- Sync to trunk 36919.

- Modified a few rbuild files to conform to trunk rbuild.

svn path=/branches/ros-amd64-bringup/; revision=36924

diff --git a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
index c84b3ed..bf0ef3b 100644 (file)
--- a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
+++ b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes">
-       <importlibrary definition="kbsdll.spec.def" />
+       <importlibrary definition="kbsdll.spec" />
        <include base="kbsdll">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
@@ -11,5 +11,4 @@
        <library>comctl32</library>
        <file>kbsdll.c</file>
        <file>kbsdll.rc</file>
-       <file>kbsdll.spec</file>
 </module>

diff --git a/reactos/base/applications/regedit/clb/clb.rbuild b/reactos/base/applications/regedit/clb/clb.rbuild
index 2e8d86a..f708661 100644 (file)
--- a/reactos/base/applications/regedit/clb/clb.rbuild
+++ b/reactos/base/applications/regedit/clb/clb.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll" unicode="yes">
-       <importlibrary definition="clb.spec.def" />
+       <importlibrary definition="clb.spec" />
        <include base="clb">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
@@ -13,6 +13,5 @@
        <library>comctl32</library>
        <file>clb.c</file>
        <file>clb.rc</file>
-       <file>clb.spec</file>
        <pch>precomp.h</pch>
 </module>

diff --git a/reactos/base/applications/screensavers/3dtext/3dtext.rbuild b/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
index 03e2f50..365f917 100644 (file)
--- a/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
+++ b/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="yes">
-       <importlibrary definition="3dtext.spec.def" />
+       <importlibrary definition="3dtext.spec" />
        <library>scrnsave</library>
        <library>kernel32</library>
        <library>user32</library>
@@ -13,7 +13,6 @@
        <file>3dtext.c</file>
        <file>settings.c</file>
        <file>rsrc.rc</file>
-       <file>3dtext.spec</file>
 
        <metadata description="3D text OpenGL screensaver" />
 </module>

diff --git a/reactos/base/applications/screensavers/logon/logon.rbuild b/reactos/base/applications/screensavers/logon/logon.rbuild
index 32085fb..6176f16 100644 (file)
--- a/reactos/base/applications/screensavers/logon/logon.rbuild
+++ b/reactos/base/applications/screensavers/logon/logon.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="yes">
-       <importlibrary definition="logon.spec.def" />
+       <importlibrary definition="logon.spec" />
        <include base="logon">.</include>
        <library>scrnsave</library>
        <library>kernel32</library>
@@ -12,5 +12,4 @@
 
        <file>logon.c</file>
        <file>logon.rc</file>
-       <file>logon.spec</file>
 </module>

diff --git a/reactos/base/services/dhcp/dhclient.c b/reactos/base/services/dhcp/dhclient.c
index 9f04b6f..ed7ff2d 100644 (file)
--- a/reactos/base/services/dhcp/dhclient.c
+++ b/reactos/base/services/dhcp/dhclient.c
@@ -451,9 +451,16 @@ dhcpack(struct packet *packet)
 }
 
 void set_name_servers( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {
+    CHAR Buffer[200] = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\";
+    HKEY RegKey;
+
+    strcat(Buffer, Adapter->DhclientInfo.name);
+    if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, Buffer, 0, KEY_WRITE, &RegKey ) != ERROR_SUCCESS)
+        return;
+
+
     if( new_lease->options[DHO_DOMAIN_NAME_SERVERS].len ) {
-        CHAR Buffer[200] = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\";
-        HKEY RegKey;
+
         struct iaddr nameserver;
         char *nsbuf;
         int i, addrs =
@@ -462,13 +469,9 @@ void set_name_servers( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {
                /* XXX I'm setting addrs to 1 until we are ready up the chain */
                addrs = 1;
         nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) );
-        nsbuf[0] = 0;
-        strcat(Buffer, Adapter->DhclientInfo.name);
 
-        if( nsbuf && !RegOpenKeyEx
-            ( HKEY_LOCAL_MACHINE,
-              Buffer,
-              0, KEY_WRITE, &RegKey ) ) {
+        if( nsbuf) {
+            nsbuf[0] = 0;
             for( i = 0; i < addrs; i++ ) {
                 nameserver.len = sizeof(ULONG);
                 memcpy( nameserver.iabuf,
@@ -480,12 +483,17 @@ void set_name_servers( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {
 
             DH_DbgPrint(MID_TRACE,("Setting DhcpNameserver: %s\n", nsbuf));
 
-            RegSetValueEx( RegKey, "DhcpNameServer", 0, REG_SZ,
-                           (LPBYTE)nsbuf, strlen(nsbuf) + 1);
+            RegSetValueExA( RegKey, "DhcpNameServer", 0, REG_SZ,
+                           (LPBYTE)nsbuf, strlen(nsbuf) + 1 );
+            free( nsbuf );
         }
-       // free(NULL) is defined to be OK too
-       free( nsbuf );
+
+    } else {
+            RegDeleteValueW( RegKey, L"DhcpNameServer" );
     }
+
+    RegCloseKey( RegKey );
+
 }
 
 void setup_adapter( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {

diff --git a/reactos/base/system/userinit/userinit.c b/reactos/base/system/userinit/userinit.c
index 6b81fe3..5c43608 100644 (file)
--- a/reactos/base/system/userinit/userinit.c
+++ b/reactos/base/system/userinit/userinit.c
@@ -580,9 +580,9 @@ wWinMain(IN HINSTANCE hInst,
          IN LPWSTR lpszCmdLine,
          IN int nCmdShow)
 {
-    NotifyLogon();
     SetUserSettings();
     StartShell();
+    NotifyLogon();
     return 0;
 }
 

diff --git a/reactos/dll/cpl/access/access.rbuild b/reactos/dll/cpl/access/access.rbuild
index 825eef4..2a90095 100644 (file)
--- a/reactos/dll/cpl/access/access.rbuild
+++ b/reactos/dll/cpl/access/access.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"  installbase="system32" installname="access.cpl" unicode="yes">
-       <importlibrary definition="access.spec.def" />
+       <importlibrary definition="access.spec" />
        <include base="access">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
@@ -18,5 +18,4 @@
        <file>mouse.c</file>
        <file>sound.c</file>
        <file>access.rc</file>
-       <file>access.spec</file>
 </module>

diff --git a/reactos/dll/cpl/appwiz-new/appwiz.rbuild b/reactos/dll/cpl/appwiz-new/appwiz.rbuild
index ba87358..ca09ede 100644 (file)
--- a/reactos/dll/cpl/appwiz-new/appwiz.rbuild
+++ b/reactos/dll/cpl/appwiz-new/appwiz.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="appwiz-new" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32" installname="appwiz-new.cpl" unicode="yes" allowwarnings="true">
-       <importlibrary definition="appwiz.spec.def" />
+       <importlibrary definition="appwiz.spec" />
        <include base="appwiz-new">.</include>
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>

diff --git a/reactos/dll/cpl/appwiz/appwiz.rbuild b/reactos/dll/cpl/appwiz/appwiz.rbuild
index 1ab4b80..ed1f57f 100644 (file)
--- a/reactos/dll/cpl/appwiz/appwiz.rbuild
+++ b/reactos/dll/cpl/appwiz/appwiz.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32" installname="appwiz.cpl" unicode="yes">
-       <importlibrary definition="appwiz.spec.def" />
+       <importlibrary definition="appwiz.spec" />
        <include base="appwiz">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/cpl/console/console.rbuild b/reactos/dll/cpl/console/console.rbuild
index 7fce920..7531fb3 100644 (file)
--- a/reactos/dll/cpl/console/console.rbuild
+++ b/reactos/dll/cpl/console/console.rbuild
@@ -1,5 +1,5 @@
 <module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll" unicode="yes">
-       <importlibrary definition="console.spec.def" />
+       <importlibrary definition="console.spec" />
        <include base="console">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
@@ -13,6 +13,5 @@
        <file>layout.c</file>
        <file>colors.c</file>
        <file>console.rc</file>
-       <file>console.spec</file>
        <pch>console.h</pch>
 </module>

diff --git a/reactos/dll/cpl/desk/desk.rbuild b/reactos/dll/cpl/desk/desk.rbuild
index 3e83899..2fd0d64 100644 (file)
--- a/reactos/dll/cpl/desk/desk.rbuild
+++ b/reactos/dll/cpl/desk/desk.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes">
-       <importlibrary definition="desk.spec.def" />
+       <importlibrary definition="desk.spec" />
        <include base="desk">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
index 628c101..65a4ad1 100644 (file)
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes">
-       <importlibrary definition="hdwwiz.spec.def" />
+       <importlibrary definition="hdwwiz.spec" />
        <include base="hdwwiz">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
@@ -9,5 +9,4 @@
        <library>kernel32</library>
        <file>hdwwiz.c</file>
        <file>hdwwiz.rc</file>
-       <file>hdwwiz.spec</file>
 </module>

diff --git a/reactos/dll/cpl/input/input.rbuild b/reactos/dll/cpl/input/input.rbuild
index f90250b..e424b99 100644 (file)
--- a/reactos/dll/cpl/input/input.rbuild
+++ b/reactos/dll/cpl/input/input.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll" unicode="yes">
-       <importlibrary definition="input.spec.def" />
+       <importlibrary definition="input.spec" />
        <include base="input">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/cpl/intl/intl.rbuild b/reactos/dll/cpl/intl/intl.rbuild
index fbd695b..291b8c2 100644 (file)
--- a/reactos/dll/cpl/intl/intl.rbuild
+++ b/reactos/dll/cpl/intl/intl.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes">
-       <importlibrary definition="intl.spec.def" />
+       <importlibrary definition="intl.spec" />
        <include base="intl">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>

diff --git a/reactos/dll/cpl/joy/joy.rbuild b/reactos/dll/cpl/joy/joy.rbuild
index 252d375..b7b919d 100644 (file)
--- a/reactos/dll/cpl/joy/joy.rbuild
+++ b/reactos/dll/cpl/joy/joy.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="joy" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_JOY}"  installbase="system32" installname="joy.cpl" unicode="yes">
-       <importlibrary definition="joy.spec.def" />
+       <importlibrary definition="joy.spec" />
        <include base="joy">.</include>
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>

diff --git a/reactos/dll/cpl/main/main.rbuild b/reactos/dll/cpl/main/main.rbuild
index b48a6b6..b26aa2a 100644 (file)
--- a/reactos/dll/cpl/main/main.rbuild
+++ b/reactos/dll/cpl/main/main.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes">
-       <importlibrary definition="main.spec.def" />
+       <importlibrary definition="main.spec" />
        <include base="main">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/cpl/mmsys/mmsys.rbuild b/reactos/dll/cpl/mmsys/mmsys.rbuild
index 918a87a..5eb9ee6 100644 (file)
--- a/reactos/dll/cpl/mmsys/mmsys.rbuild
+++ b/reactos/dll/cpl/mmsys/mmsys.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes">
-       <importlibrary definition="mmsys.spec.def" />
+       <importlibrary definition="mmsys.spec" />
        <include base="mmsys">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
@@ -20,5 +20,4 @@
        <file>audio.c</file>
        <file>voice.c</file>
        <file>mmsys.rc</file>
-       <file>mmsys.spec</file>
 </module>

diff --git a/reactos/dll/cpl/ncpa/ncpa.rbuild b/reactos/dll/cpl/ncpa/ncpa.rbuild
index bfb2d75..4211cc4 100644 (file)
--- a/reactos/dll/cpl/ncpa/ncpa.rbuild
+++ b/reactos/dll/cpl/ncpa/ncpa.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl" unicode="yes">
-       <importlibrary definition="ncpa.spec.def" />
+       <importlibrary definition="ncpa.spec" />
        <include base="ncpa">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>

diff --git a/reactos/dll/cpl/odbccp32/odbccp32.rbuild b/reactos/dll/cpl/odbccp32/odbccp32.rbuild
index 0c6933b..d1644c2 100644 (file)
--- a/reactos/dll/cpl/odbccp32/odbccp32.rbuild
+++ b/reactos/dll/cpl/odbccp32/odbccp32.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes">
-       <importlibrary definition="odbccp32.spec.def" />
+       <importlibrary definition="odbccp32.spec" />
        <include base="odbccp32">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/cpl/powercfg/powercfg.rbuild b/reactos/dll/cpl/powercfg/powercfg.rbuild
index 4d46bdd..597f30a 100644 (file)
--- a/reactos/dll/cpl/powercfg/powercfg.rbuild
+++ b/reactos/dll/cpl/powercfg/powercfg.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="powercfg" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_PWRCFG}" installbase="system32" installname="powercfg.cpl" unicode="yes">
-       <importlibrary definition="powercfg.spec.def" />
+       <importlibrary definition="powercfg.spec" />
        <include base="powercfg">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>

diff --git a/reactos/dll/cpl/sysdm/sysdm.rbuild b/reactos/dll/cpl/sysdm/sysdm.rbuild
index dd17613..096336d 100644 (file)
--- a/reactos/dll/cpl/sysdm/sysdm.rbuild
+++ b/reactos/dll/cpl/sysdm/sysdm.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes">
-       <importlibrary definition="sysdm.spec.def" />
+       <importlibrary definition="sysdm.spec" />
        <include base="sysdm">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/cpl/telephon/telephon.rbuild b/reactos/dll/cpl/telephon/telephon.rbuild
index e9634ae..1611894 100644 (file)
--- a/reactos/dll/cpl/telephon/telephon.rbuild
+++ b/reactos/dll/cpl/telephon/telephon.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="telephon" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TELEPHON}"  installbase="system32" installname="telephon.cpl" unicode="yes">
-       <importlibrary definition="telephon.spec.def" />
+       <importlibrary definition="telephon.spec" />
        <include base="telephon">.</include>
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>

diff --git a/reactos/dll/cpl/timedate/timedate.rbuild b/reactos/dll/cpl/timedate/timedate.rbuild
index e78c859..4758c17 100644 (file)
--- a/reactos/dll/cpl/timedate/timedate.rbuild
+++ b/reactos/dll/cpl/timedate/timedate.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl" unicode="yes">
-       <importlibrary definition="timedate.spec.def" />
+       <importlibrary definition="timedate.spec" />
        <include base="timedate">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/cpl/usrmgr/usrmgr.rbuild b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
index f355cfd..28b5f05 100644 (file)
--- a/reactos/dll/cpl/usrmgr/usrmgr.rbuild
+++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes">
-       <importlibrary definition="usrmgr.spec.def" />
+       <importlibrary definition="usrmgr.spec" />
        <include base="usrmgr">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/directx/d3d8/d3d8.rbuild b/reactos/dll/directx/d3d8/d3d8.rbuild
index ee82042..3c14ab2 100644 (file)
--- a/reactos/dll/directx/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/d3d8/d3d8.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="d3d8" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8.dll">
-       <importlibrary definition="d3d8.spec.def" />
+       <importlibrary definition="d3d8.spec" />
        <file>d3d8.c</file>
        <file>d3d8.rc</file>
        <file>d3d8.spec</file>

diff --git a/reactos/dll/directx/d3d9/d3d9.rbuild b/reactos/dll/directx/d3d9/d3d9.rbuild
index 61369d6..6d273c7 100644 (file)
--- a/reactos/dll/directx/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/d3d9/d3d9.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll" baseaddress="0x4fdd0000">
-       <importlibrary definition="d3d9.spec.def" />
+       <importlibrary definition="d3d9.spec" />
 
        <library>advapi32</library>
        <library>kernel32</library>
@@ -31,5 +31,4 @@
        <file>device.c</file>
        <file>format.c</file>
        <file>d3d9.rc</file>
-       <file>d3d9.spec</file>
 </module>

diff --git a/reactos/dll/directx/devenum/devenum.rbuild b/reactos/dll/directx/devenum/devenum.rbuild
index 98166aa..85536a2 100644 (file)
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="devenum.spec.def" />
+       <importlibrary definition="devenum.spec" />
        <include base="devenum">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -25,5 +25,4 @@
        <file>factory.c</file>
        <file>mediacatenum.c</file>
        <file>parsedisplayname.c</file>
-       <file>devenum.spec</file>
 </module>

diff --git a/reactos/dll/directx/dinput/dinput.rbuild b/reactos/dll/directx/dinput/dinput.rbuild
index 9ec004c..9d363d5 100644 (file)
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="dinput.spec.def" />
+       <importlibrary definition="dinput.spec" />
        <include base="dinput">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -27,5 +27,4 @@
        <file>keyboard.c</file>
        <file>mouse.c</file>
        <file>regsvr.c</file>
-       <file>dinput.spec</file>
 </module>

diff --git a/reactos/dll/directx/dinput8/dinput8.rbuild b/reactos/dll/directx/dinput8/dinput8.rbuild
index 539b927..6f10621 100644 (file)
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="dinput8.spec.def" />
+       <importlibrary definition="dinput8.spec" />
        <include base="dinput8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -20,5 +20,4 @@
        <library>dinput</library>
        <file>version.rc</file>
        <file>dinput8_main.c</file>
-       <file>dinput8.spec</file>
 </module>

diff --git a/reactos/dll/directx/dplay/dplay.rbuild b/reactos/dll/directx/dplay/dplay.rbuild
index 81144ba..337fa39 100644 (file)
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll" unicode="yes">
-       <importlibrary definition="dplay.spec.def" />
+       <importlibrary definition="dplay.spec" />
        <include base="dinput8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -19,5 +19,4 @@
        <library>dinput</library>
        <file>version.rc</file>
        <file>dplay_main.c</file>
-       <file>dplay.spec</file>
 </module>

diff --git a/reactos/dll/directx/dplayx/dplayx.rbuild b/reactos/dll/directx/dplayx/dplayx.rbuild
index fb4bde9..be38932 100644 (file)
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true" unicode="yes">
        <!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
-       <importlibrary definition="dplayx.spec.def" />
+       <importlibrary definition="dplayx.spec" />
        <include base="dplayx">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -28,5 +28,4 @@
        <file>lobbysp.c</file>
        <file>name_server.c</file>
        <file>regsvr.c</file>
-       <file>dplayx.spec</file>
 </module>

diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index f27fe9b..5c08fb2 100644 (file)
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound.dll" allowwarnings ="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="dsound.spec.def" />
+       <importlibrary definition="dsound.spec" />
        <include base="dsound">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -34,5 +34,4 @@
                <file>dxroslayer.c</file>
                <file>getguidfromstring.c</file>
        </directory>
-       <file>dsound.spec</file>
 </module>

diff --git a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
index df69d27..1155eba 100644 (file)
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="dxdiagn.spec.def" />
+       <importlibrary definition="dxdiagn.spec" />
        <include base="dxdiagn">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -22,5 +22,4 @@
        <file>dxdiag_main.c</file>
        <file>provider.c</file>
        <file>regsvr.c</file>
-       <file>dxdiagn.spec</file>
 </module>

diff --git a/reactos/dll/directx/ksproxy/ksproxy.rbuild b/reactos/dll/directx/ksproxy/ksproxy.rbuild
index fddad2c..d5b065e 100644 (file)
--- a/reactos/dll/directx/ksproxy/ksproxy.rbuild
+++ b/reactos/dll/directx/ksproxy/ksproxy.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="ksproxy" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true">
-       <importlibrary definition="ksproxy.spec.def" />
+       <importlibrary definition="ksproxy.spec" />
        <include base="ksproxy">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
@@ -11,6 +11,5 @@
        <library>ntdll</library>
        <file>ksproxy.c</file>
        <file>ksproxy.rc</file>
-       <file>ksproxy.spec</file>
 </module>
 </group>

diff --git a/reactos/dll/directx/msdmo/msdmo.rbuild b/reactos/dll/directx/msdmo/msdmo.rbuild
index 57670d0..a74951d 100644 (file)
--- a/reactos/dll/directx/msdmo/msdmo.rbuild
+++ b/reactos/dll/directx/msdmo/msdmo.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msdmo" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true">
-       <importlibrary definition="msdmo.spec.def" />
+       <importlibrary definition="msdmo.spec" />
        <include base="msdmo">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>

diff --git a/reactos/dll/directx/qedit/qedit.rbuild b/reactos/dll/directx/qedit/qedit.rbuild
index 6f2363b..30d54b2 100644 (file)
--- a/reactos/dll/directx/qedit/qedit.rbuild
+++ b/reactos/dll/directx/qedit/qedit.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="qedit" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true">
-       <importlibrary definition="qedit.spec.def" />
+       <importlibrary definition="qedit.spec" />
        <include base="qedit">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
@@ -11,6 +11,5 @@
        <library>ntdll</library>
        <file>qedit.c</file>
        <file>qedit.rc</file>
-       <file>qedit.spec</file>
 </module>
 </group>

diff --git a/reactos/dll/directx/quartz/quartz.rbuild b/reactos/dll/directx/quartz/quartz.rbuild
index 831eef5..a482805 100644 (file)
--- a/reactos/dll/directx/quartz/quartz.rbuild
+++ b/reactos/dll/directx/quartz/quartz.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="quartz.spec.def" />
+       <importlibrary definition="quartz.spec" />
        <include base="quartz">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>

diff --git a/reactos/dll/directx/wine/d3d8/d3d8.rbuild b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
index 65c8232..fb81839 100644 (file)
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true" unicode="yes">
-       <importlibrary definition="d3d8.spec.def" />
+       <importlibrary definition="d3d8.spec" />
        <include base="d3d8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>
@@ -37,5 +37,4 @@
        <file>volume.c</file>
        <file>volumetexture.c</file>
        <file>version.rc</file>
-       <file>d3d8.spec</file>
 </module>

diff --git a/reactos/dll/directx/wine/d3d9/d3d9.rbuild b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
index e6a43e3..5c333aa 100644 (file)
--- a/reactos/dll/directx/wine/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true" unicode="yes">
-       <importlibrary definition="d3d9.spec.def" />
+       <importlibrary definition="d3d9.spec" />
        <include base="d3d9">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>

diff --git a/reactos/dll/keyboard/kbda1/kbda1.rbuild b/reactos/dll/keyboard/kbda1/kbda1.rbuild
index f4535a8..0786e9f 100644 (file)
--- a/reactos/dll/keyboard/kbda1/kbda1.rbuild
+++ b/reactos/dll/keyboard/kbda1/kbda1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda1.dll" allowwarnings="true">
-       <importlibrary definition="kbda1.spec.def" />
+       <importlibrary definition="kbda1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbda1.c</file>
        <file>kbda1.rc</file>
-       <file>kbda1.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbda2/kbda2.rbuild b/reactos/dll/keyboard/kbda2/kbda2.rbuild
index 13c311d..b173ed1 100644 (file)
--- a/reactos/dll/keyboard/kbda2/kbda2.rbuild
+++ b/reactos/dll/keyboard/kbda2/kbda2.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda2.dll" allowwarnings="true">
-       <importlibrary definition="kbda2.spec.def" />
+       <importlibrary definition="kbda2.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbda2.c</file>
        <file>kbda2.rc</file>
-       <file>kbda2.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbda3/kbda3.rbuild b/reactos/dll/keyboard/kbda3/kbda3.rbuild
index b3d213c..6082e66 100644 (file)
--- a/reactos/dll/keyboard/kbda3/kbda3.rbuild
+++ b/reactos/dll/keyboard/kbda3/kbda3.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbda3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbda3.dll" allowwarnings="true">
-       <importlibrary definition="kbda3.spec.def" />
+       <importlibrary definition="kbda3.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbda3.c</file>
        <file>kbda3.rc</file>
-       <file>kbda3.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdal/kbdal.rbuild b/reactos/dll/keyboard/kbdal/kbdal.rbuild
index e45eb3d..bac4abe 100644 (file)
--- a/reactos/dll/keyboard/kbdal/kbdal.rbuild
+++ b/reactos/dll/keyboard/kbdal/kbdal.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdal.dll" allowwarnings="true">
-       <importlibrary definition="kbdal.spec.def" />
+       <importlibrary definition="kbdal.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdal.c</file>
        <file>kbdal.rc</file>
-       <file>kbdal.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
index 008efd4..fd7bdd8 100644 (file)
--- a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
+++ b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdarme" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarme.dll" allowwarnings="true">
-       <importlibrary definition="kbdarme.spec.def" />
+       <importlibrary definition="kbdarme.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdarme.c</file>
        <file>kbdarme.rc</file>
-       <file>kbdarme.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
index 3738383..56df98d 100644 (file)
--- a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
+++ b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdarmw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdarmw.dll" allowwarnings="true">
-       <importlibrary definition="kbdarmw.spec.def" />
+       <importlibrary definition="kbdarmw.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdarmw.c</file>
        <file>kbdarmw.rc</file>
-       <file>kbdarmw.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
index fdeeb8a..52baa9e 100644 (file)
--- a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
+++ b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdaze" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdaze.dll" allowwarnings="true">
-       <importlibrary definition="kbdaze.spec.def" />
+       <importlibrary definition="kbdaze.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdaze.c</file>
        <file>kbdaze.rc</file>
-       <file>kbdaze.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
index 3011162..f97e344 100644 (file)
--- a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
+++ b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdazel" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdazel.dll" allowwarnings="true">
-       <importlibrary definition="kbdazel.spec.def" />
+       <importlibrary definition="kbdazel.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdazel.c</file>
        <file>kbdazel.rc</file>
-       <file>kbdazel.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
index d17d60c..efca0ec 100644 (file)
--- a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
+++ b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbe.dll" allowwarnings="true">
-       <importlibrary definition="kbdbe.spec.def" />
+       <importlibrary definition="kbdbe.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbe.c</file>
        <file>kbdbe.rc</file>
-       <file>kbdbe.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
index 70aabd0..5a1c4cb 100644 (file)
--- a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
+++ b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbga" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbga.dll" allowwarnings="true">
-       <importlibrary definition="kbdbga.spec.def" />
+       <importlibrary definition="kbdbga.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbga.c</file>
        <file>kbdbga.rc</file>
-       <file>kbdbga.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
index 1bad671..c6ea382 100644 (file)
--- a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
+++ b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbgm" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgm.dll" allowwarnings="true">
-       <importlibrary definition="kbdbgm.spec.def" />
+       <importlibrary definition="kbdbgm.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbgm.c</file>
        <file>kbdbgm.rc</file>
-       <file>kbdbgm.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
index 43d9114..e89c17c 100644 (file)
--- a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
+++ b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbgt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbgt.dll" allowwarnings="true">
-       <importlibrary definition="kbdbgt.spec.def" />
+       <importlibrary definition="kbdbgt.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbgt.c</file>
        <file>kbdbgt.rc</file>
-       <file>kbdbgt.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdblr/kbdblr.rbuild b/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
index 51303bb..a912d5a 100644 (file)
--- a/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
+++ b/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdblr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdblr.dll" allowwarnings="true">
-       <importlibrary definition="kbdblr.spec.def" />
+       <importlibrary definition="kbdblr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdblr.c</file>
        <file>kbdblr.rc</file>
-       <file>kbdblr.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdbr/kbdbr.rbuild b/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
index e0a2d6d..87a8230 100644 (file)
--- a/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
+++ b/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbr.dll" allowwarnings="true">
-       <importlibrary definition="kbdbr.spec.def" />
+       <importlibrary definition="kbdbr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbr.c</file>
        <file>kbdbr.rc</file>
-       <file>kbdbr.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
index 81efd76..c92f791 100644 (file)
--- a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
+++ b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdbur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdbur.dll" allowwarnings="true">
-       <importlibrary definition="kbdbur.spec.def" />
+       <importlibrary definition="kbdbur.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdbur.c</file>
        <file>kbdbur.rc</file>
-       <file>kbdbur.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdcan/kbdcan.rbuild b/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
index 9857e8f..0646e31 100644 (file)
--- a/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
+++ b/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcan" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcan.dll" allowwarnings="true">
-       <importlibrary definition="kbdcan.spec.def" />
+       <importlibrary definition="kbdcan.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdcan.c</file>
        <file>kbdcan.rc</file>
-       <file>kbdcan.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdcr/kbdcr.rbuild b/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
index f709a9e..5c15707 100644 (file)
--- a/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
+++ b/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcr.dll" allowwarnings="true">
-       <importlibrary definition="kbdcr.spec.def" />
+       <importlibrary definition="kbdcr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdcr.c</file>
        <file>kbdcr.rc</file>
-       <file>kbdcr.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
index c9d22a6..378e7f5 100644 (file)
--- a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
+++ b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdcz1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcz1.dll" allowwarnings="true">
-       <importlibrary definition="kbdcz1.spec.def" />
+       <importlibrary definition="kbdcz1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdcz1.c</file>
        <file>kbdcz1.rc</file>
-       <file>kbdcz1.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdda/kbdda.rbuild b/reactos/dll/keyboard/kbdda/kbdda.rbuild
index b3582af..6e87af1 100644 (file)
--- a/reactos/dll/keyboard/kbdda/kbdda.rbuild
+++ b/reactos/dll/keyboard/kbdda/kbdda.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdda" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdda.dll" allowwarnings="true">
-       <importlibrary definition="kbdda.spec.def" />
+       <importlibrary definition="kbdda.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdda.c</file>
        <file>kbdda.rc</file>
-       <file>kbdda.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbddv/kbddv.rbuild b/reactos/dll/keyboard/kbddv/kbddv.rbuild
index 89a765c..5705ccc 100644 (file)
--- a/reactos/dll/keyboard/kbddv/kbddv.rbuild
+++ b/reactos/dll/keyboard/kbddv/kbddv.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbddv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbddv.dll" allowwarnings="true">
-       <importlibrary definition="kbddv.spec.def" />
+       <importlibrary definition="kbddv.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbddv.c</file>
        <file>kbddv.rc</file>
-       <file>kbddv.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdes/kbdes.rbuild b/reactos/dll/keyboard/kbdes/kbdes.rbuild
index 45cfdf8..9f760d1 100644 (file)
--- a/reactos/dll/keyboard/kbdes/kbdes.rbuild
+++ b/reactos/dll/keyboard/kbdes/kbdes.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdes" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdes.dll" allowwarnings="true">
-       <importlibrary definition="kbdes.spec.def" />
+       <importlibrary definition="kbdes.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdes.c</file>
        <file>kbdes.rc</file>
-       <file>kbdes.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdest/kbdest.rbuild b/reactos/dll/keyboard/kbdest/kbdest.rbuild
index 39c3b19..ce719a5 100644 (file)
--- a/reactos/dll/keyboard/kbdest/kbdest.rbuild
+++ b/reactos/dll/keyboard/kbdest/kbdest.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdest" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdest.dll" allowwarnings="true">
-       <importlibrary definition="kbdest.spec.def" />
+       <importlibrary definition="kbdest.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdest.c</file>
        <file>kbdest.rc</file>
-       <file>kbdest.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdfc/kbdfc.rbuild b/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
index 7d20ce4..1bf5206 100644 (file)
--- a/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
+++ b/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfc.dll" allowwarnings="true">
-       <importlibrary definition="kbdfc.spec.def" />
+       <importlibrary definition="kbdfc.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdfc.c</file>
        <file>kbdfc.rc</file>
-       <file>kbdfc.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
index 8def349..847f5e7 100644 (file)
--- a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
+++ b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfi" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfi.dll" allowwarnings="true">
-       <importlibrary definition="kbdfi.spec.def" />
+       <importlibrary definition="kbdfi.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdfi.c</file>
        <file>kbdfi.rc</file>
-       <file>kbdfi.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
index 3b92514..dd364bf 100644 (file)
--- a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
+++ b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdfr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdfr.dll" allowwarnings="true">
-       <importlibrary definition="kbdfr.spec.def" />
+       <importlibrary definition="kbdfr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdfr.c</file>
        <file>kbdfr.rc</file>
-       <file>kbdfr.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild b/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
index cf930f8..dc0e32d 100644 (file)
--- a/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
+++ b/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgeo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgeo.dll" allowwarnings="true">
-       <importlibrary definition="kbdgeo.spec.def" />
+       <importlibrary definition="kbdgeo.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgeo.c</file>
        <file>kbdgeo.rc</file>
-       <file>kbdgeo.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild b/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
index 5f282da..4ac2eab 100644 (file)
--- a/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
+++ b/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgerg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgerg.dll" allowwarnings="true">
-       <importlibrary definition="kbdgerg.spec.def" />
+       <importlibrary definition="kbdgerg.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgerg.c</file>
        <file>kbdgerg.rc</file>
-       <file>kbdgerg.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild b/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
index 44403a4..724ae2f 100644 (file)
--- a/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
+++ b/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgneo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgneo.dll" allowwarnings="true">
-       <importlibrary definition="kbdgneo.spec.def" />
+       <importlibrary definition="kbdgneo.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgneo.c</file>
        <file>kbdgneo.rc</file>
-       <file>kbdgneo.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
index d992f6e..99d0009 100644 (file)
--- a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
+++ b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgr.dll" allowwarnings="true">
-       <importlibrary definition="kbdgr.spec.def" />
+       <importlibrary definition="kbdgr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgr.c</file>
        <file>kbdgr.rc</file>
-       <file>kbdgr.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild b/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
index 5f22823..f3391e1 100644 (file)
--- a/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
+++ b/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdgrist" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdgrist.dll" allowwarnings="true">
-       <importlibrary definition="kbdgrist.spec.def" />
+       <importlibrary definition="kbdgrist.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdgrist.c</file>
        <file>kbdgrist.rc</file>
-       <file>kbdgrist.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
index 8dfa25c..6bcb456 100644 (file)
--- a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
+++ b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdhe" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhe.dll" allowwarnings="true">
-       <importlibrary definition="kbdhe.spec.def" />
+       <importlibrary definition="kbdhe.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdhe.c</file>
        <file>kbdhe.rc</file>
-       <file>kbdhe.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
index f163665..a4c522b 100644 (file)
--- a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
+++ b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdheb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdheb.dll" allowwarnings="true">
-       <importlibrary definition="kbdheb.spec.def" />
+       <importlibrary definition="kbdheb.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdheb.c</file>
        <file>kbdheb.rc</file>
-       <file>kbdheb.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
index 33d5a8a..037c29b 100644 (file)
--- a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
+++ b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdhu" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdhu.dll" allowwarnings="true">
-       <importlibrary definition="kbdhu.spec.def" />
+       <importlibrary definition="kbdhu.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdhu.c</file>
        <file>kbdhu.rc</file>
-       <file>kbdhu.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdic/kbdic.rbuild b/reactos/dll/keyboard/kbdic/kbdic.rbuild
index ca14176..765fe54 100644 (file)
--- a/reactos/dll/keyboard/kbdic/kbdic.rbuild
+++ b/reactos/dll/keyboard/kbdic/kbdic.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdic" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdic.dll" allowwarnings="true">
-       <importlibrary definition="kbdic.spec.def" />
+       <importlibrary definition="kbdic.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdic.c</file>
        <file>kbdic.rc</file>
-       <file>kbdic.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild b/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
index eb093ce..62d0874 100644 (file)
--- a/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
+++ b/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinasa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinasa.dll" allowwarnings="true">
-       <importlibrary definition="kbdinasa.spec.def" />
+       <importlibrary definition="kbdinasa.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdinasa.c</file>
        <file>kbdinasa.rc</file>
-       <file>kbdinasa.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdinben/kbdinben.rbuild b/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
index 418fbe7..3114edc 100644 (file)
--- a/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
+++ b/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinben" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinben.dll" allowwarnings="true">
-       <importlibrary definition="kbdinben.spec.def" />
+       <importlibrary definition="kbdinben.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdinben.c</file>
        <file>kbdinben.rc</file>
-       <file>kbdinben.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdindev/kbdindev.rbuild b/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
index 67c41f3..a413b9f 100644 (file)
--- a/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
+++ b/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdindev" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdindev.dll" allowwarnings="true">
-       <importlibrary definition="kbdindev.spec.def" />
+       <importlibrary definition="kbdindev.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdindev.c</file>
        <file>kbdindev.rc</file>
-       <file>kbdindev.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild b/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
index aca7a77..ceb9e68 100644 (file)
--- a/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
+++ b/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinguj" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinguj.dll" allowwarnings="true">
-       <importlibrary definition="kbdinguj.spec.def" />
+       <importlibrary definition="kbdinguj.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdinguj.c</file>
        <file>kbdinguj.rc</file>
-       <file>kbdinguj.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild b/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
index 4d4f50b..f18261a 100644 (file)
--- a/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
+++ b/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdinmal" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdinmal.dll" allowwarnings="true">
-       <importlibrary definition="kbdinmal.spec.def" />
+       <importlibrary definition="kbdinmal.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdinmal.c</file>
        <file>kbdinmal.rc</file>
-       <file>kbdinmal.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdir/kbdir.rbuild b/reactos/dll/keyboard/kbdir/kbdir.rbuild
index 4d35719..98bf4f0 100644 (file)
--- a/reactos/dll/keyboard/kbdir/kbdir.rbuild
+++ b/reactos/dll/keyboard/kbdir/kbdir.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdir" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdir.dll" allowwarnings="true">
-       <importlibrary definition="kbdir.spec.def" />
+       <importlibrary definition="kbdir.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdir.c</file>
        <file>kbdir.rc</file>
-       <file>kbdir.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdit/kbdit.rbuild b/reactos/dll/keyboard/kbdit/kbdit.rbuild
index eeca818..eedfc12 100644 (file)
--- a/reactos/dll/keyboard/kbdit/kbdit.rbuild
+++ b/reactos/dll/keyboard/kbdit/kbdit.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdit" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdit.dll" allowwarnings="true">
-       <importlibrary definition="kbdit.spec.def" />
+       <importlibrary definition="kbdit.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdit.c</file>
        <file>kbdit.rc</file>
-       <file>kbdit.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdja/kbdja.rbuild b/reactos/dll/keyboard/kbdja/kbdja.rbuild
index 3453ab7..1ab11a9 100644 (file)
--- a/reactos/dll/keyboard/kbdja/kbdja.rbuild
+++ b/reactos/dll/keyboard/kbdja/kbdja.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdja" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdja.dll" allowwarnings="true">
-       <importlibrary definition="kbdja.spec.def" />
+       <importlibrary definition="kbdja.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdja.c</file>
        <file>kbdja.rc</file>
-       <file>kbdja.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild b/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
index 646a073..9e1754e 100644 (file)
--- a/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
+++ b/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdkaz" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdkaz.dll" allowwarnings="true">
-       <importlibrary definition="kbdkaz.spec.def" />
+       <importlibrary definition="kbdkaz.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdkaz.c</file>
        <file>kbdkaz.rc</file>
-       <file>kbdkaz.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdko/kbdko.rbuild b/reactos/dll/keyboard/kbdko/kbdko.rbuild
index f6ad227..952be1f 100644 (file)
--- a/reactos/dll/keyboard/kbdko/kbdko.rbuild
+++ b/reactos/dll/keyboard/kbdko/kbdko.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdko" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdko.dll" allowwarnings="true">
-       <importlibrary definition="kbdko.spec.def" />
+       <importlibrary definition="kbdko.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdko.c</file>
        <file>kbdko.rc</file>
-       <file>kbdko.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdla/kbdla.rbuild b/reactos/dll/keyboard/kbdla/kbdla.rbuild
index f6eff54..80a223a 100644 (file)
--- a/reactos/dll/keyboard/kbdla/kbdla.rbuild
+++ b/reactos/dll/keyboard/kbdla/kbdla.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdla" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdla.dll" allowwarnings="true">
-       <importlibrary definition="kbdla.spec.def" />
+       <importlibrary definition="kbdla.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdla.c</file>
        <file>kbdla.rc</file>
-       <file>kbdla.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
index 682e2fc..7bf8578 100644 (file)
--- a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
+++ b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdlt" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlt.dll" allowwarnings="true">
-       <importlibrary definition="kbdlt.spec.def" />
+       <importlibrary definition="kbdlt.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdlt.c</file>
        <file>kbdlt.rc</file>
-       <file>kbdlt.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdlv/kbdlv.rbuild b/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
index 9d099e8..779582a 100644 (file)
--- a/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
+++ b/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdlv" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdlv.dll" allowwarnings="true">
-       <importlibrary definition="kbdlv.spec.def" />
+       <importlibrary definition="kbdlv.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdlv.c</file>
        <file>kbdlv.rc</file>
-       <file>kbdlv.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdmac/kbdmac.rbuild b/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
index ed855b1..dde788d 100644 (file)
--- a/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
+++ b/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdmac" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdmac.dll" allowwarnings="true">
-       <importlibrary definition="kbdmac.spec.def" />
+       <importlibrary definition="kbdmac.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdmac.c</file>
        <file>kbdmac.rc</file>
-       <file>kbdmac.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdne/kbdne.rbuild b/reactos/dll/keyboard/kbdne/kbdne.rbuild
index 926c5b0..448491c 100644 (file)
--- a/reactos/dll/keyboard/kbdne/kbdne.rbuild
+++ b/reactos/dll/keyboard/kbdne/kbdne.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdne" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdne.dll" allowwarnings="true">
-       <importlibrary definition="kbdne.spec.def" />
+       <importlibrary definition="kbdne.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdne.c</file>
        <file>kbdne.rc</file>
-       <file>kbdne.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdno/kbdno.rbuild b/reactos/dll/keyboard/kbdno/kbdno.rbuild
index 8c53f1a..65696b4 100644 (file)
--- a/reactos/dll/keyboard/kbdno/kbdno.rbuild
+++ b/reactos/dll/keyboard/kbdno/kbdno.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdno" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdno.dll" allowwarnings="true">
-       <importlibrary definition="kbdno.spec.def" />
+       <importlibrary definition="kbdno.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdno.c</file>
        <file>kbdno.rc</file>
-       <file>kbdno.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
index c67bec1..a39be73 100644 (file)
--- a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
+++ b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdpl1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpl1.dll" allowwarnings="true">
-       <importlibrary definition="kbdpl1.spec.def" />
+       <importlibrary definition="kbdpl1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdpl1.c</file>
        <file>kbdpl1.rc</file>
-       <file>kbdpl1.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
index 2610aff..f5dc73a 100644 (file)
--- a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
+++ b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdpo" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdpo.dll" allowwarnings="true">
-       <importlibrary definition="kbdpo.spec.def" />
+       <importlibrary definition="kbdpo.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdpo.c</file>
        <file>kbdpo.rc</file>
-       <file>kbdpo.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdro/kbdro.rbuild b/reactos/dll/keyboard/kbdro/kbdro.rbuild
index 15fee38..84f2718 100644 (file)
--- a/reactos/dll/keyboard/kbdro/kbdro.rbuild
+++ b/reactos/dll/keyboard/kbdro/kbdro.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdro" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdro.dll" allowwarnings="true">
-       <importlibrary definition="kbdro.spec.def" />
+       <importlibrary definition="kbdro.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdro.c</file>
        <file>kbdro.rc</file>
-       <file>kbdro.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdru/kbdru.rbuild b/reactos/dll/keyboard/kbdru/kbdru.rbuild
index 7d84ce5..a446920 100644 (file)
--- a/reactos/dll/keyboard/kbdru/kbdru.rbuild
+++ b/reactos/dll/keyboard/kbdru/kbdru.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdru" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru.dll" allowwarnings="true">
-       <importlibrary definition="kbdru.spec.def" />
+       <importlibrary definition="kbdru.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdru.c</file>
        <file>kbdru.rc</file>
-       <file>kbdru.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdru1/kbdru1.rbuild b/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
index 104e57b..fe413e1 100644 (file)
--- a/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
+++ b/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdru1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdru1.dll" allowwarnings="true">
-       <importlibrary definition="kbdru1.spec.def" />
+       <importlibrary definition="kbdru1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdru1.c</file>
        <file>kbdru1.rc</file>
-       <file>kbdru1.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
index dfb5dca..0a883c3 100644 (file)
--- a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
+++ b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsg" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsg.dll" allowwarnings="true">
-       <importlibrary definition="kbdsg.spec.def" />
+       <importlibrary definition="kbdsg.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdsg.c</file>
        <file>kbdsg.rc</file>
-       <file>kbdsg.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
index db09387..e2ee24e 100644 (file)
--- a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
+++ b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk.dll" allowwarnings="true">
-       <importlibrary definition="kbdsk.spec.def" />
+       <importlibrary definition="kbdsk.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdsk.c</file>
        <file>kbdsk.rc</file>
-       <file>kbdsk.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild b/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
index e639566..7f15ccd 100644 (file)
--- a/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
+++ b/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsk1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk1.dll" allowwarnings="true">
-       <importlibrary definition="kbdsk1.spec.def" />
+       <importlibrary definition="kbdsk1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdsk1.c</file>
        <file>kbdsk1.rc</file>
-       <file>kbdsk1.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
index 70733e9..32cf47d 100644 (file)
--- a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
+++ b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdsw" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsw.dll" allowwarnings="true">
-       <importlibrary definition="kbdsw.spec.def" />
+       <importlibrary definition="kbdsw.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdsw.c</file>
        <file>kbdsw.rc</file>
-       <file>kbdsw.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdtat/kbdtat.rbuild b/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
index b158a4b..ddffed3 100644 (file)
--- a/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
+++ b/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtat" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtat.dll" allowwarnings="true">
-       <importlibrary definition="kbdtat.spec.def" />
+       <importlibrary definition="kbdtat.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdtat.c</file>
        <file>kbdtat.rc</file>
-       <file>kbdtat.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdth0/kbdth0.rbuild b/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
index 57dac75..2083fbf 100644 (file)
--- a/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
+++ b/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth0" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth0.dll" allowwarnings="true">
-       <importlibrary definition="kbdth0.spec.def" />
+       <importlibrary definition="kbdth0.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdth0.c</file>
        <file>kbdth0.rc</file>
-       <file>kbdth0.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdth1/kbdth1.rbuild b/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
index 918ccae..ff027cf 100644 (file)
--- a/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
+++ b/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth1.dll" allowwarnings="true">
-       <importlibrary definition="kbdth1.spec.def" />
+       <importlibrary definition="kbdth1.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdth1.c</file>
        <file>kbdth1.rc</file>
-       <file>kbdth1.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.rbuild b/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
index 23028cd..986a062 100644 (file)
--- a/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
+++ b/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth2.dll" allowwarnings="true">
-       <importlibrary definition="kbdth2.spec.def" />
+       <importlibrary definition="kbdth2.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdth2.c</file>
        <file>kbdth2.rc</file>
-       <file>kbdth2.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdth3/kbdth3.rbuild b/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
index 8d4599d..9cd3614 100644 (file)
--- a/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
+++ b/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdth3" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth3.dll" allowwarnings="true">
-       <importlibrary definition="kbdth3.spec.def" />
+       <importlibrary definition="kbdth3.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdth3.c</file>
        <file>kbdth3.rc</file>
-       <file>kbdth3.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild b/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
index 5b0064c..ba720c1 100644 (file)
--- a/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
+++ b/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtuf" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuf.dll" allowwarnings="true">
-       <importlibrary definition="kbdtuf.spec.def" />
+       <importlibrary definition="kbdtuf.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdtuf.c</file>
        <file>kbdtuf.rc</file>
-       <file>kbdtuf.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild b/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
index 1cc516f..501ef71 100644 (file)
--- a/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
+++ b/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdtuq" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdtuq.dll" allowwarnings="true">
-       <importlibrary definition="kbdtuq.spec.def" />
+       <importlibrary definition="kbdtuq.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdtuq.c</file>
        <file>kbdtuq.rc</file>
-       <file>kbdtuq.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbduk/kbduk.rbuild b/reactos/dll/keyboard/kbduk/kbduk.rbuild
index 50cc9b8..a0eadb4 100644 (file)
--- a/reactos/dll/keyboard/kbduk/kbduk.rbuild
+++ b/reactos/dll/keyboard/kbduk/kbduk.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbduk" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduk.dll" allowwarnings="true">
-       <importlibrary definition="kbduk.spec.def" />
+       <importlibrary definition="kbduk.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbduk.c</file>
        <file>kbduk.rc</file>
-       <file>kbduk.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdur/kbdur.rbuild b/reactos/dll/keyboard/kbdur/kbdur.rbuild
index c38ab57..bc4e4a3 100644 (file)
--- a/reactos/dll/keyboard/kbdur/kbdur.rbuild
+++ b/reactos/dll/keyboard/kbdur/kbdur.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdur" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdur.dll" allowwarnings="true">
-       <importlibrary definition="kbdur.spec.def" />
+       <importlibrary definition="kbdur.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdur.c</file>
        <file>kbdur.rc</file>
-       <file>kbdur.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdurs/kbdurs.rbuild b/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
index 91c94bd..069e3ee 100644 (file)
--- a/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
+++ b/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdurs" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdurs.dll" allowwarnings="true">
-       <importlibrary definition="kbdurs.spec.def" />
+       <importlibrary definition="kbdurs.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdurs.c</file>
        <file>kbdurs.rc</file>
-       <file>kbdurs.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdus/kbdus.rbuild b/reactos/dll/keyboard/kbdus/kbdus.rbuild
index 42c7ca0..adb0126 100644 (file)
--- a/reactos/dll/keyboard/kbdus/kbdus.rbuild
+++ b/reactos/dll/keyboard/kbdus/kbdus.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdus" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdus.dll" allowwarnings="true">
-       <importlibrary definition="kbdus.spec.def" />
+       <importlibrary definition="kbdus.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdus.c</file>
        <file>kbdus.rc</file>
-       <file>kbdus.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdusa/kbdusa.rbuild b/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
index c9dc1b9..b3b4514 100644 (file)
--- a/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
+++ b/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusa" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusa.dll" allowwarnings="true">
-       <importlibrary definition="kbdusa.spec.def" />
+       <importlibrary definition="kbdusa.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdusa.c</file>
        <file>kbdusa.rc</file>
-       <file>kbdusa.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdusl/kbdusl.rbuild b/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
index 80de56d..a93f20d 100644 (file)
--- a/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
+++ b/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusl.dll" allowwarnings="true">
-       <importlibrary definition="kbdusl.spec.def" />
+       <importlibrary definition="kbdusl.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdusl.c</file>
        <file>kbdusl.rc</file>
-       <file>kbdusl.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdusr/kbdusr.rbuild b/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
index 3fa2412..68a0424 100644 (file)
--- a/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
+++ b/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusr" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusr.dll" allowwarnings="true">
-       <importlibrary definition="kbdusr.spec.def" />
+       <importlibrary definition="kbdusr.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdusr.c</file>
        <file>kbdusr.rc</file>
-       <file>kbdusr.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdusx/kbdusx.rbuild b/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
index c2eb6e9..e6e5df6 100644 (file)
--- a/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
+++ b/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdusx" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdusx.dll" allowwarnings="true">
-       <importlibrary definition="kbdusx.spec.def" />
+       <importlibrary definition="kbdusx.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdusx.c</file>
        <file>kbdusx.rc</file>
-       <file>kbdusx.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbduzb/kbduzb.rbuild b/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
index cf995a0..da804ac 100644 (file)
--- a/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
+++ b/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbduzb" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbduzb.dll" allowwarnings="true">
-       <importlibrary definition="kbduzb.spec.def" />
+       <importlibrary definition="kbduzb.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbduzb.c</file>
        <file>kbduzb.rc</file>
-       <file>kbduzb.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild b/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
index 472e3f9..b3b0771 100644 (file)
--- a/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
+++ b/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdvntc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdvntc.dll" allowwarnings="true">
-       <importlibrary definition="kbdvntc.spec.def" />
+       <importlibrary definition="kbdvntc.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdvntc.c</file>
        <file>kbdvntc.rc</file>
-       <file>kbdvntc.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdycc/kbdycc.rbuild b/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
index bc81aa5..18eba58 100644 (file)
--- a/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
+++ b/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdycc" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycc.dll" allowwarnings="true">
-       <importlibrary definition="kbdycc.spec.def" />
+       <importlibrary definition="kbdycc.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdycc.c</file>
        <file>kbdycc.rc</file>
-       <file>kbdycc.spec</file>
 </module>

diff --git a/reactos/dll/keyboard/kbdycl/kbdycl.rbuild b/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
index 4da9d79..eff20bb 100644 (file)
--- a/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
+++ b/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdycl" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdycl.dll" allowwarnings="true">
-       <importlibrary definition="kbdycl.spec.def" />
+       <importlibrary definition="kbdycl.spec" />
        <include base="ntoskrnl">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT">0x0500</define>
        <file>kbdycl.c</file>
        <file>kbdycl.rc</file>
-       <file>kbdycl.spec</file>
 </module>

diff --git a/reactos/dll/shellext/deskadp/deskadp.rbuild b/reactos/dll/shellext/deskadp/deskadp.rbuild
index 8b454cd..3f26d05 100644 (file)
--- a/reactos/dll/shellext/deskadp/deskadp.rbuild
+++ b/reactos/dll/shellext/deskadp/deskadp.rbuild
@@ -1,5 +1,5 @@
 <module name="deskadp" type="win32dll" baseaddress="${BASEADDRESS_DESKADP}" installbase="system32" installname="deskadp.dll" unicode="yes">
-       <importlibrary definition="deskadp.spec.def" />
+       <importlibrary definition="deskadp.spec" />
        <include base="deskadp">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
@@ -14,6 +14,5 @@
        <file>deskadp.c</file>
        <file>shxiface.c</file>
        <file>deskadp.rc</file>
-       <file>deskadp.spec</file>
        <pch>precomp.h</pch>
 </module>

diff --git a/reactos/dll/shellext/deskmon/deskmon.rbuild b/reactos/dll/shellext/deskmon/deskmon.rbuild
index b78bcba..02b01f0 100644 (file)
--- a/reactos/dll/shellext/deskmon/deskmon.rbuild
+++ b/reactos/dll/shellext/deskmon/deskmon.rbuild
@@ -1,5 +1,5 @@
 <module name="deskmon" type="win32dll" baseaddress="${BASEADDRESS_DESKMON}" installbase="system32" installname="deskmon.dll" unicode="yes">
-       <importlibrary definition="deskmon.spec.def" />
+       <importlibrary definition="deskmon.spec" />
        <include base="deskmon">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>

diff --git a/reactos/dll/shellext/fontext/fontext.rbuild b/reactos/dll/shellext/fontext/fontext.rbuild
index c299cd8..d831125 100644 (file)
--- a/reactos/dll/shellext/fontext/fontext.rbuild
+++ b/reactos/dll/shellext/fontext/fontext.rbuild
@@ -1,5 +1,5 @@
 <module name="fontext" type="win32dll" baseaddress="${BASEADDRESS_FONTEXT}" installbase="system32" installname="fontext.dll" unicode="yes">
-       <importlibrary definition="fontext.spec.def" />
+       <importlibrary definition="fontext.spec" />
        <include base="fontext">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>

diff --git a/reactos/dll/win32/acledit/acledit.rbuild b/reactos/dll/win32/acledit/acledit.rbuild
index cad5f42..047b0ac 100644 (file)
--- a/reactos/dll/win32/acledit/acledit.rbuild
+++ b/reactos/dll/win32/acledit/acledit.rbuild
@@ -1,5 +1,5 @@
 <module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll" unicode="yes">
-       <importlibrary definition="acledit.spec.def" />
+       <importlibrary definition="acledit.spec" />
        <include base="acledit">.</include>
 
        <metadata description = "Access Control List Editor" />

diff --git a/reactos/dll/win32/aclui/aclui.rbuild b/reactos/dll/win32/aclui/aclui.rbuild
index 5dd969b..ecbffd5 100644 (file)
--- a/reactos/dll/win32/aclui/aclui.rbuild
+++ b/reactos/dll/win32/aclui/aclui.rbuild
@@ -1,5 +1,5 @@
 <module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll" unicode="yes">
-       <importlibrary definition="aclui.spec.def" />
+       <importlibrary definition="aclui.spec" />
        <include base="aclui">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>

diff --git a/reactos/dll/win32/advapi32/advapi32.rbuild b/reactos/dll/win32/advapi32/advapi32.rbuild
index f602ac5..150f7fc 100644 (file)
--- a/reactos/dll/win32/advapi32/advapi32.rbuild
+++ b/reactos/dll/win32/advapi32/advapi32.rbuild
@@ -1,6 +1,6 @@
 <module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll" unicode="yes">
 
-       <importlibrary definition="advapi32.spec.def" />
+       <importlibrary definition="advapi32.spec" />
        <include base="advapi32">.</include>
        <include base="scm_client">.</include>
        <include base="lsa_client">.</include>

diff --git a/reactos/dll/win32/advapi32/advapi32.spec b/reactos/dll/win32/advapi32/advapi32.spec
index b601d25..51dcae1 100644 (file)
--- a/reactos/dll/win32/advapi32/advapi32.spec
+++ b/reactos/dll/win32/advapi32/advapi32.spec
@@ -102,12 +102,12 @@
  @ stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr)
  @ stub CreateTraceInstanceId
  @ stdcall CreateWellKnownSid(long ptr ptr ptr)
- @ stub CredDeleteA #(str long long)
- @ stub CredDeleteW #(wstr long long)
- @ stub CredEnumerateA #(str long ptr ptr)
- @ stub CredEnumerateW #(wstr long ptr ptr)
- @ stub CredFree #(ptr)
- @ stub CredGetSessionTypes #(long ptr)
+ @ stdcall CredDeleteA (str long long)
+ @ stdcall CredDeleteW (wstr long long)
+ @ stdcall CredEnumerateA (str long ptr ptr)
+ @ stdcall CredEnumerateW (wstr long ptr ptr)
+ @ stdcall CredFree (ptr)
+ @ stdcall CredGetSessionTypes (long ptr)
  @ stub CredGetTargetInfoA
  @ stub CredGetTargetInfoW
  @ stub CredIsMarshaledCredentialA
@@ -115,18 +115,18 @@
  @ stub CredMarshalCredentialA
  @ stub CredMarshalCredentialW
  @ stub CredProfileLoaded
- @ stub CredReadA #(str long long ptr)
+ @ stdcall CredReadA (str long long ptr)
  @ stub CredReadDomainCredentialsA
  @ stub CredReadDomainCredentialsW
- @ stub CredReadW #(wstr long long ptr)
+ @ stdcall CredReadW (wstr long long ptr)
  @ stub CredRenameA
  @ stub CredRenameW
  @ stub CredUnmarshalCredentialA
  @ stub CredUnmarshalCredentialW
- @ stub CredWriteA #(ptr long)
+ @ stdcall CredWriteA(ptr long)
  @ stub CredWriteDomainCredentialsA
  @ stub CredWriteDomainCredentialsW
- @ stub CredWriteW #(ptr long)
+ @ stdcall CredWriteW (ptr long)
  @ stub CredpConvertCredential
  @ stub CredpConvertTargetInfo
  @ stub CredpDecodeCredential

diff --git a/reactos/dll/win32/advpack/advpack.rbuild b/reactos/dll/win32/advpack/advpack.rbuild
index de904cb..b0a4a12 100644 (file)
--- a/reactos/dll/win32/advpack/advpack.rbuild
+++ b/reactos/dll/win32/advpack/advpack.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}" installbase="system32" installname="advpack.dll" allowwarnings="true">
-       <importlibrary definition="advpack.spec.def" />
+       <importlibrary definition="advpack.spec" />
        <include base="advpack">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/atl/atl.rbuild b/reactos/dll/win32/atl/atl.rbuild
index eed64ff..cdbfa23 100644 (file)
--- a/reactos/dll/win32/atl/atl.rbuild
+++ b/reactos/dll/win32/atl/atl.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="atl.spec.def" />
+       <importlibrary definition="atl.spec" />
        <include base="atl">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/avifil32/avifil32.rbuild b/reactos/dll/win32/avifil32/avifil32.rbuild
index 854672b..e5a053d 100644 (file)
--- a/reactos/dll/win32/avifil32/avifil32.rbuild
+++ b/reactos/dll/win32/avifil32/avifil32.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="avifil32.spec.def" />
+       <importlibrary definition="avifil32.spec" />
        <include base="avifil32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/browseui/browseui.rbuild b/reactos/dll/win32/browseui/browseui.rbuild
index 671f9cc..2c19c0d 100644 (file)
--- a/reactos/dll/win32/browseui/browseui.rbuild
+++ b/reactos/dll/win32/browseui/browseui.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="browseui" type="win32dll" baseaddress="${BASEADDRESS_BROWSEUI}" installbase="system32" installname="browseui.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="browseui.spec.def" />
+       <importlibrary definition="browseui.spec" />
        <include base="browseui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="explorer_new">.</include>

diff --git a/reactos/dll/win32/cabinet/cabinet.rbuild b/reactos/dll/win32/cabinet/cabinet.rbuild
index f8e369d..20a6ca8 100644 (file)
--- a/reactos/dll/win32/cabinet/cabinet.rbuild
+++ b/reactos/dll/win32/cabinet/cabinet.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true" entrypoint="0">
-       <importlibrary definition="cabinet.spec.def" />
+       <importlibrary definition="cabinet.spec" />
        <include base="cabinet">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild
index ace4c0c..065b1e1 100644 (file)
--- a/reactos/dll/win32/cards/cards.rbuild
+++ b/reactos/dll/win32/cards/cards.rbuild
@@ -1,5 +1,5 @@
 <module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll" unicode="yes">
-       <importlibrary definition="cards.spec.def" />
+       <importlibrary definition="cards.spec" />
        <include base="cards">.</include>
 
        <!-- Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN -->

diff --git a/reactos/dll/win32/clusapi/clusapi.rbuild b/reactos/dll/win32/clusapi/clusapi.rbuild
index 410acc5..1ea58a0 100644 (file)
--- a/reactos/dll/win32/clusapi/clusapi.rbuild
+++ b/reactos/dll/win32/clusapi/clusapi.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="clusapi" type="win32dll" baseaddress="${BASEADDRESS_CLUSAPI}" installbase="system32" installname="clusapi.dll" allowwarnings="true">
-       <importlibrary definition="clusapi.spec.def" />
+       <importlibrary definition="clusapi.spec" />
        <include base="clusapi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/comcat/comcat.rbuild b/reactos/dll/win32/comcat/comcat.rbuild
index d9c2fb7..551b99d 100644 (file)
--- a/reactos/dll/win32/comcat/comcat.rbuild
+++ b/reactos/dll/win32/comcat/comcat.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" entrypoint="0" installname="comcat.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="comcat.spec.def" />
+       <importlibrary definition="comcat.spec" />
        <include base="comcat">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index 9139d73..6079903 100644 (file)
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllInstall" />
-       <importlibrary definition="comctl32.spec.def" />
+       <importlibrary definition="comctl32.spec" />
        <include base="comctl32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild
index bce7564..57e7c22 100644 (file)
--- a/reactos/dll/win32/comdlg32/comdlg32.rbuild
+++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true">
-       <importlibrary definition="comdlg32.spec.def" />
+       <importlibrary definition="comdlg32.spec" />
        <include base="comdlg32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/compstui/compstui.rbuild b/reactos/dll/win32/compstui/compstui.rbuild
index 8d7403a..cd7ce26 100644 (file)
--- a/reactos/dll/win32/compstui/compstui.rbuild
+++ b/reactos/dll/win32/compstui/compstui.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="compstui" type="win32dll" baseaddress="${BASEADDRESS_COMPSTUI}" installbase="system32" installname="compstui.dll" allowwarnings="true">
-       <importlibrary definition="compstui.spec.def" />
+       <importlibrary definition="compstui.spec" />
        <include base="compstui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/credui/credui.rbuild b/reactos/dll/win32/credui/credui.rbuild
index e07e0f8..0ef5423 100644 (file)
--- a/reactos/dll/win32/credui/credui.rbuild
+++ b/reactos/dll/win32/credui/credui.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="credui" type="win32dll" baseaddress="${BASEADDRESS_CREDUI}" installbase="system32" installname="credui.dll" allowwarnings="true">
-       <importlibrary definition="credui.spec.def" />
+       <importlibrary definition="credui.spec" />
        <include base="credui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/crtdll/crtdll.rbuild b/reactos/dll/win32/crtdll/crtdll.rbuild
index f7166eb..883bf0c 100644 (file)
--- a/reactos/dll/win32/crtdll/crtdll.rbuild
+++ b/reactos/dll/win32/crtdll/crtdll.rbuild
@@ -1,5 +1,5 @@
 <module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true" installbase="system32" installname="crtdll.dll">
-       <importlibrary definition="crtdll.spec.def" />
+       <importlibrary definition="crtdll.spec" />
        <include base="crtdll">.</include>
        <include base="crt">include</include>
        <define name="_DISABLE_TIDENTS" />

diff --git a/reactos/dll/win32/crypt32/crypt32.rbuild b/reactos/dll/win32/crypt32/crypt32.rbuild
index 69026ee..f70d712 100644 (file)
--- a/reactos/dll/win32/crypt32/crypt32.rbuild
+++ b/reactos/dll/win32/crypt32/crypt32.rbuild
@@ -1,5 +1,5 @@
 <module name="crypt32" type="win32dll" baseaddress="${BASEADDRESS_CRYPT32}" installbase="system32" installname="crypt32.dll" allowwarnings="true">
-       <importlibrary definition="crypt32.spec.def" />
+       <importlibrary definition="crypt32.spec" />
        <include base="crypt32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/cryptdll/cryptdll.rbuild b/reactos/dll/win32/cryptdll/cryptdll.rbuild
index d8a3f47..23da95b 100644 (file)
--- a/reactos/dll/win32/cryptdll/cryptdll.rbuild
+++ b/reactos/dll/win32/cryptdll/cryptdll.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cryptdll" type="win32dll" baseaddress="${BASEADDRESS_CRYPTDLL}" installbase="system32" installname="cryptdll.dll" allowwarnings="true">
-       <importlibrary definition="cryptdll.spec.def" />
+       <importlibrary definition="cryptdll.spec" />
        <include base="cryptdll">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/cryptnet/cryptnet.rbuild b/reactos/dll/win32/cryptnet/cryptnet.rbuild
index d8a50dd..c263f11 100644 (file)
--- a/reactos/dll/win32/cryptnet/cryptnet.rbuild
+++ b/reactos/dll/win32/cryptnet/cryptnet.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="cryptnet" type="win32dll" baseaddress="${BASEADDRESS_CRYPTNET}" installbase="system32" installname="cryptnet.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="cryptnet.spec.def" />
+       <importlibrary definition="cryptnet.spec" />
        <include base="cryptnet">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/cryptui/cryptui.rbuild b/reactos/dll/win32/cryptui/cryptui.rbuild
index 63a6d1a..bab940f 100644 (file)
--- a/reactos/dll/win32/cryptui/cryptui.rbuild
+++ b/reactos/dll/win32/cryptui/cryptui.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true">
        <!--autoregister infsection="OleControlDlls" type="DllRegisterServer" /-->
-       <importlibrary definition="cryptui.spec.def" />
+       <importlibrary definition="cryptui.spec" />
        <include base="cryptui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/dbghelp/dbghelp.rbuild b/reactos/dll/win32/dbghelp/dbghelp.rbuild
index 236536a..ff2a5c2 100644 (file)
--- a/reactos/dll/win32/dbghelp/dbghelp.rbuild
+++ b/reactos/dll/win32/dbghelp/dbghelp.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" allowwarnings="true">
-       <importlibrary definition="dbghelp.spec.def" />
+       <importlibrary definition="dbghelp.spec" />
        <include base="dbghelp">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/dciman32/dciman32.rbuild b/reactos/dll/win32/dciman32/dciman32.rbuild
index 35367a6..9b03c62 100644 (file)
--- a/reactos/dll/win32/dciman32/dciman32.rbuild
+++ b/reactos/dll/win32/dciman32/dciman32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="dciman32" type="win32dll" baseaddress="${BASEADDRESS_DCIMAN32}" installbase="system32" installname="dciman32.dll" allowwarnings="true">
-       <importlibrary definition="dciman32.spec.def" />
+       <importlibrary definition="dciman32.spec" />
        <include base="dciman32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/devmgr/devmgr.rbuild b/reactos/dll/win32/devmgr/devmgr.rbuild
index 226979a..926ce28 100644 (file)
--- a/reactos/dll/win32/devmgr/devmgr.rbuild
+++ b/reactos/dll/win32/devmgr/devmgr.rbuild
@@ -1,6 +1,6 @@
 <module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true" unicode="yes">
        <include base="devmgr">.</include>
-       <importlibrary definition="devmgr.spec.def" />
+       <importlibrary definition="devmgr.spec" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>

diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
index 9ccf4e5..01f7644 100644 (file)
--- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
+++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
@@ -1,5 +1,5 @@
 <module name="dhcpcsvc" type="win32dll" baseaddress="${BASEADDRESS_DHCPCSVC}" installbase="system32" installname="dhcpcsvc.dll">
-       <importlibrary definition="dhcpcsvc.spec.def" />
+       <importlibrary definition="dhcpcsvc.spec" />
        <include base="dhcpcsvc">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="_WIN32_WINNT=0x0500" />

diff --git a/reactos/dll/win32/fusion/fusion.rbuild b/reactos/dll/win32/fusion/fusion.rbuild
index 90cabde..0d3badf 100644 (file)
--- a/reactos/dll/win32/fusion/fusion.rbuild
+++ b/reactos/dll/win32/fusion/fusion.rbuild
@@ -1,5 +1,5 @@
 <module name="fusion" type="win32dll" baseaddress="${BASEADDRESS_FUSION}" installbase="system32" installname="fusion.dll" allowwarnings="true">
-       <importlibrary definition="fusion.spec.def" />
+       <importlibrary definition="fusion.spec" />
        <include base="fusion">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def
deleted file mode 100644 (file)
index 2f18b8c..0000000
--- a/reactos/dll/win32/gdi32/gdi32.def
+++ /dev/null
@@ -1,624 +0,0 @@
-; $Id$
-;
-; gdi32.def
-;
-; ReactOS Operating System
-; From Anders Norlander's w32api-0.1.5 gdi32.def.
-;
-LIBRARY gdi32.dll
-EXPORTS
-AbortDoc@4
-AbortPath@4
-AddFontMemResourceEx@16
-AddFontResourceA@4
-AddFontResourceExA@12
-AddFontResourceExW@12
-AddFontResourceTracking@8
-AddFontResourceW@4
-AngleArc@24
-AnimatePalette@16
-AnyLinkedFonts@0=NtGdiAnyLinkedFonts@0
-Arc@36
-ArcTo@36
-BRUSHOBJ_hGetColorTransform@4=NtGdiBRUSHOBJ_hGetColorTransform@4
-BRUSHOBJ_pvAllocRbrush@8=NtGdiBRUSHOBJ_pvAllocRbrush@8
-BRUSHOBJ_pvGetRbrush@4=NtGdiBRUSHOBJ_pvGetRbrush@4
-BRUSHOBJ_ulGetBrushColor@4=NtGdiBRUSHOBJ_ulGetBrushColor@4
-BeginPath@4
-BitBlt@36
-CLIPOBJ_bEnum@12=NtGdiCLIPOBJ_bEnum@12
-CLIPOBJ_cEnumStart@20=NtGdiCLIPOBJ_cEnumStart@20
-CLIPOBJ_ppoGetPath@4=NtGdiCLIPOBJ_ppoGetPath@4
-CancelDC@4
-CheckColorsInGamut@16
-ChoosePixelFormat@8
-Chord@36
-ClearBitmapAttributes@8
-ClearBrushAttributes@8
-CloseEnhMetaFile@4
-CloseFigure@4
-CloseMetaFile@4
-ColorCorrectPalette@16
-ColorMatchToTarget@12
-CombineRgn@16
-CombineTransform@12=NtGdiCombineTransform@12
-CopyEnhMetaFileA@8
-CopyEnhMetaFileW@8
-CopyMetaFileA@8
-CopyMetaFileW@8
-CreateBitmap@20
-CreateBitmapIndirect@4
-CreateBrushIndirect@4
-CreateColorSpaceA@4
-CreateColorSpaceW@4
-CreateCompatibleBitmap@12
-CreateCompatibleDC@4
-CreateDCA@16
-CreateDCW@16
-CreateDIBPatternBrush@8
-CreateDIBPatternBrushPt@8
-CreateDIBSection@24
-CreateDIBitmap@24
-CreateDiscardableBitmap@12
-CreateEllipticRgn@16=NtGdiCreateEllipticRgn@16
-CreateEllipticRgnIndirect@4
-CreateEnhMetaFileA@16
-CreateEnhMetaFileW@16
-CreateFontA@56
-CreateFontIndirectA@4
-CreateFontIndirectExA@4
-CreateFontIndirectExW@4
-CreateFontIndirectW@4
-CreateFontW@56
-CreateHalftonePalette@4=NtGdiCreateHalftonePalette@4
-CreateHatchBrush@8
-CreateICA@16
-CreateICW@16
-CreateMetaFileA@4
-CreateMetaFileW@4
-CreatePalette@4
-CreatePatternBrush@4
-CreatePen@12
-CreatePenIndirect@4
-CreatePolyPolygonRgn@16
-CreatePolygonRgn@12
-CreateRectRgn@16
-CreateRectRgnIndirect@4
-CreateRoundRectRgn@24=NtGdiCreateRoundRectRgn@24
-CreateScalableFontResourceA@16
-CreateScalableFontResourceW@16
-CreateSolidBrush@4
-DPtoLP@12
-DdEntry0@24=NtGdiDxgGenericThunk@24
-DdEntry10@8=NtGdiDdBeginMoCompFrame@8
-DdEntry11@12=NtGdiDdBlt@12
-DdEntry12@8=NtGdiDdCanCreateSurface@8
-DdEntry13@8=NtGdiDdCanCreateD3DBuffer@8
-DdEntry14@8=NtGdiDdColorControl@8
-DdEntry15@4=NtGdiDdCreateDirectDrawObject@4
-DdEntry16@32=NtGdiDdCreateSurface@32
-DdEntry17@32=NtGdiDdCreateD3DBuffer@32
-DdEntry18@8=NtGdiDdCreateMoComp@8
-DdEntry19@24=NtGdiDdCreateSurfaceObject@24
-DdEntry1@16=NtGdiD3dContextCreate@16
-DdEntry20@4=NtGdiDdDeleteDirectDrawObject@4
-DdEntry21@4=NtGdiDdDeleteSurfaceObject@4
-DdEntry22@8=NtGdiDdDestroyMoComp@8
-DdEntry23@8=NtGdiDdDestroySurface@8
-DdEntry24@4=NtGdiDdDestroyD3DBuffer@4
-DdEntry25@8=NtGdiDdEndMoCompFrame@8
-DdEntry26@20=NtGdiDdFlip@20
-DdEntry27@8=NtGdiDdFlipToGDISurface@8
-DdEntry28@8=NtGdiDdGetAvailDriverMemory@8
-DdEntry29@8=NtGdiDdGetBltStatus@8
-DdEntry2@4=NtGdiD3dContextDestroy@4
-DdEntry30@8=NtGdiDdGetDC@8
-DdEntry31@8=NtGdiDdGetDriverInfo@8
-DdEntry32@12=NtGdiDdGetDxHandle@12
-DdEntry33@8=NtGdiDdGetFlipStatus@8
-DdEntry34@8=NtGdiDdGetInternalMoCompInfo@8
-DdEntry35@8=NtGdiDdGetMoCompBuffInfo@8
-DdEntry36@8=NtGdiDdGetMoCompGuids@8
-DdEntry37@8=NtGdiDdGetMoCompFormats@8
-DdEntry38@8=NtGdiDdGetScanLine@8
-DdEntry39@12=NtGdiDdLock@12
-DdEntry3@4=NtGdiD3dContextDestroyAll@4
-DdEntry40@8=NtGdiDdLockD3D@8
-DdEntry41@44=NtGdiDdQueryDirectDrawObject@44
-DdEntry42@8=NtGdiDdQueryMoCompStatus@8
-DdEntry43@8=NtGdiDdReenableDirectDrawObject@8
-DdEntry44@4=NtGdiDdReleaseDC@4
-DdEntry45@8=NtGdiDdRenderMoComp@8
-DdEntry46@8=NtGdiDdResetVisrgn@8
-DdEntry47@8=NtGdiDdSetColorKey@8
-DdEntry48@8=NtGdiDdSetExclusiveMode@8
-DdEntry49@12=NtGdiDdSetGammaRamp@12
-DdEntry4@4=NtGdiD3dValidateTextureStageState@4
-DdEntry50@12=NtGdiDdCreateSurfaceEx@12
-DdEntry51@12=NtGdiDdSetOverlayPosition@12
-DdEntry52@8=NtGdiDdUnattachSurface@8
-DdEntry53@8=NtGdiDdUnlock@8
-DdEntry54@8=NtGdiDdUnlockD3D@8
-DdEntry55@12=NtGdiDdUpdateOverlay@12
-DdEntry56@8=NtGdiDdWaitForVerticalBlank@8
-DdEntry5@28=NtGdiD3dDrawPrimitives2@28
-DdEntry6@4=NtGdiDdGetDriverState@4
-DdEntry7@12=NtGdiDdAddAttachedSurface@12
-DdEntry8@12=NtGdiDdAlphaBlt@12
-DdEntry9@8=NtGdiDdAttachSurface@8
-DeleteColorSpace@4=NtGdiDeleteColorSpace@4
-DeleteDC@4
-DeleteEnhMetaFile@4
-DeleteMetaFile@4
-DeleteObject@4
-DescribePixelFormat@16
-DeviceCapabilitiesExA@20
-DeviceCapabilitiesExW@20
-DrawEscape@16
-Ellipse@20
-EnableEUDC@4=NtGdiEnableEudc@4
-EndDoc@4
-EndFormPage@4
-EndPage@4
-EndPath@4
-EngAcquireSemaphore@4
-EngAlphaBlend@28=NtGdiEngAlphaBlend@28
-EngAssociateSurface@12=NtGdiEngAssociateSurface@12
-EngBitBlt@44=NtGdiEngBitBlt@44
-EngCheckAbort@4=NtGdiEngCheckAbort@4
-EngComputeGlyphSet@12
-EngCopyBits@24=NtGdiEngCopyBits@24
-EngCreateBitmap@24=NtGdiEngCreateBitmap@24
-EngCreateClip@0=NtGdiEngCreateClip@0
-EngCreateDeviceBitmap@16=NtGdiEngCreateDeviceBitmap@16
-EngCreateDeviceSurface@16=NtGdiEngCreateDeviceSurface@16
-EngCreatePalette@24=NtGdiEngCreatePalette@24
-EngCreateSemaphore@0
-EngDeleteClip@4=NtGdiEngDeleteClip@4
-EngDeletePalette@4=NtGdiEngDeletePalette@4
-EngDeletePath@4=NtGdiEngDeletePath@4
-EngDeleteSemaphore@4
-EngDeleteSurface@4=NtGdiEngDeleteSurface@4
-EngEraseSurface@12=NtGdiEngEraseSurface@12
-EngFillPath@28=NtGdiEngFillPath@28
-EngFindResource@16
-EngFreeModule@4
-EngGetCurrentCodePage@8
-EngGetDriverName@4
-EngGetPrinterDataFileName@4
-EngGradientFill@40=NtGdiEngGradientFill@40
-EngLineTo@36=NtGdiEngLineTo@36
-EngLoadModule@4
-EngLockSurface@4=NtGdiEngLockSurface@4
-EngMarkBandingSurface@4=NtGdiEngMarkBandingSurface@4
-EngMultiByteToUnicodeN@20=RtlMultiByteToUnicodeN@20
-EngMultiByteToWideChar@20
-EngPaint@20=NtGdiEngPaint@20
-EngPlgBlt@44=NtGdiEngPlgBlt@44
-EngQueryEMFInfo@8
-EngQueryLocalTime@4
-EngReleaseSemaphore@4
-EngStretchBlt@44=NtGdiEngStretchBlt@44
-EngStretchBltROP@52=NtGdiEngStretchBltROP@52
-EngStrokeAndFillPath@40=NtGdiEngStrokeAndFillPath@40
-EngStrokePath@32=NtGdiEngStrokePath@32
-EngTextOut@40=NtGdiEngTextOut@40
-EngTransparentBlt@32=NtGdiEngTransparentBlt@32
-EngUnicodeToMultiByteN@20=RtlUnicodeToMultiByteN@20
-EngUnlockSurface@4=NtGdiEngUnlockSurface@4
-EngWideCharToMultiByte@20
-EnumEnhMetaFile@20
-EnumFontFamiliesA@16
-EnumFontFamiliesExA@20
-EnumFontFamiliesExW@20
-EnumFontFamiliesW@16
-EnumFontsA@16
-EnumFontsW@16
-EnumICMProfilesA@12
-EnumICMProfilesW@12
-EnumMetaFile@16
-EnumObjects@16
-EqualRgn@8=NtGdiEqualRgn@8
-Escape@20
-EudcLoadLinkW@16
-EudcUnloadLinkW@8
-ExcludeClipRect@20
-ExtCreatePen@20
-ExtCreateRegion@12
-ExtEscape@24
-ExtFloodFill@20
-ExtSelectClipRgn@12
-ExtTextOutA@32
-ExtTextOutW@32
-FONTOBJ_cGetAllGlyphHandles@8=NtGdiFONTOBJ_cGetAllGlyphHandles@8
-FONTOBJ_cGetGlyphs@20=NtGdiFONTOBJ_cGetGlyphs@20
-FONTOBJ_pQueryGlyphAttrs@8=NtGdiFONTOBJ_pQueryGlyphAttrs@8
-FONTOBJ_pfdg@4=NtGdiFONTOBJ_pfdg@4
-FONTOBJ_pifi@4=NtGdiFONTOBJ_pifi@4
-FONTOBJ_pvTrueTypeFontFile@8=NtGdiFONTOBJ_pvTrueTypeFontFile@8
-FONTOBJ_pxoGetXform@4=NtGdiFONTOBJ_pxoGetXform@4
-FONTOBJ_vGetInfo@12=NtGdiFONTOBJ_vGetInfo@12
-FillPath@4
-FillRgn@12
-FixBrushOrgEx@16
-FlattenPath@4
-FloodFill@16
-FontIsLinked@4=NtGdiFontIsLinked@4
-FrameRgn@20
-GdiAddFontResourceW@12
-GdiAddGlsBounds@8
-GdiAddGlsRecord@16
-GdiAlphaBlend@44
-GdiArtificialDecrementDriver@8
-GdiCleanCacheDC@4
-GdiComment@12
-GdiConsoleTextOut@16=NtGdiConsoleTextOut@16
-GdiConvertAndCheckDC@4
-GdiConvertBitmap@4
-GdiConvertBitmapV5@16
-GdiConvertBrush@4
-GdiConvertDC@4
-GdiConvertEnhMetaFile@4
-GdiConvertFont@4
-GdiConvertMetaFilePict@4
-GdiConvertPalette@4
-GdiConvertRegion@4
-GdiConvertToDevmodeW@4
-GdiCreateLocalEnhMetaFile@4
-GdiCreateLocalMetaFilePict@4
-GdiDeleteLocalDC@4
-GdiDeleteSpoolFileHandle@4
-GdiDescribePixelFormat@16=NtGdiDescribePixelFormat@16
-GdiDllInitialize@12
-GdiDrawStream@12
-GdiEndDocEMF@4
-GdiEndPageEMF@8
-GdiEntry10@8
-GdiEntry11@8
-GdiEntry12@8
-GdiEntry13@0
-GdiEntry14@12
-GdiEntry15@12
-GdiEntry16@12
-GdiEntry1@8
-GdiEntry2@44
-GdiEntry3@4
-GdiEntry4@8
-GdiEntry5@4
-GdiEntry6@8
-GdiEntry7@8
-GdiEntry8@4
-GdiEntry9@24
-GdiFixUpHandle@4
-GdiFlush@0
-GdiFullscreenControl@20=NtGdiFullscreenControl@20
-GdiGetBatchLimit@0
-GdiGetCharDimensions@12
-GdiGetCodePage@4
-GdiGetDC@4
-GdiGetDevmodeForPage@16
-GdiGetLocalBrush@4
-GdiGetLocalDC@4
-GdiGetLocalFont@4
-GdiGetPageCount@4
-GdiGetPageHandle@12
-GdiGetSpoolFileHandle@12
-GdiGetSpoolMessage@16=NtGdiGetSpoolMessage@16
-GdiGradientFill@24
-GdiInitSpool@0=NtGdiInitSpool@0
-GdiInitializeLanguagePack@4
-GdiIsMetaFileDC@4
-GdiIsMetaPrintDC@4
-GdiIsPlayMetafileDC@4
-GdiPlayDCScript@24
-GdiPlayEMF@20
-GdiPlayJournal@20
-GdiPlayPageEMF@20
-GdiPlayPrivatePageEMF@12
-GdiPlayScript@28
-GdiPrinterThunk@12
-GdiProcessSetup@0
-GdiQueryFonts@12=NtGdiQueryFonts@12
-GdiQueryTable@0
-GdiRealizationInfo@8
-GdiReleaseDC@4
-GdiReleaseLocalDC@4
-GdiResetDCEMF@8
-GdiSetAttrs@4
-GdiSetBatchLimit@4
-GdiSetLastError@4
-GdiSetPixelFormat@8=NtGdiSetPixelFormat@8
-GdiSetServerAttr@8
-GdiStartDocEMF@8
-GdiStartPageEMF@4
-GdiSwapBuffers@4=NtGdiSwapBuffers@4
-GdiTransparentBlt@44
-GdiValidateHandle@4
-GetArcDirection@4
-GetAspectRatioFilterEx@8
-GetBitmapAttributes@4
-GetBitmapBits@12=NtGdiGetBitmapBits@12
-GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8
-GetBkColor@4
-GetBkMode@4
-GetBoundsRect@12
-GetBrushOrgEx@8
-GetCharABCWidthsA@16
-GetCharABCWidthsFloatA@16
-GetCharABCWidthsFloatW@16
-GetCharABCWidthsI@20
-GetCharABCWidthsW@16
-GetCharWidth32A@16
-GetCharWidth32W@16
-GetCharWidthA@16
-GetCharWidthFloatA@16
-GetCharWidthFloatW@16
-GetCharWidthI@20
-GetCharWidthInfo@8=NtGdiGetCharWidthInfo@8
-GetCharWidthW@16
-GetCharacterPlacementA@24
-GetCharacterPlacementW@24
-GetClipBox@8
-GetClipRgn@8
-GetColorAdjustment@8=NtGdiGetColorAdjustment@8
-GetColorSpace@4
-GetCurrentObject@8
-GetCurrentPositionEx@8
-GetDCBrushColor@4
-GetDCOrgEx@8
-GetDCPenColor@4
-GetDIBColorTable@16
-GetDIBits@28
-GetDeviceCaps@8
-GetDeviceGammaRamp@8
-GetETM@8
-GetEUDCTimeStamp@0
-GetEUDCTimeStampExW@4
-GetEnhMetaFileA@4
-GetEnhMetaFileBits@12
-GetEnhMetaFileDescriptionA@12
-GetEnhMetaFileDescriptionW@12
-GetEnhMetaFileHeader@12
-GetEnhMetaFilePaletteEntries@12
-GetEnhMetaFilePixelFormat@12
-GetEnhMetaFileW@4
-GetFontAssocStatus@4
-GetFontData@20
-GetFontLanguageInfo@4
-GetFontResourceInfoW@16
-GetFontUnicodeRanges@8=NtGdiGetFontUnicodeRanges@8
-GetGlyphIndicesA@20
-GetGlyphIndicesW@20=NtGdiGetGlyphIndicesW@20
-GetGlyphOutline@28=GetGlyphOutlineA@28
-GetGlyphOutlineA@28
-GetGlyphOutlineW@28
-GetGlyphOutlineWow@28
-GetGraphicsMode@4
-GetHFONT@4
-GetICMProfileA@12
-GetICMProfileW@12
-GetKerningPairs@12=GetKerningPairsA@12
-GetKerningPairsA@12
-GetKerningPairsW@12
-GetLayout@4
-GetLogColorSpaceA@12
-GetLogColorSpaceW@12
-GetMapMode@4
-GetMetaFileA@4
-GetMetaFileBitsEx@12
-GetMetaFileW@4
-GetMetaRgn@8
-GetMiterLimit@8=NtGdiGetMiterLimit@8
-GetNearestColor@8=NtGdiGetNearestColor@8
-GetNearestPaletteIndex@8=NtGdiGetNearestPaletteIndex@8
-GetObjectA@12
-GetObjectType@4
-GetObjectW@12
-GetOutlineTextMetricsA@12
-GetOutlineTextMetricsW@12
-GetPaletteEntries@16
-GetPath@16
-GetPixel@12
-GetPixelFormat@4
-GetPolyFillMode@4
-GetROP2@4
-GetRandomRgn@12=NtGdiGetRandomRgn@12
-GetRasterizerCaps@8=NtGdiGetRasterizerCaps@8
-GetRegionData@12
-GetRelAbs@8
-GetRgnBox@8
-GetStockObject@4
-GetStretchBltMode@4
-GetStringBitmapA@20
-GetStringBitmapW@20
-GetSystemPaletteEntries@16
-GetSystemPaletteUse@4=NtGdiGetSystemPaletteUse@4
-GetTextAlign@4
-GetTextCharacterExtra@4
-GetTextCharset@4
-GetTextCharsetInfo@12=NtGdiGetTextCharsetInfo@12
-GetTextColor@4
-GetTextExtentExPointA@28
-GetTextExtentExPointI@28
-GetTextExtentExPointW@28
-GetTextExtentExPointWPri@28
-GetTextExtentPoint32A@16
-GetTextExtentPoint32W@16
-GetTextExtentPointA@16
-GetTextExtentPointI@16
-GetTextExtentPointW@16
-GetTextFaceA@12
-GetTextFaceAliasW@12
-GetTextFaceW@12
-GetTextMetricsA@8
-GetTextMetricsW@8
-GetTransform@12=NtGdiGetTransform@12
-GetViewportExtEx@8
-GetViewportOrgEx@8
-GetWinMetaFileBits@20
-GetWindowExtEx@8
-GetWindowOrgEx@8
-GetWorldTransform@8
-HT_Get8BPPFormatPalette@16=NtGdiHT_Get8BPPFormatPalette@16
-HT_Get8BPPMaskPalette@24=NtGdiHT_Get8BPPMaskPalette@24
-IntersectClipRect@20
-InvertRgn@8
-IsValidEnhMetaRecord@8
-IsValidEnhMetaRecordOffExt@16
-LPtoDP@12
-LineDDA@24
-LineTo@12
-MaskBlt@48
-MirrorRgn@8
-ModifyWorldTransform@12
-MoveToEx@16
-NamedEscape@28
-OffsetClipRgn@12
-OffsetRgn@12
-OffsetViewportOrgEx@16
-OffsetWindowOrgEx@16
-PATHOBJ_bEnum@8=NtGdiPATHOBJ_bEnum@8
-PATHOBJ_bEnumClipLines@12=NtGdiPATHOBJ_bEnumClipLines@12
-PATHOBJ_vEnumStart@4=NtGdiPATHOBJ_vEnumStart@4
-PATHOBJ_vEnumStartClipLines@16=NtGdiPATHOBJ_vEnumStartClipLines@16
-PATHOBJ_vGetBounds@8=NtGdiPATHOBJ_vGetBounds@8
-PaintRgn@8
-PatBlt@24
-PathToRegion@4
-Pie@36
-PlayEnhMetaFile@12
-PlayEnhMetaFileRecord@16
-PlayMetaFile@8
-PlayMetaFileRecord@16
-PlgBlt@40
-PolyBezier@12
-PolyBezierTo@12
-PolyDraw@16
-PolyPatBlt@20
-PolyPolygon@16
-PolyPolyline@16
-PolyTextOutA@12
-PolyTextOutW@12
-Polygon@12
-Polyline@12
-PolylineTo@12
-PtInRegion@12
-PtVisible@12=NtGdiPtVisible@12
-QueryFontAssocStatus@0
-RealizePalette@4
-RectInRegion@8
-RectVisible@8=NtGdiRectVisible@8
-Rectangle@20
-RemoveFontMemResourceEx@4
-RemoveFontResourceA@4
-RemoveFontResourceExA@12
-RemoveFontResourceExW@12
-RemoveFontResourceTracking@8
-RemoveFontResourceW@4
-ResetDCA@8
-ResetDCW@8
-ResizePalette@8
-RestoreDC@8
-RoundRect@28
-STROBJ_bEnum@12=NtGdiSTROBJ_bEnum@12
-STROBJ_bEnumPositionsOnly@12=NtGdiSTROBJ_bEnumPositionsOnly@12
-STROBJ_bGetAdvanceWidths@16=NtGdiSTROBJ_bGetAdvanceWidths@16
-STROBJ_dwGetCodePage@4=NtGdiSTROBJ_dwGetCodePage@4
-STROBJ_vEnumStart@4=NtGdiSTROBJ_vEnumStart@4
-SaveDC@4
-ScaleViewportExtEx@24
-ScaleWindowExtEx@24
-SelectBrushLocal@8
-SelectClipPath@8
-SelectClipRgn@8
-SelectFontLocal@8
-SelectObject@8
-SelectPalette@12
-SetAbortProc@8
-SetArcDirection@8
-SetBitmapBits@12=NtGdiSetBitmapBits@12
-SetBitmapDimensionEx@16=NtGdiSetBitmapDimension@16
-SetBkColor@8
-SetBkMode@8
-SetBoundsRect@12
-SetBrushOrgEx@16
-SetColorAdjustment@8
-SetColorSpace@8
-SetDCBrushColor@8
-SetDCPenColor@8
-SetDIBColorTable@16
-SetDIBits@28
-SetDIBitsToDevice@48
-SetDeviceGammaRamp@8
-SetEnhMetaFileBits@8
-SetFontEnumeration@4=NtGdiSetFontEnumeration@4
-SetGraphicsMode@8
-SetICMMode@8
-SetICMProfileA@8
-SetICMProfileW@8
-SetLayout@8
-SetLayoutWidth@12
-SetMagicColors@12=NtGdiSetMagicColors@12
-SetMapMode@8
-SetMapperFlags@8
-SetMetaFileBitsEx@8
-SetMetaRgn@4
-SetMiterLimit@12
-SetPaletteEntries@16
-SetPixel@16
-SetPixelFormat@12
-SetPixelV@16
-SetPolyFillMode@8
-SetROP2@8
-SetRectRgn@20
-SetRelAbs@8
-SetStretchBltMode@8
-SetSystemPaletteUse@8=NtGdiSetSystemPaletteUse@8
-SetTextAlign@8
-SetTextCharacterExtra@8
-SetTextColor@8
-SetTextJustification@12
-SetViewportExtEx@16
-SetViewportOrgEx@16
-SetVirtualResolution@20=NtGdiSetVirtualResolution@20
-SetWinMetaFileBits@16
-SetWindowExtEx@16
-SetWindowOrgEx@16
-SetWorldTransform@8
-StartDocA@8
-StartDocW@8
-StartFormPage@4
-StartPage@4
-StretchBlt@44
-StretchDIBits@52
-StrokeAndFillPath@4
-StrokePath@4
-SwapBuffers@4
-TextOutA@20
-TextOutW@20
-TranslateCharsetInfo@12
-UnloadNetworkFonts@4
-UnrealizeObject@4
-UpdateColors@4
-UpdateICMRegKeyA@16
-UpdateICMRegKeyW@16
-WidenPath@4
-XFORMOBJ_bApplyXform@20=NtGdiXFORMOBJ_bApplyXform@20
-XFORMOBJ_iGetXform@8=NtGdiXFORMOBJ_iGetXform@8
-XLATEOBJ_cGetPalette@16=NtGdiXLATEOBJ_cGetPalette@16
-XLATEOBJ_hGetColorTransform@4=NtGdiXLATEOBJ_hGetColorTransform@4
-
-
-
-GetBrushAttributes@4
-GetGlyphIndicesA@20
-GetTextExtentExPointWPri@28
-GetTextExtentPoint32A@16
-SetBitmapAttributes@8
-SetBrushAttributes@8
-XLATEOBJ_iXlate@8
-XLATEOBJ_piVector@4
-bInitSystemAndFontsDirectoriesW@8
-bMakePathNameW@16
-cGetTTFFromFOT@28
-gdiPlaySpoolStream@24

diff --git a/reactos/dll/win32/gdi32/gdi32.rbuild b/reactos/dll/win32/gdi32/gdi32.rbuild
index 6d4062f..1883cc8 100644 (file)
--- a/reactos/dll/win32/gdi32/gdi32.rbuild
+++ b/reactos/dll/win32/gdi32/gdi32.rbuild
@@ -1,5 +1,5 @@
 <module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" allowwarnings="true">
-       <importlibrary definition="gdi32.spec.def" />
+       <importlibrary definition="gdi32.spec" />
        <include base="gdi32">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="WINVER">0x0600</define>

diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild
index eb165bb..fe7281c 100644 (file)
--- a/reactos/dll/win32/gdiplus/gdiplus.rbuild
+++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}" installbase="system32" installname="gdiplus.dll" allowwarnings="true">
-       <importlibrary definition="gdiplus.spec.def" />
+       <importlibrary definition="gdiplus.spec" />
        <include base="gdiplus">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/getuname/getuname.rbuild b/reactos/dll/win32/getuname/getuname.rbuild
index d10a924..a576b6b 100644 (file)
--- a/reactos/dll/win32/getuname/getuname.rbuild
+++ b/reactos/dll/win32/getuname/getuname.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="getuname" type="win32dll" baseaddress="${BASEADDRESS_GETUNAME}" installbase="system32" installname="getuname.dll" unicode="yes">
-       <importlibrary definition="getuname.spec.def" />
+       <importlibrary definition="getuname.spec" />
        <include base="getuname">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="WINVER">0x600</define>

diff --git a/reactos/dll/win32/glu32/glu32.rbuild b/reactos/dll/win32/glu32/glu32.rbuild
index cb2aab1..bb51858 100644 (file)
--- a/reactos/dll/win32/glu32/glu32.rbuild
+++ b/reactos/dll/win32/glu32/glu32.rbuild
@@ -1,5 +1,5 @@
 <module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true">
-       <importlibrary definition="glu32.spec.def" />
+       <importlibrary definition="glu32.spec" />
        <include base="glu32">include</include>
        <include base="glu32">libnurbs/internals</include>
        <include base="glu32">libnurbs/interface</include>

diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
index 53bbdf2..6c7cfc8 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="hhctrl" type="win32ocx" baseaddress="${BASEADDRESS_HHCTRL}" installbase="system32" installname="hhctrl.ocx" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="hhctrl.ocx.spec.def" />
+       <importlibrary definition="hhctrl.ocx.spec" />
        <include base="hhctrl">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="ReactOS" root="intermediate">include/reactos</include>

diff --git a/reactos/dll/win32/hlink/hlink.rbuild b/reactos/dll/win32/hlink/hlink.rbuild
index 531c3ff..b5b5eb8 100644 (file)
--- a/reactos/dll/win32/hlink/hlink.rbuild
+++ b/reactos/dll/win32/hlink/hlink.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="hlink" type="win32dll" baseaddress="${BASEADDRESS_HLINK}" installbase="system32" installname="hlink.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="hlink.spec.def" />
+       <importlibrary definition="hlink.spec" />
        <include base="hlink">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild
index e490e9e..b965ca1 100644 (file)
--- a/reactos/dll/win32/icmp/icmp.rbuild
+++ b/reactos/dll/win32/icmp/icmp.rbuild
@@ -1,5 +1,5 @@
 <module name="icmp" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_ICMP}" installbase="system32" installname="icmp.dll" allowwarnings="true">
-       <importlibrary definition="icmp.spec.def" />
+       <importlibrary definition="icmp.spec" />
        <include base="icmp">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/win32/imagehlp/imagehlp.rbuild b/reactos/dll/win32/imagehlp/imagehlp.rbuild
index c65b8f5..b03f5af 100644 (file)
--- a/reactos/dll/win32/imagehlp/imagehlp.rbuild
+++ b/reactos/dll/win32/imagehlp/imagehlp.rbuild
@@ -1,5 +1,5 @@
 <module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true">
-       <importlibrary definition="imagehlp.spec.def" />
+       <importlibrary definition="imagehlp.spec" />
        <include base="imagehlp">.</include>
        <define name="_WIN32_WINNT">0x600</define>
        <define name="WINVER">0x0600</define>

diff --git a/reactos/dll/win32/imm32/imm32.rbuild b/reactos/dll/win32/imm32/imm32.rbuild
index 9025374..421b1a0 100644 (file)
--- a/reactos/dll/win32/imm32/imm32.rbuild
+++ b/reactos/dll/win32/imm32/imm32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}" installbase="system32" installname="imm32.dll" allowwarnings="true">
-       <importlibrary definition="imm32.spec.def" />
+       <importlibrary definition="imm32.spec" />
        <include base="imm32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/inetcomm/inetcomm.rbuild b/reactos/dll/win32/inetcomm/inetcomm.rbuild
index 428f45b..0bc13f6 100644 (file)
--- a/reactos/dll/win32/inetcomm/inetcomm.rbuild
+++ b/reactos/dll/win32/inetcomm/inetcomm.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="inetcomm" type="win32dll" baseaddress="${BASEADDRESS_INETCOMM}" installbase="system32" installname="inetcomm.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="inetcomm.spec.def" />
+       <importlibrary definition="inetcomm.spec" />
        <include base="inetcomm">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/inetmib1/inetmib1.rbuild b/reactos/dll/win32/inetmib1/inetmib1.rbuild
index ad685b8..0f4fd6a 100644 (file)
--- a/reactos/dll/win32/inetmib1/inetmib1.rbuild
+++ b/reactos/dll/win32/inetmib1/inetmib1.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true">
-       <importlibrary definition="inetmib1.spec.def" />
+       <importlibrary definition="inetmib1.spec" />
        <include base="inetmib1">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
index b93ab59..5acca90 100644 (file)
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@@ -1,5 +1,5 @@
 <module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes">
-       <importlibrary definition="iphlpapi.spec.def" />
+       <importlibrary definition="iphlpapi.spec" />
        <include base="iphlpapi">include</include>
        <include base="ReactOS">include/reactos/wine</include>
        <library>wine</library>

diff --git a/reactos/dll/win32/iphlpapi/resinfo_reactos.c b/reactos/dll/win32/iphlpapi/resinfo_reactos.c
index a4625ef..81ddec8 100644 (file)
--- a/reactos/dll/win32/iphlpapi/resinfo_reactos.c
+++ b/reactos/dll/win32/iphlpapi/resinfo_reactos.c
@@ -124,10 +124,10 @@ static void EnumInterfaces( PVOID Data, EnumInterfacesFunc cb ) {
 void EnumNameServers( HANDLE RegHandle, PWCHAR Interface,
                             PVOID Data, EnumNameServersFunc cb ) {
     PWCHAR NameServerString =
-       QueryRegistryValueString(RegHandle, L"NameServer");
+       QueryRegistryValueString(RegHandle, L"DhcpNameServer");
 
     if (!NameServerString)
-               NameServerString = QueryRegistryValueString(RegHandle, L"DhcpNameServer");
+               NameServerString = QueryRegistryValueString(RegHandle, L"NameServer");
 
     if (NameServerString) {
     /* Now, count the non-empty comma separated */
@@ -181,12 +181,18 @@ VOID CreateNameServerListEnumNamesFunc( PWCHAR Interface,
                                               PWCHAR Server,
                                               PVOID _Data ) {
     PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data;
-    RtlUnicodeToMultiByteN((PCHAR)&Data->AddrString[Data->CurrentName],
-                          sizeof(Data->AddrString[0]),
-                          NULL,
-                          Server,
-                          wcslen(Server));
-    Data->CurrentName++;
+
+    if (WideCharToMultiByte(CP_ACP, 0, Server, -1,
+                          Data->AddrString[Data->CurrentName].String,
+                          16, NULL, NULL))
+       {
+               Data->AddrString[Data->CurrentName].String[15] = '\0';
+               Data->CurrentName++;
+       }
+       else
+       {
+               Data->AddrString[Data->CurrentName].String[0] = '\0';
+       }
 }
 
 static void CreateNameServerListEnumIfFunc( HKEY RegHandle,
@@ -207,43 +213,19 @@ static void MakeNameServerList( PNAME_SERVER_LIST_PRIVATE PrivateData ) {
 }
 
 PIPHLP_RES_INFO getResInfo() {
-    DWORD i, ServerCount, ExtraServer;
-    HKEY hKey;
-    LONG errCode;
-    PWCHAR Str;
-    IP_ADDR_STRING AddrString;
+    DWORD i, ServerCount;
     NAME_SERVER_LIST_PRIVATE PrivateNSEnum = { 0 };
     PIPHLP_RES_INFO ResInfo;
     struct sockaddr_in *AddrList;
 
     ServerCount = CountNameServers( &PrivateNSEnum );
 
-    errCode = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
-                           "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\"
-                           "Parameters", 0, KEY_READ, &hKey);
-    if (errCode != ERROR_SUCCESS) {
-       RegCloseKey( hKey );
-       return NULL;
-    }
-
-    Str = QueryRegistryValueString( hKey, L"NameServer" );
-
-    /* If NameServer is empty */
-    if (!Str || *Str == L'\0')
-    {
-        /* Then use DhcpNameServer */
-        Str = QueryRegistryValueString( hKey, L"DhcpNameServer" );
-    }
-
-    ExtraServer = Str ? 1 : 0;
-
-    ServerCount += ExtraServer;
-
     PrivateNSEnum.NumServers = ServerCount;
     PrivateNSEnum.AddrString =
        (PIP_ADDRESS_STRING)
        RtlAllocateHeap( GetProcessHeap(), 0,
                         ServerCount * sizeof(IP_ADDRESS_STRING) );
+       PrivateNSEnum.CurrentName = 0;
 
     ResInfo =
        (PIPHLP_RES_INFO)RtlAllocateHeap
@@ -253,7 +235,6 @@ PIPHLP_RES_INFO getResInfo() {
 
     if( !ResInfo ) {
        RtlFreeHeap( GetProcessHeap(), 0, PrivateNSEnum.AddrString );
-       RegCloseKey( hKey );
        return NULL;
     }
 
@@ -264,30 +245,15 @@ PIPHLP_RES_INFO getResInfo() {
 
     MakeNameServerList( &PrivateNSEnum );
 
-    if( ExtraServer ) {
-       ULONG ResultSize;
-
-       for( ResultSize = 0; Str[ResultSize]; ResultSize++ )
-           ((PCHAR)&AddrString)[ResultSize] = Str[ResultSize];
-
-       ((PCHAR)&AddrString)[ResultSize] = 0;
-       ResInfo->riAddressList[0].sin_family = AF_INET;
-       ResInfo->riAddressList[0].sin_addr.s_addr =
-           inet_addr( (PCHAR)&AddrString );
-       ResInfo->riAddressList[0].sin_port = 0;
-       ConsumeRegValueString( Str );
-    }
-
-    for( i = ExtraServer; i < ServerCount; i++ ) {
+    for( i = 0; i < PrivateNSEnum.CurrentName; i++ ) {
        /* Hmm seems that dns servers are always AF_INET but ... */
        ResInfo->riAddressList[i].sin_family = AF_INET;
        ResInfo->riAddressList[i].sin_addr.s_addr =
-           inet_addr( (PCHAR)&PrivateNSEnum.AddrString[i - ExtraServer] );
+           inet_addr(PrivateNSEnum.AddrString[i].String );
        ResInfo->riAddressList[i].sin_port = 0;
     }
 
     RtlFreeHeap( GetProcessHeap(), 0, PrivateNSEnum.AddrString );
-    RegCloseKey( hKey );
 
     return ResInfo;
 }

diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild
index b930874..eca0c55 100644 (file)
--- a/reactos/dll/win32/jscript/jscript.rbuild
+++ b/reactos/dll/win32/jscript/jscript.rbuild
@@ -1,7 +1,7 @@
 <group>
 <module name="jscript" type="win32dll" baseaddress="${BASEADDRESS_JSCRIPT}" installbase="system32" installname="jscript.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="jscript.spec.def" />
+       <importlibrary definition="jscript.spec" />
        <include base="jscript">.</include>
        <include base="jscript" root="intermediate">.</include>
        <include base="ReactOS">include/reactos/wine</include>

diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild
index 91452dc..795d91d 100644 (file)
--- a/reactos/dll/win32/kernel32/kernel32.rbuild
+++ b/reactos/dll/win32/kernel32/kernel32.rbuild
@@ -128,7 +128,7 @@
                </directory>
        </module>
        <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll">
-               <importlibrary definition="kernel32.spec.def" />
+               <importlibrary definition="kernel32.spec" />
                <include base="kernel32">.</include>
                <include base="kernel32" root="intermediate">.</include>
                <include base="kernel32">include</include>

diff --git a/reactos/dll/win32/kernel32/mem/section.c b/reactos/dll/win32/kernel32/mem/section.c
index 7829ba1..92e74a4 100644 (file)
--- a/reactos/dll/win32/kernel32/mem/section.c
+++ b/reactos/dll/win32/kernel32/mem/section.c
@@ -158,12 +158,12 @@ MapViewOfFileEx(HANDLE hFileMappingObject,
                 DWORD dwDesiredAccess,
                 DWORD dwFileOffsetHigh,
                 DWORD dwFileOffsetLow,
-                DWORD dwNumberOfBytesToMap,
+                SIZE_T dwNumberOfBytesToMap,
                 LPVOID lpBaseAddress)
 {
     NTSTATUS Status;
     LARGE_INTEGER SectionOffset;
-    ULONG ViewSize;
+    SIZE_T ViewSize;
     ULONG Protect;
     LPVOID ViewBase;
 
@@ -224,7 +224,7 @@ MapViewOfFile(HANDLE hFileMappingObject,
               DWORD dwDesiredAccess,
               DWORD dwFileOffsetHigh,
               DWORD dwFileOffsetLow,
-              DWORD dwNumberOfBytesToMap)
+              SIZE_T dwNumberOfBytesToMap)
 {
     /* Call the extended API */
     return MapViewOfFileEx(hFileMappingObject,

diff --git a/reactos/dll/win32/lpk/lpk.rbuild b/reactos/dll/win32/lpk/lpk.rbuild
index eacdef6..41a294f 100644 (file)
--- a/reactos/dll/win32/lpk/lpk.rbuild
+++ b/reactos/dll/win32/lpk/lpk.rbuild
@@ -1,5 +1,5 @@
 <module name="lpk" type="win32dll" baseaddress="${BASEADDRESS_LPK}" installbase="system32" installname="lpk.dll" unicode="yes">
-       <importlibrary definition="lpk.spec.def" />
+       <importlibrary definition="lpk.spec" />
        <include base="lpk">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="WINVER">0x0600</define>

diff --git a/reactos/dll/win32/lz32/lz32.rbuild b/reactos/dll/win32/lz32/lz32.rbuild
index 4232395..f4fb312 100644 (file)
--- a/reactos/dll/win32/lz32/lz32.rbuild
+++ b/reactos/dll/win32/lz32/lz32.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="lz32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LZ32}" installbase="system32" installname="lz32.dll" allowwarnings="true">
-       <importlibrary definition="lz32.spec.def" />
+       <importlibrary definition="lz32.spec" />
        <include base="lz32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/mapi32/mapi32.rbuild b/reactos/dll/win32/mapi32/mapi32.rbuild
index dc600d6..e24d115 100644 (file)
--- a/reactos/dll/win32/mapi32/mapi32.rbuild
+++ b/reactos/dll/win32/mapi32/mapi32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mapi32" type="win32dll" baseaddress="${BASEADDRESS_MAPI32}" installbase="system32" installname="mapi32.dll" allowwarnings="true">
-       <importlibrary definition="mapi32.spec.def" />
+       <importlibrary definition="mapi32.spec" />
        <include base="mapi32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/mlang/mlang.rbuild b/reactos/dll/win32/mlang/mlang.rbuild
index 46a20c9..cc08327 100644 (file)
--- a/reactos/dll/win32/mlang/mlang.rbuild
+++ b/reactos/dll/win32/mlang/mlang.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="mlang" type="win32dll" baseaddress="${BASEADDRESS_MLANG}" installbase="system32" installname="mlang.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="mlang.spec.def" />
+       <importlibrary definition="mlang.spec" />
        <include base="mlang">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/mmdrv/mmdrv.rbuild b/reactos/dll/win32/mmdrv/mmdrv.rbuild
index f962719..4443071 100644 (file)
--- a/reactos/dll/win32/mmdrv/mmdrv.rbuild
+++ b/reactos/dll/win32/mmdrv/mmdrv.rbuild
@@ -1,5 +1,5 @@
 <module name="mmdrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes">
-       <importlibrary definition="mmdrv.spec.def" />
+       <importlibrary definition="mmdrv.spec" />
        <include base="mmdrv">.</include>
        <define name="NDEBUG" />
        <library>ntdll</library>

diff --git a/reactos/dll/win32/modemui/modemui.rbuild b/reactos/dll/win32/modemui/modemui.rbuild
index afa5a91..c316c0d 100644 (file)
--- a/reactos/dll/win32/modemui/modemui.rbuild
+++ b/reactos/dll/win32/modemui/modemui.rbuild
@@ -1,5 +1,5 @@
 <module name="modemui" type="win32dll" baseaddress="${BASEADDRESS_MODEMUI}" installbase="system32" installname="modemui.dll" unicode="true">
-       <importlibrary definition="modemui.spec.def" />
+       <importlibrary definition="modemui.spec" />
        <include base="modemui">.</include>
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x0500</define>

diff --git a/reactos/dll/win32/mpr/mpr.rbuild b/reactos/dll/win32/mpr/mpr.rbuild
index 8df5fd1..cc17d60 100644 (file)
--- a/reactos/dll/win32/mpr/mpr.rbuild
+++ b/reactos/dll/win32/mpr/mpr.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true">
-       <importlibrary definition="mpr.spec.def" />
+       <importlibrary definition="mpr.spec" />
        <include base="mpr">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/mprapi/mprapi.rbuild b/reactos/dll/win32/mprapi/mprapi.rbuild
index 542f8af..0044f10 100644 (file)
--- a/reactos/dll/win32/mprapi/mprapi.rbuild
+++ b/reactos/dll/win32/mprapi/mprapi.rbuild
@@ -1,5 +1,5 @@
 <module name="mprapi" type="win32dll" baseaddress="${BASEADDRESS_MPRAPI}" installbase="system32" installname="mprapi.dll">
-       <importlibrary definition="mprapi.spec.def" />
+       <importlibrary definition="mprapi.spec" />
        <include base="mprapi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild
index 9d83ecf..337a99b 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm32.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.rbuild
@@ -1,5 +1,5 @@
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
-       <importlibrary definition="msacm32.spec.def" />
+       <importlibrary definition="msacm32.spec" />
        <include base="msacm32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_WIN32_IE">0x600</define>

diff --git a/reactos/dll/win32/mscoree/mscoree.rbuild b/reactos/dll/win32/mscoree/mscoree.rbuild
index 7c80527..76726a3 100644 (file)
--- a/reactos/dll/win32/mscoree/mscoree.rbuild
+++ b/reactos/dll/win32/mscoree/mscoree.rbuild
@@ -1,5 +1,5 @@
 <module name="mscoree" type="win32dll" baseaddress="${BASEADDRESS_MSCOREE}" installbase="system32" installname="mscoree.dll">
-       <importlibrary definition="mscoree.spec.def" />
+       <importlibrary definition="mscoree.spec" />
        <include base="mscoree">.</include>
        <library>wine</library>
        <library>kernel32</library>

diff --git a/reactos/dll/win32/msgina/msgina.rbuild b/reactos/dll/win32/msgina/msgina.rbuild
index d000673..951dc1c 100644 (file)
--- a/reactos/dll/win32/msgina/msgina.rbuild
+++ b/reactos/dll/win32/msgina/msgina.rbuild
@@ -1,5 +1,5 @@
 <module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}" installbase="system32" installname="msgina.dll">
-       <importlibrary definition="msgina.spec.def" />
+       <importlibrary definition="msgina.spec" />
        <include base="msgina">.</include>
        <include base="msgina">include</include>
        <library>ntdll</library>

diff --git a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
index 2f47662..a4ff711 100644 (file)
--- a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
+++ b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
@@ -4,7 +4,7 @@
        <file>mshtml_tlb.idl</file>
 </module>
 <module name="mshtml.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="mshtml.tlb" entrypoint="0">
-       <importlibrary definition="mshtml.tlb.spec.def" />
+       <importlibrary definition="mshtml.tlb.spec" />
        <include base="mshtml.tlb" root="intermediate">.</include>
        <dependency>mshtml_tlb</dependency>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/mshtml/mshtml.rbuild b/reactos/dll/win32/mshtml/mshtml.rbuild
index 5db3ddd..5bff1fc 100644 (file)
--- a/reactos/dll/win32/mshtml/mshtml.rbuild
+++ b/reactos/dll/win32/mshtml/mshtml.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="mshtml" type="win32dll" baseaddress="${BASEADDRESS_MSHTML}" installbase="system32" installname="mshtml.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="Both" />
-       <importlibrary definition="mshtml.spec.def" />
+       <importlibrary definition="mshtml.spec" />
        <include base="mshtml">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/msi/msi.rbuild b/reactos/dll/win32/msi/msi.rbuild
index c2c37e7..99d5573 100644 (file)
--- a/reactos/dll/win32/msi/msi.rbuild
+++ b/reactos/dll/win32/msi/msi.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="msi.spec.def" />
+       <importlibrary definition="msi.spec" />
        <include base="msi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/msimg32/msimg32.rbuild b/reactos/dll/win32/msimg32/msimg32.rbuild
index 117fccb..c8f9a09 100644 (file)
--- a/reactos/dll/win32/msimg32/msimg32.rbuild
+++ b/reactos/dll/win32/msimg32/msimg32.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll" allowwarnings="true">
-       <importlibrary definition="msimg32.spec.def" />
+       <importlibrary definition="msimg32.spec" />
        <include base="msimg32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/mstask/mstask.rbuild b/reactos/dll/win32/mstask/mstask.rbuild
index ea4d1f6..0284375 100644 (file)
--- a/reactos/dll/win32/mstask/mstask.rbuild
+++ b/reactos/dll/win32/mstask/mstask.rbuild
@@ -3,7 +3,7 @@
 <group>
 <module name="mstask" type="win32dll" baseaddress="${BASEADDRESS_MSTASK}" installbase="system32" installname="mstask.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="mstask.spec.def" />
+       <importlibrary definition="mstask.spec" />
        <include base="mstask">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
index 42a0f5b..bea1915 100644 (file)
--- a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
+++ b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvcrt20" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT20}" installbase="system32" installname="msvcrt20.dll" allowwarnings="true" entrypoint="0">
-       <importlibrary definition="msvcrt20.spec.def" />
+       <importlibrary definition="msvcrt20.spec" />
        <include base="msvcrt20">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
index 1771c77..e3516be 100644 (file)
--- a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
+++ b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvcrt40" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT40}" installbase="system32" installname="msvcrt40.dll">
-       <importlibrary definition="msvcrt40.spec.def" />
+       <importlibrary definition="msvcrt40.spec" />
        <include base="msvcrt40">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/msvfw32/msvfw32.rbuild b/reactos/dll/win32/msvfw32/msvfw32.rbuild
index d1e3f50..5cf4f89 100644 (file)
--- a/reactos/dll/win32/msvfw32/msvfw32.rbuild
+++ b/reactos/dll/win32/msvfw32/msvfw32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll" allowwarnings="true">
-       <importlibrary definition="msvfw32.spec.def" />
+       <importlibrary definition="msvfw32.spec" />
        <include base="msvfw32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/msxml3/msxml3.rbuild b/reactos/dll/win32/msxml3/msxml3.rbuild
index ce4fd47..e61d94b 100644 (file)
--- a/reactos/dll/win32/msxml3/msxml3.rbuild
+++ b/reactos/dll/win32/msxml3/msxml3.rbuild
@@ -1,7 +1,7 @@
 <group>
 <module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
-       <importlibrary definition="msxml3.spec.def" />
+       <importlibrary definition="msxml3.spec" />
        <include base="msxml3">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="msxml3" root="intermediate">.</include>

diff --git a/reactos/dll/win32/nddeapi/nddeapi.rbuild b/reactos/dll/win32/nddeapi/nddeapi.rbuild
index 8700ed6..80aacc2 100644 (file)
--- a/reactos/dll/win32/nddeapi/nddeapi.rbuild
+++ b/reactos/dll/win32/nddeapi/nddeapi.rbuild
@@ -1,5 +1,5 @@
 <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="nddeapi.spec.def" />
+        <importlibrary definition="nddeapi.spec" />
         <include base="nddeapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
         <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/netapi32/netapi32.rbuild b/reactos/dll/win32/netapi32/netapi32.rbuild
index 9c2ef41..dd6e1f8 100644 (file)
--- a/reactos/dll/win32/netapi32/netapi32.rbuild
+++ b/reactos/dll/win32/netapi32/netapi32.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true">
-       <importlibrary definition="netapi32.spec.def" />
+       <importlibrary definition="netapi32.spec" />
        <include base="netapi32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />

diff --git a/reactos/dll/win32/netcfgx/lang/pl-PL.rc b/reactos/dll/win32/netcfgx/lang/pl-PL.rc
index 9040297..c01995a 100644 (file)
--- a/reactos/dll/win32/netcfgx/lang/pl-PL.rc
+++ b/reactos/dll/win32/netcfgx/lang/pl-PL.rc
@@ -48,22 +48,22 @@ END
 
 IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE  0, 0, 247, 247
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "IP Settings"
+CAPTION "Ustawienia protoko³u IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "IP addressen", -1, 5, 5, 240, 90
+    GROUPBOX "Adresy IP", -1, 5, 5, 240, 90
     CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55
-    PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
-    GROUPBOX "Default gateways:", -1, 5, 100, 240, 90
+    PUSHBUTTON "Dodaj...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edytuj...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Usuñ", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP
+    GROUPBOX "Domy\9clne bramy:", -1, 5, 100, 240, 90
     CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55
-    PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Dodaj...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Edytuj...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Usuñ", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 5, 200, 240, 30
-    CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "Interface metric:", -1, 15, 215, 90, 12
+    CHECKBOX "Metryka automatyczna", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "Metryka interfejsu:", -1, 15, 215, 90, 12
     EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER
 END
 
@@ -73,157 +73,157 @@ CAPTION "DNS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY
-    LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12
-    PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP
-    LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24
-    CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12
-    CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12
+    LTEXT "Adresy serwerów D&NS wed³ug kolejno\9cci u¿ywania:", -1, 5, 5, 180, 12
+    PUSHBUTTON "W górê", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP
+    PUSHBUTTON "W dó³", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Dodaj...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Edytuj...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP
+    PUSHBUTTON "&Usuñ", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP
+    LTEXT "Trzy poni¿sze ustawienia dotycz¹ wszystkich po³¹czeñ o w³¹czonym protokole TCP/IP. W celu rozpoznawania nazw niekwalifikowanych:", -1, 5, 90, 220, 24
+    CONTROL "D&o³¹cz sufiksy DNS: podstawowy i konkretnego po³¹czenia", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12
+    CHECKBOX "Do³¹cz su&fiksy nadrzêdne podstawowego sufiksu DNS", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CONTROL "Do³¹&cz poni¿sze sufiksy DNS (w podanej kolejno\9cci):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12
     LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY
-    PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP
-    PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP
-    LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14
+    PUSHBUTTON "W górê", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP
+    PUSHBUTTON "W dó³", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Dod&aj...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Ed&ytuj...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP
+    PUSHBUTTON "U&suñ", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP
+    LTEXT "Sufiks DNS dla &tego po³¹czenia:", -1, 5, 225, 110, 14
     EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP
-    CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "&Zarejestruj adresy tego po³¹czenia w DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "U¿y&j sufiksu DNS tego po³¹czenia do rejestracji w DNS", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 
 END
 
 IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE  0, 0, 247, 247
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
-CAPTION "Options"
+CAPTION "Opcje"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX IDC_OPTLIST, 5, 30, 230, 70
-    LTEXT "&Optional settings", -1, 5, 15, 130, 12
-    PUSHBUTTON "&Properties", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP
-    GROUPBOX "Description:", -1, 5, 120, 240, 70
+    LTEXT "&Ustawienia opcjonalne", -1, 5, 15, 130, 12
+    PUSHBUTTON "&W³a\9cciwo\9cci", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP
+    GROUPBOX "Opis:", -1, 5, 120, 240, 70
     LTEXT "", IDC_OPTDESC, 15, 130, 220, 33
 END
 
 IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE  0, 0, 200, 70
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Address"
+CAPTION "Adres TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12
-    LTEXT "IP address:", -1, 5, 15, 70, 12
-    LTEXT "Subnet mask:", -1, 5, 30, 70, 12
+    LTEXT "Adres IP:", -1, 5, 15, 70, 12
+    LTEXT "Maska podsieci:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
 IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE  0, 0, 200, 80
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Gateway Address"
+CAPTION "Adres bramy TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12
-    LTEXT "Gateway:", -1, 5, 15, 70, 12
-    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
+    LTEXT "Brama:", -1, 5, 15, 70, 12
+    CHECKBOX "Metryka automatyczna", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    LTEXT "&Metryka:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
     PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anuluj", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
 IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE  0, 0, 200, 80
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP DNS Server"
+CAPTION "Serwer DNS TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
-    LTEXT "DNS server:", -1, 5, 10, 120, 12
+    LTEXT "Serwer DNS:", -1, 5, 10, 120, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
 IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE  0, 0, 200, 80
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Domain Suffix"
+CAPTION "Sufiks domeny TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
-    LTEXT "Domain suffix:", -1, 5, 10, 120, 12
+    LTEXT "Sufiks domeny:", -1, 5, 10, 120, 12
     PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
 IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE  0, 0, 305, 220
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TCP/IP Filtering"
+CAPTION "Filtrowanie TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX "W³¹cz filtrowanie TCP/IP (wszystkie karty)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     GROUPBOX "", -1, 5, 30, 90, 150
-    CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
-    CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
+    CONTROL "Pozwalaj wszystkim", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12
+    CONTROL "Pozwalaj tylko", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12
     CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75
-    PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Dodaj", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Usuñ", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 105, 30, 90, 150
-    CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
-    CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
+    CONTROL "Pozwalaj wszystkim", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12
+    CONTROL "Pozwalaj tylko", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12
     CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75
-    PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Dodaj", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Usuñ", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP
     GROUPBOX "", -1, 205, 30, 90, 150
-    CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
-    CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
+    CONTROL "Pozwalaj wszystkim", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12
+    CONTROL "Pozwalaj tylko", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75
-    PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Dodaj", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Usuñ", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
     PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anuluj", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
 IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE  0, 0, 200, 60
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Filter"
+CAPTION "Dodaj filtr"
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
     PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
+    PUSHBUTTON "Anuluj", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 
 STRINGTABLE
 BEGIN
        IDS_NET_CONNECT "Po³¹czenie sieciowe"
-       IDS_NO_IPADDR_SET   "The adapter requires at least one IP address. Please enter one."
-       IDS_NO_SUBMASK_SET  "You have entered an address that is missing its subnet mask. Please add a subnet mask."
-       IDS_TCPFILTERDESC   "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer."
-       IDS_TCPFILTER       "TCP/IP Filtering"
-       IDS_IPADDR          "IP address"
-       IDS_SUBMASK         "Subnet mask"
-       IDS_GATEWAY         "Gateway"
-       IDS_METRIC          "Metric"
-       IDS_DHCPACTIVE      "DHCP Enabled"
-       IDS_AUTOMATIC       "Automatic"
-       IDS_NOITEMSEL       "You have not selected an item. Select one first."
+       IDS_NO_IPADDR_SET   "Ta karta wymaga co najmniej jednego adresu IP. Wprowad\9f adres IP."
+       IDS_NO_SUBMASK_SET  "Wprowadzono adres, w którym brakuje maski podsieci. Wprowad\9f maskê podsieci."
+       IDS_TCPFILTERDESC   "Filtrowanie pakietów TCP/IP pozwala na kontrolowanie w sieci tego typu ruchu TCP/IP, który dociera do danego komputera."
+       IDS_TCPFILTER       "Filtrowanie protoko³u TCP/IP"
+       IDS_IPADDR          "Adres IP"
+       IDS_SUBMASK         "Maska podsieci"
+       IDS_GATEWAY         "Brama"
+       IDS_METRIC          "Metryka"
+       IDS_DHCPACTIVE      "DHCP w³¹czone"
+       IDS_AUTOMATIC       "Automatyczna"
+       IDS_NOITEMSEL       "Nie wybrano ¿adnego elementu. Najpierw wybierz element."
        IDS_TCPIP           "ReactOS-TCP/IP"
-       IDS_ADD             "Add"
+       IDS_ADD             "Dodaj"
        IDS_MOD             "OK"
-       IDS_TCP_PORTS       "TCP Ports"
-       IDS_UDP_PORTS       "UDP Ports"
-       IDS_IP_PROTO        "IP protocols"
-       IDS_PORT_RANGE      "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range."
-       IDS_PROT_RANGE      "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range."
-       IDS_DUP_NUMBER      "The number you are trying to add is already in the list. Please enter a different number."
-       IDS_DISABLE_FILTER  "Disabling this global TCP/IP setting will affect all adapters."
-       IDS_NO_SUFFIX       "The current setting of search method requires at least one DNS suffix. Please enter one or change the setting."
-       IDS_DOMAIN_SUFFIX   "Domain suffix is not a valid suffix."
-       IDS_DNS_SUFFIX      "The DNS domain name ""%s"" is not a valid DNS name."
-       IDS_DUP_SUFFIX      "The DNS suffix is already on the list."
-       IDS_DUP_IPADDR      "The IP address is already on the list."
-       IDS_DUP_GW          "The default gateway is already on the list."
+       IDS_TCP_PORTS       "Porty TCP"
+       IDS_UDP_PORTS       "Porty UDP"
+       IDS_IP_PROTO        "Protoko³y IP"
+       IDS_PORT_RANGE      "Numery portów musz¹ byæ wiêksze od 0 i mniejsze od 65536. Wprowad\9f liczbê z tego zakresu."
+       IDS_PROT_RANGE      "Numery protoko³ów musz¹ byæ wiêksze od 0 i mniejsze od 256. Wprowad\9f liczbê z tego zakresu."
+       IDS_DUP_NUMBER      "Podana liczba znajduje siê ju¿ na li\9ccie. Wprowad\9f inn¹ liczbê."
+       IDS_DISABLE_FILTER  "Wy³¹czenie tego globalnego ustawienia protoko³u TCP/IP bêdzie mia³o wp³yw na wszystkie karty."
+       IDS_NO_SUFFIX       "Aktualne ustawienie przeszukiwania wymaga podania przynajmniej jednego sufiksu DNS. Wprowad\9f sufiks DNS lub zmieñ ustawienia."
+       IDS_DOMAIN_SUFFIX   "Podany sufiks domeny jest nieprawid³owy."
+       IDS_DNS_SUFFIX      "Nazwa domeny DNS ""%s"" jest nieprawid³owa."
+       IDS_DUP_SUFFIX      "Sufiks DNS znajduje siê ju¿ na li\9ccie."
+       IDS_DUP_IPADDR      "Adres IP znajduje siê ju¿ na li\9ccie."
+       IDS_DUP_GW          "Domy\9clna brama znajduje siê ju¿ na li\9ccie."
 END

diff --git a/reactos/dll/win32/netcfgx/netcfgx.rbuild b/reactos/dll/win32/netcfgx/netcfgx.rbuild
index 8c6e0e3..c6d7998 100644 (file)
--- a/reactos/dll/win32/netcfgx/netcfgx.rbuild
+++ b/reactos/dll/win32/netcfgx/netcfgx.rbuild
@@ -1,5 +1,5 @@
 <module name="netcfgx" type="win32dll" baseaddress="${BASEADDRESS_NETCFGX}" installbase="system32" installname="netcfgx.dll">
-       <importlibrary definition="netcfgx.spec.def" />
+       <importlibrary definition="netcfgx.spec" />
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
        <library>ntdll</library>
        <library>rpcrt4</library>

diff --git a/reactos/dll/win32/netcfgx/tcpipconf_notify.c b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
index ad10890..270f432 100644 (file)
--- a/reactos/dll/win32/netcfgx/tcpipconf_notify.c
+++ b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
@@ -3194,6 +3194,7 @@ INetCfgComponentControl_fnApplyRegistryChanges(
             if(pStr)
             {
                 RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)pStr, dwSize);
+                RegDeleteValueW(hKey, L"DhcpNameServer");
                 CoTaskMemFree(pStr);
             }
         }

diff --git a/reactos/dll/win32/netid/netid.rbuild b/reactos/dll/win32/netid/netid.rbuild
index 0bab404..021663c 100644 (file)
--- a/reactos/dll/win32/netid/netid.rbuild
+++ b/reactos/dll/win32/netid/netid.rbuild
@@ -1,5 +1,5 @@
 <module name="netid" type="win32dll" baseaddress="${BASEADDRESS_NETID}" installbase="system32" installname="netid.dll" unicode="true">
-       <importlibrary definition="netid.spec.def" />
+       <importlibrary definition="netid.spec" />
        <include base="netid">.</include>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>

diff --git a/reactos/dll/win32/netshell/lang/bg-BG.rc b/reactos/dll/win32/netshell/lang/bg-BG.rc
index 45beb54..990a2ae 100644 (file)
--- a/reactos/dll/win32/netshell/lang/bg-BG.rc
+++ b/reactos/dll/win32/netshell/lang/bg-BG.rc
@@ -19,7 +19,7 @@ BEGIN
  CHECKBOX "Óâåäîìÿâàíå ïðè îãðàíè÷åíà èëè ëèïñâàùà ñâúðçàíîñò", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 END
 
-IDD_NETSTATUS DIALOGEX DISCARDABLE  0, 0, 200,180
+IDD_STATUS DIALOGEX DISCARDABLE  0, 0, 200,180
 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
 CAPTION "Îáùè"
 FONT 8, "MS Shell Dlg"
@@ -68,9 +68,29 @@ BEGIN
  PUSHBUTTON "&Ïîäðîáíîñòè...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Ìðåæîâî ñâúðçâàíå"
        IDS_SHV_COLUMN_NAME         "Èìå"
        IDS_SHV_COLUMN_TYPE         "Âèä"

diff --git a/reactos/dll/win32/netshell/lang/cs-CZ.rc b/reactos/dll/win32/netshell/lang/cs-CZ.rc
index b3ecf07..1ee4842 100644 (file)
--- a/reactos/dll/win32/netshell/lang/cs-CZ.rc
+++ b/reactos/dll/win32/netshell/lang/cs-CZ.rc
@@ -67,8 +67,29 @@ BEGIN
  PUSHBUTTON "&Detaily...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Network Connection"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Type"

diff --git a/reactos/dll/win32/netshell/lang/da-DK.rc b/reactos/dll/win32/netshell/lang/da-DK.rc
index 657918b..2cf64a4 100644 (file)
--- a/reactos/dll/win32/netshell/lang/da-DK.rc
+++ b/reactos/dll/win32/netshell/lang/da-DK.rc
@@ -67,8 +67,29 @@ BEGIN
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Network Connection"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Type"

diff --git a/reactos/dll/win32/netshell/lang/de-DE.rc b/reactos/dll/win32/netshell/lang/de-DE.rc
index bc466e3..4d1fd05 100644 (file)
--- a/reactos/dll/win32/netshell/lang/de-DE.rc
+++ b/reactos/dll/win32/netshell/lang/de-DE.rc
@@ -68,9 +68,29 @@ BEGIN
        PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Netzwerkverbindungen"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Typ"

diff --git a/reactos/dll/win32/netshell/lang/el-GR.rc b/reactos/dll/win32/netshell/lang/el-GR.rc
index 8dd4faf..a5d731b 100644 (file)
--- a/reactos/dll/win32/netshell/lang/el-GR.rc
+++ b/reactos/dll/win32/netshell/lang/el-GR.rc
@@ -67,8 +67,29 @@ BEGIN
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Network Connection"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Type"

diff --git a/reactos/dll/win32/netshell/lang/en-US.rc b/reactos/dll/win32/netshell/lang/en-US.rc
index 73b3b2f..b9e369e 100644 (file)
--- a/reactos/dll/win32/netshell/lang/en-US.rc
+++ b/reactos/dll/win32/netshell/lang/en-US.rc
@@ -68,9 +68,29 @@ BEGIN
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Network Connection"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Type"

diff --git a/reactos/dll/win32/netshell/lang/es-ES.rc b/reactos/dll/win32/netshell/lang/es-ES.rc
index ace64aa..63af8a0 100644 (file)
--- a/reactos/dll/win32/netshell/lang/es-ES.rc
+++ b/reactos/dll/win32/netshell/lang/es-ES.rc
@@ -62,9 +62,29 @@ BEGIN
  PUSHBUTTON "&Detalles...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Conexiones de red"
        IDS_SHV_COLUMN_NAME         "Nombre"
        IDS_SHV_COLUMN_TYPE         "Tipo"

diff --git a/reactos/dll/win32/netshell/lang/fr-FR.rc b/reactos/dll/win32/netshell/lang/fr-FR.rc
index 663ae61..ddfda85 100644 (file)
--- a/reactos/dll/win32/netshell/lang/fr-FR.rc
+++ b/reactos/dll/win32/netshell/lang/fr-FR.rc
@@ -67,8 +67,29 @@ BEGIN
  PUSHBUTTON "&Détails...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Network Connection"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Type"

diff --git a/reactos/dll/win32/netshell/lang/hu-HU.rc b/reactos/dll/win32/netshell/lang/hu-HU.rc
index 8b22836..e464344 100644 (file)
--- a/reactos/dll/win32/netshell/lang/hu-HU.rc
+++ b/reactos/dll/win32/netshell/lang/hu-HU.rc
@@ -68,8 +68,29 @@ BEGIN
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Network Connection"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Type"

diff --git a/reactos/dll/win32/netshell/lang/id-ID.rc b/reactos/dll/win32/netshell/lang/id-ID.rc
index 973dbe7..e555ac7 100644 (file)
--- a/reactos/dll/win32/netshell/lang/id-ID.rc
+++ b/reactos/dll/win32/netshell/lang/id-ID.rc
@@ -67,8 +67,29 @@ BEGIN
  PUSHBUTTON "&Detil...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Network Connection"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Type"

diff --git a/reactos/dll/win32/netshell/lang/it-IT.rc b/reactos/dll/win32/netshell/lang/it-IT.rc
index 131d1be..7dce9bf 100644 (file)
--- a/reactos/dll/win32/netshell/lang/it-IT.rc
+++ b/reactos/dll/win32/netshell/lang/it-IT.rc
@@ -72,9 +72,29 @@ BEGIN
  PUSHBUTTON "&Dettagli...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Connessione di rete"
        IDS_SHV_COLUMN_NAME         "Nome"
        IDS_SHV_COLUMN_TYPE         "Tipo"

diff --git a/reactos/dll/win32/netshell/lang/ja-JP.rc b/reactos/dll/win32/netshell/lang/ja-JP.rc
index fb2a60f..41586c8 100644 (file)
--- a/reactos/dll/win32/netshell/lang/ja-JP.rc
+++ b/reactos/dll/win32/netshell/lang/ja-JP.rc
@@ -67,8 +67,29 @@ BEGIN
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"
        IDS_NETWORKCONNECTION       "Network Connection"
        IDS_SHV_COLUMN_NAME         "Name"
        IDS_SHV_COLUMN_TYPE         "Type"

diff --git a/reactos/dll/win32/netshell/lang/nl-NL.rc b/reactos/dll/win32/netshell/lang/nl-NL.rc
index c4880bd..e96a830 100644 (file)
--- a/reactos/dll/win32/netshell/lang/nl-NL.rc
+++ b/reactos/dll/win32/netshell/lang/nl-NL.rc
@@ -67,8 +67,29 @@ BEGIN
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
 
+IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE  0, 0, 200,200
+STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Network Connection Details"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12
+ CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130
+ PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
+       IDS_PHYSICAL_ADDRESS        "Physical Address"
+       IDS_IP_ADDRESS              "IP Address"
+       IDS_SUBNET_MASK             "Subnet Mask"
+       IDS_DEF_GATEWAY             "Default Gateway"
+       IDS_DHCP_SERVER             "DHCP Server"
+       IDS_LEASE_OBTAINED          "Lease Obtained"
+       IDS_LEASE_EXPIRES           "Lease Expires"
+       IDS_DNS_SERVERS             "DNS Servers"
+       IDS_WINS_SERVERS            "WINS Servers"
+       IDS_PROPERTY                "Property"
+       IDS_VALUE                   "Value"