mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1766561 - Add missing l modifier for HRESULT formatting. r=media-playback-reviewers,gfx-reviewers,nika,necko-reviewers,rkraesig,alwu,kershaw 

Differential Revision: https://phabricator.services.mozilla.com/D144915
This commit is contained in:
Mike Hommey 2022-05-03 20:49:07 +00:00
Родитель 12df1ed1b6
Коммит 1663cab462
14 изменённых файлов: 70 добавлений и 67 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
dom/media/platforms/wmf/DXVA2Manager.cpp
Просмотреть файл

@ -361,8 +361,8 @@ D3D9DXVA2Manager::Init(layers::KnowsCompositor* aKnowsCompositor,
D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
(D3DFORMAT)MAKEFOURCC('N', 'V', '1', '2'), D3DFMT_X8R8G8B8);
if (!SUCCEEDED(hr)) {
aFailureReason =
nsPrintfCString("CheckDeviceFormatConversion failed with error %X", hr);
aFailureReason = nsPrintfCString(
"CheckDeviceFormatConversion failed with error %lX", hr);
return hr;
}
@ -385,7 +385,8 @@ D3D9DXVA2Manager::Init(layers::KnowsCompositor* aKnowsCompositor,
D3DCREATE_MIXED_VERTEXPROCESSING,
&params, nullptr, getter_AddRefs(device));
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString("CreateDeviceEx failed with error %X", hr);
aFailureReason =
nsPrintfCString("CreateDeviceEx failed with error %lX", hr);
return hr;
}
@ -397,7 +398,7 @@ D3D9DXVA2Manager::Init(layers::KnowsCompositor* aKnowsCompositor,
hr = device->CreateQuery(D3DQUERYTYPE_EVENT, getter_AddRefs(query));
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString("CreateQuery failed with error %X", hr);
aFailureReason = nsPrintfCString("CreateQuery failed with error %lX", hr);
return hr;
}
@ -409,13 +410,13 @@ D3D9DXVA2Manager::Init(layers::KnowsCompositor* aKnowsCompositor,
getter_AddRefs(deviceManager));
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"DXVA2CreateDirect3DDeviceManager9 failed with error %X", hr);
"DXVA2CreateDirect3DDeviceManager9 failed with error %lX", hr);
return hr;
}
hr = deviceManager->ResetDevice(device, resetToken);
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"IDirect3DDeviceManager9::ResetDevice failed with error %X", hr);
"IDirect3DDeviceManager9::ResetDevice failed with error %lX", hr);
return hr;
}
@ -424,7 +425,7 @@ D3D9DXVA2Manager::Init(layers::KnowsCompositor* aKnowsCompositor,
hr = deviceManager->OpenDeviceHandle(&deviceHandle);
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"IDirect3DDeviceManager9::OpenDeviceHandle failed with error %X", hr);
"IDirect3DDeviceManager9::OpenDeviceHandle failed with error %lX", hr);
return hr;
}
@ -433,7 +434,8 @@ D3D9DXVA2Manager::Init(layers::KnowsCompositor* aKnowsCompositor,
deviceManager->CloseDeviceHandle(deviceHandle);
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"IDirectXVideoDecoderServer::GetVideoService failed with error %X", hr);
"IDirectXVideoDecoderServer::GetVideoService failed with error %lX",
hr);
return hr;
}
@ -443,7 +445,7 @@ D3D9DXVA2Manager::Init(layers::KnowsCompositor* aKnowsCompositor,
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"IDirectXVideoDecoderServer::GetDecoderDeviceGuids failed with error "
"%X",
"%lX",
hr);
return hr;
}
@ -468,7 +470,7 @@ D3D9DXVA2Manager::Init(layers::KnowsCompositor* aKnowsCompositor,
hr = d3d9Ex->GetAdapterIdentifier(D3DADAPTER_DEFAULT, 0, &adapter);
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"IDirect3D9Ex::GetAdapterIdentifier failed with error %X", hr);
"IDirect3D9Ex::GetAdapterIdentifier failed with error %lX", hr);
return hr;
}
@ -909,14 +911,14 @@ D3D11DXVA2Manager::InitInternal(layers::KnowsCompositor* aKnowsCompositor,
getter_AddRefs(mDXGIDeviceManager));
if (!SUCCEEDED(hr)) {
aFailureReason =
nsPrintfCString("MFCreateDXGIDeviceManager failed with code %X", hr);
nsPrintfCString("MFCreateDXGIDeviceManager failed with code %lX", hr);
return hr;
}
hr = mDXGIDeviceManager->ResetDevice(mDevice, mDeviceManagerToken);
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"IMFDXGIDeviceManager::ResetDevice failed with code %X", hr);
"IMFDXGIDeviceManager::ResetDevice failed with code %lX", hr);
return hr;
}
@ -933,7 +935,7 @@ D3D11DXVA2Manager::InitInternal(layers::KnowsCompositor* aKnowsCompositor,
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"MFTDecoder::Create of Video Processor MFT for color conversion "
"failed with code %X",
"failed with code %lX",
hr);
return;
}
@ -943,7 +945,7 @@ D3D11DXVA2Manager::InitInternal(layers::KnowsCompositor* aKnowsCompositor,
if (!SUCCEEDED(hr)) {
aFailureReason = nsPrintfCString(
"MFTDecoder::SendMFTMessage(MFT_MESSAGE_"
"SET_D3D_MANAGER) failed with code %X",
"SET_D3D_MANAGER) failed with code %lX",
hr);
return;
}
@ -959,7 +961,7 @@ D3D11DXVA2Manager::InitInternal(layers::KnowsCompositor* aKnowsCompositor,
static_cast<IDXGIDevice**>(getter_AddRefs(dxgiDevice)));
if (!SUCCEEDED(hr)) {
aFailureReason =
nsPrintfCString("QI to IDXGIDevice failed with code %X", hr);
nsPrintfCString("QI to IDXGIDevice failed with code %lX", hr);
return hr;
}
@ -967,7 +969,7 @@ D3D11DXVA2Manager::InitInternal(layers::KnowsCompositor* aKnowsCompositor,
hr = dxgiDevice->GetAdapter(adapter.StartAssignment());
if (!SUCCEEDED(hr)) {
aFailureReason =
nsPrintfCString("IDXGIDevice::GetAdapter failed with code %X", hr);
nsPrintfCString("IDXGIDevice::GetAdapter failed with code %lX", hr);
return hr;
}
@ -975,7 +977,7 @@ D3D11DXVA2Manager::InitInternal(layers::KnowsCompositor* aKnowsCompositor,
hr = adapter->GetDesc(&adapterDesc);
if (!SUCCEEDED(hr)) {
aFailureReason =
nsPrintfCString("IDXGIAdapter::GetDesc failed with code %X", hr);
nsPrintfCString("IDXGIAdapter::GetDesc failed with code %lX", hr);
return hr;
}

4
dom/media/platforms/wmf/MFTDecoder.cpp
Просмотреть файл

@ -74,7 +74,7 @@ MFTDecoder::Create(const GUID& aCategory, const GUID& aInSubtype,
delete inInfo;
delete outInfo;
if (FAILED(hr)) {
NS_WARNING(nsPrintfCString("MFTEnumEx failed with code %x", hr).get());
NS_WARNING(nsPrintfCString("MFTEnumEx failed with code %lx", hr).get());
return hr;
}
if (actsNum == 0) {
@ -98,7 +98,7 @@ MFTDecoder::Create(const GUID& aCategory, const GUID& aInSubtype,
IID_PPV_ARGS(static_cast<IMFTransform**>(getter_AddRefs(mDecoder))));
NS_WARNING_ASSERTION(
SUCCEEDED(hr),
nsPrintfCString("IMFActivate::ActivateObject failed with code %x", hr)
nsPrintfCString("IMFActivate::ActivateObject failed with code %lx", hr)
.get());
return hr;
}

2
dom/media/platforms/wmf/WMFDecoderModule.cpp
Просмотреть файл

@ -142,7 +142,7 @@ void WMFDecoderModule::Init() {
// E_FAIL should be logged by CreateMFTDecoder. Skipping those codes
// will help to keep the logs readable.
WmfDecoderModuleMarkerAndLog("WMFInit Decoder Failed",
"%s failed with code 0x%x",
"%s failed with code 0x%lx",
StreamTypeToString(type), hr);
}
}

2
dom/media/platforms/wmf/WMFMediaDataDecoder.cpp
Просмотреть файл

@ -70,7 +70,7 @@ RefPtr<MediaDataDecoder::DecodePromise> WMFMediaDataDecoder::ProcessError(
// up to 3 times.
return DecodePromise::CreateAndReject(
MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
RESULT_DETAIL("%s:%x", aReason, aError)),
RESULT_DETAIL("%s:%lx", aReason, aError)),
__func__);
}

2
dom/media/platforms/wmf/WMFMediaDataEncoder.cpp
Просмотреть файл

@ -81,7 +81,7 @@ RefPtr<MediaDataEncoder::InitPromise> WMFMediaDataEncoder<T>::ProcessInit() {
mscom::EnsureMTA([&]() { hr = InitMFTEncoder(encoder); });
if (FAILED(hr)) {
WMF_ENC_LOGE("init MFTEncoder: error = 0x%X", hr);
WMF_ENC_LOGE("init MFTEncoder: error = 0x%lX", hr);
return InitPromise::CreateAndReject(
MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
RESULT_DETAIL("Can't create the MFT encoder.")),

2
dom/media/platforms/wmf/WMFVideoMFTManager.cpp
Просмотреть файл

@ -364,7 +364,7 @@ MediaResult WMFVideoMFTManager::InitInternal() {
mUseHwAccel = true;
} else {
mDXVAFailureReason = nsPrintfCString(
"MFT_MESSAGE_SET_D3D_MANAGER failed with code %X", hr);
"MFT_MESSAGE_SET_D3D_MANAGER failed with code %lX", hr);
}
} else {
mDXVAFailureReason.AssignLiteral(

8
gfx/webrender_bindings/DCLayerTree.cpp
Просмотреть файл

@ -105,7 +105,7 @@ bool DCLayerTree::Initialize(HWND aHwnd, nsACString& aError) {
(IDCompositionDesktopDevice**)getter_AddRefs(desktopDevice));
if (FAILED(hr)) {
aError.Assign(nsPrintfCString(
"DCLayerTree(get IDCompositionDesktopDevice failed %x)", hr));
"DCLayerTree(get IDCompositionDesktopDevice failed %lx)", hr));
return false;
}
@ -113,14 +113,14 @@ bool DCLayerTree::Initialize(HWND aHwnd, nsACString& aError) {
getter_AddRefs(mCompositionTarget));
if (FAILED(hr)) {
aError.Assign(nsPrintfCString(
"DCLayerTree(create DCompositionTarget failed %x)", hr));
"DCLayerTree(create DCompositionTarget failed %lx)", hr));
return false;
}
hr = mCompositionDevice->CreateVisual(getter_AddRefs(mRootVisual));
if (FAILED(hr)) {
aError.Assign(nsPrintfCString(
"DCLayerTree(create root DCompositionVisual failed %x)", hr));
"DCLayerTree(create root DCompositionVisual failed %lx)", hr));
return false;
}
@ -128,7 +128,7 @@ bool DCLayerTree::Initialize(HWND aHwnd, nsACString& aError) {
mCompositionDevice->CreateVisual(getter_AddRefs(mDefaultSwapChainVisual));
if (FAILED(hr)) {
aError.Assign(nsPrintfCString(
"DCLayerTree(create swap chain DCompositionVisual failed %x)", hr));
"DCLayerTree(create swap chain DCompositionVisual failed %lx)", hr));
return false;
}

2
gfx/webrender_bindings/RenderCompositorANGLE.cpp
Просмотреть файл

@ -308,7 +308,7 @@ bool RenderCompositorANGLE::CreateSwapChain(nsACString& aError) {
getter_AddRefs(mSwapChain));
if (FAILED(hr)) {
aError.Assign(
nsPrintfCString("RcANGLE(swap chain create failed %x)", hr));
nsPrintfCString("RcANGLE(swap chain create failed %lx)", hr));
return false;
}

8
ipc/mscom/InterceptorLog.cpp
Просмотреть файл

@ -294,7 +294,7 @@ void Logger::LogQI(HRESULT aResult, IUnknown* aTarget, REFIID aIid,
} else {
line.AppendLiteral("(IID Conversion Failed)");
}
line.AppendPrintf(", [out] 0x%p)\t0x%08X\n", aInterface, aResult);
line.AppendPrintf(", [out] 0x%p)\t0x%08lX\n", aInterface, aResult);
MutexAutoLock lock(mMutex);
mEntries.AppendElement(std::move(line));
@ -385,14 +385,14 @@ void Logger::CaptureFrame(ICallFrame* aCallFrame, IUnknown* aTargetInterface,
});
line.AppendLiteral(" }");
} else {
line.AppendPrintf("(GetParam failed with HRESULT 0x%08X)", hr);
line.AppendPrintf("(GetParam failed with HRESULT 0x%08lX)", hr);
}
} else {
VariantToString(paramValue, line);
}
} else if (hr != DISP_E_BADVARTYPE ||
!TryParamAsGuid(callInfo.iid, aCallFrame, paramInfo, line)) {
line.AppendPrintf("(GetParam failed with HRESULT 0x%08X)", hr);
line.AppendPrintf("(GetParam failed with HRESULT 0x%08lX)", hr);
}
if (paramIndex < callInfo.cParams - 1) {
line.AppendLiteral(", ");
@ -401,7 +401,7 @@ void Logger::CaptureFrame(ICallFrame* aCallFrame, IUnknown* aTargetInterface,
line.AppendLiteral(")\t");
HRESULT callResult = aCallFrame->GetReturnValue();
line.AppendPrintf("0x%08X\n", callResult);
line.AppendPrintf("0x%08lX\n", callResult);
aCapturedFrame = std::move(line);
}

12
ipc/mscom/ProxyStream.cpp
Просмотреть файл

@ -53,7 +53,7 @@ ProxyStream::ProxyStream(REFIID aIID, const BYTE* aInitBuf,
HRESULT createStreamResult =
CreateStream(aInitBuf, aInitBufSize, getter_AddRefs(mStream));
if (FAILED(createStreamResult)) {
nsPrintfCString hrAsStr("0x%08X", createStreamResult);
nsPrintfCString hrAsStr("0x%08lX", createStreamResult);
CrashReporter::AnnotateCrashReport(kCrashReportKey, hrAsStr);
return;
}
@ -134,7 +134,7 @@ ProxyStream::ProxyStream(REFIID aIID, const BYTE* aInitBuf,
mStream = nullptr;
if (FAILED(unmarshalResult) || !mUnmarshaledProxy) {
nsPrintfCString hrAsStr("0x%08X", unmarshalResult);
nsPrintfCString hrAsStr("0x%08lX", unmarshalResult);
CrashReporter::AnnotateCrashReport(
CrashReporter::Annotation::CoUnmarshalInterfaceResult, hrAsStr);
AnnotateInterfaceRegistration(aIID);
@ -350,14 +350,14 @@ ProxyStream::ProxyStream(REFIID aIID, IUnknown* aObject, Environment* aEnv,
}
if (FAILED(createStreamResult)) {
nsPrintfCString hrAsStr("0x%08X", createStreamResult);
nsPrintfCString hrAsStr("0x%08lX", createStreamResult);
CrashReporter::AnnotateCrashReport(
CrashReporter::Annotation::CreateStreamOnHGlobalFailure, hrAsStr);
}
if (FAILED(marshalResult)) {
AnnotateInterfaceRegistration(aIID);
nsPrintfCString hrAsStr("0x%08X", marshalResult);
nsPrintfCString hrAsStr("0x%08lX", marshalResult);
CrashReporter::AnnotateCrashReport(
CrashReporter::Annotation::CoMarshalInterfaceFailure, hrAsStr);
#if defined(ACCESSIBILITY)
@ -368,13 +368,13 @@ ProxyStream::ProxyStream(REFIID aIID, IUnknown* aObject, Environment* aEnv,
}
if (FAILED(statResult)) {
nsPrintfCString hrAsStr("0x%08X", statResult);
nsPrintfCString hrAsStr("0x%08lX", statResult);
CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::StatFailure,
hrAsStr);
}
if (FAILED(getHGlobalResult)) {
nsPrintfCString hrAsStr("0x%08X", getHGlobalResult);
nsPrintfCString hrAsStr("0x%08lX", getHGlobalResult);
CrashReporter::AnnotateCrashReport(
CrashReporter::Annotation::GetHGlobalFromStreamFailure, hrAsStr);
}

2
ipc/mscom/RegistrationAnnotator.cpp
Просмотреть файл

@ -193,7 +193,7 @@ static void CheckTlbPath(JSONWriter& aJson, const nsAString& aTypelibPath) {
RefPtr<ITypeLib> typeLib;
HRESULT hr = LoadTypeLibEx(buf.get(), REGKIND_NONE, getter_AddRefs(typeLib));
nsPrintfCString loadResult("0x%08X", hr);
nsPrintfCString loadResult("0x%08lX", hr);
aJson.StringProperty("LoadResult", loadResult);
}

4
netwerk/system/win32/nsNotifyAddrListener.cpp
Просмотреть файл

@ -191,14 +191,14 @@ void nsNotifyAddrListener::calculateNetworkId(void) {
HRESULT hr = CoCreateInstance(CLSID_NetworkListManager, nullptr, CLSCTX_ALL,
IID_INetworkListManager, getter_AddRefs(nlm));
if (NS_WARN_IF(FAILED(hr))) {
LOG(("CoCreateInstance error: %X", hr));
LOG(("CoCreateInstance error: %lX", hr));
return;
}
RefPtr<IEnumNetworks> enumNetworks;
hr = nlm->GetNetworks(NLM_ENUM_NETWORK_CONNECTED,
getter_AddRefs(enumNetworks));
if (NS_WARN_IF(FAILED(hr))) {
LOG(("GetNetworks error: %X", hr));
LOG(("GetNetworks error: %lX", hr));
return;
}

51
widget/windows/TSFTextStore.cpp
Просмотреть файл

@ -1511,7 +1511,7 @@ bool TSFStaticSink::Init(ITfThreadMgr* aThreadMgr,
if (FAILED(hr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFStaticSink::Init() FAILED to get ITfSource "
"instance (0x%08X)",
"instance (0x%08lX)",
this, hr));
return false;
}
@ -1525,7 +1525,7 @@ bool TSFStaticSink::Init(ITfThreadMgr* aThreadMgr,
if (FAILED(hr) || mIPProfileCookie == TF_INVALID_COOKIE) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFStaticSink::Init() FAILED to install "
"ITfInputProcessorProfileActivationSink (0x%08X)",
"ITfInputProcessorProfileActivationSink (0x%08lX)",
this, hr));
return false;
}
@ -1550,14 +1550,14 @@ void TSFStaticSink::Destroy() {
if (FAILED(hr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFStaticSink::Shutdown() FAILED to get "
"ITfSource instance (0x%08X)",
"ITfSource instance (0x%08lX)",
this, hr));
} else {
hr = source->UnadviseSink(mIPProfileCookie);
if (FAILED(hr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFTextStore::Shutdown() FAILED to uninstall "
"ITfInputProcessorProfileActivationSink (0x%08X)",
"ITfInputProcessorProfileActivationSink (0x%08lX)",
this, hr));
}
}
@ -1640,7 +1640,7 @@ bool TSFStaticSink::EnsureInitActiveTIPKeyboard() {
if (FAILED(hr) || !profileMgr) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFStaticSink::EnsureInitActiveLanguageProfile(), FAILED "
"to get input processor profile manager, hr=0x%08X",
"to get input processor profile manager, hr=0x%08lX",
this, hr));
return false;
}
@ -1651,7 +1651,7 @@ bool TSFStaticSink::EnsureInitActiveTIPKeyboard() {
MOZ_LOG(gIMELog, LogLevel::Info,
("0x%p TSFStaticSink::EnsureInitActiveLanguageProfile(), FAILED "
"to get active keyboard layout profile due to no active profile, "
"hr=0x%08X",
"hr=0x%08lX",
this, hr));
// XXX Should we call OnActivated() with arguments like non-TIP in this
// case?
@ -1660,7 +1660,7 @@ bool TSFStaticSink::EnsureInitActiveTIPKeyboard() {
if (FAILED(hr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFStaticSink::EnsureInitActiveLanguageProfile(), FAILED "
"to get active TIP keyboard, hr=0x%08X",
"to get active TIP keyboard, hr=0x%08lX",
this, hr));
return false;
}
@ -1690,7 +1690,7 @@ void TSFStaticSink::GetTIPDescription(REFCLSID aTextService, LANGID aLangID,
if (FAILED(hr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFStaticSink::InitActiveTIPDescription() FAILED "
"due to GetLanguageProfileDescription() failure, hr=0x%08X",
"due to GetLanguageProfileDescription() failure, hr=0x%08lX",
this, hr));
return;
}
@ -1713,7 +1713,7 @@ bool TSFStaticSink::IsTIPCategoryKeyboard(REFCLSID aTextService, LANGID aLangID,
if (FAILED(hr) || !enumLangProfiles) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFStaticSink::IsTIPCategoryKeyboard(), FAILED "
"to get language profiles enumerator, hr=0x%08X",
"to get language profiles enumerator, hr=0x%08lX",
this, hr));
return false;
}
@ -1881,7 +1881,7 @@ bool TSFTextStore::Init(nsWindow* aWidget, const InputContext& aContext) {
if (NS_WARN_IF(FAILED(hr))) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFTextStore::Init() FAILED to create ITfDocumentMgr "
"(0x%08X)",
"(0x%08lX)",
this, hr));
return false;
}
@ -1902,7 +1902,7 @@ bool TSFTextStore::Init(nsWindow* aWidget, const InputContext& aContext) {
if (NS_WARN_IF(FAILED(hr))) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFTextStore::Init() FAILED to create the context "
"(0x%08X)",
"(0x%08lX)",
this, hr));
return false;
}
@ -1918,7 +1918,7 @@ bool TSFTextStore::Init(nsWindow* aWidget, const InputContext& aContext) {
hr = documentMgr->Push(context);
if (NS_WARN_IF(FAILED(hr))) {
MOZ_LOG(gIMELog, LogLevel::Error,
("0x%p TSFTextStore::Init() FAILED to push the context (0x%08X)",
("0x%p TSFTextStore::Init() FAILED to push the context (0x%08lX)",
this, hr));
return false;
}
@ -6601,7 +6601,7 @@ bool TSFTextStore::GetIMEOpenState() {
if (NS_WARN_IF(FAILED(hr))) {
MOZ_LOG(gIMELog, LogLevel::Error,
("TSFTextStore::GetIMEOpenState() FAILED due to "
"ITfCompartment::GetValue() failure, hr=0x%08X",
"ITfCompartment::GetValue() failure, hr=0x%08lX",
hr));
return false;
}
@ -6743,15 +6743,16 @@ void TSFTextStore::Initialize() {
if (FAILED(hr) || !threadMgr) {
MOZ_LOG(gIMELog, LogLevel::Error,
(" TSFTextStore::Initialize() FAILED to "
"create the thread manager, hr=0x%08X",
"create the thread manager, hr=0x%08lX",
hr));
return;
}
hr = threadMgr->Activate(&sClientId);
if (FAILED(hr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
(" TSFTextStore::Initialize() FAILED to activate, hr=0x%08X", hr));
MOZ_LOG(
gIMELog, LogLevel::Error,
(" TSFTextStore::Initialize() FAILED to activate, hr=0x%08lX", hr));
return;
}
@ -6760,7 +6761,7 @@ void TSFTextStore::Initialize() {
if (FAILED(hr) || !disabledDocumentMgr) {
MOZ_LOG(gIMELog, LogLevel::Error,
(" TSFTextStore::Initialize() FAILED to create "
"a document manager for disabled mode, hr=0x%08X",
"a document manager for disabled mode, hr=0x%08lX",
hr));
return;
}
@ -6772,7 +6773,7 @@ void TSFTextStore::Initialize() {
if (FAILED(hr) || !disabledContext) {
MOZ_LOG(gIMELog, LogLevel::Error,
(" TSFTextStore::Initialize() FAILED to create "
"a context for disabled mode, hr=0x%08X",
"a context for disabled mode, hr=0x%08lX",
hr));
return;
}
@ -6821,7 +6822,7 @@ already_AddRefed<ITfMessagePump> TSFTextStore::GetMessagePump() {
if (NS_WARN_IF(FAILED(hr)) || NS_WARN_IF(!messagePump)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("TSFTextStore::GetMessagePump() FAILED to "
"QI message pump from the thread manager, hr=0x%08X",
"QI message pump from the thread manager, hr=0x%08lX",
hr));
return nullptr;
}
@ -6844,7 +6845,7 @@ TSFTextStore::GetDisplayAttributeMgr() {
if (NS_WARN_IF(FAILED(hr)) || NS_WARN_IF(!displayAttributeMgr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("TSFTextStore::GetDisplayAttributeMgr() FAILED to create "
"a display attribute manager instance, hr=0x%08X",
"a display attribute manager instance, hr=0x%08lX",
hr));
return nullptr;
}
@ -6865,7 +6866,7 @@ already_AddRefed<ITfCategoryMgr> TSFTextStore::GetCategoryMgr() {
if (NS_WARN_IF(FAILED(hr)) || NS_WARN_IF(!categoryMgr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("TSFTextStore::GetCategoryMgr() FAILED to create "
"a category manager instance, hr=0x%08X",
"a category manager instance, hr=0x%08lX",
hr));
return nullptr;
}
@ -6890,7 +6891,7 @@ already_AddRefed<ITfCompartment> TSFTextStore::GetCompartmentForOpenClose() {
if (NS_WARN_IF(FAILED(hr)) || NS_WARN_IF(!compartmentMgr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("TSFTextStore::GetCompartmentForOpenClose() FAILED due to"
"sThreadMgr not having ITfCompartmentMgr, hr=0x%08X",
"sThreadMgr not having ITfCompartmentMgr, hr=0x%08lX",
hr));
return nullptr;
}
@ -6901,7 +6902,7 @@ already_AddRefed<ITfCompartment> TSFTextStore::GetCompartmentForOpenClose() {
if (NS_WARN_IF(FAILED(hr)) || NS_WARN_IF(!compartment)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("TSFTextStore::GetCompartmentForOpenClose() FAILED due to"
"ITfCompartmentMgr::GetCompartment() failuere, hr=0x%08X",
"ITfCompartmentMgr::GetCompartment() failuere, hr=0x%08lX",
hr));
return nullptr;
}
@ -6928,7 +6929,7 @@ TSFTextStore::GetInputProcessorProfiles() {
if (NS_WARN_IF(FAILED(hr)) || NS_WARN_IF(!inputProcessorProfiles)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("TSFTextStore::GetInputProcessorProfiles() FAILED to create input "
"processor profiles, hr=0x%08X",
"processor profiles, hr=0x%08lX",
hr));
return nullptr;
}
@ -6978,7 +6979,7 @@ bool TSFTextStore::ProcessRawKeyMessage(const MSG& aMsg) {
if (NS_WARN_IF(FAILED(hr)) || NS_WARN_IF(!keystrokeMgr)) {
MOZ_LOG(gIMELog, LogLevel::Error,
("TSFTextStore::ProcessRawKeyMessage() FAILED to "
"QI keystroke manager from the thread manager, hr=0x%08X",
"QI keystroke manager from the thread manager, hr=0x%08lX",
hr));
return false;
}

2
widget/windows/nsPrintDialogUtil.cpp
Просмотреть файл

@ -283,7 +283,7 @@ static nsresult ShowNativePrintDialog(HWND aHWnd,
if (NS_WARN_IF(!SUCCEEDED(result))) {
#ifdef DEBUG
printf_stderr("PrintDlgExW failed with %x\n", result);
printf_stderr("PrintDlgExW failed with %lx\n", result);
#endif
return NS_ERROR_FAILURE;
}