src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp

*** 50,59 ****
--- 50,60 ----
      }
  
      // 6457572: ShellExecute possibly changes FPU control word - saving it here
      unsigned oldcontrol87 = _control87(0, 0);
      HINSTANCE retval = ::ShellExecute(NULL, verb_c, fileOrUri_c, NULL, NULL, SW_SHOWNORMAL);
+     DWORD error = ::GetLastError();
      _control87(oldcontrol87, 0xffffffff);
  
      JNU_ReleaseStringPlatformChars(env, fileOrUri_j, fileOrUri_c);
      JNU_ReleaseStringPlatformChars(env, verb_j, verb_c);
  
*** 63,73 ****
          int len = ::FormatMessage(
                      FORMAT_MESSAGE_ALLOCATE_BUFFER |
                      FORMAT_MESSAGE_FROM_SYSTEM  |
                      FORMAT_MESSAGE_IGNORE_INSERTS,
                      NULL,
!                     (int)retval,
                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
                      (LPTSTR)&buffer,
                      0,
                      NULL );
  
--- 64,74 ----
          int len = ::FormatMessage(
                      FORMAT_MESSAGE_ALLOCATE_BUFFER |
                      FORMAT_MESSAGE_FROM_SYSTEM  |
                      FORMAT_MESSAGE_IGNORE_INSERTS,
                      NULL,
!                     error,
                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
                      (LPTSTR)&buffer,
                      0,
                      NULL );