fixed message id, category id mapping

2 files changed, 49 insertions, 19 deletions

diff --git a/tests/log/test_log.c b/tests/log/test_log.c
index 388cafb..45c0871 100644
--- a/tests/log/test_log.c
+++ b/tests/log/test_log.c
@@ -5,11 +5,12 @@
 
 #define WOLF_CATEGORY_TEST_LOG		WOLF_LAST_INTERNAL_CATEGORY+1
 
-#define WOLF_MSG_TEST_LOG_BASE		WOLF_CATEGORY_TEST_LOG * 1000
+#define WOLF_MSG_TEST_LOG_BASE		( WOLF_CATEGORY_TEST_LOG ) * 1000
 #define WOLF_MSG_TEST_LOG_MSG1		WOLF_MSG_TEST_LOG_BASE+1
 #define WOLF_MSG_TEST_LOG_MSG2		WOLF_MSG_TEST_LOG_BASE+2
 #define WOLF_MSG_TEST_LOG_MSG3		WOLF_MSG_TEST_LOG_BASE+3
 #define WOLF_MSG_TEST_LOG_MSG4		WOLF_MSG_TEST_LOG_BASE+4
+#define WOLF_MSG_TEST_LOG_MSG5		WOLF_MSG_TEST_LOG_BASE+5
 
 int main( void ) {
 	wolf_log_openlogtostderr( WOLF_LOG_NOTICE );
@@ -20,14 +21,14 @@ int main( void ) {
 #endif
 #if defined WOLF_LOG_HAVE_EVENTLOG
 	wolf_log_openlogtoeventlog( NULL, "Application", "wolf_log_test",
-		"C:\\Temp\\testmsg.dll", WOLF_LOG_NOTICE );
+		"C:\\Temp\\testmsg.dll", 3, WOLF_LOG_NOTICE );
 #endif
 
-	wolf_log( WOLF_LOG_NOTICE, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG1, "Started the logger" );
-	wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG2, "This is error %d", 5 );
-	wolf_log( WOLF_LOG_DEBUG, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG3, "This will not appear" );
-
-	wolf_log( WOLF_LOG_NOTICE, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG4, "Closed the logger" );
+	wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG1, "This is error %d", 5 );
+	wolf_log( WOLF_LOG_WARNING, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG2, "Warning, this is just a test" );
+	wolf_log( WOLF_LOG_NOTICE, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG3, "Started the logger" );
+	wolf_log( WOLF_LOG_DEBUG, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG4, "This will not appear" );
+	wolf_log( WOLF_LOG_NOTICE, WOLF_CATEGORY_TEST_LOG, WOLF_MSG_TEST_LOG_MSG5, "Closed the logger" );
 
 #if defined WOLF_LOG_HAVE_EVENTLOG
 	wolf_log_closelogtoeventlog( );
diff --git a/tests/log/testmsg.mc b/tests/log/testmsg.mc
index 8577ca8..4d40944 100644
--- a/tests/log/testmsg.mc
+++ b/tests/log/testmsg.mc
@@ -26,6 +26,12 @@ Language = English
 Category 2
 .
 
+MessageId = 0x3
+SymbolicName = WOLF_CATEGORY_3
+Language = English
+Test Category
+.
+
 ;// event log severity levels (severity bits)
 SeverityNames = ( 
 	Success		= 0x0	: STATUS_SEVERITY_SUCCESS
@@ -35,10 +41,10 @@ SeverityNames = (
 )
 
 ;// facility names
-;FacilityNames = (
-;	System		= 0x0FF
-;	Application	= 0xFFF
-;)
+FacilityNames = (
+	System		= 0x0FF
+	Application	= 0xFFF
+)
 
 
 
@@ -46,19 +52,42 @@ SeverityNames = (
 
 MessageIdTypedef = DWORD
 
-MessageId = 0x100
+MessageId = 3001
 Severity = Error
 Facility = Application
-SymbolicName = WOLF_TEST_NO_PARAMS
+SymbolicName = WOLF_CATEGORY_TEST_LOG_MSG1
 Language = English
-This is a test message without any parameters
-It can be two lines though
+This is error %d
 .
 
-MessageId = 0x101
-Severity = Error
+MessageId = 3002
+Severity = Warning
+Facility = Application
+SymbolicName = WOLF_MSG_TEST_LOG_MSG2
+Language = English
+Warning, this is just a test
+.
+
+MessageId = 3003
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_TEST_LOG_MSG3
+Language = English
+Started the logger
+.
+
+MessageId = 3004
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_TEST_LOG_MSG4
+Language = English
+This will not appear
+.
+
+MessageId = 3005
+Severity = Informational
 Facility = Application
-SymbolicName = WOLF_TEST_PARAMS
+SymbolicName = WOLF_MSG_TEST_LOG_MSG5
 Language = English
-This is a message with parameter %1 and parameter %2
+Closed the logger
 .