[ros-diffs] [mjmartin] 37273: - Remove WINE_DECLARE_DEBUG_CHANNEL. - Call ElfrReportEventW with correct parameters. - In Prep for implementing EventLog Api's.

[mjmartin at svn.reactos.org]

Author: mjmartin
Date: Mon Nov 10 04:18:00 2008
New Revision: 37273

URL: http://svn.reactos.org/svn/reactos?rev=37273&view=rev
Log:
- Remove WINE_DECLARE_DEBUG_CHANNEL.
- Call ElfrReportEventW with correct parameters.
- In Prep for implementing EventLog Api's.

Modified:
    trunk/reactos/dll/win32/advapi32/service/eventlog.c

Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service/eventlog.c?rev=37273&r1=37272&r2=37273&view=diff
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Mon Nov 10 04:18:00 2008
@@ -25,7 +25,6 @@
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
-WINE_DECLARE_DEBUG_CHANNEL(eventlog);
 
 static RPC_UNICODE_STRING EmptyString = { 0, 0, L"" };
 
@@ -903,9 +902,9 @@
              IN LPCWSTR *lpStrings,
              IN LPVOID lpRawData)
 {
-#if 0
     NTSTATUS Status;
     UNICODE_STRING *Strings;
+    UNICODE_STRING ComputerName;
     WORD i;
 
     TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n",
@@ -923,6 +922,9 @@
 
     for (i = 0; i < wNumStrings; i++)
         RtlInitUnicodeString(&Strings[i], lpStrings[i]);
+
+    /*FIXME: ComputerName */
+    RtlInitEmptyUnicodeString(&ComputerName, NULL, 0);
 
     _SEH_TRY
     {
@@ -933,9 +935,9 @@
                                   dwEventID,
                                   wNumStrings,
                                   dwDataSize,
-                                  L"", /* FIXME: ComputerName */
+                                  (PRPC_UNICODE_STRING) &ComputerName,
                                   lpUserSid,
-                                  (LPWSTR *)lpStrings, /* FIXME: should be Strings */
+                                  (PRPC_UNICODE_STRING*) &Strings,
                                   lpRawData,
                                   0,
                                   NULL,
@@ -956,43 +958,4 @@
     }
 
     return TRUE;
-#else
-  int i;
-
-    /* partial stub */
-
-  if (wNumStrings == 0)
-    return TRUE;
-
-  if (lpStrings == NULL)
-    return TRUE;
-
-  for (i = 0; i < wNumStrings; i++)
-    {
-      switch (wType)
-        {
-        case EVENTLOG_SUCCESS:
-            TRACE_(eventlog)("Success: %S\n", lpStrings[i]);
-            break;
-
-        case EVENTLOG_ERROR_TYPE:
-            ERR_(eventlog)("Error: %S\n", lpStrings[i]);
-            break;
-
-        case EVENTLOG_WARNING_TYPE:
-            WARN_(eventlog)("Warning: %S\n", lpStrings[i]);
-            break;
-
-        case EVENTLOG_INFORMATION_TYPE:
-            TRACE_(eventlog)("Info: %S\n", lpStrings[i]);
-            break;
-
-        default:
-            TRACE_(eventlog)("Type %hu: %S\n", wType, lpStrings[i]);
-            break;
-        }
-    }
-
-  return TRUE;
-#endif
-}
+}