--- old/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp	2015-04-06 14:51:32.839225100 +0300
+++ new/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp	2015-04-06 14:51:32.371178300 +0300
@@ -242,7 +242,8 @@
         RECT focusRect;
         VERIFY(::CopyRect(&focusRect, &rect));
         VERIFY(::InflateRect(&focusRect,-inf,-inf));
-        VERIFY(::DrawFocusRect(hDC, &focusRect));
+		if(::DrawFocusRect(hDC, &focusRect) == 0)
+            VERIFY(::GetLastError() == 0);
     }
 
     /* Notify any subclasses */
--- old/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp	2015-04-06 14:51:35.328474000 +0300
+++ new/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp	2015-04-06 14:51:34.863427500 +0300
@@ -290,12 +290,14 @@
     if ((drawInfo.itemState & ODS_FOCUS) &&
         ((drawInfo.itemAction & ODA_FOCUS)||
          (drawInfo.itemAction &ODA_DRAWENTIRE))) {
-        VERIFY(::DrawFocusRect(hDC, &focusRect));
+        if(::DrawFocusRect(hDC, &focusRect) == 0)
+            VERIFY(::GetLastError() == 0);
     }
     /*  erase focus rect */
     else if (!(drawInfo.itemState & ODS_FOCUS) &&
              (drawInfo.itemAction & ODA_FOCUS)) {
-        VERIFY(::DrawFocusRect(hDC, &focusRect));
+        if(::DrawFocusRect(hDC, &focusRect) == 0)
+            VERIFY(::GetLastError() == 0);
     }
 
     /*  Notify any subclasses */
--- old/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp	2015-04-06 14:51:37.865727700 +0300
+++ new/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp	2015-04-06 14:51:37.394680600 +0300
@@ -4322,7 +4322,8 @@
     if ((drawInfo.itemState & ODS_FOCUS)  &&
         (drawInfo.itemAction & (ODA_FOCUS | ODA_DRAWENTIRE))) {
       if (!unfocusableChoice){
-          VERIFY(::DrawFocusRect(hDC, &rect));
+          if(::DrawFocusRect(hDC, &rect) == 0)
+              VERIFY(::GetLastError() == 0);
       }
     }
     env->DeleteLocalRef(target);