- Merge the remaining portion of the wlan-bringup branch

- ReactOS now supports open and WEP encrypted networks (both ad-hoc and infrastructure) (WPA(2) will be supported later)
- Use the wlanconf tool to configure the WLAN adapter (after installing the XP driver for your WLAN adapter)
- "wlanconf -c <SSID>" connects to an infrastructure network. Adding the "-a" option connects to (or creates) an ad-hoc network. Adding "-w <WEP>" will enable WEP encryption using the supplied key.
- "wlanconf -s" will scan and display a list of the surrounding networks and various attributes like signal strength, SSID, BSSID, network mode, and supported rates
- "wlanconf" will display the current WLAN configuration details if the adapter is connected
- The DHCP service will detect network changes and refresh its state accordingly when associating with a new wireless network

svn path=/trunk/; revision=55000

diff --cc reactos/base/applications/network/CMakeLists.txt
Simple merge

diff --cc reactos/base/applications/network/network.rbuild
Simple merge

diff --cc reactos/base/applications/network/wlanconf/CMakeLists.txt
index 0000000,35938d4..35938d4
mode 000000,100644..100644
--- /dev/null
--- 2/base/applications/network/wlanconf/CMakeLists.txt
+++ b/reactos/base/applications/network/wlanconf/CMakeLists.txt

diff --cc reactos/base/applications/network/wlanconf/wlanconf.c
index 0000000,15e351d..15e351d
mode 000000,100644..100644
--- /dev/null
--- 2/base/applications/network/wlanconf/wlanconf.c
+++ b/reactos/base/applications/network/wlanconf/wlanconf.c

diff --cc reactos/base/applications/network/wlanconf/wlanconf.rbuild
index 0000000,9658c28..9658c28
mode 000000,100644..100644
--- /dev/null
--- 2/base/applications/network/wlanconf/wlanconf.rbuild
+++ b/reactos/base/applications/network/wlanconf/wlanconf.rbuild

diff --cc reactos/base/applications/network/wlanconf/wlanconf.rc
index 0000000,78b2584..78b2584
mode 000000,100644..100644
--- /dev/null
--- 2/base/applications/network/wlanconf/wlanconf.rc
+++ b/reactos/base/applications/network/wlanconf/wlanconf.rc

diff --cc reactos/boot/bootdata/hivesys_i386.inf
Simple merge

diff --cc reactos/boot/bootdata/packages/reactos.dff
Simple merge

diff --cc reactos/drivers/network/CMakeLists.txt
Simple merge

diff --cc reactos/drivers/network/directory.rbuild
Simple merge

diff --cc reactos/drivers/network/ndisuio/CMakeLists.txt
index 0000000,3ab2f93..3ab2f93
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/CMakeLists.txt
+++ b/reactos/drivers/network/ndisuio/CMakeLists.txt

diff --cc reactos/drivers/network/ndisuio/createclose.c
index 0000000,d0fe7af..d0fe7af
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/createclose.c
+++ b/reactos/drivers/network/ndisuio/createclose.c

diff --cc reactos/drivers/network/ndisuio/ioctl.c
index 0000000,74070d6..74070d6
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/ioctl.c
+++ b/reactos/drivers/network/ndisuio/ioctl.c

diff --cc reactos/drivers/network/ndisuio/main.c
index 0000000,0756777..0756777
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/main.c
+++ b/reactos/drivers/network/ndisuio/main.c

diff --cc reactos/drivers/network/ndisuio/misc.c
index 0000000,43552cb..43552cb
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/misc.c
+++ b/reactos/drivers/network/ndisuio/misc.c

diff --cc reactos/drivers/network/ndisuio/ndisuio.h
index 0000000,13f6d91..13f6d91
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/ndisuio.h
+++ b/reactos/drivers/network/ndisuio/ndisuio.h

diff --cc reactos/drivers/network/ndisuio/ndisuio.rbuild
index 0000000,1ba528e..1ba528e
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/ndisuio.rbuild
+++ b/reactos/drivers/network/ndisuio/ndisuio.rbuild

diff --cc reactos/drivers/network/ndisuio/ndisuio.rc
index 0000000,bf0e8f4..bf0e8f4
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/ndisuio.rc
+++ b/reactos/drivers/network/ndisuio/ndisuio.rc

diff --cc reactos/drivers/network/ndisuio/protocol.c
index 0000000,4b8fe31..4b8fe31
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/protocol.c
+++ b/reactos/drivers/network/ndisuio/protocol.c

diff --cc reactos/drivers/network/ndisuio/readwrite.c
index 0000000,ceae632..ceae632
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/network/ndisuio/readwrite.c
+++ b/reactos/drivers/network/ndisuio/readwrite.c

diff --cc reactos/include/psdk/ntddndis.h
Simple merge

diff --cc reactos/include/reactos/drivers/ndisuio/nuiouser.h
index 0000000,36c1a9b..36c1a9b
mode 000000,100755..100755
--- /dev/null
--- 2/include/reactos/drivers/ndisuio/nuiouser.h
+++ b/reactos/include/reactos/drivers/ndisuio/nuiouser.h