From d55d76c9bbcfd3a7f994a4014bc54c752938c90a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Mon, 22 Aug 2011 11:09:24 -0400 Subject: [PATCH] libfreerdp-rail: fix window style debug output --- libfreerdp-rail/window.c | 115 ++++++++++++++++++++++----------------- 1 file changed, 66 insertions(+), 49 deletions(-) diff --git a/libfreerdp-rail/window.c b/libfreerdp-rail/window.c index 58e6091fa..0b801bc20 100644 --- a/libfreerdp-rail/window.c +++ b/libfreerdp-rail/window.c @@ -28,64 +28,65 @@ struct _WINDOW_STYLE { uint32 style; char* name; + boolean multi; }; typedef struct _WINDOW_STYLE WINDOW_STYLE; WINDOW_STYLE WINDOW_STYLES[] = { - { WS_BORDER, "WS_BORDER" }, - { WS_CAPTION, "WS_CAPTION" }, - { WS_CHILD, "WS_CHILD" }, - { WS_CLIPCHILDREN, "WS_CLIPCHILDREN" }, - { WS_CLIPSIBLINGS, "WS_CLIPSIBLINGS" }, - { WS_DISABLED, "WS_DISABLED" }, - { WS_DLGFRAME, "WS_DLGFRAME" }, - { WS_GROUP, "WS_GROUP" }, - { WS_HSCROLL, "WS_HSCROLL" }, - { WS_ICONIC, "WS_ICONIC" }, - { WS_MAXIMIZE, "WS_MAXIMIZE" }, - { WS_MAXIMIZEBOX, "WS_MAXIMIZEBOX" }, - { WS_MINIMIZE, "WS_MINIMIZE" }, - { WS_MINIMIZEBOX, "WS_MINIMIZEBOX" }, - { WS_OVERLAPPED, "WS_OVERLAPPED" }, - { WS_OVERLAPPEDWINDOW, "WS_OVERLAPPEDWINDOW" }, - { WS_POPUP, "WS_POPUP" }, - { WS_POPUPWINDOW, "WS_POPUPWINDOW" }, - { WS_SIZEBOX, "WS_SIZEBOX" }, - { WS_SYSMENU, "WS_SYSMENU" }, - { WS_TABSTOP, "WS_TABSTOP" }, - { WS_THICKFRAME, "WS_THICKFRAME" }, - { WS_VISIBLE, "WS_VISIBLE" } + { WS_BORDER, "WS_BORDER", False }, + { WS_CAPTION, "WS_CAPTION", False }, + { WS_CHILD, "WS_CHILD", False }, + { WS_CLIPCHILDREN, "WS_CLIPCHILDREN", False }, + { WS_CLIPSIBLINGS, "WS_CLIPSIBLINGS", False }, + { WS_DISABLED, "WS_DISABLED", False }, + { WS_DLGFRAME, "WS_DLGFRAME", False }, + { WS_GROUP, "WS_GROUP", False }, + { WS_HSCROLL, "WS_HSCROLL", False }, + { WS_ICONIC, "WS_ICONIC", False }, + { WS_MAXIMIZE, "WS_MAXIMIZE", False }, + { WS_MAXIMIZEBOX, "WS_MAXIMIZEBOX", False }, + { WS_MINIMIZE, "WS_MINIMIZE", False }, + { WS_MINIMIZEBOX, "WS_MINIMIZEBOX", False }, + { WS_OVERLAPPED, "WS_OVERLAPPED", False }, + { WS_OVERLAPPEDWINDOW, "WS_OVERLAPPEDWINDOW", True }, + { WS_POPUP, "WS_POPUP", False }, + { WS_POPUPWINDOW, "WS_POPUPWINDOW", True }, + { WS_SIZEBOX, "WS_SIZEBOX", False }, + { WS_SYSMENU, "WS_SYSMENU", False }, + { WS_TABSTOP, "WS_TABSTOP", False }, + { WS_THICKFRAME, "WS_THICKFRAME", False }, + { WS_VISIBLE, "WS_VISIBLE", False } }; WINDOW_STYLE EXTENDED_WINDOW_STYLES[] = { - { WS_EX_ACCEPTFILES, "WS_EX_ACCEPTFILES" }, - { WS_EX_APPWINDOW, "WS_EX_APPWINDOW" }, - { WS_EX_CLIENTEDGE, "WS_EX_CLIENTEDGE" }, - { WS_EX_COMPOSITED, "WS_EX_COMPOSITED" }, - { WS_EX_CONTEXTHELP, "WS_EX_CONTEXTHELP" }, - { WS_EX_CONTROLPARENT, "WS_EX_CONTROLPARENT" }, - { WS_EX_DLGMODALFRAME, "WS_EX_DLGMODALFRAME" }, - { WS_EX_LAYERED, "WS_EX_LAYERED" }, - { WS_EX_LAYOUTRTL, "WS_EX_LAYOUTRTL" }, - { WS_EX_LEFT, "WS_EX_LEFT" }, - { WS_EX_LEFTSCROLLBAR, "WS_EX_LEFTSCROLLBAR" }, - { WS_EX_LTRREADING, "WS_EX_LTRREADING" }, - { WS_EX_MDICHILD, "WS_EX_MDICHILD" }, - { WS_EX_NOACTIVATE, "WS_EX_NOACTIVATE" }, - { WS_EX_NOINHERITLAYOUT, "WS_EX_NOINHERITLAYOUT" }, - { WS_EX_NOPARENTNOTIFY, "WS_EX_NOPARENTNOTIFY" }, - { WS_EX_OVERLAPPEDWINDOW, "WS_EX_OVERLAPPEDWINDOW" }, - { WS_EX_PALETTEWINDOW, "WS_EX_PALETTEWINDOW" }, - { WS_EX_RIGHT, "WS_EX_RIGHT" }, - { WS_EX_RIGHTSCROLLBAR, "WS_EX_RIGHTSCROLLBAR" }, - { WS_EX_RTLREADING, "WS_EX_RTLREADING" }, - { WS_EX_STATICEDGE, "WS_EX_STATICEDGE" }, - { WS_EX_TOOLWINDOW, "WS_EX_TOOLWINDOW" }, - { WS_EX_TOPMOST, "WS_EX_TOPMOST" }, - { WS_EX_TRANSPARENT, "WS_EX_TRANSPARENT" }, - { WS_EX_WINDOWEDGE, "WS_EX_WINDOWEDGE" } + { WS_EX_ACCEPTFILES, "WS_EX_ACCEPTFILES", False }, + { WS_EX_APPWINDOW, "WS_EX_APPWINDOW", False }, + { WS_EX_CLIENTEDGE, "WS_EX_CLIENTEDGE", False }, + { WS_EX_COMPOSITED, "WS_EX_COMPOSITED", False }, + { WS_EX_CONTEXTHELP, "WS_EX_CONTEXTHELP", False }, + { WS_EX_CONTROLPARENT, "WS_EX_CONTROLPARENT", False }, + { WS_EX_DLGMODALFRAME, "WS_EX_DLGMODALFRAME", False }, + { WS_EX_LAYERED, "WS_EX_LAYERED", False }, + { WS_EX_LAYOUTRTL, "WS_EX_LAYOUTRTL", False }, + { WS_EX_LEFT, "WS_EX_LEFT", False }, + { WS_EX_LEFTSCROLLBAR, "WS_EX_LEFTSCROLLBAR", False }, + { WS_EX_LTRREADING, "WS_EX_LTRREADING", False }, + { WS_EX_MDICHILD, "WS_EX_MDICHILD", False }, + { WS_EX_NOACTIVATE, "WS_EX_NOACTIVATE", False }, + { WS_EX_NOINHERITLAYOUT, "WS_EX_NOINHERITLAYOUT", False }, + { WS_EX_NOPARENTNOTIFY, "WS_EX_NOPARENTNOTIFY", False }, + { WS_EX_OVERLAPPEDWINDOW, "WS_EX_OVERLAPPEDWINDOW", True }, + { WS_EX_PALETTEWINDOW, "WS_EX_PALETTEWINDOW", True }, + { WS_EX_RIGHT, "WS_EX_RIGHT", False }, + { WS_EX_RIGHTSCROLLBAR, "WS_EX_RIGHTSCROLLBAR", False }, + { WS_EX_RTLREADING, "WS_EX_RTLREADING", False }, + { WS_EX_STATICEDGE, "WS_EX_STATICEDGE", False }, + { WS_EX_TOOLWINDOW, "WS_EX_TOOLWINDOW", False }, + { WS_EX_TOPMOST, "WS_EX_TOPMOST", False }, + { WS_EX_TRANSPARENT, "WS_EX_TRANSPARENT", False }, + { WS_EX_WINDOWEDGE, "WS_EX_WINDOWEDGE", False } }; void print_window_styles(uint32 style) @@ -96,7 +97,15 @@ void print_window_styles(uint32 style) for (i = 0; i < sizeof(WINDOW_STYLES) / sizeof(WINDOW_STYLE); i++) { if (style & WINDOW_STYLES[i].style) + { + if (WINDOW_STYLES[i].multi) + { + if ((style & WINDOW_STYLES[i].style) != WINDOW_STYLES[i].style) + continue; + } + printf("\t%s\n", WINDOW_STYLES[i].name); + } } printf("}\n"); } @@ -109,7 +118,15 @@ void print_extended_window_styles(uint32 style) for (i = 0; i < sizeof(EXTENDED_WINDOW_STYLES) / sizeof(WINDOW_STYLE); i++) { if (style & EXTENDED_WINDOW_STYLES[i].style) + { + if (EXTENDED_WINDOW_STYLES[i].multi) + { + if ((style & EXTENDED_WINDOW_STYLES[i].style) != EXTENDED_WINDOW_STYLES[i].style) + continue; + } + printf("\t%s\n", EXTENDED_WINDOW_STYLES[i].name); + } } printf("}\n"); }