Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

-add wlan service to registry

Browse source 
-add wlansvc and wlapapi_winetest to bootcd
-add some parameter checks to WlanCloseHandle
-halfplement WlanOpenHandle

svn path=/trunk/; revision=40060
This commit is contained in:
Christoph von Wittich 2009-03-16 13:40:25 +00:00
parent 71362c59fd
commit d548413ae8
6 changed files with 104 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/boot/bootdata/hivesys_i386.inf
View file

@ -1041,6 +1041,17 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ObjectName",0x00000000,"LocalS
HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000002
HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Type",0x00010001,0x00000110
; WLAN service
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","DependOnService",0x00010000,"RPCSS"
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","DisplayName",0x00000000,"WLAN Service"
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Description",0x00000000,"WLAN Service"
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ErrorControl",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Group",0x00000000,"TDI"
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ImagePath",0x00020000,"%SystemRoot%\system32\wlansvc.exe"
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ObjectName",0x00000000,"LocalSystem"
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Start",0x00010001,0x00000003
HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Type",0x00010001,0x00000110
; Simple TCP services
HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Description",0x00000000,"Supports the following TCP/IP services: Chargen, Daytime, Discard, Echo, QOTD"
HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","DisplayName",0x00000000,"Simple TCP/IP Services"

2
reactos/boot/bootdata/packages/reactos.dff
View file

@ -86,6 +86,7 @@ base\services\spoolsv\spoolsv.exe 1
base\services\tcpsvcs\tcpsvcs.exe 1
base\services\tcpsvcs\quotes 5
base\services\umpnpmgr\umpnpmgr.exe 1
base\services\wlansvc\wlansvc.exe 1
base\setup\setup\setup.exe 1
base\setup\vmwinst\vmwinst.exe 1
@ -746,6 +747,7 @@ modules\rostests\winetests\version\version_winetest.exe 7 o
modules\rostests\winetests\winhttp\winhttp_winetest.exe 7 optional
modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional
modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional
modules\rostests\winetests\wlanapi\wlanapi_winetest.exe 7 optional
modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional
modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional

89
reactos/dll/win32/wlanapi/main.c
View file

@ -23,8 +23,62 @@
#include <windows.h>
#include "wlansvc_c.h"
#define NDEBUG
#include <debug.h>
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wlanapi);
handle_t __RPC_USER
WLANSVC_HANDLE_bind(WLANSVC_HANDLE szMachineName)
{
handle_t hBinding = NULL;
LPWSTR pszStringBinding;
RPC_STATUS Status;
TRACE("RPC_SERVICE_STATUS_HANDLE_bind() called\n");
Status = RpcStringBindingComposeW(NULL,
L"ncacn_np",
szMachineName,
L"\\pipe\\trkwks",
NULL,
&pszStringBinding);
if (Status != RPC_S_OK)
{
ERR("RpcStringBindingCompose returned 0x%x\n", Status);
return NULL;
}
/* Set the binding handle that will be used to bind to the server. */
Status = RpcBindingFromStringBindingW(pszStringBinding,
&hBinding);
if (Status != RPC_S_OK)
{
ERR("RpcBindingFromStringBinding returned 0x%x\n", Status);
}
Status = RpcStringFreeW(&pszStringBinding);
if (Status != RPC_S_OK)
{
ERR("RpcStringFree returned 0x%x\n", Status);
}
return hBinding;
}
void __RPC_USER
WLANSVC_HANDLE_unbind(WLANSVC_HANDLE szMachineName,
handle_t hBinding)
{
RPC_STATUS Status;
TRACE("WLANSVC_HANDLE_unbind() called\n");
Status = RpcBindingFree(&hBinding);
if (Status != RPC_S_OK)
{
ERR("RpcBindingFree returned 0x%x\n", Status);
}
}
PVOID
WINAPI
@ -40,6 +94,34 @@ WlanFreeMemory(IN PVOID pMem)
HeapFree(GetProcessHeap(), 0, pMem);
}
DWORD
WINAPI
WlanOpenHandle(IN DWORD dwClientVersion,
PVOID pReserved,
OUT DWORD *pdwNegotiatedVersion,
OUT HANDLE *phClientHandle)
{
DWORD dwError = ERROR_SUCCESS;
if ((pReserved != NULL) || (pdwNegotiatedVersion == NULL) || (phClientHandle == NULL))
return ERROR_INVALID_PARAMETER;
RpcTryExcept
{
dwError = _RpcOpenHandle(NULL,
dwClientVersion,
pdwNegotiatedVersion,
(WLANSVC_RPC_HANDLE) phClientHandle);
}
RpcExcept(EXCEPTION_EXECUTE_HANDLER)
{
dwError = RpcExceptionCode();
}
RpcEndExcept;
return dwError;
}
DWORD
WINAPI
WlanCloseHandle(IN HANDLE hClientHandle,
@ -47,6 +129,9 @@ WlanCloseHandle(IN HANDLE hClientHandle,
{
DWORD dwError = ERROR_SUCCESS;
if ((pReserved != NULL) || (hClientHandle == NULL))
return ERROR_INVALID_PARAMETER;
RpcTryExcept
{
_RpcCloseHandle(hClientHandle);

1
reactos/dll/win32/wlanapi/wlanapi.rbuild
View file

@ -3,6 +3,7 @@
<include base="wlanapi">.</include>
<include base="wlansvc_client">.</include>
<library>wlansvc_client</library>
<library>wine</library>
<library>kernel32</library>
<library>rpcrt4</library>
<library>pseh</library>

2
reactos/dll/win32/wlanapi/wlanapi.spec
View file

@ -15,7 +15,7 @@
@ stub WlanGetProfileList
@ stub WlanGetSecuritySettings
@ stub WlanIhvControl
@ stub WlanOpenHandle
@ stdcall WlanOpenHandle (long ptr ptr ptr)
@ stub WlanQueryAutoConfigParameter
@ stub WlanQueryInterface
@ stub WlanReasonCodeToString

3
reactos/include/reactos/idl/wlansvc.idl
View file

@ -7,6 +7,7 @@
typedef [context_handle] PVOID WLANSVC_RPC_HANDLE;
typedef WLANSVC_RPC_HANDLE* LPWLANSVC_RPC_HANDLE;
typedef [handle] LPWSTR WLANSVC_HANDLE;
/* FIXME */
typedef struct struct_C {
@ -46,7 +47,7 @@ interface wlansvc_interface
{
/* Function: 0x00 */
DWORD _RpcOpenHandle(
[in] wchar_t * arg_1,
[in] WLANSVC_HANDLE szMachineName,
[in] DWORD dwClientVersion,
[in, out] DWORD* pdwNegotiatedVersion,
[in, out] LPWLANSVC_RPC_HANDLE phClientHandle);