Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54872: [WLANCONF] - Fix a typo and fix CMake build
by cgutman＠svn.reactos.org 08 Jan '12

08 Jan '12

Author: cgutman Date: Sun Jan 8 03:28:03 2012 New Revision: 54872 URL: http://svn.reactos.org/svn/reactos?rev=54872&view=rev Log: [WLANCONF] - Fix a typo and fix CMake build Modified: branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c Modified: branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Sun Jan 8 03:28:03 2012 @@ -4,5 +4,5 @@ ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) add_executable(wlanconf wlanconf.c wlanconf.rc) set_module_type(wlanconf win32cui) -add_importlibs(wlanconf kernel32) +add_importlibs(wlanconf msvcrt kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Jan 8 03:28:03 2012 @@ -55,7 +55,7 @@ DWORD dwBytesReturned; BOOL bSuccess; - /* Open a handle to this NDISUIO driver */ + /* Open a handle to the NDISUIO driver */ hDriver = CreateFileW(NDISUIO_DEVICE_NAME, GENERIC_READ | GENERIC_WRITE, 0,

1 0

[cgutman] 54871: [WLANCONF] - Build fixes and code improvements
by cgutman＠svn.reactos.org 08 Jan '12

08 Jan '12

Author: cgutman Date: Sun Jan 8 03:22:37 2012 New Revision: 54871 URL: http://svn.reactos.org/svn/reactos?rev=54871&view=rev Log: [WLANCONF] - Build fixes and code improvements Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Jan 8 03:22:37 2012 @@ -218,7 +218,7 @@ return FALSE; SetOid->Oid = OID_802_11_SSID; - Ssid = SetOid->Data; + Ssid = (PNDIS_802_11_SSID)SetOid->Data; /* Fill the OID data buffer */ RtlCopyMemory(Ssid->Ssid, sSsid, strlen(sSsid)); @@ -246,7 +246,7 @@ NDISUIO_SET_OID SetOid; PNDISUIO_QUERY_OID QueryOid; DWORD QueryOidSize; - PNDIS_802_11_BSSID_LIST_EX BssidList; + PNDIS_802_11_BSSID_LIST BssidList; DWORD i, j; SetOid.Oid = OID_802_11_BSSID_LIST_SCAN; @@ -264,13 +264,13 @@ return FALSE; /* Allocate space for 15 networks to be returned */ - QueryOidSize = sizeof(NDISUIO_QUERY_OID) + (sizeof(NDIS_WLAN_BSSID_EX) * 15); + QueryOidSize = sizeof(NDISUIO_QUERY_OID) + (sizeof(NDIS_WLAN_BSSID) * 15); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); if (!QueryOid) return FALSE; QueryOid->Oid = OID_802_11_BSSID_LIST; - BssidList = QueryOid->Data; + BssidList = (PNDIS_802_11_BSSID_LIST)QueryOid->Data; bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, @@ -294,12 +294,11 @@ { for (i = 0; i < BssidList->NumberOfItems; i++) { - PNDIS_WLAN_BSSID_EX BssidInfo = BssidList->Bssid[i]; + PNDIS_WLAN_BSSID BssidInfo = &BssidList->Bssid[i]; PNDIS_802_11_SSID Ssid = &BssidInfo->Ssid; - UCHAR SupportedRates[16] = &BssidInfo->SupportedRates; NDIS_802_11_RSSI Rssi = BssidInfo->Rssi; NDIS_802_11_NETWORK_INFRASTRUCTURE NetworkType = BssidInfo->InfrastructureMode; - CHAR SsidBuffer[33]; + CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; /* SSID member is a non-null terminated ASCII string */ RtlCopyMemory(SsidBuffer, Ssid->Ssid, Ssid->SsidLength); @@ -315,12 +314,12 @@ NetworkType == Ndis802_11IBSS ? "Adhoc" : "Infrastructure", (int)Rssi); - for (j = 0; j < 16; j++) + for (j = 0; j < NDIS_802_11_LENGTH_RATES; j++) { - if (SupportedRates[j] != 0) + if (BssidInfo->SupportedRates[j] != 0) { /* SupportedRates are in units of .5 */ - _tprintf(_T("%d "), (SupportedRates[j] << 2)); + _tprintf(_T("%d "), (BssidInfo->SupportedRates[j] << 2)); } } _tprintf(_T("\n"));

1 0

[cgutman] 54870: [PSDK] - Add 802.11 OIDs
by cgutman＠svn.reactos.org 08 Jan '12

08 Jan '12

Author: cgutman Date: Sun Jan 8 03:12:53 2012 New Revision: 54870 URL: http://svn.reactos.org/svn/reactos?rev=54870&view=rev Log: [PSDK] - Add 802.11 OIDs Modified: branches/wlan-bringup/include/psdk/ntddndis.h Modified: branches/wlan-bringup/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/include/psdk/ntddn… ============================================================================== --- branches/wlan-bringup/include/psdk/ntddndis.h [iso-8859-1] (original) +++ branches/wlan-bringup/include/psdk/ntddndis.h [iso-8859-1] Sun Jan 8 03:12:53 2012 @@ -265,8 +265,34 @@ #define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 #define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 -#define OID_802_11_BSSID_LIST 0x0D010217 -#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A +/* IEEE 802.11 (WLAN) OIDs */ +#define OID_802_11_BSSID 0x0D010101 +#define OID_802_11_SSID 0x0D010102 +#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0D010203 +#define OID_802_11_NETWORK_TYPE_IN_USE 0x0D010204 +#define OID_802_11_TX_POWER_LEVEL 0x0D010205 +#define OID_802_11_RSSI 0x0D010206 +#define OID_802_11_RSSI_TRIGGER 0x0D010207 +#define OID_802_11_INFRASTRUCTURE_MODE 0x0D010108 +#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0D010209 +#define OID_802_11_RTS_THRESHOLD 0x0D01020A +#define OID_802_11_NUMBER_OF_ANTENNAS 0x0D01020B +#define OID_802_11_RX_ANTENNA_SELECTED 0x0D01020C +#define OID_802_11_TX_ANTENNA_SELECTED 0x0D01020D +#define OID_802_11_SUPPORTED_RATES 0x0D01020E +#define OID_802_11_DESIRED_RATES 0x0D010210 +#define OID_802_11_CONFIGURATION 0x0D010211 +#define OID_802_11_STATISTICS 0x0D020212 +#define OID_802_11_ADD_WEP 0x0D010113 +#define OID_802_11_REMOVE_WEP 0x0D010114 +#define OID_802_11_DISASSOCIATE 0x0D010115 +#define OID_802_11_POWER_MODE 0x0D010216 +#define OID_802_11_BSSID_LIST 0x0D010217 +#define OID_802_11_AUTHENTICATION_MODE 0x0D010118 +#define OID_802_11_PRIVACY_FILTER 0x0D010119 +#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A +#define OID_802_11_WEP_STATUS 0x0D01011B +#define OID_802_11_RELOAD_DEFAULTS 0x0D01011C /* OID_GEN_MINIPORT_INFO constants */ #define NDIS_MINIPORT_BUS_MASTER 0x00000001

1 0

[cgutman] 54869: [WLANCONF] - Initial drop of a little WLAN configuration tool to use until WZC is implemented and working - Doesn't build yet due to missing OID definitions - Some of this code wil...
by cgutman＠svn.reactos.org 08 Jan '12

08 Jan '12

Author: cgutman Date: Sun Jan 8 03:02:58 2012 New Revision: 54869 URL: http://svn.reactos.org/svn/reactos?rev=54869&view=rev Log: [WLANCONF] - Initial drop of a little WLAN configuration tool to use until WZC is implemented and working - Doesn't build yet due to missing OID definitions - Some of this code will eventually be reused when implementing WZC Added: branches/wlan-bringup/base/applications/network/wlanconf/ branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt (with props) branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c (with props) branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild (with props) branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rc (with props) Modified: branches/wlan-bringup/base/applications/network/CMakeLists.txt branches/wlan-bringup/base/applications/network/network.rbuild Modified: branches/wlan-bringup/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] Sun Jan 8 03:02:58 2012 @@ -14,3 +14,5 @@ endif() add_subdirectory(tracert) add_subdirectory(whois) +add_subdirectory(wlanconf) + Modified: branches/wlan-bringup/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/network.rbuild [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/network.rbuild [iso-8859-1] Sun Jan 8 03:02:58 2012 @@ -40,4 +40,7 @@ <directory name="whois"> <xi:include href="whois/whois.rbuild" /> </directory> + <directory name="wlanconf"> + <xi:include href="wlanconf/wlanconf.rbuild" /> + </directory> </group> Added: branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt (added) +++ branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Sun Jan 8 03:02:58 2012 @@ -1,0 +1,8 @@ + +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) +add_executable(wlanconf wlanconf.c wlanconf.rc) +set_module_type(wlanconf win32cui) +add_importlibs(wlanconf kernel32) +add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) Propchange: branches/wlan-bringup/base/applications/network/wlanconf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c (added) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Jan 8 03:02:58 2012 @@ -1,0 +1,430 @@ +/* + * PROJECT: ReactOS WLAN command-line configuration utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/network/wlanconf/wlanconf.c + * PURPOSE: Allows WLAN configuration via the command prompt + * COPYRIGHT: Copyright 2012 Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <windows.h> +#include <tchar.h> +#include <stdio.h> +#include <stdlib.h> +#include <ntddndis.h> +#include <nuiouser.h> + +BOOL bScan = FALSE; + +BOOL bConnect = FALSE; +char* sSsid = NULL; + +BOOL bDisconnect = FALSE; + +DWORD DoFormatMessage(DWORD ErrorCode) +{ + LPVOID lpMsgBuf; + DWORD RetVal; + + if ((RetVal = FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ))) + { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } + else + return 0; +} + +HANDLE +OpenDriverHandle(VOID) +{ + HANDLE hDriver; + DWORD dwBytesReturned; + BOOL bSuccess; + + /* Open a handle to this NDISUIO driver */ + hDriver = CreateFileW(NDISUIO_DEVICE_NAME, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hDriver == INVALID_HANDLE_VALUE) + return INVALID_HANDLE_VALUE; + + /* Wait for binds */ + bSuccess = DeviceIoControl(hDriver, + IOCTL_NDISUIO_BIND_WAIT, + NULL, + 0, + NULL, + 0, + &dwBytesReturned, + NULL); + if (!bSuccess) + { + CloseHandle(hDriver); + return INVALID_HANDLE_VALUE; + } + + return hDriver; +} + +BOOL +IsWlanAdapter(HANDLE hAdapter) +{ + BOOL bSuccess; + DWORD dwBytesReturned; + NDISUIO_QUERY_OID QueryOid; + + /* NDIS 5.1 WLAN drivers must support this OID */ + QueryOid.Oid = OID_GEN_PHYSICAL_MEDIUM; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + &QueryOid, + sizeof(QueryOid), + &QueryOid, + sizeof(QueryOid), + &dwBytesReturned, + NULL); + if (!bSuccess || *(PULONG)QueryOid.Data != NdisPhysicalMediumWirelessLan) + return FALSE; + + return TRUE; +} + +HANDLE +OpenAdapterHandle(DWORD Index) +{ + HANDLE hDriver; + BOOL bSuccess; + DWORD dwBytesReturned; + char Buffer[1024]; + PNDISUIO_QUERY_BINDING QueryBinding = (PNDISUIO_QUERY_BINDING)Buffer; + + /* Open the driver handle */ + hDriver = OpenDriverHandle(); + if (hDriver == INVALID_HANDLE_VALUE) + return INVALID_HANDLE_VALUE; + + /* Query for bindable adapters */ + QueryBinding->BindingIndex = 0; + do { + bSuccess = DeviceIoControl(hDriver, + IOCTL_NDISUIO_QUERY_BINDING, + NULL, + 0, + NULL, + 0, + &dwBytesReturned, + NULL); + if (QueryBinding->BindingIndex == Index) + break; + QueryBinding->BindingIndex++; + } while (bSuccess); + + if (!bSuccess) + { + CloseHandle(hDriver); + return INVALID_HANDLE_VALUE; + } + + /* Bind to the adapter */ + bSuccess = DeviceIoControl(hDriver, + IOCTL_NDISUIO_OPEN_DEVICE, + (PUCHAR)QueryBinding + QueryBinding->DeviceNameOffset, + QueryBinding->DeviceNameLength, + NULL, + 0, + &dwBytesReturned, + NULL); + if (!bSuccess) + { + CloseHandle(hDriver); + return INVALID_HANDLE_VALUE; + } + + return hDriver; +} + +/* Only works with the first adapter for now */ +HANDLE +OpenWlanAdapter(VOID) +{ + DWORD dwCurrentIndex; + HANDLE hCurrentAdapter; + + for (dwCurrentIndex = 0; ; dwCurrentIndex++) + { + hCurrentAdapter = OpenAdapterHandle(dwCurrentIndex); + if (hCurrentAdapter == INVALID_HANDLE_VALUE) + break; + + if (IsWlanAdapter(hCurrentAdapter)) + return hCurrentAdapter; + else + CloseHandle(hCurrentAdapter); + } + + return INVALID_HANDLE_VALUE; +} + +BOOL +WlanDisconnect(HANDLE hAdapter) +{ + BOOL bSuccess; + DWORD dwBytesReturned; + NDISUIO_SET_OID SetOid; + + SetOid.Oid = OID_802_11_DISASSOCIATE; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_SET_OID_VALUE, + &SetOid, + sizeof(SetOid), + NULL, + 0, + &dwBytesReturned, + NULL); + + return bSuccess; +} + +BOOL +WlanConnect(HANDLE hAdapter) +{ + BOOL bSuccess; + DWORD dwBytesReturned; + PNDISUIO_SET_OID SetOid; + PNDIS_802_11_SSID Ssid; + + SetOid = HeapAlloc(GetProcessHeap(), 0, sizeof(NDISUIO_SET_OID) + sizeof(NDIS_802_11_SSID)); + if (!SetOid) + return FALSE; + + SetOid->Oid = OID_802_11_SSID; + Ssid = SetOid->Data; + + /* Fill the OID data buffer */ + RtlCopyMemory(Ssid->Ssid, sSsid, strlen(sSsid)); + Ssid->SsidLength = strlen(sSsid); + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_SET_OID_VALUE, + &SetOid, + sizeof(SetOid), + NULL, + 0, + &dwBytesReturned, + NULL); + + HeapFree(GetProcessHeap(), 0, SetOid); + + return bSuccess; +} + +BOOL +WlanScan(HANDLE hAdapter) +{ + BOOL bSuccess; + DWORD dwBytesReturned; + NDISUIO_SET_OID SetOid; + PNDISUIO_QUERY_OID QueryOid; + DWORD QueryOidSize; + PNDIS_802_11_BSSID_LIST_EX BssidList; + DWORD i, j; + + SetOid.Oid = OID_802_11_BSSID_LIST_SCAN; + + /* Send the scan OID */ + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_SET_OID_VALUE, + &SetOid, + sizeof(SetOid), + NULL, + 0, + &dwBytesReturned, + NULL); + if (!bSuccess) + return FALSE; + + /* Allocate space for 15 networks to be returned */ + QueryOidSize = sizeof(NDISUIO_QUERY_OID) + (sizeof(NDIS_WLAN_BSSID_EX) * 15); + QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); + if (!QueryOid) + return FALSE; + + QueryOid->Oid = OID_802_11_BSSID_LIST; + BssidList = QueryOid->Data; + + bSuccess = DeviceIoControl(hAdapter, + IOCTL_NDISUIO_QUERY_OID_VALUE, + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + if (!bSuccess) + { + HeapFree(GetProcessHeap(), 0, QueryOid); + return FALSE; + } + + if (BssidList->NumberOfItems == 0) + { + _tprintf(_T("No networks found in range\n")); + } + else + { + for (i = 0; i < BssidList->NumberOfItems; i++) + { + PNDIS_WLAN_BSSID_EX BssidInfo = BssidList->Bssid[i]; + PNDIS_802_11_SSID Ssid = &BssidInfo->Ssid; + UCHAR SupportedRates[16] = &BssidInfo->SupportedRates; + NDIS_802_11_RSSI Rssi = BssidInfo->Rssi; + NDIS_802_11_NETWORK_INFRASTRUCTURE NetworkType = BssidInfo->InfrastructureMode; + CHAR SsidBuffer[33]; + + /* SSID member is a non-null terminated ASCII string */ + RtlCopyMemory(SsidBuffer, Ssid->Ssid, Ssid->SsidLength); + SsidBuffer[Ssid->SsidLength] = 0; + + _tprintf(_T("\nSSID: %s\n" + "Encrypted: %s" + "Network Type: %s\n" + "RSSI: %i\n" + "Supported Rates: "), + SsidBuffer, + BssidInfo->Privacy == 0 ? "No" : "Yes", + NetworkType == Ndis802_11IBSS ? "Adhoc" : "Infrastructure", + (int)Rssi); + + for (j = 0; j < 16; j++) + { + if (SupportedRates[j] != 0) + { + /* SupportedRates are in units of .5 */ + _tprintf(_T("%d "), (SupportedRates[j] << 2)); + } + } + _tprintf(_T("\n")); + } + } + + HeapFree(GetProcessHeap(), 0, QueryOid); + + return bSuccess; +} + +VOID Usage() +{ + _tprintf(_T("\nConfigures a WLAN adapter.\n\n" + "WLANCONF [-c SSID] [-d] [-s]\n\n" + " -c SSID Connects to a supplied SSID.\n" + " -d Disconnects from the current AP.\n" + " -s Scans and displays a list of access points in range.\n")); +} + + +BOOL ParseCmdline(int argc, char* argv[]) +{ + INT i; + + for (i = 1; i < argc; i++) + { + if ((argc > 1) && (argv[i][0] == '-')) + { + TCHAR c; + + while ((c = *++argv[i]) != '\0') + { + switch (c) + { + case 's' : + bScan = TRUE; + break; + case 'd' : + bDisconnect = TRUE; + break; + case 'c' : + bConnect = TRUE; + sSsid = argv[++i]; + break; + default : + Usage(); + return FALSE; + } + } + } + } + + if (!bScan && !bDisconnect && !bConnect) + { + Usage(); + return FALSE; + } + + return TRUE; +} + +int main(int argc, char* argv[]) +{ + HANDLE hAdapter; + + if (!ParseCmdline(argc, argv)) + return -1; + + hAdapter = OpenWlanAdapter(); + if (hAdapter == INVALID_HANDLE_VALUE) + { + DoFormatMessage(GetLastError()); + return -1; + } + + if (bScan) + { + if (!WlanScan(hAdapter)) + { + DoFormatMessage(GetLastError()); + CloseHandle(hAdapter); + return -1; + } + } + else if (bDisconnect) + { + if (!WlanDisconnect(hAdapter)) + { + DoFormatMessage(GetLastError()); + CloseHandle(hAdapter); + return -1; + } + } + else + { + if (!WlanConnect(hAdapter)) + { + DoFormatMessage(GetLastError()); + CloseHandle(hAdapter); + return -1; + } + } + + CloseHandle(hAdapter); + return 0; +} Propchange: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild (added) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild [iso-8859-1] Sun Jan 8 03:02:58 2012 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="wlanconf" type="win32cui" installbase="system32" installname="wlanconf.exe"> + <include base="wlanconf">.</include> + <include base="ReactOS">include/reactos/drivers/ndisuio</include> + <file>wlanconf.c</file> + <file>wlanconf.rc</file> +</module> Propchange: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rc (added) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] Sun Jan 8 03:02:58 2012 @@ -1,0 +1,7 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WLAN Configuration Tool\0" +#define REACTOS_STR_INTERNAL_NAME "wlanconf\0" +#define REACTOS_STR_ORIGINAL_FILENAME "wlanconf.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Cameron Gutman (cameron.gutman(a)reactos.org)\0" +#include <reactos/version.rc> + + Propchange: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 54868: [PREFAST] * Write PREfast defect log to the console. Dedicated to Timo.
by akhaldi＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: akhaldi Date: Sat Jan 7 21:50:10 2012 New Revision: 54868 URL: http://svn.reactos.org/svn/reactos?rev=54868&view=rev Log: [PREFAST] * Write PREfast defect log to the console. Dedicated to Timo. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=54868… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Jan 7 21:50:10 2012 @@ -53,9 +53,13 @@ endif() if(_PREFAST_) -message("PREFAST enabled!") -set(CMAKE_C_COMPILER "prefast cl") -set(CMAKE_CXX_COMPILER "prefast cl") + message("PREFAST enabled!") + set(CMAKE_C_COMPILER "prefast cl") + set(CMAKE_CXX_COMPILER "prefast cl") + set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /Fo<OBJECT> /Fd<TARGET_PDB> -c <SOURCE>${CMAKE_END_TEMP_FILE}" + "prefast LIST") + set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /TP /Fo<OBJECT> /Fd<TARGET_PDB> -c <SOURCE>${CMAKE_END_TEMP_FILE}" + "prefast LIST") endif() set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})

1 0

[tfaber] 54867: [CLASSPNP] - Fix incorrect casts. Patch by Samuel Serapion
by tfaber＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tfaber Date: Sat Jan 7 18:08:10 2012 New Revision: 54867 URL: http://svn.reactos.org/svn/reactos?rev=54867&view=rev Log: [CLASSPNP] - Fix incorrect casts. Patch by Samuel Serapion Modified: trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/classpnp/lock.c Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Sat Jan 7 18:08:10 2012 @@ -6564,7 +6564,7 @@ Irp->IoStatus.Status = ClassRetrieveDeviceRelations( Fdo, BusRelations, - (PDEVICE_RELATIONS)&Irp->IoStatus.Information); + (PDEVICE_RELATIONS*)&Irp->IoStatus.Information); InterlockedDecrement(&(fdoExtension->EnumerationInterlock)); return Irp->IoStatus.Status; Modified: trunk/reactos/drivers/storage/classpnp/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/l… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] Sat Jan 7 18:08:10 2012 @@ -133,7 +133,7 @@ } else { PREMOVE_TRACKING_BLOCK *removeTrackingList = - (PREMOVE_TRACKING_BLOCK)&commonExtension->RemoveTrackingList; + (PREMOVE_TRACKING_BLOCK*)&commonExtension->RemoveTrackingList; KIRQL oldIrql; @@ -219,7 +219,7 @@ #if DBG PREMOVE_TRACKING_BLOCK *listEntry = - (PREMOVE_TRACKING_BLOCK)&commonExtension->RemoveTrackingList; + (PREMOVE_TRACKING_BLOCK*)&commonExtension->RemoveTrackingList; BOOLEAN found = FALSE; @@ -382,7 +382,7 @@ #if DBG PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PREMOVE_TRACKING_BLOCK *listEntry = - (PREMOVE_TRACKING_BLOCK)&commonExtension->RemoveTrackingList; + (PREMOVE_TRACKING_BLOCK*)&commonExtension->RemoveTrackingList; KIRQL oldIrql;

1 0

[tfaber] 54866: [LSASRV] - Correctly set return values in LsapGetObjectAttribute [CDMAKE] - Handle out-of-memory condition - Patch by Samuel Serapion
by tfaber＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tfaber Date: Sat Jan 7 17:45:26 2012 New Revision: 54866 URL: http://svn.reactos.org/svn/reactos?rev=54866&view=rev Log: [LSASRV] - Correctly set return values in LsapGetObjectAttribute [CDMAKE] - Handle out-of-memory condition - Patch by Samuel Serapion Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Sat Jan 7 17:45:26 2012 @@ -510,13 +510,13 @@ if (AttributeData == NULL || *AttributeSize == 0) { *AttributeSize = ValueSize; - Status == STATUS_SUCCESS; + Status = STATUS_SUCCESS; goto Done; } else if (*AttributeSize < ValueSize) { *AttributeSize = ValueSize; - Status == STATUS_BUFFER_OVERFLOW; + Status = STATUS_BUFFER_OVERFLOW; goto Done; } Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sat Jan 7 17:45:26 2012 @@ -633,6 +633,8 @@ if (joliet_length > 64) error_exit ( "'%s' is not Joliet, aborting...", filename ); d->joliet_name = malloc(joliet_length + 1); + if (d->joliet_name == NULL) + error_exit("Insufficient memory"); strcpy(d->joliet_name, filename); } }

1 0

[tfaber] 54865: [NTOSKRNL/MM] - Fix memory type comparison in MiScanMemoryDescriptors. Spotted by Samuel Serapion
by tfaber＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tfaber Date: Sat Jan 7 17:05:41 2012 New Revision: 54865 URL: http://svn.reactos.org/svn/reactos?rev=54865&view=rev Log: [NTOSKRNL/MM] - Fix memory type comparison in MiScanMemoryDescriptors. Spotted by Samuel Serapion Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sat Jan 7 17:05:41 2012 @@ -397,9 +397,9 @@ MiNumberDescriptors++; /* Check if this is invisible memory */ - if ((Descriptor->MemoryType == LoaderFirmwarePermanent) && - (Descriptor->MemoryType == LoaderSpecialMemory) && - (Descriptor->MemoryType == LoaderHALCachedMemory) && + if ((Descriptor->MemoryType == LoaderFirmwarePermanent) || + (Descriptor->MemoryType == LoaderSpecialMemory) || + (Descriptor->MemoryType == LoaderHALCachedMemory) || (Descriptor->MemoryType == LoaderBBTMemory)) { /* Skip this descriptor */

1 0

[tkreuzer] 54864: [CMAKE] Add inetcpl to msvc build
by tkreuzer＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tkreuzer Date: Sat Jan 7 16:31:13 2012 New Revision: 54864 URL: http://svn.reactos.org/svn/reactos?rev=54864&view=rev Log: [CMAKE] Add inetcpl to msvc build Modified: trunk/reactos/dll/cpl/CMakeLists.txt Modified: trunk/reactos/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] Sat Jan 7 16:31:13 2012 @@ -4,9 +4,7 @@ add_subdirectory(console)#Warning: console\\/lang/cs-CZ.rc:143: unrecognized escape sequence add_subdirectory(desk) add_subdirectory(hdwwiz) -if(NOT MSVC) - add_subdirectory(inetcpl) # FIXME: msvc build. -endif() +add_subdirectory(inetcpl) add_subdirectory(input) add_subdirectory(intl) add_subdirectory(joy)

1 0

[tkreuzer] 54863: [DDK] Add wsk.h
by tkreuzer＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tkreuzer Date: Sat Jan 7 16:14:00 2012 New Revision: 54863 URL: http://svn.reactos.org/svn/reactos?rev=54863&view=rev Log: [DDK] Add wsk.h Added: trunk/reactos/include/ddk/wsk.h (with props) Added: trunk/reactos/include/ddk/wsk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wsk.h?rev=5486… ============================================================================== --- trunk/reactos/include/ddk/wsk.h (added) +++ trunk/reactos/include/ddk/wsk.h [iso-8859-1] Sat Jan 7 16:14:00 2012 @@ -1,0 +1,617 @@ +/* + * wsk.h + * + * Windows Sockets Kernel-Mode Interface + * + * This file is part of the ReactOS DDK package. + * + * Contributors: + * Timo Kreuzer (timo.kreuzer(a)reactos.org) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#pragma once +#define _WSK_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <netioddk.h> +#include <ws2def.h> +#include <mswsockdef.h> + +extern CONST NPIID NPI_WSK_INTERFACE_ID; + +#define WSKAPI NTAPI + +#define MAKE_WSK_VERSION(Mj, Mn) ((USHORT)((Mj) << 8) | (USHORT)((Mn) & 0xff)) +#define WSK_MAJOR_VERSION(V) ((UCHAR)((V) >> 8)) +#define WSK_MINOR_VERSION(V) ((UCHAR)(V)) +#define WSK_FLAG_AT_DISPATCH_LEVEL 0x00000008 +#define WSK_FLAG_RELEASE_ASAP 0x00000002 +#define WSK_FLAG_ENTIRE_MESSAGE 0x00000004 +#define WSK_FLAG_ABORTIVE 0x00000001 +#define WSK_FLAG_BASIC_SOCKET 0x00000000 +#define WSK_FLAG_LISTEN_SOCKET 0x00000001 +#define WSK_FLAG_CONNECTION_SOCKET 0x00000002 +#define WSK_FLAG_DATAGRAM_SOCKET 0x00000004 +#define WSK_TRANSPORT_LIST_QUERY 2 +#define WSK_TRANSPORT_LIST_CHANGE 3 +#define WSK_CACHE_SD 4 +#define WSK_RELEASE_SD 5 +#define WSK_TDI_DEVICENAME_MAPPING 6 +#define WSK_SET_STATIC_EVENT_CALLBACKS 7 +#define WSK_TDI_BEHAVIOR 8 +#define WSK_TDI_BEHAVIOR_BYPASS_TDI 0x00000001 +#define SO_WSK_SECURITY (WSK_SO_BASE+1) +#define SO_WSK_EVENT_CALLBACK (WSK_SO_BASE+2) +#define WSK_EVENT_RECEIVE_FROM 0x00000100 +#define WSK_EVENT_ACCEPT 0x00000200 +#define WSK_EVENT_SEND_BACKLOG 0x00000010 +#define WSK_EVENT_RECEIVE 0x00000040 +#define WSK_EVENT_DISCONNECT 0x00000080 +#define WSK_EVENT_DISABLE 0x80000000 +#define SIO_WSK_SET_REMOTE_ADDRESS _WSAIOW(IOC_WSK,0x1) +#define SIO_WSK_REGISTER_EXTENSION _WSAIORW(IOC_WSK,0x2) +#define SIO_WSK_QUERY_IDEAL_SEND_BACKLOG _WSAIOR(IOC_WSK,0x3) +#define SIO_WSK_QUERY_RECEIVE_BACKLOG _WSAIOR(IOC_WSK,0x4) +#define SIO_WSK_QUERY_INSPECT_ID _WSAIOR(IOC_WSK,0x5) +#define SIO_WSK_SET_SENDTO_ADDRESS _WSAIOW(IOC_WSK,0x6) +#define WSK_FLAG_NODELAY 0x00000002 +#define WSK_FLAG_WAITALL 0x00000002 +#define WSK_FLAG_DRAIN 0x00000004 +#define WSK_NO_WAIT 0 +#define WSK_INFINITE_WAIT 0xffffffff + +typedef enum +{ + WskInspectReject, + WskInspectAccept, + WskInspectPend, + WskInspectMax +} WSK_INSPECT_ACTION, *PWSK_INSPECT_ACTION; + +typedef enum +{ + WskSetOption, + WskGetOption, + WskIoctl, + WskControlMax +} WSK_CONTROL_SOCKET_TYPE, *PWSK_CONTROL_SOCKET_TYPE; + +typedef PVOID PWSK_CLIENT; + +typedef struct _WSK_SOCKET +{ + const VOID *Dispatch; +} WSK_SOCKET, *PWSK_SOCKET; + +typedef struct _WSK_BUF +{ + PMDL Mdl; + ULONG Offset; + SIZE_T Length; +} WSK_BUF, *PWSK_BUF; + +typedef struct _WSK_INSPECT_ID +{ + ULONG_PTR Key; + ULONG SerialNumber; +} WSK_INSPECT_ID, *PWSK_INSPECT_ID; + +typedef struct _WSK_DATAGRAM_INDICATION +{ + struct _WSK_DATAGRAM_INDICATION *Next; + WSK_BUF Buffer; + _Field_size_bytes_(ControlInfoLength) PCMSGHDR ControlInfo; + ULONG ControlInfoLength; + PSOCKADDR RemoteAddress; +} WSK_DATAGRAM_INDICATION, *PWSK_DATAGRAM_INDICATION; + +typedef +_Must_inspect_result_ +NTSTATUS +(WSKAPI * PFN_WSK_RECEIVE_FROM_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ ULONG Flags, + _In_opt_ PWSK_DATAGRAM_INDICATION DataIndication); + +typedef struct _WSK_DATA_INDICATION +{ + struct _WSK_DATA_INDICATION *Next; + WSK_BUF Buffer; +} WSK_DATA_INDICATION, *PWSK_DATA_INDICATION; + +typedef +_Must_inspect_result_ +NTSTATUS +(WSKAPI * PFN_WSK_RECEIVE_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ ULONG Flags, + _In_opt_ PWSK_DATA_INDICATION DataIndication, + _In_ SIZE_T BytesIndicated, + _Inout_ SIZE_T *BytesAccepted); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_DISCONNECT_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ ULONG Flags); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_SEND_BACKLOG_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ SIZE_T IdealBacklogSize); + +typedef struct _WSK_CLIENT_CONNECTION_DISPATCH +{ + PFN_WSK_RECEIVE_EVENT WskReceiveEvent; + PFN_WSK_DISCONNECT_EVENT WskDisconnectEvent; + PFN_WSK_SEND_BACKLOG_EVENT WskSendBacklogEvent; +} WSK_CLIENT_CONNECTION_DISPATCH, *PWSK_CLIENT_CONNECTION_DISPATCH; + +typedef +_Must_inspect_result_ +_At_(AcceptSocket, __drv_aliasesMem) +NTSTATUS +(WSKAPI * PFN_WSK_ACCEPT_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ ULONG Flags, + _In_ PSOCKADDR LocalAddress, + _In_ PSOCKADDR RemoteAddress, + _In_opt_ PWSK_SOCKET AcceptSocket, + _Outptr_result_maybenull_ PVOID *AcceptSocketContext, + _Outptr_result_maybenull_ const WSK_CLIENT_CONNECTION_DISPATCH **AcceptSocketDispatch); + +typedef +_At_(Irp->IoStatus.Information, __drv_allocatesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_SOCKET_CONNECT)( + _In_ PWSK_CLIENT Client, + _In_ USHORT SocketType, + _In_ ULONG Protocol, + _In_ PSOCKADDR LocalAddress, + _In_ PSOCKADDR RemoteAddress, + _Reserved_ ULONG Flags, + _In_opt_ PVOID SocketContext, + _In_opt_ const WSK_CLIENT_CONNECTION_DISPATCH *Dispatch, + _In_opt_ PEPROCESS OwningProcess, + _In_opt_ PETHREAD OwningThread, + _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_CONTROL_SOCKET)( + _In_ PWSK_SOCKET Socket, + _In_ WSK_CONTROL_SOCKET_TYPE RequestType, + _In_ ULONG ControlCode, + _In_ ULONG Level, + _In_ SIZE_T InputSize, + _In_reads_bytes_opt_(InputSize) PVOID InputBuffer, + _In_ SIZE_T OutputSize, + _Out_writes_bytes_opt_(OutputSize) PVOID OutputBuffer, + _Out_opt_ SIZE_T *OutputSizeReturned, + _Inout_opt_ PIRP Irp); + +typedef +_At_(Socket, __drv_freesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_CLOSE_SOCKET)( + _In_ PWSK_SOCKET Socket, + _Inout_ PIRP Irp); + +typedef struct _WSK_PROVIDER_BASIC_DISPATCH +{ + PFN_WSK_CONTROL_SOCKET WskControlSocket; + PFN_WSK_CLOSE_SOCKET WskCloseSocket; +} WSK_PROVIDER_BASIC_DISPATCH, *PWSK_PROVIDER_BASIC_DISPATCH; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_BIND) ( + _In_ PWSK_SOCKET Socket, + _In_ PSOCKADDR LocalAddress, + _Reserved_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +_At_(Irp->IoStatus.Information, __drv_allocatesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_ACCEPT)( + _In_ PWSK_SOCKET ListenSocket, + _Reserved_ ULONG Flags, + _In_opt_ PVOID AcceptSocketContext, + _In_opt_ const WSK_CLIENT_CONNECTION_DISPATCH *AcceptSocketDispatch, + _Out_opt_ PSOCKADDR LocalAddress, + _Out_opt_ PSOCKADDR RemoteAddress, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_INSPECT_COMPLETE)( + _In_ PWSK_SOCKET ListenSocket, + _In_ PWSK_INSPECT_ID InspectID, + _In_ WSK_INSPECT_ACTION Action, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_GET_LOCAL_ADDRESS)( + _In_ PWSK_SOCKET Socket, + _Out_ PSOCKADDR LocalAddress, + _Inout_ PIRP Irp); + +typedef struct _WSK_PROVIDER_LISTEN_DISPATCH +{ +#ifdef __cplusplus + WSK_PROVIDER_BASIC_DISPATCH Basic; +#else + WSK_PROVIDER_BASIC_DISPATCH; +#endif + PFN_WSK_BIND WskBind; + PFN_WSK_ACCEPT WskAccept; + PFN_WSK_INSPECT_COMPLETE WskInspectComplete; + PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; +} WSK_PROVIDER_LISTEN_DISPATCH, *PWSK_PROVIDER_LISTEN_DISPATCH; + +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef struct _WSK_BUF_LIST { + struct _WSK_BUF_LIST *Next; + WSK_BUF Buffer; +} WSK_BUF_LIST, *PWSK_BUF_LIST; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_SEND_MESSAGES)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF_LIST BufferList, + _Reserved_ ULONG Flags, + _In_opt_ PSOCKADDR RemoteAddress, + _In_ ULONG ControlInfoLength, + _In_reads_bytes_opt_(ControlInfoLength) PCMSGHDR ControlInfo, + _Inout_ PIRP Irp); +#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ + +typedef struct _WSK_PROVIDER_DATAGRAM_DISPATCH +{ +#ifdef __cplusplus + WSK_PROVIDER_BASIC_DISPATCH Basic; +#else + WSK_PROVIDER_BASIC_DISPATCH; +#endif + PFN_WSK_BIND WskBind; + PFN_WSK_SEND_TO WskSendTo; + PFN_WSK_RECEIVE_FROM WskReceiveFrom; + PFN_WSK_RELEASE_DATAGRAM_INDICATION_LIST WskRelease; + PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; +#if (NTDDI_VERSION >= NTDDI_WIN8) + PFN_WSK_SEND_MESSAGES WskSendMessages; +#endif +} WSK_PROVIDER_DATAGRAM_DISPATCH, *PWSK_PROVIDER_DATAGRAM_DISPATCH; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_CONNECT) ( + _In_ PWSK_SOCKET Socket, + _In_ PSOCKADDR RemoteAddress, + _Reserved_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_GET_REMOTE_ADDRESS)( + _In_ PWSK_SOCKET Socket, + _Out_ PSOCKADDR RemoteAddress, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_SEND)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF Buffer, + _In_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_RECEIVE)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF Buffer, + _In_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_DISCONNECT)( + _In_ PWSK_SOCKET Socket, + _In_opt_ PWSK_BUF Buffer, + _In_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_RELEASE_DATA_INDICATION_LIST)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_DATA_INDICATION DataIndication); + +typedef struct _WSK_PROVIDER_CONNECTION_DISPATCH +{ +#ifdef __cplusplus + WSK_PROVIDER_BASIC_DISPATCH Basic; +#else + WSK_PROVIDER_BASIC_DISPATCH; +#endif + PFN_WSK_BIND WskBind; + PFN_WSK_CONNECT WskConnect; + PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; + PFN_WSK_GET_REMOTE_ADDRESS WskGetRemoteAddress; + PFN_WSK_SEND WskSend; + PFN_WSK_RECEIVE WskReceive; + PFN_WSK_DISCONNECT WskDisconnect; + PFN_WSK_RELEASE_DATA_INDICATION_LIST WskRelease; +} WSK_PROVIDER_CONNECTION_DISPATCH, *PWSK_PROVIDER_CONNECTION_DISPATCH; + +typedef +_Must_inspect_result_ +WSK_INSPECT_ACTION +(WSKAPI * PFN_WSK_INSPECT_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ PSOCKADDR LocalAddress, + _In_ PSOCKADDR RemoteAddress, + _In_opt_ PWSK_INSPECT_ID InspectID); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_ABORT_EVENT) ( + _In_opt_ PVOID SocketContext, + _In_ PWSK_INSPECT_ID InspectID); + +typedef +_At_(Irp->IoStatus.Information, __drv_allocatesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_SOCKET)( + _In_ PWSK_CLIENT Client, + _In_ ADDRESS_FAMILY AddressFamily, + _In_ USHORT SocketType, + _In_ ULONG Protocol, + _In_ ULONG Flags, + _In_opt_ PVOID SocketContext, + _In_opt_ const VOID *Dispatch, + _In_opt_ PEPROCESS OwningProcess, + _In_opt_ PETHREAD OwningThread, + _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_ PIRP Irp); + +typedef struct _WSK_TDI_MAP +{ + USHORT SocketType; + ADDRESS_FAMILY AddressFamily; + ULONG Protocol; + PCWSTR TdiDeviceName; +} WSK_TDI_MAP, *PWSK_TDI_MAP; + +typedef struct _WSK_TDI_MAP_INFO +{ + const ULONG ElementCount; + _Field_size_(ElementCount) const WSK_TDI_MAP *Map; +} WSK_TDI_MAP_INFO, *PWSK_TDI_MAP_INFO; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_CONTROL_CLIENT)( + _In_ PWSK_CLIENT Client, + _In_ ULONG ControlCode, + _In_ SIZE_T InputSize, + _In_reads_bytes_opt_(InputSize) PVOID InputBuffer, + _In_ SIZE_T OutputSize, + _Out_writes_bytes_opt_(OutputSize) PVOID OutputBuffer, + _Out_opt_ SIZE_T *OutputSizeReturned, + _Inout_opt_ PIRP Irp); + +#if (NTDDI_VERSION >= NTDDI_WIN7) + +typedef +_At_(*Result, __drv_allocatesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_GET_ADDRESS_INFO)( + _In_ PWSK_CLIENT Client, + _In_opt_ PUNICODE_STRING NodeName, + _In_opt_ PUNICODE_STRING ServiceName, + _In_opt_ ULONG NameSpace, + _In_opt_ GUID *Provider, + _In_opt_ PADDRINFOEXW Hints, + _Outptr_ PADDRINFOEXW *Result, + _In_opt_ PEPROCESS OwningProcess, + _In_opt_ PETHREAD OwningThread, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_GET_NAME_INFO)( + _In_ PWSK_CLIENT Client, + _In_ PSOCKADDR SockAddr, + _In_ ULONG SockAddrLength, + _Out_opt_ PUNICODE_STRING NodeName, + _Out_opt_ PUNICODE_STRING ServiceName, + _In_ ULONG Flags, + _In_opt_ PEPROCESS OwningProcess, + _In_opt_ PETHREAD OwningThread, + _Inout_ PIRP Irp); + +typedef +_At_(AddrInfo, __drv_freesMem(Mem)) +VOID +(WSKAPI * PFN_WSK_FREE_ADDRESS_INFO)( + _In_ PWSK_CLIENT Client, + _In_ PADDRINFOEXW AddrInfo); + +#endif /* if (NTDDI_VERSION >= NTDDI_WIN7) */ + +typedef struct _WSK_EVENT_CALLBACK_CONTROL +{ + PNPIID NpiId; + ULONG EventMask; +} WSK_EVENT_CALLBACK_CONTROL, *PWSK_EVENT_CALLBACK_CONTROL; + +typedef struct _WSK_EXTENSION_CONTROL_IN +{ + PNPIID NpiId; + PVOID ClientContext; + const VOID* ClientDispatch; +} WSK_EXTENSION_CONTROL_IN, *PWSK_EXTENSION_CONTROL_IN; + +typedef struct _WSK_EXTENSION_CONTROL_OUT +{ + PVOID ProviderContext; + const VOID* ProviderDispatch; +} WSK_EXTENSION_CONTROL_OUT, *PWSK_EXTENSION_CONTROL_OUT; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_SEND_TO)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF Buffer, + _Reserved_ ULONG Flags, + _In_opt_ PSOCKADDR RemoteAddress, + _In_ ULONG ControlInfoLength, + _In_reads_bytes_opt_(ControlInfoLength) PCMSGHDR ControlInfo, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_RECEIVE_FROM)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF Buffer, + _Reserved_ ULONG Flags, + _Out_opt_ PSOCKADDR RemoteAddress, + _Inout_ PULONG ControlLength, + _Out_writes_bytes_opt_(*ControlLength) PCMSGHDR ControlInfo, + _Out_opt_ PULONG ControlFlags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_RELEASE_DATAGRAM_INDICATION_LIST)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_DATAGRAM_INDICATION DatagramIndication); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_CLIENT_EVENT)( + _In_opt_ PVOID ClientContext, + _In_ ULONG EventType, + _In_reads_bytes_opt_(InformationLength) PVOID Information, + _In_ SIZE_T InformationLength); + +typedef struct _WSK_CLIENT_DISPATCH +{ + USHORT Version; + USHORT Reserved; + PFN_WSK_CLIENT_EVENT WskClientEvent; +} WSK_CLIENT_DISPATCH, *PWSK_CLIENT_DISPATCH; + +typedef struct _WSK_CLIENT_LISTEN_DISPATCH +{ + PFN_WSK_ACCEPT_EVENT WskAcceptEvent; + PFN_WSK_INSPECT_EVENT WskInspectEvent; + PFN_WSK_ABORT_EVENT WskAbortEvent; +} WSK_CLIENT_LISTEN_DISPATCH, *PWSK_CLIENT_LISTEN_DISPATCH; + +typedef struct _WSK_CLIENT_DATAGRAM_DISPATCH +{ + PFN_WSK_RECEIVE_FROM_EVENT WskReceiveFromEvent; +} WSK_CLIENT_DATAGRAM_DISPATCH, *PWSK_CLIENT_DATAGRAM_DISPATCH; + +typedef struct _WSK_PROVIDER_DISPATCH +{ + USHORT Version; + USHORT Reserved; + PFN_WSK_SOCKET WskSocket; + PFN_WSK_SOCKET_CONNECT WskSocketConnect; + PFN_WSK_CONTROL_CLIENT WskControlClient; +#if (NTDDI_VERSION >= NTDDI_WIN7) + PFN_WSK_GET_ADDRESS_INFO WskGetAddressInfo; + PFN_WSK_FREE_ADDRESS_INFO WskFreeAddressInfo; + PFN_WSK_GET_NAME_INFO WskGetNameInfo; +#endif +} WSK_PROVIDER_DISPATCH, *PWSK_PROVIDER_DISPATCH; + + +typedef struct _WSK_CLIENT_NPI +{ + PVOID ClientContext; + const WSK_CLIENT_DISPATCH *Dispatch; +} WSK_CLIENT_NPI, *PWSK_CLIENT_NPI; + +typedef struct _WSK_PROVIDER_NPI +{ + PWSK_CLIENT Client; + const WSK_PROVIDER_DISPATCH *Dispatch; +} WSK_PROVIDER_NPI, *PWSK_PROVIDER_NPI; + +typedef struct _WSK_REGISTRATION +{ + ULONGLONG ReservedRegistrationState; + PVOID ReservedRegistrationContext; + KSPIN_LOCK ReservedRegistrationLock; +} WSK_REGISTRATION, *PWSK_REGISTRATION; + +typedef struct _WSK_PROVIDER_CHARACTERISTICS +{ + USHORT HighestVersion; + USHORT LowestVersion; +} WSK_PROVIDER_CHARACTERISTICS, *PWSK_PROVIDER_CHARACTERISTICS; + +typedef struct _WSK_TRANSPORT +{ + USHORT Version; + USHORT SocketType; + ULONG Protocol; + ADDRESS_FAMILY AddressFamily; + GUID ProviderId; +} WSK_TRANSPORT, *PWSK_TRANSPORT; + +_Must_inspect_result_ +NTSTATUS +WskRegister( + _In_ PWSK_CLIENT_NPI WskClientNpi, + _Out_ PWSK_REGISTRATION WskRegistration); + +_Must_inspect_result_ +NTSTATUS +WskCaptureProviderNPI( + _In_ PWSK_REGISTRATION WskRegistration, + _In_ ULONG WaitTimeout, + _Out_ PWSK_PROVIDER_NPI WskProviderNpi); + +VOID +WskReleaseProviderNPI( + _In_ PWSK_REGISTRATION WskRegistration); + +_Must_inspect_result_ +NTSTATUS +WskQueryProviderCharacteristics( + _In_ PWSK_REGISTRATION WskRegistration, + _Out_ PWSK_PROVIDER_CHARACTERISTICS WskProviderCharacteristics); + +VOID +WskDeregister( + _In_ PWSK_REGISTRATION WskRegistration); + +#ifdef __cplusplus +} +#endif + + Propchange: trunk/reactos/include/ddk/wsk.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs