Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source langhtml.c,1.8.2.1,1.8.2.2,pre_int64_branch langipc.c,1.6.6.2,1.6.6.3,pre_int64_branch langlist.c,1.7,1.7.6.1,pre_int64_branch langmodeless.c,1.4,1.4.6.1,pre_int64_branch langops.c,1.4.6.3,1.4.6.4,pre_int64_branch langpack.c,1.4,1.4.6.1,pre_int64_branch langsystypes.c,1.6.2.2,1.6.2.3,pre_int64_branch launch.c,1.7.6.1,1.7.6.2,pre_int64_branch oplist.c,1.7,1.7.4.1,pre_int64_branch osacomponent.c,1.7.6.2,1.7.6.3,pre_int64_branch uisharing.c,1.5.6.1,1.5.6.2,pre_int64_branch
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2899/Common/source Modified Files: Tag: pre_int64_branch langhtml.c langipc.c langlist.c langmodeless.c langops.c langpack.c langsystypes.c launch.c oplist.c osacomponent.c uisharing.c Log Message: long overdue commit update Index: uisharing.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/uisharing.c,v retrieving revision 1.5.6.1 retrieving revision 1.5.6.2 diff -C2 -d -r1.5.6.1 -r1.5.6.2 *** uisharing.c 14 Feb 2006 11:43:57 -0000 1.5.6.1 --- uisharing.c 10 Mar 2006 22:26:57 -0000 1.5.6.2 *************** *** 1187,1191 **** copydatahandle (&result, hbinary); #if AEDISPOSAL == 1 ! // possible memleak here #endif --- 1187,1192 ---- copydatahandle (&result, hbinary); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&result); #endif *************** *** 1217,1221 **** copydatahandle (&result, &htext); #if AEDISPOSAL == 1 ! // possible memleak here #endif --- 1218,1223 ---- copydatahandle (&result, &htext); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&result); #endif Index: oplist.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplist.c,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -C2 -d -r1.7 -r1.7.4.1 *** oplist.c 30 Mar 2005 13:56:02 -0000 1.7 --- oplist.c 10 Mar 2006 22:26:57 -0000 1.7.4.1 *************** *** 70,73 **** --- 70,85 ---- + #if OPLANGLISTACCEL == 1 + typedef struct tylistindex + { + Handle oplistindex; + long + start, + end, + size; + } tylistindex, *tylistindexptr, **tylistindexhdl; + #endif + + typedef struct tylistrecord { *************** *** 77,81 **** boolean isrecord; /*do items have names?*/ ! oplistreleaseitemcallback releaseitemcallback; /*routine that releases one of **your** handles*/ } tylistrecord; --- 89,96 ---- boolean isrecord; /*do items have names?*/ ! ! #if OPLANGLISTACCEL == 1 ! tylistindex listindex; ! #endif oplistreleaseitemcallback releaseitemcallback; /*routine that releases one of **your** handles*/ } tylistrecord; *************** *** 114,118 **** --- 129,260 ---- */ + #if OPLANGLISTACCEL == 1 + // a try at accelerating indexed list access. currently getnthlistitem has time complexity O(n). + // I want O(1) + static boolean growlistindex(tylistindexptr theIndex); + + + static boolean + initlistindex(tylistindexptr plistidx) + { + if (!newclearhandle (sizeof (Handle) * 1024, (Handle *) &(plistidx->oplistindex) )) + return (false); + + plistidx->start = 256; + plistidx->end = 256; + plistidx->size = 1024; + + // if (!growlistindex(plistidx)) + // return(false); + + return(true); + } + + static boolean + checklistindexlimits(tylistindexptr plistidx) + { + // total push array + long limit = plistidx->size - plistidx->start; + + // free handles in pushspace + long remainpush = limit - plistidx->end; + + // free handles in unshift space + long remainunshift = plistidx->start; + + if ((remainpush < 2) || (remainunshift < 2)) + if (!growlistindex(plistidx)) + return(false); + return(true); + } + + static boolean + disposelistindex(tylistindexptr theIndex) + { + disposehandle(theIndex->oplistindex); + // return(false); + + return(true); + } + + static boolean + growlistindex(tylistindexptr theIndex) + { + long thesize = theIndex->size + (theIndex->size >> 2); + void *s, *e; + + if (!sethandlesize(theIndex->oplistindex, thesize)) + return(false); + + theIndex->size = thesize; + + s = *(theIndex->oplistindex) + (theIndex->start * sizeof(void *)); + e = *(theIndex->oplistindex) + (theIndex->start * 256 * sizeof(void *)); + moveright(s, e, 256 * sizeof(void *)); + theIndex->start += 256; + theIndex->end += 256; + + return(true); + } + + static boolean + getindexedadr(tylistindexptr theIndex, long n, Handle *h) + { + Handle *dst; + + + dst = theIndex->oplistindex; + dst += n * sizeof(Handle); + + h = dst; + return (true); + } + + + static boolean + setindexedadr(tylistindexptr theIndex, long n, Handle *h) + { + Handle *dst; + + if (!checklistindexlimits(theIndex)) + return (false); + + dst = theIndex->oplistindex; + + dst += n * sizeof(Handle); + + h = dst; + return (true); + } + + static boolean + deleteindexedadr(tylistindexptr theIndex, long n, Handle *h) + { + long thesize = theIndex->size + (theIndex->size >> 2); + void *s, *e; + + s = *(theIndex->oplistindex) + (theIndex->start * n * sizeof(void *)); + e = *(theIndex->oplistindex) + (theIndex->start * (n+1) * sizeof(void *)); + moveright(s, e, 256); + theIndex->start += 256; + theIndex->end += 256; + + return(true); + } + + + static boolean + unshiftindexedadr(tylistindexptr theIndex, long n, Handle *h) + { + return (true); + } + + static boolean + pushindexedadr(tylistindexptr theIndex, long n, Handle *h) + { + return (true); + } + #endif boolean opnewlist (hdllistrecord *hlist, boolean isrecord) { *************** *** 130,133 **** --- 272,282 ---- h = *hlist; /*copy into register*/ + #if OPLANGLISTACCEL == 1 + (**h).listindex.oplistindex = nil; + if (!initlistindex(&((**h).listindex))) + return(false); + + #endif + if (!newoutlinerecord (&houtline)) { *************** *** 167,171 **** opdisposeoutline (ho, false); ! hcurrentlist = nil; --- 316,324 ---- opdisposeoutline (ho, false); ! ! #if OPLANGLISTACCEL == 1 ! if (!disposelistindex(&((**hlist).listindex))) ! ; ! #endif hcurrentlist = nil; *************** *** 208,217 **** opsetheadstring (hnew, bs); ! } ! ! else { hlast = oprepeatedbump (down, ctitems - 1, (**ho).hsummit, false); ! ! // setstringlength (bs, 0); if (!opaddheadline (hlast, down, bs, &hnew)) { --- 361,384 ---- opsetheadstring (hnew, bs); ! #if OPLANGLISTACCEL == 1 ! // set value at index 1 ! if (!setindexedadr( &((**h).listindex), 1, nil)) ! return(false); ! #endif ! } ! else ! { ! #if OPLANGLISTACCEL == 1 ! // set value at index 1 ! ! // get last index at n-1 ! ! // just for now hlast = oprepeatedbump (down, ctitems - 1, (**ho).hsummit, false); ! #else ! hlast = oprepeatedbump (down, ctitems - 1, (**ho).hsummit, false); ! #endif ! ! // setstringlength (bs, 0); if (!opaddheadline (hlast, down, bs, &hnew)) { *************** *** 220,243 **** goto error; ! } ! (**ho).ctexpanded++; ! (**hnew).flexpanded = true; ! } ! ! #ifdef fldebug ! if (fldebugging) { ! copystring ((ptrstring) "\x0A" "headline #", bs); ! pushint (ctitems + 1, bs); ! opsetheadstring (hnew, bs); ! } ! ! #endif ! (**hnew).hrefcon = hdata; /*link in the user's data structure*/ --- 387,409 ---- goto error; ! } ! (**ho).ctexpanded++; ! (**hnew).flexpanded = true; ! } ! ! #ifdef fldebug ! if (fldebugging) { ! copystring ((ptrstring) "\x0A" "headline #", bs); ! pushint (ctitems + 1, bs); ! opsetheadstring (hnew, bs); ! } ! #endif ! (**hnew).hrefcon = hdata; /*link in the user's data structure*/ Index: langmodeless.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langmodeless.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** langmodeless.c 11 Jan 2005 22:48:07 -0000 1.4 --- langmodeless.c 10 Mar 2006 22:26:57 -0000 1.4.6.1 *************** *** 135,146 **** short item; ! #if TARGET_API_MAC_CARBON DialogPtr theDial = GetDialogFromWindow(langdialogwindow); if(dialogevent (&shellevent, theDial, &item)) ! #else if (dialogevent (&shellevent, langdialogwindow, &item)) ! #endif ! { /*mouse in text item*/ ! (**hd).itemhit = item; --- 135,146 ---- short item; ! #if TARGET_API_MAC_CARBON DialogPtr theDial = GetDialogFromWindow(langdialogwindow); if(dialogevent (&shellevent, theDial, &item)) ! #else if (dialogevent (&shellevent, langdialogwindow, &item)) ! #endif ! { ! /*mouse in text item*/ (**hd).itemhit = item; *************** *** 158,167 **** register hdldialogrecord hd = langdialogdata; short item; ! #if TARGET_API_MAC_CARBON DialogPtr theDial = GetDialogFromWindow(langdialogwindow); if (dialogevent (&shellevent, theDial, &item)) ! #else if (dialogevent (&shellevent, langdialogwindow, &item)) ! #endif { (**hd).itemhit = item; --- 158,167 ---- register hdldialogrecord hd = langdialogdata; short item; ! #if TARGET_API_MAC_CARBON DialogPtr theDial = GetDialogFromWindow(langdialogwindow); if (dialogevent (&shellevent, theDial, &item)) ! #else if (dialogevent (&shellevent, langdialogwindow, &item)) ! #endif { (**hd).itemhit = item; *************** *** 195,222 **** (**hd).itemhit = -2; /*close*/ - - #if TARGET_API_MAC_CARBON ! while (((char)((long)*hd) != -1) && ((**hd).flstillalive)) { /*make sure it's handled before window is disposed*/ ! ! processchecktimeouts (); ! ! if (!processyield ()) ! return (false); ! } ! ! #else ! ! while ((**hd).flstillalive) { /*make sure it's handled before window is disposed*/ ! ! processchecktimeouts (); ! ! if (!processyield ()) ! return (false); ! } ! ! #endif ! } else { langdialogitemhit ((**hd).itemhitroutine, -2, false); --- 195,212 ---- (**hd).itemhit = -2; /*close*/ ! #if TARGET_API_MAC_CARBON ! while (((char)((long)*hd) != -1) && ((**hd).flstillalive)) /*make sure it's handled before window is disposed*/ ! #else ! while ((**hd).flstillalive) /*make sure it's handled before window is disposed*/ ! #endif ! { ! processchecktimeouts (); ! ! if (!processyield ()) ! return (false); } + + } else { langdialogitemhit ((**hd).itemhitroutine, -2, false); *************** *** 237,248 **** event.what = updateEvt; ! #if TARGET_API_MAC_CARBON { ! DialogPtr theDial = GetDialogFromWindow(langdialogwindow); ! dialogupdate (&event, theDial); } ! #else dialogupdate (&event, (DialogPtr) langdialogwindow); ! #endif } /*langdialogupdate*/ --- 227,238 ---- event.what = updateEvt; ! #if TARGET_API_MAC_CARBON { ! DialogPtr theDial = GetDialogFromWindow(langdialogwindow); ! dialogupdate (&event, theDial); } ! #else dialogupdate (&event, (DialogPtr) langdialogwindow); ! #endif } /*langdialogupdate*/ *************** *** 251,262 **** (**langdialogdata).flactive = flactivate; ! #if TARGET_API_MAC_CARBON { ! DialogPtr theDial = GetDialogFromWindow(langdialogwindow); ! dialogactivate (theDial, flactivate); } ! #else dialogactivate (langdialogwindow, flactivate); ! #endif } /*langdialogactivate*/ --- 241,252 ---- (**langdialogdata).flactive = flactivate; ! #if TARGET_API_MAC_CARBON { ! DialogPtr theDial = GetDialogFromWindow(langdialogwindow); ! dialogactivate (theDial, flactivate); } ! #else dialogactivate (langdialogwindow, flactivate); ! #endif } /*langdialogactivate*/ *************** *** 307,319 **** static void langdialogidle (void) { ! ! #if TARGET_API_MAC_CARBON { ! DialogPtr theDial = GetDialogFromWindow(langdialogwindow); ! dialogidle (theDial); } ! #else dialogidle (langdialogwindow); ! #endif } /*langdialogidle*/ --- 297,309 ---- static void langdialogidle (void) { ! ! #if TARGET_API_MAC_CARBON { ! DialogPtr theDial = GetDialogFromWindow(langdialogwindow); ! dialogidle (theDial); } ! #else dialogidle (langdialogwindow); ! #endif } /*langdialogidle*/ *************** *** 323,332 **** Handle htext; ! #if TARGET_API_MAC_CARBON DialogPtr theDial = GetDialogFromWindow(langdialogwindow); DialogCopy (theDial); ! #else DialogCopy (langdialogwindow); ! #endif if (!copyhandle (TEScrapHandle (), &htext)) --- 313,322 ---- Handle htext; ! #if TARGET_API_MAC_CARBON DialogPtr theDial = GetDialogFromWindow(langdialogwindow); DialogCopy (theDial); ! #else DialogCopy (langdialogwindow); ! #endif if (!copyhandle (TEScrapHandle (), &htext)) Index: launch.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/launch.c,v retrieving revision 1.7.6.1 retrieving revision 1.7.6.2 diff -C2 -d -r1.7.6.1 -r1.7.6.2 *** launch.c 14 Feb 2006 11:43:57 -0000 1.7.6.1 --- launch.c 10 Mar 2006 22:26:57 -0000 1.7.6.2 *************** *** 989,993 **** copydatahandle (&launchdesc, (Handle*) appparams); #if AEDISPOSAL == 1 ! // possible memleak here #endif --- 989,994 ---- copydatahandle (&launchdesc, (Handle*) appparams); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&launchdesc); #endif *************** *** 1034,1041 **** clearbytes (&sys7lpb, longsizeof (sys7lpb)); ! #if TARGET_API_MAC_CARBON == 1 /*7.1b19 PBS: append ".app" to the filename if the file can't be found.*/ ! { boolean flfolder = false; ! if (!fileexists (fsapp, &flfolder)) { --- 1035,1042 ---- clearbytes (&sys7lpb, longsizeof (sys7lpb)); ! #if TARGET_API_MAC_CARBON == 1 /*7.1b19 PBS: append ".app" to the filename if the file can't be found.*/ ! { boolean flfolder = false; ! if (!fileexists (fsapp, &flfolder)) { *************** *** 1056,1060 **** } /*if*/ } /*if*/ ! } /* { --- 1057,1061 ---- } /*if*/ } /*if*/ ! } /* { *************** *** 1078,1082 **** } */ ! #endif sys7lpb.launchAppSpec = (FSSpecPtr) fsapp; --- 1079,1083 ---- } */ ! #endif sys7lpb.launchAppSpec = (FSSpecPtr) fsapp; Index: langpack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpack.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** langpack.c 11 Jan 2005 22:48:07 -0000 1.4 --- langpack.c 10 Mar 2006 22:26:57 -0000 1.4.6.1 *************** *** 296,305 **** case externalvaluetype: { ! register Handle h = val.data.externalvalue; Handle hpacked; initbeachball (left); ! fl = langexternalmemorypack ((hdlexternalvariable) h, &hpacked, hnode); if (!fl) --- 296,305 ---- case externalvaluetype: { ! register Handle lh = val.data.externalvalue; Handle hpacked; initbeachball (left); ! fl = langexternalmemorypack ((hdlexternalvariable) lh, &hpacked, hnode); if (!fl) Index: langipc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langipc.c,v retrieving revision 1.6.6.2 retrieving revision 1.6.6.3 diff -C2 -d -r1.6.6.2 -r1.6.6.3 *** langipc.c 14 Feb 2006 11:43:57 -0000 1.6.6.2 --- langipc.c 10 Mar 2006 22:26:57 -0000 1.6.6.3 *************** *** 353,357 **** copydatahandle (&aelist, &hval); #if AEDISPOSAL == 1 ! // possible memleak here #endif #else --- 353,358 ---- copydatahandle (&aelist, &hval); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&aelist); #endif #else *************** *** 1019,1023 **** long ctparams; hdltreenode hlist = nil; ! AEDescList directparam; typaramrecord param; tyvaluerecord val; --- 1020,1024 ---- long ctparams; hdltreenode hlist = nil; ! AEDescList directparam = {typeNull, 0L}; // kw - 2006-02-18 --- AEDISPOSAL typaramrecord param; tyvaluerecord val; *************** *** 1042,1045 **** --- 1043,1050 ---- *hparams = nil; + #if AEDISPOSAL == 1 + // possible memleak here + AEDisposeDesc(&directparam); + #endif return (true); *************** *** 2406,2410 **** fl = setbinarysymbolval (htable, bsname, hcopy, listdesc.descriptorType); #if AEDISPOSAL == 1 ! // possible memleak here #endif --- 2411,2416 ---- fl = setbinarysymbolval (htable, bsname, hcopy, listdesc.descriptorType); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&listdesc); #endif *************** *** 3948,3961 **** bigstring bs; ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! datahandletostring (&desc, bs); ! ! #else ! texthandletostring (desc.dataHandle, bs); ! ! #endif langerrormessage (bs); } --- 3954,3971 ---- bigstring bs; ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! datahandletostring (&desc, bs); ! #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&desc); ! #endif + #else + + texthandletostring (desc.dataHandle, bs); + + #endif + langerrormessage (bs); } *************** *** 4210,4214 **** OSErr err; ! AEDesc desc; tyfastverbcontext savecontext; long curA5; --- 4220,4224 ---- OSErr err; ! AEDesc desc = {typeNull, 0L}; // kw - 2006-02-18 - AEDISPOSAL tyfastverbcontext savecontext; long curA5; *************** *** 4240,4245 **** --- 4250,4261 ---- if (fl) + { + #if AEDISPOSAL == 1 + // possible memleak here + AEDisposeDesc(&desc); + #endif newdescwithhandle (&desc, desc.descriptorType, hcopy); + } disposehandle (hcopy); *************** *** 4322,4326 **** goto exit; #if AEDISPOSAL == 1 ! // possible memleak here #endif } --- 4338,4344 ---- goto exit; #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&desc1); ! AEDisposeDesc(&desc2); #endif } *************** *** 4408,4412 **** copydatahandle (&script, &h); #if AEDISPOSAL == 1 ! // possible memleak here #endif --- 4426,4431 ---- copydatahandle (&script, &h); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&script); #endif Index: langlist.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langlist.c,v retrieving revision 1.7 retrieving revision 1.7.6.1 diff -C2 -d -r1.7 -r1.7.6.1 *** langlist.c 11 Jan 2005 22:48:07 -0000 1.7 --- langlist.c 10 Mar 2006 22:26:57 -0000 1.7.6.1 *************** *** 626,630 **** err = AECoerceDesc (&vdesc, langgettypeid (type), &listdesc); ! if (err != noErr) { --- 626,632 ---- err = AECoerceDesc (&vdesc, langgettypeid (type), &listdesc); ! #if AEDISPOSAL == 1 ! AEDisposeDesc(&vdesc); ! #endif if (err != noErr) { Index: langops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langops.c,v retrieving revision 1.4.6.3 retrieving revision 1.4.6.4 diff -C2 -d -r1.4.6.3 -r1.4.6.4 *** langops.c 14 Feb 2006 11:43:57 -0000 1.4.6.3 --- langops.c 10 Mar 2006 22:26:57 -0000 1.4.6.4 *************** *** 172,179 **** boolean fl = true; int x = type, y = ctvaluetypes; - tytypeinfo z = typeinfo[type]; --- 172,179 ---- boolean fl = true; + // kw - 2006-01 --- debugging stuff int x = type, y = ctvaluetypes; tytypeinfo z = typeinfo[type]; *************** *** 184,190 **** fl = false; } if (x >= 38) { ! x = x * 1; } --- 184,191 ---- fl = false; } + if (x >= 38) { ! x = x * 1; // just for getting a break } Index: langsystypes.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langsystypes.c,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** langsystypes.c 14 Feb 2006 11:43:57 -0000 1.6.2.2 --- langsystypes.c 10 Mar 2006 22:26:57 -0000 1.6.2.3 *************** *** 135,156 **** boolean langcanusealiases (void) { - - #ifdef MACVERSION - - return (langgestaltcheck (gestaltAliasMgrAttr, cantusealiaseserror)); - - #else - - return (false); - - #endif - } /*langcanusealiases*/ ! static boolean findvaluevisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid valfind) { ! return (val.data.longvalue == (long) valfind); //.data.longvalue ! } /*findvaluevisit*/ --- 135,157 ---- boolean langcanusealiases (void) { + #ifdef MACVERSION + return (langgestaltcheck (gestaltAliasMgrAttr, cantusealiaseserror)); + #else + return (false); + #endif + } /*langcanusealiases*/ ! static boolean ! findvaluevisit ( ! bigstring bs, ! hdlhashnode hnode, ! tyvaluerecord val, ! ptrvoid valfind) ! { ! #pragma unused (bs, hnode) return (val.data.longvalue == (long) valfind); //.data.longvalue ! } /*findvaluevisit*/ *************** *** 221,226 **** ! static boolean getostypevalnamevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { ! /* 3.0.2b1 dmb: we now look in all loaded app tables for a match when --- 222,233 ---- ! static boolean ! getostypevalnamevisit ( ! bigstring bsname, ! hdlhashnode hnode, ! tyvaluerecord val, ! ptrvoid refcon) ! { ! #pragma unused (hnode) /* 3.0.2b1 dmb: we now look in all loaded app tables for a match when *************** *** 358,362 **** if (err != noErr) /*no AE coercion to objspec*/ err = AECoerceDesc (&desc, typeAERecord, &coerceddesc); ! if (err != noErr) { /*no AE coercion to record either*/ --- 365,373 ---- if (err != noErr) /*no AE coercion to objspec*/ err = AECoerceDesc (&desc, typeAERecord, &coerceddesc); ! ! #if AEDISPOSAL == 1 ! AEDisposeDesc(&desc); ! #endif ! if (err != noErr) { /*no AE coercion to record either*/ *************** *** 377,380 **** --- 388,396 ---- } } + + #if 0 //AEDISPOSAL == 1 + // kw - 2006-03-04 --- gotta crash with find next + AEDisposeDesc(&coerceddesc); + #endif #endif *************** *** 1280,1292 **** return (err); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! datahandletostring (keydesc, bs); ! ! #else ! ! texthandletostring ((*keydesc).dataHandle, bs); ! ! #endif if (!langexpandtodotparams (bs, &htable, bs)) { --- 1296,1304 ---- return (err); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! datahandletostring (keydesc, bs); ! #else ! texthandletostring ((*keydesc).dataHandle, bs); ! #endif if (!langexpandtodotparams (bs, &htable, bs)) { *************** *** 1319,1348 **** static void setupdescriptor (Handle hdata, AEDesc *desc) { ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! DescType type = typeObjectSpecifier; ! ! if (hdata == nil) ! type = typeNull; ! ! newdescwithhandle (desc, type, hdata); ! ! #else ! ! register AEDesc *d = desc; ! ! (*d).dataHandle = hdata; ! ! if ((*d).dataHandle == nil) ! (*d).descriptorType = typeNull; ! else ! (*d).descriptorType = typeObjectSpecifier; ! ! #endif } /*setupdescriptor*/ ! static OSErr langsystem7parseobject (const AEDesc *object, DescType *class, AEDesc *container, DescType *keyform, AEDesc *keydata) { ! AEDesc objdesc; DescType type; --- 1331,1364 ---- static void setupdescriptor (Handle hdata, AEDesc *desc) { ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! DescType type = typeObjectSpecifier; ! ! if (hdata == nil) ! type = typeNull; ! ! newdescwithhandle (desc, type, hdata); ! ! #else ! register AEDesc *d = desc; ! ! (*d).dataHandle = hdata; ! ! if ((*d).dataHandle == nil) ! (*d).descriptorType = typeNull; ! else ! (*d).descriptorType = typeObjectSpecifier; ! ! #endif } /*setupdescriptor*/ ! static OSErr ! langsystem7parseobject ( ! const AEDesc *object, ! DescType *class, ! AEDesc *container, ! DescType *keyform, ! AEDesc *keydata) ! { AEDesc objdesc; DescType type; *************** *** 1435,1439 **** errcode = langsystem7resolve (&objdesc, &token); ! if (errcode != noErr) return (false); --- 1451,1459 ---- errcode = langsystem7resolve (&objdesc, &token); ! ! #if AEDISPOSAL == 1 ! AEDisposeDesc(&objdesc); ! #endif ! if (errcode != noErr) return (false); *************** *** 1447,1451 **** copydatahandle (&token, &h); #if AEDISPOSAL == 1 ! // possible memleak here #endif if (!setheapvalue (h, stringvaluetype, v)) --- 1467,1472 ---- copydatahandle (&token, &h); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&token); #endif if (!setheapvalue (h, stringvaluetype, v)) *************** *** 1539,1543 **** copydatahandle (&objdesc, &h); #if AEDISPOSAL == 1 ! // possible memleak here #endif return (setheapvalue (h, objspecvaluetype, v)); --- 1560,1565 ---- copydatahandle (&objdesc, &h); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&objdesc); #endif return (setheapvalue (h, objspecvaluetype, v)); *************** *** 1638,1644 **** static boolean getobjspeckeydesc (AEDesc *objdata, OSType desiredkey, AEDesc *keydata) { ! #if TARGET_API_MAC_CARBON == 1 ! // MJL 17/08/05: As of Jaguar the AEDesc datahandle is opaque so use toolbox accessor functions rather ! // than trying to parse the data structure. AEKeyword curKeyWord; OSErr err; --- 1660,1666 ---- static boolean getobjspeckeydesc (AEDesc *objdata, OSType desiredkey, AEDesc *keydata) { ! #if TARGET_API_MAC_CARBON == 1 ! // MJL 17/08/05: As of Jaguar the AEDesc datahandle is opaque so use toolbox accessor functions rather ! // than trying to parse the data structure. AEKeyword curKeyWord; OSErr err; *************** *** 1666,1670 **** return (!oserror (err)); ! #else // #if TARGET_API_MAC_CARBON == 1 register Handle h = (*objdata).dataHandle; --- 1688,1692 ---- return (!oserror (err)); ! #else // #if TARGET_API_MAC_CARBON == 1 register Handle h = (*objdata).dataHandle; *************** *** 1715,1719 **** return (!oserror (err)); ! #endif // #if !TARGET_API_MAC_CARBON == 1 } /*getobjspeckeydesc*/ --- 1737,1741 ---- return (!oserror (err)); ! #endif // #if !TARGET_API_MAC_CARBON == 1 } /*getobjspeckeydesc*/ *************** *** 1792,1796 **** static boolean testtostring (AEDesc *testdata, bigstring bstest) { ! bigstring bs1, bs2; byte bsop [16]; --- 1814,1818 ---- static boolean testtostring (AEDesc *testdata, bigstring bstest) { ! bigstring bs1, bs2; byte bsop [16]; *************** *** 2288,2292 **** if (oserror (AECoerceDesc (&desc, typeObjectSpecifier, obj))) return (false); ! exemptfromtmpstack (v); --- 2310,2316 ---- if (oserror (AECoerceDesc (&desc, typeObjectSpecifier, obj))) return (false); ! #if AEDISPOSAL == 1 ! AEDisposeDesc(&desc); ! #endif exemptfromtmpstack (v); *************** *** 2317,2350 **** } /*switch*/ ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! if (x == nil) ! ! newdescwithhandle (obj, typeNull, x); ! ! else { ! ! exemptfromtmpstack (v); ! ! newdescwithhandle (obj, typeObjectSpecifier, x); ! } /*else*/ ! ! #else ! ! (*obj).dataHandle = x; ! ! ! if (x == nil) { ! ! (*obj).descriptorType = typeNull; /*don't use nulltype here; nil spec is always typeNull*/ ! } ! else { ! ! exemptfromtmpstack (v); ! ! (*obj).descriptorType = typeObjectSpecifier; ! } ! ! #endif return (true); } /*valtoobjspec*/ --- 2341,2362 ---- } /*switch*/ ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! if (x == nil) ! newdescwithhandle (obj, typeNull, x); ! else { ! exemptfromtmpstack (v); ! newdescwithhandle (obj, typeObjectSpecifier, x); ! } /*else*/ ! #else ! (*obj).dataHandle = x; ! ! if (x == nil) { ! (*obj).descriptorType = typeNull; /*don't use nulltype here; nil spec is always typeNull*/ ! } ! else { ! exemptfromtmpstack (v); ! (*obj).descriptorType = typeObjectSpecifier; ! } ! #endif return (true); } /*valtoobjspec*/ *************** *** 2387,2391 **** copydatahandle (&objectdesc, &h); #if AEDISPOSAL == 1 ! // possible memleak here #endif --- 2399,2404 ---- copydatahandle (&objectdesc, &h); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&objectdesc); #endif *************** *** 2496,2500 **** copydatahandle (&objspecdesc, &h); #if AEDISPOSAL == 1 ! // possible memleak here #endif return (setheapvalue (h, objspecvaluetype, val)); --- 2509,2514 ---- copydatahandle (&objspecdesc, &h); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&objspecdesc); #endif return (setheapvalue (h, objspecvaluetype, val)); *************** *** 2593,2611 **** if (!createpropertyspecifier (&containerdesc, propkey, objectdesc)) return (false); - - if (fltmp) - - #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ - - releaseheaptmp (hcopy); ! #else ! ! releaseheaptmp (containerdesc.dataHandle); ! ! #endif ! return (true); ! } /*evaluateproperty*/ --- 2607,2624 ---- if (!createpropertyspecifier (&containerdesc, propkey, objectdesc)) return (false); ! #if AEDISPOSAL == 1 ! AEDisposeDesc(&containerdesc); ! #endif ! if (fltmp) ! { ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! releaseheaptmp (hcopy); ! #else ! releaseheaptmp (containerdesc.dataHandle); ! #endif ! } return (true); ! } /*evaluateproperty*/ *************** *** 2746,2750 **** copydatahandle (&objectdesc, &hcopy); #if AEDISPOSAL == 1 ! // possible memleak here #endif pushtmpstack (hcopy); --- 2759,2764 ---- copydatahandle (&objectdesc, &hcopy); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&objectdesc); #endif pushtmpstack (hcopy); *************** *** 2760,2773 **** errcode = CreateCompDescriptor (operator, &objectdesc, &valdesc, false, keydatadesc); - - #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! releaseheaptmp (hcopy); ! ! #else ! ! releaseheaptmp (objectdesc.dataHandle); /*keep tmpstack cleared out*/ ! ! #endif AEDisposeDesc (&valdesc); --- 2774,2783 ---- errcode = CreateCompDescriptor (operator, &objectdesc, &valdesc, false, keydatadesc); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! releaseheaptmp (hcopy); ! #else ! releaseheaptmp (objectdesc.dataHandle); /*keep tmpstack cleared out*/ ! #endif AEDisposeDesc (&valdesc); *************** *** 2780,2785 **** ! static boolean evaluatelogical (hdltreenode hcomp1, tytreetype op1, hdltreenode hcomp2, tytreetype op2, DescType operator, AEDesc *keydatadesc) { ! AEDesc compdesc1, compdesc2; AEDesc listdesc; --- 2790,2802 ---- ! static boolean ! evaluatelogical ( ! hdltreenode hcomp1, ! tytreetype op1, ! hdltreenode hcomp2, ! tytreetype op2, ! DescType operator, ! AEDesc *keydatadesc) ! { AEDesc compdesc1, compdesc2; AEDesc listdesc; *************** *** 2917,2930 **** if (!evaluatesimplekey (h, &keyform, &keydatadesc)) return (false); ! ! #if TARGET_API_MAC_CARBON == 1 ! ! nildatahandle (&containerdesc); ! ! #else ! ! containerdesc.dataHandle = nil; ! ! #endif containerdesc.descriptorType = typeCurrentContainer; --- 2934,2943 ---- if (!evaluatesimplekey (h, &keyform, &keydatadesc)) return (false); ! ! #if TARGET_API_MAC_CARBON == 1 ! nildatahandle (&containerdesc); ! #else ! containerdesc.dataHandle = nil; ! #endif containerdesc.descriptorType = typeCurrentContainer; *************** *** 2953,2957 **** errcode = CreateRangeDescriptor (&rangedesc1, &rangedesc2, true, keydatadesc); ! return (!oserror (errcode)); } /*evaluaterange*/ --- 2966,2973 ---- errcode = CreateRangeDescriptor (&rangedesc1, &rangedesc2, true, keydatadesc); ! #if AEDISPOSAL == 1 ! AEDisposeDesc(&rangedesc1); ! AEDisposeDesc(&rangedesc2); ! #endif return (!oserror (errcode)); } /*evaluaterange*/ *************** *** 3018,3022 **** #if AEDISPOSAL == 1 ! // possible memleak here #endif #else --- 3034,3039 ---- #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&containerdesc); #endif #else *************** *** 3040,3044 **** pushtmpstack (hcopy); #if AEDISPOSAL == 1 ! // possible memleak here #endif #else --- 3057,3062 ---- pushtmpstack (hcopy); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&containerdesc); #endif #else *************** *** 3104,3119 **** errcode = CreateObjSpecifier (class, &containerdesc, keyform, &keydatadesc, false, objectdesc); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! if (fltmp) ! releaseheaptmp (hcopy); ! ! #else ! ! if (fltmp) ! releaseheaptmp (containerdesc.dataHandle); ! ! #endif ! AEDisposeDesc (&keydatadesc); --- 3122,3137 ---- errcode = CreateObjSpecifier (class, &containerdesc, keyform, &keydatadesc, false, objectdesc); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! if (fltmp) ! releaseheaptmp (hcopy); ! ! #else ! ! if (fltmp) ! releaseheaptmp (containerdesc.dataHandle); ! ! #endif ! AEDisposeDesc (&keydatadesc); *************** *** 3206,3210 **** copydatahandle (&objectdesc, &h); #if AEDISPOSAL == 1 ! // possible memleak here #endif --- 3224,3229 ---- copydatahandle (&objectdesc, &h); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&objectdesc); #endif Index: osacomponent.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osacomponent.c,v retrieving revision 1.7.6.2 retrieving revision 1.7.6.3 diff -C2 -d -r1.7.6.2 -r1.7.6.3 *** osacomponent.c 14 Feb 2006 11:43:57 -0000 1.7.6.2 --- osacomponent.c 10 Mar 2006 22:26:57 -0000 1.7.6.3 *************** *** 1267,1271 **** DebugStr ("\punexpected coercion"); ! #endif stylerecord.ctstyles = 1; --- 1267,1271 ---- DebugStr ("\punexpected coercion"); ! #endif stylerecord.ctstyles = 1; *************** *** 1324,1348 **** OSErr err; ! #if !TARGET_API_MAC_CARBON long curA5 = SetUpAppA5 (); ! #endif ! ! #ifdef fldebug ! if ((*desc).descriptorType != typeType) ! DebugStr ("\punexpected coercion"); ! #endif ! ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! newdescnull (&containerdesc, typeNull); ! #else ! containerdesc.descriptorType = typeNull; ! containerdesc.dataHandle = nil; ! #endif ! err = CreateObjSpecifier (cProperty, &containerdesc, formPropertyID, desc, false, result); ! ! #if !TARGET_API_MAC_CARBON RestoreA5 (curA5); ! #endif return (err); --- 1324,1348 ---- OSErr err; ! #if !TARGET_API_MAC_CARBON long curA5 = SetUpAppA5 (); ! #endif ! ! #ifdef fldebug ! if ((*desc).descriptorType != typeType) ! DebugStr ("\punexpected coercion"); ! #endif ! ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! newdescnull (&containerdesc, typeNull); ! #else ! containerdesc.descriptorType = typeNull; ! containerdesc.dataHandle = nil; ! #endif ! err = CreateObjSpecifier (cProperty, &containerdesc, formPropertyID, desc, false, result); ! ! #if !TARGET_API_MAC_CARBON RestoreA5 (curA5); ! #endif return (err); *************** *** 1841,1849 **** appA5 = SetUpCurA5 (); // SetUpThisA5 (clienta5); // 4.0b5: was: SetUpCurA5 (); ! #if TARGET_API_MAC_CARBON == 1 ! err = InvokeOSASendUPP (event, reply, mode, priority, timeout, nil, nil, (**hcg).sendprocrefcon, sendproc); ! #else ! err = CallOSASendProc (sendproc, event, reply, mode, priority, timeout, nil, nil, (**hcg).sendprocrefcon); ! #endif RestoreA5 (appA5); --- 1841,1849 ---- appA5 = SetUpCurA5 (); // SetUpThisA5 (clienta5); // 4.0b5: was: SetUpCurA5 (); ! #if TARGET_API_MAC_CARBON == 1 ! err = InvokeOSASendUPP (event, reply, mode, priority, timeout, nil, nil, (**hcg).sendprocrefcon, sendproc); ! #else ! err = CallOSASendProc (sendproc, event, reply, mode, priority, timeout, nil, nil, (**hcg).sendprocrefcon); ! #endif RestoreA5 (appA5); *************** *** 1852,1860 **** osainstallpatch (hcg); /*repatch*/ ! #if TARGET_API_MAC_CARBON == 1 ! LMSetApplZone(origzone); ! #else ! SetZone (origzone); ! #endif osapushfastcontext (hcg); --- 1852,1860 ---- osainstallpatch (hcg); /*repatch*/ ! #if TARGET_API_MAC_CARBON == 1 ! LMSetApplZone(origzone); ! #else ! SetZone (origzone); ! #endif osapushfastcontext (hcg); *************** *** 2648,2657 **** } ! #if TARGET_API_MAC_CARBON == 1 ! fl = newdescwithhandle (&desc, descType, hpacked); ! #else ! desc.dataHandle = hpacked; ! desc.descriptorType = descType; ! #endif *resultingScriptData = desc; --- 2648,2657 ---- } ! #if TARGET_API_MAC_CARBON == 1 ! fl = newdescwithhandle (&desc, descType, hpacked); ! #else ! desc.dataHandle = hpacked; ! desc.descriptorType = descType; ! #endif *resultingScriptData = desc; *************** *** 2950,2964 **** return (errAECoercionFail); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! if (!copydatahandle ((AEDesc*) sourceData, &htext)) /*don't let langbuildtree consume caller's text*/ ! return (memFullErr); ! ! #else ! ! if (!copyhandle ((*sourceData).dataHandle, &htext)) /*don't let langbuildtree consume caller's text*/ ! return (memFullErr); ! ! #endif if (!langbuildtree (htext, false, &hcode)) /*syntax error*/ --- 2950,2960 ---- return (errAECoercionFail); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! if (!copydatahandle ((AEDesc*) sourceData, &htext)) /*don't let langbuildtree consume caller's text*/ ! return (memFullErr); ! #else ! if (!copyhandle ((*sourceData).dataHandle, &htext)) /*don't let langbuildtree consume caller's text*/ ! return (memFullErr); ! #endif if (!langbuildtree (htext, false, &hcode)) /*syntax error*/ *************** *** 3104,3140 **** val.valuetype = externalvaluetype; ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! { Handle h; ! copydatahandle (&desc, &h); ! fl = langexternalmemoryunpack (h, (hdlexternalhandle *) &val.data.externalvalue); ! disposehandle (h); ! } ! #else ! fl = langexternalmemoryunpack (desc.dataHandle, (hdlexternalhandle *) &val.data.externalvalue); ! #endif ! AEDisposeDesc (&desc); ! if (!fl) goto error; ! } else { ! if (!setdescriptorvalue (desc, &val)) goto error; ! } ! if (!addstorageval (hglobals, &val, resultingScriptID)) goto error; ! return (noErr); ! ! error: ! return (osageterror ()); ! } /*osaCoerceFromDesc*/ --- 3100,3136 ---- val.valuetype = externalvaluetype; ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! { Handle h; ! copydatahandle (&desc, &h); ! fl = langexternalmemoryunpack (h, (hdlexternalhandle *) &val.data.externalvalue); ! disposehandle (h); ! } ! #else ! fl = langexternalmemoryunpack (desc.dataHandle, (hdlexternalhandle *) &val.data.externalvalue); ! #endif ! AEDisposeDesc (&desc); ! if (!fl) goto error; ! } else { ! if (!setdescriptorvalue (desc, &val)) goto error; ! } ! if (!addstorageval (hglobals, &val, resultingScriptID)) goto error; ! return (noErr); ! ! error: ! return (osageterror ()); ! } /*osaCoerceFromDesc*/ *************** *** 3222,3231 **** // kw -2006-01-28 --- typo, was "degug" #ifdef fldebug - if ((*desc).descriptorType != typeInsertionLoc) DebugStr ("\punexpected coercion"); ! ! #endif ! err = AECoerceDesc (desc, typeAERecord, &rec); --- 3218,3225 ---- // kw -2006-01-28 --- typo, was "degug" #ifdef fldebug if ((*desc).descriptorType != typeInsertionLoc) DebugStr ("\punexpected coercion"); ! #endif ! err = AECoerceDesc (desc, typeAERecord, &rec); *************** *** 3303,3313 **** #if TARGET_RT_MAC_CFM || TARGET_RT_MAC_MACHO ! #if TARGET_API_MAC_CARBON ! AECoercionHandlerUPP coerceInsltoTEXTDesc; - - #define coerceInsltoTEXTUPP (coerceInsltoTEXTDesc); ! #else static RoutineDescriptor coerceInsltoTEXTDesc = BUILD_ROUTINE_DESCRIPTOR (uppAECoerceDescProcInfo, coerceInsltoTEXT); --- 3297,3306 ---- #if TARGET_RT_MAC_CFM || TARGET_RT_MAC_MACHO ! #if TARGET_API_MAC_CARBON AECoercionHandlerUPP coerceInsltoTEXTDesc; ! #define coerceInsltoTEXTUPP (coerceInsltoTEXTDesc); ! ! #else static RoutineDescriptor coerceInsltoTEXTDesc = BUILD_ROUTINE_DESCRIPTOR (uppAECoerceDescProcInfo, coerceInsltoTEXT); *************** *** 3505,3509 **** if (!setdescriptorvalue (desc, &val)) return (getoserror ()); ! getobjectmodeldisplaystring (&val, bsval); --- 3498,3506 ---- if (!setdescriptorvalue (desc, &val)) return (getoserror ()); ! ! #if AEDISPOSAL == 1 ! AEDisposeDesc(&desc); ! #endif ! getobjectmodeldisplaystring (&val, bsval); *************** *** 3608,3640 **** Handle haete; ! #if !TARGET_API_MAC_CARBON ! long curA5 = SetUpAppA5 (); ! #endif ! err = landsystem7getsenderinfo (event, &psn, &fs, &signature); ! if (err != noErr) { ! ! #if !TARGET_API_MAC_CARBON ! RestoreA5 (curA5); ! #endif ! return (err); ! } ! osapushfastcontext (hcg); ! ! #if TARGET_API_MAC_CARBON ! coerceInsltoTEXTDesc = NewAECoerceDescUPP(coerceInsltoTEXT); ! AEInstallCoercionHandler (typeInsertionLoc, typeObjectSpecifier, coerceInsltoTEXTDesc, 0, true, false); ! #else ! AEInstallCoercionHandler (typeInsertionLoc, typeObjectSpecifier, coerceInsltoTEXTUPP, 0, true, false); ! #endif ! ! #if TARGET_API_MAC_CARBON == 1 ! LMSetApplZone(homezone); ! #else ! SetZone (homezone); ! #endif if (signature == (**hcg).recordingstate.lastappid) --- 3605,3636 ---- Handle haete; ! #if !TARGET_API_MAC_CARBON ! long curA5 = SetUpAppA5 (); ! #endif ! err = landsystem7getsenderinfo (event, &psn, &fs, &signature); ! if (err != noErr) { ! #if !TARGET_API_MAC_CARBON ! RestoreA5 (curA5); ! #endif ! return (err); ! } ! osapushfastcontext (hcg); ! ! #if TARGET_API_MAC_CARBON ! coerceInsltoTEXTDesc = NewAECoerceDescUPP(coerceInsltoTEXT); ! AEInstallCoercionHandler (typeInsertionLoc, typeObjectSpecifier, coerceInsltoTEXTDesc, 0, true, false); ! #else ! AEInstallCoercionHandler (typeInsertionLoc, typeObjectSpecifier, coerceInsltoTEXTUPP, 0, true, false); ! #endif ! ! #if TARGET_API_MAC_CARBON == 1 ! LMSetApplZone(homezone); ! #else ! SetZone (homezone); ! #endif if (signature == (**hcg).recordingstate.lastappid) *************** *** 3740,3749 **** if (err == noErr) { ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! datahandletostring (&desc, bs); ! #else ! texthandletostring (desc.dataHandle, bs); ! #endif ! insertstring ("\p\tÇ", bs); --- 3736,3744 ---- if (err == noErr) { ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! datahandletostring (&desc, bs); ! #else ! texthandletostring (desc.dataHandle, bs); ! #endif insertstring ("\p\tÇ", bs); *************** *** 4297,4334 **** return (true); ! error: ! ! #if version42orgreater ! ! if (osageterror () == errAEEventNotHandled) { // verb not handled by context ! ! /***this is where the ResumeDispatchProc should be invoked*/ ! ! register hdlcomponentglobals hcg = osaglobals; ! hdllandglobals hg = landgetglobals (); // get global verb handler ! GNEUPP origproc; ! boolean fl; ! ! origproc = osainstallpatch (hcg); ! ! #if TARGET_API_MAC_CARBON == 1 ! LMSetApplZone(homezone); ! #else ! SetZone (homezone); ! #endif ! fl = (*(**hg).handleverbroutine) (hverb); ! ! getverbresult (hverb, vresult); ! ! osasetclientzone (hcg); ! ! osaremovepatch (hcg, origproc); ! ! return (fl); ! } ! #endif ! ! return (false); ! } /*osahandleevent*/ --- 4292,4327 ---- return (true); ! error: ! ! #if version42orgreater ! if (osageterror () == errAEEventNotHandled) { // verb not handled by context ! ! /***this is where the ResumeDispatchProc should be invoked*/ ! ! register hdlcomponentglobals hcg = osaglobals; ! hdllandglobals hg = landgetglobals (); // get global verb handler ! GNEUPP origproc; ! boolean fl; ! ! origproc = osainstallpatch (hcg); ! ! #if TARGET_API_MAC_CARBON == 1 ! LMSetApplZone(homezone); ! #else ! SetZone (homezone); ! #endif ! fl = (*(**hg).handleverbroutine) (hverb); ! ! getverbresult (hverb, vresult); ! ! osasetclientzone (hcg); ! ! osaremovepatch (hcg, origproc); ! ! return (fl); ! } ! #endif ! return (false); ! } /*osahandleevent*/ *************** *** 4407,4462 **** langipcpushparam (&vresult, returnedvaluekey, hverb); ! exit: { ! landdisposeverb (hverb); ! if (!fl) { ! AEDesc desc; OSAError err = osageterror (); ! if (err == errOSAScriptError) { ! err = errOSAGeneralError; ! if (osaScriptError (hcg, kOSAErrorMessage, typeChar, &desc) == noErr) { ! AEPutKeyDesc (reply, keyErrorString, &desc); ! AEDisposeDesc (&desc); ! } ! ! if (osaScriptError (hcg, kOSAErrorNumber, typeShortInteger, &desc) == noErr) { ! ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! { Handle h; ! copydatahandle (&desc, &h); ! err = numberfromhandle (h); ! disposehandle (h); ! } ! ! #else ! ! err = numberfromhandle (desc.dataHandle); ! ! #endif ! AEPutKeyDesc (reply, keyErrorNumber, &desc); ! AEDisposeDesc (&desc); - } } - - return (err); } ! ! return (noErr); } ! } /*osaDoEvent*/ --- 4400,4449 ---- langipcpushparam (&vresult, returnedvaluekey, hverb); ! exit: ! { landdisposeverb (hverb); ! if (!fl) { ! AEDesc desc; OSAError err = osageterror (); ! if (err == errOSAScriptError) { ! err = errOSAGeneralError; ! if (osaScriptError (hcg, kOSAErrorMessage, typeChar, &desc) == noErr) { ! AEPutKeyDesc (reply, keyErrorString, &desc); ! AEDisposeDesc (&desc); ! } ! ! if (osaScriptError (hcg, kOSAErrorNumber, typeShortInteger, &desc) == noErr) ! { ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! { Handle h; ! copydatahandle (&desc, &h); ! err = numberfromhandle (h); ! disposehandle (h); ! } ! #else ! err = numberfromhandle (desc.dataHandle); ! #endif AEPutKeyDesc (reply, keyErrorNumber, &desc); ! AEDisposeDesc (&desc); } } ! return (err); } ! ! return (noErr); ! } ! } /*osaDoEvent*/ *************** *** 4520,4548 **** break; } ! ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! datahandletostring ((AEDesc*) selectorData, bs); ! ! #else ! ! texthandletostring ((*selectorData).dataHandle, bs); ! ! #endif ! if (!langgetsymbolval (bs, &val, &hnode)) { ! err = errOSAScriptError; ! break; ! } ! if (!copyvaluerecord (val, &val)) { ! err = memFullErr; ! break; } ! /* if (!coercetobinary (&val)) { --- 4507,4531 ---- break; } ! ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! datahandletostring ((AEDesc*) selectorData, bs); ! #else ! texthandletostring ((*selectorData).dataHandle, bs); ! #endif ! if (!langgetsymbolval (bs, &val, &hnode)) { ! err = errOSAScriptError; ! break; ! } ! if (!copyvaluerecord (val, &val)) { ! err = memFullErr; ! break; } ! /* if (!coercetobinary (&val)) { *************** *** 4555,4565 **** binarytodesc (val.data.binaryvalue, resultingDebugInfoOrDataToSet); */ ! if (!valuetodescriptor (&val, resultingDebugInfoOrDataToSet)) err = memFullErr; ! break; ! } ! default: return (errOSABadSelector); --- 4538,4548 ---- binarytodesc (val.data.binaryvalue, resultingDebugInfoOrDataToSet); */ ! if (!valuetodescriptor (&val, resultingDebugInfoOrDataToSet)) err = memFullErr; ! break; ! } ! default: return (errOSABadSelector); *************** *** 4663,4674 **** //Code change by Timothy Paustian Monday, June 26, 2000 9:38:15 PM // ! #if TARGET_API_MAC_CARBON == 1 ! CGrafPtr saveport; ! saveport = GetQDGlobalsThePort(); ! #else ! GrafPtr saveport; ! saveport = quickdrawglobal (thePort); ! #endif ! osapushfastcontext (hcg); --- 4646,4657 ---- //Code change by Timothy Paustian Monday, June 26, 2000 9:38:15 PM // ! #if TARGET_API_MAC_CARBON == 1 ! CGrafPtr saveport; ! saveport = GetQDGlobalsThePort(); ! #else ! GrafPtr saveport; ! saveport = quickdrawglobal (thePort); ! #endif ! osapushfastcontext (hcg); *************** *** 4708,4723 **** //Code change by Timothy Paustian Monday, June 26, 2000 9:37:17 PM // ! { ! #if TARGET_API_MAC_CARBON == 1 ! CGrafPtr thePort; ! thePort = GetQDGlobalsThePort(); ! #else ! GrafPtr thePort; ! thePort = quickdrawglobal (thePort); ! #endif ! if (thePort != saveport) SetPort (saveport); ! } return (result); --- 4691,4706 ---- //Code change by Timothy Paustian Monday, June 26, 2000 9:37:17 PM // ! { ! #if TARGET_API_MAC_CARBON == 1 ! CGrafPtr thePort; ! thePort = GetQDGlobalsThePort(); ! #else ! GrafPtr thePort; ! thePort = quickdrawglobal (thePort); ! #endif ! if (thePort != saveport) SetPort (saveport); ! } return (result); *************** *** 4729,4742 **** ComponentResult result = noErr; short what = (*params).what; - - #if TARGET_API_MAC_CARBON ! hdlcomponentglobals theGlobals = nil; ! if(what != kComponentOpenSelect) //else we create the globals ! theGlobals = (hdlcomponentglobals)storage; - #endif - if (what < 0) { /*negative selectors are component manager calls*/ --- 4712,4723 ---- ComponentResult result = noErr; short what = (*params).what; ! #if TARGET_API_MAC_CARBON ! hdlcomponentglobals theGlobals = nil; ! if(what != kComponentOpenSelect) //else we create the globals ! theGlobals = (hdlcomponentglobals)storage; ! #endif if (what < 0) { /*negative selectors are component manager calls*/ Index: langhtml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langhtml.c,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** langhtml.c 14 Feb 2006 11:43:57 -0000 1.8.2.1 --- langhtml.c 10 Mar 2006 22:26:57 -0000 1.8.2.2 *************** *** 557,561 **** copydatahandle (&result, hresult); #if AEDISPOSAL == 1 ! // possible memleak here #endif --- 557,562 ---- copydatahandle (&result, hresult); #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&result); #endif |
