Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 54952: [PSDK] * Stub _Kernel_acquires_resource_ and _Maybe_raises_SEH_exception_ annotations and add __maybenull_impl.
by akhaldi＠svn.reactos.org 14 Jan '12

14 Jan '12

Author: akhaldi Date: Sat Jan 14 11:27:20 2012 New Revision: 54952 URL: http://svn.reactos.org/svn/reactos?rev=54952&view=rev Log: [PSDK] * Stub _Kernel_acquires_resource_ and _Maybe_raises_SEH_exception_ annotations and add __maybenull_impl. Modified: trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Sat Jan 14 11:27:20 2012 @@ -138,4 +138,5 @@ #define _Kernel_releases_resource_(kind) #define _Kernel_requires_resource_held_(kind) #define _Kernel_requires_resource_not_held_(kind) +#define _Kernel_acquires_resource_(kind) Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=549… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Jan 14 11:27:20 2012 @@ -268,6 +268,7 @@ #define __null_impl_notref _Notref_ _Null_ #define __notnull_impl _Notnull_ #define __notnull_impl_notref _Notref_ _Notnull_ +#define __maybenull_impl __inner_exceptthat _Maybenull_ #define __maybenull_impl_notref _Notref_ __inner_exceptthat _Maybenull_ #define __valid_impl __declspec("SAL_valid") // __declspec("SAL_valid(__yes)") #define __maybevalid_impl __declspec("SAL_maybevalid") // __declspec("SAL_valid(__maybe)") @@ -1557,6 +1558,7 @@ #define _Prepost_z_ #define _Printf_format_string_ #define _Raises_SEH_exception_ +#define _Maybe_raises_SEH_exception_ #define _Readable_bytes_(size) #define _Readable_elements_(size) #define _Reserved_

1 0

[akhaldi] 54951: [DDK] * Add fltwinerror.h
by akhaldi＠svn.reactos.org 14 Jan '12

14 Jan '12

Author: akhaldi Date: Sat Jan 14 11:16:50 2012 New Revision: 54951 URL: http://svn.reactos.org/svn/reactos?rev=54951&view=rev Log: [DDK] * Add fltwinerror.h Added: trunk/reactos/include/ddk/fltwinerror.h (with props) Added: trunk/reactos/include/ddk/fltwinerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/fltwinerror.h?… ============================================================================== --- trunk/reactos/include/ddk/fltwinerror.h (added) +++ trunk/reactos/include/ddk/fltwinerror.h [iso-8859-1] Sat Jan 14 11:16:50 2012 @@ -1,0 +1,67 @@ +/* + * fltwinerror.h + * + * This file is part of the ReactOS DDK package. + * + * Contributors: + * Amine Khaldi (amine.khaldi(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 + +#ifndef _FLT_WINERROR_ +#define _FLT_WINERROR_ + +#if NTDDI_VERSION < NTDDI_VISTA + +#if !defined(FACILITY_USERMODE_FILTER_MANAGER) + +#define FILTER_HRESULT_FROM_FLT_NTSTATUS(x) \ + (NT_ASSERT((x & 0xfff0000) == 0x001c0000),(HRESULT) (((x) & 0x8000FFFF) | (FACILITY_USERMODE_FILTER_MANAGER << 16))) + +#define FACILITY_USERMODE_FILTER_MANAGER 0x1F + +#define ERROR_FLT_IO_COMPLETE ((HRESULT)0x001F0001L) +#define ERROR_FLT_NO_HANDLER_DEFINED ((HRESULT)0x801F0001L) +#define ERROR_FLT_CONTEXT_ALREADY_DEFINED ((HRESULT)0x801F0002L) +#define ERROR_FLT_INVALID_ASYNCHRONOUS_REQUEST ((HRESULT)0x801F0003L) +#define ERROR_FLT_DISALLOW_FAST_IO ((HRESULT)0x801F0004L) +#define ERROR_FLT_INVALID_NAME_REQUEST ((HRESULT)0x801F0005L) +#define ERROR_FLT_NOT_SAFE_TO_POST_OPERATION ((HRESULT)0x801F0006L) +#define ERROR_FLT_NOT_INITIALIZED ((HRESULT)0x801F0007L) +#define ERROR_FLT_FILTER_NOT_READY ((HRESULT)0x801F0008L) +#define ERROR_FLT_POST_OPERATION_CLEANUP ((HRESULT)0x801F0009L) +#define ERROR_FLT_INTERNAL_ERROR ((HRESULT)0x801F000AL) +#define ERROR_FLT_DELETING_OBJECT ((HRESULT)0x801F000BL) +#define ERROR_FLT_MUST_BE_NONPAGED_POOL ((HRESULT)0x801F000CL) +#define ERROR_FLT_DUPLICATE_ENTRY ((HRESULT)0x801F000DL) +#define ERROR_FLT_CBDQ_DISABLED ((HRESULT)0x801F000EL) +#define ERROR_FLT_DO_NOT_ATTACH ((HRESULT)0x801F000FL) +#define ERROR_FLT_DO_NOT_DETACH ((HRESULT)0x801F0010L) +#define ERROR_FLT_INSTANCE_ALTITUDE_COLLISION ((HRESULT)0x801F0011L) +#define ERROR_FLT_INSTANCE_NAME_COLLISION ((HRESULT)0x801F0012L) +#define ERROR_FLT_FILTER_NOT_FOUND ((HRESULT)0x801F0013L) +#define ERROR_FLT_VOLUME_NOT_FOUND ((HRESULT)0x801F0014L) +#define ERROR_FLT_INSTANCE_NOT_FOUND ((HRESULT)0x801F0015L) +#define ERROR_FLT_CONTEXT_ALLOCATION_NOT_FOUND ((HRESULT)0x801F0016L) +#define ERROR_FLT_INVALID_CONTEXT_REGISTRATION ((HRESULT)0x801F0017L) +#define ERROR_FLT_NAME_CACHE_MISS ((HRESULT)0x801F0018L) +#define ERROR_FLT_NO_DEVICE_OBJECT ((HRESULT)0x801F0019L) +#define ERROR_FLT_VOLUME_ALREADY_MOUNTED ((HRESULT)0x801F001AL) +#define ERROR_FLT_NO_WAITER_FOR_REPLY ((HRESULT)0x801F0020L) + +#endif /* !defined(FACILITY_USERMODE_FILTER_MANAGER) */ + +#endif /* NTDDI_VERSION < NTDDI_VISTA */ + +#endif /* _FLT_WINERROR_ */ Propchange: trunk/reactos/include/ddk/fltwinerror.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 54950: [CMAKE] * CreateBootSectorTarget2: Properly set the C compiler for both normal and prefast modes.
by akhaldi＠svn.reactos.org 14 Jan '12

14 Jan '12

Author: akhaldi Date: Sat Jan 14 11:15:33 2012 New Revision: 54950 URL: http://svn.reactos.org/svn/reactos?rev=54950&view=rev Log: [CMAKE] * CreateBootSectorTarget2: Properly set the C compiler for both normal and prefast modes. 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=54950… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Jan 14 11:15:33 2012 @@ -207,7 +207,7 @@ add_custom_command( OUTPUT ${_temp_file} - COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} + COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} DEPENDS ${_asm_file}) add_custom_command(

1 0

[akhaldi] 54949: [NTOSKRNL] * Use a different variable for the inside loop.
by akhaldi＠svn.reactos.org 14 Jan '12

14 Jan '12

Author: akhaldi Date: Sat Jan 14 11:14:40 2012 New Revision: 54949 URL: http://svn.reactos.org/svn/reactos?rev=54949&view=rev Log: [NTOSKRNL] * Use a different variable for the inside loop. Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=5494… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Jan 14 11:14:40 2012 @@ -434,7 +434,7 @@ KeGetBugMessageText(IN ULONG BugCheckCode, OUT PANSI_STRING OutputString OPTIONAL) { - ULONG i; + ULONG i, j; ULONG IdOffset; ULONG_PTR MessageEntry; PCHAR BugCode; @@ -457,7 +457,7 @@ IdOffset = BugCheckCode - KiBugCodeMessages->Blocks[i].LowId; /* Get offset to ID */ - for (i = 0; i < IdOffset; i++) + for (j = 0; j < IdOffset; j++) { /* Advance in the Entries */ MessageEntry += ((PMESSAGE_RESOURCE_ENTRY)MessageEntry)->

1 0

[rharabien] 54948: [SHELL32] - Move folder properties to CFileDefExt class and share as much code as possible. Now changing file attributes is implemented. - Fix a warning (patch by EDIJS - #6821) ...
by rharabien＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: rharabien Date: Fri Jan 13 23:41:09 2012 New Revision: 54948 URL: http://svn.reactos.org/svn/reactos?rev=54948&view=rev Log: [SHELL32] - Move folder properties to CFileDefExt class and share as much code as possible. Now changing file attributes is implemented. - Fix a warning (patch by EDIJS - #6821) - Load property sheet handlers from "Directory" key Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp trunk/reactos/dll/win32/shell32/filedefext.h trunk/reactos/dll/win32/shell32/folder_options.cpp trunk/reactos/dll/win32/shell32/fprop.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/openwithmenu.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… Modified: trunk/reactos/dll/win32/shell32/filedefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… Modified: trunk/reactos/dll/win32/shell32/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… Modified: trunk/reactos/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.cp… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith…

1 0

[cgutman] 54947: [NETCFGX] - Always flush default gateways because pOldConfig->Gw may be NULL if the adapter was DHCP configured
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 23:39:44 2012 New Revision: 54947 URL: http://svn.reactos.org/svn/reactos?rev=54947&view=rev Log: [NETCFGX] - Always flush default gateways because pOldConfig->Gw may be NULL if the adapter was DHCP configured Modified: branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c Modified: branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/netcfgx/… ============================================================================== --- branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Fri Jan 13 23:39:44 2012 @@ -3230,28 +3230,25 @@ } } - if (pOldConfig->Gw) - { - dwSize = 0; - if (GetIpForwardTable(NULL, &dwSize, FALSE) == ERROR_INSUFFICIENT_BUFFER) - { - DWORD Index; - PMIB_IPFORWARDTABLE pIpForwardTable = (PMIB_IPFORWARDTABLE)CoTaskMemAlloc(dwSize); - if (pIpForwardTable) + dwSize = 0; + if (GetIpForwardTable(NULL, &dwSize, FALSE) == ERROR_INSUFFICIENT_BUFFER) + { + DWORD Index; + PMIB_IPFORWARDTABLE pIpForwardTable = (PMIB_IPFORWARDTABLE)CoTaskMemAlloc(dwSize); + if (pIpForwardTable) + { + if (GetIpForwardTable(pIpForwardTable, &dwSize, FALSE) == NO_ERROR) { - if (GetIpForwardTable(pIpForwardTable, &dwSize, FALSE) == NO_ERROR) + for (Index = 0; Index < pIpForwardTable->dwNumEntries; Index++) { - for (Index = 0; Index < pIpForwardTable->dwNumEntries; Index++) + if (pIpForwardTable->table[Index].dwForwardIfIndex == pOldConfig->Index && + pIpForwardTable->table[Index].dwForwardDest == 0) { - if (pIpForwardTable->table[Index].dwForwardIfIndex == pOldConfig->Index && - pIpForwardTable->table[Index].dwForwardDest == 0) - { - DeleteIpForwardEntry(&pIpForwardTable->table[Index]); - } + DeleteIpForwardEntry(&pIpForwardTable->table[Index]); } } - CoTaskMemFree(pIpForwardTable); } + CoTaskMemFree(pIpForwardTable); } }

1 0

[cgutman] 54946: [TCPIP] - Fix adding a static interface route
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 23:23:58 2012 New Revision: 54946 URL: http://svn.reactos.org/svn/reactos?rev=54946&view=rev Log: [TCPIP] - Fix adding a static interface route Modified: branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c Modified: branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/tc… ============================================================================== --- branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Jan 13 23:23:58 2012 @@ -638,9 +638,6 @@ TRUE); AddrInitIPv4(&Interface->Unicast, inet_addr(RegistryDataA.Buffer)); - - if (!AddrIsUnspecified(&Interface->Unicast)) - IPAddInterfaceRoute(Interface); RtlFreeAnsiString(&RegistryDataA); } @@ -663,6 +660,13 @@ RtlFreeAnsiString(&RegistryDataA); } + + /* We have to wait until both IP address and subnet mask + * are read to add the interface route, but we must do it + * before we add the default gateway */ + if (!AddrIsUnspecified(&Interface->Unicast) && + !AddrIsUnspecified(&Interface->Netmask)) + IPAddInterfaceRoute(Interface); /* Read default gateway info */ Status = ZwQueryValueKey(ParameterHandle,

1 0

[cgutman] 54945: [DHCPCSVC] - Adapt the reconnect hack to also enable DHCP when transitioning from static configuration to DHCP enabled via netcfgx
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 22:56:22 2012 New Revision: 54945 URL: http://svn.reactos.org/svn/reactos?rev=54945&view=rev Log: [DHCPCSVC] - Adapt the reconnect hack to also enable DHCP when transitioning from static configuration to DHCP enabled via netcfgx Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/dhcpcsvc… ============================================================================== --- branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Fri Jan 13 22:56:22 2012 @@ -210,10 +210,11 @@ proto = find_protocol_by_adapter(&Adapter->DhclientInfo); - if (!proto) + if (Adapter->DhclientInfo.client->state == S_BOUND && !proto) return FALSE; - if (Adapter->DhclientInfo.client->state != S_BOUND) + if (Adapter->DhclientInfo.client->state != S_BOUND && + Adapter->DhclientInfo.client->state != S_STATIC) return FALSE; ApiUnlock(); @@ -331,7 +332,8 @@ { /* This handles a disconnect/reconnect */ - remove_protocol(proto); + if (proto) + remove_protocol(proto); Adapter->DhclientInfo.client->state = S_INIT; /* These are already invalid since the media state change */

1 0

[cgutman] 54944: [TCPIP] - Queue a work item from the ProtocolStatus handler so we can refresh the state from the registry instead relying on hacks to track our state
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 22:38:28 2012 New Revision: 54944 URL: http://svn.reactos.org/svn/reactos?rev=54944&view=rev Log: [TCPIP] - Queue a work item from the ProtocolStatus handler so we can refresh the state from the registry instead relying on hacks to track our state Modified: branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c branches/wlan-bringup/drivers/network/tcpip/include/ip.h branches/wlan-bringup/drivers/network/tcpip/include/lan.h branches/wlan-bringup/drivers/network/tcpip/tcpip/dispatch.c branches/wlan-bringup/lib/drivers/ip/network/ip.c Modified: branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/tc… ============================================================================== --- branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Jan 13 22:38:28 2012 @@ -23,6 +23,11 @@ UINT BytesTransferred; BOOLEAN LegacyReceive; } LAN_WQ_ITEM, *PLAN_WQ_ITEM; + +typedef struct _RECONFIGURE_CONTEXT { + ULONG State; + PLAN_ADAPTER Adapter; +} RECONFIGURE_CONTEXT, *PRECONFIGURE_CONTEXT; NDIS_HANDLE NdisProtocolHandle = (NDIS_HANDLE)NULL; BOOLEAN ProtocolRegistered = FALSE; @@ -571,6 +576,9 @@ ANSI_STRING RegistryDataA; ULONG Unused; NTSTATUS Status; + IP_ADDRESS DefaultMask, Router; + + AddrInitIPv4(&DefaultMask, 0); TcpipRegistryPath.MaximumLength = sizeof(WCHAR) * 150; TcpipRegistryPath.Length = 0; @@ -591,8 +599,7 @@ if (!NT_SUCCESS(Status)) { - Interface->DhcpEnabled = TRUE; - return TRUE; + return FALSE; } else { @@ -630,10 +637,12 @@ &RegistryDataU, TRUE); - AddrInitIPv4(&Interface->StaticUnicast, inet_addr(RegistryDataA.Buffer)); + AddrInitIPv4(&Interface->Unicast, inet_addr(RegistryDataA.Buffer)); + + if (!AddrIsUnspecified(&Interface->Unicast)) + IPAddInterfaceRoute(Interface); RtlFreeAnsiString(&RegistryDataA); - } Status = ZwQueryValueKey(ParameterHandle, @@ -650,7 +659,7 @@ &RegistryDataU, TRUE); - AddrInitIPv4(&Interface->StaticNetmask, inet_addr(RegistryDataA.Buffer)); + AddrInitIPv4(&Interface->Netmask, inet_addr(RegistryDataA.Buffer)); RtlFreeAnsiString(&RegistryDataA); } @@ -670,16 +679,13 @@ &RegistryDataU, TRUE); - AddrInitIPv4(&Interface->StaticRouter, inet_addr(RegistryDataA.Buffer)); + AddrInitIPv4(&Router, inet_addr(RegistryDataA.Buffer)); + + if (!AddrIsUnspecified(&Router)) + RouterCreateRoute(&DefaultMask, &DefaultMask, &Router, Interface, 1); RtlFreeAnsiString(&RegistryDataA); } - - Interface->DhcpEnabled = FALSE; - } - else - { - Interface->DhcpEnabled = TRUE; } ZwClose(ParameterHandle); @@ -688,38 +694,27 @@ return TRUE; } -BOOLEAN ReconfigureAdapter(PLAN_ADAPTER Adapter, BOOLEAN FinishedReset) -{ +BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) +{ + PLAN_ADAPTER Adapter = Context->Adapter; PIP_INTERFACE Interface = Adapter->Context; //NDIS_STATUS NdisStatus; IP_ADDRESS DefaultMask; /* Initalize the default unspecified address (0.0.0.0) */ AddrInitIPv4(&DefaultMask, 0); - if (Adapter->State == LAN_STATE_STARTED && !FinishedReset) + if (Context->State == LAN_STATE_STARTED && + !Context->Adapter->CompletingReset) { - /* Set the static IP configuration */ - if (!Interface->DhcpEnabled) - { - /* Reset the IP information */ - Interface->Unicast = Interface->StaticUnicast; - Interface->Netmask = Interface->StaticNetmask; - - /* Compute the broadcast address */ - Interface->Broadcast.Type = IP_ADDRESS_V4; - Interface->Broadcast.Address.IPv4Address = Interface->Unicast.Address.IPv4Address | - ~Interface->Netmask.Address.IPv4Address; - - /* Add the interface route for a static IP */ - if (!AddrIsUnspecified(&Interface->Unicast)) - IPAddInterfaceRoute(Interface); - - /* Add the default route */ - if (!AddrIsUnspecified(&Interface->StaticRouter)) - RouterCreateRoute(&DefaultMask, &DefaultMask, &Interface->StaticRouter, Interface, 1); - } - } - else if (!FinishedReset) + /* Read the IP configuration */ + ReadIpConfiguration(Interface); + + /* Compute the broadcast address */ + Interface->Broadcast.Type = IP_ADDRESS_V4; + Interface->Broadcast.Address.IPv4Address = Interface->Unicast.Address.IPv4Address | + ~Interface->Netmask.Address.IPv4Address; + } + else if (!Context->Adapter->CompletingReset) { /* Clear IP configuration */ Interface->Unicast = DefaultMask; @@ -732,9 +727,15 @@ /* Destroy all cached neighbors */ NBDestroyNeighborsForInterface(Interface); } + + Context->Adapter->CompletingReset = FALSE; /* We're done here if the adapter isn't connected */ - if (Adapter->State != LAN_STATE_STARTED) return TRUE; + if (Context->State != LAN_STATE_STARTED) + { + Adapter->State = Context->State; + return TRUE; + } /* NDIS Bug! */ #if 0 @@ -770,8 +771,21 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) return FALSE; #endif + + Adapter->State = Context->State; return TRUE; +} + +VOID ReconfigureAdapterWorker(PVOID Context) +{ + PRECONFIGURE_CONTEXT ReconfigureContext = Context; + + /* Complete the reconfiguration asynchronously */ + ReconfigureAdapter(ReconfigureContext); + + /* Free the context */ + ExFreePool(ReconfigureContext); } VOID NTAPI ProtocolStatus( @@ -789,8 +803,15 @@ */ { PLAN_ADAPTER Adapter = BindingContext; + PRECONFIGURE_CONTEXT Context; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + + Context = ExAllocatePool(NonPagedPool, sizeof(RECONFIGURE_CONTEXT)); + if (!Context) + return; + + Context->Adapter = Adapter; switch(GeneralStatus) { @@ -798,36 +819,47 @@ DbgPrint("NDIS_STATUS_MEDIA_CONNECT\n"); if (Adapter->State == LAN_STATE_STARTED) - break; - - Adapter->OldState = Adapter->State; - Adapter->State = LAN_STATE_STARTED; + { + ExFreePool(Context); + return; + } + + Context->State = LAN_STATE_STARTED; break; case NDIS_STATUS_MEDIA_DISCONNECT: DbgPrint("NDIS_STATUS_MEDIA_DISCONNECT\n"); if (Adapter->State == LAN_STATE_STOPPED) - break; + { + ExFreePool(Context); + return; + } - Adapter->OldState = Adapter->State; - Adapter->State = LAN_STATE_STOPPED; + Context->State = LAN_STATE_STOPPED; break; case NDIS_STATUS_RESET_START: Adapter->OldState = Adapter->State; Adapter->State = LAN_STATE_RESETTING; /* Nothing else to do here */ - break; + ExFreePool(Context); + return; case NDIS_STATUS_RESET_END: - Adapter->State = Adapter->OldState; + Adapter->CompletingReset = TRUE; + Context->State = Adapter->OldState; break; default: DbgPrint("Unhandled status: %x", GeneralStatus); - break; - } + ExFreePool(Context); + return; + } + + /* Queue the work item */ + if (!ChewCreate(ReconfigureAdapterWorker, Context)) + ExFreePool(Context); } VOID NTAPI ProtocolStatusComplete(NDIS_HANDLE NdisBindingContext) @@ -837,15 +869,7 @@ * BindingContext = Pointer to a device context (LAN_ADAPTER) */ { - PLAN_ADAPTER Adapter = NdisBindingContext; - TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - - if (Adapter->State != LAN_STATE_RESETTING) - { - ReconfigureAdapter(Adapter, - (Adapter->State == Adapter->OldState)); - } } NDIS_STATUS NTAPI @@ -1361,14 +1385,7 @@ IPRegisterInterface(IF); /* Set adapter state */ - Adapter->State = LAN_STATE_STARTED; Adapter->Context = IF; - - /* Read adapter IP configuration */ - ReadIpConfiguration(IF); - - /* Configure the adapter */ - ReconfigureAdapter(Adapter, FALSE); /* Set packet filter so we can send and receive packets */ NdisStatus = NDISCall(Adapter, @@ -1383,6 +1400,9 @@ IPDestroyInterface(IF); return FALSE; } + + /* Indicate media connect (our drivers are broken and don't do this) */ + ProtocolStatus(Adapter, NDIS_STATUS_MEDIA_CONNECT, NULL, 0); return TRUE; } Modified: branches/wlan-bringup/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/tc… ============================================================================== --- branches/wlan-bringup/drivers/network/tcpip/include/ip.h [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/tcpip/include/ip.h [iso-8859-1] Fri Jan 13 22:38:28 2012 @@ -156,12 +156,10 @@ UINT MinFrameSize; /* Minimum frame size in bytes */ UINT MTU; /* Maximum transmission unit */ UINT Speed; /* Link speed */ - IP_ADDRESS Unicast, StaticUnicast;/* Unicast address */ - IP_ADDRESS PointToPoint, StaticPointToPoint;/* Point to point address */ - IP_ADDRESS Netmask, StaticNetmask;/* Netmask */ + IP_ADDRESS Unicast; /* Unicast address */ + IP_ADDRESS PointToPoint; /* Point to point address */ + IP_ADDRESS Netmask; /* Netmask */ IP_ADDRESS Broadcast; /* Broadcast */ - IP_ADDRESS StaticRouter; /* Static default route */ - BOOLEAN DhcpEnabled; /* DHCP enabled */ UNICODE_STRING Name; /* Adapter name (GUID) */ UNICODE_STRING Description; /* Adapter description (Human readable) */ PUCHAR Address; /* Pointer to interface address */ Modified: branches/wlan-bringup/drivers/network/tcpip/include/lan.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/tc… ============================================================================== --- branches/wlan-bringup/drivers/network/tcpip/include/lan.h [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/tcpip/include/lan.h [iso-8859-1] Fri Jan 13 22:38:28 2012 @@ -40,6 +40,7 @@ LIST_ENTRY ListEntry; /* Entry on list */ KSPIN_LOCK Lock; /* Lock for this structure */ UCHAR State, OldState; /* State of the adapter */ + BOOLEAN CompletingReset; /* Reset is finishing */ KEVENT Event; /* Opening event */ PVOID Context; /* Upper layer context information */ NDIS_HANDLE NdisHandle; /* NDIS binding handle */ Modified: branches/wlan-bringup/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/tc… ============================================================================== --- branches/wlan-bringup/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Jan 13 22:38:28 2012 @@ -1552,11 +1552,9 @@ IF->Unicast.Type = IP_ADDRESS_V4; IF->Unicast.Address.IPv4Address = IpAddrChange->Address; - IF->StaticUnicast = IF->Unicast; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = IpAddrChange->Netmask; - IF->StaticNetmask = IF->Netmask; IF->Broadcast.Type = IP_ADDRESS_V4; IF->Broadcast.Address.IPv4Address = @@ -1568,7 +1566,6 @@ TI_DbgPrint(MID_TRACE,("New Netmask : %x\n", IF->Netmask.Address.IPv4Address)); - IF->DhcpEnabled = FALSE; IPAddInterfaceRoute( IF ); IpAddrChange->Address = IF->Index; @@ -1592,16 +1589,13 @@ IPRemoveInterfaceRoute( IF ); IF->Unicast.Type = IP_ADDRESS_V4; IF->Unicast.Address.IPv4Address = 0; - IF->StaticUnicast = IF->Unicast; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = 0; - IF->StaticNetmask = IF->Netmask; IF->Broadcast.Type = IP_ADDRESS_V4; IF->Broadcast.Address.IPv4Address = 0; - IF->DhcpEnabled = TRUE; Status = STATUS_SUCCESS; } } EndFor(IF); Modified: branches/wlan-bringup/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/lib/drivers/ip/net… ============================================================================== --- branches/wlan-bringup/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ branches/wlan-bringup/lib/drivers/ip/network/ip.c [iso-8859-1] Fri Jan 13 22:38:28 2012 @@ -214,7 +214,6 @@ IF->PointToPoint.Type = IP_ADDRESS_V4; IF->Netmask.Type = IP_ADDRESS_V4; IF->Broadcast.Type = IP_ADDRESS_V4; - IF->StaticRouter.Type = IP_ADDRESS_V4; TcpipInitializeSpinLock(&IF->Lock);

1 0

[khornicek] 54943: [SERVMAN] Improve the button bitmaps so they look consistent in both enabled and disabled state.
by khornicek＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: khornicek Date: Fri Jan 13 21:47:22 2012 New Revision: 54943 URL: http://svn.reactos.org/svn/reactos?rev=54943&view=rev Log: [SERVMAN] Improve the button bitmaps so they look consistent in both enabled and disabled state. Modified: trunk/reactos/base/applications/mscutils/servman/res/pause.bmp trunk/reactos/base/applications/mscutils/servman/res/restart.bmp trunk/reactos/base/applications/mscutils/servman/res/start.bmp trunk/reactos/base/applications/mscutils/servman/res/stop.bmp Modified: trunk/reactos/base/applications/mscutils/servman/res/pause.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mscutils/servman/res/restart.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mscutils/servman/res/start.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mscutils/servman/res/stop.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available.

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