PlugIn patch

Tom Hughes tom at compton.nu
Sun Oct 28 15:17:52 GMT 2001


The attached patch tidies up various minor bugs in the PlugIn module.

Specifically it corrects some typos where Plug was used as the prefix
instead of PlugIn; it fixes the type of the reason code in the Notify
message; and it introduces a consitent type for the notify data in all
the messages.

Tom

-- 
Tom Hughes (tom at compton.nu)
http://www.compton.nu/
-------------- next part --------------
Index: PlugIn
===================================================================
RCS file: /home/cvs/riscos/oslib/Source/User/PlugIn,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 PlugIn
--- PlugIn	14 Apr 2000 22:59:25 -0000	1.1.1.2
+++ PlugIn	28 Oct 2001 15:15:46 -0000
@@ -33,6 +33,9 @@
    PlugIn_BS "Abstract type for browser stream instance handles";
 
 TYPE
+   PlugIn_NotifyData = .Int;
+
+TYPE
    PlugIn_OpenFlags        = .Bits,
    PlugIn_OpeningFlags     = .Bits,
    PlugIn_CloseFlags       = .Bits,
@@ -63,16 +66,16 @@
    PlugIn_ClosedWithError     = PlugIn_ClosedFlags: 0x4;
 
 CONST
-   PlugIn_StreamNewType           = Plug_StreamNewFlags: 0xF,
+   PlugIn_StreamNewType           = PlugIn_StreamNewFlags: 0xF,
    PlugIn_StreamNewTypeShift      = .Int: 0,
    PlugIn_StreamNewTypeNormal     = .Int: 0,
    PlugIn_StreamNewTypeSeekOnly   = .Int: 1,
    PlugIn_StreamNewTypeAsFile     = .Int: 2,
    PlugIn_StreamNewTypeAsFileOnly = .Int: 3,
-   PlugIn_StreamNewSeekable       = Plug_StreamNewFlags: 0x10;
+   PlugIn_StreamNewSeekable       = PlugIn_StreamNewFlags: 0x10;
 
 CONST
-   PlugIn_StreamWriteDataType           = Plug_StreamWriteFlags: 0xF,
+   PlugIn_StreamWriteDataType           = PlugIn_StreamWriteFlags: 0xF,
    PlugIn_StreamWriteDataTypeShift      = .Int: 0,
    PlugIn_StreamWriteDataTypeString     = .Int: 0,
    PlugIn_StreamWriteDataTypeAnchor     = .Int: 1,
@@ -191,7 +194,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Int: notify_data,
+     PlugIn_NotifyData: notify_data,
      OS_StringValue: mime_type,
      OS_StringValue: target_window
   ),
@@ -206,7 +209,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      PlugIn_StreamDestroyReason: reason
   ),
 
@@ -220,7 +223,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      .Int: offset,
      .Int: length,
      .Ref .Data: data
@@ -236,7 +239,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      .Int: length
   ),
 
@@ -250,7 +253,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      OS_StringValue: filename
   ),
 
@@ -261,7 +264,7 @@
      PlugIn_B: browser,
      OS_StringValue: url,
      OS_StringValue: target_window,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      .Int: length,
      OS_StringValue: filename_or_data
   ),
@@ -272,8 +275,8 @@
      PlugIn_P: plugin,
      PlugIn_B: browser,
      OS_StringValue: url,
-     .Bits: reason,
-     PlugIn_NotifyReason: notify_data
+     PlugIn_NotifyReason: reason,
+     PlugIn_NotifyData: notify_data
   ),
 
   PlugIn_MessageStatus =
@@ -386,7 +389,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Int: notify_data,
+     PlugIn_NotifyData: notify_data,
      OS_StringValue: mime_type,
      OS_StringValue: target_window
   ),
@@ -401,7 +404,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      PlugIn_StreamDestroyReason: reason
   ),
 
@@ -415,7 +418,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      .Int: offset,
      .Int: length,
      .Ref .Data: data
@@ -431,7 +434,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      .Int: length
   ),
 
@@ -445,7 +448,7 @@
      OS_StringValue: url,
      .Int: end,
      .Int: last_modified_date,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      OS_StringValue: filename
   ),
 
@@ -456,7 +459,7 @@
      PlugIn_B: browser,
      OS_StringValue: url,
      OS_StringValue: target_window,
-     .Ref .Data: notify_data,
+     PlugIn_NotifyData: notify_data,
      .Int: length,
      OS_StringValue: filename_or_data
   ),
@@ -467,8 +470,8 @@
      PlugIn_P: plugin,
      PlugIn_B: browser,
      OS_StringValue: url,
-     .Bits: reason,
-     PlugIn_NotifyReason: notify_data
+     PlugIn_NotifyReason: reason,
+     PlugIn_NotifyData: notify_data
   ),
 
   PlugIn_FullMessageStatus =


More information about the oslib-team mailing list