Index: libmapi/conf/mapi-codes
===================================================================
--- libmapi/conf/mapi-codes	(revision 1356)
+++ libmapi/conf/mapi-codes	(working copy)
@@ -55,7 +55,7 @@
 0x80040200  MAPI_E_END_OF_SESSION
 0x80040201  MAPI_E_UNKNOWN_ENTRYID
 0x80040202  MAPI_E_MISSING_REQUIRED_COLUMN
-0x80040203  MAPI_W_NO_SERVICE
+0x00040203  MAPI_W_NO_SERVICE
 0x80040301  MAPI_E_BAD_VALUE
 0x80040302  MAPI_E_INVALID_TYPE
 0x80040303  MAPI_E_TYPE_NO_SUPPORT
@@ -63,18 +63,18 @@
 0x80040305  MAPI_E_TOO_BIG
 0x80040306  MAPI_E_DECLINE_COPY
 0x80040307  MAPI_E_UNEXPECTED_ID
-0x80040380  MAPI_W_ERRORS_RETURNED
+0x00040380  MAPI_W_ERRORS_RETURNED
 0x80040400  MAPI_E_UNABLE_TO_COMPLETE
 0x80040401  MAPI_E_TIMEOUT
 0x80040402  MAPI_E_TABLE_EMPTY
 0x80040403  MAPI_E_TABLE_TOO_BIG
 0x80040405  MAPI_E_INVALID_BOOKMARK
-0x80040481  MAPI_W_POSITION_CHANGED
-0x80040482  MAPI_W_APPROX_COUNT
+0x00040481  MAPI_W_POSITION_CHANGED
+0x00040482  MAPI_W_APPROX_COUNT
 0x80040500  MAPI_E_WAIT
 0x80040501  MAPI_E_CANCEL
 0x80040502  MAPI_E_NOT_ME
-0x80040580  MAPI_W_CANCEL_MESSAGE
+0x00040580  MAPI_W_CANCEL_MESSAGE
 0x80040600  MAPI_E_CORRUPT_STORE
 0x80040601  MAPI_E_NOT_IN_QUEUE
 0x80040602  MAPI_E_NO_SUPPRESS
@@ -87,7 +87,7 @@
 0x8004060A  MAPI_E_HAS_MESAGES
 0x8004060B  MAPI_E_FOLDER_CYCLE
 0x8004060D  MAPI_E_LOCKID_LIMIT
-0x80040680  MAPI_W_PARTIAL_COMPLETION
+0x00040680  MAPI_W_PARTIAL_COMPLETION
 0x80040700  MAPI_E_AMBIGUOUS_RECIP
 0x80040800  SYNC_E_OBJECT_DELETED
 0x80040801  SYNC_E_IGNORE
@@ -95,8 +95,8 @@
 0x80040803  SYNC_E_NO_PARENT
 0x80040804  SYNC_E_CYCLE_DETECTED
 0x80040805  SYNC_E_UNSYNCHRONIZED
-0x80040820  SYNC_W_PROGRESS
-0x80040821  SYNC_W_CLIENT_CHANGE_NEWER
+0x00040820  SYNC_W_PROGRESS
+0x00040821  SYNC_W_CLIENT_CHANGE_NEWER
 0x80040900  MAPI_E_NAMED_PROP_QUOTA_EXCEEDED
 0x80070005  MAPI_E_NO_ACCESS
 0x8007000E  MAPI_E_NOT_ENOUGH_MEMORY