diff --git a/bazaar/MAPIEx/MAPIAppointment.cpp b/bazaar/MAPIEx/MAPIAppointment.cpp index 4ba424b33..561234013 100644 --- a/bazaar/MAPIEx/MAPIAppointment.cpp +++ b/bazaar/MAPIEx/MAPIAppointment.cpp @@ -82,7 +82,7 @@ bool MAPIAppointment::SetSubject(const String &szSubject) { } bool MAPIAppointment::SetLocation(const String &szLocation) { - return SetOutlookProperty(OUTLOOK_DATA2, OUTLOOK_APPOINTMENT_START, szLocation); + return SetOutlookProperty(OUTLOOK_DATA2, OUTLOOK_APPOINTMENT_LOCATION, szLocation); } bool MAPIAppointment::SetStartTime(const Time &tm) { @@ -98,7 +98,7 @@ bool MAPIAppointment::SetEndTime(const Time &tm) { MAPIEx::SetSystemTime(st, tm); FILETIME ftEnd; SystemTimeToFileTime(&st, &ftEnd); - return SetOutlookProperty(OUTLOOK_DATA2, OUTLOOK_APPOINTMENT_START, ftEnd); + return SetOutlookProperty(OUTLOOK_DATA2, OUTLOOK_APPOINTMENT_END, ftEnd); } const GUID PSETID_Meeting = {0x6ED8DA90, 0x450B, 0x101B, {0x98, 0xDA, 0x00, 0xAA, 0x00, 0x3F, 0x13, 0x05}}; diff --git a/bazaar/MAPIEx/MAPIEx.h b/bazaar/MAPIEx/MAPIEx.h index f9887ea4a..0765e17b8 100644 --- a/bazaar/MAPIEx/MAPIEx.h +++ b/bazaar/MAPIEx/MAPIEx.h @@ -28,11 +28,6 @@ using namespace Upp; #include #include #else -#define INITGUID -#define USES_IID_IMessage -#include -#include - #include #include #endif diff --git a/bazaar/MAPIEx/MAPIMessage.cpp b/bazaar/MAPIEx/MAPIMessage.cpp index 5f8728d98..9e430582e 100644 --- a/bazaar/MAPIEx/MAPIMessage.cpp +++ b/bazaar/MAPIEx/MAPIMessage.cpp @@ -18,6 +18,14 @@ const GUID CLSID_MailMessage={ 0x00020D0B, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 }; +#ifndef _WIN32_WCE +#define INITGUID +#define USES_IID_IMessage +#include +#include +#endif + + // Ported to U++ Framework by Koldo. See License.txt file ///////////////////////////////////////////////////////////// diff --git a/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tpp b/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tpp index eb8e0e39b..daa3ec11c 100644 --- a/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tpp +++ b/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tpp @@ -4,7 +4,7 @@ topic "MAPIEx License"; [{_}%EN-US [s0; [*R+184 MAPIEx License]&] [s0;2 &] -[s0; [2 MAPIEx U`+`+ Bazaar page is fully based in ][^http`:`/`/www`.mud`.ca`/MAPIEx`.zip^2 N +[s0; [2 MAPIEx U`+`+ Bazaar package is fully based in ][^http`:`/`/www`.mud`.ca`/MAPIEx`.zip^2 N oel Dillabough CMAPIEx][2 . Its license is:]&] [s0;2 &] [s0; [C+75 Copyright (C) 2005`-2010, Noel Dillabough]&] diff --git a/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tppi b/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tppi index 945dad803..0c7dc33f3 100644 --- a/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tppi +++ b/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tppi @@ -1,6 +1,6 @@ TITLE("MAPIEx License") COMPRESSED -120,156,149,147,107,79,219,48,20,134,255,202,145,96,19,163,144,91,175,43,154,166,209,49,9,13,16,2,170,125,168,10,54,142,155,120,56,118,100,59,52,101,218,127,223,113,82,208,214,21,77,235,151,186,245,185,188,239,57,143,103,176,187,27,29,68,59,209,63,62,227,207,124,65,43,233,230,51,58,234,30,237,95,13,48,47,198,188,110,220,141,163,120,144,244,134,189,36,234,70,73,47,78,250,241,104,212,139,135,253,81,247,253,96,48,102,180,116,66,171,249,236,199,221,207,55,39,23,135,211,107,152,217,232,8,102,251,87,157,120,212,131,243,79,151,167,39,53,156,9,198,149,229,243,183,115,127,155,64,251,13,179,228,57,96,74,58,164,3,199,244,137,82,3,37,205,56,8,11,139,74,202,21,220,83,203,83,16,10,230,179,219,220,185,146,140,73,72,194,229,114,73,130,162,74,73,192,40,9,219,42,36,120,18,229,109,2,23,154,75,248,44,164,164,247,186,202,114,152,180,215,115,108,23,192,169,179,32,91,57,216,99,252,151,164,73,103,216,135,137,46,87,70,100,185,131, -189,201,59,72,162,168,79,14,147,40,142,14,54,107,175,211,155,164,63,42,220,228,104,192,234,202,48,14,76,167,173,31,195,57,56,13,21,182,166,42,133,66,167,98,177,130,210,232,71,145,162,71,231,115,148,118,168,14,12,47,168,80,22,125,59,202,92,19,238,114,234,15,43,224,42,167,138,241,130,43,244,162,13,220,87,25,44,68,205,45,80,195,161,212,214,249,98,26,19,56,58,73,249,165,209,223,57,22,105,230,154,227,181,80,89,219,140,73,106,81,23,214,240,177,76,23,69,165,132,91,249,228,123,174,248,66,184,224,85,135,83,139,229,198,96,189,167,141,70,212,160,7,137,38,29,248,141,141,67,191,174,192,143,161,108,35,240,92,132,104,141,27,197,93,56,57,167,165,56,169,3,106,203,45,132,124,209,82,234,229,139,228,231,221,81,41,129,225,28,50,180,157,211,71,142,130,185,194,177,149,218,172,237,179,151,37,230,90,166,220,4,91,8,250,77,147,255,81,144,240,235,49,9,79,47,201,179,40,226,85,213,228,99,97,51,242,161,59,26,14,162,94,76,118,234,122, -125,172,107,228,237,186,25,1,106,243,163,111,40,219,98,99,13,33,170,194,141,250,205,54,84,44,140,46,182,200,90,10,203,114,241,176,150,36,43,18,162,200,204,208,162,224,134,132,5,42,35,119,149,19,210,146,32,119,133,68,13,103,21,19,84,193,183,54,177,121,86,48,245,17,255,65,125,195,108,35,107,143,53,212,39,158,250,104,176,81,252,117,36,110,242,13,216,61,182,72,172,86,248,63,22,72,53,44,133,203,65,56,88,34,204,252,145,55,224,173,80,218,3,63,64,214,153,172,82,191,105,60,105,131,155,164,13,170,24,142,207,223,211,201,13,10,145,254,197,164,21,115,54,152,207,127,1,208,40,152,8, +120,156,149,147,107,79,219,48,20,134,255,202,145,96,19,163,144,91,175,43,154,166,209,49,9,13,16,2,170,125,168,10,54,142,155,120,56,118,100,59,52,101,218,127,223,113,82,208,214,21,77,235,151,186,245,185,188,239,57,143,103,176,187,27,29,68,59,209,63,62,227,207,124,65,43,233,230,51,58,234,30,237,95,13,48,47,198,188,110,220,141,163,120,144,244,134,189,36,234,70,73,47,78,250,241,104,212,139,135,253,81,247,253,96,48,102,180,116,66,171,249,236,199,221,207,55,39,23,135,211,107,152,217,232,8,102,251,87,157,120,212,131,243,79,151,167,39,53,156,9,198,149,229,243,183,115,127,155,64,251,13,179,228,57,96,74,58,164,3,199,244,137,82,3,37,101,15,52,227,32,44,44,42,41,87,112,79,45,79,65,40,152,207,110,115,231,74,50,38,33,9,151,203,37,9,138,42,37,1,163,36,108,11,145,224,73,148,183,9,92,104,46,225,179,144,146,222,235,42,203,97,210,94,207,177,99,0,167,206,130,108,21,97,143,241,95,170,38,157,97,31,38,186,92,25,145, +229,14,246,38,239,32,137,162,62,57,76,162,56,58,216,172,189,78,111,146,254,168,112,147,163,1,171,43,195,56,48,157,182,126,12,231,224,52,84,216,154,170,20,10,157,138,197,10,74,163,31,69,138,30,157,207,81,218,161,58,48,188,160,66,89,244,237,40,115,77,184,203,169,63,172,128,171,156,42,198,11,174,208,139,54,112,95,101,176,16,53,183,64,13,135,82,91,231,139,105,76,224,232,36,229,151,70,127,231,88,164,244,115,205,241,90,168,172,109,198,36,181,168,11,107,248,88,166,139,162,82,194,173,124,242,61,87,124,33,92,240,170,195,169,197,114,99,176,222,211,70,35,106,208,131,68,147,14,252,198,198,161,95,87,224,199,80,182,17,120,46,66,180,198,141,226,46,156,156,211,82,156,212,1,181,229,22,72,190,104,41,245,242,69,242,243,238,168,148,192,112,14,25,218,206,233,35,71,193,92,225,216,74,109,214,246,217,203,18,115,45,83,110,130,45,4,253,166,201,255,40,72,248,245,152,132,167,151,228,89,20,241,170,106,242,177,176,25,249,208,29,13,7,81,47,38, +59,117,189,62,214,53,242,118,221,140,0,181,249,209,55,148,109,177,177,134,16,85,225,70,253,102,27,42,22,70,23,91,100,45,133,101,185,120,88,75,146,21,9,81,100,102,104,81,112,67,194,2,149,145,187,202,9,105,73,144,187,66,162,134,179,138,9,170,224,91,155,216,188,44,152,250,136,255,160,190,97,182,145,181,199,26,234,19,79,125,52,216,40,254,58,18,55,249,6,236,30,91,36,86,43,252,31,11,164,26,150,194,229,32,28,44,17,102,254,200,27,240,86,40,237,129,31,32,235,76,86,169,223,52,158,180,193,77,210,6,85,12,199,231,239,233,228,6,133,72,255,98,210,138,57,27,204,231,191,0,77,128,153,55,