diff --git a/mozilla/modules/plugin/samples/simple/makefile.win b/mozilla/modules/plugin/samples/simple/makefile.win
index bf38efdec9b..be4b3c0b705 100644
--- a/mozilla/modules/plugin/samples/simple/makefile.win
+++ b/mozilla/modules/plugin/samples/simple/makefile.win
@@ -23,7 +23,7 @@ LIBRARY_NAME	= npsimple
 
 DEPTH = ..\..\..
 
-REQUIRES = java plug xpcom
+REQUIRES = java plug xpcom raptor
 
 OBJS = .\$(OBJDIR)\npsimple.obj \
        .\$(OBJDIR)\stubs.obj \
@@ -76,7 +76,7 @@ GARBAGE	= $(GARBAGE) _gen
 #//------------------------------------------------------------------------
 include <$(DEPTH)/config/rules.mak>
 
-LINCS=$(LINCS) -I$(PUBLIC)\plugin -I$(PUBLIC)\xpcom -I$(PUBLIC)\java -I$(PUBLIC)\plugimpl
+LINCS=$(LINCS) -I$(PUBLIC)\plugin -I$(PUBLIC)\xpcom -I$(PUBLIC)\java -I$(PUBLIC)\plugimpl -I$(PUBLIC)\raptor
 
 install:: $(DLL)
         $(MAKE_INSTALL) $(XPDIST)\classes11\Simple.class $(DEPTH)\cmd\winfe\mkfiles32\x86dbg\plugins\simple
diff --git a/mozilla/modules/plugin/samples/simple/npsimple.cpp b/mozilla/modules/plugin/samples/simple/npsimple.cpp
index 87b4963677f..ba686f47852 100644
--- a/mozilla/modules/plugin/samples/simple/npsimple.cpp
+++ b/mozilla/modules/plugin/samples/simple/npsimple.cpp
@@ -324,7 +324,7 @@ public:
      *  @return number of bytes read or -1 if error
      */   
     NS_IMETHOD
-    Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount); 
+    Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aWriteCount); 
 
     ////////////////////////////////////////////////////////////////////////////
     // from nsIPluginStream:
@@ -840,11 +840,12 @@ SimplePluginStream::Close(void)
  +++++++++++++++++++++++++++++++++++++++++++++++++*/
 
 NS_METHOD
-SimplePluginStream::Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount)
+SimplePluginStream::Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aWriteCount)
 {
     PR_ASSERT(aOffset == 0);    // XXX need to handle the non-sequential write case
     fInst->DisplayJavaMessage((char*)aBuf, aCount); 
-    return aCount;		/* The number of bytes accepted */
+    *aWriteCount = aCount;		/* The number of bytes accepted */
+    return NS_OK;
 }
 
 /*******************************************************************************/
diff --git a/mozilla/modules/plugin/test/makefile.win b/mozilla/modules/plugin/test/makefile.win
index bf38efdec9b..be4b3c0b705 100644
--- a/mozilla/modules/plugin/test/makefile.win
+++ b/mozilla/modules/plugin/test/makefile.win
@@ -23,7 +23,7 @@ LIBRARY_NAME	= npsimple
 
 DEPTH = ..\..\..
 
-REQUIRES = java plug xpcom
+REQUIRES = java plug xpcom raptor
 
 OBJS = .\$(OBJDIR)\npsimple.obj \
        .\$(OBJDIR)\stubs.obj \
@@ -76,7 +76,7 @@ GARBAGE	= $(GARBAGE) _gen
 #//------------------------------------------------------------------------
 include <$(DEPTH)/config/rules.mak>
 
-LINCS=$(LINCS) -I$(PUBLIC)\plugin -I$(PUBLIC)\xpcom -I$(PUBLIC)\java -I$(PUBLIC)\plugimpl
+LINCS=$(LINCS) -I$(PUBLIC)\plugin -I$(PUBLIC)\xpcom -I$(PUBLIC)\java -I$(PUBLIC)\plugimpl -I$(PUBLIC)\raptor
 
 install:: $(DLL)
         $(MAKE_INSTALL) $(XPDIST)\classes11\Simple.class $(DEPTH)\cmd\winfe\mkfiles32\x86dbg\plugins\simple
diff --git a/mozilla/modules/plugin/test/npsimple.cpp b/mozilla/modules/plugin/test/npsimple.cpp
index 87b4963677f..ba686f47852 100644
--- a/mozilla/modules/plugin/test/npsimple.cpp
+++ b/mozilla/modules/plugin/test/npsimple.cpp
@@ -324,7 +324,7 @@ public:
      *  @return number of bytes read or -1 if error
      */   
     NS_IMETHOD
-    Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount); 
+    Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aWriteCount); 
 
     ////////////////////////////////////////////////////////////////////////////
     // from nsIPluginStream:
@@ -840,11 +840,12 @@ SimplePluginStream::Close(void)
  +++++++++++++++++++++++++++++++++++++++++++++++++*/
 
 NS_METHOD
-SimplePluginStream::Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount)
+SimplePluginStream::Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aWriteCount)
 {
     PR_ASSERT(aOffset == 0);    // XXX need to handle the non-sequential write case
     fInst->DisplayJavaMessage((char*)aBuf, aCount); 
-    return aCount;		/* The number of bytes accepted */
+    *aWriteCount = aCount;		/* The number of bytes accepted */
+    return NS_OK;
 }
 
 /*******************************************************************************/