Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 690669 Remove PR_TRUE/PR_FALSE from widget/src/windows r=jimm

Browse Source
This commit is contained in:
Masayuki Nakano 2011-10-02 11:16:19 +09:00
parent 6c56914b11
commit 67a0ee1944
34 changed files with 895 additions and 895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
widget/src/windows/GfxInfo.cpp
View File

@ -80,8 +80,8 @@ GfxInfo::GfxInfo()
mAdapterVendorID2(0),
mAdapterDeviceID2(0),
mWindowsVersion(0),
mHasDualGPU(PR_FALSE),
mIsGPU2Active(PR_FALSE)
mHasDualGPU(false),
mIsGPU2Active(false)
{
}
@ -104,7 +104,7 @@ GfxInfo::GetDWriteEnabled(bool *aEnabled)
nsresult
GfxInfo::GetAzureEnabled(bool *aEnabled)
{
*aEnabled = PR_FALSE;
*aEnabled = false;
bool d2dEnabled =
gfxWindowsPlatform::GetPlatform()->GetRenderMode() == gfxWindowsPlatform::RENDER_DIRECT2D;
@ -114,7 +114,7 @@ GfxInfo::GetAzureEnabled(bool *aEnabled)
nsresult rv = mozilla::Preferences::GetBool("gfx.canvas.azure.enabled", &azure);
if (NS_SUCCEEDED(rv) && azure) {
*aEnabled = PR_TRUE;
*aEnabled = true;
}
}
@ -439,7 +439,7 @@ GfxInfo::Init()
}
result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, driverKey.BeginReading(), 0, KEY_QUERY_VALUE, &key);
if (result == ERROR_SUCCESS) {
mHasDualGPU = PR_TRUE;
mHasDualGPU = true;
mDeviceKey2 = driverKey;
dwcbData = sizeof(value);
result = RegQueryValueExW(key, L"DriverVersion", NULL, NULL, (LPBYTE)value, &dwcbData);
@ -488,7 +488,7 @@ GfxInfo::Init()
PR_sscanf(spoofedVendor, "%x", &mAdapterVendorID);
}
mHasDriverVersionMismatch = PR_FALSE;
mHasDriverVersionMismatch = false;
if (mAdapterVendorID == vendorIntel) {
// we've had big crashers (bugs 590373 and 595364) apparently correlated
// with bad Intel driver installations where the DriverVersion reported
@ -508,7 +508,7 @@ GfxInfo::Init()
// so if GetDLLVersion failed, we get dllNumericVersion = 0
// so this test implicitly handles the case where GetDLLVersion failed
if (dllNumericVersion != driverNumericVersion)
mHasDriverVersionMismatch = PR_TRUE;
mHasDriverVersionMismatch = true;
}
const char *spoofedDevice = PR_GetEnv("MOZ_GFX_SPOOF_DEVICE_ID");
@ -972,7 +972,7 @@ nsresult
GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo /* = nsnull */)
{
*aStatus = nsIGfxInfo::FEATURE_NO_INFO;
aSuggestedDriverVersion.SetIsVoid(PR_TRUE);
aSuggestedDriverVersion.SetIsVoid(true);
PRInt32 status = nsIGfxInfo::FEATURE_NO_INFO;

50
widget/src/windows/JumpListBuilder.cpp
View File

@ -80,7 +80,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(AsyncDeleteAllFaviconsFromDisk, nsIRunnable)
JumpListBuilder::JumpListBuilder() :
mMaxItems(0),
mHasCommit(PR_FALSE)
mHasCommit(false)
{
::CoInitialize(NULL);
@ -102,10 +102,10 @@ JumpListBuilder::~JumpListBuilder()
/* readonly attribute short available; */
NS_IMETHODIMP JumpListBuilder::GetAvailable(PRInt16 *aAvailable)
{
*aAvailable = PR_FALSE;
*aAvailable = false;
if (mJumpListMgr)
*aAvailable = PR_TRUE;
*aAvailable = true;
return NS_OK;
}
@ -149,7 +149,7 @@ NS_IMETHODIMP JumpListBuilder::InitListBuild(nsIMutableArray *removedItems, bool
{
NS_ENSURE_ARG_POINTER(removedItems);
*_retval = PR_FALSE;
*_retval = false;
if (!mJumpListMgr)
return NS_ERROR_NOT_AVAILABLE;
@ -167,8 +167,8 @@ NS_IMETHODIMP JumpListBuilder::InitListBuild(nsIMutableArray *removedItems, bool
RemoveIconCacheForItems(removedItems);
sBuildingList = PR_TRUE;
*_retval = PR_TRUE;
sBuildingList = true;
*_retval = true;
return NS_OK;
}
@ -265,7 +265,7 @@ nsresult JumpListBuilder::RemoveIconCacheForAllItems()
continue;
// We found an ICO file that exists, so we should remove it
currFile->Remove(PR_FALSE);
currFile->Remove(false);
}
} while(true);
@ -277,7 +277,7 @@ NS_IMETHODIMP JumpListBuilder::AddListToBuild(PRInt16 aCatType, nsIArray *items,
{
nsresult rv;
*_retval = PR_FALSE;
*_retval = false;
if (!mJumpListMgr)
return NS_ERROR_NOT_AVAILABLE;
@ -327,21 +327,21 @@ NS_IMETHODIMP JumpListBuilder::AddListToBuild(PRInt16 aCatType, nsIArray *items,
// Add the tasks
hr = mJumpListMgr->AddUserTasks(pArray);
if (SUCCEEDED(hr))
*_retval = PR_TRUE;
*_retval = true;
return NS_OK;
}
break;
case nsIJumpListBuilder::JUMPLIST_CATEGORY_RECENT:
{
if (SUCCEEDED(mJumpListMgr->AppendKnownCategory(KDC_RECENT)))
*_retval = PR_TRUE;
*_retval = true;
return NS_OK;
}
break;
case nsIJumpListBuilder::JUMPLIST_CATEGORY_FREQUENT:
{
if (SUCCEEDED(mJumpListMgr->AppendKnownCategory(KDC_FREQUENT)))
*_retval = PR_TRUE;
*_retval = true;
return NS_OK;
}
break;
@ -408,7 +408,7 @@ NS_IMETHODIMP JumpListBuilder::AddListToBuild(PRInt16 aCatType, nsIArray *items,
// Add the tasks
hr = mJumpListMgr->AppendCategory(catName.BeginReading(), pArray);
if (SUCCEEDED(hr))
*_retval = PR_TRUE;
*_retval = true;
return NS_OK;
}
break;
@ -423,7 +423,7 @@ NS_IMETHODIMP JumpListBuilder::AbortListBuild()
return NS_ERROR_NOT_AVAILABLE;
mJumpListMgr->AbortList();
sBuildingList = PR_FALSE;
sBuildingList = false;
return NS_OK;
}
@ -431,18 +431,18 @@ NS_IMETHODIMP JumpListBuilder::AbortListBuild()
/* boolean commitListBuild(); */
NS_IMETHODIMP JumpListBuilder::CommitListBuild(bool *_retval)
{
*_retval = PR_FALSE;
*_retval = false;
if (!mJumpListMgr)
return NS_ERROR_NOT_AVAILABLE;
HRESULT hr = mJumpListMgr->CommitList();
sBuildingList = PR_FALSE;
sBuildingList = false;
// XXX We might want some specific error data here.
if (SUCCEEDED(hr)) {
*_retval = PR_TRUE;
mHasCommit = PR_TRUE;
*_retval = true;
mHasCommit = true;
}
return NS_OK;
@ -451,7 +451,7 @@ NS_IMETHODIMP JumpListBuilder::CommitListBuild(bool *_retval)
/* boolean deleteActiveList(); */
NS_IMETHODIMP JumpListBuilder::DeleteActiveList(bool *_retval)
{
*_retval = PR_FALSE;
*_retval = false;
if (!mJumpListMgr)
return NS_ERROR_NOT_AVAILABLE;
@ -464,7 +464,7 @@ NS_IMETHODIMP JumpListBuilder::DeleteActiveList(bool *_retval)
return NS_OK;
if (SUCCEEDED(mJumpListMgr->DeleteList(uid.get())))
*_retval = PR_TRUE;
*_retval = true;
return NS_OK;
}
@ -476,11 +476,11 @@ bool JumpListBuilder::IsSeparator(nsCOMPtr<nsIJumpListItem>& item)
PRInt16 type;
item->GetType(&type);
if (NS_FAILED(item->GetType(&type)))
return PR_FALSE;
return false;
if (type == nsIJumpListItem::JUMPLIST_ITEM_SEPARATOR)
return PR_TRUE;
return PR_FALSE;
return true;
return false;
}
// TransferIObjectArrayToIMutableArray - used in converting removed items
@ -524,7 +524,7 @@ nsresult JumpListBuilder::TransferIObjectArrayToIMutableArray(IObjectArray *objA
pItem->Release();
if (NS_SUCCEEDED(rv)) {
removedItems->AppendElement(item, PR_FALSE);
removedItems->AppendElement(item, false);
}
}
return NS_OK;
@ -703,7 +703,7 @@ NS_IMETHODIMP AsyncDeleteIconFromDisk::Run()
return NS_ERROR_FAILURE;
// We found an ICO file that exists, so we should remove it
icoFile->Remove(PR_FALSE);
icoFile->Remove(false);
}
return NS_OK;
@ -753,7 +753,7 @@ NS_IMETHODIMP AsyncDeleteAllFaviconsFromDisk::Run()
continue;
// We found an ICO file that exists, so we should remove it
currFile->Remove(PR_FALSE);
currFile->Remove(false);
}
} while(true);

32
widget/src/windows/JumpListItem.cpp
View File

@ -110,7 +110,7 @@ NS_IMETHODIMP JumpListItem::Equals(nsIJumpListItem *aItem, bool *aResult)
{
NS_ENSURE_ARG_POINTER(aItem);
*aResult = PR_FALSE;
*aResult = false;
PRInt16 theType = nsIJumpListItem::JUMPLIST_ITEM_EMPTY;
if (NS_FAILED(aItem->GetType(&theType)))
@ -120,7 +120,7 @@ NS_IMETHODIMP JumpListItem::Equals(nsIJumpListItem *aItem, bool *aResult)
if (Type() != theType)
return NS_OK;
*aResult = PR_TRUE;
*aResult = true;
return NS_OK;
}
@ -197,7 +197,7 @@ NS_IMETHODIMP JumpListLink::Equals(nsIJumpListItem *aItem, bool *aResult)
nsresult rv;
*aResult = PR_FALSE;
*aResult = false;
PRInt16 theType = nsIJumpListItem::JUMPLIST_ITEM_EMPTY;
if (NS_FAILED(aItem->GetType(&theType)))
@ -223,11 +223,11 @@ NS_IMETHODIMP JumpListLink::Equals(nsIJumpListItem *aItem, bool *aResult)
if (NS_SUCCEEDED(link->GetUri(getter_AddRefs(theUri)))) {
if (!theUri) {
if (!mURI)
*aResult = PR_TRUE;
*aResult = true;
return NS_OK;
}
if (NS_SUCCEEDED(theUri->Equals(mURI, &equals)) && equals) {
*aResult = PR_TRUE;
*aResult = true;
}
}
@ -291,7 +291,7 @@ NS_IMETHODIMP JumpListShortcut::Equals(nsIJumpListItem *aItem, bool *aResult)
nsresult rv;
*aResult = PR_FALSE;
*aResult = false;
PRInt16 theType = nsIJumpListItem::JUMPLIST_ITEM_EMPTY;
if (NS_FAILED(aItem->GetType(&theType)))
@ -318,11 +318,11 @@ NS_IMETHODIMP JumpListShortcut::Equals(nsIJumpListItem *aItem, bool *aResult)
if (NS_SUCCEEDED(shortcut->GetApp(getter_AddRefs(theApp)))) {
if (!theApp) {
if (!mHandlerApp)
*aResult = PR_TRUE;
*aResult = true;
return NS_OK;
}
if (NS_SUCCEEDED(theApp->Equals(mHandlerApp, &equals)) && equals) {
*aResult = PR_TRUE;
*aResult = true;
}
}
@ -381,7 +381,7 @@ static PRInt32 GetICOCacheSecondsTimeout() {
const char PREF_ICOTIMEOUT[] = "browser.taskbar.lists.icoTimeoutInSeconds";
icoReCacheSecondsTimeout = Preferences::GetInt(PREF_ICOTIMEOUT,
kSecondsPerDay);
alreadyObtained = PR_TRUE;
alreadyObtained = true;
return icoReCacheSecondsTimeout;
}
@ -560,7 +560,7 @@ nsresult JumpListShortcut::GetShellLink(nsCOMPtr<nsIJumpListItem>& item,
nsCOMPtr<nsIURI> iconUri;
rv = shortcut->GetFaviconPageUri(getter_AddRefs(iconUri));
if (NS_SUCCEEDED(rv) && iconUri) {
useUriIcon = PR_TRUE;
useUriIcon = true;
}
// Store the title of the app
@ -592,7 +592,7 @@ nsresult JumpListShortcut::GetShellLink(nsCOMPtr<nsIJumpListItem>& item,
// Always use the first icon in the ICO file
// our encoded icon only has 1 resource
psl->SetIconLocation(icoFilePath.get(), 0);
usedUriIcon = PR_TRUE;
usedUriIcon = true;
}
}
@ -614,7 +614,7 @@ static nsresult IsPathInOurIconCache(nsCOMPtr<nsIJumpListShortcut>& aShortcut,
NS_ENSURE_ARG_POINTER(aPath);
NS_ENSURE_ARG_POINTER(aSame);
*aSame = PR_FALSE;
*aSame = false;
// Construct the path of our jump list cache
nsCOMPtr<nsIFile> jumpListCache;
@ -662,7 +662,7 @@ nsresult JumpListShortcut::GetJumpListShortcut(IShellLinkW *pLink, nsCOMPtr<nsIJ
nsCOMPtr<nsILocalFile> file;
nsDependentString filepath(buf);
rv = NS_NewLocalFile(filepath, PR_FALSE, getter_AddRefs(file));
rv = NS_NewLocalFile(filepath, false, getter_AddRefs(file));
NS_ENSURE_SUCCESS(rv, rv);
rv = handlerApp->SetExecutable(file);
@ -813,7 +813,7 @@ bool JumpListShortcut::ExecutableExists(nsCOMPtr<nsILocalHandlerApp>& handlerApp
nsresult rv;
if (!handlerApp)
return PR_FALSE;
return false;
nsCOMPtr<nsIFile> executable;
rv = handlerApp->GetExecutable(getter_AddRefs(executable));
@ -822,7 +822,7 @@ bool JumpListShortcut::ExecutableExists(nsCOMPtr<nsILocalHandlerApp>& handlerApp
executable->Exists(&exists);
return exists;
}
return PR_FALSE;
return false;
}
// (static) Helper method which will hash a URI
@ -846,7 +846,7 @@ nsresult JumpListItem::HashURI(nsCOMPtr<nsICryptoHash> &aCryptoHash,
rv = aCryptoHash->Update(reinterpret_cast<const PRUint8*>(spec.BeginReading()),
spec.Length());
NS_ENSURE_SUCCESS(rv, rv);
rv = aCryptoHash->Finish(PR_TRUE, aUriHash);
rv = aCryptoHash->Finish(true, aUriHash);
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;

18
widget/src/windows/KeyboardLayout.cpp
View File

@ -130,7 +130,7 @@ VirtualKey::SetNormalChars(PRUint8 aShiftState,
{
NS_ASSERTION(aShiftState < NS_ARRAY_LENGTH(mShiftStates), "invalid index");
SetDeadKey(aShiftState, PR_FALSE);
SetDeadKey(aShiftState, false);
for (PRUint32 index = 0; index < aNumOfChars; index++) {
// Ignore legacy non-printable control characters
@ -149,7 +149,7 @@ VirtualKey::SetDeadChar(PRUint8 aShiftState, PRUnichar aDeadChar)
{
NS_ASSERTION(aShiftState < NS_ARRAY_LENGTH(mShiftStates), "invalid index");
SetDeadKey(aShiftState, PR_TRUE);
SetDeadKey(aShiftState, true);
mShiftStates[aShiftState].DeadKey.DeadChar = aDeadChar;
mShiftStates[aShiftState].DeadKey.Table = nsnull;
@ -624,7 +624,7 @@ KeyboardLayout::DeactivateDeadKeyState()
SetShiftState(kbdState, mDeadKeyShiftState);
EnsureDeadKeyActive(PR_FALSE, mActiveDeadKey, kbdState);
EnsureDeadKeyActive(false, mActiveDeadKey, kbdState);
mActiveDeadKey = -1;
}
@ -636,14 +636,14 @@ KeyboardLayout::AddDeadKeyEntry(PRUnichar aBaseChar,
{
for (PRUint32 index = 0; index < aEntries; index++) {
if (aDeadKeyArray[index].BaseChar == aBaseChar) {
return PR_FALSE;
return false;
}
}
aDeadKeyArray[aEntries].BaseChar = aBaseChar;
aDeadKeyArray[aEntries].CompositeChar = aCompositeChar;
return PR_TRUE;
return true;
}
PRUint32
@ -673,7 +673,7 @@ KeyboardLayout::GetDeadKeyCombinations(PRUint8 aDeadKey,
// Ensure dead-key is in active state, when it swallows entered
// character and waits for the next pressed key.
if (!deadKeyActive) {
deadKeyActive = EnsureDeadKeyActive(PR_TRUE, aDeadKey,
deadKeyActive = EnsureDeadKeyActive(true, aDeadKey,
aDeadKeyKbdState);
}
@ -702,14 +702,14 @@ KeyboardLayout::GetDeadKeyCombinations(PRUint8 aDeadKey,
aDeadKeyArray, entries)) {
entries++;
}
deadKeyActive = PR_FALSE;
deadKeyActive = false;
break;
}
default:
// 1. Unexpected dead-key. Dead-key chaining is not supported.
// 2. More than one character generated. This is not a valid
// dead-key and base character combination.
deadKeyActive = PR_FALSE;
deadKeyActive = false;
break;
}
}
@ -717,7 +717,7 @@ KeyboardLayout::GetDeadKeyCombinations(PRUint8 aDeadKey,
}
if (deadKeyActive) {
deadKeyActive = EnsureDeadKeyActive(PR_FALSE, aDeadKey, aDeadKeyKbdState);
deadKeyActive = EnsureDeadKeyActive(false, aDeadKey, aDeadKeyKbdState);
}
NS_QuickSort(aDeadKeyArray, entries, sizeof(DeadKeyEntry),

2
widget/src/windows/KeyboardLayout.h
View File

@ -181,7 +181,7 @@ public:
bool IsDeadKey() const
{
return (mLastVirtualKeyIndex >= 0) ?
mVirtualKeys[mLastVirtualKeyIndex].IsDeadKey(mLastShiftState) : PR_FALSE;
mVirtualKeys[mLastVirtualKeyIndex].IsDeadKey(mLastShiftState) : false;
}
void LoadLayout(HKL aLayout);

20
widget/src/windows/TaskbarPreview.cpp
View File

@ -136,7 +136,7 @@ TaskbarPreview::TaskbarPreview(ITaskbarList4 *aTaskbar, nsITaskbarPreviewControl
: mTaskbar(aTaskbar),
mController(aController),
mWnd(aHWND),
mVisible(PR_FALSE),
mVisible(false),
mDocShell(do_GetWeakReference(aShell))
{
// TaskbarPreview may outlive the WinTaskbar that created it
@ -252,7 +252,7 @@ TaskbarPreview::UpdateTaskbarProperties() {
// and should be displayed as so.
if (sActivePreview == this) {
if (mWnd == ::GetActiveWindow()) {
nsresult rvActive = ShowActive(PR_TRUE);
nsresult rvActive = ShowActive(true);
if (NS_FAILED(rvActive))
rv = rvActive;
} else {
@ -287,10 +287,10 @@ TaskbarPreview::IsWindowAvailable() const {
if (mWnd) {
nsWindow* win = nsWindow::GetNSWindowPtr(mWnd);
if(win && !win->HasDestroyStarted()) {
return PR_TRUE;
return true;
}
}
return PR_FALSE;
return false;
}
void
@ -324,7 +324,7 @@ TaskbarPreview::WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam) {
thumbnailHeight = PRUint32(thumbnailWidth / preferredAspectRatio);
}
DrawBitmap(thumbnailWidth, thumbnailHeight, PR_FALSE);
DrawBitmap(thumbnailWidth, thumbnailHeight, false);
}
break;
case WM_DWMSENDICONICLIVEPREVIEWBITMAP:
@ -338,7 +338,7 @@ TaskbarPreview::WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam) {
if (NS_FAILED(rv))
break;
DrawBitmap(width, height, PR_TRUE);
DrawBitmap(width, height, true);
}
break;
}
@ -350,17 +350,17 @@ TaskbarPreview::CanMakeTaskbarCalls() {
// If the nsWindow has already been destroyed and we know it but our caller
// clearly doesn't so we can't make any calls.
if (!mWnd)
return PR_FALSE;
return false;
// Certain functions like SetTabOrder seem to require a visible window. During
// window close, the window seems to be hidden before being destroyed.
if (!::IsWindowVisible(mWnd))
return PR_FALSE;
return false;
if (mVisible) {
nsWindow *window = nsWindow::GetNSWindowPtr(mWnd);
NS_ASSERTION(window, "Could not get nsWindow from HWND");
return window->HasTaskbarIconBeenCreated();
}
return PR_FALSE;
return false;
}
WindowHook&
@ -457,7 +457,7 @@ TaskbarPreview::MainWindowHook(void *aContext,
if (preview->mVisible)
preview->UpdateTaskbarProperties();
}
return PR_FALSE;
return false;
}
TaskbarPreview *

4
widget/src/windows/TaskbarPreviewButton.cpp
View File

@ -59,7 +59,7 @@ TaskbarPreviewButton::TaskbarPreviewButton(TaskbarWindowPreview* preview, PRUint
}
TaskbarPreviewButton::~TaskbarPreviewButton() {
SetVisible(PR_FALSE);
SetVisible(false);
}
NS_IMETHODIMP
@ -140,7 +140,7 @@ TaskbarPreviewButton::SetImage(imgIContainer *img) {
::DestroyIcon(Button().hIcon);
if (img) {
nsresult rv;
rv = nsWindowGfx::CreateIcon(img, PR_FALSE, 0, 0,
rv = nsWindowGfx::CreateIcon(img, false, 0, 0,
nsWindowGfx::GetIconMetrics(nsWindowGfx::kRegularIcon),
&Button().hIcon);
NS_ENSURE_SUCCESS(rv, rv);

14
widget/src/windows/TaskbarTabPreview.cpp
View File

@ -58,7 +58,7 @@ TaskbarTabPreview::TaskbarTabPreview(ITaskbarList4 *aTaskbar, nsITaskbarPreviewC
: TaskbarPreview(aTaskbar, aController, aHWND, aShell),
mProxyWindow(NULL),
mIcon(NULL),
mRegistered(PR_FALSE)
mRegistered(false)
{
WindowHook &hook = GetWindowHook();
hook.AddMonitor(WM_WINDOWPOSCHANGED, MainWindowHook, this);
@ -125,7 +125,7 @@ TaskbarTabPreview::SetIcon(imgIContainer *icon) {
HICON hIcon = NULL;
if (icon) {
nsresult rv;
rv = nsWindowGfx::CreateIcon(icon, PR_FALSE, 0, 0,
rv = nsWindowGfx::CreateIcon(icon, false, 0, 0,
nsWindowGfx::GetIconMetrics(nsWindowGfx::kSmallIcon),
&hIcon);
NS_ENSURE_SUCCESS(rv, rv);
@ -163,7 +163,7 @@ TaskbarTabPreview::UpdateTaskbarProperties() {
nsresult rv = UpdateNext();
NS_ENSURE_SUCCESS(rv, rv);
rv = TaskbarPreview::UpdateTaskbarProperties();
mRegistered = PR_TRUE;
mRegistered = true;
return rv;
}
@ -172,7 +172,7 @@ TaskbarTabPreview::WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam) {
nsRefPtr<TaskbarTabPreview> kungFuDeathGrip(this);
switch (nMsg) {
case WM_CREATE:
TaskbarPreview::EnableCustomDrawing(mProxyWindow, PR_TRUE);
TaskbarPreview::EnableCustomDrawing(mProxyWindow, true);
return 0;
case WM_CLOSE:
mController->OnClose();
@ -291,7 +291,7 @@ TaskbarTabPreview::Disable() {
if (FAILED(mTaskbar->UnregisterTab(mProxyWindow)))
return NS_ERROR_FAILURE;
mRegistered = PR_FALSE;
mRegistered = false;
// TaskbarPreview::WndProc will set mProxyWindow to null
if (!DestroyWindow(mProxyWindow))
@ -302,7 +302,7 @@ TaskbarTabPreview::Disable() {
void
TaskbarTabPreview::DetachFromNSWindow() {
(void) SetVisible(PR_FALSE);
(void) SetVisible(false);
WindowHook &hook = GetWindowHook();
hook.RemoveMonitor(WM_WINDOWPOSCHANGED, MainWindowHook, this);
@ -323,7 +323,7 @@ TaskbarTabPreview::MainWindowHook(void *aContext,
} else {
NS_NOTREACHED("Style changed hook fired on non-style changed message");
}
return PR_FALSE;
return false;
}
void

14
widget/src/windows/TaskbarWindowPreview.cpp
View File

@ -57,7 +57,7 @@ bool WindowHookProc(void *aContext, HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM
{
TaskbarWindowPreview *preview = reinterpret_cast<TaskbarWindowPreview*>(aContext);
*aResult = preview->WndProc(nMsg, wParam, lParam);
return PR_TRUE;
return true;
}
}
@ -80,15 +80,15 @@ static TBPFLAG sNativeStates[] =
TaskbarWindowPreview::TaskbarWindowPreview(ITaskbarList4 *aTaskbar, nsITaskbarPreviewController *aController, HWND aHWND, nsIDocShell *aShell)
: TaskbarPreview(aTaskbar, aController, aHWND, aShell),
mCustomDrawing(PR_FALSE),
mHaveButtons(PR_FALSE),
mCustomDrawing(false),
mHaveButtons(false),
mState(TBPF_NOPROGRESS),
mCurrentValue(0),
mMaxValue(0),
mOverlayIcon(NULL)
{
// Window previews are visible by default
(void) SetVisible(PR_TRUE);
(void) SetVisible(true);
memset(mThumbButtons, 0, sizeof mThumbButtons);
for (PRInt32 i = 0; i < nsITaskbarWindowPreview::NUM_TOOLBAR_BUTTONS; i++) {
@ -146,7 +146,7 @@ TaskbarWindowPreview::GetButton(PRUint32 index, nsITaskbarPreviewButton **_retVa
}
if (!mHaveButtons) {
mHaveButtons = PR_TRUE;
mHaveButtons = true;
WindowHook &hook = GetWindowHook();
(void) hook.AddHook(WM_COMMAND, WindowHookProc, this);
@ -297,7 +297,7 @@ TaskbarWindowPreview::TaskbarWindowHook(void *aContext,
reinterpret_cast<TaskbarWindowPreview*>(aContext);
// Now we can make all the calls to mTaskbar
preview->UpdateTaskbarProperties();
return PR_FALSE;
return false;
}
nsresult
@ -323,7 +323,7 @@ TaskbarWindowPreview::Disable() {
void
TaskbarWindowPreview::DetachFromNSWindow() {
// Remove the hooks we have for drawing
SetEnableCustomDrawing(PR_FALSE);
SetEnableCustomDrawing(false);
WindowHook &hook = GetWindowHook();
(void) hook.RemoveHook(WM_COMMAND, WindowHookProc, this);

30
widget/src/windows/WinTaskbar.cpp
View File

@ -197,13 +197,13 @@ DefaultController::GetThumbnailAspectRatio(float *aThumbnailAspectRatio) {
NS_IMETHODIMP
DefaultController::DrawPreview(nsIDOMCanvasRenderingContext2D *ctx, bool *rDrawFrame) {
*rDrawFrame = PR_TRUE;
*rDrawFrame = true;
return NS_OK;
}
NS_IMETHODIMP
DefaultController::DrawThumbnail(nsIDOMCanvasRenderingContext2D *ctx, PRUint32 width, PRUint32 height, bool *rDrawFrame) {
*rDrawFrame = PR_FALSE;
*rDrawFrame = false;
return NS_OK;
}
@ -215,7 +215,7 @@ DefaultController::OnClose(void) {
NS_IMETHODIMP
DefaultController::OnActivate(bool *rAcceptActivation) {
*rAcceptActivation = PR_TRUE;
*rAcceptActivation = true;
NS_NOTREACHED("OnActivate should not be called for TaskbarWindowPreviews");
return NS_OK;
}
@ -239,7 +239,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(WinTaskbar, nsIWinTaskbar)
bool
WinTaskbar::Initialize() {
if (mTaskbar)
return PR_TRUE;
return true;
::CoInitialize(NULL);
HRESULT hr = ::CoCreateInstance(CLSID_TaskbarList,
@ -248,15 +248,15 @@ WinTaskbar::Initialize() {
IID_ITaskbarList4,
(void**)&mTaskbar);
if (FAILED(hr))
return PR_FALSE;
return false;
hr = mTaskbar->HrInit();
if (FAILED(hr)) {
NS_WARNING("Unable to initialize taskbar");
NS_RELEASE(mTaskbar);
return PR_FALSE;
return false;
}
return PR_TRUE;
return true;
}
WinTaskbar::WinTaskbar()
@ -276,7 +276,7 @@ WinTaskbar::GetAppUserModelID(nsAString & aDefaultGroupId) {
nsCOMPtr<nsIXULAppInfo> appInfo =
do_GetService("@mozilla.org/xre/app-info;1");
if (!appInfo)
return PR_FALSE;
return false;
// The default, pulled from application.ini:
// 'vendor.application.version'
@ -294,14 +294,14 @@ WinTaskbar::GetAppUserModelID(nsAString & aDefaultGroupId) {
}
if (aDefaultGroupId.IsEmpty())
return PR_FALSE;
return false;
// Differentiate 64-bit builds
#if defined(_WIN64)
aDefaultGroupId.AppendLiteral(".Win64");
#endif
return PR_TRUE;
return true;
}
/* readonly attribute AString defaultGroupId; */
@ -317,14 +317,14 @@ WinTaskbar::GetDefaultGroupId(nsAString & aDefaultGroupId) {
bool
WinTaskbar::RegisterAppUserModelID() {
if (nsWindow::GetWindowsVersion() < WIN7_VERSION)
return PR_FALSE;
return false;
SetCurrentProcessExplicitAppUserModelIDPtr funcAppUserModelID = nsnull;
bool retVal = false;
nsAutoString uid;
if (!GetAppUserModelID(uid))
return PR_FALSE;
return false;
HMODULE hDLL = ::LoadLibraryW(kShellLibraryName);
@ -333,11 +333,11 @@ WinTaskbar::RegisterAppUserModelID() {
if (!funcAppUserModelID) {
::FreeLibrary(hDLL);
return PR_FALSE;
return false;
}
if (SUCCEEDED(funcAppUserModelID(uid.get())))
retVal = PR_TRUE;
retVal = true;
if (hDLL)
::FreeLibrary(hDLL);
@ -349,7 +349,7 @@ NS_IMETHODIMP
WinTaskbar::GetAvailable(bool *aAvailable) {
*aAvailable =
nsWindow::GetWindowsVersion() < WIN7_VERSION ?
PR_FALSE : PR_TRUE;
false : true;
return NS_OK;
}

4
widget/src/windows/WindowHook.cpp
View File

@ -135,7 +135,7 @@ WindowHook::Notify(HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam,
LRESULT *aResult) {
MessageData *data = Lookup(nMsg);
if (!data)
return PR_FALSE;
return false;
PRUint32 length = data->monitors.Length();
for (PRUint32 midx = 0; midx < length; midx++) {
@ -149,7 +149,7 @@ bool
WindowHook::CallbackData::Invoke(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam,
LRESULT *aResult) {
if (!cb)
return PR_FALSE;
return false;
return cb(context, hWnd, msg, wParam, lParam, aResult);
}
} // namespace widget

14
widget/src/windows/nsAppShell.cpp
View File

@ -95,7 +95,7 @@ static bool PeekUIMessage(MSG* aMsg)
}
if (pMsg && !nsIMM32Handler::CanOptimizeKeyAndIMEMessages(pMsg)) {
return PR_FALSE;
return false;
}
if (haveMouseMsg && (!pMsg || mouseMsg.time < pMsg->time)) {
@ -103,7 +103,7 @@ static bool PeekUIMessage(MSG* aMsg)
}
if (!pMsg) {
return PR_FALSE;
return false;
}
return ::PeekMessageW(aMsg, NULL, pMsg->message, pMsg->message, PM_REMOVE);
@ -222,7 +222,7 @@ CollectNewLoadedModules()
if (sLoadedModules[i].mStartAddr == module.modBaseAddr &&
!strcmp(moduleName.get(),
sLoadedModules[i].mName)) {
found = PR_TRUE;
found = true;
break;
}
}
@ -300,9 +300,9 @@ nsAppShell::DoProcessMoreGeckoEvents()
// gecko events get processed.
if (mEventloopNestingLevel < 2) {
OnDispatchedEvent(nsnull);
mNativeCallbackPending = PR_FALSE;
mNativeCallbackPending = false;
} else {
mNativeCallbackPending = PR_TRUE;
mNativeCallbackPending = true;
}
}
@ -322,7 +322,7 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait)
{
#if defined(_MSC_VER) && defined(_M_IX86)
if (sXPCOMHasLoadedNewDLLs && sLoadedModules) {
sXPCOMHasLoadedNewDLLs = PR_FALSE;
sXPCOMHasLoadedNewDLLs = false;
CollectNewLoadedModules();
}
#endif
@ -337,7 +337,7 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait)
// Give priority to keyboard and mouse messages.
if (PeekUIMessage(&msg) ||
::PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) {
gotMessage = PR_TRUE;
gotMessage = true;
if (msg.message == WM_QUIT) {
::PostQuitMessage(msg.wParam);
Exit();

2
widget/src/windows/nsAppShell.h
View File

@ -50,7 +50,7 @@ class nsAppShell : public nsBaseAppShell
public:
nsAppShell() :
mEventWnd(NULL),
mNativeCallbackPending(PR_FALSE)
mNativeCallbackPending(false)
{}
typedef mozilla::TimeStamp TimeStamp;

12
widget/src/windows/nsBidiKeyboard.cpp
View File

@ -46,8 +46,8 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard)
nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard()
{
mInitialized = PR_FALSE;
mHaveBidiKeyboards = PR_FALSE;
mInitialized = false;
mHaveBidiKeyboards = false;
mLTRKeyboard[0] = '\0';
mRTLKeyboard[0] = '\0';
mCurrentLocaleName[0] = '\0';
@ -86,7 +86,7 @@ NS_IMETHODIMP nsBidiKeyboard::SetLangFromBidiLevel(PRUint8 aLevel)
NS_IMETHODIMP nsBidiKeyboard::IsLangRTL(bool *aIsRTL)
{
*aIsRTL = PR_FALSE;
*aIsRTL = false;
nsresult result = SetupBidiKeyboards();
if (NS_FAILED(result))
@ -171,16 +171,16 @@ nsresult nsBidiKeyboard::SetupBidiKeyboards()
if (IsRTLLanguage(locale)) {
_snwprintf(mRTLKeyboard, KL_NAMELENGTH, L"%.*x", KL_NAMELENGTH - 1,
LANGIDFROMLCID((DWORD_PTR)locale));
isRTLKeyboardSet = PR_TRUE;
isRTLKeyboardSet = true;
}
else {
_snwprintf(mLTRKeyboard, KL_NAMELENGTH, L"%.*x", KL_NAMELENGTH - 1,
LANGIDFROMLCID((DWORD_PTR)locale));
isLTRKeyboardSet = PR_TRUE;
isLTRKeyboardSet = true;
}
}
PR_Free(buf);
mInitialized = PR_TRUE;
mInitialized = true;
// If there is not at least one keyboard of each directionality, Bidi
// keyboard functionality will be disabled.

38
widget/src/windows/nsClipboard.cpp
View File

@ -91,7 +91,7 @@ nsClipboard::nsClipboard() : nsBaseClipboard()
}
#endif
mIgnoreEmptyNotification = PR_FALSE;
mIgnoreEmptyNotification = false;
mWindow = nsnull;
}
@ -259,7 +259,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData ( PRInt32 aWhichClipboard )
if ( aWhichClipboard != kGlobalClipboard )
return NS_ERROR_FAILURE;
mIgnoreEmptyNotification = PR_TRUE;
mIgnoreEmptyNotification = true;
// make sure we have a good transferable
if (nsnull == mTransferable) {
@ -275,7 +275,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData ( PRInt32 aWhichClipboard )
::OleSetClipboard(NULL);
}
mIgnoreEmptyNotification = PR_FALSE;
mIgnoreEmptyNotification = false;
return NS_OK;
}
@ -615,11 +615,11 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject * aDataObject,
bool dataFound = false;
if (nsnull != aDataObject) {
if ( NS_SUCCEEDED(GetNativeDataOffClipboard(aDataObject, anIndex, format, flavorStr, &data, &dataLen)) )
dataFound = PR_TRUE;
dataFound = true;
}
else if (nsnull != aWindow) {
if ( NS_SUCCEEDED(GetNativeDataOffClipboard(aWindow, anIndex, format, &data, &dataLen)) )
dataFound = PR_TRUE;
dataFound = true;
}
// This is our second chance to try to find some data, having not found it
@ -644,7 +644,7 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject * aDataObject,
// we have a file path in |data|. Create an nsLocalFile object.
nsDependentString filepath(reinterpret_cast<PRUnichar*>(data));
nsCOMPtr<nsILocalFile> file;
if ( NS_SUCCEEDED(NS_NewLocalFile(filepath, PR_FALSE, getter_AddRefs(file))) )
if ( NS_SUCCEEDED(NS_NewLocalFile(filepath, false, getter_AddRefs(file))) )
genericDataWrapper = do_QueryInterface(file);
nsMemory::Free(data);
}
@ -712,7 +712,7 @@ nsClipboard :: FindPlatformHTML ( IDataObject* inDataObject, UINT inIndex, void*
// the header is ASCII.
if (!outData || !*outData) {
return PR_FALSE;
return false;
}
float vers = 0.0;
@ -722,7 +722,7 @@ nsClipboard :: FindPlatformHTML ( IDataObject* inDataObject, UINT inIndex, void*
&vers, &startOfData, &endOfData);
if (numFound != 3 || startOfData < -1 || endOfData < -1) {
return PR_FALSE;
return false;
}
// Fixup the start and end markers if they have no context (set to -1)
@ -736,14 +736,14 @@ nsClipboard :: FindPlatformHTML ( IDataObject* inDataObject, UINT inIndex, void*
// Make sure we were passed sane values within our buffer size.
if (!endOfData || startOfData >= endOfData ||
endOfData > *outDataLen) {
return PR_FALSE;
return false;
}
// We want to return the buffer not offset by startOfData because it will be
// parsed out later (probably by nsHTMLEditor::ParseCFHTML) when it is still
// in CF_HTML format.
*outDataLen = endOfData;
return PR_TRUE;
return true;
}
@ -772,7 +772,7 @@ nsClipboard :: FindUnicodeFromPlainText ( IDataObject* inDataObject, UINT inInde
nsMemory::Free(*outData);
*outData = convertedText;
*outDataLen = convertedTextLen * sizeof(PRUnichar);
dataFound = PR_TRUE;
dataFound = true;
}
} // if plain text data on clipboard
@ -799,7 +799,7 @@ nsClipboard :: FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, v
// we have a file path in |data|. Is it an internet shortcut or a normal file?
const nsDependentString filepath(static_cast<PRUnichar*>(*outData));
nsCOMPtr<nsILocalFile> file;
nsresult rv = NS_NewLocalFile(filepath, PR_TRUE, getter_AddRefs(file));
nsresult rv = NS_NewLocalFile(filepath, true, getter_AddRefs(file));
if (NS_FAILED(rv)) {
nsMemory::Free(*outData);
return dataFound;
@ -823,7 +823,7 @@ nsClipboard :: FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, v
*outData = ToNewUnicode(urlString + NS_LITERAL_STRING("\n") + title);
*outDataLen = nsCRT::strlen(static_cast<PRUnichar*>(*outData)) * sizeof(PRUnichar);
dataFound = PR_TRUE;
dataFound = true;
}
}
else {
@ -835,7 +835,7 @@ nsClipboard :: FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, v
nsMemory::Free(*outData);
*outData = UTF8ToNewUnicode(urlSpec);
*outDataLen = nsCRT::strlen(static_cast<PRUnichar*>(*outData)) * sizeof(PRUnichar);
dataFound = PR_TRUE;
dataFound = true;
} // else regular file
}
@ -866,7 +866,7 @@ nsClipboard :: FindURLFromNativeURL ( IDataObject* inDataObject, UINT inIndex, v
*outData = ToNewUnicode(urlString + NS_LITERAL_STRING("\n") + urlString);
*outDataLen = nsCRT::strlen(static_cast<PRUnichar*>(*outData)) * sizeof(PRUnichar);
nsMemory::Free(tempOutData);
dataFound = PR_TRUE;
dataFound = true;
}
else {
loadResult = GetNativeDataOffClipboard(inDataObject, inIndex, ::RegisterClipboardFormat(CFSTR_INETURLA), nsnull, &tempOutData, &tempDataLen);
@ -888,7 +888,7 @@ nsClipboard :: FindURLFromNativeURL ( IDataObject* inDataObject, UINT inIndex, v
*outData = ToNewUnicode(urlString + NS_LITERAL_STRING("\n") + urlString);
*outDataLen = nsCRT::strlen(static_cast<PRUnichar*>(*outData)) * sizeof(PRUnichar);
nsMemory::Free(tempOutData);
dataFound = PR_TRUE;
dataFound = true;
}
}
@ -959,7 +959,7 @@ NS_IMETHODIMP nsClipboard::HasDataMatchingFlavors(const char** aFlavorList,
PRInt32 aWhichClipboard,
bool *_retval)
{
*_retval = PR_FALSE;
*_retval = false;
if (aWhichClipboard != kGlobalClipboard || !aFlavorList)
return NS_OK;
@ -971,7 +971,7 @@ NS_IMETHODIMP nsClipboard::HasDataMatchingFlavors(const char** aFlavorList,
UINT format = GetFormat(aFlavorList[i]);
if (IsClipboardFormatAvailable(format)) {
*_retval = PR_TRUE;
*_retval = true;
break;
}
else {
@ -981,7 +981,7 @@ NS_IMETHODIMP nsClipboard::HasDataMatchingFlavors(const char** aFlavorList,
// client asked for unicode and it wasn't present, check if we have CF_TEXT.
// We'll handle the actual data substitution in the data object.
if (IsClipboardFormatAvailable(GetFormat(kTextMime)))
*_retval = PR_TRUE;
*_retval = true;
}
}
}

56
widget/src/windows/nsDataObj.cpp
View File

@ -193,7 +193,7 @@ nsresult nsDataObj::CStream::WaitForCompletion()
// We are guaranteed OnStopRequest will get called, so this should be ok.
while (!mChannelRead) {
// Pump messages
NS_ProcessNextEvent(nsnull, PR_TRUE);
NS_ProcessNextEvent(nsnull, true);
}
if (!mChannelData.Length())
@ -483,7 +483,7 @@ STDMETHODIMP_(ULONG) nsDataObj::Release()
500, nsITimer::TYPE_ONE_SHOT);
return AddRef();
}
mCachedTempFile->Remove(PR_FALSE);
mCachedTempFile->Remove(false);
mCachedTempFile = NULL;
}
@ -558,13 +558,13 @@ STDMETHODIMP nsDataObj::GetData(LPFORMATETC aFormat, LPSTGMEDIUM pSTM)
default:
if ( format == fileDescriptorFlavorA )
return GetFileDescriptor ( *aFormat, *pSTM, PR_FALSE );
return GetFileDescriptor ( *aFormat, *pSTM, false );
if ( format == fileDescriptorFlavorW )
return GetFileDescriptor ( *aFormat, *pSTM, PR_TRUE);
return GetFileDescriptor ( *aFormat, *pSTM, true);
if ( format == uniformResourceLocatorA )
return GetUniformResourceLocator( *aFormat, *pSTM, PR_FALSE);
return GetUniformResourceLocator( *aFormat, *pSTM, false);
if ( format == uniformResourceLocatorW )
return GetUniformResourceLocator( *aFormat, *pSTM, PR_TRUE);
return GetUniformResourceLocator( *aFormat, *pSTM, true);
if ( format == fileFlavor )
return GetFileContents ( *aFormat, *pSTM );
if ( format == PreferredDropEffect )
@ -664,7 +664,7 @@ nsDataObj::LookupArbitraryFormat(FORMATETC *aFormat, LPDATAENTRY *aDataEntry, BO
*aDataEntry = NULL;
if (aFormat->ptd != NULL)
return PR_FALSE;
return false;
// See if it's already in our list. If so return the data entry.
for (PRUint32 idx = 0; idx < mDataEntryList.Length(); idx++) {
@ -675,21 +675,21 @@ nsDataObj::LookupArbitraryFormat(FORMATETC *aFormat, LPDATAENTRY *aDataEntry, BO
// If the caller requests we update, or if the
// medium type matches, return the entry.
*aDataEntry = mDataEntryList[idx];
return PR_TRUE;
return true;
} else {
// Medium does not match, not found.
return PR_FALSE;
return false;
}
}
}
if (!aAddorUpdate)
return PR_FALSE;
return false;
// Add another entry to mDataEntryList
LPDATAENTRY dataEntry = (LPDATAENTRY)CoTaskMemAlloc(sizeof(DATAENTRY));
if (!dataEntry)
return PR_FALSE;
return false;
dataEntry->fe = *aFormat;
*aDataEntry = dataEntry;
@ -702,7 +702,7 @@ nsDataObj::LookupArbitraryFormat(FORMATETC *aFormat, LPDATAENTRY *aDataEntry, BO
// Store a copy internally in the arbitrary formats array.
mDataEntryList.AppendElement(dataEntry);
return PR_TRUE;
return true;
}
bool
@ -721,10 +721,10 @@ nsDataObj::CopyMediumData(STGMEDIUM *aMediumDst, STGMEDIUM *aMediumSrc, LPFORMAT
if (!aMediumSrc->pUnkForRelease) {
if (aSetData) {
if (aMediumSrc->tymed != TYMED_HGLOBAL)
return PR_FALSE;
return false;
stgmOut.hGlobal = OleDuplicateData(aMediumSrc->hGlobal, aFormat->cfFormat, 0);
if (!stgmOut.hGlobal)
return PR_FALSE;
return false;
} else {
// We are returning this data from LookupArbitraryFormat, indicate to the
// shell we hold it and will free it.
@ -733,7 +733,7 @@ nsDataObj::CopyMediumData(STGMEDIUM *aMediumDst, STGMEDIUM *aMediumSrc, LPFORMAT
}
break;
default:
return PR_FALSE;
return false;
}
if (stgmOut.pUnkForRelease)
@ -741,7 +741,7 @@ nsDataObj::CopyMediumData(STGMEDIUM *aMediumDst, STGMEDIUM *aMediumSrc, LPFORMAT
*aMediumDst = stgmOut;
return PR_TRUE;
return true;
}
//-----------------------------------------------------
@ -947,7 +947,7 @@ MangleTextToValidFilename(nsString & aText)
};
aText.StripChars(FILE_PATH_SEPARATOR FILE_ILLEGAL_CHARACTERS);
aText.CompressWhitespace(PR_TRUE, PR_TRUE);
aText.CompressWhitespace(true, true);
PRUint32 nameLen;
for (size_t n = 0; n < NS_ARRAY_LENGTH(forbiddenNames); ++n) {
nameLen = (PRUint32) strlen(forbiddenNames[n]);
@ -977,7 +977,7 @@ CreateFilenameFromTextA(nsString & aText, const char * aExtension,
// text empty.
MangleTextToValidFilename(aText);
if (aText.IsEmpty())
return PR_FALSE;
return false;
// repeatably call WideCharToMultiByte as long as the title doesn't fit in the buffer
// available to us. Continually reduce the length of the source title until the MBCS
@ -995,11 +995,11 @@ CreateFilenameFromTextA(nsString & aText, const char * aExtension,
while (currLen == 0 && textLen > 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER);
if (currLen > 0 && textLen > 0) {
strcpy(&aFilename[currLen], aExtension);
return PR_TRUE;
return true;
}
else {
// empty names aren't permitted
return PR_FALSE;
return false;
}
}
@ -1012,14 +1012,14 @@ CreateFilenameFromTextW(nsString & aText, const wchar_t * aExtension,
// text empty.
MangleTextToValidFilename(aText);
if (aText.IsEmpty())
return PR_FALSE;
return false;
const int extensionLen = wcslen(aExtension);
if (aText.Length() + extensionLen + 1 > aFilenameLen)
aText.Truncate(aFilenameLen - extensionLen - 1);
wcscpy(&aFilename[0], aText.get());
wcscpy(&aFilename[aText.Length()], aExtension);
return PR_TRUE;
return true;
}
#define PAGEINFO_PROPERTIES "chrome://navigator/locale/pageInfo.properties"
@ -1030,13 +1030,13 @@ GetLocalizedString(const PRUnichar * aName, nsXPIDLString & aString)
nsCOMPtr<nsIStringBundleService> stringService =
mozilla::services::GetStringBundleService();
if (!stringService)
return PR_FALSE;
return false;
nsCOMPtr<nsIStringBundle> stringBundle;
nsresult rv = stringService->CreateBundle(PAGEINFO_PROPERTIES,
getter_AddRefs(stringBundle));
if (NS_FAILED(rv))
return PR_FALSE;
return false;
rv = stringBundle->GetStringFromName(aName, getter_Copies(aString));
return NS_SUCCEEDED(rv);
@ -1180,12 +1180,12 @@ nsDataObj :: GetFileContentsInternetShortcut ( FORMATETC& aFE, STGMEDIUM& aSTG )
bool nsDataObj :: IsFlavourPresent(const char *inFlavour)
{
bool retval = false;
NS_ENSURE_TRUE(mTransferable, PR_FALSE);
NS_ENSURE_TRUE(mTransferable, false);
// get the list of flavors available in the transferable
nsCOMPtr<nsISupportsArray> flavorList;
mTransferable->FlavorsTransferableCanExport(getter_AddRefs(flavorList));
NS_ENSURE_TRUE(flavorList, PR_FALSE);
NS_ENSURE_TRUE(flavorList, false);
// try to find requested flavour
PRUint32 cnt;
@ -1198,7 +1198,7 @@ bool nsDataObj :: IsFlavourPresent(const char *inFlavour)
nsCAutoString flavorStr;
currentFlavor->GetData(flavorStr);
if (flavorStr.Equals(inFlavour)) {
retval = PR_TRUE; // found it!
retval = true; // found it!
break;
}
}
@ -2143,7 +2143,7 @@ void nsDataObj::RemoveTempFile(nsITimer* aTimer, void* aClosure)
{
nsDataObj *timedDataObj = static_cast<nsDataObj *>(aClosure);
if (timedDataObj->mCachedTempFile) {
timedDataObj->mCachedTempFile->Remove(PR_FALSE);
timedDataObj->mCachedTempFile->Remove(false);
timedDataObj->mCachedTempFile = NULL;
}
timedDataObj->Release();

94
widget/src/windows/nsDeviceContextSpecWin.cpp
View File

@ -125,47 +125,47 @@ typedef struct {
// There are around 40 default print sizes defined by Windows
const NativePaperSizes kPaperSizes[] = {
{DMPAPER_LETTER, 8.5, 11.0, PR_TRUE},
{DMPAPER_LEGAL, 8.5, 14.0, PR_TRUE},
{DMPAPER_A4, 210.0, 297.0, PR_FALSE},
{DMPAPER_B4, 250.0, 354.0, PR_FALSE},
{DMPAPER_B5, 182.0, 257.0, PR_FALSE},
{DMPAPER_TABLOID, 11.0, 17.0, PR_TRUE},
{DMPAPER_LEDGER, 17.0, 11.0, PR_TRUE},
{DMPAPER_STATEMENT, 5.5, 8.5, PR_TRUE},
{DMPAPER_EXECUTIVE, 7.25, 10.5, PR_TRUE},
{DMPAPER_A3, 297.0, 420.0, PR_FALSE},
{DMPAPER_A5, 148.0, 210.0, PR_FALSE},
{DMPAPER_CSHEET, 17.0, 22.0, PR_TRUE},
{DMPAPER_DSHEET, 22.0, 34.0, PR_TRUE},
{DMPAPER_ESHEET, 34.0, 44.0, PR_TRUE},
{DMPAPER_LETTERSMALL, 8.5, 11.0, PR_TRUE},
{DMPAPER_A4SMALL, 210.0, 297.0, PR_FALSE},
{DMPAPER_FOLIO, 8.5, 13.0, PR_TRUE},
{DMPAPER_QUARTO, 215.0, 275.0, PR_FALSE},
{DMPAPER_10X14, 10.0, 14.0, PR_TRUE},
{DMPAPER_11X17, 11.0, 17.0, PR_TRUE},
{DMPAPER_NOTE, 8.5, 11.0, PR_TRUE},
{DMPAPER_ENV_9, 3.875, 8.875, PR_TRUE},
{DMPAPER_ENV_10, 40.125, 9.5, PR_TRUE},
{DMPAPER_ENV_11, 4.5, 10.375, PR_TRUE},
{DMPAPER_ENV_12, 4.75, 11.0, PR_TRUE},
{DMPAPER_ENV_14, 5.0, 11.5, PR_TRUE},
{DMPAPER_ENV_DL, 110.0, 220.0, PR_FALSE},
{DMPAPER_ENV_C5, 162.0, 229.0, PR_FALSE},
{DMPAPER_ENV_C3, 324.0, 458.0, PR_FALSE},
{DMPAPER_ENV_C4, 229.0, 324.0, PR_FALSE},
{DMPAPER_ENV_C6, 114.0, 162.0, PR_FALSE},
{DMPAPER_ENV_C65, 114.0, 229.0, PR_FALSE},
{DMPAPER_ENV_B4, 250.0, 353.0, PR_FALSE},
{DMPAPER_ENV_B5, 176.0, 250.0, PR_FALSE},
{DMPAPER_ENV_B6, 176.0, 125.0, PR_FALSE},
{DMPAPER_ENV_ITALY, 110.0, 230.0, PR_FALSE},
{DMPAPER_ENV_MONARCH, 3.875, 7.5, PR_TRUE},
{DMPAPER_ENV_PERSONAL, 3.625, 6.5, PR_TRUE},
{DMPAPER_FANFOLD_US, 14.875, 11.0, PR_TRUE},
{DMPAPER_FANFOLD_STD_GERMAN, 8.5, 12.0, PR_TRUE},
{DMPAPER_FANFOLD_LGL_GERMAN, 8.5, 13.0, PR_TRUE},
{DMPAPER_LETTER, 8.5, 11.0, true},
{DMPAPER_LEGAL, 8.5, 14.0, true},
{DMPAPER_A4, 210.0, 297.0, false},
{DMPAPER_B4, 250.0, 354.0, false},
{DMPAPER_B5, 182.0, 257.0, false},
{DMPAPER_TABLOID, 11.0, 17.0, true},
{DMPAPER_LEDGER, 17.0, 11.0, true},
{DMPAPER_STATEMENT, 5.5, 8.5, true},
{DMPAPER_EXECUTIVE, 7.25, 10.5, true},
{DMPAPER_A3, 297.0, 420.0, false},
{DMPAPER_A5, 148.0, 210.0, false},
{DMPAPER_CSHEET, 17.0, 22.0, true},
{DMPAPER_DSHEET, 22.0, 34.0, true},
{DMPAPER_ESHEET, 34.0, 44.0, true},
{DMPAPER_LETTERSMALL, 8.5, 11.0, true},
{DMPAPER_A4SMALL, 210.0, 297.0, false},
{DMPAPER_FOLIO, 8.5, 13.0, true},
{DMPAPER_QUARTO, 215.0, 275.0, false},
{DMPAPER_10X14, 10.0, 14.0, true},
{DMPAPER_11X17, 11.0, 17.0, true},
{DMPAPER_NOTE, 8.5, 11.0, true},
{DMPAPER_ENV_9, 3.875, 8.875, true},
{DMPAPER_ENV_10, 40.125, 9.5, true},
{DMPAPER_ENV_11, 4.5, 10.375, true},
{DMPAPER_ENV_12, 4.75, 11.0, true},
{DMPAPER_ENV_14, 5.0, 11.5, true},
{DMPAPER_ENV_DL, 110.0, 220.0, false},
{DMPAPER_ENV_C5, 162.0, 229.0, false},
{DMPAPER_ENV_C3, 324.0, 458.0, false},
{DMPAPER_ENV_C4, 229.0, 324.0, false},
{DMPAPER_ENV_C6, 114.0, 162.0, false},
{DMPAPER_ENV_C65, 114.0, 229.0, false},
{DMPAPER_ENV_B4, 250.0, 353.0, false},
{DMPAPER_ENV_B5, 176.0, 250.0, false},
{DMPAPER_ENV_B6, 176.0, 125.0, false},
{DMPAPER_ENV_ITALY, 110.0, 230.0, false},
{DMPAPER_ENV_MONARCH, 3.875, 7.5, true},
{DMPAPER_ENV_PERSONAL, 3.625, 6.5, true},
{DMPAPER_FANFOLD_US, 14.875, 11.0, true},
{DMPAPER_FANFOLD_STD_GERMAN, 8.5, 12.0, true},
{DMPAPER_FANFOLD_LGL_GERMAN, 8.5, 13.0, true},
};
const PRInt32 kNumPaperSizes = 41;
@ -238,7 +238,7 @@ EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, bool& aIsFoun
for (DWORD i = 0; i < dwNumItems; i++ ) {
if (wcscmp(lpInfo[i].pPrinterName, aPrinterName) == 0) {
aIsFound = PR_TRUE;
aIsFound = true;
aIsFile = wcscmp(lpInfo[i].pPortName, L"FILE:") == 0;
break;
}
@ -253,7 +253,7 @@ static void
CheckForPrintToFileWithName(LPWSTR aPrinterName, bool& aIsFile)
{
bool isFound = false;
aIsFile = PR_FALSE;
aIsFile = false;
nsresult rv = EnumerateNativePrinters(PRINTER_ENUM_LOCAL, aPrinterName, isFound, aIsFile);
if (isFound) return;
@ -343,7 +343,7 @@ GetFileNameForPrintSettings(nsIPrintSettings* aPS)
bool isFile;
rv = localFile->IsFile(&isFile);
if (NS_SUCCEEDED(rv) && isFile) {
rv = localFile->Remove(PR_FALSE /* recursive delete */);
rv = localFile->Remove(false /* recursive delete */);
NS_ENSURE_SUCCESS(rv, rv);
}
}
@ -765,7 +765,7 @@ nsDeviceContextSpecWin::SetPrintSettingsFromDevMode(nsIPrintSettings* aPrintSett
if (aPrintSettings == nsnull) {
return NS_ERROR_FAILURE;
}
aPrintSettings->SetIsInitializedFromPrinter(PR_TRUE);
aPrintSettings->SetIsInitializedFromPrinter(true);
BOOL doingNumCopies = aDevMode->dmFields & DM_COPIES;
BOOL doingOrientation = aDevMode->dmFields & DM_ORIENTATION;
@ -790,7 +790,7 @@ nsDeviceContextSpecWin::SetPrintSettingsFromDevMode(nsIPrintSettings* aPrintSett
aPrintSettings->SetScaling(scale);
aDevMode->dmScale = 100;
// To turn this on you must change where the mPrt->mShrinkToFit is being set in the DocumentViewer
//aPrintSettings->SetShrinkToFit(PR_FALSE);
//aPrintSettings->SetShrinkToFit(false);
}
}
@ -814,7 +814,7 @@ nsDeviceContextSpecWin::SetPrintSettingsFromDevMode(nsIPrintSettings* aPrintSett
aPrintSettings->SetPaperHeight(kPaperSizes[i].mHeight);
aPrintSettings->SetPaperSizeUnit(kPaperSizes[i].mIsInches
?PRInt16(nsIPrintSettings::kPaperSizeInches):nsIPrintSettings::kPaperSizeMillimeters);
found = PR_TRUE;
found = true;
break;
}
}

34
widget/src/windows/nsDragService.cpp
View File

@ -81,7 +81,7 @@
//
//-------------------------------------------------------------------------
nsDragService::nsDragService()
: mNativeDragSrc(nsnull), mNativeDragTarget(nsnull), mDataObject(nsnull), mSentLocalDropEvent(PR_FALSE)
: mNativeDragSrc(nsnull), mNativeDragTarget(nsnull), mDataObject(nsnull), mSentLocalDropEvent(false)
{
}
@ -103,11 +103,11 @@ nsDragService::CreateDragImage(nsIDOMNode *aDOMNode,
SHDRAGIMAGE *psdi)
{
if (!psdi)
return PR_FALSE;
return false;
memset(psdi, 0, sizeof(SHDRAGIMAGE));
if (!aDOMNode)
return PR_FALSE;
return false;
// Prepare the drag image
nsIntRect dragRect;
@ -117,12 +117,12 @@ nsDragService::CreateDragImage(nsIDOMNode *aDOMNode,
mScreenX, mScreenY,
&dragRect, getter_AddRefs(surface), &pc);
if (!surface)
return PR_FALSE;
return false;
PRUint32 bmWidth = dragRect.width, bmHeight = dragRect.height;
if (bmWidth == 0 || bmHeight == 0)
return PR_FALSE;
return false;
psdi->crColorKey = CLR_NONE;
@ -130,11 +130,11 @@ nsDragService::CreateDragImage(nsIDOMNode *aDOMNode,
gfxIntSize(bmWidth, bmHeight),
gfxImageSurface::ImageFormatARGB32);
if (!imgSurface)
return PR_FALSE;
return false;
nsRefPtr<gfxContext> context = new gfxContext(imgSurface);
if (!context)
return PR_FALSE;
return false;
context->SetOperator(gfxContext::OPERATOR_SOURCE);
context->SetSource(surface);
@ -298,7 +298,7 @@ nsDragService::StartInvokingDragSession(IDataObject * aDataObj,
// XXX not sure why we bother to cache this, it can change during
// the drag
mDragAction = aActionType;
mSentLocalDropEvent = PR_FALSE;
mSentLocalDropEvent = false;
// Start dragging
StartDragSession();
@ -351,9 +351,9 @@ nsDragService::StartInvokingDragSession(IDataObject * aDataObj,
cpos.x = GET_X_LPARAM(pos);
cpos.y = GET_Y_LPARAM(pos);
SetDragEndPoint(nsIntPoint(cpos.x, cpos.y));
EndDragSession(PR_TRUE);
EndDragSession(true);
mDoingDrag = PR_FALSE;
mDoingDrag = false;
return DRAGDROP_S_DROP == res ? NS_OK : NS_ERROR_FAILURE;
}
@ -485,7 +485,7 @@ nsDragService::SetDroppedLocal()
{
// Sent from the native drag handler, letting us know
// a drop occurred within the application vs. outside of it.
mSentLocalDropEvent = PR_TRUE;
mSentLocalDropEvent = true;
return;
}
@ -501,7 +501,7 @@ nsDragService::IsDataFlavorSupported(const char *aDataFlavor, bool *_retval)
NS_WARNING("DO NOT USE THE text/plain DATA FLAVOR ANY MORE. USE text/unicode INSTEAD");
#endif
*_retval = PR_FALSE;
*_retval = false;
FORMATETC fe;
UINT format = 0;
@ -520,7 +520,7 @@ nsDragService::IsDataFlavorSupported(const char *aDataFlavor, bool *_retval)
for (PRUint32 i=0;i<cnt;++i) {
IDataObject * dataObj = dataObjCol->GetDataObjectAt(i);
if (S_OK == dataObj->QueryGetData(&fe))
*_retval = PR_TRUE; // found it!
*_retval = true; // found it!
}
}
} // if special collection object
@ -533,7 +533,7 @@ nsDragService::IsDataFlavorSupported(const char *aDataFlavor, bool *_retval)
SET_FORMATETC(fe, format, 0, DVASPECT_CONTENT, -1,
TYMED_HGLOBAL | TYMED_FILE | TYMED_GDI);
if (mDataObject->QueryGetData(&fe) == S_OK)
*_retval = PR_TRUE; // found it!
*_retval = true; // found it!
else {
// We haven't found the exact flavor the client asked for, but
// maybe we can still find it from something else that's on the
@ -546,7 +546,7 @@ nsDragService::IsDataFlavorSupported(const char *aDataFlavor, bool *_retval)
SET_FORMATETC(fe, format, 0, DVASPECT_CONTENT, -1,
TYMED_HGLOBAL | TYMED_FILE | TYMED_GDI);
if (mDataObject->QueryGetData(&fe) == S_OK)
*_retval = PR_TRUE; // found it!
*_retval = true; // found it!
}
else if (strcmp(aDataFlavor, kURLMime) == 0) {
// client asked for a url and it wasn't present, but if we
@ -556,7 +556,7 @@ nsDragService::IsDataFlavorSupported(const char *aDataFlavor, bool *_retval)
SET_FORMATETC(fe, format, 0, DVASPECT_CONTENT, -1,
TYMED_HGLOBAL | TYMED_FILE | TYMED_GDI);
if (mDataObject->QueryGetData(&fe) == S_OK)
*_retval = PR_TRUE; // found it!
*_retval = true; // found it!
}
} // else try again
}
@ -589,7 +589,7 @@ nsDragService::IsCollectionObject(IDataObject* inDataObj)
// ask the object if it supports it. If yes, we have a collection
// object
if (inDataObj->QueryGetData(&sFE) == S_OK)
isCollection = PR_TRUE;
isCollection = true;
return isCollection;

10
widget/src/windows/nsFilePicker.cpp
View File

@ -218,7 +218,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
if (mParentWidget) {
nsIWidget *tmp = mParentWidget;
nsWindow *parent = static_cast<nsWindow *>(tmp);
parent->SuppressBlurEvents(PR_TRUE);
parent->SuppressBlurEvents(true);
}
bool result = false;
@ -387,7 +387,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
// Don't follow shortcuts when saving a shortcut, this can be used
// to trick users (bug 271732)
NS_ConvertUTF16toUTF8 ext(mDefault);
ext.Trim(" .", PR_FALSE, PR_TRUE); // watch out for trailing space and dots
ext.Trim(" .", false, true); // watch out for trailing space and dots
ToLowerCase(ext);
if (StringEndsWith(ext, NS_LITERAL_CSTRING(".lnk")) ||
StringEndsWith(ext, NS_LITERAL_CSTRING(".pif")) ||
@ -411,12 +411,12 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
NS_ERROR("unsupported mode");
}
}
MOZ_SEH_EXCEPT(PR_TRUE) {
MOZ_SEH_EXCEPT(true) {
MessageBoxW(ofn.hwndOwner,
0,
L"The filepicker was unexpectedly closed by Windows.",
MB_ICONERROR);
result = PR_FALSE;
result = false;
}
if (result) {
@ -536,7 +536,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
if (mParentWidget) {
nsIWidget *tmp = mParentWidget;
nsWindow *parent = static_cast<nsWindow *>(tmp);
parent->SuppressBlurEvents(PR_FALSE);
parent->SuppressBlurEvents(false);
}
return NS_OK;

288
widget/src/windows/nsIMM32Handler.cpp
View File

@ -145,10 +145,10 @@ nsIMM32Handler::IsComposingWindow(nsWindow* aWindow)
nsIMM32Handler::IsTopLevelWindowOfComposition(nsWindow* aWindow)
{
if (!gIMM32Handler || !gIMM32Handler->mComposingWindow) {
return PR_FALSE;
return false;
}
HWND wnd = gIMM32Handler->mComposingWindow->GetWindowHandle();
return nsWindow::GetTopLevelHWND(wnd, PR_TRUE) == aWindow->GetWindowHandle();
return nsWindow::GetTopLevelHWND(wnd, true) == aWindow->GetWindowHandle();
}
/* static */ bool
@ -238,8 +238,8 @@ nsIMM32Handler::CanOptimizeKeyAndIMEMessages(MSG *aNextKeyOrIMEMessage)
nsIMM32Handler::nsIMM32Handler() :
mComposingWindow(nsnull), mCursorPosition(NO_IME_CARET), mCompositionStart(0),
mIsComposing(PR_FALSE), mIsComposingOnPlugin(PR_FALSE),
mNativeCaretIsCreated(PR_FALSE)
mIsComposing(false), mIsComposingOnPlugin(false),
mNativeCaretIsCreated(false)
{
PR_LOG(gIMM32Log, PR_LOG_ALWAYS, ("IMM32: nsIMM32Handler is created\n"));
}
@ -306,7 +306,7 @@ nsIMM32Handler::CommitComposition(nsWindow* aWindow, bool aForce)
}
if (associated) {
aWindow->AssociateDefaultIMC(PR_FALSE);
aWindow->AssociateDefaultIMC(false);
}
}
@ -336,7 +336,7 @@ nsIMM32Handler::CancelComposition(nsWindow* aWindow, bool aForce)
}
if (associated) {
aWindow->AssociateDefaultIMC(PR_FALSE);
aWindow->AssociateDefaultIMC(false);
}
}
@ -348,7 +348,7 @@ nsIMM32Handler::ProcessInputLangChangeMessage(nsWindow* aWindow,
bool &aEatMessage)
{
*aRetValue = 0;
aEatMessage = PR_FALSE;
aEatMessage = false;
// We don't need to create the instance of the handler here.
if (gIMM32Handler) {
aEatMessage = gIMM32Handler->OnInputLangChange(aWindow, wParam, lParam);
@ -359,7 +359,7 @@ nsIMM32Handler::ProcessInputLangChangeMessage(nsWindow* aWindow,
Terminate();
// Don't return as "processed", the messages should be processed on nsWindow
// too.
return PR_FALSE;
return false;
}
/* static */ bool
@ -383,7 +383,7 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
case WM_IME_SETCONTEXT:
// For safety, we should reset sIsIMEOpening when we receive unexpected
// message.
sIsIMEOpening = PR_FALSE;
sIsIMEOpening = false;
}
}
@ -401,15 +401,15 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
case WM_RBUTTONDOWN: {
// We don't need to create the instance of the handler here.
if (!gIMM32Handler)
return PR_FALSE;
return false;
if (!gIMM32Handler->OnMouseEvent(aWindow, lParam,
msg == WM_LBUTTONDOWN ? IMEMOUSE_LDOWN :
msg == WM_MBUTTONDOWN ? IMEMOUSE_MDOWN :
IMEMOUSE_RDOWN)) {
return PR_FALSE;
return false;
}
aEatMessage = PR_FALSE;
return PR_TRUE;
aEatMessage = false;
return true;
}
case WM_INPUTLANGCHANGE:
return ProcessInputLangChangeMessage(aWindow, wParam, lParam,
@ -417,37 +417,37 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
case WM_IME_STARTCOMPOSITION:
EnsureHandlerInstance();
aEatMessage = gIMM32Handler->OnIMEStartComposition(aWindow);
return PR_TRUE;
return true;
case WM_IME_COMPOSITION:
EnsureHandlerInstance();
aEatMessage = gIMM32Handler->OnIMEComposition(aWindow, wParam, lParam);
return PR_TRUE;
return true;
case WM_IME_ENDCOMPOSITION:
EnsureHandlerInstance();
aEatMessage = gIMM32Handler->OnIMEEndComposition(aWindow);
return PR_TRUE;
return true;
case WM_IME_CHAR:
aEatMessage = OnIMEChar(aWindow, wParam, lParam);
return PR_TRUE;
return true;
case WM_IME_NOTIFY:
aEatMessage = OnIMENotify(aWindow, wParam, lParam);
return PR_TRUE;
return true;
case WM_IME_REQUEST:
EnsureHandlerInstance();
aEatMessage =
gIMM32Handler->OnIMERequest(aWindow, wParam, lParam, aRetValue);
return PR_TRUE;
return true;
case WM_IME_SELECT:
aEatMessage = OnIMESelect(aWindow, wParam, lParam);
return PR_TRUE;
return true;
case WM_IME_SETCONTEXT:
aEatMessage = OnIMESetContext(aWindow, wParam, lParam, aRetValue);
return PR_TRUE;
return true;
case WM_KEYDOWN:
return OnKeyDownEvent(aWindow, wParam, lParam, aEatMessage);
case WM_CHAR:
if (!gIMM32Handler) {
return PR_FALSE;
return false;
}
aEatMessage = gIMM32Handler->OnChar(aWindow, wParam, lParam);
// If we eat this message, we should return "processed", otherwise,
@ -455,7 +455,7 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
// "not processed" at that time.
return aEatMessage;
default:
return PR_FALSE;
return false;
};
}
@ -466,42 +466,42 @@ nsIMM32Handler::ProcessMessageForPlugin(nsWindow* aWindow, UINT msg,
bool &aEatMessage)
{
*aRetValue = 0;
aEatMessage = PR_FALSE;
aEatMessage = false;
switch (msg) {
case WM_INPUTLANGCHANGEREQUEST:
case WM_INPUTLANGCHANGE:
aWindow->DispatchPluginEvent(msg, wParam, lParam, PR_FALSE);
aWindow->DispatchPluginEvent(msg, wParam, lParam, false);
return ProcessInputLangChangeMessage(aWindow, wParam, lParam,
aRetValue, aEatMessage);
case WM_IME_COMPOSITION:
EnsureHandlerInstance();
aEatMessage =
gIMM32Handler->OnIMECompositionOnPlugin(aWindow, wParam, lParam);
return PR_TRUE;
return true;
case WM_IME_STARTCOMPOSITION:
EnsureHandlerInstance();
aEatMessage =
gIMM32Handler->OnIMEStartCompositionOnPlugin(aWindow, wParam, lParam);
return PR_TRUE;
return true;
case WM_IME_ENDCOMPOSITION:
EnsureHandlerInstance();
aEatMessage =
gIMM32Handler->OnIMEEndCompositionOnPlugin(aWindow, wParam, lParam);
return PR_TRUE;
return true;
case WM_IME_CHAR:
EnsureHandlerInstance();
aEatMessage =
gIMM32Handler->OnIMECharOnPlugin(aWindow, wParam, lParam);
return PR_TRUE;
return true;
case WM_IME_SETCONTEXT:
aEatMessage = OnIMESetContextOnPlugin(aWindow, wParam, lParam, aRetValue);
return PR_TRUE;
return true;
case WM_IME_NOTIFY:
if (wParam == IMN_SETOPENSTATUS) {
// finished being opening
sIsIMEOpening = PR_FALSE;
sIsIMEOpening = false;
}
return PR_FALSE;
return false;
case WM_KEYDOWN:
if (wParam == VK_PROCESSKEY) {
// If we receive when IME isn't open, it means IME is opening right now.
@ -509,24 +509,24 @@ nsIMM32Handler::ProcessMessageForPlugin(nsWindow* aWindow, UINT msg,
sIsIMEOpening = IMEContext.IsValid() &&
::ImmGetOpenStatus(IMEContext.get());
}
return PR_FALSE;
return false;
case WM_CHAR:
if (!gIMM32Handler) {
return PR_FALSE;
return false;
}
aEatMessage =
gIMM32Handler->OnCharOnPlugin(aWindow, wParam, lParam);
return PR_FALSE; // is going to be handled by nsWindow.
return false; // is going to be handled by nsWindow.
case WM_IME_COMPOSITIONFULL:
case WM_IME_CONTROL:
case WM_IME_KEYDOWN:
case WM_IME_KEYUP:
case WM_IME_REQUEST:
case WM_IME_SELECT:
aEatMessage = aWindow->DispatchPluginEvent(msg, wParam, lParam, PR_FALSE);
return PR_TRUE;
aEatMessage = aWindow->DispatchPluginEvent(msg, wParam, lParam, false);
return true;
}
return PR_FALSE;
return false;
}
/****************************************************************************
@ -549,7 +549,7 @@ nsIMM32Handler::OnInputLangChange(nsWindow* aWindow,
HandleEndComposition(aWindow);
}
return PR_FALSE;
return false;
}
bool
@ -609,7 +609,7 @@ nsIMM32Handler::OnIMEEndComposition(nsWindow* aWindow)
mCompositionString.Truncate();
nsIMEContext IMEContext(aWindow->GetWindowHandle());
DispatchTextEvent(aWindow, IMEContext, PR_FALSE);
DispatchTextEvent(aWindow, IMEContext, false);
HandleEndComposition(aWindow);
@ -631,7 +631,7 @@ nsIMM32Handler::OnIMEChar(nsWindow* aWindow,
// processed in nsWindow::OnIMEComposition already.
// We need to return TRUE here so that Windows don't send two WM_CHAR msgs
return PR_TRUE;
return true;
}
/* static */ bool
@ -642,7 +642,7 @@ nsIMM32Handler::OnIMECompositionFull(nsWindow* aWindow)
aWindow->GetWindowHandle()));
// not implement yet
return PR_FALSE;
return false;
}
/* static */ bool
@ -703,7 +703,7 @@ nsIMM32Handler::OnIMENotify(nsWindow* aWindow,
aWindow->GetWindowHandle()));
break;
case IMN_SETOPENSTATUS:
sIsIMEOpening = PR_FALSE;
sIsIMEOpening = false;
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: OnIMENotify, hWnd=%08x, IMN_SETOPENSTATUS\n",
aWindow->GetWindowHandle()));
@ -727,7 +727,7 @@ nsIMM32Handler::OnIMENotify(nsWindow* aWindow,
#endif // PR_LOGGING
if (::GetKeyState(NS_VK_ALT) >= 0) {
return PR_FALSE;
return false;
}
// XXXmnakano Following code was added by bug 28852 (Key combo to trun ON/OFF
@ -738,7 +738,7 @@ nsIMM32Handler::OnIMENotify(nsWindow* aWindow,
// keypress event. So, we should find another way for the bug.
// add hacky code here
nsModifierKeyState modKeyState(PR_FALSE, PR_FALSE, PR_TRUE);
nsModifierKeyState modKeyState(false, false, true);
aWindow->DispatchKeyEvent(NS_KEY_PRESS, 0, nsnull, 192, nsnull, modKeyState);
sIsStatusChanged = sIsStatusChanged || (wParam == IMN_SETOPENSTATUS);
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
@ -746,7 +746,7 @@ nsIMM32Handler::OnIMENotify(nsWindow* aWindow,
sIsStatusChanged ? "TRUE" : "FALSE"));
// not implement yet
return PR_FALSE;
return false;
}
bool
@ -775,7 +775,7 @@ nsIMM32Handler::OnIMERequest(nsWindow* aWindow,
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: OnIMERequest, hWnd=%08x, wParam=%08x\n",
aWindow->GetWindowHandle(), wParam));
return PR_FALSE;
return false;
}
}
@ -789,7 +789,7 @@ nsIMM32Handler::OnIMESelect(nsWindow* aWindow,
aWindow->GetWindowHandle(), wParam, lParam));
// not implement yet
return PR_FALSE;
return false;
}
/* static */ bool
@ -812,7 +812,7 @@ nsIMM32Handler::OnIMESetContext(nsWindow* aWindow,
if (IsTopLevelWindowOfComposition(aWindow)) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: OnIMESetContext, hWnd=%08x is top level window\n"));
return PR_FALSE;
return false;
}
// When IME context is activating on another window,
@ -839,10 +839,10 @@ nsIMM32Handler::OnIMESetContext(nsWindow* aWindow,
// Cancel composition on the new window if we committed our composition on
// another window.
if (cancelComposition) {
CancelComposition(aWindow, PR_TRUE);
CancelComposition(aWindow, true);
}
return PR_TRUE;
return true;
}
bool
@ -851,7 +851,7 @@ nsIMM32Handler::OnChar(nsWindow* aWindow,
LPARAM lParam)
{
if (IsIMECharRecordsEmpty()) {
return PR_FALSE;
return false;
}
WPARAM recWParam;
LPARAM recLParam;
@ -866,12 +866,12 @@ nsIMM32Handler::OnChar(nsWindow* aWindow,
// of course, this shouldn't happen.
if (recWParam != wParam || recLParam != lParam) {
ResetIMECharRecords();
return PR_FALSE;
return false;
}
// Eat the char message which is caused by WM_IME_CHAR because we should
// have processed the IME messages, so, this message could be come from
// a windowless plug-in.
return PR_TRUE;
return true;
}
/****************************************************************************
@ -886,11 +886,11 @@ nsIMM32Handler::OnIMEStartCompositionOnPlugin(nsWindow* aWindow,
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: OnIMEStartCompositionOnPlugin, hWnd=%08x, mIsComposingOnPlugin=%s\n",
aWindow->GetWindowHandle(), mIsComposingOnPlugin ? "TRUE" : "FALSE"));
mIsComposingOnPlugin = PR_TRUE;
mIsComposingOnPlugin = true;
mComposingWindow = aWindow;
bool handled =
aWindow->DispatchPluginEvent(WM_IME_STARTCOMPOSITION, wParam, lParam,
PR_FALSE);
false);
return handled;
}
@ -912,16 +912,16 @@ nsIMM32Handler::OnIMECompositionOnPlugin(nsWindow* aWindow,
lParam & GCS_CURSORPOS ? "YES" : "no"));
// We should end composition if there is a committed string.
if (IS_COMMITTING_LPARAM(lParam)) {
mIsComposingOnPlugin = PR_FALSE;
mIsComposingOnPlugin = false;
mComposingWindow = nsnull;
}
// Continue composition if there is still a string being composed.
if (IS_COMPOSING_LPARAM(lParam)) {
mIsComposingOnPlugin = PR_TRUE;
mIsComposingOnPlugin = true;
mComposingWindow = aWindow;
}
bool handled =
aWindow->DispatchPluginEvent(WM_IME_COMPOSITION, wParam, lParam, PR_TRUE);
aWindow->DispatchPluginEvent(WM_IME_COMPOSITION, wParam, lParam, true);
return handled;
}
@ -934,11 +934,11 @@ nsIMM32Handler::OnIMEEndCompositionOnPlugin(nsWindow* aWindow,
("IMM32: OnIMEEndCompositionOnPlugin, hWnd=%08x, mIsComposingOnPlugin=%s\n",
aWindow->GetWindowHandle(), mIsComposingOnPlugin ? "TRUE" : "FALSE"));
mIsComposingOnPlugin = PR_FALSE;
mIsComposingOnPlugin = false;
mComposingWindow = nsnull;
bool handled =
aWindow->DispatchPluginEvent(WM_IME_ENDCOMPOSITION, wParam, lParam,
PR_FALSE);
false);
return handled;
}
@ -952,7 +952,7 @@ nsIMM32Handler::OnIMECharOnPlugin(nsWindow* aWindow,
aWindow->GetWindowHandle(), wParam, lParam));
bool handled =
aWindow->DispatchPluginEvent(WM_IME_CHAR, wParam, lParam, PR_TRUE);
aWindow->DispatchPluginEvent(WM_IME_CHAR, wParam, lParam, true);
if (!handled) {
// Record the WM_CHAR messages which are going to be coming.
@ -986,7 +986,7 @@ nsIMM32Handler::OnIMESetContextOnPlugin(nsWindow* aWindow,
// Dispatch message to the plug-in.
// XXX When a windowless plug-in gets focus, we should send
// WM_IME_SETCONTEXT
aWindow->DispatchPluginEvent(WM_IME_SETCONTEXT, wParam, lParam, PR_FALSE);
aWindow->DispatchPluginEvent(WM_IME_SETCONTEXT, wParam, lParam, false);
// We should send WM_IME_SETCONTEXT to the DefWndProc here. It shouldn't
// be received on ancestor windows, see OnIMESetContext() for the detail.
@ -996,7 +996,7 @@ nsIMM32Handler::OnIMESetContextOnPlugin(nsWindow* aWindow,
// Don't synchronously dispatch the pending events when we receive
// WM_IME_SETCONTEXT because we get it during plugin destruction.
// (bug 491848)
return PR_TRUE;
return true;
}
bool
@ -1005,7 +1005,7 @@ nsIMM32Handler::OnCharOnPlugin(nsWindow* aWindow,
LPARAM lParam)
{
if (IsIMECharRecordsEmpty()) {
return PR_FALSE;
return false;
}
WPARAM recWParam;
@ -1023,7 +1023,7 @@ nsIMM32Handler::OnCharOnPlugin(nsWindow* aWindow,
ResetIMECharRecords();
}
// WM_CHAR on plug-in is always handled by nsWindow.
return PR_FALSE;
return false;
}
/****************************************************************************
@ -1039,7 +1039,7 @@ nsIMM32Handler::HandleStartComposition(nsWindow* aWindow,
NS_PRECONDITION(!aWindow->PluginHasFocus(),
"HandleStartComposition should not be called when a plug-in has focus");
nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, aWindow);
nsQueryContentEvent selection(true, NS_QUERY_SELECTED_TEXT, aWindow);
nsIntPoint point(0, 0);
aWindow->InitEvent(selection, &point);
aWindow->DispatchWindowEvent(&selection);
@ -1052,13 +1052,13 @@ nsIMM32Handler::HandleStartComposition(nsWindow* aWindow,
mCompositionStart = selection.mReply.mOffset;
mLastDispatchedCompositionString.Truncate();
nsCompositionEvent event(PR_TRUE, NS_COMPOSITION_START, aWindow);
nsCompositionEvent event(true, NS_COMPOSITION_START, aWindow);
aWindow->InitEvent(event, &point);
aWindow->DispatchWindowEvent(&event);
SetIMERelatedWindowsPos(aWindow, aIMEContext);
mIsComposing = PR_TRUE;
mIsComposing = true;
mComposingWindow = aWindow;
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
@ -1113,7 +1113,7 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
}
mCompositionString.Truncate();
DispatchTextEvent(aWindow, aIMEContext, PR_FALSE);
DispatchTextEvent(aWindow, aIMEContext, false);
return ShouldDrawCompositionStringOurselves();
}
@ -1134,7 +1134,7 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleComposition, GCS_RESULTSTR\n"));
DispatchTextEvent(aWindow, aIMEContext, PR_FALSE);
DispatchTextEvent(aWindow, aIMEContext, false);
HandleEndComposition(aWindow);
if (!IS_COMPOSING_LPARAM(lParam)) {
@ -1183,7 +1183,7 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
if (clauseArrayLength > 0) {
nsresult rv = EnsureClauseArray(clauseArrayLength);
NS_ENSURE_SUCCESS(rv, PR_FALSE);
NS_ENSURE_SUCCESS(rv, false);
// Intelligent ABC IME (Simplified Chinese IME, the code page is 936)
// will crash in ImmGetCompositionStringW for GCS_COMPCLAUSE (bug 424663).
@ -1250,7 +1250,7 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
if (attrArrayLength > 0) {
nsresult rv = EnsureAttributeArray(attrArrayLength);
NS_ENSURE_SUCCESS(rv, PR_FALSE);
NS_ENSURE_SUCCESS(rv, false);
attrArrayLength =
::ImmGetCompositionStringW(aIMEContext.get(), GCS_COMPATTR,
mAttributeArray.Elements(),
@ -1305,19 +1305,19 @@ nsIMM32Handler::HandleEndComposition(nsWindow* aWindow)
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleEndComposition\n"));
nsCompositionEvent event(PR_TRUE, NS_COMPOSITION_END, aWindow);
nsCompositionEvent event(true, NS_COMPOSITION_END, aWindow);
nsIntPoint point(0, 0);
if (mNativeCaretIsCreated) {
::DestroyCaret();
mNativeCaretIsCreated = PR_FALSE;
mNativeCaretIsCreated = false;
}
aWindow->InitEvent(event, &point);
// The last dispatched composition string must be the committed string.
event.data = mLastDispatchedCompositionString;
aWindow->DispatchWindowEvent(&event);
mIsComposing = PR_FALSE;
mIsComposing = false;
mComposingWindow = nsnull;
mLastDispatchedCompositionString.Truncate();
}
@ -1348,14 +1348,14 @@ nsIMM32Handler::HandleReconvert(nsWindow* aWindow,
*oResult = 0;
RECONVERTSTRING* pReconv = reinterpret_cast<RECONVERTSTRING*>(lParam);
nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, aWindow);
nsQueryContentEvent selection(true, NS_QUERY_SELECTED_TEXT, aWindow);
nsIntPoint point(0, 0);
aWindow->InitEvent(selection, &point);
aWindow->DispatchWindowEvent(&selection);
if (!selection.mSucceeded) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleReconvert, FAILED (NS_QUERY_SELECTED_TEXT)\n"));
return PR_FALSE;
return false;
}
PRUint32 len = selection.mReply.mString.Length();
@ -1366,20 +1366,20 @@ nsIMM32Handler::HandleReconvert(nsWindow* aWindow,
if (len == 0) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleReconvert, There are not selected text\n"));
return PR_FALSE;
return false;
}
*oResult = needSize;
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleReconvert, SUCCEEDED result=%ld\n",
*oResult));
return PR_TRUE;
return true;
}
if (pReconv->dwSize < needSize) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleReconvert, FAILED pReconv->dwSize=%ld, needSize=%ld\n",
pReconv->dwSize, needSize));
return PR_FALSE;
return false;
}
*oResult = needSize;
@ -1401,7 +1401,7 @@ nsIMM32Handler::HandleReconvert(nsWindow* aWindow,
*oResult));
DumpReconvertString(pReconv);
return PR_TRUE;
return true;
}
bool
@ -1410,41 +1410,41 @@ nsIMM32Handler::HandleQueryCharPosition(nsWindow* aWindow,
LRESULT *oResult)
{
PRUint32 len = mIsComposing ? mCompositionString.Length() : 0;
*oResult = PR_FALSE;
*oResult = false;
IMECHARPOSITION* pCharPosition = reinterpret_cast<IMECHARPOSITION*>(lParam);
if (!pCharPosition) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleQueryCharPosition, FAILED (pCharPosition is null)\n"));
return PR_FALSE;
return false;
}
if (pCharPosition->dwSize < sizeof(IMECHARPOSITION)) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleReconvert, FAILED, pCharPosition->dwSize=%ld, sizeof(IMECHARPOSITION)=%ld\n",
pCharPosition->dwSize, sizeof(IMECHARPOSITION)));
return PR_FALSE;
return false;
}
if (::GetFocus() != aWindow->GetWindowHandle()) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleReconvert, FAILED, ::GetFocus()=%08x, OurWindowHandle=%08x\n",
::GetFocus(), aWindow->GetWindowHandle()));
return PR_FALSE;
return false;
}
if (pCharPosition->dwCharPos > len) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleQueryCharPosition, FAILED, pCharPosition->dwCharPos=%ld, len=%ld\n",
pCharPosition->dwCharPos, len));
return PR_FALSE;
return false;
}
nsIntRect r;
bool ret =
GetCharacterRectOfSelectedTextAt(aWindow, pCharPosition->dwCharPos, r);
NS_ENSURE_TRUE(ret, PR_FALSE);
NS_ENSURE_TRUE(ret, false);
nsIntRect screenRect;
// We always need top level window that is owner window of the popup window
// even if the content of the popup window has focus.
ResolveIMECaretPos(aWindow->GetTopLevelWindow(PR_FALSE),
ResolveIMECaretPos(aWindow->GetTopLevelWindow(false),
r, nsnull, screenRect);
pCharPosition->pt.x = screenRect.x;
pCharPosition->pt.y = screenRect.y;
@ -1458,7 +1458,7 @@ nsIMM32Handler::HandleQueryCharPosition(nsWindow* aWindow,
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleQueryCharPosition, SUCCEEDED\n"));
return PR_TRUE;
return true;
}
bool
@ -1476,13 +1476,13 @@ nsIMM32Handler::HandleDocumentFeed(nsWindow* aWindow,
PRInt32 targetOffset, targetLength;
if (!hasCompositionString) {
nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, aWindow);
nsQueryContentEvent selection(true, NS_QUERY_SELECTED_TEXT, aWindow);
aWindow->InitEvent(selection, &point);
aWindow->DispatchWindowEvent(&selection);
if (!selection.mSucceeded) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleDocumentFeed, FAILED (NS_QUERY_SELECTED_TEXT)\n"));
return PR_FALSE;
return false;
}
targetOffset = PRInt32(selection.mReply.mOffset);
targetLength = PRInt32(selection.mReply.mString.Length());
@ -1498,32 +1498,32 @@ nsIMM32Handler::HandleDocumentFeed(nsWindow* aWindow,
targetOffset + targetLength < 0) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleDocumentFeed, FAILED (The selection is out of range)\n"));
return PR_FALSE;
return false;
}
// Get all contents of the focused editor.
nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, aWindow);
nsQueryContentEvent textContent(true, NS_QUERY_TEXT_CONTENT, aWindow);
textContent.InitForQueryTextContent(0, PR_UINT32_MAX);
aWindow->InitEvent(textContent, &point);
aWindow->DispatchWindowEvent(&textContent);
if (!textContent.mSucceeded) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleDocumentFeed, FAILED (NS_QUERY_TEXT_CONTENT)\n"));
return PR_FALSE;
return false;
}
nsAutoString str(textContent.mReply.mString);
if (targetOffset > PRInt32(str.Length())) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleDocumentFeed, FAILED (The caret offset is invalid)\n"));
return PR_FALSE;
return false;
}
// Get the focused paragraph, we decide that it starts from the previous CRLF
// (or start of the editor) to the next one (or the end of the editor).
PRInt32 paragraphStart = str.RFind("\n", PR_FALSE, targetOffset, -1) + 1;
PRInt32 paragraphStart = str.RFind("\n", false, targetOffset, -1) + 1;
PRInt32 paragraphEnd =
str.Find("\r", PR_FALSE, targetOffset + targetLength, -1);
str.Find("\r", false, targetOffset + targetLength, -1);
if (paragraphEnd < 0) {
paragraphEnd = str.Length();
}
@ -1538,14 +1538,14 @@ nsIMM32Handler::HandleDocumentFeed(nsWindow* aWindow,
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleDocumentFeed, SUCCEEDED result=%ld\n",
*oResult));
return PR_TRUE;
return true;
}
if (pReconv->dwSize < needSize) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleDocumentFeed, FAILED pReconv->dwSize=%ld, needSize=%ld\n",
pReconv->dwSize, needSize));
return PR_FALSE;
return false;
}
// Fill reconvert struct
@ -1561,7 +1561,7 @@ nsIMM32Handler::HandleDocumentFeed(nsWindow* aWindow,
if (!GetTargetClauseRange(&offset, &length)) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: HandleDocumentFeed, FAILED, by GetTargetClauseRange\n"));
return PR_FALSE;
return false;
}
pReconv->dwTargetStrLen = length;
pReconv->dwTargetStrOffset = (offset - paragraphStart) * sizeof(WCHAR);
@ -1584,14 +1584,14 @@ nsIMM32Handler::HandleDocumentFeed(nsWindow* aWindow,
*oResult));
DumpReconvertString(pReconv);
return PR_TRUE;
return true;
}
bool
nsIMM32Handler::CommitCompositionOnPreviousWindow(nsWindow* aWindow)
{
if (!mComposingWindow || mComposingWindow == aWindow) {
return PR_FALSE;
return false;
}
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
@ -1603,9 +1603,9 @@ nsIMM32Handler::CommitCompositionOnPreviousWindow(nsWindow* aWindow)
nsIMEContext IMEContext(mComposingWindow->GetWindowHandle());
NS_ASSERTION(IMEContext.IsValid(), "IME context must be valid");
DispatchTextEvent(mComposingWindow, IMEContext, PR_FALSE);
DispatchTextEvent(mComposingWindow, IMEContext, false);
HandleEndComposition(mComposingWindow);
return PR_TRUE;
return true;
}
// XXX When plug-in has composition, we should commit composition on the
@ -1629,7 +1629,7 @@ PlatformToNSAttr(PRUint8 aAttr)
case ATTR_TARGET_CONVERTED:
return NS_TEXTRANGE_SELECTEDCONVERTEDTEXT;
default:
NS_ASSERTION(PR_FALSE, "unknown attribute");
NS_ASSERTION(false, "unknown attribute");
return NS_TEXTRANGE_CARETPOSITION;
}
}
@ -1679,7 +1679,7 @@ nsIMM32Handler::DispatchTextEvent(nsWindow* aWindow,
nsIntPoint point(0, 0);
if (mCompositionString != mLastDispatchedCompositionString) {
nsCompositionEvent compositionUpdate(PR_TRUE, NS_COMPOSITION_UPDATE,
nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
aWindow);
aWindow->InitEvent(compositionUpdate, &point);
compositionUpdate.data = mCompositionString;
@ -1693,7 +1693,7 @@ nsIMM32Handler::DispatchTextEvent(nsWindow* aWindow,
SetIMERelatedWindowsPos(aWindow, aIMEContext);
}
nsTextEvent event(PR_TRUE, NS_TEXT_TEXT, aWindow);
nsTextEvent event(true, NS_TEXT_TEXT, aWindow);
aWindow->InitEvent(event, &point);
@ -1710,7 +1710,7 @@ nsIMM32Handler::DispatchTextEvent(nsWindow* aWindow,
nsModifierKeyState modKeyState;
event.isShift = modKeyState.mIsShiftDown;
event.isControl = modKeyState.mIsControlDown;
event.isMeta = PR_FALSE;
event.isMeta = false;
event.isAlt = modKeyState.mIsAltDown;
aWindow->DispatchWindowEvent(&event);
@ -1815,9 +1815,9 @@ nsIMM32Handler::GetCompositionString(const nsIMEContext &aIMEContext,
bool
nsIMM32Handler::GetTargetClauseRange(PRUint32 *aOffset, PRUint32 *aLength)
{
NS_ENSURE_TRUE(aOffset, PR_FALSE);
NS_ENSURE_TRUE(mIsComposing, PR_FALSE);
NS_ENSURE_TRUE(ShouldDrawCompositionStringOurselves(), PR_FALSE);
NS_ENSURE_TRUE(aOffset, false);
NS_ENSURE_TRUE(mIsComposing, false);
NS_ENSURE_TRUE(ShouldDrawCompositionStringOurselves(), false);
bool found = false;
*aOffset = mCompositionStart;
@ -1825,20 +1825,20 @@ nsIMM32Handler::GetTargetClauseRange(PRUint32 *aOffset, PRUint32 *aLength)
if (mAttributeArray[i] == ATTR_TARGET_NOTCONVERTED ||
mAttributeArray[i] == ATTR_TARGET_CONVERTED) {
*aOffset = mCompositionStart + i;
found = PR_TRUE;
found = true;
break;
}
}
if (!aLength) {
return PR_TRUE;
return true;
}
if (!found) {
// The all composition string is targetted when there is no ATTR_TARGET_*
// clause. E.g., there is only ATTR_INPUT
*aLength = mCompositionString.Length();
return PR_TRUE;
return true;
}
PRUint32 offsetInComposition = *aOffset - mCompositionStart;
@ -1850,7 +1850,7 @@ nsIMM32Handler::GetTargetClauseRange(PRUint32 *aOffset, PRUint32 *aLength)
break;
}
}
return PR_TRUE;
return true;
}
bool
@ -1860,16 +1860,16 @@ nsIMM32Handler::ConvertToANSIString(const nsAFlatString& aStr, UINT aCodePage,
int len = ::WideCharToMultiByte(aCodePage, 0,
(LPCWSTR)aStr.get(), aStr.Length(),
NULL, 0, NULL, NULL);
NS_ENSURE_TRUE(len >= 0, PR_FALSE);
NS_ENSURE_TRUE(len >= 0, false);
if (!EnsureStringLength(aANSIStr, len)) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: ConvertToANSIString, FAILED by OOM\n"));
return PR_FALSE;
return false;
}
::WideCharToMultiByte(aCodePage, 0, (LPCWSTR)aStr.get(), aStr.Length(),
(LPSTR)aANSIStr.BeginWriting(), len, NULL, NULL);
return PR_TRUE;
return true;
}
bool
@ -1879,14 +1879,14 @@ nsIMM32Handler::GetCharacterRectOfSelectedTextAt(nsWindow* aWindow,
{
nsIntPoint point(0, 0);
nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, aWindow);
nsQueryContentEvent selection(true, NS_QUERY_SELECTED_TEXT, aWindow);
aWindow->InitEvent(selection, &point);
aWindow->DispatchWindowEvent(&selection);
if (!selection.mSucceeded) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: GetCharacterRectOfSelectedTextAt, aOffset=%lu, FAILED (NS_QUERY_SELECTED_TEXT)\n",
aOffset));
return PR_FALSE;
return false;
}
PRUint32 offset = selection.mReply.mOffset + aOffset;
@ -1895,7 +1895,7 @@ nsIMM32Handler::GetCharacterRectOfSelectedTextAt(nsWindow* aWindow,
mIsComposing && !mCompositionString.IsEmpty()) {
// There is not a normal selection, but we have composition string.
// XXX mnakano - Should we implement NS_QUERY_IME_SELECTED_TEXT?
useCaretRect = PR_FALSE;
useCaretRect = false;
if (mCursorPosition != NO_IME_CARET) {
PRUint32 cursorPosition =
NS_MIN<PRUint32>(mCursorPosition, mCompositionString.Length());
@ -1906,7 +1906,7 @@ nsIMM32Handler::GetCharacterRectOfSelectedTextAt(nsWindow* aWindow,
nsIntRect r;
if (!useCaretRect) {
nsQueryContentEvent charRect(PR_TRUE, NS_QUERY_TEXT_RECT, aWindow);
nsQueryContentEvent charRect(true, NS_QUERY_TEXT_RECT, aWindow);
charRect.InitForQueryTextRect(offset, 1);
aWindow->InitEvent(charRect, &point);
aWindow->DispatchWindowEvent(&charRect);
@ -1918,7 +1918,7 @@ nsIMM32Handler::GetCharacterRectOfSelectedTextAt(nsWindow* aWindow,
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: GetCharacterRectOfSelectedTextAt, aCharRect={ x: %ld, y: %ld, width: %ld, height: %ld }\n",
aCharRect.x, aCharRect.y, aCharRect.width, aCharRect.height));
return PR_TRUE;
return true;
}
}
@ -1930,31 +1930,31 @@ nsIMM32Handler::GetCaretRect(nsWindow* aWindow, nsIntRect &aCaretRect)
{
nsIntPoint point(0, 0);
nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, aWindow);
nsQueryContentEvent selection(true, NS_QUERY_SELECTED_TEXT, aWindow);
aWindow->InitEvent(selection, &point);
aWindow->DispatchWindowEvent(&selection);
if (!selection.mSucceeded) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: GetCaretRect, FAILED (NS_QUERY_SELECTED_TEXT)\n"));
return PR_FALSE;
return false;
}
PRUint32 offset = selection.mReply.mOffset;
nsQueryContentEvent caretRect(PR_TRUE, NS_QUERY_CARET_RECT, aWindow);
nsQueryContentEvent caretRect(true, NS_QUERY_CARET_RECT, aWindow);
caretRect.InitForQueryCaretRect(offset);
aWindow->InitEvent(caretRect, &point);
aWindow->DispatchWindowEvent(&caretRect);
if (!caretRect.mSucceeded) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: GetCaretRect, FAILED (NS_QUERY_CARET_RECT)\n"));
return PR_FALSE;
return false;
}
aCaretRect = caretRect.mReply.mRect;
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: GetCaretRect, SUCCEEDED, aCaretRect={ x: %ld, y: %ld, width: %ld, height: %ld }\n",
aCaretRect.x, aCaretRect.y, aCaretRect.width, aCaretRect.height));
return PR_TRUE;
return true;
}
bool
@ -1965,8 +1965,8 @@ nsIMM32Handler::SetIMERelatedWindowsPos(nsWindow* aWindow,
// Get first character rect of current a normal selected text or a composing
// string.
bool ret = GetCharacterRectOfSelectedTextAt(aWindow, 0, r);
NS_ENSURE_TRUE(ret, PR_FALSE);
nsWindow* toplevelWindow = aWindow->GetTopLevelWindow(PR_FALSE);
NS_ENSURE_TRUE(ret, false);
nsWindow* toplevelWindow = aWindow->GetTopLevelWindow(false);
nsIntRect firstSelectedCharRect;
ResolveIMECaretPos(toplevelWindow, r, aWindow, firstSelectedCharRect);
@ -2002,16 +2002,16 @@ nsIMM32Handler::SetIMERelatedWindowsPos(nsWindow* aWindow,
if (!GetTargetClauseRange(&offset)) {
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: SetIMERelatedWindowsPos, FAILED, by GetTargetClauseRange\n"));
return PR_FALSE;
return false;
}
ret = GetCharacterRectOfSelectedTextAt(aWindow,
offset - mCompositionStart, r);
NS_ENSURE_TRUE(ret, PR_FALSE);
NS_ENSURE_TRUE(ret, false);
} else {
// If there are no composition string, we should use a first character
// rect.
ret = GetCharacterRectOfSelectedTextAt(aWindow, 0, r);
NS_ENSURE_TRUE(ret, PR_FALSE);
NS_ENSURE_TRUE(ret, false);
}
nsIntRect firstTargetCharRect;
ResolveIMECaretPos(toplevelWindow, r, aWindow, firstTargetCharRect);
@ -2042,7 +2042,7 @@ nsIMM32Handler::SetIMERelatedWindowsPos(nsWindow* aWindow,
::ImmSetCompositionWindow(aIMEContext.get(), &compForm);
}
return PR_TRUE;
return true;
}
void
@ -2067,11 +2067,11 @@ bool
nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
{
if (!sWM_MSIME_MOUSE || !mIsComposing) {
return PR_FALSE;
return false;
}
nsIntPoint cursor(LOWORD(lParam), HIWORD(lParam));
nsQueryContentEvent charAtPt(PR_TRUE, NS_QUERY_CHARACTER_AT_POINT, aWindow);
nsQueryContentEvent charAtPt(true, NS_QUERY_CHARACTER_AT_POINT, aWindow);
aWindow->InitEvent(charAtPt, &cursor);
aWindow->DispatchWindowEvent(&charAtPt);
if (!charAtPt.mSucceeded ||
@ -2079,7 +2079,7 @@ nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
charAtPt.mReply.mOffset < mCompositionStart ||
charAtPt.mReply.mOffset >
mCompositionStart + mCompositionString.Length()) {
return PR_FALSE;
return false;
}
// calcurate positioning and offset
@ -2088,7 +2088,7 @@ nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
// positioning: 2301 2301 2301
nsIntRect cursorInTopLevel, cursorRect(cursor, nsIntSize(0, 0));
ResolveIMECaretPos(aWindow, cursorRect,
aWindow->GetTopLevelWindow(PR_FALSE), cursorInTopLevel);
aWindow->GetTopLevelWindow(false), cursorInTopLevel);
PRInt32 cursorXInChar = cursorInTopLevel.x - charAtPt.mReply.mRect.x;
int positioning = cursorXInChar * 4 / charAtPt.mReply.mRect.width;
positioning = (positioning + 2) % 4;
@ -2117,7 +2117,7 @@ nsIMM32Handler::OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
("IMM32: OnKeyDownEvent, hWnd=%08x, wParam=%08x, lParam=%08x\n",
aWindow->GetWindowHandle(), wParam, lParam));
aEatMessage = PR_FALSE;
aEatMessage = false;
switch (wParam) {
case VK_PROCESSKEY:
// If we receive when IME isn't open, it means IME is opening right now.
@ -2126,7 +2126,7 @@ nsIMM32Handler::OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
sIsIMEOpening =
IMEContext.IsValid() && !::ImmGetOpenStatus(IMEContext.get());
}
return PR_FALSE;
return false;
case VK_TAB:
case VK_PRIOR:
case VK_NEXT:
@ -2145,10 +2145,10 @@ nsIMM32Handler::OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
// it's needed.
if (IsComposingOnOurEditor()) {
// NOTE: We don't need to cancel the composition on another window.
CancelComposition(aWindow, PR_FALSE);
CancelComposition(aWindow, false);
}
return PR_FALSE;
return false;
default:
return PR_FALSE;
return false;
}
}

2
widget/src/windows/nsIMM32Handler.h
View File

@ -127,7 +127,7 @@ public:
static bool IsDoingKakuteiUndo(HWND aWnd);
static void NotifyEndStatusChange() { sIsStatusChanged = PR_FALSE; }
static void NotifyEndStatusChange() { sIsStatusChanged = false; }
static bool CanOptimizeKeyAndIMEMessages(MSG *aNextKeyOrIMEMessage);

2
widget/src/windows/nsImageClipboard.cpp
View File

@ -462,7 +462,7 @@ void nsImageFromClipboard::CalcBitmask(PRUint32 aMask, PRUint8& aBegin, PRUint8&
if (!started && (aMask & (1 << pos)))
{
aBegin = pos;
started = PR_TRUE;
started = true;
}
else if (started && !(aMask & (1 << pos)))
{

4
widget/src/windows/nsNativeDragSource.cpp
View File

@ -52,7 +52,7 @@ static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID);
nsNativeDragSource::nsNativeDragSource(nsIDOMDataTransfer* aDataTransfer) :
m_cRef(0),
m_hCursor(nsnull),
mUserCancelled(PR_FALSE)
mUserCancelled(false)
{
mDataTransfer = do_QueryInterface(aDataTransfer);
}
@ -107,7 +107,7 @@ nsNativeDragSource::QueryContinueDrag(BOOL fEsc, DWORD grfKeyState)
}
if (fEsc) {
mUserCancelled = PR_TRUE;
mUserCancelled = true;
return DRAGDROP_S_CANCEL;
}

22
widget/src/windows/nsNativeDragTarget.cpp
View File

@ -64,7 +64,7 @@ nsNativeDragTarget::nsNativeDragTarget(nsIWidget * aWnd)
: m_cRef(0),
mEffectsAllowed(DROPEFFECT_MOVE | DROPEFFECT_COPY | DROPEFFECT_LINK),
mEffectsPreferred(DROPEFFECT_NONE),
mTookOwnRef(PR_FALSE), mWindow(aWnd), mDropTargetHelper(nsnull)
mTookOwnRef(false), mWindow(aWnd), mDropTargetHelper(nsnull)
{
mHWnd = (HWND)mWindow->GetNativeData(NS_NATIVE_WINDOW);
@ -187,7 +187,7 @@ void
nsNativeDragTarget::DispatchDragDropEvent(PRUint32 aEventType, POINTL aPT)
{
nsEventStatus status;
nsDragEvent event(PR_TRUE, aEventType, mWindow);
nsDragEvent event(true, aEventType, mWindow);
nsWindow * win = static_cast<nsWindow *>(mWindow);
win->InitEvent(event);
@ -207,7 +207,7 @@ nsNativeDragTarget::DispatchDragDropEvent(PRUint32 aEventType, POINTL aPT)
event.isShift = IsKeyDown(NS_VK_SHIFT);
event.isControl = IsKeyDown(NS_VK_CONTROL);
event.isMeta = PR_FALSE;
event.isMeta = false;
event.isAlt = IsKeyDown(NS_VK_ALT);
event.inputSource = static_cast<nsBaseDragService*>(mDragService)->GetInputSource();
@ -247,7 +247,7 @@ nsNativeDragTarget::ProcessDrag(PRUint32 aEventType,
}
// Clear the cached value
currSession->SetCanDrop(PR_FALSE);
currSession->SetCanDrop(false);
}
// IDropTarget methods
@ -273,7 +273,7 @@ nsNativeDragTarget::DragEnter(LPDATAOBJECT pIDataSource,
// save a ref to this, in case the window is destroyed underneath us
NS_ASSERTION(!mTookOwnRef, "own ref already taken!");
this->AddRef();
mTookOwnRef = PR_TRUE;
mTookOwnRef = true;
// tell the drag service about this drag (it may have come from an
// outside app).
@ -382,7 +382,7 @@ nsNativeDragTarget::DragLeave()
// initiated in a different app. End the drag session, since
// we're done with it for now (until the user drags back into
// mozilla).
mDragService->EndDragSession(PR_FALSE);
mDragService->EndDragSession(false);
}
}
@ -390,7 +390,7 @@ nsNativeDragTarget::DragLeave()
NS_ASSERTION(mTookOwnRef, "want to release own ref, but not taken!");
if (mTookOwnRef) {
this->Release();
mTookOwnRef = PR_FALSE;
mTookOwnRef = false;
}
return S_OK;
@ -405,10 +405,10 @@ nsNativeDragTarget::DragCancel()
mDropTargetHelper->DragLeave();
}
if (mDragService) {
mDragService->EndDragSession(PR_FALSE);
mDragService->EndDragSession(false);
}
this->Release(); // matching the AddRef in DragEnter
mTookOwnRef = PR_FALSE;
mTookOwnRef = false;
}
}
@ -466,13 +466,13 @@ nsNativeDragTarget::Drop(LPDATAOBJECT pData,
cpos.x = GET_X_LPARAM(pos);
cpos.y = GET_Y_LPARAM(pos);
winDragService->SetDragEndPoint(nsIntPoint(cpos.x, cpos.y));
serv->EndDragSession(PR_TRUE);
serv->EndDragSession(true);
// release the ref that was taken in DragEnter
NS_ASSERTION(mTookOwnRef, "want to release own ref, but not taken!");
if (mTookOwnRef) {
this->Release();
mTookOwnRef = PR_FALSE;
mTookOwnRef = false;
}
return S_OK;

136
widget/src/windows/nsNativeThemeWin.cpp
View File

@ -90,8 +90,8 @@ static PRInt32 GetTopLevelWindowActiveState(nsIFrame *aFrame)
nsIWidget* widget = aFrame->GetNearestWidget();
nsWindow * window = static_cast<nsWindow*>(widget);
if (widget && !window->IsTopLevelWidget() &&
!(window = window->GetParentWindow(PR_FALSE)))
return PR_FALSE;
!(window = window->GetParentWindow(false)))
return false;
if (window->GetWindowHandle() == ::GetActiveWindow())
return mozilla::widget::themeconst::FS_ACTIVE;
@ -132,7 +132,7 @@ static void QueryForButtonData(nsIFrame *aFrame)
if (!window)
return;
if (!window->IsTopLevelWidget() &&
!(window = window->GetParentWindow(PR_FALSE)))
!(window = window->GetParentWindow(false)))
return;
nsUXThemeData::UpdateTitlebarInfo(window->GetWindowHandle());
@ -576,7 +576,7 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
return NS_OK;
}
aState = StandardGetState(aFrame, aWidgetType, PR_TRUE);
aState = StandardGetState(aFrame, aWidgetType, true);
// Check for default dialog buttons. These buttons should always look
// focused.
@ -610,7 +610,7 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
if (IsDisabled(aFrame, eventState)) {
aState = TS_DISABLED;
} else {
aState = StandardGetState(aFrame, aWidgetType, PR_FALSE);
aState = StandardGetState(aFrame, aWidgetType, false);
}
}
@ -672,7 +672,7 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
else if (IsReadOnly(aFrame))
aState = TFS_READONLY;
else
aState = StandardGetState(aFrame, aWidgetType, PR_TRUE);
aState = StandardGetState(aFrame, aWidgetType, true);
}
return NS_OK;
@ -848,7 +848,7 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
else if (IsDisabled(aFrame, eventState))
aState = TS_DISABLED;
else
aState = StandardGetState(aFrame, aWidgetType, PR_FALSE);
aState = StandardGetState(aFrame, aWidgetType, false);
return NS_OK;
}
case NS_THEME_TOOLBOX:
@ -926,7 +926,7 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
aState = TS_ACTIVE; // The selected tab is always "pressed".
}
else
aState = StandardGetState(aFrame, aWidgetType, PR_TRUE);
aState = StandardGetState(aFrame, aWidgetType, true);
return NS_OK;
}
@ -943,7 +943,7 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
return NS_OK;
}
aState = StandardGetState(aFrame, aWidgetType, PR_TRUE);
aState = StandardGetState(aFrame, aWidgetType, true);
return NS_OK;
}
@ -1562,15 +1562,15 @@ RENDER_AGAIN:
// the fallback path to cairo_d2d_acquire_dest if the area to fill
// is a complex region.
ctx->NewPath();
ctx->Rectangle(buttonbox1, PR_TRUE);
ctx->Rectangle(buttonbox1, true);
ctx->Fill();
ctx->NewPath();
ctx->Rectangle(buttonbox2, PR_TRUE);
ctx->Rectangle(buttonbox2, true);
ctx->Fill();
ctx->NewPath();
ctx->Rectangle(buttonbox3, PR_TRUE);
ctx->Rectangle(buttonbox3, true);
ctx->Fill();
ctx->Restore();
@ -1772,7 +1772,7 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
case NS_THEME_CHECKBOX:
case NS_THEME_RADIO:
aResult->SizeTo(0, 0, 0, 0);
return PR_TRUE;
return true;
}
HANDLE theme = GetTheme(aWidgetType);
@ -1784,14 +1784,14 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
// aero glass doesn't display custom buttons
if (nsUXThemeData::CheckForCompositor())
return PR_TRUE;
return true;
#endif
// button padding for standard windows
if (aWidgetType == NS_THEME_WINDOW_BUTTON_BOX) {
aResult->top = GetSystemMetrics(SM_CXFRAME);
}
return PR_TRUE;
return true;
}
// Content padding
@ -1802,7 +1802,7 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
// the border padding. (windows quirk)
if (aWidgetType == NS_THEME_WINDOW_TITLEBAR_MAXIMIZED)
aResult->top = GetSystemMetrics(SM_CXFRAME);
return PR_TRUE;
return true;
}
if (!theme)
@ -1814,7 +1814,7 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
nsUXThemeData::getThemePartSize(theme, NULL, MENU_POPUPBORDERS, /* state */ 0, NULL, TS_TRUE, &popupSize);
aResult->top = aResult->bottom = popupSize.cy;
aResult->left = aResult->right = popupSize.cx;
return PR_TRUE;
return true;
}
if (nsUXThemeData::sIsVistaOrLater) {
@ -1824,7 +1824,7 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
{
/* If we have author-specified padding for these elements, don't do the fixups below */
if (aFrame->PresContext()->HasAuthorSpecifiedRules(aFrame, NS_AUTHOR_SPECIFIED_PADDING))
return PR_FALSE;
return false;
}
/* textfields need extra pixels on all sides, otherwise they
@ -1836,7 +1836,7 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
if (aWidgetType == NS_THEME_TEXTFIELD || aWidgetType == NS_THEME_TEXTFIELD_MULTILINE) {
aResult->top = aResult->bottom = 2;
aResult->left = aResult->right = 2;
return PR_TRUE;
return true;
} else if (IsHTMLContent(aFrame) && aWidgetType == NS_THEME_DROPDOWN) {
/* For content menulist controls, we need an extra pixel so
* that we have room to draw our focus rectangle stuff.
@ -1845,7 +1845,7 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
*/
aResult->top = aResult->bottom = 1;
aResult->left = aResult->right = 1;
return PR_TRUE;
return true;
}
}
@ -1879,7 +1879,7 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
}
break;
default:
return PR_FALSE;
return false;
}
if (IsFrameRTL(aFrame))
@ -1893,7 +1893,7 @@ nsNativeThemeWin::GetWidgetPadding(nsDeviceContext* aContext,
aResult->left = left;
}
return PR_TRUE;
return true;
}
bool
@ -1925,12 +1925,12 @@ nsNativeThemeWin::GetWidgetOverflow(nsDeviceContext* aContext,
/* Note: no overflow on the left */
nsMargin m(0, p2a, p2a, p2a);
aOverflowRect->Inflate (m);
return PR_TRUE;
return true;
}
}
#endif
return PR_FALSE;
return false;
}
NS_IMETHODIMP
@ -1939,7 +1939,7 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* a
nsIntSize* aResult, bool* aIsOverridable)
{
(*aResult).width = (*aResult).height = 0;
*aIsOverridable = PR_TRUE;
*aIsOverridable = true;
HANDLE theme = GetTheme(aWidgetType);
if (!theme)
@ -2007,7 +2007,7 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* a
SIZE boxSize(GetGutterSize(theme, NULL));
aResult->width = boxSize.cx+2;
aResult->height = boxSize.cy;
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
}
case NS_THEME_MENUITEMTEXT:
@ -2027,13 +2027,13 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* a
break;
case NS_THEME_RESIZER:
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
break;
case NS_THEME_SCALE_THUMB_HORIZONTAL:
case NS_THEME_SCALE_THUMB_VERTICAL:
{
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
// on Vista, GetThemePartAndState returns odd values for
// scale thumbs, so use a hardcoded size instead.
if (nsUXThemeData::sIsVistaOrLater) {
@ -2080,7 +2080,7 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* a
aResult->height -= 4;
}
AddPaddingRect(aResult, CAPTIONBUTTON_RESTORE);
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
return NS_OK;
case NS_THEME_WINDOW_BUTTON_MINIMIZE:
@ -2092,7 +2092,7 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* a
aResult->height -= 4;
}
AddPaddingRect(aResult, CAPTIONBUTTON_MINIMIZE);
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
return NS_OK;
case NS_THEME_WINDOW_BUTTON_CLOSE:
@ -2104,14 +2104,14 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* a
aResult->height -= 4;
}
AddPaddingRect(aResult, CAPTIONBUTTON_CLOSE);
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
return NS_OK;
case NS_THEME_WINDOW_TITLEBAR:
case NS_THEME_WINDOW_TITLEBAR_MAXIMIZED:
aResult->height = GetSystemMetrics(SM_CYCAPTION);
aResult->height += GetSystemMetrics(SM_CYFRAME);
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
return NS_OK;
case NS_THEME_WINDOW_BUTTON_BOX:
@ -2125,7 +2125,7 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* a
aResult->width += 1;
aResult->height -= 2;
}
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
return NS_OK;
}
break;
@ -2135,7 +2135,7 @@ nsNativeThemeWin::GetMinimumWidgetSize(nsRenderingContext* aContext, nsIFrame* a
case NS_THEME_WINDOW_FRAME_BOTTOM:
aResult->width = GetSystemMetrics(SM_CXFRAME);
aResult->height = GetSystemMetrics(SM_CYFRAME);
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
return NS_OK;
}
@ -2193,7 +2193,7 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
aWidgetType == NS_THEME_TOOLBAR_SEPARATOR ||
aWidgetType == NS_THEME_WIN_GLASS ||
aWidgetType == NS_THEME_WIN_BORDERLESS_GLASS) {
*aShouldRepaint = PR_FALSE;
*aShouldRepaint = false;
return NS_OK;
}
@ -2206,7 +2206,7 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
aWidgetType == NS_THEME_WINDOW_BUTTON_MINIMIZE ||
aWidgetType == NS_THEME_WINDOW_BUTTON_MINIMIZE ||
aWidgetType == NS_THEME_WINDOW_BUTTON_RESTORE) {
*aShouldRepaint = PR_TRUE;
*aShouldRepaint = true;
return NS_OK;
}
@ -2214,7 +2214,7 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
if (!nsUXThemeData::sIsVistaOrLater &&
(aWidgetType == NS_THEME_SCROLLBAR_TRACK_VERTICAL ||
aWidgetType == NS_THEME_SCROLLBAR_TRACK_HORIZONTAL)) {
*aShouldRepaint = PR_FALSE;
*aShouldRepaint = false;
return NS_OK;
}
@ -2224,7 +2224,7 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
(aWidgetType == NS_THEME_DROPDOWN || aWidgetType == NS_THEME_DROPDOWN_BUTTON) &&
IsHTMLContent(aFrame))
{
*aShouldRepaint = PR_TRUE;
*aShouldRepaint = true;
return NS_OK;
}
@ -2233,12 +2233,12 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
// For example, a toolbar doesn't care about any states.
if (!aAttribute) {
// Hover/focus/active changed. Always repaint.
*aShouldRepaint = PR_TRUE;
*aShouldRepaint = true;
}
else {
// Check the attribute to see if it's relevant.
// disabled, checked, dlgtype, default, etc.
*aShouldRepaint = PR_FALSE;
*aShouldRepaint = false;
if (aAttribute == nsWidgetAtoms::disabled ||
aAttribute == nsWidgetAtoms::checked ||
aAttribute == nsWidgetAtoms::selected ||
@ -2246,7 +2246,7 @@ nsNativeThemeWin::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
aAttribute == nsWidgetAtoms::open ||
aAttribute == nsWidgetAtoms::mozmenuactive ||
aAttribute == nsWidgetAtoms::focused)
*aShouldRepaint = PR_TRUE;
*aShouldRepaint = true;
}
return NS_OK;
@ -2268,7 +2268,7 @@ nsNativeThemeWin::ThemeSupportsWidget(nsPresContext* aPresContext,
// specific widgets.
if (aPresContext && !aPresContext->PresShell()->IsThemeSupportEnabled())
return PR_FALSE;
return false;
HANDLE theme = NULL;
if (aWidgetType == NS_THEME_CHECKBOX_CONTAINER)
@ -2282,7 +2282,7 @@ nsNativeThemeWin::ThemeSupportsWidget(nsPresContext* aPresContext,
// turn off theming for some HTML widgets styled by the page
return (!IsWidgetStyled(aPresContext, aFrame, aWidgetType));
return PR_FALSE;
return false;
}
bool
@ -2292,20 +2292,20 @@ nsNativeThemeWin::WidgetIsContainer(PRUint8 aWidgetType)
if (aWidgetType == NS_THEME_DROPDOWN_BUTTON ||
aWidgetType == NS_THEME_RADIO ||
aWidgetType == NS_THEME_CHECKBOX)
return PR_FALSE;
return PR_TRUE;
return false;
return true;
}
bool
nsNativeThemeWin::ThemeDrawsFocusForWidget(nsPresContext* aPresContext, nsIFrame* aFrame, PRUint8 aWidgetType)
{
return PR_FALSE;
return false;
}
bool
nsNativeThemeWin::ThemeNeedsComboboxDropmarker()
{
return PR_TRUE;
return true;
}
nsITheme::Transparency
@ -2373,7 +2373,7 @@ nsNativeThemeWin::ClassicThemeSupportsWidget(nsPresContext* aPresContext,
case NS_THEME_MENUPOPUP:
// Classic non-flat menus are handled almost entirely through CSS.
if (!nsUXThemeData::sFlatMenus)
return PR_FALSE;
return false;
case NS_THEME_BUTTON:
case NS_THEME_TEXTFIELD:
case NS_THEME_TEXTFIELD_MULTILINE:
@ -2429,9 +2429,9 @@ nsNativeThemeWin::ClassicThemeSupportsWidget(nsPresContext* aPresContext,
case NS_THEME_WINDOW_BUTTON_RESTORE:
case NS_THEME_WINDOW_BUTTON_BOX:
case NS_THEME_WINDOW_BUTTON_BOX_MAXIMIZED:
return PR_TRUE;
return true;
}
return PR_FALSE;
return false;
}
nsresult
@ -2500,7 +2500,7 @@ nsNativeThemeWin::ClassicGetWidgetPadding(nsDeviceContext* aContext,
bool focused;
if (NS_FAILED(ClassicGetThemePartAndState(aFrame, aWidgetType, part, state, focused)))
return PR_FALSE;
return false;
if (part == 1) { // top-level menu
if (nsUXThemeData::sFlatMenus || !(state & DFCS_PUSHED)) {
@ -2516,14 +2516,14 @@ nsNativeThemeWin::ClassicGetWidgetPadding(nsDeviceContext* aContext,
(*aResult).top = 0;
(*aResult).bottom = (*aResult).left = (*aResult).right = 2;
}
return PR_TRUE;
return true;
}
case NS_THEME_PROGRESSBAR:
case NS_THEME_PROGRESSBAR_VERTICAL:
(*aResult).top = (*aResult).left = (*aResult).bottom = (*aResult).right = 1;
return PR_TRUE;
return true;
default:
return PR_FALSE;
return false;
}
}
@ -2533,7 +2533,7 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
nsIntSize* aResult, bool* aIsOverridable)
{
(*aResult).width = (*aResult).height = 0;
*aIsOverridable = PR_TRUE;
*aIsOverridable = true;
switch (aWidgetType) {
case NS_THEME_RADIO:
case NS_THEME_CHECKBOX:
@ -2549,13 +2549,13 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
case NS_THEME_SCROLLBAR_BUTTON_DOWN:
(*aResult).width = ::GetSystemMetrics(SM_CXVSCROLL);
(*aResult).height = ::GetSystemMetrics(SM_CYVSCROLL);
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
break;
case NS_THEME_SCROLLBAR_BUTTON_LEFT:
case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
(*aResult).width = ::GetSystemMetrics(SM_CXHSCROLL);
(*aResult).height = ::GetSystemMetrics(SM_CYHSCROLL);
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
break;
case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
// XXX HACK We should be able to have a minimum height for the scrollbar
@ -2567,12 +2567,12 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
case NS_THEME_SCALE_THUMB_HORIZONTAL:
(*aResult).width = 12;
(*aResult).height = 20;
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
break;
case NS_THEME_SCALE_THUMB_VERTICAL:
(*aResult).width = 20;
(*aResult).height = 12;
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
break;
case NS_THEME_DROPDOWN_BUTTON:
(*aResult).width = ::GetSystemMetrics(SM_CXVSCROLL);
@ -2605,7 +2605,7 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
(*aResult).width = (*aResult).height = abs(nc.lfStatusFont.lfHeight) + 4;
else
(*aResult).width = (*aResult).height = 15;
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
break;
case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
(*aResult).width = ::GetSystemMetrics(SM_CXVSCROLL);
@ -2614,7 +2614,7 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
// native
if (!GetTheme(aWidgetType))
(*aResult).height >>= 1;
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
break;
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
(*aResult).width = ::GetSystemMetrics(SM_CXHTHUMB);
@ -2623,7 +2623,7 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
// native
if (!GetTheme(aWidgetType))
(*aResult).width >>= 1;
*aIsOverridable = PR_FALSE;
*aIsOverridable = false;
break;
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
(*aResult).width = ::GetSystemMetrics(SM_CXHTHUMB) << 1;
@ -2685,14 +2685,14 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
PRInt32& aPart, PRInt32& aState, bool& aFocused)
{
aFocused = PR_FALSE;
aFocused = false;
switch (aWidgetType) {
case NS_THEME_BUTTON: {
nsEventStates contentState;
aPart = DFC_BUTTON;
aState = DFCS_BUTTONPUSH;
aFocused = PR_FALSE;
aFocused = false;
contentState = GetContentState(aFrame, aWidgetType);
if (IsDisabled(aFrame, contentState))
@ -2710,12 +2710,12 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
if (!aFrame->GetContent()->IsHTML())
aState |= DFCS_FLAT;
aFocused = PR_TRUE;
aFocused = true;
}
}
if (contentState.HasState(NS_EVENT_STATE_FOCUS) ||
(aState == DFCS_BUTTONPUSH && IsDefaultButton(aFrame))) {
aFocused = PR_TRUE;
aFocused = true;
}
}
@ -2725,7 +2725,7 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
case NS_THEME_CHECKBOX:
case NS_THEME_RADIO: {
nsEventStates contentState;
aFocused = PR_FALSE;
aFocused = false;
aPart = DFC_BUTTON;
aState = 0;
@ -2751,7 +2751,7 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
contentState = GetContentState(aFrame, aWidgetType);
if (!content->IsXUL() &&
contentState.HasState(NS_EVENT_STATE_FOCUS)) {
aFocused = PR_TRUE;
aFocused = true;
}
if (IsDisabled(aFrame, contentState)) {

14
widget/src/windows/nsPrintSettingsWin.cpp
View File

@ -219,15 +219,15 @@ Tester::Tester()
}
if (ps) {
ps->SetPrintOptions(nsIPrintSettings::kPrintOddPages, PR_TRUE);
ps->SetPrintOptions(nsIPrintSettings::kPrintEvenPages, PR_FALSE);
ps->SetPrintOptions(nsIPrintSettings::kPrintOddPages, true);
ps->SetPrintOptions(nsIPrintSettings::kPrintEvenPages, false);
ps->SetMarginTop(1.0);
ps->SetMarginLeft(1.0);
ps->SetMarginBottom(1.0);
ps->SetMarginRight(1.0);
ps->SetScaling(0.5);
ps->SetPrintBGColors(PR_TRUE);
ps->SetPrintBGImages(PR_TRUE);
ps->SetPrintBGColors(true);
ps->SetPrintBGImages(true);
ps->SetPrintRange(15);
ps->SetHeaderStrLeft(NS_ConvertUTF8toUTF16("Left").get());
ps->SetHeaderStrCenter(NS_ConvertUTF8toUTF16("Center").get());
@ -241,13 +241,13 @@ Tester::Tester()
ps->SetPaperWidth(100.0);
ps->SetPaperHeight(50.0);
ps->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
ps->SetPrintReversed(PR_TRUE);
ps->SetPrintInColor(PR_TRUE);
ps->SetPrintReversed(true);
ps->SetPrintInColor(true);
ps->SetOrientation(nsIPrintSettings::kLandscapeOrientation);
ps->SetPrintCommand(NS_ConvertUTF8toUTF16("Command").get());
ps->SetNumCopies(2);
ps->SetPrinterName(NS_ConvertUTF8toUTF16("Printer Name").get());
ps->SetPrintToFile(PR_TRUE);
ps->SetPrintToFile(true);
ps->SetToFileName(NS_ConvertUTF8toUTF16("File Name").get());
ps->SetPrintPageDelay(1000);

80
widget/src/windows/nsTextStore.cpp
View File

@ -93,7 +93,7 @@ nsTextStore::Create(nsWindow* aWindow,
// Create document manager
HRESULT hr = sTsfThreadMgr->CreateDocumentMgr(
getter_AddRefs(mDocumentMgr));
NS_ENSURE_TRUE(SUCCEEDED(hr), PR_FALSE);
NS_ENSURE_TRUE(SUCCEEDED(hr), false);
mWindow = aWindow;
// Create context and add it to document manager
hr = mDocumentMgr->CreateContext(sTsfClientId, 0,
@ -106,12 +106,12 @@ nsTextStore::Create(nsWindow* aWindow,
if (SUCCEEDED(hr)) {
PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
("TSF: Created, window=%08x\n", aWindow));
return PR_TRUE;
return true;
}
mContext = NULL;
mDocumentMgr = NULL;
}
return PR_FALSE;
return false;
}
bool
@ -138,7 +138,7 @@ nsTextStore::Destroy(void)
PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
("TSF: Destroyed, window=%08x\n", mWindow));
mWindow = NULL;
return PR_TRUE;
return true;
}
STDMETHODIMP
@ -301,7 +301,7 @@ nsTextStore::GetSelection(ULONG ulIndex,
*pSelection = mCompositionSelection;
} else {
// Construct and initialize an event to get selection info
nsQueryContentEvent event(PR_TRUE, NS_QUERY_SELECTED_TEXT, mWindow);
nsQueryContentEvent event(true, NS_QUERY_SELECTED_TEXT, mWindow);
mWindow->InitEvent(event);
mWindow->DispatchWindowEvent(&event);
NS_ENSURE_TRUE(event.mSucceeded, E_FAIL);
@ -543,7 +543,7 @@ nsTextStore::SaveTextEvent(const nsTextEvent* aEvent)
if (!aEvent)
return S_OK;
mLastDispatchedTextEvent = new nsTextEvent(PR_TRUE, NS_TEXT_TEXT, nsnull);
mLastDispatchedTextEvent = new nsTextEvent(true, NS_TEXT_TEXT, nsnull);
if (!mLastDispatchedTextEvent)
return E_OUTOFMEMORY;
mLastDispatchedTextEvent->rangeCount = aEvent->rangeCount;
@ -608,7 +608,7 @@ nsTextStore::UpdateCompositionExtent(ITfRange* aRangeNew)
// a new one. OnEndComposition followed by OnStartComposition
// will accomplish this automagically.
OnEndComposition(pComposition);
OnStartCompositionInternal(pComposition, composingRange, PR_TRUE);
OnStartCompositionInternal(pComposition, composingRange, true);
PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
("TSF: UpdateCompositionExtent, (reset) range=%ld-%ld\n",
compStart, compStart + compLength));
@ -630,15 +630,15 @@ GetColor(const TF_DA_COLOR &aTSFColor, nscolor &aResult)
DWORD sysColor = ::GetSysColor(aTSFColor.nIndex);
aResult = NS_RGB(GetRValue(sysColor), GetGValue(sysColor),
GetBValue(sysColor));
return PR_TRUE;
return true;
}
case TF_CT_COLORREF:
aResult = NS_RGB(GetRValue(aTSFColor.cr), GetGValue(aTSFColor.cr),
GetBValue(aTSFColor.cr));
return PR_TRUE;
return true;
case TF_CT_NONE:
default:
return PR_FALSE;
return false;
}
}
@ -648,21 +648,21 @@ GetLineStyle(TF_DA_LINESTYLE aTSFLineStyle, PRUint8 &aTextRangeLineStyle)
switch (aTSFLineStyle) {
case TF_LS_NONE:
aTextRangeLineStyle = nsTextRangeStyle::LINESTYLE_NONE;
return PR_TRUE;
return true;
case TF_LS_SOLID:
aTextRangeLineStyle = nsTextRangeStyle::LINESTYLE_SOLID;
return PR_TRUE;
return true;
case TF_LS_DOT:
aTextRangeLineStyle = nsTextRangeStyle::LINESTYLE_DOTTED;
return PR_TRUE;
return true;
case TF_LS_DASH:
aTextRangeLineStyle = nsTextRangeStyle::LINESTYLE_DASHED;
return PR_TRUE;
return true;
case TF_LS_SQUIGGLE:
aTextRangeLineStyle = nsTextRangeStyle::LINESTYLE_WAVY;
return PR_TRUE;
return true;
default:
return PR_FALSE;
return false;
}
}
@ -688,7 +688,7 @@ nsTextStore::SendTextEventForCompositionString()
NS_ENSURE_TRUE(SUCCEEDED(hr) && attrPropetry, hr);
// Use NS_TEXT_TEXT to set composition string
nsTextEvent event(PR_TRUE, NS_TEXT_TEXT, mWindow);
nsTextEvent event(true, NS_TEXT_TEXT, mWindow);
mWindow->InitEvent(event);
nsRefPtr<ITfRange> composingRange;
@ -804,7 +804,7 @@ nsTextStore::SendTextEventForCompositionString()
}
if (mCompositionString != mLastDispatchedCompositionString) {
nsCompositionEvent compositionUpdate(PR_TRUE, NS_COMPOSITION_UPDATE,
nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
mWindow);
mWindow->InitEvent(compositionUpdate);
compositionUpdate.data = mCompositionString;
@ -845,7 +845,7 @@ nsTextStore::SetSelectionInternal(const TS_SELECTION_ACP* pSelection,
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
}
} else {
nsSelectionEvent event(PR_TRUE, NS_SELECTION_SET, mWindow);
nsSelectionEvent event(true, NS_SELECTION_SET, mWindow);
event.mOffset = pSelection->acpStart;
event.mLength = PRUint32(pSelection->acpEnd - pSelection->acpStart);
event.mReversed = pSelection->style.ase == TS_AE_START;
@ -865,7 +865,7 @@ nsTextStore::SetSelection(ULONG ulCount,
NS_ENSURE_TRUE(TS_LF_READWRITE == (mLock & TS_LF_READWRITE), TS_E_NOLOCK);
NS_ENSURE_TRUE(1 == ulCount && pSelection, E_INVALIDARG);
return SetSelectionInternal(pSelection, PR_TRUE);
return SetSelectionInternal(pSelection, true);
}
STDMETHODIMP
@ -919,7 +919,7 @@ nsTextStore::GetText(LONG acpStart,
}
}
// Send NS_QUERY_TEXT_CONTENT to get text content
nsQueryContentEvent event(PR_TRUE, NS_QUERY_TEXT_CONTENT, mWindow);
nsQueryContentEvent event(true, NS_QUERY_TEXT_CONTENT, mWindow);
mWindow->InitEvent(event);
event.InitForQueryTextContent(PRUint32(acpStart), length);
mWindow->DispatchWindowEvent(&event);
@ -1081,7 +1081,7 @@ nsTextStore::GetEndACP(LONG *pacp)
NS_ENSURE_TRUE(TS_LF_READ == (mLock & TS_LF_READ), TS_E_NOLOCK);
NS_ENSURE_TRUE(pacp, E_INVALIDARG);
// Flattened text is retrieved and its length returned
nsQueryContentEvent event(PR_TRUE, NS_QUERY_TEXT_CONTENT, mWindow);
nsQueryContentEvent event(true, NS_QUERY_TEXT_CONTENT, mWindow);
mWindow->InitEvent(event);
// Return entire text
event.InitForQueryTextContent(0, PR_INT32_MAX);
@ -1126,7 +1126,7 @@ nsTextStore::GetTextExt(TsViewCookie vcView,
NS_ENSURE_TRUE(acpStart >= 0 && acpEnd >= acpStart, TS_E_INVALIDPOS);
// use NS_QUERY_TEXT_RECT to get rect in system, screen coordinates
nsQueryContentEvent event(PR_TRUE, NS_QUERY_TEXT_RECT, mWindow);
nsQueryContentEvent event(true, NS_QUERY_TEXT_RECT, mWindow);
mWindow->InitEvent(event);
event.InitForQueryTextRect(acpStart, acpEnd - acpStart);
mWindow->DispatchWindowEvent(&event);
@ -1141,7 +1141,7 @@ nsTextStore::GetTextExt(TsViewCookie vcView,
nsWindow* refWindow = static_cast<nsWindow*>(
event.mReply.mFocusedWidget ? event.mReply.mFocusedWidget : mWindow);
// Result rect is in top level widget coordinates
refWindow = refWindow->GetTopLevelWindow(PR_FALSE);
refWindow = refWindow->GetTopLevelWindow(false);
NS_ENSURE_TRUE(refWindow, E_FAIL);
event.mReply.mRect.MoveBy(refWindow->WidgetToScreenOffset());
@ -1169,7 +1169,7 @@ nsTextStore::GetScreenExt(TsViewCookie vcView,
{
NS_ENSURE_TRUE(TEXTSTORE_DEFAULT_VIEW == vcView && prc, E_INVALIDARG);
// use NS_QUERY_EDITOR_RECT to get rect in system, screen coordinates
nsQueryContentEvent event(PR_TRUE, NS_QUERY_EDITOR_RECT, mWindow);
nsQueryContentEvent event(true, NS_QUERY_EDITOR_RECT, mWindow);
mWindow->InitEvent(event);
mWindow->DispatchWindowEvent(&event);
NS_ENSURE_TRUE(event.mSucceeded, E_FAIL);
@ -1177,7 +1177,7 @@ nsTextStore::GetScreenExt(TsViewCookie vcView,
nsWindow* refWindow = static_cast<nsWindow*>(
event.mReply.mFocusedWidget ? event.mReply.mFocusedWidget : mWindow);
// Result rect is in top level widget coordinates
refWindow = refWindow->GetTopLevelWindow(PR_FALSE);
refWindow = refWindow->GetTopLevelWindow(false);
NS_ENSURE_TRUE(refWindow, E_FAIL);
nsIntRect boundRect;
@ -1255,7 +1255,7 @@ nsTextStore::InsertTextAtSelection(DWORD dwFlags,
sel.acpEnd - mCompositionStart));
} else {
// Use a temporary composition to contain the text
nsCompositionEvent compEvent(PR_TRUE, NS_COMPOSITION_START, mWindow);
nsCompositionEvent compEvent(true, NS_COMPOSITION_START, mWindow);
mWindow->InitEvent(compEvent);
mWindow->DispatchWindowEvent(&compEvent);
if (mWindow && !mWindow->Destroyed()) {
@ -1263,7 +1263,7 @@ nsTextStore::InsertTextAtSelection(DWORD dwFlags,
compEvent.data.Assign(pchText, cch);
mWindow->DispatchWindowEvent(&compEvent);
if (mWindow && !mWindow->Destroyed()) {
nsTextEvent event(PR_TRUE, NS_TEXT_TEXT, mWindow);
nsTextEvent event(true, NS_TEXT_TEXT, mWindow);
mWindow->InitEvent(event);
if (!cch) {
// XXX See OnEndComposition comment on inserting empty strings
@ -1324,16 +1324,16 @@ nsTextStore::OnStartCompositionInternal(ITfCompositionView* pComposition,
mCompositionStart + mCompositionLength));
// Select composition range so the new composition replaces the range
nsSelectionEvent selEvent(PR_TRUE, NS_SELECTION_SET, mWindow);
nsSelectionEvent selEvent(true, NS_SELECTION_SET, mWindow);
mWindow->InitEvent(selEvent);
selEvent.mOffset = PRUint32(mCompositionStart);
selEvent.mLength = PRUint32(mCompositionLength);
selEvent.mReversed = PR_FALSE;
selEvent.mReversed = false;
mWindow->DispatchWindowEvent(&selEvent);
NS_ENSURE_TRUE(selEvent.mSucceeded, E_FAIL);
// Set up composition
nsQueryContentEvent queryEvent(PR_TRUE, NS_QUERY_SELECTED_TEXT, mWindow);
nsQueryContentEvent queryEvent(true, NS_QUERY_SELECTED_TEXT, mWindow);
mWindow->InitEvent(queryEvent);
mWindow->DispatchWindowEvent(&queryEvent);
NS_ENSURE_TRUE(queryEvent.mSucceeded, E_FAIL);
@ -1344,7 +1344,7 @@ nsTextStore::OnStartCompositionInternal(ITfCompositionView* pComposition,
mCompositionSelection.style.ase = TS_AE_END;
mCompositionSelection.style.fInterimChar = FALSE;
}
nsCompositionEvent event(PR_TRUE, NS_COMPOSITION_START, mWindow);
nsCompositionEvent event(true, NS_COMPOSITION_START, mWindow);
mWindow->InitEvent(event);
mWindow->DispatchWindowEvent(&event);
return S_OK;
@ -1375,7 +1375,7 @@ nsTextStore::OnStartComposition(ITfCompositionView* pComposition,
nsRefPtr<ITfRange> range;
HRESULT hr = pComposition->GetRange(getter_AddRefs(range));
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
hr = OnStartCompositionInternal(pComposition, range, PR_FALSE);
hr = OnStartCompositionInternal(pComposition, range, false);
if (FAILED(hr))
return hr;
@ -1424,7 +1424,7 @@ nsTextStore::OnEndComposition(ITfCompositionView* pComposition)
}
if (mCompositionString != mLastDispatchedCompositionString) {
nsCompositionEvent compositionUpdate(PR_TRUE, NS_COMPOSITION_UPDATE,
nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
mWindow);
mWindow->InitEvent(compositionUpdate);
compositionUpdate.data = mCompositionString;
@ -1438,7 +1438,7 @@ nsTextStore::OnEndComposition(ITfCompositionView* pComposition)
}
// Use NS_TEXT_TEXT to commit composition string
nsTextEvent textEvent(PR_TRUE, NS_TEXT_TEXT, mWindow);
nsTextEvent textEvent(true, NS_TEXT_TEXT, mWindow);
mWindow->InitEvent(textEvent);
if (!mCompositionString.Length()) {
// XXX HACK! HACK! NS_TEXT_TEXT handler specifically rejects
@ -1460,7 +1460,7 @@ nsTextStore::OnEndComposition(ITfCompositionView* pComposition)
return S_OK;
}
nsCompositionEvent event(PR_TRUE, NS_COMPOSITION_END, mWindow);
nsCompositionEvent event(true, NS_COMPOSITION_END, mWindow);
event.data = mLastDispatchedCompositionString;
mWindow->InitEvent(event);
mWindow->DispatchWindowEvent(&event);
@ -1583,11 +1583,11 @@ GetCompartment(IUnknown* pUnk,
const GUID& aID,
ITfCompartment** aCompartment)
{
if (!pUnk) return PR_FALSE;
if (!pUnk) return false;
nsRefPtr<ITfCompartmentMgr> compMgr;
pUnk->QueryInterface(IID_ITfCompartmentMgr, getter_AddRefs(compMgr));
if (!compMgr) return PR_FALSE;
if (!compMgr) return false;
return SUCCEEDED(compMgr->GetCompartment(aID, aCompartment)) &&
(*aCompartment) != NULL;
@ -1618,7 +1618,7 @@ nsTextStore::GetIMEOpenState(void)
if (!GetCompartment(sTsfThreadMgr,
GUID_COMPARTMENT_KEYBOARD_OPENCLOSE,
getter_AddRefs(comp)))
return PR_FALSE;
return false;
VARIANT variant;
::VariantInit(&variant);
@ -1626,7 +1626,7 @@ nsTextStore::GetIMEOpenState(void)
return variant.lVal != 0;
::VariantClear(&variant); // clear up in case variant.vt != VT_I4
return PR_FALSE;
return false;
}
void

12
widget/src/windows/nsToolkit.cpp
View File

@ -95,7 +95,7 @@ void RunPump(void* arg)
// do registration and creation in this thread
info->toolkit->CreateInternalWindow(PR_GetCurrentThread());
gThreadState = PR_TRUE;
gThreadState = true;
::PR_Notify(info->monitor);
::PR_ExitMonitor(info->monitor);
@ -374,7 +374,7 @@ bool nsToolkit::InitVersionInfo()
if (!isInitialized)
{
isInitialized = PR_TRUE;
isInitialized = true;
OSVERSIONINFO osversion;
osversion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@ -386,7 +386,7 @@ bool nsToolkit::InitVersionInfo()
}
}
return PR_TRUE;
return true;
}
//-------------------------------------------------------------------------
@ -394,7 +394,7 @@ bool nsToolkit::InitVersionInfo()
//
//-------------------------------------------------------------------------
MouseTrailer::MouseTrailer() : mMouseTrailerWindow(nsnull), mCaptureWindow(nsnull),
mIsInCaptureMode(PR_FALSE), mEnabled(PR_TRUE)
mIsInCaptureMode(false), mEnabled(true)
{
}
//-------------------------------------------------------------------------
@ -427,7 +427,7 @@ void MouseTrailer::SetCaptureWindow(HWND aWnd)
{
mCaptureWindow = aWnd;
if (mCaptureWindow) {
mIsInCaptureMode = PR_TRUE;
mIsInCaptureMode = true;
}
}
@ -485,7 +485,7 @@ void MouseTrailer::TimerProc(nsITimer* aTimer, void* aClosure)
// it if we were capturing and now this is the first timer callback
// since we canceled the capture
mtrailer->mMouseTrailerWindow = nsnull;
mtrailer->mIsInCaptureMode = PR_FALSE;
mtrailer->mIsInCaptureMode = false;
return;
}
}

4
widget/src/windows/nsToolkit.h
View File

@ -132,8 +132,8 @@ public:
void SetMouseTrailerWindow(HWND aWnd);
void SetCaptureWindow(HWND aWnd);
void Disable() { mEnabled = PR_FALSE; DestroyTimer(); }
void Enable() { mEnabled = PR_TRUE; CreateTimer(); }
void Disable() { mEnabled = false; DestroyTimer(); }
void Enable() { mEnabled = true; CreateTimer(); }
void DestroyTimer();
MouseTrailer();

22
widget/src/windows/nsUXThemeData.cpp
View File

@ -67,9 +67,9 @@ nsUXThemeData::sDwmDLL = NULL;
BOOL
nsUXThemeData::sFlatMenus = FALSE;
bool
nsUXThemeData::sIsXPOrLater = PR_FALSE;
nsUXThemeData::sIsXPOrLater = false;
bool
nsUXThemeData::sIsVistaOrLater = PR_FALSE;
nsUXThemeData::sIsVistaOrLater = false;
bool nsUXThemeData::sTitlebarInfoPopulatedAero = false;
bool nsUXThemeData::sTitlebarInfoPopulatedThemed = false;
@ -148,7 +148,7 @@ nsUXThemeData::Initialize()
dwmSetWindowAttributePtr = (DwmSetWindowAttributeProc)::GetProcAddress(sDwmDLL, "DwmSetWindowAttribute");
dwmInvalidateIconicBitmapsPtr = (DwmInvalidateIconicBitmapsProc)::GetProcAddress(sDwmDLL, "DwmInvalidateIconicBitmaps");
dwmDwmDefWindowProcPtr = (DwmDefWindowProcProc)::GetProcAddress(sDwmDLL, "DwmDefWindowProc");
CheckForCompositor(PR_TRUE);
CheckForCompositor(true);
}
#endif
@ -164,15 +164,15 @@ nsUXThemeData::Invalidate() {
}
}
if (sIsXPOrLater) {
BOOL useFlat = PR_FALSE;
BOOL useFlat = false;
sFlatMenus = ::SystemParametersInfo(SPI_GETFLATMENU, 0, &useFlat, 0) ?
useFlat : PR_FALSE;
useFlat : false;
} else {
// Contrary to Microsoft's documentation, SPI_GETFLATMENU will not fail
// on Windows 2000, and it is also possible (though unlikely) for WIN2K
// to be misconfigured in such a way that it would return true, so we
// shall give WIN2K special treatment
sFlatMenus = PR_FALSE;
sFlatMenus = false;
}
}
@ -289,7 +289,7 @@ nsUXThemeData::UpdateTitlebarInfo(HWND aWnd)
sizeof(captionButtons)))) {
sCommandButtons[CMDBUTTONIDX_BUTTONBOX].cx = captionButtons.right - captionButtons.left - 3;
sCommandButtons[CMDBUTTONIDX_BUTTONBOX].cy = (captionButtons.bottom - captionButtons.top) - 1;
sTitlebarInfoPopulatedAero = PR_TRUE;
sTitlebarInfoPopulatedAero = true;
}
}
#endif
@ -348,7 +348,7 @@ nsUXThemeData::UpdateTitlebarInfo(HWND aWnd)
sCommandButtons[2].cx = info.rgrect[5].right - info.rgrect[5].left;
sCommandButtons[2].cy = info.rgrect[5].bottom - info.rgrect[5].top;
sTitlebarInfoPopulatedThemed = PR_TRUE;
sTitlebarInfoPopulatedThemed = true;
}
// visual style (aero glass, aero basic)
@ -378,7 +378,7 @@ LookAndFeel::WindowsTheme
nsUXThemeData::sThemeId = LookAndFeel::eWindowsTheme_Generic;
bool
nsUXThemeData::sIsDefaultWindowsTheme = PR_FALSE;
nsUXThemeData::sIsDefaultWindowsTheme = false;
// static
LookAndFeel::WindowsTheme
@ -400,7 +400,7 @@ nsUXThemeData::UpdateNativeThemeInfo()
// Trigger a refresh of themed button metrics if needed
sTitlebarInfoPopulatedThemed = (nsWindow::GetWindowsVersion() < VISTA_VERSION);
sIsDefaultWindowsTheme = PR_FALSE;
sIsDefaultWindowsTheme = false;
sThemeId = LookAndFeel::eWindowsTheme_Generic;
if (!IsAppThemed() || !getCurrentThemeName) {
@ -434,7 +434,7 @@ nsUXThemeData::UpdateNativeThemeInfo()
return;
if (theme == WINTHEME_AERO || theme == WINTHEME_LUNA)
sIsDefaultWindowsTheme = PR_TRUE;
sIsDefaultWindowsTheme = true;
if (theme != WINTHEME_LUNA) {
switch(theme) {

110
widget/src/windows/nsWinGesture.cpp
View File

@ -76,11 +76,11 @@ nsWinGesture::CloseTouchInputHandlePtr nsWinGesture::closeTouchInputHandle = nsn
static bool gEnableSingleFingerPanEvents = false;
nsWinGesture::nsWinGesture() :
mPanActive(PR_FALSE),
mFeedbackActive(PR_FALSE),
mXAxisFeedback(PR_FALSE),
mYAxisFeedback(PR_FALSE),
mPanInertiaActive(PR_FALSE)
mPanActive(false),
mFeedbackActive(false),
mXAxisFeedback(false),
mYAxisFeedback(false),
mPanInertiaActive(false)
{
(void)InitLibrary();
mPixelScrollOverflow = 0;
@ -91,9 +91,9 @@ nsWinGesture::nsWinGesture() :
bool nsWinGesture::InitLibrary()
{
if (getGestureInfo) {
return PR_TRUE;
return true;
} else if (sLibraryHandle) {
return PR_FALSE;
return false;
}
sLibraryHandle = ::LoadLibraryW(kGestureLibraryName);
@ -119,7 +119,7 @@ bool nsWinGesture::InitLibrary()
getGestureExtraArgs = nsnull;
setGestureConfig = nsnull;
getGestureConfig = nsnull;
return PR_FALSE;
return false;
}
if (!registerTouchWindow || !unregisterTouchWindow || !getTouchInputInfo || !closeTouchInputHandle) {
@ -147,7 +147,7 @@ bool nsWinGesture::InitLibrary()
gEnableSingleFingerPanEvents =
Preferences::GetBool("gestures.enable_single_finger_input", false);
return PR_TRUE;
return true;
}
#define GCOUNT 5
@ -155,7 +155,7 @@ bool nsWinGesture::InitLibrary()
bool nsWinGesture::SetWinGestureSupport(HWND hWnd, nsGestureNotifyEvent::ePanDirection aDirection)
{
if (!getGestureInfo)
return PR_FALSE;
return false;
GESTURECONFIG config[GCOUNT];
@ -214,7 +214,7 @@ bool nsWinGesture::IsAvailable()
bool nsWinGesture::RegisterTouchWindow(HWND hWnd)
{
if (!registerTouchWindow)
return PR_FALSE;
return false;
return registerTouchWindow(hWnd, TWF_WANTPALM);
}
@ -222,7 +222,7 @@ bool nsWinGesture::RegisterTouchWindow(HWND hWnd)
bool nsWinGesture::UnregisterTouchWindow(HWND hWnd)
{
if (!unregisterTouchWindow)
return PR_FALSE;
return false;
return unregisterTouchWindow(hWnd);
}
@ -230,7 +230,7 @@ bool nsWinGesture::UnregisterTouchWindow(HWND hWnd)
bool nsWinGesture::GetTouchInputInfo(HTOUCHINPUT hTouchInput, PRUint32 cInputs, PTOUCHINPUT pInputs)
{
if (!getTouchInputInfo)
return PR_FALSE;
return false;
return getTouchInputInfo(hTouchInput, cInputs, pInputs, sizeof(TOUCHINPUT));
}
@ -238,7 +238,7 @@ bool nsWinGesture::GetTouchInputInfo(HTOUCHINPUT hTouchInput, PRUint32 cInputs,
bool nsWinGesture::CloseTouchInputHandle(HTOUCHINPUT hTouchInput)
{
if (!closeTouchInputHandle)
return PR_FALSE;
return false;
return closeTouchInputHandle(hTouchInput);
}
@ -246,7 +246,7 @@ bool nsWinGesture::CloseTouchInputHandle(HTOUCHINPUT hTouchInput)
bool nsWinGesture::GetGestureInfo(HGESTUREINFO hGestureInfo, PGESTUREINFO pGestureInfo)
{
if (!getGestureInfo || !hGestureInfo || !pGestureInfo)
return PR_FALSE;
return false;
ZeroMemory(pGestureInfo, sizeof(GESTUREINFO));
pGestureInfo->cbSize = sizeof(GESTUREINFO);
@ -257,7 +257,7 @@ bool nsWinGesture::GetGestureInfo(HGESTUREINFO hGestureInfo, PGESTUREINFO pGestu
bool nsWinGesture::CloseGestureInfoHandle(HGESTUREINFO hGestureInfo)
{
if (!getGestureInfo || !hGestureInfo)
return PR_FALSE;
return false;
return closeGestureInfoHandle(hGestureInfo);
}
@ -265,7 +265,7 @@ bool nsWinGesture::CloseGestureInfoHandle(HGESTUREINFO hGestureInfo)
bool nsWinGesture::GetGestureExtraArgs(HGESTUREINFO hGestureInfo, UINT cbExtraArgs, PBYTE pExtraArgs)
{
if (!getGestureInfo || !hGestureInfo || !pExtraArgs)
return PR_FALSE;
return false;
return getGestureExtraArgs(hGestureInfo, cbExtraArgs, pExtraArgs);
}
@ -273,7 +273,7 @@ bool nsWinGesture::GetGestureExtraArgs(HGESTUREINFO hGestureInfo, UINT cbExtraAr
bool nsWinGesture::SetGestureConfig(HWND hWnd, UINT cIDs, PGESTURECONFIG pGestureConfig)
{
if (!getGestureInfo || !pGestureConfig)
return PR_FALSE;
return false;
return setGestureConfig(hWnd, 0, cIDs, pGestureConfig, sizeof(GESTURECONFIG));
}
@ -281,7 +281,7 @@ bool nsWinGesture::SetGestureConfig(HWND hWnd, UINT cIDs, PGESTURECONFIG pGestur
bool nsWinGesture::GetGestureConfig(HWND hWnd, DWORD dwFlags, PUINT pcIDs, PGESTURECONFIG pGestureConfig)
{
if (!getGestureInfo || !pGestureConfig)
return PR_FALSE;
return false;
return getGestureConfig(hWnd, 0, dwFlags, pcIDs, pGestureConfig, sizeof(GESTURECONFIG));
}
@ -289,7 +289,7 @@ bool nsWinGesture::GetGestureConfig(HWND hWnd, DWORD dwFlags, PUINT pcIDs, PGEST
bool nsWinGesture::BeginPanningFeedback(HWND hWnd)
{
if (!beginPanningFeedback)
return PR_FALSE;
return false;
return beginPanningFeedback(hWnd);
}
@ -297,7 +297,7 @@ bool nsWinGesture::BeginPanningFeedback(HWND hWnd)
bool nsWinGesture::EndPanningFeedback(HWND hWnd)
{
if (!beginPanningFeedback)
return PR_FALSE;
return false;
return endPanningFeedback(hWnd, TRUE);
}
@ -305,7 +305,7 @@ bool nsWinGesture::EndPanningFeedback(HWND hWnd)
bool nsWinGesture::UpdatePanningFeedback(HWND hWnd, LONG offsetX, LONG offsetY, BOOL fInInertia)
{
if (!beginPanningFeedback)
return PR_FALSE;
return false;
return updatePanningFeedback(hWnd, offsetX, offsetY, fInInertia);
}
@ -319,12 +319,12 @@ bool nsWinGesture::IsPanEvent(LPARAM lParam)
BOOL result = GetGestureInfo((HGESTUREINFO)lParam, &gi);
if (!result)
return PR_FALSE;
return false;
if (gi.dwID == GID_PAN)
return PR_TRUE;
return true;
return PR_FALSE;
return false;
}
/* Gesture event processing */
@ -339,7 +339,7 @@ nsWinGesture::ProcessGestureMessage(HWND hWnd, WPARAM wParam, LPARAM lParam, nsS
BOOL result = GetGestureInfo((HGESTUREINFO)lParam, &gi);
if (!result)
return PR_FALSE;
return false;
// The coordinates of this event
nsPointWin coord;
@ -356,7 +356,7 @@ nsWinGesture::ProcessGestureMessage(HWND hWnd, WPARAM wParam, LPARAM lParam, nsS
case GID_BEGIN:
case GID_END:
// These should always fall through to DefWndProc
return PR_FALSE;
return false;
break;
case GID_ZOOM:
@ -434,7 +434,7 @@ nsWinGesture::ProcessGestureMessage(HWND hWnd, WPARAM wParam, LPARAM lParam, nsS
break;
}
return PR_TRUE;
return true;
}
bool
@ -447,7 +447,7 @@ nsWinGesture::ProcessPanMessage(HWND hWnd, WPARAM wParam, LPARAM lParam)
BOOL result = GetGestureInfo((HGESTUREINFO)lParam, &gi);
if (!result)
return PR_FALSE;
return false;
// The coordinates of this event
nsPointWin coord;
@ -461,7 +461,7 @@ nsWinGesture::ProcessPanMessage(HWND hWnd, WPARAM wParam, LPARAM lParam)
case GID_BEGIN:
case GID_END:
// These should always fall through to DefWndProc
return PR_FALSE;
return false;
break;
// Setup pixel scroll events for both axis
@ -470,8 +470,8 @@ nsWinGesture::ProcessPanMessage(HWND hWnd, WPARAM wParam, LPARAM lParam)
if (gi.dwFlags & GF_BEGIN) {
mPanIntermediate = coord;
mPixelScrollDelta = 0;
mPanActive = PR_TRUE;
mPanInertiaActive = PR_FALSE;
mPanActive = true;
mPanInertiaActive = false;
}
else {
@ -488,25 +488,25 @@ nsWinGesture::ProcessPanMessage(HWND hWnd, WPARAM wParam, LPARAM lParam)
mPanIntermediate = coord;
if (gi.dwFlags & GF_INERTIA)
mPanInertiaActive = PR_TRUE;
mPanInertiaActive = true;
if (gi.dwFlags & GF_END) {
mPanActive = PR_FALSE;
mPanInertiaActive = PR_FALSE;
PanFeedbackFinalize(hWnd, PR_TRUE);
mPanActive = false;
mPanInertiaActive = false;
PanFeedbackFinalize(hWnd, true);
}
}
}
break;
}
return PR_TRUE;
return true;
}
inline bool TestTransition(PRInt32 a, PRInt32 b)
{
// If a is zero, overflow is zero, implying the cursor has moved back to the start position.
// If b is zero, cached overscroll is zero, implying feedback just begun.
if (a == 0 || b == 0) return PR_TRUE;
if (a == 0 || b == 0) return true;
// Test for different signs.
return (a < 0) == (b < 0);
}
@ -519,10 +519,10 @@ nsWinGesture::UpdatePanFeedbackX(HWND hWnd, PRInt32 scrollOverflow, bool& endFee
if (scrollOverflow != 0) {
if (!mFeedbackActive) {
BeginPanningFeedback(hWnd);
mFeedbackActive = PR_TRUE;
mFeedbackActive = true;
}
endFeedback = PR_FALSE;
mXAxisFeedback = PR_TRUE;
endFeedback = false;
mXAxisFeedback = true;
return;
}
@ -536,7 +536,7 @@ nsWinGesture::UpdatePanFeedbackX(HWND hWnd, PRInt32 scrollOverflow, bool& endFee
// Cache the total over scroll in pixels.
mPixelScrollOverflow.x = newOverflow;
endFeedback = PR_FALSE;
endFeedback = false;
}
}
@ -548,10 +548,10 @@ nsWinGesture::UpdatePanFeedbackY(HWND hWnd, PRInt32 scrollOverflow, bool& endFee
if (scrollOverflow != 0) {
if (!mFeedbackActive) {
BeginPanningFeedback(hWnd);
mFeedbackActive = PR_TRUE;
mFeedbackActive = true;
}
endFeedback = PR_FALSE;
mYAxisFeedback = PR_TRUE;
endFeedback = false;
mYAxisFeedback = true;
return;
}
@ -565,7 +565,7 @@ nsWinGesture::UpdatePanFeedbackY(HWND hWnd, PRInt32 scrollOverflow, bool& endFee
// Cache the total over scroll in pixels.
mPixelScrollOverflow.y = newOverflow;
endFeedback = PR_FALSE;
endFeedback = false;
}
}
@ -576,9 +576,9 @@ nsWinGesture::PanFeedbackFinalize(HWND hWnd, bool endFeedback)
return;
if (endFeedback) {
mFeedbackActive = PR_FALSE;
mXAxisFeedback = PR_FALSE;
mYAxisFeedback = PR_FALSE;
mFeedbackActive = false;
mXAxisFeedback = false;
mYAxisFeedback = false;
mPixelScrollOverflow = 0;
EndPanningFeedback(hWnd);
return;
@ -597,7 +597,7 @@ nsWinGesture::PanDeltaToPixelScrollX(nsMouseScrollEvent& evt)
// panning back from a max feedback position. This keeps the original drag point
// constant.
if (mXAxisFeedback)
return PR_FALSE;
return false;
if (mPixelScrollDelta.x != 0)
{
@ -608,9 +608,9 @@ nsWinGesture::PanDeltaToPixelScrollX(nsMouseScrollEvent& evt)
evt.delta = mPixelScrollDelta.x;
evt.refPoint.x = mPanRefPoint.x;
evt.refPoint.y = mPanRefPoint.y;
return PR_TRUE;
return true;
}
return PR_FALSE;
return false;
}
bool
@ -623,7 +623,7 @@ nsWinGesture::PanDeltaToPixelScrollY(nsMouseScrollEvent& evt)
// panning back from a max feedback position. This keeps the original drag point
// constant.
if (mYAxisFeedback)
return PR_FALSE;
return false;
if (mPixelScrollDelta.y != 0)
{
@ -634,7 +634,7 @@ nsWinGesture::PanDeltaToPixelScrollY(nsMouseScrollEvent& evt)
evt.delta = mPixelScrollDelta.y;
evt.refPoint.x = mPanRefPoint.x;
evt.refPoint.y = mPanRefPoint.y;
return PR_TRUE;
return true;
}
return PR_FALSE;
return false;
}

596
widget/src/windows/nsWindow.cpp
View File

File diff suppressed because it is too large Load Diff

4
widget/src/windows/nsWindowDbg.h
View File

@ -63,8 +63,8 @@
// Main event loop debug output flags
#if defined(EVENT_DEBUG_OUTPUT)
#define SHOW_REPEAT_EVENTS PR_TRUE
#define SHOW_MOUSEMOVE_EVENTS PR_FALSE
#define SHOW_REPEAT_EVENTS true
#define SHOW_MOUSEMOVE_EVENTS false
#endif // defined(EVENT_DEBUG_OUTPUT)
#if defined(POPUP_ROLLUP_DEBUG_OUTPUT) || defined(EVENT_DEBUG_OUTPUT) || 1

30
widget/src/windows/nsWindowGfx.cpp
View File

@ -226,7 +226,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
// but view manager will refuse to paint the surface, resulting is black
// flashes on the plugin rendering surface.
if (mozilla::ipc::RPCChannel::IsSpinLoopActive() && mPainting)
return PR_FALSE;
return false;
if (mWindowType == eWindowType_plugin) {
@ -243,7 +243,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
PAINTSTRUCT ps;
BeginPaint(mWnd, &ps);
EndPaint(mWnd, &ps);
return PR_TRUE;
return true;
}
PluginInstanceParent* instance = reinterpret_cast<PluginInstanceParent*>(
@ -251,12 +251,12 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
if (instance) {
instance->CallUpdateWindow();
ValidateRect(mWnd, NULL);
return PR_TRUE;
return true;
}
}
nsPaintEvent willPaintEvent(PR_TRUE, NS_WILL_PAINT, this);
willPaintEvent.willSendDidPaint = PR_TRUE;
nsPaintEvent willPaintEvent(true, NS_WILL_PAINT, this);
willPaintEvent.willSendDidPaint = true;
DispatchWindowEvent(&willPaintEvent);
bool result = true;
@ -279,7 +279,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
}
#endif
mPainting = PR_TRUE;
mPainting = true;
#ifdef WIDGET_DEBUG_OUTPUT
HRGN debugPaintFlashRegion = NULL;
@ -299,7 +299,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
}
// generate the event and call the event callback
nsPaintEvent event(PR_TRUE, NS_PAINT, this);
nsPaintEvent event(true, NS_PAINT, this);
InitEvent(event);
#ifdef MOZ_XUL
@ -308,7 +308,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
bool forceRepaint = NULL != aDC;
#endif
event.region = GetRegionToPaint(forceRepaint, ps, hDC);
event.willSendDidPaint = PR_TRUE;
event.willSendDidPaint = true;
if (!event.region.IsEmpty() && mEventCallback)
{
@ -400,7 +400,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
const nsIntRect* r;
for (nsIntRegionRectIterator iter(event.region);
(r = iter.Next()) != nsnull;) {
thebesContext->Rectangle(gfxRect(r->x, r->y, r->width, r->height), PR_TRUE);
thebesContext->Rectangle(gfxRect(r->x, r->y, r->width, r->height), true);
}
thebesContext->Clip();
thebesContext->SetOperator(gfxContext::OPERATOR_CLEAR);
@ -566,7 +566,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
// When our device was removed, we should have gfxWindowsPlatform
// check if its render mode is up to date!
gfxWindowsPlatform::GetPlatform()->UpdateRenderMode();
Invalidate(PR_FALSE);
Invalidate(false);
}
}
break;
@ -577,7 +577,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
gfxWindowsPlatform::GetPlatform()->UpdateRenderMode();
LayerManagerD3D10 *layerManagerD3D10 = static_cast<mozilla::layers::LayerManagerD3D10*>(GetLayerManager());
if (layerManagerD3D10->device() != gfxWindowsPlatform::GetPlatform()->GetD3D10Device()) {
Invalidate(PR_FALSE);
Invalidate(false);
} else {
result = DispatchWindowEvent(&event, eventStatus);
}
@ -613,12 +613,12 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
}
#endif // WIDGET_DEBUG_OUTPUT
mPainting = PR_FALSE;
mPainting = false;
nsPaintEvent didPaintEvent(PR_TRUE, NS_DID_PAINT, this);
nsPaintEvent didPaintEvent(true, NS_DID_PAINT, this);
DispatchWindowEvent(&didPaintEvent);
if (aNestingLevel == 0 && ::GetUpdateRect(mWnd, NULL, PR_FALSE)) {
if (aNestingLevel == 0 && ::GetUpdateRect(mWnd, NULL, false)) {
OnPaint(aDC, 1);
}
@ -751,7 +751,7 @@ bool nsWindowGfx::IsCursorTranslucencySupported()
static bool didCheck = false;
static bool isSupported = false;
if (!didCheck) {
didCheck = PR_TRUE;
didCheck = true;
// Cursor translucency is supported on Windows XP and newer
isSupported = nsWindow::GetWindowsVersion() >= 0x501;
}