Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[599] trunk/OpenMPT
|
From: <rel...@us...> - 2010-05-21 16:37:44
|
Revision: 599
http://modplug.svn.sourceforge.net/modplug/?rev=599&view=rev
Author: relabsoluness
Date: 2010-05-21 16:37:38 +0000 (Fri, 21 May 2010)
Log Message:
-----------
[Mod] Keybindings: Updated and slightly modified default keybindings.
[Fix] General: Fix to possible path handling related crash (occurred at least in VC03 build at startup).
[Fix] Internal: VC03 build fixes(e.g. added ungzip-project, updated zlib-project).
Modified Paths:
--------------
trunk/OpenMPT/mptrack/MPTRACK.sln
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/View_gen.cpp
trunk/OpenMPT/mptrack/mptrack.vcproj
trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
trunk/OpenMPT/zlib/contrib/vstudio/vc7/zlibstat.vcproj
Added Paths:
-----------
trunk/OpenMPT/ungzip/ungzip.vcproj
Modified: trunk/OpenMPT/mptrack/MPTRACK.sln
===================================================================
--- trunk/OpenMPT/mptrack/MPTRACK.sln 2010-05-20 21:41:36 UTC (rev 598)
+++ trunk/OpenMPT/mptrack/MPTRACK.sln 2010-05-21 16:37:38 UTC (rev 599)
@@ -6,6 +6,7 @@
{71531076-78C7-488D-8FD6-9D841F20AADE} = {71531076-78C7-488D-8FD6-9D841F20AADE}
{CF3C2CA5-5D45-4635-BBA4-C1F435E10896} = {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}
{3C7281B0-D0E2-48ED-AE4D-A181FC77D8F7} = {3C7281B0-D0E2-48ED-AE4D-A181FC77D8F7}
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE} = {20BF96C8-0202-4251-80C9-6C62BE845DAE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unlha", "..\unlha\unlha.vcproj", "{71531076-78C7-488D-8FD6-9D841F20AADE}"
@@ -32,6 +33,11 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ungzip", "..\ungzip\ungzip.vcproj", "{20BF96C8-0202-4251-80C9-6C62BE845DAE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3F7D3110-B3DD-4DE1-B608-C3F491009625} = {3F7D3110-B3DD-4DE1-B608-C3F491009625}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -92,12 +98,20 @@
{CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.ReleaseWithoutAsm.Build.0 = Release|Win32
{3F7D3110-B3DD-4DE1-B608-C3F491009625}.Debug.ActiveCfg = Debug|Win32
{3F7D3110-B3DD-4DE1-B608-C3F491009625}.Debug.Build.0 = Debug|Win32
- {3F7D3110-B3DD-4DE1-B608-C3F491009625}.Release.ActiveCfg = Release|Win32
- {3F7D3110-B3DD-4DE1-B608-C3F491009625}.Release.Build.0 = Release|Win32
+ {3F7D3110-B3DD-4DE1-B608-C3F491009625}.Release.ActiveCfg = ReleaseWithoutAsm|Win32
+ {3F7D3110-B3DD-4DE1-B608-C3F491009625}.Release.Build.0 = ReleaseWithoutAsm|Win32
{3F7D3110-B3DD-4DE1-B608-C3F491009625}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32
{3F7D3110-B3DD-4DE1-B608-C3F491009625}.ReleaseAxp.Build.0 = ReleaseAxp|Win32
{3F7D3110-B3DD-4DE1-B608-C3F491009625}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32
{3F7D3110-B3DD-4DE1-B608-C3F491009625}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE}.Debug.ActiveCfg = Debug|Win32
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE}.Debug.Build.0 = Debug|Win32
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE}.Release.ActiveCfg = Release|Win32
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE}.Release.Build.0 = Release|Win32
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE}.ReleaseAxp.ActiveCfg = Release|Win32
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE}.ReleaseAxp.Build.0 = Release|Win32
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE}.ReleaseWithoutAsm.ActiveCfg = Release|Win32
+ {20BF96C8-0202-4251-80C9-6C62BE845DAE}.ReleaseWithoutAsm.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2010-05-20 21:41:36 UTC (rev 598)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2010-05-21 16:37:38 UTC (rev 599)
@@ -3176,14 +3176,14 @@
return;
const size_t nStrLength = nLength - 1; // "usable" length, i.e. not including the null char.
- TCHAR szExePath[nLength], szTempPath[nLength];
+ TCHAR szExePath[nLength], szTempPath[nLength] = _T("");
_tcsncpy(szExePath, theApp.GetAppDirPath(), nStrLength);
SetNullTerminator(szExePath);
// Path is on the same drive as OpenMPT ("\Somepath\" => "C:\Somepath\")
if(!_tcsncicmp(szPath, _T("\\"), 1))
{
- _tcsncpy(szTempPath, szExePath, 2); // "C:"
+ _tcsncat(szTempPath, szExePath, 2); // "C:"
_tcsncat(szTempPath, szPath, nStrLength - 2); // "\Somepath\"
_tcscpy(szPath, szTempPath);
} else
Modified: trunk/OpenMPT/mptrack/View_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp 2010-05-20 21:41:36 UTC (rev 598)
+++ trunk/OpenMPT/mptrack/View_gen.cpp 2010-05-21 16:37:38 UTC (rev 599)
@@ -1488,6 +1488,7 @@
// This is used for retrieving the correct background colour for the
// frames on the general tab when using WinXP Luna or Vista/Win7 Aero.
typedef HRESULT (__stdcall * ETDT)(HWND, DWORD);
+#include <uxtheme.h>
HBRUSH CViewGlobals::OnCtlColor(CDC *pDC, CWnd* pWnd, UINT nCtlColor)
//-------------------------------------------------------------------
@@ -1497,7 +1498,7 @@
if(!bUxInited)
{
- HMODULE uxlib = LoadLibrary("uxtheme.dll");
+ HMODULE uxlib = LoadLibrary(_T("uxtheme.dll"));
if(uxlib)
hETDT = (ETDT)GetProcAddress(uxlib, "EnableThemeDialogTexture");
bUxInited = true;
Modified: trunk/OpenMPT/mptrack/mptrack.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.vcproj 2010-05-20 21:41:36 UTC (rev 598)
+++ trunk/OpenMPT/mptrack/mptrack.vcproj 2010-05-21 16:37:38 UTC (rev 599)
@@ -698,6 +698,9 @@
RelativePath=".\res\view_pat.bmp">
</File>
<File
+ RelativePath=".\res\vispcnode.bmp">
+ </File>
+ <File
RelativePath=".\res\vumeters.bmp">
</File>
</Filter>
Modified: trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
===================================================================
--- trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-05-20 21:41:36 UTC (rev 598)
+++ trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-05-21 16:37:38 UTC (rev 599)
@@ -23,6 +23,7 @@
0:1362:1:45:1 //Paste: Shift+INSERT (KeyDown)
0:1363:3:86:1 //Mix Paste: Shift+Ctrl+V (KeyDown)
0:1793:1:86:5 //Paste Flood: Shift+V (KeyDown|KeyHold)
+0:1820:6:86:1 //Push Forward Paste: Ctrl+Alt+V (KeyDown)
0:1364:2:53:1 //SelectAll: Ctrl+5 (KeyDown)
0:1365:2:70:1 //Find: Ctrl+F (KeyDown)
0:1366:0:114:1 //Find Next: F3 (KeyDown)
@@ -79,11 +80,13 @@
2:1317:4:18:1 //Set row jump on note entry: Alt (KeyDown)
2:1685:2:9:1 //Switch to order list: Ctrl+TAB (KeyDown)
2:1806:2:68:1 //Duplicate pattern: Ctrl+D (KeyDown)
+2:1836:2:191:1 //Edit plugin assigned to PC note: Ctrl+/ (KeyDown)
2:1662:6:80:1 //Toggle channel's plugin editor: Ctrl+Alt+P (KeyDown)
2:1062:0:93:1 //Show note properties: Application (KeyDown)
2:1772:5:80:1 //Show pattern properties window: Shift+Alt+P (KeyDown)
2:1819:2:69:1 //Split Keyboard Settings dialog: Ctrl+E (KeyDown)
-2:1780:2:80:1 //Show playback time at current row: Ctrl+P (KeyDown)
+2:1776:1:122:1 //Toggle loop pattern: Shift+F11 (KeyDown)
+2:1780:2:84:1 //Show playback time at current row: Ctrl+T (KeyDown)
2:1005:0:121:1 //Mute current channel: F10 (KeyDown)
2:1006:2:121:1 //Solo current channel: Ctrl+F10 (KeyDown)
2:1771:6:121:1 //Unmute all channels: Ctrl+Alt+F10 (KeyDown)
@@ -134,7 +137,7 @@
3:1083:0:75:1 //Base octave +1 G: K (KeyDown)
3:1084:0:76:1 //Base octave +1 G#: L (KeyDown)
3:1085:0:186:1 //Base octave +1 A: ; (KeyDown)
-3:1086:0:222:1 //Base octave +1 A#: ' (KeyDown)
+3:1086:0:222:1 //Base octave +1 A#: # (KeyDown)
3:1087:0:220:1 //Base octave +1 B: \ (KeyDown)
3:1088:0:90:1 //Base octave +2 C: Z (KeyDown)
3:1089:0:88:1 //Base octave +2 C#: X (KeyDown)
@@ -167,11 +170,11 @@
3:1221:0:57:1 //Set octave 9: 9 (KeyDown)
3:1221:0:105:1 //Set octave 9: NUM 9 (KeyDown)
3:1316:1:16:1 //Chord Modifier: Shift (KeyDown)
-3:1200:0:192:1 //Note Cut: ` (KeyDown)
+3:1200:0:192:1 //Note Cut: ' (KeyDown)
3:1201:0:187:1 //Note Off: = (KeyDown)
3:1791:1:187:1 //Note Fade: Shift+= (KeyDown)
-3:1788:0:189:1 //Parameter control(MPTm only): - (KeyDown)
-3:1789:1:189:1 //Parameter control(smooth)(MPTm only): Shift+- (KeyDown)
+3:1788:1:189:1 //Parameter control(MPTm only): Shift+- (KeyDown)
+3:1789:0:189:1 //Parameter control(smooth)(MPTm only): - (KeyDown)
//----( Pattern Context [bottom] - Ins Col (4) )------------
4:1202:0:96:1 //Set instrument digit 0: NUM 0 (KeyDown)
@@ -229,14 +232,12 @@
5:1242:0:71:1 //Vol command - Portamento: G (KeyDown)
5:1243:0:70:1 //Vol command - Portamento Up: F (KeyDown)
5:1244:0:69:1 //Vol command - Portamento Down: E (KeyDown)
-5:1245:0:186:1 //Vol command - (unused): ; (KeyDown)
-5:1245:1:186:1 //Vol command - (unused): Shift+; (KeyDown)
5:1246:0:79:1 //Vol command - Offset: O (KeyDown)
//----( Pattern Context [bottom] - FX Col (6) )------------
6:1294:0:220:1 //FX midi macro slide: \ (KeyDown)
-6:1295:1:186:1 //FX combined note cute and note delay: Shift+; (KeyDown)
-6:1295:0:186:1 //FX combined note cute and note delay: ; (KeyDown)
+6:1295:1:186:1 //FX combined note delay and note cut: Shift+; (KeyDown)
+6:1295:0:186:1 //FX combined note delay and note cut: ; (KeyDown)
6:1666:0:191:1 //FX parameter extension command: / (KeyDown)
//----( Pattern Context [bottom] - Param Col (7) )------------
@@ -282,6 +283,8 @@
8:1790:2:68:1 //Remove DC Offset: Ctrl+D (KeyDown)
//----( Instrument Context [bottom] (9) )------------
+9:1837:0:107:5 //Zoom In: NUM PLUS (KeyDown|KeyHold)
+9:1838:0:109:5 //Zoom Out: NUM SUB (KeyDown|KeyHold)
9:1825:1:9:5 //Select previous envelope point: Shift+TAB (KeyDown|KeyHold)
9:1826:0:9:5 //Select next envelope point: TAB (KeyDown|KeyHold)
9:1821:0:37:5 //Move envelope point left: LEFT (KeyDown|KeyHold)
@@ -306,11 +309,14 @@
//----( Unknown Context (12) )------------
//----( Plugin GUI Context (13) )------------
-13:1763:0:37:5 //Previous plugin preset: LEFT (KeyDown|KeyHold)
-13:1764:0:39:5 //Next plugin preset: RIGHT (KeyDown|KeyHold)
-13:1782:0:38:5 //Plugin preset backward jump: UP (KeyDown|KeyHold)
-13:1783:0:40:5 //Plugin preset forward jump: DOWN (KeyDown|KeyHold)
-13:1765:2:82:1 //Randomize plugin parameters: Ctrl+R (KeyDown)
+13:1763:0:109:5 //Previous plugin preset: NUM SUB (KeyDown|KeyHold)
+13:1764:0:107:5 //Next plugin preset: NUM PLUS (KeyDown|KeyHold)
+13:1782:2:109:5 //Plugin preset backward jump: Ctrl+NUM SUB (KeyDown|KeyHold)
+13:1783:2:107:5 //Plugin preset forward jump: Ctrl+NUM PLUS (KeyDown|KeyHold)
+13:1765:3:68:1 //Randomize plugin parameters: Shift+Ctrl+D (KeyDown)
+13:1839:2:82:1 //Toggle parameter recording: Ctrl+R (KeyDown)
+13:1840:2:75:1 //Pass key presses to plugin: Ctrl+K (KeyDown)
+13:1841:2:66:1 //Bypass plugin: Ctrl+B (KeyDown)
//----( General Context [top] (14) )------------
Added: trunk/OpenMPT/ungzip/ungzip.vcproj
===================================================================
--- trunk/OpenMPT/ungzip/ungzip.vcproj (rev 0)
+++ trunk/OpenMPT/ungzip/ungzip.vcproj 2010-05-21 16:37:38 UTC (rev 599)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="ungzip"
+ ProjectGUID="{20BF96C8-0202-4251-80C9-6C62BE845DAE}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="4"
+ CharacterSet="0">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ZLIB_WINAPI"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="TRUE"
+ ForceConformanceInForLoopScope="TRUE"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/ungzip.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="4"
+ CharacterSet="0">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/O2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;ZLIB_WINAPI"
+ RuntimeLibrary="0"
+ ForceConformanceInForLoopScope="TRUE"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/ungzip.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\ungzip.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\ungzip.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: trunk/OpenMPT/zlib/contrib/vstudio/vc7/zlibstat.vcproj
===================================================================
--- trunk/OpenMPT/zlib/contrib/vstudio/vc7/zlibstat.vcproj 2010-05-20 21:41:36 UTC (rev 598)
+++ trunk/OpenMPT/zlib/contrib/vstudio/vc7/zlibstat.vcproj 2010-05-21 16:37:38 UTC (rev 599)
@@ -135,7 +135,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- AdditionalOptions="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj /NODEFAULTLIB "
+ AdditionalOptions="/NODEFAULTLIB "
OutputFile=".\zlibstat\zlibstat.lib"
SuppressStartupBanner="TRUE"/>
<Tool
@@ -173,7 +173,7 @@
PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
StringPooling="TRUE"
ExceptionHandling="FALSE"
- RuntimeLibrary="4"
+ RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\zlibstat/zlibstat.pch"
AssemblerListingLocation=".\zlibstatWithoutAsm/"
@@ -228,9 +228,6 @@
RelativePath="..\..\..\deflate.c">
</File>
<File
- RelativePath="..\..\masmx86\gvmat32c.c">
- </File>
- <File
RelativePath="..\..\..\infback.c">
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
