Revision d436a267 trunk/Pithos.Installer/PithosPlus.~is

b/trunk/Pithos.Installer/PithosPlus.~is
54 54
VersionInfoCompany=GRNET
55 55
VersionInfoDescription=Pithos Plus
56 56
VersionInfoCopyright=(c) 2011-2012 GRNET
57
VersionInfoProductName=Pitho Plus
57
VersionInfoProductName=Pithos Plus
58 58
VersionInfoProductVersion=1
59 59
AppModifyPath="{app}\UninsHs.exe" /m0=AppId
60
;CloseApplications=yes
61
RestartApplications=yes
60 62

  
61 63
[Languages]
62 64
Name: "english"; MessagesFile: "compiler:Default.isl"
......
79 81
Source: "..\Pithos.Client.WPF\bin\Debug\PithosPlus.exe"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
80 82
Source: "..\Pithos.Client.WPF\bin\Debug\PithosPlus.exe.config"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
81 83
; Appearance
82
Source: "Skin\ISSkin.dll"; DestDir: {app}; Flags: dontcopy
83
Source: "Skin\GRNETWhite.cjstyles"; DestDir: {tmp}; Flags: dontcopy
84
;Source: "Skin\ISSkin.dll"; DestDir: {app}; Flags: dontcopy
85
;Source: "Skin\GRNETWhite.cjstyles"; DestDir: {tmp}; Flags: dontcopy
84 86
; Repair/Modify
85 87
Source: "Tools\UninsHs.exe"; DestDir: {app}; Flags: restartreplace
86 88
; Running Processes
87
Source: "Tools\IssProc.dll"; DestDir: {app}; Flags: restartreplace
89
;Source: "Tools\IssProc.dll"; DestDir: {app}; Flags: restartreplace
88 90
; DLL
89 91
Source: "..\Pithos.ShellExtensions\bin\x86\Debug\Pithos.ShellExtensions.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
90 92
Source: "..\Pithos.ShellExtensions\bin\x64\Debug\Pithos.ShellExtensions.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
......
100 102
Source: "..\Pithos.Client.WPF\bin\Debug\Newtonsoft.Json.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
101 103
Source: "..\Pithos.Client.WPF\bin\Debug\NHibernate.ByteCode.Castle.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
102 104
Source: "..\Pithos.Client.WPF\bin\Debug\NHibernate.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
103
Source: "..\Pithos.Client.WPF\bin\Debug\NHibernate.Search.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
104 105
Source: "..\Pithos.Client.WPF\bin\Debug\ParallelExtensionsExtras.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
105 106
Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Core.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
106 107
Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Interfaces.dll"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
......
314 315
        LicenseID: Integer;      
315 316

  
316 317
// IssFindModule called on in/uninstall
317
function IssFindModule(hWnd: Integer; Modulename: String; Language: PAnsiChar; Silent: Boolean; CanIgnore: Boolean ): Integer;
318
external 'IssFindModuleW@files:IssProc.dll stdcall setuponly';
318
///function IssFindModule(hWnd: Integer; Modulename: String; Language: PAnsiChar; Silent: Boolean; CanIgnore: Boolean ): Integer;
319
///external 'IssFindModuleW@files:IssProc.dll stdcall setuponly';
319 320

  
320
function IssFindModuleU(hWnd: Integer; Modulename: String; Language: PAnsiChar; Silent: Boolean; CanIgnore: Boolean ): Integer;
321
external 'IssFindModuleW@{app}\IssProc.dll stdcall uninstallonly';
321
///function IssFindModuleU(hWnd: Integer; Modulename: String; Language: PAnsiChar; Silent: Boolean; CanIgnore: Boolean ): Integer;
322
///external 'IssFindModuleW@{app}\IssProc.dll stdcall uninstallonly';
322 323

  
323 324
//Call this to enable search for any in use file type
324
function IssEnableAnyFileInUseCheck(Folder: String): Integer;
325
external 'IssEnableAnyFileInUseCheckW@files:IssProc.dll stdcall setuponly';
325
///function IssEnableAnyFileInUseCheck(Folder: String): Integer;
326
///external 'IssEnableAnyFileInUseCheckW@files:IssProc.dll stdcall setuponly';
326 327

  
327 328
//IssEnableAnyFileInUseCheck called on uninstall
328
function IssEnableAnyFileInUseCheckU(Folder: String): Integer;
329
external 'IssEnableAnyFileInUseCheckW@{app}\IssProc.dll stdcall uninstallonly';
329
///function IssEnableAnyFileInUseCheckU(Folder: String): Integer;
330
///external 'IssEnableAnyFileInUseCheckW@{app}\IssProc.dll stdcall uninstallonly';
330 331

  
331 332
//Register for commercial use on install
332
function IssRegister(rName: PAnsiChar; rKey: PAnsiChar): Integer;
333
external 'IssRegister@files:IssProc.dll stdcall setuponly';
333
///function IssRegister(rName: PAnsiChar; rKey: PAnsiChar): Integer;
334
///external 'IssRegister@files:IssProc.dll stdcall setuponly';
334 335

  
335 336
//Register for commercial use on uninstall
336
function IssRegisterU(rName: PAnsiChar; rKey: PAnsiChar): Integer;
337
external 'IssRegister@{app}\IssProc.dll stdcall uninstallonly';
337
///function IssRegisterU(rName: PAnsiChar; rKey: PAnsiChar): Integer;
338
///external 'IssRegister@{app}\IssProc.dll stdcall uninstallonly';
338 339

  
339 340
// Importing LoadSkin API from ISSkin.DLL
340
procedure LoadSkin(lpszPath: String; lpszIniFileName: String);
341
external 'LoadSkin@files:isskin.dll stdcall';
341
//procedure LoadSkin(lpszPath: String; lpszIniFileName: String);
342
//external 'LoadSkin@files:isskin.dll stdcall';
342 343

  
343
procedure UnloadSkin();
344
external 'UnloadSkin@files:isskin.dll stdcall';
344
//procedure UnloadSkin();
345
//external 'UnloadSkin@files:isskin.dll stdcall';
345 346

  
346 347
// Importing ShowWindow Windows API from User32.DLL
347 348
function ShowWindow(hWnd: Integer; uType: Integer): Integer;
......
393 394
      Result := false;
394 395
            
395 396
      hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));                     { get main wizard handle }
396
      IssEnableAnyFileInUseCheck(ExpandConstant('{app}'));
397
      sModuleName :=ExpandConstant('pithos*.dll;PithosPlus.exe');            
398
      nCode:=IssFindModule(hWnd,sModuleName,'en',false,true);                { search for module and display files-in-use window if found  }
397
///      IssEnableAnyFileInUseCheck(ExpandConstant('{app}'));
398
///      sModuleName :=ExpandConstant('pithos*.dll;PithosPlus.exe');            
399
///      nCode:=IssFindModule(hWnd,sModuleName,'en',false,true);                { search for module and display files-in-use window if found  }
399 400
     if nCode=1 then  begin                                                 { cancel pressed or files-in-use window closed }
400 401
          PostMessage (WizardForm.Handle, $0010, 0, 0);                     { quit setup, $0010=WM_CLOSE }
401 402
     end else if (nCode=0) or (nCode=2) then begin                          { no module found or ignored pressed}
......
407 408
function InitializeSetup(): Boolean;
408 409
begin
409 410
  //Unpack The Skin
410
  ExtractTemporaryFile('GRNETWhite.cjstyles');
411
  LoadSkin(ExpandConstant('{tmp}\GRNETWhite.cjstyles'), '');
411
 //ExtractTemporaryFile('GRNETWhite.cjstyles');
412
 //LoadSkin(ExpandConstant('{tmp}\GRNETWhite.cjstyles'), '');
412 413
    
413 414
  // Test the presence of .NET 4.0
414 415
  if (not(RegKeyExists(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4'))) then
......
420 421
procedure DeinitializeSetup();
421 422
begin
422 423
  //Hide Window widget
423
  ShowWindow(StrToInt(ExpandConstant('{wizardhwnd}')), 0);
424
  UnloadSkin();
424
  //ShowWindow(StrToInt(ExpandConstant('{wizardhwnd}')), 0);
425
  //UnloadSkin();
425 426
end;
426 427

  
427 428
function ShouldInstalldotNET40(): Boolean;
......
534 535
  BitmapImage1.width := Page.SurfaceWidth;
535 536
  BitmapImage1.height := Page.SurfaceHeight;
536 537
  BitmapImage1.Bitmap.LoadFromFile(BitmapFileName);
537
  BitmapImage1.Left := 0 
538
  BitmapImage1.Left := 0;
538 539
  BitmapImage1.Top := Page.Surface.Top + LabelWz.Height;
539 540
  BitmapImage1.Parent := Page.Surface;
540
  
541 541
end;
542 542

  
543 543
procedure InitializeWizard;

Also available in: Unified diff