Menu
▾
▴
SF.net SVN: frontierkernel: [1297] Frontier/branches/Conversant/Common/Paige
|
From: <set...@us...> - 2006-04-18 19:34:11
|
Revision: 1297 Author: sethdill Date: 2006-04-18 12:33:35 -0700 (Tue, 18 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1297&view=rev Log Message: ----------- Merged trunk changes r1261:1296 into the Conversant branch, *excluding* changes made to the project file in xcode. Modified Paths: -------------- Frontier/branches/Conversant/Common/IowaRuntime/Headers/iowacore.h Frontier/branches/Conversant/Common/IowaRuntime/Source/iowacore.c Frontier/branches/Conversant/Common/IowaRuntime/Source/iowaruntime.c Frontier/branches/Conversant/Common/Paige/libpaigemacho.a Frontier/branches/Conversant/Common/headers/byteorder.h Frontier/branches/Conversant/Common/headers/config.r Frontier/branches/Conversant/Common/headers/frontierconfig.h Frontier/branches/Conversant/Common/headers/macconv.h Frontier/branches/Conversant/Common/headers/shellprivate.h Frontier/branches/Conversant/Common/resources/Win32/kernelverbs.rc Frontier/branches/Conversant/Common/source/FrontierWinMain.c Frontier/branches/Conversant/Common/source/OpenTransportNetEvents.c Frontier/branches/Conversant/Common/source/fileops.c Frontier/branches/Conversant/Common/source/fileverbs.c Frontier/branches/Conversant/Common/source/frontierconfig.c Frontier/branches/Conversant/Common/source/langipc.c Frontier/branches/Conversant/Common/source/langstartup.c Frontier/branches/Conversant/Common/source/langtree.c Frontier/branches/Conversant/Common/source/oppack.c Frontier/branches/Conversant/Common/source/osacomponent.c Frontier/branches/Conversant/Common/source/osawindows.c Frontier/branches/Conversant/Common/source/resources.c Frontier/branches/Conversant/Common/source/shelljuggler.c Frontier/branches/Conversant/Common/source/stringverbs.c Added Paths: ----------- Frontier/branches/Conversant/Common/Paige/libpaigefat.a Removed Paths: ------------- Frontier/branches/Conversant/Common/Paige/PaigePPC.lib Property Changed: ---------------- Frontier/branches/Conversant/build_XCode/tools/ Frontier/branches/Conversant/build_XCode/tools/postlinking.sh Modified: Frontier/branches/Conversant/Common/IowaRuntime/Headers/iowacore.h =================================================================== --- Frontier/branches/Conversant/Common/IowaRuntime/Headers/iowacore.h 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/IowaRuntime/Headers/iowacore.h 2006-04-18 19:33:35 UTC (rev 1297) @@ -28,6 +28,7 @@ #ifndef iowacoreinclude #define iowacoreinclude +#include "byteorder.h" /* 2006-04-17 aradke: for SWAP_BYTE_ORDER */ #ifdef coderesource /*we're building into a UCMD*/ @@ -105,8 +106,26 @@ short defaulttextcolor; short defaultframecolor; + +#ifdef SWAP_BYTE_ORDER + unsigned short wastebits: 10; /*room for more booleans*/ + + unsigned short floater: 1; + + unsigned short flinvisiblegrid: 1; + + unsigned short flselection: 1; + + unsigned short flgrid: 1; + + unsigned short defaulttransparent: 1; + unsigned short defaulthasframe: 1; + +#else + + unsigned short defaulthasframe: 1; unsigned short defaulttransparent: 1; @@ -119,7 +138,9 @@ unsigned short floater: 1; unsigned short wastebits: 10; /*room for more booleans*/ - + +#endif + short gridunits; short rightborder, bottomborder; @@ -163,8 +184,28 @@ short objectlinespacing; short objectindentation; + +#ifdef SWAP_BYTE_ORDER + unsigned short wastebits: 9; /* room for more booleans */ + + unsigned short objectdisabled: 1; + + unsigned short objectfastscript: 1; + + unsigned short objecttransparent: 1; + + unsigned short lastinlist: 1; + + unsigned short objectinvisible: 1; + + unsigned short objectflag: 1; + unsigned short objecthasframe: 1; + +#else + + unsigned short objecthasframe: 1; unsigned short objectflag: 1; @@ -178,6 +219,10 @@ unsigned short objectdisabled: 1; + unsigned short wastebits: 9; /* room for more booleans */ + +#endif + long objecttype; /*room for lots of object types*/ RGBColor objectfillcolor, objecttextcolor, objectframecolor; Modified: Frontier/branches/Conversant/Common/IowaRuntime/Source/iowacore.c =================================================================== --- Frontier/branches/Conversant/Common/IowaRuntime/Source/iowacore.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/IowaRuntime/Source/iowacore.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -29,6 +29,7 @@ #include "standard.h" #include "shelltypes.h" +#include "byteorder.h" #ifdef iowaRuntime @@ -2728,12 +2729,60 @@ boolean unpackobject (hdlobject *hobject, boolean *lastinlist) { + /* + 2006-04-17 aradke: must convert packed data to native byte-order on Intel Macs + */ + tydiskobject info; tyobject obj; hdlobject h; moveleft (unpack.p, &info, longsizeof (info)); + disktomemshort (info.versionnumber); + + disktomemshort (info.objectrect.top); + disktomemshort (info.objectrect.left); + disktomemshort (info.objectrect.bottom); + disktomemshort (info.objectrect.right); + + disktomemlong (info.lenname); + disktomemlong (info.lenvalue); + disktomemlong (info.lenscript); + disktomemlong (info.lendata); + + disktomemshort (info.objectfontsize); + disktomemshort (info.objectstyle); + disktomemshort (info.objectjustification); + disktomemshort (info.objectrecalcstatus); + disktomemshort (info.objectrecalcperiod); + disktomemshort (info.unused1); + disktomemshort (info.objectdropshadowdepth); + disktomemshort (info.objectlinespacing); + disktomemshort (info.objectindentation); + + /* + 2006-04-17 aradke: The info.objecthasframe etc. bit-field doesn't need to be byte-swapped, + because this is already taken care of via the endian-specific definition in iowacore.h. + */ + + disktomemlong (info.objecttype); + + disktomemshort (info.objectfillcolor.red); + disktomemshort (info.objectfillcolor.green); + disktomemshort (info.objectfillcolor.blue); + + disktomemshort (info.objecttextcolor.red); + disktomemshort (info.objecttextcolor.green); + disktomemshort (info.objecttextcolor.blue); + + disktomemshort (info.objectframecolor.red); + disktomemshort (info.objectframecolor.green); + disktomemshort (info.objectframecolor.blue); + + disktomemlong (info.objectlanguage); + disktomemlong (info.lenrecalcscript); + if (info.versionnumber == 1) /*record format changed to allow 4 bytes for object type*/ info.objecttype = (unsigned long) info.v1objecttype; @@ -2898,6 +2947,10 @@ boolean iowaunpack (Handle hpacked) { + + /* + 2006-04-17 aradke: must convert packed data to native byte-order on Intel Macs + */ hdlcard hc = iowadata; hdlobject newlist; @@ -2917,6 +2970,8 @@ unpack.p += longsizeof (header); + disktomemshort (header.versionnumber); + if (header.versionnumber < 4) { /*the header grew by 66 bytes in version 4*/ header.lenwindowtitle = 0; @@ -2924,6 +2979,30 @@ unpack.p -= 66; } + disktomemshort (header.v2backcolor); + + disktomemlong (header.lenembeddedtable); + + disktomemshort (header.defaultfillcolor); + disktomemshort (header.defaulttextcolor); + disktomemshort (header.defaultframecolor); + + /* + 2006-04-17 aradke: The header.defaulthasframe etc. bit-field doesn't need to be byte-swapped, + because this is already taken care of via the endian-specific definition in iowacore.h. + */ + + disktomemshort (header.gridunits); + disktomemshort (header.rightborder); + disktomemshort (header.bottomborder); + + disktomemshort (header.backcolor.red); + disktomemshort (header.backcolor.green); + disktomemshort (header.backcolor.blue); + + disktomemlong (header.idwindow); + disktomemlong (header.lenwindowtitle); + if (header.versionnumber <= 2) /*back color was stored as an index, now stored as a RGBColor*/ oldclutconverter (header.v2backcolor, &header.backcolor); Modified: Frontier/branches/Conversant/Common/IowaRuntime/Source/iowaruntime.c =================================================================== --- Frontier/branches/Conversant/Common/IowaRuntime/Source/iowaruntime.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/IowaRuntime/Source/iowaruntime.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -28,6 +28,8 @@ #include "frontier.h" #include "standard.h" +#include "byteorder.h" + #include "shelltypes.h" #include <appletdefs.h> #include <iac.h> @@ -2051,6 +2053,8 @@ moveleft (*hpackedcard, &header, longsizeof (header)); + disktomemlong (header.idwindow); /* 2006-04-17 aradke: for Mac Intel */ + switch (header.idwindow) { case 1024: case 1025: Deleted: Frontier/branches/Conversant/Common/Paige/PaigePPC.lib =================================================================== (Binary files differ) Copied: Frontier/branches/Conversant/Common/Paige/libpaigefat.a (from rev 1296, Frontier/trunk/Common/Paige/libpaigefat.a) =================================================================== (Binary files differ) Modified: Frontier/branches/Conversant/Common/Paige/libpaigemacho.a =================================================================== (Binary files differ) Modified: Frontier/branches/Conversant/Common/headers/byteorder.h =================================================================== --- Frontier/branches/Conversant/Common/headers/byteorder.h 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/headers/byteorder.h 2006-04-18 19:33:35 UTC (rev 1297) @@ -76,6 +76,36 @@ #endif +/* + 2006-04-16 aradke: Carbon resource manager resources are in big endian format. + If we are running on an Intel Mac, we need to perform byte order conversion. +*/ + +#if (defined(TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON == 1) && defined(SWAP_BYTE_ORDER)) + + #define SWAP_REZ_BYTE_ORDER 1 + + #define reztomemshort(x) shortswap(x) + #define reztomemlong(x) longswap(x) + #define reztomemrect(x) do {shortswap((x).top); shortswap((x).left); shortswap((x).bottom); shortswap((x).right);} while(0) + #define memtorezshort(x) shortswap(x) + #define memtorezlong(x) longswap(x) + #define memtorezrect(x) do {shortswap((x).top); shortswap((x).left); shortswap((x).bottom); shortswap((x).right);} while(0) + +#else + + #undef SWAP_REZ_BYTE_ORDER + + #define reztomemshort(x) + #define reztomemlong(x) + #define reztomemrect(x) + #define memtorezshort(x) + #define memtorezlong(x) + #define memtorezrect(x) + +#endif + + #define longswap(foo) do {foo = dolongswap(foo);} while (0) #define shortswap(foo) do {foo = doshortswap(foo);} while (0) Modified: Frontier/branches/Conversant/Common/headers/config.r =================================================================== --- Frontier/branches/Conversant/Common/headers/config.r 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/headers/config.r 2006-04-18 19:33:35 UTC (rev 1297) @@ -27,37 +27,37 @@ type'cnfg' { - boolean nohorizscroll, horizscroll; /*window has horiz scrollbar?*/ + integer nohorizscroll = 0, horizscroll = 1; /*window has horiz scrollbar?*/ - boolean novertscroll, vertscroll; + integer novertscroll = 0, vertscroll = 1; - boolean dontfloat, windowfloats; /*is it a floating palette window?*/ + integer dontfloat = 0, windowfloats = 1; /*is it a floating palette window?*/ - boolean nomessagearea, messagearea; /*allocate space for a message area?*/ + integer nomessagearea = 0, messagearea = 1; /*allocate space for a message area?*/ - boolean dontinsetcontentrect, insetcontentrect; /*if true we inset by 3 pixels*/ + integer dontinsetcontentrect = 0, insetcontentrect = 1; /*if true we inset by 3 pixels*/ - boolean nonewonlaunch, newonlaunch; + integer nonewonlaunch = 0, newonlaunch = 1; - boolean dontopenresfile, openresfile; + integer dontopenresfile = 0, openresfile = 1; - boolean normalwindow, dialogwindow; /*do a GetNewDialog on creating one of these windows?*/ + integer normalwindow = 0, dialogwindow = 1; /*do a GetNewDialog on creating one of these windows?*/ - boolean notgrowable, isgrowable; /*provide a grow box for window*/ + integer notgrowable = 0, isgrowable = 1; /*provide a grow box for window*/ - boolean dontcreateonnew, createonnew; + integer dontcreateonnew = 0, createonnew = 1; - boolean nowindoidscrollbars, windoidscrollbars; + integer nowindoidscrollbars = 0, windoidscrollbars = 1; - boolean notstoredindatabase, storedindatabase; + integer notstoredindatabase = 0, storedindatabase = 1; - boolean handlesownsave, parentwindowhandlessave; + integer handlesownsave = 0, parentwindowhandlessave = 1; - boolean donteraseonresize, eraseonresize; + integer donteraseonresize = 0, eraseonresize = 1; - boolean consumefrontclicks, dontconsumefrontclicks; + integer consumefrontclicks = 0, dontconsumefrontclicks = 1; - boolean monochromewindow, colorwindow; + integer monochromewindow = 0, colorwindow = 1; integer onehalf = 2, onethird = 3, onequarter = 4; Modified: Frontier/branches/Conversant/Common/headers/frontierconfig.h =================================================================== --- Frontier/branches/Conversant/Common/headers/frontierconfig.h 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/headers/frontierconfig.h 2006-04-18 19:33:35 UTC (rev 1297) @@ -71,41 +71,7 @@ typedef struct tyconfigrecord { -#ifdef MACVERSION - boolean flhorizscroll: 1; /*window has horiz scrollbar?*/ - - boolean flvertscroll: 1; - - boolean flwindowfloats: 1; /*is it a floating palette window?*/ // NOT USED - - boolean flmessagearea: 1; /*allocate space for a message area?*/ - - boolean flinsetcontentrect: 1; /*if true we inset by 3 pixels*/ - - boolean flnewonlaunch: 1; - - boolean flopenresfile: 1; - - boolean fldialog: 1; /*do a GetNewDialog on creating one of these windows?*/ - - boolean flgrowable: 1; /*provide a grow box for window*/ - - boolean flcreateonnew: 1; - - boolean flwindoidscrollbars: 1; - - boolean flstoredindatabase: 1; - - boolean flparentwindowhandlessave: 1; - - boolean fleraseonresize: 1; - - boolean fldontconsumefrontclicks: 1; - - boolean flcolorwindow: 1; -#endif - -#ifdef WIN95VERSION + short flhorizscroll; /*window has horiz scrollbar?*/ short flvertscroll; @@ -137,9 +103,7 @@ short fldontconsumefrontclicks; short flcolorwindow; -#endif - short messageareafraction; OSType filecreator, filetype; Modified: Frontier/branches/Conversant/Common/headers/macconv.h =================================================================== --- Frontier/branches/Conversant/Common/headers/macconv.h 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/headers/macconv.h 2006-04-18 19:33:35 UTC (rev 1297) @@ -67,7 +67,9 @@ #define wmouseUp 38 //Windows Only #define zoomEvt 39 //Windows Only - +#define suspendResumeMessage 0x0001 +#define resumeFlag 0x01 + #define everyEvent -1 #define activeFlag 256 #define activMask 256 Modified: Frontier/branches/Conversant/Common/headers/shellprivate.h =================================================================== --- Frontier/branches/Conversant/Common/headers/shellprivate.h 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/headers/shellprivate.h 2006-04-18 19:33:35 UTC (rev 1297) @@ -63,17 +63,6 @@ } tymenustate; -typedef struct tyjugglermessage { - - long eventtype: 8; /*bits 24 -- 31*/ - - long reservedbits: 22; /*bits 2 -- 23*/ - - long flconvertclipboard: 1; /*bit 1*/ - - long flresume: 1; /*bit 0*/ - } tyjugglermessage; - #ifdef version42orgreater #define cteditors 14 #else Modified: Frontier/branches/Conversant/Common/resources/Win32/kernelverbs.rc =================================================================== --- Frontier/branches/Conversant/Common/resources/Win32/kernelverbs.rc 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/resources/Win32/kernelverbs.rc 2006-04-18 19:33:35 UTC (rev 1297) @@ -573,7 +573,7 @@ "multiplereplaceall\0", "macromantoutf8\0", // 2006-02-25 creedon "utf8tomacroman\0", // 2006-02-25 creedon - "convertcharset\0" /* 2006-04-16 */ + "convertcharset\0" /* 2006-04-16 smd */ END Modified: Frontier/branches/Conversant/Common/source/FrontierWinMain.c =================================================================== --- Frontier/branches/Conversant/Common/source/FrontierWinMain.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/FrontierWinMain.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -1820,22 +1820,23 @@ /* 5.0a22 dmb: added + + 2006-04-17 aradke: Removed tyjugglermessage for endianness-agnostic code. + See shellhandlejugglerevent in shelljuggler.c. */ EventRecord ev; - tyjugglermessage jmsg; ev.hwnd = hwnd; ev.winmsg = msg; ev.wparam = wParam; ev.lparam = lParam; + + ev.message = 0; + ev.message |= (suspendResumeMessage << 24); + ev.message |= ((wParam != 0) ? resumeFlag : 0); - *((long *)&jmsg) = 0; - jmsg.eventtype = 1; - jmsg.flresume = (BOOL) wParam; - ev.what = jugglerEvt; - ev.message = *(long *) &jmsg; ev.when = gettickcount (); ev.where.h = 0; ev.where.v = 0; Modified: Frontier/branches/Conversant/Common/source/OpenTransportNetEvents.c =================================================================== --- Frontier/branches/Conversant/Common/source/OpenTransportNetEvents.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/OpenTransportNetEvents.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -2464,6 +2464,8 @@ /* Initialize the NetEvents system + + 5.0.2b5 dmb: added hostData parameter and GUSI support to handle threading */ if (!frontierWinSockLoaded) { @@ -5140,3 +5142,4 @@ return (true); }/*fwsNetEventGetStats*/ + Modified: Frontier/branches/Conversant/Common/source/fileops.c =================================================================== --- Frontier/branches/Conversant/Common/source/fileops.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/fileops.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -53,8 +53,8 @@ #if TARGET_API_MAC_CARBON #include "MoreFilesX.h" #else - pascal OSErr XGetVInfo(short volReference, StringPtr volName, short *vRefNum, - UInt64 *freeBytes, UInt64 *totalBytes); + pascal OSErr XGetVInfo(short volReference, StringPtr volName, short *vRefNum, UInt64 *freeBytes, + UInt64 *totalBytes); #endif #ifdef flcomponent @@ -65,7 +65,7 @@ #ifndef __MOREFILESEXTRAS__ enum { /*permissions used by MoreFile 1.1 code*/ - dmNone = 0x0000, + dmNone = 0x0000, dmNoneDenyRd = 0x0010, dmNoneDenyWr = 0x0020, dmNoneDenyRdWr = 0x0030, @@ -75,9 +75,9 @@ dmRdDenyRdWr = 0x0031, dmWr = 0x0002, dmWrDenyRd = 0x0012, - dmWrDenyWr = 0x0022, + dmWrDenyWr = 0x0022, dmWrDenyRdWr = 0x0032, - dmRdWr = 0x0003, /* Shared access - equivalent to fsRdWrShPerm */ + dmRdWr = 0x0003, /* Shared access - equivalent to fsRdWrShPerm */ dmRdWrDenyRd = 0x0013, dmRdWrDenyWr = 0x0023, /* Single writer, multiple readers; the writer */ dmRdWrDenyRdWr = 0x0033 /* Exclusive access - equivalent to fsRdWrPerm */ @@ -170,6 +170,7 @@ return (false); } /*endswithpathsep*/ + boolean cleanendoffilename (bigstring bs) { if (endswithpathsep(bs)) { setstringlength (bs, stringlength(bs) - 1); @@ -595,9 +596,10 @@ return (true); } - wsprintf (stringbaseaddress(errmsg), "Can't complete function because \"%s\" is not a valid volume name.", stringbaseaddress(fsname(fs))); + wsprintf (stringbaseaddress (errmsg), "Can't complete function because \"%s\" is not a valid volume name.", + stringbaseaddress (fsname (fs))); - setstringlength (errmsg, strlen(stringbaseaddress(errmsg))); + setstringlength (errmsg, strlen (stringbaseaddress (errmsg))); shellerrormessage (errmsg); @@ -737,8 +739,8 @@ } } else { - fref = (Handle) CreateFile (stringbaseaddress(fn), GENERIC_READ | GENERIC_WRITE, 0, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + fref = (Handle) CreateFile (stringbaseaddress (fn), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); if (fref == INVALID_HANDLE_VALUE) { info->flbusy = true; @@ -753,7 +755,6 @@ return (true); } /*filegetinfo*/ - boolean filegetvolumename (short vnum, bigstring volname) { #ifdef MACVERSION @@ -803,7 +804,6 @@ } /*filegetvolumename*/ - boolean fileisbusy (const tyfilespec *fs, boolean *flbusy) { /* @@ -945,7 +945,6 @@ } /*filesetvisible*/ - boolean getfiletype (const tyfilespec *fs, OSType *type) { tyfileinfo info; @@ -976,7 +975,6 @@ } /*getfilecreator*/ - boolean filesize (const tyfilespec *fs, long *size) { tyfileinfo info; @@ -1794,8 +1792,15 @@ //Timothy Paustian's comments //warning the values returned by getspecialfolderpath on OS X are very different //than classic Mac OS + boolean getspecialfolderpath (bigstring bsvol, bigstring bsfolder, boolean flcreate, tyfilespec *fs) { - + /* + 2006-04-11 creedon: windows now honors flcreate + for windows added; CSIDL_PROGRAM_FILES, CSIDL_MYDOCUMENTS, CSIDL_MYMUSIC, + CSIDL_MYPICTURES, CSIDL_MYVIDEO; + for windows replaced more complex code with CSIDL_SYSTEM, CSIDL_WINDOWS + */ + #ifdef MACVERSION /* 9/1/92 dmb: last new verb for 2.0. (?) @@ -1865,13 +1870,12 @@ #ifdef WIN95VERSION int nFolder = -1; - int res; + // int res; ITEMIDLIST * il; // Global pointer to the shell's IMalloc interface. LPMALLOC g_pMalloc = NULL; - - if (equalidentifiers ("\x6" "system", bsfolder)) { + /* if (equalidentifiers ("\x6" "system", bsfolder)) { unsigned char str[MAX_PATH]; res = GetSystemDirectory (str, MAX_PATH); @@ -1905,7 +1909,7 @@ pushchar ('\\', fsname(fs)); nullterminate (fsname(fs)); return (true); - } + } */ if (equalidentifiers ("\x9" "bitbucket", bsfolder)) nFolder = CSIDL_BITBUCKET; @@ -1939,8 +1943,25 @@ nFolder = CSIDL_STARTUP; else if (equalidentifiers ("\x9" "templates", bsfolder)) nFolder = CSIDL_TEMPLATES; + else if (equalidentifiers ("\xD" "program files", bsfolder)) + nFolder = CSIDL_PROGRAM_FILES; + else if (equalidentifiers ("\x6" "system", bsfolder)) + nFolder = CSIDL_SYSTEM; + else if (equalidentifiers ("\x7" "windows", bsfolder)) + nFolder = CSIDL_WINDOWS; + else if (equalidentifiers ("\xC" "my documents", bsfolder)) + nFolder = CSIDL_MYDOCUMENTS; + else if (equalidentifiers ("\x8" "my music", bsfolder)) + nFolder = CSIDL_MYMUSIC; + else if (equalidentifiers ("\xB" "my pictures", bsfolder)) + nFolder = CSIDL_MYPICTURES; + else if (equalidentifiers ("\x8" "my video", bsfolder)) + nFolder = CSIDL_MYVIDEO; - if(nFolder != -1) { + if (flcreate) + nFolder += CSIDL_FLAG_CREATE; + +if (nFolder != -1) { // Get the shell's allocator. if (!SUCCEEDED(SHGetMalloc(&g_pMalloc))) { oserror (ERROR_INVALID_FUNCTION); @@ -2092,7 +2113,11 @@ #ifdef MACVERSION - /* 2005-01-24 creedon - reversed free and total parameters to match FSGetVInfo and XGetVInfo functions < http://groups.yahoo.com/group/frontierkernel/message/846 > */ + /* + 2005-01-24 creedon - reversed free and total parameters to match FSGetVInfo and XGetVInfo functions + < http://groups.yahoo.com/group/frontierkernel/message/846 > + */ + #if TARGET_API_MAC_CARBON errnum = FSGetVInfo (fs->vRefNum, nil, &ui64freebytes, &ui64totalbytes); #else @@ -2288,54 +2313,6 @@ #endif } /*lockvolume*/ - -#ifdef WIN95VERSION -boolean findapplication (OSType creator, tyfilespec *fsapp) { - - /* - 5.0.1 dmb: implemented for Win using the registry - */ - - byte bsextension [8]; - bigstring bsregpath, bsoptions; - - ostypetostring (creator, bsextension); - - poptrailingwhitespace (bsextension); - - insertchar ('.', bsextension); - - pushchar (chnul, bsextension); - -// copyctopstring ("software\\Microsoft\\Windows\\CurrentVersion", bsregpath); - - if (!getRegKeyString ((Handle) HKEY_CLASSES_ROOT, bsextension, NULL, bsregpath)) - return (false); - - pushstring ("\x13\\shell\\open\\command", bsregpath); - - if (!getRegKeyString ((Handle) HKEY_CLASSES_ROOT, bsregpath, NULL, bsregpath)) - return (false); - - if (getstringcharacter (bsregpath, 0) == '"') { - - popleadingchars (bsregpath, '"'); - - firstword (bsregpath, '"', bsregpath); - } - else { - - lastword (bsregpath, ' ', bsoptions); - - if (stringlength (bsoptions) < stringlength (bsregpath)) - deletestring (bsregpath, stringlength (bsregpath) - stringlength (bsoptions) + 1, stringlength (bsoptions)); - } - - return (pathtofilespec (bsregpath, fsapp)); - } /*findapplication*/ -#endif - - #ifdef MACVERSION boolean unmountvolume (const tyfilespec *fs) { @@ -2386,114 +2363,6 @@ } /*hasdesktopmanager*/ -boolean findapplication (OSType creator, tyfilespec *fsapp) { - - /* - 2006-04-09 creedon: use LSFindApplicationForInfo if available - - 2.1b11 dmb: loop through all files in each db if necessary to find one - that's actually an application - - 9/7/92 dmb: make two passes, skipping volumes mounted with a foreign - file system the first time through. note: if this turns out not to be - the best criteria, we could check for shared volumes instead by testing - vMLocalHand in hasdesktopmanager. - - also: since we don't maintain the desktop DB when we delete files, we - need to verify that the file we locate still exists. added fileexists - call before returning true. - - 12/5/91 dmb - */ - - if ((UInt32) LSFindApplicationForInfo != (UInt32) kUnresolvedCFragSymbolAddress) { - - FSRef myRef; - - if (LSFindApplicationForInfo (creator, NULL, NULL, &myRef, NULL) != noErr) - return (false); - - if (FSRefMakeFSSpec (&myRef, fsapp) != noErr) - return (false); - - return (true); - } - else { - - bigstring bsapp; - DTPBRec dt; - HParamBlockRec pb; - OSType type; - register OSErr errcode; - boolean fltryremote = false; - boolean flremote; - - clearbytes (&pb, sizeof (pb)); - - while (true) { - - ++pb.volumeParam.ioVolIndex; - - errcode = PBHGetVInfoSync (&pb); - - if (errcode == nsvErr) { // index out of range - - if (fltryremote) // we've tried everything - return (false); - - pb.volumeParam.ioVolIndex = 0; // reset - - fltryremote = true; - - continue; - } - - if (errcode != noErr) - return (false); - - flremote = pb.volumeParam.ioVFSID != 0; // actually means foreign file system - - if (fltryremote != flremote) - continue; - - if (!hasdesktopmanager (pb.volumeParam.ioVRefNum)) - continue; - - dt.ioNamePtr = NULL; - dt.ioVRefNum = pb.volumeParam.ioVRefNum; - - if (PBDTGetPath (&dt) != noErr) - return (false); - - dt.ioNamePtr = (StringPtr) &bsapp; - dt.ioIndex = 0; - dt.ioFileCreator = creator; - - for (dt.ioIndex = 0; ; ++dt.ioIndex) { - - if (PBDTGetAPPLSync (&dt) != noErr) // go to next volume - break; - - if (FSMakeFSSpec (pb.volumeParam.ioVRefNum, dt.ioAPPLParID, bsapp, fsapp) != noErr) - continue; - - if (!getfiletype (fsapp, &type)) - return (false); - - if (type == 'APPL') // desktop db can contain references to non-apps - return (true); - } - - // if (PBDTGetAPPLSync (&dt) == noErr) { - - // if (FSMakeFSSpec (pb.volumeParam.ioVRefNum, dt.ioAPPLParID, bsapp, fsapp) == noErr) - // return (true); - // } - } - } /* if */ - } /* findapplication */ - - #if 0 static boolean getdesktopdatabasepath (short vnum, DTPBRec *dt) { @@ -2593,7 +2462,7 @@ /* new: pascal OSErr GetLabel(short labelNumber, RGBColor *labelColor, Str255 labelString) - = {0x303c, 0x050B, 0xABC9}; + = {0x303c, 0x050B, 0xABC9}; */ Handle hlabel; @@ -2878,7 +2747,6 @@ } /*fileparsevolname*/ - #ifdef MACVERSION boolean fileresolvealias (tyfilespec *fs) { @@ -3150,7 +3018,7 @@ #endif #ifdef WIN95VERSION - char fn[300]; + char fn [300]; bigstring bsfolder; if (!surefile (fs)) /*file doesn't exist -- catch error*/ @@ -3168,7 +3036,7 @@ nullterminate (bsfolder); - if (MoveFile (stringbaseaddress (fn), stringbaseaddress(bsfolder))) + if (MoveFile (stringbaseaddress (fn), stringbaseaddress (bsfolder))) return (true); winfileerror (fs); @@ -3276,8 +3144,8 @@ nullterminate (fn); - f = CreateFile (stringbaseaddress(fn), GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + f = CreateFile (stringbaseaddress(fn), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); if (f == INVALID_HANDLE_VALUE) { @@ -3359,4 +3227,86 @@ } /*initfile*/ +boolean findapplication (OSType creator, tyfilespec *fsapp) { + + /* + 2006-04-10 creedon: deleted old code, see revision 1246 for old code + + 2006-04-09 creedon: use LSFindApplicationForInfo if available + + 5.0.1 dmb: implemented for Win using the registry + 2.1b11 dmb: loop through all files in each db if necessary to find one that's actually an application + + 9/7/92 dmb: make two passes, skipping volumes mounted with a foreign + file system the first time through. note: if this turns out not to be + the best criteria, we could check for shared volumes instead by testing + vMLocalHand in hasdesktopmanager. + + also: since we don't maintain the desktop DB when we delete files, we + need to verify that the file we locate still exists. added fileexists + call before returning true. + + 12/5/91 dmb + */ + + #ifdef MACVERSION + + if ((UInt32) LSFindApplicationForInfo == (UInt32) kUnresolvedCFragSymbolAddress) + return (false); + + FSRef myRef; + + if (LSFindApplicationForInfo (creator, NULL, NULL, &myRef, NULL) != noErr) + return (false); + + if (FSRefMakeFSSpec (&myRef, fsapp) != noErr) + return (false); + + return (true); + + #endif /* MACVERSION */ + + #ifdef WIN95VERSION + + byte bsextension [8]; + bigstring bsregpath, bsoptions; + + ostypetostring (creator, bsextension); + + poptrailingwhitespace (bsextension); + + insertchar ('.', bsextension); + + pushchar (chnul, bsextension); + + // copyctopstring ("software\\Microsoft\\Windows\\CurrentVersion", bsregpath); + + if (!getRegKeyString ((Handle) HKEY_CLASSES_ROOT, bsextension, NULL, bsregpath)) + return (false); + + pushstring ("\x13\\shell\\open\\command", bsregpath); + + if (!getRegKeyString ((Handle) HKEY_CLASSES_ROOT, bsregpath, NULL, bsregpath)) + return (false); + + if (getstringcharacter (bsregpath, 0) == '"') { + + popleadingchars (bsregpath, '"'); + + firstword (bsregpath, '"', bsregpath); + } + else { + + lastword (bsregpath, ' ', bsoptions); + + if (stringlength (bsoptions) < stringlength (bsregpath)) + deletestring (bsregpath, stringlength (bsregpath) - stringlength (bsoptions) + 1, stringlength (bsoptions)); + } + + return (pathtofilespec (bsregpath, fsapp)); + + #endif /* WIN95VERSION */ + + } /* findapplication */ + Modified: Frontier/branches/Conversant/Common/source/fileverbs.c =================================================================== --- Frontier/branches/Conversant/Common/source/fileverbs.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/fileverbs.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -45,6 +45,7 @@ #include "tablestructure.h" #include "kernelverbdefs.h" #include "shell.rsrc.h" +#include "byteorder.h" /* 2006-04-16 aradke: for SWAP_REZ_BYTE_ORDER */ #ifdef MACVERSION @@ -1458,13 +1459,23 @@ */ typedef struct lNumVersion { +#ifdef SWAP_REZ_BYTE_ORDER + unsigned short nonRelRev2: 4; /* 2nd nibble of revision level*/ + unsigned short nonRelRev1 : 4; /*revision level of non-released version*/ + unsigned short stage : 8; /*stage code: dev, alpha, beta, final*/ + unsigned short bugFixRev : 4; /*3rd part is 1 nibble in BCD*/ + unsigned short minorRev : 4; /*2nd part is 1 nibble in BCD*/ + unsigned short majorRev2: 4; /* 2nd nibble of 1st part*/ unsigned short majorRev1: 4; /*1st part of version number in BCD*/ +#else + unsigned short majorRev1: 4; /*1st part of version number in BCD*/ unsigned short majorRev2: 4; /* 2nd nibble of 1st part*/ unsigned short minorRev : 4; /*2nd part is 1 nibble in BCD*/ unsigned short bugFixRev : 4; /*3rd part is 1 nibble in BCD*/ unsigned short stage : 8; /*stage code: dev, alpha, beta, final*/ unsigned short nonRelRev1 : 4; /*revision level of non-released version*/ unsigned short nonRelRev2: 4; /* 2nd nibble of revision level*/ +#endif } lNumVersion; typedef struct lVersRec { Modified: Frontier/branches/Conversant/Common/source/frontierconfig.c =================================================================== --- Frontier/branches/Conversant/Common/source/frontierconfig.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/frontierconfig.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -37,6 +37,7 @@ #include "shell.rsrc.h" #include "frontierconfig.h" #include "shell.h" +#include "byteorder.h" /* 2006-04-16 aradke: swap byte order in loadconfigresource */ #ifdef MACVERSION @@ -90,6 +91,8 @@ /* 2.1b5 dmb: release the config resource when done with it + + 2006-04-16 aradke: swap byte-order on Intel Macs */ register Handle h; @@ -100,14 +103,66 @@ if (h != nil) { moveleft (*h, cr, sizeof (tyconfigrecord)); + + releaseresourcehandle (h); + reztomemshort ((*cr).flhorizscroll); + + reztomemshort ((*cr).flvertscroll); + + reztomemshort ((*cr).flwindowfloats); + + reztomemshort ((*cr).flmessagearea); + + reztomemshort ((*cr).flinsetcontentrect); + + reztomemshort ((*cr).flnewonlaunch); + + reztomemshort ((*cr).flopenresfile); + + reztomemshort ((*cr).fldialog); + + reztomemshort ((*cr).flgrowable); + + reztomemshort ((*cr).flcreateonnew); + + reztomemshort ((*cr).flwindoidscrollbars); + + reztomemshort ((*cr).flstoredindatabase); + + reztomemshort ((*cr).flparentwindowhandlessave); + + reztomemshort ((*cr).fleraseonresize); + + reztomemshort ((*cr).fldontconsumefrontclicks); + + reztomemshort ((*cr).flcolorwindow); + + reztomemshort ((*cr).messageareafraction); + + reztomemlong ((*cr).filecreator); /* OSType */ + + reztomemlong ((*cr).filetype); /* OSType */ + + reztomemrect ((*cr).rmin); + + reztomemshort ((*cr).templateresnum); + + reztomemshort ((*cr).defaultfont); + + reztomemshort ((*cr).defaultsize); + + reztomemshort ((*cr).defaultstyle); + + reztomemshort ((*cr).idbuttonstringlist); + + reztomemrect ((*cr).defaultwindowrect); + getstringlist (fontnamelistnumber, (*cr).defaultfont, bs); fontgetnumber (bs, &(*cr).defaultfont); centerrectondesktop (&(*cr).defaultwindowrect); - - releaseresourcehandle (h); } else initconfigrecord (cr); Modified: Frontier/branches/Conversant/Common/source/langipc.c =================================================================== --- Frontier/branches/Conversant/Common/source/langipc.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/langipc.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -51,6 +51,7 @@ #include "meprograms.h" #include "process.h" #include "processinternal.h" +#include "byteorder.h" #ifdef flcomponent #include <uisharing.h> #include <uisinternal.h> @@ -2175,6 +2176,8 @@ 8/11/92 dmb: also special-case character values; they must go out as standard typeChar descriptors. + + 2006-04-17 aradke: Must byte-swap valtype id extracted from binary value on Intel Macs. */ register AEDesc *d = desc; @@ -2182,15 +2185,16 @@ #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ Handle hcopy; + DescType dtype; - newclearhandle (sizeof (DescType), &hcopy); + copyhandle (hbinary, &hcopy); - copyhandlecontents (hbinary, hcopy); + pullfromhandle (hcopy, 0L, sizeof (DescType), &dtype); - pullfromhandle (hcopy, 0L, sizeof (DescType), &(*d).descriptorType); - - newdescwithhandle (d, (*d).descriptorType, hcopy); + disktomemlong (dtype); + newdescwithhandle (d, dtype, hcopy); + disposehandle (hcopy); #else @@ -2198,6 +2202,8 @@ (*d).dataHandle = hbinary; pullfromhandle ((*d).dataHandle, 0L, sizeof (DescType), &(*d).descriptorType); + + disktomemlong ((*d).descriptorType); #endif Modified: Frontier/branches/Conversant/Common/source/langstartup.c =================================================================== --- Frontier/branches/Conversant/Common/source/langstartup.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/langstartup.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -42,6 +42,7 @@ #include "resources.h" #include "WinSockNetEvents.h" #include "sysshellcall.h" /* 2006-03-09 aradke: unixshellcall moved from CallMachOFramework.h */ +#include "byteorder.h" /* 2006-04-16 aradke: swap byte-order in loadfunctionprocessor */ #define str_isPike BIGSTRING ("\x06" "isPike") @@ -155,6 +156,8 @@ '040 instruction cache bug in Think C's run-time implementation of same, it's time to create the kernel tables directly from resources. that's what this routine does. + + 2006-04-16 aradke: swap byte-order on Intel Macs */ bigstring bsname; @@ -182,6 +185,8 @@ if (!loadfromhandle (hefps, &ix, 2, &ctefps)) return (false); + reztomemshort (ctefps); + while (--ctefps >= 0) { copyrezstring (BIGSTRING (*hefps + ix), bsname); @@ -191,12 +196,16 @@ if (!loadfromhandle (hefps, &ix, 2, &flwindow)) return (false); + reztomemshort (flwindow); + if (!newfunctionprocessor (bsname, valuecallback, (boolean) flwindow, &htable)) return (false); if (!loadfromhandle (hefps, &ix, 2, &ctverbs)) return (false); + reztomemshort (ctverbs); + pushhashtable (htable); while (--ctverbs >= 0 && fl) { Modified: Frontier/branches/Conversant/Common/source/langtree.c =================================================================== --- Frontier/branches/Conversant/Common/source/langtree.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/langtree.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -38,12 +38,11 @@ typedef struct tydisktreenode { -#ifdef MACVERSION +#ifdef SWAP_BYTE_ORDER + short nodetype; /*low byte will coincide with MAC enum*/ +#else tytreetype nodetype; /*add, subtract, if, etc.*/ #endif -#ifdef WIN95VERSION - short nodetype; /*low byte will coincide with MAC enum*/ -#endif long nodevalsize; @@ -70,7 +69,15 @@ typedef enum tydisktreenodeparaminfo { -#ifdef MACVERSION +#ifdef SWAP_BYTE_ORDER + ctparams_mask = 0x00f0, + ctparams_1 = 0x0010, + hasparam1_mask = 0x0008, + hasparam2_mask = 0x0004, + hasparam3_mask = 0x0002, + hasparam4_mask = 0x0001, + haslink_mask = 0x8000 +#else ctparams_mask = 0xf000, ctparams_1 = 0x1000, hasparam1_mask = 0x0800, @@ -79,16 +86,6 @@ hasparam4_mask = 0x0100, haslink_mask = 0x0080 #endif - -#ifdef WIN95VERSION - ctparams_mask = 0x00f0, - ctparams_1 = 0x0010, - hasparam1_mask = 0x0008, - hasparam2_mask = 0x0004, - hasparam3_mask = 0x0002, - hasparam4_mask = 0x0001, - haslink_mask = 0x8000 -#endif } tydisktreenodeparaminfo; @@ -108,10 +105,10 @@ typedef struct tyOLD42disktreenode { - #ifdef MACVERSION + #ifdef __BIG_ENDIAN__ tytreetype nodetype; /*add, subtract, if, etc.*/ #endif - #ifdef WIN95VERSION + #ifdef __LITTLE_ENDIAN__ short nodetype; #endif Modified: Frontier/branches/Conversant/Common/source/oppack.c =================================================================== --- Frontier/branches/Conversant/Common/source/oppack.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/oppack.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -47,7 +47,7 @@ typedef enum tylinetableitemflags { -#ifdef MACVERSION +#ifndef SWAP_BYTE_ORDER flexpanded = 0x8000, /*was the line expanded when the outline was closed?*/ flopenwindow = 0x4000, /*was the linked window open when its owner was closed?*/ appbit0 = 0x2000, /*application-defined bit*/ @@ -55,9 +55,7 @@ fllocked = 0x0800, /*is the line locked?*/ flcomment = 0x0400, /*is this line a comment?*/ flbreakpoint = 0x0200 /*is a breakpoint set on this line?*/ -#endif - -#ifdef WIN95VERSION +#else flexpanded = 0x0080, /*was the line expanded when the outline was closed?*/ flopenwindow = 0x0040, /*was the linked window open when its owner was closed?*/ appbit0 = 0x0020, /*application-defined bit*/ Modified: Frontier/branches/Conversant/Common/source/osacomponent.c =================================================================== --- Frontier/branches/Conversant/Common/source/osacomponent.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/osacomponent.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -66,6 +66,7 @@ #include "osaparseaete.h" #include "osawindows.h" #include <SetUpA5.h> +#include "byteorder.h" #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ #include "aeutils.h" @@ -2558,7 +2559,46 @@ break; } - err = OSARemoveStorageType ((AEDataStorage) hdata); + #ifdef SWAP_BYTE_ORDER + { + /* + 2006-04-17 aradke: This is a MAJOR HACK (FIXME)! + + Compiled osa scripts of the generic storage type have a 12-byte trailer: + + Bytes 0-3 contain the signature of the OSA component that knows + how to execute the script, e.g. 'LAND' for the UserTalk component. + The meaning of bytes 4-5 is unknown. + Bytes 6-7 seem to contain the length of the trailer as a 16bit integer. + Bytes 8-11 contain 0xFADEDEAD as a magic signature for the trailer. + + Example: 4C41 4E44 0001 000C FADE DEAD (see 'scpt' resource #1024 in iowaruntime.r) + + OSARemoveStorageType is supposed to remove this trailer if it is present. + However, it doesn't perform byte-order swapping on the length bytes in the trailer. + The call below ends up removing 3072 bytes instead of 12 bytes from hdata. + + Until we figure out how to properly deal with this bug(?), we use our own + implementation of OSARemoveStorageType on Intel Macs. + */ + + long hlen = gethandlesize (hdata); + char * p = *hdata; + long marker; + + p += (hlen - 4); + + marker = *(long *) p; + + disktomemlong (marker); + + if (marker == 0xFADEDEAD) { + sethandlesize (hdata, hlen - 12); //remove storage type trailer + } + } + #else + err = OSARemoveStorageType ((AEDataStorage) hdata); + #endif if (err == noErr) fl = langunpackvalue (hdata, &vscript); @@ -2571,7 +2611,7 @@ err = errOSABadStorageType; } - #if TARGET_API_MAC_CARBON + #if TARGET_API_MAC_CARBON == 1 if(descData != nil) { disposehandle(descData); /* AE OS X fix */ Modified: Frontier/branches/Conversant/Common/source/osawindows.c =================================================================== --- Frontier/branches/Conversant/Common/source/osawindows.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/osawindows.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -97,13 +97,13 @@ static boolean removewindowsharinghandlers (void); -static pascal ComponentResult -handlewindoweventcommand ( - Handle hglobals, - EventRecord *ev, - tyWindowSharingGlobals *pwsGlobals) -{ -#pragma unused (hglobals) +static pascal ComponentResult handlewindoweventcommand (Handle hglobals, EventRecord *ev, tyWindowSharingGlobals *pwsGlobals) { + + /* + 2006-04-17 aradke: update jugglerEvt case for Intel Macs using endianness-agnostic code + */ + + #pragma unused (hglobals) boolean flcloseallwindows = false; WindowPtr w; @@ -130,10 +130,9 @@ break; case jugglerEvt: { - tyjugglermessage *jmsg = (tyjugglermessage *) &(*ev).message; - if ((*jmsg).eventtype == 1) /*suspend or resume subevent*/ - shellactivatewindow (w, (*jmsg).flresume); + if ((((*ev).message >> 24) & 0xff) == suspendResumeMessage) /*suspend or resume subevent*/ + shellactivatewindow (w, ((*ev).message & resumeFlag) != 0); break; } Modified: Frontier/branches/Conversant/Common/source/resources.c =================================================================== --- Frontier/branches/Conversant/Common/source/resources.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/resources.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -50,7 +50,7 @@ is of zero length. */ - #ifdef fldebug + #if 0 //#ifdef fldebug /* 2006-04-16 aradke: disabled for Mac Intel build */ if (GetResource ('STR#', listnum) == nil) DebugStr ("\pmissing STR# resource"); Modified: Frontier/branches/Conversant/Common/source/shelljuggler.c =================================================================== --- Frontier/branches/Conversant/Common/source/shelljuggler.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/shelljuggler.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -93,11 +93,7 @@ } /*shellactivate*/ -static boolean -shelljugglervisit ( - WindowPtr w, - ptrvoid refcon) -{ +static boolean shelljugglervisit (WindowPtr w, ptrvoid refcon) { #pragma unused (refcon) shellpushglobals (w); @@ -116,18 +112,18 @@ 7/13/90 DW: deactivate the front window when we're swapped into the background on a juggler event. activate it when we're swapped back into the foreground. + + 2006-04-17 aradke: updated for Intel Macs using endianness-agnostic code */ register boolean flresume; - tyjugglermessage jmsg; + long message = shellevent.message; - moveleft (&shellevent.message, &jmsg, longsizeof (jmsg)); - - if (jmsg.eventtype == 1) { /*suspend or resume subevent*/ + if (((message >> 24) & 0xff) == suspendResumeMessage) { /*suspend or resume subevent*/ boolean fl; - flresume = jmsg.flresume; /*copy into register*/ + flresume = ((message & resumeFlag) != 0); /*copy into register*/ flshellactive = flresume; /*set global*/ @@ -142,14 +138,20 @@ if (fl) shellactivatewindow (shellwindow, flshellactive); - - if (jmsg.flconvertclipboard) { + + #if defined(TARGET_API_MAC_OS8) && (TARGET_API_MAC_OS8 == 1) + /* + 2006-04-17 aradke: convertClipboardFlag is never set on Carbon + */ - if (flresume) - ; /*shellreadscrap ()*/ /*12/28/90 dmb: see comment in shellreadscrap*/ - else - shellwritescrap (anyscraptype); - } + if ((message & convertClipboardFlag) != 0) { + + if (flresume) + ; /*shellreadscrap ()*/ /*12/28/90 dmb: see comment in shellreadscrap*/ + else + shellwritescrap (anyscraptype); + } + #endif if (fl) shellpopglobals (); Modified: Frontier/branches/Conversant/Common/source/stringverbs.c =================================================================== --- Frontier/branches/Conversant/Common/source/stringverbs.c 2006-04-18 19:08:25 UTC (rev 1296) +++ Frontier/branches/Conversant/Common/source/stringverbs.c 2006-04-18 19:33:35 UTC (rev 1297) @@ -2258,7 +2258,7 @@ if (!ansitoutf16 (h, hresult)) return (false); - disposehandle(h); // kw 2005-07-23 --- memleak + disposehandle (h); // kw 2005-07-23 --- memleak return (setheapvalue (hresult, stringvaluetype, v)); } @@ -2301,7 +2301,7 @@ if (!utf8tomacroman (h, hresult)) goto error; - disposehandle(h); + disposehandle (h); return (setheapvalue (hresult, stringvaluetype, v)); } Property changes on: Frontier/branches/Conversant/build_XCode/tools ___________________________________________________________________ Name: svn:ignore - libpaigemacho.a + libpaigemacho.a libpaigefat.a Property changes on: Frontier/branches/Conversant/build_XCode/tools/postlinking.sh ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
