From ddc29a68dcad47048cd6a76eafdf6eed8302a5bb Mon Sep 17 00:00:00 2001
From: Gert Driesen <drieseng@users.sourceforge.net>
Date: Sat, 29 May 2004 12:43:03 +0000
Subject: [PATCH] * System.Messaging/Acknowledgment.cs: added/corrected values,
 removed TODO * System.Messaging/MessageQueueErrorCode.cs: fixed typo *
 System.Messaging/MessageQueueAccessRights.cs: removed extra enum field

svn path=/trunk/mcs/; revision=28438
---
 mcs/class/System.Messaging/ChangeLog          |  8 +++++
 .../System.Messaging/Acknowledgment.cs        | 34 ++++++++++---------
 .../MessageQueueAccessRights.cs               | 34 +++++++++----------
 .../System.Messaging/MessageQueueErrorCode.cs |  2 +-
 4 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/mcs/class/System.Messaging/ChangeLog b/mcs/class/System.Messaging/ChangeLog
index e5c8dfbd5fea4..41cb31319a8aa 100644
--- a/mcs/class/System.Messaging/ChangeLog
+++ b/mcs/class/System.Messaging/ChangeLog
@@ -1,2 +1,10 @@
+2004-05-29  Gert Driesen (drieseng@users.sourceforge.net)
+
+	* System.Messaging/Acknowledgment.cs: added/corrected values,
+	removed TODO
+	* System.Messaging/MessageQueueErrorCode.cs: fixed typo
+	* System.Messaging/MessageQueueAccessRights.cs: removed extra
+	enum field
+
 2003-02-23  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
 	* added just files enough to compile a dummy DLL for now
diff --git a/mcs/class/System.Messaging/System.Messaging/Acknowledgment.cs b/mcs/class/System.Messaging/System.Messaging/Acknowledgment.cs
index 0fc870a2f6561..91487718ee7fc 100644
--- a/mcs/class/System.Messaging/System.Messaging/Acknowledgment.cs
+++ b/mcs/class/System.Messaging/System.Messaging/Acknowledgment.cs
@@ -9,24 +9,26 @@
 using System;
 
 namespace System.Messaging 
-{	
-	[MonoTODO("Have to force the right specific values for each element")]
+{
 	[Serializable]
 	public enum Acknowledgment 
 	{
-		AccessDenied, 
-		BadDestinationQueue, 
-		BadEncryption,
-		BadSignature, 
-		CouldNotEncrypt, 
-		HopCountExceeded,
-		None, 
-		NotTransactionalMessage, 
-		NotTransactionQueue,
-		Purged, 
-		ReachQueue, 
-		ReachQueueTimeout,
-		Receive, 
-		ReceiveTimeout
+		AccessDenied = 32772,
+		BadDestinationQueue = 32768,
+		BadEncryption = 32775,
+		BadSignature = 32774,
+		CouldNotEncrypt = 32776,
+		HopCountExceeded = 32773,
+		None = 0,
+		NotTransactionalMessage = 32778,
+		NotTransactionalQueue = 32777,
+		Purged = 32769,
+		QueueDeleted = 49152,
+		QueueExceedMaximumSize = 32771,
+		QueuePurged = 49153,
+		ReachQueue = 2,
+		ReachQueueTimeout = 32770,
+		Receive = 16384,
+		ReceiveTimeout = 49154
 	}
 }
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueueAccessRights.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueueAccessRights.cs
index 165d4be003621..4cb8658e21d0b 100644
--- a/mcs/class/System.Messaging/System.Messaging/MessageQueueAccessRights.cs
+++ b/mcs/class/System.Messaging/System.Messaging/MessageQueueAccessRights.cs
@@ -10,26 +10,24 @@
 
 namespace System.Messaging 
 {
-	[MonoTODO("Have to force the right specific values for each element")]
 	[Flags]
 	[Serializable]
-	public enum MessageQueueAccessRights 
+	public enum MessageQueueAccessRights
 	{
-		ChangeQueuePermissions,
-		DeleteJournalMessage, 
-		DeleteMessage,
-		DeleteQueue, 
-		FullControl, 
-		GenericRead,
-		GenericWrite, 
-		GetQueuePermissions, 
-		GetQueueProperties,
-		PeekMessage, 
-		ReceiveJournalMessage, 
-		ReceiveMessage,
-		SetQueueProperties, 
-		TakeQueueProperties, 
-		TakeQueueOwnership,
-		WriteMessage
+		ChangeQueuePermissions = 262144,
+		DeleteJournalMessage = 8, 
+		DeleteMessage = 1,
+		DeleteQueue = 65536,
+		FullControl = 983103,
+		GenericRead = 131115,
+		GenericWrite = 131108, 
+		GetQueuePermissions = 131072, 
+		GetQueueProperties = 32,
+		PeekMessage = 2, 
+		ReceiveJournalMessage = 10, 
+		ReceiveMessage = 3,
+		SetQueueProperties = 16, 
+		TakeQueueOwnership = 524288,
+		WriteMessage = 4
 	}
 }
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueueErrorCode.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueueErrorCode.cs
index d5342e115a370..99ca33c6946a6 100644
--- a/mcs/class/System.Messaging/System.Messaging/MessageQueueErrorCode.cs
+++ b/mcs/class/System.Messaging/System.Messaging/MessageQueueErrorCode.cs
@@ -28,7 +28,7 @@ public enum MessageQueueErrorCode
 		CannotJoinDomain,
 		CannotLoadMsmqOcm, 
 		CannotOpenCertificateStore,
-		CannotSetCryptographicSecurityDescription, 
+		CannotSetCryptographicSecurityDescriptor, 
 		CannotSignDataEx,
 		CertificateNotProvided, 
 		ComputerDoesNotSupportEncryption,