diff --git a/.gitignore b/.gitignore index 88ac3982..a751ce22 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,57 @@ Plug-ins/SSL/SSL.xcodeproj/xcuserdata/ Plug-ins/SSL/build/ Plug-ins/vCardAdbkIO/build/ Plug-ins/vCardAdbkIO/vCardAdbkIO.xcodeproj/xcuserdata/ +Plug-ins/CommunicatorAdbkIO/CommunicatorAdbkIO.vcxproj.user +Plug-ins/CRAM-MD5/CRAM-MD5.vcxproj.user +Plug-ins/DIGEST-MD5/DIGEST-MD5.vcxproj.user +Plug-ins/Eudora4AdbkIO/Eudora4AdbkIO.vcxproj.user +Plug-ins/EudoraAdbkIO/EudoraAdbkIO.vcxproj.user +Plug-ins/GPG/GPG.vcxproj.user +Plug-ins/NetscapeAdbkIO/NetscapeAdbkIO.vcxproj.user +Plug-ins/OEAdbkIO/OEAdbkIO.vcxproj.user +Plug-ins/PineAdbkIO/PineAdbkIO.vcxproj.user +Plug-ins/PluginLibrary/PluginLib.vcxproj.user +Plug-ins/QuickmailAdbkIO/QuickmailAdbkIO.vcxproj.user +Plug-ins/QuickmailProAdbkIO/QuickmailProAdbkIO.vcxproj.user +Plug-ins/SMIME/SMIME.vcxproj.user +Plug-ins/SSL/SSL.vcxproj.user +Plug-ins/vCardAdbkIO/vCardAdbkIO.vcxproj.user +Win32/Mulberry.vcxproj.user +Plug-ins/CommunicatorAdbkIO/Debug +Plug-ins/CRAM-MD5/Debug +Plug-ins/DIGEST-MD5/Debug +Plug-ins/Eudora4AdbkIO/Debug +Plug-ins/EudoraAdbkIO/Debug +Plug-ins/GPG/Debug +Plug-ins/NetscapeAdbkIO/Debug +Plug-ins/OEAdbkIO/Debug +Plug-ins/PineAdbkIO/Debug +Plug-ins/PluginLibrary/Debug +Plug-ins/QuickmailAdbkIO/Debug +Plug-ins/QuickmailProAdbkIO/Debug +Plug-ins/SMIME/Debug +Plug-ins/SSL/Debug +Plug-ins/vCardAdbkIO/Debug +Win32/Debug +Win32/Installer/Mulberry/Debug +Plug-ins/CommunicatorAdbkIO/Release +Plug-ins/CRAM-MD5/Release +Plug-ins/DIGEST-MD5/Release +Plug-ins/Eudora4AdbkIO/Release +Plug-ins/EudoraAdbkIO/Release +Plug-ins/GPG/Release +Plug-ins/NetscapeAdbkIO/Release +Plug-ins/OEAdbkIO/Release +Plug-ins/PineAdbkIO/Release +Plug-ins/PluginLibrary/Release +Plug-ins/QuickmailAdbkIO/Release +Plug-ins/QuickmailProAdbkIO/Release +Plug-ins/SMIME/Release +Plug-ins/SSL/Release +Plug-ins/vCardAdbkIO/Release +Win32/Release +Win32/Installer/Mulberry/Release +Win32/MulberryVC10.sdf +Win32/MulberryVC10.suo +Win32/MulberryVC10.opensdf +Win32/ipch/ diff --git a/Libraries/CICalendar b/Libraries/CICalendar index a69472b9..f653890c 160000 --- a/Libraries/CICalendar +++ b/Libraries/CICalendar @@ -1 +1 @@ -Subproject commit a69472b99f73f81bfe0d3db3c9cbb6efabe1bb34 +Subproject commit f653890c9dd2715e5f6a8f8a6fb8969ab774790a diff --git a/Libraries/JX b/Libraries/JX index 3a08cdac..0db19415 160000 --- a/Libraries/JX +++ b/Libraries/JX @@ -1 +1 @@ -Subproject commit 3a08cdacfebe90784937f18dfa3b9243e19cefde +Subproject commit 0db19415b858670a37498d82649dbdbeacc598c3 diff --git a/Libraries/XMLLib b/Libraries/XMLLib index f9ad1f3b..d9294abb 160000 --- a/Libraries/XMLLib +++ b/Libraries/XMLLib @@ -1 +1 @@ -Subproject commit f9ad1f3b7f528d658fcaf4cfb5a4b8eab70f1cef +Subproject commit d9294abbe7ba2d861ff908070944728f72cac375 diff --git a/MacOS/MulberryXcode.xcodeproj/project.pbxproj b/MacOS/MulberryXcode.xcodeproj/project.pbxproj index 1d5d79f7..bcc75d64 100644 --- a/MacOS/MulberryXcode.xcodeproj/project.pbxproj +++ b/MacOS/MulberryXcode.xcodeproj/project.pbxproj @@ -5465,72 +5465,72 @@ 20286C2AFDCF999611CA2CEA /* Sources */ = { isa = PBXGroup; children = ( - 32DBCF6D0370B57F00C91783 /* MulberryXcode_Prefix.pch */, - AFCDE4930AE1795600E30447 /* Mulberry_PrefixX.h */, - AFCDD2D10AE1647A00E30447 /* os_dep.h */, - AFCDD2D20AE1647A00E30447 /* os_dep.cp */, - AFCDE48E0AE1788300E30447 /* framework.h */, + AFCDDCA10AE176DA00E30447 /* 3 Pane */, + AFCDDFD00AE176DE00E30447 /* Address */, + AFCDDE8B0AE176DC00E30447 /* Address Book */, + AFCDDE6C0AE176DC00E30447 /* Address Book Manager */, + AFCDDE820AE176DC00E30447 /* Address Search */, + AFCDDEB70AE176DD00E30447 /* App Support */, AFCDDAC80AE1769900E30447 /* Application */, + AFCDDFBD0AE176DE00E30447 /* Attachments */, + AFCDDB2A0AE176D800E30447 /* Automation */, + AFCDDCE80AE176DA00E30447 /* Calendar */, + AFCDE0400AE176DF00E30447 /* Calendar_Store */, + AFCDDFE50AE176DE00E30447 /* CICalendar */, + AFCDDF4E0AE176DD00E30447 /* Control */, + AFCDDB780AE176D900E30447 /* Errors */, + AFCDE09C0AE176DF00E30447 /* Extensions */, + AFCDDFB00AE176DE00E30447 /* Filtering */, + AFCDDE690AE176DC00E30447 /* Find & Replace Window */, AFCDDB030AE176D800E30447 /* Formatting */, + AFCDE48E0AE1788300E30447 /* framework.h */, AF2551E70C432843001AAE53 /* HTML */, - AFCDDB2A0AE176D800E30447 /* Automation */, + AFCDE05C0AE176DF00E30447 /* HTTP */, + AFCDE0EB0AE176DF00E30447 /* i18n */, + AFCDE0BA0AE176DF00E30447 /* INET Clients */, + AFCDDE4D0AE176DC00E30447 /* Letter Window */, + AFCDDEB20AE176DD00E30447 /* Macros */, + AFCDDF8D0AE176DE00E30447 /* Mailbox */, + AFCDDDD10AE176DC00E30447 /* Mailbox Info Window */, + AFCDDDC50AE176DB00E30447 /* Mailbox Window */, + AFCDDF9A0AE176DE00E30447 /* Message */, + AFCDDE320AE176DC00E30447 /* Message Window */, + AFCDE1210AE176E000E30447 /* MIME Filters */, + AF37509E0AE1DC5D00C56E20 /* More ATSUI */, + AFCDDA760AE173C700E30447 /* MoreFiles */, + AFCDDA9B0AE1751700E30447 /* MoreFilesX */, + AFCDE4930AE1795600E30447 /* Mulberry_PrefixX.h */, + 32DBCF6D0370B57F00C91783 /* MulberryXcode_Prefix.pch */, + AFCDE0B10AE176DF00E30447 /* Network */, + AFCDE0DE0AE176DF00E30447 /* Offline Clients */, + AFCDDF710AE176DE00E30447 /* Offline Mail */, + AFCDDF7C0AE176DE00E30447 /* Offline Recording */, + AFCDD2D20AE1647A00E30447 /* os_dep.cp */, + AFCDD2D10AE1647A00E30447 /* os_dep.h */, AFCDDB2F0AE176D800E30447 /* Plug-ins */, - AFCDDB750AE176D900E30447 /* Speech */, - AFCDDB780AE176D900E30447 /* Errors */, + AFCDD2E00AE164ED00E30447 /* PowerPlant */, + AFCDD89C0AE1726900E30447 /* PowerPlantX */, + AFCDE53F0AE1AC4A00E30447 /* PPOverride */, AFCDDB830AE176D900E30447 /* Preferences */, AFCDDBD30AE176D900E30447 /* Preferences Dialog */, - AFCDDC970AE176DA00E30447 /* Status */, - AFCDDCA10AE176DA00E30447 /* 3 Pane */, - AFCDDCE80AE176DA00E30447 /* Calendar */, + AFBE2AB30D2F3089002132BE /* Preferences_Store */, + AFCDDF630AE176DD00E30447 /* Protocols */, + AFCDDE0D0AE176DC00E30447 /* Rules Window */, + AFCDDFA90AE176DE00E30447 /* Search */, + AFCDDDF80AE176DC00E30447 /* Search Window */, AFCDDD8E0AE176DB00E30447 /* Server Window */, - AFCDDDC50AE176DB00E30447 /* Mailbox Window */, - AFCDDDD10AE176DC00E30447 /* Mailbox Info Window */, + AFCDE0DB0AE176DF00E30447 /* SMTP Client */, AFCDDDEA0AE176DC00E30447 /* SMTP Window */, - AFCDDDF80AE176DC00E30447 /* Search Window */, - AFCDDE0D0AE176DC00E30447 /* Rules Window */, - AFCDDE320AE176DC00E30447 /* Message Window */, - AFCDDE4D0AE176DC00E30447 /* Letter Window */, - AFCDDE690AE176DC00E30447 /* Find & Replace Window */, - AFCDDE6C0AE176DC00E30447 /* Address Book Manager */, - AFCDDE820AE176DC00E30447 /* Address Search */, - AFCDDE8B0AE176DC00E30447 /* Address Book */, - AFCDDEB20AE176DD00E30447 /* Macros */, - AFCDDEB70AE176DD00E30447 /* App Support */, - AFCDDEF90AE176DD00E30447 /* Text Support */, + AFCDDB750AE176D900E30447 /* Speech */, + AFCDDC970AE176DA00E30447 /* Status */, AFCDDF1B0AE176DD00E30447 /* Table Support */, + AFCDDEF90AE176DD00E30447 /* Text Support */, AFCDDF400AE176DD00E30447 /* Toolbars */, - AFCDDF4E0AE176DD00E30447 /* Control */, - AFCDDF630AE176DD00E30447 /* Protocols */, - AFCDDF710AE176DE00E30447 /* Offline Mail */, - AFCDDF7C0AE176DE00E30447 /* Offline Recording */, - AFCDDF8D0AE176DE00E30447 /* Mailbox */, - AFCDDF9A0AE176DE00E30447 /* Message */, - AFCDDFA90AE176DE00E30447 /* Search */, - AFCDDFB00AE176DE00E30447 /* Filtering */, - AFCDDFBD0AE176DE00E30447 /* Attachments */, - AFCDDFD00AE176DE00E30447 /* Address */, - AFCDDFE50AE176DE00E30447 /* CICalendar */, - AFCDE0400AE176DF00E30447 /* Calendar_Store */, + AFCDE1360AE176E000E30447 /* Utils */, AF2551720C4326EF001AAE53 /* vCard */, AF25515A0C4326C8001AAE53 /* VCard_Store */, - AFBE2AB30D2F3089002132BE /* Preferences_Store */, - AFCDE05C0AE176DF00E30447 /* HTTP */, - AFCDE09C0AE176DF00E30447 /* Extensions */, - AFCDE0B10AE176DF00E30447 /* Network */, - AFCDE0BA0AE176DF00E30447 /* INET Clients */, - AFCDE0DB0AE176DF00E30447 /* SMTP Client */, - AFCDE0DE0AE176DF00E30447 /* Offline Clients */, - AFCDE0EB0AE176DF00E30447 /* i18n */, - AFCDE1210AE176E000E30447 /* MIME Filters */, - AFCDE1360AE176E000E30447 /* Utils */, - AF82692D0C1B2C3500B18EED /* XMLLib */, AFCDE1680AE176E000E30447 /* XML Resources */, - AFCDD2E00AE164ED00E30447 /* PowerPlant */, - AFCDD89C0AE1726900E30447 /* PowerPlantX */, - AFCDE53F0AE1AC4A00E30447 /* PPOverride */, - AFCDDA760AE173C700E30447 /* MoreFiles */, - AFCDDA9B0AE1751700E30447 /* MoreFilesX */, - AF37509E0AE1DC5D00C56E20 /* More ATSUI */, + AF82692D0C1B2C3500B18EED /* XMLLib */, ); name = Sources; sourceTree = ""; @@ -7118,87 +7118,87 @@ AFCDDB830AE176D900E30447 /* Preferences */ = { isa = PBXGroup; children = ( - AFCDDB840AE176D900E30447 /* CWindowStatesFwd.h */, - AFCDDB850AE176D900E30447 /* CWindowStates.h */, - AFCDDB860AE176D900E30447 /* CWindowStates.cp */, - AFCDDB870AE176D900E30447 /* CWindowStatesXtras.cp */, - AFCDDB880AE176D900E30447 /* CScreenDimensions.h */, - AFCDDB890AE176D900E30447 /* CScreenDimensions.cp */, - AFCDDB8A0AE176D900E30447 /* CPreferenceKeys.h */, - AFCDDB8B0AE176D900E30447 /* CPreferenceKeys.cp */, - AFCDDB8C0AE176D900E30447 /* CAdmin.h */, + AFCDDBA40AE176D900E30447 /* CAddressAccount.cp */, + AFCDDBA30AE176D900E30447 /* CAddressAccount.h */, AFCDDB8D0AE176D900E30447 /* CAdmin.cp */, - AFCDDB8E0AE176D900E30447 /* CAdminLock.h */, + AFCDDB8C0AE176D900E30447 /* CAdmin.h */, AFCDDB8F0AE176D900E30447 /* CAdminLock.cp */, - AFCDDB900AE176D900E30447 /* CPreferences.h */, - AFCDDB910AE176D900E30447 /* CPreferences.cp */, - AFCDDB920AE176D900E30447 /* CPreferencesBits.cp */, - AFCDDB930AE176D900E30447 /* CPreferencesXtra.cp */, - AFCDDB940AE176D900E30447 /* CPreferencesRW.cp */, - AFCDDB950AE176D900E30447 /* CPreferenceEnum.h */, - AFCDDB960AE176D900E30447 /* CPreferenceEnum.cp */, - AFCDDB970AE176D900E30447 /* prefsvector.h */, - AFCDDB980AE176D900E30447 /* prefsvector.cp */, - AFCDDB990AE176D900E30447 /* CFutureItems.h */, - AFCDDB9A0AE176D900E30447 /* CFutureItems.cp */, - AFCDDB9B0AE176D900E30447 /* CAuthenticator.h */, + AFCDDB8E0AE176D900E30447 /* CAdminLock.h */, AFCDDB9C0AE176D900E30447 /* CAuthenticator.cp */, - AFCDDB9D0AE176D900E30447 /* CINETAccount.h */, - AFCDDB9E0AE176D900E30447 /* CINETAccount.cp */, - AFCDDB9F0AE176D900E30447 /* CMailAccount.h */, - AFCDDBA00AE176D900E30447 /* CMailAccount.cp */, - AFCDDBA10AE176D900E30447 /* CSMTPAccount.h */, - AFCDDBA20AE176D900E30447 /* CSMTPAccount.cp */, - AFBE2AB90D2F34A4002132BE /* COptionsAccount.h */, - AFBE2AB80D2F34A4002132BE /* COptionsAccount.cp */, - AFCDDBA30AE176D900E30447 /* CAddressAccount.h */, - AFCDDBA40AE176D900E30447 /* CAddressAccount.cp */, - AFCDDBA50AE176D900E30447 /* CManageSIEVEAccount.h */, - AFCDDBA60AE176D900E30447 /* CManageSIEVEAccount.cp */, - AFCDDBA70AE176D900E30447 /* CCalendarAccount.h */, + AFCDDB9B0AE176D900E30447 /* CAuthenticator.h */, + AFCDDBCA0AE176D900E30447 /* CBlockOptionsMap.cp */, + AFCDDBC90AE176D900E30447 /* CBlockOptionsMap.h */, AFCDDBA80AE176D900E30447 /* CCalendarAccount.cp */, - AFCDDBA90AE176D900E30447 /* CDisplayItem.h */, + AFCDDBA70AE176D900E30447 /* CCalendarAccount.h */, + AFCDDBC40AE176D900E30447 /* CDayWeekViewTimeRange.cpp */, + AFCDDBC30AE176D900E30447 /* CDayWeekViewTimeRange.h */, AFCDDBAA0AE176D900E30447 /* CDisplayItem.cp */, - AFCDDBAB0AE176D900E30447 /* CFavouriteItem.h */, + AFCDDBA90AE176D900E30447 /* CDisplayItem.h */, + AFCDDBB60AE176D900E30447 /* CDSN.cp */, + AFCDDBB50AE176D900E30447 /* CDSN.h */, AFCDDBAC0AE176D900E30447 /* CFavouriteItem.cp */, - AFCDDBAD0AE176D900E30447 /* COSStringMap.h */, - AFCDDBAE0AE176D900E30447 /* COSStringMap.cp */, - AFCDDBAF0AE176D900E30447 /* CNotification.h */, - AFCDDBB00AE176D900E30447 /* CNotification.cp */, - AFCDDBB10AE176D900E30447 /* CMailNotification.h */, - AFCDDBB20AE176D900E30447 /* CMailNotification.cp */, - AFCDDBB30AE176D900E30447 /* CIdentity.h */, + AFCDDBAB0AE176D900E30447 /* CFavouriteItem.h */, + AFCDDBD00AE176D900E30447 /* CFileOptionsMap.cp */, + AFCDDBCF0AE176D900E30447 /* CFileOptionsMap.h */, + AFCDDB9A0AE176D900E30447 /* CFutureItems.cp */, + AFCDDB990AE176D900E30447 /* CFutureItems.h */, AFCDDBB40AE176D900E30447 /* CIdentity.cp */, - AFCDDBB50AE176D900E30447 /* CDSN.h */, - AFCDDBB60AE176D900E30447 /* CDSN.cp */, - AFCDDBB70AE176D900E30447 /* CSearchStyle.h */, - AFCDDBB80AE176D900E30447 /* CSearchStyle.cp */, - AFCDDBB90AE176D900E30447 /* CMatchItem.h */, - AFCDDBBA0AE176D900E30447 /* CMatchItem.cp */, - AFCDDBBB0AE176D900E30447 /* CKeyAction.h */, + AFCDDBB30AE176D900E30447 /* CIdentity.h */, + AFCDDB9E0AE176D900E30447 /* CINETAccount.cp */, + AFCDDB9D0AE176D900E30447 /* CINETAccount.h */, AFCDDBBC0AE176D900E30447 /* CKeyAction.cp */, - AFCDDBBD0AE176D900E30447 /* CTextMacros.h */, - AFCDDBBE0AE176D900E30447 /* CTextMacros.cp */, - AFCDDBBF0AE176D900E30447 /* CMIMEMap.h */, + AFCDDBBB0AE176D900E30447 /* CKeyAction.h */, + AFCDDBA00AE176D900E30447 /* CMailAccount.cp */, + AFCDDB9F0AE176D900E30447 /* CMailAccount.h */, + AFCDDBB20AE176D900E30447 /* CMailNotification.cp */, + AFCDDBB10AE176D900E30447 /* CMailNotification.h */, + AFCDDBA60AE176D900E30447 /* CManageSIEVEAccount.cp */, + AFCDDBA50AE176D900E30447 /* CManageSIEVEAccount.h */, + AFCDDBBA0AE176D900E30447 /* CMatchItem.cp */, + AFCDDBB90AE176D900E30447 /* CMatchItem.h */, AFCDDBC00AE176D900E30447 /* CMIMEMap.cp */, - AFCDDBC10AE176D900E30447 /* CRemotePrefsSets.h */, - AFCDDBC20AE176D900E30447 /* CRemotePrefsSets.cp */, - AFCDDBC30AE176D900E30447 /* CDayWeekViewTimeRange.h */, - AFCDDBC40AE176D900E30447 /* CDayWeekViewTimeRange.cpp */, - AFCDDBC50AE176D900E30447 /* CPreferencesFile.h */, - AFCDDBC60AE176D900E30447 /* CPreferencesFile.cp */, - AFCDDBC70AE176D900E30447 /* COptionsMap.h */, + AFCDDBBF0AE176D900E30447 /* CMIMEMap.h */, + AFCDDBB00AE176D900E30447 /* CNotification.cp */, + AFCDDBAF0AE176D900E30447 /* CNotification.h */, + AFBE2AB80D2F34A4002132BE /* COptionsAccount.cp */, + AFBE2AB90D2F34A4002132BE /* COptionsAccount.h */, AFCDDBC80AE176D900E30447 /* COptionsMap.cp */, - AFCDDBC90AE176D900E30447 /* CBlockOptionsMap.h */, - AFCDDBCA0AE176D900E30447 /* CBlockOptionsMap.cp */, - AFCDDBCB0AE176D900E30447 /* CStreamOptionsMap.h */, + AFCDDBC70AE176D900E30447 /* COptionsMap.h */, + AFCDDBAE0AE176D900E30447 /* COSStringMap.cp */, + AFCDDBAD0AE176D900E30447 /* COSStringMap.h */, + AFCDDB960AE176D900E30447 /* CPreferenceEnum.cp */, + AFCDDB950AE176D900E30447 /* CPreferenceEnum.h */, + AFCDDB8B0AE176D900E30447 /* CPreferenceKeys.cp */, + AFCDDB8A0AE176D900E30447 /* CPreferenceKeys.h */, + AFCDDB910AE176D900E30447 /* CPreferences.cp */, + AFCDDB900AE176D900E30447 /* CPreferences.h */, + AFCDDB920AE176D900E30447 /* CPreferencesBits.cp */, + AFCDDBC60AE176D900E30447 /* CPreferencesFile.cp */, + AFCDDBC50AE176D900E30447 /* CPreferencesFile.h */, + AFCDDB940AE176D900E30447 /* CPreferencesRW.cp */, + AFCDDB930AE176D900E30447 /* CPreferencesXtra.cp */, + AFCDDBD20AE176D900E30447 /* CRemoteOptionsMap.cp */, + AFCDDBD10AE176D900E30447 /* CRemoteOptionsMap.h */, + AFCDDBC20AE176D900E30447 /* CRemotePrefsSets.cp */, + AFCDDBC10AE176D900E30447 /* CRemotePrefsSets.h */, + AFCDDB890AE176D900E30447 /* CScreenDimensions.cp */, + AFCDDB880AE176D900E30447 /* CScreenDimensions.h */, + AFCDDBB80AE176D900E30447 /* CSearchStyle.cp */, + AFCDDBB70AE176D900E30447 /* CSearchStyle.h */, + AFCDDBA20AE176D900E30447 /* CSMTPAccount.cp */, + AFCDDBA10AE176D900E30447 /* CSMTPAccount.h */, AFCDDBCC0AE176D900E30447 /* CStreamOptionsMap.cp */, - AFCDDBCD0AE176D900E30447 /* CStringOptionsMap.h */, + AFCDDBCB0AE176D900E30447 /* CStreamOptionsMap.h */, AFCDDBCE0AE176D900E30447 /* CStringOptionsMap.cp */, - AFCDDBCF0AE176D900E30447 /* CFileOptionsMap.h */, - AFCDDBD00AE176D900E30447 /* CFileOptionsMap.cp */, - AFCDDBD10AE176D900E30447 /* CRemoteOptionsMap.h */, - AFCDDBD20AE176D900E30447 /* CRemoteOptionsMap.cp */, + AFCDDBCD0AE176D900E30447 /* CStringOptionsMap.h */, + AFCDDBBE0AE176D900E30447 /* CTextMacros.cp */, + AFCDDBBD0AE176D900E30447 /* CTextMacros.h */, + AFCDDB860AE176D900E30447 /* CWindowStates.cp */, + AFCDDB850AE176D900E30447 /* CWindowStates.h */, + AFCDDB840AE176D900E30447 /* CWindowStatesFwd.h */, + AFCDDB870AE176D900E30447 /* CWindowStatesXtras.cp */, + AFCDDB980AE176D900E30447 /* prefsvector.cp */, + AFCDDB970AE176D900E30447 /* prefsvector.h */, ); name = Preferences; sourceTree = ""; diff --git a/MacOS/Resources/Mulberry.PPob b/MacOS/Resources/Mulberry.PPob index 3b40fb79..5db1e2cd 100644 Binary files a/MacOS/Resources/Mulberry.PPob and b/MacOS/Resources/Mulberry.PPob differ diff --git a/MacOS/Resources/MulberryBits.r b/MacOS/Resources/MulberryBits.r index 40ea76ee..6db74fb1 100644 --- a/MacOS/Resources/MulberryBits.r +++ b/MacOS/Resources/MulberryBits.r @@ -1 +1 @@ -/* Copyright (c) 2007 Cyrus Daboo. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ #include "Resources/RsrcTypes.r" resource 'ALRT' (204, "Low Memory Warning", preload) { {104, 130, 205, 488}, 204, { /* array: 4 elements */ /* [1] */ OK, visible, silent, /* [2] */ OK, visible, silent, /* [3] */ OK, visible, silent, /* [4] */ OK, visible, silent }, alertPositionMainScreen }; resource 'ALRT' (206, "No Directory", preload) { {104, 130, 205, 488}, 206, { /* array: 4 elements */ /* [1] */ OK, visible, silent, /* [2] */ OK, visible, silent, /* [3] */ OK, visible, silent, /* [4] */ OK, visible, silent }, alertPositionParentWindowScreen }; resource 'ALRT' (207, "Logging", preload) { {104, 130, 243, 568}, 207, { /* array: 4 elements */ /* [1] */ OK, visible, silent, /* [2] */ OK, visible, silent, /* [3] */ OK, visible, silent, /* [4] */ OK, visible, silent }, alertPositionParentWindowScreen }; resource 'DITL' (204, preload) { { /* array DITLarray: 2 elements */ /* [1] */ {71, 278, 91, 348}, Button { enabled, "OK" }, /* [2] */ {10, 75, 58, 348}, StaticText { disabled, "Memory is getting full. Please try to alleviate the problem by closing some wind" "ows or Quit the application. " } } }; resource 'DITL' (206, preload) { { /* array DITLarray: 2 elements */ /* [1] */ {71, 278, 91, 348}, Button { enabled, "OK" }, /* [2] */ {10, 75, 58, 348}, StaticText { disabled, "The default download directory could not be found. Please reset it in the �Attac" "hment� preferences panel." } } }; resource 'DITL' (207, "Logging", preload) { { /* array DITLarray: 3 elements */ /* [1] */ {108, 348, 128, 418}, Button { enabled, "Yes" }, /* [2] */ {108, 266, 128, 336}, Button { enabled, "No" }, /* [3] */ {10, 69, 89, 401}, StaticText { disabled, "Protocol logging is turned on. This may store passwords and details of messages " "you read and send in clear text in local files on disk. Do you want to allow pro" "tocol logging to continue for this session of Mulberry?" } } }; resource 'Estr' (-23045) { "Could not lookup the name using the domain nameserver" }; resource 'Estr' (-23044) { "Cannot find domain nameserver on the network" }; resource 'Estr' (-23016) { "TCP/IP connection timed-out" }; resource 'Estr' (-23015) { "The connection came halfway up and then failed" }; resource 'Estr' (-23012) { "TCP/IP connection terminated" }; resource 'Estr' (-23008) { "TCP/IP connection no longer exists" }; resource 'Estr' (-23004) { "Cannot get IP address" }; resource 'Estr' (-2810) { "Not enough memory to load plugin." }; resource 'Estr' (-108, preload) { "Out of Memory" }; resource 'Estr' (-49) { "File already open with write permission" }; resource 'Estr' (-48) { "Duplicate or illegal file name" }; resource 'Estr' (-45) { "File is locked" }; resource 'Estr' (-44) { "Disk is write protected" }; resource 'Estr' (-43) { "File or folder not found" }; resource 'Estr' (-35) { "Volume not found" }; resource 'Estr' (-34) { "Disk full" }; resource 'Estr' (-33) { "Directory full" }; resource 'Estr' (-1) { "Unknown Error Type" }; resource 'Estr' (25, preload) { "Out of Memory" }; resource 'Estr' (10038) { "TCP/IP: illegal socket" }; resource 'Estr' (10045) { "TCP/IP: cannot support socket" }; resource 'Estr' (10050) { "TCP/IP: not available" }; resource 'Estr' (10051) { "TCP/IP: network unreachable from this host" }; resource 'Estr' (10052) { "TCP/IP: connection dropped" }; resource 'Estr' (10053) { "TCP/IP: connection aborted" }; resource 'Estr' (10054) { "TCP/IP: connection reset by remote host" }; resource 'Estr' (10055) { "TCP/IP: no buffer space available" }; resource 'Estr' (10056) { "TCP/IP: already connected" }; resource 'Estr' (10057) { "TCP/IP: cannot connect" }; resource 'Estr' (10058) { "TCP/IP: socket closed" }; resource 'Estr' (10060) { "TCP/IP: timed out while connecting" }; resource 'Estr' (10061) { "TCP/IP: connection was refused" }; resource 'Estr' (10064) { "TCP/IP: host down" }; resource 'Estr' (10065) { "TCP/IP: host unreachable" }; resource 'Estr' (10091) { "TCP/IP: network not ready" }; resource 'Estr' (10093) { "TCP/IP: not initialised" }; resource 'Estr' (11001) { "TCP/IP: host not found during DNS lookup" }; resource 'Estr' (11002) { "TCP/IP: host not found or DNS server failure" }; resource 'Estr' (11003) { "DNS lookup failure" }; resource 'Estr' (11004) { "TCP/IP: DNS could not resolve name" }; resource 'Estr' (19278) { "Network: Unknown Error" }; resource 'Estr' (-51) { "Illegal File Number" }; resource 'Estr' (-52) { "Could not locate file position" }; resource 'Estr' (-53) { "Volume not available" }; resource 'Estr' (-54) { "File permissions inadequate" }; resource 'Estr' (-61) { "File is not writeable" }; resource 'Estr' (-5000) { "File permissions inadequate" }; resource 'Estr' (-5008) { "Disk is full" }; resource 'Estr' (-5010) { "File is busy" }; resource 'Estr' (-5017) { "File already exists" }; resource 'Estr' (-5018) { "File does not exist" }; resource 'Estr' (-5031) { "Volume is locked" }; resource 'Estr' (-46) { "Volume is locked" }; resource 'Estr' (-47) { "File is busy" }; resource 'Estr' (-120) { "Directory not found" }; resource 'Mlby' (0, "Owner resource") { "Mulberry �Cyrus Daboo, 2006." }; data 'SPIN' (128) { $"0000 0080 0004 0001 0006" /* ...�...... */ }; data 'SPIN' (129) { $"0000 0080 0004 0078 0006" /* ...�...x.. */ }; resource 'STR ' (256, "Default Prefs File Name", purgeable) { "Mulberry Prefs" }; data 'Xmnu' (0) { $"0800 0000 0000 0000 2000 4000 0000 0000 0100 0000 0000 0000 0000" /* ........ .@............... */ }; data 'logo' (128) { $"0000" /* .. */ }; resource 'pltt' (0, "Default palette") { { /* array ColorInfo: 256 elements */ /* [1] */ 65535, 65535, 65535, pmTolerant, 0, /* [2] */ 0, 0, 0, 5378, 0, /* [3] */ 43690, 43690, 43690, 5378, 0, /* [4] */ 21845, 21845, 21845, 5378, 0, /* [5] */ 65535, 65535, 0, 5378, 0, /* [6] */ 65535, 26214, 0, 5378, 0, /* [7] */ 56797, 0, 0, 5378, 0, /* [8] */ 65535, 0, 52428, 5378, 0, /* [9] */ 13107, 0, 39321, 5378, 0, /* [10] */ 0, 0, 56797, 5378, 0, /* [11] */ 0, 39321, 65535, 5378, 0, /* [12] */ 13107, 52428, 13107, 5378, 0, /* [13] */ 0, 26214, 0, 5378, 0, /* [14] */ 26214, 13107, 0, 5378, 0, /* [15] */ 39321, 26214, 13107, 5378, 0, /* [16] */ 48059, 48059, 48059, 5378, 0, /* [17] */ 65535, 65535, 52428, 5378, 0, /* [18] */ 65535, 65535, 39321, 5378, 0, /* [19] */ 65535, 65535, 26214, 5378, 0, /* [20] */ 65535, 65535, 13107, 5378, 0, /* [21] */ 65535, 52428, 65535, 5378, 0, /* [22] */ 65535, 52428, 52428, 5378, 0, /* [23] */ 65535, 52428, 39321, 5378, 0, /* [24] */ 65535, 52428, 26214, 5378, 0, /* [25] */ 65535, 52428, 13107, 5378, 0, /* [26] */ 65535, 52428, 0, 5378, 0, /* [27] */ 65535, 39321, 65535, 5378, 0, /* [28] */ 65535, 39321, 52428, 5378, 0, /* [29] */ 65535, 39321, 39321, 5378, 0, /* [30] */ 65535, 39321, 26214, 5378, 0, /* [31] */ 65535, 39321, 13107, 5378, 0, /* [32] */ 65535, 39321, 0, 5378, 0, /* [33] */ 65535, 26214, 65535, 5378, 0, /* [34] */ 65535, 26214, 52428, 5378, 0, /* [35] */ 65535, 26214, 39321, 5378, 0, /* [36] */ 65535, 26214, 26214, 5378, 0, /* [37] */ 65535, 26214, 13107, 5378, 0, /* [38] */ 65535, 13107, 65535, 5378, 0, /* [39] */ 65535, 13107, 52428, 5378, 0, /* [40] */ 65535, 13107, 39321, 5378, 0, /* [41] */ 65535, 13107, 26214, 5378, 0, /* [42] */ 65535, 13107, 13107, 5378, 0, /* [43] */ 65535, 13107, 0, 5378, 0, /* [44] */ 65535, 0, 65535, 5378, 0, /* [45] */ 65535, 0, 39321, 5378, 0, /* [46] */ 65535, 0, 26214, 5378, 0, /* [47] */ 65535, 0, 13107, 5378, 0, /* [48] */ 65535, 0, 0, 5378, 0, /* [49] */ 52428, 65535, 65535, 5378, 0, /* [50] */ 52428, 65535, 52428, 5378, 0, /* [51] */ 52428, 65535, 39321, 5378, 0, /* [52] */ 52428, 65535, 26214, 5378, 0, /* [53] */ 52428, 65535, 13107, 5378, 0, /* [54] */ 52428, 65535, 0, 5378, 0, /* [55] */ 52428, 52428, 65535, 5378, 0, /* [56] */ 52428, 52428, 52428, 5378, 0, /* [57] */ 52428, 52428, 39321, 5378, 0, /* [58] */ 52428, 52428, 26214, 5378, 0, /* [59] */ 52428, 52428, 13107, 5378, 0, /* [60] */ 52428, 52428, 0, 5378, 0, /* [61] */ 52428, 39321, 65535, 5378, 0, /* [62] */ 52428, 39321, 52428, 5378, 0, /* [63] */ 52428, 39321, 39321, 5378, 0, /* [64] */ 52428, 39321, 26214, 5378, 0, /* [65] */ 52428, 39321, 13107, 5378, 0, /* [66] */ 52428, 39321, 0, 5378, 0, /* [67] */ 52428, 26214, 65535, 5378, 0, /* [68] */ 52428, 26214, 52428, 5378, 0, /* [69] */ 52428, 26214, 39321, 5378, 0, /* [70] */ 52428, 26214, 26214, 5378, 0, /* [71] */ 52428, 26214, 13107, 5378, 0, /* [72] */ 52428, 26214, 0, 5378, 0, /* [73] */ 52428, 13107, 65535, 5378, 0, /* [74] */ 52428, 13107, 52428, 5378, 0, /* [75] */ 52428, 13107, 39321, 5378, 0, /* [76] */ 52428, 13107, 26214, 5378, 0, /* [77] */ 52428, 13107, 13107, 5378, 0, /* [78] */ 52428, 13107, 0, 5378, 0, /* [79] */ 52428, 0, 65535, 5378, 0, /* [80] */ 52428, 0, 52428, 5378, 0, /* [81] */ 52428, 0, 39321, 5378, 0, /* [82] */ 52428, 0, 26214, 5378, 0, /* [83] */ 52428, 0, 13107, 5378, 0, /* [84] */ 52428, 0, 0, 5378, 0, /* [85] */ 39321, 65535, 65535, 5378, 0, /* [86] */ 39321, 65535, 52428, 5378, 0, /* [87] */ 39321, 65535, 39321, 5378, 0, /* [88] */ 39321, 65535, 26214, 5378, 0, /* [89] */ 39321, 65535, 13107, 5378, 0, /* [90] */ 39321, 65535, 0, 5378, 0, /* [91] */ 39321, 52428, 65535, 5378, 0, /* [92] */ 39321, 52428, 52428, 5378, 0, /* [93] */ 39321, 52428, 39321, 5378, 0, /* [94] */ 39321, 52428, 26214, 5378, 0, /* [95] */ 39321, 52428, 13107, 5378, 0, /* [96] */ 39321, 52428, 0, 5378, 0, /* [97] */ 39321, 39321, 65535, 5378, 0, /* [98] */ 39321, 39321, 52428, 5378, 0, /* [99] */ 39321, 39321, 39321, 5378, 0, /* [100] */ 39321, 39321, 26214, 5378, 0, /* [101] */ 39321, 39321, 13107, 5378, 0, /* [102] */ 39321, 39321, 0, 5378, 0, /* [103] */ 39321, 26214, 65535, 5378, 0, /* [104] */ 39321, 26214, 52428, 5378, 0, /* [105] */ 39321, 26214, 39321, 5378, 0, /* [106] */ 39321, 26214, 26214, 5378, 0, /* [107] */ 39321, 26214, 0, 5378, 0, /* [108] */ 39321, 13107, 65535, 5378, 0, /* [109] */ 39321, 13107, 52428, 5378, 0, /* [110] */ 39321, 13107, 39321, 5378, 0, /* [111] */ 39321, 13107, 26214, 5378, 0, /* [112] */ 39321, 13107, 13107, 5378, 0, /* [113] */ 39321, 13107, 0, 5378, 0, /* [114] */ 39321, 0, 65535, 5378, 0, /* [115] */ 39321, 0, 52428, 5378, 0, /* [116] */ 39321, 0, 39321, 5378, 0, /* [117] */ 39321, 0, 26214, 5378, 0, /* [118] */ 39321, 0, 13107, 5378, 0, /* [119] */ 39321, 0, 0, 5378, 0, /* [120] */ 26214, 65535, 65535, 5378, 0, /* [121] */ 26214, 65535, 52428, 5378, 0, /* [122] */ 26214, 65535, 39321, 5378, 0, /* [123] */ 26214, 65535, 26214, 5378, 0, /* [124] */ 26214, 65535, 13107, 5378, 0, /* [125] */ 26214, 65535, 0, 5378, 0, /* [126] */ 26214, 52428, 65535, 5378, 0, /* [127] */ 26214, 52428, 52428, 5378, 0, /* [128] */ 26214, 52428, 39321, 5378, 0, /* [129] */ 26214, 52428, 26214, 5378, 0, /* [130] */ 26214, 52428, 13107, 5378, 0, /* [131] */ 26214, 52428, 0, 5378, 0, /* [132] */ 26214, 39321, 65535, 5378, 0, /* [133] */ 26214, 39321, 52428, 5378, 0, /* [134] */ 26214, 39321, 39321, 5378, 0, /* [135] */ 26214, 39321, 26214, 5378, 0, /* [136] */ 26214, 39321, 13107, 5378, 0, /* [137] */ 26214, 39321, 0, 5378, 0, /* [138] */ 26214, 26214, 65535, 5378, 0, /* [139] */ 26214, 26214, 52428, 5378, 0, /* [140] */ 26214, 26214, 39321, 5378, 0, /* [141] */ 26214, 26214, 26214, 5378, 0, /* [142] */ 26214, 26214, 13107, 5378, 0, /* [143] */ 26214, 26214, 0, 5378, 0, /* [144] */ 26214, 13107, 65535, 5378, 0, /* [145] */ 26214, 13107, 52428, 5378, 0, /* [146] */ 26214, 13107, 39321, 5378, 0, /* [147] */ 26214, 13107, 26214, 5378, 0, /* [148] */ 26214, 13107, 13107, 5378, 0, /* [149] */ 26214, 0, 65535, 5378, 0, /* [150] */ 26214, 0, 52428, 5378, 0, /* [151] */ 26214, 0, 39321, 5378, 0, /* [152] */ 26214, 0, 26214, 5378, 0, /* [153] */ 26214, 0, 13107, 5378, 0, /* [154] */ 26214, 0, 0, 5378, 0, /* [155] */ 13107, 65535, 65535, 5378, 0, /* [156] */ 13107, 65535, 52428, 5378, 0, /* [157] */ 13107, 65535, 39321, 5378, 0, /* [158] */ 13107, 65535, 26214, 5378, 0, /* [159] */ 13107, 65535, 13107, 5378, 0, /* [160] */ 13107, 65535, 0, 5378, 0, /* [161] */ 13107, 52428, 65535, 5378, 0, /* [162] */ 13107, 52428, 52428, 5378, 0, /* [163] */ 13107, 52428, 39321, 5378, 0, /* [164] */ 13107, 52428, 26214, 5378, 0, /* [165] */ 13107, 52428, 0, 5378, 0, /* [166] */ 13107, 39321, 65535, 5378, 0, /* [167] */ 13107, 39321, 52428, 5378, 0, /* [168] */ 13107, 39321, 39321, 5378, 0, /* [169] */ 13107, 39321, 26214, 5378, 0, /* [170] */ 13107, 39321, 13107, 5378, 0, /* [171] */ 13107, 39321, 0, 5378, 0, /* [172] */ 13107, 26214, 65535, 5378, 0, /* [173] */ 13107, 26214, 52428, 5378, 0, /* [174] */ 13107, 26214, 39321, 5378, 0, /* [175] */ 13107, 26214, 26214, 5378, 0, /* [176] */ 13107, 26214, 13107, 5378, 0, /* [177] */ 13107, 26214, 0, 5378, 0, /* [178] */ 13107, 13107, 65535, 5378, 0, /* [179] */ 13107, 13107, 52428, 5378, 0, /* [180] */ 13107, 13107, 39321, 5378, 0, /* [181] */ 13107, 13107, 26214, 5378, 0, /* [182] */ 13107, 13107, 13107, 5378, 0, /* [183] */ 13107, 13107, 0, 5378, 0, /* [184] */ 13107, 0, 65535, 5378, 0, /* [185] */ 13107, 0, 52428, 5378, 0, /* [186] */ 13107, 0, 26214, 5378, 0, /* [187] */ 13107, 0, 13107, 5378, 0, /* [188] */ 13107, 0, 0, 5378, 0, /* [189] */ 0, 65535, 65535, 5378, 0, /* [190] */ 0, 65535, 52428, 5378, 0, /* [191] */ 0, 65535, 39321, 5378, 0, /* [192] */ 0, 65535, 26214, 5378, 0, /* [193] */ 0, 65535, 13107, 5378, 0, /* [194] */ 0, 65535, 0, 5378, 0, /* [195] */ 0, 52428, 65535, 5378, 0, /* [196] */ 0, 52428, 52428, 5378, 0, /* [197] */ 0, 52428, 39321, 5378, 0, /* [198] */ 0, 52428, 26214, 5378, 0, /* [199] */ 0, 52428, 13107, 5378, 0, /* [200] */ 0, 52428, 0, 5378, 0, /* [201] */ 0, 39321, 52428, 5378, 0, /* [202] */ 0, 39321, 39321, 5378, 0, /* [203] */ 0, 39321, 26214, 5378, 0, /* [204] */ 0, 39321, 13107, 5378, 0, /* [205] */ 0, 39321, 0, 5378, 0, /* [206] */ 0, 26214, 65535, 5378, 0, /* [207] */ 0, 26214, 52428, 5378, 0, /* [208] */ 0, 26214, 39321, 5378, 0, /* [209] */ 0, 26214, 26214, 5378, 0, /* [210] */ 0, 26214, 13107, 5378, 0, /* [211] */ 0, 13107, 65535, 5378, 0, /* [212] */ 0, 13107, 52428, 5378, 0, /* [213] */ 0, 13107, 39321, 5378, 0, /* [214] */ 0, 13107, 26214, 5378, 0, /* [215] */ 0, 13107, 13107, 5378, 0, /* [216] */ 0, 13107, 0, 5378, 0, /* [217] */ 0, 0, 65535, 5378, 0, /* [218] */ 0, 0, 52428, 5378, 0, /* [219] */ 0, 0, 39321, 5378, 0, /* [220] */ 0, 0, 26214, 5378, 0, /* [221] */ 0, 0, 13107, 5378, 0, /* [222] */ 61166, 0, 0, 5378, 0, /* [223] */ 48059, 0, 0, 5378, 0, /* [224] */ 43690, 0, 0, 5378, 0, /* [225] */ 34952, 0, 0, 5378, 0, /* [226] */ 30583, 0, 0, 5378, 0, /* [227] */ 21845, 0, 0, 5378, 0, /* [228] */ 17476, 0, 0, 5378, 0, /* [229] */ 8738, 0, 0, 5378, 0, /* [230] */ 4369, 0, 0, 5378, 0, /* [231] */ 0, 61166, 0, 5378, 0, /* [232] */ 0, 56797, 0, 5378, 0, /* [233] */ 0, 48059, 0, 5378, 0, /* [234] */ 0, 43690, 0, 5378, 0, /* [235] */ 0, 34952, 0, 5378, 0, /* [236] */ 0, 30583, 0, 5378, 0, /* [237] */ 0, 21845, 0, 5378, 0, /* [238] */ 0, 17476, 0, 5378, 0, /* [239] */ 0, 8738, 0, 5378, 0, /* [240] */ 0, 4369, 0, 5378, 0, /* [241] */ 0, 0, 61166, 5378, 0, /* [242] */ 0, 0, 48059, 5378, 0, /* [243] */ 0, 0, 43690, 5378, 0, /* [244] */ 0, 0, 34952, 5378, 0, /* [245] */ 0, 0, 30583, 5378, 0, /* [246] */ 0, 0, 21845, 5378, 0, /* [247] */ 0, 0, 17476, 5378, 0, /* [248] */ 0, 0, 8738, 5378, 0, /* [249] */ 0, 0, 4369, 5378, 0, /* [250] */ 61166, 61166, 61166, 5378, 0, /* [251] */ 56797, 56797, 56797, 5378, 0, /* [252] */ 34952, 34952, 34952, 5378, 0, /* [253] */ 30583, 30583, 30583, 5378, 0, /* [254] */ 17476, 17476, 17476, 5378, 0, /* [255] */ 8738, 8738, 8738, 5378, 0, /* [256] */ 4369, 4369, 4369, 5378, 0 } }; data 'teda' (128, purgeable) { $"0000 0000" /* .... */ }; data 'TEXT' (10000, "About text", purgeable) { $"4D75 6C62 6572 7279 C2AE 2069 7320 616E 2065 6D61 696C 2061 6E64 2063 616C 656E" /* Mulberry® is an email and calen */ $"6461 7220 636C 6965 6E74 2066 6F72 204D 6163 4F53 2058 2C20 5769 6E33 3220 616E" /* dar client for MacOS X, Win32 an */ $"6420 556E 6978 2062 6173 6564 2063 6F6D 7075 7465 7273 2E0D 0D68 7474 703A 2F2F" /* d Unix based computers...http:// */ $"7777 772E 6D75 6C62 6572 7279 6D61 696C 2E63 6F6D 0D6D 6169 6C74 6F3A 6D75 6C62" /* www.mulberrymail.com.mailto:mulb */ $"6572 7279 2D73 7570 706F 7274 406D 756C 6265 7272 796D 6169 6C2E 636F 6D0D 0D48" /* erry-support@mulberrymail.com..H */ $"436D 6442 7574 746F 6E41 7474 6163 686D 656E 7420 C2A9 3139 3937 2D31 3939 3820" /* CmdButtonAttachment ©1997-1998 */ $"4A6F 686E 2043 2E20 4461 7562 2E20 2041 6C6C 2072 6967 6874 7320 7265 7365 7276" /* John C. Daub. All rights reserv */ $"6564 2E0D 506F 7274 696F 6E73 206F 6620 4C44 4150 2063 6F64 6520 436F 7079 7269" /* ed..Portions of LDAP code Copyri */ $"6768 7420 C2A9 2031 3939 3020 5265 6765 6E74 7320 6F66 2074 6865 2055 6E69 7665" /* ght © 1990 Regents of the Unive */ $"7273 6974 7920 6F66 204D 6963 6869 6761 6E2E 2041 6C6C 2072 6967 6874 7320 7265" /* rsity of Michigan. All rights re */ $"7365 7276 6564 2E0D 0D4D 756C 6265 7272 79C2 AE20 6973 20C2 A920 4379 7275 7320" /* served...Mulberry® is © Cyrus */ $"4461 626F 6F2C 2032 3030 362E 2041 6C6C 2052 6967 6874 7320 5265 7365 7276 6564" /* Daboo, 2006. All Rights Reserved */ $"2E" /* . */ }; data 'styl' (10000, "About text") { $"0001 0000 0000 000D 000A 0004 0000 000A 0000 0000 0000" /* .........�.....�...... */ }; \ No newline at end of file +/* Copyright (c) 2007 Cyrus Daboo. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ #include "RsrcTypes.r" resource 'ALRT' (204, "Low Memory Warning", preload) { {104, 130, 205, 488}, 204, { /* array: 4 elements */ /* [1] */ OK, visible, silent, /* [2] */ OK, visible, silent, /* [3] */ OK, visible, silent, /* [4] */ OK, visible, silent }, alertPositionMainScreen }; resource 'ALRT' (206, "No Directory", preload) { {104, 130, 205, 488}, 206, { /* array: 4 elements */ /* [1] */ OK, visible, silent, /* [2] */ OK, visible, silent, /* [3] */ OK, visible, silent, /* [4] */ OK, visible, silent }, alertPositionParentWindowScreen }; resource 'ALRT' (207, "Logging", preload) { {104, 130, 243, 568}, 207, { /* array: 4 elements */ /* [1] */ OK, visible, silent, /* [2] */ OK, visible, silent, /* [3] */ OK, visible, silent, /* [4] */ OK, visible, silent }, alertPositionParentWindowScreen }; resource 'DITL' (204, preload) { { /* array DITLarray: 2 elements */ /* [1] */ {71, 278, 91, 348}, Button { enabled, "OK" }, /* [2] */ {10, 75, 58, 348}, StaticText { disabled, "Memory is getting full. Please try to alleviate the problem by closing some wind" "ows or Quit the application. " } } }; resource 'DITL' (206, preload) { { /* array DITLarray: 2 elements */ /* [1] */ {71, 278, 91, 348}, Button { enabled, "OK" }, /* [2] */ {10, 75, 58, 348}, StaticText { disabled, "The default download directory could not be found. Please reset it in the �Attac" "hment� preferences panel." } } }; resource 'DITL' (207, "Logging", preload) { { /* array DITLarray: 3 elements */ /* [1] */ {108, 348, 128, 418}, Button { enabled, "Yes" }, /* [2] */ {108, 266, 128, 336}, Button { enabled, "No" }, /* [3] */ {10, 69, 89, 401}, StaticText { disabled, "Protocol logging is turned on. This may store passwords and details of messages " "you read and send in clear text in local files on disk. Do you want to allow pro" "tocol logging to continue for this session of Mulberry?" } } }; resource 'Estr' (-23045) { "Could not lookup the name using the domain nameserver" }; resource 'Estr' (-23044) { "Cannot find domain nameserver on the network" }; resource 'Estr' (-23016) { "TCP/IP connection timed-out" }; resource 'Estr' (-23015) { "The connection came halfway up and then failed" }; resource 'Estr' (-23012) { "TCP/IP connection terminated" }; resource 'Estr' (-23008) { "TCP/IP connection no longer exists" }; resource 'Estr' (-23004) { "Cannot get IP address" }; resource 'Estr' (-2810) { "Not enough memory to load plugin." }; resource 'Estr' (-108, preload) { "Out of Memory" }; resource 'Estr' (-49) { "File already open with write permission" }; resource 'Estr' (-48) { "Duplicate or illegal file name" }; resource 'Estr' (-45) { "File is locked" }; resource 'Estr' (-44) { "Disk is write protected" }; resource 'Estr' (-43) { "File or folder not found" }; resource 'Estr' (-35) { "Volume not found" }; resource 'Estr' (-34) { "Disk full" }; resource 'Estr' (-33) { "Directory full" }; resource 'Estr' (-1) { "Unknown Error Type" }; resource 'Estr' (25, preload) { "Out of Memory" }; resource 'Estr' (10038) { "TCP/IP: illegal socket" }; resource 'Estr' (10045) { "TCP/IP: cannot support socket" }; resource 'Estr' (10050) { "TCP/IP: not available" }; resource 'Estr' (10051) { "TCP/IP: network unreachable from this host" }; resource 'Estr' (10052) { "TCP/IP: connection dropped" }; resource 'Estr' (10053) { "TCP/IP: connection aborted" }; resource 'Estr' (10054) { "TCP/IP: connection reset by remote host" }; resource 'Estr' (10055) { "TCP/IP: no buffer space available" }; resource 'Estr' (10056) { "TCP/IP: already connected" }; resource 'Estr' (10057) { "TCP/IP: cannot connect" }; resource 'Estr' (10058) { "TCP/IP: socket closed" }; resource 'Estr' (10060) { "TCP/IP: timed out while connecting" }; resource 'Estr' (10061) { "TCP/IP: connection was refused" }; resource 'Estr' (10064) { "TCP/IP: host down" }; resource 'Estr' (10065) { "TCP/IP: host unreachable" }; resource 'Estr' (10091) { "TCP/IP: network not ready" }; resource 'Estr' (10093) { "TCP/IP: not initialised" }; resource 'Estr' (11001) { "TCP/IP: host not found during DNS lookup" }; resource 'Estr' (11002) { "TCP/IP: host not found or DNS server failure" }; resource 'Estr' (11003) { "DNS lookup failure" }; resource 'Estr' (11004) { "TCP/IP: DNS could not resolve name" }; resource 'Estr' (19278) { "Network: Unknown Error" }; resource 'Estr' (-51) { "Illegal File Number" }; resource 'Estr' (-52) { "Could not locate file position" }; resource 'Estr' (-53) { "Volume not available" }; resource 'Estr' (-54) { "File permissions inadequate" }; resource 'Estr' (-61) { "File is not writeable" }; resource 'Estr' (-5000) { "File permissions inadequate" }; resource 'Estr' (-5008) { "Disk is full" }; resource 'Estr' (-5010) { "File is busy" }; resource 'Estr' (-5017) { "File already exists" }; resource 'Estr' (-5018) { "File does not exist" }; resource 'Estr' (-5031) { "Volume is locked" }; resource 'Estr' (-46) { "Volume is locked" }; resource 'Estr' (-47) { "File is busy" }; resource 'Estr' (-120) { "Directory not found" }; resource 'Mlby' (0, "Owner resource") { "Mulberry �Cyrus Daboo, 2006-2012." }; data 'SPIN' (128) { $"0000 0080 0004 0001 0006" /* ...�...... */ }; data 'SPIN' (129) { $"0000 0080 0004 0078 0006" /* ...�...x.. */ }; resource 'STR ' (256, "Default Prefs File Name", purgeable) { "Mulberry Prefs" }; data 'Xmnu' (0) { $"0800 0000 0000 0000 2000 4000 0000 0000 0100 0000 0000 0000 0000" /* ........ .@............... */ }; data 'logo' (128) { $"0000" /* .. */ }; #if 0 resource 'pltt' (0, "Default palette") { { /* array ColorInfo: 256 elements */ /* [1] */ 65535, 65535, 65535, pmTolerant, 0, /* [2] */ 0, 0, 0, 5378, 0, /* [3] */ 43690, 43690, 43690, 5378, 0, /* [4] */ 21845, 21845, 21845, 5378, 0, /* [5] */ 65535, 65535, 0, 5378, 0, /* [6] */ 65535, 26214, 0, 5378, 0, /* [7] */ 56797, 0, 0, 5378, 0, /* [8] */ 65535, 0, 52428, 5378, 0, /* [9] */ 13107, 0, 39321, 5378, 0, /* [10] */ 0, 0, 56797, 5378, 0, /* [11] */ 0, 39321, 65535, 5378, 0, /* [12] */ 13107, 52428, 13107, 5378, 0, /* [13] */ 0, 26214, 0, 5378, 0, /* [14] */ 26214, 13107, 0, 5378, 0, /* [15] */ 39321, 26214, 13107, 5378, 0, /* [16] */ 48059, 48059, 48059, 5378, 0, /* [17] */ 65535, 65535, 52428, 5378, 0, /* [18] */ 65535, 65535, 39321, 5378, 0, /* [19] */ 65535, 65535, 26214, 5378, 0, /* [20] */ 65535, 65535, 13107, 5378, 0, /* [21] */ 65535, 52428, 65535, 5378, 0, /* [22] */ 65535, 52428, 52428, 5378, 0, /* [23] */ 65535, 52428, 39321, 5378, 0, /* [24] */ 65535, 52428, 26214, 5378, 0, /* [25] */ 65535, 52428, 13107, 5378, 0, /* [26] */ 65535, 52428, 0, 5378, 0, /* [27] */ 65535, 39321, 65535, 5378, 0, /* [28] */ 65535, 39321, 52428, 5378, 0, /* [29] */ 65535, 39321, 39321, 5378, 0, /* [30] */ 65535, 39321, 26214, 5378, 0, /* [31] */ 65535, 39321, 13107, 5378, 0, /* [32] */ 65535, 39321, 0, 5378, 0, /* [33] */ 65535, 26214, 65535, 5378, 0, /* [34] */ 65535, 26214, 52428, 5378, 0, /* [35] */ 65535, 26214, 39321, 5378, 0, /* [36] */ 65535, 26214, 26214, 5378, 0, /* [37] */ 65535, 26214, 13107, 5378, 0, /* [38] */ 65535, 13107, 65535, 5378, 0, /* [39] */ 65535, 13107, 52428, 5378, 0, /* [40] */ 65535, 13107, 39321, 5378, 0, /* [41] */ 65535, 13107, 26214, 5378, 0, /* [42] */ 65535, 13107, 13107, 5378, 0, /* [43] */ 65535, 13107, 0, 5378, 0, /* [44] */ 65535, 0, 65535, 5378, 0, /* [45] */ 65535, 0, 39321, 5378, 0, /* [46] */ 65535, 0, 26214, 5378, 0, /* [47] */ 65535, 0, 13107, 5378, 0, /* [48] */ 65535, 0, 0, 5378, 0, /* [49] */ 52428, 65535, 65535, 5378, 0, /* [50] */ 52428, 65535, 52428, 5378, 0, /* [51] */ 52428, 65535, 39321, 5378, 0, /* [52] */ 52428, 65535, 26214, 5378, 0, /* [53] */ 52428, 65535, 13107, 5378, 0, /* [54] */ 52428, 65535, 0, 5378, 0, /* [55] */ 52428, 52428, 65535, 5378, 0, /* [56] */ 52428, 52428, 52428, 5378, 0, /* [57] */ 52428, 52428, 39321, 5378, 0, /* [58] */ 52428, 52428, 26214, 5378, 0, /* [59] */ 52428, 52428, 13107, 5378, 0, /* [60] */ 52428, 52428, 0, 5378, 0, /* [61] */ 52428, 39321, 65535, 5378, 0, /* [62] */ 52428, 39321, 52428, 5378, 0, /* [63] */ 52428, 39321, 39321, 5378, 0, /* [64] */ 52428, 39321, 26214, 5378, 0, /* [65] */ 52428, 39321, 13107, 5378, 0, /* [66] */ 52428, 39321, 0, 5378, 0, /* [67] */ 52428, 26214, 65535, 5378, 0, /* [68] */ 52428, 26214, 52428, 5378, 0, /* [69] */ 52428, 26214, 39321, 5378, 0, /* [70] */ 52428, 26214, 26214, 5378, 0, /* [71] */ 52428, 26214, 13107, 5378, 0, /* [72] */ 52428, 26214, 0, 5378, 0, /* [73] */ 52428, 13107, 65535, 5378, 0, /* [74] */ 52428, 13107, 52428, 5378, 0, /* [75] */ 52428, 13107, 39321, 5378, 0, /* [76] */ 52428, 13107, 26214, 5378, 0, /* [77] */ 52428, 13107, 13107, 5378, 0, /* [78] */ 52428, 13107, 0, 5378, 0, /* [79] */ 52428, 0, 65535, 5378, 0, /* [80] */ 52428, 0, 52428, 5378, 0, /* [81] */ 52428, 0, 39321, 5378, 0, /* [82] */ 52428, 0, 26214, 5378, 0, /* [83] */ 52428, 0, 13107, 5378, 0, /* [84] */ 52428, 0, 0, 5378, 0, /* [85] */ 39321, 65535, 65535, 5378, 0, /* [86] */ 39321, 65535, 52428, 5378, 0, /* [87] */ 39321, 65535, 39321, 5378, 0, /* [88] */ 39321, 65535, 26214, 5378, 0, /* [89] */ 39321, 65535, 13107, 5378, 0, /* [90] */ 39321, 65535, 0, 5378, 0, /* [91] */ 39321, 52428, 65535, 5378, 0, /* [92] */ 39321, 52428, 52428, 5378, 0, /* [93] */ 39321, 52428, 39321, 5378, 0, /* [94] */ 39321, 52428, 26214, 5378, 0, /* [95] */ 39321, 52428, 13107, 5378, 0, /* [96] */ 39321, 52428, 0, 5378, 0, /* [97] */ 39321, 39321, 65535, 5378, 0, /* [98] */ 39321, 39321, 52428, 5378, 0, /* [99] */ 39321, 39321, 39321, 5378, 0, /* [100] */ 39321, 39321, 26214, 5378, 0, /* [101] */ 39321, 39321, 13107, 5378, 0, /* [102] */ 39321, 39321, 0, 5378, 0, /* [103] */ 39321, 26214, 65535, 5378, 0, /* [104] */ 39321, 26214, 52428, 5378, 0, /* [105] */ 39321, 26214, 39321, 5378, 0, /* [106] */ 39321, 26214, 26214, 5378, 0, /* [107] */ 39321, 26214, 0, 5378, 0, /* [108] */ 39321, 13107, 65535, 5378, 0, /* [109] */ 39321, 13107, 52428, 5378, 0, /* [110] */ 39321, 13107, 39321, 5378, 0, /* [111] */ 39321, 13107, 26214, 5378, 0, /* [112] */ 39321, 13107, 13107, 5378, 0, /* [113] */ 39321, 13107, 0, 5378, 0, /* [114] */ 39321, 0, 65535, 5378, 0, /* [115] */ 39321, 0, 52428, 5378, 0, /* [116] */ 39321, 0, 39321, 5378, 0, /* [117] */ 39321, 0, 26214, 5378, 0, /* [118] */ 39321, 0, 13107, 5378, 0, /* [119] */ 39321, 0, 0, 5378, 0, /* [120] */ 26214, 65535, 65535, 5378, 0, /* [121] */ 26214, 65535, 52428, 5378, 0, /* [122] */ 26214, 65535, 39321, 5378, 0, /* [123] */ 26214, 65535, 26214, 5378, 0, /* [124] */ 26214, 65535, 13107, 5378, 0, /* [125] */ 26214, 65535, 0, 5378, 0, /* [126] */ 26214, 52428, 65535, 5378, 0, /* [127] */ 26214, 52428, 52428, 5378, 0, /* [128] */ 26214, 52428, 39321, 5378, 0, /* [129] */ 26214, 52428, 26214, 5378, 0, /* [130] */ 26214, 52428, 13107, 5378, 0, /* [131] */ 26214, 52428, 0, 5378, 0, /* [132] */ 26214, 39321, 65535, 5378, 0, /* [133] */ 26214, 39321, 52428, 5378, 0, /* [134] */ 26214, 39321, 39321, 5378, 0, /* [135] */ 26214, 39321, 26214, 5378, 0, /* [136] */ 26214, 39321, 13107, 5378, 0, /* [137] */ 26214, 39321, 0, 5378, 0, /* [138] */ 26214, 26214, 65535, 5378, 0, /* [139] */ 26214, 26214, 52428, 5378, 0, /* [140] */ 26214, 26214, 39321, 5378, 0, /* [141] */ 26214, 26214, 26214, 5378, 0, /* [142] */ 26214, 26214, 13107, 5378, 0, /* [143] */ 26214, 26214, 0, 5378, 0, /* [144] */ 26214, 13107, 65535, 5378, 0, /* [145] */ 26214, 13107, 52428, 5378, 0, /* [146] */ 26214, 13107, 39321, 5378, 0, /* [147] */ 26214, 13107, 26214, 5378, 0, /* [148] */ 26214, 13107, 13107, 5378, 0, /* [149] */ 26214, 0, 65535, 5378, 0, /* [150] */ 26214, 0, 52428, 5378, 0, /* [151] */ 26214, 0, 39321, 5378, 0, /* [152] */ 26214, 0, 26214, 5378, 0, /* [153] */ 26214, 0, 13107, 5378, 0, /* [154] */ 26214, 0, 0, 5378, 0, /* [155] */ 13107, 65535, 65535, 5378, 0, /* [156] */ 13107, 65535, 52428, 5378, 0, /* [157] */ 13107, 65535, 39321, 5378, 0, /* [158] */ 13107, 65535, 26214, 5378, 0, /* [159] */ 13107, 65535, 13107, 5378, 0, /* [160] */ 13107, 65535, 0, 5378, 0, /* [161] */ 13107, 52428, 65535, 5378, 0, /* [162] */ 13107, 52428, 52428, 5378, 0, /* [163] */ 13107, 52428, 39321, 5378, 0, /* [164] */ 13107, 52428, 26214, 5378, 0, /* [165] */ 13107, 52428, 0, 5378, 0, /* [166] */ 13107, 39321, 65535, 5378, 0, /* [167] */ 13107, 39321, 52428, 5378, 0, /* [168] */ 13107, 39321, 39321, 5378, 0, /* [169] */ 13107, 39321, 26214, 5378, 0, /* [170] */ 13107, 39321, 13107, 5378, 0, /* [171] */ 13107, 39321, 0, 5378, 0, /* [172] */ 13107, 26214, 65535, 5378, 0, /* [173] */ 13107, 26214, 52428, 5378, 0, /* [174] */ 13107, 26214, 39321, 5378, 0, /* [175] */ 13107, 26214, 26214, 5378, 0, /* [176] */ 13107, 26214, 13107, 5378, 0, /* [177] */ 13107, 26214, 0, 5378, 0, /* [178] */ 13107, 13107, 65535, 5378, 0, /* [179] */ 13107, 13107, 52428, 5378, 0, /* [180] */ 13107, 13107, 39321, 5378, 0, /* [181] */ 13107, 13107, 26214, 5378, 0, /* [182] */ 13107, 13107, 13107, 5378, 0, /* [183] */ 13107, 13107, 0, 5378, 0, /* [184] */ 13107, 0, 65535, 5378, 0, /* [185] */ 13107, 0, 52428, 5378, 0, /* [186] */ 13107, 0, 26214, 5378, 0, /* [187] */ 13107, 0, 13107, 5378, 0, /* [188] */ 13107, 0, 0, 5378, 0, /* [189] */ 0, 65535, 65535, 5378, 0, /* [190] */ 0, 65535, 52428, 5378, 0, /* [191] */ 0, 65535, 39321, 5378, 0, /* [192] */ 0, 65535, 26214, 5378, 0, /* [193] */ 0, 65535, 13107, 5378, 0, /* [194] */ 0, 65535, 0, 5378, 0, /* [195] */ 0, 52428, 65535, 5378, 0, /* [196] */ 0, 52428, 52428, 5378, 0, /* [197] */ 0, 52428, 39321, 5378, 0, /* [198] */ 0, 52428, 26214, 5378, 0, /* [199] */ 0, 52428, 13107, 5378, 0, /* [200] */ 0, 52428, 0, 5378, 0, /* [201] */ 0, 39321, 52428, 5378, 0, /* [202] */ 0, 39321, 39321, 5378, 0, /* [203] */ 0, 39321, 26214, 5378, 0, /* [204] */ 0, 39321, 13107, 5378, 0, /* [205] */ 0, 39321, 0, 5378, 0, /* [206] */ 0, 26214, 65535, 5378, 0, /* [207] */ 0, 26214, 52428, 5378, 0, /* [208] */ 0, 26214, 39321, 5378, 0, /* [209] */ 0, 26214, 26214, 5378, 0, /* [210] */ 0, 26214, 13107, 5378, 0, /* [211] */ 0, 13107, 65535, 5378, 0, /* [212] */ 0, 13107, 52428, 5378, 0, /* [213] */ 0, 13107, 39321, 5378, 0, /* [214] */ 0, 13107, 26214, 5378, 0, /* [215] */ 0, 13107, 13107, 5378, 0, /* [216] */ 0, 13107, 0, 5378, 0, /* [217] */ 0, 0, 65535, 5378, 0, /* [218] */ 0, 0, 52428, 5378, 0, /* [219] */ 0, 0, 39321, 5378, 0, /* [220] */ 0, 0, 26214, 5378, 0, /* [221] */ 0, 0, 13107, 5378, 0, /* [222] */ 61166, 0, 0, 5378, 0, /* [223] */ 48059, 0, 0, 5378, 0, /* [224] */ 43690, 0, 0, 5378, 0, /* [225] */ 34952, 0, 0, 5378, 0, /* [226] */ 30583, 0, 0, 5378, 0, /* [227] */ 21845, 0, 0, 5378, 0, /* [228] */ 17476, 0, 0, 5378, 0, /* [229] */ 8738, 0, 0, 5378, 0, /* [230] */ 4369, 0, 0, 5378, 0, /* [231] */ 0, 61166, 0, 5378, 0, /* [232] */ 0, 56797, 0, 5378, 0, /* [233] */ 0, 48059, 0, 5378, 0, /* [234] */ 0, 43690, 0, 5378, 0, /* [235] */ 0, 34952, 0, 5378, 0, /* [236] */ 0, 30583, 0, 5378, 0, /* [237] */ 0, 21845, 0, 5378, 0, /* [238] */ 0, 17476, 0, 5378, 0, /* [239] */ 0, 8738, 0, 5378, 0, /* [240] */ 0, 4369, 0, 5378, 0, /* [241] */ 0, 0, 61166, 5378, 0, /* [242] */ 0, 0, 48059, 5378, 0, /* [243] */ 0, 0, 43690, 5378, 0, /* [244] */ 0, 0, 34952, 5378, 0, /* [245] */ 0, 0, 30583, 5378, 0, /* [246] */ 0, 0, 21845, 5378, 0, /* [247] */ 0, 0, 17476, 5378, 0, /* [248] */ 0, 0, 8738, 5378, 0, /* [249] */ 0, 0, 4369, 5378, 0, /* [250] */ 61166, 61166, 61166, 5378, 0, /* [251] */ 56797, 56797, 56797, 5378, 0, /* [252] */ 34952, 34952, 34952, 5378, 0, /* [253] */ 30583, 30583, 30583, 5378, 0, /* [254] */ 17476, 17476, 17476, 5378, 0, /* [255] */ 8738, 8738, 8738, 5378, 0, /* [256] */ 4369, 4369, 4369, 5378, 0 } }; #endif data 'teda' (128, purgeable) { $"0000 0000" /* .... */ }; data 'TEXT' (10000, "About text", purgeable) { $"4D75 6C62 6572 7279 C2AE 2069 7320 616E 2065 6D61 696C 2061 6E64 2063 616C 656E" /* Mulberry® is an email and calen */ $"6461 7220 636C 6965 6E74 2066 6F72 204D 6163 4F53 2058 2C20 5769 6E33 3220 616E" /* dar client for MacOS X, Win32 an */ $"6420 556E 6978 2062 6173 6564 2063 6F6D 7075 7465 7273 2E0D 0D68 7474 703A 2F2F" /* d Unix based computers...http:// */ $"7777 772E 6D75 6C62 6572 7279 6D61 696C 2E63 6F6D 0D6D 6169 6C74 6F3A 6D75 6C62" /* www.mulberrymail.com.mailto:mulb */ $"6572 7279 2D73 7570 706F 7274 406D 756C 6265 7272 796D 6169 6C2E 636F 6D0D 0D48" /* erry-support@mulberrymail.com..H */ $"436D 6442 7574 746F 6E41 7474 6163 686D 656E 7420 C2A9 3139 3937 2D31 3939 3820" /* CmdButtonAttachment ©1997-1998 */ $"4A6F 686E 2043 2E20 4461 7562 2E20 2041 6C6C 2072 6967 6874 7320 7265 7365 7276" /* John C. Daub. All rights reserv */ $"6564 2E0D 506F 7274 696F 6E73 206F 6620 4C44 4150 2063 6F64 6520 436F 7079 7269" /* ed..Portions of LDAP code Copyri */ $"6768 7420 C2A9 2031 3939 3020 5265 6765 6E74 7320 6F66 2074 6865 2055 6E69 7665" /* ght © 1990 Regents of the Unive */ $"7273 6974 7920 6F66 204D 6963 6869 6761 6E2E 2041 6C6C 2072 6967 6874 7320 7265" /* rsity of Michigan. All rights re */ $"7365 7276 6564 2E0D 0D4D 756C 6265 7272 79C2 AE20 6973 20C2 A920 4379 7275 7320" /* served...Mulberry® is © Cyrus */ $"4461 626F 6F2C 2032 3030 362E 2041 6C6C 2052 6967 6874 7320 5265 7365 7276 6564" /* Daboo, 2006. All Rights Reserved */ $"2E" /* . */ }; data 'styl' (10000, "About text") { $"0001 0000 0000 000D 000A 0004 0000 000A 0000 0000 0000" /* .........�.....�...... */ }; \ No newline at end of file diff --git a/MacOS/Resources/MulberryVers.r b/MacOS/Resources/MulberryVers.r index 530e30f3..ec3633b1 100644 --- a/MacOS/Resources/MulberryVers.r +++ b/MacOS/Resources/MulberryVers.r @@ -14,16 +14,16 @@ limitations under the License. */ -#include "Resources/RsrcTypes.r" +#include "RsrcTypes.r" resource 'vers' (1) { 0x4, 0x10, alpha, - 0x1, + 0x3, 0, - "v4.1a1", - "Mulberry v4.1a1, © Cyrus Daboo, 2006-2009." + "v4.1a3", + "Mulberry v4.1a3, © Cyrus Daboo, 2006-2012." }; resource 'vers' (2) { @@ -32,6 +32,6 @@ resource 'vers' (2) { alpha, 0x1, 0, - "v4.1a1", - "Mulberry v4.1a1" + "v4.1a3", + "Mulberry v4.1a3" }; diff --git a/MacOS/Sources/Application/Address_Book/CAddressFieldMultiLine.cp b/MacOS/Sources/Application/Address_Book/CAddressFieldMultiLine.cp index ae12abf5..52444919 100644 --- a/MacOS/Sources/Application/Address_Book/CAddressFieldMultiLine.cp +++ b/MacOS/Sources/Application/Address_Book/CAddressFieldMultiLine.cp @@ -65,8 +65,8 @@ void CAddressFieldMultiLine::SetDetails(const cdstring& title, int type, const c mOriginalData = data; mTitle->SetText(title); - if (type != 0) - mType->SetValue(type); + if (mUsesType) + mType->SetValue(type + 1); mData->SetText(data); } @@ -76,7 +76,7 @@ bool CAddressFieldMultiLine::GetDetails(int& newtype, cdstring& newdata) if (mUsesType) { - newtype = mType->GetValue(); + newtype = mType->GetValue() - 1; if (newtype != mOriginalType) changed = true; } diff --git a/MacOS/Sources/Application/Address_Book/CAddressFieldSubContainer.cp b/MacOS/Sources/Application/Address_Book/CAddressFieldSubContainer.cp index 21c8c694..606d5d5a 100644 --- a/MacOS/Sources/Application/Address_Book/CAddressFieldSubContainer.cp +++ b/MacOS/Sources/Application/Address_Book/CAddressFieldSubContainer.cp @@ -151,6 +151,7 @@ void CAddressFieldSubContainer::SetAddress(const CAdbkAddress* addr) } Layout(); + mDirty = false; } bool CAddressFieldSubContainer::GetAddress(CAdbkAddress* addr) diff --git a/MacOS/Sources/Application/Address_Book/CAddressFieldText.cp b/MacOS/Sources/Application/Address_Book/CAddressFieldText.cp index e0475957..7b51433d 100644 --- a/MacOS/Sources/Application/Address_Book/CAddressFieldText.cp +++ b/MacOS/Sources/Application/Address_Book/CAddressFieldText.cp @@ -64,8 +64,8 @@ void CAddressFieldText::SetDetails(const cdstring& title, int type, const cdstri mOriginalData = data; mTitle->SetText(title); - if (type != 0) - mType->SetValue(type); + if (mUsesType) + mType->SetValue(type + 1); mData->SetText(data); } @@ -75,7 +75,7 @@ bool CAddressFieldText::GetDetails(int& newtype, cdstring& newdata) if (mUsesType) { - newtype = mType->GetValue(); + newtype = mType->GetValue() - 1; if (newtype != mOriginalType) changed = true; } diff --git a/MacOS/Sources/Application/Calendar/Calendar_Properties/CCalendarPropDialog.cp b/MacOS/Sources/Application/Calendar/Calendar_Properties/CCalendarPropDialog.cp index 893ab2e1..ab997e78 100644 --- a/MacOS/Sources/Application/Calendar/Calendar_Properties/CCalendarPropDialog.cp +++ b/MacOS/Sources/Application/Calendar/Calendar_Properties/CCalendarPropDialog.cp @@ -97,7 +97,7 @@ void CCalendarPropDialog::SetCalList(calstore::CCalendarStoreNodeList* cal_list) // Add name if single calendar if (mCalList->size() == 1) { - title += mCalList->front()->GetName(); + title += mCalList->front()->GetAccountDisplayName(); } // Now set window title diff --git a/MacOS/Sources/Application/Calendar/Calendar_Properties/CPropCalendarGeneral.cp b/MacOS/Sources/Application/Calendar/Calendar_Properties/CPropCalendarGeneral.cp index aaa17592..fb4ed2f4 100644 --- a/MacOS/Sources/Application/Calendar/Calendar_Properties/CPropCalendarGeneral.cp +++ b/MacOS/Sources/Application/Calendar/Calendar_Properties/CPropCalendarGeneral.cp @@ -58,7 +58,6 @@ void CPropCalendarGeneral::FinishCreateSelf(void) mName = (CTextFieldX*) FindPaneByID(paneid_CalendarGeneralName); mServer = (CTextFieldX*) FindPaneByID(paneid_CalendarGeneralServer); mHierarchy = (CTextFieldX*) FindPaneByID(paneid_CalendarGeneralHierarchy); - mSeparator = (CTextFieldX*) FindPaneByID(paneid_CalendarGeneralSeparator); mSize = (CTextFieldX*) FindPaneByID(paneid_CalendarGeneralSize); mStatus = (CTextFieldX*) FindPaneByID(paneid_CalendarGeneralStatus); mLastSync = (CTextFieldX*) FindPaneByID(paneid_CalendarGeneralLastSync); @@ -119,10 +118,7 @@ void CPropCalendarGeneral::SetCalendar(calstore::CCalendarStoreNode* node) mServer->SetText(node->GetProtocol()->GetDescriptor()); - mHierarchy->SetText(node->GetParent()->GetName()); - - cdstring temp(node->GetProtocol()->GetDirDelim()); - mSeparator->SetText(temp); + mHierarchy->SetText(node->GetName()); // Only set these if not a directory if (!node->IsDirectory()) @@ -151,7 +147,7 @@ void CPropCalendarGeneral::SetCalendar(calstore::CCalendarStoreNode* node) else if (node->GetProtocol()->IsWebCalendar() || node->GetProtocol()->CanDisconnect()) { unsigned long utc_time = node->GetLastSync(); - + cdstring temp; if (utc_time != 0) { // Determine timezone offset @@ -179,7 +175,7 @@ void CPropCalendarGeneral::SetCalendar(calstore::CCalendarStoreNode* node) if (node->IsDirectory()) FindPaneByID(paneid_CalendarGeneralCalculate)->Disable(); - temp = cdstring::null_str; + cdstring temp = cdstring::null_str; if (node->IsActive()) { cdstring rsrc; diff --git a/MacOS/Sources/Application/Calendar/Calendar_Properties/CPropCalendarGeneral.h b/MacOS/Sources/Application/Calendar/Calendar_Properties/CPropCalendarGeneral.h index 4c95ebc4..5fd3aa02 100644 --- a/MacOS/Sources/Application/Calendar/Calendar_Properties/CPropCalendarGeneral.h +++ b/MacOS/Sources/Application/Calendar/Calendar_Properties/CPropCalendarGeneral.h @@ -31,7 +31,6 @@ const PaneIDT paneid_CalendarGeneralState = 'ICON'; const PaneIDT paneid_CalendarGeneralName = 'NAME'; const PaneIDT paneid_CalendarGeneralServer = 'SERV'; const PaneIDT paneid_CalendarGeneralHierarchy = 'HIER'; -const PaneIDT paneid_CalendarGeneralSeparator = 'SEPR'; const PaneIDT paneid_CalendarGeneralSize = 'SIZE'; const PaneIDT paneid_CalendarGeneralCalculate = 'CALC'; const PaneIDT paneid_CalendarGeneralStatus = 'STAT'; @@ -60,7 +59,6 @@ class CPropCalendarGeneral : public CCalendarPropPanel, CTextFieldX* mName; CTextFieldX* mServer; CTextFieldX* mHierarchy; - CTextFieldX* mSeparator; CTextFieldX* mSize; CTextFieldX* mStatus; CTextFieldX* mLastSync; diff --git a/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarEventBase.cp b/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarEventBase.cp index 9cc27bf3..ad4dc4be 100644 --- a/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarEventBase.cp +++ b/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarEventBase.cp @@ -458,6 +458,9 @@ void CCalendarEventBase::DrawHorizFrame(CGUtils::CGContextFromQD& inContext, HIR case iCal::CITIPProcessor::eIHaveAccepted: theResID = ICNx_AttendeeIsMeEvent; break; + case iCal::CITIPProcessor::eIHaveDeclined: + theResID = ICNx_DeclinedEvent; + break; case iCal::CITIPProcessor::eIHaveNotAccepted: theResID = ICNx_AttendeeNeedsAction; break; @@ -670,6 +673,9 @@ void CCalendarEventBase::DrawVertFrame(CGUtils::CGContextFromQD& inContext, HIRe case iCal::CITIPProcessor::eIHaveAccepted: theResID = ICNx_AttendeeIsMeEvent; break; + case iCal::CITIPProcessor::eIHaveDeclined: + theResID = ICNx_DeclinedEvent; + break; case iCal::CITIPProcessor::eIHaveNotAccepted: theResID = ICNx_AttendeeNeedsAction; break; diff --git a/MacOS/Sources/Application/General/CMulberryApp.cp b/MacOS/Sources/Application/General/CMulberryApp.cp index 6bdede90..baa67dcb 100644 --- a/MacOS/Sources/Application/General/CMulberryApp.cp +++ b/MacOS/Sources/Application/General/CMulberryApp.cp @@ -35,6 +35,7 @@ #include "CAdbkSearchWindow.h" #include "CAddressBookWindow.h" #include "CAdminLock.h" +#include "CAppLaunch.h" #include "CApplyRulesMenu.h" #include "CAttachmentManager.h" #include "CBalloonDialog.h" @@ -1427,7 +1428,7 @@ void CMulberryApp::OnHelpMulberryOnline() { // Launch the Mulberry webpage URL cdstring url = CAdminLock::sAdminLock.mMulberryURL; - OSStatus err = CICSupport::ICLaunchURL(url); + OSStatus err = CAppLaunch::LaunchURL(url); } // Go to Mulberry faq web page @@ -1435,7 +1436,7 @@ void CMulberryApp::OnHelpOnlineFAQ() { // Launch the Mulberry FAQ webpage URL cdstring url = CAdminLock::sAdminLock.mMulberryFAQ; - OSStatus err = CICSupport::ICLaunchURL(url); + OSStatus err = CAppLaunch::LaunchURL(url); } // Go to check updates page @@ -1472,7 +1473,7 @@ void CMulberryApp::OnHelpCheckUpdates() url += cdstring(static_cast(GetVersionNumber().nonRelRev)); // Launch the URL - OSStatus err = CICSupport::ICLaunchURL(url); + OSStatus err = CAppLaunch::LaunchURL(url); } // Create Mulberry support message @@ -1495,7 +1496,7 @@ void CMulberryApp::OnHelpBuyMulberry() { // Launch the Mulberry order form webpage URL cdstring url = cBuyMulberryURL; - OSStatus err = CICSupport::ICLaunchURL(url); + OSStatus err = CAppLaunch::LaunchURL(url); } #pragma mark ____________________________Command handling diff --git a/MacOS/Sources/Formatting/CFormattedTextDisplay.cp b/MacOS/Sources/Formatting/CFormattedTextDisplay.cp index b4efbdd9..2c783e8b 100644 --- a/MacOS/Sources/Formatting/CFormattedTextDisplay.cp +++ b/MacOS/Sources/Formatting/CFormattedTextDisplay.cp @@ -18,12 +18,12 @@ #include "CFormattedTextDisplay.h" #include "CAddressBookManager.h" +#include "CAppLaunch.h" #include "CATSUIStyle.h" #include "CBetterScrollerX.h" #include "CGUtils.h" #include "CClickList.h" #include "CCommands.h" -#include "CICSupport.h" #include "CMulberryCommon.h" #include "CParserEnriched.h" #include "CParserHTML.h" @@ -1118,9 +1118,7 @@ bool CFormattedTextDisplay::GetLineRange(SInt32 &first, SInt32 &last, SInt32 sta bool CFormattedTextDisplay::LaunchURL(const char* url) { - OSStatus err; - err = CICSupport::ICLaunchURL((char*) url); // justin grab_c_str change - + OSStatus err = CAppLaunch::LaunchURL(url); // justin grab_c_str change return (err == noErr); } diff --git a/MacOS/Sources/Support/CAppLaunch.cp b/MacOS/Sources/Support/CAppLaunch.cp index 967dc83c..22b40f5f 100644 --- a/MacOS/Sources/Support/CAppLaunch.cp +++ b/MacOS/Sources/Support/CAppLaunch.cp @@ -21,6 +21,10 @@ #include "CAppLaunch.h" +#include +#include +#include + #include // OpenSpecifiedDocument searches to see if the application which @@ -29,14 +33,37 @@ // (remember that, because of puppet strings, this works even // if the target application is not Apple event-aware.) -OSErr CAppLaunch::OpenDocumentWithApp(const PPx::FSObject* doc, OSType appCreator) +OSErr CAppLaunch::OpenDocumentWithApp(const PPx::FSObject* doc, const cdstring& mimeType, OSType appCreator) { // verify the document file exists and get its creator type if (!doc->Exists()) return fnfErr; - return LaunchApplicationWithDocument(appCreator, doc); + if (!appCreator) + { + // Try mime type first, then just use file name (extension) + PPx::CFString inMIMEType(mimeType, kCFStringEncodingUTF8); + CFURLRef outAppURL; + if (::LSCopyApplicationForMIMEType(inMIMEType, kLSRolesAll, &outAppURL) == noErr) + { + OSErr err = LaunchApplicationWithDocument(outAppURL, doc); + ::CFRelease(outAppURL); + return err; + } + + return ::LSOpenFSRef(&doc->UseRef(), NULL); + } + else + return LaunchApplicationWithDocument(appCreator, doc); +} + +// Launch the URL +OSErr CAppLaunch::LaunchURL(const cdstring& url) +{ + PPx::CFString urlStr(url, kCFStringEncodingUTF8); + PPx::CFURL inURL(urlStr); + return ::LSOpenCFURLRef(inURL, NULL); } //---------------------------------------------------------------------------- @@ -48,7 +75,6 @@ OSErr CAppLaunch::OpenDocumentWithApp(const PPx::FSObject* doc, OSType appCreato //---------------------------------------------------------------------------- OSErr CAppLaunch::LaunchApplicationWithDocument(OSType appCreator, const PPx::FSObject* doc) { - // Code taken from TechNote #2017 on Launch Services // Find the application on disk FSRef outAppRef; @@ -68,3 +94,25 @@ OSErr CAppLaunch::LaunchApplicationWithDocument(OSType appCreator, const PPx::FS return err; } + +OSErr CAppLaunch::LaunchApplicationWithDocument(CFURLRef appURL, const PPx::FSObject* doc) +{ + PPx::CFURL docURL(doc->UseRef()); + PPx::CFArray array(1); + array.AppendValue(docURL); + + + // Try to launch it with the document + + LSLaunchURLSpec inLaunchSpec; + inLaunchSpec.appURL = appURL; + inLaunchSpec.itemURLs = array; + inLaunchSpec.passThruParams = NULL; + inLaunchSpec.launchFlags = kLSLaunchDefaults; + inLaunchSpec.asyncRefCon = NULL; + + OSErr err = ::LSOpenFromURLSpec(&inLaunchSpec, NULL); + + return err; +} + diff --git a/MacOS/Sources/Support/CAppLaunch.h b/MacOS/Sources/Support/CAppLaunch.h index 47fe4567..2bfe6fdf 100644 --- a/MacOS/Sources/Support/CAppLaunch.h +++ b/MacOS/Sources/Support/CAppLaunch.h @@ -26,10 +26,13 @@ class CAppLaunch { public: - static OSErr OpenDocumentWithApp(const PPx::FSObject* doc, OSType appCreator); + static OSErr OpenDocumentWithApp(const PPx::FSObject* doc, const cdstring& mimeType, OSType appCreator); + static OSErr LaunchURL(const cdstring& url); + private: static OSErr LaunchApplicationWithDocument(OSType appCreator, const PPx::FSObject* doc); + static OSErr LaunchApplicationWithDocument(CFURLRef appURL, const PPx::FSObject* doc); CAppLaunch(); // Never create ~CAppLaunch(); diff --git a/Plug-ins/CRAM-MD5/CRAM-MD5.vcxproj b/Plug-ins/CRAM-MD5/CRAM-MD5.vcxproj new file mode 100644 index 00000000..8dc29f85 --- /dev/null +++ b/Plug-ins/CRAM-MD5/CRAM-MD5.vcxproj @@ -0,0 +1,139 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2984B681-27AE-4CA2-8AC5-911F02D3ED71} + CRAMMD5 + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;Ws2_32.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;Ws2_32.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + + Document + Create + Create + + + + + + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Plug-ins/CRAM-MD5/CRAM-MD5.vcxproj.filters b/Plug-ins/CRAM-MD5/CRAM-MD5.vcxproj.filters new file mode 100644 index 00000000..628cc9e1 --- /dev/null +++ b/Plug-ins/CRAM-MD5/CRAM-MD5.vcxproj.filters @@ -0,0 +1,76 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/Plug-ins/Common/CPluginInfo.h b/Plug-ins/Common/CPluginInfo.h index 185867f7..0340c2dd 100644 --- a/Plug-ins/Common/CPluginInfo.h +++ b/Plug-ins/Common/CPluginInfo.h @@ -30,4 +30,4 @@ const char* cPluginManufacturer = "mulberrymail.com"; #elif __dest_os == __linux_os #define OS_ENDL "\n" #endif -#define COPYRIGHT OS_ENDL OS_ENDL "Copyright Cyrus Daboo, 2006-2007." +#define COPYRIGHT OS_ENDL OS_ENDL "Copyright Cyrus Daboo, 2006-2012." diff --git a/Plug-ins/CommunicatorAdbkIO/CommunicatorAdbkIO.vcxproj b/Plug-ins/CommunicatorAdbkIO/CommunicatorAdbkIO.vcxproj new file mode 100644 index 00000000..69f0f0ea --- /dev/null +++ b/Plug-ins/CommunicatorAdbkIO/CommunicatorAdbkIO.vcxproj @@ -0,0 +1,148 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {44908954-E9BC-451A-948F-503C34C21459} + CommunicatorAdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + Document + Create + Create + + + + + + + + CompileAsC + + + CompileAsC + + + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/CommunicatorAdbkIO/CommunicatorAdbkIO.vcxproj.filters b/Plug-ins/CommunicatorAdbkIO/CommunicatorAdbkIO.vcxproj.filters new file mode 100644 index 00000000..fcd7c7ff --- /dev/null +++ b/Plug-ins/CommunicatorAdbkIO/CommunicatorAdbkIO.vcxproj.filters @@ -0,0 +1,73 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Source Files + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/Plug-ins/DIGEST-MD5/DIGEST-MD5.vcxproj b/Plug-ins/DIGEST-MD5/DIGEST-MD5.vcxproj new file mode 100644 index 00000000..7c413bde --- /dev/null +++ b/Plug-ins/DIGEST-MD5/DIGEST-MD5.vcxproj @@ -0,0 +1,150 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {30F10565-E2D7-43C5-BA6F-1E8008D2E9A1} + DIGESTMD5 + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)..\CRAM-MD5\sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;Ws2_32.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)..\CRAM-MD5\sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;Ws2_32.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + + Document + Create + Create + + + + + + CompileAsCpp + CompileAsCpp + + + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/DIGEST-MD5/DIGEST-MD5.vcxproj.filters b/Plug-ins/DIGEST-MD5/DIGEST-MD5.vcxproj.filters new file mode 100644 index 00000000..1733b09b --- /dev/null +++ b/Plug-ins/DIGEST-MD5/DIGEST-MD5.vcxproj.filters @@ -0,0 +1,82 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/Plug-ins/Eudora4AdbkIO/Eudora4AdbkIO.vcxproj b/Plug-ins/Eudora4AdbkIO/Eudora4AdbkIO.vcxproj new file mode 100644 index 00000000..d520beb4 --- /dev/null +++ b/Plug-ins/Eudora4AdbkIO/Eudora4AdbkIO.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {271F7588-C3AE-4E19-B80A-253375154200} + Eudora4AdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/Eudora4AdbkIO/Eudora4AdbkIO.vcxproj.filters b/Plug-ins/Eudora4AdbkIO/Eudora4AdbkIO.vcxproj.filters new file mode 100644 index 00000000..1a122344 --- /dev/null +++ b/Plug-ins/Eudora4AdbkIO/Eudora4AdbkIO.vcxproj.filters @@ -0,0 +1,61 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/EudoraAdbkIO/EudoraAdbkIO.vcxproj b/Plug-ins/EudoraAdbkIO/EudoraAdbkIO.vcxproj new file mode 100644 index 00000000..fb0ff870 --- /dev/null +++ b/Plug-ins/EudoraAdbkIO/EudoraAdbkIO.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {112E94B7-051A-4538-800D-C19A63DF9A0A} + EudoraAdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32v2\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/EudoraAdbkIO/EudoraAdbkIO.vcxproj.filters b/Plug-ins/EudoraAdbkIO/EudoraAdbkIO.vcxproj.filters new file mode 100644 index 00000000..62c707c7 --- /dev/null +++ b/Plug-ins/EudoraAdbkIO/EudoraAdbkIO.vcxproj.filters @@ -0,0 +1,61 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/GPG/GPG.vcxproj b/Plug-ins/GPG/GPG.vcxproj new file mode 100644 index 00000000..2ff7f594 --- /dev/null +++ b/Plug-ins/GPG/GPG.vcxproj @@ -0,0 +1,137 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2021ACB1-9223-4445-8FB1-15F9FD43C9CC} + GPG + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;$(ProjectDir)..\..\Win32\Sources\Support;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;$(ProjectDir)..\..\Win32\Sources\Support;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/GPG/GPG.vcxproj.filters b/Plug-ins/GPG/GPG.vcxproj.filters new file mode 100644 index 00000000..168c6380 --- /dev/null +++ b/Plug-ins/GPG/GPG.vcxproj.filters @@ -0,0 +1,67 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/NetscapeAdbkIO/NetscapeAdbkIO.vcxproj b/Plug-ins/NetscapeAdbkIO/NetscapeAdbkIO.vcxproj new file mode 100644 index 00000000..a7380ce4 --- /dev/null +++ b/Plug-ins/NetscapeAdbkIO/NetscapeAdbkIO.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {4FA83DF0-7E1F-40F0-8E56-A563D5B0C464} + NetscapeAdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/NetscapeAdbkIO/NetscapeAdbkIO.vcxproj.filters b/Plug-ins/NetscapeAdbkIO/NetscapeAdbkIO.vcxproj.filters new file mode 100644 index 00000000..33f2436a --- /dev/null +++ b/Plug-ins/NetscapeAdbkIO/NetscapeAdbkIO.vcxproj.filters @@ -0,0 +1,61 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/OEAdbkIO/OEAdbkIO.vcxproj b/Plug-ins/OEAdbkIO/OEAdbkIO.vcxproj new file mode 100644 index 00000000..6754e1a4 --- /dev/null +++ b/Plug-ins/OEAdbkIO/OEAdbkIO.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {FE83F247-5B3F-4340-9199-837ADA4A3DC8} + OEAdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/OEAdbkIO/OEAdbkIO.vcxproj.filters b/Plug-ins/OEAdbkIO/OEAdbkIO.vcxproj.filters new file mode 100644 index 00000000..18a1f158 --- /dev/null +++ b/Plug-ins/OEAdbkIO/OEAdbkIO.vcxproj.filters @@ -0,0 +1,61 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/PineAdbkIO/PineAdbkIO.vcxproj b/Plug-ins/PineAdbkIO/PineAdbkIO.vcxproj new file mode 100644 index 00000000..6e1471c0 --- /dev/null +++ b/Plug-ins/PineAdbkIO/PineAdbkIO.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {C83D0E2D-8DF5-4386-8E9C-31F16AB14834} + PineAdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/PineAdbkIO/PineAdbkIO.vcxproj.filters b/Plug-ins/PineAdbkIO/PineAdbkIO.vcxproj.filters new file mode 100644 index 00000000..c9850363 --- /dev/null +++ b/Plug-ins/PineAdbkIO/PineAdbkIO.vcxproj.filters @@ -0,0 +1,61 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/PluginLibrary/PluginLib.vcxproj b/Plug-ins/PluginLibrary/PluginLib.vcxproj new file mode 100644 index 00000000..1d4eb953 --- /dev/null +++ b/Plug-ins/PluginLibrary/PluginLib.vcxproj @@ -0,0 +1,153 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {0896B645-32A6-45A8-AE53-0184EF807ABA} + PluginLib + Win32Proj + + + + StaticLibrary + false + Unicode + true + + + StaticLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(ProjectDir)$(Configuration)\ + $(Configuration)\ + $(ProjectDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + $(ProjectDir);$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;$(ProjectDir)..\CRAM-MD5\sources\md5;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)\$(Configuration)\$(ProjectName).lib + + + + + $(ProjectDir);$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;$(ProjectDir)..\CRAM-MD5\sources\md5;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)\$(Configuration)\$(ProjectName).lib + true + + + + + + + + + + + + + + + + + + + + + + + Document + __VCPP__;%(PreprocessorDefinitions) + Create + Plugin_Prefix_Win32.h + __VCPP__;%(PreprocessorDefinitions) + Create + Plugin_Prefix_Win32.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsCpp + CompileAsCpp + + + + + + \ No newline at end of file diff --git a/Plug-ins/PluginLibrary/PluginLib.vcxproj.filters b/Plug-ins/PluginLibrary/PluginLib.vcxproj.filters new file mode 100644 index 00000000..664f848a --- /dev/null +++ b/Plug-ins/PluginLibrary/PluginLib.vcxproj.filters @@ -0,0 +1,174 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/PluginLibrary/PluginLibrary.xcodeproj/project.pbxproj b/Plug-ins/PluginLibrary/PluginLibrary.xcodeproj/project.pbxproj index cec50883..cc838295 100644 --- a/Plug-ins/PluginLibrary/PluginLibrary.xcodeproj/project.pbxproj +++ b/Plug-ins/PluginLibrary/PluginLibrary.xcodeproj/project.pbxproj @@ -559,6 +559,7 @@ REZ_SCRIPT_TYPE = Roman; REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO; STRIP_INSTALLED_PRODUCT = YES; + WARNING_CFLAGS = "-Wno-logical-op-parentheses"; }; name = Release; }; @@ -609,6 +610,7 @@ REZ_SCRIPT_TYPE = Roman; REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO; STRIP_INSTALLED_PRODUCT = NO; + WARNING_CFLAGS = "-Wno-logical-op-parentheses"; }; name = Debug; }; diff --git a/Plug-ins/QuickmailAdbkIO/QuickmailAdbkIO.vcxproj b/Plug-ins/QuickmailAdbkIO/QuickmailAdbkIO.vcxproj new file mode 100644 index 00000000..f27bfa5b --- /dev/null +++ b/Plug-ins/QuickmailAdbkIO/QuickmailAdbkIO.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {7F2EA713-8C9E-40FD-B8E9-A16FA100EFB1} + QuickmailAdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/QuickmailAdbkIO/QuickmailAdbkIO.vcxproj.filters b/Plug-ins/QuickmailAdbkIO/QuickmailAdbkIO.vcxproj.filters new file mode 100644 index 00000000..0327e588 --- /dev/null +++ b/Plug-ins/QuickmailAdbkIO/QuickmailAdbkIO.vcxproj.filters @@ -0,0 +1,61 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/QuickmailProAdbkIO/QuickmailProAdbkIO.vcxproj b/Plug-ins/QuickmailProAdbkIO/QuickmailProAdbkIO.vcxproj new file mode 100644 index 00000000..870dc240 --- /dev/null +++ b/Plug-ins/QuickmailProAdbkIO/QuickmailProAdbkIO.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {3067EE83-4924-4845-9555-A68E5C6A9AED} + QuickmailProAdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/QuickmailProAdbkIO/QuickmailProAdbkIO.vcxproj.filters b/Plug-ins/QuickmailProAdbkIO/QuickmailProAdbkIO.vcxproj.filters new file mode 100644 index 00000000..77c93af0 --- /dev/null +++ b/Plug-ins/QuickmailProAdbkIO/QuickmailProAdbkIO.vcxproj.filters @@ -0,0 +1,61 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/SMIME/SMIME.vcxproj b/Plug-ins/SMIME/SMIME.vcxproj new file mode 100644 index 00000000..bdc6a7b7 --- /dev/null +++ b/Plug-ins/SMIME/SMIME.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D49FFB27-5460-4B71-AFE5-A4819614FE8F} + SMIME + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Plugins\SSL;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;$(ProjectDir)..\..\Libraries\vendor\openssl-1.0.0d\inc32;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Plugins\SSL;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;$(ProjectDir)..\..\Libraries\vendor\openssl-1.0.0d\inc32;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/SMIME/SMIME.vcxproj.filters b/Plug-ins/SMIME/SMIME.vcxproj.filters new file mode 100644 index 00000000..b4a6f8fe --- /dev/null +++ b/Plug-ins/SMIME/SMIME.vcxproj.filters @@ -0,0 +1,65 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/SMIME/sources/CSMIMEPluginDLL.cp b/Plug-ins/SMIME/sources/CSMIMEPluginDLL.cp index b848a5e5..8c25c29d 100644 --- a/Plug-ins/SMIME/sources/CSMIMEPluginDLL.cp +++ b/Plug-ins/SMIME/sources/CSMIMEPluginDLL.cp @@ -1460,7 +1460,7 @@ int CSMIMEPluginDLL::B64write_PKCS7(BIO* bio, PKCS7* p7) ::i2d_PKCS7_bio(bio, p7); #endif - BIO_flush(bio); + (void)BIO_flush(bio); ::BIO_pop(bio); ::BIO_free(b64); @@ -1492,7 +1492,7 @@ PKCS7* CSMIMEPluginDLL::B64read_PKCS7(BIO* bio) return 0;; } - BIO_flush(bio); + (void)BIO_flush(bio); ::BIO_pop(bio); ::BIO_free(b64); diff --git a/Plug-ins/SSL/SSL.def b/Plug-ins/SSL/SSL.def index ec06a8a0..061dc15d 100644 --- a/Plug-ins/SSL/SSL.def +++ b/Plug-ins/SSL/SSL.def @@ -41,7 +41,6 @@ CRYPTO_set_locked_mem_ex_functions CRYPTO_set_locked_mem_functions CRYPTO_set_mem_ex_functions CRYPTO_set_mem_functions -cleanse_ctr OPENSSL_cleanse CRYPTO_mem_leaks_cb CRYPTO_mem_leaks_fp @@ -107,10 +106,6 @@ ASN1_ENUMERATED_set ASN1_GENERALIZEDTIME_set ASN1_GENERALIZEDTIME_set_string ASN1_GENERALIZEDTIME_check -ASN1_HEADER_free -ASN1_HEADER_new -d2i_ASN1_HEADER -i2d_ASN1_HEADER ASN1_item_i2d_bio ASN1_item_i2d_fp ASN1_i2d_bio @@ -126,8 +121,6 @@ ASN1_INTEGER_cmp ASN1_INTEGER_dup ASN1_mbstring_ncopy ASN1_mbstring_copy -ASN1_BIT_STRING_asn1_meth -ASN1_IA5STRING_asn1_meth ASN1_OBJECT_create ASN1_OBJECT_free ASN1_OBJECT_new @@ -302,7 +295,6 @@ ASN1_primitive_free ASN1_template_free ASN1_item_ex_free ASN1_item_free -asn1_primitive_clear ASN1_primitive_new ASN1_template_new ASN1_item_ex_new @@ -530,7 +522,6 @@ d2i_X509_AUX X509_get_ex_data X509_set_ex_data X509_get_ex_new_index -X509_asn1_meth X509_dup X509_free X509_new @@ -613,8 +604,6 @@ BIO_free BIO_set BIO_new BIO_new_accept -BIO_ACCEPT_free -BIO_ACCEPT_new BIO_s_accept BIO_nwrite BIO_nwrite0 @@ -1225,7 +1214,6 @@ EVP_PKEY2PKCS8 EVP_PKCS82PKEY EVP_dss EVP_dss1 -EVP_md2 EVP_md5 EVP_md_null EVP_ripemd160 @@ -1296,12 +1284,6 @@ lh_insert lh_free lh_new lh_strhash -MD2_version -MD2_Final -MD2_Update -MD2_Init -MD2_options -MD2 MD4_version MD4_Init MD4_Final @@ -1325,7 +1307,6 @@ OBJ_NAME_new_index OBJ_NAME_init OBJ_create OBJ_create_objects -OBJ_bsearch OBJ_sn2nid OBJ_ln2nid OBJ_txt2nid @@ -1437,7 +1418,6 @@ OCSP_copy_nonce OCSP_check_nonce OCSP_basic_add1_nonce OCSP_request_add1_nonce -ASN1_STRING_encode OCSP_SINGLERESP_add_ext OCSP_SINGLERESP_add1_ext_i2d OCSP_SINGLERESP_get1_ext_d2i @@ -1665,8 +1645,6 @@ d2i_PKCS12_fp d2i_PKCS12_bio i2d_PKCS12_fp i2d_PKCS12_bio -uni2asc -asc2uni ERR_load_PKCS12_strings PKCS7_it PKCS7_SIGNED_it @@ -1789,7 +1767,6 @@ RC2_set_key RC2_cfb64_encrypt RC2_ofb64_encrypt RC4 -RC4_version RC4_set_key RC4_options RMD160_version @@ -1804,7 +1781,6 @@ RSAPrivateKey_dup RSAPublicKey_dup i2d_RSAPublicKey d2i_RSAPublicKey -RSAPrivateKey_asn1_meth i2d_RSAPrivateKey d2i_RSAPrivateKey RSA_check_key @@ -1835,7 +1811,6 @@ RSA_new RSA_padding_check_none RSA_padding_add_none RSA_null_method -MGF1 RSA_padding_check_PKCS1_OAEP RSA_padding_add_PKCS1_OAEP RSA_padding_check_PKCS1_type_2 @@ -2445,7 +2420,6 @@ BIO_new_buffer_ssl_connect BIO_f_ssl SSLv23_client_method ssl23_connect -sslv23_base_method SSLv23_method ssl23_read_bytes ssl23_write_bytes @@ -2463,7 +2437,6 @@ ssl2_ciphers ssl2_write_error ssl2_return_error ssl2_generate_key_material -sslv2_base_method ssl2_new ssl2_clear ssl2_free @@ -2498,7 +2471,6 @@ SSLv3_client_method ssl3_connect ssl3_alert_code ssl3_generate_master_secret -ssl3_mac ssl3_final_finish_mac ssl3_cert_verify_mac ssl3_finish_mac @@ -2511,7 +2483,6 @@ ssl3_version_str ssl3_ciphers ssl3_get_req_cert_type ssl3_choose_cipher -sslv3_base_method ssl3_new ssl3_clear ssl3_free @@ -2630,8 +2601,6 @@ SSL_CTX_set_default_passwd_cb_userdata SSL_CTX_set_default_passwd_cb SSL_CTX_free SSL_CTX_new -SSL_SESSION_cmp -SSL_SESSION_hash ssl_bytes_to_cipher_list ssl_cipher_list_to_bytes SSL_get_shared_ciphers @@ -2756,7 +2725,6 @@ tls1_enc tls1_setup_key_block tls1_change_cipher_state tls1_version_str -tlsv1_base_method tls1_new tls1_clear tls1_free diff --git a/Plug-ins/SSL/SSL.vcxproj b/Plug-ins/SSL/SSL.vcxproj new file mode 100644 index 00000000..5a88a4c0 --- /dev/null +++ b/Plug-ins/SSL/SSL.vcxproj @@ -0,0 +1,138 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {09D392B6-ADFB-4DBD-8B90-969EA87F4395} + SSL + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;$(ProjectDir)..\..\Libraries\vendor\openssl-1.0.0d\inc32;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + /Def:"SSL.def" %(AdditionalOptions) + $(ProjectDir)..\..\Libraries\vendor\openssl-1.0.0d\out32d\libeay32.lib;$(ProjectDir)..\..\Libraries\vendor\openssl-1.0.0d\out32d\ssleay32.lib;WSOCK32.lib;Crypt32.lib;%(AdditionalDependencies) + false + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;$(ProjectDir)..\..\Libraries\vendor\openssl-1.0.0d\inc32;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + /Def:"SSL.def" %(AdditionalOptions) + $(ProjectDir)..\..\Libraries\vendor\openssl-1.0.0d\out32s\libeay32.lib;$(ProjectDir)..\..\Libraries\vendor\openssl-1.0.0d\out32s\ssleay32.lib;WSOCK32.lib;Crypt32.lib;%(AdditionalDependencies) + false + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/SSL/SSL.vcxproj.filters b/Plug-ins/SSL/SSL.vcxproj.filters new file mode 100644 index 00000000..b799acd7 --- /dev/null +++ b/Plug-ins/SSL/SSL.vcxproj.filters @@ -0,0 +1,58 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Plug-ins/vCardAdbkIO/vCardAdbkIO.vcxproj b/Plug-ins/vCardAdbkIO/vCardAdbkIO.vcxproj new file mode 100644 index 00000000..c2009a5d --- /dev/null +++ b/Plug-ins/vCardAdbkIO/vCardAdbkIO.vcxproj @@ -0,0 +1,142 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {4325A88C-9A90-4A39-8D18-54A7B30B5B0C} + vCardAdbkIO + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Plugin_Prefix_Win32.h + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + true + Windows + false + + + MachineX86 + + + + + + + + + $(ProjectDir)sources;$(ProjectDir)sources\md5;$(ProjectDir)..\Common;$(ProjectDir)..\..\Sources_Common\i18n;$(ProjectDir)..\..\Sources_Common\i18n\Charsets;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\..\Sources_Common\Mail\URLs;$(ProjectDir)..\..\Sources_Common\Utilities;$(ProjectDir)..\..\Win32\Sources\VCPP;%(AdditionalIncludeDirectories) + __VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Plugin_Prefix_Win32.h + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;4309;%(DisableSpecificWarnings) + Plugin_Prefix_Win32.h;%(ForcedIncludeFiles) + + + $(ProjectDir)..\PluginLibrary\$(Configuration)\PluginLib.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + + + Document + Create + Create + + + + + + + + + + + + + + + + + + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + + + + \ No newline at end of file diff --git a/Plug-ins/vCardAdbkIO/vCardAdbkIO.vcxproj.filters b/Plug-ins/vCardAdbkIO/vCardAdbkIO.vcxproj.filters new file mode 100644 index 00000000..be17adf3 --- /dev/null +++ b/Plug-ins/vCardAdbkIO/vCardAdbkIO.vcxproj.filters @@ -0,0 +1,76 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/Sources_Common/Application/Preferences/CBlockOptionsMap.h b/Sources_Common/Application/Preferences/CBlockOptionsMap.h index d731c2bb..309f3822 100644 --- a/Sources_Common/Application/Preferences/CBlockOptionsMap.h +++ b/Sources_Common/Application/Preferences/CBlockOptionsMap.h @@ -35,7 +35,7 @@ class CBlockOptionsMap : public COptionsMap virtual bool ReadMap(void) = 0; virtual bool WriteMap(bool verify) = 0; virtual bool IsEmpty() const - { return mMap.size(); } + { return mMap.size() == 0; } virtual void DeleteMap(void) = 0; // Look for values under a key diff --git a/Sources_Common/Calendar_Store/CCalendarStoreManager.cpp b/Sources_Common/Calendar_Store/CCalendarStoreManager.cpp index 58c14c16..63eaba3e 100644 --- a/Sources_Common/Calendar_Store/CCalendarStoreManager.cpp +++ b/Sources_Common/Calendar_Store/CCalendarStoreManager.cpp @@ -1034,7 +1034,7 @@ iCal::CICalendar* CCalendarStoreManager::PickCalendar(const iCal::CICalendarComp for(iCal::CICalendarList::const_iterator iter = mReceivableCalendars.begin(); iter != mReceivableCalendars.end(); iter++, cal_pos++) { const CCalendarStoreNode* node = GetNode(*iter); - cdstring name = node ? node->GetAccountName(HasMultipleProtocols()) : (*iter)->GetName(); + cdstring name = node ? node->GetAccountDisplayName(HasMultipleProtocols()) : (*iter)->GetName(); if (name.empty()) { name = rsrc::GetString("::NumberedCalendar"); diff --git a/Sources_Common/Calendar_Store/CCalendarStoreNode.cpp b/Sources_Common/Calendar_Store/CCalendarStoreNode.cpp index f67b2ee1..40f03e69 100644 --- a/Sources_Common/Calendar_Store/CCalendarStoreNode.cpp +++ b/Sources_Common/Calendar_Store/CCalendarStoreNode.cpp @@ -521,7 +521,7 @@ void CCalendarStoreNode::MoveCalendar(const CCalendarStoreNode* dir, bool siblin cdstring new_name; // Must have item and it must be a directory or protocol - if (!dir || !dir->IsProtocol() && !dir->IsDirectory()) + if (!dir || (!dir->IsProtocol() && !dir->IsDirectory())) return; // Check for sibling diff --git a/Sources_Common/Calendar_Store/Clients/CCalDAVCalendarClient.cpp b/Sources_Common/Calendar_Store/Clients/CCalDAVCalendarClient.cpp index 600eb628..40f77199 100644 --- a/Sources_Common/Calendar_Store/Clients/CCalDAVCalendarClient.cpp +++ b/Sources_Common/Calendar_Store/Clients/CCalDAVCalendarClient.cpp @@ -685,7 +685,7 @@ void CCalDAVCalendarClient::_FastSync(const CCalendarStoreNode& node, iCal::CICa // Create WebDAV report cdstring rurl = node.GetName(); rurl.EncodeURL('/'); - std::auto_ptr request(new http::webdav::CWebDAVSyncReport(this, rurl, cal.GetSyncToken())); + std::auto_ptr request(new http::webdav::CWebDAVSyncReport(this, rurl, synctoken)); http::CHTTPOutputDataString dout; request->SetOutput(&dout); diff --git a/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp b/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp index c05c8c45..a148d6c0 100644 --- a/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp +++ b/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp @@ -297,7 +297,7 @@ void CCalendarProtocol::CreateClient() case CINETAccount::eWebDAVCalendar: case CINETAccount::eCalDAVCalendar: case CINETAccount::eHTTPCalendar: - if (CConnectionManager::sConnectionManager.IsConnected() && !IsForceDisconnect() || !CanDisconnect()) + if ((CConnectionManager::sConnectionManager.IsConnected() && !IsForceDisconnect()) || !CanDisconnect()) { SetFlags(eIsOffline, false); SetFlags(eDisconnected, false); @@ -1125,12 +1125,14 @@ bool CCalendarProtocol::SyncComponentsFromServerFast(const CCalendarStoreNode& n // Step 1 cdstrmap changed; - cdstrset removed; - cdstring synctoken; + cdstrset removed; + cdstring synctoken = cal.GetSyncToken(); mClient->_FastSync(node, cal, changed, removed, synctoken); if (synctoken.empty() && !cal.GetSyncToken().empty()) { + // Original token was invalid so invalidate the entire local cache and do a full sync + cal.ClearSync(); changed.clear(); removed.clear(); mClient->_FastSync(node, cal, changed, removed, synctoken); @@ -1325,7 +1327,7 @@ bool CCalendarProtocol::SyncComponentsFromServerFast(const CCalendarStoreNode& n // Clear out cache recording cal.ClearRecording(); - // Get the current server sync token if changes were made or it was differemt + // Get the current server sync token if changes were made or it was different if (server_changed || changes_made) { mClient->_UpdateSyncToken(node, cal); diff --git a/Sources_Common/Mail/Attachments/CAttachment.cp b/Sources_Common/Mail/Attachments/CAttachment.cp index 55f1fd1a..824ebfc3 100644 --- a/Sources_Common/Mail/Attachments/CAttachment.cp +++ b/Sources_Common/Mail/Attachments/CAttachment.cp @@ -1199,7 +1199,6 @@ const cdstring CAttachment::GetMappedName(bool not_empty, bool force) const #endif } -#if __dest_os == __win32_os || __dest_os == __linux_os // Must have proper file extension if (!::strchr(name.c_str(), '.')) name += CMIMESupport::MapMIMEToFileExt((CAttachment&) *part_to_map); @@ -1216,7 +1215,6 @@ const cdstring CAttachment::GetMappedName(bool not_empty, bool force) const if (::strrchr(result.c_str(), '.')) name += cdstring(::strrchr(result.c_str(), '.')); } -#endif const_cast(this)->SetName(name); } @@ -1322,10 +1320,12 @@ bool CAttachment::UniqueFile(const cdstring& fpath) const // Get suite of icons from icon cache const CIconRef* CAttachment::GetIconRef() const { +#if 0 #if __dest_os == __mac_os || __dest_os == __mac_os_x ICMapEntry entry; if (CICSupport::ICMapFileName(mContent, entry, true) == noErr) return CDesktopIcons::GetDesktopIcons(entry.fileCreator, entry.fileType); +#endif #endif return CDesktopIcons::GetDesktopIconsFromMIME(mContent.GetContentTypeText(), mContent.GetContentSubtypeText()); } @@ -2078,7 +2078,8 @@ void CAttachment::TryLaunch(CFullFileStream* aFile) const appCreator = finfo.file.fileCreator; } - CAppLaunch::OpenDocumentWithApp(&fspec, appCreator); + cdstring mimeType = CMIMESupport::GenerateContentHeader(this, false, lendl, false); + CAppLaunch::OpenDocumentWithApp(&fspec, mimeType, appCreator); #elif __dest_os == __win32_os TCHAR dir[MAX_PATH]; if (::GetCurrentDirectory(MAX_PATH, dir)) diff --git a/Sources_Common/Mail/Attachments/CMIMESupport.cp b/Sources_Common/Mail/Attachments/CMIMESupport.cp index 7df1459a..c0ff019f 100644 --- a/Sources_Common/Mail/Attachments/CMIMESupport.cp +++ b/Sources_Common/Mail/Attachments/CMIMESupport.cp @@ -917,7 +917,6 @@ void CMIMESupport::MapFileToMIME(CAttachment& attach) } #endif -#if ( __dest_os == __win32_os ) || (__dest_os == __linux_os) // Get file extension for MIME cdstring CMIMESupport::MapMIMEToFileExt(const CAttachment& attach) { @@ -944,12 +943,18 @@ cdstring CMIMESupport::MapMIMEToFileExt(const CAttachment& attach) #if __dest_os == __win32_os // Look in registry return CWinRegistry::GetSuffixFromMIME(type, original); -#else +#elif __dest_os == __linux_os // Look in MIME map return CMIMETypesMap::sMIMETypesMap.GetExtension(type, original); +#else + if (type == "text/plain") + return ".txt"; + else if (type == "text/html") + return ".html"; + else + return ""; #endif } -#endif // Get application that will open MIME part cdstring CMIMESupport::MapMIMEToApp(const CAttachment& attach) @@ -1027,6 +1032,7 @@ OSType CMIMESupport::MapMIMEToCreator(const CAttachment& attach) if (attach.GetContent().IsBinHexed() || attach.GetContent().IsUUed() || attach.IsApplefile()) return 0L; +#if 0 // Will rely on LaunchServices from now on // Lookup attachment with internet config ICMapEntry entry; if (CICSupport::ICMapFileName(attach.GetContent(), entry) == noErr) @@ -1037,12 +1043,14 @@ OSType CMIMESupport::MapMIMEToCreator(const CAttachment& attach) return entry.fileCreator; } else +#endif return 0L; } // Get application creator that will open MIME part OSType CMIMESupport::MapMIMEToCreator(const cdstring& fname, const cdstring& type) { +#if 0 // Will rely on LaunchServices from now on // Lookup attachment with internet config ICMapEntry entry; if (CICSupport::ICMapMIMEType(fname, type, entry) == noErr) @@ -1053,6 +1061,7 @@ OSType CMIMESupport::MapMIMEToCreator(const cdstring& fname, const cdstring& typ return entry.fileCreator; } else +#endif return 0L; } #endif diff --git a/Sources_Common/Mail/Attachments/CMIMESupport.h b/Sources_Common/Mail/Attachments/CMIMESupport.h index f7a2551f..2544674a 100644 --- a/Sources_Common/Mail/Attachments/CMIMESupport.h +++ b/Sources_Common/Mail/Attachments/CMIMESupport.h @@ -76,8 +76,8 @@ class CMIMESupport #if (__dest_os == __win32_os) || (__dest_os == __linux_os) static void MapFileToMIME(CAttachment& attach); // Map file extension to MIME content - static cdstring MapMIMEToFileExt(const CAttachment& attach); // Get file extension for MIME #endif + static cdstring MapMIMEToFileExt(const CAttachment& attach); // Get file extension for MIME static cdstring MapMIMEToApp(const CAttachment& attach); // Get application that will open MIME part #if __dest_os == __mac_os || __dest_os == __mac_os_x static OSType MapMIMEToCreator(const CAttachment& attach); // Get application that will open MIME part diff --git a/Sources_Common/Mail/Control/CAttachmentManager.cp b/Sources_Common/Mail/Control/CAttachmentManager.cp index 07456e90..499031ce 100644 --- a/Sources_Common/Mail/Control/CAttachmentManager.cp +++ b/Sources_Common/Mail/Control/CAttachmentManager.cp @@ -583,11 +583,11 @@ LStream* CAttachmentManager::GetFileStream(CAttachment& attach, bool view) case eBinaryEncoding: case eXtokenEncoding: // No filter - copy as is - ICMapEntry entry; - CICSupport::ICMapFileName(attach.GetContent(), entry); - aFile->CreateNewDataFile(entry.fileCreator, entry.fileType, smCurrentScript); - newFlavor.fileType = entry.fileType; - newFlavor.fileCreator = entry.fileCreator; + ICMapEntry entry2; + CICSupport::ICMapFileName(attach.GetContent(), entry2); + aFile->CreateNewDataFile(entry2.fileCreator, entry2.fileType, smCurrentScript); + newFlavor.fileType = entry2.fileType; + newFlavor.fileCreator = entry2.fileCreator; newFlavor.fdFlags = 0; break; @@ -725,8 +725,8 @@ bool CAttachmentManager::MapToFile(const cdstring& name, fspectype& file, bool v // Add number to name nname = fname + cdstring((long) ctr++); fpath = CPreferences::sPrefs->mDefaultDownload.GetValue() + nname; - MyCFString cfstr(fpath, kCFStringEncodingUTF8); - fspec = PPx::FSObject(cfstr); + MyCFString cfstr2(fpath, kCFStringEncodingUTF8); + fspec = PPx::FSObject(cfstr2); } // Alert if directory not found @@ -902,15 +902,7 @@ bool CAttachmentManager::LaunchURL(const cdstring& url) const // Try default map first OSType appCreator = CMIMESupport::MapMIMEToCreator(name, GetEntry(url)->second.mMimeType); - // If not found or decoded file use file's creator - if (!appCreator) - { - FinderInfo finfo; - fspec.GetFinderInfo(&finfo, NULL, NULL); - appCreator = finfo.file.fileCreator; - } - - CAppLaunch::OpenDocumentWithApp(&fspec, appCreator); + CAppLaunch::OpenDocumentWithApp(&fspec, GetEntry(url)->second.mMimeType, appCreator); #elif __dest_os == __win32_os TCHAR dir[MAX_PATH]; if (::GetCurrentDirectory(MAX_PATH, dir)) @@ -1051,7 +1043,8 @@ void CAttachmentManager::TryLaunch(const CAttachment* attach, const fspectype& f appCreator = finfo.file.fileCreator; } - CAppLaunch::OpenDocumentWithApp(&fspec, appCreator); + cdstring mimeType = CMIMESupport::GenerateContentHeader(attach, false, lendl, false); + CAppLaunch::OpenDocumentWithApp(&fspec, mimeType, appCreator); #elif __dest_os == __win32_os TCHAR dir[MAX_PATH]; if (::GetCurrentDirectory(MAX_PATH, dir)) diff --git a/Sources_Common/Mail/Control/CConnectionManager.cp b/Sources_Common/Mail/Control/CConnectionManager.cp index f2e8ee57..3bf1850e 100644 --- a/Sources_Common/Mail/Control/CConnectionManager.cp +++ b/Sources_Common/Mail/Control/CConnectionManager.cp @@ -41,7 +41,7 @@ #if __dest_os == __win32_os #include //#include -#include +#include #elif __dest_os == __linux_os #include #endif diff --git a/Sources_Common/Mail/Filtering/CActionItem.cp b/Sources_Common/Mail/Filtering/CActionItem.cp index 0e20b10b..bbe806c4 100644 --- a/Sources_Common/Mail/Filtering/CActionItem.cp +++ b/Sources_Common/Mail/Filtering/CActionItem.cp @@ -38,6 +38,7 @@ #endif #include +#include #include "char_stream.h" diff --git a/Sources_Common/Mail/Filtering/CFilterItem.cp b/Sources_Common/Mail/Filtering/CFilterItem.cp index 4f2befb9..c24dcd54 100644 --- a/Sources_Common/Mail/Filtering/CFilterItem.cp +++ b/Sources_Common/Mail/Filtering/CFilterItem.cp @@ -29,6 +29,7 @@ #include #include +#include extern const char* cSpace; extern const char* cValueBoolTrue; diff --git a/Sources_Common/Mail/Mailbox/CMbox.cp b/Sources_Common/Mail/Mailbox/CMbox.cp index 27585530..65f55c63 100644 --- a/Sources_Common/Mail/Mailbox/CMbox.cp +++ b/Sources_Common/Mail/Mailbox/CMbox.cp @@ -39,6 +39,7 @@ #endif #include +#include #include "cdomutex.h" diff --git a/Sources_Common/Mail/Network/CTLSSocket.cp b/Sources_Common/Mail/Network/CTLSSocket.cp index bf07d0e0..7d1e4282 100644 --- a/Sources_Common/Mail/Network/CTLSSocket.cp +++ b/Sources_Common/Mail/Network/CTLSSocket.cp @@ -45,37 +45,37 @@ #endif #ifdef _winsock -#define EWOULDBLOCK WSAEWOULDBLOCK -#define EINPROGRESS WSAEINPROGRESS -#define EALREADY WSAEALREADY -#define ENOTSOCK WSAENOTSOCK -#define EDESTADDRREQ WSAEDESTADDRREQ -#define EMSGSIZE WSAEMSGSIZE -#define EPROTOTYPE WSAEPROTOTYPE -#define ENOPROTOOPT WSAENOPROTOOPT -#define EPROTONOSUPPORT WSAEPROTONOSUPPORT +//#define EWOULDBLOCK WSAEWOULDBLOCK +//#define EINPROGRESS WSAEINPROGRESS +//#define EALREADY WSAEALREADY +//#define ENOTSOCK WSAENOTSOCK +//#define EDESTADDRREQ WSAEDESTADDRREQ +//#define EMSGSIZE WSAEMSGSIZE +//#define EPROTOTYPE WSAEPROTOTYPE +//#define ENOPROTOOPT WSAENOPROTOOPT +//#define EPROTONOSUPPORT WSAEPROTONOSUPPORT #define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT -#define EOPNOTSUPP WSAEOPNOTSUPP +//#define EOPNOTSUPP WSAEOPNOTSUPP #define EPFNOSUPPORT WSAEPFNOSUPPORT -#define EAFNOSUPPORT WSAEAFNOSUPPORT -#define EADDRINUSE WSAEADDRINUSE -#define EADDRNOTAVAIL WSAEADDRNOTAVAIL -#define ENETDOWN WSAENETDOWN -#define ENETUNREACH WSAENETUNREACH -#define ENETRESET WSAENETRESET -#define ECONNABORTED WSAECONNABORTED -#define ECONNRESET WSAECONNRESET -#define ENOBUFS WSAENOBUFS -#define EISCONN WSAEISCONN -#define ENOTCONN WSAENOTCONN +//#define EAFNOSUPPORT WSAEAFNOSUPPORT +//#define EADDRINUSE WSAEADDRINUSE +//#define EADDRNOTAVAIL WSAEADDRNOTAVAIL +//#define ENETDOWN WSAENETDOWN +//#define ENETUNREACH WSAENETUNREACH +//#define ENETRESET WSAENETRESET +//#define ECONNABORTED WSAECONNABORTED +//#define ECONNRESET WSAECONNRESET +//#define ENOBUFS WSAENOBUFS +//#define EISCONN WSAEISCONN +//#define ENOTCONN WSAENOTCONN #define ESHUTDOWN WSAESHUTDOWN #define ETOOMANYREFS WSAETOOMANYREFS -#define ETIMEDOUT WSAETIMEDOUT -#define ECONNREFUSED WSAECONNREFUSED -#define ELOOP WSAELOOP +//#define ETIMEDOUT WSAETIMEDOUT +//#define ECONNREFUSED WSAECONNREFUSED +//#define ELOOP WSAELOOP //#define ENAMETOOLONG WSAENAMETOOLONG #define EHOSTDOWN WSAEHOSTDOWN -#define EHOSTUNREACH WSAEHOSTUNREACH +//#define EHOSTUNREACH WSAEHOSTUNREACH //#define ENOTEMPTY WSAENOTEMPTY #define EPROCLIM WSAEPROCLIM #define EUSERS WSAEUSERS @@ -415,7 +415,7 @@ void CTLSSocket::TLSStartConnection() mCertIssuer = str; // Get cipher in use - SSL_CIPHER* cipher = ::SSL_get_current_cipher(m_tls); + const SSL_CIPHER* cipher = ::SSL_get_current_cipher(m_tls); char cipher_desc[256]; ::SSL_CIPHER_description(cipher, cipher_desc, 256); diff --git a/Sources_Common/Mail/Protocols/CMboxProtocol.cp b/Sources_Common/Mail/Protocols/CMboxProtocol.cp index 250177ba..66585ec3 100644 --- a/Sources_Common/Mail/Protocols/CMboxProtocol.cp +++ b/Sources_Common/Mail/Protocols/CMboxProtocol.cp @@ -52,6 +52,7 @@ #include #include +#include //#include diff --git a/Sources_Common/Plugins/SSL/CCertificateManager.cp b/Sources_Common/Plugins/SSL/CCertificateManager.cp index c41f53fb..b05457e1 100644 --- a/Sources_Common/Plugins/SSL/CCertificateManager.cp +++ b/Sources_Common/Plugins/SSL/CCertificateManager.cp @@ -639,6 +639,7 @@ bool CCertificateManager::ImportCertificateFile(CCertificateManager::ECertificat const unsigned char* p = (unsigned char*) buf->data; const unsigned char* op = p; +#if 0 // KAP: until we find a suitable replacement in openssl-1.0 code // First load the header NSSL::StSSLObject ah(::d2i_ASN1_HEADER(NULL, &p, (long)size)); if (ah.get() == NULL) @@ -666,6 +667,7 @@ bool CCertificateManager::ImportCertificateFile(CCertificateManager::ECertificat xcert.reset((X509 *)ah->data); ah->data = NULL; +#endif } // Do actual certificate import if one is left @@ -1107,7 +1109,7 @@ STACK_OF(X509)* CCertificateManager::GetCerts(const char* key, ECertificateType return NULL; } - STACK_OF(EVP_PKEY)* result = sk_X509_new_null(); + STACK_OF(X509)* result = sk_X509_new_null(); // Add each matching pkey to the stack for(CCertificateStoreList::const_iterator iter1 = store->begin(); iter1 != store->end(); iter1++) diff --git a/Sources_Common/Plugins/SSL/CSSLUtils.cp b/Sources_Common/Plugins/SSL/CSSLUtils.cp index 8de23606..b9871fd2 100644 --- a/Sources_Common/Plugins/SSL/CSSLUtils.cp +++ b/Sources_Common/Plugins/SSL/CSSLUtils.cp @@ -37,12 +37,6 @@ namespace NSSL { -// ASN1_HEADER -template<> void StSSLObject::delete_obj() -{ - ::ASN1_HEADER_free(mObj); -} - // BIO template<> void StSSLObject::delete_obj() { diff --git a/Sources_Common/Plugins/SSL/loadsslfunc.cp b/Sources_Common/Plugins/SSL/loadsslfunc.cp index a4490069..e98da504 100644 --- a/Sources_Common/Plugins/SSL/loadsslfunc.cp +++ b/Sources_Common/Plugins/SSL/loadsslfunc.cp @@ -47,22 +47,22 @@ extern CDLLLoader* sSSLLoader; #pragma mark ______________________crypto // void ASN1_HEADER_free(ASN1_HEADER *a); -IMPORT_FUNCTION_VOID(sSSLLoader, void, ASN1_HEADER_free, (ASN1_HEADER *a), (a)) +//IMPORT_FUNCTION_VOID(sSSLLoader, void, ASN1_HEADER_free, (ASN1_HEADER *a), (a)) -//int ASN1_OCTET_STRING_cmp(ASN1_OCTET_STRING *a, ASN1_OCTET_STRING *b); -IMPORT_FUNCTION(sSSLLoader, int, ASN1_OCTET_STRING_cmp, (ASN1_OCTET_STRING *a, ASN1_OCTET_STRING *b), (a, b)) +//int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b); +IMPORT_FUNCTION(sSSLLoader, int, ASN1_OCTET_STRING_cmp, (const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b), (a, b)) -//ASN1_STRING * ASN1_STRING_dup(ASN1_STRING *a); -IMPORT_FUNCTION(sSSLLoader, ASN1_STRING *, ASN1_STRING_dup, (ASN1_STRING *a), (a)) +//ASN1_STRING * ASN1_STRING_dup(const ASN1_STRING *a); +IMPORT_FUNCTION(sSSLLoader, ASN1_STRING *, ASN1_STRING_dup, (const ASN1_STRING *a), (a)) -//int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b); -IMPORT_FUNCTION(sSSLLoader, int, ASN1_STRING_cmp, (ASN1_STRING *a, ASN1_STRING *b), (a, b)) +//int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b); +IMPORT_FUNCTION(sSSLLoader, int, ASN1_STRING_cmp, (const ASN1_STRING *a, const ASN1_STRING *b), (a, b)) -//int ASN1_STRING_length(ASN1_STRING *x); -IMPORT_FUNCTION(sSSLLoader, int, ASN1_STRING_length, (ASN1_STRING *x), (x)) +//int ASN1_STRING_length(const ASN1_STRING *x); +IMPORT_FUNCTION(sSSLLoader, int, ASN1_STRING_length, (const ASN1_STRING *x), (x)) -//int ASN1_TIME_print(BIO *fp, ASN1_TIME *a); -IMPORT_FUNCTION(sSSLLoader, int, ASN1_TIME_print, (BIO *fp, ASN1_TIME *a), (fp, a)) +//int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a); +IMPORT_FUNCTION(sSSLLoader, int, ASN1_TIME_print, (BIO *fp, const ASN1_TIME *a), (fp, a)) //unsigned char * ASN1_STRING_data(ASN1_STRING *x); IMPORT_FUNCTION(sSSLLoader, unsigned char *, ASN1_STRING_data, (ASN1_STRING *x), (x)) @@ -118,8 +118,8 @@ IMPORT_FUNCTION(sSSLLoader, BIO_METHOD *, BIO_s_mem, (void), ()) // void BUF_MEM_free(BUF_MEM *a); IMPORT_FUNCTION_VOID(sSSLLoader, void, BUF_MEM_free, (BUF_MEM *a), (a)) -// int BUF_MEM_grow(BUF_MEM *str, int len); -IMPORT_FUNCTION(sSSLLoader, int, BUF_MEM_grow, (BUF_MEM *str, int len), (str, len)) +// int BUF_MEM_grow(BUF_MEM *str, size_t len); +IMPORT_FUNCTION(sSSLLoader, int, BUF_MEM_grow, (BUF_MEM *str, size_t len), (str, len)) // BUF_MEM *BUF_MEM_new(void); IMPORT_FUNCTION(sSSLLoader, BUF_MEM *, BUF_MEM_new, (void), ()) @@ -140,7 +140,7 @@ IMPORT_FUNCTION(sSSLLoader, void *, CRYPTO_malloc, (int num, const char *file, i IMPORT_FUNCTION(sSSLLoader, int, CRYPTO_set_ex_data, (CRYPTO_EX_DATA *ad, int idx, void *val), (ad, idx, val)) // ASN1_HEADER *d2i_ASN1_HEADER(ASN1_HEADER **a,const unsigned char **pp, long length); -IMPORT_FUNCTION(sSSLLoader, ASN1_HEADER *, d2i_ASN1_HEADER, (ASN1_HEADER **a, const unsigned char **pp, long length), (a, pp, length)) +//IMPORT_FUNCTION(sSSLLoader, ASN1_HEADER *, d2i_ASN1_HEADER, (ASN1_HEADER **a, const unsigned char **pp, long length), (a, pp, length)) // PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12); IMPORT_FUNCTION(sSSLLoader, PKCS12 *, d2i_PKCS12_bio, (BIO *bp, PKCS12 **p12), (bp, p12)) @@ -215,8 +215,8 @@ IMPORT_FUNCTION(sSSLLoader, unsigned char *, MD5, (const unsigned char *d, size_ //void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); IMPORT_FUNCTION_VOID(sSSLLoader, void, RC4_set_key, (RC4_KEY *key, int len, const unsigned char *data), (key, len, data)) -//void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, unsigned char *outdata); -IMPORT_FUNCTION_VOID(sSSLLoader, void, RC4, (RC4_KEY *key, unsigned long len, const unsigned char *indata, unsigned char *outdata), (key, len, indata, outdata)) +//void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, unsigned char *outdata); +IMPORT_FUNCTION_VOID(sSSLLoader, void, RC4, (RC4_KEY *key, size_t len, const unsigned char *indata, unsigned char *outdata), (key, len, indata, outdata)) //int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name); IMPORT_FUNCTION(sSSLLoader, int, OBJ_obj2txt, (char *buf, int buf_len, const ASN1_OBJECT *a, int no_name), (buf, buf_len, a, no_name)) @@ -258,39 +258,39 @@ IMPORT_FUNCTION(sSSLLoader, int, PKCS12_parse, (PKCS12 *p12, const char *pass, E //int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags); IMPORT_FUNCTION(sSSLLoader, int, PKCS7_decrypt, (PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags), (p7, pkey, cert, data, flags)) -//PKCS7 *PKCS7_encrypt(STACK *certs, BIO *in, const EVP_CIPHER *cipher, int flags); -IMPORT_FUNCTION(sSSLLoader, PKCS7 *, PKCS7_encrypt, (STACK *certs, BIO *in, const EVP_CIPHER *cipher, int flags), (certs, in, cipher, flags)) +//PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags); +IMPORT_FUNCTION(sSSLLoader, PKCS7 *, PKCS7_encrypt, (STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags), (certs, in, cipher, flags)) //void PKCS7_free(PKCS7 *a); IMPORT_FUNCTION_VOID(sSSLLoader, void, PKCS7_free, (PKCS7 *a), (a)) -//STACK *PKCS7_get0_signers(PKCS7 *p7, STACK *certs, int flags); -IMPORT_FUNCTION(sSSLLoader, STACK *, PKCS7_get0_signers, (PKCS7 *p7, STACK *certs, int flags), (p7, certs, flags)) +//STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags); +IMPORT_FUNCTION(sSSLLoader, STACK_OF(X509) *, PKCS7_get0_signers, (PKCS7 *p7, STACK_OF(X509) *certs, int flags), (p7, certs, flags)) -//PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK *certs, BIO *data, int flags); -IMPORT_FUNCTION(sSSLLoader, PKCS7 *, PKCS7_sign, (X509 *signcert, EVP_PKEY *pkey, STACK *certs, BIO *data, int flags), (signcert, pkey, certs, data, flags)) +//PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags); +IMPORT_FUNCTION(sSSLLoader, PKCS7 *, PKCS7_sign, (X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags), (signcert, pkey, certs, data, flags)) -//int PKCS7_verify(PKCS7 *p7, STACK *certs, X509_STORE *store, BIO *indata, BIO *out, int flags) -IMPORT_FUNCTION(sSSLLoader, int, PKCS7_verify, (PKCS7 *p7, STACK *certs, X509_STORE *store, BIO *indata, BIO *out, int flags), (p7, certs, store, indata, out, flags)) +//int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags) +IMPORT_FUNCTION(sSSLLoader, int, PKCS7_verify, (PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags), (p7, certs, store, indata, out, flags)) #ifdef USE_CMS //int CMS_decrypt(CMS *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags); IMPORT_FUNCTION(sSSLLoader, int, CMS_decrypt, (CMS *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags), (p7, pkey, cert, data, flags)) -//CMS *CMS_encrypt(STACK *certs, BIO *in, const EVP_CIPHER *cipher, int flags); -IMPORT_FUNCTION(sSSLLoader, CMS *, CMS_encrypt, (STACK *certs, BIO *in, const EVP_CIPHER *cipher, int flags), (certs, in, cipher, flags)) +//CMS *CMS_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags); +IMPORT_FUNCTION(sSSLLoader, CMS *, CMS_encrypt, (STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags), (certs, in, cipher, flags)) //void CMS_free(CMS *a); IMPORT_FUNCTION_VOID(sSSLLoader, void, CMS_free, (CMS *a), (a)) -//STACK *CMS_get0_signers(CMS *p7, STACK *certs, int flags); -IMPORT_FUNCTION(sSSLLoader, STACK *, CMS_get0_signers, (CMS *p7, STACK *certs, int flags), (p7, certs, flags)) +//STACK_OF(X509) *CMS_get0_signers(CMS *p7, STACK_OF(X509) *certs, int flags); +IMPORT_FUNCTION(sSSLLoader, STACK_OF(X509) *, CMS_get0_signers, (CMS *p7, STACK_OF(X509) *certs, int flags), (p7, certs, flags)) -//CMS *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK *certs, BIO *data, int flags); -IMPORT_FUNCTION(sSSLLoader, CMS *, CMS_sign, (X509 *signcert, EVP_PKEY *pkey, STACK *certs, BIO *data, int flags), (signcert, pkey, certs, data, flags)) +//CMS *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags); +IMPORT_FUNCTION(sSSLLoader, CMS *, CMS_sign, (X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags), (signcert, pkey, certs, data, flags)) -//int CMS_verify(CMS *p7, STACK *certs, X509_STORE *store, BIO *indata, BIO *out, int flags) -IMPORT_FUNCTION(sSSLLoader, int, CMS_verify, (CMS *p7, STACK *certs, X509_STORE *store, BIO *indata, BIO *out, int flags), (p7, certs, store, indata, out, flags)) +//int CMS_verify(CMS *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags) +IMPORT_FUNCTION(sSSLLoader, int, CMS_verify, (CMS *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags), (p7, certs, store, indata, out, flags)) //int CMS_RECIP_INFO_contains(const CMS_RECIP_INFO *cmsi, X509 *x509) IMPORT_FUNCTION(sSSLLoader, int, CMS_RECIP_INFO_contains, (const CMS_RECIP_INFO *cmsi, X509 *x509), (cmsi, x509)) @@ -321,26 +321,26 @@ IMPORT_FUNCTION(sSSLLoader, int, RAND_write_file, (const char *file), (file)) //RSA * RSA_generate_key(int bits, unsigned long e,void (*callback)(int,int,void *),void *cb_arg); IMPORT_FUNCTION(sSSLLoader, RSA *, RSA_generate_key, (int bits, unsigned long e, void (*callback)(int,int,void *), void *cb_arg), (bits, e, callback, cb_arg)) -//void sk_free(STACK *); -IMPORT_FUNCTION_VOID(sSSLLoader, void, sk_free, (STACK *s), (s)) +//void sk_free(_STACK *); +IMPORT_FUNCTION_VOID(sSSLLoader, void, sk_free, (_STACK *s), (s)) -//STACK *sk_new_null(void); -IMPORT_FUNCTION(sSSLLoader, STACK *, sk_new_null, (void), ()) +//_STACK *sk_new_null(void); +IMPORT_FUNCTION(sSSLLoader, _STACK *, sk_new_null, (void), ()) -//int sk_num(const STACK *); -IMPORT_FUNCTION(sSSLLoader, int, sk_num, (const STACK *s), (s)) +//int sk_num(const _STACK *); +IMPORT_FUNCTION(sSSLLoader, int, sk_num, (const _STACK *s), (s)) -//void sk_pop_free(STACK *st, void (*func)(void *)); -IMPORT_FUNCTION_VOID(sSSLLoader, void, sk_pop_free, (STACK *st, void (*func)(void *)), (st, func)) +//void sk_pop_free(_STACK *st, void (*func)(void *)); +IMPORT_FUNCTION_VOID(sSSLLoader, void, sk_pop_free, (_STACK *st, void (*func)(void *)), (st, func)) -//int sk_push(STACK *st,char *data); -IMPORT_FUNCTION(sSSLLoader, int, sk_push, (STACK *st,char *data), (st, data)) +//int sk_push(_STACK *st,void *data); +IMPORT_FUNCTION(sSSLLoader, int, sk_push, (_STACK *st,void *data), (st, data)) -//char *sk_value(const STACK *, int); -IMPORT_FUNCTION(sSSLLoader, char *, sk_value, (const STACK *s, int i), (s, i)) +//void *sk_value(const _STACK *, int); +IMPORT_FUNCTION(sSSLLoader, void *, sk_value, (const _STACK *s, int i), (s, i)) // ASN1_METHOD *X509_asn1_meth(void); -IMPORT_FUNCTION(sSSLLoader, ASN1_METHOD *, X509_asn1_meth, (void), ()) +//IMPORT_FUNCTION(sSSLLoader, ASN1_METHOD *, X509_asn1_meth, (void), ()) //int X509_check_issued(X509 *issuer, X509 *subject); IMPORT_FUNCTION(sSSLLoader, int, X509_check_issued, (X509 *issuer, X509 *subject), (issuer, subject)) @@ -348,8 +348,8 @@ IMPORT_FUNCTION(sSSLLoader, int, X509_check_issued, (X509 *issuer, X509 *subject //int X509_cmp(const X509 *a, const X509 *b); IMPORT_FUNCTION(sSSLLoader, int, X509_cmp, (const X509 *a, const X509 *b), (a, b)) -//int X509_cmp_current_time(ASN1_TIME *s); -IMPORT_FUNCTION(sSSLLoader, int, X509_cmp_current_time, (ASN1_TIME *s), (s)) +//int X509_cmp_current_time(const ASN1_TIME *s); +IMPORT_FUNCTION(sSSLLoader, int, X509_cmp_current_time, (const ASN1_TIME *s), (s)) //X509 *X509_dup(X509 *x509); IMPORT_FUNCTION(sSSLLoader, X509 *, X509_dup, (X509 *x), (x)) @@ -471,49 +471,25 @@ IMPORT_FUNCTION(sSSLLoader, int, SSL_connect, (SSL *ssl), (ssl)) IMPORT_FUNCTION_VOID(sSSLLoader, void, SSL_free, (SSL *ssl), (ssl)) //X509 *SSL_get_certificate(SSL *ssl); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, X509 *, SSL_get_certificate, (SSL *ssl), (ssl)) -#else IMPORT_FUNCTION(sSSLLoader, X509 *, SSL_get_certificate, (const SSL *ssl), (ssl)) -#endif //SSL_CIPHER *SSL_get_current_cipher(SSL *s); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, SSL_CIPHER *, SSL_get_current_cipher, (SSL *ssl), (ssl)) -#else -IMPORT_FUNCTION(sSSLLoader, SSL_CIPHER *, SSL_get_current_cipher, (const SSL *ssl), (ssl)) -#endif +IMPORT_FUNCTION(sSSLLoader, const SSL_CIPHER *, SSL_get_current_cipher, (const SSL *ssl), (ssl)) //int SSL_get_error(SSL *s,int ret_code); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, int, SSL_get_error, (SSL *s,int ret_code), (s, ret_code)) -#else IMPORT_FUNCTION(sSSLLoader, int, SSL_get_error, (const SSL *s,int ret_code), (s, ret_code)) -#endif //void *SSL_get_ex_data(SSL *ssl,int idx); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, void *, SSL_get_ex_data, (SSL *ssl,int idx), (ssl, idx)) -#else IMPORT_FUNCTION(sSSLLoader, void *, SSL_get_ex_data, (const SSL *ssl,int idx), (ssl, idx)) -#endif //int SSL_get_ex_data_X509_STORE_CTX_idx(void ); IMPORT_FUNCTION(sSSLLoader, int, SSL_get_ex_data_X509_STORE_CTX_idx, (void), ()) //X509 *SSL_get_peer_certificate(SSL *s); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, X509 *, SSL_get_peer_certificate, (SSL *ssl), (ssl)) -#else IMPORT_FUNCTION(sSSLLoader, X509 *, SSL_get_peer_certificate, (const SSL *ssl), (ssl)) -#endif //long SSL_get_verify_result(SSL *ssl); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, long, SSL_get_verify_result, (SSL *ssl), (ssl)) -#else IMPORT_FUNCTION(sSSLLoader, long, SSL_get_verify_result, (const SSL *ssl), (ssl)) -#endif //int SSL_library_init(void); IMPORT_FUNCTION(sSSLLoader, int, SSL_library_init, (void), ()) @@ -528,11 +504,7 @@ IMPORT_FUNCTION_VOID(sSSLLoader, void, SSL_load_error_strings, (void), ()) IMPORT_FUNCTION(sSSLLoader, SSL *, SSL_new, (SSL_CTX *ctx), (ctx)) //int SSL_pending(SSL *s); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, int, SSL_pending, (SSL *ssl), (ssl)) -#else IMPORT_FUNCTION(sSSLLoader, int, SSL_pending, (const SSL *ssl), (ssl)) -#endif //int SSL_read(SSL *ssl,void *buf,int num); IMPORT_FUNCTION(sSSLLoader, int, SSL_read, (SSL *ssl,void *buf,int num), (ssl, buf, num)) @@ -553,11 +525,7 @@ IMPORT_FUNCTION(sSSLLoader, int, SSL_get_ex_new_index, (long argl, void *argp, C IMPORT_FUNCTION(sSSLLoader, int, SSL_set_fd, (SSL *s, int fd), (s, fd)) //int SSL_state(SSL *ssl); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, int, SSL_state, (SSL *ssl), (ssl)) -#else IMPORT_FUNCTION(sSSLLoader, int, SSL_state, (const SSL *ssl), (ssl)) -#endif //const char * SSL_state_string_long(const SSL *s); IMPORT_FUNCTION(sSSLLoader, const char *, SSL_state_string_long, (const SSL *ssl), (ssl)) @@ -569,36 +537,20 @@ IMPORT_FUNCTION(sSSLLoader, int, SSL_use_certificate, (SSL *ssl, X509 *x), (ssl, IMPORT_FUNCTION(sSSLLoader, int, SSL_use_PrivateKey, (SSL *ssl, EVP_PKEY *pkey), (ssl, pkey)) //int SSL_version(SSL *ssl); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, int, SSL_version, (SSL *ssl), (ssl)) -#else IMPORT_FUNCTION(sSSLLoader, int, SSL_version, (const SSL *ssl), (ssl)) -#endif //int SSL_write(SSL *ssl,const void *buf,int num); IMPORT_FUNCTION(sSSLLoader, int, SSL_write, (SSL *ssl,const void *buf,int num), (ssl, buf, num)) -//char *SSL_CIPHER_description(SSL_CIPHER *s,char *buf,int size); +//char *SSL_CIPHER_description(const SSL_CIPHER *s,char *buf,int size); // argument was constified in 0.9.8m -#if OPENSSL_VERSION_NUMBER >= 0x009080dfL IMPORT_FUNCTION(sSSLLoader, char *, SSL_CIPHER_description, (const SSL_CIPHER *s,char *buf,int size), (s, buf, size)) -#else -IMPORT_FUNCTION(sSSLLoader, char *, SSL_CIPHER_description, (SSL_CIPHER *s,char *buf,int size), (s, buf, size)) -#endif //int SSL_CIPHER_get_bits(SSL_CIPHER *c,int *alg_bits); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, int, SSL_CIPHER_get_bits, (SSL_CIPHER *c,int *alg_bits), (c, alg_bits)) -#else IMPORT_FUNCTION(sSSLLoader, int, SSL_CIPHER_get_bits, (const SSL_CIPHER *c,int *alg_bits), (c, alg_bits)) -#endif //int SSL_CTX_check_private_key(SSL_CTX *ctx); -#if OPENSSL_VERSION_NUMBER == 0x0090704fL -IMPORT_FUNCTION(sSSLLoader, int, SSL_CTX_check_private_key, (SSL_CTX *ctx), (ctx)) -#else IMPORT_FUNCTION(sSSLLoader, int, SSL_CTX_check_private_key, (const SSL_CTX *ctx), (ctx)) -#endif //long SSL_CTX_ctrl(SSL_CTX *ctx,int cmd, long larg, void *parg); IMPORT_FUNCTION(sSSLLoader, long, SSL_CTX_ctrl, (SSL_CTX *ctx,int cmd, long larg, void *parg), (ctx, cmd, larg, parg)) @@ -609,8 +561,8 @@ IMPORT_FUNCTION_VOID(sSSLLoader, void, SSL_CTX_free, (SSL_CTX *ctx), (ctx)) //int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath); IMPORT_FUNCTION(sSSLLoader, int, SSL_CTX_load_verify_locations, (SSL_CTX *ctx, const char *CAfile, const char *CApath), (ctx, CAfile, CApath)) -//SSL_CTX *SSL_CTX_new(SSL_METHOD *meth); -IMPORT_FUNCTION(sSSLLoader, SSL_CTX *, SSL_CTX_new, (SSL_METHOD *meth), (meth)) +//SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth); +IMPORT_FUNCTION(sSSLLoader, SSL_CTX *, SSL_CTX_new, (const SSL_METHOD *meth), (meth)) //int SSL_CTX_set_cipher_list(SSL_CTX *,const char *str); IMPORT_FUNCTION(sSSLLoader, int, SSL_CTX_set_cipher_list, (SSL_CTX *ctx,const char *str), (ctx, str)) @@ -636,17 +588,17 @@ IMPORT_FUNCTION(sSSLLoader, int, SSL_CTX_use_certificate_file, (SSL_CTX *ctx, co //int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type); IMPORT_FUNCTION(sSSLLoader, int, SSL_CTX_use_PrivateKey_file, (SSL_CTX *ctx, const char *file, int type), (ctx, file, type)) -//SSL_METHOD *SSLv23_method(void); -IMPORT_FUNCTION(sSSLLoader, SSL_METHOD *, SSLv23_method, (void), ()) +//const SSL_METHOD *SSLv23_method(void); +IMPORT_FUNCTION(sSSLLoader, const SSL_METHOD *, SSLv23_method, (void), ()) -//SSL_METHOD *SSLv23_client_method(void); -IMPORT_FUNCTION(sSSLLoader, SSL_METHOD *, SSLv23_client_method, (void), ()) +//const SSL_METHOD *SSLv23_client_method(void); +IMPORT_FUNCTION(sSSLLoader, const SSL_METHOD *, SSLv23_client_method, (void), ()) -//SSL_METHOD *SSLv3_client_method(void); -IMPORT_FUNCTION(sSSLLoader, SSL_METHOD *, SSLv3_client_method, (void), ()) +//const SSL_METHOD *SSLv3_client_method(void); +IMPORT_FUNCTION(sSSLLoader, const SSL_METHOD *, SSLv3_client_method, (void), ()) -//SSL_METHOD *TLSv1_client_method(void); -IMPORT_FUNCTION(sSSLLoader, SSL_METHOD *, TLSv1_client_method, (void), ()) +//const SSL_METHOD *TLSv1_client_method(void); +IMPORT_FUNCTION(sSSLLoader, const SSL_METHOD *, TLSv1_client_method, (void), ()) //void ssl3_send_alert(SSL *s,int level, int desc); IMPORT_FUNCTION_VOID(sSSLLoader, void, ssl3_send_alert, (SSL *s,int level, int desc), (s, level, desc)) diff --git a/Sources_Common/Preferences_Store/Clients/CWebDAVPrefsClient.cpp b/Sources_Common/Preferences_Store/Clients/CWebDAVPrefsClient.cpp index 9053a061..91b80025 100644 --- a/Sources_Common/Preferences_Store/Clients/CWebDAVPrefsClient.cpp +++ b/Sources_Common/Preferences_Store/Clients/CWebDAVPrefsClient.cpp @@ -164,6 +164,20 @@ void CWebDAVPrefsClient::Reset() void CWebDAVPrefsClient::Logon() { + // Get authorization info, some servers require it before the first request + if (!HasAuthorization() && + GetAccount()->GetAuthenticatorType() != CAuthenticator::eNone) + { + cdstrvect hdrs; + SetHost(mServerAddr); + OpenConnection(); + mAuthorization = GetAuthorization(true, hdrs); + if (mAuthorization == (CHTTPAuthorization*) -1) + { + mAuthorization = NULL; + } + } + // Do initialisation if not already done if (!Initialise(mServerAddr, mBaseRURL)) { diff --git a/Sources_Common/Utilities/bf_crlfbuf.c b/Sources_Common/Utilities/bf_crlfbuf.c index a5025422..2e05e68f 100644 --- a/Sources_Common/Utilities/bf_crlfbuf.c +++ b/Sources_Common/Utilities/bf_crlfbuf.c @@ -207,7 +207,7 @@ static int crlfbuffer_write(BIO *b, const char *in, int inl) static long crlfbuffer_ctrl(BIO *b, int cmd, long num, void *ptr) { - long ret; + long ret = 0; if (b->next_bio == NULL) return(0); switch(cmd) @@ -220,7 +220,7 @@ static long crlfbuffer_ctrl(BIO *b, int cmd, long num, void *ptr) ctx->ibuf_off=0; ctx->got_cr=0; if (b->next_bio) - BIO_reset(b->next_bio); + (void)BIO_reset(b->next_bio); break; } case BIO_C_DO_STATE_MACHINE: diff --git a/Sources_Common/i18n/Charsets/Converters/CConverterBase.cp b/Sources_Common/i18n/Charsets/Converters/CConverterBase.cp index cd537d05..2c012a75 100644 --- a/Sources_Common/i18n/Charsets/Converters/CConverterBase.cp +++ b/Sources_Common/i18n/Charsets/Converters/CConverterBase.cp @@ -108,7 +108,7 @@ void CConverterBase::ToUTF16(const char* str, size_t len, std::ostream& wout) } else { - wc -= 0x10000; + wc -= (wchar_t)0x10000; wchar_t wc1 = 0xD800 | ((wc & 0x000FFC00) >> 10); wchar_t wc2 = 0xDC00 | (wc & 0x000003FF); diff --git a/Win32/Mulberry.vcxproj b/Win32/Mulberry.vcxproj new file mode 100644 index 00000000..ab1f8d26 --- /dev/null +++ b/Win32/Mulberry.vcxproj @@ -0,0 +1,2427 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Template + Win32 + + + + {5215D70C-FBAC-4E55-AE4F-E7400CE8CCB7} + Mulberry + Win32Proj + + + + Application + Dynamic + Dynamic + Unicode + + + Application + Dynamic + Dynamic + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Debug\ + Debug\ + true + Release\ + Release\ + true + + + + Disabled + $(ProjectDir)Sources;$(ProjectDir)Sources\Application;$(ProjectDir)Sources\Application\Address_Book;$(ProjectDir)Sources\Application\Address_Book_Manager;$(ProjectDir)Sources\Application\Address_Book_Manager\Address_Book_Properties;$(ProjectDir)Sources\Application\Address_Search;$(ProjectDir)Sources\Application\Calendar;$(ProjectDir)Sources\Application\Calendar\Calendar_Properties;$(ProjectDir)Sources\Application\Calendar\Calendar_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Calendar_Store_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Calendar_Window;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Day_Week_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Event_ToDo_Preview;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Free_Busy_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Month_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Summary_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\ToDo_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Year_View;$(ProjectDir)Sources\Application\Calendar\Component_Editing;$(ProjectDir)Sources\Application\Calendar\Dialogs;$(ProjectDir)Sources\Application\Calendar\Utilities;$(ProjectDir)Sources\Application\Find_Replace;$(ProjectDir)Sources\Application\General;$(ProjectDir)Sources\Application\Letter;$(ProjectDir)Sources\Application\Macros;$(ProjectDir)Sources\Application\Mailbox;$(ProjectDir)Sources\Application\Mailbox_Info;$(ProjectDir)Sources\Application\Message;$(ProjectDir)Sources\Application\Other_Dialogs;$(ProjectDir)Sources\Application\Preferences_Dialog;$(ProjectDir)Sources\Application\Preferences_Dialog\Edit_Identities;$(ProjectDir)Sources\Application\Preferences_Dialog\Extras;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Address_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Authentication_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Calendar_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\IMAP_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Local_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\POP3_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Remote_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\SIEVE_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\SMTP_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Address_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Alerts_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Attachment_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Display_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Letter_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Mailbox_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Message_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Spelling_Panels;$(ProjectDir)Sources\Application\Rules;$(ProjectDir)Sources\Application\Rules\Action Dialogs;$(ProjectDir)Sources\Application\Rules\Dialog;$(ProjectDir)Sources\Application\Search;$(ProjectDir)Sources\Application\Server;$(ProjectDir)Sources\Application\Server\Dialogs;$(ProjectDir)Sources\Application\Server\Browse_Dialog;$(ProjectDir)Sources\Application\Server\Mailbox_Properties;$(ProjectDir)Sources\Application\Dialogs;$(ProjectDir)Sources\Application\Mailbox_Properties;$(ProjectDir)Sources\Application\SMTP_Queue;$(ProjectDir)Sources\Application\Speech;$(ProjectDir)Sources\Application\Status;$(ProjectDir)Sources\Application\Three Pane;$(ProjectDir)Sources\Application\Three Pane\Accounts;$(ProjectDir)Sources\Application\Three Pane\Items;$(ProjectDir)Sources\Application\Three Pane\Options Dialog;$(ProjectDir)Sources\Application\Three Pane\Preview;$(ProjectDir)Sources\Application\Windows;$(ProjectDir)Sources\VCPP;$(ProjectDir)Sources\Formatting;$(ProjectDir)Sources\Plugins;$(ProjectDir)Sources\Plugins\General;$(ProjectDir)Sources\Plugins\Security;$(ProjectDir)Sources\Plugins\Spelling;$(ProjectDir)Sources\Plugins\SSL;$(ProjectDir)Sources\PP_Sources;$(ProjectDir)Sources\PP_Sources\Hierarchy List;$(ProjectDir)Sources\PP_Sources\Streams;$(ProjectDir)Sources\PP_Sources\Tables;$(ProjectDir)Sources\PP_Sources\Undoable;$(ProjectDir)Sources\Support;$(ProjectDir)Sources\Support\Table;$(ProjectDir)Sources\Support\Text;$(ProjectDir)Sources\Support\Toolbars;$(ProjectDir)Resources;$(ProjectDir)..\Sources_Common;$(ProjectDir)..\Sources_Common\Application;$(ProjectDir)..\Sources_Common\Application\Address_Book;$(ProjectDir)..\Sources_Common\Application\Address_Book_Manager;$(ProjectDir)..\Sources_Common\Application\Calendar;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Calendar_Store_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Calendar_Window;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Day_Week_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Free_Busy_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Month_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Summary_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\ToDo_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Year_View;$(ProjectDir)..\Sources_Common\Application\General;$(ProjectDir)..\Sources_Common\Application\Letter;$(ProjectDir)..\Sources_Common\Application\Mailbox;$(ProjectDir)..\Sources_Common\Application\Mailbox_Info;$(ProjectDir)..\Sources_Common\Application\Message;$(ProjectDir)..\Sources_Common\Application\Preferences;$(ProjectDir)..\Sources_Common\Application\Rules;$(ProjectDir)..\Sources_Common\Application\Server;$(ProjectDir)..\Sources_Common\Application\SMTP_Queue;$(ProjectDir)..\Sources_Common\Application\Three_Pane;$(ProjectDir)..\Sources_Common\Automation;$(ProjectDir)..\Sources_Common\Calendar_Store;$(ProjectDir)..\Sources_Common\Calendar_Store\Clients;$(ProjectDir)..\Sources_Common\Calendar_Store\Notifications;$(ProjectDir)..\Sources_Common\Calendar_Store\Protocols;$(ProjectDir)..\Sources_Common\Formatting;$(ProjectDir)..\Sources_Common\HTTP;$(ProjectDir)..\Sources_Common\HTTP\CalDAVClient;$(ProjectDir)..\Sources_Common\HTTP\CardDAVClient;$(ProjectDir)..\Sources_Common\HTTP\HTTPClient;$(ProjectDir)..\Sources_Common\HTTP\WebDAVClient;$(ProjectDir)..\Sources_Common\i18n;$(ProjectDir)..\Sources_Common\i18n\Charsets;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\ISO2022;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\TwoByte;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\Sources_Common\Mail;$(ProjectDir)..\Sources_Common\Mail\Address;$(ProjectDir)..\Sources_Common\Mail\AddressBook;$(ProjectDir)..\Sources_Common\Mail\Attachments;$(ProjectDir)..\Sources_Common\Mail\Charsets;$(ProjectDir)..\Sources_Common\Mail\Control;$(ProjectDir)..\Sources_Common\Mail\Extensions;$(ProjectDir)..\Sources_Common\Mail\Filtering;$(ProjectDir)..\Sources_Common\Mail\Filters;$(ProjectDir)..\Sources_Common\Mail\INET_Clients;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\ACAP;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\IMAP;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\IMSP;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\LDAP;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\Password;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SIEVE;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SIEVE\SIEVE;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SMTP;$(ProjectDir)..\Sources_Common\Mail\Local_Clients;$(ProjectDir)..\Sources_Common\Mail\Mailbox;$(ProjectDir)..\Sources_Common\Mail\Message;$(ProjectDir)..\Sources_Common\Mail\Network;$(ProjectDir)..\Sources_Common\Mail\Protocols;$(ProjectDir)..\Sources_Common\Mail\Search;$(ProjectDir)..\Sources_Common\Mail\URLs;$(ProjectDir)..\Sources_Common\Offline;$(ProjectDir)..\Sources_Common\Offline\Mail;$(ProjectDir)..\Sources_Common\Offline\Recording;$(ProjectDir)..\Sources_Common\Preferences_Store\Clients;$(ProjectDir)..\Sources_Common\Plugins;$(ProjectDir)..\Sources_Common\Plugins\AddressBooks;$(ProjectDir)..\Sources_Common\Plugins\Authentication;$(ProjectDir)..\Sources_Common\Plugins\Configuration;$(ProjectDir)..\Sources_Common\Plugins\General;$(ProjectDir)..\Sources_Common\Plugins\PasswordChange;$(ProjectDir)..\Sources_Common\Plugins\Security;$(ProjectDir)..\Sources_Common\Plugins\Spelling;$(ProjectDir)..\Sources_Common\Plugins\SSL;$(ProjectDir)..\Sources_Common\Resources;$(ProjectDir)..\Sources_Common\Support;$(ProjectDir)..\Sources_Common\Support\Toolbars;$(ProjectDir)..\Sources_Common\Tasks;$(ProjectDir)..\Sources_Common\Utilities;$(ProjectDir)..\Sources_Common\VCard_Store;$(ProjectDir)..\Sources_Common\VCard_Store\Clients;$(ProjectDir)..\Libraries\CICalendar\Source;$(ProjectDir)..\Libraries\vCard\Source;$(ProjectDir)..\Libraries\XMLLib\Source;$(ProjectDir)..\Plug-ins\CRAM-MD5\sources\md5;C:\Program Files\Microsoft Speech SDK 5.1\Include;$(VCInstallDir)atlmfc\src\mfc;$(ProjectDir)..\Libraries\vendor\openssl-1.0.0d\inc32;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;__VCPP__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + MulberryUnicode.pch++ + Level3 + EditAndContinue + 4068;4018;4800;4996;4267;4244;4312;%(DisableSpecificWarnings) + MulberryUnicode.pch++;%(ForcedIncludeFiles) + + + false + + + sapi.lib;WinInet.Lib;IPHlpApi.Lib;RichEd20.Lib;WINMM.Lib;%(AdditionalDependencies) + C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386;%(AdditionalLibraryDirectories) + true + Windows + false + + + MachineX86 + + + call "$(ProjectDir)postbuild.bat" + + + + + $(ProjectDir)Sources;$(ProjectDir)Sources\Application;$(ProjectDir)Sources\Application\Address_Book;$(ProjectDir)Sources\Application\Address_Book_Manager;$(ProjectDir)Sources\Application\Address_Book_Manager\Address_Book_Properties;$(ProjectDir)Sources\Application\Address_Search;$(ProjectDir)Sources\Application\Calendar;$(ProjectDir)Sources\Application\Calendar\Calendar_Properties;$(ProjectDir)Sources\Application\Calendar\Calendar_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Calendar_Store_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Calendar_Window;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Day_Week_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Event_ToDo_Preview;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Free_Busy_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Month_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Summary_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\ToDo_View;$(ProjectDir)Sources\Application\Calendar\Calendar_View\Year_View;$(ProjectDir)Sources\Application\Calendar\Component_Editing;$(ProjectDir)Sources\Application\Calendar\Dialogs;$(ProjectDir)Sources\Application\Calendar\Utilities;$(ProjectDir)Sources\Application\Find_Replace;$(ProjectDir)Sources\Application\General;$(ProjectDir)Sources\Application\Letter;$(ProjectDir)Sources\Application\Macros;$(ProjectDir)Sources\Application\Mailbox;$(ProjectDir)Sources\Application\Mailbox_Info;$(ProjectDir)Sources\Application\Message;$(ProjectDir)Sources\Application\Other_Dialogs;$(ProjectDir)Sources\Application\Preferences_Dialog;$(ProjectDir)Sources\Application\Preferences_Dialog\Edit_Identities;$(ProjectDir)Sources\Application\Preferences_Dialog\Extras;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Address_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Authentication_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Calendar_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\IMAP_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Local_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\POP3_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Remote_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\SIEVE_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\SMTP_Account_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Address_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Alerts_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Attachment_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Display_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Letter_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Mailbox_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Message_Panels;$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Spelling_Panels;$(ProjectDir)Sources\Application\Rules;$(ProjectDir)Sources\Application\Rules\Action Dialogs;$(ProjectDir)Sources\Application\Rules\Dialog;$(ProjectDir)Sources\Application\Search;$(ProjectDir)Sources\Application\Server;$(ProjectDir)Sources\Application\Server\Dialogs;$(ProjectDir)Sources\Application\Server\Browse_Dialog;$(ProjectDir)Sources\Application\Server\Mailbox_Properties;$(ProjectDir)Sources\Application\Dialogs;$(ProjectDir)Sources\Application\Mailbox_Properties;$(ProjectDir)Sources\Application\SMTP_Queue;$(ProjectDir)Sources\Application\Speech;$(ProjectDir)Sources\Application\Status;$(ProjectDir)Sources\Application\Three Pane;$(ProjectDir)Sources\Application\Three Pane\Accounts;$(ProjectDir)Sources\Application\Three Pane\Items;$(ProjectDir)Sources\Application\Three Pane\Options Dialog;$(ProjectDir)Sources\Application\Three Pane\Preview;$(ProjectDir)Sources\Application\Windows;$(ProjectDir)Sources\VCPP;$(ProjectDir)Sources\Formatting;$(ProjectDir)Sources\Plugins;$(ProjectDir)Sources\Plugins\General;$(ProjectDir)Sources\Plugins\Security;$(ProjectDir)Sources\Plugins\Spelling;$(ProjectDir)Sources\Plugins\SSL;$(ProjectDir)Sources\PP_Sources;$(ProjectDir)Sources\PP_Sources\Hierarchy List;$(ProjectDir)Sources\PP_Sources\Streams;$(ProjectDir)Sources\PP_Sources\Tables;$(ProjectDir)Sources\PP_Sources\Undoable;$(ProjectDir)Sources\Support;$(ProjectDir)Sources\Support\Table;$(ProjectDir)Sources\Support\Text;$(ProjectDir)Sources\Support\Toolbars;$(ProjectDir)Resources;$(ProjectDir)..\Sources_Common;$(ProjectDir)..\Sources_Common\Application;$(ProjectDir)..\Sources_Common\Application\Address_Book;$(ProjectDir)..\Sources_Common\Application\Address_Book_Manager;$(ProjectDir)..\Sources_Common\Application\Calendar;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Calendar_Store_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Calendar_Window;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Day_Week_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Month_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Summary_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\ToDo_View;$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Year_View;$(ProjectDir)..\Sources_Common\Application\General;$(ProjectDir)..\Sources_Common\Application\Letter;$(ProjectDir)..\Sources_Common\Application\Mailbox;$(ProjectDir)..\Sources_Common\Application\Mailbox_Info;$(ProjectDir)..\Sources_Common\Application\Message;$(ProjectDir)..\Sources_Common\Application\Preferences;$(ProjectDir)..\Sources_Common\Application\Rules;$(ProjectDir)..\Sources_Common\Application\Server;$(ProjectDir)..\Sources_Common\Application\SMTP_Queue;$(ProjectDir)..\Sources_Common\Application\Three_Pane;$(ProjectDir)..\Sources_Common\Automation;$(ProjectDir)..\Sources_Common\Calendar_Store;$(ProjectDir)..\Sources_Common\Calendar_Store\Clients;$(ProjectDir)..\Sources_Common\Calendar_Store\Notifications;$(ProjectDir)..\Sources_Common\Calendar_Store\Protocols;$(ProjectDir)..\Sources_Common\Formatting;$(ProjectDir)..\Sources_Common\HTTP;$(ProjectDir)..\Sources_Common\HTTP\CalDAVClient;$(ProjectDir)..\Sources_Common\HTTP\CardDAVClient;$(ProjectDir)..\Sources_Common\HTTP\HTTPClient;$(ProjectDir)..\Sources_Common\HTTP\WebDAVClient;$(ProjectDir)..\Sources_Common\i18n;$(ProjectDir)..\Sources_Common\i18n\Charsets;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\ISO2022;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\OneByte;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\TwoByte;$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\Unicode;$(ProjectDir)..\Sources_Common\Mail;$(ProjectDir)..\Sources_Common\Mail\Address;$(ProjectDir)..\Sources_Common\Mail\AddressBook;$(ProjectDir)..\Sources_Common\Mail\Attachments;$(ProjectDir)..\Sources_Common\Mail\Charsets;$(ProjectDir)..\Sources_Common\Mail\Control;$(ProjectDir)..\Sources_Common\Mail\Extensions;$(ProjectDir)..\Sources_Common\Mail\Filtering;$(ProjectDir)..\Sources_Common\Mail\Filters;$(ProjectDir)..\Sources_Common\Mail\INET_Clients;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\ACAP;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\IMAP;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\IMSP;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\LDAP;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\Password;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SIEVE;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SIEVE\SIEVE;$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SMTP;$(ProjectDir)..\Sources_Common\Mail\Local_Clients;$(ProjectDir)..\Sources_Common\Mail\Mailbox;$(ProjectDir)..\Sources_Common\Mail\Message;$(ProjectDir)..\Sources_Common\Mail\Network;$(ProjectDir)..\Sources_Common\Mail\Protocols;$(ProjectDir)..\Sources_Common\Mail\Search;$(ProjectDir)..\Sources_Common\Mail\URLs;$(ProjectDir)..\Sources_Common\Offline;$(ProjectDir)..\Sources_Common\Offline\Mail;$(ProjectDir)..\Sources_Common\Offline\Recording;$(ProjectDir)..\Sources_Common\Preferences_Store\Clients;$(ProjectDir)..\Sources_Common\Plugins;$(ProjectDir)..\Sources_Common\Plugins\AddressBooks;$(ProjectDir)..\Sources_Common\Plugins\Authentication;$(ProjectDir)..\Sources_Common\Plugins\Configuration;$(ProjectDir)..\Sources_Common\Plugins\General;$(ProjectDir)..\Sources_Common\Plugins\PasswordChange;$(ProjectDir)..\Sources_Common\Plugins\Security;$(ProjectDir)..\Sources_Common\Plugins\Spelling;$(ProjectDir)..\Sources_Common\Plugins\SSL;$(ProjectDir)..\Sources_Common\Resources;$(ProjectDir)..\Sources_Common\Support;$(ProjectDir)..\Sources_Common\Support\Toolbars;$(ProjectDir)..\Sources_Common\Tasks;$(ProjectDir)..\Sources_Common\Utilities;$(ProjectDir)..\Sources_Common\VCard_Store;$(ProjectDir)..\Sources_Common\VCard_Store\Clients;$(ProjectDir)..\Libraries\CICalendar\Source;$(ProjectDir)..\Libraries\vCard\Source;$(ProjectDir)..\Libraries\XMLLib\Source;$(ProjectDir)..\Plug-ins\CRAM-MD5\sources\md5;C:\Program Files\Microsoft Speech SDK 5.1\Include;$(VCInstallDir)atlmfc\src\mfc;$(ProjectDir)..\Libraries\vendor\openssl-1.0.0d\inc32;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;__VCPP__;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + MulberryUnicode.pch++ + Level3 + ProgramDatabase + 4068;4018;4800;4996;4267;4244;4312;%(DisableSpecificWarnings) + MulberryUnicode.pch++;%(ForcedIncludeFiles) + + + sapi.lib;WinInet.Lib;IPHlpApi.Lib;RichEd20.Lib;WINMM.Lib;%(AdditionalDependencies) + C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386;%(AdditionalLibraryDirectories) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + true + true + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + Document + true + true + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + Document + true + true + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + + + + + + + + + + + Document + true + true + + + + Document + true + true + + + Document + %(AdditionalIncludeDirectories) + Create + MulberryUnicode.pch++ + %(AdditionalIncludeDirectories) + Create + MulberryUnicode.pch++ + + + + + + + + + + + + + + + + + + + + + + + Document + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.xdc + + + + + + + + + + + + + + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsCpp + CompileAsCpp + + + + + + {44908954-e9bc-451a-948f-503c34c21459} + false + + + {2984b681-27ae-4ca2-8ac5-911f02d3ed71} + false + + + {30f10565-e2d7-43c5-ba6f-1e8008d2e9a1} + false + + + {271f7588-c3ae-4e19-b80a-253375154200} + false + + + {112e94b7-051a-4538-800d-c19a63df9a0a} + false + + + {2021acb1-9223-4445-8fb1-15f9fd43c9cc} + false + + + {4fa83df0-7e1f-40f0-8e56-a563d5b0c464} + false + + + {fe83f247-5b3f-4340-9199-837ada4a3dc8} + false + + + {c83d0e2d-8df5-4386-8e9c-31f16ab14834} + false + + + {0896b645-32a6-45a8-ae53-0184ef807aba} + false + + + {7f2ea713-8c9e-40fd-b8e9-a16fa100efb1} + false + + + {3067ee83-4924-4845-9555-a68e5c6a9aed} + false + + + {d49ffb27-5460-4b71-afe5-a4819614fe8f} + false + + + {09d392b6-adfb-4dbd-8b90-969ea87f4395} + false + + + {4325a88c-9a90-4a39-8d18-54a7b30b5b0c} + false + + + + + + + + + + + \ No newline at end of file diff --git a/Win32/Mulberry.vcxproj.filters b/Win32/Mulberry.vcxproj.filters new file mode 100644 index 00000000..4159d36b --- /dev/null +++ b/Win32/Mulberry.vcxproj.filters @@ -0,0 +1,6315 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Resource Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Win32/MulberryVC10.sln b/Win32/MulberryVC10.sln new file mode 100644 index 00000000..8a533a80 --- /dev/null +++ b/Win32/MulberryVC10.sln @@ -0,0 +1,134 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mulberry", "Mulberry.vcxproj", "{5215D70C-FBAC-4E55-AE4F-E7400CE8CCB7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CRAM-MD5", "..\Plug-ins\CRAM-MD5\CRAM-MD5.vcxproj", "{2984B681-27AE-4CA2-8AC5-911F02D3ED71}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSL", "..\Plug-ins\SSL\SSL.vcxproj", "{09D392B6-ADFB-4DBD-8B90-969EA87F4395}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommunicatorAdbkIO", "..\Plug-ins\CommunicatorAdbkIO\CommunicatorAdbkIO.vcxproj", "{44908954-E9BC-451A-948F-503C34C21459}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DIGEST-MD5", "..\Plug-ins\DIGEST-MD5\DIGEST-MD5.vcxproj", "{30F10565-E2D7-43C5-BA6F-1E8008D2E9A1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vCardAdbkIO", "..\Plug-ins\vCardAdbkIO\vCardAdbkIO.vcxproj", "{4325A88C-9A90-4A39-8D18-54A7B30B5B0C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eudora4AdbkIO", "..\Plug-ins\Eudora4AdbkIO\Eudora4AdbkIO.vcxproj", "{271F7588-C3AE-4E19-B80A-253375154200}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EudoraAdbkIO", "..\Plug-ins\EudoraAdbkIO\EudoraAdbkIO.vcxproj", "{112E94B7-051A-4538-800D-C19A63DF9A0A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetscapeAdbkIO", "..\Plug-ins\NetscapeAdbkIO\NetscapeAdbkIO.vcxproj", "{4FA83DF0-7E1F-40F0-8E56-A563D5B0C464}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OEAdbkIO", "..\Plug-ins\OEAdbkIO\OEAdbkIO.vcxproj", "{FE83F247-5B3F-4340-9199-837ADA4A3DC8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PineAdbkIO", "..\Plug-ins\PineAdbkIO\PineAdbkIO.vcxproj", "{C83D0E2D-8DF5-4386-8E9C-31F16AB14834}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickmailAdbkIO", "..\Plug-ins\QuickmailAdbkIO\QuickmailAdbkIO.vcxproj", "{7F2EA713-8C9E-40FD-B8E9-A16FA100EFB1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickmailProAdbkIO", "..\Plug-ins\QuickmailProAdbkIO\QuickmailProAdbkIO.vcxproj", "{3067EE83-4924-4845-9555-A68E5C6A9AED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPG", "..\Plug-ins\GPG\GPG.vcxproj", "{2021ACB1-9223-4445-8FB1-15F9FD43C9CC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMIME", "..\Plug-ins\SMIME\SMIME.vcxproj", "{D49FFB27-5460-4B71-AFE5-A4819614FE8F}" +EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Mulberry", "Installer\Mulberry\MulberrySetUp.vdproj", "{F4348B05-68D4-4BB3-B53D-222BEB88EBEC}" + ProjectSection(ProjectDependencies) = postProject + {5215D70C-FBAC-4E55-AE4F-E7400CE8CCB7} = {5215D70C-FBAC-4E55-AE4F-E7400CE8CCB7} + {7F2EA713-8C9E-40FD-B8E9-A16FA100EFB1} = {7F2EA713-8C9E-40FD-B8E9-A16FA100EFB1} + {D49FFB27-5460-4B71-AFE5-A4819614FE8F} = {D49FFB27-5460-4B71-AFE5-A4819614FE8F} + {C83D0E2D-8DF5-4386-8E9C-31F16AB14834} = {C83D0E2D-8DF5-4386-8E9C-31F16AB14834} + {0896B645-32A6-45A8-AE53-0184EF807ABA} = {0896B645-32A6-45A8-AE53-0184EF807ABA} + {FE83F247-5B3F-4340-9199-837ADA4A3DC8} = {FE83F247-5B3F-4340-9199-837ADA4A3DC8} + {44908954-E9BC-451A-948F-503C34C21459} = {44908954-E9BC-451A-948F-503C34C21459} + {30F10565-E2D7-43C5-BA6F-1E8008D2E9A1} = {30F10565-E2D7-43C5-BA6F-1E8008D2E9A1} + {2984B681-27AE-4CA2-8AC5-911F02D3ED71} = {2984B681-27AE-4CA2-8AC5-911F02D3ED71} + {3067EE83-4924-4845-9555-A68E5C6A9AED} = {3067EE83-4924-4845-9555-A68E5C6A9AED} + {271F7588-C3AE-4E19-B80A-253375154200} = {271F7588-C3AE-4E19-B80A-253375154200} + {4325A88C-9A90-4A39-8D18-54A7B30B5B0C} = {4325A88C-9A90-4A39-8D18-54A7B30B5B0C} + {2021ACB1-9223-4445-8FB1-15F9FD43C9CC} = {2021ACB1-9223-4445-8FB1-15F9FD43C9CC} + {09D392B6-ADFB-4DBD-8B90-969EA87F4395} = {09D392B6-ADFB-4DBD-8B90-969EA87F4395} + {112E94B7-051A-4538-800D-C19A63DF9A0A} = {112E94B7-051A-4538-800D-C19A63DF9A0A} + {4FA83DF0-7E1F-40F0-8E56-A563D5B0C464} = {4FA83DF0-7E1F-40F0-8E56-A563D5B0C464} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginLib", "..\Plug-ins\PluginLibrary\PluginLib.vcxproj", "{0896B645-32A6-45A8-AE53-0184EF807ABA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5215D70C-FBAC-4E55-AE4F-E7400CE8CCB7}.Debug|Win32.ActiveCfg = Debug|Win32 + {5215D70C-FBAC-4E55-AE4F-E7400CE8CCB7}.Debug|Win32.Build.0 = Debug|Win32 + {5215D70C-FBAC-4E55-AE4F-E7400CE8CCB7}.Release|Win32.ActiveCfg = Release|Win32 + {5215D70C-FBAC-4E55-AE4F-E7400CE8CCB7}.Release|Win32.Build.0 = Release|Win32 + {2984B681-27AE-4CA2-8AC5-911F02D3ED71}.Debug|Win32.ActiveCfg = Debug|Win32 + {2984B681-27AE-4CA2-8AC5-911F02D3ED71}.Debug|Win32.Build.0 = Debug|Win32 + {2984B681-27AE-4CA2-8AC5-911F02D3ED71}.Release|Win32.ActiveCfg = Release|Win32 + {2984B681-27AE-4CA2-8AC5-911F02D3ED71}.Release|Win32.Build.0 = Release|Win32 + {09D392B6-ADFB-4DBD-8B90-969EA87F4395}.Debug|Win32.ActiveCfg = Debug|Win32 + {09D392B6-ADFB-4DBD-8B90-969EA87F4395}.Debug|Win32.Build.0 = Debug|Win32 + {09D392B6-ADFB-4DBD-8B90-969EA87F4395}.Release|Win32.ActiveCfg = Release|Win32 + {09D392B6-ADFB-4DBD-8B90-969EA87F4395}.Release|Win32.Build.0 = Release|Win32 + {44908954-E9BC-451A-948F-503C34C21459}.Debug|Win32.ActiveCfg = Debug|Win32 + {44908954-E9BC-451A-948F-503C34C21459}.Debug|Win32.Build.0 = Debug|Win32 + {44908954-E9BC-451A-948F-503C34C21459}.Release|Win32.ActiveCfg = Release|Win32 + {44908954-E9BC-451A-948F-503C34C21459}.Release|Win32.Build.0 = Release|Win32 + {30F10565-E2D7-43C5-BA6F-1E8008D2E9A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {30F10565-E2D7-43C5-BA6F-1E8008D2E9A1}.Debug|Win32.Build.0 = Debug|Win32 + {30F10565-E2D7-43C5-BA6F-1E8008D2E9A1}.Release|Win32.ActiveCfg = Release|Win32 + {30F10565-E2D7-43C5-BA6F-1E8008D2E9A1}.Release|Win32.Build.0 = Release|Win32 + {4325A88C-9A90-4A39-8D18-54A7B30B5B0C}.Debug|Win32.ActiveCfg = Debug|Win32 + {4325A88C-9A90-4A39-8D18-54A7B30B5B0C}.Debug|Win32.Build.0 = Debug|Win32 + {4325A88C-9A90-4A39-8D18-54A7B30B5B0C}.Release|Win32.ActiveCfg = Release|Win32 + {4325A88C-9A90-4A39-8D18-54A7B30B5B0C}.Release|Win32.Build.0 = Release|Win32 + {271F7588-C3AE-4E19-B80A-253375154200}.Debug|Win32.ActiveCfg = Debug|Win32 + {271F7588-C3AE-4E19-B80A-253375154200}.Debug|Win32.Build.0 = Debug|Win32 + {271F7588-C3AE-4E19-B80A-253375154200}.Release|Win32.ActiveCfg = Release|Win32 + {271F7588-C3AE-4E19-B80A-253375154200}.Release|Win32.Build.0 = Release|Win32 + {112E94B7-051A-4538-800D-C19A63DF9A0A}.Debug|Win32.ActiveCfg = Debug|Win32 + {112E94B7-051A-4538-800D-C19A63DF9A0A}.Debug|Win32.Build.0 = Debug|Win32 + {112E94B7-051A-4538-800D-C19A63DF9A0A}.Release|Win32.ActiveCfg = Release|Win32 + {112E94B7-051A-4538-800D-C19A63DF9A0A}.Release|Win32.Build.0 = Release|Win32 + {4FA83DF0-7E1F-40F0-8E56-A563D5B0C464}.Debug|Win32.ActiveCfg = Debug|Win32 + {4FA83DF0-7E1F-40F0-8E56-A563D5B0C464}.Debug|Win32.Build.0 = Debug|Win32 + {4FA83DF0-7E1F-40F0-8E56-A563D5B0C464}.Release|Win32.ActiveCfg = Release|Win32 + {4FA83DF0-7E1F-40F0-8E56-A563D5B0C464}.Release|Win32.Build.0 = Release|Win32 + {FE83F247-5B3F-4340-9199-837ADA4A3DC8}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE83F247-5B3F-4340-9199-837ADA4A3DC8}.Debug|Win32.Build.0 = Debug|Win32 + {FE83F247-5B3F-4340-9199-837ADA4A3DC8}.Release|Win32.ActiveCfg = Release|Win32 + {FE83F247-5B3F-4340-9199-837ADA4A3DC8}.Release|Win32.Build.0 = Release|Win32 + {C83D0E2D-8DF5-4386-8E9C-31F16AB14834}.Debug|Win32.ActiveCfg = Debug|Win32 + {C83D0E2D-8DF5-4386-8E9C-31F16AB14834}.Debug|Win32.Build.0 = Debug|Win32 + {C83D0E2D-8DF5-4386-8E9C-31F16AB14834}.Release|Win32.ActiveCfg = Release|Win32 + {C83D0E2D-8DF5-4386-8E9C-31F16AB14834}.Release|Win32.Build.0 = Release|Win32 + {7F2EA713-8C9E-40FD-B8E9-A16FA100EFB1}.Debug|Win32.ActiveCfg = Debug|Win32 + {7F2EA713-8C9E-40FD-B8E9-A16FA100EFB1}.Debug|Win32.Build.0 = Debug|Win32 + {7F2EA713-8C9E-40FD-B8E9-A16FA100EFB1}.Release|Win32.ActiveCfg = Release|Win32 + {7F2EA713-8C9E-40FD-B8E9-A16FA100EFB1}.Release|Win32.Build.0 = Release|Win32 + {3067EE83-4924-4845-9555-A68E5C6A9AED}.Debug|Win32.ActiveCfg = Debug|Win32 + {3067EE83-4924-4845-9555-A68E5C6A9AED}.Debug|Win32.Build.0 = Debug|Win32 + {3067EE83-4924-4845-9555-A68E5C6A9AED}.Release|Win32.ActiveCfg = Release|Win32 + {3067EE83-4924-4845-9555-A68E5C6A9AED}.Release|Win32.Build.0 = Release|Win32 + {2021ACB1-9223-4445-8FB1-15F9FD43C9CC}.Debug|Win32.ActiveCfg = Debug|Win32 + {2021ACB1-9223-4445-8FB1-15F9FD43C9CC}.Debug|Win32.Build.0 = Debug|Win32 + {2021ACB1-9223-4445-8FB1-15F9FD43C9CC}.Release|Win32.ActiveCfg = Release|Win32 + {2021ACB1-9223-4445-8FB1-15F9FD43C9CC}.Release|Win32.Build.0 = Release|Win32 + {D49FFB27-5460-4B71-AFE5-A4819614FE8F}.Debug|Win32.ActiveCfg = Debug|Win32 + {D49FFB27-5460-4B71-AFE5-A4819614FE8F}.Debug|Win32.Build.0 = Debug|Win32 + {D49FFB27-5460-4B71-AFE5-A4819614FE8F}.Release|Win32.ActiveCfg = Release|Win32 + {D49FFB27-5460-4B71-AFE5-A4819614FE8F}.Release|Win32.Build.0 = Release|Win32 + {F4348B05-68D4-4BB3-B53D-222BEB88EBEC}.Debug|Win32.ActiveCfg = Debug + {F4348B05-68D4-4BB3-B53D-222BEB88EBEC}.Debug|Win32.Build.0 = Debug + {F4348B05-68D4-4BB3-B53D-222BEB88EBEC}.Release|Win32.ActiveCfg = Release + {F4348B05-68D4-4BB3-B53D-222BEB88EBEC}.Release|Win32.Build.0 = Release + {0896B645-32A6-45A8-AE53-0184EF807ABA}.Debug|Win32.ActiveCfg = Debug|Win32 + {0896B645-32A6-45A8-AE53-0184EF807ABA}.Debug|Win32.Build.0 = Debug|Win32 + {0896B645-32A6-45A8-AE53-0184EF807ABA}.Release|Win32.ActiveCfg = Release|Win32 + {0896B645-32A6-45A8-AE53-0184EF807ABA}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Win32/Sources/Application/Calendar/Calendar_View/Day_Week_View/CDayWeekTable.cp b/Win32/Sources/Application/Calendar/Calendar_View/Day_Week_View/CDayWeekTable.cp index 1cee4ad0..efc853b9 100644 --- a/Win32/Sources/Application/Calendar/Calendar_View/Day_Week_View/CDayWeekTable.cp +++ b/Win32/Sources/Application/Calendar/Calendar_View/Day_Week_View/CDayWeekTable.cp @@ -581,7 +581,7 @@ void CDayWeekTable::AddAllDayEvent(iCal::CICalendarComponentExpandedShared& veve if (slot >= mAllDayEvents[col_start - 2].size()) { for(TableIndexT col_ctr = 2; col_ctr <= mCols; col_ctr++) - mAllDayEvents[col_ctr - 2].push_back(CDayEventSlotList::value_type(NULL, false)); + mAllDayEvents[col_ctr - 2].push_back(CDayEventSlotList::value_type((CDayEvent*)NULL, false)); } // Determine visual position in table cell diff --git a/Win32/Sources/Application/Calendar/Calendar_View/Month_View/CMonthTable.cp b/Win32/Sources/Application/Calendar/Calendar_View/Month_View/CMonthTable.cp index 0a43d086..b6cd69c8 100644 --- a/Win32/Sources/Application/Calendar/Calendar_View/Month_View/CMonthTable.cp +++ b/Win32/Sources/Application/Calendar/Calendar_View/Month_View/CMonthTable.cp @@ -304,7 +304,7 @@ void CMonthTable::AddEvent(iCal::CICalendarComponentExpandedShared& vevent) if (slot >= mEvents[row - 1][col_start - 1].size()) { for(TableIndexT col_ctr = 1; col_ctr <= 7; col_ctr++) - mEvents[row - 1][col_ctr - 1].push_back(CMonthEventSlotList::value_type(NULL, false)); + mEvents[row - 1][col_ctr - 1].push_back(CMonthEventSlotList::value_type((CMonthEvent*)NULL, false)); } // Determine visual poisition in table cell diff --git a/Win32/Sources/Application/General/CMulberryCommon.cp b/Win32/Sources/Application/General/CMulberryCommon.cp index af9a5ced..fe9202f7 100644 --- a/Win32/Sources/Application/General/CMulberryCommon.cp +++ b/Win32/Sources/Application/General/CMulberryCommon.cp @@ -264,37 +264,31 @@ void RectOnScreen(CRect& rect, CWnd* owner) if (owner) owner->GetClientRect(desktop); else - // Get task bar pos and see if at top - ::SystemParametersInfo(SPI_GETWORKAREA, 0, (Rect*) desktop, 0); - desktop.right -= 64; - desktop.bottom -= 64; - - // Always offset the rect by the left/top margins to account for toolbar placement - POINT pt; - pt.x = desktop.left; - pt.y = desktop.top; - rect.OffsetRect(pt); - - // Now make sure top-left of window title bar IS on screen - pt.x = rect.left; - pt.y = rect.top; - if (!desktop.PtInRect(pt)) { - POINT diff = {0, 0}; + // we're interested in area, not actual position of the + // work area, because if the taskbar is at top or left, + // windows are placed relative to its height/width. + ::SystemParametersInfo(SPI_GETWORKAREA, 0, (Rect*) desktop, 0); + desktop.OffsetRect(-desktop.left, -desktop.top); + } - if (rect.left < desktop.left) - diff.x = desktop.left - rect.left; - else if (rect.left > desktop.right) - diff.x = desktop.right - rect.left; + // move left edge right into work area + if (rect.left < 0) + rect.OffsetRect(-rect.left, 0); - if (rect.top < desktop.top) - diff.y = desktop.top - rect.top; - else if (rect.top > desktop.bottom) - diff.y = desktop.bottom - rect.top; - - rect.OffsetRect(diff); - } + // move top edge down into work area + if (rect.top < 0) + rect.OffsetRect(0, -rect.top); + + // bring right edge into work area + if (rect.right > desktop.right) + rect.right = desktop.right; + + // bring bottom edge into work area + if (rect.bottom > desktop.bottom) + rect.bottom = desktop.bottom; } + cdstring GetNumericFormat(unsigned long number) { cdstring result; diff --git a/Win32/Sources/Application/Search/CSearchCriteriaContainer.cp b/Win32/Sources/Application/Search/CSearchCriteriaContainer.cp index fbace5fb..bd88c54c 100644 --- a/Win32/Sources/Application/Search/CSearchCriteriaContainer.cp +++ b/Win32/Sources/Application/Search/CSearchCriteriaContainer.cp @@ -463,6 +463,9 @@ CSearchItem* CSearchCriteriaContainer::ConstructSearch() const and_list->push_back(new CSearchItem(**prev)); and_list->push_back(new CSearchItem(**next)); + // all three iterators will be invalidated, so save the index of prev and use it after invalidation to recreate a new iter pointing where prev used to point. + const CSearchItemList::difference_type index = prev - flat_list.begin(); + // Delete the next item flat_list.erase(next, next + 1); @@ -470,7 +473,7 @@ CSearchItem* CSearchCriteriaContainer::ConstructSearch() const flat_list.erase(prev, prev + 1); // Adjust iter to previous item so it will point to the new item after cycling through the loop - iter = prev; + iter = flat_list.begin() + index; } } } @@ -505,6 +508,9 @@ CSearchItem* CSearchCriteriaContainer::ConstructSearch() const and_list->push_back(new CSearchItem(**prev)); and_list->push_back(new CSearchItem(**next)); + // all three iterators will be invalidated, so save the index of prev and use it after invalidation to recreate a new iter pointing where prev used to point. + const CSearchItemList::difference_type index = prev - flat_list.begin(); + // Delete the next item flat_list.erase(next, next + 1); @@ -512,7 +518,7 @@ CSearchItem* CSearchCriteriaContainer::ConstructSearch() const flat_list.erase(prev, prev + 1); // Adjust iter to previous item so it will point to the new item after cycling through the loop - iter = prev; + iter = flat_list.begin() + index; } } } diff --git a/Win32/Sources/PP_Sources/Tables/WIN_LTableArrayStorage.cp b/Win32/Sources/PP_Sources/Tables/WIN_LTableArrayStorage.cp index b812b424..a3fc4405 100644 --- a/Win32/Sources/PP_Sources/Tables/WIN_LTableArrayStorage.cp +++ b/Win32/Sources/PP_Sources/Tables/WIN_LTableArrayStorage.cp @@ -102,7 +102,7 @@ LTableArrayStorage::SetCellData( std::free(mDataArray->at(cellIndex -1).first); // Create new data - LTableStorageElement element(NULL, inDataSize); + LTableStorageElement element((void*)NULL, inDataSize); if (inDataSize > 0) { element.first = std::malloc(inDataSize); @@ -233,7 +233,7 @@ LTableArrayStorage::InsertRows( // Insert blank elements first - though all with the correct size if ((inHowMany > 0) && (cols > 0)) { - LTableStorageElement element(NULL, inDataSize); + LTableStorageElement element((void*)NULL, inDataSize); mDataArray->insert(mDataArray->begin() + (startIndex - 1), inHowMany * cols, element); // Now create new data elements and store in each new array element @@ -273,7 +273,7 @@ LTableArrayStorage::InsertCols( // Insert blank elements first - though all with the correct size if (inHowMany) { - LTableStorageElement element(NULL, inDataSize); + LTableStorageElement element((void*)NULL, inDataSize); mDataArray->insert(mDataArray->begin() + (startIndex - 1), inHowMany, element); // Now create new data elements and store in each new array element diff --git a/debian/changelog b/debian/changelog index 40a71ea9..de09b5e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mulberry (4.1.0a3-git-20120727-2206) unstable; urgency=low + + * Cyrus' changes from July 2012 + + -- Martin Dietze Sat, 27 Jul 2012 22:07:00 +0100 + mulberry (4.1d1-svn-20111217-1800) unstable; urgency=low * First git-based build, contains Cyrus' changes from November 2011