Author: johnmci Date: 2009-09-27 14:39:59 -0700 (Sun, 27 Sep 2009) New Revision: 2144
Modified: trunk/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist trunk/platforms/Mac OS/vm/Developer/SqueakVMUNIXPATHS.xcodeproj.zip trunk/platforms/Mac OS/vm/Documentation/4.x.x Release Notes.rtf trunk/platforms/Mac OS/vm/NSCursorWrappers.m trunk/platforms/Mac OS/vm/osExports.c trunk/platforms/Mac OS/vm/sqMacMain.c trunk/platforms/Mac OS/vm/sqMacNSPluginUILogic2.c trunk/platforms/Mac OS/vm/sqMacUIEventsUniversal.c Log: Mac Carbon 4.2.2beta1U update, move towards unix named serial port code. Fix horizontal wheel scrolling. Migrate to XCode 3.2 for os-x 10.6. Fix a new non-important memory leaks according to Clang
Modified: trunk/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c =================================================================== --- trunk/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c 2009-09-27 18:19:02 UTC (rev 2143) +++ trunk/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c 2009-09-27 21:39:59 UTC (rev 2144) @@ -518,6 +518,7 @@ CFStringAppendCString(vmPathString, "/", kCFStringEncodingMacRoman); SetVMPathFromCFString(vmPathString); CFRelease(filePath); + CFRelease(vmPathString); return 0; }
Modified: trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist =================================================================== --- trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist 2009-09-27 18:19:02 UTC (rev 2143) +++ trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist 2009-09-27 21:39:59 UTC (rev 2144) @@ -458,7 +458,7 @@ <key>CFBundleExecutable</key> <string>Squeak VM Opt</string> <key>CFBundleGetInfoString</key> - <string>Squeak VM 4.2.1b1 http://www.squeak.org</string> + <string>Squeak VM 4.2.2b1 http://www.squeak.org</string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> <key>CFBundleIdentifier</key> @@ -470,11 +470,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>Squeak VM 4.2.1b1</string> + <string>Squeak VM 4.2.2b1</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> - <string>4.2.1b1</string> + <string>4.2.2b1</string> <key>CGDisableCoalescedUpdates</key> <true/> <key>LSBackgroundOnly</key>
Modified: trunk/platforms/Mac OS/vm/Developer/SqueakVMUNIXPATHS.xcodeproj.zip =================================================================== (Binary files differ)
Modified: trunk/platforms/Mac OS/vm/Documentation/4.x.x Release Notes.rtf =================================================================== --- trunk/platforms/Mac OS/vm/Documentation/4.x.x Release Notes.rtf 2009-09-27 18:19:02 UTC (rev 2143) +++ trunk/platforms/Mac OS/vm/Documentation/4.x.x Release Notes.rtf 2009-09-27 21:39:59 UTC (rev 2144) @@ -1,10 +1,10 @@ -{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf110 {\fonttbl\f0\fnil\fcharset0 Geneva;\f1\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} +{\colortbl;\red255\green255\blue255;\red0\green116\blue0;} \margl1440\margr1440\vieww13080\viewh12220\viewkind0 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\f0\fs24 \cf0 Mac VM 4.2.1b1 mach-o build for Carbon with Closures and UTF-8 plus 32bit clean.\ +\f0\fs24 \cf0 Mac VM 4.2.2b1 mach-o build for Carbon with Closures and UTF-8 plus 32bit clean.\ \ Support for Croquet, support for Safari, support for TK4/Sophie, support for Multiple Windows/Ffenestri, full GC instrumentation, configurable quartz flush drawing, MacIntel Machines, mappable mouse buttons, Safari and Firefox browser support, with Closure support\ \ @@ -13,8 +13,44 @@ Apr 21st, 2009 (4.1.0b1)\ May 7th, 2009 (4.1.1b2)\ Aug 20th, 2009 (4.2.1b1)\ +Sept 17th, 2009 (4.2.2b1)\ \ Still yet to do, in future versions -> Verify that file delete rename etc works on aliases, not the targets. (Yawn, someday)\ +\ +4.2.2b1 We update system to 10.6.1 and newest xCode \ + Build powerpc VM with gcc 4.0\ + Run Static Analyser \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural + +\f1 \cf0 FilePlugin.c\ + SetVMPathFromApplicationDirectory\ + memory leak from vmPathString\ +\ + \CocoaLigature0 NSCursorWrappers.m\ +\CocoaLigature1 \CocoaLigature0 fix memory leak, bitmap, image\ +\pard\tx560\pardeftab560\ql\qnatural\pardirnatural +\cf0 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural +\cf0 \CocoaLigature1 \CocoaLigature0 sqMacMain.c\ +\CocoaLigature1 \CocoaLigature0 fixupNonAbsolutePath\ +\CocoaLigature1 \CocoaLigature0 memory leak from resourcePathString\ +\pard\tx560\pardeftab560\ql\qnatural\pardirnatural +\cf0 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural +\cf0 \CocoaLigature1 \CocoaLigature0 sqMacNSPluginUILogic2.c\ +\CocoaLigature1 \CocoaLigature0 handle_CMD_SHARED_MEMORY\ +\CocoaLigature1 \CocoaLigature0 memory leak from colorspace\ +\pard\tx560\pardeftab560\ql\qnatural\pardirnatural +\cf0 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural +\cf0 \CocoaLigature1 \CocoaLigature0 sqmacUIEventsUniversal.c\ +\CocoaLigature1 \CocoaLigature0 Bert reported scroll wheel movement was wrong. \ +\CocoaLigature1 \CocoaLigature0 We did not get kEventParamMouseWheelAxis correctly\ +\CocoaLigature1 \CocoaLigature0 This problem oddly has existed for years. \cf2 \ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0 \cf0 \CocoaLigature1 \ +\ 4.2.1b1 We update our VM to VMMaker-dtl.135\ Fixes\ Reference Mantis 7260: some Float comparison primitives don't handle Nan correctly\
Modified: trunk/platforms/Mac OS/vm/NSCursorWrappers.m =================================================================== --- trunk/platforms/Mac OS/vm/NSCursorWrappers.m 2009-09-27 18:19:02 UTC (rev 2143) +++ trunk/platforms/Mac OS/vm/NSCursorWrappers.m 2009-09-27 21:39:59 UTC (rev 2144) @@ -117,8 +117,11 @@ } [cursor set]; // [NSCursor unhide]; - [pool release];
+ CFRelease(bitmap); + CFRelease(image); + [pool release]; + return 1; }
Modified: trunk/platforms/Mac OS/vm/osExports.c =================================================================== --- trunk/platforms/Mac OS/vm/osExports.c 2009-09-27 18:19:02 UTC (rev 2143) +++ trunk/platforms/Mac OS/vm/osExports.c 2009-09-27 21:39:59 UTC (rev 2144) @@ -47,12 +47,7 @@ XFN(setPostMessageHook) XFN(GetAttributeString) XFN(recordDragDropEvent) - XFN(serialPortSetControl) - XFN(serialPortIsOpen) XFN(serialPortClose) - XFN(serialPortCount) - XFN(serialPortNames) - XFN(serialPortOpen) XFN(serialPortReadInto) XFN(serialPortWriteFrom) XFN(IsKeyDown)
Modified: trunk/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- trunk/platforms/Mac OS/vm/sqMacMain.c 2009-09-27 18:19:02 UTC (rev 2143) +++ trunk/platforms/Mac OS/vm/sqMacMain.c 2009-09-27 21:39:59 UTC (rev 2144) @@ -404,7 +404,8 @@ /* vm build string */
if (id == 1006) { - return "Mac Carbon 4.2.1b1 19-Aug-09 >4897EDBA-66BA-413A-9117-AC98701639F8<"; + return "Mac Carbon 4.2.2b1 17-Sep-09 >6F0202CF-180C-420A-9CE8-411B696D3467<"; +// return "Mac Carbon 4.2.1b1 19-Aug-09 >4897EDBA-66BA-413A-9117-AC98701639F8<"; // return "Mac Carbon 4.1.1b2 7-May-09 >028D94A1-439E-4D2D-9894-AF0DE7F057E8<"; // return "Mac Carbon 4.1.1b1 1-May-09 >56D42F58-DC56-4B75-9C58-6CF5D03605CC<"; // return "Mac Carbon 4.1.0b1 21-Apr-09 >6A843063-B019-4516-8EBE-67566B766023<"; @@ -710,6 +711,7 @@ bundleURL2 = CFURLCreateCopyAppendingPathComponent( kCFAllocatorSystemDefault, bundleURL, resourcePathString, false ); CFRelease(bundleURL); + CFRelease(resourcePathString); bundleURL3 = CFURLCreateCopyAppendingPathComponent( kCFAllocatorSystemDefault, bundleURL2, partialPathString, false ); CFRelease(bundleURL2); filePath = CFURLCopyFileSystemPath (bundleURL3, kCFURLPOSIXPathStyle);
Modified: trunk/platforms/Mac OS/vm/sqMacNSPluginUILogic2.c =================================================================== --- trunk/platforms/Mac OS/vm/sqMacNSPluginUILogic2.c 2009-09-27 18:19:02 UTC (rev 2143) +++ trunk/platforms/Mac OS/vm/sqMacNSPluginUILogic2.c 2009-09-27 21:39:59 UTC (rev 2144) @@ -270,6 +270,7 @@ dprintf((stderr,"VM: Size Window to %i @ %i \n",width,height)); } SharedBrowserBitMapContextRef = CGBitmapContextCreate (SharedMemoryBlock->screenBits,width,height,8,rowBytes,colorspace,kCGImageAlphaNoneSkipFirst); + CGColorSpaceRelease(colorspace); dprintf((stderr,"VM: made bitmap context ref %i\n", (int) SharedBrowserBitMapContextRef)); }
Modified: trunk/platforms/Mac OS/vm/sqMacUIEventsUniversal.c =================================================================== --- trunk/platforms/Mac OS/vm/sqMacUIEventsUniversal.c 2009-09-27 18:19:02 UTC (rev 2143) +++ trunk/platforms/Mac OS/vm/sqMacUIEventsUniversal.c 2009-09-27 21:39:59 UTC (rev 2144) @@ -906,7 +906,7 @@
if (whatHappened == kEventMouseWheelMoved) { GetEventParameter( event, - kEventParamKeyModifiers, + kEventParamMouseWheelAxis, typeMouseWheelAxis, NULL, sizeof(EventMouseWheelAxis), @@ -957,9 +957,12 @@ sqKeyboardEvent *evt,*extra; UInt32 macKeyCode=0;
+ if (wheelMouseDelta == 0) + return; + pthread_mutex_lock(&gEventQueueLock); for(i=0;i<abs(wheelMouseDelta);i++) { - if (wheelMouseDirection == kEventMouseWheelAxisX) + if (wheelMouseDirection == kEventMouseWheelAxisY) if (wheelMouseDelta > 0) {//up/down macKeyCode = 126; asciiChar = kUpArrowCharCode; @@ -968,7 +971,7 @@ asciiChar = kDownArrowCharCode; } else - if (wheelMouseDelta > 0) {//left/right + if (wheelMouseDelta < 0) {//left/right macKeyCode = 124; asciiChar = kRightArrowCharCode; } else {