diff --git a/data/common/drivers/acpi/acpi b/data/common/drivers/acpi/acpi index fa75ae194a..b67cd17933 100644 Binary files a/data/common/drivers/acpi/acpi and b/data/common/drivers/acpi/acpi differ diff --git a/data/common/drivers/acpi/install.kex b/data/common/drivers/acpi/install.kex index ed1ee66a73..c7970ba33e 100644 Binary files a/data/common/drivers/acpi/install.kex and b/data/common/drivers/acpi/install.kex differ diff --git a/data/common/icons32.png b/data/common/icons32.png index bdd09a4de9..05859534e6 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/drivers/devman/acpi.asm b/drivers/devman/acpi.asm index e1a081ec96..6cf10b55a6 100644 --- a/drivers/devman/acpi.asm +++ b/drivers/devman/acpi.asm @@ -1,6 +1,7 @@ - use32 +format binary as "" + db 'MENUET01' dd 1 dd start @@ -8,20 +9,25 @@ dd i_end dd mem dd mem dd 0 -dd 0 +dd app_path + +include '../../programs/macros.inc' +include '../../programs/proc32.inc' +include '../../programs/string.inc' start: - mov eax, 68 - mov ebx, 21 - mov ecx, sz_acpi - int 0x40 + stdcall string.concatenate, sz_dll, app_path + mov eax, 68 + mov ebx, 21 + mov ecx, app_path + int 0x40 - mov eax, -1 - int 0x40 - -sz_acpi db '/rd/1/drivers/acpi.dll',0 + mov eax, -1 + int 0x40 align 4 +app_path rb 2048 +sz_dll db '.dll',0 i_end: rb 128 mem: diff --git a/programs/cmm/quark/quark.c b/programs/cmm/quark/quark.c index ff6300a9d0..ecb7bd6e8c 100644 --- a/programs/cmm/quark/quark.c +++ b/programs/cmm/quark/quark.c @@ -725,5 +725,5 @@ void SetFontSize(char _size) list.horisontal_selelection = true; list.SetSizes(0, TOOLBAR_H, Form.cwidth-scroll.size_x-1, Form.cheight - TOOLBAR_H - calc(search.visible * SEARCH_H) - STATUSBAR_H /*- TAB_H*/, - math.round(list.font_h * 1.4)); + math.round(list.font_h * 1.3)); } \ No newline at end of file