[PATCH 0/1] MR2597: advapi32: Print ReportEvent() messages one line at a time.

[Zebediah Figura (＠zfigura)]

.NET Framework passes multiline backtraces to ReportEvent(), which get cut off when passed to debugstr_w().

[PATCH 1/1] advapi32: Print ReportEvent() messages one line at a time.

[Zebediah Figura]

From: Zebediah Figura

.NET Framework passes multiline backtraces to ReportEvent(), which get cut off when passed to debugstr_w().
---
 dlls/advapi32/eventlog.c | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index f7fbfc6d547..d21d3452591 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -642,20 +642,34 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw

for (i = 0; i < wNumStrings; i++)
     {
-        switch (wType)
+        const WCHAR *line = lpStrings[i];
+
+        while (*line)
         {
-        case EVENTLOG_SUCCESS:
-            TRACE_(eventlog)("%s\n", debugstr_w(lpStrings[i]));
-            break;
-        case EVENTLOG_ERROR_TYPE:
-            ERR_(eventlog)("%s\n", debugstr_w(lpStrings[i]));
-            break;
-        case EVENTLOG_WARNING_TYPE:
-            WARN_(eventlog)("%s\n", debugstr_w(lpStrings[i]));
-            break;
-        default:
-            TRACE_(eventlog)("%s\n", debugstr_w(lpStrings[i]));
-            break;
+            const WCHAR *next = wcschr( line, '\n' );
+
+            if (next)
+                ++next;
+            else
+                next = line + wcslen( line );
+
+            switch (wType)
+            {
+            case EVENTLOG_SUCCESS:
+                TRACE_(eventlog)("%s\n", debugstr_wn(line, next - line));
+                break;
+            case EVENTLOG_ERROR_TYPE:
+                ERR_(eventlog)("%s\n", debugstr_wn(line, next - line));
+                break;
+            case EVENTLOG_WARNING_TYPE:
+                WARN_(eventlog)("%s\n", debugstr_wn(line, next - line));
+                break;
+            default:
+                TRACE_(eventlog)("%s\n", debugstr_wn(line, next - line));
+                break;
+            }
+
+            line = next;
         }
     }
     return TRUE;