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

8198000: java/awt/List/EmptyListEventTest/EmptyListEventTest.java debug assert on Windows

Browse Source 
Reviewed-by: prr, serb
This commit is contained in:
Ambarish Rapte 2018-11-09 12:08:05 +05:30
parent e40a70bce0
commit 3ec1c6f949
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/java.desktop/windows/native/libawt/windows/awt_List.cpp
View File

@ -478,16 +478,22 @@ BOOL AwtList::IsFocusingMouseMessage(MSG *pMsg)
MsgRouting AwtList::HandleEvent(MSG *msg, BOOL synthetic)
{
if (IsFocusingMouseMessage(msg)) {
LONG item = static_cast<LONG>(SendListMessage(LB_ITEMFROMPOINT, 0, msg->lParam));
if (item != LB_ERR) {
if (isMultiSelect) {
if (IsItemSelected(item)) {
Deselect(item);
} else {
Select(item);
LONG count = GetCount();
if (count > 0) {
LONG item = static_cast<LONG>(SendListMessage(LB_ITEMFROMPOINT, 0, msg->lParam));
if (HIWORD(item) == 0) {
item = LOWORD(item);
if (item >= 0 && item < count) {
if (isMultiSelect) {
if (IsItemSelected(item)) {
Deselect(item);
} else {
Select(item);
}
} else {
Select(item);
}
}
} else {
Select(item);
}
}
delete msg;

4
test/jdk/java/awt/List/EmptyListEventTest/EmptyListEventTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -24,7 +24,7 @@
/*
* @test
* @key headful
* @bug 6366126
* @bug 6366126 8198000
* @summary List throws ArrayIndexOutOfBoundsException when pressing ENTER after removing all the items, Win32
* @author Dmitry Cherepanov area=awt.list
* @run main EmptyListEventTest