From: Aleksey Bragin Date: Mon, 21 Jul 2008 09:15:15 +0000 (+0000) Subject: - Remove useless USE_W32API define from .rbuilds X-Git-Tag: ReactOS-0.3.6~230 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=1b7106dee16682f9849a66b8aa3ac238ed3236e5 - Remove useless USE_W32API define from .rbuilds - Fix compilation of a number of modules. - Delete outdated fmifs.h, the one from ReactOS includes should be used instead. - Move more libs to /lib directory. svn path=/trunk/; revision=34627 --- diff --git a/rosapps/applications/applications.rbuild b/rosapps/applications/applications.rbuild index c1138918796..41ab33a1347 100644 --- a/rosapps/applications/applications.rbuild +++ b/rosapps/applications/applications.rbuild @@ -25,6 +25,11 @@ --> + + + + + @@ -37,11 +42,9 @@ - diff --git a/rosapps/applications/cmdutils/comp/comp.rbuild b/rosapps/applications/cmdutils/comp/comp.rbuild index 7e71f6be6ce..0a748deb8e1 100644 --- a/rosapps/applications/cmdutils/comp/comp.rbuild +++ b/rosapps/applications/cmdutils/comp/comp.rbuild @@ -1,5 +1,4 @@ - kernel32 comp.c comp.rc diff --git a/rosapps/applications/cmdutils/mode/mode.rbuild b/rosapps/applications/cmdutils/mode/mode.rbuild index 6f993663cbe..0a530a56a5e 100644 --- a/rosapps/applications/cmdutils/mode/mode.rbuild +++ b/rosapps/applications/cmdutils/mode/mode.rbuild @@ -1,7 +1,6 @@ . . - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/cmdutils/sort/sort.rbuild b/rosapps/applications/cmdutils/sort/sort.rbuild index 721f9582243..cf1829fa987 100644 --- a/rosapps/applications/cmdutils/sort/sort.rbuild +++ b/rosapps/applications/cmdutils/sort/sort.rbuild @@ -1,5 +1,4 @@ - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/cmdutils/tee/tee.rbuild b/rosapps/applications/cmdutils/tee/tee.rbuild index de31d751cdb..7250ac5aebf 100644 --- a/rosapps/applications/cmdutils/tee/tee.rbuild +++ b/rosapps/applications/cmdutils/tee/tee.rbuild @@ -1,5 +1,4 @@ - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/cmdutils/touch/touch.rbuild b/rosapps/applications/cmdutils/touch/touch.rbuild index 19547086564..f1044026d5a 100644 --- a/rosapps/applications/cmdutils/touch/touch.rbuild +++ b/rosapps/applications/cmdutils/touch/touch.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 ntdll diff --git a/rosapps/applications/cmdutils/uptime/uptime.rbuild b/rosapps/applications/cmdutils/uptime/uptime.rbuild index d34d34bc4fa..48e728e583b 100644 --- a/rosapps/applications/cmdutils/uptime/uptime.rbuild +++ b/rosapps/applications/cmdutils/uptime/uptime.rbuild @@ -1,5 +1,4 @@ - 0x0501 0x0501 diff --git a/rosapps/applications/cmdutils/y/y.rbuild b/rosapps/applications/cmdutils/y/y.rbuild index b999bf177ae..37df929227d 100644 --- a/rosapps/applications/cmdutils/y/y.rbuild +++ b/rosapps/applications/cmdutils/y/y.rbuild @@ -1,5 +1,4 @@ - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/devutils/cputointel/cputointel.rbuild b/rosapps/applications/devutils/cputointel/cputointel.rbuild index 2267eb9ad8f..ad97f9e2827 100644 --- a/rosapps/applications/devutils/cputointel/cputointel.rbuild +++ b/rosapps/applications/devutils/cputointel/cputointel.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/devutils/gdb2/gdb2.rbuild b/rosapps/applications/devutils/gdb2/gdb2.rbuild index 7731f5ea632..f2d2d7a5812 100644 --- a/rosapps/applications/devutils/gdb2/gdb2.rbuild +++ b/rosapps/applications/devutils/gdb2/gdb2.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/devutils/gdihv/gdihv.rbuild b/rosapps/applications/devutils/gdihv/gdihv.rbuild index c2b4660d6fa..99481b216e1 100644 --- a/rosapps/applications/devutils/gdihv/gdihv.rbuild +++ b/rosapps/applications/devutils/gdihv/gdihv.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 user32 diff --git a/rosapps/applications/devutils/genguid/genguid.rbuild b/rosapps/applications/devutils/genguid/genguid.rbuild index dc4b9ad4e7a..3ad0211f257 100644 --- a/rosapps/applications/devutils/genguid/genguid.rbuild +++ b/rosapps/applications/devutils/genguid/genguid.rbuild @@ -1,5 +1,4 @@ - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/devutils/roswebparser/roswebparser.rbuild b/rosapps/applications/devutils/roswebparser/roswebparser.rbuild index 831d9a9a36a..6c4f0ebd893 100644 --- a/rosapps/applications/devutils/roswebparser/roswebparser.rbuild +++ b/rosapps/applications/devutils/roswebparser/roswebparser.rbuild @@ -2,9 +2,9 @@ . 0x0501 0x0501 - - kernel32 - roswebparser.c - utf8.c + + kernel32 + roswebparser.c + utf8.c diff --git a/rosapps/applications/devutils/syscalldump/syscalldump.rbuild b/rosapps/applications/devutils/syscalldump/syscalldump.rbuild index 931dd000beb..27ce6e28b44 100644 --- a/rosapps/applications/devutils/syscalldump/syscalldump.rbuild +++ b/rosapps/applications/devutils/syscalldump/syscalldump.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/devutils/zoomin/zoomin.rbuild b/rosapps/applications/devutils/zoomin/zoomin.rbuild index e517b19c34f..528d16e3904 100644 --- a/rosapps/applications/devutils/zoomin/zoomin.rbuild +++ b/rosapps/applications/devutils/zoomin/zoomin.rbuild @@ -2,7 +2,6 @@ . 0x0501 0x0501 - kernel32 gdi32 user32 diff --git a/rosapps/applications/downloader/downloader.rbuild b/rosapps/applications/downloader/downloader.rbuild index b915d8d8fac..9ca46e5b400 100644 --- a/rosapps/applications/downloader/downloader.rbuild +++ b/rosapps/applications/downloader/downloader.rbuild @@ -5,7 +5,6 @@ . . - 0x0501 0x0600 diff --git a/rosapps/applications/fontview/fontview.rbuild b/rosapps/applications/fontview/fontview.rbuild index ac22427a647..c4a10148f4e 100644 --- a/rosapps/applications/fontview/fontview.rbuild +++ b/rosapps/applications/fontview/fontview.rbuild @@ -1,6 +1,5 @@ . - gdi32 user32 shell32 diff --git a/rosapps/applications/imagesoft/imagesoft.rbuild b/rosapps/applications/imagesoft/imagesoft.rbuild index 60fb3de44f6..156f525a071 100644 --- a/rosapps/applications/imagesoft/imagesoft.rbuild +++ b/rosapps/applications/imagesoft/imagesoft.rbuild @@ -2,7 +2,6 @@ . - 0x0600 0x0501 kernel32 diff --git a/rosapps/applications/magnify/magnify.rbuild b/rosapps/applications/magnify/magnify.rbuild index 64b8e1dc7fa..29d01b31566 100644 --- a/rosapps/applications/magnify/magnify.rbuild +++ b/rosapps/applications/magnify/magnify.rbuild @@ -2,7 +2,6 @@ . - 0x0600 0x0501 user32 diff --git a/rosapps/applications/net/ncftp/ncftp.rbuild b/rosapps/applications/net/ncftp/ncftp.rbuild index 2ef8e1a0b34..a71881ee227 100644 --- a/rosapps/applications/net/ncftp/ncftp.rbuild +++ b/rosapps/applications/net/ncftp/ncftp.rbuild @@ -6,7 +6,6 @@ ncftp - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/net/netreg/netreg.rbuild b/rosapps/applications/net/netreg/netreg.rbuild index b211a028038..c5985bae57e 100644 --- a/rosapps/applications/net/netreg/netreg.rbuild +++ b/rosapps/applications/net/netreg/netreg.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/net/niclist/niclist.rbuild b/rosapps/applications/net/niclist/niclist.rbuild index dc0d21a9c72..b95594a3a07 100644 --- a/rosapps/applications/net/niclist/niclist.rbuild +++ b/rosapps/applications/net/niclist/niclist.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/net/roshttpd/roshttpd.rbuild b/rosapps/applications/net/roshttpd/roshttpd.rbuild index 15a0c659179..419b46c0cc7 100644 --- a/rosapps/applications/net/roshttpd/roshttpd.rbuild +++ b/rosapps/applications/net/roshttpd/roshttpd.rbuild @@ -2,7 +2,6 @@ include - 0x600 0x501 diff --git a/rosapps/applications/notevil/notevil.rbuild b/rosapps/applications/notevil/notevil.rbuild index d87d605f1cd..8ff083a3620 100644 --- a/rosapps/applications/notevil/notevil.rbuild +++ b/rosapps/applications/notevil/notevil.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/packmgr/cmd-line/rosget.rbuild b/rosapps/applications/packmgr/cmd-line/rosget.rbuild index d9fab33c146..e789017aba5 100644 --- a/rosapps/applications/packmgr/cmd-line/rosget.rbuild +++ b/rosapps/applications/packmgr/cmd-line/rosget.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 diff --git a/rosapps/applications/packmgr/gui/lang/pl-PL.rc b/rosapps/applications/packmgr/gui/lang/pl-PL.rc deleted file mode 100644 index 15a87943dfc..00000000000 --- a/rosapps/applications/packmgr/gui/lang/pl-PL.rc +++ /dev/null @@ -1,99 +0,0 @@ -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -/* Dialogs */ -IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 180, 200 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Opcje" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Brak opcji do ustawienia.", 0, 50, 95, 80, 8 -END - -IDD_DOIT DIALOGEX DISCARDABLE 0, 0, 180, 100 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Wykonywanie zadañ" -FONT 8, "MS Shell Dlg" -BEGIN - - CTEXT "{Stan}", IDC_TSTATUS, 0, 10, 180, 8 - - CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 - - CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 - - PUSHBUTTON "Przerwij", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED -END - -IDR_POPUP MENU DISCARDABLE -BEGIN - POPUP "PopUp", MENUBARBREAK - BEGIN - MENUITEM "Brak zadañ", 1, GRAYED - MENUITEM "Instaluj (zalecane)", 2, GRAYED - MENUITEM "Instaluj ze Ÿród³a", 3, GRAYED - MENUITEM "Uaktualnij", 4, GRAYED - MENUITEM "Odinstaluj", 5, GRAYED - MENUITEM SEPARATOR - MENUITEM "Opcje", 8 - MENUITEM SEPARATOR - MENUITEM "ZróbTo", 6 - END -END - -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -/* Dialogs */ -IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 180, 200 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Opcje" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Brak opcji do ustawienia.", 0, 50, 95, 80, 8 -END - -IDD_DOIT DIALOGEX DISCARDABLE 0, 0, 180, 100 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Wykonywanie zadañ" -FONT 8, "MS Shell Dlg" -BEGIN - - CTEXT "{Stan}", IDC_TSTATUS, 0, 10, 180, 8 - - CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 - - CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 - - PUSHBUTTON "Przerwij", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED -END - -IDR_POPUP MENU DISCARDABLE -BEGIN - POPUP "PopUp", MENUBARBREAK - BEGIN - MENUITEM "Brak zadañ", 1, GRAYED - MENUITEM "Instaluj (zalecane)", 2, GRAYED - MENUITEM "Instaluj ze Ÿród³a", 3, GRAYED - MENUITEM "Uaktualnij", 4, GRAYED - MENUITEM "Odinstaluj", 5, GRAYED - MENUITEM SEPARATOR - MENUITEM "Opcje", 8 - MENUITEM SEPARATOR - MENUITEM "ZróbTo", 6 - END -END - - diff --git a/rosapps/applications/packmgr/gui/lang/sk-SK.rc b/rosapps/applications/packmgr/gui/lang/sk-SK.rc deleted file mode 100644 index ad7081d6b3a..00000000000 --- a/rosapps/applications/packmgr/gui/lang/sk-SK.rc +++ /dev/null @@ -1,44 +0,0 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario@szm.sk) - * DATE OF TR: 03-02-2008 - */ - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -/* Dialogs */ -IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 180, 200 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Možnosti" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Zatia¾ nie sú žiadne možnosti.", 0, 50, 95, 80, 8 -END - -IDD_DOIT DIALOGEX DISCARDABLE 0, 0, 180, 100 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Vykonávam operácie" -FONT 8, "MS Shell Dlg" -BEGIN - - CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 - - CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 - - CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 - - PUSHBUTTON "Zruši", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED -END - -IDR_POPUP MENU DISCARDABLE -BEGIN - POPUP "PopUp", MENUBARBREAK - BEGIN - MENUITEM "Žiadna akcia", 1, GRAYED - MENUITEM "Inštalova (odporúèané)", 2, GRAYED - MENUITEM "Inštalova zo zdrojových kódov", 3, GRAYED - MENUITEM "Aktualizova", 4, GRAYED - MENUITEM "Odinštalova", 5, GRAYED - MENUITEM SEPARATOR - MENUITEM "Možnosti", 8 - MENUITEM SEPARATOR - MENUITEM "Spravi", 6 - END diff --git a/rosapps/applications/packmgr/gui/lang/uk-UA.rc b/rosapps/applications/packmgr/gui/lang/uk-UA.rc deleted file mode 100644 index 462b1eef045..00000000000 --- a/rosapps/applications/packmgr/gui/lang/uk-UA.rc +++ /dev/null @@ -1,50 +0,0 @@ -/* - * PROJECT: ReactOS Package Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: rosapps/packmgr/gui/uk.rc - * PURPOSE: Ukraianian Language File for packmgr - * TRANSLATOR: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -/* Dialogs */ -IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 180, 200 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ïàðàìåòðè" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ùå íåìຠí³ÿêèõ ïàðàìåòð³â.", 0, 50, 95, 80, 8 -END - -IDD_DOIT DIALOGEX DISCARDABLE 0, 0, 180, 100 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Âèêîíàííÿ îïåðàö³é" -FONT 8, "MS Shell Dlg" -BEGIN - - CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 - - CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 - - CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 - - PUSHBUTTON "Ïåðåðâàòè", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED -END - -IDR_POPUP MENU DISCARDABLE -BEGIN - POPUP "PopUp", MENUBARBREAK - BEGIN - MENUITEM "Íåìຠ䳿", 1, GRAYED - MENUITEM "Óñòàíîâèòè (ðåêîìåíäîâàíî)", 2, GRAYED - MENUITEM "Óñòàíîâèòè ç âèõ³äíèõ êîä³â", 3, GRAYED - MENUITEM "Îíîâèòè", 4, GRAYED - MENUITEM "Âèäàëèòè", 5, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ïàðàìåòðè", 8 - MENUITEM SEPARATOR - MENUITEM "Âèêîíàòè", 6 - END -END - diff --git a/rosapps/applications/packmgr/gui/main.h b/rosapps/applications/packmgr/gui/main.h index 46cb1716623..78fbe542e08 100644 --- a/rosapps/applications/packmgr/gui/main.h +++ b/rosapps/applications/packmgr/gui/main.h @@ -38,8 +38,6 @@ int Ask (const WCHAR* message); /* Toolbar Releated */ -#define TBSTYLE_FLAT 2048 - // This is the struct where the toolbar is defined extern const TBBUTTON Buttons []; diff --git a/rosapps/applications/packmgr/gui/packmgr.rbuild b/rosapps/applications/packmgr/gui/packmgr.rbuild index 50d51272e83..0249adf77d6 100644 --- a/rosapps/applications/packmgr/gui/packmgr.rbuild +++ b/rosapps/applications/packmgr/gui/packmgr.rbuild @@ -1,7 +1,6 @@ . . - 0x0501 0x0501 diff --git a/rosapps/applications/packmgr/gui/packmgr.rc b/rosapps/applications/packmgr/gui/packmgr.rc index 32f152a9dae..b6261eaa0d9 100644 --- a/rosapps/applications/packmgr/gui/packmgr.rc +++ b/rosapps/applications/packmgr/gui/packmgr.rc @@ -18,9 +18,6 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" -#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" /* EOF */ diff --git a/rosapps/applications/packmgr/lib/lang/pl-PL.rc b/rosapps/applications/packmgr/lib/lang/pl-PL.rc deleted file mode 100644 index 98e1ad6e990..00000000000 --- a/rosapps/applications/packmgr/lib/lang/pl-PL.rc +++ /dev/null @@ -1,62 +0,0 @@ -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -/* String Tables */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_LOAD "£adowanie ..." - ERR_OK "Zadanie ukoñczone." - ERR_PACK "Nie uda³o siê zainstalowaæ wszystkich pakietów\n\nProszê sprawdziæ szczegó³y w logach." - ERR_GENERIC "Wyst¹pi³ b³¹d. \nWiêcej informacji znajduje siê w logach." - ERR_DOWNL "Niezbêdny plik nie móg³ zostaæ œci¹gniêty!\nWiêcej informacji znajduje siê w logach." - ERR_FILE "B³¹d podczas wykonywania skryptu.\nPlik nie móg³ zostaæ otwarty." - - ERR_SYNATX "B³¹d podczas wykonywania skryptu.\nNieprawid³owa sk³adnia." - ERR_CALL "B³¹d podczas wykonywania skryptu.\nFunkcja nie zosta³a znaleziona." - ERR_PARAMETER "B³¹d podczas wykonywania skryptu.\nB³êdny parametr(y)." - - ERR_DEP1 "Do zainstalowania tego pakietu konieczne jest uprzednie zainstalowanie nastêpuj¹cych:\n\n" - ERR_DEP2 "\nCzy chcesz je teraz zainstalowaæ ?" - ERR_READY "Wybra³eœ instalacjê %d pakietu(ów). Aby je zainstalowaæ, musisz przeczytaæ i zaakceptowaæ licencjê ka¿dego z nich. \n\nCzy chcesz kontynuowaæ ?" -END - -123 RCDATA "options.xml" - -/* EOF */ -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -/* String Tables */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_LOAD "£adowanie ..." - ERR_OK "Zadanie ukoñczone." - ERR_PACK "Nie uda³o siê zainstalowaæ wszystkich pakietów\n\nProszê sprawdziæ szczegó³y w logach." - ERR_GENERIC "Wyst¹pi³ b³¹d. \nWiêcej informacji znajduje siê w logach." - ERR_DOWNL "Niezbêdny plik nie móg³ zostaæ œci¹gniêty!\nWiêcej informacji znajduje siê w logach." - ERR_FILE "B³¹d podczas wykonywania skryptu.\nPlik nie móg³ zostaæ otwarty." - - ERR_SYNATX "B³¹d podczas wykonywania skryptu.\nNieprawid³owa sk³adnia." - ERR_CALL "B³¹d podczas wykonywania skryptu.\nFunkcja nie zosta³a znaleziona." - ERR_PARAMETER "B³¹d podczas wykonywania skryptu.\nB³êdny parametr(y)." - - ERR_DEP1 "Do zainstalowania tego pakietu konieczne jest uprzednie zainstalowanie nastêpuj¹cych:\n\n" - ERR_DEP2 "\nCzy chcesz je teraz zainstalowaæ ?" - ERR_READY "Wybra³eœ instalacjê %d pakietu(ów). Aby je zainstalowaæ, musisz przeczytaæ i zaakceptowaæ licencjê ka¿dego z nich. \n\nCzy chcesz kontynuowaæ ?" -END - -123 RCDATA "options.xml" - -/* EOF */ diff --git a/rosapps/applications/packmgr/lib/package.rbuild b/rosapps/applications/packmgr/lib/package.rbuild index af9c2532f4e..8d6ecd5266c 100644 --- a/rosapps/applications/packmgr/lib/package.rbuild +++ b/rosapps/applications/packmgr/lib/package.rbuild @@ -3,7 +3,6 @@ . - 0x0501 0x0501 @@ -12,6 +11,7 @@ user32 expat urlmon + shell32 download.cpp functions.cpp diff --git a/rosapps/applications/packmgr/lib/package.rc b/rosapps/applications/packmgr/lib/package.rc index 0ef93b8b43f..9e93925d924 100644 --- a/rosapps/applications/packmgr/lib/package.rc +++ b/rosapps/applications/packmgr/lib/package.rc @@ -15,7 +15,6 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" -#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.c b/rosapps/applications/sysutils/chkdsk/chkdsk.c index 28d50992af2..bf15c55e8c4 100644 --- a/rosapps/applications/sysutils/chkdsk/chkdsk.c +++ b/rosapps/applications/sysutils/chkdsk/chkdsk.c @@ -36,11 +36,17 @@ // 1999 April (Emanuele Aliberti) // Adapted for ReactOS and egcs. // +// 2008 July (Aleksey Bragin) +// Cleanup, use ReactOS's fmifs.h +// //====================================================================== +#define WIN32_NO_STATUS +#define NTOS_MODE_USER #define UNICODE #include #include -#include +#include +#include #define _UNICODE 1 #include #include "config.h" @@ -233,12 +239,12 @@ ChkdskCallback( wprintf(L"UNKNOWN5\r"); break; - case UNKNOWN7: - wprintf(L"UNKNOWN7\r"); + case FSNOTSUPPORTED: + wprintf(L"FSNOTSUPPORTED\r"); break; - case UNKNOWN8: - wprintf(L"UNKNOWN8\r"); + case VOLUMEINUSE: + wprintf(L"VOLUMEINUSE\r"); break; case UNKNOWN9: @@ -269,6 +275,10 @@ ChkdskCallback( wprintf(L"DONEWITHSTRUCTURE\r"); break; + case CLUSTERSIZETOOSMALL: + wprintf(L"CLUSTERSIZETOOSMALL\r"); + break; + case PROGRESS: percent = (PDWORD) Argument; wprintf(L"%d percent completed.\r", *percent); diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild b/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild index 95427097bf9..8c0677db971 100644 --- a/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild +++ b/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild @@ -1,9 +1,12 @@ - - - - + + include/reactos/libs/fmifs + - --numeric-sort - + 0x0501 0x0501 - kernel32 + win32err + kernel32 + chklib.c chklib.rc diff --git a/rosapps/applications/sysutils/ctm/ctm.rbuild b/rosapps/applications/sysutils/ctm/ctm.rbuild index acecfda5aba..f7dee25b4bc 100644 --- a/rosapps/applications/sysutils/ctm/ctm.rbuild +++ b/rosapps/applications/sysutils/ctm/ctm.rbuild @@ -1,5 +1,4 @@ - epsapi ntdll kernel32 diff --git a/rosapps/applications/sysutils/fmifs.h b/rosapps/applications/sysutils/fmifs.h deleted file mode 100644 index 3e69e7cb3c2..00000000000 --- a/rosapps/applications/sysutils/fmifs.h +++ /dev/null @@ -1,129 +0,0 @@ -#ifndef _FMIFS_H -#define _FMIFS_H -/* $Id$ - * - * fmifs.h - * - * Copyright (c) 1998 Mark Russinovich - * Systems Internals - * http://www.sysinternals.com - * - * Typedefs and definitions for using chkdsk and formatex - * functions exported by the fmifs.dll library. - * - * --- - * - * 1999-02-18 (Emanuele Aliberti) - * Normalized function names. - * - */ -#ifndef _INC_WINDOWS_ -#include -#endif - -/* Output command */ -typedef -struct -{ - DWORD Lines; - PCHAR Output; - -} TEXTOUTPUT, *PTEXTOUTPUT; - - -/* Callback command types */ -typedef -enum -{ - PROGRESS, - DONEWITHSTRUCTURE, - UNKNOWN2, - UNKNOWN3, - UNKNOWN4, - UNKNOWN5, - INSUFFICIENTRIGHTS, - UNKNOWN7, - UNKNOWN8, - UNKNOWN9, - UNKNOWNA, - DONE, - UNKNOWNC, - UNKNOWND, - OUTPUT, - STRUCTUREPROGRESS - -} CALLBACKCOMMAND; - - -/* FMIFS callback definition */ -typedef -BOOL -(STDCALL * PFMIFSCALLBACK) ( - CALLBACKCOMMAND Command, - DWORD SubAction, - PVOID ActionInfo - ); - -/* Chkdsk command in FMIFS */ -VOID -STDCALL -ChkDsk( - PWCHAR DriveRoot, - PWCHAR Format, - BOOL CorrectErrors, - BOOL Verbose, - BOOL CheckOnlyIfDirty, - BOOL ScanDrive, - PVOID Unused2, - PVOID Unused3, - PFMIFSCALLBACK Callback - ); - -/* ChkdskEx command in FMIFS (not in the original) */ -VOID -STDCALL -ChkDskEx( - PWCHAR DriveRoot, - PWCHAR Format, - BOOL CorrectErrors, - BOOL Verbose, - BOOL CheckOnlyIfDirty, - BOOL ScanDrive, - PVOID Unused2, - PVOID Unused3, - PFMIFSCALLBACK Callback - ); - -/* DiskCopy command in FMIFS */ - -VOID -STDCALL -DiskCopy(VOID); - -/* Enable/Disable volume compression */ -BOOL -STDCALL -EnableVolumeCompression( - PWCHAR DriveRoot, - BOOL Enable - ); - -/* Format command in FMIFS */ - -/* media flags */ -#define FMIFS_HARDDISK 0xC -#define FMIFS_FLOPPY 0x8 - -VOID -STDCALL -FormatEx( - PWCHAR DriveRoot, - DWORD MediaFlag, - PWCHAR Format, - PWCHAR Label, - BOOL QuickFormat, - DWORD ClusterSize, - PFMIFSCALLBACK Callback - ); - -#endif /* ndef _FMIFS_H */ diff --git a/rosapps/applications/sysutils/gettype/gettype.rbuild b/rosapps/applications/sysutils/gettype/gettype.rbuild index 1f3ba190804..130f57e0cd0 100644 --- a/rosapps/applications/sysutils/gettype/gettype.rbuild +++ b/rosapps/applications/sysutils/gettype/gettype.rbuild @@ -1,7 +1,6 @@ . 0x0501 - kernel32 shell32 mpr diff --git a/rosapps/applications/sysutils/kill/kill.rbuild b/rosapps/applications/sysutils/kill/kill.rbuild index 7f9e4b385b4..9c88922f2ac 100644 --- a/rosapps/applications/sysutils/kill/kill.rbuild +++ b/rosapps/applications/sysutils/kill/kill.rbuild @@ -1,5 +1,4 @@ - ntdll kernel32 user32 diff --git a/rosapps/applications/sysutils/logevent/logevent.rbuild b/rosapps/applications/sysutils/logevent/logevent.rbuild index 91fc81124bd..b1c7092ef52 100644 --- a/rosapps/applications/sysutils/logevent/logevent.rbuild +++ b/rosapps/applications/sysutils/logevent/logevent.rbuild @@ -1,7 +1,6 @@ - kernel32 advapi32 logevent.c diff --git a/rosapps/applications/sysutils/lsdd/lsdd.rbuild b/rosapps/applications/sysutils/lsdd/lsdd.rbuild index 88f0b794de6..55597f15a88 100644 --- a/rosapps/applications/sysutils/lsdd/lsdd.rbuild +++ b/rosapps/applications/sysutils/lsdd/lsdd.rbuild @@ -1,8 +1,7 @@ - 0x0501 0x0501 - lib + win32err kernel32 user32 diff --git a/rosapps/applications/sysutils/man/man.rbuild b/rosapps/applications/sysutils/man/man.rbuild index da407112e68..53ac813e3f0 100644 --- a/rosapps/applications/sysutils/man/man.rbuild +++ b/rosapps/applications/sysutils/man/man.rbuild @@ -1,5 +1,4 @@ - ntdll kernel32 user32 diff --git a/rosapps/applications/sysutils/pedump/pedump.rbuild b/rosapps/applications/sysutils/pedump/pedump.rbuild index 7fa41e95121..a9b14bc2f3b 100644 --- a/rosapps/applications/sysutils/pedump/pedump.rbuild +++ b/rosapps/applications/sysutils/pedump/pedump.rbuild @@ -1,5 +1,4 @@ - 0x0501 0x0501 ntdll diff --git a/rosapps/applications/sysutils/regexpl/regexpl.rbuild b/rosapps/applications/sysutils/regexpl/regexpl.rbuild index 95d01bdc36c..9abdc633379 100644 --- a/rosapps/applications/sysutils/regexpl/regexpl.rbuild +++ b/rosapps/applications/sysutils/regexpl/regexpl.rbuild @@ -1,6 +1,5 @@ . - kernel32 user32 advapi32 diff --git a/rosapps/applications/sysutils/screenshot/screenshot.rbuild b/rosapps/applications/sysutils/screenshot/screenshot.rbuild index 72fd989c7b2..9f616a92146 100644 --- a/rosapps/applications/sysutils/screenshot/screenshot.rbuild +++ b/rosapps/applications/sysutils/screenshot/screenshot.rbuild @@ -1,6 +1,5 @@ . - 0x501 0x0501 kernel32 diff --git a/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild b/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild index 59efff16e09..30a0bef8248 100644 --- a/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild +++ b/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild @@ -1,5 +1,4 @@ - 0x0501 0x0501 kernel32 diff --git a/rosapps/applications/sysutils/sysutils.rbuild b/rosapps/applications/sysutils/sysutils.rbuild index 019e8f3b3a4..47ec3b08867 100644 --- a/rosapps/applications/sysutils/sysutils.rbuild +++ b/rosapps/applications/sysutils/sysutils.rbuild @@ -1,18 +1,16 @@ - - - - - + + + + diff --git a/rosapps/applications/sysutils/tcat/tcat.rbuild b/rosapps/applications/sysutils/tcat/tcat.rbuild index e79d0c4e90b..e5ea7c8a885 100644 --- a/rosapps/applications/sysutils/tcat/tcat.rbuild +++ b/rosapps/applications/sysutils/tcat/tcat.rbuild @@ -1,5 +1,4 @@ - ntdll kernel32 user32 diff --git a/rosapps/applications/sysutils/tlist/tlist.rbuild b/rosapps/applications/sysutils/tlist/tlist.rbuild index a07bc3f96f8..a9a71360989 100644 --- a/rosapps/applications/sysutils/tlist/tlist.rbuild +++ b/rosapps/applications/sysutils/tlist/tlist.rbuild @@ -1,5 +1,4 @@ - epsapi kernel32 diff --git a/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild b/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild index ab7b9847384..df279416b52 100644 --- a/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild +++ b/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild @@ -1,5 +1,4 @@ - kernel32 ntdll patch.c diff --git a/rosapps/applications/sysutils/utils/cat/cat.rbuild b/rosapps/applications/sysutils/utils/cat/cat.rbuild index 3c3b8ab2474..96a30027da8 100644 --- a/rosapps/applications/sysutils/utils/cat/cat.rbuild +++ b/rosapps/applications/sysutils/utils/cat/cat.rbuild @@ -1,5 +1,4 @@ - kernel32 ntdll cat.c diff --git a/rosapps/applications/sysutils/utils/driver/load/load.rbuild b/rosapps/applications/sysutils/utils/driver/load/load.rbuild index 9bc923b6e1e..8c185b31391 100644 --- a/rosapps/applications/sysutils/utils/driver/load/load.rbuild +++ b/rosapps/applications/sysutils/utils/driver/load/load.rbuild @@ -1,5 +1,4 @@ - kernel32 ntdll user32 diff --git a/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild b/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild index 9bf22b91043..1673cbc1e6f 100644 --- a/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild +++ b/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild @@ -1,5 +1,4 @@ - kernel32 ntdll user32 diff --git a/rosapps/applications/sysutils/utils/infinst/infinst.rbuild b/rosapps/applications/sysutils/utils/infinst/infinst.rbuild index 2e42421af85..ab70f3533cf 100644 --- a/rosapps/applications/sysutils/utils/infinst/infinst.rbuild +++ b/rosapps/applications/sysutils/utils/infinst/infinst.rbuild @@ -1,5 +1,4 @@ - kernel32 ntdll user32 diff --git a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild index 5318fa4864b..00887d9a697 100644 --- a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild +++ b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild @@ -1,5 +1,4 @@ - msvcrt kernel32 ntdll diff --git a/rosapps/applications/sysutils/utils/objdir/objdir.rbuild b/rosapps/applications/sysutils/utils/objdir/objdir.rbuild index 23894a34821..b4c78b78f32 100644 --- a/rosapps/applications/sysutils/utils/objdir/objdir.rbuild +++ b/rosapps/applications/sysutils/utils/objdir/objdir.rbuild @@ -1,7 +1,4 @@ - - - msvcrt kernel32 ntdll diff --git a/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild b/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild index a655bcbf2d9..d4149e8abb3 100644 --- a/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild +++ b/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild @@ -1,5 +1,4 @@ - msvcrt kernel32 ntdll diff --git a/rosapps/applications/sysutils/utils/ps/ps.rbuild b/rosapps/applications/sysutils/utils/ps/ps.rbuild index dbb0d7fd8ee..d98b610609d 100644 --- a/rosapps/applications/sysutils/utils/ps/ps.rbuild +++ b/rosapps/applications/sysutils/utils/ps/ps.rbuild @@ -1,6 +1,5 @@ . - user32 kernel32 ntdll diff --git a/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild b/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild index 68882be0425..c4c6fc02f5f 100644 --- a/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild +++ b/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild @@ -1,6 +1,5 @@ . - 0x0501 version diff --git a/rosapps/applications/sysutils/utils/stats/stats.rbuild b/rosapps/applications/sysutils/utils/stats/stats.rbuild index 9ba4871e818..f18059d921b 100644 --- a/rosapps/applications/sysutils/utils/stats/stats.rbuild +++ b/rosapps/applications/sysutils/utils/stats/stats.rbuild @@ -1,5 +1,4 @@ - kernel32 ntdll stats.c diff --git a/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild b/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild index 2efcb188d17..9d35ae0d6fc 100644 --- a/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild +++ b/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild @@ -1,5 +1,4 @@ - kernel32 ntdll tickcount.c diff --git a/rosapps/applications/winfile/winfile.rbuild b/rosapps/applications/winfile/winfile.rbuild index 70a64b2627a..8ee11167d43 100644 --- a/rosapps/applications/winfile/winfile.rbuild +++ b/rosapps/applications/winfile/winfile.rbuild @@ -3,7 +3,6 @@ . - 0x0501 0x0501 shell32 diff --git a/rosapps/applications/winver/winver.rbuild b/rosapps/applications/winver/winver.rbuild index f62a5b26558..970699c7c92 100644 --- a/rosapps/applications/winver/winver.rbuild +++ b/rosapps/applications/winver/winver.rbuild @@ -1,6 +1,5 @@ . - 0x501 0x0501 shell32 diff --git a/rosapps/applications/write/write.rbuild b/rosapps/applications/write/write.rbuild index 53be5abd578..d62dedac1bf 100644 --- a/rosapps/applications/write/write.rbuild +++ b/rosapps/applications/write/write.rbuild @@ -2,7 +2,6 @@ . - 0x0600 0x0501 kernel32 diff --git a/rosapps/demos/ddraw/ddraw.rbuild b/rosapps/demos/ddraw/ddraw.rbuild index ca62e1b40a0..4b832d0c30d 100644 --- a/rosapps/demos/ddraw/ddraw.rbuild +++ b/rosapps/demos/ddraw/ddraw.rbuild @@ -1,7 +1,6 @@ 0x0501 0x0501 - kernel32 gdi32 ddraw diff --git a/rosapps/demos/maze/maze.rbuild b/rosapps/demos/maze/maze.rbuild index f7936e9b618..e8167e97c12 100644 --- a/rosapps/demos/maze/maze.rbuild +++ b/rosapps/demos/maze/maze.rbuild @@ -1,7 +1,6 @@ 0x0501 0x0501 - kernel32 gdi32 user32 diff --git a/rosapps/dflat32/dflat32.rbuild b/rosapps/dflat32/dflat32.rbuild index 4bfcb79075c..eb64931ceaf 100644 --- a/rosapps/dflat32/dflat32.rbuild +++ b/rosapps/dflat32/dflat32.rbuild @@ -1,7 +1,6 @@ include/wine . - 0x0501 0x0501 kernel32 diff --git a/rosapps/lib/dflat32/dflat32.rbuild b/rosapps/lib/dflat32/dflat32.rbuild index 29afa430b4f..2bdd1a9fa4a 100644 --- a/rosapps/lib/dflat32/dflat32.rbuild +++ b/rosapps/lib/dflat32/dflat32.rbuild @@ -1,6 +1,5 @@ - 0x0501 0x0501 diff --git a/rosapps/lib/directory.rbuild b/rosapps/lib/directory.rbuild index 07d10ff4179..89400726e96 100644 --- a/rosapps/lib/directory.rbuild +++ b/rosapps/lib/directory.rbuild @@ -9,9 +9,13 @@ + + + + diff --git a/rosapps/applications/sysutils/lib/win32err.c b/rosapps/lib/win32err/win32err.c similarity index 100% rename from rosapps/applications/sysutils/lib/win32err.c rename to rosapps/lib/win32err/win32err.c diff --git a/rosapps/applications/sysutils/lib/lib.rbuild b/rosapps/lib/win32err/win32err.rbuild similarity index 62% rename from rosapps/applications/sysutils/lib/lib.rbuild rename to rosapps/lib/win32err/win32err.rbuild index 4415887382d..9ebb4b0493a 100644 --- a/rosapps/applications/sysutils/lib/lib.rbuild +++ b/rosapps/lib/win32err/win32err.rbuild @@ -1,5 +1,4 @@ - - + 0x0501 0x0501 win32err.c diff --git a/rosapps/templates/dialog/dialog.rbuild b/rosapps/templates/dialog/dialog.rbuild index 0b67e5b2f1a..7fb48b52105 100644 --- a/rosapps/templates/dialog/dialog.rbuild +++ b/rosapps/templates/dialog/dialog.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 ntdll diff --git a/rosapps/templates/mdi/mdi.rbuild b/rosapps/templates/mdi/mdi.rbuild index 4f8158c8be6..26357d10419 100644 --- a/rosapps/templates/mdi/mdi.rbuild +++ b/rosapps/templates/mdi/mdi.rbuild @@ -1,6 +1,5 @@ . - 0x0501 0x0501 ntdll diff --git a/rosapps/templates/old_wordpad/old_wordpad.rbuild b/rosapps/templates/old_wordpad/old_wordpad.rbuild index 1e3aa5081e4..44753971d55 100644 --- a/rosapps/templates/old_wordpad/old_wordpad.rbuild +++ b/rosapps/templates/old_wordpad/old_wordpad.rbuild @@ -2,7 +2,6 @@ . - 0x0600 0x0501 kernel32