[Vm-dev] [commit][3070] CogVM source as per VMMaker.oscog-eem.870
commits at squeakvm.org
commits at squeakvm.org
Fri Sep 5 17:31:14 UTC 2014
Revision: 3070
Author: eliot
Date: 2014-09-05 10:31:11 -0700 (Fri, 05 Sep 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.870
Fix bad regression in FilePlugin>>primitiveFileSetPosition introduces around
r2797 that breaks > 1Gb file access.
Change manifest files on Windows to make app HIGHDPIAWARE. Create a
manifest for the consolevm and include it in the archive.
Modified Paths:
--------------
branches/Cog/build.win32x86/newspeak.cog.spur/Makefile
branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest
branches/Cog/build.win32x86/newspeak.cog.v3/Makefile
branches/Cog/build.win32x86/newspeak.cog.v3/nsvm.exe.manifest
branches/Cog/build.win32x86/newspeak.stack.spur/Makefile
branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest
branches/Cog/build.win32x86/newspeak.stack.v3/Makefile
branches/Cog/build.win32x86/newspeak.stack.v3/nsvm.exe.manifest
branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest
branches/Cog/build.win32x86/squeak.cog.spur/Makefile
branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest
branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest
branches/Cog/build.win32x86/squeak.cog.v3/Makefile
branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest
branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest
branches/Cog/build.win32x86/squeak.stack.spur/Makefile
branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest
branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest
branches/Cog/build.win32x86/squeak.stack.v3/Makefile
branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest
branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
branches/Cog/scripts/mkcogvmarchives
branches/Cog/scripts/mksistaarchives
branches/Cog/scripts/mkspurvmarchives
branches/Cog/src/plugins/FilePlugin/FilePlugin.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-09-05 17:31:11 UTC (rev 3070)
@@ -317,6 +317,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
$(CP) $(VM).exe.manifest $(OBJDIR)
+ $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
name="www.mirandabanda.org.Cog.Newspeak"
type="win32"
/>
-<description>Newspeak Virtual Machine</description>
+<description>Newspeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-09-05 17:31:11 UTC (rev 3070)
@@ -317,6 +317,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
$(CP) $(VM).exe.manifest $(OBJDIR)
+ $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/build.win32x86/newspeak.cog.v3/nsvm.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.v3/nsvm.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/newspeak.cog.v3/nsvm.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
name="www.mirandabanda.org.Cog.Newspeak"
type="win32"
/>
-<description>Newspeak Virtual Machine</description>
+<description>Newspeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-09-05 17:31:11 UTC (rev 3070)
@@ -318,6 +318,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
$(CP) $(VM).exe.manifest $(OBJDIR)
+ $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
name="www.mirandabanda.org.Cog.Newspeak"
type="win32"
/>
-<description>Newspeak Virtual Machine</description>
+<description>Newspeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/newspeak.stack.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-09-05 17:31:11 UTC (rev 3070)
@@ -318,6 +318,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
$(CP) $(VM).exe.manifest $(OBJDIR)
+ $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/build.win32x86/newspeak.stack.v3/nsvm.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.v3/nsvm.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/newspeak.stack.v3/nsvm.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
name="www.mirandabanda.org.Cog.Newspeak"
type="win32"
/>
-<description>Newspeak Virtual Machine</description>
+<description>Newspeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
@@ -7,6 +10,11 @@
type="win32"
/>
<description>Croquet Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-09-05 17:31:11 UTC (rev 3070)
@@ -328,6 +328,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
$(CP) $(VM).exe.manifest $(OBJDIR)
+ $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
@@ -7,6 +10,11 @@
type="win32"
/>
<description>Squeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
@@ -7,6 +10,11 @@
type="win32"
/>
<description>Croquet Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/squeak.cog.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-09-05 17:31:11 UTC (rev 3070)
@@ -367,6 +367,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
$(CP) $(VM).exe.manifest $(OBJDIR)
+ $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
@@ -7,6 +10,11 @@
type="win32"
/>
<description>Squeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
@@ -7,6 +10,11 @@
type="win32"
/>
<description>Croquet Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-09-05 17:31:11 UTC (rev 3070)
@@ -329,6 +329,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
$(CP) $(VM).exe.manifest $(OBJDIR)
+ $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
@@ -7,6 +10,11 @@
type="win32"
/>
<description>Squeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
@@ -7,6 +10,11 @@
type="win32"
/>
<description>Croquet Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-09-05 17:31:11 UTC (rev 3070)
@@ -329,6 +329,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
$(CP) $(VM).exe.manifest $(OBJDIR)
+ $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
@@ -7,6 +10,11 @@
type="win32"
/>
<description>Squeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+</asmv3:application>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ VMPluginCodeGenerator VMMaker.oscog-eem.870 uuid: aa732da6-bba7-4906-b822-6dfd7f4e1bc7
from
- FilePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ FilePlugin VMMaker.oscog-eem.870 uuid: aa732da6-bba7-4906-b822-6dfd7f4e1bc7
*/
-static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.870 uuid: aa732da6-bba7-4906-b822-6dfd7f4e1bc7 " __DATE__ ;
@@ -180,9 +180,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FilePlugin VMMaker.oscog-eem.787 (i)"
+ "FilePlugin VMMaker.oscog-eem.870 (i)"
#else
- "FilePlugin VMMaker.oscog-eem.787 (e)"
+ "FilePlugin VMMaker.oscog-eem.870 (e)"
#endif
;
static void * sCCPfn;
@@ -941,10 +941,8 @@
squeakFileOffsetType newPosition;
sqInt objectPointer;
- if (!(isIntegerObject(stackValue(0)))) {
- if ((byteSizeOf(stackValue(0))) != (sizeof(squeakFileOffsetType))) {
- return primitiveFail();
- }
+ if ((byteSizeOf(stackValue(0))) > (sizeof(squeakFileOffsetType))) {
+ return primitiveFail();
}
newPosition = positive64BitValueOf(stackValue(0));
/* begin fileValueOf: */
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Tue Aug 26 09:49:41 BST 2014
+ Fri Sep 5 10:18:14 PDT 2014
Modified: branches/Cog/scripts/mkcogvmarchives
===================================================================
--- branches/Cog/scripts/mkcogvmarchives 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/scripts/mkcogvmarchives 2014-09-05 17:31:11 UTC (rev 3070)
@@ -113,7 +113,8 @@
echo build.win32x86/$SQB/$1 '=>' $dir '=>' $dir-$TAG.zip
(cd ../build.win32x86/$SQB/$1 >/dev/null; \
tar cf - Squeak.exe Squeak.map Squeak.exe.manifest \
- SqueakConsole.exe SqueakConsole.map *.dll) \
+ SqueakConsole.exe SqueakConsole.map SqueakConsole.exe.manifest \
+ *.dll) \
| (cd $dir;tar xf -)
zip -qr $dir-$TAG.zip $dir
EXES="$EXES $dir/Squeak.exe $dir/SqueakConsole.exe"
Modified: branches/Cog/scripts/mksistaarchives
===================================================================
--- branches/Cog/scripts/mksistaarchives 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/scripts/mksistaarchives 2014-09-05 17:31:11 UTC (rev 3070)
@@ -134,7 +134,8 @@
echo build.win32x86/$SQSB/$1 '=>' $dir '=>' $dir-$TAG.zip
(cd ../build.win32x86/$SQSB/$1 >/dev/null; \
tar cf - Squeak.exe Squeak.map Squeak.exe.manifest \
- SqueakConsole.exe SqueakConsole.map *.dll) \
+ SqueakConsole.exe SqueakConsole.map SqueakConsole.exe.manifest \
+ *.dll) \
| (cd $dir;tar xf -)
zip -qr $dir-$TAG.zip $dir
EXES="$EXES $dir/Squeak.exe $dir/SqueakConsole.exe"
Modified: branches/Cog/scripts/mkspurvmarchives
===================================================================
--- branches/Cog/scripts/mkspurvmarchives 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/scripts/mkspurvmarchives 2014-09-05 17:31:11 UTC (rev 3070)
@@ -112,7 +112,8 @@
echo build.win32x86/$SQB/$1 '=>' $dir '=>' $dir-$TAG.zip
(cd ../build.win32x86/$SQB/$1 >/dev/null; \
tar cf - Squeak.exe Squeak.map Squeak.exe.manifest \
- SqueakConsole.exe SqueakConsole.map *.dll) \
+ SqueakConsole.exe SqueakConsole.map SqueakConsole.exe.manifest \
+ *.dll) \
| (cd $dir;tar xf -)
zip -qr $dir-$TAG.zip $dir
EXES="$EXES $dir/Squeak.exe $dir/SqueakConsole.exe"
Modified: branches/Cog/src/plugins/FilePlugin/FilePlugin.c
===================================================================
--- branches/Cog/src/plugins/FilePlugin/FilePlugin.c 2014-08-28 14:14:21 UTC (rev 3069)
+++ branches/Cog/src/plugins/FilePlugin/FilePlugin.c 2014-09-05 17:31:11 UTC (rev 3070)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ VMPluginCodeGenerator VMMaker.oscog-eem.870 uuid: aa732da6-bba7-4906-b822-6dfd7f4e1bc7
from
- FilePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211
+ FilePlugin VMMaker.oscog-eem.870 uuid: aa732da6-bba7-4906-b822-6dfd7f4e1bc7
*/
-static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.870 uuid: aa732da6-bba7-4906-b822-6dfd7f4e1bc7 " __DATE__ ;
@@ -180,9 +180,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FilePlugin VMMaker.oscog-eem.787 (i)"
+ "FilePlugin VMMaker.oscog-eem.870 (i)"
#else
- "FilePlugin VMMaker.oscog-eem.787 (e)"
+ "FilePlugin VMMaker.oscog-eem.870 (e)"
#endif
;
static void * sCCPfn;
@@ -941,10 +941,8 @@
squeakFileOffsetType newPosition;
sqInt objectPointer;
- if (!(isIntegerObject(stackValue(0)))) {
- if ((byteSizeOf(stackValue(0))) != (sizeof(squeakFileOffsetType))) {
- return primitiveFail();
- }
+ if ((byteSizeOf(stackValue(0))) > (sizeof(squeakFileOffsetType))) {
+ return primitiveFail();
}
newPosition = positive64BitValueOf(stackValue(0));
/* begin fileValueOf: */
More information about the Vm-dev
mailing list