src/jdk.jpackage/windows/native/libapplauncher/WindowsPlatform.h

*** 21,45 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
- #include "Platform.h"
- 
- #ifdef WINDOWS
- 
  #ifndef WINDOWSPLATFORM_H
  #define WINDOWSPLATFORM_H
  
- #include "GenericPlatform.h"
- 
  #include <Windows.h>
  
! #pragma warning( push )
! // C4250 - 'class1' : inherits 'class2::member'
! #pragma warning( disable : 4250 )
! class WindowsPlatform : virtual public Platform, GenericPlatform {
  private:
      DWORD FMainThread;
  
  public:
      WindowsPlatform(void);
--- 21,37 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  #ifndef WINDOWSPLATFORM_H
  #define WINDOWSPLATFORM_H
  
  #include <Windows.h>
+ #include "Platform.h"
  
! class WindowsPlatform : virtual public Platform {
  private:
      DWORD FMainThread;
  
  public:
      WindowsPlatform(void);
*** 52,92 ****
  
      virtual void ShowMessage(TString title, TString description);
      virtual void ShowMessage(TString description);
      virtual MessageResponse ShowResponseMessage(TString title,
              TString description);
-     //virtual MessageResponse ShowResponseMessage(TString description);
  
      virtual void SetCurrentDirectory(TString Value);
      virtual TString GetPackageRootDirectory();
      virtual TString GetAppDataDirectory();
      virtual TString GetBundledJVMLibraryFileName(TString RuntimePath);
  
      virtual ISectionalPropertyContainer* GetConfigFile(TString FileName);
  
      virtual TString GetModuleFileName();
      virtual Module LoadLibrary(TString FileName);
      virtual void FreeLibrary(Module AModule);
      virtual Procedure GetProcAddress(Module AModule, std::string MethodName);
-     virtual std::vector<TString> GetLibraryImports(const TString FileName);
-     virtual std::vector<TString> FilterOutRuntimeDependenciesForPlatform(
-             std::vector<TString> Imports);
  
      virtual Process* CreateProcess();
  
      virtual bool IsMainThread();
      virtual TPlatformNumber GetMemorySize();
  
      virtual TString GetTempDirectory();
! 
! #ifdef DEBUG
!     virtual bool IsNativeDebuggerPresent();
!     virtual int GetProcessID();
! #endif //DEBUG
  };
- #pragma warning( pop ) // C4250
- 
  
  class FileHandle {
  private:
      HANDLE FHandle;
  
--- 44,79 ----
  
      virtual void ShowMessage(TString title, TString description);
      virtual void ShowMessage(TString description);
      virtual MessageResponse ShowResponseMessage(TString title,
              TString description);
  
      virtual void SetCurrentDirectory(TString Value);
      virtual TString GetPackageRootDirectory();
      virtual TString GetAppDataDirectory();
+     virtual TString GetAppName();
      virtual TString GetBundledJVMLibraryFileName(TString RuntimePath);
+     TString GetPackageAppDirectory();
+     TString GetPackageLauncherDirectory();
+     TString GetPackageRuntimeBinDirectory();
  
      virtual ISectionalPropertyContainer* GetConfigFile(TString FileName);
  
      virtual TString GetModuleFileName();
      virtual Module LoadLibrary(TString FileName);
      virtual void FreeLibrary(Module AModule);
      virtual Procedure GetProcAddress(Module AModule, std::string MethodName);
  
      virtual Process* CreateProcess();
  
      virtual bool IsMainThread();
      virtual TPlatformNumber GetMemorySize();
  
      virtual TString GetTempDirectory();
!     void InitStreamLocale(wios *stream);
!     void addPlatformDependencies(JavaLibrary *pJavaLibrary);
  };
  
  class FileHandle {
  private:
      HANDLE FHandle;
  
*** 180,190 ****
      virtual TProcessID GetProcessID();
      virtual void SetInput(TString Value);
      virtual std::list<TString> GetOutput();
  };
  
- 
- 
- 
  #endif // WINDOWSPLATFORM_H
- 
- #endif // WINDOWS
--- 167,172 ----