msvfw32: Make wine_dbgstr_fcc handle non-ASCII values better.

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvfw32: Make wine_dbgstr_fcc handle non-ASCII values better.
970692c0 · Bruno Jesus · Alexandre Julliard · 3a7dfcd2 · 970692c0
Commit 970692c0 authored Oct 20, 2015 by Bruno Jesus Committed by Alexandre Julliard Oct 21, 2015
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

msvideo_main.c dlls/msvfw32/msvideo_main.c +6 -3

No files found.
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -48,9 +48,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvideo);

 static inline const char *wine_dbgstr_fcc( DWORD fcc )
 {
-    return wine_dbg_sprintf("%c%c%c%c", 
-                            LOBYTE(LOWORD(fcc)), HIBYTE(LOWORD(fcc)),
-                            LOBYTE(HIWORD(fcc)), HIBYTE(HIWORD(fcc)));
+    char fcc_str[5] = {LOBYTE(LOWORD(fcc)), HIBYTE(LOWORD(fcc)),
+                       LOBYTE(HIWORD(fcc)), HIBYTE(HIWORD(fcc)), '\0'};
+    if (isalnum(fcc_str[0]) && isalnum(fcc_str[1])
+     && isalnum(fcc_str[2]) && isalnum(fcc_str[3]))
+        return wine_dbg_sprintf("%s", fcc_str);
+    return wine_dbg_sprintf("0x%08x", fcc);
 }

 static WINE_HIC*        MSVIDEO_FirstHic /* = NULL */;