fixing incompatibility to orignal sharp rom

2 files changed, 21 insertions, 1 deletions

diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index dab128e..2f22c20 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1114,202 +1114,207 @@ static void writeValue(OFile *fp, VObject *o, unsigned long size)
             char buf[16];
             sprintf(buf,"%lu", LONG_VALUE_OF(o));
             appendsOFile(fp,buf);
             break;
             }
         case VCVT_RAW: {
             appendcOFile(fp,'\n');
             writeBase64(fp,(unsigned char*)(ANY_VALUE_OF(o)),size);
             break;
             }
         case VCVT_VOBJECT:
             appendcOFile(fp,'\n');
             writeVObject_(fp,VOBJECT_VALUE_OF(o));
             break;
         }
 }
 
 static void writeAttrValue(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         pi = lookupPropInfo(NAME_OF(o));
         if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;
         if ( includesUnprintable(o) ) {
             appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
             appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
         }
         appendcOFile(fp,';');
         appendsOFile(fp,NAME_OF(o));
         }
     else
         appendcOFile(fp,';');
     if (VALUE_TYPE(o)) {
         appendcOFile(fp,'=');
         writeValue(fp,o,0);
         }
 }
 
 static void writeGroup(OFile *fp, VObject *o)
 {
     char buf1[256];
     char buf2[256];
     strcpy(buf1,NAME_OF(o));
     while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
         strcpy(buf2,STRINGZ_VALUE_OF(o));
         strcat(buf2,".");
         strcat(buf2,buf1);
         strcpy(buf1,buf2);
         }
     appendsOFile(fp,buf1);
 }
 
 static int inList(const char **list, const char *s)
 {
     if (list == 0) return 0;
     while (*list) {
         if (qstricmp(*list,s) == 0) return 1;
         list++;
         }
     return 0;
 }
 
 static void writeProp(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         VObjectIterator t;
         const char **fields_ = 0;
         pi = lookupPropInfo(NAME_OF(o));
         if (pi && ((pi->flags & PD_BEGIN) != 0)) {
             writeVObject_(fp,o);
             return;
             }
         if (isAPropertyOf(o,VCGroupingProp))
             writeGroup(fp,o);
         else
             appendsOFile(fp,NAME_OF(o));
         if (pi) fields_ = pi->fields;
         initPropIterator(&t,o);
         while (moreIteration(&t)) {
             const char *s;
             VObject *eachProp = nextVObject(&t);
             s = NAME_OF(eachProp);
             if (qstricmp(VCGroupingProp,s) && !inList(fields_,s))
                 writeAttrValue(fp,eachProp);
             }
         if (fields_) {
             int i = 0, n = 0;
             const char** fields = fields_;
             /* output prop as fields */
             bool printable = TRUE;
             while (*fields && printable) {
                 VObject *t = isAPropertyOf(o,*fields);
                 if (includesUnprintable(t))
                     printable = FALSE;
                 fields++;
             }
             fields = fields_;
             if (!printable) {
                 appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
                 appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
             }
             appendcOFile(fp,':');
             while (*fields) {
                 VObject *t = isAPropertyOf(o,*fields);
                 i++;
                 if (t) n = i;
                 fields++;
             }
             fields = fields_;
             for (i=0;i<n;i++) {
                 writeValue(fp,isAPropertyOf(o,*fields),0);
                 fields++;
                 if (i<(n-1)) appendcOFile(fp,';');
             }
             }
         }
 
 
     if (VALUE_TYPE(o)) {
             if ( includesUnprintable(o) ) {
             appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
             appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
         }
         unsigned long size = 0;
         VObject *p = isAPropertyOf(o,VCDataSizeProp);
         if (p) size = LONG_VALUE_OF(p);
         appendcOFile(fp,':');
         writeValue(fp,o,size);
         }
 
     appendcOFile(fp,'\n');
 }
 
 static void writeVObject_(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         pi = lookupPropInfo(NAME_OF(o));
 
         if (pi && ((pi->flags & PD_BEGIN) != 0)) {
             VObjectIterator t;
             const char *begin = NAME_OF(o);
             appendsOFile(fp,"BEGIN:");
             appendsOFile(fp,begin);
             appendcOFile(fp,'\n');
             initPropIterator(&t,o);
             while (moreIteration(&t)) {
                 VObject *eachProp = nextVObject(&t);
                 writeProp(fp, eachProp);
                 }
             appendsOFile(fp,"END:");
             appendsOFile(fp,begin);
             appendsOFile(fp,"\n\n");
             }
         }
 }
 
 void writeVObject(FILE *fp, VObject *o)
 {
     OFile ofp;
     // #####
     //_setmode(_fileno(fp), _O_BINARY);
     initOFile(&ofp,fp);
     writeVObject_(&ofp,o);
 }
 
 DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
 {
         QFileDirect f( fname);
         if ( !f.open( IO_WriteOnly ) ) {
                 qWarning("Unable to open vobject write %s", fname);
                 return;
         }
 
     writeVObject( f.directHandle(),o );
 }
 
 DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
 {
         QFileDirect f( fname);
         if ( !f.open( IO_WriteOnly ) ) {
                 qWarning("Unable to open vobject write %s", fname);
                 return;
         }
 
         while (list) {
             writeVObject(f.directHandle(),list);
             list = nextVObjectInList(list);
             }
 }
 
+#ifndef __SHARP_COMP_
+
+// This function is not available in the Sharp ROM for SL 5500 !
+// Therefore I have to move it into the header file.. (se)
+
 DLLEXPORT(const char *) vObjectTypeInfo(VObject *o)
 {
     const char *type = vObjectName( o );
     if ( strcmp( type, "TYPE" ) == 0 )
         type = vObjectStringZValue( o );
     return type;
 }
-
+#endif
 
 // end of source file vobject.c
diff --git a/library/backend/vobject_p.h b/library/backend/vobject_p.h
index 0d0a2a8..bab22bb 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -209,198 +209,213 @@ For example:
         #define VCNoteProp                      "NOTE"
         #define VCOrgNameProp           "ORGNAME"
         #define VCOrgProp                       "ORG"
         #define VCOrgUnit2Prop          "OUN2"
         #define VCOrgUnit3Prop          "OUN3"
         #define VCOrgUnit4Prop          "OUN4"
         #define VCOrgUnitProp           "OUN"
         #define VCPagerProp                     "PAGER"
         #define VCPAlarmProp            "PALARM"
         #define VCParcelProp            "PARCEL"
         #define VCPartProp                      "PART"
         #define VCPCMProp                       "PCM"
         #define VCPDFProp                       "PDF"
         #define VCPGPProp                       "PGP"
         #define VCPhotoProp                     "PHOTO"
         #define VCPICTProp                      "PICT"
         #define VCPMBProp                       "PMB"
         #define VCPostalBoxProp                 "BOX"
         #define VCPostalCodeProp        "PC"
         #define VCPostalProp            "POSTAL"
         #define VCPowerShareProp        "POWERSHARE"
         #define VCPreferredProp                 "PREF"
         #define VCPriorityProp          "PRIORITY"
         #define VCProcedureNameProp     "PROCEDURENAME"
         #define VCProdIdProp            "PRODID"
         #define VCProdigyProp           "PRODIGY"
         #define VCPronunciationProp     "SOUND"
         #define VCPSProp                        "PS"
         #define VCPublicKeyProp                 "KEY"
         #define VCQPProp                        "QP"
         #define VCQuickTimeProp                 "QTIME"
         #define VCQuotedPrintableProp"QUOTED-PRINTABLE"
         #define VCRDateProp                     "RDATE"
         #define VCRegionProp            "R"
         #define VCRelatedToProp                 "RELATED-TO"
         #define VCRepeatCountProp       "REPEATCOUNT"
         #define VCResourcesProp                 "RESOURCES"
         #define VCRNumProp                      "RNUM"
         #define VCRoleProp                      "ROLE"
         #define VCRRuleProp                     "RRULE"
         #define VCRSVPProp                      "RSVP"
         #define VCRunTimeProp           "RUNTIME"
         #define VCSequenceProp          "SEQUENCE"
         #define VCSnoozeTimeProp        "SNOOZETIME"
         #define VCStartProp                     "START"
         #define VCStatusProp            "STATUS"
         #define VCStreetAddressProp     "STREET"
         #define VCSubTypeProp           "SUBTYPE"
         #define VCSummaryProp           "SUMMARY"
         #define VCTelephoneProp                 "TEL"
         #define VCTIFFProp                      "TIFF"
         #define VCTimeZoneProp          "TZ"
         #define VCTitleProp                     "TITLE"
         #define VCTLXProp                       "TLX"
         #define VCTodoProp                      "VTODO"
         #define VCTranspProp            "TRANSP"
         #define VCUniqueStringProp      "UID"
         #define VCURLProp                       "URL"
         #define VCURLValueProp          "URLVAL"
         #define VCValueProp                     "VALUE"
         #define VCVersionProp           "VERSION"
         #define VCVideoProp                     "VIDEO"
         #define VCVoiceProp                     "VOICE"
         #define VCWAVEProp                      "WAVE"
         #define VCWMFProp                       "WMF"
         #define VCWorkProp                      "WORK"
         #define VCX400Prop                      "X400"
         #define VCX509Prop                      "X509"
         #define VCXRuleProp                     "XRULE"
 
 
 typedef struct VObject VObject;
 
 typedef struct VObjectIterator {
     VObject* start;
     VObject* next;
     } VObjectIterator;
 
 extern DLLEXPORT(VObject*) newVObject(const char *id);
 extern DLLEXPORT(void) deleteVObject(VObject *p);
 extern DLLEXPORT(char*) dupStr(const char *s, unsigned int size);
 extern DLLEXPORT(void) deleteStr(const char *p);
 extern DLLEXPORT(void) unUseStr(const char *s);
 
 extern DLLEXPORT(void) setVObjectName(VObject *o, const char* id);
 extern DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s);
 extern DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s);
 extern DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i);
 extern DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l);
 extern DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t);
 extern DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size);
 extern DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size);
 
 extern DLLEXPORT(const char*) vObjectName(VObject *o);
 extern DLLEXPORT(const char*) vObjectStringZValue(VObject *o);
 extern DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o);
 extern DLLEXPORT(unsigned long) vObjectLongValue(VObject *o);
 extern DLLEXPORT(void*) vObjectAnyValue(VObject *o);
 extern DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o);
 extern DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p);
 
 extern DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p);
 extern DLLEXPORT(VObject*) addProp(VObject *o, const char *id);
 extern DLLEXPORT(VObject*) addProp_(VObject *o, const char *id);
 extern DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v);
 extern DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
 extern DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
 extern DLLEXPORT(VObject*) addGroup(VObject *o, const char *g);
 extern DLLEXPORT(void) addList(VObject **o, VObject *p);
 
 extern DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id);
 
 extern DLLEXPORT(VObject*) nextVObjectInList(VObject *o);
 extern DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o);
 extern DLLEXPORT(int) moreIteration(VObjectIterator *i);
 extern DLLEXPORT(VObject*) nextVObject(VObjectIterator *i);
 
 extern DLLEXPORT(const char*) lookupStr(const char *s);
 extern DLLEXPORT(void) cleanStrTbl();
 
 extern DLLEXPORT(void) cleanVObject(VObject *o);
 extern DLLEXPORT(void) cleanVObjects(VObject *list);
 
 extern DLLEXPORT(const char*) lookupProp(const char* str);
 extern DLLEXPORT(const char*) lookupProp_(const char* str);
 
 extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);
 extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
 
 extern DLLEXPORT(int) vObjectValueType(VObject *o);
 
 /* return type of vObjectValueType: */
         #define VCVT_NOVALUE0
         /* if the VObject has no value associated with it. */
         #define VCVT_STRINGZ1
         /* if the VObject has value set by setVObjectStringZValue. */
         #define VCVT_UINT       2
         /* if the VObject has value set by setVObjectIntegerValue. */
         #define VCVT_ULONG             3
         /* if the VObject has value set by setVObjectLongValue. */
         #define VCVT_RAW        4
         /* if the VObject has value set by setVObjectAnyValue. */
         #define VCVT_VOBJECT5
         /* if the VObject has value set by setVObjectVObjectValue. */
 
 extern const char** fieldedProp;
 
 /***************************************************
  * The methods below are implemented in vcc.c (generated from vcc.y )
  ***************************************************/
 
 /* NOTE regarding printVObject and writeVObject
 
 The functions below are not exported from the DLL because they
 take a FILE* as a parameter, which cannot be passed across a DLL
 interface (at least that is my experience). Instead you can use
 their companion functions which take file names or pointers
 to memory. However, if you are linking this code into
 your build directly then you may find them a more convenient API
 and you can go ahead and use them. If you try to use them with
 the DLL LIB you will get a link error.
 */
 extern void writeVObject(FILE *fp, VObject *o);
 
 
 
 typedef void (*MimeErrorHandler)(char *);
 
 extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);
 
 extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);
 extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);
 
 
 /* NOTE regarding Parse_MIME_FromFile
 The function above, Parse_MIME_FromFile, comes in two flavors,
 neither of which is exported from the DLL. Each version takes
 a CFile or FILE* as a parameter, neither of which can be
 passed across a DLL interface (at least that is my experience).
 If you are linking this code into your build directly then
 you may find them a more convenient API that the other flavors
 that take a file name. If you use them with the DLL LIB you
 will get a link error.
 */
 
 
 #if INCLUDEMFC
 extern VObject* Parse_MIME_FromFile(CFile *file);
 #else
 extern VObject* Parse_MIME_FromFile(FILE *file);
 #endif
 
+#define __SHARP_COMP_
+
+#ifndef __SHARP_COMP_
 extern DLLEXPORT(const char *) vObjectTypeInfo(VObject *o);
 
+#else
+// This function is not available in the Sharp ROM for SL 5500 !
+// Therefore I have to move it into the header file.. (se)
+
+inline const char*  vObjectTypeInfo(VObject *o)
+{
+    const char *type = vObjectName( o );
+    if ( strcmp( type, "TYPE" ) == 0 )
+        type = vObjectStringZValue( o );
+    return type;
+}
+#endif
 
 #endif /* __VOBJECT_H__ */