From 59687548437979c2c07feb396685c9e932075597 Mon Sep 17 00:00:00 2001 From: blairmcg Date: Fri, 19 Feb 2016 19:49:15 +0000 Subject: [PATCH 1/7] Add common props and targets and remove unecessary project dependencies --- .gitignore | 4 +- Compiler/Compiler.vcxproj | 10 +- ConsoleStub/Console.vcxproj | 19 +- ConsoleStub/stub.rc | 13 +- ConsoleToGo/ConsoleToGo.rc | 27 +- ConsoleToGo/ConsoleToGo.vcxproj | 17 +- DevRes.vcxproj | 61 +--- DolphinLib.vcxproj | 42 +-- DolphinSureCrypto/DolphinSureCrypto.rc | 29 +- DolphinSureCrypto/DolphinSureCrypto.vcxproj | 15 +- DolphinVM.sln | 13 +- GUIStub/Stub.vcxproj | 9 +- GUIStub/stub.rc | 5 +- InProcStub/InProcStub.rc | 4 +- InProcStub/InProcStub.vcxproj | 12 +- InProcToGo/IPToGo.rc | 8 +- InProcToGo/InProcToGo.vcxproj | 55 ++-- Launcher/Dull.vcxproj | 27 +- Launcher/dull.rc | 9 +- ToGoLib/ToGoLib.vcxproj | 135 ++------- ToGoStub/GuiToGo.vcxproj | 11 +- ToGoStub/ToGoStub.rc | 14 +- VMLib/VMLib.vcxproj | 240 +++------------- decode.cpp | 2 +- devres.rc | 301 +++++++++++++++++++- dll.vcxproj | 22 +- dolphin.props | 39 +++ dolphin.targets | 49 ++++ getVersion.cmd | 14 - vm.rc | 11 +- 30 files changed, 595 insertions(+), 622 deletions(-) create mode 100644 dolphin.props create mode 100644 dolphin.targets delete mode 100755 getVersion.cmd diff --git a/.gitignore b/.gitignore index 1c75bdb..31c10ed 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,4 @@ UpgradeLog.htm *.sdf *.aps *.opensdf -*.VC.opendb - -Version.h +*.VC.opendb \ No newline at end of file diff --git a/Compiler/Compiler.vcxproj b/Compiler/Compiler.vcxproj index f2f59f2..e089ff4 100644 --- a/Compiler/Compiler.vcxproj +++ b/Compiler/Compiler.vcxproj @@ -45,14 +45,12 @@ $(SolutionDir)$(Configuration)\ - $(Configuration)\ true false DolphinCR7 $(SolutionDir)$(Configuration)\ - $(Configuration)\ true true DolphinCR7 @@ -75,7 +73,6 @@ true Speed true - $(SolutionDir) USE_VM_DLL;_WIN32_WINNT=0x0400;WIN32;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -93,7 +90,6 @@ NDEBUG;%(PreprocessorDefinitions) 0x0809 - $(SolutionDir) /MACHINE:I386 %(AdditionalOptions) @@ -129,7 +125,6 @@ Disabled - $(SolutionDir) DEBUG;_DEBUG;USE_VM_DLL;_WIN32_WINNT=0x0400;WIN32;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -150,7 +145,6 @@ _DEBUG;%(PreprocessorDefinitions) 0x0809 - $(IntDir) /MACHINE:I386 %(AdditionalOptions) @@ -213,11 +207,9 @@ {241d4e3e-44c0-40b7-be1b-5249916fe631} false - - {bc5d162d-46bc-42cf-85db-cb715ee8517e} - + \ No newline at end of file diff --git a/ConsoleStub/Console.vcxproj b/ConsoleStub/Console.vcxproj index 71680fd..ac5b6c2 100644 --- a/ConsoleStub/Console.vcxproj +++ b/ConsoleStub/Console.vcxproj @@ -60,7 +60,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -73,20 +73,13 @@ AnySuitable Size true - $(SolutionDir);%(AdditionalIncludeDirectories) _CONSOLE;NDEBUG;STRICT;WIN32;USE_VM_DLL;%(PreprocessorDefinitions) - true MultiThreadedDLL false - true - true - true Use ist.h true Level3 - true - ProgramDatabase StdCall Default @@ -98,8 +91,6 @@ /MACHINE:I386 %(AdditionalOptions) $(OutDir)$(ProjectName)Stub.exe 6.0 - true - true Console false false @@ -108,13 +99,12 @@ false MachineX86 - Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -125,19 +115,15 @@ Disabled Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) DEBUG;_DEBUG;_CONSOLE;STRICT;WIN32;USE_VM_DLL;%(PreprocessorDefinitions) true MultiThreadedDebugDLL false true - true - true Use ist.h true Level3 - true StdCall Default true @@ -194,5 +180,6 @@ + \ No newline at end of file diff --git a/ConsoleStub/stub.rc b/ConsoleStub/stub.rc index ec41f2f..b7f3067 100644 --- a/ConsoleStub/stub.rc +++ b/ConsoleStub/stub.rc @@ -9,18 +9,16 @@ // #include "winres.h" #include "..\rc_stub.h" - +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.K.) resources +// English (United Kingdom) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -35,8 +33,9 @@ END 2 TEXTINCLUDE BEGIN - "#include ""winres.h""\0" - "#include ""..\\rc_stub.h""\0" + "#include ""winres.h""\r\n" + "#include ""..\\rc_stub.h""\r\n" + "#include ""Version.h""\0" END 3 TEXTINCLUDE @@ -47,7 +46,7 @@ END #endif // APSTUDIO_INVOKED -#endif // English (U.K.) resources +#endif // English (United Kingdom) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/ConsoleToGo/ConsoleToGo.rc b/ConsoleToGo/ConsoleToGo.rc index 2fce603..9091488 100755 --- a/ConsoleToGo/ConsoleToGo.rc +++ b/ConsoleToGo/ConsoleToGo.rc @@ -10,17 +10,16 @@ #include "winres.h" #include "..\rc_vm.h" #include "..\rc_stub.h" +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -48,7 +47,6 @@ BEGIN VALUE "FileDescription", "Dolphin ToGo Console Application" VALUE "FileVersion", "1, 0, 0, 1" VALUE "LegalCopyright", "Copyright © Object Arts 1997-2016." - VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "ConsoleToGo.exe" VALUE "ProductName", "A Dolphin ToGo Console Application" VALUE "ProductVersion", "1, 0, 0, 1" @@ -60,18 +58,16 @@ BEGIN END END -#endif // English (U.S.) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// English (U.K.) resources +// English (United Kingdom) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -88,7 +84,8 @@ END BEGIN "#include ""winres.h""\r\n" "#include ""..\\rc_vm.h""\r\n" - "#include ""..\\rc_stub.h""\0" + "#include ""..\\rc_stub.h""\r\n" + "#include ""Version.h""\0" END 3 TEXTINCLUDE @@ -105,18 +102,18 @@ END // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDS_APPNAME "A Dolphin Smalltalk Console Application" END -STRINGTABLE +STRINGTABLE BEGIN IDP_INVALIDIMAGETYPE "Executable file '%1' is corrupt" IDP_OPENIMAGEFAILURE "Fail to load executable '%1'" END -STRINGTABLE +STRINGTABLE BEGIN IDP_RECURSIVEDNU "Recursive message not understood (#%2). See crash dump." IDP_STACKOVERFLOW "Unrecoverable stack overflow (%1!u!, %2!x!, %3!x!, %4!u!). See crash dump." @@ -135,17 +132,17 @@ BEGIN IDP_UNKNOWNIMAGEERROR "An unknown error occurred while loading the executable" END -STRINGTABLE +STRINGTABLE BEGIN IDP_FAILTOHOOK "Unable to hook window creation events (%1!d!).%nPlease wait a few moments and try again." END -STRINGTABLE +STRINGTABLE BEGIN IDS_APP_SHORT_NAME "Dolphin" END -#endif // English (U.K.) resources +#endif // English (United Kingdom) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/ConsoleToGo/ConsoleToGo.vcxproj b/ConsoleToGo/ConsoleToGo.vcxproj index fb86148..639f7bc 100644 --- a/ConsoleToGo/ConsoleToGo.vcxproj +++ b/ConsoleToGo/ConsoleToGo.vcxproj @@ -58,7 +58,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -74,21 +74,15 @@ true Speed true - $(SolutionDir);$(SolutionDir)zlib;%(AdditionalIncludeDirectories) _CONSOLE;STRICT;TO_GO;NDEBUG;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true MultiThreaded false - true - true - true Use ist.h - true Level3 true - ProgramDatabase FastCall Default @@ -113,8 +107,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" - + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -126,19 +119,14 @@ Disabled - $(SolutionDir);$(SolutionDir)zlib;%(AdditionalIncludeDirectories) DEBUG;_DEBUG;_CONSOLE;STRICT;TO_GO;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true MultiThreadedDebug false - true - true - true Use ist.h - true Level3 true FastCall @@ -249,5 +237,6 @@ + \ No newline at end of file diff --git a/DevRes.vcxproj b/DevRes.vcxproj index 6abf520..2990656 100644 --- a/DevRes.vcxproj +++ b/DevRes.vcxproj @@ -28,6 +28,7 @@ + @@ -59,36 +60,14 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) - - NDEBUG;%(PreprocessorDefinitions) - Win32 - true - .\WinDLL/DevRes.tlb - - - /LD %(AdditionalOptions) - MinSpace - Default - Size - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - true - Level3 - true - $(SolutionDir) - NDEBUG 0x0809 - $(SolutionDir) /MACHINE:I386 %(AdditionalOptions) @@ -105,45 +84,17 @@ true - - - - Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" - + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) - - NDEBUG;%(PreprocessorDefinitions) - Win32 - true - .\WinDLL/DevRes.tlb - - - /LD %(AdditionalOptions) - Disabled - Disabled - DEBUG;_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions) - true - true - true - true - Level3 - true - true - EnableFastChecks - true - $(SolutionDir) - _DEBUG;%(PreprocessorDefinitions) 0x0809 - $(SolutionDir) /MACHINE:I386 /NOENTRY %(AdditionalOptions) @@ -488,12 +439,8 @@ - - - {bc5d162d-46bc-42cf-85db-cb715ee8517e} - - + \ No newline at end of file diff --git a/DolphinLib.vcxproj b/DolphinLib.vcxproj index 93d0bc1..4b04b53 100644 --- a/DolphinLib.vcxproj +++ b/DolphinLib.vcxproj @@ -42,22 +42,11 @@ <_ProjectFileVersion>12.0.30501.0 - - $(SolutionDir)$(Configuration)\ - $(TargetName)\$(Configuration)\ - - + $(SolutionDir)$(Configuration)\ $(TargetName)\$(Configuration)\ - - - false - $(ProjectDir)/dlldata.c - false - - - + false $(ProjectDir)/dlldata.c @@ -66,26 +55,17 @@ - Win32 - Win32 - true - true - Compiler.tlb - Compiler.tlb - Compiler_i.h - Compiler_i.h + Win32 + true + Compiler.tlb + Compiler_i.h - Win32 - Win32 - true - true - DolphinSmalltalk.tlb - DolphinSmalltalk.tlb - DolphinSmalltalk_i.h - DolphinSmalltalk_i.h - false - false + Win32 + true + DolphinSmalltalk.tlb + DolphinSmalltalk_i.h + false diff --git a/DolphinSureCrypto/DolphinSureCrypto.rc b/DolphinSureCrypto/DolphinSureCrypto.rc index 4f54826..844e3bc 100755 --- a/DolphinSureCrypto/DolphinSureCrypto.rc +++ b/DolphinSureCrypto/DolphinSureCrypto.rc @@ -9,6 +9,7 @@ // #include "winres.h" #include "..\rc_stub.h" +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -17,6 +18,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -31,8 +33,9 @@ END 2 TEXTINCLUDE BEGIN - "#include ""winres.h""\r\n" - "#include ""..\\rc_stub.h""\0" + "#include ""winres.h""\r\n" + "#include ""..\\rc_stub.h""\r\n" + "#include ""Version.h""\0" END 3 TEXTINCLUDE @@ -66,17 +69,16 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Object Arts Ltd." - VALUE "FileDescription", "Dolphin Smalltalk Crypto Library" - VALUE "FileVersion", "2016.7.0.0" - VALUE "InternalName", "Dolphin" - VALUE "LegalCopyright", "Copyright © Object Arts 1997-2016" - VALUE "OriginalFilename", "DolphinSureCrypto.dll" - VALUE "ProductName", "Dolphin Smalltalk" -#include "Version.h" - VALUE "ProductVersion", GIT_TAG - VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" - END + VALUE "CompanyName", "Object Arts Ltd." + VALUE "FileDescription", "Dolphin Smalltalk Crypto Library" + VALUE "FileVersion", "2016.7.0.0" + VALUE "InternalName", "Dolphin" + VALUE "LegalCopyright", "Copyright © Object Arts 1997-2016" + VALUE "OriginalFilename", "DolphinSureCrypto.dll" + VALUE "ProductName", "Dolphin Smalltalk" + VALUE "ProductVersion", "v7.0.2.1-3-ge873caa" + VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" + END END BLOCK "VarFileInfo" BEGIN @@ -98,3 +100,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/DolphinSureCrypto/DolphinSureCrypto.vcxproj b/DolphinSureCrypto/DolphinSureCrypto.vcxproj index 8091a60..90cc7cc 100644 --- a/DolphinSureCrypto/DolphinSureCrypto.vcxproj +++ b/DolphinSureCrypto/DolphinSureCrypto.vcxproj @@ -56,7 +56,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)\..\..\$(TargetFileName) @@ -77,16 +77,13 @@ NDEBUG;WIN32;_WINDOWS;_USRDLL;DOLPHINSURECRYPTO_EXPORTS;INC_CHILD;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true MultiThreaded - true Level3 true - $(SolutionDir) NDEBUG;%(PreprocessorDefinitions) 0x0809 - $(SolutionDir) true @@ -105,7 +102,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)\..\..\$(TargetFileName) @@ -135,12 +132,10 @@ true EnableFastChecks true - $(SolutionDir) _DEBUG;%(PreprocessorDefinitions) 0x0809 - $(SolutionDir) true @@ -185,12 +180,8 @@ - - - {bc5d162d-46bc-42cf-85db-cb715ee8517e} - - + \ No newline at end of file diff --git a/DolphinVM.sln b/DolphinVM.sln index 2f0f2d4..b59fbeb 100644 --- a/DolphinVM.sln +++ b/DolphinVM.sln @@ -14,13 +14,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DevRes", "DevRes.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcStub", "InProcStub\InProcStub.vcxproj", "{CD85B8FA-6C9E-45C0-AFC8-0A79A7E5D0F7}" ProjectSection(ProjectDependencies) = postProject - {BC5D162D-46BC-42CF-85DB-CB715EE8517E} = {BC5D162D-46BC-42CF-85DB-CB715EE8517E} + {241D4E3E-44C0-40B7-BE1B-5249916FE631} = {241D4E3E-44C0-40B7-BE1B-5249916FE631} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcToGo", "InProcToGo\InProcToGo.vcxproj", "{90C32F90-C0B1-46FE-BACE-FB6566EB6F3C}" - ProjectSection(ProjectDependencies) = postProject - {382ABBF3-B32D-4D77-B303-346AA146921C} = {382ABBF3-B32D-4D77-B303-346AA146921C} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUIStub", "GUIStub\Stub.vcxproj", "{47007458-C534-493F-9A4C-936E5E0C91C8}" ProjectSection(ProjectDependencies) = postProject @@ -40,9 +37,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VMLib", "VMLib\VMLib.vcxpro EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUIToGo", "ToGoStub\GuiToGo.vcxproj", "{12B536BA-143E-4F38-BD96-77B35467DB13}" - ProjectSection(ProjectDependencies) = postProject - {382ABBF3-B32D-4D77-B303-346AA146921C} = {382ABBF3-B32D-4D77-B303-346AA146921C} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToGoLib", "ToGoLib\ToGoLib.vcxproj", "{50AB410B-7D13-43FF-B426-FB02CA3FEF86}" ProjectSection(ProjectDependencies) = postProject @@ -53,6 +47,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinSureCrypto", "Dolphi EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stubs", "Stubs", "{F6CB1D3C-CC39-4BCA-AC1A-DF0D1CA27580}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{89BB403F-881C-4B73-BA44-50A545697C93}" + ProjectSection(SolutionItems) = preProject + dolphin.props = dolphin.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Release|Win32 = Release|Win32 diff --git a/GUIStub/Stub.vcxproj b/GUIStub/Stub.vcxproj index 1019af7..21f3c78 100644 --- a/GUIStub/Stub.vcxproj +++ b/GUIStub/Stub.vcxproj @@ -58,7 +58,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -74,12 +74,9 @@ AnySuitable Size true - $(SolutionDir);%(AdditionalIncludeDirectories) USE_VM_DLL;_CTYPE_DISABLE_MACROS;NDEBUG;STRICT;WIN32;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL - true - true true Use ist.h @@ -92,6 +89,7 @@ NDEBUG;STUB;%(PreprocessorDefinitions) 0x0809 + $(IntDir);%(AdditionalIncludeDirectories) /MACHINE:I386 %(AdditionalOptions) @@ -108,7 +106,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -121,7 +119,6 @@ Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) DEBUG;_DEBUG;USE_VM_DLL;_CTYPE_DISABLE_MACROS;STRICT;WIN32;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDebugDLL diff --git a/GUIStub/stub.rc b/GUIStub/stub.rc index b3a1c86..6e7ef60 100644 --- a/GUIStub/stub.rc +++ b/GUIStub/stub.rc @@ -9,7 +9,7 @@ // #include "winres.h" #include "..\rc_stub.h" - +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -77,6 +77,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // remains consistent on all systems. !APPLICATION ICON "..\\Res\\ExeStub.ico" + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -92,7 +93,7 @@ END BEGIN "#include ""winres.h""\r\n" "#include ""..\\rc_stub.h""\r\n" - "\0" + "#include ""Version.h""\0" END 3 TEXTINCLUDE diff --git a/InProcStub/InProcStub.rc b/InProcStub/InProcStub.rc index 2ea4a10..0bf113f 100644 --- a/InProcStub/InProcStub.rc +++ b/InProcStub/InProcStub.rc @@ -9,7 +9,7 @@ // #include "winres.h" #include "..\rc_stub.h" - +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -35,7 +35,7 @@ END BEGIN "#include ""winres.h""\r\n" "#include ""..\\rc_stub.h""\r\n" - "\0" + "#include ""Version.h""\0" END 3 TEXTINCLUDE diff --git a/InProcStub/InProcStub.vcxproj b/InProcStub/InProcStub.vcxproj index 9dd1e17..1339e38 100644 --- a/InProcStub/InProcStub.vcxproj +++ b/InProcStub/InProcStub.vcxproj @@ -59,7 +59,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -75,7 +75,6 @@ AnySuitable Size true - $(ProjectDir);$(SolutionDir);$(SolutionDir)zlib;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;USE_VM_DLL;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -113,7 +112,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -127,7 +126,6 @@ Disabled Disabled - $(ProjectDir);$(SolutionDir);$(SolutionDir)zlib;%(AdditionalIncludeDirectories) DEBUG;_DEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;USE_VM_DLL;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -235,10 +233,7 @@ - - $(OUTDIR) - $(OUTDIR) - + @@ -250,5 +245,6 @@ + \ No newline at end of file diff --git a/InProcToGo/IPToGo.rc b/InProcToGo/IPToGo.rc index 7a8978c..a296d02 100755 --- a/InProcToGo/IPToGo.rc +++ b/InProcToGo/IPToGo.rc @@ -10,7 +10,7 @@ #include "winres.h" #include "..\rc_stub.h" #include "..\rc_vm.h" - +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -56,7 +56,9 @@ END // HSPLIT CURSOR "..\\res\\hsplit.cur" + VSPLIT CURSOR "..\\res\\vsplit.cur" + #endif // Neutral (Default) resources ///////////////////////////////////////////////////////////////////////////// @@ -92,7 +94,7 @@ BEGIN BEGIN VALUE "Comments", "Powered by Dolphin Smalltalk" VALUE "FileDescription", "Dolphin ToGo In-Proc COM Server Stub" - VALUE "FileVersion", "1, 0, 0, 1" + VALUE "FileVersion", "1, 0, 0, 1" VALUE "InternalName", "IPDolphin To Go" VALUE "LegalCopyright", "Portions Copyright © Object Arts 1997-2016" VALUE "OriginalFilename", "IPDolphinToGo.DLL" @@ -134,7 +136,7 @@ BEGIN "#include ""winres.h""\r\n" "#include ""..\\rc_stub.h""\r\n" "#include ""..\\rc_vm.h""\r\n" - "\0" + "#include ""Version.h""\0" END 3 TEXTINCLUDE diff --git a/InProcToGo/InProcToGo.vcxproj b/InProcToGo/InProcToGo.vcxproj index 1d2dc29..43a564b 100644 --- a/InProcToGo/InProcToGo.vcxproj +++ b/InProcToGo/InProcToGo.vcxproj @@ -75,7 +75,6 @@ true Speed true - $(SolutionDir);$(SolutionDir)zlib NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;TO_GO;_WIN32_WINNT=0x0500;_MERGE_PROXYSTUB;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_CRT_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true Sync @@ -129,7 +128,6 @@ Disabled - $(SolutionDir);$(SolutionDir)zlib DEBUG;_DEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;TO_GO;_WIN32_WINNT=0x0500;_MERGE_PROXYSTUB;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_CRT_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true MultiThreadedDebug @@ -177,66 +175,50 @@ - - ..;..\zlib;. - ..;..\zlib;. + - - - - + - - - - + - - ..;..\zlib;. - ..;..\zlib;. - - - ..;..\zlib;. - ..;..\zlib;. - Create - Create + + + Create NDEBUG;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;TO_GO;_MERGE_PROXYSTUB;_WIN32_WINNT=0x0400 NDEBUG;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;TO_GO;_MERGE_PROXYSTUB;_WIN32_WINNT=0x0400 - - - - + + + + + + + + - - $(OUTDIR) - $(OUTDIR) - + - /no_robust %(AdditionalOptions) - /no_robust %(AdditionalOptions) - .\InProcStub.h - .\InProcStub.h - InProcStub_i.c - InProcStub_i.c + /no_robust %(AdditionalOptions) + .\InProcStub.h + InProcStub_i.c @@ -321,5 +303,6 @@ + \ No newline at end of file diff --git a/Launcher/Dull.vcxproj b/Launcher/Dull.vcxproj index c9c2022..ec274a4 100644 --- a/Launcher/Dull.vcxproj +++ b/Launcher/Dull.vcxproj @@ -44,24 +44,20 @@ <_ProjectFileVersion>12.0.30501.0 - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - false - Dolphin7 - - + $(SolutionDir)$(Configuration)\ $(Configuration)\ true true Dolphin7 + + false + Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -77,7 +73,6 @@ OnlyExplicitInline Size true - $(SolutionDir) USE_VM_DLL;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;_CTYPE_DISABLE_MACROS;WIN32;_WIN32_WINNT=0x0400;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -96,7 +91,6 @@ NDEBUG;DULL;%(PreprocessorDefinitions) 0x0809 - $(SolutionDir) /MACHINE:I386 %(AdditionalOptions) @@ -118,7 +112,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -132,7 +126,6 @@ Disabled Disabled - $(SolutionDir) DEBUG;_DEBUG;USE_VM_DLL;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;_CTYPE_DISABLE_MACROS;WIN32;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -152,7 +145,6 @@ _DEBUG;DULL;%(PreprocessorDefinitions) 0x0809 - $(SolutionDir) /MACHINE:I386 %(AdditionalOptions) @@ -181,13 +173,11 @@ - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj - Create - Create + Create @@ -227,5 +217,6 @@ + \ No newline at end of file diff --git a/Launcher/dull.rc b/Launcher/dull.rc index 6606e52..336ea32 100755 --- a/Launcher/dull.rc +++ b/Launcher/dull.rc @@ -9,6 +9,7 @@ // #include "winres.h" #include "..\rc_stub.h" +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -48,8 +49,7 @@ BEGIN VALUE "LegalCopyright", "Copyright © Object Arts 1997-2016. STS © David Gorisek 2000-2016" VALUE "OriginalFilename", "Dolphin7.exe" VALUE "ProductName", "Dolphin Smalltalk" -#include "Version.h" - VALUE "ProductVersion", GIT_TAG + VALUE "ProductVersion", "v7.0.2.1-3-ge873caa" VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" END END @@ -79,6 +79,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // remains consistent on all systems. !APPLICATION ICON "..\\Res\\Flipper.ico" + ///////////////////////////////////////////////////////////////////////////// // // RT_MANIFEST @@ -86,6 +87,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK IDR_MANIFEST RT_MANIFEST "..\\res\\dolphin.exe.manifest" + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -100,7 +102,8 @@ END 2 TEXTINCLUDE BEGIN "#include ""winres.h""\r\n" - "#include ""..\\rc_stub.h""\0" + "#include ""..\\rc_stub.h""\r\n" + "#include ""Version.h""\0" END 3 TEXTINCLUDE diff --git a/ToGoLib/ToGoLib.vcxproj b/ToGoLib/ToGoLib.vcxproj index 3fc7506..a29138b 100644 --- a/ToGoLib/ToGoLib.vcxproj +++ b/ToGoLib/ToGoLib.vcxproj @@ -30,6 +30,7 @@ + @@ -56,7 +57,6 @@ true Speed true - $(SolutionDir);$(SolutionDir)zlib;%(AdditionalIncludeDirectories) NDEBUG;TO_GO;VM;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;_MERGE_PROXYSTUB;_ATL_NO_MP_HEAP;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_CRT_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true @@ -72,12 +72,14 @@ Default 4577 + + $(IntDir)%(Filename).lst + Disabled Disabled - $(SolutionDir);$(SolutionDir)zlib;%(AdditionalIncludeDirectories) DEBUG;_DEBUG;TO_GO;VM;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;_MERGE_PROXYSTUB;_ATL_NO_MP_HEAP;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_CRT_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true MultiThreadedDebug @@ -94,6 +96,9 @@ true false + + _DEBUG;%(PreprocessorDefinitions) + @@ -259,125 +264,12 @@ - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - true - true - - - - - ml /nologo /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - + - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - @@ -428,7 +320,18 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/ToGoStub/GuiToGo.vcxproj b/ToGoStub/GuiToGo.vcxproj index 6976b2b..8f80d3b 100644 --- a/ToGoStub/GuiToGo.vcxproj +++ b/ToGoStub/GuiToGo.vcxproj @@ -59,7 +59,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -76,7 +76,6 @@ true Speed true - $(SolutionDir);$(SolutionDir)zlib;%(AdditionalIncludeDirectories) NDEBUG;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;TO_GO;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true @@ -116,7 +115,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -130,7 +129,6 @@ Disabled Disabled - $(SolutionDir);$(SolutionDir)zlib;%(AdditionalIncludeDirectories) DEBUG;_DEBUG;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;TO_GO;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true @@ -196,9 +194,9 @@ Compiling message table Compiling message table - mc "%(FullPath)" + mc "%(FullPath)" - mc "%(FullPath)" + mc "%(FullPath)" $(ProjectDir)%(Filename).rc;$(ProjectDir)%(Filename).h;%(Outputs) $(ProjectDir)%(Filename).rc;$(ProjectDir)%(Filename).h;%(Outputs) @@ -295,5 +293,6 @@ + \ No newline at end of file diff --git a/ToGoStub/ToGoStub.rc b/ToGoStub/ToGoStub.rc index 880565d..5733013 100755 --- a/ToGoStub/ToGoStub.rc +++ b/ToGoStub/ToGoStub.rc @@ -10,7 +10,7 @@ #include "winres.h" #include "..\rc_vm.h" #include "..\rc_stub.h" - +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -28,8 +28,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT // HSPLIT CURSOR "..\\res\\hsplit.cur" + VSPLIT CURSOR "..\\res\\vsplit.cur" + ///////////////////////////////////////////////////////////////////////////// // // Dialog @@ -125,9 +127,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. !APPLICATION ICON "..\\Res\\ExeStub.ico" + UPARROW.ICO ICON "..\\Res\\UpArrow.ico" + DOWNARROW.ICO ICON "..\\Res\\DownArrow.ico" + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -144,7 +149,7 @@ BEGIN "#include ""winres.h""\r\n" "#include ""..\\rc_vm.h""\r\n" "#include ""..\\rc_stub.h""\r\n" - "\r\n" + "#include ""Version.h""\r\n" "\0" END @@ -162,11 +167,16 @@ END // FINDBAR.BMP BITMAP "..\\Res\\findbar.bmp" + LISTBAR.BMP BITMAP "..\\res\\ListBar.bmp" + EDITBAR.BMP BITMAP "..\\Res\\EditBar.bmp" + FILEBAR.BMP BITMAP "..\\res\\FileBar.bmp" + VIEWBAR.BMP BITMAP "..\\Res\\ViewBar.bmp" + ///////////////////////////////////////////////////////////////////////////// // // String Table diff --git a/VMLib/VMLib.vcxproj b/VMLib/VMLib.vcxproj index 7e5a6e3..d37bd7c 100644 --- a/VMLib/VMLib.vcxproj +++ b/VMLib/VMLib.vcxproj @@ -30,6 +30,8 @@ + + @@ -56,7 +58,6 @@ true Speed true - $(SolutionDir);$(SolutionDir)zlib VM;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;_MERGE_PROXYSTUB;_ATL_NO_MP_HEAP;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_CRT_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0; true @@ -72,15 +73,11 @@ Default 4577 - - $(SolutionDir)getVersion.cmd "$(SolutionDir)" - Disabled Disabled - $(SolutionDir);$(SolutionDir)zlib DEBUG;_DEBUG;VM;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;_MERGE_PROXYSTUB;_ATL_NO_MP_HEAP;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_CRT_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0; true @@ -98,9 +95,6 @@ EnableFastChecks true - - $(SolutionDir)getVersion.cmd "$(SolutionDir)" - @@ -111,8 +105,7 @@ - Create - Create + Create @@ -126,20 +119,17 @@ - - - - + - Use - Use - ist.h - ist.h + Use + ist.h - + + $(SolutionDir)zlib;%(AdditionalIncludeDirectories) + @@ -149,20 +139,13 @@ - - - - + - _CRTBLD;%(PreprocessorDefinitions) - _CRTBLD;%(PreprocessorDefinitions) - - - - + _CRTBLD;%(PreprocessorDefinitions) + @@ -170,218 +153,67 @@ - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fl /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - + + + + + + + - - true - true - - - - - ml /nologo /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - + - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - - - ml /nologo /Zd /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - ml /nologo /Zd /D_DEBUG /coff /c /Fo "$(IntDir)%(Filename).obj" "%(FullPath)" - - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(SolutionDir)istasm.inc;%(AdditionalInputs) - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - @@ -435,5 +267,7 @@ + + \ No newline at end of file diff --git a/decode.cpp b/decode.cpp index 8a9b284..a2fc837 100755 --- a/decode.cpp +++ b/decode.cpp @@ -1530,7 +1530,7 @@ void Interpreter::decodeMethodAt(CompiledMethod* meth, unsigned ip, ostream& str #include -string printString(OTE* pote) +template string printString(TOTE pote) { std::ostrstream stream; stream << pote << ends; diff --git a/devres.rc b/devres.rc index d992c89..0ec5f0f 100755 --- a/devres.rc +++ b/devres.rc @@ -8,6 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "winres.h" +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -27,291 +28,571 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. 2 ICON "res\\imagedoc.ico" + !APPLICATION ICON "Res\\flipper.ico" + ABSTRACTCARDCONTAINER.ICO ICON "Res\\AbstractCardContainer.ico" + ACCELERATORPRESENTER.ICO ICON "Res\\AcceleratorPresenter.ico" + AIBO.ICO ICON "Res\\Aibo.ico" + APPLICATIONDEPLOYMENTWIZARD.ICO ICON "Res\\ApplicationDeploymentWizard.ico" + ASPECTBUFFER.ICO ICON "Res\\AspectBuffer.ico" + BAG.ICO ICON "Res\\Bag.ico" + BASICINSPECTOR.ICO ICON "Res\\BasicInspector.ico" + LISTCONTROLVIEW.ICO ICON "Res\\ListControlView.ico" + BATCHASPECTACCESSOR.ICO ICON "Res\\BatchAspectAccessor.ico" + BEHAVIOR.ICO ICON "Res\\Behavior.ico" + BLANK.ICO ICON "res\\blank.ico" + BLOCKCLOSURE.ICO ICON "res\\BlockClosure.ico" + BOOLEAN.ICO ICON "Res\\Boolean.ico" + BOOLEANPRESENTER.ICO ICON "Res\\BooleanPresenter.ico" + BOUNCINGBALLVIEW.ICO ICON "Res\\BouncingBallView.ico" + BROWSEFOLDERDIALOG.ICO ICON "Res\\BrowseFolderDialog.ico" + BRUSH.ICO ICON "Res\\Brush.ico" + BYTEARRAY.ICO ICON "Res\\ByteArray.ico" + CALCULATOR.ICO ICON "Res\\Calculator.ico" + CANVAS.ICO ICON "Res\\Canvas.ico" + CATEGORY.ICO ICON "Res\\Category.ico" + CHANGED.ICO ICON "res\\Changed.ico" + CHARACTER.ICO ICON "Res\\Character.ico" + CHAT.ICO ICON "res\\Chat.ico" + CHECKBOX.ICO ICON "Res\\CheckBox.ico" + CHOICEPRESENTER.ICO ICON "Res\\ChoicePresenter.ico" + CLASS.ICO ICON "res\\Class.ico" + CLASSBROWSERSHELL.ICO ICON "res\\ClassBrowserShell.ico" + CLASSCOMMENT.ICO ICON "Res\\ClassComment.ico" + CLASSHIERARCHYDIAGRAM.ICO ICON "res\\ClassHierarchyDiagram.ico" + CLEARDOCUMENT.ICO ICON "Res\\ClearDocument.ico" + CLIPBOARD.ICO ICON "Res\\Clipboard.ico" + CLOSEWINDOW.ICO ICON "Res\\CloseWindow.ico" + CODEMENTORPLUGIN.ICO ICON "Res\\CodeMentorPlugin.ico" + COLLECTION.ICO ICON "res\\Collection.ico" + COLLECTIONPRESENTER.ICO ICON "Res\\CollectionPresenter.ico" + COLOR.ICO ICON "res\\color.ico" + COLORDIALOG.ICO ICON "Res\\ColorDialog.ico" + COLORPRESENTER.ICO ICON "Res\\ColorPresenter.ico" + COLORVIEW.ICO ICON "Res\\ColorView.ico" + COMBOBOX.ICO ICON "Res\\Combobox.ico" + COMINTERFACE.ICO ICON "res\\cominter.ico" + COMPILEDMETHOD.ICO ICON "res\\CompiledMethod.ico" + COMPILEDMETHOD_DEPRECATED.ICO ICON "res\\CompiledMethod_Deprecated.ico" + COMPILEDMETHOD_PRIVATE.ICO ICON "res\\CompiledMethodPrivate.ico" + COMPILEDMETHOD_PUBLIC.ICO ICON "res\\CompiledMethodPublic.ico" + COMPILEFAILEDMETHOD.ICO ICON "res\\CompileFailedMethod.ico" + COMPILER.ICO ICON "Res\\Compiler.ico" + CONSOLESESSIONMANAGER.ICO ICON "Res\\cmd.ico" + CONTAINERVIEW.ICO ICON "Res\\ContainerView.ico" + CONTROLBARABSTRACT.ICO ICON "Res\\ControlBarAbstract.ico" + DATE.ICO ICON "Res\\Date.ico" + DATEPRESENTER.ICO ICON "Res\\DatePresenter.ico" + DATETIMECOMMONCONTROL.ICO ICON "Res\\DateTimePicker.ico" + DEADOBJECT.ICO ICON "Res\\DeadObject.ico" + DEAFOBJECT.ICO ICON "Res\\DeafObject.ico" + DEBUGGER.ICO ICON "res\\Debugger.ico" + DELAY.ICO ICON "Res\\delay.ico" + DESKTOPVIEW.ICO ICON "Res\\DesktopView.ico" + DIALOG.ICO ICON "Res\\Dialog.ico" + DIALOGVIEW.ICO ICON "Res\\DialogView.ico" + DICTIONARY.ICO ICON "Res\\Dictionary.ico" + DISASSEMBLYPLUGIN.ICO ICON "Res\\DisassemblyPlugin.ico" + DISPLAYIT.ICO ICON "Res\\DisplayIt.ico" + DOCUMENTSHELL.ICO ICON "Res\\DocumentShell.ico" + DOLPHINPACKAGEFOLDER.ICO ICON "Res\\DolphinPackageFolder.ico" + DOLPHINSERIALNUMBER.ICO ICON "res\\DolphinSerialNumber.ico" + DOLPHINSURECERTIFICATE.ICO ICON "Res\\DolphinSureCertificate.ico" + DOLPHINSURETRUSTEDDATA.ICO ICON "Res\\DolphinSureTrustedData.ico" + DOWNARROW.ICO ICON "Res\\DownArrow.ico" + EDITCLEAR.ICO ICON "Res\\EditDelete.ico" + EDITCOPY.ICO ICON "Res\\EditCopy.ico" + EDITCUT.ICO ICON "Res\\EditCut.ico" + EDITPASTE.ICO ICON "Res\\EditPaste.ico" + EDITREDO.ICO ICON "Res\\EditRedo.ico" + EDITUNDO.ICO ICON "Res\\EditUndo.ico" + ENVIRONMENTBROWSERSHELL.ICO ICON "res\\EnvironmentBrowserShell.ico" + ETCHASKETCH.ICO ICON "res\\EtchASketch.ico" + EVALUATEIT.ICO ICON "Res\\EvaluateIt.ico" + EXCEPTION.ICO ICON "Res\\Exception.ico" + EXTENT.ICO ICON "res\\EXTENT.ICO" + EXTERNALSTRUCTURE.ICO ICON "Res\\externalstructure.ico" + FALSE.ICO ICON "Res\\False.ico" + FILEDIALOG.ICO ICON "Res\\FileDialog.ico" + FILENEW.ICO ICON "Res\\DocumentShell.ico" + FILEOPEN.ICO ICON "Res\\FileOpen.ico" + FILESAVE.ICO ICON "Res\\FileSave.ico" + FILESYSTEMMONITOR.ICO ICON "Res\\FileSystemMonitor.ico" + FINDCLASS.ICO ICON "Res\\Find.ico" + FINDNEXT.ICO ICON "Res\\FindNext.ico" + FLOAT.ICO ICON "Res\\Float.ico" + FOLDER.ICO ICON "Res\\Folder.ico" + FOLDERPRESENTER.ICO ICON "Res\\FolderPresenter.ico" + FONT.ICO ICON "res\\font.ico" + FONTPRESENTER.ICO ICON "Res\\FontPresenter.ico" + FONTVIEW.ICO ICON "Res\\FontView.ico" + FRACTION.ICO ICON "Res\\Fraction.ico" + GDILIBRARY.ICO ICON "Res\\GDILibrary.ico" + GOSEARCH.ICO ICON "Res\\GoSearch.ico" + GRAPHICSTOOL.ICO ICON "Res\\GraphicsTool.ico" + GRAYEDCLASSCOMMENT.ICO ICON "res\\GrayedClassComment.ico" + GROUPBOX.ICO ICON "Res\\GroupBox.ico" + HELLOWORLD.ICO ICON "res\\HelloWorld.ico" + HISTORYBACK.ICO ICON "Res\\HistoryBack.ico" + HISTORYFORWARD.ICO ICON "Res\\HistoryForward.ico" + HOTKEY.ICO ICON "Res\\HotKey.ico" + IAGENTCTLCHARACTER.ICO ICON "Res\\IAgentCtlCharacter.ico" + FINDDIALOG.ICO ICON "Res\\FindDialog.ico" + IDI_UNLOCK ICON "Res\\UnlockDialog.ico" + IDISPATCH.ICO ICON "Res\\idispatch.ico" + IMAGE.ICO ICON "res\\image.ico" + IMAGEPRESENTER.ICO ICON "Res\\ImagePresenter.ico" + IMAGEVIEW.ICO ICON "Res\\ImageView.ico" + ICON.ICO ICON "Res\\Icon.ico" + INPLACERENAME.ICO ICON "Res\\Rename.ico" + INPUTSTATE.ICO ICON "Res\\InputState.ico" + INSPECTIT.ICO ICON "Res\\InspectIt.ico" + INTERVAL.ICO ICON "Res\\Interval.ico" + ITYPELIB.ICO ICON "Res\\typelib.ico" + KEYBOARD.ICO ICON "Res\\Keyboard.ico" + LARGEINTEGER.ICO ICON "Res\\LargeInteger.ico" + LAYOUTMANAGER.ICO ICON "res\\LayoutManager.ico" + LINTERROR.ICO ICON "Res\\LintError.ico" + LINTINFO.ICO ICON "Res\\LintInfo.ico" + LINTPASS.ICO ICON "Res\\LintPass.ico" + LINTRULE.ICO ICON "Res\\LintRule.ico" + LINTWARNING.ICO ICON "Res\\LintWarning.ico" + LISTMODEL.ICO ICON "Res\\ListModel.ico" + LISTPRESENTER.ICO ICON "Res\\ListPresenter.ico" + LISTVALUEPRESENTER.ICO ICON "Res\\ListValuePresenter.ico" + LISTVIEWCOLUMN.ICO ICON "Res\\ListViewColumn.ico" + LIVEUPDATE.ICO ICON "Res\\LiveUpdate.ico" + LIVEUPDATEOFF.ICO ICON "Res\\LiveUpdateOff.ico" + LOCALE.ICO ICON "Res\\Locale.ico" + MEMORYMANAGER.ICO ICON "Res\\MemoryManager.ico" + MENU.ICO ICON "Res\\Menu.ico" + MESSAGE.ICO ICON "Res\\Message.ico" + MESSAGESENDABSTRACT.ICO ICON "Res\\MessageSendAbstract.ico" + MESSAGESEQUENCEABSTRACT.ICO ICON "Res\\MessageSequenceAbstract.ico" + METACLASS.ICO ICON "Res\\Metaclass.ico" + METHODBROWSER.ICO ICON "res\\MethodBrowser.ico" + METHODPROTOCOL.ICO ICON "Res\\methodprotocol.ico" + METHODPROTOCOL_ANSI.ICO ICON "res\\methodprotocolansi.ico" + METHODPROTOCOL_READONLY.ICO ICON "res\\methodprotocolro.ico" + MODEL.ICO ICON "Res\\Model.ico" + MOENTREEVIEW.ICO ICON "Res\\MoenTreeView.ico" + MOUSETRACKER.ICO ICON "Res\\MouseTracker.ico" + MOVEPRIOR.ICO ICON "Res\\MovePrior.ico" + MOVENEXT.ICO ICON "Res\\MoveNext.ico" + MULTIPLESELECTIONLISTBOX.ICO ICON "Res\\MultipleSelectionListBox.ico" + MULTIPLESELECTIONLISTVIEW.ICO ICON "Res\\MultipleSelectionListView.ico" + MUTEX.ICO ICON "Res\\Mutex.ico" + NEWCLASS.ICO ICON "Res\\NewClass.ico" + NEWMETHOD.ICO ICON "Res\\NewMethod.ico" + NUMBER.ICO ICON "Res\\Number.ico" + NUMBERPRESENTER.ICO ICON "Res\\NumberPresenter.ico" + OBJECT.ICO ICON "Res\\object.ico" + OVERRIDDEN.ICO ICON "res\\Overridden.ico" + PACKAGE.ICO ICON "Res\\Package.ico" + PANIC.ICO ICON "Res\\Panic.ico" + PEN.ICO ICON "Res\\Pen.ico" + PLAYGROUND.ICO ICON "res\\Playground.ico" + POINT.ICO ICON "Res\\Point.ico" + POSITION.ICO ICON "res\\POSITION.ICO" + POWERSWITCH.ICO ICON "Res\\PowerOff.ico" + PRESENTER.ICO ICON "Res\\Presenter.ico" + PROCESS.ICO ICON "Res\\PROCESS.ICO" + PROCESSMONITOR.ICO ICON "res\\ProcessMonitor.ico" + PROGRESSBAR.ICO ICON "Res\\ProgressBar.ico" + PROTOCOLBROWSERSHELL.ICO ICON "res\\ProtocolBrowserShell.ico" + PUSHBUTTON.ICO ICON "Res\\PushButton.ico" + RADIOBUTTON.ICO ICON "Res\\RadioButton.ico" + RECTANGLE.ICO ICON "Res\\Rectangle.ico" + RECYCLEBIN.ICO ICON "Res\\RecycleBin.ico" + REFACTORING.ICO ICON "Res\\Refactoring.ico" + REFERENCEVIEW.ICO ICON "Res\\ReferenceView.ico" + REFRESH.ICO ICON "Res\\Refresh.ico" + REGKEY.ICO ICON "res\\regkey.ico" + REGKEYABSTRACT.ICO ICON "res\\REGKEYABSTRACT.ico" + REGKEYVALUES.ICO ICON "res\\regkeyva.ico" + REGVALUEBIN.ICO ICON "res\\regvalue.ico" + RESOURCE.ICO ICON "res\\Resource.ico" + REVERT.ICO ICON "Res\\Revert.ico" + RUNTOCURSOR.ICO ICON "Res\\RunToCursor.ico" + RUN.ICO ICON "Res\\Run.ico" + SCALEDDECIMAL.ICO ICON "res\\ScaledDecimal.ico" + SCINTILLAVIEW.ICO ICON "Res\\ScintillaView.ico" + SCRIBBLE.ICO ICON "res\\Scribble.ico" + SCRIBBLEVIEW.ICO ICON "res\\ScribbleView.ico" + SCROLLBAR.ICO ICON "Res\\ScrollBar.ico" + SCROLLINGDECORATOR.ICO ICON "Res\\ScrollingDecorator.ico" + SEARCHTEXT.ICO ICON "Res\\SearchText.ico" + SHELL.ICO ICON "Res\\Shell.ico" + SHELLVIEW.ICO ICON "Res\\ShellView.ico" + SHIELD.ICO ICON "Res\\Shield.ico" + SHOWNEXTSTATEMENT.ICO ICON "Res\\Forwards.ico" + SLEEP.ICO ICON "Res\\Sleep.ico" + SLIDER.ICO ICON "Res\\Slider.ico" + SMALLTALKOPTIONSFOLDER.ICO ICON "res\\SmalltalkSystemOptionSet.ico" + SMALLTALKSYSTEMFOLDER.ICO ICON "res\\SmalltalkSystemFolder.ico" + SMALLTALKTOOLSFOLDER.ICO ICON "res\\SmalltalkSystemToolsFolder.ico" + SMALLTALKTOOLSHELL.ICO ICON "res\\SmalltalkToolShell.ico" + SMALLTALKWORKSPACE.ICO ICON "res\\SmalltalkWorkspace.ico" + SNAPSHOT.ICO ICON "Res\\Snapshot.ico" + SOUND.ICO ICON "Res\\Sound.ico" + SOURCEMANAGER.ICO ICON "Res\\SourceManager.ico" + SOURCETRACKINGSYSTEM.ICO ICON "Res\\SourceTrackingSystem.ico" + SOURCETRACKINGTOOLSFOLDER.ICO ICON "Res\\SourceTrackingToolsFolder.ico" + SOURCETRACKINGTOOLSHELL.ICO ICON "Res\\SourceTrackingToolShell.ico" + SPINBUTTON.ICO ICON "Res\\SpinButton.ico" + SPLITTER.ICO ICON "Res\\Splitter.ico" + STATICIMAGE.ICO ICON "Res\\StaticImage.ico" + STATICTEXT.ICO ICON "Res\\StaticText.ico" + STATUS.ICO ICON "Res\\Status.ico" + STEPINTO.ICO ICON "Res\\StepInto.ico" + STEPOVER.ICO ICON "Res\\StepOver.ico" + STEPOUT.ICO ICON "Res\\StepOut.ico" + STRING.ICO ICON "res\\String.ico" + STSADMINSHELL.ICO ICON "Res\\StsAdminShell.ico" + STSCLASSEDITION.ICO ICON "Res\\StsClassEdition.ico" + STSMETHODEDITION.ICO ICON "Res\\StsMethodEdition.ico" + STSPACKAGEEDITION.ICO ICON "Res\\StsPackageEdition.ico" + STSPROJECTEDITION.ICO ICON "Res\\StsProjectEdition.ico" + STSRESOURCEEDITION.ICO ICON "Res\\StsResourceEdition.ico" + SYMBOL.ICO ICON "res\\symbol.ico" + SYSTEMBROWSERSHELL.ICO ICON "Res\\SystemBrowserShell.ico" + SYSTEMDICTIONARY.ICO ICON "Res\\SystemDictionary.ico" + TABVIEW.ICO ICON "Res\\TabView.ico" + TEXTEDIT.ICO ICON "Res\\TextEdit.ico" + TEXTPRESENTER.ICO ICON "Res\\TextPresenter.ico" + TIME.ICO ICON "Res\\Time.ico" + TIMEPRESENTER.ICO ICON "Res\\TimePresenter.ico" + TIMESTAMP.ICO ICON "Res\\TimeStamp.ico" + TIPOFTHEDAY.ICO ICON "Res\\TipOfTheDay.ico" + TOGGLELOCALHIERARCHY.ICO ICON "Res\\ToggleLocalHierarchy.ico" + TOOLTIP.ICO ICON "Res\\ToolTip.ico" + TRANSCRIPTSHELL.ICO ICON "res\\TranscriptShell.ico" + TRANSFORMATIONRULE.ICO ICON "Res\\Writing.ico" + TREEMODELABSTRACT.ICO ICON "Res\\TreeModelAbstract.ico" + TREEPRESENTER.ICO ICON "Res\\TreePresenter.ico" + TREEVIEW.ICO ICON "Res\\TreeView.ico" + TRUE.ICO ICON "Res\\True.ico" + TYPECONVERTER.ICO ICON "res\\TypeConverter.ico" + UNDEFINEDOBJECT.ICO ICON "Res\\UndefinedObject.ico" + UP.ICO ICON "Res\\Up.ico" + UPARROW.ICO ICON "Res\\UpArrow.ico" + VALUEADAPTOR.ICO ICON "Res\\ValueAdaptor.ico" + VALUEBUFFER.ICO ICON "Res\\ValueBuffer.ico" + VALUECONVERTER.ICO ICON "Res\\ValueConverter.ico" + VALUECONVERTINGCONTROLVIEW.ICO ICON "Res\\ValueConvertingControlView.ico" + VALUEDIALOG.ICO ICON "Res\\ValueDialog.ico" + VALUEHOLDER.ICO ICON "Res\\ValueHolder.ico" + VALUEMODEL.ICO ICON "Res\\ValueModel.ico" + VALUEPRESENTER.ICO ICON "Res\\ValuePresenter.ico" + VIDEOLIBRARY.ICO ICON "Res\\VideoLibrary.ico" + VIDEORECORDING.ICO ICON "Res\\VideoRecording.ico" + VIDEOTAPE.ICO ICON "Res\\VideoTape.ico" + VIEW.ICO ICON "Res\\View.ico" + VIEWCOMPOSER.ICO ICON "Res\\ViewComposer.ico" + VISUALOBJECTFINDER.ICO ICON "res\\VisualObjectFinder.ico" + WAIT.ICO ICON "Res\\Wait.ico" + WINIMAGELIST.ICO ICON "Res\\FilmStrip.ico" + WIZARD.ICO ICON "res\\Wizard.ico" + XML.ICO ICON "res\\Xml.ico" + RESTART.ICO ICON "Res\\Restart.ico" + MARKOVGAME.ICO ICON "res\\MarkovGame.ico" + UNITTESTPLUGIN.ICO ICON "Res\\UnitTestPlugin.ico" + UNITTESTPLUGINDEFECT.ICO ICON "res\\UnitTestPluginDefect.ico" + UNITTESTPLUGINFAIL.ICO ICON "res\\UnitTestPluginFail.ico" + UNITTESTPLUGINNOTEST.ICO ICON "res\\UnitTestPluginNoTest.ico" + UNITTESTPLUGINNOTRUN.ICO ICON "res\\UnitTestPluginNotRun.ico" + UNITTESTPLUGINPASS.ICO ICON "res\\UnitTestPluginPass.ico" + TESTRUNNER.ICO ICON "res\\TestRunner.ico" + SUNITABSBROWSER.ICO ICON "res\\SUnitAbsBrowser.ico" + ///////////////////////////////////////////////////////////////////////////// // // Bitmap // TOOLS.BMP BITMAP "res\\Tools.bmp" + XHATCH.BMP BITMAP "res\\xhatch.bmp" + LAGOONLOGO.BMP BITMAP "res\\LagoonLogo.bmp" + HEADERPIN.BMP BITMAP "res\\HeaderPin.bmp" + #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// @@ -391,6 +672,7 @@ END 2 TEXTINCLUDE BEGIN "#include ""winres.h""\r\n" + "#include ""Verson.h""\r\n" "\0" END @@ -446,8 +728,7 @@ BEGIN VALUE "LegalCopyright", "Copyright © Object Arts 1997-2016" VALUE "OriginalFilename", "DolphinDR7.dll" VALUE "ProductName", "Dolphin Smalltalk 7" -#include "Version.h" - VALUE "ProductVersion", GIT_TAG + VALUE "ProductVersion", "v7.0.2.1-3-ge873caa" VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" END END @@ -476,27 +757,43 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDEASPACESHELL.ICO ICON "Res\\IdeaSpaceShell.ico" + TRADINGMACHINEWORKBENCH.ICO ICON "Res\\TradingMachineWorkbench.ico" + STRATEGYANALYSERSHELL.ICO ICON "Res\\StrategyAnalyserShell.ico" + STRATEGYANALYSERPRESENTER.ICO ICON "Res\\StrategyAnalyserPresenter.ico" + IDEASPACEBREAKOUT.ICO ICON "Res\\IdeaSpaceBreakout.ico" + IDEASPACESHELLADD.ICO ICON "Res\\IdeaSpaceShellAdd.ico" + IDEASPACESHELLADDDISABLED.ICO ICON "res\\IdeaSpaceShellAddDisabled.ico" + DOLPHINPACKAGE.ICO ICON "Res\\DolphinPackage.ico" + STSPROJECT.ICO ICON "res\\StsProject.ico" + ///////////////////////////////////////////////////////////////////////////// // // Bitmap // FINDBAR.BMP BITMAP "Res\\findbar.bmp" + LISTBAR.BMP BITMAP "Res\\ListBar.bmp" + EDITBAR.BMP BITMAP "res\\EditBar.bmp" + FILEBAR.BMP BITMAP "Res\\FileBar.bmp" + VIEWBAR.BMP BITMAP "res\\ViewBar.bmp" + VCBAR.BMP BITMAP "Res\\VCBar.bmp" + IDEASPACECARDBAR.BMP BITMAP "Res\\IdeaSpaceCardBar.bmp" + #endif // English (United Kingdom) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/dll.vcxproj b/dll.vcxproj index 46a3715..10160bd 100644 --- a/dll.vcxproj +++ b/dll.vcxproj @@ -61,8 +61,7 @@ Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" - + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -78,7 +77,6 @@ true Speed true - $(SolutionDir);$(SolutionDir)zlib VM;VMDLL;NDEBUG;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;_MERGE_PROXYSTUB;_ATL_NO_MP_HEAP;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true @@ -101,7 +99,6 @@ NDEBUG 0x0809 - $(SolutionDir) /MACHINE:I386 %(AdditionalOptions) @@ -123,15 +120,12 @@ true - - Copying "$(TargetPath)" to "$(SolutionDir)..\..\$(TargetFileName)" - copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" - + copy "$(TargetPath)" "$(SolutionDir)..\..\$(TargetFileName)" $(SolutionDir)..\..\$(TargetFileName) $(TargetPath) @@ -143,7 +137,6 @@ /LD %(AdditionalOptions) Disabled - $(SolutionDir);$(SolutionDir)zlib DEBUG;_DEBUG;VM;VMDLL;_CTYPE_DISABLE_MACROS;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;WIN32_EXTRA_LEAN;STRICT;_MERGE_PROXYSTUB;_ATL_NO_MP_HEAP;ZEXPORT=__stdcall;ZEXPORTVA=__cdecl;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) @@ -170,7 +163,6 @@ _DEBUG;%(PreprocessorDefinitions) 0x0809 - $(SolutionDir) /MACHINE:I386 %(AdditionalOptions) @@ -222,7 +214,10 @@ Level3 Level3 - + + $(SolutionDir)zlib;%(AdditionalIncludeDirectories) + $(SolutionDir)zlib;%(AdditionalIncludeDirectories) + MinSpace @@ -262,9 +257,9 @@ - mc "%(FullPath)" + mc "%(FullPath)" - mc "%(FullPath)" + mc "%(FullPath)" $(ProjectDir)%(Filename).rc;$(ProjectDir)%(Filename).h;%(Outputs) $(ProjectDir)%(Filename).rc;$(ProjectDir)%(Filename).h;%(Outputs) @@ -292,5 +287,6 @@ + \ No newline at end of file diff --git a/dolphin.props b/dolphin.props new file mode 100644 index 0000000..356a7cd --- /dev/null +++ b/dolphin.props @@ -0,0 +1,39 @@ + + + + + $(IntDir);$(SolutionDir) + + + Win32 + true + + + $(SolutionDir) + true + true + true + true + true + Level3 + true + ProgramDatabase + + + + true + true + + + False + true + $(IntDir)%(Filename).lst + + + + + + _DEBUG;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/dolphin.targets b/dolphin.targets new file mode 100644 index 0000000..7cc5369 --- /dev/null +++ b/dolphin.targets @@ -0,0 +1,49 @@ + + + + + $(IntDir)Version.h + + + + + + + + + + + + + + + + $(IntDir);$(SolutionDir);$(AdditionalIncludeDirectories) + + + Win32 + true + + + $(SolutionDir) + true + true + true + true + true + Level3 + true + ProgramDatabase + + + + true + + + \ No newline at end of file diff --git a/getVersion.cmd b/getVersion.cmd deleted file mode 100755 index 69998a3..0000000 --- a/getVersion.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -rem -- Get git tag and commit information for use in product version - -rem -- this seems to be the way to get the result of a command into a variable -for /f %%i in ('git describe --tag') do set GIT_TAG=%%i - -rem -- generate Version.h in the intermediate directory (passed in as first argument) - -echo // this file generated by getVersion.cmd on %date% at %time% > %1Version.h -echo #if defined(_DEBUG) >> %1Version.h -echo #define GIT_TAG "%GIT_TAG% (Debug)" >> %1Version.h -echo #else >> %1Version.h -echo #define GIT_TAG "%GIT_TAG%" >> %1Version.h -echo #endif >> %1Version.h \ No newline at end of file diff --git a/vm.rc b/vm.rc index 9507851..141453d 100755 --- a/vm.rc +++ b/vm.rc @@ -8,6 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "winres.h" +#include "Version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -47,15 +48,19 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT // HSPLIT CURSOR "res\\hsplit.cur" + VSPLIT CURSOR "res\\vsplit.cur" + ///////////////////////////////////////////////////////////////////////////// // // Bitmap // FINDBAR.BMP BITMAP "Res\\findbar.bmp" + LISTBAR.BMP BITMAP "res\\ListBar.bmp" + #endif // Neutral (Default) resources ///////////////////////////////////////////////////////////////////////////// @@ -99,7 +104,8 @@ END 2 TEXTINCLUDE BEGIN - "#include ""winres.h""\0" + "#include ""winres.h""\r\n" + "#include ""Version.h""\0" END 3 TEXTINCLUDE @@ -160,8 +166,7 @@ BEGIN VALUE "OriginalFilename", "DolphinVM7.DLL" VALUE "PrivateBuild", "11192015" VALUE "ProductName", "Dolphin Smalltalk 7" -#include "Version.h" - VALUE "ProductVersion", GIT_TAG + VALUE "ProductVersion", "v7.0.2.1-3-ge873caa" VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" END END From f3cca0a3e5c30982062b739fc4e97262522ecbcf Mon Sep 17 00:00:00 2001 From: blairmcg Date: Fri, 19 Feb 2016 19:50:32 +0000 Subject: [PATCH 2/7] Fix some masm warnings --- ExternalCall.asm | 1 - primasm.asm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ExternalCall.asm b/ExternalCall.asm index aa1f105..e62df82 100644 --- a/ExternalCall.asm +++ b/ExternalCall.asm @@ -1341,7 +1341,6 @@ extCallArgQWORD: ; Now we need to check that the high dword is zero cmp [ARG].m_digits[SIZEOF QWORD], 0 jnz preCallFail ; Top dword not 0, so can't be 64-bit - @@: pushIt: ASSUME ARG:PTR QWORDBytes diff --git a/primasm.asm b/primasm.asm index 1d51494..7c6af17 100644 --- a/primasm.asm +++ b/primasm.asm @@ -1758,7 +1758,7 @@ BEGINPRIMITIVE primitiveInstVarAtPut xchg ecx, [eax].m_elements[edx*OOPSIZE] ; Exchange Oop of overwritten value with new value ASSUME eax:NOTHING CountDownOopIn ; Count down overwritten value -@@: + ; count down destroys eax, ecx, and edx mov ecx, [_SP-OOPSIZE*2] ; Reload receiver mov eax, [_SP] ; Reload new value into eax From a3bec6be44d311042b45fe8101111c607fefce2e Mon Sep 17 00:00:00 2001 From: blairmcg Date: Fri, 19 Feb 2016 23:37:32 +0000 Subject: [PATCH 3/7] More project cleanup --- GUIStub/Stub.vcxproj | 2 ++ InProcStub/InProcStub.vcxproj | 52 ++++++++++------------------------- ToGoLib/ToGoLib.vcxproj | 5 +++- 3 files changed, 21 insertions(+), 38 deletions(-) diff --git a/GUIStub/Stub.vcxproj b/GUIStub/Stub.vcxproj index 21f3c78..464e904 100644 --- a/GUIStub/Stub.vcxproj +++ b/GUIStub/Stub.vcxproj @@ -30,6 +30,7 @@ + @@ -187,5 +188,6 @@ + \ No newline at end of file diff --git a/InProcStub/InProcStub.vcxproj b/InProcStub/InProcStub.vcxproj index 1339e38..769e683 100644 --- a/InProcStub/InProcStub.vcxproj +++ b/InProcStub/InProcStub.vcxproj @@ -29,6 +29,7 @@ + @@ -172,49 +173,30 @@ - - - - + - - - - + - - - - + - - - - + + $(ProjectDir);%(AdditionalIncludeDirectories) - - - - + - - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj + + $(IntDir)%(Filename)1.obj - Create - Create + Create @@ -222,14 +204,10 @@ - Win32 - Win32 - .\InProcStub.tlb - .\InProcStub.tlb - InProcStub.h - InProcStub.h - InProcStub_i.c - InProcStub_i.c + Win32 + .\InProcStub.tlb + InProcStub.h + InProcStub_i.c @@ -245,6 +223,6 @@ - + \ No newline at end of file diff --git a/ToGoLib/ToGoLib.vcxproj b/ToGoLib/ToGoLib.vcxproj index a29138b..db6e201 100644 --- a/ToGoLib/ToGoLib.vcxproj +++ b/ToGoLib/ToGoLib.vcxproj @@ -138,7 +138,10 @@ - + + $(SolutionDir)zlib;%(AdditionalIncludeDirectories) + $(SolutionDir)zlib;%(AdditionalIncludeDirectories) + From 3c267cf7779baa92f8106edbc88b4bb21550529a Mon Sep 17 00:00:00 2001 From: blairmcg Date: Fri, 19 Feb 2016 23:38:35 +0000 Subject: [PATCH 4/7] printString debugging method no longer works Need to add some proper debugger visualisers, but for now provide a way to dump an object to debug output since printString no longer works. --- decode.cpp | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/decode.cpp b/decode.cpp index a2fc837..f36a188 100755 --- a/decode.cpp +++ b/decode.cpp @@ -45,6 +45,8 @@ ostream& operator<<(ostream& stream, const VariantCharOTE* oteChars) { // stream.lock(); + ASSERT(oteChars->isBytes()); + unsigned len=oteChars->bytesSize(); VariantCharObject* string = oteChars->m_location; unsigned end = min(len, 80); @@ -77,13 +79,35 @@ ostream& operator<<(ostream& st, const CompiledMethod& method) ostream& operator<<(ostream& st, const MethodOTE* ote) { if (ote->isNil()) return st << "nil"; - return st << *ote->m_location; + BehaviorOTE* oteClass = ote->m_oteClass; + if (oteClass == Pointers.ClassCompiledExpression) + { + st << "a CompiledExpression"; + } + else if (oteClass == Pointers.ClassCompiledMethod) + { + st << *ote->m_location; + } + else + { + st << "**Non-method: " << reinterpret_cast(ote) << "**"; + } + return st; } ostream& operator<<(ostream& st, const StringOTE* ote) { if (ote->isNil()) return st << "nil"; - return st << "'" << reinterpret_cast(ote) << "'"; + if (!ObjectMemory::isKindOf(Oop(ote), Pointers.ClassString)) + { + // Expected a Symbol Oop, but got something else + st << "**Non-String: " << reinterpret_cast(ote) << "**"; + } + else + { + st << "'" << reinterpret_cast(ote) << "'"; + } + return st; } //inline ostream& operator<<(ostream& st, const Symbol& symbol) @@ -115,7 +139,7 @@ ostream& operator<<(ostream& stream, const SymbolOTE* ote) if (!ObjectMemory::isKindOf(Oop(ote), Pointers.ClassSymbol)) // Expected a Symbol Oop, but got something else - return stream << "???" << reinterpret_cast(ote); + return stream << "**Non-symbol**" << reinterpret_cast(ote); else // Dump without a # prefix return stream << reinterpret_cast(ote); @@ -127,7 +151,7 @@ ostream& operator<<(ostream& stream, const BehaviorOTE* ote) if (!ObjectMemory::isBehavior(Oop(ote))) // Expected a class Oop, but got something else - return stream << "???" << reinterpret_cast(ote); + return stream << "**Non-behaviour**" << reinterpret_cast(ote); else return ote->isMetaclass() ? stream << *static_cast(ote->m_location) : @@ -1529,12 +1553,10 @@ void Interpreter::decodeMethodAt(CompiledMethod* meth, unsigned ip, ostream& str #endif #include - -template string printString(TOTE pote) + +void DumpObject(const POTE pote) { - std::ostrstream stream; - stream << pote << ends; - return stream.str(); + TRACESTREAM << pote << endl; } #ifdef _DEBUG From b7039e938948b7163ff6f8ee9aa3e9ffb5b31247 Mon Sep 17 00:00:00 2001 From: blairmcg Date: Fri, 19 Feb 2016 23:40:16 +0000 Subject: [PATCH 5/7] Clear out process->next pointer correctly when removing from list At some point in the past, the & reference was lost from the list manipulation code, resulting in a local variable being nil'd out, rather than the list next pointer. This may be @jgfoster's bug (not sure as I couldn't repro his problem precisely). --- process.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process.cpp b/process.cpp index 3f0469c..d439b14 100755 --- a/process.cpp +++ b/process.cpp @@ -1091,7 +1091,7 @@ ProcessOTE* ProcessList::remove(ProcessOTE* aLink) prevLink->m_location->BasicSetNext(nextLink); // Nil out the nextLink pointer of the removed link (ref. count remains same overall) - nextLink = nil; + currLink->m_location->BasicClearNext(); // May have removed last link in list if (aLink == m_lastLink) From d0e4888870468e5f4aa0a6b2ea088f16895e4262 Mon Sep 17 00:00:00 2001 From: blairmcg Date: Sat, 20 Feb 2016 00:00:27 +0000 Subject: [PATCH 6/7] Fix build break in InProcToGo --- InProcToGo/InProcToGo.vcxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/InProcToGo/InProcToGo.vcxproj b/InProcToGo/InProcToGo.vcxproj index 43a564b..72c87ba 100644 --- a/InProcToGo/InProcToGo.vcxproj +++ b/InProcToGo/InProcToGo.vcxproj @@ -175,7 +175,9 @@ - + + $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) @@ -185,7 +187,7 @@ - + Create From ef88084c00d102835ba4409a66686087b30a0b3a Mon Sep 17 00:00:00 2001 From: blairmcg Date: Sat, 20 Feb 2016 00:00:58 +0000 Subject: [PATCH 7/7] Restore GIT_TAG version numbers We are going to need to move this content to the rc2 file --- DolphinSureCrypto/DolphinSureCrypto.rc | 2 +- Launcher/dull.rc | 2 +- devres.rc | 2 +- vm.rc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DolphinSureCrypto/DolphinSureCrypto.rc b/DolphinSureCrypto/DolphinSureCrypto.rc index 844e3bc..254eb05 100755 --- a/DolphinSureCrypto/DolphinSureCrypto.rc +++ b/DolphinSureCrypto/DolphinSureCrypto.rc @@ -76,7 +76,7 @@ BEGIN VALUE "LegalCopyright", "Copyright © Object Arts 1997-2016" VALUE "OriginalFilename", "DolphinSureCrypto.dll" VALUE "ProductName", "Dolphin Smalltalk" - VALUE "ProductVersion", "v7.0.2.1-3-ge873caa" + VALUE "ProductVersion", GIT_TAG VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" END END diff --git a/Launcher/dull.rc b/Launcher/dull.rc index 336ea32..1f44dc9 100755 --- a/Launcher/dull.rc +++ b/Launcher/dull.rc @@ -49,7 +49,7 @@ BEGIN VALUE "LegalCopyright", "Copyright © Object Arts 1997-2016. STS © David Gorisek 2000-2016" VALUE "OriginalFilename", "Dolphin7.exe" VALUE "ProductName", "Dolphin Smalltalk" - VALUE "ProductVersion", "v7.0.2.1-3-ge873caa" + VALUE "ProductVersion", GIT_TAG VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" END END diff --git a/devres.rc b/devres.rc index 0ec5f0f..1df9a55 100755 --- a/devres.rc +++ b/devres.rc @@ -728,7 +728,7 @@ BEGIN VALUE "LegalCopyright", "Copyright © Object Arts 1997-2016" VALUE "OriginalFilename", "DolphinDR7.dll" VALUE "ProductName", "Dolphin Smalltalk 7" - VALUE "ProductVersion", "v7.0.2.1-3-ge873caa" + VALUE "ProductVersion", GIT_TAG VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" END END diff --git a/vm.rc b/vm.rc index 141453d..fe37736 100755 --- a/vm.rc +++ b/vm.rc @@ -166,7 +166,7 @@ BEGIN VALUE "OriginalFilename", "DolphinVM7.DLL" VALUE "PrivateBuild", "11192015" VALUE "ProductName", "Dolphin Smalltalk 7" - VALUE "ProductVersion", "v7.0.2.1-3-ge873caa" + VALUE "ProductVersion", GIT_TAG VALUE "WARNING", "Please edit this as a text file rather than with the resource editor to preserve GIT_TAG" END END