[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml/rendering
From:       Koos Vriezen <koos.vriezen () xs4all ! nl>
Date:       2005-02-13 13:32:04
Message-ID: 20050213133204.7C3811C43C () office ! kde ! org
[Download RAW message or body]

CVS commit by vriezen: 

clsid for quicktime and wmp activex plugins


  M +11 -4     render_frames.cpp   1.194


--- kdelibs/khtml/rendering/render_frames.cpp  #1.193:1.194
@@ -680,5 +680,5 @@ void RenderPartObject::updateWidget()
               serviceType = "application/x-activex-handler";
 
-              if(objbase->classId.contains(QString::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000"))) \
{ +              if(objbase->classId.find(QString::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) \
>= 0) {  // It is ActiveX, but the nsplugin system handling
                   // should also work, that's why we don't override the
@@ -689,9 +689,16 @@ void RenderPartObject::updateWidget()
                   serviceType = "application/x-shockwave-flash";
               }
-              else if(objbase->classId.contains(QString::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")))
 +              else \
if(objbase->classId.find(QString::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) \
>= 0)  serviceType = "audio/x-pn-realaudio-plugin";
-              else if(objbase->classId.contains(QString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) \
                ||
-                      \
objbase->classId.contains(QString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")))
 +              else \
if(objbase->classId.find(QString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) \
>= 0 || +                      \
> objbase->classId.find(QString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) \
> >= 0)
                   serviceType = "application/x-java-applet";
+              // http://www.apple.com/quicktime/tools_tips/tutorials/activex.html
+              else if(objbase->classId.find(QString::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) \
>= 0) +                  serviceType = "video/quicktime";
+              // http://msdn.microsoft.com/library/en-us/dnwmt/html/adding_windows_media_to_web_pages__etse.asp?frame=true
 +              else \
if(objbase->classId.find(QString::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) \
>= 0 || +                      \
> objbase->classId.find(QString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) \
> >= 0)
+                  serviceType = "video/x-msvideo";
 
               else


[prev in list] [next in list] [prev in thread] [next in thread]