wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 797316 - Fix -Werror=conversion-null errors in Windows-only code (dom/plugins part) r=joshmoz

Browse Source 
--HG--
extra : rebase_source : c62bc730aa7c1d4f8c00c41b3e5d21b1a6f59604
This commit is contained in:
Jacek Caban 2012-10-04 10:31:37 +02:00
parent b34bfbddbd
commit 50905a5c81
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@ -262,11 +262,12 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
// Certain assistive technologies don't want oop Flash, thus we have a special
// pref for them to disable oop Flash (refer to bug 785047 for details).
bool useA11yPref = false;
#ifdef XP_WIN
useA11yPref = a11y::Compatibility::IsJAWS();
#endif
#endif
#ifdef XP_WIN
useA11yPref = a11y::Compatibility::IsJAWS();
// On Windows Vista+, we force Flash to run in OOPP mode because Adobe
// doesn't test Flash in-process and there are known stability bugs.
if (aPluginTag->mIsFlashPlugin && IsVistaOrLater()) {

2
dom/plugins/base/nsPluginNativeWindowWin.cpp
View File

@ -694,7 +694,7 @@ nsresult nsPluginNativeWindowWin::SubclassAndAssociateWindow()
if (!mPluginWinProc)
return NS_ERROR_FAILURE;
nsPluginNativeWindowWin * win = (nsPluginNativeWindowWin *)::GetProp(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION);
DebugOnly<nsPluginNativeWindowWin *> win = (nsPluginNativeWindowWin *)::GetProp(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION);
NS_ASSERTION(!win || (win == this), "plugin window already has property and this is not us");
if (!::SetProp(hWnd, NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION, (HANDLE)this))

4
dom/plugins/base/nsPluginsDirWin.cpp
View File

@ -280,7 +280,7 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary **outLibrary)
}
if (restoreOrigDir) {
BOOL bCheck = SetCurrentDirectoryW(aOrigDir);
DebugOnly<BOOL> bCheck = SetCurrentDirectoryW(aOrigDir);
NS_ASSERTION(bCheck, "Error in Loading plugin");
}
@ -321,7 +321,7 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info, PRLibrary **outLibrary)
if (!verbuf)
return NS_ERROR_OUT_OF_MEMORY;
if (::GetFileVersionInfoW(lpFilepath, NULL, versionsize, verbuf))
if (::GetFileVersionInfoW(lpFilepath, 0, versionsize, verbuf))
{
// TODO: get appropriately-localized info from plugin file
UINT lang = 1033; // language = English

2
dom/plugins/ipc/NPEventWindows.h
View File

@ -98,7 +98,7 @@ struct ParamTraits<mozilla::plugins::NPRemoteEvent>
default:
// RegisterWindowMessage events should be passed.
if (paramCopy.event.event >= 0xC000 && paramCopy.event.event <= 0xFFFF)
if (paramCopy.event.event >= 0xC000)
break;
// FIXME/bug 567465: temporarily work around unhandled