diff --git a/sdk/include/reactos/wine/test.h b/sdk/include/reactos/wine/test.h
index 8b9035adfcf..81408fb976b 100644
--- a/sdk/include/reactos/wine/test.h
+++ b/sdk/include/reactos/wine/test.h
@@ -26,6 +26,11 @@
 #include <windef.h>
 #include <winbase.h>
 
+#ifndef _STRSAFE_H_INCLUDED_
+#include <tchar.h>
+#include <strsafe.h>
+#endif
+
 #ifdef __WINE_CONFIG_H
 #error config.h should not be used in Wine tests
 #endif
@@ -634,30 +639,36 @@ const char *wine_dbgstr_an( const CHAR *str, intptr_t n )
     return res;
 }
 
-const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n )
+const char *wine_dbgstr_wn( const WCHAR *str, int n )
 {
-    char *dst, *res;
-    size_t size;
+    char *res;
+    size_t CbLength = 0;
+    HRESULT hr;
 
+    static const char hex[16] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
+    char buffer[300], *dst = buffer;
+
+    if (!str) return "(null)";
     if (!((ULONG_PTR)str >> 16))
     {
-        if (!str) return "(null)";
         res = get_temp_buffer( 6 );
-        sprintf( res, "#%04x", LOWORD(str) );
+        sprintf(res, "#%04x", LOWORD(str));
         return res;
     }
-    if (n == -1)
+    if (n == -1) for (n = 0; str[n]; n++) ;
+    hr = StringCbLengthW((STRSAFE_LPCWSTR)str, sizeof(buffer), &CbLength);
+    if (SUCCEEDED(hr))
     {
-        const WCHAR *end = str;
-        while (*end) end++;
-        n = end - str;
+        n = min(n, CbLength/2);
     }
-    if (n < 0) n = 0;
-    size = 12 + min( 300, n * 5 );
-    dst = res = get_temp_buffer( size );
+    else
+    {
+        return "(invalid)";
+    }
+
     *dst++ = 'L';
     *dst++ = '"';
-    while (n-- > 0 && dst <= res + size - 10)
+    while (n-- > 0 && dst <= buffer + sizeof(buffer) - 10)
     {
         WCHAR c = *str++;
         switch (c)
@@ -668,14 +679,15 @@ const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n )
         case '"':  *dst++ = '\\'; *dst++ = '"'; break;
         case '\\': *dst++ = '\\'; *dst++ = '\\'; break;
         default:
-            if (c >= ' ' && c <= 126)
-                *dst++ = (char)c;
-            else
+            if (c < ' ' || c >= 127)
             {
                 *dst++ = '\\';
-                sprintf(dst,"%04x",c);
-                dst+=4;
+                *dst++ = hex[(c >> 12) & 0x0f];
+                *dst++ = hex[(c >> 8) & 0x0f];
+                *dst++ = hex[(c >> 4) & 0x0f];
+                *dst++ = hex[c & 0x0f];
             }
+            else *dst++ = (char)c;
         }
     }
     *dst++ = '"';
@@ -685,8 +697,22 @@ const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n )
         *dst++ = '.';
         *dst++ = '.';
     }
-    *dst++ = 0;
-    release_temp_buffer( res, dst - res );
+    *dst = 0;
+
+    hr = StringCbLengthA(buffer + 1, sizeof(buffer), &CbLength);
+    if (SUCCEEDED(hr))
+    {
+        res = get_temp_buffer(CbLength);
+        hr = StringCchCopyA(res, sizeof(buffer), buffer);
+        if (FAILED(hr))
+        {
+            return "(invalid)";
+        }
+    }
+    else
+    {
+        return "(invalid)";
+    }
     return res;
 }