   
   /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
 --- 39,50 ----
-  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
+  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: oiddata.h,v $ $Revision: 1.1 $ $Date: 2002/01/04 05:22:07 $ $Name: MOZILLA_1_7_5_RELEASE $ ; @(#) $RCSfile: oiddata.h,v $ $Revision: 1.1 $ $Date: 2002/01/04 05:22:07 $ $Name: MOZILLA_1_7_5_RELEASE $";
   #endif /* DEBUG */
   
 + #include "pki1t.h"

              nsMapiEntry parentEntry ;
              nsMapiEntry temporaryEntry ;
  
*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h	2004-02-05 19:33:06.000000000 +0100
--- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h	2006-02-24 09:41:55.000000000 +0100
***************
*** 46,51 ****
--- 46,52 ----

                              PR_LOG(sDragLm, PR_LOG_DEBUG,
                                     ("automatically adding target %s with \
                                     id %ld\n", urlTarget->target, urlAtom));
*** misc/mozilla/widget/src/windows/nsDataObj.cpp	Wed Oct 27 07:50:31 2004
--- misc/build/mozilla/widget/src/windows/nsDataObj.cpp	Tue Mar 20 14:56:56 2007
***************
*** 504,515 ****
--- 504,523 ----
        return E_OUTOFMEMORY;
  
      char titleStr[MAX_PATH+1];
+ #ifdef __MINGW32__
+     int lenTitleStr = WideCharToMultiByte(CP_ACP, 0, NS_REINTERPRET_CAST(LPCWSTR, title.get()), title.Length(), titleStr, MAX_PATH, NULL, NULL);
+ #else
      int lenTitleStr = WideCharToMultiByte(CP_ACP, 0, title.get(), title.Length(), titleStr, MAX_PATH, NULL, NULL);
+ #endif
      if (!lenTitleStr && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) {
        // this is a very rare situation
        int len = title.Length() - 1;
        while ((len > 0) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) {
+ #ifdef __MINGW32__
+         lenTitleStr = WideCharToMultiByte(CP_ACP, 0, NS_REINTERPRET_CAST(LPCWSTR, title.get()), len--, titleStr, MAX_PATH, NULL, NULL);  
+ #else
          lenTitleStr = WideCharToMultiByte(CP_ACP, 0, title.get(), len--, titleStr, MAX_PATH, NULL, NULL);  
+ #endif
        } 
      }
      titleStr[lenTitleStr] = '\0';
*** misc/mozilla/widget/src/windows/nsFilePicker.cpp	Wed Dec  8 22:58:30 2004
--- misc/build/mozilla/widget/src/windows/nsFilePicker.cpp	Tue Mar 20 14:56:56 2007
***************
*** 117,123 ****
--- 117,127 ----
  
    PRBool result = PR_FALSE;
    PRUnichar fileBuffer[FILE_BUFFER_SIZE+1];
+ #ifdef __MINGW32__
+   wcsncpy(NS_REINTERPRET_CAST(LPWSTR, fileBuffer),  NS_REINTERPRET_CAST(LPCWSTR, mDefault.get()), FILE_BUFFER_SIZE);
+ #else
    wcsncpy(fileBuffer,  mDefault.get(), FILE_BUFFER_SIZE);
+ #endif
  
    NS_NAMED_LITERAL_STRING(htmExt, "html");
    nsAutoString initialDir;
***************
*** 133,146 ****
--- 137,158 ----
  
    if (mMode == modeGetFolder) {
      PRUnichar dirBuffer[MAX_PATH+1];
+ #ifdef __MINGW32__
+     wcsncpy(NS_REINTERPRET_CAST(LPWSTR, dirBuffer), NS_REINTERPRET_CAST(LPCWSTR, initialDir.get()), MAX_PATH);
+ #else
      wcsncpy(dirBuffer, initialDir.get(), MAX_PATH);
+ #endif
  
      BROWSEINFOW browserInfo;
      browserInfo.hwndOwner      = (HWND)
        (mParentWidget.get() ? mParentWidget->GetNativeData(NS_NATIVE_WINDOW) : 0); 
      browserInfo.pidlRoot       = nsnull;
      browserInfo.pszDisplayName = (LPWSTR)dirBuffer;
+ #ifdef __MINGW32__
+     browserInfo.lpszTitle      = NS_REINTERPRET_CAST(LPCWSTR, mTitle.get());
+ #else
      browserInfo.lpszTitle      = mTitle.get();
+ #endif
      browserInfo.ulFlags        = BIF_USENEWUI | BIF_RETURNONLYFSDIRS;
      if (initialDir.Length()) // convert folder path to native, the strdup copy will be released in BrowseCallbackProc
      {
***************
*** 183,189 ****
--- 195,205 ----
      nsString filterBuffer = mFilterList;
                                    
      if (!initialDir.IsEmpty()) {
+ #ifdef __MINGW32__
+       ofn.lpstrInitialDir = NS_REINTERPRET_CAST(LPCWSTR, initialDir.get());
+ #else
        ofn.lpstrInitialDir = initialDir.get();
+ #endif
      }
      
      ofn.lpstrTitle   = (LPCWSTR)mTitle.get();
***************
*** 191,203 ****
--- 207,227 ----
      ofn.nFilterIndex = mSelectedType;
      ofn.hwndOwner    = (HWND)
        (mParentWidget.get() ? mParentWidget->GetNativeData(NS_NATIVE_WINDOW) : 0); 
+ #ifdef __MINGW32__
+     ofn.lpstrFile    = NS_REINTERPRET_CAST(LPWSTR, fileBuffer);
+ #else
      ofn.lpstrFile    = fileBuffer;
+ #endif
      ofn.nMaxFile     = FILE_BUFFER_SIZE;
  
      ofn.Flags = OFN_NOCHANGEDIR | OFN_SHAREAWARE | OFN_LONGNAMES | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
  
      if (!mDefaultExtension.IsEmpty()) {
+ #ifdef __MINGW32__
+       ofn.lpstrDefExt = NS_REINTERPRET_CAST(LPCWSTR, mDefaultExtension.get());
+ #else
        ofn.lpstrDefExt = mDefaultExtension.get();
+ #endif
      }
      else {
        // Get file extension from suggested filename
***************
*** 217,223 ****
--- 241,251 ----
            //XXX Actually, behavior is sort of weird:
            //    often appends ".html" even if you have an extension
            //    It obeys your extension if you put quotes around name
+ #ifdef __MINGW32__
+           ofn.lpstrDefExt = NS_REINTERPRET_CAST(LPCWSTR, htmExt.get());
+ #else
            ofn.lpstrDefExt = htmExt.get();
+ #endif
          }
        }
      }
*** misc/mozilla/widget/src/windows/nsWindow.cpp	Sat May 29 22:27:51 2004
--- misc/build/mozilla/widget/src/windows/nsWindow.cpp	Tue Mar 20 14:56:56 2007
***************
*** 444,449 ****
--- 444,452 ----
  
  // VC++5.0 header doesn't have reconvertion structure and message.
  #ifndef WM_IME_REQUEST
+ #define WM_IME_REQUEST                  0x0288
+ #endif
+ #ifndef IMR_RECONVERTSTRING
  typedef struct tagRECONVERTSTRING {
      DWORD dwSize;
      DWORD dwVersion;
***************
*** 456,462 ****
  } RECONVERTSTRING, FAR * LPRECONVERTSTRING;
  
  #define IMR_RECONVERTSTRING             0x0004
- #define WM_IME_REQUEST                  0x0288
  #endif
  
  // from http://msdn.microsoft.com/library/specs/msime.h
--- 459,464 ----
***************
*** 480,486 ****
--- 482,490 ----
  //
  #ifndef WM_APPCOMMAND
  #define WM_APPCOMMAND  0x0319
+ #endif
  
+ #ifndef APPCOMMAND_BROWSER_BACKWARD
  #define APPCOMMAND_BROWSER_BACKWARD       1
  #define APPCOMMAND_BROWSER_FORWARD        2
  #define APPCOMMAND_BROWSER_REFRESH        3
***************
*** 517,523 ****
  //#define GET_FLAGS_LPARAM(lParam)      (LOWORD(lParam))
  //#define GET_KEYSTATE_LPARAM(lParam)   GET_FLAGS_LPARAM(lParam)
  
! #endif  // #ifndef WM_APPCOMMAND
  
  static PRBool LangIDToCP(WORD aLangID, UINT& oCP)
  {
--- 521,527 ----
  //#define GET_FLAGS_LPARAM(lParam)      (LOWORD(lParam))
  //#define GET_KEYSTATE_LPARAM(lParam)   GET_FLAGS_LPARAM(lParam)
  
! #endif  // #ifndef APPCOMMAND_BROWSER_BACKWARD
  
  static PRBool LangIDToCP(WORD aLangID, UINT& oCP)
  {
***************
*** 5529,5535 ****
--- 5533,5543 ----
     if(acp)
     {
        int outlen = ::WideCharToMultiByte( CP_ACP, 0, 
+ #ifdef __MINGW32__
+                       NS_REINTERPRET_CAST(LPCWSTR, aStr.get()), aStr.Length(),
+ #else
                        aStr.get(), aStr.Length(),
+ #endif
                        acp, acplen, NULL, NULL);
        if ( outlen >= 0)
           acp[outlen] = '\0';  // null terminate
***************
*** 5696,5702 ****
--- 5704,5714 ----
      unicharSize = ::MultiByteToWideChar(gCurrentKeyboardCP,MB_PRECOMPOSED,
        mIMECompString->get(),
        mIMECompString->Length(),
+ #ifdef __MINGW32__
+       NS_REINTERPRET_CAST(LPWSTR, mIMECompUnicode->BeginWriting()),
+ #else
        mIMECompUnicode->BeginWriting(),
+ #endif
        unicharSize+1);
      mIMECompUnicode->SetLength(unicharSize);
    }
***************
*** 6472,6478 ****
--- 6484,6494 ----
          *oResult = sizeof(RECONVERTSTRING) + len * sizeof(WCHAR);
        } else {
          len = ::WideCharToMultiByte(gCurrentKeyboardCP, 0,
+ #ifdef __MINGW32__
+                                     NS_REINTERPRET_CAST(LPCWSTR, mIMEReconvertUnicode),
+ #else
                                      mIMEReconvertUnicode,
+ #endif
                                      nsCRT::strlen(mIMEReconvertUnicode),
                                      NULL, 0, NULL, NULL);
          *oResult = sizeof(RECONVERTSTRING) + len;
***************
*** 6491,6497 ****
--- 6507,6517 ----
        *oResult = sizeof(RECONVERTSTRING) + len * sizeof(WCHAR);
      } else {
        len = ::WideCharToMultiByte(gCurrentKeyboardCP, 0,
+ #ifdef __MINGW32__
+                                   NS_REINTERPRET_CAST(LPCWSTR, mIMEReconvertUnicode),
+ #else
                                    mIMEReconvertUnicode,
+ #endif
                                    nsCRT::strlen(mIMEReconvertUnicode),
                                    NULL, 0, NULL, NULL);
        *oResult = sizeof(RECONVERTSTRING) + len;
***************
*** 6512,6518 ****
--- 6532,6542 ----
                     mIMEReconvertUnicode, len * sizeof(WCHAR));
      } else {
        ::WideCharToMultiByte(gCurrentKeyboardCP, 0,
+ #ifdef __MINGW32__
+                             NS_REINTERPRET_CAST(LPCWSTR, mIMEReconvertUnicode),
+ #else
                              mIMEReconvertUnicode,
+ #endif
                              nsCRT::strlen(mIMEReconvertUnicode),
                              (LPSTR) (aData + sizeof(RECONVERTSTRING)),
                              len,
*** misc/mozilla/xpcom/base/nsStackFrameUnix.cpp	Mon Mar  8 08:47:44 2004
--- misc/build/mozilla/xpcom/base/nsStackFrameUnix.cpp	Tue Mar 20 14:56:56 2007
***************
*** 78,102 ****
  }
