src/jdk.jpackage/share/native/libapplauncher/main.cpp

*** 27,46 ****
  #include "PlatformString.h"
  #include "FilePath.h"
  #include "PropertyFile.h"
  #include "JavaVirtualMachine.h"
  #include "Package.h"
- #include "PlatformThread.h"
  #include "Macros.h"
  #include "Messages.h"
  
- 
- #ifdef WINDOWS
- #include <Shellapi.h>
- #endif
- 
- 
  #include <stdio.h>
  #include <signal.h>
  #include <stdlib.h>
  
  /*
--- 27,39 ----
*** 66,82 ****
      See CR 6316197 for more information.
  */
  
  extern "C" {
  
- #ifdef WINDOWS
-     BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
-             LPVOID lpvReserved) {
-         return true;
-     }
- #endif //WINDOWS
- 
      JNIEXPORT bool start_launcher(int argc, TCHAR* argv[]) {
          bool result = false;
          bool parentProcess = true;
  
          // Platform must be initialize first.
--- 59,68 ----
*** 181,191 ****
                          Messages& messages = Messages::GetInstance();
                          TString message = PlatformString::Format(
                                  messages.GetMessage(
                                  APPCDS_CACHE_FILE_NOT_FOUND),
                                  cacheFileName.data());
!                         throw FileNotFoundException(message);
                      }
                      break;
                  }
  
                  case cdsUninitialized: {
--- 167,177 ----
                          Messages& messages = Messages::GetInstance();
                          TString message = PlatformString::Format(
                                  messages.GetMessage(
                                  APPCDS_CACHE_FILE_NOT_FOUND),
                                  cacheFileName.data());
!                         throw Exception(message);
                      }
                      break;
                  }
  
                  case cdsUninitialized: {
*** 194,204 ****
                  }
              }
  
              // Run App
              result = RunVM();
!         } catch (FileNotFoundException &e) {
              platform.ShowMessage(e.GetMessage());
          }
  
          return result;
      }
--- 180,190 ----
                  }
              }
  
              // Run App
              result = RunVM();
!         } catch (Exception &e) {
              platform.ShowMessage(e.GetMessage());
          }
  
          return result;
      }