Re: user32: Avoid -Wmisleading-indentation warnings and fix comments in comments in test_AppendMenu.
Gerald Pfeifer <gerald(a)pfeifer.com> wrote:
diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 33d8eb8..ea965cd 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3992,13 +3992,15 @@ static void test_AppendMenu(void) mii.wID = 206; ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); ok(ret, "InsertMenuItem failed\n"); -if (0) /* FIXME: uncomment once Wine is fixed */ +if (0) /* FIXME: enable once Wine is fixed */ { check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); +} mii.wID = 207; ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); ok(ret, "SetMenuItemInfo failed\n"); -if (0) /* FIXME: uncomment once Wine is fixed */ +if (0) /* FIXME: enable once Wine is fixed */ { check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); +} DestroyMenu(hmenu);
hbmp = CreateBitmap(1, 1, 1, 1, NULL);
Please don't make the code look uglier than it already is. I'd personally argue that checking and forcing indentation rules by a C compiler is pretty disappointing and actually misleading. That warning should be turned off by default IMHO. -- Dmitry.
On Tue, 12 Jan 2016, Dmitry Timoshkov wrote:
Gerald Pfeifer <gerald(a)pfeifer.com> wrote:
diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 33d8eb8..ea965cd 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3992,13 +3992,15 @@ static void test_AppendMenu(void) mii.wID = 206; ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); ok(ret, "InsertMenuItem failed\n"); -if (0) /* FIXME: uncomment once Wine is fixed */ +if (0) /* FIXME: enable once Wine is fixed */ { check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); +} mii.wID = 207; ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); ok(ret, "SetMenuItemInfo failed\n"); -if (0) /* FIXME: uncomment once Wine is fixed */ +if (0) /* FIXME: enable once Wine is fixed */ { check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); +} DestroyMenu(hmenu);
hbmp = CreateBitmap(1, 1, 1, 1, NULL);
Please don't make the code look uglier than it already is. I'd personally argue that checking and forcing indentation rules by a C compiler is pretty disappointing and actually misleading. That warning should be turned off by default IMHO.
So, this is a bit disappointing: Beginning of January my patch was declined, and now in August the very same patch (minus fixing the comment) actually got applied -- submitted by Nikolay. commit 6c8887b830358dc109ea7781b2bb182c8104ce47 Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 20:06:22 2016 +0300 user32/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Looks like duplicate (and hence wasted) efforts. :-( Gerald
Gerald Pfeifer <gerald(a)pfeifer.com> writes:
On Tue, 12 Jan 2016, Dmitry Timoshkov wrote:
Please don't make the code look uglier than it already is. I'd personally argue that checking and forcing indentation rules by a C compiler is pretty disappointing and actually misleading. That warning should be turned off by default IMHO.
So, this is a bit disappointing: Beginning of January my patch was declined, and now in August the very same patch (minus fixing the comment) actually got applied -- submitted by Nikolay.
I'm not a big fan of that type of change either, but Nikolay investigated it and determined that there were few enough required changes that I felt it would be acceptable to not disable the warning. I should probably have asked you to do that investigation back in January, sorry about that. -- Alexandre Julliard julliard(a)winehq.org
participants (3)
-
Alexandre Julliard -
Dmitry Timoshkov -
Gerald Pfeifer