| blob | 8c6ee36ec1c2004ae6c8d7dcef513001107542b9 |
1 Index: directory/xpcom/base/src/nsLDAPMessage.cpp
2 ===================================================================
3 RCS file: /cvsroot/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp,v
4 retrieving revision 1.28
5 diff -u -r1.28 nsLDAPMessage.cpp
6 --- misc/build/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp 29 Jan 2004 22:04:23 -0000 1.28
7 +++ misc/build/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp 17 May 2004 03:23:37 -0000
8 @@ -513,7 +513,11 @@
9 //
10 PRUint32 i;
11 for ( i = 0 ; i < numVals ; i++ ) {
12 - (*aValues)[i] = UTF8ToNewUnicode(nsDependentCString(values[i]));
13 + if (IsUTF8(nsDependentCString(values[i])))
14 + (*aValues)[i] = UTF8ToNewUnicode(nsDependentCString(values[i]));
15 + else
16 + (*aValues)[i] = ToNewUnicode(nsDependentCString(values[i]));
17 +
18 if ( ! (*aValues)[i] ) {
19 NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(i, aValues);
20 ldap_value_free(values);
21 Index: mailnews/addrbook/src/Makefile.in
22 ===================================================================
23 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/Makefile.in,v
24 retrieving revision 1.47
25 diff -u -r1.47 Makefile.in
26 --- misc/build/mozilla/mailnews/addrbook/src/Makefile.in 6 Oct 2003 17:48:56 -0000 1.47
27 +++ misc/build/mozilla/mailnews/addrbook/src/Makefile.in 17 May 2004 03:23:53 -0000
28 @@ -86,6 +86,7 @@
29 nsVCard.cpp \
30 nsVCardObj.cpp \
31 nsMsgVCardService.cpp \
32 + nsAbMD5sum.cpp \
33 $(NULL)
35 EXPORTS = \
36 Index: mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.cpp
37 ===================================================================
38 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.cpp,v
39 retrieving revision 1.4
40 diff -u -r1.4 nsAbBoolExprToLDAPFilter.cpp
41 --- misc/build/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.cpp 11 Oct 2002 08:17:13 -0000 1.4
42 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.cpp 17 May 2004 03:23:53 -0000
43 @@ -39,6 +39,7 @@
44 #include "nsAbBoolExprToLDAPFilter.h"
45 #include "nsAbLDAPProperties.h"
46 #include "nsXPIDLString.h"
47 +#include "nsAbUtils.h"
49 const int nsAbBoolExprToLDAPFilter::TRANSLATE_CARD_PROPERTY = 1 << 0 ;
50 const int nsAbBoolExprToLDAPFilter::ALLOW_NON_CONVERTABLE_CARD_PROPERTY = 1 << 1 ;
51 @@ -186,13 +187,16 @@
52 rv = condition->GetName (getter_Copies (name));
53 NS_ENSURE_SUCCESS(rv, rv);
55 - const char* ldapProperty = name.get ();
56 + CharPtrArrayGuard attrs;
57 if (flags & TRANSLATE_CARD_PROPERTY)
58 {
59 - const MozillaLdapPropertyRelation* p =
60 - MozillaLdapPropertyRelator::findLdapPropertyFromMozilla (name.get ());
61 - if (p)
62 - ldapProperty = p->ldapProperty;
63 + if(const MozillaLdapPropertyRelation* property =
64 + MozillaLdapPropertyRelator::findLdapPropertyFromMozilla (name.get ()))
65 + {
66 + // allow even single ldap attribute mapppings to go through this to simplify the filter creation later.
67 + rv = MozillaLdapPropertyRelator::getAllLDAPAttrsFromMozilla (property->ldapProperty, attrs.GetSizeAddr(), attrs.GetArrayAddr() );
68 + NS_ENSURE_SUCCESS(rv, rv);
69 + }
70 else if (!(flags & ALLOW_NON_CONVERTABLE_CARD_PROPERTY))
71 return NS_OK;
72 }
73 @@ -202,6 +206,37 @@
74 NS_ENSURE_SUCCESS(rv, rv);
75 NS_ConvertUCS2toUTF8 vUTF8 (value);
77 + // check if using multiple ldap attributes
78 + if(attrs.GetSize() == 1 )
79 + GenerateSingleFilter(conditionType,filter,vUTF8,attrs.GetArray()[0]);
80 + else
81 + {
82 + // add the opening brace if using multiple ldap attributes
83 + switch (conditionType)
84 + {
85 + // 'NOT' conditionals use the 'AND' operator
86 + case nsIAbBooleanConditionTypes::DoesNotExist:
87 + case nsIAbBooleanConditionTypes::DoesNotContain:
88 + case nsIAbBooleanConditionTypes::IsNot:
89 + filter += NS_LITERAL_CSTRING("(&");
90 + break;
91 + default:
92 + filter += NS_LITERAL_CSTRING("(|");
93 + break;
94 + }
95 + GenerateMultipleFilter(conditionType,filter,vUTF8,&attrs);
96 + // add the closing brace if using multiple ldap attributes
97 + filter += NS_LITERAL_CSTRING(")");
98 + }
99 +
100 + return rv;
101 +}
102 +void nsAbBoolExprToLDAPFilter:: GenerateSingleFilter(
103 + nsAbBooleanConditionType conditionType,
104 + nsCString& filter,
105 + NS_ConvertUCS2toUTF8 &vUTF8,
106 + const char *ldapProperty)
107 +{
108 switch (conditionType)
109 {
110 case nsIAbBooleanConditionTypes::DoesNotExist:
111 @@ -282,7 +317,47 @@
112 default:
113 break;
114 }
115 -
116 - return rv;
117 }
118 +void nsAbBoolExprToLDAPFilter:: GenerateMultipleFilter(
119 + nsAbBooleanConditionType conditionType,
120 + nsCString& filter,
121 + NS_ConvertUCS2toUTF8 &vUTF8,
122 + CharPtrArrayGuard *pAttrs)
123 +{
124 + PRUint16 i = 0;
125 + PRUint16 inner = 0;
126 +
127 + /*
128 + * This function is based on the fact that we are trying to generate support
129 + * for multiple occurring ldap attributes. Consider the following query:
130 + * (PagerNumber,=,123456) where PagerNumber = pager|pagerphone translates to:
131 + * (|(&(pager=*)(pager=123456))(&(!(pager=*))(pagerphone=123456)))
132 + * This can be shortened to:
133 + * (|(pager=123456)(&(!(pager=*))(pagerphone=123456)))
134 + *
135 + * i.e. use the first occurring attribute if it exists otherwise if first
136 + * does not exist use the second etc. The assumption is that the first
137 + * always takes precedence.
138 + * This translates to:
139 + * GenerateSingleFilter(Is);
140 + * GenerateSingleFilter(DoesNotExists);
141 + * GenerateSingleFilter(Is);
142 + */
144 + for (i = 0; i < pAttrs->GetSize(); i++)
145 + {
146 + if(i == 0)
147 + GenerateSingleFilter(conditionType,filter,vUTF8,pAttrs->GetArray()[i]);
148 + else
149 + {
150 + filter += NS_LITERAL_CSTRING("(&");
151 + nsAbBooleanConditionType doesNotExistsType = nsIAbBooleanConditionTypes::DoesNotExist;
152 + for(inner = 0; inner < i; ++inner)
153 + {
154 + GenerateSingleFilter(doesNotExistsType,filter,vUTF8,pAttrs->GetArray()[inner]);
155 + }
156 + GenerateSingleFilter(conditionType,filter,vUTF8,pAttrs->GetArray()[i]);
157 + filter += NS_LITERAL_CSTRING(")");
158 + }
159 + }
160 +}
161 Index: mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.h
162 ===================================================================
163 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.h,v
164 retrieving revision 1.2
165 diff -u -r1.2 nsAbBoolExprToLDAPFilter.h
166 --- misc/build/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.h 28 Sep 2001 20:06:21 -0000 1.2
167 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.h 17 May 2004 03:23:53 -0000
168 @@ -42,6 +42,7 @@
169 #include "nsIAbBooleanExpression.h"
170 #include "nsCOMPtr.h"
171 #include "nsString.h"
172 +#include "nsAbUtils.h"
174 class nsAbBoolExprToLDAPFilter
175 {
176 @@ -67,6 +68,16 @@
177 nsIAbBooleanConditionString* condition,
178 nsCString& filter,
179 int flags);
180 + static void GenerateMultipleFilter(
181 + nsAbBooleanConditionType conditionType,
182 + nsCString& filter,
183 + NS_ConvertUCS2toUTF8 &vUTF8,
184 + CharPtrArrayGuard *pAttrs);
185 + static void GenerateSingleFilter(
186 + nsAbBooleanConditionType conditionType,
187 + nsCString& filter,
188 + NS_ConvertUCS2toUTF8 &vUTF8,
189 + const char *ldapProperty);
190 };
192 #endif
193 Index: mailnews/addrbook/src/nsAbLDAPDirectory.cpp
194 ===================================================================
195 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp,v
196 retrieving revision 1.17
197 diff -u -r1.17 nsAbLDAPDirectory.cpp
198 --- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp 14 Feb 2004 02:09:27 -0000 1.17
199 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp 17 May 2004 03:23:53 -0000
200 @@ -118,11 +118,13 @@
202 // use mURINoQuery to get a prefName
203 nsCAutoString prefName;
204 - prefName = nsDependentCString(mURINoQuery.get() + kLDAPDirectoryRootLen) + NS_LITERAL_CSTRING(".uri");
205 + prefName = nsDependentCString(mURINoQuery.get() + kLDAPDirectoryRootLen) ;
207 // turn moz-abldapdirectory://ldap_2.servers.nscpphonebook into -> "ldap_2.servers.nscpphonebook.uri"
208 nsXPIDLCString URI;
209 - rv = prefs->CopyCharPref(prefName.get(), getter_Copies(URI));
210 + nsCAutoString uriPrefName;
211 + uriPrefName = prefName + NS_LITERAL_CSTRING(".uri");
212 + rv = prefs->CopyCharPref(uriPrefName.get(), getter_Copies(URI));
213 if (NS_FAILED(rv))
214 {
215 /*
216 @@ -146,6 +148,27 @@
217 nsCAutoString tempLDAPURL(mURINoQuery);
218 tempLDAPURL.ReplaceSubstring("moz-abldapdirectory:", "ldap:");
219 rv = mURL->SetSpec(tempLDAPURL);
220 + NS_ENSURE_SUCCESS(rv,rv);
221 +
222 + nsCAutoString aHost;
223 + mURL->GetHost(aHost);
224 + aHost.ReplaceChar('.','_');
225 + prefName = nsDependentCString("ldap_2.servers.") + aHost;
226 + PRBool useSSL=0;
227 + rv = prefs->GetBoolPref(
228 + PromiseFlatCString(prefName
229 + + NS_LITERAL_CSTRING(".UseSSL")).get(),
230 + &useSSL
231 + );
232 +
233 + // If use SSL,ldap url will look like this ldaps://host:port/.....
234 + if (!NS_FAILED(rv) && useSSL)
235 + {
236 + tempLDAPURL.ReplaceSubstring("ldap:", "ldaps:");
237 + rv = mURL->SetSpec(tempLDAPURL);
238 + }
239 + //NS_FAILED(rv) means ldap_2.servers.nscpphonebook.UseSSL not exist
240 + rv = 0;
241 }
242 else
243 {
244 @@ -156,24 +179,29 @@
245 // get the login information, if there is any
246 //
247 rv = prefs->GetCharPref(
248 - PromiseFlatCString(
249 - Substring(mURINoQuery, kLDAPDirectoryRootLen,
250 - mURINoQuery.Length() - kLDAPDirectoryRootLen)
251 + PromiseFlatCString(prefName
252 + NS_LITERAL_CSTRING(".auth.dn")).get(),
253 getter_Copies(mLogin));
254 if (NS_FAILED(rv)) {
255 mLogin.Truncate(); // zero out mLogin
256 }
258 + // get the password information, if there is any
259 + //
260 + rv = prefs->GetCharPref(
261 + PromiseFlatCString(prefName
262 + + NS_LITERAL_CSTRING(".auth.pwd")).get(),
263 + getter_Copies(mPassword));
264 + if (NS_FAILED(rv)) {
265 + mPassword.Truncate(); // zero out mLogin
266 + }
267 // get the protocol version, if there is any. using a string pref
268 // here instead of an int, as protocol versions sometimes have names like
269 // "4bis".
270 //
271 nsXPIDLCString protocolVersion;
272 rv = prefs->GetCharPref(
273 - PromiseFlatCString(
274 - Substring(mURINoQuery, kLDAPDirectoryRootLen,
275 - mURINoQuery.Length() - kLDAPDirectoryRootLen)
276 + PromiseFlatCString(prefName
277 + NS_LITERAL_CSTRING(".protocolVersion")).get(),
278 getter_Copies(protocolVersion));
280 Index: mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
281 ===================================================================
282 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp,v
283 retrieving revision 1.22
284 diff -u -r1.22 nsAbLDAPDirectoryQuery.cpp
285 --- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp 14 Feb 2004 02:09:27 -0000 1.22
286 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp 17 May 2004 03:23:53 -0000
287 @@ -74,7 +74,7 @@
288 PRInt32 resultLimit = -1,
289 PRInt32 timeOut = 0);
290 virtual ~nsAbQueryLDAPMessageListener ();
291 -
292 + void SetPassword(const nsAString& aPassword){m_sPassword = aPassword;};
293 protected:
294 nsresult OnLDAPMessageBind (nsILDAPMessage *aMessage);
295 nsresult OnLDAPMessageSearchEntry (nsILDAPMessage *aMessage,
296 @@ -105,6 +105,8 @@
297 PRBool mInitialized;
298 PRBool mCanceled;
300 + nsAutoString m_sPassword;
301 +
302 nsCOMPtr<nsILDAPOperation> mSearchOperation;
304 PRLock* mLock;
305 @@ -255,7 +257,7 @@
307 // If mLogin is set, we're expected to use it to get a password.
308 //
309 - if (!mDirectoryQuery->mLogin.IsEmpty()) {
310 + if (!mDirectoryQuery->mLogin.IsEmpty() && !m_sPassword.Length()) {
311 // XXX hack until nsUTF8AutoString exists
312 #define nsUTF8AutoString nsCAutoString
313 nsUTF8AutoString spec;
314 @@ -398,10 +400,13 @@
315 rv = ldapOperation->Init(mConnection, proxyListener, nsnull);
316 NS_ENSURE_SUCCESS(rv, rv);
318 - // Bind
319 - rv = ldapOperation->SimpleBind(NS_ConvertUCS2toUTF8(passwd));
320 +
321 + // Bind
322 + if (m_sPassword.Length())
323 + rv = ldapOperation->SimpleBind(NS_ConvertUCS2toUTF8(m_sPassword));
324 + else
325 + rv = ldapOperation->SimpleBind(NS_ConvertUCS2toUTF8(passwd));
326 NS_ENSURE_SUCCESS(rv, rv);
327 -
328 return rv;
329 }
331 @@ -685,7 +690,7 @@
332 rv = getLdapReturnAttributes (arguments, returnAttributes);
333 NS_ENSURE_SUCCESS(rv, rv);
335 -
336 +
337 // Get the filter
338 nsCOMPtr<nsISupports> supportsExpression;
339 rv = arguments->GetExpression (getter_AddRefs (supportsExpression));
340 @@ -811,6 +816,11 @@
341 timeOut);
342 if (_messageListener == NULL)
343 return NS_ERROR_OUT_OF_MEMORY;
344 +
345 + nsAutoString wPassword;
346 + wPassword.AssignWithConversion(mPassword.get());
347 + _messageListener->SetPassword(wPassword);
348 +
349 messageListener = _messageListener;
350 nsVoidKey key (NS_REINTERPRET_CAST(void *,contextID));
352 Index: mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h
353 ===================================================================
354 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h,v
355 retrieving revision 1.6
356 diff -u -r1.6 nsAbLDAPDirectoryQuery.h
357 --- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h 14 Feb 2004 02:09:27 -0000 1.6
358 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h 17 May 2004 03:23:53 -0000
359 @@ -74,6 +74,7 @@
360 nsresult RemoveListener (PRInt32 contextID);
361 nsresult Initiate ();
362 nsXPIDLCString mLogin; // authenticate to the LDAP server as...
363 + nsXPIDLCString mPassword; // password to the LDAP server as...
364 nsCOMPtr<nsILDAPURL> mDirectoryUrl; // the URL for the server
365 PRUint32 mProtocolVersion; // version of LDAP (see nsILDAPConnection.idl)
367 Index: mailnews/addrbook/src/nsAbLDAPProperties.cpp
368 ===================================================================
369 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.cpp,v
370 retrieving revision 1.11
371 diff -u -r1.11 nsAbLDAPProperties.cpp
372 --- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.cpp 22 Mar 2003 15:43:29 -0000 1.11
373 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.cpp 17 May 2004 03:23:53 -0000
374 @@ -39,6 +39,7 @@
375 #include "nsAbLDAPProperties.h"
377 #include "nsAbUtils.h"
378 +#include "nsCRT.h"
380 #include "nsCOMPtr.h"
381 #include "nsString.h"
382 @@ -59,6 +60,21 @@
383 If there are multiple entries for a mozilla
384 property the first takes precedence.
386 + But where we need to do a query against
387 + a multiple occurring ldap attribute we
388 + need to OR all the possible ldap entries e.g.
389 +
390 + (CellularNumber=123456) translates to
391 + (|(mobile=123456)(&(!(mobile=*))(cellphone=123456))(&(!(mobile=*))(!(cellphone=*))(carphone=123456)))
392 +
393 + i.e. use the first occurring attribute otherwise if
394 + first does not exist use the second etc.
395 +
396 + [Multiple occurring ldap attributes do not
397 + include aliases. We have also ignored the case
398 + for including 'displayname' as the first occurring
399 + attribute 'cn' is a required attribute.]
400 +
401 This ensures that
403 1) Generality is maintained when mapping from
404 @@ -101,52 +117,32 @@
405 {MozillaProperty_String, "FaxNumber", "fax"},
406 // organizationalPerson
407 {MozillaProperty_String, "FaxNumber", "facsimiletelephonenumber"},
408 - // inetOrgPerson
409 - {MozillaProperty_String, "PagerNumber", "pager"},
410 - // ?
411 - {MozillaProperty_String, "PagerNumber", "pagerphone"},
412 - // inetOrgPerson
413 - {MozillaProperty_String, "CellularNumber", "mobile"},
414 - // ?
415 - {MozillaProperty_String, "CellularNumber", "cellphone"},
416 - // ?
417 - {MozillaProperty_String, "CellularNumber", "carphone"},
418 + // inetOrgPerson,?
419 + {MozillaProperty_String, "PagerNumber", "pager,pagerphone"},
420 + // inetOrgPerson,?,?
421 + {MozillaProperty_String, "CellularNumber", "mobile,cellphone,carphone"},
423 // No Home* properties defined yet
425 - // organizationalPerson
426 - {MozillaProperty_String, "WorkAddress", "postofficebox"},
427 - // ?
428 - {MozillaProperty_String, "WorkAddress", "streetaddress"},
429 + // organizationalPerson,?
430 + {MozillaProperty_String, "WorkAddress", "postofficebox,streetaddress"},
431 // ?
432 {MozillaProperty_String, "WorkCity", "l"},
433 // ?
434 {MozillaProperty_String, "WorkCity", "locality"},
435 // ?
436 - {MozillaProperty_String, "WorkState", "st"},
437 - // ?
438 - {MozillaProperty_String, "WorkState", "region"},
439 - // organizationalPerson
440 - {MozillaProperty_String, "WorkZipCode", "postalcode"},
441 - // ?
442 - {MozillaProperty_String, "WorkZipCode", "zip"},
443 + {MozillaProperty_String, "WorkState", "st,region"},
444 + // organizationalPerson,?
445 + {MozillaProperty_String, "WorkZipCode", "postalcode,zip"},
446 // ?
447 {MozillaProperty_String, "WorkCountry", "countryname"},
449 // organizationalPerson
450 {MozillaProperty_String, "JobTitle", "title"},
451 // ?
452 - {MozillaProperty_String, "Department", "ou"},
453 - // ?
454 - {MozillaProperty_String, "Department", "orgunit"},
455 - // ?
456 - {MozillaProperty_String, "Department", "department"},
457 - // ?
458 - {MozillaProperty_String, "Department", "departmentnumber"},
459 - // inetOrgPerson
460 - {MozillaProperty_String, "Company", "o"},
461 - // ?
462 - {MozillaProperty_String, "Company", "company"},
463 + {MozillaProperty_String, "Department", "ou,orgunit,department,departmentnumber"},
464 + // inetOrgPerson,?
465 + {MozillaProperty_String, "Company", "o,company"},
466 // ?
467 {MozillaProperty_String, "WorkCountry", "countryname"},
468 // ?
469 @@ -168,10 +164,8 @@
470 // ?
471 {MozillaProperty_String, "Custom4", "custom4"},
473 - // ?
474 - {MozillaProperty_String, "Notes", "notes"},
475 - // person
476 - {MozillaProperty_String, "Notes", "description"},
477 + // ?,person
478 + {MozillaProperty_String, "Notes", "notes,description"},
480 // mozilla specfic
481 {MozillaProperty_Int, "PreferMailFormat", "xmozillausehtmlmail"},
482 @@ -209,10 +203,22 @@
483 if (IsInitialized) { return ; }
485 for (int i = tableSize - 1 ; i >= 0 ; -- i) {
486 - nsCStringKey keyMozilla (table [i].mozillaProperty, -1, nsCStringKey::NEVER_OWN);
487 - nsCStringKey keyLdap (table [i].ldapProperty, -1, nsCStringKey::NEVER_OWN);
489 + char *attrToken = nsnull;
490 + char *LDAPProperty = nsCRT::strdup(table[i].ldapProperty);
491 + char *tmpLDAPProperty;
492 +
493 + attrToken = nsCRT::strtok(LDAPProperty, ",", &tmpLDAPProperty);
494 + while (attrToken != nsnull)
495 + {
496 + while ( ' ' == *attrToken)
497 + attrToken++;
498 + nsCStringKey keyLdap (attrToken, -1, nsCStringKey::NEVER_OWN);
499 mLdapToMozilla.Put(&keyLdap, NS_REINTERPRET_CAST(void *, NS_CONST_CAST(MozillaLdapPropertyRelation*, &table[i]))) ;
500 + attrToken = nsCRT::strtok(tmpLDAPProperty, ",", &tmpLDAPProperty);
501 + }
502 +
503 + nsCStringKey keyMozilla (table [i].mozillaProperty, -1, nsCStringKey::NEVER_OWN);
504 mMozillaToLdap.Put(&keyMozilla, NS_REINTERPRET_CAST(void *, NS_CONST_CAST(MozillaLdapPropertyRelation*, &table[i]))) ;
505 }
506 IsInitialized = PR_TRUE;
507 @@ -234,10 +240,13 @@
508 const MozillaLdapPropertyRelation* MozillaLdapPropertyRelator::findMozillaPropertyFromLdap (const char* ldapProperty)
509 {
510 Initialize();
511 + char *attrToken;
512 + char *tmpLDAPProperty;
513 + attrToken = nsCRT::strtok(NS_CONST_CAST(char *,ldapProperty), ",", &tmpLDAPProperty);
514 // ensure that we always do a case insensitive comparison
515 // against the incoming ldap attributes.
516 - nsCAutoString lowercasedProp(ldapProperty);
517 - ToLowerCase(nsDependentCString(ldapProperty), lowercasedProp);
518 + nsCAutoString lowercasedProp (attrToken) ;
519 + ToLowerCase(nsDependentCString(attrToken),lowercasedProp);
520 nsCStringKey key(lowercasedProp);
522 return NS_REINTERPRET_CAST(const MozillaLdapPropertyRelation *, mLdapToMozilla.Get(&key)) ;
523 @@ -287,5 +296,66 @@
524 }
525 }
527 + return rv;
528 +}
529 +
530 +// Parse the input string which may contain a single ldap attribute or multiple attributes in the form
531 +// "string" or "string1,string2,string3" respectively and assign to the array.
532 +nsresult MozillaLdapPropertyRelator::getAllLDAPAttrsFromMozilla (const char* aLDAPProperty, PRUint32 *aAttrCount, char * **aAttributes)
533 +{
534 + NS_ENSURE_ARG_POINTER(aAttrCount);
535 + NS_ENSURE_ARG_POINTER(aAttributes);
536 +
537 + nsresult rv = NS_OK;
538 +
539 + *aAttributes = 0;
540 + // we must have at least one attribute
541 + *aAttrCount = 1;
542 +
543 + // if no multiple ldap attributes then allocate our single entry and exit
544 + if (!strchr(aLDAPProperty,','))
545 + {
546 + if (!(*aAttributes = NS_STATIC_CAST(char **, nsMemory::Alloc(sizeof(char *)))))
547 + return NS_ERROR_OUT_OF_MEMORY;
548 + if (!((*aAttributes)[0] = nsCRT::strdup(aLDAPProperty)))
549 + return NS_ERROR_OUT_OF_MEMORY;
550 +
551 + return rv;
552 + }
553 +
554 + char *attrToken = nsnull;
555 + char *LDAPProperty = nsnull;
556 + char *tmpLDAPProperty;
557 +
558 + if((LDAPProperty = nsCRT::strdup(aLDAPProperty)) == nsnull)
559 + return NS_ERROR_OUT_OF_MEMORY;
560 +
561 + // set our tokenizer to the start
562 + attrToken = nsCRT::strtok(LDAPProperty, ",", &tmpLDAPProperty);
563 +
564 + // Count up the attribute names
565 + while ((attrToken = nsCRT::strtok(tmpLDAPProperty, ",", &tmpLDAPProperty)) != nsnull)
566 + *aAttrCount += 1;
567 +
568 + nsCRT::free (LDAPProperty);
569 + if(!(*aAttributes = NS_STATIC_CAST(char **, nsMemory::Alloc(*aAttrCount * sizeof(char *)))))
570 + return NS_ERROR_OUT_OF_MEMORY;
571 +
572 + if((LDAPProperty = nsCRT::strdup(aLDAPProperty)) == nsnull)
573 + return NS_ERROR_OUT_OF_MEMORY;
574 +
575 + PRInt32 j = 0;
576 + attrToken = nsCRT::strtok(LDAPProperty, ",", &tmpLDAPProperty);
577 + while (nsnull != attrToken) {
578 + if(((*aAttributes)[j++] = nsCRT::strdup(attrToken)) == nsnull)
579 + {
580 + nsCRT::free(LDAPProperty);
581 + return NS_ERROR_OUT_OF_MEMORY;
582 + }
583 +
584 + attrToken = nsCRT::strtok(tmpLDAPProperty, ",", &tmpLDAPProperty);
585 + }
586 +
587 + nsCRT::free(LDAPProperty);
588 return rv;
589 }
590 Index: mailnews/addrbook/src/nsAbLDAPProperties.h
591 ===================================================================
592 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.h,v
593 retrieving revision 1.7
594 diff -u -r1.7 nsAbLDAPProperties.h
595 --- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.h 9 Apr 2002 09:27:24 -0000 1.7
596 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.h 17 May 2004 03:23:53 -0000
597 @@ -85,6 +85,7 @@
598 static nsresult createCardPropertyFromLDAPMessage (nsILDAPMessage* message,
599 nsIAbCard* card,
600 PRBool* hasSetCardProperty);
601 + static nsresult getAllLDAPAttrsFromMozilla (const char* aLDAPProperty, PRUint32 *aAttrCount, char * **aAttributes);
602 };
604 #endif
605 Index: mailnews/addrbook/src/nsAbMDBCardProperty.cpp
606 ===================================================================
607 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp,v
608 retrieving revision 1.15
609 diff -u -r1.15 nsAbMDBCardProperty.cpp
610 --- misc/build/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp 12 Nov 2002 19:19:56 -0000 1.15
611 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp 17 May 2004 03:23:53 -0000
612 @@ -266,8 +266,7 @@
613 if (mCardDatabase)
614 {
615 mCardDatabase->EditCard(this, PR_TRUE);
616 - mCardDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
617 - return NS_OK;
618 + return mCardDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
619 }
620 else
621 return NS_ERROR_FAILURE;
622 Index: mailnews/addrbook/src/nsAbMDBDirectory.cpp
623 ===================================================================
624 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp,v
625 retrieving revision 1.36
626 diff -u -r1.36 nsAbMDBDirectory.cpp
627 --- misc/build/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp 9 Mar 2004 14:42:24 -0000 1.36
628 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp 17 May 2004 03:23:53 -0000
629 @@ -537,7 +537,7 @@
630 }
631 }
632 }
633 - mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
634 + rv = mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
635 }
636 return rv;
637 }
638 @@ -684,6 +684,7 @@
639 return NS_ERROR_NOT_IMPLEMENTED;
641 nsresult rv = NS_OK;
642 +
643 if (!mDatabase)
644 rv = GetAbDatabase();
646 @@ -713,10 +714,11 @@
647 mDatabase->CreateNewListCardAndAddToDB(this, m_dbRowID, newCard, PR_TRUE);
648 else
649 mDatabase->CreateNewCardAndAddToDB(newCard, PR_TRUE);
650 - mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
651 + rv = mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
653 + NS_ENSURE_SUCCESS(rv, rv);
654 NS_IF_ADDREF(*addedCard = newCard);
655 - return NS_OK;
656 + return rv;
657 }
659 NS_IMETHODIMP nsAbMDBDirectory::DropCard(nsIAbCard* aCard, PRBool needToCopyCard)
660 Index: mailnews/addrbook/src/nsAbOutlookCard.cpp
661 ===================================================================
662 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbOutlookCard.cpp,v
663 retrieving revision 1.14
664 diff -u -r1.14 nsAbOutlookCard.cpp
665 --- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookCard.cpp 9 Mar 2004 15:18:40 -0000 1.14
666 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookCard.cpp 17 May 2004 03:23:53 -0000
667 @@ -97,6 +97,7 @@
668 {
669 index_DisplayName = 0,
670 index_EmailAddress,
671 + index_SecondEmailAddress,
672 index_FirstName,
673 index_LastName,
674 index_NickName,
675 @@ -124,32 +125,34 @@
677 static const ULONG OutlookCardMAPIProps [] =
678 {
679 - PR_DISPLAY_NAME_W,
680 - PR_EMAIL_ADDRESS_W,
681 - PR_GIVEN_NAME_W,
682 - PR_SURNAME_W,
683 - PR_NICKNAME_W,
684 - PR_BUSINESS_TELEPHONE_NUMBER_W,
685 - PR_HOME_TELEPHONE_NUMBER_W,
686 - PR_BUSINESS_FAX_NUMBER_W,
687 - PR_PAGER_TELEPHONE_NUMBER_W,
688 - PR_MOBILE_TELEPHONE_NUMBER_W,
689 - PR_HOME_ADDRESS_CITY_W,
690 - PR_HOME_ADDRESS_STATE_OR_PROVINCE_W,
691 - PR_HOME_ADDRESS_POSTAL_CODE_W,
692 - PR_HOME_ADDRESS_COUNTRY_W,
693 - PR_BUSINESS_ADDRESS_CITY_W,
694 - PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE_W,
695 - PR_BUSINESS_ADDRESS_POSTAL_CODE_W,
696 - PR_BUSINESS_ADDRESS_COUNTRY_W,
697 - PR_TITLE_W,
698 - PR_DEPARTMENT_NAME_W,
699 - PR_COMPANY_NAME_W,
700 - PR_BUSINESS_HOME_PAGE_W,
701 - PR_PERSONAL_HOME_PAGE_W,
702 - PR_COMMENT_W
703 + PR_DISPLAY_NAME_A,//0x8035001E
704 + PR_EMAIL_ADDRESS_A,//0x8034001E
705 + PR_SECOND_EMAIL_ADDRESS_A,//Second Email Address
706 + PR_GIVEN_NAME_A,
707 + PR_SURNAME_A,
708 + PR_NICKNAME_A,
709 + PR_BUSINESS_TELEPHONE_NUMBER_A,
710 + PR_HOME_TELEPHONE_NUMBER_A,
711 + PR_BUSINESS_FAX_NUMBER_A,
712 + PR_PAGER_TELEPHONE_NUMBER_A,
713 + PR_MOBILE_TELEPHONE_NUMBER_A,
714 + PR_HOME_ADDRESS_CITY_A,
715 + PR_HOME_ADDRESS_STATE_OR_PROVINCE_A,
716 + PR_HOME_ADDRESS_POSTAL_CODE_A,
717 + PR_HOME_ADDRESS_COUNTRY_A,
718 + PR_BUSINESS_ADDRESS_CITY_A,
719 + PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE_A,
720 + PR_BUSINESS_ADDRESS_POSTAL_CODE_A,
721 + PR_BUSINESS_ADDRESS_COUNTRY_A,
722 + PR_TITLE_A,
723 + PR_DEPARTMENT_NAME_A,
724 + PR_COMPANY_NAME_A,
725 + PR_BUSINESS_HOME_PAGE_A,
726 + PR_PERSONAL_HOME_PAGE_A,
727 + PR_COMMENT_A
728 } ;
730 +
731 nsresult nsAbOutlookCard::Init(const char *aUri)
732 {
733 nsresult retCode = nsRDFResource::Init(aUri) ;
734 @@ -176,6 +179,7 @@
735 SetDisplayName(unichars [index_DisplayName]->get()) ;
736 SetNickName(unichars [index_NickName]->get()) ;
737 SetPrimaryEmail(unichars [index_EmailAddress]->get()) ;
738 + SetSecondEmail(unichars [index_SecondEmailAddress]->get()) ;
739 SetWorkPhone(unichars [index_WorkPhoneNumber]->get()) ;
740 SetHomePhone(unichars [index_HomePhoneNumber]->get()) ;
741 SetFaxNumber(unichars [index_WorkFaxNumber]->get()) ;
742 @@ -210,12 +214,12 @@
743 nsAutoString unichar ;
744 nsAutoString unicharBis ;
746 - if (mapiAddBook->GetPropertyUString(*mMapiData, PR_HOME_ADDRESS_STREET_W, unichar)) {
747 + if (mapiAddBook->GetPropertyUString(*mMapiData, PR_HOME_ADDRESS_STREET_A, unichar)) {
748 splitString(unichar, unicharBis) ;
749 SetHomeAddress(unichar.get()) ;
750 SetHomeAddress2(unicharBis.get()) ;
751 }
752 - if (mapiAddBook->GetPropertyUString(*mMapiData, PR_BUSINESS_ADDRESS_STREET_W, unichar)) {
753 + if (mapiAddBook->GetPropertyUString(*mMapiData, PR_BUSINESS_ADDRESS_STREET_A, unichar)) {
754 splitString(unichar, unicharBis) ;
755 SetWorkAddress(unichar.get()) ;
756 SetWorkAddress2(unicharBis.get()) ;
757 @@ -297,6 +301,7 @@
758 SetDisplayName(properties [index_DisplayName]) ;
759 GetNickName(getter_Copies(properties [index_NickName])) ;
760 GetPrimaryEmail(getter_Copies(properties [index_EmailAddress])) ;
761 + GetSecondEmail(getter_Copies(properties [index_SecondEmailAddress])) ;
762 GetWorkPhone(getter_Copies(properties [index_WorkPhoneNumber])) ;
763 GetHomePhone(getter_Copies(properties [index_HomePhoneNumber])) ;
764 GetFaxNumber(getter_Copies(properties [index_WorkFaxNumber])) ;
765 @@ -316,9 +321,16 @@
766 GetWebPage1(getter_Copies(properties [index_WorkWebPage])) ;
767 GetWebPage2(getter_Copies(properties [index_HomeWebPage])) ;
768 GetNotes(getter_Copies(properties [index_Comments])) ;
769 - if (!mapiAddBook->SetPropertiesUString(*mMapiData, OutlookCardMAPIProps,
770 - index_LastProp, properties)) {
771 - PRINTF(("Cannot set general properties.\n")) ;
772 +
773 + int i=0;
774 + for (i=0;i<index_LastProp;i++)
775 + {
776 + if (!mapiAddBook->SetPropertyUString(*mMapiData,
777 + OutlookCardMAPIProps[i],
778 + properties[i]))
779 + {
780 + PRINTF(("Cannot set properties:%d.\n",OutlookCardMAPIProps[i])) ;
781 + }
782 }
783 delete [] properties ;
784 nsXPIDLString unichar ;
785 Index: mailnews/addrbook/src/nsAbOutlookDirFactory.cpp
786 ===================================================================
787 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp,v
788 retrieving revision 1.9
789 diff -u -r1.9 nsAbOutlookDirFactory.cpp
790 --- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp 25 Feb 2003 21:36:33 -0000 1.9
791 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp 17 May 2004 03:23:53 -0000
792 @@ -124,8 +124,8 @@
793 nsCAutoString uri ;
794 nsCOMPtr<nsIRDFResource> resource ;
796 - for (ULONG i = 0 ; i < folders.mNbEntries ; ++ i) {
797 - folders.mEntries [i].ToString(entryId) ;
798 + for (ULONG i = 0 ; i < folders.GetSize() ; ++ i) {
799 + folders[i].ToString(entryId) ;
800 buildAbWinUri(kOutlookDirectoryScheme, abType, uri) ;
801 uri.Append(entryId) ;
803 Index: mailnews/addrbook/src/nsAbOutlookDirectory.cpp
804 ===================================================================
805 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.cpp,v
806 retrieving revision 1.18
807 diff -u -r1.18 nsAbOutlookDirectory.cpp
808 --- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.cpp 5 Feb 2004 18:33:06 -0000 1.18
809 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.cpp 17 May 2004 03:23:53 -0000
810 @@ -126,7 +126,7 @@
811 PRINTF(("Cannot get type.\n")) ;
812 return NS_ERROR_FAILURE ;
813 }
814 - if (!mapiAddBook->GetPropertyUString(*mMapiData, PR_DISPLAY_NAME_W, unichars)) {
815 + if (!mapiAddBook->GetPropertyUString(*mMapiData, PR_DISPLAY_NAME_A, unichars)) {
816 PRINTF(("Cannot get name.\n")) ;
817 return NS_ERROR_FAILURE ;
818 }
819 @@ -163,45 +163,85 @@
820 return retCode;
821 }
823 +nsresult nsAbOutlookDirectory::BuildCardFromURI(const nsCString& uriName,nsIAbCard **aNewCard,
824 + PRBool aSearchForOld, PRBool& aIsNewCard)
825 +{
826 + nsresult retCode = NS_OK ;
827 + if (aSearchForOld) {
828 + nsCStringKey key(uriName) ;
829 + nsCOMPtr<nsISupports> existingCard = mCardList.Get(&key) ;
830 +
831 + if (existingCard) {
832 + nsCOMPtr<nsIAbCard> card(do_QueryInterface(existingCard, &retCode)) ;
833 +
834 + NS_ENSURE_SUCCESS(retCode, retCode) ;
835 + NS_IF_ADDREF(*aNewCard = card) ;
836 + aIsNewCard = PR_FALSE ;
837 + return retCode ;
838 + }
839 + }
840 + aIsNewCard = PR_TRUE ;
841 + nsCOMPtr<nsIRDFResource> resource ;
842 +
843 + nsCOMPtr<nsIAbCard> childCard = do_CreateInstance(NS_ABOUTLOOKCARD_CONTRACTID, &retCode);
844 + NS_ENSURE_SUCCESS(retCode, retCode) ;
845 + resource = do_QueryInterface(childCard, &retCode) ;
846 + NS_ENSURE_SUCCESS(retCode, retCode) ;
847 + retCode = resource->Init(uriName.get()) ;
848 + NS_ENSURE_SUCCESS(retCode, retCode) ;
849 + NS_IF_ADDREF(*aNewCard = childCard);
850 + return retCode ;
851 +}
852 +
853 NS_IMETHODIMP nsAbOutlookDirectory::GetChildCards(nsIEnumerator **aCards)
854 {
855 if (!aCards) { return NS_ERROR_NULL_POINTER ; }
856 *aCards = nsnull ;
857 nsCOMPtr<nsISupportsArray> cardList ;
858 + nsCStringArray uriList ;
859 + nsAbWinHelperGuard mapiAddBook (mAbWinType) ;
860 nsresult retCode ;
862 - mCardList.Reset() ;
863 if (mIsQueryURI) {
864 retCode = StartSearch() ;
865 - NS_NewISupportsArray(getter_AddRefs(cardList)) ;
866 }
867 else {
868 - retCode = GetChildCards(getter_AddRefs(cardList), nsnull) ;
869 + retCode = GetChildCards(uriList, nsnull) ;
870 }
871 + NS_NewISupportsArray(getter_AddRefs(cardList)) ;
872 if (NS_SUCCEEDED(retCode)) {
873 // Fill the results array and update the card list
874 // Also update the address list and notify any changes.
875 PRUint32 nbCards = 0 ;
876 - nsCOMPtr<nsISupports> element ;
877 + nsCAutoString uriName;
878 + nsCOMPtr <nsIAbCard> childCard;
879 + PRBool searchForOldCards = 0; //(mCardList.Count() != 0) ;
880 +
881 + nbCards = uriList.Count();
882 + NS_NewISupportsArray(getter_AddRefs(m_AddressList));
884 - cardList->Enumerate(aCards) ;
885 - cardList->Count(&nbCards) ;
886 for (PRUint32 i = 0 ; i < nbCards ; ++ i) {
887 - cardList->GetElementAt(i, getter_AddRefs(element)) ;
888 - nsVoidKey newKey (NS_STATIC_CAST(void *, element)) ;
889 - nsCOMPtr<nsISupports> oldElement = mCardList.Get(&newKey) ;
890 + PRBool isNewCard = PR_FALSE ;
892 - if (!oldElement) {
893 + uriList.CStringAt(i,uriName);
894 + retCode = BuildCardFromURI(uriName,getter_AddRefs(childCard), searchForOldCards, isNewCard);
895 + NS_ENSURE_SUCCESS(retCode, retCode) ;
896 + cardList->AppendElement(childCard);
897 +
898 + if (isNewCard) {
899 // We are dealing with a new element (probably directly
900 // added from Outlook), we may need to sync m_AddressList
901 - mCardList.Put(&newKey, element) ;
902 - nsCOMPtr<nsIAbCard> card (do_QueryInterface(element, &retCode)) ;
903 + nsCStringKey newKey(uriName) ;
904 +
905 + mCardList.Put(&newKey, childCard) ;
906 + nsCOMPtr<nsIAbCard> card (do_QueryInterface(childCard, &retCode)) ;
908 NS_ENSURE_SUCCESS(retCode, retCode) ;
909 PRBool isMailList = PR_FALSE ;
911 retCode = card->GetIsMailList(&isMailList) ;
912 NS_ENSURE_SUCCESS(retCode, retCode) ;
913 +
914 if (isMailList) {
915 // We can have mailing lists only in folder,
916 // we must add the directory to m_AddressList
917 @@ -224,18 +264,33 @@
918 NotifyItemAddition(card) ;
919 }
920 }
921 - else {
922 - NS_ASSERTION(oldElement == element, "Different card stored") ;
923 }
924 }
925 + return cardList->Enumerate(aCards) ;
926 }
927 +
928 +static nsresult ExtractUriFromCard(nsIAbCard *aCard, nsCString& aUri) {
929 + nsresult retCode = NS_OK ;
930 + nsCOMPtr<nsIRDFResource> resource (do_QueryInterface(aCard, &retCode)) ;
931 +
932 + // Receiving a non-RDF card is accepted
933 + if (NS_FAILED(retCode)) { return NS_OK ; }
934 + nsXPIDLCString uri ;
935 +
936 + retCode = resource->GetValue(getter_Copies(uri)) ;
937 + NS_ENSURE_SUCCESS(retCode, retCode) ;
938 + aUri = uri.get() ;
939 return retCode ;
940 }
942 NS_IMETHODIMP nsAbOutlookDirectory::HasCard(nsIAbCard *aCard, PRBool *aHasCard)
943 {
944 if (!aCard || !aHasCard) { return NS_ERROR_NULL_POINTER ; }
945 - nsVoidKey key (NS_STATIC_CAST(void *, aCard)) ;
946 + *aHasCard = PR_FALSE ;
947 + nsCString uri ;
948 +
949 + ExtractUriFromCard(aCard, uri) ;
950 + nsCStringKey key(uri) ;
952 *aHasCard = mCardList.Exists(&key) ;
953 return NS_OK ;
954 @@ -317,7 +372,10 @@
955 PRINTF(("Cannot delete card %s.\n", entryString.get())) ;
956 }
957 else {
958 - nsVoidKey key (NS_STATIC_CAST(void *, element)) ;
959 + nsCString uri ;
960 +
961 + ExtractUriFromCard(card, uri) ;
962 + nsCStringKey key(uri) ;
964 mCardList.Remove(&key) ;
965 if (m_IsMailList) { m_AddressList->RemoveElement(element) ; }
966 @@ -386,7 +444,10 @@
967 }
968 retCode = CreateCard(aData, addedCard) ;
969 NS_ENSURE_SUCCESS(retCode, retCode) ;
970 - nsVoidKey newKey (NS_STATIC_CAST(void *, *addedCard)) ;
971 + nsCString uri ;
972 +
973 + ExtractUriFromCard(*addedCard, uri) ;
974 + nsCStringKey newKey(uri) ;
976 mCardList.Put(&newKey, *addedCard) ;
977 if (m_IsMailList) { m_AddressList->AppendElement(*addedCard) ; }
978 @@ -457,7 +518,7 @@
979 if (!mapiAddBook->IsOK()) { return NS_ERROR_FAILURE ; }
980 retCode = GetDirName(getter_Copies(name)) ;
981 NS_ENSURE_SUCCESS(retCode, retCode) ;
982 - if (!mapiAddBook->SetPropertyUString(*mMapiData, PR_DISPLAY_NAME_W, name.get())) {
983 + if (!mapiAddBook->SetPropertyUString(*mMapiData, PR_DISPLAY_NAME_A, name.get())) {
984 return NS_ERROR_FAILURE ;
985 }
986 retCode = CommitAddressList() ;
987 @@ -518,6 +579,7 @@
988 {"DisplayName", PR_DISPLAY_NAME_A},
989 {"NickName", PR_NICKNAME_A},
990 {"PrimaryEmail", PR_EMAIL_ADDRESS_A},
991 + {"SecondEmail",PR_SECOND_EMAIL_ADDRESS_A},
992 {"WorkPhone", PR_BUSINESS_TELEPHONE_NUMBER_A},
993 {"HomePhone", PR_HOME_TELEPHONE_NUMBER_A},
994 {"FaxNumber", PR_BUSINESS_FAX_NUMBER_A},
995 @@ -1032,7 +1094,10 @@
997 nsresult nsAbOutlookDirectory::OnSearchFoundCard(nsIAbCard *aCard)
998 {
999 - nsVoidKey newKey (NS_STATIC_CAST(void *, aCard)) ;
1000 + nsCString uri ;
1001 +
1002 + ExtractUriFromCard(aCard, uri) ;
1003 + nsCStringKey newKey(uri) ;
1004 nsresult retCode = NS_OK ;
1006 mCardList.Put(&newKey, aCard) ;
1007 @@ -1056,14 +1121,14 @@
1008 retCode = BuildRestriction(aArguments, arguments) ;
1009 NS_ENSURE_SUCCESS(retCode, retCode) ;
1010 nsCOMPtr<nsISupportsArray> resultsArray ;
1011 + nsCStringArray uriArray ;
1012 PRUint32 nbResults = 0 ;
1014 - retCode = GetChildCards(getter_AddRefs(resultsArray),
1015 + retCode = GetChildCards(uriArray,
1016 arguments.rt == RES_COMMENT ? nsnull : &arguments) ;
1017 DestroyRestriction(arguments) ;
1018 NS_ENSURE_SUCCESS(retCode, retCode) ;
1019 - retCode = resultsArray->Count(&nbResults) ;
1020 - NS_ENSURE_SUCCESS(retCode, retCode) ;
1021 + nbResults = uriArray.Count() ;
1022 nsCOMPtr<nsIAbDirectoryQueryResult> result ;
1023 nsAbDirectoryQueryResult *newResult = nsnull ;
1025 @@ -1071,15 +1136,18 @@
1026 nbResults = NS_STATIC_CAST(PRUint32, aResultLimit) ;
1027 }
1028 PRUint32 i = 0 ;
1029 - nsCOMPtr<nsISupports> element ;
1030 nsCOMPtr<nsISupportsArray> propertyValues ;
1032 + nsCAutoString uriName;
1033 + nsCOMPtr <nsIAbCard> card;
1034 +
1035 for (i = 0 ; i < nbResults ; ++ i) {
1036 - retCode = resultsArray->GetElementAt(i, getter_AddRefs(element)) ;
1037 - NS_ENSURE_SUCCESS(retCode, retCode) ;
1038 - nsCOMPtr<nsIAbCard> card (do_QueryInterface(element, &retCode)) ;
1039 + PRBool isNewCard = PR_FALSE ;
1041 + uriArray.CStringAt(i,uriName);
1042 + retCode = BuildCardFromURI(uriName,getter_AddRefs(card), PR_FALSE, isNewCard);
1043 NS_ENSURE_SUCCESS(retCode, retCode) ;
1044 +
1045 FillPropertyValues(card, aArguments, getter_AddRefs(propertyValues)) ;
1046 newResult = new nsAbDirectoryQueryResult(0, aArguments,
1047 nsIAbDirectoryQueryResult::queryResultMatch,
1048 @@ -1104,13 +1172,43 @@
1049 if (!aCards) { return NS_ERROR_NULL_POINTER ; }
1050 *aCards = nsnull ;
1051 nsresult retCode = NS_OK ;
1052 - nsCOMPtr<nsISupportsArray> cards ;
1053 +
1054 + nsCOMPtr<nsISupportsArray> cards;
1055 + retCode = NS_NewISupportsArray(getter_AddRefs(cards));
1056 + NS_ENSURE_SUCCESS(retCode, retCode) ;
1057 +
1058 + nsCStringArray uriList;
1059 + retCode = GetChildCards(uriList,aRestriction);
1060 + NS_ENSURE_SUCCESS(retCode, retCode) ;
1061 +
1062 + nsCAutoString uriName;
1063 + nsCOMPtr <nsIAbCard> childCard;
1064 + PRUint32 nbURIs = 0 ;
1065 + nbURIs = uriList.Count();
1066 + PRUint32 i = 0 ;
1067 +
1068 + for (i = 0 ; i < nbURIs ; ++ i) {
1069 + PRBool isNewCard = PR_FALSE ;
1070 +
1071 + uriList.CStringAt(i,uriName);
1072 + retCode = BuildCardFromURI(uriName,getter_AddRefs(childCard), PR_TRUE, isNewCard);
1073 + NS_ENSURE_SUCCESS(retCode, retCode) ;
1074 + cards->AppendElement(childCard);
1075 + }
1076 +
1077 + NS_IF_ADDREF(*aCards = cards);
1078 + return retCode ;
1079 +}
1080 +
1081 +nsresult nsAbOutlookDirectory::GetChildCards(nsCStringArray& aURI,
1082 + void *aRestriction)
1083 +{
1084 + nsresult retCode = NS_OK ;
1085 nsAbWinHelperGuard mapiAddBook (mAbWinType) ;
1086 nsMapiEntryArray cardEntries ;
1087 LPSRestriction restriction = (LPSRestriction) aRestriction ;
1089 if (!mapiAddBook->IsOK()) { return NS_ERROR_FAILURE ; }
1090 - retCode = NS_NewISupportsArray(getter_AddRefs(cards)) ;
1091 NS_ENSURE_SUCCESS(retCode, retCode) ;
1092 if (!mapiAddBook->GetCards(*mMapiData, restriction, cardEntries)) {
1093 PRINTF(("Cannot get cards.\n")) ;
1094 @@ -1119,22 +1217,14 @@
1095 nsCAutoString entryId ;
1096 nsCAutoString uriName ;
1097 nsCOMPtr<nsIRDFResource> resource ;
1098 - nsCOMPtr <nsIAbCard> childCard;
1099 -
1100 - for (ULONG card = 0 ; card < cardEntries.mNbEntries ; ++ card) {
1101 - cardEntries.mEntries [card].ToString(entryId) ;
1102 + aURI.Clear();
1103 +
1104 + for (ULONG card = 0 ; card < cardEntries.GetSize() ; ++ card) {
1105 + cardEntries [card].ToString(entryId) ;
1106 buildAbWinUri(kOutlookCardScheme, mAbWinType, uriName) ;
1107 uriName.Append(entryId) ;
1108 - childCard = do_CreateInstance(NS_ABOUTLOOKCARD_CONTRACTID, &retCode);
1109 - NS_ENSURE_SUCCESS(retCode, retCode) ;
1110 - resource = do_QueryInterface(childCard, &retCode) ;
1111 - NS_ENSURE_SUCCESS(retCode, retCode) ;
1112 - retCode = resource->Init(uriName.get()) ;
1113 - NS_ENSURE_SUCCESS(retCode, retCode) ;
1114 - cards->AppendElement(childCard) ;
1115 + aURI.AppendCString(uriName);
1116 }
1117 - *aCards = cards ;
1118 - NS_ADDREF(*aCards) ;
1119 return retCode ;
1120 }
1122 @@ -1158,8 +1248,8 @@
1123 nsCAutoString uriName ;
1124 nsCOMPtr <nsIRDFResource> resource ;
1126 - for (ULONG node = 0 ; node < nodeEntries.mNbEntries ; ++ node) {
1127 - nodeEntries.mEntries [node].ToString(entryId) ;
1128 + for (ULONG node = 0 ; node < nodeEntries.GetSize() ; ++ node) {
1129 + nodeEntries [node].ToString(entryId) ;
1130 buildAbWinUri(kOutlookDirectoryScheme, mAbWinType, uriName) ;
1131 uriName.Append(entryId) ;
1132 retCode = gRDFService->GetResource(uriName, getter_AddRefs(resource)) ;
1133 @@ -1280,7 +1370,7 @@
1134 // In the case of a mailing list, we cannot directly create a new card,
1135 // we have to create a temporary one in a real folder (to be able to use
1136 // templates) and then copy it to the mailing list.
1137 - if (m_IsMailList) {
1138 + if (m_IsMailList && mAbWinType == nsAbWinType_OutlookExp) {
1139 nsMapiEntry parentEntry ;
1140 nsMapiEntry temporaryEntry ;
1142 Index: mailnews/addrbook/src/nsAbOutlookDirectory.h
1143 ===================================================================
1144 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h,v
1145 retrieving revision 1.6
1146 diff -u -r1.6 nsAbOutlookDirectory.h
1147 --- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h 5 Feb 2004 18:33:06 -0000 1.6
1148 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h 17 May 2004 03:23:53 -0000
1149 @@ -46,6 +46,7 @@
1150 #include "nsHashtable.h"
1152 #include "nsISupportsArray.h"
1153 +#include "nsVoidArray.h"
1155 struct nsMapiEntry ;
1157 @@ -92,6 +93,8 @@
1158 protected:
1159 // Retrieve hierarchy as cards, with an optional restriction
1160 nsresult GetChildCards(nsISupportsArray **aCards, void *aRestriction) ;
1161 + // Retrieve hierarchy as URIs, with an optional restriction
1162 + nsresult GetChildCards(nsCStringArray& aURI, void *aRestriction) ;
1163 // Retrieve hierarchy as directories
1164 nsresult GetChildNodes(nsISupportsArray **aNodes) ;
1165 // Create a new card
1166 @@ -103,6 +106,9 @@
1167 nsresult CommitAddressList(void) ;
1168 // Read MAPI repository
1169 nsresult UpdateAddressList(void) ;
1170 + // Search for an existing card or build a new one
1171 + nsresult BuildCardFromURI(const nsCString& uriName,nsIAbCard **aNewCard,
1172 + PRBool aSearchForOld, PRBool& aIsNewCard) ;
1174 nsMapiEntry *mMapiData ;
1175 // Container for the query threads
1176 Index: mailnews/addrbook/src/nsAbWinHelper.cpp
1177 ===================================================================
1178 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp,v
1179 retrieving revision 1.13
1180 diff -u -r1.13 nsAbWinHelper.cpp
1181 --- misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp 24 Dec 2003 19:55:05 -0000 1.13
1182 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp 17 May 2004 03:23:53 -0000
1183 @@ -41,6 +41,9 @@
1184 #define USES_IID_IABContainer
1185 #define USES_IID_IMAPITable
1186 #define USES_IID_IDistList
1187 +#define USES_IID_IMsgStore
1188 +#define USES_IID_IMessage
1189 +#define USES_IID_IMAPIFolder
1191 #include "nsAbWinHelper.h"
1192 #include "nsAbUtils.h"
1193 @@ -59,19 +62,6 @@
1195 #define PRINTF(args) PR_LOG(gAbWinHelperLog, PR_LOG_DEBUG, args)
1197 -// Small utility to ensure release of all MAPI interfaces
1198 -template <class tInterface> struct nsMapiInterfaceWrapper
1199 -{
1200 - tInterface mInterface ;
1201 -
1202 - nsMapiInterfaceWrapper(void) : mInterface(NULL) {}
1203 - ~nsMapiInterfaceWrapper(void) {
1204 - if (mInterface != NULL) { mInterface->Release() ; }
1205 - }
1206 - operator LPUNKNOWN *(void) { return NS_REINTERPRET_CAST(LPUNKNOWN *, &mInterface) ; }
1207 - tInterface operator -> (void) const { return mInterface ; }
1208 - operator tInterface *(void) { return &mInterface ; }
1209 -} ;
1211 static void assignEntryID(LPENTRYID& aTarget, LPENTRYID aSource, ULONG aByteCount)
1212 {
1213 @@ -249,24 +239,28 @@
1214 MOZ_DECL_CTOR_COUNTER(nsMapiEntryArray)
1216 nsMapiEntryArray::nsMapiEntryArray(void)
1217 -: mEntries(NULL), mNbEntries(0)
1218 {
1219 MOZ_COUNT_CTOR(nsMapiEntryArray) ;
1220 }
1222 nsMapiEntryArray::~nsMapiEntryArray(void)
1223 {
1224 - if (mEntries) { delete [] mEntries ; }
1225 + CleanUp();
1226 MOZ_COUNT_DTOR(nsMapiEntryArray) ;
1227 }
1228 -
1229 +void nsMapiEntryArray::AddItem(nsMapiEntry * aEntries)
1230 +{
1231 + m_array.AppendElement(aEntries);
1232 +}
1233 void nsMapiEntryArray::CleanUp(void)
1234 {
1235 - if (mEntries != NULL) {
1236 - delete [] mEntries ;
1237 - mEntries = NULL ;
1238 - mNbEntries = 0 ;
1239 + nsMapiEntry *pEntries;
1240 + for (int i = 0; i < m_array.Count(); i++)
1241 + {
1242 + pEntries = (nsMapiEntry *)m_array.ElementAt( i);
1243 + delete pEntries;
1244 }
1245 + m_array.Clear();
1246 }
1248 MOZ_DECL_CTOR_COUNTER(nsAbWinHelper)
1249 @@ -280,100 +274,55 @@
1250 // same protection (MAPI is supposed to be thread-safe).
1251 PRLock *nsAbWinHelper::mMutex = PR_NewLock() ;
1253 +int nsAbWinHelper::m_clients = 0;
1254 +
1255 +PRUnichar * nsAbWinHelper::m_pUniBuff = NULL;
1256 +int nsAbWinHelper::m_uniBuffLen = 0;
1257 +char * nsAbWinHelper::m_pCStrBuff = NULL;
1258 +int nsAbWinHelper::m_cstrBuffLen = 0;
1259 +
1260 nsAbWinHelper::nsAbWinHelper(void)
1261 -: mAddressBook(NULL), mLastError(S_OK)
1262 +:mLastError(S_OK)
1263 {
1264 MOZ_COUNT_CTOR(nsAbWinHelper) ;
1265 + m_clients++;
1266 }
1268 nsAbWinHelper::~nsAbWinHelper(void)
1269 {
1270 MOZ_COUNT_DTOR(nsAbWinHelper) ;
1271 -}
1272 -
1273 -BOOL nsAbWinHelper::GetFolders(nsMapiEntryArray& aFolders)
1274 + m_clients--;
1275 + if (!m_clients)
1276 {
1277 - aFolders.CleanUp() ;
1278 - nsMapiInterfaceWrapper<LPABCONT> rootFolder ;
1279 - nsMapiInterfaceWrapper<LPMAPITABLE> folders ;
1280 - ULONG objType = 0 ;
1281 - ULONG rowCount = 0 ;
1282 - SRestriction restriction ;
1283 - SPropTagArray folderColumns ;
1284 -
1285 - mLastError = mAddressBook->OpenEntry(0, NULL, NULL, 0, &objType,
1286 - rootFolder) ;
1287 - if (HR_FAILED(mLastError)) {
1288 - PRINTF(("Cannot open root %08x.\n", mLastError)) ;
1289 - return FALSE ;
1290 + delete [] m_pUniBuff;
1291 + m_pUniBuff = NULL;
1292 + m_uniBuffLen = 0;
1293 + delete [] m_pCStrBuff;
1294 + m_pCStrBuff = NULL;
1295 + m_cstrBuffLen = 0;
1296 }
1297 - mLastError = rootFolder->GetHierarchyTable(0, folders) ;
1298 - if (HR_FAILED(mLastError)) {
1299 - PRINTF(("Cannot get hierarchy %08x.\n", mLastError)) ;
1300 - return FALSE ;
1301 }
1302 - // We only take into account modifiable containers,
1303 - // otherwise, we end up with all the directory services...
1304 - restriction.rt = RES_BITMASK ;
1305 - restriction.res.resBitMask.ulPropTag = PR_CONTAINER_FLAGS ;
1306 - restriction.res.resBitMask.relBMR = BMR_NEZ ;
1307 - restriction.res.resBitMask.ulMask = AB_MODIFIABLE ;
1308 - mLastError = folders->Restrict(&restriction, 0) ;
1309 - if (HR_FAILED(mLastError)) {
1310 - PRINTF(("Cannot restrict table %08x.\n", mLastError)) ;
1311 - }
1312 - folderColumns.cValues = 1 ;
1313 - folderColumns.aulPropTag [0] = PR_ENTRYID ;
1314 - mLastError = folders->SetColumns(&folderColumns, 0) ;
1315 - if (HR_FAILED(mLastError)) {
1316 - PRINTF(("Cannot set columns %08x.\n", mLastError)) ;
1317 - return FALSE ;
1318 - }
1319 - mLastError = folders->GetRowCount(0, &rowCount) ;
1320 - if (HR_SUCCEEDED(mLastError)) {
1321 - aFolders.mEntries = new nsMapiEntry [rowCount] ;
1322 - aFolders.mNbEntries = 0 ;
1323 - do {
1324 - LPSRowSet rowSet = NULL ;
1325 -
1326 - rowCount = 0 ;
1327 - mLastError = folders->QueryRows(1, 0, &rowSet) ;
1328 - if (HR_SUCCEEDED(mLastError)) {
1329 - rowCount = rowSet->cRows ;
1330 - if (rowCount > 0) {
1331 - nsMapiEntry& current = aFolders.mEntries [aFolders.mNbEntries ++] ;
1332 - SPropValue& currentValue = rowSet->aRow->lpProps [0] ;
1333 -
1334 - current.Assign(currentValue.Value.bin.cb,
1335 - NS_REINTERPRET_CAST(LPENTRYID, currentValue.Value.bin.lpb)) ;
1336 - }
1337 - MyFreeProws(rowSet) ;
1338 - }
1339 - else {
1340 - PRINTF(("Cannot query rows %08x.\n", mLastError)) ;
1341 - }
1342 - } while (rowCount > 0) ;
1343 - }
1344 - return HR_SUCCEEDED(mLastError) ;
1345 -}
1346 +
1348 BOOL nsAbWinHelper::GetCards(const nsMapiEntry& aParent, LPSRestriction aRestriction,
1349 nsMapiEntryArray& aCards)
1350 {
1351 aCards.CleanUp() ;
1352 - return GetContents(aParent, aRestriction, &aCards.mEntries, aCards.mNbEntries, 0) ;
1353 + return GetContents(aParent, aRestriction, &aCards, 0) ;
1354 }
1356 BOOL nsAbWinHelper::GetNodes(const nsMapiEntry& aParent, nsMapiEntryArray& aNodes)
1357 {
1358 aNodes.CleanUp() ;
1359 - return GetContents(aParent, NULL, &aNodes.mEntries, aNodes.mNbEntries, MAPI_DISTLIST) ;
1360 + return GetContents(aParent, NULL, &aNodes, MAPI_DISTLIST) ;
1361 }
1363 BOOL nsAbWinHelper::GetCardsCount(const nsMapiEntry& aParent, ULONG& aNbCards)
1364 {
1365 - aNbCards = 0 ;
1366 - return GetContents(aParent, NULL, NULL, aNbCards, 0) ;
1367 + nsMapiEntryArray aCards;
1368 + BOOL ret=GetContents(aParent, NULL, &aCards, 0) ;
1369 + aNbCards=aCards.GetSize();
1370 + return ret;
1371 }
1373 BOOL nsAbWinHelper::GetPropertyString(const nsMapiEntry& aObject,
1374 @@ -390,7 +339,7 @@
1375 aName = values->Value.lpszA ;
1376 }
1377 else if (PROP_TYPE(values->ulPropTag) == PT_UNICODE) {
1378 - aName.AssignWithConversion(values->Value.lpszW) ;
1379 + UnicodeToCStr(values->Value.lpszW,aName) ;
1380 }
1381 }
1382 FreeBuffer(values) ;
1383 @@ -410,7 +359,7 @@
1384 aName = values->Value.lpszW ;
1385 }
1386 else if (PROP_TYPE(values->ulPropTag) == PT_STRING8) {
1387 - aName.AssignWithConversion(values->Value.lpszA) ;
1388 + CStrToUnicode(values->Value.lpszA,aName) ;
1389 }
1390 }
1391 FreeBuffer(values) ;
1392 @@ -431,16 +380,22 @@
1393 ULONG i = 0 ;
1395 for (i = 0 ; i < valueCount ; ++ i) {
1396 - if (PROP_ID(values [i].ulPropTag) == PROP_ID(aPropertyTags [i])) {
1397 + if (PROP_TYPE( values [i].ulPropTag) != PT_ERROR && values [i].Value.l != MAPI_E_NOT_FOUND){
1398 if (PROP_TYPE(values [i].ulPropTag) == PT_STRING8) {
1399 nsAutoString temp ;
1401 - temp.AssignWithConversion (values [i].Value.lpszA) ;
1402 + CStrToUnicode(values [i].Value.lpszA,temp) ;
1403 aNames.AppendString(temp) ;
1404 }
1405 else if (PROP_TYPE(values [i].ulPropTag) == PT_UNICODE) {
1406 aNames.AppendString(nsAutoString (values [i].Value.lpszW)) ;
1407 }
1408 + else if (aPropertyTags [i] == PR_EMAIL_ADDRESS_A) {
1409 + nsAutoString temp ;
1410 +
1411 + CStrToUnicode (values [i].Value.lpszA,temp) ;
1412 + aNames.AppendString(temp) ;
1413 + }
1414 else {
1415 aNames.AppendString(nsAutoString((const PRUnichar *) "")) ;
1416 }
1417 @@ -466,7 +421,6 @@
1418 if (!GetMAPIProperties(aObject, &aPropertyTag, 1, values, valueCount)) { return FALSE ; }
1419 if (valueCount == 1 && values != NULL && PROP_TYPE(values->ulPropTag) == PT_SYSTIME) {
1420 SYSTEMTIME readableTime ;
1421 -
1422 if (FileTimeToSystemTime(&values->Value.ft, &readableTime)) {
1423 aYear = readableTime.wYear ;
1424 aMonth = readableTime.wMonth ;
1425 @@ -518,7 +472,7 @@
1426 nsMapiInterfaceWrapper<LPMAPIPROP> subObject ;
1427 ULONG objType = 0 ;
1429 - mLastError = mAddressBook->OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
1430 + mLastError = OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
1431 &IID_IMAPIContainer, 0, &objType,
1432 container) ;
1433 if (HR_FAILED(mLastError)) {
1434 @@ -537,7 +491,7 @@
1435 SBinary entry ;
1436 SBinaryArray entryArray ;
1438 - mLastError = mAddressBook->OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
1439 + mLastError = OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
1440 &IID_IABContainer, MAPI_MODIFY, &objType,
1441 container) ;
1442 if (HR_FAILED(mLastError)) {
1443 @@ -567,14 +521,15 @@
1444 value.Value.lpszW = NS_CONST_CAST(WORD *, aValue) ;
1445 }
1446 else if (PROP_TYPE(aPropertyTag) == PT_STRING8) {
1447 - alternativeValue.AssignWithConversion(aValue) ;
1448 + UnicodeToCStr(aValue,alternativeValue) ;
1449 value.Value.lpszA = NS_CONST_CAST(char *, alternativeValue.get()) ;
1450 }
1451 else {
1452 PRINTF(("Property %08x is not a string.\n", aPropertyTag)) ;
1453 return TRUE ;
1454 }
1455 - return SetMAPIProperties(aObject, 1, &value) ;
1456 + LPSPropValue values=&value;
1457 + return SetMAPIProperties(aObject, 1, values) ;
1458 }
1460 BOOL nsAbWinHelper::SetPropertiesUString(const nsMapiEntry& aObject, const ULONG *aPropertiesTag,
1461 @@ -595,7 +550,7 @@
1462 values [currentValue ++].Value.lpszW = NS_CONST_CAST(WORD *, aValues [i].get()) ;
1463 }
1464 else if (PROP_TYPE(aPropertiesTag [i]) == PT_STRING8) {
1465 - alternativeValue.AssignWithConversion(aValues [i].get()) ;
1466 + UnicodeToCStr(aValues [i].get(),alternativeValue) ;
1467 char *av = nsCRT::strdup(alternativeValue.get()) ;
1468 if (!av) {
1469 retCode = FALSE ;
1470 @@ -633,7 +588,8 @@
1471 readableTime.wSecond = 0 ;
1472 readableTime.wMilliseconds = 0 ;
1473 if (SystemTimeToFileTime(&readableTime, &value.Value.ft)) {
1474 - return SetMAPIProperties(aObject, 1, &value) ;
1475 + LPSPropValue values=&value;
1476 + return SetMAPIProperties(aObject, 1, values) ;
1477 }
1478 return TRUE ;
1479 }
1480 @@ -645,7 +601,7 @@
1481 nsMapiInterfaceWrapper<LPABCONT> container ;
1482 ULONG objType = 0 ;
1484 - mLastError = mAddressBook->OpenEntry(aParent.mByteCount, aParent.mEntryId,
1485 + mLastError = OpenEntry(aParent.mByteCount, aParent.mEntryId,
1486 &IID_IABContainer, MAPI_MODIFY, &objType,
1487 container) ;
1488 if (HR_FAILED(mLastError)) {
1489 @@ -708,7 +664,7 @@
1490 nsMapiInterfaceWrapper<LPABCONT> container ;
1491 ULONG objType = 0 ;
1493 - mLastError = mAddressBook->OpenEntry(aParent.mByteCount, aParent.mEntryId,
1494 + mLastError = OpenEntry(aParent.mByteCount, aParent.mEntryId,
1495 &IID_IABContainer, MAPI_MODIFY, &objType,
1496 container) ;
1497 if (HR_FAILED(mLastError)) {
1498 @@ -773,7 +729,7 @@
1499 nsMapiInterfaceWrapper<LPABCONT> container ;
1500 ULONG objType = 0 ;
1502 - mLastError = mAddressBook->OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
1503 + mLastError = OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
1504 &IID_IABContainer, MAPI_MODIFY, &objType,
1505 container) ;
1506 if (HR_FAILED(mLastError)) {
1507 @@ -810,194 +766,77 @@
1508 return TRUE ;
1509 }
1511 -BOOL nsAbWinHelper::GetDefaultContainer(nsMapiEntry& aContainer)
1512 -{
1513 - LPENTRYID entryId = NULL ;
1514 - ULONG byteCount = 0 ;
1515 -
1516 - mLastError = mAddressBook->GetPAB(&byteCount, &entryId) ;
1517 - if (HR_FAILED(mLastError)) {
1518 - PRINTF(("Cannot get PAB %08x.\n", mLastError)) ;
1519 - return FALSE ;
1520 - }
1521 - aContainer.Assign(byteCount, entryId) ;
1522 - FreeBuffer(entryId) ;
1523 - return TRUE ;
1524 -}
1526 -enum
1527 -{
1528 - ContentsColumnEntryId = 0,
1529 - ContentsColumnObjectType,
1530 - ContentsColumnsSize
1531 -} ;
1533 -static const SizedSPropTagArray(ContentsColumnsSize, ContentsColumns) =
1534 -{
1535 - ContentsColumnsSize,
1536 - {
1537 - PR_ENTRYID,
1538 - PR_OBJECT_TYPE
1539 - }
1540 -} ;
1542 -BOOL nsAbWinHelper::GetContents(const nsMapiEntry& aParent, LPSRestriction aRestriction,
1543 - nsMapiEntry **aList, ULONG& aNbElements, ULONG aMapiType)
1544 +void nsAbWinHelper::MyFreeProws(LPSRowSet aRowset)
1545 {
1546 - if (aList != NULL) { *aList = NULL ; }
1547 - aNbElements = 0 ;
1548 - nsMapiInterfaceWrapper<LPMAPICONTAINER> parent ;
1549 - nsMapiInterfaceWrapper<LPMAPITABLE> contents ;
1550 - ULONG objType = 0 ;
1551 - ULONG rowCount = 0 ;
1552 + if (aRowset == NULL) { return ; }
1553 + ULONG i = 0 ;
1555 - mLastError = mAddressBook->OpenEntry(aParent.mByteCount, aParent.mEntryId,
1556 - &IID_IMAPIContainer, 0, &objType,
1557 - parent) ;
1558 - if (HR_FAILED(mLastError)) {
1559 - PRINTF(("Cannot open parent %08x.\n", mLastError)) ;
1560 - return FALSE ;
1561 - }
1562 - // Here, flags for WAB and MAPI could be different, so this works
1563 - // only as long as we don't want to use any flag in GetContentsTable
1564 - mLastError = parent->GetContentsTable(0, contents) ;
1565 - if (HR_FAILED(mLastError)) {
1566 - PRINTF(("Cannot get contents %08x.\n", mLastError)) ;
1567 - return FALSE ;
1568 + for (i = 0 ; i < aRowset->cRows ; ++ i) {
1569 + FreeBuffer(aRowset->aRow [i].lpProps) ;
1570 }
1571 - if (aRestriction != NULL) {
1572 - mLastError = contents->Restrict(aRestriction, 0) ;
1573 - if (HR_FAILED(mLastError)) {
1574 - PRINTF(("Cannot set restriction %08x.\n", mLastError)) ;
1575 - return FALSE ;
1576 - }
1577 - }
1578 - mLastError = contents->SetColumns((LPSPropTagArray) &ContentsColumns, 0) ;
1579 - if (HR_FAILED(mLastError)) {
1580 - PRINTF(("Cannot set columns %08x.\n", mLastError)) ;
1581 - return FALSE ;
1582 - }
1583 - mLastError = contents->GetRowCount(0, &rowCount) ;
1584 - if (HR_FAILED(mLastError)) {
1585 - PRINTF(("Cannot get result count %08x.\n", mLastError)) ;
1586 - return FALSE ;
1587 - }
1588 - if (aList != NULL) { *aList = new nsMapiEntry [rowCount] ; }
1589 - aNbElements = 0 ;
1590 - do {
1591 - LPSRowSet rowSet = NULL ;
1592 -
1593 - rowCount = 0 ;
1594 - mLastError = contents->QueryRows(1, 0, &rowSet) ;
1595 - if (HR_FAILED(mLastError)) {
1596 - PRINTF(("Cannot query rows %08x.\n", mLastError)) ;
1597 - return FALSE ;
1598 - }
1599 - rowCount = rowSet->cRows ;
1600 - if (rowCount > 0 &&
1601 - (aMapiType == 0 ||
1602 - rowSet->aRow->lpProps[ContentsColumnObjectType].Value.ul == aMapiType)) {
1603 - if (aList != NULL) {
1604 - nsMapiEntry& current = (*aList) [aNbElements] ;
1605 - SPropValue& currentValue = rowSet->aRow->lpProps[ContentsColumnEntryId] ;
1606 -
1607 - current.Assign(currentValue.Value.bin.cb,
1608 - NS_REINTERPRET_CAST(LPENTRYID, currentValue.Value.bin.lpb)) ;
1609 + FreeBuffer(aRowset) ;
1610 + }
1611 +void nsAbWinHelper::CStrToUnicode( const char *pStr, nsString& result)
1612 +{
1613 + result.Truncate( 0);
1614 + int wLen = MultiByteToWideChar( CP_ACP, 0, pStr, -1, m_pUniBuff, 0);
1615 + if (wLen >= m_uniBuffLen)
1616 + {
1617 + delete [] m_pUniBuff;
1618 + m_pUniBuff = new PRUnichar[wLen + 64];
1619 + m_uniBuffLen = wLen + 64;
1620 }
1621 - ++ aNbElements ;
1622 + if (wLen)
1623 + {
1624 + MultiByteToWideChar( CP_ACP, 0, pStr, -1, m_pUniBuff, m_uniBuffLen);
1625 + result = m_pUniBuff;
1626 }
1627 - MyFreeProws(rowSet) ;
1628 - } while (rowCount > 0) ;
1629 - return TRUE ;
1630 }
1631 -
1632 -BOOL nsAbWinHelper::GetMAPIProperties(const nsMapiEntry& aObject, const ULONG *aPropertyTags,
1633 - ULONG aNbProperties, LPSPropValue& aValue,
1634 - ULONG& aValueCount)
1635 +void nsAbWinHelper::UnicodeToCStr( const PRUnichar *pUStr,nsCString& result)
1636 {
1637 - nsMapiInterfaceWrapper<LPMAPIPROP> object ;
1638 - ULONG objType = 0 ;
1639 - LPSPropTagArray properties = NULL ;
1640 - ULONG i = 0 ;
1641 -
1642 - mLastError = mAddressBook->OpenEntry(aObject.mByteCount, aObject.mEntryId,
1643 - &IID_IMAPIProp, 0, &objType,
1644 - object) ;
1645 - if (HR_FAILED(mLastError)) {
1646 - PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
1647 - return FALSE ;
1648 + result.Truncate( 0);
1649 + int cLen = WideCharToMultiByte( CP_ACP, 0, pUStr, -1, m_pCStrBuff, 0,NULL,NULL);
1650 + if (cLen >= m_cstrBuffLen) {
1651 + if (m_pCStrBuff)
1652 + delete [] m_pCStrBuff;
1653 + m_pCStrBuff = new char[cLen + 64];
1654 + m_cstrBuffLen = cLen + 64;
1655 }
1656 - AllocateBuffer(CbNewSPropTagArray(aNbProperties),
1657 - NS_REINTERPRET_CAST(void **, &properties)) ;
1658 - properties->cValues = aNbProperties ;
1659 - for (i = 0 ; i < aNbProperties ; ++ i) {
1660 - properties->aulPropTag [i] = aPropertyTags [i] ;
1661 - }
1662 - mLastError = object->GetProps(properties, 0, &aValueCount, &aValue) ;
1663 - FreeBuffer(properties) ;
1664 - if (HR_FAILED(mLastError)) {
1665 - PRINTF(("Cannot get props %08x.\n", mLastError)) ;
1666 + if (cLen) {
1667 + WideCharToMultiByte( CP_ACP, 0, pUStr, -1, m_pCStrBuff, m_cstrBuffLen,NULL,NULL);
1668 + result = m_pCStrBuff;
1669 }
1670 - return HR_SUCCEEDED(mLastError) ;
1671 }
1673 -BOOL nsAbWinHelper::SetMAPIProperties(const nsMapiEntry& aObject, ULONG aNbProperties,
1674 - const LPSPropValue& aValues)
1675 -{
1676 - nsMapiInterfaceWrapper<LPMAPIPROP> object ;
1677 - ULONG objType = 0 ;
1678 - LPSPropProblemArray problems = NULL ;
1679 +static nsAbWinHelper *getOutlookAddressBook(void) {
1680 + static nsMapiAddressBook *addressBook = NULL ;
1682 - mLastError = mAddressBook->OpenEntry(aObject.mByteCount, aObject.mEntryId,
1683 - &IID_IMAPIProp, MAPI_MODIFY, &objType,
1684 - object) ;
1685 - if (HR_FAILED(mLastError)) {
1686 - PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
1687 - return FALSE ;
1688 - }
1689 - mLastError = object->SetProps(aNbProperties, aValues, &problems) ;
1690 - if (HR_FAILED(mLastError)) {
1691 - PRINTF(("Cannot update the object %08x.\n", mLastError)) ;
1692 - return FALSE ;
1693 - }
1694 - if (problems != NULL) {
1695 - for (ULONG i = 0 ; i < problems->cProblem ; ++ i) {
1696 - PRINTF(("Problem %d: index %d code %08x.\n", i,
1697 - problems->aProblem [i].ulIndex,
1698 - problems->aProblem [i].scode)) ;
1699 - }
1700 - }
1701 - mLastError = object->SaveChanges(0) ;
1702 - if (HR_FAILED(mLastError)) {
1703 - PRINTF(("Cannot commit changes %08x.\n", mLastError)) ;
1704 - }
1705 - return HR_SUCCEEDED(mLastError) ;
1706 + if (addressBook == NULL) { addressBook = new nsMapiAddressBook ; }
1707 + return addressBook ;
1708 }
1710 -void nsAbWinHelper::MyFreeProws(LPSRowSet aRowset)
1711 -{
1712 - if (aRowset == NULL) { return ; }
1713 - ULONG i = 0 ;
1714 +static nsAbWinHelper *getOutlookExpAddressBook(void) {
1715 + static nsWabAddressBook *addressBook = NULL ;
1717 - for (i = 0 ; i < aRowset->cRows ; ++ i) {
1718 - FreeBuffer(aRowset->aRow [i].lpProps) ;
1719 - }
1720 - FreeBuffer(aRowset) ;
1721 + if (addressBook == NULL) { addressBook = new nsWabAddressBook ; }
1722 + return addressBook ;
1723 }
1725 nsAbWinHelperGuard::nsAbWinHelperGuard(PRUint32 aType)
1726 : mHelper(NULL)
1727 {
1728 switch(aType) {
1729 - case nsAbWinType_Outlook: mHelper = new nsMapiAddressBook ; break ;
1730 - case nsAbWinType_OutlookExp: mHelper = new nsWabAddressBook ; break ;
1731 + case nsAbWinType_Outlook: mHelper = getOutlookAddressBook() ; break ;
1732 + case nsAbWinType_OutlookExp: mHelper = getOutlookExpAddressBook() ; break ;
1733 default: break ;
1734 }
1735 }
1737 nsAbWinHelperGuard::~nsAbWinHelperGuard(void)
1738 {
1739 - delete mHelper ;
1740 }
1742 const char *kOutlookDirectoryScheme = "moz-aboutlookdirectory://" ;
1743 Index: mailnews/addrbook/src/nsAbWinHelper.h
1744 ===================================================================
1745 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbWinHelper.h,v
1746 retrieving revision 1.2
1747 diff -u -r1.2 nsAbWinHelper.h
1748 --- misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.h 28 Sep 2001 20:06:23 -0000 1.2
1749 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.h 17 May 2004 03:23:53 -0000
1750 @@ -45,6 +45,24 @@
1751 #include "nsVoidArray.h"
1752 #include "nsXPIDLString.h"
1754 +#define PR_SECOND_EMAIL_ADDRESS_A 0x8033001E
1755 +#define PR_SCREEN_NAME_A 0x805B001E
1756 +
1757 +
1758 +// Small utility to ensure release of all MAPI interfaces
1759 +template <class tInterface> struct nsMapiInterfaceWrapper
1760 +{
1761 + tInterface mInterface ;
1762 +
1763 + nsMapiInterfaceWrapper(void) : mInterface(NULL) {}
1764 + ~nsMapiInterfaceWrapper(void) {
1765 + if (mInterface ) { mInterface->Release() ; }
1766 + }
1767 + operator LPUNKNOWN *(void) { return NS_REINTERPRET_CAST(LPUNKNOWN *, &mInterface) ; }
1768 + tInterface operator -> (void) const { return mInterface ; }
1769 + operator tInterface *(void) { return &mInterface ; }
1770 +} ;
1771 +
1772 struct nsMapiEntry
1773 {
1774 ULONG mByteCount ;
1775 @@ -62,14 +80,28 @@
1777 struct nsMapiEntryArray
1778 {
1779 - nsMapiEntry *mEntries ;
1780 - ULONG mNbEntries ;
1782 nsMapiEntryArray(void) ;
1783 ~nsMapiEntryArray(void) ;
1785 - const nsMapiEntry& operator [] (int aIndex) const { return mEntries [aIndex] ; }
1786 + void AddItem(nsMapiEntry * aEntries);
1787 + void AddItem( ULONG mByteCount , LPENTRYID mEntryId )
1788 + {
1789 + nsMapiEntry * aEntries=new nsMapiEntry();
1790 + aEntries->Assign(mByteCount,mEntryId);
1791 + AddItem(aEntries);
1792 + }
1793 +
1794 + ULONG GetSize( void) { return( m_array.Count());}
1795 + nsMapiEntry& operator [] (int aIndex) { return *(nsMapiEntry*)m_array.ElementAt(aIndex); }
1796 + nsMapiEntry* ElementAt(int aIndex) { return (nsMapiEntry*)m_array.ElementAt(aIndex); }
1797 void CleanUp(void) ;
1798 + void Remove(nsMapiEntry * aEntries){ m_array.RemoveElement(aEntries); }
1799 + void Remove(int index){ m_array.RemoveElementAt(index); }
1800 + ULONG IndexOf(nsMapiEntry * aEntries){return m_array.IndexOf(aEntries);};
1801 +private:
1802 + nsVoidArray m_array;
1803 +
1804 } ;
1806 class nsAbWinHelper
1807 @@ -79,7 +111,7 @@
1808 virtual ~nsAbWinHelper(void) ;
1810 // Get the top address books
1811 - BOOL GetFolders(nsMapiEntryArray& aFolders) ;
1812 + virtual BOOL GetFolders(nsMapiEntryArray& aFolders) =0;
1813 // Get a list of entries for cards/mailing lists in a folder/mailing list
1814 BOOL GetCards(const nsMapiEntry& aParent, LPSRestriction aRestriction,
1815 nsMapiEntryArray& aCards) ;
1816 @@ -97,18 +129,14 @@
1817 BOOL GetPropertiesUString(const nsMapiEntry& aObject, const ULONG *aPropertiesTag,
1818 ULONG aNbProperties, nsStringArray& aValues) ;
1819 // Get the value of a MAPI property of type SYSTIME
1820 - BOOL GetPropertyDate(const nsMapiEntry& aObject, ULONG aPropertyTag,
1821 + virtual BOOL GetPropertyDate(const nsMapiEntry& aObject, ULONG aPropertyTag,
1822 WORD& aYear, WORD& aMonth, WORD& aDay) ;
1823 - // Get the value of a MAPI property of type LONG
1824 - BOOL GetPropertyLong(const nsMapiEntry& aObject, ULONG aPropertyTag, ULONG& aValue) ;
1825 // Get the value of a MAPI property of type BIN
1826 BOOL GetPropertyBin(const nsMapiEntry& aObject, ULONG aPropertyTag, nsMapiEntry& aValue) ;
1827 // Tests if a container contains an entry
1828 BOOL TestOpenEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aEntry) ;
1829 - // Delete an entry in the address book
1830 - BOOL DeleteEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aEntry) ;
1831 // Set the value of a MAPI property of type string in unicode
1832 - BOOL SetPropertyUString (const nsMapiEntry& aObject, ULONG aPropertyTag,
1833 + virtual BOOL SetPropertyUString (const nsMapiEntry& aObject, ULONG aPropertyTag,
1834 const PRUnichar *aValue) ;
1835 // Same as previous, but with a bunch of properties in one call
1836 BOOL SetPropertiesUString(const nsMapiEntry& aObject, const ULONG *aPropertiesTag,
1837 @@ -117,32 +145,44 @@
1838 BOOL SetPropertyDate(const nsMapiEntry& aObject, ULONG aPropertyTag,
1839 WORD aYear, WORD aMonth, WORD aDay) ;
1840 // Create entry in the address book
1841 - BOOL CreateEntry(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry) ;
1842 + virtual BOOL CreateEntry(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry) ;
1843 + // Delete an entry in the address book
1844 + virtual BOOL DeleteEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aEntry) ;
1845 // Create a distribution list in the address book
1846 - BOOL CreateDistList(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry) ;
1847 + virtual BOOL CreateDistList(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry) ;
1848 // Copy an existing entry in the address book
1849 - BOOL CopyEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aSource, nsMapiEntry& aTarget) ;
1850 + virtual BOOL CopyEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aSource, nsMapiEntry& aTarget) ;
1851 // Get a default address book container
1852 - BOOL GetDefaultContainer(nsMapiEntry& aContainer) ;
1853 + virtual BOOL GetDefaultContainer(nsMapiEntry& aContainer) =0;
1854 // Is the helper correctly initialised?
1855 - BOOL IsOK(void) const { return mAddressBook != NULL ; }
1856 + virtual BOOL IsOK(void) =0;/*const { return mAddressBook != NULL ; }*/
1857 +
1858 + // Get the value of a MAPI property of type LONG
1859 + virtual BOOL GetPropertyLong(const nsMapiEntry& aObject, ULONG aPropertyTag, ULONG& aValue) ;
1861 protected:
1862 HRESULT mLastError ;
1863 - LPADRBOOK mAddressBook ;
1864 static ULONG mEntryCounter ;
1865 static PRLock *mMutex ;
1867 + virtual HRESULT OpenEntry(ULONG cbEntryID,
1868 + LPENTRYID lpEntryID,
1869 + LPCIID lpInterface,
1870 + ULONG ulFlags,
1871 + ULONG FAR * lpulObjType,
1872 + LPUNKNOWN FAR * lppUnk
1873 + ) = 0;
1874 +
1875 // Retrieve the contents of a container, with an optional restriction
1876 - BOOL GetContents(const nsMapiEntry& aParent, LPSRestriction aRestriction,
1877 - nsMapiEntry **aList, ULONG &aNbElements, ULONG aMapiType) ;
1878 + virtual BOOL GetContents(const nsMapiEntry& aParent, LPSRestriction aRestriction,
1879 + nsMapiEntryArray *aList, ULONG aMapiType) =0;
1880 // Retrieve the values of a set of properties on a MAPI object
1881 - BOOL GetMAPIProperties(const nsMapiEntry& aObject, const ULONG *aPropertyTags,
1882 + virtual BOOL GetMAPIProperties(const nsMapiEntry& aObject, const ULONG *aPropertyTags,
1883 ULONG aNbProperties,
1884 - LPSPropValue& aValues, ULONG& aValueCount) ;
1885 + LPSPropValue& aValues, ULONG& aValueCount) =0;
1886 // Set the values of a set of properties on a MAPI object
1887 - BOOL SetMAPIProperties(const nsMapiEntry& aObject, ULONG aNbProperties,
1888 - const LPSPropValue& aValues) ;
1889 + virtual BOOL SetMAPIProperties(const nsMapiEntry& aObject, ULONG aNbProperties,
1890 + LPSPropValue& aValues) =0;
1891 // Clean-up a rowset returned by QueryRows
1892 void MyFreeProws(LPSRowSet aSet) ;
1893 // Allocation of a buffer for transmission to interfaces
1894 @@ -150,7 +190,16 @@
1895 // Destruction of a buffer provided by the interfaces
1896 virtual void FreeBuffer(LPVOID aBuffer) = 0 ;
1898 + static void CStrToUnicode( const char *pStr, nsString& result);
1899 + static void UnicodeToCStr( const PRUnichar *pStr, nsCString& result);
1900 +
1901 private:
1902 + static int m_clients;
1903 + static PRUnichar * m_pUniBuff;
1904 + static int m_uniBuffLen;
1905 + static char * m_pCStrBuff;
1906 + static int m_cstrBuffLen;
1907 +
1908 } ;
1910 enum nsAbWinType
1911 @@ -168,6 +217,7 @@
1913 nsAbWinHelper *operator ->(void) { return mHelper ; }
1915 + static void FreeWinAbLibrarys();
1916 private:
1917 nsAbWinHelper *mHelper ;
1918 } ;
1919 Index: mailnews/addrbook/src/nsAddrDatabase.cpp
1920 ===================================================================
1921 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp,v
1922 retrieving revision 1.118
1923 diff -u -r1.118 nsAddrDatabase.cpp
1924 --- misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp 24 Dec 2003 17:18:08 -0000 1.118
1925 +++ misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp 17 May 2004 03:23:55 -0000
1926 @@ -97,6 +97,9 @@
1928 static const char kMailListAddressFormat[] = "Address%d";
1930 +extern int getMD5sum(const char * fileName,char * sum);
1931 +extern int testMD5sum(const char * fileName,char * sum);
1932 +
1933 static NS_DEFINE_CID(kCMorkFactory, NS_MORK_CID);
1935 nsAddrDatabase::nsAddrDatabase()
1936 @@ -166,6 +169,7 @@
1937 m_LastRecordKey(0),
1938 m_dbDirectory(nsnull)
1939 {
1940 + memset(m_dbMd5Sum,0,33);
1941 }
1943 nsAddrDatabase::~nsAddrDatabase()
1944 @@ -720,7 +724,11 @@
1945 NS_RELEASE(oldFile); // always release our file ref, store has own
1946 }
1947 }
1948 -
1949 +
1950 + ret = getMD5sum(nativeFileName,m_dbMd5Sum);
1951 + if (ret == 1)
1952 + ret = NS_ERROR_FAILURE;
1953 +
1954 nsCRT::free(nativeFileName);
1956 if (NS_SUCCEEDED(ret) && thumb)
1957 @@ -817,6 +825,17 @@
1958 nsresult err = NS_OK;
1959 nsIMdbThumb *commitThumb = nsnull;
1961 + const char *pFilename = m_dbName.GetCString(); /* do not free */
1962 + char *nativeFileName = nsCRT::strdup(pFilename);
1963 +#if defined(XP_PC) || defined(XP_MAC)
1964 + UnixToNative(nativeFileName);
1965 +#endif
1966 + if (testMD5sum(nativeFileName,m_dbMd5Sum))
1967 + {
1968 + nsCRT::free(nativeFileName);
1969 + return NS_ERROR_FILE_ACCESS_DENIED;
1970 + }
1971 +
1972 if (commitType == nsAddrDBCommitType::kLargeCommit || commitType == nsAddrDBCommitType::kSessionCommit)
1973 {
1974 mdb_percent outActualWaste = 0;
1975 @@ -867,6 +886,10 @@
1976 // ### do something with error, but clear it now because mork errors out on commits.
1977 if (GetEnv())
1978 GetEnv()->ClearErrors();
1979 + if (NS_SUCCEEDED(err) && getMD5sum(nativeFileName,m_dbMd5Sum))
1980 + err = NS_ERROR_FAILURE;
1981 + nsCRT::free(nativeFileName);
1982 +
1983 return err;
1984 }
1986 Index: mailnews/addrbook/src/nsAddrDatabase.h
1987 ===================================================================
1988 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAddrDatabase.h,v
1989 retrieving revision 1.46
1990 diff -u -r1.46 nsAddrDatabase.h
1991 --- misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.h 28 Jan 2004 17:22:13 -0000 1.46
1992 +++ misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.h 17 May 2004 03:23:55 -0000
1993 @@ -396,6 +396,7 @@
1994 nsIMdbTable *m_mdbPabTable;
1995 nsIMdbTable *m_mdbDeletedCardsTable;
1996 nsFileSpec m_dbName;
1997 + char m_dbMd5Sum[33];
1998 PRBool m_mdbTokensInitialized;
1999 nsVoidArray /*<nsIAddrDBListener>*/ *m_ChangeListeners;
2001 Index: mailnews/addrbook/src/nsMapiAddressBook.cpp
2002 ===================================================================
2003 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp,v
2004 retrieving revision 1.7
2005 diff -u -r1.7 nsMapiAddressBook.cpp
2006 --- misc/build/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp 30 Oct 2001 07:59:16 -0000 1.7
2007 +++ misc/build/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp 17 May 2004 03:23:55 -0000
2008 @@ -41,6 +41,22 @@
2010 #include "prlog.h"
2012 +static char * stristr(const char *big, const char *little)
2013 +{
2014 + PRUint32 len;
2015 +
2016 + if (!big || !little || !*big || !*little)
2017 + return 0;
2018 + len = strlen(little);
2019 +
2020 + for( ; *big; big++ )
2021 + if(!_strnicmp (big, little, 1) && ! _strnicmp (big, little, len) )
2022 + return (char *)big;
2023 +
2024 + return (char *)0;
2025 +
2026 +}
2027 +
2028 #ifdef PR_LOGGING
2029 static PRLogModuleInfo* gMapiAddressBookLog
2030 = PR_NewLogModule("nsMapiAddressBookLog");
2031 @@ -48,6 +64,60 @@
2033 #define PRINTF(args) PR_LOG(gMapiAddressBookLog, PR_LOG_DEBUG, args)
2035 +#define OUTLOOK_EMAIL_DIAPLAY_MAPI_ID 0x00008005 //use to get and set display
2036 +#define OUTLOOK_EMAIL1_MAPI_ID 0x00008084 //use to get and set primary email address
2037 +#define OUTLOOK_EMAIL2_MAPI_ID 0x00008094 //use to get and set second email address
2038 +#define OUTLOOK_EMAIL_SCREEN_NAME 0x8061001E //use to get and set screen name
2039 +#define OUTLOOK_EMAIL_ORGID 0x00008085 //use to get orginal entryid to add to distlist
2040 +#define OUTLOOK_EMAIL_LIST1 0x00008054 //use to get distlist table
2041 +#define OUTLOOK_EMAIL_LIST2 0x00008055 //use to set distlist table
2042 +
2043 +static const TagMap TagMaps[]={
2044 + {PR_DISPLAY_NAME_A, OUTLOOK_EMAIL_DIAPLAY_MAPI_ID, PT_STRING8},
2045 + {PR_EMAIL_ADDRESS_A, OUTLOOK_EMAIL1_MAPI_ID, PT_STRING8},
2046 + {PR_SECOND_EMAIL_ADDRESS_A, OUTLOOK_EMAIL2_MAPI_ID, PT_STRING8},
2047 + {PR_SCREEN_NAME_A, OUTLOOK_EMAIL_SCREEN_NAME, PT_STRING8}};
2048 +
2049 +enum {
2050 + ieidPR_ENTRYID = 0,
2051 + ieidPR_OBJECT_TYPE,
2052 + ieidPR_DISPLAY_NAME,
2053 + ieidPR_MESSAGE_CLASS,
2054 + ieidPR_STORE_ENTRYID,
2055 + ieidPR_MESSAGE_RECIPIENTS,
2056 + ieidMax
2057 +};
2058 +
2059 +static const SizedSPropTagArray(ieidMax, ptaEid)=
2060 +{
2061 + ieidMax,
2062 + {
2063 + PR_ENTRYID,
2064 + PR_OBJECT_TYPE,
2065 + PR_DISPLAY_NAME,
2066 + PR_MESSAGE_CLASS,
2067 + PR_STORE_ENTRYID,
2068 + PR_MESSAGE_RECIPIENTS
2069 + }
2070 +};
2071 +
2072 +enum
2073 +{
2074 + ContentsColumnEntryId = 0,
2075 + ContentsColumnObjectType,
2076 + ContentsColumnMessageClass,
2077 + ContentsColumnsSize
2078 +} ;
2079 +
2080 +static const SizedSPropTagArray(ContentsColumnsSize, ContentsColumns) =
2081 +{
2082 + ContentsColumnsSize,
2083 + {
2084 + PR_ENTRYID,
2085 + PR_OBJECT_TYPE,
2086 + PR_MESSAGE_CLASS
2087 + }
2088 +} ;
2090 HMODULE nsMapiAddressBook::mLibrary = NULL ;
2091 PRInt32 nsMapiAddressBook::mLibUsage = 0 ;
2092 @@ -60,7 +130,7 @@
2093 BOOL nsMapiAddressBook::mInitialized = FALSE ;
2094 BOOL nsMapiAddressBook::mLogonDone = FALSE ;
2095 LPMAPISESSION nsMapiAddressBook::mRootSession = NULL ;
2096 -LPADRBOOK nsMapiAddressBook::mRootBook = NULL ;
2097 +#define MAPI_NO_COINIT 8
2099 BOOL nsMapiAddressBook::LoadMapiLibrary(void)
2100 {
2101 @@ -92,7 +162,7 @@
2102 mMAPILogonEx = NS_REINTERPRET_CAST(LPMAPILOGONEX,
2103 GetProcAddress(mLibrary, "MAPILogonEx")) ;
2104 if (!mMAPILogonEx) { return FALSE ; }
2105 - MAPIINIT_0 mapiInit = { MAPI_INIT_VERSION, MAPI_MULTITHREAD_NOTIFICATIONS } ;
2106 + MAPIINIT_0 mapiInit = { MAPI_INIT_VERSION, MAPI_MULTITHREAD_NOTIFICATIONS | MAPI_NO_COINIT } ;
2107 HRESULT retCode = mMAPIInitialize(&mapiInit) ;
2109 if (HR_FAILED(retCode)) {
2110 @@ -106,22 +176,19 @@
2111 MAPI_NEW_SESSION,
2112 &mRootSession) ;
2113 if (HR_FAILED(retCode)) {
2114 - PRINTF(("Cannot logon to MAPI %08x.\n", retCode)) ; return FALSE ;
2115 + PRINTF(("Cannot logon to MAPI %08x.\n", retCode)) ;
2116 + return FALSE ;
2117 }
2118 mLogonDone = TRUE ;
2119 - retCode = mRootSession->OpenAddressBook(0, NULL, 0, &mRootBook) ;
2120 - if (HR_FAILED(retCode)) {
2121 - PRINTF(("Cannot open MAPI address book %08x.\n", retCode)) ;
2122 - }
2123 +
2124 return HR_SUCCEEDED(retCode) ;
2125 }
2127 void nsMapiAddressBook::FreeMapiLibrary(void)
2128 {
2129 if (mLibrary) {
2130 - if (-- mLibUsage == 0) {
2131 + if (--mLibUsage < 0) {
2132 {
2133 - if (mRootBook) { mRootBook->Release() ; }
2134 if (mRootSession) {
2135 if (mLogonDone) {
2136 mRootSession->Logoff(NULL, 0, 0) ;
2137 @@ -135,6 +202,7 @@
2138 }
2139 }
2140 FreeLibrary(mLibrary) ;
2141 + mRootSession = NULL;
2142 mLibrary = NULL ;
2143 }
2144 }
2145 @@ -146,7 +214,6 @@
2146 : nsAbWinHelper()
2147 {
2148 BOOL result = Initialize() ;
2149 -
2150 NS_ASSERTION(result == TRUE, "Couldn't initialize Mapi Helper") ;
2151 MOZ_COUNT_CTOR(nsMapiAddressBook) ;
2152 }
2153 @@ -154,22 +221,882 @@
2154 nsMapiAddressBook::~nsMapiAddressBook(void)
2155 {
2156 nsAutoLock guard(mMutex) ;
2157 -
2158 + CleanUpMDB();
2159 FreeMapiLibrary() ;
2160 MOZ_COUNT_DTOR(nsMapiAddressBook) ;
2161 }
2163 +LPSPropValue nsMapiAddressBook::GetMapiProperty( LPMAPIPROP pProp, ULONG tag)
2164 +{
2165 + if (!pProp)
2166 + return( NULL);
2167 +
2168 + int sz = CbNewSPropTagArray( 1);
2169 + SPropTagArray *pTag = (SPropTagArray *) new char[sz];
2170 + pTag->cValues = 1;
2171 + pTag->aulPropTag[0] = tag;
2172 + LPSPropValue lpProp = NULL;
2173 + ULONG cValues = 0;
2174 + HRESULT hr = pProp->GetProps( pTag, 0, &cValues, &lpProp);
2175 + delete pTag;
2176 + if (HR_FAILED( hr) || (cValues != 1)) {
2177 + if (lpProp)
2178 + mMAPIFreeBuffer( lpProp);
2179 + return( NULL);
2180 + }
2181 + else {
2182 + if (PROP_TYPE( lpProp->ulPropTag) == PT_ERROR) {
2183 + if (lpProp->Value.l == MAPI_E_NOT_FOUND) {
2184 + mMAPIFreeBuffer( lpProp);
2185 + lpProp = NULL;
2186 + }
2187 + }
2188 + }
2189 +
2190 + return( lpProp);
2191 +}
2192 +BOOL nsMapiAddressBook::GetEntryIdFromProp( LPSPropValue pVal, ULONG& cbEntryId, LPENTRYID& lpEntryId, BOOL delVal)
2193 +{
2194 + if (!pVal)
2195 + return( FALSE);
2196 +
2197 + BOOL bResult = TRUE;
2198 + switch (PROP_TYPE(pVal->ulPropTag))
2199 + {
2200 + case PT_BINARY:
2201 + cbEntryId = pVal->Value.bin.cb;
2202 + mMAPIAllocateBuffer( cbEntryId, (LPVOID *) &lpEntryId);
2203 + memcpy( lpEntryId, pVal->Value.bin.lpb, cbEntryId);
2204 + break;
2205 +
2206 + default:
2207 + PRINTF(( "EntryId not in BINARY prop value\n"));
2208 + bResult = FALSE;
2209 + break;
2210 + }
2211 +
2212 + if (pVal && delVal)
2213 + mMAPIFreeBuffer( pVal);
2214 +
2215 + return( bResult);
2216 +}
2217 +
2218 +BOOL nsMapiAddressBook::HandleContentsItem(ULONG oType, ULONG cb, LPENTRYID pEntry,nsMapiEntryArray& aFolders)
2219 +{
2220 + LPMDB lpMsgStore;
2221 + ULONG objType=0;
2222 + HRESULT hr;
2223 +
2224 + if (oType == MAPI_MESSAGE)
2225 + return FALSE;
2226 + if (oType == MAPI_STORE)
2227 + {
2228 + hr=mRootSession->OpenEntry(
2229 + cb,
2230 + pEntry,
2231 + &IID_IMsgStore,
2232 + MAPI_BEST_ACCESS,
2233 + &objType,
2234 + (IUnknown**)&lpMsgStore);
2235 + if (FAILED(hr))
2236 + return FALSE ;
2237 + //Add MDB to a list to make it can be released when class destroyed.
2238 + //We must leave it openned or else we can't open address store in it.
2239 + AddToMDBArray(lpMsgStore);
2240 +
2241 + LPSPropValue pVal;
2242 + pVal=GetMapiProperty(lpMsgStore,PR_IPM_SUBTREE_ENTRYID);
2243 +
2244 +
2245 + if (pVal) {
2246 + ULONG cbEntry;
2247 + LPENTRYID pEntry;
2248 + nsMapiInterfaceWrapper<LPMAPICONTAINER> lpSubTree;
2249 +
2250 + if (GetEntryIdFromProp( pVal, cbEntry, pEntry)) {
2251 + // Open up the folder!
2252 + BOOL bResult = TRUE;
2253 + bResult = lpMsgStore->OpenEntry(
2254 + cbEntry,
2255 + pEntry,
2256 + NULL,
2257 + MAPI_BEST_ACCESS,
2258 + &objType,
2259 + lpSubTree);
2260 + mMAPIFreeBuffer( pEntry);
2261 + if (!bResult && *(LPMAPICONTAINER*)&lpSubTree) {
2262 + // Iterate the subtree with the results going into the folder list
2263 + bResult = IterateHierarchy(*(LPMAPICONTAINER*)&lpSubTree,aFolders);
2264 + }
2265 + else {
2266 + PRINTF(( "GetStoreFolders: Error opening sub tree.\n"));
2267 + }
2268 + }
2269 + else {
2270 + PRINTF(( "GetStoreFolders: Error getting entryID from sub tree property val.\n"));
2271 + }
2272 + }
2273 + else {
2274 + PRINTF(( "GetStoreFolders: Error getting sub tree property.\n"));
2275 + }
2276 + }
2277 + else
2278 + {
2279 + PRINTF(("Type:%d\n",oType));
2280 + }
2281 +
2282 + return TRUE ;
2283 +}
2284 +
2285 +BOOL nsMapiAddressBook::IterateHierarchy(LPMAPICONTAINER pFolder,nsMapiEntryArray& aFolders, ULONG flags)
2286 +{
2287 + // flags can be CONVENIENT_DEPTH or 0
2288 + // CONVENIENT_DEPTH will return all depths I believe instead
2289 + // of just children
2290 + HRESULT hr;
2291 + nsMapiInterfaceWrapper<LPMAPITABLE> lpTable;
2292 + hr = pFolder->GetHierarchyTable( CONVENIENT_DEPTH , lpTable);
2293 + if (HR_FAILED(hr)) {
2294 + PRINTF(( "IterateHierarchy: GetContentsTable failed: 0x%lx, %d\n", (long)hr, (int)hr));
2295 + return( FALSE);
2296 +}
2297 +
2298 + ULONG rowCount;
2299 + hr = lpTable->GetRowCount( 0, &rowCount);
2300 + if (!rowCount) {
2301 + return( TRUE);
2302 + }
2303 +
2304 + hr = lpTable->SetColumns( (LPSPropTagArray)&ptaEid, 0);
2305 + if (HR_FAILED(hr)) {
2306 + PRINTF(( "IterateHierarchy: SetColumns failed: 0x%lx, %d\n", (long)hr, (int)hr));
2307 + return( FALSE);
2308 + }
2309 +
2310 + hr = lpTable->SeekRow( BOOKMARK_BEGINNING, 0, NULL);
2311 + if (HR_FAILED(hr)) {
2312 + PRINTF(( "IterateHierarchy: SeekRow failed: 0x%lx, %d\n", (long)hr, (int)hr));
2313 + return( FALSE);
2314 + }
2315 +
2316 + int cNumRows = 0;
2317 + LPSRowSet lpRow;
2318 + BOOL keepGoing = TRUE;
2319 + BOOL bResult = TRUE;
2320 + do {
2321 +
2322 + lpRow = NULL;
2323 + hr = lpTable->QueryRows( 1, 0, &lpRow);
2324 +
2325 + if (HR_FAILED(hr))
2326 +{
2327 + PRINTF(( "QueryRows failed: 0x%lx, %d\n", (long)hr, (int)hr));
2328 + bResult = FALSE;
2329 + break;
2330 + }
2331 +
2332 + if (lpRow){
2333 + cNumRows = lpRow->cRows;
2334 +
2335 + if (cNumRows) {
2336 + LPENTRYID lpEntry = (LPENTRYID) lpRow->aRow[0].lpProps[ieidPR_ENTRYID].Value.bin.lpb;
2337 + ULONG cb = lpRow->aRow[0].lpProps[ieidPR_ENTRYID].Value.bin.cb;
2338 + ULONG oType = lpRow->aRow[0].lpProps[ieidPR_OBJECT_TYPE].Value.ul;
2339 +
2340 + keepGoing = HandleHierarchyItem( oType, cb, lpEntry,aFolders);
2341 +
2342 + }
2343 + MyFreeProws(lpRow);
2344 + }
2345 +
2346 + } while ( SUCCEEDED(hr) && cNumRows && lpRow && keepGoing);
2347 +
2348 +
2349 + if (bResult && !keepGoing)
2350 + bResult = FALSE;
2351 +
2352 + return( bResult);
2353 +}
2354 +BOOL nsMapiAddressBook::HandleHierarchyItem( ULONG oType, ULONG cb, LPENTRYID pEntry,nsMapiEntryArray& aFolders)
2355 +{
2356 + ULONG objType=0;
2357 + if (oType == MAPI_FOLDER)
2358 + {
2359 + nsMapiInterfaceWrapper<LPMAPICONTAINER> pFolder ;
2360 + if (!mRootSession->OpenEntry(
2361 + cb,
2362 + pEntry,
2363 + 0,
2364 + MAPI_BEST_ACCESS,
2365 + &objType,
2366 + pFolder))
2367 + {
2368 + LPSPropValue pVal;
2369 +
2370 +
2371 + pVal = GetMapiProperty(*(LPMAPICONTAINER*)&pFolder, PR_CONTAINER_CLASS);
2372 + if (pVal)
2373 + {
2374 + if (strcmp("IPF.Contact",pVal->Value.lpszA) == 0)
2375 + {
2376 + SPropValue *currentValue=GetMapiProperty( *(LPMAPICONTAINER*)&pFolder, PR_ENTRYID);
2377 +
2378 + aFolders.AddItem(currentValue->Value.bin.cb,
2379 + NS_REINTERPRET_CAST(LPENTRYID, currentValue->Value.bin.lpb)) ;
2380 +
2381 + }
2382 + }
2383 + }
2384 + }
2385 + else
2386 + {
2387 + PRINTF(( "GetStoreFolders - HandleHierarchyItem: Unhandled ObjectType: %ld\n", oType));
2388 + }
2389 +
2390 + return( TRUE);
2391 +}
2392 +
2393 +
2394 +BOOL nsMapiAddressBook::GetFolders(nsMapiEntryArray& aFolders)
2395 +{
2396 + aFolders.CleanUp() ;
2397 + nsMapiInterfaceWrapper<LPMAPICONTAINER> rootFolder ;
2398 + nsMapiInterfaceWrapper<LPMAPITABLE> folders ;
2399 + ULONG objType = 0 ;
2400 + ULONG rowCount = 0 ;
2401 +
2402 + nsMapiInterfaceWrapper<LPMAPITABLE> lpTable;
2403 +
2404 + mLastError = mRootSession->GetMsgStoresTable( 0, lpTable);
2405 + if (HR_FAILED(mLastError)) {
2406 + PRINTF(("Cannot open MAPI MsgStores %08x.\n", mLastError));
2407 + return mLastError;
2408 + }
2409 +
2410 + mLastError = lpTable->GetRowCount( 0, &rowCount);
2411 +
2412 + mLastError = lpTable->SetColumns( (LPSPropTagArray)&ptaEid, 0);
2413 + if (FAILED(mLastError))
2414 + return( mLastError);
2415 + mLastError = lpTable->SeekRow( BOOKMARK_BEGINNING, 0, NULL);
2416 + if (FAILED(mLastError))
2417 + return mLastError;
2418 +
2419 + int cNumRows = 0;
2420 + LPSRowSet lpRow;
2421 + BOOL keepGoing = TRUE;
2422 + BOOL bResult = TRUE;
2423 + do {
2424 +
2425 + lpRow = NULL;
2426 + mLastError = lpTable->QueryRows( 1, 0, &lpRow);
2427 +
2428 + if (HR_FAILED(mLastError)){
2429 + bResult = FALSE;
2430 + break;
2431 + }
2432 +
2433 + if (lpRow){
2434 + cNumRows = lpRow->cRows;
2435 +
2436 + if (cNumRows) {
2437 + LPENTRYID lpEID = (LPENTRYID) lpRow->aRow[0].lpProps[ieidPR_ENTRYID].Value.bin.lpb;
2438 + ULONG cbEID = lpRow->aRow[0].lpProps[ieidPR_ENTRYID].Value.bin.cb;
2439 + ULONG oType = lpRow->aRow[0].lpProps[ieidPR_OBJECT_TYPE].Value.ul;
2440 +
2441 +
2442 + keepGoing = HandleContentsItem( oType, cbEID, lpEID,aFolders);
2443 + }
2444 + MyFreeProws( lpRow);
2445 + }
2446 +
2447 + } while ( SUCCEEDED(mLastError) && cNumRows && lpRow && keepGoing);
2448 +
2449 +
2450 + return HR_SUCCEEDED(mLastError) ;
2451 +}
2452 +BOOL nsMapiAddressBook::CorrectRestriction(const LPMAPIPROP aMapiProp,ULONG aRestrictionNum, LPSRestriction aRestriction)
2453 +{
2454 + ULONG conditionType = 0 ;
2455 + ULONG ulResIndex;
2456 + if (!aRestriction)
2457 + return FALSE;
2458 + for (ulResIndex=0;ulResIndex < aRestrictionNum;ulResIndex++)
2459 + {
2460 + conditionType = aRestriction[ulResIndex].rt;
2461 + switch (conditionType)
2462 + {
2463 + case RES_EXIST :
2464 + aRestriction[ulResIndex].res.resExist.ulPropTag =
2465 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resExist.ulPropTag);
2466 + break ;
2467 + case RES_BITMASK :
2468 + aRestriction[ulResIndex].res.resBitMask.ulPropTag =
2469 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resBitMask.ulPropTag);
2470 + break ;
2471 + case RES_CONTENT :
2472 + aRestriction[ulResIndex].res.resContent.ulPropTag =
2473 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resContent.ulPropTag);
2474 + aRestriction[ulResIndex].res.resContent.lpProp->ulPropTag =
2475 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resContent.lpProp->ulPropTag);
2476 + break ;
2477 + case RES_PROPERTY :
2478 + aRestriction[ulResIndex].res.resProperty.ulPropTag =
2479 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resProperty.ulPropTag);
2480 + aRestriction[ulResIndex].res.resProperty.lpProp->ulPropTag =
2481 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resProperty.lpProp->ulPropTag);
2482 + break ;
2483 + case RES_SIZE :
2484 + aRestriction[ulResIndex].res.resSize.ulPropTag =
2485 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resSize.ulPropTag);
2486 + break ;
2487 + case RES_COMPAREPROPS :
2488 + aRestriction[ulResIndex].res.resCompareProps.ulPropTag1 =
2489 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resCompareProps.ulPropTag1);
2490 + aRestriction[ulResIndex].res.resCompareProps.ulPropTag2 =
2491 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resCompareProps.ulPropTag2);
2492 + break ;
2493 + case RES_NOT :
2494 + CorrectRestriction(aMapiProp,1,aRestriction[ulResIndex].res.resNot.lpRes);
2495 + break;
2496 + case RES_AND :
2497 + CorrectRestriction(aMapiProp,
2498 + aRestriction[ulResIndex].res.resAnd.cRes,
2499 + aRestriction[ulResIndex].res.resAnd.lpRes);
2500 + break;
2501 + case RES_OR :
2502 + CorrectRestriction(aMapiProp,
2503 + aRestriction[ulResIndex].res.resOr.cRes,
2504 + aRestriction[ulResIndex].res.resOr.lpRes);
2505 + break;
2506 +
2507 + case RES_COMMENT :
2508 + CorrectRestriction(aMapiProp,1,aRestriction[ulResIndex].res.resComment.lpRes);
2509 + aRestriction[ulResIndex].res.resComment.lpProp->ulPropTag =
2510 + GetRealMapiPropertyTag(aMapiProp,aRestriction[ulResIndex].res.resComment.lpProp->ulPropTag);
2511 + break;
2512 + case RES_SUBRESTRICTION :
2513 + CorrectRestriction(aMapiProp,1,aRestriction[ulResIndex].res.resSub.lpRes);
2514 + break;
2515 + default:
2516 + return FALSE;
2517 + }
2518 + }
2519 + return TRUE;
2520 +}
2521 +BOOL nsMapiAddressBook::Filter( LPSRestriction aRestriction,nsMapiEntryArray * aList)
2522 +{
2523 + if (!aRestriction)
2524 + return FALSE;
2525 +
2526 + ULONG conditionType = 0 ;
2527 +
2528 + nsMapiEntryArray listOut;
2529 + ULONG listindex=0;
2530 +
2531 + nsMapiEntryArray listDel;
2532 + ULONG delindex=0;
2533 +
2534 + ULONG listsize;
2535 + ULONG resCount = 0;
2536 + ULONG resIndex = 0;
2537 +
2538 + listsize = aList->GetSize();
2539 + conditionType = aRestriction->rt;
2540 + switch (conditionType)
2541 + {
2542 + case RES_EXIST :
2543 + case RES_BITMASK :
2544 + case RES_CONTENT :
2545 + case RES_PROPERTY :
2546 + case RES_SIZE :
2547 + case RES_COMPAREPROPS :
2548 + case RES_COMMENT :
2549 + case RES_SUBRESTRICTION :
2550 + {
2551 + while(listindex < aList->GetSize())
2552 + {
2553 + if (!FilterOnOneRow(aList->ElementAt(listindex),aRestriction))
2554 + aList->Remove(listindex);
2555 + else
2556 + listindex++;
2557 + }
2558 + }
2559 + break;
2560 + case RES_NOT :
2561 + aRestriction->res.resNot.ulReserved = 1;
2562 + case RES_AND :
2563 + case RES_OR :
2564 + {
2565 + if (conditionType == RES_OR)
2566 + {
2567 + for(listindex=0;listindex<aList->GetSize();listindex++)
2568 + {
2569 + listDel.AddItem(aList->ElementAt(listindex));
2570 + }
2571 + }
2572 +
2573 + resCount = aRestriction->res.resAnd.cRes;
2574 + //notice that SAndRestriction ,SNotRestriction ,SOrRestriction
2575 + //use the same struct
2576 + for (resIndex = 0;resIndex < resCount;resIndex++)
2577 + {
2578 + //can't call listOut.CleanUp() here
2579 + //because it will destroy all Element too
2580 + while(listOut.GetSize())
2581 + {
2582 + listOut.Remove(0);
2583 + }
2584 +
2585 + for(listindex=0;listindex<aList->GetSize();listindex++)
2586 + {
2587 + listOut.AddItem(aList->ElementAt(listindex));
2588 + }
2589 +
2590 + Filter(&aRestriction->res.resAnd.lpRes[resIndex],&listOut);
2591 + if (conditionType == RES_NOT)
2592 + {
2593 + for(listindex=0;listindex<listOut.GetSize();listindex++)
2594 + {
2595 + aList->Remove(listOut.ElementAt(listindex));
2596 + }
2597 + }
2598 + else if (conditionType == RES_AND )
2599 + {
2600 + for(listindex=0;listindex<listOut.GetSize();listindex++)
2601 + {
2602 + if (!aList->IndexOf(listOut.ElementAt(listindex)))
2603 + {
2604 + aList->Remove(listOut.ElementAt(listindex));
2605 + }
2606 + }
2607 + }
2608 + else if (conditionType == RES_OR )
2609 + {
2610 + for(listindex=0;listindex<listOut.GetSize();listindex++)
2611 + {
2612 + listDel.Remove(listOut.ElementAt(listindex));
2613 + }
2614 + if (listDel.GetSize() == 0)
2615 + {
2616 + break;
2617 + }
2618 + }
2619 + }
2620 + if (conditionType == RES_OR)
2621 + {
2622 + for(listindex=0;listindex<listDel.GetSize();listindex++)
2623 + {
2624 + aList->Remove(listDel.ElementAt(listindex));
2625 + }
2626 + }
2627 + }
2628 +
2629 + }
2630 + while(listDel.GetSize())
2631 + {
2632 + listDel.Remove(0);
2633 + }
2634 + while(listOut.GetSize())
2635 + {
2636 + listOut.Remove(0);
2637 + }
2638 +
2639 +
2640 + return TRUE;
2641 +}
2642 +
2643 +BOOL nsMapiAddressBook::FilterOnOneRow(nsMapiEntry *aEntry,LPSRestriction aRestriction)
2644 +{
2645 + LPMAPIPROP object ;
2646 + ULONG objType = 0 ;
2647 + LPSPropValue realValue = NULL ;
2648 + LPSPropValue resValue = NULL ;
2649 + ULONG valueCount = 0 ;
2650 +
2651 + mLastError = OpenEntry(aEntry->mByteCount, aEntry->mEntryId,
2652 + &IID_IMAPIProp, MAPI_BEST_ACCESS, &objType,
2653 + (IUnknown **)&object) ;
2654 +
2655 + if (HR_FAILED(mLastError)) {
2656 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
2657 + return FALSE ;
2658 + }
2659 +
2660 + ULONG conditionType = 0 ;
2661 + conditionType = aRestriction->rt;
2662 +
2663 + switch (conditionType)
2664 + {
2665 + case RES_EXIST :
2666 + if (!GetMAPIProperties(*aEntry,&aRestriction->res.resExist.ulPropTag,1,realValue,valueCount))
2667 + return FALSE;
2668 + resValue = NULL;
2669 + break ;
2670 + case RES_CONTENT :
2671 + if (!GetMAPIProperties(*aEntry,&aRestriction->res.resContent.ulPropTag,1,realValue,valueCount))
2672 + return FALSE;
2673 + resValue = aRestriction->res.resContent.lpProp;
2674 + break ;
2675 + case RES_PROPERTY :
2676 + if (!GetMAPIProperties(*aEntry,&aRestriction->res.resProperty.ulPropTag,1,realValue,valueCount))
2677 + return FALSE;
2678 + resValue = aRestriction->res.resProperty.lpProp;
2679 + break ;
2680 + case RES_BITMASK :
2681 + return FALSE; //not support
2682 + break ;
2683 + case RES_SIZE :
2684 + return FALSE;//not been used now
2685 + break ;
2686 + case RES_COMPAREPROPS :
2687 + return FALSE;//not been used now
2688 + break ;
2689 + case RES_NOT :
2690 + return FALSE;//not need care here
2691 + break;
2692 + case RES_AND :
2693 + return FALSE;//not need care here
2694 + break;
2695 + case RES_OR :
2696 + return FALSE;//not need care here
2697 + break;
2698 + case RES_COMMENT :
2699 + return TRUE;//comment
2700 + break;
2701 + case RES_SUBRESTRICTION :
2702 + return FALSE;//not been used now
2703 + break ;
2704 +}
2705 + return AtomyFilter(aRestriction,realValue,resValue);
2706 +
2707 +}
2708 +
2709 +BOOL nsMapiAddressBook::AtomyFilter(LPSRestriction aRestriction,LPSPropValue aRealValue,LPSPropValue aFilterValue)
2710 +{
2711 + ULONG conditionType = 0 ;
2712 + conditionType = aRestriction->rt;
2713 +
2714 + BOOL bTagEq=(aRealValue &&
2715 + PROP_TYPE( aRealValue->ulPropTag ) != PT_ERROR) &&
2716 + aFilterValue;
2717 + // PROP_TYPE( aRealValue->ulPropTag ) == PROP_TYPE( aFilterValue->ulPropTag ));
2718 + switch (conditionType)
2719 + {
2720 + case RES_EXIST :
2721 + return (aRealValue && PROP_TYPE( aRealValue->ulPropTag ) != PT_ERROR) ;
2722 + break ;
2723 + case RES_CONTENT :
2724 + if (bTagEq)
2725 + {
2726 + switch(aRestriction->res.resContent.ulFuzzyLevel)
2727 + {
2728 + case FL_FULLSTRING :
2729 + return !stricmp(aRealValue->Value.lpszA,aFilterValue->Value.lpszA);
2730 + break;
2731 + case FL_PREFIX :
2732 + return stristr(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) == aRealValue->Value.lpszA;
2733 + break;
2734 + case FL_SUBSTRING :
2735 + default:
2736 + return stristr(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) != NULL;
2737 + break;
2738 + }
2739 + }
2740 + return FALSE;
2741 + break ;
2742 + case RES_PROPERTY :
2743 + if (bTagEq)
2744 + {
2745 + switch(aRestriction->res.resProperty.relop)
2746 + {
2747 + case RELOP_GE :
2748 + return stricmp(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) >= 0;
2749 + break;
2750 + case RELOP_GT :
2751 + return stricmp(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) > 0;
2752 + break;
2753 + case RELOP_LE :
2754 + return stricmp(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) <= 0;
2755 + break;
2756 + case RELOP_LT :
2757 + return stricmp(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) < 0;
2758 + break;
2759 + case RELOP_EQ :
2760 + return stricmp(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) == 0;
2761 + break;
2762 + case RELOP_NE :
2763 + return stricmp(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) != 0;
2764 + break;
2765 + case RELOP_RE :
2766 + default:
2767 + return stristr(aRealValue->Value.lpszA,aFilterValue->Value.lpszA) != NULL;
2768 + break;
2769 +
2770 + }
2771 + }
2772 + return FALSE;
2773 + break ;
2774 + case RES_BITMASK :
2775 + return FALSE; //not support
2776 + break ;
2777 + case RES_SIZE :
2778 + return FALSE;//not been used now
2779 + break ;
2780 + case RES_COMPAREPROPS :
2781 + return FALSE;//not been used now
2782 + break ;
2783 + case RES_NOT :
2784 + return FALSE;//not need care here
2785 + break;
2786 + case RES_AND :
2787 + return FALSE;//not need care here
2788 + break;
2789 + case RES_OR :
2790 + return FALSE;//not need care here
2791 + break;
2792 + case RES_COMMENT :
2793 + return TRUE;//comment
2794 + break;
2795 + case RES_SUBRESTRICTION :
2796 + return FALSE;//not been used now
2797 + break ;
2798 + }
2799 + return TRUE;
2800 +}
2801 +
2802 +BOOL nsMapiAddressBook::GetContents(const nsMapiEntry& aParent, LPSRestriction aRestriction,
2803 + nsMapiEntryArray *aList, ULONG aMapiType)
2804 +{
2805 + if (aList)
2806 + aList->CleanUp();
2807 +
2808 + nsMapiInterfaceWrapper<LPMAPICONTAINER> parent ;
2809 + nsMapiInterfaceWrapper<LPMAPITABLE> contents ;
2810 + ULONG objType = 0 ;
2811 + ULONG rowCount = 0 ;
2812 +
2813 +
2814 + nsMapiInterfaceWrapper<LPMAPIPROP> pFolder;
2815 + nsCString cs;
2816 + aParent.ToString(cs);
2817 +
2818 + mLastError = OpenEntry(aParent.mByteCount, aParent.mEntryId,
2819 + 0, MAPI_BEST_ACCESS, &objType, pFolder);
2820 + if (HR_FAILED(mLastError))
2821 + {
2822 + PRINTF(("Cannot open folder %08x.\n", mLastError)) ;
2823 + return FALSE;
2824 + }
2825 +
2826 +
2827 + LPSPropValue msgClass=GetMapiProperty(*(LPMAPIPROP*)&pFolder,PR_MESSAGE_CLASS);
2828 + if (msgClass && strcmp("IPM.DistList",msgClass->Value.lpszA) == 0)
2829 + {
2830 + HRESULT hr;
2831 + LPSPropValue aValue = NULL ;
2832 + ULONG aValueCount = 0 ;
2833 +
2834 + LPSPropTagArray properties = NULL ;
2835 + mMAPIAllocateBuffer(CbNewSPropTagArray(1),
2836 + (void **)&properties);
2837 + properties->cValues = 1;
2838 + properties->aulPropTag [0] = GetEmailPropertyTag(*(LPMAPIPROP*)&pFolder,OUTLOOK_EMAIL_LIST1);
2839 + hr = pFolder->GetProps(properties, 0, &aValueCount, &aValue) ;
2840 +
2841 + SBinaryArray *sa=&aValue->Value.MVbin;
2842 +
2843 + LPENTRYID lpEID;
2844 + ULONG cbEID;
2845 +
2846 + ULONG idx;
2847 + nsMapiEntry testEntry;
2848 + nsCString sClass;
2849 + for (idx=0;sa->lpbin && idx<sa->cValues ;idx++)
2850 + {
2851 + lpEID= (LPENTRYID) sa->lpbin[idx].lpb;
2852 + cbEID = sa->lpbin[idx].cb;
2853 + testEntry.Assign(sa->lpbin[idx].cb,NS_REINTERPRET_CAST(LPENTRYID,sa->lpbin[idx].lpb));
2854 +
2855 + if (GetPropertyString(testEntry,PR_MESSAGE_CLASS,sClass)) //Error get property
2856 + {
2857 + aList->AddItem(cbEID,lpEID);
2858 + }
2859 + }
2860 + Filter(aRestriction,aList);
2861 + }
2862 + else
2863 + {
2864 + if (aRestriction && !CorrectRestriction(*(LPMAPICONTAINER*)&pFolder,1,aRestriction))
2865 + return FALSE;
2866 + mLastError = OpenEntry(aParent.mByteCount, aParent.mEntryId,
2867 + &IID_IMAPIContainer, MAPI_BEST_ACCESS, &objType,
2868 + parent) ;
2869 + if (HR_FAILED(mLastError)) {
2870 + PRINTF(("Cannot open parent %08x.\n", mLastError)) ;
2871 + return FALSE ;
2872 + }
2873 +
2874 + mLastError = parent->GetContentsTable(0, contents) ;
2875 + if (HR_FAILED(mLastError)) {
2876 + PRINTF(("Cannot get contents %08x.\n", mLastError)) ;
2877 + return FALSE;
2878 + }
2879 + if (aRestriction) {
2880 + mLastError = contents->Restrict(aRestriction, TBL_BATCH) ;
2881 + if (HR_FAILED(mLastError)) {
2882 + PRINTF(("Cannot set restriction %08x.\n", mLastError)) ;
2883 + return FALSE ;
2884 + }
2885 + }
2886 + mLastError = contents->SetColumns((LPSPropTagArray)&ContentsColumns, 0);
2887 + if (HR_FAILED(mLastError)) {
2888 + PRINTF(("Cannot set columns %08x.\n", mLastError)) ;
2889 + return FALSE ;
2890 + }
2891 + mLastError = contents->GetRowCount(0, &rowCount) ;
2892 + if (HR_FAILED(mLastError)) {
2893 + PRINTF(("Cannot get result count %08x.\n", mLastError)) ;
2894 + return FALSE ;
2895 + }
2896 + do {
2897 + LPSRowSet rowSet = NULL ;
2898 +
2899 + rowCount = 0 ;
2900 + mLastError = contents->QueryRows(1, 0, &rowSet) ;
2901 + if (HR_FAILED(mLastError)) {
2902 + PRINTF(("Cannot query rows %08x.\n", mLastError)) ;
2903 + return FALSE ;
2904 + }
2905 + rowCount = rowSet->cRows ;
2906 + if (rowCount > 0 && aList)
2907 + {
2908 + if (aMapiType == 0 || rowSet->aRow->lpProps[ContentsColumnObjectType].Value.ul == aMapiType)
2909 + {
2910 + SPropValue& currentValue = rowSet->aRow->lpProps[ContentsColumnEntryId] ;
2911 + aList->AddItem(currentValue.Value.bin.cb,
2912 + NS_REINTERPRET_CAST(LPENTRYID, currentValue.Value.bin.lpb)) ;
2913 + }
2914 + else if (aMapiType == MAPI_DISTLIST)
2915 + {
2916 + if (strcmp("IPM.DistList",rowSet->aRow->lpProps[ContentsColumnMessageClass].Value.lpszA)==0)
2917 + {
2918 + SPropValue& currentValue = rowSet->aRow->lpProps[ContentsColumnEntryId] ;
2919 + aList->AddItem(currentValue.Value.bin.cb,
2920 + NS_REINTERPRET_CAST(LPENTRYID, currentValue.Value.bin.lpb)) ;
2921 +
2922 + }
2923 +}
2924 +
2925 + }
2926 + MyFreeProws(rowSet) ;
2927 + } while (rowCount > 0) ;
2928 + }
2929 +
2930 +
2931 + return TRUE ;
2932 +}
2933 +
2934 +BOOL nsMapiAddressBook::GetMAPIProperties(const nsMapiEntry& aObject, const ULONG *aPropertyTags,
2935 + ULONG aNbProperties, LPSPropValue& aValue,
2936 + ULONG& aValueCount)
2937 +{
2938 + nsMapiInterfaceWrapper<LPMAPIPROP> object ;
2939 + ULONG objType = 0 ;
2940 + LPSPropTagArray properties = NULL ;
2941 + ULONG i = 0 ;
2942 +
2943 + mLastError = OpenEntry(aObject.mByteCount, aObject.mEntryId,
2944 + &IID_IMAPIProp, MAPI_BEST_ACCESS, &objType,
2945 + object) ;
2946 +
2947 + if (HR_FAILED(mLastError)) {
2948 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
2949 + return FALSE ;
2950 + }
2951 + AllocateBuffer(CbNewSPropTagArray(aNbProperties),
2952 + NS_REINTERPRET_CAST(void **, &properties));
2953 + properties->cValues = aNbProperties ;
2954 + for (i = 0 ; i < aNbProperties ; ++ i)
2955 + {
2956 + properties->aulPropTag [i] = GetRealMapiPropertyTag(*(LPMAPIPROP*)&object,aPropertyTags [i],TRUE);
2957 + }
2958 + mLastError = object->GetProps(properties, 0 , &aValueCount, &aValue) ;
2959 + FreeBuffer(properties) ;
2960 +
2961 + if (HR_FAILED(mLastError)) {
2962 + PRINTF(("Error get props %08x.\n", mLastError)) ;
2963 + }
2964 + return HR_SUCCEEDED(mLastError);
2965 +}
2966 +
2967 +BOOL nsMapiAddressBook::SetMAPIProperties(const nsMapiEntry& aObject, ULONG aNbProperties,
2968 + LPSPropValue& aValues)
2969 +{
2970 + nsMapiInterfaceWrapper<LPMESSAGE> object;
2971 + ULONG objType = 0 ;
2972 + LPSPropProblemArray problems = NULL ;
2973 + ULONG i = 0 ;
2974 +
2975 + LPMDB lpMsgStore=GetMsgStore(aObject);
2976 +
2977 + if (!lpMsgStore)
2978 + {
2979 + return FALSE;
2980 + }
2981 + mLastError = lpMsgStore->OpenEntry(aObject.mByteCount, aObject.mEntryId,
2982 + &IID_IMAPIProp, MAPI_BEST_ACCESS , &objType,
2983 + object) ;
2984 + lpMsgStore->Release();
2985 +
2986 + if (HR_FAILED(mLastError)) {
2987 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
2988 + return FALSE ;
2989 + }
2990 + for (i = 0 ; i < aNbProperties ; ++ i)
2991 + {
2992 + aValues[i].ulPropTag = GetRealMapiPropertyTag(*(LPMESSAGE*)&object,aValues[i].ulPropTag,TRUE);
2993 + }
2994 + mLastError = object->SetProps(aNbProperties, aValues, &problems) ;
2995 + if (HR_FAILED(mLastError)) {
2996 + PRINTF(("Cannot update the object %08x.\n", mLastError)) ;
2997 + return FALSE ;
2998 + }
2999 + if (problems) {
3000 + for (ULONG i = 0 ; i < problems->cProblem ; ++ i) {
3001 + PRINTF(("Problem %d: index %d code %08x.\n", i,
3002 + problems->aProblem [i].ulIndex,
3003 + problems->aProblem [i].scode)) ;
3004 + }
3005 + }
3006 + mLastError = object->SaveChanges(0) ;
3007 + if (MAPI_E_OBJECT_CHANGED == mLastError)
3008 + {
3009 + mLastError = object->SaveChanges(FORCE_SAVE ) ;
3010 + }
3011 + return HR_SUCCEEDED(mLastError) ;
3012 +}
3013 +
3014 +BOOL nsMapiAddressBook::GetDefaultContainer(nsMapiEntry& aContainer)
3015 +{
3016 + return FALSE ;
3017 +}
3018 +
3019 +BOOL nsMapiAddressBook::IsOK(void)
3020 +{
3021 + return mRootSession && mLibUsage;
3022 +}
3023 +
3024 BOOL nsMapiAddressBook::Initialize(void)
3025 {
3026 - if (mAddressBook) { return TRUE ; }
3027 +
3028 nsAutoLock guard(mMutex) ;
3030 if (!LoadMapiLibrary()) {
3031 PRINTF(("Cannot load library.\n")) ;
3032 return FALSE ;
3033 }
3034 - mAddressBook = mRootBook ;
3035 - return TRUE ;
3036 + return TRUE;
3037 }
3039 void nsMapiAddressBook::AllocateBuffer(ULONG aByteCount, LPVOID *aBuffer)
3040 @@ -182,7 +1109,803 @@
3041 mMAPIFreeBuffer(aBuffer) ;
3042 }
3044 +ULONG nsMapiAddressBook::GetEmailPropertyTag(LPMAPIPROP lpProp, LONG nameID)
3045 +{
3046 + static GUID emailGUID =
3047 + {
3048 + 0x00062004, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46
3049 + };
3050 +
3051 +
3052 + MAPINAMEID mapiNameID;
3053 + mapiNameID.lpguid = &emailGUID;
3054 + mapiNameID.ulKind = MNID_ID;
3055 + mapiNameID.Kind.lID = nameID;
3056 +
3057 + LPMAPINAMEID lpMapiNames = &mapiNameID;
3058 + LPSPropTagArray lpMailTagArray = NULL;
3059 +
3060 + HRESULT result = lpProp->GetIDsFromNames(1L, &lpMapiNames, 0, &lpMailTagArray);
3061 + if (result == S_OK)
3062 + {
3063 + ULONG lTag = lpMailTagArray->aulPropTag[0];
3064 + mMAPIFreeBuffer(lpMailTagArray);
3065 + return lTag;
3066 + }
3067 + return 0L;
3068 +}
3069 +ULONG nsMapiAddressBook::GetRealMapiPropertyTag(LPMAPIPROP lpProp, LONG aPropertyTag,BOOL aTest)
3070 +{
3071 + LPSPropValue addr;
3072 + ULONG upRealTag=aPropertyTag;
3073 + ULONG lSize=sizeof(TagMaps) / sizeof(TagMap);
3074 +
3075 + for(int i=0; i<lSize; i++)
3076 + {
3077 + if (TagMaps[i].AddressTag == aPropertyTag)
3078 + {
3079 +
3080 + ULONG kPriEmailColumn=GetEmailPropertyTag(lpProp,TagMaps[i].NameID);
3081 + if (aTest)
3082 + {
3083 + if (PR_DISPLAY_NAME_A == aPropertyTag)
3084 + {
3085 + //We need not change PR_DISPLAY_NAME_A tag if we are not using an address
3086 + LPSPropValue msgClass=GetMapiProperty(lpProp,PR_MESSAGE_CLASS);
3087 + if (msgClass && !strcmp("IPM.Contact",msgClass->Value.lpszA))
3088 + {
3089 + if (kPriEmailColumn)
3090 + upRealTag = kPriEmailColumn | TagMaps[i].TypeMask;
3091 + }
3092 + else
3093 + {
3094 + FreeBuffer(msgClass);
3095 + upRealTag = aPropertyTag;
3096 + }
3097 + }
3098 + else //PR_DISPLAY_NAME_A == aPropertyTag
3099 + {
3100 + addr=GetMapiProperty(lpProp,aPropertyTag);
3101 + if (!addr || PROP_TYPE( addr->ulPropTag) == PT_ERROR ||
3102 + addr->Value.l == MAPI_E_NOT_FOUND)
3103 + {
3104 + if (kPriEmailColumn)
3105 + upRealTag = kPriEmailColumn | TagMaps[i].TypeMask;
3106 + }
3107 + }
3108 + }
3109 + else //aTest
3110 + {
3111 + if (kPriEmailColumn)
3112 + upRealTag = kPriEmailColumn | TagMaps[i].TypeMask;
3113 + }
3114 +
3115 + break; //we find it,exit
3116 + }
3117 + }
3118 +
3119 + return upRealTag;
3120 +}
3121 +
3122 +BOOL nsMapiAddressBook::GetPropertyLong(const nsMapiEntry& aObject,
3123 + ULONG aPropertyTag,
3124 + ULONG& aValue)
3125 +{
3126 + aValue = 0 ;
3127 + LPSPropValue values = NULL ;
3128 + ULONG valueCount = 0 ;
3129 +
3130 + if (PR_OBJECT_TYPE == aPropertyTag)
3131 + {
3132 + nsMapiInterfaceWrapper<LPMAPIFOLDER> pFolder ;
3133 + ULONG objType=0;
3134 + mLastError = OpenEntry(aObject.mByteCount,aObject.mEntryId,
3135 + NULL,MAPI_BEST_ACCESS,&objType, pFolder);
3136 + if (HR_FAILED(mLastError))
3137 + {
3138 + PRINTF(("Cannot open folder %08x.\n", mLastError)) ;
3139 + return FALSE;
3140 + }
3141 + LPSPropValue msgClass=GetMapiProperty(*(LPMAPIFOLDER*)&pFolder,PR_MESSAGE_CLASS);
3142 + if (msgClass && strcmp("IPM.DistList",msgClass->Value.lpszA) == 0)
3143 + {
3144 + FreeBuffer(msgClass);
3145 + aValue = MAPI_DISTLIST;
3146 + return TRUE;
3147 + }
3148 + }
3150 + if (!GetMAPIProperties(aObject, &aPropertyTag, 1, values, valueCount))
3151 + return FALSE ;
3153 + if (valueCount == 1 && values && PROP_TYPE(values->ulPropTag) == PT_LONG) {
3154 + aValue = values->Value.ul ;
3155 + }
3156 + FreeBuffer(values) ;
3157 + return TRUE ;
3158 +}
3159 +
3160 +BOOL nsMapiAddressBook::GetPropertyDate(const nsMapiEntry& aObject, ULONG aPropertyTag,
3161 + WORD& aYear, WORD& aMonth, WORD& aDay)
3162 +{
3163 + aYear = 0;
3164 + aMonth = 0;
3165 + aDay = 0;
3166 + LPSPropValue values = NULL ;
3167 + ULONG valueCount = 0 ;
3168 +
3169 + if (!GetMAPIProperties(aObject, &aPropertyTag, 1, values, valueCount))
3170 + return FALSE ;
3171 +
3172 + if (valueCount == 1 && values && PROP_TYPE(values->ulPropTag) == PT_SYSTIME) {
3173 + SYSTEMTIME readableTime ;
3174 + FILETIME localTime ;
3175 + FileTimeToLocalFileTime(&values->Value.ft,&localTime);
3176 + if (FileTimeToSystemTime(&localTime, &readableTime)) {
3177 + aYear = readableTime.wYear ;
3178 + aMonth = readableTime.wMonth ;
3179 + aDay = readableTime.wDay ;
3180 + }
3181 + }
3182 + FreeBuffer(values) ;
3183 + return TRUE ;
3184 +}
3185 +
3186 +HRESULT nsMapiAddressBook::OpenEntry(ULONG cbEntryID,
3187 + LPENTRYID lpEntryID,
3188 + LPCIID lpInterface,
3189 + ULONG ulFlags,
3190 + ULONG FAR * lpulObjType,
3191 + LPUNKNOWN FAR * lppUnk
3192 + )
3193 +{
3194 +
3195 + int err;
3196 + HRESULT rv;
3197 + __try
3198 + {
3199 + rv=mRootSession->OpenEntry(cbEntryID,
3200 + lpEntryID,
3201 + lpInterface,
3202 + ulFlags ,
3203 + lpulObjType,
3204 + lppUnk
3205 + );
3206 + }__except(err)
3207 + {
3208 + return (-1);
3209 + }
3210 +
3211 + if (HR_FAILED(rv) && !m_MDBArray.Count())
3212 + {
3213 + //There are no openned Message store,so we have to open them all
3214 + nsMapiEntryArray aFolders;
3215 + if (GetFolders(aFolders))
3216 + {
3217 + __try
3218 + {
3219 + rv=mRootSession->OpenEntry(cbEntryID,
3220 + lpEntryID,
3221 + lpInterface,
3222 + ulFlags ,
3223 + lpulObjType,
3224 + lppUnk
3225 + );
3226 + }__except(err)
3227 + {
3228 + return (-1);
3229 + }
3230 + }
3231 + }
3232 + return rv;
3233 +
3234 +}
3235 +
3236 +BOOL nsMapiAddressBook::AddEntryToList(const nsMapiEntry& aDistlist, const nsMapiEntry& aNewEntry)
3237 +{
3238 + nsMapiInterfaceWrapper<LPMAPIPROP> container ;
3239 + ULONG objType = 0 ;
3240 +
3241 + nsMapiEntry parentEntry;
3242 + if (!GetEntryParent(aDistlist,parentEntry))
3243 + return FALSE;
3244 +
3245 + LPMDB lpMsgStore=GetMsgStore(parentEntry);
3246 +
3247 + if (!lpMsgStore)
3248 + return FALSE;
3249 + mLastError = lpMsgStore->OpenEntry(aDistlist.mByteCount, aDistlist.mEntryId,
3250 + &IID_IMAPIProp, MAPI_BEST_ACCESS, &objType,
3251 + container) ;
3252 + lpMsgStore->Release();
3253 +
3254 + if (HR_FAILED(mLastError))
3255 + return FALSE ;
3256 +
3257 +
3258 + /*
3259 + When add mail address to distlist,Mapi need update 2 tag.
3260 + */
3261 + //update OUTLOOK_EMAIL_LIST1
3262 + ULONG listTag=GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST1) | PT_MV_BINARY;
3263 + SBinaryArray oldChilds;
3264 + LPSBinary bins=NULL;
3265 + SBinaryArray newChilds;
3266 + LPSPropValue oldChildValue = NULL ;
3267 + ULONG valueCount = 0 ;
3268 +
3269 + if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
3270 + {
3271 + PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
3272 + return FALSE;
3273 + }
3274 +
3275 + if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
3276 + {
3277 + oldChilds = oldChildValue->Value.MVbin;
3278 + newChilds.cValues=oldChilds.cValues + 1;
3279 + mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
3280 + newChilds.lpbin = bins;
3281 + for (ULONG i=0;i<oldChilds.cValues;i++)
3282 + {
3283 + newChilds.lpbin[i].lpb = oldChilds.lpbin[i].lpb;
3284 + newChilds.lpbin[i].cb = oldChilds.lpbin[i].cb;
3285 + }
3286 + }
3287 + else
3288 + {
3289 + newChilds.cValues = 1;
3290 + mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
3291 + newChilds.lpbin = bins;
3292 + }
3293 +
3294 + nsMapiEntry orgEntryID;
3295 + if (!GetPropertyBin(aNewEntry,
3296 + GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_ORGID) | PT_BINARY,
3297 + orgEntryID))
3298 + {
3299 + return FALSE;
3300 + }
3301 + newChilds.lpbin[newChilds.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *, orgEntryID.mEntryId);
3302 + newChilds.lpbin[newChilds.cValues-1].cb = orgEntryID.mByteCount;
3303 +
3304 + SPropValue childs;
3305 + childs.ulPropTag = listTag;
3306 + childs.Value.MVbin = newChilds;
3307 +
3308 + LPSPropProblemArray problems = NULL ;
3309 + mLastError = container->SetProps(1, &childs, &problems) ;
3310 + if (HR_FAILED(mLastError)) {
3311 + PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
3312 + return FALSE ;
3313 + }
3314 +
3315 + //update OUTLOOK_EMAIL_LIST2
3316 + listTag = GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST2) | PT_MV_BINARY;
3317 + if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
3318 + {
3319 + PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
3320 + return FALSE;
3321 + }
3322 +
3323 + if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
3324 + {
3325 + oldChilds = oldChildValue->Value.MVbin;
3326 + newChilds.cValues=oldChilds.cValues + 1;
3327 + mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
3328 + newChilds.lpbin = bins;
3329 + for (ULONG i=0;i<oldChilds.cValues;i++)
3330 + {
3331 + newChilds.lpbin[i].lpb = oldChilds.lpbin[i].lpb;
3332 + newChilds.lpbin[i].cb = oldChilds.lpbin[i].cb;
3333 + }
3334 + }
3335 + else
3336 + {
3337 + newChilds.cValues = 1;
3338 + mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
3339 + newChilds.lpbin = bins;
3340 + }
3341 +
3342 + /*
3343 + Need more work here.
3344 + There are two kind of mail address in outlook DistList.
3345 + One is sample,not include in parent folder.
3346 + The other is a link to a unattached address in parents folders.
3347 + Currently we can only add first kind of address to a outlook distlist.
3348 + */
3349 +
3350 + newChilds.lpbin[newChilds.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *, orgEntryID.mEntryId);
3351 + newChilds.lpbin[newChilds.cValues-1].cb = orgEntryID.mByteCount;
3352 +
3353 + childs.ulPropTag = listTag;
3354 + childs.Value.MVbin = newChilds;
3355 +
3356 + mLastError = container->SetProps(1, &childs, &problems) ;
3357 + if (HR_FAILED(mLastError))
3358 + {
3359 + PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
3360 + return FALSE ;
3361 + }
3362 +
3363 + mMAPIFreeBuffer(bins);
3364 +
3365 + mLastError = container->SaveChanges(KEEP_OPEN_READONLY) ;
3366 + if (HR_FAILED(mLastError)) {
3367 + PRINTF(("Cannot commit new entry %08x.\n", mLastError)) ;
3368 + return FALSE ;
3369 + }
3370 +
3371 + return TRUE ;
3372 +}
3373 +BOOL nsMapiAddressBook::DeleteEntryFromList(const nsMapiEntry& aDistlist, const nsMapiEntry& aNewEntry)
3374 +{
3375 + nsMapiInterfaceWrapper<LPMAPIPROP> container ;
3376 + ULONG objType = 0 ;
3377 +
3378 + nsMapiEntry parentEntry;
3379 + if (!GetEntryParent(aDistlist,parentEntry))
3380 + return FALSE;
3381 +
3382 + LPMDB lpMsgStore=GetMsgStore(parentEntry);
3383 + if (!lpMsgStore)
3384 + return FALSE;
3385 +
3386 + mLastError = lpMsgStore->OpenEntry(aDistlist.mByteCount, aDistlist.mEntryId,
3387 + &IID_IMAPIProp, MAPI_BEST_ACCESS, &objType,
3388 + container) ;
3389 + lpMsgStore->Release();
3390 +
3391 + if (HR_FAILED(mLastError))
3392 + return FALSE ;
3393 + /*
3394 + When delete mail address from distlist,Mapi need update 2 tag.
3395 + */
3396 + //update OUTLOOK_EMAIL_LIST1
3397 + ULONG listTag=GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST1) | PT_MV_BINARY;
3398 +
3399 + SBinaryArray oldChilds;
3400 + LPSBinary bins=NULL;
3401 + SBinaryArray newChilds;
3402 + LPSPropValue oldChildValue = NULL ;
3403 + ULONG valueCount = 0 ;
3404 +
3405 + newChilds.lpbin=NULL;
3406 +
3407 + ULONG lDeleteEntry=0;
3408 + ULONG newIndex=0;
3409 + ULONG oldIndex=0;
3410 + if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
3411 + {
3412 + PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
3413 + return FALSE;
3414 + }
3415 +
3416 + if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
3417 + {
3418 + oldChilds = oldChildValue->Value.MVbin;
3419 + newChilds.cValues=oldChilds.cValues - 1;
3420 + mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
3421 + newChilds.lpbin = bins;
3422 + for (oldIndex=0;oldIndex<oldChilds.cValues;oldIndex++)
3423 + {
3424 + if ( oldChilds.lpbin[oldIndex].cb == aNewEntry.mByteCount &&
3425 + !memcmp((void*)(oldChilds.lpbin[oldIndex].lpb+4),
3426 + (void*)(aNewEntry.mEntryId->ab),
3427 + oldChilds.lpbin[oldIndex].cb-4))
3428 + {
3429 + lDeleteEntry=oldIndex;
3430 + }
3431 + else
3432 + {
3433 + newChilds.lpbin[newIndex].lpb = oldChilds.lpbin[oldIndex].lpb;
3434 + newChilds.lpbin[newIndex].cb = oldChilds.lpbin[oldIndex].cb;
3435 + newIndex++;
3436 + }
3437 + }
3438 + }
3439 + else
3440 + return FALSE;
3441 +
3442 +
3443 + SPropValue childs;
3444 + LPSPropProblemArray problems = NULL ;
3445 +
3446 + if (newChilds.cValues == 0)
3447 + {
3448 + SPropTagArray delTags;
3449 + delTags.cValues = 1;
3450 + delTags.aulPropTag[0] = listTag;
3451 +
3452 + mLastError = container->DeleteProps(&delTags, &problems) ;
3453 + }
3454 + else
3455 + {
3456 + childs.ulPropTag = listTag;
3457 + childs.Value.MVbin = newChilds;
3458 + mLastError = container->SetProps(1, &childs, &problems) ;
3459 + }
3460 +
3461 + if (HR_FAILED(mLastError)) {
3462 + PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
3463 + return FALSE ;
3464 + }
3465 +
3466 + //update OUTLOOK_EMAIL_LIST2
3467 + listTag = GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST2) | PT_MV_BINARY;
3468 + if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
3469 + {
3470 + PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
3471 + return FALSE;
3472 + }
3473 +
3474 + newIndex=0;
3475 + if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
3476 + {
3477 + oldChilds = oldChildValue->Value.MVbin;
3478 + newChilds.cValues=oldChilds.cValues - 1;
3479 + mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
3480 + newChilds.lpbin = bins;
3481 + for (oldIndex=0;oldIndex<oldChilds.cValues;oldIndex++)
3482 + {
3483 + if (oldIndex != lDeleteEntry)
3484 + {
3485 + newChilds.lpbin[newIndex].lpb = oldChilds.lpbin[oldIndex].lpb;
3486 + newChilds.lpbin[newIndex].cb = oldChilds.lpbin[oldIndex].cb;
3487 + newIndex++;
3488 + }
3489 + }
3490 + }
3491 + else
3492 + {
3493 + newChilds.cValues = 1;
3494 + mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
3495 + newChilds.lpbin = bins;
3496 + }
3499 +
3500 + if (newChilds.cValues == 0)
3501 + {
3502 + SPropTagArray delTags;
3503 + delTags.cValues = 1;
3504 + delTags.aulPropTag[0] = listTag;
3505 +
3506 + mLastError = container->DeleteProps(&delTags, &problems) ;
3507 + }
3508 + else
3509 + {
3510 + childs.ulPropTag = listTag;
3511 + childs.Value.MVbin = newChilds;
3512 + mLastError = container->SetProps(1, &childs, &problems) ;
3513 + }
3514 + if (HR_FAILED(mLastError)) {
3515 + PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
3516 + return FALSE ;
3517 + }
3518 +
3519 + mMAPIFreeBuffer(bins);
3520 +
3521 + mLastError = container->SaveChanges(KEEP_OPEN_READONLY) ;
3522 + if (HR_FAILED(mLastError)) {
3523 + PRINTF(("Cannot commit new entry %08x.\n", mLastError)) ;
3524 + return FALSE ;
3525 + }
3526 +
3527 + return TRUE ;
3528 +}
3529 +
3530 +BOOL nsMapiAddressBook::GetEntryParent(const nsMapiEntry& aParent, nsMapiEntry& aParentEntry)
3531 +{
3532 + nsMapiInterfaceWrapper<LPMAPIPROP> object ;
3533 + ULONG objType = 0 ;
3534 + mLastError = OpenEntry(aParent.mByteCount, aParent.mEntryId,
3535 + &IID_IMAPIProp, MAPI_BEST_ACCESS, &objType,
3536 + (IUnknown **)&object) ;
3537 +
3538 + if (HR_FAILED(mLastError)) {
3539 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
3540 + return FALSE ;
3541 + }
3542 + SPropValue *parentID=GetMapiProperty(*(LPMAPIPROP*)&object, PR_PARENT_ENTRYID);
3543 +
3544 + if (parentID->Value.l == MAPI_E_NOT_FOUND)
3545 + return FALSE;
3546 + aParentEntry.Assign(parentID->Value.bin.cb, NS_REINTERPRET_CAST(LPENTRYID, parentID->Value.bin.lpb));
3547 + return TRUE;
3548 +}
3549 +BOOL nsMapiAddressBook::CreateEntryInList(const nsMapiEntry& aDistlist, nsMapiEntry& aNewEntry)
3550 +{
3551 + nsMapiInterfaceWrapper<LPMAPIPROP> container ;
3552 + ULONG objType = 0 ;
3553 +
3554 + nsMapiEntry parentEntry;
3555 + if (!GetEntryParent(aDistlist,parentEntry))
3556 + {
3557 + return FALSE;
3558 + }
3559 + nsMapiInterfaceWrapper<LPMESSAGE> newEntry ;
3560 + if (!CreateEntry(parentEntry,aNewEntry)) //Create a entry in parent folder
3561 + return FALSE;
3562 +
3563 + return AddEntryToList(aDistlist,aNewEntry);
3564 +}
3565 +
3566 +BOOL nsMapiAddressBook::CreateEntry(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry)
3567 +{
3568 + nsMapiInterfaceWrapper<LPMAPIFOLDER> container ;
3569 + ULONG objType = 0 ;
3570 +
3571 + nsMapiInterfaceWrapper<LPMAPIPROP> object;
3572 + mLastError = OpenEntry(aParent.mByteCount, aParent.mEntryId,
3573 + &IID_IMAPIProp, MAPI_BEST_ACCESS, &objType,
3574 + object) ;
3575 +
3576 + if (HR_FAILED(mLastError)) {
3577 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
3578 + return NULL ;
3579 + }
3580 + LPSPropValue msgClass=GetMapiProperty(*(LPMAPIPROP*)&object,PR_MESSAGE_CLASS);
3581 +
3582 + if (msgClass && strcmp("IPM.DistList",msgClass->Value.lpszA) == 0)
3583 + return CreateEntryInList(aParent,aNewEntry); //Create entry in DistList
3584 +
3585 + LPMDB lpMsgStore=GetMsgStore(aParent);
3586 +
3587 + if (!lpMsgStore)
3588 + return FALSE;
3589 +
3590 + mLastError = lpMsgStore->OpenEntry(aParent.mByteCount, aParent.mEntryId,
3591 + &IID_IMAPIFolder, MAPI_BEST_ACCESS, &objType,
3592 + container) ;
3593 + lpMsgStore->Release();
3594 +
3595 + if (HR_FAILED(mLastError))
3596 + return FALSE;
3597 +
3598 + nsMapiInterfaceWrapper<LPMESSAGE> newEntry ;
3599 +
3600 + mLastError = container->CreateMessage(&IID_IMessage,
3601 + 0,
3602 + newEntry) ;
3603 + if (HR_FAILED(mLastError)) {
3604 + PRINTF(("Cannot create new entry %08x.\n", mLastError)) ;
3605 + return FALSE ;
3606 + }
3607 + SPropValue messageclass ;
3608 + LPSPropProblemArray problems = NULL ;
3609 + nsCString tempName ;
3610 +
3611 + messageclass.ulPropTag = PR_MESSAGE_CLASS_A ;
3612 + tempName.Assign("IPM.Contact") ;
3613 + messageclass.Value.lpszA = NS_CONST_CAST(char *, tempName.get()) ;
3614 + mLastError = newEntry->SetProps(1, &messageclass, &problems) ;
3615 + if (HR_FAILED(mLastError)) {
3616 + PRINTF(("Cannot set temporary name %08x.\n", mLastError)) ;
3617 + return FALSE ;
3618 + }
3619 + mLastError = newEntry->SaveChanges(KEEP_OPEN_READONLY) ;
3620 + if (HR_FAILED(mLastError)) {
3621 + PRINTF(("Cannot commit new entry %08x.\n", mLastError)) ;
3622 + return FALSE ;
3623 + }
3624 +
3625 + SPropTagArray property ;
3626 + LPSPropValue value = NULL ;
3627 + ULONG valueCount = 0 ;
3628 +
3629 + property.cValues = 1 ;
3630 + property.aulPropTag [0] = PR_ENTRYID ;
3631 + mLastError = newEntry->GetProps(&property, 0, &valueCount, &value) ;
3632 + if (HR_FAILED(mLastError) || valueCount != 1) {
3633 + PRINTF(("Cannot get entry id %08x.\n", mLastError)) ;
3634 + return FALSE ;
3635 + }
3636 + aNewEntry.Assign(value->Value.bin.cb, NS_REINTERPRET_CAST(LPENTRYID, value->Value.bin.lpb)) ;
3637 + FreeBuffer(value) ;
3638 + return TRUE ;
3639 +}
3640 +
3641 +BOOL nsMapiAddressBook::CreateDistList(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry)
3642 +{
3643 + nsMapiInterfaceWrapper<LPMAPIFOLDER> container ;
3644 + ULONG objType = 0 ;
3645 +
3646 + LPMDB lpMsgStore=GetMsgStore(aParent);
3647 + if (!lpMsgStore)
3648 + return FALSE;
3649 + mLastError = lpMsgStore->OpenEntry(aParent.mByteCount, aParent.mEntryId,
3650 + &IID_IMAPIFolder, MAPI_BEST_ACCESS, &objType,
3651 + container) ;
3652 + lpMsgStore->Release();
3653 +
3654 + if (HR_FAILED(mLastError)) {
3655 + PRINTF(("Cannot open container %08x.\n", mLastError)) ;
3656 + return FALSE ;
3657 + }
3658 +
3659 + nsMapiInterfaceWrapper<LPMESSAGE> newEntry ;
3660 + mLastError = container->CreateMessage(&IID_IMAPIProp,
3661 + 0,
3662 + newEntry) ;
3663 + if (HR_FAILED(mLastError)) {
3664 + PRINTF(("Cannot create new entry %08x.\n", mLastError)) ;
3665 + return FALSE ;
3666 + }
3667 + SPropValue messageclass ;
3668 + LPSPropProblemArray problems = NULL ;
3669 + nsCString tempName ;
3670 +
3671 + messageclass.ulPropTag = PR_MESSAGE_CLASS_A ;
3672 + tempName.Assign("IPM.DistList") ;
3673 + messageclass.Value.lpszA = NS_CONST_CAST(char *, tempName.get()) ;
3674 + mLastError = newEntry->SetProps(1, &messageclass, &problems) ;
3675 + if (HR_FAILED(mLastError)) {
3676 + PRINTF(("Cannot set PR_MESSAGE_CLASS_A %08x.\n", mLastError)) ;
3677 + return FALSE ;
3678 + }
3679 + mLastError = newEntry->SaveChanges(KEEP_OPEN_READONLY) ;
3680 + if (HR_FAILED(mLastError)) {
3681 + PRINTF(("Cannot commit new entry %08x.\n", mLastError)) ;
3682 + return FALSE ;
3683 + }
3684 +
3685 + ULONG valueCount = 0 ;
3686 + SPropTagArray property ;
3687 + LPSPropValue value = NULL ;
3688 +
3689 + property.cValues = 1 ;
3690 + property.aulPropTag [0] = PR_ENTRYID ;
3691 + mLastError = newEntry->GetProps(&property, 0, &valueCount, &value) ;
3692 + if (HR_FAILED(mLastError) || valueCount != 1) {
3693 + PRINTF(("Cannot get entry id %08x.\n", mLastError)) ;
3694 + return FALSE ;
3695 + }
3696 + aNewEntry.Assign(value->Value.bin.cb, NS_REINTERPRET_CAST(LPENTRYID, value->Value.bin.lpb)) ;
3697 +
3698 + FreeBuffer(value) ;
3699 + return TRUE ;
3700 +}
3701 +
3702 +
3703 +BOOL nsMapiAddressBook::CopyEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aSource,
3704 + nsMapiEntry& aTarget)
3705 +{
3706 + nsMapiInterfaceWrapper<LPMAPIFOLDER> container ;
3707 + nsMapiInterfaceWrapper<LPMAPIFOLDER> targetFolder ;
3708 + ULONG objType = 0 ;
3709 + nsMapiInterfaceWrapper<LPMAPIPROP> object;
3710 + mLastError = OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
3711 + &IID_IMAPIProp, MAPI_BEST_ACCESS, &objType,
3712 + object) ;
3713 +
3714 + if (HR_FAILED(mLastError)) {
3715 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
3716 + return FALSE ;
3717 + }
3718 + LPSPropValue msgClass=GetMapiProperty(*(LPMAPIPROP*)&object,PR_MESSAGE_CLASS);
3719 +
3720 + if (msgClass && strcmp("IPM.DistList",msgClass->Value.lpszA) == 0)
3721 + {
3722 + //Add Entry To DistList
3723 + if (!AddEntryToList(aContainer,aSource))
3724 + return FALSE;
3725 + aTarget.Assign(aSource.mByteCount,aSource.mEntryId);
3726 + return TRUE;
3727 + }
3728 +
3729 + SBinary entry ;
3730 + SBinaryArray entryArray ;
3731 +
3732 + entry.cb = aSource.mByteCount ;
3733 + entry.lpb = NS_REINTERPRET_CAST(LPBYTE, aSource.mEntryId) ;
3734 + entryArray.cValues = 1 ;
3735 + entryArray.lpbin = &entry ;
3736 +
3737 + mLastError = OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
3738 + &IID_IMAPIFolder, MAPI_BEST_ACCESS, &objType,
3739 + container) ;
3740 + if (HR_FAILED(mLastError)) {
3741 + PRINTF(("Cannot open container %08x.\n", mLastError)) ;
3742 + return FALSE ;
3743 + }
3744 +
3745 + mLastError = OpenEntry(aTarget.mByteCount, aTarget.mEntryId,
3746 + &IID_IMAPIFolder, MAPI_BEST_ACCESS, &objType,
3747 + targetFolder) ;
3748 + if (HR_FAILED(mLastError)) {
3749 + PRINTF(("Cannot open Target folder %08x.\n", mLastError)) ;
3750 + return FALSE ;
3751 + }
3752 +
3753 + nsMapiInterfaceWrapper<LPMAPIPROP> newEntry ;
3754 +
3755 + mLastError = container->CopyMessages(&entryArray,
3756 + &IID_IMessage,
3757 + (void*)&targetFolder,
3758 + 0,
3759 + NULL,
3760 + NULL) ;
3761 + if (HR_FAILED(mLastError)) {
3762 + PRINTF(("Cannot create new entry %08x.\n", mLastError)) ;
3763 + return FALSE ;
3764 + }
3765 + return TRUE ;
3766 +}
3767 +
3768 +BOOL nsMapiAddressBook::DeleteEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aEntry)
3769 +{
3770 + nsMapiInterfaceWrapper<LPMAPIFOLDER> container ;
3771 + ULONG objType = 0 ;
3772 + SBinary entry ;
3773 + SBinaryArray entryArray ;
3774 +
3775 +
3776 + nsMapiInterfaceWrapper<LPMAPIPROP> object;
3777 + mLastError = OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
3778 + &IID_IMAPIProp, MAPI_BEST_ACCESS, &objType,
3779 + object) ;
3780 +
3781 + if (HR_FAILED(mLastError)) {
3782 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
3783 + return FALSE ;
3784 + }
3785 + LPSPropValue msgClass=GetMapiProperty(*(LPMAPIPROP*)&object,PR_MESSAGE_CLASS);
3786 +
3787 + if (msgClass && strcmp("IPM.DistList",msgClass->Value.lpszA) == 0)
3788 + return DeleteEntryFromList(aContainer,aEntry); //Delete Entry from DistList
3789 +
3790 + LPMDB lpMsgStore=GetMsgStore(aContainer);
3791 + if (!lpMsgStore)
3792 + return FALSE;
3793 +
3794 + mLastError = lpMsgStore->OpenEntry(aContainer.mByteCount, aContainer.mEntryId,
3795 + &IID_IMAPIFolder, MAPI_BEST_ACCESS, &objType,
3796 + container) ;
3797 + lpMsgStore->Release();
3798 + if (HR_FAILED(mLastError)) {
3799 + PRINTF(("Cannot open container %08x.\n", mLastError)) ;
3800 + return FALSE ;
3801 + }
3802 + entry.cb = aEntry.mByteCount ;
3803 + entry.lpb = NS_REINTERPRET_CAST(LPBYTE, aEntry.mEntryId) ;
3804 + entryArray.cValues = 1 ;
3805 + entryArray.lpbin = &entry ;
3806 + mLastError = container->DeleteMessages(&entryArray, 0,0,0) ;
3807 + if (HR_FAILED(mLastError)) {
3808 + PRINTF(("Cannot delete entry %08x.\n", mLastError)) ;
3809 + return FALSE ;
3810 + }
3811 + return TRUE ;
3812 +}
3813 +
3814 +//Use to open message store in write mode
3815 +LPMDB nsMapiAddressBook::GetMsgStore(const nsMapiEntry& aEntry)
3816 +{
3817 + nsMapiInterfaceWrapper<LPMAPIPROP> object;
3818 + ULONG objType=0;
3819 +
3820 + mLastError = OpenEntry(aEntry.mByteCount, aEntry.mEntryId,
3821 + &IID_IMAPIProp, MAPI_BEST_ACCESS , &objType,
3822 + object) ;
3823 + if (HR_FAILED(mLastError)) {
3824 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
3825 + return NULL ;
3826 + }
3827 + SPropValue *svMsgSore=GetMapiProperty( *(LPMAPIPROP*)&object, PR_STORE_ENTRYID);;
3828 +
3829 + LPMDB lpMsgStore=NULL;
3830 + mLastError=mRootSession->OpenMsgStore(0,
3831 + svMsgSore->Value.bin.cb,
3832 + (ENTRYID*)svMsgSore->Value.bin.lpb,
3833 + &IID_IMsgStore,
3834 + MAPI_BEST_ACCESS ,
3835 + &lpMsgStore);
3836 +
3837 + if (HR_FAILED(mLastError)) {
3838 + PRINTF(("Cannot open MsgStore %08x.\n", mLastError)) ;
3839 + return NULL ;
3840 + }
3841 +
3842 + return lpMsgStore;
3843 +}
3844 Index: mailnews/addrbook/src/nsMapiAddressBook.h
3845 ===================================================================
3846 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsMapiAddressBook.h,v
3847 retrieving revision 1.3
3848 diff -u -r1.3 nsMapiAddressBook.h
3849 --- misc/build/mozilla/mailnews/addrbook/src/nsMapiAddressBook.h 28 Sep 2001 20:06:25 -0000 1.3
3850 +++ misc/build/mozilla/mailnews/addrbook/src/nsMapiAddressBook.h 17 May 2004 03:23:55 -0000
3851 @@ -40,12 +40,42 @@
3853 #include "nsAbWinHelper.h"
3855 +struct TagMap
3856 +{
3857 + ULONG AddressTag;
3858 + ULONG NameID;
3859 + ULONG TypeMask;
3860 +};
3861 class nsMapiAddressBook : public nsAbWinHelper
3862 {
3863 public :
3864 nsMapiAddressBook(void) ;
3865 virtual ~nsMapiAddressBook(void) ;
3867 + // Get the top address books
3868 + virtual BOOL GetFolders(nsMapiEntryArray& aFolders);
3869 +
3870 + // Get a default address book container
3871 + virtual BOOL GetDefaultContainer(nsMapiEntry& aContainer);
3872 + // Is the helper correctly initialised?
3873 + virtual BOOL IsOK(void);
3874 + virtual BOOL GetPropertyLong(const nsMapiEntry& aObject,
3875 + ULONG aPropertyTag,
3876 + ULONG& aValue);
3877 + // Get the value of a MAPI property of type SYSTIME
3878 + virtual BOOL GetPropertyDate(const nsMapiEntry& aObject, ULONG aPropertyTag,
3879 + WORD& aYear, WORD& aMonth, WORD& aDay);
3880 + // Create entry in the address book
3881 + virtual BOOL CreateEntry(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry) ;
3882 + // Delete an entry in the address book
3883 + virtual BOOL DeleteEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aEntry) ;
3884 + // Create a distribution list in the address book
3885 + virtual BOOL CreateDistList(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry) ;
3886 + // Copy an existing entry in the address book
3887 + virtual BOOL CopyEntry(const nsMapiEntry& aContainer, const nsMapiEntry& aSource, nsMapiEntry& aTarget) ;
3888 +
3889 + static void FreeMapiLibrary(void) ;
3890 +
3891 protected :
3892 // Class members to handle the library/entry points
3893 static HMODULE mLibrary ;
3894 @@ -67,19 +97,77 @@
3895 static BOOL mInitialized ;
3896 static BOOL mLogonDone ;
3897 static LPMAPISESSION mRootSession ;
3898 - static LPADRBOOK mRootBook ;
3899 +
3901 // Load the MAPI environment
3902 BOOL Initialize(void) ;
3903 +
3904 + virtual HRESULT OpenEntry(ULONG cbEntryID,
3905 + LPENTRYID lpEntryID,
3906 + LPCIID lpInterface,
3907 + ULONG ulFlags,
3908 + ULONG FAR * lpulObjType,
3909 + LPUNKNOWN FAR * lppUnk
3910 + );
3911 +
3912 +
3913 + // Retrieve the contents of a container, with an optional restriction
3914 + virtual BOOL GetContents(const nsMapiEntry& aParent, LPSRestriction aRestriction,
3915 + nsMapiEntryArray *aList, ULONG aMapiType) ;
3916 + // Retrieve the values of a set of properties on a MAPI object
3917 + virtual BOOL GetMAPIProperties(const nsMapiEntry& aObject, const ULONG *aPropertyTags,
3918 + ULONG aNbProperties,
3919 + LPSPropValue& aValues, ULONG& aValueCount) ;
3920 + // Set the values of a set of properties on a MAPI object
3921 + virtual BOOL SetMAPIProperties(const nsMapiEntry& aObject, ULONG aNbProperties,
3922 + LPSPropValue& aValues);
3923 +
3924 +
3925 // Allocation of a buffer for transmission to interfaces
3926 virtual void AllocateBuffer(ULONG aByteCount, LPVOID *aBuffer) ;
3927 // Destruction of a buffer provided by the interfaces
3928 virtual void FreeBuffer(LPVOID aBuffer) ;
3929 // Library management
3930 static BOOL LoadMapiLibrary(void) ;
3931 - static void FreeMapiLibrary(void) ;
3932 +
3933 + BOOL HandleContentsItem(ULONG oType, ULONG cb, LPENTRYID pEntry,nsMapiEntryArray& aFolders);
3934 + LPSPropValue GetMapiProperty( LPMAPIPROP pProp, ULONG tag);
3935 + BOOL GetEntryIdFromProp( LPSPropValue pVal, ULONG& cbEntryId, LPENTRYID& lpEntryId, BOOL delVal=FALSE);
3936 + BOOL HandleHierarchyItem( ULONG oType, ULONG cb, LPENTRYID pEntry,nsMapiEntryArray& aFolders);
3937 + BOOL IterateHierarchy(IMAPIContainer * pFolder, nsMapiEntryArray& aFolders,ULONG flags=0);
3938 + ULONG GetEmailPropertyTag(LPMAPIPROP lpProp, LONG nameID);
3939 + ULONG GetRealMapiPropertyTag(LPMAPIPROP lpProp, LONG aPropertyTag,BOOL aTest=FALSE);
3940 + LPMDB GetMsgStore(const nsMapiEntry& aEntry);
3941 + BOOL CreateEntryInList(const nsMapiEntry& aParent, nsMapiEntry& aNewEntry);
3942 + BOOL AddEntryToList(const nsMapiEntry& aParent,const nsMapiEntry& aNewEntry);
3943 + BOOL DeleteEntryFromList(const nsMapiEntry& aDistlist, const nsMapiEntry& aNewEntry);
3944 + BOOL GetEntryParent(const nsMapiEntry& aParent, nsMapiEntry& aParentEntry);
3945 + BOOL CorrectRestriction(const LPMAPIPROP aMapiProp,ULONG aRestrictionNum, LPSRestriction aRestriction);
3946 +
3947 + //filter
3948 + BOOL Filter( LPSRestriction aRestriction,nsMapiEntryArray * aList);
3949 + BOOL FilterOnOneRow(nsMapiEntry *aEntry,LPSRestriction aRestriction);
3950 + BOOL AtomyFilter(LPSRestriction aRestriction,LPSPropValue aRealValue,LPSPropValue aFilterValue);
3951 +
3952 + void AddToMDBArray(LPMDB aMDB)
3953 + {
3954 + m_MDBArray.AppendElement(aMDB);
3955 + }
3956 + void CleanUpMDB()
3957 + {
3958 + LPMDB mdb;
3959 + for (int i = 0; i < m_MDBArray.Count(); i++)
3960 + {
3961 + mdb = (LPMDB)m_MDBArray.ElementAt(i);
3962 + mdb->Release();
3963 + }
3964 + m_MDBArray.Clear();
3965 + }
3967 private :
3968 + //use to keep all openned MsgStore,if we not open a message store,we can't open any thing on it
3969 + //so we have to kill message stores openned
3970 + nsVoidArray m_MDBArray;
3971 } ;
3973 #endif // nsMapiAddressBook_h___
3974 Index: mailnews/addrbook/src/nsWabAddressBook.cpp
3975 ===================================================================
3976 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp,v
3977 retrieving revision 1.6
3978 diff -u -r1.6 nsWabAddressBook.cpp
3979 --- misc/build/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp 30 Oct 2001 07:59:16 -0000 1.6
3980 +++ misc/build/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp 17 May 2004 03:23:55 -0000
3981 @@ -47,6 +47,22 @@
3983 #define PRINTF(args) PR_LOG(gWabAddressBookLog, PR_LOG_DEBUG, args)
3985 +enum
3986 +{
3987 + ContentsColumnEntryId = 0,
3988 + ContentsColumnObjectType,
3989 + ContentsColumnsSize
3990 +} ;
3991 +
3992 +static const SizedSPropTagArray(ContentsColumnsSize, ContentsColumns) =
3993 +{
3994 + ContentsColumnsSize,
3995 + {
3996 + PR_ENTRYID,
3997 + PR_OBJECT_TYPE
3998 + }
3999 +} ;
4000 +
4001 HMODULE nsWabAddressBook::mLibrary = NULL ;
4002 PRInt32 nsWabAddressBook::mLibUsage = 0 ;
4003 LPWABOPEN nsWabAddressBook::mWABOpen = NULL ;
4004 @@ -95,7 +111,7 @@
4005 MOZ_DECL_CTOR_COUNTER(nsWabAddressBook)
4007 nsWabAddressBook::nsWabAddressBook(void)
4008 -: nsAbWinHelper()
4009 +: nsAbWinHelper(),mAddressBook(NULL)
4010 {
4011 BOOL result = Initialize() ;
4013 @@ -110,9 +126,254 @@
4014 MOZ_COUNT_DTOR(nsWabAddressBook) ;
4015 }
4017 +BOOL nsWabAddressBook::GetFolders(nsMapiEntryArray& aFolders)
4018 +{
4019 + aFolders.CleanUp() ;
4020 + nsMapiInterfaceWrapper<LPABCONT> rootFolder ;
4021 + nsMapiInterfaceWrapper<LPMAPITABLE> folders ;
4022 + ULONG objType = 0 ;
4023 + ULONG rowCount = 0 ;
4024 + SRestriction restriction ;
4025 + SPropTagArray folderColumns ;
4026 +
4027 + mLastError = OpenEntry(0, NULL, NULL, 0, &objType,
4028 + rootFolder);
4029 + if (HR_FAILED(mLastError)){
4030 + PRINTF(("Cannot open root %08x.\n", mLastError));
4031 + return FALSE;
4032 + }
4033 + mLastError = rootFolder->GetHierarchyTable(0, folders);
4034 + if (HR_FAILED(mLastError)){
4035 + PRINTF(("Cannot get hierarchy %08x.\n", mLastError));
4036 + return FALSE;
4037 + }
4038 + // We only take into account modifiable containers,
4039 + // otherwise, we end up with all the directory services...
4040 + restriction.rt = RES_BITMASK ;
4041 + restriction.res.resBitMask.ulPropTag = PR_CONTAINER_FLAGS ;
4042 + restriction.res.resBitMask.relBMR = BMR_NEZ ;
4043 + restriction.res.resBitMask.ulMask = AB_MODIFIABLE ;
4044 + mLastError = folders->Restrict(&restriction, 0) ;
4045 + if (HR_FAILED(mLastError)) {
4046 + PRINTF(("Cannot restrict table %08x.\n", mLastError)) ;
4047 + }
4048 + folderColumns.cValues = 1 ;
4049 + folderColumns.aulPropTag [0] = PR_ENTRYID ;
4050 + mLastError = folders->SetColumns(&folderColumns, 0) ;
4051 + if (HR_FAILED(mLastError)) {
4052 + PRINTF(("Cannot set columns %08x.\n", mLastError)) ;
4053 + return FALSE ;
4054 + }
4055 + mLastError = folders->GetRowCount(0, &rowCount) ;
4056 + if (HR_SUCCEEDED(mLastError)) {
4057 + do {
4058 + LPSRowSet rowSet = NULL ;
4059 +
4060 + rowCount = 0 ;
4061 + mLastError = folders->QueryRows(1, 0, &rowSet) ;
4062 + if (HR_SUCCEEDED(mLastError)) {
4063 + rowCount = rowSet->cRows ;
4064 + if (rowCount > 0) {
4065 + SPropValue& currentValue = rowSet->aRow->lpProps [0] ;
4066 +
4067 + aFolders.AddItem(currentValue.Value.bin.cb,
4068 + NS_REINTERPRET_CAST(LPENTRYID, currentValue.Value.bin.lpb)) ;
4069 + }
4070 + MyFreeProws(rowSet) ;
4071 + }
4072 + else {
4073 + PRINTF(("Cannot query rows %08x.\n", mLastError)) ;
4074 + }
4075 + } while (rowCount > 0) ;
4076 + }
4077 + return HR_SUCCEEDED(mLastError) ;
4078 +}
4079 +BOOL nsWabAddressBook::GetContents(const nsMapiEntry& aParent, LPSRestriction aRestriction,
4080 + nsMapiEntryArray *aList, ULONG aMapiType)
4081 +{
4082 + if (aList) { aList->CleanUp(); }
4083 + nsMapiInterfaceWrapper<LPMAPICONTAINER> parent ;
4084 + nsMapiInterfaceWrapper<LPMAPITABLE> contents ;
4085 + ULONG objType = 0 ;
4086 + ULONG rowCount = 0 ;
4087 +
4088 + mLastError = OpenEntry(aParent.mByteCount, aParent.mEntryId,
4089 + &IID_IMAPIContainer, 0, &objType,
4090 + parent) ;
4091 + if (HR_FAILED(mLastError)) {
4092 + PRINTF(("Cannot open parent %08x.\n", mLastError)) ;
4093 + return FALSE ;
4094 + }
4095 + // Here, flags for WAB and MAPI could be different, so this works
4096 + // only as long as we don't want to use any flag in GetContentsTable
4097 + mLastError = parent->GetContentsTable(0, contents) ;
4098 + if (HR_FAILED(mLastError)) {
4099 + PRINTF(("Cannot get contents %08x.\n", mLastError)) ;
4100 + return FALSE ;
4101 + }
4102 + if (aRestriction) {
4103 + mLastError = contents->Restrict(aRestriction, 0) ;
4104 + if (HR_FAILED(mLastError)) {
4105 + PRINTF(("Cannot set restriction %08x.\n", mLastError)) ;
4106 + return FALSE ;
4107 + }
4108 + }
4109 + int entryId = ContentsColumnEntryId ;
4110 + int objectType = ContentsColumnObjectType ;
4111 +
4112 + if (aRestriction)
4113 + {
4114 + LPSPropTagArray allColumns = NULL ;
4115 +
4116 + mLastError = contents->QueryColumns(TBL_ALL_COLUMNS, &allColumns) ;
4117 + if (HR_FAILED(mLastError)) {
4118 + PRINTF(("Cannot query columns %08x.\n", mLastError)) ;
4119 + return FALSE ;
4120 + }
4121 +
4122 + for (unsigned int j = 0 ; j < allColumns->cValues ; ++ j) {
4123 + if (allColumns->aulPropTag [j] == PR_ENTRYID) {
4124 + entryId = j ;
4125 + }
4126 + else if (allColumns->aulPropTag [j] == PR_OBJECT_TYPE) {
4127 + objectType = j ;
4128 + }
4129 + }
4130 + mLastError = contents->SetColumns(allColumns, 0) ;
4131 + if (HR_FAILED(mLastError)) {
4132 + PRINTF(("Cannot set columns %08x.\n", mLastError)) ;
4133 + return FALSE ;
4134 + }
4135 + FreeBuffer(allColumns) ;
4136 + }
4137 + else
4138 + {
4139 +
4140 + mLastError = contents->SetColumns((LPSPropTagArray) &ContentsColumns, 0) ;
4141 + if (HR_FAILED(mLastError)) {
4142 + PRINTF(("Cannot set columns %08x.\n", mLastError)) ;
4143 + return FALSE ;
4144 + }
4145 + }
4146 +
4147 + mLastError = contents->GetRowCount(0, &rowCount) ;
4148 + if (HR_FAILED(mLastError)) {
4149 + PRINTF(("Cannot get result count %08x.\n", mLastError)) ;
4150 + return FALSE ;
4151 + }
4152 + do {
4153 + LPSRowSet rowSet = NULL ;
4154 +
4155 + rowCount = 0 ;
4156 + mLastError = contents->QueryRows(1, 0, &rowSet) ;
4157 + if (HR_FAILED(mLastError)) {
4158 + PRINTF(("Cannot query rows %08x.\n", mLastError)) ;
4159 + return FALSE ;
4160 + }
4161 + rowCount = rowSet->cRows ;
4162 + if (rowCount > 0 &&
4163 + (aMapiType == 0 ||
4164 + rowSet->aRow->lpProps[objectType].Value.ul == aMapiType)) {
4165 + if (aList) {
4166 + SPropValue& currentValue = rowSet->aRow->lpProps[entryId] ;
4167 +
4168 + aList->AddItem(currentValue.Value.bin.cb,
4169 + NS_REINTERPRET_CAST(LPENTRYID, currentValue.Value.bin.lpb)) ;
4170 +
4171 + }
4172 + }
4173 + MyFreeProws(rowSet) ;
4174 + } while (rowCount > 0) ;
4175 + return TRUE ;
4176 +}
4177 +
4178 +BOOL nsWabAddressBook::GetMAPIProperties(const nsMapiEntry& aObject, const ULONG *aPropertyTags,
4179 + ULONG aNbProperties, LPSPropValue& aValue,
4180 + ULONG& aValueCount)
4181 +{
4182 + nsMapiInterfaceWrapper<LPMAPIPROP> object ;
4183 + IMsgStore * mdb=NULL;
4184 + ULONG objType = 0 ;
4185 + LPSPropTagArray properties = NULL ;
4186 + ULONG i = 0 ;
4187 +
4188 + mLastError = OpenEntry(aObject.mByteCount, aObject.mEntryId,
4189 + &IID_IMAPIProp, 0, &objType,
4190 + object) ;
4191 +
4192 + if (HR_FAILED(mLastError)){
4193 + PRINTF(("Cannot open entry %08x.\n", mLastError));
4194 + return FALSE;
4195 + }
4196 + AllocateBuffer(CbNewSPropTagArray(aNbProperties),
4197 + NS_REINTERPRET_CAST(void **, &properties));
4198 + properties->cValues = aNbProperties;
4199 + for (i = 0 ; i < aNbProperties ; ++ i) {
4200 + properties->aulPropTag [i] = aPropertyTags [i];
4201 + }
4202 + mLastError = object->GetProps(properties, 0, &aValueCount, &aValue);
4203 + FreeBuffer(properties);
4204 + if (HR_FAILED(mLastError)){
4205 + PRINTF(("Cannot get props %08x.\n", mLastError));
4206 + }
4207 + return HR_SUCCEEDED(mLastError) ;
4208 +}
4209 +
4210 +BOOL nsWabAddressBook::SetMAPIProperties(const nsMapiEntry& aObject, ULONG aNbProperties,
4211 + LPSPropValue& aValues)
4212 +{
4213 + nsMapiInterfaceWrapper<LPMAPIPROP> object ;
4214 + ULONG objType = 0 ;
4215 + LPSPropProblemArray problems = NULL ;
4216 +
4217 + mLastError = OpenEntry(aObject.mByteCount, aObject.mEntryId,
4218 + &IID_IMAPIProp, MAPI_MODIFY, &objType,
4219 + object) ;
4220 + if (HR_FAILED(mLastError)) {
4221 + PRINTF(("Cannot open entry %08x.\n", mLastError)) ;
4222 + return FALSE ;
4223 + }
4224 + mLastError = object->SetProps(aNbProperties, aValues, &problems) ;
4225 + if (HR_FAILED(mLastError)) {
4226 + PRINTF(("Cannot update the object %08x.\n", mLastError)) ;
4227 + return FALSE ;
4228 + }
4229 + if (problems) {
4230 + for (ULONG i = 0 ; i < problems->cProblem ; ++ i) {
4231 + PRINTF(("Problem %d: index %d code %08x.\n", i,
4232 + problems->aProblem [i].ulIndex,
4233 + problems->aProblem [i].scode));
4234 + }
4235 + }
4236 + mLastError = object->SaveChanges(0) ;
4237 + if (HR_FAILED(mLastError)) {
4238 + PRINTF(("Cannot commit changes %08x.\n", mLastError)) ;
4239 + }
4240 + return HR_SUCCEEDED(mLastError) ;
4241 +}
4242 +
4243 +BOOL nsWabAddressBook::GetDefaultContainer(nsMapiEntry& aContainer)
4244 +{
4245 + LPENTRYID entryId = NULL;
4246 + ULONG byteCount = 0;
4247 +
4248 + mLastError = mAddressBook->GetPAB(&byteCount, &entryId);
4249 + if (HR_FAILED(mLastError)){
4250 + PRINTF(("Cannot get PAB %08x.\n", mLastError));
4251 + return FALSE;
4252 + }
4253 + aContainer.Assign(byteCount, entryId);
4254 + FreeBuffer(entryId) ;
4255 + return TRUE ;
4256 +}
4257 +
4258 +BOOL nsWabAddressBook::IsOK(void)
4259 +{
4260 + return mAddressBook != NULL ;
4261 +}
4262 +
4263 BOOL nsWabAddressBook::Initialize(void)
4264 {
4265 - if (mAddressBook) { return TRUE ; }
4266 nsAutoLock guard(mMutex) ;
4268 if (!LoadWabLibrary()) {
4269 Index: mailnews/addrbook/src/nsWabAddressBook.h
4270 ===================================================================
4271 RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsWabAddressBook.h,v
4272 retrieving revision 1.2
4273 diff -u -r1.2 nsWabAddressBook.h
4274 --- misc/build/mozilla/mailnews/addrbook/src/nsWabAddressBook.h 28 Sep 2001 20:06:25 -0000 1.2
4275 +++ misc/build/mozilla/mailnews/addrbook/src/nsWabAddressBook.h 17 May 2004 03:23:55 -0000
4276 @@ -47,6 +47,15 @@
4277 nsWabAddressBook(void) ;
4278 virtual ~nsWabAddressBook(void) ;
4280 + // Get the top address books
4281 + virtual BOOL GetFolders(nsMapiEntryArray& aFolders);
4282 +
4283 + // Get a default address book container
4284 + virtual BOOL GetDefaultContainer(nsMapiEntry& aContainer);
4285 + // Is the helper correctly initialised?
4286 + virtual BOOL IsOK(void);
4287 + static void FreeWabLibrary(void) ;
4288 +
4289 protected :
4290 // Session and address book that will be shared by all instances
4291 // (see nsMapiAddressBook.h for details)
4292 @@ -57,15 +66,46 @@
4293 static HMODULE mLibrary ;
4294 static LPWABOPEN mWABOpen ;
4296 + LPADRBOOK mAddressBook ;
4297 +
4298 // Load the WAB environment
4299 BOOL Initialize(void) ;
4300 +
4301 + virtual HRESULT OpenEntry(ULONG cbEntryID,
4302 + LPENTRYID lpEntryID,
4303 + LPCIID lpInterface,
4304 + ULONG ulFlags,
4305 + ULONG FAR * lpulObjType,
4306 + LPUNKNOWN FAR * lppUnk
4307 + )
4308 + {
4309 + return mAddressBook->OpenEntry(cbEntryID,
4310 + lpEntryID,
4311 + lpInterface,
4312 + ulFlags,
4313 + lpulObjType,
4314 + lppUnk
4315 + );
4316 + }
4317 +
4318 +
4319 + // Retrieve the contents of a container, with an optional restriction
4320 + virtual BOOL GetContents(const nsMapiEntry& aParent, LPSRestriction aRestriction,
4321 + nsMapiEntryArray *aList, ULONG aMapiType) ;
4322 + // Retrieve the values of a set of properties on a MAPI object
4323 + virtual BOOL GetMAPIProperties(const nsMapiEntry& aObject, const ULONG *aPropertyTags,
4324 + ULONG aNbProperties,
4325 + LPSPropValue& aValues, ULONG& aValueCount) ;
4326 + // Set the values of a set of properties on a MAPI object
4327 + virtual BOOL SetMAPIProperties(const nsMapiEntry& aObject, ULONG aNbProperties,
4328 + LPSPropValue& aValues) ;
4329 +
4330 // Allocation of a buffer for transmission to interfaces
4331 virtual void AllocateBuffer(ULONG aByteCount, LPVOID *aBuffer) ;
4332 // Destruction of a buffer provided by the interfaces
4333 virtual void FreeBuffer(LPVOID aBuffer) ;
4334 // Manage the library
4335 static BOOL LoadWabLibrary(void) ;
4336 - static void FreeWabLibrary(void) ;
4338 private :
4339 } ;
4340 Index: profile/src/nsProfile.cpp
4341 ===================================================================
4342 RCS file: /cvsroot/mozilla/profile/src/nsProfile.cpp,v
4343 retrieving revision 1.298
4344 diff -u -r1.298 nsProfile.cpp
4345 --- misc/build/mozilla/profile/src/nsProfile.cpp 28 Feb 2004 22:34:02 -0000 1.298
4346 +++ misc/build/mozilla/profile/src/nsProfile.cpp 17 May 2004 03:24:08 -0000
4347 @@ -37,7 +37,9 @@
4349 #include "nscore.h"
4350 #include "nsProfile.h"
4351 +#ifdef MOZ_PROFILELOCKING
4352 #include "nsProfileLock.h"
4353 +#endif
4354 #include "nsIPrefService.h"
4355 #include "nsIPrefBranch.h"
4357 @@ -499,12 +501,14 @@
4358 profileURLStr = PROFILE_MANAGER_URL;
4359 if (exists)
4360 {
4361 +#ifdef MOZ_PROFILELOCKING
4362 // If the profile is locked, we need the UI
4363 nsCOMPtr<nsILocalFile> localFile(do_QueryInterface(curProfileDir));
4364 nsProfileLock tempLock;
4365 rv = tempLock.Lock(localFile);
4366 if (NS_FAILED(rv))
4367 profileURLStr = PROFILE_MANAGER_URL;
4368 +#endif
4369 }
4370 }
4371 else
4372 @@ -1173,7 +1177,7 @@
4373 }
4374 else
4375 isSwitch = PR_FALSE;
4376 -
4377 +#ifdef MOZ_PROFILELOCKING
4378 nsProfileLock localLock;
4379 nsCOMPtr<nsILocalFile> localProfileDir(do_QueryInterface(profileDir, &rv));
4380 if (NS_FAILED(rv)) return rv;
4381 @@ -1183,7 +1187,7 @@
4382 NS_ERROR("Could not get profile directory lock.");
4383 return rv;
4384 }
4385 -
4386 +#endif
4387 nsCOMPtr<nsIObserverService> observerService =
4388 do_GetService("@mozilla.org/observer-service;1", &rv);
4389 NS_ENSURE_TRUE(observerService, NS_ERROR_FAILURE);
4390 @@ -1237,8 +1241,10 @@
4391 UpdateCurrentProfileModTime(PR_FALSE);
4392 }
4394 +#ifdef MOZ_PROFILELOCKING
4395 // Do the profile switch
4396 localLock.Unlock(); // gDirServiceProvider will get and hold its own lock
4397 +#endif
4398 gDirServiceProvider->SetProfileDir(profileDir);
4399 mCurrentProfileName.Assign(aCurrentProfile);
4400 gProfileDataAccess->SetCurrentProfile(aCurrentProfile);
4401 Index: security/nss/lib/nss/config.mk
4402 ===================================================================
4403 RCS file: /cvsroot/mozilla/security/nss/lib/nss/config.mk,v
4404 retrieving revision 1.21
4405 diff -u -r1.21 config.mk
4406 --- misc/build/mozilla/security/nss/lib/nss/config.mk 20 Apr 2003 04:23:32 -0000 1.21
4407 +++ misc/build/mozilla/security/nss/lib/nss/config.mk 17 May 2004 03:24:08 -0000
4408 @@ -105,7 +105,7 @@
4409 ifeq ($(OS_TARGET),SunOS)
4410 # The -R '$ORIGIN' linker option instructs libnss3.so to search for its
4411 # dependencies (libsoftokn3.so) in the same directory where it resides.
4412 -MKSHLIB += -R '$$ORIGIN'
4413 +#MKSHLIB += -R '$$ORIGIN'
4414 endif
4416 ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
4417 --- misc/build/mozilla/security/nss/lib/nss/nss.def 2004-07-13 10:38:04.000000000 +0800
4418 +++ misc/build/mozilla/security/nss/lib/nss/nss.def 2004-05-20 01:32:27.000000000 +0800
4419 @@ -60,6 +60,7 @@
4420 CERT_CheckCertValidTimes;
4421 CERT_CreateCertificateRequest;
4422 CERT_ChangeCertTrust;
4423 +CERT_DecodeDERCertificate;
4424 CERT_DecodeDERCrl;
4425 CERT_DestroyCertificateRequest;
4426 CERT_DestroyCertList;
4427 @@ -212,6 +213,7 @@
4428 PK11_GetBestSlot;
4429 PK11_GetBestSlotMultiple;
4430 PK11_GetBestWrapMechanism;
4431 +PK11_GetCertFromPrivateKey;
4432 PK11_GetCurrentWrapIndex;
4433 PK11_GetMechanism;
4434 PK11_GetModuleID;
4435 Index: security/nss/lib/softoken/config.mk
4436 ===================================================================
4437 RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v
4438 retrieving revision 1.14
4439 diff -u -r1.14 config.mk
4440 --- misc/build/mozilla/security/nss/lib/softoken/config.mk 16 May 2003 20:21:20 -0000 1.14
4441 +++ misc/build/mozilla/security/nss/lib/softoken/config.mk 17 May 2004 03:24:08 -0000
4442 @@ -88,7 +88,7 @@
4443 ifeq ($(CPU_ARCH),sparc)
4444 # The -R '$ORIGIN' linker option instructs libsoftokn3.so to search for its
4445 # dependencies (libfreebl_*.so) in the same directory where it resides.
4446 -MKSHLIB += -R '$$ORIGIN'
4447 +#MKSHLIB += -R '$$ORIGIN'
4448 endif
4449 endif
4450 endif
4452 Index: mailnews/addrbook/src/nsAbMD5sum.cpp
4453 ===================================================================
4454 --- misc/mozilla/mailnews/addrbook/src/nsAbMD5sum.cpp 2005-01-09 00:07:11.359375000 -0500
4455 +++ misc/build/mozilla/mailnews/addrbook/src/nsAbMD5sum.cpp 2004-03-29 16:43:58.000000000 +0800
4456 @@ -1 +1,633 @@
4457 -dummy
4458 +/*
4459 + * The contents of this file are subject to the Mozilla Public
4460 + * License Version 1.1 (the "License"); you may not use this file
4461 + * except in compliance with the License. You may obtain a copy of
4462 + * the License at http://www.mozilla.org/MPL/
4463 + *
4464 + * Software distributed under the License is distributed on an "AS
4465 + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
4466 + * implied. See the License for the specific language governing
4467 + * rights and limitations under the License.
4468 + *
4469 + * The Original Code is the Netscape security libraries.
4470 + *
4471 + * The Initial Developer of the Original Code is Netscape
4472 + * Communications Corporation. Portions created by Netscape are
4473 + * Copyright (C) 1994-2000 Netscape Communications Corporation. All
4474 + * Rights Reserved.
4475 + *
4476 + * Contributor(s):
4477 + *
4478 + * Alternatively, the contents of this file may be used under the
4479 + * terms of the GNU General Public License Version 2 or later (the
4480 + * "GPL"), in which case the provisions of the GPL are applicable
4481 + * instead of those above. If you wish to allow use of your
4482 + * version of this file only under the terms of the GPL and not to
4483 + * allow others to use your version of this file under the MPL,
4484 + * indicate your decision by deleting the provisions above and
4485 + * replace them with the notice and other provisions required by
4486 + * the GPL. If you do not delete the provisions above, a recipient
4487 + * may use your version of this file under either the MPL or the
4488 + * GPL.
4489 + */
4490 +#include <stdio.h>
4491 +#include <stdlib.h>
4492 +
4493 +#include "prerr.h"
4494 +
4495 +#include "prtypes.h"
4496 +#include "prlong.h"
4497 +#include "plstr.h"
4498 +#include "nsMemory.h"
4499 +
4500 +#define MD5_HASH_LEN 16
4501 +#define MD5_BUFFER_SIZE 64
4502 +#define MD5_END_BUFFER (MD5_BUFFER_SIZE - 8)
4503 +
4504 +#define CV0_1 0x67452301
4505 +#define CV0_2 0xefcdab89
4506 +#define CV0_3 0x98badcfe
4507 +#define CV0_4 0x10325476
4508 +
4509 +#define T1_0 0xd76aa478
4510 +#define T1_1 0xe8c7b756
4511 +#define T1_2 0x242070db
4512 +#define T1_3 0xc1bdceee
4513 +#define T1_4 0xf57c0faf
4514 +#define T1_5 0x4787c62a
4515 +#define T1_6 0xa8304613
4516 +#define T1_7 0xfd469501
4517 +#define T1_8 0x698098d8
4518 +#define T1_9 0x8b44f7af
4519 +#define T1_10 0xffff5bb1
4520 +#define T1_11 0x895cd7be
4521 +#define T1_12 0x6b901122
4522 +#define T1_13 0xfd987193
4523 +#define T1_14 0xa679438e
4524 +#define T1_15 0x49b40821
4525 +
4526 +#define T2_0 0xf61e2562
4527 +#define T2_1 0xc040b340
4528 +#define T2_2 0x265e5a51
4529 +#define T2_3 0xe9b6c7aa
4530 +#define T2_4 0xd62f105d
4531 +#define T2_5 0x02441453
4532 +#define T2_6 0xd8a1e681
4533 +#define T2_7 0xe7d3fbc8
4534 +#define T2_8 0x21e1cde6
4535 +#define T2_9 0xc33707d6
4536 +#define T2_10 0xf4d50d87
4537 +#define T2_11 0x455a14ed
4538 +#define T2_12 0xa9e3e905
4539 +#define T2_13 0xfcefa3f8
4540 +#define T2_14 0x676f02d9
4541 +#define T2_15 0x8d2a4c8a
4542 +
4543 +#define T3_0 0xfffa3942
4544 +#define T3_1 0x8771f681
4545 +#define T3_2 0x6d9d6122
4546 +#define T3_3 0xfde5380c
4547 +#define T3_4 0xa4beea44
4548 +#define T3_5 0x4bdecfa9
4549 +#define T3_6 0xf6bb4b60
4550 +#define T3_7 0xbebfbc70
4551 +#define T3_8 0x289b7ec6
4552 +#define T3_9 0xeaa127fa
4553 +#define T3_10 0xd4ef3085
4554 +#define T3_11 0x04881d05
4555 +#define T3_12 0xd9d4d039
4556 +#define T3_13 0xe6db99e5
4557 +#define T3_14 0x1fa27cf8
4558 +#define T3_15 0xc4ac5665
4559 +
4560 +#define T4_0 0xf4292244
4561 +#define T4_1 0x432aff97
4562 +#define T4_2 0xab9423a7
4563 +#define T4_3 0xfc93a039
4564 +#define T4_4 0x655b59c3
4565 +#define T4_5 0x8f0ccc92
4566 +#define T4_6 0xffeff47d
4567 +#define T4_7 0x85845dd1
4568 +#define T4_8 0x6fa87e4f
4569 +#define T4_9 0xfe2ce6e0
4570 +#define T4_10 0xa3014314
4571 +#define T4_11 0x4e0811a1
4572 +#define T4_12 0xf7537e82
4573 +#define T4_13 0xbd3af235
4574 +#define T4_14 0x2ad7d2bb
4575 +#define T4_15 0xeb86d391
4576 +
4577 +#define R1B0 0
4578 +#define R1B1 1
4579 +#define R1B2 2
4580 +#define R1B3 3
4581 +#define R1B4 4
4582 +#define R1B5 5
4583 +#define R1B6 6
4584 +#define R1B7 7
4585 +#define R1B8 8
4586 +#define R1B9 9
4587 +#define R1B10 10
4588 +#define R1B11 11
4589 +#define R1B12 12
4590 +#define R1B13 13
4591 +#define R1B14 14
4592 +#define R1B15 15
4593 +
4594 +#define R2B0 1
4595 +#define R2B1 6
4596 +#define R2B2 11
4597 +#define R2B3 0
4598 +#define R2B4 5
4599 +#define R2B5 10
4600 +#define R2B6 15
4601 +#define R2B7 4
4602 +#define R2B8 9
4603 +#define R2B9 14
4604 +#define R2B10 3
4605 +#define R2B11 8
4606 +#define R2B12 13
4607 +#define R2B13 2
4608 +#define R2B14 7
4609 +#define R2B15 12
4610 +
4611 +#define R3B0 5
4612 +#define R3B1 8
4613 +#define R3B2 11
4614 +#define R3B3 14
4615 +#define R3B4 1
4616 +#define R3B5 4
4617 +#define R3B6 7
4618 +#define R3B7 10
4619 +#define R3B8 13
4620 +#define R3B9 0
4621 +#define R3B10 3
4622 +#define R3B11 6
4623 +#define R3B12 9
4624 +#define R3B13 12
4625 +#define R3B14 15
4626 +#define R3B15 2
4627 +
4628 +#define R4B0 0
4629 +#define R4B1 7
4630 +#define R4B2 14
4631 +#define R4B3 5
4632 +#define R4B4 12
4633 +#define R4B5 3
4634 +#define R4B6 10
4635 +#define R4B7 1
4636 +#define R4B8 8
4637 +#define R4B9 15
4638 +#define R4B10 6
4639 +#define R4B11 13
4640 +#define R4B12 4
4641 +#define R4B13 11
4642 +#define R4B14 2
4643 +#define R4B15 9
4644 +
4645 +#define S1_0 7
4646 +#define S1_1 12
4647 +#define S1_2 17
4648 +#define S1_3 22
4649 +
4650 +#define S2_0 5
4651 +#define S2_1 9
4652 +#define S2_2 14
4653 +#define S2_3 20
4654 +
4655 +#define S3_0 4
4656 +#define S3_1 11
4657 +#define S3_2 16
4658 +#define S3_3 23
4659 +
4660 +#define S4_0 6
4661 +#define S4_1 10
4662 +#define S4_2 15
4663 +#define S4_3 21
4664 +
4665 +struct MD5ContextStr {
4666 + PRUint32 lsbInput;
4667 + PRUint32 msbInput;
4668 + PRUint32 cv[4];
4669 + union {
4670 + PRUint8 b[64];
4671 + PRUint32 w[16];
4672 + } u;
4673 +};
4674 +typedef struct MD5ContextStr MD5Context;
4675 +
4676 +#define inBuf u.b
4677 +
4678 +int MD5_Hash(unsigned char *dest, const char *src);
4679 +int MD5_HashBuf(unsigned char *dest, const unsigned char *src, uint32 src_length);
4680 +MD5Context * MD5_NewContext(void);
4681 +void MD5_DestroyContext(MD5Context *cx, PRBool freeit);
4682 +void MD5_Begin(MD5Context *cx);
4683 +static void md5_compress(MD5Context *cx);
4684 +void MD5_Update(MD5Context *cx, const unsigned char *input, unsigned int inputLen);
4685 +void MD5_End(MD5Context *cx, unsigned char *digest,
4686 + unsigned int *digestLen, unsigned int maxDigestLen);
4687 +unsigned int MD5_FlattenSize(MD5Context *cx);
4688 +int MD5_Flatten(MD5Context *cx, unsigned char *space);
4689 +MD5Context * MD5_Resurrect(unsigned char *space, void *arg);
4690 +void MD5_TraceState(MD5Context *cx);
4691 +
4692 +int
4693 +MD5_Hash(unsigned char *dest, const char *src)
4694 +{
4695 + return MD5_HashBuf(dest, (unsigned char *)src, PL_strlen(src));
4696 +}
4697 +
4698 +int
4699 +MD5_HashBuf(unsigned char *dest, const unsigned char *src, uint32 src_length)
4700 +{
4701 + unsigned int len;
4702 + MD5Context *cx = MD5_NewContext();
4703 + if (cx == NULL) {
4704 +// PORT_SetError(PR_OUT_OF_MEMORY_ERROR);
4705 + return -1;
4706 + }
4707 + MD5_Begin(cx);
4708 + MD5_Update(cx, src, src_length);
4709 + MD5_End(cx, dest, &len, MD5_HASH_LEN);
4710 + MD5_DestroyContext(cx, PR_TRUE);
4711 + return 0;
4712 +}
4713 +
4714 +MD5Context *
4715 +MD5_NewContext(void)
4716 +{
4717 + MD5Context *cx = (MD5Context *)malloc(sizeof(MD5Context));
4718 + if (cx == NULL) {
4719 +// PORT_SetError(PR_OUT_OF_MEMORY_ERROR);
4720 + return NULL;
4721 + }
4722 + return cx;
4723 +}
4724 +
4725 +void
4726 +MD5_DestroyContext(MD5Context *cx, PRBool freeit)
4727 +{
4728 + if (freeit) {
4729 + free(cx);
4730 + }
4731 +}
4732 +
4733 +void
4734 +MD5_Begin(MD5Context *cx)
4735 +{
4736 + cx->lsbInput = 0;
4737 + cx->msbInput = 0;
4738 + memset(cx->inBuf, 0, sizeof(cx->inBuf));
4739 + cx->cv[0] = CV0_1;
4740 + cx->cv[1] = CV0_2;
4741 + cx->cv[2] = CV0_3;
4742 + cx->cv[3] = CV0_4;
4743 +}
4744 +
4745 +#define cls(i32, s) (tmp = i32, tmp << s | tmp >> (32 - s))
4746 +
4747 +#define MASK 0x00ff00ff
4748 +#ifdef IS_LITTLE_ENDIAN
4749 +#define lendian(i32) \
4750 + (i32)
4751 +#else
4752 +#define lendian(i32) \
4753 + (tmp = i32 >> 16 | i32 << 16, (tmp & MASK) << 8 | tmp >> 8 & MASK)
4754 +#endif
4755 +
4756 +#if defined(SOLARIS) || defined(HPUX)
4757 +#define addto64(sumhigh, sumlow, addend) \
4758 + sumlow += addend; sumhigh += (sumlow < addend);
4759 +#else
4760 +#define addto64(sumhigh, sumlow, addend) \
4761 + sumlow += addend; if (sumlow < addend) ++sumhigh;
4762 +#endif
4763 +
4764 +#define F(X, Y, Z) \
4765 + ((X & Y) | ((~X) & Z))
4766 +
4767 +#define G(X, Y, Z) \
4768 + ((X & Z) | (Y & (~Z)))
4769 +
4770 +#define H(X, Y, Z) \
4771 + (X ^ Y ^ Z)
4772 +
4773 +#define I(X, Y, Z) \
4774 + (Y ^ (X | (~Z)))
4775 +
4776 +#define FF(a, b, c, d, bufint, s, ti) \
4777 + a = b + cls(a + F(b, c, d) + bufint + ti, s)
4778 +
4779 +#define GG(a, b, c, d, bufint, s, ti) \
4780 + a = b + cls(a + G(b, c, d) + bufint + ti, s)
4781 +
4782 +#define HH(a, b, c, d, bufint, s, ti) \
4783 + a = b + cls(a + H(b, c, d) + bufint + ti, s)
4784 +
4785 +#define II(a, b, c, d, bufint, s, ti) \
4786 + a = b + cls(a + I(b, c, d) + bufint + ti, s)
4787 +
4788 +static void
4789 +md5_compress(MD5Context *cx)
4790 +{
4791 + PRUint32 a, b, c, d;
4792 + PRUint32 tmp;
4793 + a = cx->cv[0];
4794 + b = cx->cv[1];
4795 + c = cx->cv[2];
4796 + d = cx->cv[3];
4797 +#ifndef IS_LITTLE_ENDIAN
4798 + cx->u.w[0] = lendian(cx->u.w[0]);
4799 + cx->u.w[1] = lendian(cx->u.w[1]);
4800 + cx->u.w[2] = lendian(cx->u.w[2]);
4801 + cx->u.w[3] = lendian(cx->u.w[3]);
4802 + cx->u.w[4] = lendian(cx->u.w[4]);
4803 + cx->u.w[5] = lendian(cx->u.w[5]);
4804 + cx->u.w[6] = lendian(cx->u.w[6]);
4805 + cx->u.w[7] = lendian(cx->u.w[7]);
4806 + cx->u.w[8] = lendian(cx->u.w[8]);
4807 + cx->u.w[9] = lendian(cx->u.w[9]);
4808 + cx->u.w[10] = lendian(cx->u.w[10]);
4809 + cx->u.w[11] = lendian(cx->u.w[11]);
4810 + cx->u.w[12] = lendian(cx->u.w[12]);
4811 + cx->u.w[13] = lendian(cx->u.w[13]);
4812 + cx->u.w[14] = lendian(cx->u.w[14]);
4813 + cx->u.w[15] = lendian(cx->u.w[15]);
4814 +#endif
4815 + FF(a, b, c, d, cx->u.w[R1B0 ], S1_0, T1_0);
4816 + FF(d, a, b, c, cx->u.w[R1B1 ], S1_1, T1_1);
4817 + FF(c, d, a, b, cx->u.w[R1B2 ], S1_2, T1_2);
4818 + FF(b, c, d, a, cx->u.w[R1B3 ], S1_3, T1_3);
4819 + FF(a, b, c, d, cx->u.w[R1B4 ], S1_0, T1_4);
4820 + FF(d, a, b, c, cx->u.w[R1B5 ], S1_1, T1_5);
4821 + FF(c, d, a, b, cx->u.w[R1B6 ], S1_2, T1_6);
4822 + FF(b, c, d, a, cx->u.w[R1B7 ], S1_3, T1_7);
4823 + FF(a, b, c, d, cx->u.w[R1B8 ], S1_0, T1_8);
4824 + FF(d, a, b, c, cx->u.w[R1B9 ], S1_1, T1_9);
4825 + FF(c, d, a, b, cx->u.w[R1B10], S1_2, T1_10);
4826 + FF(b, c, d, a, cx->u.w[R1B11], S1_3, T1_11);
4827 + FF(a, b, c, d, cx->u.w[R1B12], S1_0, T1_12);
4828 + FF(d, a, b, c, cx->u.w[R1B13], S1_1, T1_13);
4829 + FF(c, d, a, b, cx->u.w[R1B14], S1_2, T1_14);
4830 + FF(b, c, d, a, cx->u.w[R1B15], S1_3, T1_15);
4831 + GG(a, b, c, d, cx->u.w[R2B0 ], S2_0, T2_0);
4832 + GG(d, a, b, c, cx->u.w[R2B1 ], S2_1, T2_1);
4833 + GG(c, d, a, b, cx->u.w[R2B2 ], S2_2, T2_2);
4834 + GG(b, c, d, a, cx->u.w[R2B3 ], S2_3, T2_3);
4835 + GG(a, b, c, d, cx->u.w[R2B4 ], S2_0, T2_4);
4836 + GG(d, a, b, c, cx->u.w[R2B5 ], S2_1, T2_5);
4837 + GG(c, d, a, b, cx->u.w[R2B6 ], S2_2, T2_6);
4838 + GG(b, c, d, a, cx->u.w[R2B7 ], S2_3, T2_7);
4839 + GG(a, b, c, d, cx->u.w[R2B8 ], S2_0, T2_8);
4840 + GG(d, a, b, c, cx->u.w[R2B9 ], S2_1, T2_9);
4841 + GG(c, d, a, b, cx->u.w[R2B10], S2_2, T2_10);
4842 + GG(b, c, d, a, cx->u.w[R2B11], S2_3, T2_11);
4843 + GG(a, b, c, d, cx->u.w[R2B12], S2_0, T2_12);
4844 + GG(d, a, b, c, cx->u.w[R2B13], S2_1, T2_13);
4845 + GG(c, d, a, b, cx->u.w[R2B14], S2_2, T2_14);
4846 + GG(b, c, d, a, cx->u.w[R2B15], S2_3, T2_15);
4847 + HH(a, b, c, d, cx->u.w[R3B0 ], S3_0, T3_0);
4848 + HH(d, a, b, c, cx->u.w[R3B1 ], S3_1, T3_1);
4849 + HH(c, d, a, b, cx->u.w[R3B2 ], S3_2, T3_2);
4850 + HH(b, c, d, a, cx->u.w[R3B3 ], S3_3, T3_3);
4851 + HH(a, b, c, d, cx->u.w[R3B4 ], S3_0, T3_4);
4852 + HH(d, a, b, c, cx->u.w[R3B5 ], S3_1, T3_5);
4853 + HH(c, d, a, b, cx->u.w[R3B6 ], S3_2, T3_6);
4854 + HH(b, c, d, a, cx->u.w[R3B7 ], S3_3, T3_7);
4855 + HH(a, b, c, d, cx->u.w[R3B8 ], S3_0, T3_8);
4856 + HH(d, a, b, c, cx->u.w[R3B9 ], S3_1, T3_9);
4857 + HH(c, d, a, b, cx->u.w[R3B10], S3_2, T3_10);
4858 + HH(b, c, d, a, cx->u.w[R3B11], S3_3, T3_11);
4859 + HH(a, b, c, d, cx->u.w[R3B12], S3_0, T3_12);
4860 + HH(d, a, b, c, cx->u.w[R3B13], S3_1, T3_13);
4861 + HH(c, d, a, b, cx->u.w[R3B14], S3_2, T3_14);
4862 + HH(b, c, d, a, cx->u.w[R3B15], S3_3, T3_15);
4863 + II(a, b, c, d, cx->u.w[R4B0 ], S4_0, T4_0);
4864 + II(d, a, b, c, cx->u.w[R4B1 ], S4_1, T4_1);
4865 + II(c, d, a, b, cx->u.w[R4B2 ], S4_2, T4_2);
4866 + II(b, c, d, a, cx->u.w[R4B3 ], S4_3, T4_3);
4867 + II(a, b, c, d, cx->u.w[R4B4 ], S4_0, T4_4);
4868 + II(d, a, b, c, cx->u.w[R4B5 ], S4_1, T4_5);
4869 + II(c, d, a, b, cx->u.w[R4B6 ], S4_2, T4_6);
4870 + II(b, c, d, a, cx->u.w[R4B7 ], S4_3, T4_7);
4871 + II(a, b, c, d, cx->u.w[R4B8 ], S4_0, T4_8);
4872 + II(d, a, b, c, cx->u.w[R4B9 ], S4_1, T4_9);
4873 + II(c, d, a, b, cx->u.w[R4B10], S4_2, T4_10);
4874 + II(b, c, d, a, cx->u.w[R4B11], S4_3, T4_11);
4875 + II(a, b, c, d, cx->u.w[R4B12], S4_0, T4_12);
4876 + II(d, a, b, c, cx->u.w[R4B13], S4_1, T4_13);
4877 + II(c, d, a, b, cx->u.w[R4B14], S4_2, T4_14);
4878 + II(b, c, d, a, cx->u.w[R4B15], S4_3, T4_15);
4879 + cx->cv[0] += a;
4880 + cx->cv[1] += b;
4881 + cx->cv[2] += c;
4882 + cx->cv[3] += d;
4883 +}
4884 +
4885 +void
4886 +MD5_Update(MD5Context *cx, const unsigned char *input, unsigned int inputLen)
4887 +{
4888 + PRUint32 bytesToConsume;
4889 + PRUint32 inBufIndex = cx->lsbInput & 63;
4890 +
4891 + /* Add the number of input bytes to the 64-bit input counter. */
4892 + addto64(cx->msbInput, cx->lsbInput, inputLen);
4893 + if (inBufIndex) {
4894 + /* There is already data in the buffer. Fill with input. */
4895 + bytesToConsume = PR_MIN(inputLen, MD5_BUFFER_SIZE - inBufIndex);
4896 + memcpy(&cx->inBuf[inBufIndex], input, bytesToConsume);
4897 + if (inBufIndex + bytesToConsume >= MD5_BUFFER_SIZE)
4898 + /* The buffer is filled. Run the compression function. */
4899 + md5_compress(cx);
4900 + /* Remaining input. */
4901 + inputLen -= bytesToConsume;
4902 + input += bytesToConsume;
4903 + }
4904 +
4905 + /* Iterate over 64-byte chunks of the message. */
4906 + while (inputLen >= MD5_BUFFER_SIZE) {
4907 + memcpy(cx->inBuf, input, MD5_BUFFER_SIZE);
4908 + md5_compress(cx);
4909 + inputLen -= MD5_BUFFER_SIZE;
4910 + input += MD5_BUFFER_SIZE;
4911 + }
4912 +
4913 + /* Tail of message (message bytes mod 64). */
4914 + if (inputLen)
4915 + memcpy(cx->inBuf, input, inputLen);
4916 +}
4917 +
4918 +static const unsigned char padbytes[] = {
4919 + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4920 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4921 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4922 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4923 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4924 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4925 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4926 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4927 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4928 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4929 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4930 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
4931 +};
4932 +
4933 +void
4934 +MD5_End(MD5Context *cx, unsigned char *digest,
4935 + unsigned int *digestLen, unsigned int maxDigestLen)
4936 +{
4937 +#ifndef IS_LITTLE_ENDIAN
4938 + PRUint32 tmp;
4939 +#endif
4940 + PRUint32 lowInput, highInput;
4941 + PRUint32 inBufIndex = cx->lsbInput & 63;
4942 +
4943 + if (maxDigestLen < MD5_HASH_LEN) {
4944 +// PORT_SetError(SEC_ERROR_INVALID_ARGS);
4945 + return;
4946 + }
4947 +
4948 + /* Copy out the length of bits input before padding. */
4949 + lowInput = cx->lsbInput;
4950 + highInput = (cx->msbInput << 3) | (lowInput >> 29);
4951 + lowInput <<= 3;
4952 +
4953 + if (inBufIndex < MD5_END_BUFFER) {
4954 + MD5_Update(cx, padbytes, MD5_END_BUFFER - inBufIndex);
4955 + } else {
4956 + MD5_Update(cx, padbytes,
4957 + MD5_END_BUFFER + MD5_BUFFER_SIZE - inBufIndex);
4958 + }
4959 +
4960 + /* Store the number of bytes input (before padding) in final 64 bits. */
4961 + cx->u.w[14] = lendian(lowInput);
4962 + cx->u.w[15] = lendian(highInput);
4963 +
4964 + /* Final call to compress. */
4965 + md5_compress(cx);
4966 +
4967 + /* Copy the resulting values out of the chain variables into return buf. */
4968 + *digestLen = MD5_HASH_LEN;
4969 +#ifndef IS_LITTLE_ENDIAN
4970 + cx->cv[0] = lendian(cx->cv[0]);
4971 + cx->cv[1] = lendian(cx->cv[1]);
4972 + cx->cv[2] = lendian(cx->cv[2]);
4973 + cx->cv[3] = lendian(cx->cv[3]);
4974 +#endif
4975 + memcpy(digest, cx->cv, MD5_HASH_LEN);
4976 +}
4977 +
4978 +unsigned int
4979 +MD5_FlattenSize(MD5Context *cx)
4980 +{
4981 + return sizeof(*cx);
4982 +}
4983 +
4984 +int
4985 +MD5_Flatten(MD5Context *cx, unsigned char *space)
4986 +{
4987 + memcpy(space, cx, sizeof(*cx));
4988 + return 0;
4989 +}
4990 +
4991 +MD5Context *
4992 +MD5_Resurrect(unsigned char *space, void *arg)
4993 +{
4994 + MD5Context *cx = MD5_NewContext();
4995 + if (cx)
4996 + memcpy(cx, space, sizeof(*cx));
4997 + return cx;
4998 +}
4999 +
5000 +void
5001 +MD5_TraceState(MD5Context *cx)
5002 +{
5003 +// PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
5004 +}
5005 +
5006 +int
5007 +md5_stream (FILE *stream, unsigned char *dest)
5008 +{
5009 + /* Important: BLOCKSIZE must be a multiple of 64. */
5010 +#define BLOCKSIZE 4096
5011 + unsigned int len;
5012 + MD5Context *cx = MD5_NewContext();
5013 + if (cx == NULL) {
5014 +// PORT_SetError(PR_OUT_OF_MEMORY_ERROR);
5015 + return -1;
5016 + }
5017 +
5018 + unsigned char buffer[BLOCKSIZE + 72];
5019 + size_t sum;
5020 +
5021 + /* Initialize the computation context. */
5022 + MD5_Begin(cx);
5023 +
5024 + /* Iterate over full file contents. */
5025 + while (1)
5026 + {
5027 + /* We read the file in blocks of BLOCKSIZE bytes. One call of the
5028 + computation function processes the whole buffer so that with the
5029 + next round of the loop another block can be read. */
5030 + size_t n;
5031 + sum = 0;
5032 +
5033 + /* Read block. Take care for partial reads. */
5034 + do
5035 + {
5036 + n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
5037 +
5038 + sum += n;
5039 + }
5040 + while (sum < BLOCKSIZE && n != 0);
5041 + if (n == 0 && ferror (stream))
5042 + return 1;
5043 +
5044 + /* If end of file is reached, end the loop. */
5045 + if (n == 0)
5046 + break;
5047 +
5048 + /* Process buffer with BLOCKSIZE bytes. Note that
5049 + BLOCKSIZE % 64 == 0
5050 + */
5051 + MD5_Update(cx, buffer, BLOCKSIZE);
5052 + }
5053 +
5054 + /* Add the last bytes if necessary. */
5055 + if (sum > 0)
5056 + MD5_Update(cx, buffer, sum);
5057 +
5058 + MD5_End(cx, dest, &len, MD5_HASH_LEN);
5059 + MD5_DestroyContext(cx, PR_TRUE);
5060 + return len;
5061 +
5062 +}
5063 +
5064 +int getMD5sum(const char * fileName,char * sum)
5065 +{
5066 + unsigned char bin_sum[16];
5067 + int len=0;
5068 + if (fileName)
5069 + {
5070 + FILE *fp=fopen(fileName,"rb");
5071 + if (fp)
5072 + {
5073 + len=md5_stream(fp,bin_sum);
5074 + memset(sum,0,33);
5075 + for (int i = 0; i < len; ++i)
5076 + sprintf (sum,"%s%02x",sum, bin_sum[i]);
5077 + fclose(fp);
5078 + return 0;
5079 + }
5080 + }
5081 + return 1;
5082 +}
5083 +
5084 +int testMD5sum(const char * fileName,char * sum)
5085 +{
5086 + char newSum[33]="";
5087 + if (getMD5sum(fileName,newSum))
5088 + return 1;
5089 + return strcmp(newSum,sum);
5090 +}
5092 Index: jmorecfg.h
5093 ===================================================================
5094 RCS file: /cvsroot/mozilla/jpeg/jmorecfg.h,v
5095 retrieving revision 3.12
5096 diff -u -r3.12 jmorecfg.h
5097 --- misc/build/mozilla/jpeg/jmorecfg.h 5 Mar 2004 22:17:45 -0000 3.12
5098 +++ misc/build/mozilla/jpeg/jmorecfg.h 17 May 2004 03:48:38 -0000
5099 @@ -108,8 +108,8 @@
5100 /* Defines for MMX/SSE2 support. */
5102 #if defined(XP_WIN32) && defined(_M_IX86)
5103 -#define HAVE_MMX_INTEL_MNEMONICS
5104 -#define HAVE_SSE2_INTEL_MNEMONICS
5105 +//#define HAVE_MMX_INTEL_MNEMONICS
5106 +//#define HAVE_SSE2_INTEL_MNEMONICS
5107 #endif