rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- support for long path entries (2048 characters)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@135 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
schlaepfer
2006-04-12 13:22:49 +00:00
parent 0cec9f4350
commit 8dc9960a45
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
blackbox/Usb/Mod/Utils.otd
View File

@@ -1,5 +1,5 @@
MODULE UsbUtils; MODULE UsbUtils;
IMPORT WinApi, Strings, Log := StdLog, XC := XdeCmds; IMPORT WinApi, Strings, Log := StdLog;
CONST CONST
HK_LM_JRE_Key = "SOFTWARE\javaSoft\Java Runtime Environment"; HK_LM_JRE_Key = "SOFTWARE\javaSoft\Java Runtime Environment";
@@ -9,6 +9,27 @@ IMPORT WinApi, Strings, Log := StdLog, XC := XdeCmds;
HK_CU_PATH_Key = "Environment"; HK_CU_PATH_Key = "Environment";
PATH_value = "PATH"; PATH_value = "PATH";
PROCEDURE RegLMQuery* (IN subKey, valueName: ARRAY OF SHORTCHAR;
OUT qValue: ARRAY OF SHORTCHAR): BOOLEAN;
VAR
res, length: INTEGER; hKey: WinApi.HKEY;
BEGIN
qValue := "";
res := WinApi.RegOpenKeyEx(WinApi.HKEY_LOCAL_MACHINE,
subKey, 0, WinApi.KEY_QUERY_VALUE, hKey);
IF res # WinApi.ERROR_SUCCESS THEN
RETURN FALSE
ELSE
length := LEN(qValue);
res := WinApi.RegQueryValueEx(hKey, valueName, NIL, NIL, qValue[0], length);
IF res # WinApi.ERROR_SUCCESS THEN
RETURN FALSE
END
END;
res := WinApi.RegCloseKey(hKey);
RETURN TRUE;
END RegLMQuery;
PROCEDURE RegCUQuery* (IN subKey, valueName: ARRAY OF SHORTCHAR; PROCEDURE RegCUQuery* (IN subKey, valueName: ARRAY OF SHORTCHAR;
OUT qValue: ARRAY OF SHORTCHAR): BOOLEAN; OUT qValue: ARRAY OF SHORTCHAR): BOOLEAN;
VAR VAR
@@ -53,15 +74,19 @@ IMPORT WinApi, Strings, Log := StdLog, XC := XdeCmds;
CONST CONST
PATH_Pattern = "\bin\client"; PATH_Pattern = "\bin\client";
VAR VAR
jreHome, regValue, tmpRegValue: ARRAY 512 OF SHORTCHAR; jreHome, regValue, tmpRegValue: ARRAY 2048 OF SHORTCHAR;
pos: INTEGER; noUserPathValue, found: BOOLEAN; pos: INTEGER; noUserPathValue, success, found: BOOLEAN;
BEGIN BEGIN
(* get jre home path *) (* get jre home path *)
XC.RegLocalMachineQuery(HK_LM_JRE_Key, HK_LM_JRE_CurrentVersion_value, tmpRegValue); (* e.g. "1.5" *) IF ~RegLMQuery(HK_LM_JRE_Key, HK_LM_JRE_CurrentVersion_value, tmpRegValue) (* e.g. "1.5" *) THEN
XC.RegLocalMachineQuery(HK_LM_JRE_Key + "\" + tmpRegValue, HK_LM_JRE_JavaHome_value, jreHome); Log.String("UsbUtils: Error getting " + HK_LM_JRE_Key + "! Is Java installed?"); Log.Ln; RETURN
END;
IF ~RegLMQuery(HK_LM_JRE_Key + "\" + tmpRegValue, HK_LM_JRE_JavaHome_value, jreHome) THEN
Log.String("UsbUtils: Error getting " + HK_LM_JRE_Key + "\" + tmpRegValue + "! Is Java installed?"); Log.Ln; RETURN
END;
(* look for %javahome%\bin\client on system and user path*) (* look for %javahome%\bin\client on system and user path*)
regValue := jreHome + PATH_Pattern; regValue := jreHome + PATH_Pattern;
XC.RegLocalMachineQuery(HK_LM_PATH_Key, PATH_value, tmpRegValue); found := RegLMQuery(HK_LM_PATH_Key, "Path", tmpRegValue);
Strings.Find(LONG(tmpRegValue), LONG(regValue), 0, pos); Strings.Find(LONG(tmpRegValue), LONG(regValue), 0, pos);
found := pos >= 0; found := pos >= 0;
IF found THEN IF found THEN
@@ -78,7 +103,7 @@ IMPORT WinApi, Strings, Log := StdLog, XC := XdeCmds;
ELSE ELSE
tmpRegValue := tmpRegValue + ";" + regValue tmpRegValue := tmpRegValue + ";" + regValue
END; END;
IF RegCUCreateKeyAndSetValue(HK_CU_PATH_Key, PATH_value, tmpRegValue) THEN IF RegCUCreateKeyAndSetValue(HK_CU_PATH_Key, PATH_value, tmpRegValue) THEN
IF noUserPathValue THEN (* create user PATH value first *) IF noUserPathValue THEN (* create user PATH value first *)
Log.String("user value PATH created"); Log.Ln; Log.String("user value PATH created"); Log.Ln;
END; END;