Removed images and video from language dll's

Minor fix memsetd

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1929 10f7b99b-c216-0410-bff0-8a66a9350fd8

22 files changed, 40 insertions, 31 deletions

diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp
index 728ac9c39..aff89b0cc 100644
--- a/src/DSUtil/DSUtil.cpp
+++ b/src/DSUtil/DSUtil.cpp
@@ -976,7 +976,6 @@ void memsetd(void* dst, unsigned int c, size_t nbytes)
 #endif

 	size_t n = nbytes / 4;

 	size_t o = n - (n % 4);

-	ASSERT(n == o);

 

 	__m128i val = _mm_set1_epi32 ( (int)c );

 	if (((uintptr_t)dst & 0x0F) == 0) // 16-byte aligned

@@ -989,6 +988,16 @@ void memsetd(void* dst, unsigned int c, size_t nbytes)
 		for (ptrdiff_t i = 0; i < o; i+=4)

 			_mm_storeu_si128( (__m128i*)&(((DWORD*)dst)[i]), val );

 	}

+

+	switch(n - o)

+	{

+	case 3:

+		((DWORD*)dst)[n + 2] = c;

+	case 2:

+		((DWORD*)dst)[n + 1] = c;

+	case 1:

+		((DWORD*)dst)[n + 0] = c;

+	}

 }

 

 bool ExtractBIH(const AM_MEDIA_TYPE* pmt, BITMAPINFOHEADER* bih)

diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
index d4a7c8d28..8ab68da8c 100644
--- a/src/apps/mplayerc/MainFrm.cpp
+++ b/src/apps/mplayerc/MainFrm.cpp
@@ -1073,7 +1073,7 @@ void CMainFrame::ShowTrayIcon(bool fShow)
     {

         if(!m_fTrayIcon)

         {

-            tnid.hIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDR_MAINFRAME), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);

+            tnid.hIcon = (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAINFRAME), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);

             tnid.uFlags = NIF_MESSAGE|NIF_ICON|NIF_TIP;

             tnid.uCallbackMessage = WM_NOTIFYICON;

             StringCchCopy(tnid.szTip, countof(tnid.szTip), TEXT("Media Player Classic"));

@@ -14407,7 +14407,7 @@ HRESULT CMainFrame::CreateThumbnailToolbar()
         Gdiplus::GdiplusStartup(&m_gdiplusToken, &gdiplusStartupInput, NULL);

 

         CGdiPlusBitmapResource* pBitmap = new CGdiPlusBitmapResource;

-        if (!pBitmap->Load(_T("W7_TOOLBAR"), _T("PNG")))

+        if (!pBitmap->Load(_T("W7_TOOLBAR"), _T("PNG"), AfxGetInstanceHandle()))

         {

             delete pBitmap;

             Gdiplus::GdiplusShutdown(m_gdiplusToken);

diff --git a/src/apps/mplayerc/mplayerc.br.rc b/src/apps/mplayerc/mplayerc.br.rc
index d881ec71f..0d658c55c 100644
--- a/src/apps/mplayerc/mplayerc.br.rc
+++ b/src/apps/mplayerc/mplayerc.br.rc
diff --git a/src/apps/mplayerc/mplayerc.by.rc b/src/apps/mplayerc/mplayerc.by.rc
index 659fd629e..e1f2becd5 100644
--- a/src/apps/mplayerc/mplayerc.by.rc
+++ b/src/apps/mplayerc/mplayerc.by.rc
diff --git a/src/apps/mplayerc/mplayerc.cz.rc b/src/apps/mplayerc/mplayerc.cz.rc
index 8570e931d..fd9deb5e0 100644
--- a/src/apps/mplayerc/mplayerc.cz.rc
+++ b/src/apps/mplayerc/mplayerc.cz.rc
diff --git a/src/apps/mplayerc/mplayerc.de.rc b/src/apps/mplayerc/mplayerc.de.rc
index 7c0b37436..b867291fe 100644
--- a/src/apps/mplayerc/mplayerc.de.rc
+++ b/src/apps/mplayerc/mplayerc.de.rc
diff --git a/src/apps/mplayerc/mplayerc.es.rc b/src/apps/mplayerc/mplayerc.es.rc
index 0a284fe40..46612f502 100644
--- a/src/apps/mplayerc/mplayerc.es.rc
+++ b/src/apps/mplayerc/mplayerc.es.rc
diff --git a/src/apps/mplayerc/mplayerc.fr.rc b/src/apps/mplayerc/mplayerc.fr.rc
index 185bfaee5..59039aa68 100644
--- a/src/apps/mplayerc/mplayerc.fr.rc
+++ b/src/apps/mplayerc/mplayerc.fr.rc
diff --git a/src/apps/mplayerc/mplayerc.hu.rc b/src/apps/mplayerc/mplayerc.hu.rc
index 4c53e904d..66487413f 100644
--- a/src/apps/mplayerc/mplayerc.hu.rc
+++ b/src/apps/mplayerc/mplayerc.hu.rc
diff --git a/src/apps/mplayerc/mplayerc.it.rc b/src/apps/mplayerc/mplayerc.it.rc
index c16490367..366ba8a13 100644
--- a/src/apps/mplayerc/mplayerc.it.rc
+++ b/src/apps/mplayerc/mplayerc.it.rc
diff --git a/src/apps/mplayerc/mplayerc.kr.rc b/src/apps/mplayerc/mplayerc.kr.rc
index c234c624a..08b656ed7 100644
--- a/src/apps/mplayerc/mplayerc.kr.rc
+++ b/src/apps/mplayerc/mplayerc.kr.rc
diff --git a/src/apps/mplayerc/mplayerc.nl.rc b/src/apps/mplayerc/mplayerc.nl.rc
index 8a9c9ea8d..d721dc49f 100644
--- a/src/apps/mplayerc/mplayerc.nl.rc
+++ b/src/apps/mplayerc/mplayerc.nl.rc
diff --git a/src/apps/mplayerc/mplayerc.pl.rc b/src/apps/mplayerc/mplayerc.pl.rc
index d7a6b3be8..68ef53680 100644
--- a/src/apps/mplayerc/mplayerc.pl.rc
+++ b/src/apps/mplayerc/mplayerc.pl.rc
diff --git a/src/apps/mplayerc/mplayerc.rc b/src/apps/mplayerc/mplayerc.rc
index cc2925934..14eb4cfd3 100644
--- a/src/apps/mplayerc/mplayerc.rc
+++ b/src/apps/mplayerc/mplayerc.rc
diff --git a/src/apps/mplayerc/mplayerc.ru.rc b/src/apps/mplayerc/mplayerc.ru.rc
index 4f126b8fa..89b18cdae 100644
--- a/src/apps/mplayerc/mplayerc.ru.rc
+++ b/src/apps/mplayerc/mplayerc.ru.rc
diff --git a/src/apps/mplayerc/mplayerc.sc.rc b/src/apps/mplayerc/mplayerc.sc.rc
index dd4ee07af..c3cc49ebd 100644
--- a/src/apps/mplayerc/mplayerc.sc.rc
+++ b/src/apps/mplayerc/mplayerc.sc.rc
diff --git a/src/apps/mplayerc/mplayerc.sk.rc b/src/apps/mplayerc/mplayerc.sk.rc
index 1ab5ea572..8ef3dcab8 100644
--- a/src/apps/mplayerc/mplayerc.sk.rc
+++ b/src/apps/mplayerc/mplayerc.sk.rc
diff --git a/src/apps/mplayerc/mplayerc.sv.rc b/src/apps/mplayerc/mplayerc.sv.rc
index 085ed9128..bfc58b242 100644
--- a/src/apps/mplayerc/mplayerc.sv.rc
+++ b/src/apps/mplayerc/mplayerc.sv.rc
diff --git a/src/apps/mplayerc/mplayerc.tc.rc b/src/apps/mplayerc/mplayerc.tc.rc
index a0ab9f1d2..ea106442f 100644
--- a/src/apps/mplayerc/mplayerc.tc.rc
+++ b/src/apps/mplayerc/mplayerc.tc.rc
diff --git a/src/apps/mplayerc/mplayerc.tr.rc b/src/apps/mplayerc/mplayerc.tr.rc
index fea7ca4cb..c37cc1e23 100644
--- a/src/apps/mplayerc/mplayerc.tr.rc
+++ b/src/apps/mplayerc/mplayerc.tr.rc
diff --git a/src/apps/mplayerc/mplayerc.ua.rc b/src/apps/mplayerc/mplayerc.ua.rc
index 3995c71b3..1d47bd59e 100644
--- a/src/apps/mplayerc/mplayerc.ua.rc
+++ b/src/apps/mplayerc/mplayerc.ua.rc
diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj
index 62a36c6d5..b91015359 100644
--- a/src/apps/mplayerc/mplayerc.vcproj
+++ b/src/apps/mplayerc/mplayerc.vcproj
@@ -574,34 +574,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\mplayerc.rc"

-				>

-				<FileConfiguration

-					Name="Release Unicode|Win32"

-					>

-					<Tool

-						Name="VCResourceCompilerTool"

-						PreprocessorDefinitions="NDEBUG"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode|x64"

-					>

-					<Tool

-						Name="VCResourceCompilerTool"

-						PreprocessorDefinitions="NDEBUG,_WIN64"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode|x64"

-					>

-					<Tool

-						Name="VCResourceCompilerTool"

-						PreprocessorDefinitions="_DEBUG,_WIN64"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath=".\MultiMonitor.cpp"

 				>

 			</File>

@@ -1586,6 +1558,34 @@
 				>

 			</File>

 			<File

+				RelativePath=".\mplayerc.rc"

+				>

+				<FileConfiguration

+					Name="Release Unicode|Win32"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+						PreprocessorDefinitions="NDEBUG"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Unicode|x64"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+						PreprocessorDefinitions="NDEBUG,_WIN64"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Unicode|x64"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+						PreprocessorDefinitions="_DEBUG,_WIN64"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath=".\res\mplayerc.rc2"

 				>

 				<FileConfiguration