Skip to content

Commit

Permalink
Merge commit '95184529b6d22a33e1cf3afe0bfa092cc4391770'
Browse files Browse the repository at this point in the history
Conflicts:
	WinRun4J/src/common/Runtime.cpp
  • Loading branch information
poidasmith committed Jan 20, 2013
2 parents 3be7a5a + 9518452 commit 95f1926
Show file tree
Hide file tree
Showing 244 changed files with 36,160 additions and 36,159 deletions.
106 changes: 53 additions & 53 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
## Change History

### 0.4.4

* Improved command line argument parsing
* Fixes for service shutdown and working directory
* Fixes for return codes in built-in commands
* Fix for large INI files
* Added <code>--WinRun4J:Version</code> built-in command to check launcher version

### 0.4.3

* Fixed loading issue with Java 7
* Added standalone java service launcher

### 0.4.2

* Fixed issue with the ini.override flag.
* Fixed some JNI issues with Service and DDE functionality.
* Added ability to log to the debug monitor.
* RCEDIT supports /M option to add a manifest file.

### 0.4.1

* Fix for loading embedded jars

### 0.4.0

* Dynamic native binding implementation using <a href="http://sourceware.org/libffi/">libffi</a>. See <a href="nativebinding.html">native binding examples</a> for more information.
* Fixed a race condition in the service implementation for quick starting applications.
* The launcher java library now requires java 1.5 minimum (due to use of annotations). The launcher executable is compatible with java 1.4 and above.
* Fixed lowercased key issue with INI file
* Fixed max heap size issue on 64-bit VM
* Added option to set console title via INI file
* Added option to suppress error popups
* DDE activate message sends command line

### 0.3.3

* Moved service name, description and controls accepted to INI file
* Refactored Service interface and added AbstractService helper class
* Implemented FileAssociations helper class
* Greatly improved the Registry API
* Option to log to console and file
* Log file rolling
* Fix for relative log file path

### 0.3.2

* Implemented <code>--WinRun4J:ExecuteINI</code> built-in command - allows the launcher to execute abitrary INI files
* Fix for splash.autohide enable/disable option.
* Fix for service startup args
* Fix for dde activate thread hang
## Change History

### 0.4.4

* Improved command line argument parsing
* Fixes for service shutdown and working directory
* Fixes for return codes in built-in commands
* Fix for large INI files
* Added <code>--WinRun4J:Version</code> built-in command to check launcher version

### 0.4.3

* Fixed loading issue with Java 7
* Added standalone java service launcher

### 0.4.2

* Fixed issue with the ini.override flag.
* Fixed some JNI issues with Service and DDE functionality.
* Added ability to log to the debug monitor.
* RCEDIT supports /M option to add a manifest file.

### 0.4.1

* Fix for loading embedded jars

### 0.4.0

* Dynamic native binding implementation using <a href="http://sourceware.org/libffi/">libffi</a>. See <a href="nativebinding.html">native binding examples</a> for more information.
* Fixed a race condition in the service implementation for quick starting applications.
* The launcher java library now requires java 1.5 minimum (due to use of annotations). The launcher executable is compatible with java 1.4 and above.
* Fixed lowercased key issue with INI file
* Fixed max heap size issue on 64-bit VM
* Added option to set console title via INI file
* Added option to suppress error popups
* DDE activate message sends command line

### 0.3.3

* Moved service name, description and controls accepted to INI file
* Refactored Service interface and added AbstractService helper class
* Implemented FileAssociations helper class
* Greatly improved the Registry API
* Option to log to console and file
* Log file rolling
* Fix for relative log file path

### 0.3.2

* Implemented <code>--WinRun4J:ExecuteINI</code> built-in command - allows the launcher to execute abitrary INI files
* Fix for splash.autohide enable/disable option.
* Fix for service startup args
* Fix for dde activate thread hang
4 changes: 2 additions & 2 deletions WinRun4J/.cvsignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
WinRun4J.suo
WinRun4J.ncb
WinRun4J.suo
WinRun4J.ncb
22 changes: 11 additions & 11 deletions WinRun4J/.project
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>WinRun4J</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>WinRun4J</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
120 changes: 60 additions & 60 deletions WinRun4J/WinRun4J.sln
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinRun4J", "build\WinRun4J.vcproj", "{B3EC7585-646E-4D0D-850E-8CD6FADB323D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResourceEditor", "build\ResourceEditor.vcproj", "{B3EC7585-646E-4D0D-850E-7CD7FADB723D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug-Console|Win32 = Debug-Console|Win32
Debug-Console|x64 = Debug-Console|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release-Console|Win32 = Release-Console|Win32
Release-Console|x64 = Release-Console|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug|Win32.ActiveCfg = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug|Win32.Build.0 = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug|x64.ActiveCfg = Debug|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug|x64.Build.0 = Debug|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug-Console|Win32.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug-Console|Win32.Build.0 = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug-Console|x64.ActiveCfg = Debug - Console|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug-Console|x64.Build.0 = Debug - Console|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release|Win32.ActiveCfg = Release|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release|x64.ActiveCfg = Release|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release|x64.Build.0 = Release|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release-Console|Win32.ActiveCfg = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release-Console|Win32.Build.0 = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release-Console|x64.ActiveCfg = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release-Console|x64.Build.0 = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug|Win32.ActiveCfg = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug|Win32.Build.0 = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug|x64.ActiveCfg = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug-Console|Win32.ActiveCfg = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug-Console|x64.ActiveCfg = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release|Win32.ActiveCfg = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release|Win32.Build.0 = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release|x64.ActiveCfg = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release-Console|Win32.ActiveCfg = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release-Console|Win32.Build.0 = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release-Console|x64.ActiveCfg = Release|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug|Win32.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug|Win32.Build.0 = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug|x64.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug-Console|Win32.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug-Console|x64.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release|Win32.ActiveCfg = Release - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release|x64.ActiveCfg = Release - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release-Console|Win32.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release-Console|Win32.Build.0 = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release-Console|x64.ActiveCfg = Release - Console|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinRun4J", "build\WinRun4J.vcproj", "{B3EC7585-646E-4D0D-850E-8CD6FADB323D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResourceEditor", "build\ResourceEditor.vcproj", "{B3EC7585-646E-4D0D-850E-7CD7FADB723D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug-Console|Win32 = Debug-Console|Win32
Debug-Console|x64 = Debug-Console|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release-Console|Win32 = Release-Console|Win32
Release-Console|x64 = Release-Console|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug|Win32.ActiveCfg = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug|Win32.Build.0 = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug|x64.ActiveCfg = Debug|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug|x64.Build.0 = Debug|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug-Console|Win32.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug-Console|Win32.Build.0 = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug-Console|x64.ActiveCfg = Debug - Console|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Debug-Console|x64.Build.0 = Debug - Console|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release|Win32.ActiveCfg = Release|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release|x64.ActiveCfg = Release|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release|x64.Build.0 = Release|x64
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release-Console|Win32.ActiveCfg = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release-Console|Win32.Build.0 = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release-Console|x64.ActiveCfg = Debug|Win32
{B3EC7585-646E-4D0D-850E-8CD6FADB323D}.Release-Console|x64.Build.0 = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug|Win32.ActiveCfg = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug|Win32.Build.0 = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug|x64.ActiveCfg = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug-Console|Win32.ActiveCfg = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Debug-Console|x64.ActiveCfg = Debug|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release|Win32.ActiveCfg = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release|Win32.Build.0 = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release|x64.ActiveCfg = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release-Console|Win32.ActiveCfg = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release-Console|Win32.Build.0 = Release|Win32
{930CC50F-F2EF-486E-BDDB-9B6867177A4C}.Release-Console|x64.ActiveCfg = Release|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug|Win32.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug|Win32.Build.0 = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug|x64.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug-Console|Win32.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Debug-Console|x64.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release|Win32.ActiveCfg = Release - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release|x64.ActiveCfg = Release - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release-Console|Win32.ActiveCfg = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release-Console|Win32.Build.0 = Debug - Console|Win32
{B3EC7585-646E-4D0D-850E-7CD7FADB723D}.Release-Console|x64.ActiveCfg = Release - Console|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
42 changes: 21 additions & 21 deletions WinRun4J/build/.cvsignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
ResourceEditor-Debug?-?Console
ResourceEditor-Debug?-?Console-x64
ResourceEditor-Release?-?Console
ResourceEditor-Release?-?Console-x64
WinRun4J-Debug
WinRun4J-Debug?-?Console
WinRun4J-Debug?-?Console-x64
WinRun4J-Debug-x64
WinRun4J-Release
WinRun4J-Release?-?Console
WinRun4J-Release?-?Console-x64
WinRun4J-Release-x64
XLLoop-Release
XLLoop-Debug
XLLoop.vcproj.Poida-PC.Poida.user
WinRun4J.vcproj.Poida-PC.Poida.user
ResourceEditor.vcproj.Poida-PC.Poida.user
ResourceEditor.vcproj.BEAST.Poida.user
WinRun4J.vcproj.BEAST.Poida.user
XLLoop.vcproj.BEAST.Poida.user
WinRun4J.aps
ResourceEditor-Debug?-?Console
ResourceEditor-Debug?-?Console-x64
ResourceEditor-Release?-?Console
ResourceEditor-Release?-?Console-x64
WinRun4J-Debug
WinRun4J-Debug?-?Console
WinRun4J-Debug?-?Console-x64
WinRun4J-Debug-x64
WinRun4J-Release
WinRun4J-Release?-?Console
WinRun4J-Release?-?Console-x64
WinRun4J-Release-x64
XLLoop-Release
XLLoop-Debug
XLLoop.vcproj.Poida-PC.Poida.user
WinRun4J.vcproj.Poida-PC.Poida.user
ResourceEditor.vcproj.Poida-PC.Poida.user
ResourceEditor.vcproj.BEAST.Poida.user
WinRun4J.vcproj.BEAST.Poida.user
XLLoop.vcproj.BEAST.Poida.user
WinRun4J.aps
Loading

0 comments on commit 95f1926

Please sign in to comment.