Menu
▾
▴
[Pmplib-commits] SF.net SVN: pmplib: [225] trunk/pmplib/frontend/easypmp/win32gui
|
From: <ny...@us...> - 2006-12-29 06:27:47
|
Revision: 225
http://svn.sourceforge.net/pmplib/?rev=225&view=rev
Author: nyaochi
Date: 2006-12-28 22:27:47 -0800 (Thu, 28 Dec 2006)
Log Message:
-----------
- EasyPMP [Win32 GUI] is now compatible with MSVC2005.
- Removed a reference to the manifest file from the resource.
Modified Paths:
--------------
trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.rc
trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.vcproj
trunk/pmplib/frontend/easypmp/win32gui/preference.h
trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h
trunk/pmplib/frontend/easypmp/win32gui/stdafx.h
Modified: trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.rc
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.rc 2006-12-29 04:51:14 UTC (rev 224)
+++ trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.rc 2006-12-29 06:27:47 UTC (rev 225)
@@ -343,7 +343,7 @@
//
// Generated from the TEXTINCLUDE 3 resource.
//
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\easypmp_win32gui.exe.manifest"
+//CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\easypmp_win32gui.exe.manifest"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
Modified: trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.vcproj
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.vcproj 2006-12-29 04:51:14 UTC (rev 224)
+++ trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.vcproj 2006-12-29 06:27:47 UTC (rev 225)
@@ -269,26 +269,6 @@
>
</File>
<File
- RelativePath=".\res\easypmp_win32gui.exe.manifest"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\res\easypmp_win32gui.ico"
>
</File>
Modified: trunk/pmplib/frontend/easypmp/win32gui/preference.h
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/preference.h 2006-12-29 04:51:14 UTC (rev 224)
+++ trunk/pmplib/frontend/easypmp/win32gui/preference.h 2006-12-29 06:27:47 UTC (rev 225)
@@ -199,7 +199,7 @@
USES_CONVERSION;
if (pmp) {
- strPlayerLocation = W2CT(pmp->env.path_to_root.path);
+ strPlayerLocation = UCS2CT(pmp->env.path_to_root.path);
strPlayerIdentifier = A2CT(pmp->env.id);
strPlayerDescription = A2CT(pmp->env.name);
strPlayerDescription += _T("");
@@ -228,7 +228,7 @@
strPlayerIdentifier = _T("");
strPlayerDescription = _T("");
- res = pmphelp_create(pmphelp, &pmp, T2CW(szLocation), NULL);
+ res = pmphelp_create(pmphelp, &pmp, T2CUCS(szLocation), NULL);
if (res == 0 && pmp) {
setPlayerInformation(pmp);
pmp->release(pmp);
Modified: trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h 2006-12-29 04:51:14 UTC (rev 224)
+++ trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h 2006-12-29 06:27:47 UTC (rev 225)
@@ -268,7 +268,8 @@
// Set words to be stripped from artist names.
if (!m_preference.strStripWords.IsEmpty()) {
- easypmp_set_strip_words(&opt, CT2CW(m_preference.strStripWords));
+ LPCWSTR lpwszStripWords = CT2CW(m_preference.strStripWords);
+ easypmp_set_strip_words(&opt, CW2CUCS(lpwszStripWords));
opt.media_info_source |= GMIF_STRIP_ARTIST;
}
@@ -285,14 +286,16 @@
// Set path to the root folder.
m_preference.GetPathToPlayerRoot(str);
- ucs2cpy(opt.path_to_root, T2CW(str));
+ ucs2cpy(opt.path_to_root, T2CUCS(str));
// Set path to the include folder.
- ::GetModuleFileNameW(_Module.GetModuleInstance(), opt.path_to_include, MAX_PATH);
- ::PathRemoveFileSpecW(opt.path_to_include);
- ::PathAddBackslashW(opt.path_to_include);
- ucs2cat(opt.path_to_include, A2W("jspl"));
- ::PathAddBackslashW(opt.path_to_include);
+ TCHAR jspl_include[MAX_PATH];
+ ::GetModuleFileName(_Module.GetModuleInstance(), jspl_include, MAX_PATH);
+ ::PathRemoveFileSpec(jspl_include);
+ ::PathAddBackslash(jspl_include);
+ ::lstrcat(jspl_include, A2W("jspl"));
+ ::PathAddBackslash(jspl_include);
+ ucs2cpy(opt.path_to_include, T2CUCS(jspl_include));
// Set model
if (!m_preference.strPlayerIdentifier.IsEmpty()) {
@@ -470,10 +473,10 @@
CString str;
USES_CONVERSION;
CProcessingDlg* dlg = (CProcessingDlg*)instance;
- str.Format(_T("(%d) %s"), n, W2CT(file));
+ str.Format(_T("(%d) %s"), n, UCS2CT(file));
dlg->setProgress(PHASE_ENUMERATE_MUSIC, str);
- str = W2CT(path);
- str += W2CT(file);
+ str = UCS2CT(path);
+ str += UCS2CT(file);
dlg->write_log(LL_TRACE, _T("[%d] %s"), n, str);
return (dlg->m_bCancel) ? -1 : 0;
}
@@ -489,10 +492,10 @@
CString str;
USES_CONVERSION;
CProcessingDlg* dlg = (CProcessingDlg*)instance;
- str.Format(_T("(%d) %s"), n, W2CT(file));
+ str.Format(_T("(%d) %s"), n, UCS2CT(file));
dlg->setProgress(PHASE_ENUMERATE_PLAYLIST, str);
- str = W2CT(path);
- str += W2CT(file);
+ str = UCS2CT(path);
+ str += UCS2CT(file);
dlg->write_log(LL_TRACE, _T("[%d] %s"), n, str);
return (dlg->m_bCancel) ? -1 : 0;
}
@@ -543,10 +546,10 @@
dlg->write_log(LL_TRACE, _T("[Obtaining media information]"));
break;
case EASYPMPDBP_GMI|EASYPMPSP_PROGRESS:
- str.Format(_T("(%d) %s"), param_int+1, W2CT(filepath_skippath(param_str)));
+ str.Format(_T("(%d) %s"), param_int+1, UCS2CT(filepath_skippath(param_str)));
dlg->m_ctrlProgress.SetText(str);
dlg->m_ctrlProgress.SetPos(param_int);
- dlg->write_log(LL_TRACE, _T("%s"), W2CT(param_str));
+ dlg->write_log(LL_TRACE, _T("%s"), UCS2CT(param_str));
break;
case EASYPMPDBP_GMI|EASYPMPSP_END:
dlg->m_ctrlProgress.ShowWindow(SW_HIDE);
@@ -590,27 +593,27 @@
dlg->write_log(LL_TRACE, _T("[Playlist conversion]"));
break;
case EASYPMPPLP_CONVERT|EASYPMPSP_PROGRESS:
- str.Format(_T("(%d) %s"), param_int+1, W2CT(filepath_skippath(param_str)));
+ str.Format(_T("(%d) %s"), param_int+1, UCS2CT(filepath_skippath(param_str)));
dlg->m_ctrlProgress.SetText(str);
dlg->m_ctrlProgress.SetPos(param_int);
- dlg->write_log(LL_TRACE, _T("%s"), W2CT(param_str));
+ dlg->write_log(LL_TRACE, _T("%s"), UCS2CT(param_str));
break;
case EASYPMPPLP_CONVERT|EASYPMPSP_WARN_PLAYLIST:
dlg->m_bFailed = TRUE;
- dlg->write_log(LL_WARNING, _T("WARNING: %s"), W2CT(param_str));
+ dlg->write_log(LL_WARNING, _T("WARNING: %s"), UCS2CT(param_str));
break;
case EASYPMPPLP_CONVERT|EASYPMPSP_SKIP_PLAYLIST:
dlg->m_bFailed = TRUE;
- dlg->write_log(LL_ERROR, _T("ERROR: %s"), W2CT(param_str));
+ dlg->write_log(LL_ERROR, _T("ERROR: %s"), UCS2CT(param_str));
break;
case EASYPMPPLP_CONVERT|EASYPMPSP_MISSING_MEDIA:
- dlg->write_log(LL_INFO, _T(" %s"), W2CT(param_str));
+ dlg->write_log(LL_INFO, _T(" %s"), UCS2CT(param_str));
break;
case EASYPMPPLP_CONVERT|EASYPMPSP_JSPL_ERROR:
- dlg->write_log(LL_ERROR, _T("JSPL(ERROR): %s"), W2CT(param_str));
+ dlg->write_log(LL_ERROR, _T("JSPL(ERROR): %s"), UCS2CT(param_str));
break;
case EASYPMPPLP_CONVERT|EASYPMPSP_JSPL_OUTPUT:
- dlg->write_log(LL_INFO, _T("JSPL: %s"), W2CT(param_str));
+ dlg->write_log(LL_INFO, _T("JSPL: %s"), UCS2CT(param_str));
break;
case EASYPMPPLP_CONVERT|EASYPMPSP_END:
dlg->m_ctrlProgress.ShowWindow(SW_HIDE);
@@ -672,10 +675,10 @@
write_log(LL_TRACE, _T("Firmware mode: %s"), A2CT(pmp->env.mode));
write_log(LL_INFO, _T("Firmware version: %s"), A2CT(pmp->env.version));
write_log(LL_TRACE, _T("Default language: %s"), A2CT(pmp->env.language));
- write_log(LL_TRACE, _T("Root directory: %s"), W2CT(pmp->env.path_to_root.path));
- write_log(LL_TRACE, _T("Music directory: %s"), W2CT(pmp->env.path_to_music.path));
- write_log(LL_TRACE, _T("Playlist directory: %s"), W2CT(pmp->env.path_to_playlist.path));
- write_log(LL_TRACE, _T("Playlist extension: %s"), W2CT(pmp->env.playlist_ext));
+ write_log(LL_TRACE, _T("Root directory: %s"), UCS2CT(pmp->env.path_to_root.path));
+ write_log(LL_TRACE, _T("Music directory: %s"), UCS2CT(pmp->env.path_to_music.path));
+ write_log(LL_TRACE, _T("Playlist directory: %s"), UCS2CT(pmp->env.path_to_playlist.path));
+ write_log(LL_TRACE, _T("Playlist extension: %s"), UCS2CT(pmp->env.playlist_ext));
write_log(LL_INFO, _T(""));
}
Modified: trunk/pmplib/frontend/easypmp/win32gui/stdafx.h
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/stdafx.h 2006-12-29 04:51:14 UTC (rev 224)
+++ trunk/pmplib/frontend/easypmp/win32gui/stdafx.h 2006-12-29 06:27:47 UTC (rev 225)
@@ -5,12 +5,18 @@
#pragma once
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
+
// Change these values to use different versions
#define WINVER 0x0410
#define _WIN32_WINNT 0x0500
#define _WIN32_IE 0x0500
#define _RICHEDIT_VER 0x0100
+#if _MSC_VER >= 1400
+#define _CRT_SECURE_NO_DEPRECATE 1 /* Use 'unsafe' CRT routines. */
+#endif/*_MSC_VER*/
+
#include <atlbase.h>
#if _ATL_VER >= 0x0700
#include <atlcoll.h>
@@ -33,3 +39,9 @@
#include <atlddx.h>
#include <imagehlp.h>
+
+#define UCS2CT(x) W2CT(reinterpret_cast<LPCWSTR>(x))
+#define CW2CUCS(x) reinterpret_cast<const ucs2char_t*>(x)
+#define T2CUCS(x) reinterpret_cast<const ucs2char_t*>(T2CW(x))
+#define UCS2W(x) reinterpret_cast<LPWSTR>(x)
+#define UCS2CW(x) reinterpret_cast<LPCWSTR>(x)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
