openlp-core team mailing list archive

[Stevan Pettit <openlp@xxxxxxxxxxxxxxx>]

Stevan Pettit has proposed merging lp:~smpettit/openlp/inno-setup into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #870715 in OpenLP: "Inno Setup check for OpenLP running not working"
  https://bugs.launchpad.net/openlp/+bug/870715

For more details, see:
https://code.launchpad.net/~smpettit/openlp/inno-setup/+merge/78737

Bug #870715

As per documentation for Inno Setup Unicode, changed the parameter string type of psvince.dll to the correct setting to check if OpenLP is currently running during a setup.

"If you want to compile an existing script that imports ANSI Windows API calls with the Unicode compiler, either upgrade to the 'W' Unicode API call or change the parameters from 'String' or 'PChar' to 'AnsiString'. The 'AnsiString' approach will make your [Code] compatible with both the Unicode and the non Unicode version."

Tested and works as before.
-- 
https://code.launchpad.net/~smpettit/openlp/inno-setup/+merge/78737
Your team OpenLP Core is requested to review the proposed merge of lp:~smpettit/openlp/inno-setup into lp:openlp.

=== modified file 'resources/windows/OpenLP-2.0.iss'
--- resources/windows/OpenLP-2.0.iss	2011-05-23 15:41:22 +0000
+++ resources/windows/OpenLP-2.0.iss	2011-10-08 22:32:24 +0000
@@ -87,7 +87,7 @@
 Root: HKCR; Subkey: "OpenLP\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\OpenLP.exe"" ""%1"""
 
 [Code]
-function IsModuleLoaded(modulename: String ):  Boolean;
+function IsModuleLoaded(modulename: AnsiString ):  Boolean;
 external 'IsModuleLoaded@files:psvince.dll stdcall';
 
 function GetUninstallString(): String;