ShuriZma
/
FPPS4
mirror of https://github.com/red-prig/fpPS4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+

This commit is contained in:
Pavel 2024-05-15 21:12:27 +03:00
parent 47c1ace99f
commit 62e787bb1d
5 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gui/cfg_edit.pas
View File

@ -87,36 +87,38 @@ procedure DoOpenFile(Edit:TEdit);
var var
d:TOpenDialog; d:TOpenDialog;
begin begin
d:=TOpenDialog.Create(nil); d:=nil;
try
d.InitialDir:=Edit.Text; d:=TOpenDialog.Create(nil);
d.InitialDir:=Edit.Text;
d.Options:=[ofPathMustExist,ofEnableSizing,ofViewDetail]; d.Options:=[ofPathMustExist,ofEnableSizing,ofViewDetail];
if d.Execute then
if d.Execute then begin
begin Edit.Text:=d.FileName;
Edit.Text:=d.FileName; end;
except
//
end; end;
FreeAndNil(d);
d.Free;
end; end;
procedure DoOpenDir(Edit:TEdit); procedure DoOpenDir(Edit:TEdit);
var var
d:TSelectDirectoryDialog; d:TSelectDirectoryDialog;
begin begin
d:=TSelectDirectoryDialog.Create(nil); d:=nil;
try
d.InitialDir:=Edit.Text; d:=TSelectDirectoryDialog.Create(nil);
d.InitialDir:=Edit.Text;
d.Options:=[ofPathMustExist,ofEnableSizing,ofViewDetail]; d.Options:=[ofPathMustExist,ofEnableSizing,ofViewDetail];
if d.Execute then
if d.Execute then begin
begin Edit.Text:=d.FileName;
Edit.Text:=d.FileName; end;
except
//
end; end;
FreeAndNil(d);
d.Free;
end; end;
procedure TfrmCfgEditor.BtnLogOpenClick(Sender: TObject); procedure TfrmCfgEditor.BtnLogOpenClick(Sender: TObject);

34
gui/game_edit.pas
View File

@ -97,22 +97,28 @@ procedure TButtonPath.OpenDir(Sender:TObject);
var var
d:TSelectDirectoryDialog; d:TSelectDirectoryDialog;
begin begin
d:=TSelectDirectoryDialog.Create(nil); d:=nil;
with TMyStringGrid(Editor.Parent) do try
begin d:=TSelectDirectoryDialog.Create(nil);
d.InitialDir:=Cells[1,aRow];
with TMyStringGrid(Editor.Parent) do
begin
d.InitialDir:=Cells[1,aRow];
end;
d.Options:=[ofPathMustExist,ofEnableSizing,ofViewDetail];
if d.Execute then
with TMyStringGrid(Editor.Parent) do
begin
Cells[1,aRow]:=d.FileName;
end;
except
//
end; end;
FreeAndNil(d);
d.Options:=[ofPathMustExist,ofEnableSizing,ofViewDetail];
if d.Execute then
with TMyStringGrid(Editor.Parent) do
begin
Cells[1,aRow]:=d.FileName;
end;
d.Free;
TfrmGameEditor(Self.Form).LoadParamSfo(True); TfrmGameEditor(Self.Form).LoadParamSfo(True);

6
sys/kern/kern_rtld.pas
View File

@ -1112,7 +1112,7 @@ begin
vm_object_deallocate(imgp^.obj); vm_object_deallocate(imgp^.obj);
// //
Writeln(StdErr,'[',HexStr(vaddr_lo,8),'..',HexStr(vaddr_hi,8),']'); Writeln(StdErr,'[',HexStr(vaddr_lo,8),'..',HexStr(vaddr_hi,8),']');
Writeln(StdErr,'[KERNEL] self_load_section: vm_map_insert failed ',id,', ',HexStr(vaddr,8)); Writeln(StdErr,'[KERNEL] self_load_section: vm_map_insert failed ',id,', ',HexStr(vaddr,8),' (',Result,')');
Exit(vm_mmap_to_errno(Result)); Exit(vm_mmap_to_errno(Result));
end; end;
@ -1139,7 +1139,7 @@ begin
vm_map_unlock(map); vm_map_unlock(map);
// //
Writeln(StdErr,'[KERNEL] self_load_section: copyout failed ', Writeln(StdErr,'[KERNEL] self_load_section: copyout failed ',
id,', ',HexStr(base),'->',HexStr(vaddr_lo,8),':',HexStr(memsz,8)); id,', ',HexStr(base),'->',HexStr(vaddr_lo,8),':',HexStr(memsz,8),' (',Result,')');
Assert(false,'self_load_section'); Assert(false,'self_load_section');
Exit; Exit;
end; end;
@ -1149,7 +1149,7 @@ begin
begin begin
vm_map_unlock(map); vm_map_unlock(map);
// //
Writeln(StdErr,'[KERNEL] self_load_section: vm_map_protect failed ',id,', ',HexStr(vaddr,8)); Writeln(StdErr,'[KERNEL] self_load_section: vm_map_protect failed ',id,', ',HexStr(vaddr,8),' (',Result,')');
Exit(vm_mmap_to_errno(Result)); Exit(vm_mmap_to_errno(Result));
end; end;

8
sys/kern/subr_dynlib.pas
View File

@ -2828,7 +2828,7 @@ begin
error:=rtld_mmap(@vaddr_lo,obj^.map_size); error:=rtld_mmap(@vaddr_lo,obj^.map_size);
if (error<>0) then if (error<>0) then
begin begin
Writeln(StdErr,'preload_prx_internal:','failed to allocate VA for ',obj^.lib_path); Writeln(StdErr,'[KERNEL] preload_prx_internal:','failed to allocate VA for ',obj^.lib_path,' (',error,')');
Exit(error); Exit(error);
end; end;
@ -2848,7 +2848,7 @@ begin
vm_map_unlock(map); vm_map_unlock(map);
// //
Writeln(StdErr,'[',HexStr(vaddr_lo,8),'..',HexStr(vaddr_hi,8),']'); Writeln(StdErr,'[',HexStr(vaddr_lo,8),'..',HexStr(vaddr_hi,8),']');
Writeln(StdErr,'[KERNEL] preload_prx_internal: vm_map_insert failed ',HexStr(vaddr_lo,8)); Writeln(StdErr,'[KERNEL] preload_prx_internal: vm_map_insert failed ',HexStr(vaddr_lo,8),' (',error,')');
error:=vm_mmap_to_errno(error); error:=vm_mmap_to_errno(error);
Exit(error); Exit(error);
end; end;
@ -2870,7 +2870,7 @@ begin
begin begin
vm_map_unlock(map); vm_map_unlock(map);
// //
Writeln(StdErr,'[KERNEL] preload_prx_internal: vm_map_protect failed ',HexStr(vaddr_lo,8)); Writeln(StdErr,'[KERNEL] preload_prx_internal: vm_map_protect failed ',HexStr(vaddr_lo,8),' (',error,')');
error:=vm_mmap_to_errno(error); error:=vm_mmap_to_errno(error);
Exit(error); Exit(error);
end; end;
@ -2881,7 +2881,7 @@ begin
begin begin
vm_map_unlock(map); vm_map_unlock(map);
// //
Writeln(StdErr,'[KERNEL] preload_prx_internal: vm_map_protect failed ',HexStr(QWORD(data),8)); Writeln(StdErr,'[KERNEL] preload_prx_internal: vm_map_protect failed ',HexStr(QWORD(data),8),' (',error,')');
error:=vm_mmap_to_errno(error); error:=vm_mmap_to_errno(error);
Exit(error); Exit(error);
end; end;

1
vulkan/vHostBufferManager.pas
View File

@ -98,6 +98,7 @@ var
buf:TvHostBuffer; buf:TvHostBuffer;
__end:QWORD; __end:QWORD;
begin begin
Result:=nil;
__end:=Addr+Size; __end:=Addr+Size;
key:=Default(TvHostBufferKey); key:=Default(TvHostBufferKey);