--- trunk/xvidcore/dshow/src/CXvidDecoder.cpp	2011/05/18 16:12:47	1994
+++ trunk/xvidcore/dshow/src/CXvidDecoder.cpp	2011/06/15 19:09:17	2018
@@ -20,7 +20,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: CXvidDecoder.cpp,v 1.29 2011-03-17 15:11:32 Isibaar Exp $
+ * $Id$
  *
  ****************************************************************************/
 
@@ -36,10 +36,11 @@
 	C:\DX90SDK\Samples\C++\DirectShow\BaseClasses\Debug
 */
 
-/*
+#ifdef ENABLE_MFT
 #define XVID_USE_MFT
+#endif
+
 #define XVID_USE_TRAYICON
-*/
 
 #include <windows.h>
 
@@ -313,7 +314,7 @@
 /* constructor */
 
 CXvidDecoder::CXvidDecoder(LPUNKNOWN punk, HRESULT *phr) :
-    CVideoTransformFilter(NAME("CXvidDecoder"), punk, CLSID_XVID), m_hdll (NULL)
+    CVideoTransformFilter(TEXT("CXvidDecoder"), punk, CLSID_XVID), m_hdll (NULL)
 {
 	DPRINTF("Constructor");
 
@@ -355,7 +356,7 @@
 	m_hdll = LoadLibrary(XVID_DLL_NAME);
 	if (m_hdll == NULL) {
 		DPRINTF("dll load failed");
-		MessageBox(0, XVID_DLL_NAME " not found","Error", MB_TOPMOST);
+		MessageBox(0, XVID_DLL_NAME TEXT(" not found"), TEXT("Error"), MB_TOPMOST);
 		return E_FAIL;
 	}
 
@@ -363,7 +364,7 @@
 	if (xvid_global_func == NULL) {
         FreeLibrary(m_hdll);
         m_hdll = NULL;
-		MessageBox(0, "xvid_global() not found", "Error", MB_TOPMOST);
+		MessageBox(0, TEXT("xvid_global() not found"), TEXT("Error"), MB_TOPMOST);
 		return E_FAIL;
 	}
 
@@ -372,7 +373,7 @@
         xvid_global_func = NULL;
         FreeLibrary(m_hdll);
         m_hdll = NULL;
-		MessageBox(0, "xvid_decore() not found", "Error", MB_TOPMOST);
+		MessageBox(0, TEXT("xvid_decore() not found"), TEXT("Error"), MB_TOPMOST);
 		return E_FAIL;
 	}
 
@@ -382,7 +383,7 @@
         xvid_decore_func = NULL;
         FreeLibrary(m_hdll);
         m_hdll = NULL;
-		MessageBox(0, "xvid_global() failed", "Error", MB_TOPMOST);
+		MessageBox(0, TEXT("xvid_global() failed"), TEXT("Error"), MB_TOPMOST);
 		return E_FAIL;
 	}
 
@@ -392,7 +393,7 @@
         xvid_decore_func = NULL;
         FreeLibrary(m_hdll);
         m_hdll = NULL;
-		MessageBox(0, "xvid_global() failed", "Error", MB_TOPMOST);
+		MessageBox(0, TEXT("xvid_global() failed"), TEXT("Error"), MB_TOPMOST);
 		return E_FAIL;
 	}
 
@@ -947,14 +948,14 @@
 		wc.hInstance = (HINSTANCE) g_xvid_hInst;
 		wc.hbrBackground = (HBRUSH) GetStockObject(NULL_BRUSH);
 		wc.lpszMenuName = NULL;
-		wc.lpszClassName = "XVID_MSG_WINDOW";
+		wc.lpszClassName = TEXT("XVID_MSG_WINDOW");
 		wc.hIcon = NULL;
 		wc.hIconSm = NULL;
 		wc.hCursor = NULL;
 		RegisterClassEx(&wc);
 
-		MSG_hwnd = CreateWindowEx(0, "XVID_MSG_WINDOW", NULL, 0, CW_USEDEFAULT, 
-                                  CW_USEDEFAULT, 0, 0, HWND_MESSAGE, NULL, (HINSTANCE) g_xvid_hInst, NULL);
+		MSG_hwnd = CreateWindowEx(0, TEXT("XVID_MSG_WINDOW"), NULL, 0, CW_USEDEFAULT, 
+			CW_USEDEFAULT, 0, 0, HWND_MESSAGE, NULL, (HINSTANCE) g_xvid_hInst, NULL);
 
 		/* display the tray icon */
 		NOTIFYICONDATA nid;    
@@ -965,7 +966,7 @@
 		nid.uID = 1456;  
 		nid.uCallbackMessage = WM_ICONMESSAGE;  
 		nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON));  
-		strcpy_s(nid.szTip, 19, "Xvid Video Decoder");  
+		lstrcpy(nid.szTip, TEXT("Xvid Video Decoder"));  
 		nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
 	
 		Shell_NotifyIcon(NIM_ADD, &nid); 
@@ -1659,13 +1660,13 @@
 		wc.hInstance = (HINSTANCE) g_xvid_hInst;
 		wc.hbrBackground = (HBRUSH) GetStockObject(NULL_BRUSH);
 		wc.lpszMenuName = NULL;
-		wc.lpszClassName = "XVID_MSG_WINDOW";
+		wc.lpszClassName = TEXT("XVID_MSG_WINDOW");
 		wc.hIcon = NULL;
 		wc.hIconSm = NULL;
 		wc.hCursor = NULL;
 		RegisterClassEx(&wc);
 
-		MSG_hwnd = CreateWindowEx(0, "XVID_MSG_WINDOW", NULL, 0, CW_USEDEFAULT, 
+		MSG_hwnd = CreateWindowEx(0, TEXT("XVID_MSG_WINDOW"), NULL, 0, CW_USEDEFAULT, 
                                   CW_USEDEFAULT, 0, 0, HWND_MESSAGE, NULL, (HINSTANCE) g_xvid_hInst, NULL);
 
 		/* display the tray icon */
@@ -1676,8 +1677,8 @@
 		nid.hWnd = MSG_hwnd;  
 		nid.uID = 1456;  
 		nid.uCallbackMessage = WM_ICONMESSAGE;  
-		nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON));  
-		strcpy_s(nid.szTip, 19, "Xvid Video Decoder");  
+		nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON));
+		lstrcpy(nid.szTip, TEXT("Xvid Video Decoder"));
 		nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
 		
 		Shell_NotifyIcon(NIM_ADD, &nid); 
@@ -1906,7 +1907,7 @@
 	EnterCriticalSection(&m_mft_lock);
 
 	HRESULT hr = S_OK;
-	IMFMediaBuffer *pBuffer;
+	IMFMediaBuffer *pBuffer = NULL;
 
 	if (SUCCEEDED(hr)) {
 		hr = pSample->ConvertToContiguousBuffer(&pBuffer);
@@ -2160,9 +2161,9 @@
 	}
 	
 	if (m_hdll == NULL) {
-		HRESULT hr = OpenLib();
+		HRESULT hr2 = OpenLib();
 		
-		if (FAILED(hr) || (m_hdll == NULL)) // Paranoid checks.
+		if (FAILED(hr2) || (m_hdll == NULL)) // Paranoid checks.
 			hr = MF_E_INVALIDTYPE;
 	}