pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Replaced backslashes with DirectorySeparator

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1362 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
Loesje_
2010-11-02 19:48:19 +00:00
parent 95d348513e
commit 9d0cbed421
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/geckoport/nsInit.pas
View File

@ -1126,7 +1126,7 @@ begin
ok := False; ok := False;
end else end else
begin begin
NS_StrLCat(Buf, '\'+XPCOM_DLL, BufLen); NS_StrLCat(Buf, DirectorySeparator+XPCOM_DLL, BufLen);
end; end;
end; end;
RegCloseKey(subKey); RegCloseKey(subKey);
@ -1247,7 +1247,7 @@ const
XPCOM_DEPENDENT_LIBS_LIST = 'dependentlibs.list'; XPCOM_DEPENDENT_LIBS_LIST = 'dependentlibs.list';
begin begin
NS_StrCopy(buffer, xpcomDir); NS_StrCopy(buffer, xpcomDir);
NS_StrLCat(buffer, '\' + XPCOM_DEPENDENT_LIBS_LIST, MAX_PATH); NS_StrLCat(buffer, DirectorySeparator + XPCOM_DEPENDENT_LIBS_LIST, MAX_PATH);
if not BufferedFile_Open(buffer, f) then if not BufferedFile_Open(buffer, f) then
begin begin
@ -1263,7 +1263,7 @@ begin
if buffer[l-1] in [#10, #13] then if buffer[l-1] in [#10, #13] then
buffer[l-1]:= #0; buffer[l-1]:= #0;
NS_StrCopy(buffer2, xpcomdir); NS_StrCopy(buffer2, xpcomdir);
NS_StrLCat(buffer2, '\', MAX_PATH); NS_StrLCat(buffer2, DirectorySeparator, MAX_PATH);
NS_StrLCat(buffer2, buffer, MAX_PATH); NS_StrLCat(buffer2, buffer, MAX_PATH);
cb(buffer2); cb(buffer2);
@ -1322,7 +1322,7 @@ begin
begin begin
xpcomDir[idx] := #0; xpcomDir[idx] := #0;
XPCOMGlueLoadDependentLibs(xpcomDir, ReadDependentCB); XPCOMGlueLoadDependentLibs(xpcomDir, ReadDependentCB);
NS_StrLCat(xpcomdir, '\'+xul_dll, sizeof(xpcomdir)); NS_StrLCat(xpcomdir, DirectorySeparator+xul_dll, sizeof(xpcomdir));
sXULLibrary := LoadLibrary(xpcomdir); sXULLibrary := LoadLibrary(xpcomdir);
end; end;
end; end;
@ -1652,7 +1652,7 @@ begin
(GREVersionCompare(ver, greVer)>=0) then (GREVersionCompare(ver, greVer)>=0) then
begin begin
dllPath := path; dllPath := path;
NS_StrCat(dllPath, '\'+XPCOM_DLL); NS_StrCat(dllPath, DirectorySeparator+XPCOM_DLL);
//if IsXpcomDll(dllPath) then //if IsXpcomDll(dllPath) then
// if CheckGeckoVersion(dllPath, reqVer) and // if CheckGeckoVersion(dllPath, reqVer) and
// IsXpcomDll(@dllPath) then // IsXpcomDll(@dllPath) then
@ -1733,7 +1733,7 @@ begin
if NS_CurrentProcessDirectory(cpd, MAX_PATH) then if NS_CurrentProcessDirectory(cpd, MAX_PATH) then
begin begin
dllPath := cpd; dllPath := cpd;
NS_StrCat(dllPath, '\'+XPCOM_DLL); NS_StrCat(dllPath, DirectorySeparator+XPCOM_DLL);
if IsXpcomDll(dllPath) then if IsXpcomDll(dllPath) then
begin begin
//buf := cpd; //buf := cpd;
@ -2187,7 +2187,7 @@ var
begin begin
Result := False; Result := False;
move(ParamStr(0)[1],buf^,min(bufLen,Length(ParamStr(0)))); move(ParamStr(0)[1],buf^,min(bufLen,Length(ParamStr(0))));
lastSlash := NS_StrRScan(buf, '\'); lastSlash := NS_StrRScan(buf, DirectorySeparator);
if Assigned(lastSlash) then if Assigned(lastSlash) then
begin begin
lastSlash^ := #0; lastSlash^ := #0;