- Remove useless USE_W32API define from .rbuilds
authorAleksey Bragin <aleksey@reactos.org>
Mon, 21 Jul 2008 09:15:15 +0000 (09:15 +0000)
committerAleksey Bragin <aleksey@reactos.org>
Mon, 21 Jul 2008 09:15:15 +0000 (09:15 +0000)
- 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

76 files changed:
rosapps/applications/applications.rbuild
rosapps/applications/cmdutils/comp/comp.rbuild
rosapps/applications/cmdutils/mode/mode.rbuild
rosapps/applications/cmdutils/sort/sort.rbuild
rosapps/applications/cmdutils/tee/tee.rbuild
rosapps/applications/cmdutils/touch/touch.rbuild
rosapps/applications/cmdutils/uptime/uptime.rbuild
rosapps/applications/cmdutils/y/y.rbuild
rosapps/applications/devutils/cputointel/cputointel.rbuild
rosapps/applications/devutils/gdb2/gdb2.rbuild
rosapps/applications/devutils/gdihv/gdihv.rbuild
rosapps/applications/devutils/genguid/genguid.rbuild
rosapps/applications/devutils/roswebparser/roswebparser.rbuild
rosapps/applications/devutils/syscalldump/syscalldump.rbuild
rosapps/applications/devutils/zoomin/zoomin.rbuild
rosapps/applications/downloader/downloader.rbuild
rosapps/applications/fontview/fontview.rbuild
rosapps/applications/imagesoft/imagesoft.rbuild
rosapps/applications/magnify/magnify.rbuild
rosapps/applications/net/ncftp/ncftp.rbuild
rosapps/applications/net/netreg/netreg.rbuild
rosapps/applications/net/niclist/niclist.rbuild
rosapps/applications/net/roshttpd/roshttpd.rbuild
rosapps/applications/notevil/notevil.rbuild
rosapps/applications/packmgr/cmd-line/rosget.rbuild
rosapps/applications/packmgr/gui/lang/pl-PL.rc [deleted file]
rosapps/applications/packmgr/gui/lang/sk-SK.rc [deleted file]
rosapps/applications/packmgr/gui/lang/uk-UA.rc [deleted file]
rosapps/applications/packmgr/gui/main.h
rosapps/applications/packmgr/gui/packmgr.rbuild
rosapps/applications/packmgr/gui/packmgr.rc
rosapps/applications/packmgr/lib/lang/pl-PL.rc [deleted file]
rosapps/applications/packmgr/lib/package.rbuild
rosapps/applications/packmgr/lib/package.rc
rosapps/applications/sysutils/chkdsk/chkdsk.c
rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
rosapps/applications/sysutils/chklib/chklib.rbuild
rosapps/applications/sysutils/ctm/ctm.rbuild
rosapps/applications/sysutils/fmifs.h [deleted file]
rosapps/applications/sysutils/gettype/gettype.rbuild
rosapps/applications/sysutils/kill/kill.rbuild
rosapps/applications/sysutils/logevent/logevent.rbuild
rosapps/applications/sysutils/lsdd/lsdd.rbuild
rosapps/applications/sysutils/man/man.rbuild
rosapps/applications/sysutils/pedump/pedump.rbuild
rosapps/applications/sysutils/regexpl/regexpl.rbuild
rosapps/applications/sysutils/screenshot/screenshot.rbuild
rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
rosapps/applications/sysutils/sysutils.rbuild
rosapps/applications/sysutils/tcat/tcat.rbuild
rosapps/applications/sysutils/tlist/tlist.rbuild
rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
rosapps/applications/sysutils/utils/cat/cat.rbuild
rosapps/applications/sysutils/utils/driver/load/load.rbuild
rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
rosapps/applications/sysutils/utils/infinst/infinst.rbuild
rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
rosapps/applications/sysutils/utils/objdir/objdir.rbuild
rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
rosapps/applications/sysutils/utils/ps/ps.rbuild
rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
rosapps/applications/sysutils/utils/stats/stats.rbuild
rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
rosapps/applications/winfile/winfile.rbuild
rosapps/applications/winver/winver.rbuild
rosapps/applications/write/write.rbuild
rosapps/demos/ddraw/ddraw.rbuild
rosapps/demos/maze/maze.rbuild
rosapps/dflat32/dflat32.rbuild
rosapps/lib/dflat32/dflat32.rbuild
rosapps/lib/directory.rbuild
rosapps/lib/win32err/win32err.c [moved from rosapps/applications/sysutils/lib/win32err.c with 100% similarity]
rosapps/lib/win32err/win32err.rbuild [moved from rosapps/applications/sysutils/lib/lib.rbuild with 62% similarity]
rosapps/templates/dialog/dialog.rbuild
rosapps/templates/mdi/mdi.rbuild
rosapps/templates/old_wordpad/old_wordpad.rbuild

index c113891..41ab33a 100644 (file)
                <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>
                <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" />
index 7e71f6b..0a748de 100644 (file)
@@ -1,5 +1,4 @@
 <module name="comp" type="win32cui" installbase="system32" installname="comp.exe" allowwarnings="true">\r
-    <define name="__USE_W32API" />\r
     <library>kernel32</library>\r
     <file>comp.c</file>\r
     <file>comp.rc</file>\r
index 6f99366..0a530a5 100644 (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>
index 721f958..cf1829f 100644 (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>
index de31d75..7250ac5 100644 (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>
index 1954708..f104402 100644 (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>
index d34d34b..48e728e 100644 (file)
@@ -1,5 +1,4 @@
 <module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe" allowwarnings="true">\r
-       <define name="__USE_W32API" />\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
 <!-- <define name="LINUX_OUTPUT"></define> -->\r
index b999bf1..37df929 100644 (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>
index 2267eb9..ad97f9e 100644 (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>
index 7731f5e..f2d2d7a 100644 (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>
index c2b4660..99481b2 100644 (file)
@@ -1,6 +1,5 @@
 <module name="gdihv" type="win32gui" installbase="system32" installname="gdihv.exe">\r
        <include base="gdihv">.</include>\r
-       <define name="__USE_W32API" />\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <library>user32</library>\r
index dc4b9ad..3ad0211 100644 (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>
index 831d9a9..6c4f0eb 100644 (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>
index 931dd00..27ce6e2 100644 (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>
index e517b19..528d16e 100644 (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>
index b915d8d..9ca46e5 100644 (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>
 
index ac22427..c4a1014 100644 (file)
@@ -1,6 +1,5 @@
 <module name="fontview" type="win32gui" installbase="system32" installname="fontview.exe">\r
        <include base="fontview">.</include>\r
-       <define name="__USE_W32API" />\r
        <library>gdi32</library>\r
        <library>user32</library>\r
        <library>shell32</library>\r
index 60fb3de..156f525 100644 (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>
index 64b8e1d..29d01b3 100644 (file)
@@ -2,7 +2,6 @@
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">\r
 <module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe">\r
        <include base="magnify">.</include>\r
-       <define name="__USE_W32API" />\r
        <define name="_WIN32_IE">0x0600</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <library>user32</library>\r
index 2ef8e1a..a71881e 100644 (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>
index b211a02..c5985ba 100644 (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>
index dc0d21a..b95594a 100644 (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>
index 15a0c65..419b46c 100644 (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>
index d87d605..8ff083a 100644 (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>
index d9fab33..e789017 100644 (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>
diff --git a/rosapps/applications/packmgr/gui/lang/pl-PL.rc b/rosapps/applications/packmgr/gui/lang/pl-PL.rc
deleted file mode 100644 (file)
index 15a8794..0000000
+++ /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 \9fró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 \9fró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 (file)
index ad7081d..0000000
+++ /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\9enosti"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT      "Zatia¾ nie sú \9eiadne mo\9enosti.", 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\9ai\9d", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED
-END
-
-IDR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP "PopUp", MENUBARBREAK
-    BEGIN
-        MENUITEM "\8eiadna akcia",                       1, GRAYED
-        MENUITEM "In\9atalova\9d (odporúèané)",       2, GRAYED
-        MENUITEM "In\9atalova\9d zo zdrojových kódov",         3, GRAYED
-        MENUITEM "Aktualizova\9d",                      4, GRAYED
-        MENUITEM "Odin\9atalova\9d",                   5, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Mo\9enosti",                     8
-        MENUITEM SEPARATOR
-        MENUITEM "Spravi\9d",                        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 (file)
index 462b1ee..0000000
+++ /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
-
index 46cb171..78fbe54 100644 (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 [];
 
index 50d5127..0249adf 100644 (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>
index 32f152a..b6261ea 100644 (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 */
diff --git a/rosapps/applications/packmgr/lib/lang/pl-PL.rc b/rosapps/applications/packmgr/lib/lang/pl-PL.rc
deleted file mode 100644 (file)
index 98e1ad6..0000000
+++ /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æ \9cci¹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\9c 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æ \9cci¹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\9c 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 */
index af9c253..8d6ecd5 100644 (file)
@@ -3,7 +3,6 @@
        <include base="package">.</include>\r
 \r
        <define name="UNICODE" />\r
-       <define name="__USE_W32API" />\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
 \r
@@ -12,6 +11,7 @@
        <library>user32</library>\r
        <library>expat</library>\r
        <library>urlmon</library>\r
+       <library>shell32</library>\r
 \r
        <file>download.cpp</file>\r
        <file>functions.cpp</file>\r
index 0ef93b8..9e93925 100644 (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"
 
index 28d5099..bf15c55 100644 (file)
 // 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);
index 9542709..8c0677d 100644 (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>
index 2842810..fc01c14 100644 (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>
index acecfda..f7dee25 100644 (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>
diff --git a/rosapps/applications/sysutils/fmifs.h b/rosapps/applications/sysutils/fmifs.h
deleted file mode 100644 (file)
index 3e69e7c..0000000
+++ /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 <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 */
index 1f3ba19..130f57e 100644 (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>
index 7f9e4b3..9c88922 100644 (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>
index 91fc811..b1c7092 100644 (file)
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>\r
 \r
 <module name="logevent" type="win32cui" installbase="system32" installname="logevent.exe" allowwarnings="true">\r
-       <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>advapi32</library>\r
        <file>logevent.c</file>\r
index 88f0b79..55597f1 100644 (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>
 
index da40711..53ac813 100644 (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>
index 7fa41e9..a9b14bc 100644 (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>
index 95d01bd..9abdc63 100644 (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>
index 72fd989..9f616a9 100644 (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>
index 59efff1..30a0bef 100644 (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>
index 019e8f3..47ec3b0 100644 (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" />
index e79d0c4..e5ea7c8 100644 (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>
index a07bc3f..a9a7136 100644 (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>
index ab7b984..df27941 100644 (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>
index 3c3b8ab..96a3002 100644 (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>
index 9bc923b..8c185b3 100644 (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>
index 9bf22b9..1673cbc 100644 (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>
index 2e42421..ab70f35 100644 (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>
index 5318fa4..00887d9 100644 (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>
index 23894a3..b4c78b7 100644 (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>
index a655bcb..d4149e8 100644 (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>
index dbb0d7f..d98b610 100644 (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>
index 68882be..c4c6fc0 100644 (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>
index 9ba4871..f18059d 100644 (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>
index 2efcb18..9d35ae0 100644 (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>
index 70a64b2..8ee1116 100644 (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>
index f62a5b2..970699c 100644 (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>
index 53be5ab..d62deda 100644 (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>
index ca62e1b..4b832d0 100644 (file)
@@ -1,7 +1,6 @@
 <module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw_demo.exe" allowwarnings="true">\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
-       <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <library>ddraw</library>\r
index f7936e9..e8167e9 100644 (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>
index 4bfcb79..eb64931 100644 (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>
index 29afa43..2bdd1a9 100644 (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>
 
index 07d10ff..8940072 100644 (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>
 
similarity index 62%
rename from rosapps/applications/sysutils/lib/lib.rbuild
rename to rosapps/lib/win32err/win32err.rbuild
index 4415887..9ebb4b0 100644 (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>
index 0b67e5b..7fb48b5 100644 (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>
index 4f8158c..26357d1 100644 (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>
index 1e3aa50..4475397 100644 (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>