stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8198001: java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java debug assert on Windows

Browse Source 
Reviewed-by: prr, serb
This commit is contained in:
Ambarish Rapte 2018-11-02 23:05:47 +05:30
parent 5fa252a52c
commit fa9ec805d9
2 changed files with 7 additions and 4 deletions
src/java.desktop/windows/native/libawt/windows
awt_MenuBar.cpp
test/jdk/java/awt/Menu/WrongParentAfterRemoveMenu
WrongParentAfterRemoveMenu.java

7
src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -206,7 +206,10 @@ void AwtMenuBar::DeleteItem(UINT index)
* this function must be called to draw the changed menu bar. * this function must be called to draw the changed menu bar.
*/ */
void AwtMenuBar::RedrawMenuBar() { void AwtMenuBar::RedrawMenuBar() {
VERIFY(::DrawMenuBar(GetOwnerHWnd())); HWND hOwnerWnd = GetOwnerHWnd();
if (hOwnerWnd != NULL) {
VERIFY(::DrawMenuBar(hOwnerWnd));
}
} }
void AwtMenuBar::_AddMenu(void *param) void AwtMenuBar::_AddMenu(void *param)

4
test/jdk/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -29,7 +29,7 @@ import java.awt.Window;
/** /**
* @test * @test
* @bug 8165769 * @bug 8165769 8198001
* @key headful * @key headful
*/ */
public final class WrongParentAfterRemoveMenu { public final class WrongParentAfterRemoveMenu {