Menu
▾
▴
frontierkernel-commits — Mailing list for Subversion commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(447) |
Nov
(163) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(172) |
Feb
|
Mar
(123) |
Apr
(64) |
May
(1) |
Jun
(278) |
Jul
(89) |
Aug
(97) |
Sep
(62) |
Oct
(53) |
Nov
(119) |
Dec
(60) |
| 2006 |
Jan
(76) |
Feb
(1094) |
Mar
(363) |
Apr
(163) |
May
(57) |
Jun
(43) |
Jul
(39) |
Aug
(15) |
Sep
(33) |
Oct
(62) |
Nov
(8) |
Dec
|
| 2007 |
Jan
(9) |
Feb
(34) |
Mar
(2) |
Apr
(14) |
May
(8) |
Jun
(40) |
Jul
(21) |
Aug
(1) |
Sep
(20) |
Oct
(15) |
Nov
(26) |
Dec
|
| 2008 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(32) |
Jun
|
Jul
|
Aug
(3) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Andre R. <and...@us...> - 2004-10-28 23:04:34
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1903/Frontier/Common/headers Modified Files: shellprivate.h Log Message: Eliminated GCC compiler warnings. Index: shellprivate.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellprivate.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shellprivate.h 9 Oct 2004 21:09:30 -0000 1.1 --- shellprivate.h 28 Oct 2004 23:04:13 -0000 1.2 *************** *** 121,125 **** ! /* 5.0a5 dmb - no longer needed: extern void shellsetscrollbarinfo (void); /*shellops.c*/ --- 121,125 ---- ! /* 5.0a5 dmb - no longer needed: extern void shellsetscrollbarinfo (void); /%shellops.c*/ |
|
From: Andre R. <and...@us...> - 2004-10-28 23:03:54
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1741/Frontier/Common/headers Modified Files: wpengine.h Log Message: Eliminated GCC compiler warnings. Index: wpengine.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/wpengine.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wpengine.h 9 Oct 2004 21:12:47 -0000 1.1 --- wpengine.h 28 Oct 2004 23:03:43 -0000 1.2 *************** *** 73,79 **** typedef TrackClickProcPtr TrackClickUPP; ! //this ain't used. ! //#define NewTrackClickProc(userRoutine) \ ! // ((TrackClickUPP) (userRoutine)) #define CallTrackClickProc(userRoutine, wp, pt) \ --- 73,80 ---- typedef TrackClickProcPtr TrackClickUPP; ! /*this ain't used. ! #define NewTrackClickProc(userRoutine) \ ! ((TrackClickUPP) (userRoutine)) ! */ #define CallTrackClickProc(userRoutine, wp, pt) \ |
|
From: Andre R. <and...@us...> - 2004-10-28 23:01:36
|
Update of /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1028/Frontier/Common/UserLandIACToolkit Modified Files: landinternal.h Log Message: Eliminated GCC compiler warnings. Index: landinternal.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landinternal.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** landinternal.h 9 Oct 2004 06:13:43 -0000 1.1 --- landinternal.h 28 Oct 2004 23:01:26 -0000 1.2 *************** *** 122,126 **** ! extern landdisposeallparams (hdlverbrecord); /*land.c*/ extern boolean landhandleverb (hdlverbrecord); --- 122,126 ---- ! //extern landdisposeallparams (hdlverbrecord); /*land.c*/ extern boolean landhandleverb (hdlverbrecord); *************** *** 291,295 **** extern boolean landstatswindowisopen (void); ! extern landsetmemstats (void); extern boolean landwindoweventfilter (EventRecord *); --- 291,295 ---- extern boolean landstatswindowisopen (void); ! // extern landsetmemstats (void); extern boolean landwindoweventfilter (EventRecord *); |
|
From: Andre R. <and...@us...> - 2004-10-28 23:00:27
|
Update of /cvsroot/frontierkernel/Frontier/Common/SystemHeaders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv554/Frontier/Common/SystemHeaders Modified Files: land.h Log Message: Eliminated GCC compiler warnings., Index: land.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/land.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** land.h 24 Oct 2004 17:10:56 -0000 1.2 --- land.h 28 Oct 2004 23:00:16 -0000 1.3 *************** *** 435,439 **** landeventrecordcallback breakembraceroutine; /*if non-nil, break a synchronous deadly embrace*/ ! /*landcallback menuscriptcompleteroutine; /*if non-nil, callback when script completes*/ /*names that begin with "mac" are inherently NOT cross-platform*/ --- 435,439 ---- landeventrecordcallback breakembraceroutine; /*if non-nil, break a synchronous deadly embrace*/ ! /*landcallback menuscriptcompleteroutine; /%if non-nil, callback when script completes*/ /*names that begin with "mac" are inherently NOT cross-platform*/ *************** *** 471,475 **** short maxqueuedepth; /*for stats window -- the longest chain in the system 6 queue*/ ! /*Handle mactypes; /*for system 7, maps our param types to Apple's*/ long initialfreemem; /*for stats window -- the amount of memory free after landinit*/ --- 471,475 ---- short maxqueuedepth; /*for stats window -- the longest chain in the system 6 queue*/ ! /*Handle mactypes; /%for system 7, maps our param types to Apple's*/ long initialfreemem; /*for stats window -- the amount of memory free after landinit*/ |
|
From: Andre R. <and...@us...> - 2004-10-28 22:59:30
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32748/Frontier/Common/headers Modified Files: file.h Log Message: Eliminated GCC compiler warnings. Index: file.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/file.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** file.h 9 Oct 2004 20:54:44 -0000 1.1 --- file.h 28 Oct 2004 22:59:21 -0000 1.2 *************** *** 438,442 **** ! extern filecheckdefaultpath (bigstring); /*fileverbs.c*/ extern boolean filegetprogramversion (bigstring); --- 438,442 ---- ! //extern filecheckdefaultpath (bigstring); /*fileverbs.c*/ extern boolean filegetprogramversion (bigstring); |
|
From: Andre R. <and...@us...> - 2004-10-28 22:58:51
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32457/Frontier/Common/headers Modified Files: command.h Log Message: Eliminated GCC compiler warnings. Index: command.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/command.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** command.h 9 Oct 2004 20:53:31 -0000 1.1 --- command.h 28 Oct 2004 22:58:40 -0000 1.2 *************** *** 29,35 **** /*prototypes*/ ! extern cmdprocessstarted (void) ; ! extern cmdprocesskilled (void); extern boolean startcmddialog (void); --- 29,35 ---- /*prototypes*/ ! //extern cmdprocessstarted (void) ; ! //extern cmdprocesskilled (void); extern boolean startcmddialog (void); |
|
From: Andre R. <and...@us...> - 2004-10-28 22:32:29
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24660/Frontier/Common/headers Modified Files: strings.h Log Message: Moved latintomactable and mactolatintable from strings.h to stringverbs.c since that's the only place where they are actually needed. Index: strings.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/strings.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** strings.h 28 Oct 2004 01:51:21 -0000 1.3 --- strings.h 28 Oct 2004 22:32:16 -0000 1.4 *************** *** 44,189 **** extern unsigned char lowercasetable[256]; - - /*Latin to Mac conversion table: 7.0b28 PBS*/ - - static unsigned char latintomactable [] = { - - 0, 1, 2, 3, - 4, 5, 6, 7, - 8, 9, 10, 11, - 12, 13, 14, 15, - 16, 17, 18, 19, - 20, 21, 22, 23, - 24, 25, 26, 27, - 28, 29, 30, 31, - 32, 33, 34, 35, - 36, 37, 38, 39, - 40, 41, 42, 43, - 44, 45, 46, 47, - 48, 49, 50, 51, - 52, 53, 54, 55, - 56, 57, 58, 59, - 60, 61, 62, 63, - 64, 65, 66, 67, - 68, 69, 70, 71, - 72, 73, 74, 75, - 76, 77, 78, 79, - 80, 81, 82, 83, - 84, 85, 86, 87, - 88, 89, 90, 91, - 92, 93, 94, 95, - 96, 97, 98, 99, - 100, 101, 102, 103, - 104, 105, 106, 107, - 108, 109, 110, 111, - 112, 113, 114, 115, - 116, 117, 118, 119, - 120, 121, 122, 123, - 124, 125, 126, 127, - 165, 170, 173, 176, - 179, 183, 186, 189, - 195, 197, 201, 209, - 212, 217, 218, 182, - 198, 206, 226, 227, - 228, 240, 246, 247, - 249, 250, 251, 253, - 254, 255, 245, 196, - 202, 193, 162, 163, - 219, 180, 207, 164, - 172, 169, 187, 199, - 194, 208, 168, 248, - 161, 177, 211, 210, - 171, 181, 166, 225, - 252, 213, 188, 200, - 185, 184, 178, 192, - 203, 231, 229, 204, - 128, 129, 174, 130, - 233, 131, 230, 232, - 237, 234, 235, 236, - 220, 132, 241, 238, - 239, 205, 133, 215, - 175, 244, 242, 243, - 134, 160, 222, 167, - 136, 135, 137, 139, - 138, 140, 190, 141, - 143, 142, 144, 145, - 147, 146, 148, 149, - 221, 150, 152, 151, - 153, 155, 154, 214, - 191, 157, 156, 158, - 159, 224, 223, 216 - }; - - /*Mac to Latin conversion table: 7.0b35 PBS*/ - - static unsigned char mactolatintable [] = { - - 0, 1, 2, 3, - 4, 5, 6, 7, - 8, 9, 10, 11, - 12, 13, 14, 15, - 16, 17, 18, 19, - 20, 21, 22, 23, - 24, 25, 26, 27, - 28, 29, 30, 31, - 32, 33, 34, 35, - 36, 37, 38, 39, - 40, 41, 42, 43, - 44, 45, 46, 47, - 48, 49, 50, 51, - 52, 53, 54, 55, - 56, 57, 58, 59, - 60, 61, 62, 63, - 64, 65, 66, 67, - 68, 69, 70, 71, - 72, 73, 74, 75, - 76, 77, 78, 79, - 80, 81, 82, 83, - 84, 85, 86, 87, - 88, 89, 90, 91, - 92, 93, 94, 95, - 96, 97, 98, 99, - 100, 101, 102, 103, - 104, 105, 106, 107, - 108, 109, 110, 111, - 112, 113, 114, 115, - 116, 117, 118, 119, - 120, 121, 122, 123, - 124, 125, 126, 127, - 196, 197, 199, 201, - 209, 214, 220, 225, - 224, 226, 228, 227, - 229, 231, 233, 232, - 234, 235, 237, 236, - 238, 239, 241, 243, - 242, 244, 246, 245, - 250, 249, 251, 252, - 221, 176, 162, 163, - 167, 128, 182, 223, - 174, 169, 129, 180, - 168, 130, 198, 216, - 131, 177, 190, 132, - 165, 181, 143, 133, - 189, 188, 134, 170, - 186, 135, 230, 248, - 191, 161, 172, 136, - 159, 137, 144, 171, - 187, 138, 160, 192, - 195, 213, 145, 166, - 173, 139, 179, 178, - 140, 185, 247, 215, - 255, 141, 142, 164, - 208, 240, 222, 254, - 253, 183, 146, 147, - 148, 194, 202, 193, - 203, 200, 205, 206, - 207, 204, 211, 212, - 149, 210, 218, 219, - 217, 158, 150, 151, - 175, 152, 153, 154, - 184, 155, 156, 157 - }; - - /*prototypes*/ --- 44,47 ---- |
|
From: Andre R. <and...@us...> - 2004-10-28 22:30:55
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24343/Frontier/Common/source Modified Files: stringverbs.c Log Message: Moved latintomactable and mactolatintable from strings.h to stringverbs.c since that's the only place where they are actually needed. Index: stringverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/stringverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stringverbs.c 23 Oct 2004 22:59:03 -0000 1.2 --- stringverbs.c 28 Oct 2004 22:30:43 -0000 1.3 *************** *** 46,49 **** --- 46,192 ---- + /*Latin to Mac conversion table: 7.0b28 PBS*/ + /* moved to stringverbs.c: 2004-10-28 aradke */ + + static unsigned char latintomactable [] = { + + 0, 1, 2, 3, + 4, 5, 6, 7, + 8, 9, 10, 11, + 12, 13, 14, 15, + 16, 17, 18, 19, + 20, 21, 22, 23, + 24, 25, 26, 27, + 28, 29, 30, 31, + 32, 33, 34, 35, + 36, 37, 38, 39, + 40, 41, 42, 43, + 44, 45, 46, 47, + 48, 49, 50, 51, + 52, 53, 54, 55, + 56, 57, 58, 59, + 60, 61, 62, 63, + 64, 65, 66, 67, + 68, 69, 70, 71, + 72, 73, 74, 75, + 76, 77, 78, 79, + 80, 81, 82, 83, + 84, 85, 86, 87, + 88, 89, 90, 91, + 92, 93, 94, 95, + 96, 97, 98, 99, + 100, 101, 102, 103, + 104, 105, 106, 107, + 108, 109, 110, 111, + 112, 113, 114, 115, + 116, 117, 118, 119, + 120, 121, 122, 123, + 124, 125, 126, 127, + 165, 170, 173, 176, + 179, 183, 186, 189, + 195, 197, 201, 209, + 212, 217, 218, 182, + 198, 206, 226, 227, + 228, 240, 246, 247, + 249, 250, 251, 253, + 254, 255, 245, 196, + 202, 193, 162, 163, + 219, 180, 207, 164, + 172, 169, 187, 199, + 194, 208, 168, 248, + 161, 177, 211, 210, + 171, 181, 166, 225, + 252, 213, 188, 200, + 185, 184, 178, 192, + 203, 231, 229, 204, + 128, 129, 174, 130, + 233, 131, 230, 232, + 237, 234, 235, 236, + 220, 132, 241, 238, + 239, 205, 133, 215, + 175, 244, 242, 243, + 134, 160, 222, 167, + 136, 135, 137, 139, + 138, 140, 190, 141, + 143, 142, 144, 145, + 147, 146, 148, 149, + 221, 150, 152, 151, + 153, 155, 154, 214, + 191, 157, 156, 158, + 159, 224, 223, 216 + }; + + /*Mac to Latin conversion table: 7.0b35 PBS*/ + /* moved to stringverbs.c: 2004-10-28 aradke */ + + static unsigned char mactolatintable [] = { + + 0, 1, 2, 3, + 4, 5, 6, 7, + 8, 9, 10, 11, + 12, 13, 14, 15, + 16, 17, 18, 19, + 20, 21, 22, 23, + 24, 25, 26, 27, + 28, 29, 30, 31, + 32, 33, 34, 35, + 36, 37, 38, 39, + 40, 41, 42, 43, + 44, 45, 46, 47, + 48, 49, 50, 51, + 52, 53, 54, 55, + 56, 57, 58, 59, + 60, 61, 62, 63, + 64, 65, 66, 67, + 68, 69, 70, 71, + 72, 73, 74, 75, + 76, 77, 78, 79, + 80, 81, 82, 83, + 84, 85, 86, 87, + 88, 89, 90, 91, + 92, 93, 94, 95, + 96, 97, 98, 99, + 100, 101, 102, 103, + 104, 105, 106, 107, + 108, 109, 110, 111, + 112, 113, 114, 115, + 116, 117, 118, 119, + 120, 121, 122, 123, + 124, 125, 126, 127, + 196, 197, 199, 201, + 209, 214, 220, 225, + 224, 226, 228, 227, + 229, 231, 233, 232, + 234, 235, 237, 236, + 238, 239, 241, 243, + 242, 244, 246, 245, + 250, 249, 251, 252, + 221, 176, 162, 163, + 167, 128, 182, 223, + 174, 169, 129, 180, + 168, 130, 198, 216, + 131, 177, 190, 132, + 165, 181, 143, 133, + 189, 188, 134, 170, + 186, 135, 230, 248, + 191, 161, 172, 136, + 159, 137, 144, 171, + 187, 138, 160, 192, + 195, 213, 145, 166, + 173, 139, 179, 178, + 140, 185, 247, 215, + 255, 141, 142, 164, + 208, 240, 222, 254, + 253, 183, 146, 147, + 148, 194, 202, 193, + 203, 200, 205, 206, + 207, 204, 211, 212, + 149, 210, 218, 219, + 217, 158, 150, 151, + 175, 152, 153, 154, + 184, 155, 156, 157 + }; + + #define stringerrorlist 263 #define notimplementederror 1 |
|
From: Andre R. <and...@us...> - 2004-10-28 22:07:22
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16518/Frontier/Common/source Modified Files: OpenTransportNetEvents.c Log Message: Eliminated most GCC compiler warnings. Index: OpenTransportNetEvents.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/OpenTransportNetEvents.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OpenTransportNetEvents.c 23 Oct 2004 22:40:14 -0000 1.3 --- OpenTransportNetEvents.c 28 Oct 2004 22:07:07 -0000 1.4 *************** *** 167,170 **** --- 167,171 ---- }; + #if 0 static unsigned char * dnserrorstrings [5] = { *************** *** 175,179 **** "\x39" "Valid name, no data record of requested type. (DNS error)", /* 4 */ }; ! static unsigned char * stdcliberrorstrings [80] = { --- 176,181 ---- "\x39" "Valid name, no data record of requested type. (DNS error)", /* 4 */ }; ! ! #endif static unsigned char * stdcliberrorstrings [80] = { *************** *** 328,332 **** typedef struct tylistenrecord { EndpointRef ep; ! long stateflags; OTLink validationlink; /* Link into an OT FIFO (not atomic) */ OTLIFO idleEPs; /* Endpoints ready to accept a new incoming connection */ --- 330,334 ---- typedef struct tylistenrecord { EndpointRef ep; ! UInt8 stateflags; OTLink validationlink; /* Link into an OT FIFO (not atomic) */ OTLIFO idleEPs; /* Endpoints ready to accept a new incoming connection */ *************** *** 351,356 **** OTLink link; /* Used for linking into TCP low-level lists (atomic) */ OTLink validationlink; /* Used for linking into worker thread lists (atomic) */ ! long stateflags; ! long completionflags; OSStatus result; tysocktypeid typeID; --- 353,358 ---- OTLink link; /* Used for linking into TCP low-level lists (atomic) */ OTLink validationlink; /* Used for linking into worker thread lists (atomic) */ ! UInt8 stateflags; ! UInt8 completionflags; OSStatus result; tysocktypeid typeID; *************** *** 463,467 **** static OSStatus EnterSndDisconnect (EndpointRecordRef epref); static void ReadAllAndClose (EndpointRecordRef epref); ! static void DoWaitList (ListenRecordRef listenref); static pascal void DNRNotifier (void *context, OTEventCode event, OTResult result, void *cookie); static pascal void ListenNotifier (void *context, OTEventCode code, OTResult result, void *cookie); --- 465,469 ---- static OSStatus EnterSndDisconnect (EndpointRecordRef epref); static void ReadAllAndClose (EndpointRecordRef epref); ! //static void DoWaitList (ListenRecordRef listenref); static pascal void DNRNotifier (void *context, OTEventCode event, OTResult result, void *cookie); static pascal void ListenNotifier (void *context, OTEventCode code, OTResult result, void *cookie); *************** *** 473,477 **** /*Code change by Timothy Paustian Monday, September 25, 2000 8:58:07 PM needed to add a declaration to get the new carbon stuff to compile.*/ ! static void *fwsacceptingthreadmain (long *param); --- 475,479 ---- /*Code change by Timothy Paustian Monday, September 25, 2000 8:58:07 PM needed to add a declaration to get the new carbon stuff to compile.*/ ! static void *fwsacceptingthreadmain (void *param); *************** *** 704,708 **** if (epref) { if (!CheckEndpointList (epref)) { ! wsprintf (TCPmsg, "Entering %s at line %d, EndpointRecordRef = %08lx - INVALID ENPOINT.", functionName, linenumber, epref); TCPWRITEMSG (); return; --- 706,710 ---- if (epref) { if (!CheckEndpointList (epref)) { ! wsprintf (TCPmsg, "Entering %s at line %d, EndpointRecordRef = %08lx - INVALID ENPOINT.", functionName, linenumber, (long) epref); TCPWRITEMSG (); return; *************** *** 710,714 **** wsprintf (TCPmsg, "Entering %s at line %d, EndpointRecordRef = %08lx, Endpoint = %08lx, Type = %s, State Flags = %02x, Completion Flags = %02x, Listen Ref = %08lX.", ! functionName, linenumber, epref, epref->ep, TCPGETTYPE (epref->typeID), epref->stateflags, epref->completionflags, epref->listener); TCPWRITEMSG (); --- 712,716 ---- wsprintf (TCPmsg, "Entering %s at line %d, EndpointRecordRef = %08lx, Endpoint = %08lx, Type = %s, State Flags = %02x, Completion Flags = %02x, Listen Ref = %08lX.", ! functionName, linenumber, (long) epref, (long) epref->ep, TCPGETTYPE (epref->typeID), epref->stateflags, epref->completionflags, (long) epref->listener); TCPWRITEMSG (); *************** *** 717,727 **** if (listenref) { if (!CheckListenList (listenref)) { ! wsprintf (TCPmsg, "Entering %s at line %d, ListenRecordRef = %08lx - INVALID ENPOINT.", functionName, linenumber, listenref); TCPWRITEMSG (); return; } ! wsprintf (TCPmsg, "Entering %s at line %d, ListenRecordRef = %08lx, Endpoint = %08lx, Type = %s, Max Depth = %d, Refcon = %08lX, Thread = %d", ! functionName, linenumber, listenref, listenref->ep, TCPGETTYPE (listenref->typeID), listenref->maxdepth, listenref->refcon, listenref->idthread); TCPWRITEMSG (); --- 719,729 ---- if (listenref) { if (!CheckListenList (listenref)) { ! wsprintf (TCPmsg, "Entering %s at line %d, ListenRecordRef = %08lx - INVALID ENPOINT.", functionName, linenumber, (long) listenref); TCPWRITEMSG (); return; } ! wsprintf (TCPmsg, "Entering %s at line %d, ListenRecordRef = %08lx, Endpoint = %08lx, Type = %s, Max Depth = %ld, Refcon = %08lX, Thread = %ld", ! functionName, linenumber, (long) listenref, (long) listenref->ep, TCPGETTYPE (listenref->typeID), listenref->maxdepth, listenref->refcon, listenref->idthread); TCPWRITEMSG (); *************** *** 736,740 **** if (epref) { if (!CheckEndpointList (epref)) { ! wsprintf (TCPmsg, "Exiting %s at line %d, EndpointRecordRef = %08lx - INVALID ENPOINT.", functionName, linenumber, epref); TCPWRITEMSG (); return; --- 738,742 ---- if (epref) { if (!CheckEndpointList (epref)) { ! wsprintf (TCPmsg, "Exiting %s at line %d, EndpointRecordRef = %08lx - INVALID ENPOINT.", functionName, linenumber, (long) epref); TCPWRITEMSG (); return; *************** *** 742,746 **** wsprintf (TCPmsg, "Exiting %s at line %d, EndpointRecordRef = %08lx, Endpoint = %08lx, Type = %s, State Flags = %02x, Completion Flags = %02x, Listen Ref = %08lX.", ! functionName, linenumber, epref, epref->ep, TCPGETTYPE (epref->typeID), epref->stateflags, epref->completionflags, epref->listener); TCPWRITEMSG (); --- 744,748 ---- wsprintf (TCPmsg, "Exiting %s at line %d, EndpointRecordRef = %08lx, Endpoint = %08lx, Type = %s, State Flags = %02x, Completion Flags = %02x, Listen Ref = %08lX.", ! functionName, linenumber, (long) epref, (long) epref->ep, TCPGETTYPE (epref->typeID), epref->stateflags, epref->completionflags, (long) epref->listener); TCPWRITEMSG (); *************** *** 749,759 **** if (listenref) { if (!CheckListenList (listenref)) { ! wsprintf (TCPmsg, "Exiting %s at line %d, ListenRecordRef = %08lx - INVALID ENPOINT.", functionName, linenumber, listenref); TCPWRITEMSG (); return; } ! wsprintf (TCPmsg, "Exiting %s at line %d, ListenRecordRef = %08lx, Endpoint = %08lx, Type = %s, Max Depth = %d, Refcon = %08lX, Thread = %d", ! functionName, linenumber, listenref, listenref->ep, TCPGETTYPE (listenref->typeID), listenref->maxdepth, listenref->refcon, listenref->idthread); TCPWRITEMSG (); --- 751,761 ---- if (listenref) { if (!CheckListenList (listenref)) { ! wsprintf (TCPmsg, "Exiting %s at line %d, ListenRecordRef = %08lx - INVALID ENPOINT.", functionName, linenumber, (long) listenref); TCPWRITEMSG (); return; } ! wsprintf (TCPmsg, "Exiting %s at line %d, ListenRecordRef = %08lx, Endpoint = %08lx, Type = %s, Max Depth = %ld, Refcon = %08lX, Thread = %ld", ! functionName, linenumber, (long) listenref, (long) listenref->ep, TCPGETTYPE (listenref->typeID), listenref->maxdepth, listenref->refcon, listenref->idthread); TCPWRITEMSG (); *************** *** 782,786 **** #endif ! extern long ctconnections = 0; --- 784,788 ---- #endif ! static long ctconnections = 0; *************** *** 827,831 **** static pascal boolean listendatabasevisit (const void* ref, OTLink* linkToCheck) { ! hdldatabaserecord hdatabase = (ListenRecordRef) ref; return (hdatabase == (OTGetLinkObject (linkToCheck, tylistenrecord, validationlink))->hdatabase); --- 829,833 ---- static pascal boolean listendatabasevisit (const void* ref, OTLink* linkToCheck) { ! hdldatabaserecord hdatabase = (hdldatabaserecord) ref; return (hdatabase == (OTGetLinkObject (linkToCheck, tylistenrecord, validationlink))->hdatabase); *************** *** 851,855 **** static boolean CheckEndpointList (EndpointRecordRef epref) { ! OTList *eplink; #if TARGET_API_MAC_CARBON == 1 --- 853,857 ---- static boolean CheckEndpointList (EndpointRecordRef epref) { ! OTLink *eplink; #if TARGET_API_MAC_CARBON == 1 *************** *** 865,869 **** static boolean CheckListenList (ListenRecordRef listenref) { ! OTList *listenlink; #if TARGET_API_MAC_CARBON == 1 --- 867,871 ---- static boolean CheckListenList (ListenRecordRef listenref) { ! OTLink *listenlink; #if TARGET_API_MAC_CARBON == 1 *************** *** 1165,1170 **** /* if (!incrementconnectioncounter ()) { ! OTSndDisconnect (listenref->ep, nil); /*6.2b13 AR: reject connection (PIKE) */ ! /* return; }*/ --- 1167,1172 ---- /* if (!incrementconnectioncounter ()) { ! OTSndDisconnect (listenref->ep, nil); /%6.2b13 AR: reject connection (PIKE) %/ ! return; }*/ *************** *** 1344,1348 **** }/*DoSndOrderlyDisconnect*/ ! /*static OSStatus EnterSndOrderlyDisconnect (EndpointRecordRef epref) { OSStatus err; --- 1346,1352 ---- }/*DoSndOrderlyDisconnect*/ ! #if 0 ! ! static OSStatus EnterSndOrderlyDisconnect (EndpointRecordRef epref) { OSStatus err; *************** *** 1357,1360 **** --- 1361,1365 ---- }/*EnterSndOrderlyDisconnect*/ + #endif // *************** *** 2381,2384 **** --- 2386,2390 ---- } /*neterror*/ + #if 0 static void dnserror (char *cannot, long errcode) { *************** *** 2414,2417 **** --- 2420,2426 ---- } + #endif + + static void intneterror (long errcode) { bigstring bs; *************** *** 2817,2821 **** *addr = hostinfo.addrs[0]; ! TCPprintf (wsprintf(TCPmsg, "Leaving fwsNetEventNameToAddress at line %d. Address: %ld.", __LINE__, addr)); TCPWRITEMSG(); --- 2826,2830 ---- *addr = hostinfo.addrs[0]; ! TCPprintf (wsprintf(TCPmsg, "Leaving fwsNetEventNameToAddress at line %d. Address: %08lx.", __LINE__, *addr)); TCPWRITEMSG(); *************** *** 3057,3061 **** epref->typeID = SOCKTYPE_OPEN; ! TCPprintf (wsprintf (TCPmsg, "In fwsacceptpendingconnections at line %d. Accepted new connection #%08ld on listener %08lx: %s (%08lx, %ld).", __LINE__, ct, listenref, stringbaseaddress (listenref->callback), epref, listenref->refcon)); TCPWRITEMSG(); --- 3066,3071 ---- epref->typeID = SOCKTYPE_OPEN; ! TCPprintf (wsprintf (TCPmsg, "In fwsacceptpendingconnections at line %d. Accepted new connection #%08ld on listener %08lx: %s (%08lx, %ld).", ! __LINE__, ct, (long) listenref, stringbaseaddress (listenref->callback), (long) epref, listenref->refcon)); TCPWRITEMSG(); *************** *** 3151,3157 **** disposehandle (listenref->hcallbacktree); ! DisposePtr (listenref->acceptors); ! DisposePtr (listenref); return; --- 3161,3167 ---- disposehandle (listenref->hcallbacktree); ! DisposePtr ((Ptr) listenref->acceptors); ! DisposePtr ((Ptr) listenref); return; *************** *** 3159,3163 **** ! static void *fwsacceptingthreadmain (long *param) { /* --- 3169,3173 ---- ! static void *fwsacceptingthreadmain (void *param) { /* *************** *** 3188,3192 **** }/*while*/ ! TCPprintf (wsprintf (TCPmsg, "In fwsacceptingthreadmain at line %d, broke out of loop after accepting %ld connections on listener %08lx. Now starting clean-up.", __LINE__, ct, listenref)); TCPWRITEMSG(); --- 3198,3203 ---- }/*while*/ ! TCPprintf (wsprintf (TCPmsg, "In fwsacceptingthreadmain at line %d, broke out of loop after accepting %ld connections on listener %08lx. Now starting clean-up.", ! __LINE__, ct, (long) listenref)); TCPWRITEMSG(); *************** *** 3285,3290 **** if (kOTNoError != err) { ! OSStatus junk = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", junk == kOTNoError); neterror ("set listen stream to blocking mode", err); goto exit; --- 3296,3302 ---- if (kOTNoError != err) { ! OSStatus status; ! status = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", status == kOTNoError); neterror ("set listen stream to blocking mode", err); goto exit; *************** *** 3306,3311 **** if (kOTNoError != err) { ! OSStatus junk = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", junk == kOTNoError); neterror ("set IP_REUSEADDR option on listen stream", err); goto exit; --- 3318,3324 ---- if (kOTNoError != err) { ! OSStatus status; ! status = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", status == kOTNoError); neterror ("set IP_REUSEADDR option on listen stream", err); goto exit; *************** *** 3325,3330 **** if (kOTNoError != err) { ! OSStatus junk = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", junk == kOTNoError); neterror ("bind listen stream", err); goto exit; --- 3338,3344 ---- if (kOTNoError != err) { ! OSStatus status; ! status = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", status == kOTNoError); neterror ("bind listen stream", err); goto exit; *************** *** 3339,3344 **** if (kOTNoError != err) { ! OSStatus junk = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", junk == kOTNoError); neterror ("install notifier for listen stream", err); goto exit; --- 3353,3359 ---- if (kOTNoError != err) { ! OSStatus status; ! status = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", status == kOTNoError); neterror ("install notifier for listen stream", err); goto exit; *************** *** 3348,3353 **** if (kOTNoError != err) { ! OSStatus junk = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", junk == kOTNoError); neterror ("set listen stream to async mode", err); goto exit; --- 3363,3369 ---- if (kOTNoError != err) { ! OSStatus status; ! status = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", status == kOTNoError); neterror ("set listen stream to async mode", err); goto exit; *************** *** 3361,3366 **** if (!fwslaunchacceptingthread (listenref)) { /* takes care of closing ep and cleaning up, even if we fail further down */ ! OSStatus junk = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", junk == kOTNoError); goto exit; } --- 3377,3383 ---- if (!fwslaunchacceptingthread (listenref)) { /* takes care of closing ep and cleaning up, even if we fail further down */ ! OSStatus status; ! status = OTCloseProvider (listenref->ep); ! OTAssert ("fwsNetEventListenStream: Could not close listener", status == kOTNoError); goto exit; } *************** *** 3464,3468 **** if (kOTNoError != err) { ! TCPERRORprintf (wsprintf (TCPmsg, "In fwscleanuplistener at line %d, error %ld setting listener %08lx to synchronous mode.", __LINE__, err, listenref)); TCPERRORWRITEMSG(); } --- 3481,3485 ---- if (kOTNoError != err) { ! TCPERRORprintf (wsprintf (TCPmsg, "In fwscleanuplistener at line %d, error %ld setting listener %08lx to synchronous mode.", __LINE__, err, (long) listenref)); TCPERRORWRITEMSG(); } *************** *** 3473,3477 **** if (kOTNoError != err) { ! TCPERRORprintf (wsprintf (TCPmsg, "In fwscleanuplistener at line %d, error %ld closing listener %08lx.", __LINE__, err, listenref)); TCPERRORWRITEMSG(); } --- 3490,3494 ---- if (kOTNoError != err) { ! TCPERRORprintf (wsprintf (TCPmsg, "In fwscleanuplistener at line %d, error %ld closing listener %08lx.", __LINE__, err, (long) listenref)); TCPERRORWRITEMSG(); } *************** *** 3620,3624 **** if (kOTNoError != err) { ! DisposePtr (epref); neterror ("open stream", err); decrementconnectioncounter(); --- 3637,3641 ---- if (kOTNoError != err) { ! DisposePtr ((Ptr) epref); neterror ("open stream", err); decrementconnectioncounter(); *************** *** 3810,3814 **** if (kOTNoError != err) { // Scripts don't have to care about this error, it has already been taken care off anyway ! TCPERRORprintf (wsprintf (TCPmsg, "In fwsNetEventAbortStream at line %d, error %ld disconnecting endpoint %08lx.", __LINE__, err, epref)); TCPERRORWRITEMSG(); } --- 3827,3831 ---- if (kOTNoError != err) { // Scripts don't have to care about this error, it has already been taken care off anyway ! TCPERRORprintf (wsprintf (TCPmsg, "In fwsNetEventAbortStream at line %d, error %ld disconnecting endpoint %08lx.", __LINE__, err, (long) epref)); TCPERRORWRITEMSG(); } *************** *** 4155,4159 **** copyctopstring ("OPEN", status); ! result = OTCountDataBytes (epref->ep, (size_t*) bytesPending); switch (result) { --- 4172,4176 ---- copyctopstring ("OPEN", status); ! result = OTCountDataBytes (epref->ep, (OTByteCount*) bytesPending); switch (result) { |
|
From: Andre R. <and...@us...> - 2004-10-28 21:07:22
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30510/Frontier/Common/headers Modified Files: frontierdebug.h Log Message: Fixed some GCC compiler warnings. Index: frontierdebug.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdebug.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** frontierdebug.h 9 Oct 2004 20:55:30 -0000 1.1 --- frontierdebug.h 28 Oct 2004 21:07:12 -0000 1.2 *************** *** 72,77 **** #define ASSERT_1(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_1(x) ((void *) nil) ! #define ASSERT_1(x) ((void *) nil) #endif --- 72,77 ---- #define ASSERT_1(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_1(x) ! #define ASSERT_1(x) #endif *************** *** 80,85 **** #define ASSERT_2(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_2(x) ((void *) nil) ! #define ASSERT_2(x) ((void *) nil) #endif --- 80,85 ---- #define ASSERT_2(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_2(x) ! #define ASSERT_2(x) #endif *************** *** 88,93 **** #define ASSERT_3(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_3(x) ((void *) nil) ! #define ASSERT_3(x) ((void *) nil) #endif --- 88,93 ---- #define ASSERT_3(x) LAND_ASSERT((x), LAND_GENERALLOG_TARGET, LAND_GENERALLOG_NAME)) #else ! #define MSG_3(x) ! #define ASSERT_3(x) #endif *************** *** 99,104 **** #define TCP_ASSERT_1(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_1(x) ((void *) nil) ! #define TCP_ASSERT_1(x) ((void *) nil) #endif --- 99,104 ---- #define TCP_ASSERT_1(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_1(x) ! #define TCP_ASSERT_1(x) #endif *************** *** 107,112 **** #define TCP_ASSERT_2(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_2(x) ((void *) nil) ! #define TCP_ASSERT_2(x) ((void *) nil) #endif --- 107,112 ---- #define TCP_ASSERT_2(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_2(x) ! #define TCP_ASSERT_2(x) #endif *************** *** 115,120 **** #define TCP_ASSERT_3(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_3(x) ((void *) nil) ! #define TCP_ASSERT_3(x) ((void *) nil) #endif --- 115,120 ---- #define TCP_ASSERT_3(x) LAND_ASSERT((x), LAND_TCPLOG_TARGET, LAND_TCPLOG_NAME)) #else ! #define TCP_MSG_3(x) ! #define TCP_ASSERT_3(x) #endif *************** *** 126,131 **** #define DB_ASSERT_1(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_1(x) ((void *) nil) ! #define DB_ASSERT_1(x) ((void *) nil) #endif --- 126,131 ---- #define DB_ASSERT_1(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_1(x) ! #define DB_ASSERT_1(x) #endif *************** *** 134,139 **** #define DB_ASSERT_2(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_2(x) ((void *) nil) ! #define DB_ASSERT_2(x) ((void *) nil) #endif --- 134,139 ---- #define DB_ASSERT_2(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_2(x) ! #define DB_ASSERT_2(x) #endif *************** *** 142,147 **** #define DB_ASSERT_3(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_3(x) ((void *) nil) ! #define DB_ASSERT_3(x) ((void *) nil) #endif --- 142,147 ---- #define DB_ASSERT_3(x) LAND_ASSERT((x), LAND_DBLOG_TARGET, LAND_DBLOG_NAME)) #else ! #define DB_MSG_3(x) ! #define DB_ASSERT_3(x) #endif *************** *** 153,158 **** #define THREADS_ASSERT_1(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_1(x) ((void *) nil) ! #define THREADS_ASSERT_1(x) ((void *) nil) #endif --- 153,158 ---- #define THREADS_ASSERT_1(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_1(x) ! #define THREADS_ASSERT_1(x) #endif *************** *** 161,166 **** #define THREADS_ASSERT_2(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_2(x) ((void *) nil) ! #define THREADS_ASSERT_2(x) ((void *) nil) #endif --- 161,166 ---- #define THREADS_ASSERT_2(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_2(x) ! #define THREADS_ASSERT_2(x) #endif *************** *** 169,174 **** #define THREADS_ASSERT_3(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_3(x) ((void *) nil) ! #define THREADS_ASSERT_3(x) ((void *) nil) #endif --- 169,174 ---- #define THREADS_ASSERT_3(x) LAND_ASSERT((x), LAND_THREADSLOG_TARGET, LAND_THREADSLOG_NAME)) #else ! #define THREADS_MSG_3(x) ! #define THREADS_ASSERT_3(x) #endif |
|
From: Andre R. <and...@us...> - 2004-10-28 20:49:52
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25760/Frontier/Common/source Modified Files: osawindows.c Log Message: Reconciled Classic and Carbon versions. Fixed some GCC compiler warnings. Index: osawindows.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osawindows.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osawindows.c 23 Oct 2004 22:47:36 -0000 1.2 --- osawindows.c 28 Oct 2004 20:49:26 -0000 1.3 *************** *** 25,34 **** /*Forked file. Carbon at top, "good" version at bottom. This file should be reconciled later.*/ #include "frontier.h" #include "standard.h" - #if TARGET_API_MAC_CARBON == 1 - #include <uisharing.h> #include <uisinternal.h> --- 25,35 ---- /*Forked file. Carbon at top, "good" version at bottom. This file should be reconciled later.*/ + /* + 2004-10-28 aradke: Reconciled the Carbon and Classic versions. + */ #include "frontier.h" #include "standard.h" #include <uisharing.h> #include <uisinternal.h> *************** *** 48,52 **** - static WindowPtr osageteventwindow (EventRecord *ev) { --- 49,52 ---- *************** *** 92,97 **** --- 92,99 ---- } /*osageteventwindow*/ + static boolean removewindowsharinghandlers (void); + static pascal ComponentResult handlewindoweventcommand (Handle hglobals, EventRecord *ev, tyWindowSharingGlobals *wsGlobals) { *************** *** 258,262 **** ! static pascal OSErr handleselectwindow (const AppleEvent *event, AppleEvent *reply, UInt32 refcon) { /* --- 260,264 ---- ! static pascal OSErr handleselectwindow (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { /* *************** *** 289,302 **** ! #if THINK_C || !TARGET_RT_MAC_CFM ! ! #define windowcandofunctionUPP ((ComponentFunctionUPP) windowcandofunction) ! #define handlewindoweventcommandUPP ((ComponentFunctionUPP) handlewindoweventcommand) ! #define windowiscardcommandUPP ((ComponentFunctionUPP) windowiscardcommand) ! #define closewindowcommandUPP ((ComponentFunctionUPP) closewindowcommand) ! #define windoweditcommandUPP ((ComponentFunctionUPP) windoweditcommand) ! #define windowopencommandUPP ((ComponentFunctionUPP) windowopencommand) ! #else enum { --- 291,297 ---- ! #if TARGET_RT_MAC_CFM || TARGET_RT_MAC_MACHO ! /* proc infos for building routine descriptors and universal procedure pointers */ enum { *************** *** 344,659 **** #if TARGET_API_MAC_CARBON == 1 ! ComponentFunctionUPP windowcandofunctionDesc; ! ComponentFunctionUPP handlewindoweventcommandDesc; ! ComponentFunctionUPP windowiscardcommandDesc; ! ComponentFunctionUPP closewindowcommandDesc; ! ComponentFunctionUPP windoweditcommandDesc; ! ComponentFunctionUPP windowopencommandDesc; ! ! #define windowcandofunctionUPP (windowcandofunctionDesc) ! #define handlewindoweventcommandUPP (handlewindoweventcommandDesc) ! #define windowiscardcommandUPP (windowiscardcommandDesc) ! #define closewindowcommandUPP (closewindowcommandDesc) ! #define windoweditcommandUPP (windoweditcommandDesc) ! #define windowopencommandUPP (windowopencommandDesc) ! #else ! static RoutineDescriptor windowcandofunctionDesc = BUILD_ROUTINE_DESCRIPTOR (windowcandofunctionProcInfo, windowcandofunction); ! static RoutineDescriptor handlewindoweventcommandDesc = BUILD_ROUTINE_DESCRIPTOR (handlewindoweventcommandProcInfo, handlewindoweventcommand); ! static RoutineDescriptor windowiscardcommandDesc = BUILD_ROUTINE_DESCRIPTOR (windowiscardcommandProcInfo, windowiscardcommand); ! static RoutineDescriptor closewindowcommandDesc = BUILD_ROUTINE_DESCRIPTOR (closewindowcommandProcInfo, closewindowcommand); ! static RoutineDescriptor windoweditcommandDesc = BUILD_ROUTINE_DESCRIPTOR (windoweditcommandProcInfo, windoweditcommand); ! static RoutineDescriptor windowopencommandDesc = BUILD_ROUTINE_DESCRIPTOR (windowopencommandProcInfo, windowopencommand); ! ! #define windowcandofunctionUPP (&windowcandofunctionDesc) ! #define handlewindoweventcommandUPP (&handlewindoweventcommandDesc) ! #define windowiscardcommandUPP (&windowiscardcommandDesc) ! #define closewindowcommandUPP (&closewindowcommandDesc) ! #define windoweditcommandUPP (&windoweditcommandDesc) ! #define windowopencommandUPP (&windowopencommandDesc) ! #endif ! #endif ! ! static pascal OSErr handleselectwindow (const AppleEvent *, AppleEvent *, UInt32); /*forward*/ ! ! //Code change by Timothy Paustian Friday, July 21, 2000 11:41:07 PM ! //Let's see if we can get away with just installing this. ! #if !TARGET_RT_MAC_CFM ! ! #define handleselectwindowUPP handleselectwindow ! ! #else ! ! #if TARGET_API_MAC_CARBON == 1 ! AEEventHandlerUPP handleselectwindowDesc = nil; ! #define handleselectwindowUPP (handleselectwindowDesc) #else ! static RoutineDescriptor handleselectwindowDesc = BUILD_ROUTINE_DESCRIPTOR (uppAEEventHandlerProcInfo, handleselectwindow); ! ! #define handleselectwindowUPP (&handleselectwindowDesc) ! ! #endif ! #endif ! ! static boolean installwindowsharinghandlers (void) { ! ! OSErr err; ! ! #if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM ! if (handleselectwindowDesc == nil) ! handleselectwindowDesc = NewAEEventHandlerUPP(handleselectwindow); ! #endif ! err = AEInstallEventHandler ('SHUI', 'selw', handleselectwindowUPP, 0, false); ! ! return (err == noErr); ! } /*installwindowsharinghandlers*/ ! - static boolean removewindowsharinghandlers (void) { - - OSErr err; - - err = AERemoveEventHandler ('SHUI', 'selw', handleselectwindowUPP, false); - #if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM - if (handleselectwindowDesc != nil) - DisposeAEEventHandlerUPP(handleselectwindowDesc); - - DisposeComponentFunctionUPP(windowcandofunctionDesc); - DisposeComponentFunctionUPP(handlewindoweventcommandDesc); - DisposeComponentFunctionUPP(windowiscardcommandDesc); - DisposeComponentFunctionUPP(closewindowcommandDesc); - DisposeComponentFunctionUPP(windoweditcommandDesc); - DisposeComponentFunctionUPP(windowopencommandDesc); #endif ! ! return (err == noErr); ! } /*removewindowsharinghandlers*/ ! ! static pascal ComponentResult windowsharingdispatch (register ComponentParameters *params, Handle storage) { ! ! /* ! 2.1b8 dmb: added case for wsRunFromHandleCommand ! */ ! ! ComponentResult result = noErr; ! short what = (*params).what; ! ! switch (what) { ! ! case kComponentOpenSelect: { /*can't call subroutine because a5 isn't ours*/ ! ! hdlcomponentglobals hglobals; ! Component self = (Component) (*params).params [0]; ! long selfa5; ! long clienta5; ! ! selfa5 = GetComponentRefcon (self); ! ! #ifdef THINK_C ! ! asm { ! move.l a5,clienta5 ! move.l a5,-(a7) ! move.l selfa5,a5 ! } ! ! #else ! ! clienta5 = SetUpAppA5 (); ! ! #endif ! ! #if !TARGET_API_MAC_CARBON ! SetComponentInstanceA5 ((ComponentInstance) self, selfa5); ! #endif ! if (newcomponentglobals (self, clienta5, &hglobals)) ! SetComponentInstanceStorage ((ComponentInstance) self, (Handle) hglobals); ! else ! result = memFullErr; ! ! installwindowsharinghandlers (); ! ! /* ! initprocess (); ! */ ! ! RestoreA5 (clienta5); ! ! break; ! } ! ! case kComponentCloseSelect: ! disposecomponentglobals ((hdlcomponentglobals) storage); ! ! removewindowsharinghandlers (); ! ! /* ! processclose (); ! */ ! ! result = noErr; /***maybe look for shared windows & close them*/ ! ! break; ! ! case kComponentCanDoSelect: ! result = CallComponentFunction (params, windowcandofunctionUPP); ! break; ! ! case kComponentVersionSelect: ! result = 0x04100100; ! ! break; ! ! case wsEventHandlerCommand: ! result = callosafunction (storage, params, handlewindoweventcommandUPP); ! ! break; ! ! case wsWindowIsCardCommand: ! result = CallComponentFunctionWithStorage (storage, params, windowiscardcommandUPP); ! ! break; ! ! case wsCloseWindowCommand: ! result = callosafunction (storage, params, closewindowcommandUPP); ! ! break; ! ! case wsEditCommand: ! result = callosafunction (storage, params, windoweditcommandUPP); ! ! break; ! ! case wsRunFromHandleCommand: ! result = callosafunction (storage, params, windowopencommandUPP); ! ! break; ! ! default: ! result = badComponentSelector; ! ! break; ! } ! return (result); ! } /*windowsharingdispatch*/ ! ! boolean initwindowsharingcomponent (void) { ! ! /* ! register the window sharing component. ! */ ! ! Component comp; ! ! #if !TARGET_API_MAC_CARBON ! RememberA5 (); ! #endif ! ! #if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM ! windowcandofunctionDesc = NewComponentFunctionUPP(windowcandofunction, windowcandofunctionProcInfo); ! handlewindoweventcommandDesc = NewComponentFunctionUPP(handlewindoweventcommand, handlewindoweventcommandProcInfo); ! windowiscardcommandDesc = NewComponentFunctionUPP(windowiscardcommand, windowiscardcommandProcInfo); ! closewindowcommandDesc = NewComponentFunctionUPP(closewindowcommand, closewindowcommandProcInfo); ! windoweditcommandDesc = NewComponentFunctionUPP(windoweditcommand, windoweditcommandProcInfo); ! windowopencommandDesc = NewComponentFunctionUPP(windowopencommand, windowopencommandProcInfo); ! #endif ! ! ! comp = osaregistercomponent (wsComponentType, 0, &windowsharingdispatch, frontierstring, windowsharingcomponentstring); ! ! if (comp == nil) ! return (false); ! ! installwindowsharinghandlers (); /*we need to support them too*/ ! ! return (true); ! } /*initwindowsharingcomponent*/ ! #else ! #include <uisharing.h> ! #include <uisinternal.h> ! #include <land.h> ! #include "ops.h" ! #include "kb.h" ! #include "memory.h" ! #include "quickdraw.h" ! #include "resources.h" ! #include "shell.h" ! #include "shellmenu.h" ! #include "shellprivate.h" ! #include "tablestructure.h" ! #include "osainternal.h" ! #include "osawindows.h" ! #include <SetUpA5.h> ! static WindowPtr osageteventwindow (EventRecord *ev) { ! ! WindowPtr w; ! WindowPtr wfront; ! ! wfront = FrontWindow (); ! ! w = nil; /*default*/ ! ! switch ((*ev).what) { /*some events apply to windows other than the frontmost*/ ! ! case nullEvent: ! w = wfront; ! ! break; ! ! case keyDown: case autoKey: case keyUp: ! w = wfront; ! ! break; ! ! case mouseDown: case mouseUp: ! FindWindow ((*ev).where, &w); ! ! break; ! ! case updateEvt: case activateEvt: ! w = (WindowPtr) (*ev).message; ! ! break; ! ! case jugglerEvt: ! w = wfront; ! ! break; ! default: /*we don't handle other events*/ ! break; ! } /*switch*/ ! return (w); ! } /*osageteventwindow*/ ! ! ! static pascal OSErr handleselectwindow (const AppleEvent *, AppleEvent *, UInt32); /*forward*/ ! ! ! #if !TARGET_RT_MAC_CFM || TARGET_API_MAC_CARBON ! #define handleselectwindowUPP handleselectwindow #else ! static RoutineDescriptor handleselectwindowDesc = BUILD_ROUTINE_DESCRIPTOR (uppAEEventHandlerProcInfo, handleselectwindow); ! ! #define handleselectwindowUPP (&handleselectwindowDesc) #endif --- 339,420 ---- #if TARGET_API_MAC_CARBON == 1 ! ! /* ! For Carbon we have to build univeral procedure pointers at runtime. ! So we just declare the UPPs here. ! */ ! ComponentFunctionUPP windowcandofunctionDesc; ! ComponentFunctionUPP handlewindoweventcommandDesc; ! ComponentFunctionUPP windowiscardcommandDesc; ! ComponentFunctionUPP closewindowcommandDesc; ! ComponentFunctionUPP windoweditcommandDesc; ! ComponentFunctionUPP windowopencommandDesc; ! #define windowcandofunctionUPP (windowcandofunctionDesc) ! #define handlewindoweventcommandUPP (handlewindoweventcommandDesc) ! #define windowiscardcommandUPP (windowiscardcommandDesc) ! #define closewindowcommandUPP (closewindowcommandDesc) ! #define windoweditcommandUPP (windoweditcommandDesc) ! #define windowopencommandUPP (windowopencommandDesc) #else ! /* ! For the Classic Mac OS API, routine descriptors are built by the compiler. ! Just define the UPPs as pointers to these routine descriptors. ! */ ! static RoutineDescriptor windowcandofunctionDesc = BUILD_ROUTINE_DESCRIPTOR (windowcandofunctionProcInfo, windowcandofunction); ! static RoutineDescriptor handlewindoweventcommandDesc = BUILD_ROUTINE_DESCRIPTOR (handlewindoweventcommandProcInfo, handlewindoweventcommand); ! static RoutineDescriptor windowiscardcommandDesc = BUILD_ROUTINE_DESCRIPTOR (windowiscardcommandProcInfo, windowiscardcommand); ! static RoutineDescriptor closewindowcommandDesc = BUILD_ROUTINE_DESCRIPTOR (closewindowcommandProcInfo, closewindowcommand); ! static RoutineDescriptor windoweditcommandDesc = BUILD_ROUTINE_DESCRIPTOR (windoweditcommandProcInfo, windoweditcommand); ! static RoutineDescriptor windowopencommandDesc = BUILD_ROUTINE_DESCRIPTOR (windowopencommandProcInfo, windowopencommand); ! #define windowcandofunctionUPP (&windowcandofunctionDesc) ! #define handlewindoweventcommandUPP (&handlewindoweventcommandDesc) ! #define windowiscardcommandUPP (&windowiscardcommandDesc) ! #define closewindowcommandUPP (&closewindowcommandDesc) ! #define windoweditcommandUPP (&windoweditcommandDesc) ! #define windowopencommandUPP (&windowopencommandDesc) #endif ! #else ! /* For Mac 68k (non-CFM) just use function pointers */ ! #define windowcandofunctionUPP ((ComponentFunctionUPP) windowcandofunction) ! #define handlewindoweventcommandUPP ((ComponentFunctionUPP) handlewindoweventcommand) ! #define windowiscardcommandUPP ((ComponentFunctionUPP) windowiscardcommand) ! #define closewindowcommandUPP ((ComponentFunctionUPP) closewindowcommand) ! #define windoweditcommandUPP ((ComponentFunctionUPP) windoweditcommand) ! #define windowopencommandUPP ((ComponentFunctionUPP) windowopencommand) ! #endif ! #if TARGET_RT_MAC_CFM || TARGET_RT_MAC_MACHO ! #if TARGET_API_MAC_CARBON + //Code change by Timothy Paustian Friday, July 21, 2000 11:41:07 PM + //Let's see if we can get away with just installing this. + AEEventHandlerUPP handleselectwindowDesc = nil; + #define handleselectwindowUPP (handleselectwindowDesc) ! #else ! static RoutineDescriptor handleselectwindowDesc = BUILD_ROUTINE_DESCRIPTOR (uppAEEventHandlerProcInfo, handleselectwindow); ! #define handleselectwindowUPP (&handleselectwindowDesc) ! #endif #else ! #define handleselectwindowUPP handleselectwindow #endif *************** *** 664,667 **** --- 425,433 ---- OSErr err; + #if TARGET_API_MAC_CARBON + if (handleselectwindowDesc == nil) + handleselectwindowDesc = NewAEEventHandlerUPP(handleselectwindow); + #endif + err = AEInstallEventHandler ('SHUI', 'selw', handleselectwindowUPP, 0, false); *************** *** 675,948 **** err = AERemoveEventHandler ('SHUI', 'selw', handleselectwindowUPP, false); - - return (err == noErr); - } /*removewindowsharinghandlers*/ - - - static pascal ComponentResult handlewindoweventcommand (Handle hglobals, EventRecord *ev, tyWindowSharingGlobals *wsGlobals) { - - boolean flcloseallwindows = false; - WindowPtr w; - boolean fl = false; - - if (flosashutdown) - removewindowsharinghandlers (); - - w = osageteventwindow (ev); - - if (!isshellwindow (w)) - return (false); - - if (!shellpushglobals (w)) - return (false); - - switch ((*ev).what) { /*some events apply to windows other than the frontmost*/ - - case nullEvent: - shellidle (); - - shelladjustcursor (); - - break; - - case jugglerEvt: { - tyjugglermessage *jmsg = (tyjugglermessage *) &(*ev).message; - - if ((*jmsg).eventtype == 1) /*suspend or resume subevent*/ - shellactivatewindow (w, (*jmsg).flresume); - - break; - } - - case keyDown: case autoKey: case keyUp: - setkeyboardstatus ((*ev).message, (*ev).what, (*ev).modifiers); - - if (keyboardstatus.flcmdkey) { - - if (!(*shellglobals.cmdkeyfilterroutine) (keyboardstatus.chkb)) { - - fl = true; - - break; - } - - if (textchar (keyboardstatus.chkb)) /*pass it up to menu mgr*/ - break; - } - - /*fall through into default case*/ - - default: /*we don't handle other events*/ - - langcallbacks.errormessagecallback = &langerrordialog; - - fl = shellprocessevent (ev); - - break; - } /*switch*/ - - shellpopglobals (); - - (*wsGlobals).flcloseallwindows = flcloseallwindows; /****/ - - /* - processyield (); - */ - - return (fl); /*handled the event -- or not*/ - } /*eventhandlercommand*/ - - - static pascal ComponentResult windowiscardcommand (Handle hglobals, WindowPtr w) { - - return (isshellwindow (w)); - } /*windowiscardcommand*/ - - - static pascal ComponentResult closewindowcommand (Handle hglobals, WindowPtr w) { - - return (shellclosewindow (w)); - } /*closewindowcommand*/ - - - static pascal ComponentResult windoweditcommand (Handle hglobals, short editcmd) { - - register WindowPtr w; - register boolean fl; - - w = FrontWindow (); - - if (!isshellwindow (w)) - return (false); - - if (!shellpushglobals (w)) - return (false); - - fl = shelleditcommand ((tyeditcommand) editcmd); - - shellpopglobals (); - - return (fl); - } /*windoweditcommand*/ - - - static pascal ComponentResult windowopencommand (Handle hglobals, Handle h, short flscripted, Str255 windowname, Point pt, uisEventCallback filter) { - - #pragma unused (flscripted, windowname, pt, filter) - - /* - 2.1b8 dmb: new routine so client can open window at will - */ - - bigstring bsname; - hdlhashtable htable; - tyvaluerecord val; - boolean fl = false; - hdlhashnode hnode; - - texthandletostring (h, bsname); - - pushhashtable (roottable); /*override storage table set up by callosafunction so langrunhandle will set up root*/ - - if (langexpandtodotparams (bsname, &htable, bsname)) { - - if (htable == nil) - langsearchpathlookup (bsname, &htable); - - if (hashtablelookup (htable, bsname, &val, &hnode)) { - - if (val.valuetype == externalvaluetype) - fl = langzoomvalwindow (htable, bsname, val, true); - } - } - - pophashtable (); - - return (fl); - } /*windowopencommand*/ ! ! static pascal ComponentResult windowcandofunction (short selector) { ! switch (selector) { ! ! case kComponentOpenSelect: ! case kComponentCloseSelect: ! case kComponentCanDoSelect: ! case kComponentVersionSelect: ! case wsEventHandlerCommand: ! case wsWindowIsCardCommand: ! case wsCloseWindowCommand: ! case wsEditCommand: ! case wsRunFromHandleCommand: ! return (true); ! } ! ! return (false); ! } /*windowcandofunction*/ ! - static pascal OSErr handleselectwindow (const AppleEvent *event, AppleEvent *reply, UInt32 refcon) { - - /* - handle the window select event in the current application context. ! in case we're in Frontier, dirty the window menu ! */ ! ! OSErr err; ! OSType type; ! long size; ! WindowPtr w; ! long curA5; ! ! err = AEGetParamPtr (event, '----', typeLongInteger, &type, (Ptr) &w, sizeof (w), &size); ! ! if (err == noErr) { ! ! SelectWindow (w); ! ! curA5 = SetUpAppA5 (); ! ! shellwindowmenudirty (); ! ! RestoreA5 (curA5); ! } ! ! return (err); ! } /*handleselectwindow*/ ! ! ! #if THINK_C || !TARGET_RT_MAC_CFM || TARGET_API_MAC_CARBON ! ! #define windowcandofunctionUPP ((ComponentFunctionUPP) windowcandofunction) ! #define handlewindoweventcommandUPP ((ComponentFunctionUPP) handlewindoweventcommand) ! #define windowiscardcommandUPP ((ComponentFunctionUPP) windowiscardcommand) ! #define closewindowcommandUPP ((ComponentFunctionUPP) closewindowcommand) ! #define windoweditcommandUPP ((ComponentFunctionUPP) windoweditcommand) ! #define windowopencommandUPP ((ComponentFunctionUPP) windowopencommand) ! ! #else - enum { - windowcandofunctionProcInfo = kPascalStackBased - | RESULT_SIZE(SIZE_CODE(sizeof(OSAError))) - | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(hdlcomponentglobals))) - | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(short))) - | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(short))) - }; - enum { - handlewindoweventcommandProcInfo = kPascalStackBased - | RESULT_SIZE(SIZE_CODE(sizeof(OSAError))) - | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(hdlcomponentglobals))) - | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(short))) - | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(short))) - }; - enum { - windowiscardcommandProcInfo = kPascalStackBased - | RESULT_SIZE(SIZE_CODE(sizeof(OSAError))) - | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(hdlcomponentglobals))) - | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(short))) - | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(short))) - }; - enum { - closewindowcommandProcInfo = kPascalStackBased - | RESULT_SIZE(SIZE_CODE(sizeof(OSAError))) - | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(hdlcomponentglobals))) - | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(short))) - | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(short))) - }; - enum { - windoweditcommandProcInfo = kPascalStackBased - | RESULT_SIZE(SIZE_CODE(sizeof(OSAError))) - | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(hdlcomponentglobals))) - | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(short))) - | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(short))) - }; - enum { - windowopencommandProcInfo = kPascalStackBased - | RESULT_SIZE(SIZE_CODE(sizeof(OSAError))) - | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(hdlcomponentglobals))) - | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(short))) - | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(short))) - }; - static RoutineDescriptor windowcandofunctionDesc = BUILD_ROUTINE_DESCRIPTOR (windowcandofunctionProcInfo, windowcandofunction); - static RoutineDescriptor handlewindoweventcommandDesc = BUILD_ROUTINE_DESCRIPTOR (handlewindoweventcommandProcInfo, handlewindoweventcommand); - static RoutineDescriptor windowiscardcommandDesc = BUILD_ROUTINE_DESCRIPTOR (windowiscardcommandProcInfo, windowiscardcommand); - static RoutineDescriptor closewindowcommandDesc = BUILD_ROUTINE_DESCRIPTOR (closewindowcommandProcInfo, closewindowcommand); - static RoutineDescriptor windoweditcommandDesc = BUILD_ROUTINE_DESCRIPTOR (windoweditcommandProcInfo, windoweditcommand); - static RoutineDescriptor windowopencommandDesc = BUILD_ROUTINE_DESCRIPTOR (windowopencommandProcInfo, windowopencommand); - - #define windowcandofunctionUPP (&windowcandofunctionDesc) - #define handlewindoweventcommandUPP (&handlewindoweventcommandDesc) - #define windowiscardcommandUPP (&windowiscardcommandDesc) - #define closewindowcommandUPP (&closewindowcommandDesc) - #define windoweditcommandUPP (&windoweditcommandDesc) - #define windowopencommandUPP (&windowopencommandDesc) - - #endif - static pascal ComponentResult windowsharingdispatch (register ComponentParameters *params, Handle storage) { --- 441,463 ---- err = AERemoveEventHandler ('SHUI', 'selw', handleselectwindowUPP, false); ! #if TARGET_API_MAC_CARBON ! if (handleselectwindowDesc != nil) ! DisposeAEEventHandlerUPP(handleselectwindowDesc); ! DisposeComponentFunctionUPP(windowcandofunctionDesc); ! DisposeComponentFunctionUPP(handlewindoweventcommandDesc); ! DisposeComponentFunctionUPP(windowiscardcommandDesc); ! DisposeComponentFunctionUPP(closewindowcommandDesc); ! DisposeComponentFunctionUPP(windoweditcommandDesc); ! DisposeComponentFunctionUPP(windowopencommandDesc); ! #endif ! return (err == noErr); ! } /*removewindowsharinghandlers*/ static pascal ComponentResult windowsharingdispatch (register ComponentParameters *params, Handle storage) { *************** *** 965,984 **** selfa5 = GetComponentRefcon (self); ! #ifdef THINK_C ! ! asm { ! move.l a5,clienta5 ! move.l a5,-(a7) ! move.l selfa5,a5 ! } ! ! #else ! ! clienta5 = SetUpAppA5 (); ! ! #endif #if !TARGET_API_MAC_CARBON ! SetComponentInstanceA5 ((ComponentInstance) self, selfa5); #endif --- 480,487 ---- selfa5 = GetComponentRefcon (self); ! clienta5 = SetUpAppA5 (); #if !TARGET_API_MAC_CARBON ! SetComponentInstanceA5 ((ComponentInstance) self, selfa5); #endif *************** *** 1000,1003 **** --- 503,507 ---- case kComponentCloseSelect: + disposecomponentglobals ((hdlcomponentglobals) storage); *************** *** 1013,1016 **** --- 517,521 ---- case kComponentCanDoSelect: + result = CallComponentFunction (params, windowcandofunctionUPP); *************** *** 1018,1026 **** case kComponentVersionSelect: result = 0x04100100; ! break; case wsEventHandlerCommand: result = callosafunction (storage, params, handlewindoweventcommandUPP); --- 523,533 ---- case kComponentVersionSelect: + result = 0x04100100; ! break; case wsEventHandlerCommand: + result = callosafunction (storage, params, handlewindoweventcommandUPP); *************** *** 1028,1031 **** --- 535,539 ---- case wsWindowIsCardCommand: + result = CallComponentFunctionWithStorage (storage, params, windowiscardcommandUPP); *************** *** 1033,1036 **** --- 541,545 ---- case wsCloseWindowCommand: + result = callosafunction (storage, params, closewindowcommandUPP); *************** *** 1038,1041 **** --- 547,551 ---- case wsEditCommand: + result = callosafunction (storage, params, windoweditcommandUPP); *************** *** 1043,1046 **** --- 553,557 ---- case wsRunFromHandleCommand: + result = callosafunction (storage, params, windowopencommandUPP); *************** *** 1048,1051 **** --- 559,563 ---- default: + result = badComponentSelector; *************** *** 1066,1072 **** #if !TARGET_API_MAC_CARBON ! RememberA5 (); #endif comp = osaregistercomponent (wsComponentType, 0, &windowsharingdispatch, frontierstring, windowsharingcomponentstring); --- 578,593 ---- #if !TARGET_API_MAC_CARBON ! RememberA5 (); #endif + #if TARGET_API_MAC_CARBON + windowcandofunctionDesc = NewComponentFunctionUPP((ProcPtr) windowcandofunction, windowcandofunctionProcInfo); + handlewindoweventcommandDesc = NewComponentFunctionUPP((ProcPtr) handlewindoweventcommand, handlewindoweventcommandProcInfo); + windowiscardcommandDesc = NewComponentFunctionUPP((ProcPtr) windowiscardcommand, windowiscardcommandProcInfo); + closewindowcommandDesc = NewComponentFunctionUPP((ProcPtr) closewindowcommand, closewindowcommandProcInfo); + windoweditcommandDesc = NewComponentFunctionUPP((ProcPtr) windoweditcommand, windoweditcommandProcInfo); + windowopencommandDesc = NewComponentFunctionUPP((ProcPtr) windowopencommand, windowopencommandProcInfo); + #endif + comp = osaregistercomponent (wsComponentType, 0, &windowsharingdispatch, frontierstring, windowsharingcomponentstring); *************** *** 1078,1082 **** return (true); } /*initwindowsharingcomponent*/ - - - #endif --- 599,600 ---- |
|
From: Andre R. <and...@us...> - 2004-10-28 20:03:09
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12048/Frontier/Common/source Modified Files: osamenus.c Log Message: Added comment about this file not being used on Carbon. Index: osamenus.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osamenus.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osamenus.c 23 Oct 2004 22:46:55 -0000 1.2 --- osamenus.c 28 Oct 2004 20:02:58 -0000 1.3 *************** *** 30,33 **** --- 30,38 ---- reconciled later.*/ + /* + 2004-10-28 aradke: Menusharing won't work on Carbon. + This file is only relevant for the classic Mac OS version. + */ + #if TARGET_API_MAC_CARBON == 1 |
|
From: Andre R. <and...@us...> - 2004-10-28 19:59:49
|
Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11105/Frontier/build_XCode/Frontier.xcode Modified Files: project.pbxproj Log Message: Removed osamenus.c from project since the code isn't used anyway. Menusharing is incompatible with Carbon. Index: project.pbxproj =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** project.pbxproj 28 Oct 2004 00:21:08 -0000 1.8 --- project.pbxproj 28 Oct 2004 19:59:38 -0000 1.9 *************** *** 503,507 **** 6515276E072BFC6800411831, 6515276F072BFC6800411831, - 65152770072BFC6800411831, 65152771072BFC6800411831, 65152772072BFC6800411831, --- 503,506 ---- *************** *** 2899,2903 **** 65152667072BFC6800411831, 65152668072BFC6800411831, - 65152669072BFC6800411831, 6515266A072BFC6800411831, 6515266B072BFC6800411831, --- 2898,2901 ---- *************** *** 2924,2935 **** sourceTree = SOURCE_ROOT; }; - 65152669072BFC6800411831 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = osamenus.c; - path = ../Common/source/osamenus.c; - refType = 2; - sourceTree = SOURCE_ROOT; - }; 6515266A072BFC6800411831 = { isa = PBXFileReference; --- 2922,2925 ---- *************** *** 4629,4638 **** }; }; - 65152770072BFC6800411831 = { - fileRef = 65152669072BFC6800411831; - isa = PBXBuildFile; - settings = { - }; - }; 65152771072BFC6800411831 = { fileRef = 6515266A072BFC6800411831; --- 4619,4622 ---- |
|
From: Andre R. <and...@us...> - 2004-10-28 19:57:40
|
Update of /cvsroot/frontierkernel/Frontier/build_CWPro8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10276/Frontier/build_CWPro8 Modified Files: Frontier.mcp Log Message: Remove osamenus.c from Carbon targets since the code isn't used anyway. Menusharing is incompatible with Carbon. Index: Frontier.mcp =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_CWPro8/Frontier.mcp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsjZSsSh and /tmp/cvsHR6WEd differ |
|
From: Andre R. <and...@us...> - 2004-10-28 19:55:10
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9659/Frontier/Common/source Modified Files: osacomponent.c Log Message: Call initosaservers just once in osacomponentstart. Index: osacomponent.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osacomponent.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** osacomponent.c 28 Oct 2004 12:19:21 -0000 1.4 --- osacomponent.c 28 Oct 2004 19:54:59 -0000 1.5 *************** *** 6159,6166 **** GetCurrentProcess (&homepsn); ! #if !TARGET_API_MAC_CARBON ! if (!initosaservers ()) ! return (false); ! #endif initosacomponent (); --- 6159,6164 ---- GetCurrentProcess (&homepsn); ! if (!initosaservers ()) ! return (false); initosacomponent (); *************** *** 6186,6192 **** AEInstallCoercionHandler (typeType, typeObjectSpecifier, coerceTypetoObjUPP, 0, true, true); - if (!initosaservers ()) - return (false); - return (newclearhandle (longsizeof (tyclientlist), (Handle *) &hclientlist)); } /*osacomponentstart*/ --- 6184,6187 ---- |
|
From: Henri A. <has...@us...> - 2004-10-28 17:22:23
|
Update of /cvsroot/frontierkernel/Frontier/Common/SystemHeaders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1483 Modified Files: standard.h Log Message: Fix of 'statement with no effect' fix. Index: standard.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/standard.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** standard.h 24 Oct 2004 17:12:23 -0000 1.4 --- standard.h 28 Oct 2004 17:22:10 -0000 1.5 *************** *** 55,62 **** #define diskshort(x) x #define memshort(x) x ! #define disktomemshort(x) ((void *)0) ! #define disktomemlong(x) ((void *)0) ! #define memtodiskshort(x) ((void *)0) ! #define memtodisklong(x) ((void *)0) #endif --- 55,62 ---- #define diskshort(x) x #define memshort(x) x ! #define disktomemshort(x) ! #define disktomemlong(x) ! #define memtodiskshort(x) ! #define memtodisklong(x) #endif |
|
From: Henri A. <has...@us...> - 2004-10-28 17:22:18
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1454 Modified Files: strings.c Log Message: Fix of 'statement with no effect' fix. Index: strings.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/strings.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** strings.c 28 Oct 2004 01:51:26 -0000 1.3 --- strings.c 28 Oct 2004 17:22:04 -0000 1.4 *************** *** 1962,1966 **** if ((number < -32768) || (number > 32767)) { ! if (memtodisklong (number)) { }; /* hra 10/27/04: bypass 'statement with no effect' warning */ bytestohexstring (&number, sizeof (long), bshex); --- 1962,1966 ---- if ((number < -32768) || (number > 32767)) { ! memtodisklong (number); bytestohexstring (&number, sizeof (long), bshex); *************** *** 1971,1975 **** short x = number; ! if (memtodiskshort (x)) { }; /* hra 10/27/04: bypass 'statement with no effect' warning */ bytestohexstring (&x, sizeof (short), bshex); --- 1971,1975 ---- short x = number; ! memtodiskshort (x); bytestohexstring (&x, sizeof (short), bshex); |
|
From: Andre R. <and...@us...> - 2004-10-28 12:29:57
|
Update of /cvsroot/frontierkernel/Frontier/Common/SystemHeaders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26682/Frontier/Common/SystemHeaders Modified Files: SetUpA5.h Log Message: Eliminated GCC compiler warning about unused __appA5. Index: SetUpA5.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/SetUpA5.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SetUpA5.h 9 Oct 2004 06:17:38 -0000 1.1 --- SetUpA5.h 28 Oct 2004 12:29:48 -0000 1.2 *************** *** 92,97 **** #else ! static long __appA5; ! #endif --- 92,99 ---- #else ! #if !TARGET_API_MAC_CARBON ! static long __appA5; /* 2004-10-28 aradke: not used on Carbon */ ! #endif ! #endif *************** *** 99,132 **** //A5 worlds have no relvance in Carbon so just define them away. #if TARGET_API_MAC_CARBON == 1 ! #define RememberA5() ! ! #define SetUpThisA5(A5) nil ! ! #define SetUpAppA5() nil ! #define SetUpCurA5() nil ! #define RestoreA5(savedA5) ! ! #define pushA5() ! ! #define popA5() #else ! #define RememberA5() do {__appA5 = (long) LMGetCurrentA5 ();} while (0) ! ! #define SetUpThisA5(A5) SetA5 (A5) ! ! #define SetUpAppA5() SetA5 (__appA5); ! ! // #define SetUpCurA5() do { savedA5 = SetA5 ((long) LMGetCurrentA5 ()); } while (0) ! ! #define SetUpCurA5() SetCurrentA5 (); ! ! #define RestoreA5(savedA5) SetA5 (savedA5) ! ! #define pushA5() SetUpCurA5 () ! ! #define popA5() RestoreA5 () #endif --- 101,137 ---- //A5 worlds have no relvance in Carbon so just define them away. #if TARGET_API_MAC_CARBON == 1 ! ! #define RememberA5() ! #define SetUpThisA5(A5) nil ! #define SetUpAppA5() nil ! ! #define SetUpCurA5() nil ! ! #define RestoreA5(savedA5) ! ! #define pushA5() ! ! #define popA5() ! #else ! #define RememberA5() do {__appA5 = (long) LMGetCurrentA5 ();} while (0) ! ! #define SetUpThisA5(A5) SetA5 (A5) ! ! #define SetUpAppA5() SetA5 (__appA5); ! ! // #define SetUpCurA5() do { savedA5 = SetA5 ((long) LMGetCurrentA5 ()); } while (0) ! ! #define SetUpCurA5() SetCurrentA5 (); ! ! #define RestoreA5(savedA5) SetA5 (savedA5) ! ! #define pushA5() SetUpCurA5 () ! ! #define popA5() RestoreA5 () ! #endif |
|
From: Andre R. <and...@us...> - 2004-10-28 12:19:36
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24102/Frontier/Common/source Modified Files: osacomponent.c Log Message: Major overhaul: Reconciled implementations for Carbon and Classic into a single implementation. Also eliminated some GCC compiler warnings. Index: osacomponent.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osacomponent.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** osacomponent.c 26 Oct 2004 22:33:35 -0000 1.3 --- osacomponent.c 28 Oct 2004 12:19:21 -0000 1.4 *************** *** 29,37 **** /*This file has been forked to protect the shipping version. The Carbon version is at the top, the "good" version at the bottom. This file should be reconciled later.*/ ! ! #if TARGET_API_MAC_CARBON == 1 ! ! ! /*copyright 1992-1993, UserLand Software, Inc.*/ //#pragma options (pack_enums) /* 2002-10-13 AR: pragma not supported by CodeWarrior */ --- 29,35 ---- [...9806 lines suppressed...] return (newclearhandle (longsizeof (tyclientlist), (Handle *) &hclientlist)); } /*osacomponentstart*/ - #endif - --- 6181,6193 ---- #if TARGET_API_MAC_CARBON ! coerceTypetoObjDesc = NewAECoerceDescUPP((AECoerceDescProcPtr)coerceTypetoObj); #endif ! AEInstallCoercionHandler (typeType, typeObjectSpecifier, coerceTypetoObjUPP, 0, true, true); if (!initosaservers ()) return (false); return (newclearhandle (longsizeof (tyclientlist), (Handle *) &hclientlist)); } /*osacomponentstart*/ |
|
From: Henri A. <has...@us...> - 2004-10-28 01:51:37
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26314 Modified Files: error.c strings.c aeutils.c Log Message: Removed some warnings. Index: aeutils.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/aeutils.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aeutils.c 23 Oct 2004 22:11:18 -0000 1.2 --- aeutils.c 28 Oct 2004 01:51:26 -0000 1.3 *************** *** 109,113 **** return (AECreateDesc (typeNull, nil, 0, desc) != noErr); ! } /*newdescnull*/ boolean newdescnull (AEDesc *desc, DescType typeCode) { // MJL 08/12/03: Broken boolean obj spec fix AEInitializeDescInline (desc); --- 109,113 ---- return (AECreateDesc (typeNull, nil, 0, desc) != noErr); ! } #*newdescnull*/ boolean newdescnull (AEDesc *desc, DescType typeCode) { // MJL 08/12/03: Broken boolean obj spec fix AEInitializeDescInline (desc); Index: strings.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/strings.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** strings.c 23 Oct 2004 22:58:38 -0000 1.2 --- strings.c 28 Oct 2004 01:51:26 -0000 1.3 *************** *** 190,194 **** short comparestrings (bigstring bs1, bigstring bs2) { ! /* return zero if the two strings (pascal type, with length-byte) are equal. return -1 if bs1 is less than bs2, or +1 if bs1 is greater than --- 190,194 ---- short comparestrings (bigstring bs1, bigstring bs2) { ! #* return zero if the two strings (pascal type, with length-byte) are equal. return -1 if bs1 is less than bs2, or +1 if bs1 is greater than *************** *** 200,204 **** return (IUCompString (bs1, bs2)); ! } /*comparestrings*/ #endif --- 200,204 ---- return (IUCompString (bs1, bs2)); ! } #*comparestrings*/ #endif *************** *** 381,385 **** pushstring (bsboo, bsdest); ! } /*pushboolean*/ --- 381,385 ---- pushstring (bsboo, bsdest); ! } #*pushboolean*/ *************** *** 392,396 **** pushstring (bsres, bs); ! } /*pushstringresource*/ --- 392,396 ---- pushstring (bsres, bs); ! } #*pushstringresource*/ *************** *** 956,960 **** long i; ! i = (chdelim, stringbaseaddress (bs), stringlength (bs)); if (i >= 0) --- 956,960 ---- long i; ! i = langcommentdelete (chdelim, stringbaseaddress (bs), stringlength (bs)); if (i >= 0) *************** *** 1179,1183 **** */ ! register len; if (bssource == nil) { /*special case, handled at lowest level*/ --- 1179,1183 ---- */ ! register short len; if (bssource == nil) { /*special case, handled at lowest level*/ *************** *** 1491,1495 **** } /*for*/ ! /***subtractstrings (bsresult, "\p ÒÓ", bsresult); /*in case there was a missing param*/ } /*parsedialogstring*/ --- 1491,1495 ---- } /*for*/ ! /***subtractstrings (bsresult, "\p ÒÓ", bsresult); #*in case there was a missing param*/ } /*parsedialogstring*/ *************** *** 1962,1966 **** if ((number < -32768) || (number > 32767)) { ! memtodisklong (number); bytestohexstring (&number, sizeof (long), bshex); --- 1962,1966 ---- if ((number < -32768) || (number > 32767)) { ! if (memtodisklong (number)) { }; /* hra 10/27/04: bypass 'statement with no effect' warning */ bytestohexstring (&number, sizeof (long), bshex); *************** *** 1971,1975 **** short x = number; ! memtodiskshort (x); bytestohexstring (&x, sizeof (short), bshex); --- 1971,1975 ---- short x = number; ! if (memtodiskshort (x)) { }; /* hra 10/27/04: bypass 'statement with no effect' warning */ bytestohexstring (&x, sizeof (short), bshex); *************** *** 2427,2431 **** sethandlesize (hresult, ctansibytes); ! sethandlesize (hresult, gethandlesize (hresult) - 1); /*pop trailing terminator*/ #endif --- 2427,2431 ---- sethandlesize (hresult, ctansibytes); ! sethandlesize (hresult, gethandlesize (hresult) - 1); #*pop trailing terminator*/ #endif *************** *** 2441,2448 **** */ - long lentext = gethandlesize (h); - #ifdef WIN95VERSION ! Handle htemp; --- 2441,2448 ---- */ #ifdef WIN95VERSION ! ! long lentext = gethandlesize (h); ! Handle htemp; *************** *** 2470,2473 **** --- 2470,2475 ---- /* OSErr err = noErr; + + long lentext = gethandlesize (h); TECObjectRef converter; *************** *** 2479,2487 **** (*h) [lentext] = '\0'; ! err = TECCreateConverter (&converter, 0x08000100, kTextEncodingWindowsLatin1); /*0x08000100 is UTF-8*/ /* sethandlesize (hresult, lentext * 2); ! if (((*h) [0] == '\xFF') || ((*h) [0] == '\xEF')) /*pop byte order mark*/ /* pullfromhandle (h, 0, 3, NULL); --- 2481,2489 ---- (*h) [lentext] = '\0'; ! err = TECCreateConverter (&converter, 0x08000100, kTextEncodingWindowsLatin1); #*0x08000100 is UTF-8*/ /* sethandlesize (hresult, lentext * 2); ! if (((*h) [0] == '\xFF') || ((*h) [0] == '\xEF')) #*pop byte order mark*/ /* pullfromhandle (h, 0, 3, NULL); *************** *** 2497,2501 **** sethandlesize (hresult, ctansibytes); ! sethandlesize (hresult, gethandlesize (hresult) - 1); /*pop trailing terminator*/ #endif --- 2499,2503 ---- sethandlesize (hresult, ctansibytes); ! sethandlesize (hresult, gethandlesize (hresult) - 1); #*pop trailing terminator*/ #endif Index: error.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/error.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** error.c 23 Oct 2004 22:17:07 -0000 1.2 --- error.c 28 Oct 2004 01:51:26 -0000 1.3 *************** *** 51,55 **** short errornumber; /*an error result passed back by a Mac system routine*/ ! /***short errorindex; /*index into the STR# resource for the appropriate message*/ } --- 51,55 ---- short errornumber; /*an error result passed back by a Mac system routine*/ ! /***short errorindex; #*index into the STR# resource for the appropriate message*/ } *************** *** 58,154 **** systemerrortable [ctsystemerrors] = { ! -33, //dirFulErr ! -34, //dskFulErr ! -35, //nsvErr ! -36, //ioErr ! -37, //bdNamErr ! -38, //fnOpnErr ! -39, //eofErr ! -40, //posErr ! -41, //mFulErr ! -42, //tmfoErr ! -43, //fnfErr ! -44, //wPrErr ! -45, //fLckdErr ! -46, //vLckdErr ! -47, //fBsyErr ! -48, //dupFNErr ! -49, //opWrErr ! -50, ! -51, //rfNumErr ! -52, //gfpErr ! -53, //volOffLinErr ! -54, //permErr ! -55, //volOnLinErr ! -56, //nsDrvErr ! -57, //noMacDskErr ! -58, //extFSErr ! -59, //fsRnErr ! -60, //badMDBErr ! -61, //wrPermErr ! -64, //noDriveErr ! -65, //offLinErr ! -66, //noNybErr ! -67, //noAdrMkErr ! -68, //dataVerErr ! -69, //badCksmErr ! -70, //badBtSlpErr ! -71, //noDtaMkErr ! -72, //badDCksum ! -73, ! -74, ! -75, ! -76, ! -77, ! -78, ! -79, ! -80, ! -81, ! -120, //dirNFErr ! -121, ! -122, //badMovErr ! -123, //wrgVolTypErr ! -192, //resNotFound ! -193, //resFNotFound ! -194, //addResFailed ! -196, //rmvResFailed ! -198, //resAttrErr ! -199, //mapReadErr ! -100, ! -102, ! -108, //memFullErr ! -109, //nilHandleErr ! -111, ! -112, ! -117, ! -1703, ! -1719, ! -1704, ! -1705, ! -1708, ! -1712, ! -1711, ! -906, ! -1700, ! -1701, ! -1723, ! -1728, ! -5000, ! -5016, ! -5019, ! -5023, ! -5063, ! -10000, ! -10007, ! -10011, ! -10003, ! -10014, ! errAENewerVersion, ! errOSAScriptError, ! errAECantHandleClass, ! connectionInvalid, ! noUserInteractionAllowed, ! errOSASourceNotAvailable }; /*systemerrortable*/ --- 58,155 ---- systemerrortable [ctsystemerrors] = { ! {-33}, //dirFulErr ! {-34}, //dskFulErr ! {-35}, //nsvErr ! {-36}, //ioErr ! {-37}, //bdNamErr ! {-38}, //fnOpnErr ! {-39}, //eofErr ! {-40}, //posErr ! {-41}, //mFulErr ! {-42}, //tmfoErr ! {-43}, //fnfErr ! {-44}, //wPrErr ! {-45}, //fLckdErr ! {-46}, //vLckdErr ! {-47}, //fBsyErr ! {-48}, //dupFNErr ! {-49}, //opWrErr ! {-50}, ! {-51}, //rfNumErr ! {-52}, //gfpErr ! {-53}, //volOffLinErr ! {-54}, //permErr ! {-55}, //volOnLinErr ! {-56}, //nsDrvErr ! {-57}, //noMacDskErr ! {-58}, //extFSErr ! {-59}, //fsRnErr ! {-60}, //badMDBErr ! {-61}, //wrPermErr ! {-64}, //noDriveErr ! {-65}, //offLinErr ! {-66}, //noNybErr ! {-67}, //noAdrMkErr ! {-68}, //dataVerErr ! {-69}, //badCksmErr ! {-70}, //badBtSlpErr ! {-71}, //noDtaMkErr ! {-72}, //badDCksum ! {-73}, ! {-74}, ! {-75}, ! {-76}, ! {-77}, ! {-78}, ! {-79}, ! {-80}, ! {-81}, ! {-120}, //dirNFErr ! {-121}, ! {-122}, //badMovErr ! {-123}, //wrgVolTypErr ! {-192}, //resNotFound ! {-193}, //resFNotFound ! {-194}, //addResFailed ! {-196}, //rmvResFailed ! {-198}, //resAttrErr ! {-199}, //mapReadErr ! {-100}, ! {-102}, ! {-108}, //memFullErr ! {-109}, //nilHandleErr ! {-111}, ! {-112}, ! {-117}, ! {-1703}, ! {-1719}, ! {-1704}, ! {-1705}, ! {-1708}, ! {-1712}, ! {-1711}, ! {-906}, ! {-1700}, ! {-1701}, ! {-1723}, ! {-1728}, ! {-5000}, ! {-5016}, ! {-5019}, ! {-5023}, ! {-5063}, ! {-10000}, ! {-10007}, ! {-10011}, ! {-10003}, ! {-10014}, ! {errAENewerVersion}, ! {errOSAScriptError}, ! {errAECantHandleClass}, ! {connectionInvalid}, ! {noUserInteractionAllowed}, ! {errOSASourceNotAvailable} ! }; /*systemerrortable*/ *************** *** 159,249 **** systemerrortable [ctsystemerrors] = { ! -33, //dirFulErr ! -34, //dskFulErr ! -35, //nsvErr ! -36, //ioErr ! -37, //bdNamErr ! -38, //fnOpnErr ! -39, //eofErr ! -40, //posErr ! -41, //mFulErr ! ERROR_TOO_MANY_OPEN_FILES, //tmfoErr ! ERROR_FILE_NOT_FOUND, //fnfErr ! -44, //wPrErr ! -45, //fLckdErr ! -46, //vLckdErr ! ERROR_SHARING_VIOLATION, //fBsyErr ! -48, //dupFNErr ! -49, //opWrErr ! -50, ! -51, //rfNumErr ! -52, //gfpErr ! -53, //volOffLinErr ! -54, //permErr ! -55, //volOnLinErr ! -56, //nsDrvErr ! -57, //noMacDskErr ! -58, //extFSErr ! -59, //fsRnErr ! -60, //badMDBErr ! -61, //wrPermErr ! -64, //noDriveErr ! -65, //offLinErr ! -66, //noNybErr ! -67, //noAdrMkErr ! -68, //dataVerErr ! -69, //badCksmErr ! -70, //badBtSlpErr ! -71, //noDtaMkErr ! -72, //badDCksum ! -73, ! -74, ! -75, ! -76, ! -77, ! -78, ! -79, ! -80, ! -81, ! ERROR_PATH_NOT_FOUND, //dirNFErr ! -121, ! -122, //badMovErr ! -123, //wrgVolTypErr ! -192, //resNotFound ! -193, //resFNotFound ! -194, //addResFailed ! -196, //rmvResFailed ! -198, //resAttrErr ! -199, //mapReadErr ! -100, ! -102, ! ERROR_OUTOFMEMORY, //memFullErr ! -109, //nilHandleErr ! -111, ! -112, ! -117, ! -1703, ! -1719, ! -1704, ! -1705, ! -1708, ! -1712, ! -1711, ! -906, ! -1700, ! -1701, ! -1723, ! -1728, ! ERROR_ACCESS_DENIED, ! -5016, ! -5019, ! -5023, ! -5063, ! -10000, ! -10007, ! -10011, ! -10003, ! -10014, ! }; /*systemerrortable*/ --- 160,250 ---- systemerrortable [ctsystemerrors] = { ! {-33}, //dirFulErr ! {-34}, //dskFulErr ! {-35}, //nsvErr ! {-36}, //ioErr ! {-37}, //bdNamErr ! {-38}, //fnOpnErr ! {-39}, //eofErr ! {-40}, //posErr ! {-41}, //mFulErr ! {ERROR_TOO_MANY_OPEN_FILES}, //tmfoErr ! {ERROR_FILE_NOT_FOUND}, //fnfErr ! {-44}, //wPrErr ! {-45}, //fLckdErr ! {-46}, //vLckdErr ! {ERROR_SHARING_VIOLATION}, //fBsyErr ! {-48}, //dupFNErr ! {-49}, //opWrErr ! {-50}, ! {-51}, //rfNumErr ! {-52}, //gfpErr ! {-53}, //volOffLinErr ! {-54}, //permErr ! {-55}, //volOnLinErr ! {-56}, //nsDrvErr ! {-57}, //noMacDskErr ! {-58}, //extFSErr ! {-59}, //fsRnErr ! {-60}, //badMDBErr ! {-61}, //wrPermErr ! {-64}, //noDriveErr ! {-65}, //offLinErr ! {-66}, //noNybErr ! {-67}, //noAdrMkErr ! {-68}, //dataVerErr ! {-69}, //badCksmErr ! {-70}, //badBtSlpErr ! {-71}, //noDtaMkErr ! {-72}, //badDCksum ! {-73}, ! {-74}, ! {-75}, ! {-76}, ! {-77}, ! {-78}, ! {-79}, ! {-80}, ! {-81}, ! {ERROR_PATH_NOT_FOUND}, //dirNFErr ! {-121}, ! {-122}, //badMovErr ! {-123}, //wrgVolTypErr ! {-192}, //resNotFound ! {-193}, //resFNotFound ! {-194}, //addResFailed ! {-196}, //rmvResFailed ! {-198}, //resAttrErr ! {-199}, //mapReadErr ! {-100}, ! {-102}, ! {ERROR_OUTOFMEMORY}, //memFullErr ! {-109}, //nilHandleErr ! {-111}, ! {-112}, ! {-117}, ! {-1703}, ! {-1719}, ! {-1704}, ! {-1705}, ! {-1708}, ! {-1712}, ! {-1711}, ! {-906}, ! {-1700}, ! {-1701}, ! {-1723}, ! {-1728}, ! {ERROR_ACCESS_DENIED}, ! {-5016}, ! {-5019}, ! {-5023}, ! {-5063}, ! {-10000}, ! {-10007}, ! {-10011}, ! {-10003}, ! {-10014}, ! }; /*systemerrortable*/ *************** *** 263,267 **** ! setoserrorparam (bigstring bs) { return (setparseparams (bs, nil, nil, nil)); --- 264,268 ---- ! boolean setoserrorparam (bigstring bs) { return (setparseparams (bs, nil, nil, nil)); *************** *** 278,282 **** copystring (lasterrormessage, bs); ! } /*getoserrormessage*/ --- 279,283 ---- copystring (lasterrormessage, bs); ! } #*getoserrormessage*/ |
|
From: Henri A. <has...@us...> - 2004-10-28 01:51:30
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26291 Modified Files: strings.h error.h Log Message: Removed some warnings. Index: strings.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/strings.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** strings.h 17 Oct 2004 12:03:15 -0000 1.2 --- strings.h 28 Oct 2004 01:51:21 -0000 1.3 *************** *** 225,229 **** extern boolean pushchar (byte, bigstring); ! extern pushstringresource (short, short, bigstring); extern boolean insertstring (bigstring, bigstring); --- 225,229 ---- extern boolean pushchar (byte, bigstring); ! extern boolean pushstringresource (short, short, bigstring); extern boolean insertstring (bigstring, bigstring); Index: error.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/error.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** error.h 9 Oct 2004 20:54:26 -0000 1.1 --- error.h 28 Oct 2004 01:51:21 -0000 1.2 *************** *** 29,33 **** /*prototypes*/ ! extern setoserrorparam (bigstring); extern OSErr getoserror (void); --- 29,33 ---- /*prototypes*/ ! extern boolean setoserrorparam (bigstring); extern OSErr getoserror (void); |
|
From: Henri A. <has...@us...> - 2004-10-28 00:21:17
|
Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4204 Modified Files: project.pbxproj Log Message: Added Info.plist to describe the Frontier.app bundle. An icons file needs to be created and linked in via Info.plist to display the icon for the bundle. Index: project.pbxproj =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.pbxproj 27 Oct 2004 09:27:00 -0000 1.7 --- project.pbxproj 28 Oct 2004 00:21:08 -0000 1.8 *************** *** 8,11 **** --- 8,12 ---- 6515255C072BFC6500411831 = { children = ( + BB3B83610730603C0049D0C1, 6515256C072BFC6700411831, 65152571072BFC6700411831, *************** *** 558,561 **** --- 559,563 ---- buildActionMask = 2147483647; files = ( + BB3B83630730604B0049D0C1, ); isa = PBXResourcesBuildPhase; *************** *** 626,629 **** --- 628,632 ---- GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; + INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ../Common/Paige; OTHER_CFLAGS = "-fno-inline -malign-mac68k "; *************** *** 8171,8174 **** --- 8174,8210 ---- }; }; + //650 + //651 + //652 + //653 + //654 + //BB0 + //BB1 + //BB2 + //BB3 + //BB4 + BB3B83610730603C0049D0C1 = { + children = ( + BB3B83620730604B0049D0C1, + ); + isa = PBXGroup; + name = Resources; + refType = 4; + sourceTree = "<group>"; + }; + BB3B83620730604B0049D0C1 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = Info.plist; + refType = 2; + sourceTree = SOURCE_ROOT; + }; + BB3B83630730604B0049D0C1 = { + fileRef = BB3B83620730604B0049D0C1; + isa = PBXBuildFile; + settings = { + }; + }; }; rootObject = 65152560072BFC6500411831; |
|
From: Henri A. <has...@us...> - 2004-10-28 00:21:12
|
Update of /cvsroot/frontierkernel/Frontier/build_XCode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4163 Added Files: Info.plist Log Message: Added Info.plist to describe the Frontier.app bundle. An icons file needs to be created and linked in via Info.plist to display the icon for the bundle. --- NEW FILE: Info.plist --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleDocumentTypes</key> <array> <dict> <key>CFBundleTypeExtensions</key> <array> <string>.root</string> </array> <key>CFBundleTypeName</key> <string>Frontier Root</string> </dict> </array> <key>CFBundleExecutable</key> <string>${PRODUCT_NAME}</string> <key>CFBundleIdentifier</key> <string>com.scripting.Frontier</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> <string>${DYLIB_CURRENT_VERSION}</string> </dict> </plist> |
|
From: Andre R. <and...@us...> - 2004-10-27 18:58:04
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18155/Frontier/Common/source Modified Files: shellsysverbs.c Log Message: Frontier.isPowerPC() incorrectly returned false when running the Carbon/Mach-O build. Fixed. Index: shellsysverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellsysverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellsysverbs.c 23 Oct 2004 22:56:06 -0000 1.2 --- shellsysverbs.c 27 Oct 2004 18:57:55 -0000 1.3 *************** *** 913,917 **** case isnativefunc: ! #if __powerc (*v).data.flvalue = true; #else --- 913,917 ---- case isnativefunc: ! #if __powerc || __GNUC__ (*v).data.flvalue = true; #else |
|
From: Andre R. <and...@us...> - 2004-10-27 09:28:50
|
Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32195/Frontier/build_Xcode/Frontier.xcode Added Files: .cvsignore Log Message: Ignore *.pbxuser and *.mode1 files. --- NEW FILE: .cvsignore --- *.pbxuser *.mode1 |
1 message has been excluded from this view by a project administrator.
