Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-21 16:04:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove useless USE_W32API define from .rbuilds

Browse source 
- 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
This commit is contained in:
Aleksey Bragin 2008-07-21 09:15:15 +00:00
parent 32bd72afd4
commit 1b7106dee1
76 changed files with 47 additions and 478 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rosapps/applications/applications.rbuild
View file

@ -25,6 +25,11 @@
<xi:include href="fraginator/fraginator.rbuild" />
</directory>
-->
<directory name="imagesoft">
<xi:include href="imagesoft/imagesoft.rbuild" />
</directory>
<directory name="magnify">
<xi:include href="magnify/magnify.rbuild" />
</directory>
@ -37,11 +42,9 @@
<xi:include href="notevil/notevil.rbuild" />
</directory>
<!--
<directory name="packmgr">
<xi:include href="packmgr/directory.rbuild" />
</directory>
-->
<directory name="sysutils">
<xi:include href="sysutils/sysutils.rbuild" />

1
rosapps/applications/cmdutils/comp/comp.rbuild
View file

@ -1,5 +1,4 @@
<module name="comp" type="win32cui" installbase="system32" installname="comp.exe" allowwarnings="true">
<define name="__USE_W32API" />
<library>kernel32</library>
<file>comp.c</file>
<file>comp.rc</file>

1
rosapps/applications/cmdutils/mode/mode.rbuild
View file

@ -1,7 +1,6 @@
<module name="mode" type="win32cui" installbase="system32" installname="mode.exe">
<include base="mode">.</include>
<include base="mode">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/cmdutils/sort/sort.rbuild
View file

@ -1,5 +1,4 @@
<module name="sort" type="win32cui" installbase="system32" installname="sort.exe">
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/cmdutils/tee/tee.rbuild
View file

@ -1,5 +1,4 @@
<module name="tee" type="win32cui" installbase="system32" installname="tee.exe">
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/cmdutils/touch/touch.rbuild
View file

@ -1,6 +1,5 @@
<module name="touch" type="win32cui" installbase="system32" installname="touch.exe">
<include base="touch">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>ntdll</library>

1
rosapps/applications/cmdutils/uptime/uptime.rbuild
View file

@ -1,5 +1,4 @@
<module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe" allowwarnings="true">
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<!-- <define name="LINUX_OUTPUT"></define> -->

1
rosapps/applications/cmdutils/y/y.rbuild
View file

@ -1,5 +1,4 @@
<module name="y" type="win32cui" installbase="system32" installname="y.exe">
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/devutils/cputointel/cputointel.rbuild
View file

@ -1,6 +1,5 @@
<module name="cputointel" type="win32cui" installbase="system32" installname="cputointel.exe" stdlib="host">
<include base="cputointel">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/devutils/gdb2/gdb2.rbuild
View file

@ -1,6 +1,5 @@
<module name="gdb2" type="win32cui" installbase="system32" installname="gdb2.exe" stdlib="host">
<include base="gdb2">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/devutils/gdihv/gdihv.rbuild
View file

@ -1,6 +1,5 @@
<module name="gdihv" type="win32gui" installbase="system32" installname="gdihv.exe">
<include base="gdihv">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>user32</library>

1
rosapps/applications/devutils/genguid/genguid.rbuild
View file

@ -1,5 +1,4 @@
<module name="genguid" type="win32cui" installbase="system32" installname="genguid.exe">
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

8
rosapps/applications/devutils/roswebparser/roswebparser.rbuild
View file

@ -2,9 +2,9 @@
<include base="zoomin">.</include>
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<define name="__USE_W32API" />
<library>kernel32</library>
<file>roswebparser.c</file>
<file>utf8.c</file>
<library>kernel32</library>
<file>roswebparser.c</file>
<file>utf8.c</file>
</module>

1
rosapps/applications/devutils/syscalldump/syscalldump.rbuild
View file

@ -1,6 +1,5 @@
<module name="syscalldump" type="win32cui" installname="syscalldump.exe">
<include base="syscalldump">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/devutils/zoomin/zoomin.rbuild
View file

@ -2,7 +2,6 @@
<include base="zoomin">.</include>
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<define name="__USE_W32API" />
<library>kernel32</library>
<library>gdi32</library>
<library>user32</library>

1
rosapps/applications/downloader/downloader.rbuild
View file

@ -5,7 +5,6 @@
<include base="downloader">.</include>
<include base="expat">.</include>
<define name="__USE_W32API" />
<define name="WINVER">0x0501</define>
<define name="_WIN32_IE">0x0600</define>

1
rosapps/applications/fontview/fontview.rbuild
View file

@ -1,6 +1,5 @@
<module name="fontview" type="win32gui" installbase="system32" installname="fontview.exe">
<include base="fontview">.</include>
<define name="__USE_W32API" />
<library>gdi32</library>
<library>user32</library>
<library>shell32</library>

1
rosapps/applications/imagesoft/imagesoft.rbuild
View file

@ -2,7 +2,6 @@
<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="imagesoft" type="win32gui" installbase="system32" installname="imagesoft.exe" unicode="yes">
<include base="imagesoft">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/magnify/magnify.rbuild
View file

@ -2,7 +2,6 @@
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
<module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe">
<include base="magnify">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>user32</library>

1
rosapps/applications/net/ncftp/ncftp.rbuild
View file

@ -6,7 +6,6 @@
<include base="ncftp">ncftp</include>
<define name="ncftp" />
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/net/netreg/netreg.rbuild
View file

@ -1,6 +1,5 @@
<module name="netreg" type="win32cui" installbase="system32" installname="netreg.exe" stdlib="host">
<include base="netreg">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/net/niclist/niclist.rbuild
View file

@ -1,6 +1,5 @@
<module name="niclist" type="win32cui" installbase="system32" installname="niclist.exe">
<include base="niclist">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/net/roshttpd/roshttpd.rbuild
View file

@ -2,7 +2,6 @@
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
<module name="roshttpd" type="win32cui" installbase="system32" installname="roshttpd.exe" stdlib="host">
<include base="roshttpd">include</include>
<define name="__USE_W32API" />
<define name="__USE_W32_SOCKETS" />
<define name="_WIN32_IE">0x600</define>
<define name="_WIN32_WINNT">0x501</define>

1
rosapps/applications/notevil/notevil.rbuild
View file

@ -1,6 +1,5 @@
<module name="notevil" type="win32cui" installbase="system32" installname="notevil.exe">
<include base="notevil">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/packmgr/cmd-line/rosget.rbuild
View file

@ -1,6 +1,5 @@
<module name="rosget" type="win32cui" installbase="system32" installname="rosget.exe">
<include base="package">.</include>
<define name="__USE_W32API" />
<define name="UNICODE" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>

99
rosapps/applications/packmgr/gui/lang/pl-PL.rc
View file

@ -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

44
rosapps/applications/packmgr/gui/lang/sk-SK.rc
View file

@ -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<C5A1>", 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<76> (odporúèané)", 2, GRAYED
MENUITEM "Inštalova<76> zo zdrojových kódov", 3, GRAYED
MENUITEM "Aktualizova<76>", 4, GRAYED
MENUITEM "Odinštalova<76>", 5, GRAYED
MENUITEM SEPARATOR
MENUITEM "Možnosti", 8
MENUITEM SEPARATOR
MENUITEM "Spravi<76>", 6
END

50
rosapps/applications/packmgr/gui/lang/uk-UA.rc
View file

@ -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

2
rosapps/applications/packmgr/gui/main.h
View file

@ -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 [];

1
rosapps/applications/packmgr/gui/packmgr.rbuild
View file

@ -1,7 +1,6 @@
<module name="packmgr" type="win32gui" installbase="system32" installname="packmgr.exe">
<include base="package">.</include>
<include base="packmgr">.</include>
<define name="__USE_W32API" />
<define name="UNICODE" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>

3
rosapps/applications/packmgr/gui/packmgr.rc
View file

@ -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 */

62
rosapps/applications/packmgr/lib/lang/pl-PL.rc
View file

@ -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 */

2
rosapps/applications/packmgr/lib/package.rbuild
View file

@ -3,7 +3,6 @@
<include base="package">.</include>
<define name="UNICODE" />
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
@ -12,6 +11,7 @@
<library>user32</library>
<library>expat</library>
<library>urlmon</library>
<library>shell32</library>
<file>download.cpp</file>
<file>functions.cpp</file>

1
rosapps/applications/packmgr/lib/package.rc
View file

@ -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"

20
rosapps/applications/sysutils/chkdsk/chkdsk.c
View file

@ -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 <windows.h>
#include <stdio.h>
#include <fmifs.h>
#include <ndk/ntndk.h>
#include <fmifs/fmifs.h>
#define _UNICODE 1
#include <tchar.h>
#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);

11
rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
View file

@ -1,9 +1,12 @@
<module name="chkdsk" type="win32cui" installbase="system32" installname="chkdsk.exe" allowwarnings="true">
<define name="__USE_W32API" />
<define name="UNICODE" />
<define name="_UNICODE" />
<module name="chkdsk" type="win32cui" installbase="system32" installname="chkdsk.exe" allowwarnings="true" unicode="yes">
<include base="reactos">include/reactos/libs/fmifs</include>
<include base="chkdsk>..</include>
<library>fmifs</library>
<library>win32err</library>
<library>ntdll</library>
<library>kernel32</library>
<file>chkdsk.c</file>
<file>chkdsk.rc</file>
</module>

8
rosapps/applications/sysutils/chklib/chklib.rbuild
View file

@ -1,10 +1,12 @@
<module name="chklib" type="win32cui" installbase="system32" installname="chklib.exe" allowwarnings="true">
<linkerflag>--numeric-sort</linkerflag>
<define name="__USE_W32API" />
<include base="chklib>..</include>
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>
<library>win32err</library>
<library>kernel32</library>
<file>chklib.c</file>
<file>chklib.rc</file>
</module>

1
rosapps/applications/sysutils/ctm/ctm.rbuild
View file

@ -1,5 +1,4 @@
<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe" unicode="yes">
<define name="__USE_W32API" />
<library>epsapi</library>
<library>ntdll</library>
<library>kernel32</library>

129
rosapps/applications/sysutils/fmifs.h
View file

@ -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 <windows.h>
#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 */

1
rosapps/applications/sysutils/gettype/gettype.rbuild
View file

@ -1,7 +1,6 @@
<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe" unicode="yes">
<include base="gettype">.</include>
<define name="_WIN32_WINNT">0x0501</define>
<define name="__USE_W32API" />
<library>kernel32</library>
<library>shell32</library>
<library>mpr</library>

1
rosapps/applications/sysutils/kill/kill.rbuild
View file

@ -1,5 +1,4 @@
<module name="kill" type="win32cui" installbase="system32" installname="kill.exe">
<define name="__USE_W32API" />
<library>ntdll</library>
<library>kernel32</library>
<library>user32</library>

1
rosapps/applications/sysutils/logevent/logevent.rbuild
View file

@ -1,7 +1,6 @@
<?xml version="1.0"?>
<module name="logevent" type="win32cui" installbase="system32" installname="logevent.exe" allowwarnings="true">
<define name="__USE_W32API" />
<library>kernel32</library>
<library>advapi32</library>
<file>logevent.c</file>

3
rosapps/applications/sysutils/lsdd/lsdd.rbuild
View file

@ -1,8 +1,7 @@
<module name="lsdd" type="win32cui" installbase="system32" installname="lsdd.exe">
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>lib</library>
<library>win32err</library>
<library>kernel32</library>
<library>user32</library>

1
rosapps/applications/sysutils/man/man.rbuild
View file

@ -1,5 +1,4 @@
<module name="man" type="win32cui" installbase="system32" installname="man.exe">
<define name="__USE_W32API" />
<library>ntdll</library>
<library>kernel32</library>
<library>user32</library>

1
rosapps/applications/sysutils/pedump/pedump.rbuild
View file

@ -1,5 +1,4 @@
<module name="pedump" type="win32cui" installbase="system32" installname="pedump.exe">
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>ntdll</library>

1
rosapps/applications/sysutils/regexpl/regexpl.rbuild
View file

@ -1,6 +1,5 @@
<module name="regexpl" type="win32cui" installbase="system32" installname="regexpl.exe" stdlib="host">
<include base="regexpl">.</include>
<define name="__USE_W32API" />
<library>kernel32</library>
<library>user32</library>
<library>advapi32</library>

1
rosapps/applications/sysutils/screenshot/screenshot.rbuild
View file

@ -1,6 +1,5 @@
<module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe" unicode="yes">
<include base="screenshot">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
View file

@ -1,5 +1,4 @@
<module name="systeminfo" type="win32cui" installbase="system32" installname="systeminfo.exe">
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

10
rosapps/applications/sysutils/sysutils.rbuild
View file

@ -1,18 +1,16 @@
<?xml version="1.0"?>
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="lib">
<xi:include href="lib/lib.rbuild" />
</directory>
<directory name="ctm">
<xi:include href="ctm/ctm.rbuild" />
</directory>
<!--
<directory name="chkdsk">
<xi:include href="chkdsk/chkdsk.rbuild" />
</directory>
-->
<directory name="chklib">
<xi:include href="chklib/chklib.rbuild" />
</directory>
<directory name="gettype">
<xi:include href="gettype/gettype.rbuild" />

1
rosapps/applications/sysutils/tcat/tcat.rbuild
View file

@ -1,5 +1,4 @@
<module name="tcat" type="win32cui" installbase="system32" installname="tcat.exe">
<define name="__USE_W32API" />
<library>ntdll</library>
<library>kernel32</library>
<library>user32</library>

1
rosapps/applications/sysutils/tlist/tlist.rbuild
View file

@ -1,5 +1,4 @@
<module name="tlist" type="win32cui" installbase="system32" installname="tlist.exe">
<define name="__USE_W32API" />
<library>epsapi</library>
<!-- <library>tgetopt</library> -->
<library>kernel32</library>

1
rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
View file

@ -1,5 +1,4 @@
<module name="binpatch" type="win32cui" installbase="bin" installname="binpatch.exe" >
<define name="__USE_W32API" />
<library>kernel32</library>
<library>ntdll</library>
<file>patch.c</file>

1
rosapps/applications/sysutils/utils/cat/cat.rbuild
View file

@ -1,5 +1,4 @@
<module name="cat" type="win32cui" installbase="bin" installname="cat.exe" >
<define name="__USE_W32API" />
<library>kernel32</library>
<library>ntdll</library>
<file>cat.c</file>

1
rosapps/applications/sysutils/utils/driver/load/load.rbuild
View file

@ -1,5 +1,4 @@
<module name="load" type="win32cui" installbase="bin" installname="load.exe" unicode="true" >
<define name="__USE_W32API" />
<library>kernel32</library>
<library>ntdll</library>
<library>user32</library>

1
rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
View file

@ -1,5 +1,4 @@
<module name="unload" type="win32cui" installbase="bin" installname="unload.exe" unicode="true">
<define name="__USE_W32API" />
<library>kernel32</library>
<library>ntdll</library>
<library>user32</library>

1
rosapps/applications/sysutils/utils/infinst/infinst.rbuild
View file

@ -1,5 +1,4 @@
<module name="infinst" type="win32cui" installbase="bin" installname="infinst.exe" >
<define name="__USE_W32API" />
<library>kernel32</library>
<library>ntdll</library>
<library>user32</library>

1
rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
View file

@ -1,5 +1,4 @@
<module name="nts2w32err" type="win32cui" installbase="bin" installname="nts2w32err.exe" >
<define name="__USE_W32API" />
<library>msvcrt</library>
<library>kernel32</library>
<library>ntdll</library>

3
rosapps/applications/sysutils/utils/objdir/objdir.rbuild
View file

@ -1,7 +1,4 @@
<module name="objdir" type="win32cui" installbase="bin" installname="objdir.exe">
<define name="__USE_W32API" />
<define name="UNICODE" />
<define name="_UNICODE" />
<library>msvcrt</library>
<library>kernel32</library>
<library>ntdll</library>

1
rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
View file

@ -1,5 +1,4 @@
<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe" allowwarnings="true">
<define name="__USE_W32API" />
<library>msvcrt</library>
<library>kernel32</library>
<library>ntdll</library>

1
rosapps/applications/sysutils/utils/ps/ps.rbuild
View file

@ -1,6 +1,5 @@
<module name="ps" type="win32cui" installbase="bin" installname="ps.exe">
<include base="ps">.</include>
<define name="__USE_W32API" />
<library>user32</library>
<library>kernel32</library>
<library>ntdll</library>

1
rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
View file

@ -1,6 +1,5 @@
<module name="rosperf" type="win32cui" installbase="system32" installname="rosperf.exe">
<include base="rosperf">.</include>
<define name="__USE_W32API" />
<define name="UNICODE" />
<define name="WINVER">0x0501</define>
<library>version</library>

1
rosapps/applications/sysutils/utils/stats/stats.rbuild
View file

@ -1,5 +1,4 @@
<module name="stats" type="win32cui" installbase="bin" installname="stats.exe" unicode="true" >
<define name="__USE_W32API" />
<library>kernel32</library>
<library>ntdll</library>
<file>stats.c</file>

1
rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
View file

@ -1,5 +1,4 @@
<module name="tickcount" type="win32cui" installbase="bin" installname="tickcount.exe" unicode="true" >
<define name="__USE_W32API" />
<library>kernel32</library>
<library>ntdll</library>
<file>tickcount.c</file>

1
rosapps/applications/winfile/winfile.rbuild
View file

@ -3,7 +3,6 @@
<module name="winfile" type="win32gui" installbase="system32" installname="winfile.exe" allowwarnings="true">
<include base="winfile">.</include>
<define name="UNICODE" />
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>shell32</library>

1
rosapps/applications/winver/winver.rbuild
View file

@ -1,6 +1,5 @@
<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" unicode="yes">
<include base="winver">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>shell32</library>

1
rosapps/applications/write/write.rbuild
View file

@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="write" type="win32gui" installbase="system32" installname="write.exe" unicode="yes">
<include base="write">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/demos/ddraw/ddraw.rbuild
View file

@ -1,7 +1,6 @@
<module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw_demo.exe" allowwarnings="true">
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<define name="__USE_W32API" />
<library>kernel32</library>
<library>gdi32</library>
<library>ddraw</library>

1
rosapps/demos/maze/maze.rbuild
View file

@ -1,7 +1,6 @@
<module name="maze" type="win32gui" installbase="system32" installname="maze.exe">
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<define name="__USE_W32API" />
<library>kernel32</library>
<library>gdi32</library>
<library>user32</library>

1
rosapps/dflat32/dflat32.rbuild
View file

@ -1,7 +1,6 @@
<module name="dflat32" type="win32cui" installbase="system32" installname="edit.exe">
<include base="ReactOS">include/wine</include>
<include base="dflat32">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>

1
rosapps/lib/dflat32/dflat32.rbuild
View file

@ -1,6 +1,5 @@
<module name="dflat32lib" type="win32dll" baseadress="0x98000000" installbase="system32" installname="dflat32.dll">
<importlibrary definition="dflat32.def" />
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>

4
rosapps/lib/directory.rbuild
View file

@ -9,9 +9,13 @@
<directory name="libjpeg">
<xi:include href="libjpeg/libjpeg.rbuild" />
</directory>
<directory name="libpng">
<xi:include href="libpng/libpng.rbuild" />
</directory>
<directory name="win32err">
<xi:include href="win32err/win32err.rbuild" />
</directory>
</group>

0
rosapps/applications/sysutils/lib/win32err.c → rosapps/lib/win32err/win32err.c
View file

3
rosapps/applications/sysutils/lib/lib.rbuild → rosapps/lib/win32err/win32err.rbuild
View file

@ -1,5 +1,4 @@
<module name="lib" type="objectlibrary">
<define name="__USE_W32API" />
<module name="win32err" type="objectlibrary">
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<file>win32err.c</file>

1
rosapps/templates/dialog/dialog.rbuild
View file

@ -1,6 +1,5 @@
<module name="template_dialog" type="win32cui" installname="dialog.exe" allowwarnings="true">
<include base="template_dialog">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>ntdll</library>

1
rosapps/templates/mdi/mdi.rbuild
View file

@ -1,6 +1,5 @@
<module name="template_mdi" type="win32cui" installname="mdi.exe" allowwarnings="true">
<include base="template_mdi">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>ntdll</library>

1
rosapps/templates/old_wordpad/old_wordpad.rbuild
View file

@ -2,7 +2,6 @@
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="old_wordpad" type="win32gui" installbase="system32" installname="old_wordpad.exe" unicode="yes">
<include base="old_wordpad">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library>