Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Real fix for Quicktime 4.x sweep bug 89407 r=av sr=blizzard

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_0_9_2_BRANCH@99223 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterlubczynski%netscape.com
2001-07-13 22:02:45 +00:00
parent f3637ccef7
commit 9fc63b895f
2 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -3810,27 +3810,13 @@ static PRBool isUnwantedPlugin(nsPluginTag * tag)
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"application/x-director"))
return PR_FALSE;
// these are Quicktime-only types so that wav and midi will register indirectly on QT4
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"image/x-quicktime"))
return PR_FALSE;
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"image/x-macpaint"))
return PR_FALSE;
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"video/quicktime"))
return PR_FALSE;
// Quicktime 5 puts seperates mpeg and midi in their own files
// XXX indirectly include MPEG by including this MIME-type in the same DLL
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"audio/vnd.qcelp"))
return PR_FALSE;
// XXX indirectly include MIDI, WAV, and AIF by including this MIME-type in the same DLL
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"audio/basic"))
return PR_FALSE;
}
// On Windows, we also want to include the Quicktime plugin from the 4.x directory
// But because it spans several DLL's, the best check for now is by filename
if (nsnull != PL_strcasestr(tag->mFileName,"npqtplugin"))
return PR_FALSE;
return PR_TRUE;
}

24
mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@@ -3810,27 +3810,13 @@ static PRBool isUnwantedPlugin(nsPluginTag * tag)
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"application/x-director"))
return PR_FALSE;
// these are Quicktime-only types so that wav and midi will register indirectly on QT4
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"image/x-quicktime"))
return PR_FALSE;
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"image/x-macpaint"))
return PR_FALSE;
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"video/quicktime"))
return PR_FALSE;
// Quicktime 5 puts seperates mpeg and midi in their own files
// XXX indirectly include MPEG by including this MIME-type in the same DLL
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"audio/vnd.qcelp"))
return PR_FALSE;
// XXX indirectly include MIDI, WAV, and AIF by including this MIME-type in the same DLL
if(nsnull == PL_strcasecmp(tag->mMimeTypeArray[i],"audio/basic"))
return PR_FALSE;
}
// On Windows, we also want to include the Quicktime plugin from the 4.x directory
// But because it spans several DLL's, the best check for now is by filename
if (nsnull != PL_strcasestr(tag->mFileName,"npqtplugin"))
return PR_FALSE;
return PR_TRUE;
}