--- D:\3_Mozilla\mozilla\configure.BAK	2005-04-24 17:06:38.843750000 +0800
+++ D:\3_Mozilla\mozilla\configure	2005-04-24 17:27:41.265625000 +0800
@@ -2841,8 +2841,8 @@
         _MIDL_MAJOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $1 }'`
         _MIDL_MINOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $2 }'`
         _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
-         if test "$_MIDL_MAJOR_VERSION" != "5" -a "$_MIDL_FULL_VERSION" != "6.00.0347" -a "$_MIDL_FULL_VERSION" != "6.00.0361" -a "$_MIDL_FULL_VERSION" != "6.00.0364"; then
-             { echo "configure: error: Midl version $_MIDL_FULL_VERSION was found.  Midl version must be 5.x.x (VC6*) or 6.00.0347 (VC7) or 6.00.0361 (VC.net 2003) or 6.00.0364 (VC 2005)." 1>&2; exit 1; }
+         if test "$_MIDL_MAJOR_VERSION" != "5" -a "$_MIDL_FULL_VERSION" != "6.00.0347" -a "$_MIDL_FULL_VERSION" != "6.00.0361" -a "$_MIDL_FULL_VERSION" != "6.00.0366"; then
+             { echo "configure: error: Midl version $_MIDL_FULL_VERSION was found.  Midl version must be 5.x.x (VC6*) or 6.00.0347 (VC7) or 6.00.0361 (VC.net 2003) or 6.00.0366 (VC 2005)." 1>&2; exit 1; }
          fi
 
          # Add flags if necessary
--- D:\3_Mozilla\mozilla\xpcom\typelib\xpt\tools\Makefile.in.BAK	2005-04-17 02:56:34.593750000 +0800
+++ D:\3_Mozilla\mozilla\xpcom\typelib\xpt\tools\Makefile.in	2005-04-23 12:59:24.562500000 +0800
@@ -45,7 +45,7 @@
 MODULE		= xpcom
 INTERNAL_TOOLS	= 1
 
-SIMPLE_PROGRAMS	= xpt_dump$(BIN_SUFFIX) xpt_link$(BIN_SUFFIX)
+SIMPLE_PROGRAMS	= xpt_dump$(BIN_SUFFIX) xpt_link$(BIN_SUFFIX) xpt_dump$(BIN_SUFFIX).manifest xpt_link$(BIN_SUFFIX).manifest
 
 CSRCS		= xpt_dump.c xpt_link.c
 
--- D:\3_Mozilla\mozilla\xpcom\typelib\xpidl\Makefile.in.BAK	2005-04-17 02:56:34.625000000 +0800
+++ D:\3_Mozilla\mozilla\xpcom\typelib\xpidl\Makefile.in	2005-04-23 13:00:06.421875000 +0800
@@ -27,7 +27,7 @@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
-PROGRAM		= xpidl$(BIN_SUFFIX)
+PROGRAM		= xpidl$(BIN_SUFFIX) xpidl$(BIN_SUFFIX).manifest
 INTERNAL_TOOLS	= 1
 
 # glib and libIDL link against the non-debug msvcrt
--- D:\3_Mozilla\mozilla\xpcom\io\nsLocalFileWin.cpp.BAK	2005-04-24 17:06:39.281250000 +0800
+++ D:\3_Mozilla\mozilla\xpcom\io\nsLocalFileWin.cpp	2005-04-24 17:48:08.781250000 +0800
@@ -729,7 +729,7 @@
     }
 
     // search for first slash after the drive (or volume) name
-    unsigned char* slash = _mbschr(path, '\\');
+    unsigned char* slash = (unsigned char*)_mbschr(path, '\\');
 
     if (slash)
     {
--- D:\3_Mozilla\mozilla\directory\c-sdk\build.mk.BAK	2004-08-27 07:03:00.000000000 +0800
+++ D:\3_Mozilla\mozilla\directory\c-sdk\build.mk	2005-04-29 23:24:24.406250000 +0800
@@ -379,7 +379,7 @@
 
 SUBSYSTEM=CONSOLE
 ifndef MOZ_DEBUG_SYMBOLS
-DEBUG_FLAGS=/PDB:NONE /DEBUGTYPE:BOTH
+DEBUG_FLAGS=/PDB:NONE
 endif
 
 LINK_EXE        = $(CYGWIN_WRAPPER) link $(DEBUG_LINK_OPT) -OUT:"$@" /MAP $(ALDFLAGS) $(LDFLAGS) $(ML_DEBUG) \
--- D:\3_Mozilla\mailnews\addrbook\src\nsAbWinHelper.cpp.BAK	2004-11-05 23:13:32.000000000 +0800
+++ D:\3_Mozilla\mailnews\addrbook\src\nsAbWinHelper.cpp	2005-04-29 23:28:11.468750000 +0800
@@ -564,7 +564,7 @@
 
     value.ulPropTag = aPropertyTag ;
     if (PROP_TYPE(aPropertyTag) == PT_UNICODE) {
-        value.Value.lpszW = NS_CONST_CAST(WORD *, aValue) ;
+        value.Value.lpszW = (LPWSTR)NS_CONST_CAST(WORD *, (WORD *)aValue) ;
     }
     else if (PROP_TYPE(aPropertyTag) == PT_STRING8) {
         alternativeValue.AssignWithConversion(aValue) ;
@@ -592,7 +592,7 @@
     for (i = 0 ; i < aNbProperties ; ++ i) {
         values [currentValue].ulPropTag = aPropertiesTag [i] ;
         if (PROP_TYPE(aPropertiesTag [i]) == PT_UNICODE) {
-            values [currentValue ++].Value.lpszW = NS_CONST_CAST(WORD *, aValues [i].get()) ;
+            values [currentValue ++].Value.lpszW = (LPWSTR)NS_CONST_CAST(WORD *, (WORD *)aValues [i].get()) ;
         }
         else if (PROP_TYPE(aPropertiesTag [i]) == PT_STRING8) {
             alternativeValue.AssignWithConversion(aValues [i].get()) ;
@@ -681,7 +681,7 @@
     displayName.ulPropTag = PR_DISPLAY_NAME_W ;
     tempName.AssignLiteral("__MailUser__") ;
     tempName.AppendInt(mEntryCounter ++) ;
-    displayName.Value.lpszW = NS_CONST_CAST(WORD *, tempName.get()) ;
+    displayName.Value.lpszW = (LPWSTR)NS_CONST_CAST(WORD *, (WORD *)tempName.get()) ;
     mLastError = newEntry->SetProps(1, &displayName, &problems) ;
     if (HR_FAILED(mLastError)) {
         PRINTF(("Cannot set temporary name %08x.\n", mLastError)) ;
@@ -744,7 +744,7 @@
     displayName.ulPropTag = PR_DISPLAY_NAME_W ;
     tempName.AssignLiteral("__MailList__") ;
     tempName.AppendInt(mEntryCounter ++) ;
-    displayName.Value.lpszW = NS_CONST_CAST(WORD *, tempName.get()) ;
+    displayName.Value.lpszW = (LPWSTR)NS_CONST_CAST(WORD *, (WORD *)tempName.get()) ;
     mLastError = newEntry->SetProps(1, &displayName, &problems) ;
     if (HR_FAILED(mLastError)) {
         PRINTF(("Cannot set temporary name %08x.\n", mLastError)) ;