Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54942: [IPHLPAPI] - Store the NTEContext in the IP address list so netcfgx can remove IP addresses - Fixes routing after manually setting an IP address
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 20:55:26 2012 New Revision: 54942 URL: http://svn.reactos.org/svn/reactos?rev=54942&view=rev Log: [IPHLPAPI] - Store the NTEContext in the IP address list so netcfgx can remove IP addresses - Fixes routing after manually setting an IP address Modified: branches/wlan-bringup/dll/win32/iphlpapi/iphlpapi_main.c Modified: branches/wlan-bringup/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/iphlpapi… ============================================================================== --- branches/wlan-bringup/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Fri Jan 13 20:55:26 2012 @@ -639,6 +639,7 @@ ptr->IpAddressList.IpAddress.String); toIPAddressString(getInterfaceMaskByIndex(table->indexes[ndx]), ptr->IpAddressList.IpMask.String); + ptr->IpAddressList.Context = ptr->Index; toIPAddressString(getInterfaceGatewayByIndex(table->indexes[ndx]), ptr->GatewayList.IpAddress.String); getDhcpInfoForAdapter(table->indexes[ndx], &dhcpEnabled,

1 0

[cgutman] 54941: [IPHLPAPI] - Fix incorrect interface indexes in the routing table returned from GetIpForwardTable
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 19:57:20 2012 New Revision: 54941 URL: http://svn.reactos.org/svn/reactos?rev=54941&view=rev Log: [IPHLPAPI] - Fix incorrect interface indexes in the routing table returned from GetIpForwardTable Modified: branches/wlan-bringup/dll/win32/iphlpapi/iphlpapi_main.c Modified: branches/wlan-bringup/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/iphlpapi… ============================================================================== --- branches/wlan-bringup/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Fri Jan 13 19:57:20 2012 @@ -1189,7 +1189,7 @@ pIpForwardTable->dwNumEntries = table->numRoutes; for (ndx = 0; ndx < numRoutes; ndx++) { pIpForwardTable->table[ndx].dwForwardIfIndex = - table->routes[ndx].ifIndex + 1; + table->routes[ndx].ifIndex; pIpForwardTable->table[ndx].dwForwardDest = table->routes[ndx].dest; pIpForwardTable->table[ndx].dwForwardMask =

1 0

[tkreuzer] 54940: [PSDK] - add missing stubs to driverspecs.h - Add concurrencysal.h - add some missing definitions to sal.h and specstrings.h
by tkreuzer＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: tkreuzer Date: Fri Jan 13 19:01:47 2012 New Revision: 54940 URL: http://svn.reactos.org/svn/reactos?rev=54940&view=rev Log: [PSDK] - add missing stubs to driverspecs.h - Add concurrencysal.h - add some missing definitions to sal.h and specstrings.h Added: trunk/reactos/include/psdk/concurrencysal.h (with props) Modified: trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/sal.h trunk/reactos/include/psdk/specstrings.h Added: trunk/reactos/include/psdk/concurrencysal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/concurrencysa… ============================================================================== --- trunk/reactos/include/psdk/concurrencysal.h (added) +++ trunk/reactos/include/psdk/concurrencysal.h [iso-8859-1] Fri Jan 13 19:01:47 2012 @@ -1,0 +1,32 @@ +/* + * concurrencysal.h + * + * Standard Annotation Language (SAL) definitions for synchronisation + * + * This file is part of the ReactOS PSDK 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. + * + */ + + + +#define _Requires_lock_held_(lock) +#define _Requires_lock_not_held_(lock) +#define _Acquires_lock_(lock) +#define _Acquires_shared_lock_(lock) +#define _Acquires_exclusive_lock_(lock) +#define _Releases_lock_(lock) +#define _Post_same_lock_(lock1,lock2) + Propchange: trunk/reactos/include/psdk/concurrencysal.h ------------------------------------------------------------------------------ svn:eol-style = native 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] Fri Jan 13 19:01:47 2012 @@ -6,24 +6,136 @@ * allow drivers using them to compile with our header set. */ +#pragma once +#define DRIVERSPECS_H + +#ifndef SPECSTRINGS_H +#include <specstrings.h> +#endif + +#include <concurrencysal.h> + // // Stubs // +#define ___drv_unit_internal_kernel_driver +#define ___drv_unit_kernel_code +#define ___drv_unit_kernel_driver +#define ___drv_unit_user_code +#define ___drv_unit_user_driver +#define __drv_acquiresCancelSpinLock +#define __drv_acquiresCriticalRegion +#define __drv_acquiresExclusiveResource(kind) +#define __drv_acquiresExclusiveResourceGlobal(kind,param) +#define __drv_acquiresPriorityRegion +#define __drv_acquiresResource(kind) +#define __drv_acquiresResourceGlobal(kind,param) +#define __drv_aliasesMem +#define __drv_allocatesMem(kind) +#define __drv_arg(expr,annotes) +#define __drv_at(expr,annotes) +#define __drv_callbackType(kind) +#define __drv_clearDoInit +#define __drv_completionType(kindlist) +#define __drv_constant +#define __drv_defined(x) +#define __drv_deref(annotes) +#define __drv_dispatchType_other #define __drv_dispatchType(x) -#define __drv_dispatchType_other +#define __drv_floatRestored +#define __drv_floatSaved +#define __drv_floatUsed +#define __drv_formatString(kind) +#define __drv_freesMem(kind) +#define __drv_fun(annotes) +#define __drv_functionClass +#define __drv_holdsCancelSpinLock() +#define __drv_holdsCriticalRegion() +#define __drv_holdsPriorityRegion() +#define __drv_in_deref(annotes) +#define __drv_in(annotes) +#define __drv_innerAcquiresGlobal(kind,param) +#define __drv_innerMustHoldGlobal(kind,param) +#define __drv_innerNeverHoldGlobal(kind,param) +#define __drv_innerReleasesGlobal(kind,param) +#define __drv_interlocked +#define __drv_IoGetDmaAdapter +#define __drv_isCancelIRQL +#define __drv_isObjectPointer +#define __drv_KMDF +#define __drv_maxFunctionIRQL +#define __drv_maxIRQL +#define __drv_minFunctionIRQL +#define __drv_minIRQL +#define __drv_Mode_impl(x) +#define __drv_mustHold(kind) +#define __drv_mustHoldCancelSpinLock +#define __drv_mustHoldCriticalRegion +#define __drv_mustHoldGlobal(kind,param) +#define __drv_mustHoldPriorityRegion +#define __drv_NDIS +#define __drv_neverHold(kind) +#define __drv_neverHoldCancelSpinLock +#define __drv_neverHoldCriticalRegion +#define __drv_neverHoldGlobal(kind,param) +#define __drv_neverHoldPriorityRegion +#define __drv_nonConstant +#define __drv_notInTry +#define __drv_notPointer +#define __drv_out_deref(annotes) +#define __drv_out(annotes) +#define __drv_preferredFunction(func,why) +#define __drv_raisesIRQL +#define __drv_releasesCancelSpinLock +#define __drv_releasesCriticalRegion +#define __drv_releasesExclusiveResource(kind) +#define __drv_releasesExclusiveResourceGlobal(kind,param) +#define __drv_releasesPriorityRegion +#define __drv_releasesResource(kind) +#define __drv_releasesResourceGlobal(kind,param) +#define __drv_reportError(why) +#define __drv_requiresIRQL +#define __drv_restoresIRQL +#define __drv_restoresIRQLGlobal +#define __drv_ret(annotes) +#define __drv_sameIRQL +#define __drv_savesIRQL +#define __drv_savesIRQLGlobal +#define __drv_setsIRQL(irql) +#define __drv_strictType(typename,mode) +#define __drv_strictTypeMatch(mode) +#define __drv_unit(p) +#define __drv_useCancelIRQL +#define __drv_valueIs(arglist) +#define __drv_WDM +#define __drv_when(cond,annotes) +#define __internal_kernel_driver +#define __kernel_code +#define __kernel_driver +#define __prefast_operator_new_null +#define __prefast_operator_new_throws +#define __user_code +#define __user_driver +#define _Dispatch_type_ +#define _IRQL_always_function_max_(irql) +#define _IRQL_always_function_min_(irql) +#define _IRQL_is_cancel_ +#define _IRQL_raises_(irql) +#define _IRQL_requires_(irql) +#define _IRQL_requires_max_(irql) +#define _IRQL_requires_min_(irql) +#define _IRQL_requires_same_ +#define _IRQL_restores_ +#define _IRQL_restores_global_(kind,param) +#define _IRQL_saves_ +#define _IRQL_saves_global_(kind,param) +#define _IRQL_uses_cancel_ +#define _Kernel_clear_do_init_(yesNo) +#define _Kernel_float_restored_ +#define _Kernel_float_saved_ +#define _Kernel_float_used_ +#define _Kernel_IoGetDmaAdapter_ +#define _Kernel_releases_resource_(kind) +#define _Kernel_requires_resource_held_(kind) +#define _Kernel_requires_resource_not_held_(kind) -// -// FIXME: These annotations are not driver-only and does not belong here -// -#define __in -#define __in_bcount(Size) -#define __in_ecount(Size) - -#define __out -#define __out_bcount(Size) -#define __out_bcount_part(Size, Length) -#define __out_ecount(Size) - -#define __inout - -#define __deref_out_ecount(Size) 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] Fri Jan 13 19:01:47 2012 @@ -391,6 +391,10 @@ #define _Struct_size_bytes_(size) _Writable_bytes_(size) #define _Unchanged_(e) _At_(e, _Post_equal_to_(_Old_(e)) _Const_) #define _Analysis_noreturn_ _SA_annotes0(SAL_terminates) +#define _Function_class_(x) _SA_annotes1(SAL_functionClassNew, #x) +#define _Raises_SEH_exception_ _Group_(_Pre_ _SA_annotes1(SAL_inTry,__yes) _Analysis_noreturn_) +#define _Maybe_raises_SEH_exception_ _Pre_ _SA_annotes1(SAL_inTry,__yes) +#define _Interlocked_operand_ _Pre_ _SA_annotes0(SAL_interlocked) #define _Field_size_(size) _Notnull_ _Writable_elements_(size) #define _Field_size_bytes_(size) _Notnull_ _Writable_bytes_(size) @@ -1185,6 +1189,7 @@ #define _Field_size_part_(size, count) #define _Field_size_part_opt_(size, count) #define _Field_z_ +#define _Function_class_(x) #define _Group_(annos) #define _In_ #define _In_bound_ @@ -1291,9 +1296,11 @@ #define _Inout_z_cap_x_(size) #define _Inout_z_count_(size) #define _Inout_z_count_c_(size) +#define _Interlocked_operand_ #define _Literal_ #define _Maybenull_ #define _Maybevalid_ +#define _Maybe_raises_SEH_exception #define _Must_inspect_result_ #define _Notliteral_ #define _Notnull_ @@ -1549,6 +1556,7 @@ #define _Prepost_valid_ #define _Prepost_z_ #define _Printf_format_string_ +#define _Raises_SEH_exception_ #define _Readable_bytes_(size) #define _Readable_elements_(size) #define _Reserved_ Modified: trunk/reactos/include/psdk/specstrings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/specstrings.h… ============================================================================== --- trunk/reactos/include/psdk/specstrings.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/specstrings.h [iso-8859-1] Fri Jan 13 19:01:47 2012 @@ -24,6 +24,7 @@ #define SPECSTRINGS_H #include <sal.h> +#include <driverspecs.h> #define __field_bcount(size) __notnull __byte_writableTo(size) #define __field_ecount(size) __notnull __elem_writableTo(size) @@ -43,5 +44,7 @@ #define __out_awcount(expr,size) #define __in_awcount(expr,size) #define __nullnullterminated -#define __analysis_assume(expr) +#define __in_data_source(src_sym) +#define __analysis_noreturn +#define __kernel_entry

1 0

[cgutman] 54939: [TCPIP] - Configure route NCEs to never timeout to prevent them from falling out from under the routing code - Fix a typo - Fix detection of duplicate routes [NETCFGX] - Don't dele...
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 18:32:30 2012 New Revision: 54939 URL: http://svn.reactos.org/svn/reactos?rev=54939&view=rev Log: [TCPIP] - Configure route NCEs to never timeout to prevent them from falling out from under the routing code - Fix a typo - Fix detection of duplicate routes [NETCFGX] - Don't delete all routes for an interface when adding a default gateway Modified: branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c branches/wlan-bringup/drivers/network/tcpip/datalink/lan.c branches/wlan-bringup/drivers/network/tcpip/include/neighbor.h branches/wlan-bringup/drivers/network/tcpip/tcpip/dispatch.c branches/wlan-bringup/lib/drivers/ip/network/neighbor.c branches/wlan-bringup/lib/drivers/ip/network/router.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 18:32:30 2012 @@ -3243,7 +3243,8 @@ { for (Index = 0; Index < pIpForwardTable->dwNumEntries; Index++) { - if (pIpForwardTable->table[Index].dwForwardIfIndex == pOldConfig->Index) + if (pIpForwardTable->table[Index].dwForwardIfIndex == pOldConfig->Index && + pIpForwardTable->table[Index].dwForwardDest == 0) { DeleteIpForwardEntry(&pIpForwardTable->table[Index]); } 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 18:32:30 2012 @@ -709,14 +709,14 @@ 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); - - /* Add the interface route for a static IP */ - if (!AddrIsUnspecified(&Interface->Unicast)) - IPAddInterfaceRoute(Interface); } } else if (!FinishedReset) Modified: branches/wlan-bringup/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/tc… ============================================================================== --- branches/wlan-bringup/drivers/network/tcpip/include/neighbor.h [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/tcpip/include/neighbor.h [iso-8859-1] Fri Jan 13 18:32:30 2012 @@ -43,16 +43,16 @@ #define NUD_STALE 0x04 /* Timeout for incomplete NCE ARP requests */ -#define ARP_INCOMPLETE_TIMEOUT 5 +#define ARP_INCOMPLETE_TIMEOUT 3 /* Number of seconds between ARP transmissions */ #define ARP_RATE 900 /* Number of seconds before the NCE times out */ -#define ARP_COMPLETE_TIMEOUT (ARP_RATE + 15) +#define ARP_COMPLETE_TIMEOUT (ARP_RATE + 9) /* Number of seconds before retransmission */ -#define ARP_TIMEOUT_RETRANSMISSION 5 +#define ARP_TIMEOUT_RETRANSMISSION 3 extern NEIGHBOR_CACHE_TABLE NeighborCache[NB_HASHMASK + 1]; @@ -87,7 +87,8 @@ PNEIGHBOR_CACHE_ENTRY NBFindOrCreateNeighbor( PIP_INTERFACE Interface, - PIP_ADDRESS Address); + PIP_ADDRESS Address, + BOOLEAN NoTimeout); BOOLEAN NBQueuePacket( PNEIGHBOR_CACHE_ENTRY NCE, 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 18:32:30 2012 @@ -1596,7 +1596,7 @@ IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = 0; - IF->StaticNetmask = IF->StaticNetmask; + IF->StaticNetmask = IF->Netmask; IF->Broadcast.Type = IP_ADDRESS_V4; IF->Broadcast.Address.IPv4Address = 0; Modified: branches/wlan-bringup/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/lib/drivers/ip/net… ============================================================================== --- branches/wlan-bringup/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ branches/wlan-bringup/lib/drivers/ip/network/neighbor.c [iso-8859-1] Fri Jan 13 18:32:30 2012 @@ -106,17 +106,27 @@ for (PrevNCE = &NeighborCache[i].Cache; (NCE = *PrevNCE) != NULL;) { + if (NCE->State & NUD_INCOMPLETE) + { + /* Solicit for an address */ + NBSendSolicit(NCE); + if (NCE->EventTimer == 0) + { + NCE->EventCount++; + if (NCE->EventCount == ARP_INCOMPLETE_TIMEOUT) + { + NBFlushPacketQueue(NCE, NDIS_STATUS_NETWORK_UNREACHABLE); + NCE->EventCount = 0; + } + } + } + /* Check if event timer is running */ if (NCE->EventTimer > 0) { ASSERT(!(NCE->State & NUD_PERMANENT)); NCE->EventCount++; - if (NCE->State & NUD_INCOMPLETE) - { - /* We desperately need an address in this state or - * we timeout in 5 seconds */ - NBSendSolicit(NCE); - } - else if ((NCE->EventCount > ARP_RATE && + + if ((NCE->EventCount > ARP_RATE && NCE->EventCount % ARP_TIMEOUT_RETRANSMISSION == 0) || (NCE->EventCount == ARP_RATE)) { @@ -129,7 +139,7 @@ if (NCE->EventTimer - NCE->EventCount == 0) { /* Unlink and destroy the NCE */ *PrevNCE = NCE->Next; - + /* Choose the proper failure status */ if (NCE->State & NUD_INCOMPLETE) { @@ -141,8 +151,9 @@ /* This guy was stale for way too long */ Status = NDIS_STATUS_REQUEST_ABORTED; } - + NBFlushPacketQueue(NCE, Status); + ExFreePoolWithTag(NCE, NCE_TAG); continue; @@ -367,7 +378,7 @@ if( !(NCE->State & NUD_INCOMPLETE) ) { - NCE->EventTimer = ARP_COMPLETE_TIMEOUT; + if (NCE->EventTimer) NCE->EventTimer = ARP_COMPLETE_TIMEOUT; NBSendPackets( NCE ); } } @@ -446,7 +457,8 @@ PNEIGHBOR_CACHE_ENTRY NBFindOrCreateNeighbor( PIP_INTERFACE Interface, - PIP_ADDRESS Address) + PIP_ADDRESS Address, + BOOLEAN NoTimeout) /* * FUNCTION: Tries to find a neighbor and if unsuccesful, creates a new NCE * ARGUMENTS: @@ -474,7 +486,7 @@ Interface->AddressLength, NUD_PERMANENT, 0); } else { NCE = NBAddNeighbor(Interface, Address, NULL, - Interface->AddressLength, NUD_INCOMPLETE, ARP_INCOMPLETE_TIMEOUT); + Interface->AddressLength, NUD_INCOMPLETE, NoTimeout ? 0 : ARP_INCOMPLETE_TIMEOUT); if (!NCE) return NULL; NBSendSolicit(NCE); } Modified: branches/wlan-bringup/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/lib/drivers/ip/net… ============================================================================== --- branches/wlan-bringup/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ branches/wlan-bringup/lib/drivers/ip/network/router.c [iso-8859-1] Fri Jan 13 18:32:30 2012 @@ -327,7 +327,7 @@ Interface = FindOnLinkInterface(Destination); if (Interface) { /* The destination address is on-link. Check our neighbor cache */ - NCE = NBFindOrCreateNeighbor(Interface, Destination); + NCE = NBFindOrCreateNeighbor(Interface, Destination, FALSE); } else { /* Destination is not on any subnets we're on. Find a router to use */ NCE = RouterGetRoute(Destination); @@ -454,8 +454,10 @@ NCE = Current->Router; - if( AddrIsEqual(NetworkAddress, &Current->NetworkAddress) && - AddrIsEqual(Netmask, &Current->Netmask) ) { + if(AddrIsEqual(NetworkAddress, &Current->NetworkAddress) && + AddrIsEqual(Netmask, &Current->Netmask) && + NCE->Interface == Interface) + { TI_DbgPrint(DEBUG_ROUTER,("Attempting to add duplicate route to %s\n", A2S(NetworkAddress))); TcpipReleaseSpinLock(&FIBLock, OldIrql); return NULL; @@ -467,7 +469,7 @@ TcpipReleaseSpinLock(&FIBLock, OldIrql); /* The NCE references RouterAddress. The NCE is referenced for us */ - NCE = NBFindOrCreateNeighbor(Interface, RouterAddress); + NCE = NBFindOrCreateNeighbor(Interface, RouterAddress, TRUE); if (!NCE) { /* Not enough free resources */

1 0

[tkreuzer] 54938: [XDK] Fix build
by tkreuzer＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: tkreuzer Date: Fri Jan 13 17:49:40 2012 New Revision: 54938 URL: http://svn.reactos.org/svn/reactos?rev=54938&view=rev Log: [XDK] Fix build Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/xdk/obtypes.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=54… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Jan 13 17:49:40 2012 @@ -817,6 +817,12 @@ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation = 0, ObjectTypeInformation = 2, + /* Not for public use */ + ObjectNameInformation = 1, + ObjectTypesInformation = 3, + ObjectHandleFlagInformation = 4, + ObjectSessionInformation = 5, + MaxObjectInfoClass } OBJECT_INFORMATION_CLASS; Modified: trunk/reactos/include/xdk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/obtypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/obtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/obtypes.h [iso-8859-1] Fri Jan 13 17:49:40 2012 @@ -139,14 +139,14 @@ ObjectBasicInformation = 0, ObjectTypeInformation = 2, $endif (_NTIFS_) -$if (_PRIVATE_) +$if (_NTIFS_) // we should remove these, but the kernel needs them :-/ /* Not for public use */ ObjectNameInformation = 1, ObjectTypesInformation = 3, ObjectHandleFlagInformation = 4, ObjectSessionInformation = 5, MaxObjectInfoClass -$endif (_PRIVATE_) +$endif (_NTIFS_) $if (_NTIFS_) } OBJECT_INFORMATION_CLASS;

1 0

[tkreuzer] 54937: [XDK] - Add some missing NTAPI - move some types into appropriate headers - make sure $endif is followed by (...)
by tkreuzer＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: tkreuzer Date: Fri Jan 13 17:45:26 2012 New Revision: 54937 URL: http://svn.reactos.org/svn/reactos?rev=54937&view=rev Log: [XDK] - Add some missing NTAPI - move some types into appropriate headers - make sure $endif is followed by (...) Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/extypes.h trunk/reactos/include/xdk/iofuncs.h trunk/reactos/include/xdk/iotypes.h trunk/reactos/include/xdk/kdfuncs.h trunk/reactos/include/xdk/kdtypes.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/mmfuncs.h trunk/reactos/include/xdk/ntifs.template.h trunk/reactos/include/xdk/nttmapi.h trunk/reactos/include/xdk/obtypes.h trunk/reactos/include/xdk/psfuncs.h trunk/reactos/include/xdk/pstypes.h trunk/reactos/include/xdk/rtltypes.h trunk/reactos/include/xdk/sefuncs.h trunk/reactos/include/xdk/setypes.h trunk/reactos/include/xdk/zwfuncs.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=54… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -3769,6 +3769,7 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ + /****************************************************************************** * I/O Manager Functions * ******************************************************************************/ Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=54… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -800,6 +800,26 @@ typedef NTSTATUS (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE)( IN PLUID LogonId); + +typedef struct _SECURITY_CLIENT_CONTEXT { + SECURITY_QUALITY_OF_SERVICE SecurityQos; + PACCESS_TOKEN ClientToken; + BOOLEAN DirectlyAccessClientToken; + BOOLEAN DirectAccessEffectiveOnly; + BOOLEAN ServerIsRemote; + TOKEN_CONTROL ClientTokenControl; +} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; + +/****************************************************************************** + * Object Manager Types * + ******************************************************************************/ + +typedef enum _OBJECT_INFORMATION_CLASS { + ObjectBasicInformation = 0, + ObjectTypeInformation = 2, +} OBJECT_INFORMATION_CLASS; + + /****************************************************************************** * Runtime Library Types * ******************************************************************************/ @@ -1886,16 +1906,6 @@ #define RtlOffsetToPointer(B,O) ((PCHAR)(((PCHAR)(B)) + ((ULONG_PTR)(O)))) #define RtlPointerToOffset(B,P) ((ULONG)(((PCHAR)(P)) - ((PCHAR)(B)))) - -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation = 0, - ObjectNameInformation = 1, /* FIXME, not in WDK */ - ObjectTypeInformation = 2, - ObjectTypesInformation = 3, /* FIXME, not in WDK */ - ObjectHandleFlagInformation = 4, /* FIXME, not in WDK */ - ObjectSessionInformation = 5, /* FIXME, not in WDK */ - MaxObjectInfoClass /* FIXME, not in WDK */ -} OBJECT_INFORMATION_CLASS; NTSYSCALLAPI NTSTATUS @@ -4737,18 +4747,12 @@ ULONG Reserved [22]; } PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION; -typedef struct _SECURITY_CLIENT_CONTEXT { - SECURITY_QUALITY_OF_SERVICE SecurityQos; - PACCESS_TOKEN ClientToken; - BOOLEAN DirectlyAccessClientToken; - BOOLEAN DirectAccessEffectiveOnly; - BOOLEAN ServerIsRemote; - TOKEN_CONTROL ClientTokenControl; -} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; - #define SYSTEM_PAGE_PRIORITY_BITS 3 #define SYSTEM_PAGE_PRIORITY_LEVELS (1 << SYSTEM_PAGE_PRIORITY_BITS) +/****************************************************************************** + * Kernel Types * + ******************************************************************************/ typedef struct _KAPC_STATE { LIST_ENTRY ApcListHead[MaximumMode]; PKPROCESS Process; @@ -4769,6 +4773,7 @@ LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + /****************************************************************************** * Kernel Functions * ******************************************************************************/ @@ -4944,7 +4949,8 @@ NTKERNELAPI ULONG -KeRemoveQueueEx ( +NTAPI +KeRemoveQueueEx( IN OUT PKQUEUE Queue, IN KPROCESSOR_MODE WaitMode, IN BOOLEAN Alertable, @@ -10286,6 +10292,9 @@ #include "csq.h" +extern PACL SePublicDefaultDacl; +extern PACL SeSystemDefaultDacl; + #define FS_LFN_APIS 0x00004000 #define FILE_STORAGE_TYPE_SPECIFIED 0x00000041 /* FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE */ Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5493… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -7561,6 +7561,7 @@ extern POBJECT_TYPE NTSYSAPI SeTokenObjectType; extern POBJECT_TYPE NTSYSAPI PsProcessType; + /****************************************************************************** * Process Manager Types * ******************************************************************************/ @@ -7896,6 +7897,7 @@ VOID KeMemoryBarrier(VOID) { + // FIXME: Do we really need lfence after the __faststorefence ? FastFence(); LFENCE_ACQUIRE(); } @@ -10351,12 +10353,14 @@ #if (NTDDI_VERSION >= NTDDI_WS08) PVOID +NTAPI KeRegisterProcessorChangeCallback( IN PPROCESSOR_CALLBACK_FUNCTION CallbackFunction, IN PVOID CallbackContext OPTIONAL, IN ULONG Flags); VOID +NTAPI KeDeregisterProcessorChangeCallback( IN PVOID CallbackHandle); @@ -14757,6 +14761,7 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + #ifndef _NTTMAPI_ #define _NTTMAPI_ Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -815,7 +815,7 @@ $if (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WINXP) -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_) NTKERNELAPI @@ -872,7 +872,7 @@ $endif (_NTIFS_) $if (_WDMDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_WINXPSP2) Modified: trunk/reactos/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/extypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -2,7 +2,7 @@ /****************************************************************************** * Executive Types * ******************************************************************************/ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) #define EX_RUNDOWN_ACTIVE 0x1 #define EX_RUNDOWN_COUNT_SHIFT 0x1 Modified: trunk/reactos/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -2051,7 +2051,7 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_NTDDK_) NTKERNELAPI IO_PAGING_PRIORITY @@ -2084,10 +2084,10 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_NTDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WS03SP1) -$endif +$endif (_NTDDK_ || _NTIFS_) $if (_NTDDK_) BOOLEAN @@ -2111,7 +2111,7 @@ $endif (_NTIFS_) $if (_NTDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WS03SP1) */ -$endif +$endif (_NTDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_VISTA) $if (_WDMDDK_) Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -2,7 +2,7 @@ /****************************************************************************** * I/O Manager Types * ******************************************************************************/ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) @@ -214,7 +214,7 @@ #define DO_SYSTEM_CRITICAL_PARTITION 0x00400000 #define DO_DISALLOW_EXECUTE 0x00800000 -$endif +$endif (_NTDDK_) $if (_WDMDDK_) /* DEVICE_OBJECT.Flags */ #define DO_VERIFY_VOLUME 0x00000002 @@ -254,12 +254,12 @@ #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff -$endif +$endif (_NTDDK_) $if (_WDMDDK_ || _DEVIOCTL_) /* DEVICE_OBJECT.DeviceType */ #define DEVICE_TYPE ULONG -$endif +$endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) typedef struct _DEVICE_OBJECT { CSHORT Type; Modified: trunk/reactos/include/xdk/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kdfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kdfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -9,7 +9,7 @@ IN PCCH Prompt, OUT PCH Response, IN ULONG MaximumResponseLength); -$endif +$endif (_NTDDK_) $if (_WDMDDK_) #ifndef _DBGNT_ @@ -189,4 +189,4 @@ OUT PVOID OutBuffer, OUT PULONG OutBufferNeeded OPTIONAL); #endif -$endif +$endif (_WDMDDK_) Modified: trunk/reactos/include/xdk/kdtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdtypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kdtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kdtypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -91,4 +91,4 @@ IN PVOID Buffer, IN ULONG Offset, IN ULONG Length); -$endif +$endif (_NTDDK_) Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -103,7 +103,7 @@ $endif(_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #if defined(SINGLE_GROUP_LEGACY_API) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) NTKERNELAPI @@ -145,7 +145,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* defined(SINGLE_GROUP_LEGACY_API) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) #if !defined(_M_AMD64) @@ -605,7 +605,7 @@ KeAcquireSpinLockRaiseToSynch( IN OUT PKSPIN_LOCK SpinLock); #endif -$endif +$endif (_NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ @@ -735,7 +735,7 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) NTKERNELAPI @@ -794,10 +794,10 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03SP1) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) NTKERNELAPI @@ -878,7 +878,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03SP1) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_VISTA) $if (_WDMDDK_) @@ -903,7 +903,7 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if defined(SINGLE_GROUP_LEGACY_API) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) NTKERNELAPI @@ -943,7 +943,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* SINGLE_GROUP_LEGACY_API */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_NTIFS_) NTKERNELAPI VOID @@ -953,7 +953,8 @@ NTKERNELAPI ULONG -KeRemoveQueueEx ( +NTAPI +KeRemoveQueueEx( IN OUT PKQUEUE Queue, IN KPROCESSOR_MODE WaitMode, IN BOOLEAN Alertable, @@ -968,12 +969,14 @@ #if (NTDDI_VERSION >= NTDDI_WS08) PVOID +NTAPI KeRegisterProcessorChangeCallback( IN PPROCESSOR_CALLBACK_FUNCTION CallbackFunction, IN PVOID CallbackContext OPTIONAL, IN ULONG Flags); VOID +NTAPI KeDeregisterProcessorChangeCallback( IN PVOID CallbackHandle); @@ -981,7 +984,7 @@ $endif (_WDMDDK_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WIN7) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) ULONG64 @@ -1207,7 +1210,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) #if !defined(_IA64_) NTHALAPI Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -999,7 +999,7 @@ extern PCCHAR KeNumberProcessors; #endif -$endif /* _WDMDDK_ */ +$endif (_WDMDDK_) $if (_NTDDK_) #define NX_SUPPORT_POLICY_ALWAYSOFF 0 @@ -1182,5 +1182,27 @@ extern PCCHAR KeNumberProcessors; #endif -$endif /* _NTDDK_ */ - +$endif (_NTDDK_) +$if (_NTIFS_) +typedef struct _KAPC_STATE { + LIST_ENTRY ApcListHead[MaximumMode]; + PKPROCESS Process; + BOOLEAN KernelApcInProgress; + BOOLEAN KernelApcPending; + BOOLEAN UserApcPending; +} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; + +#define KAPC_STATE_ACTUAL_LENGTH (FIELD_OFFSET(KAPC_STATE, UserApcPending) + sizeof(BOOLEAN)) + +#define ASSERT_QUEUE(Q) ASSERT(((Q)->Header.Type & KOBJECT_TYPE_MASK) == QueueObject); + +typedef struct _KQUEUE { + DISPATCHER_HEADER Header; + LIST_ENTRY EntryListHead; + volatile ULONG CurrentCount; + ULONG MaximumCount; + LIST_ENTRY ThreadListHead; +} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + +$endif (_NTIFS_) + Modified: trunk/reactos/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -591,7 +591,7 @@ $if (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WINXP) -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_) NTKERNELAPI @@ -664,10 +664,10 @@ $if (_WDMDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_ || _NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03) -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) NTKERNELAPI LOGICAL @@ -685,7 +685,7 @@ $endif (_NTDDK_) $if (_WDMDDK_ || _NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ -$endif +$endif (_WDMDDK_ || _NTDDK_) $if (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_WS03SP1) NTKERNELAPI @@ -699,7 +699,7 @@ IN MEMORY_CACHING_TYPE CacheType, IN ULONG Flags); #endif -$endif +$endif (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_VISTA) $if (_WDMDDK_) Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -62,18 +62,9 @@ typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; $include (setypes.h) +$include (obtypes.h) $include (rtltypes.h) $include (rtlfuncs.h) - -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation = 0, - ObjectNameInformation = 1, /* FIXME, not in WDK */ - ObjectTypeInformation = 2, - ObjectTypesInformation = 3, /* FIXME, not in WDK */ - ObjectHandleFlagInformation = 4, /* FIXME, not in WDK */ - ObjectSessionInformation = 5, /* FIXME, not in WDK */ - MaxObjectInfoClass /* FIXME, not in WDK */ -} OBJECT_INFORMATION_CLASS; NTSYSCALLAPI NTSTATUS @@ -1031,38 +1022,10 @@ ULONG Reserved [22]; } PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION; -typedef struct _SECURITY_CLIENT_CONTEXT { - SECURITY_QUALITY_OF_SERVICE SecurityQos; - PACCESS_TOKEN ClientToken; - BOOLEAN DirectlyAccessClientToken; - BOOLEAN DirectAccessEffectiveOnly; - BOOLEAN ServerIsRemote; - TOKEN_CONTROL ClientTokenControl; -} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; - #define SYSTEM_PAGE_PRIORITY_BITS 3 #define SYSTEM_PAGE_PRIORITY_LEVELS (1 << SYSTEM_PAGE_PRIORITY_BITS) -typedef struct _KAPC_STATE { - LIST_ENTRY ApcListHead[MaximumMode]; - PKPROCESS Process; - BOOLEAN KernelApcInProgress; - BOOLEAN KernelApcPending; - BOOLEAN UserApcPending; -} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; - -#define KAPC_STATE_ACTUAL_LENGTH (FIELD_OFFSET(KAPC_STATE, UserApcPending) + sizeof(BOOLEAN)) - -#define ASSERT_QUEUE(Q) ASSERT(((Q)->Header.Type & KOBJECT_TYPE_MASK) == QueueObject); - -typedef struct _KQUEUE { - DISPATCHER_HEADER Header; - LIST_ENTRY EntryListHead; - volatile ULONG CurrentCount; - ULONG MaximumCount; - LIST_ENTRY ThreadListHead; -} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; - +$include (ketypes.h) $include (kefuncs.h) $include (extypes.h) $include (exfuncs.h) @@ -1268,6 +1231,9 @@ #endif #include "csq.h" + +extern PACL SePublicDefaultDacl; +extern PACL SeSystemDefaultDacl; #define FS_LFN_APIS 0x00004000 Modified: trunk/reactos/include/xdk/nttmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/nttmapi.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/nttmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/nttmapi.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -1,4 +1,3 @@ -$if (_WDMDDK_) #ifndef _NTTMAPI_ #define _NTTMAPI_ @@ -649,4 +648,3 @@ #endif /* NTDDI_VERSION >= NTDDI_VISTA */ #endif /* !_NTTMAPI_ */ -$endif Modified: trunk/reactos/include/xdk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/obtypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/obtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/obtypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -2,6 +2,7 @@ * Object Manager Types * ******************************************************************************/ +$if (_WDMDDK_) #define MAXIMUM_FILENAME_LENGTH 256 #define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\\') @@ -132,3 +133,22 @@ extern POBJECT_TYPE NTSYSAPI SeTokenObjectType; extern POBJECT_TYPE NTSYSAPI PsProcessType; +$endif (_WDMDDK_) +$if (_NTIFS_) +typedef enum _OBJECT_INFORMATION_CLASS { + ObjectBasicInformation = 0, + ObjectTypeInformation = 2, +$endif (_NTIFS_) +$if (_PRIVATE_) + /* Not for public use */ + ObjectNameInformation = 1, + ObjectTypesInformation = 3, + ObjectHandleFlagInformation = 4, + ObjectSessionInformation = 5, + MaxObjectInfoClass +$endif (_PRIVATE_) +$if (_NTIFS_) +} OBJECT_INFORMATION_CLASS; + +$endif (_NTIFS_) + Modified: trunk/reactos/include/xdk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/psfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -211,7 +211,7 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ $if (_NTDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WINXP) -$endif +$endif (_NTDDK_ || _NTIFS_) $if (_NTDDK_) NTKERNELAPI @@ -274,7 +274,7 @@ $endif (_NTIFS_) $if (_NTDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ -$endif +$endif (_NTDDK_ || _NTIFS_) $if (_NTDDK_) #if (NTDDI_VERSION >= NTDDI_WS03) Modified: trunk/reactos/include/xdk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/pstypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -38,7 +38,7 @@ #define HIGH_PRIORITY 31 #define MAXIMUM_PRIORITY 32 -$endif /* _WDMDDK_ */ +$endif (_WDMDDK_) $if (_NTDDK_) #define QUOTA_LIMITS_HARDWS_MIN_ENABLE 0x00000001 @@ -447,5 +447,5 @@ extern NTKERNELAPI PEPROCESS PsInitialSystemProcess; -$endif /* _NTDDK_ */ - +$endif (_NTDDK_) + Modified: trunk/reactos/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtltypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -553,4 +553,4 @@ ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; #endif -$endif +$endif (_NTIFS_) Modified: trunk/reactos/include/xdk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/sefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/sefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/sefuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -378,7 +378,7 @@ $if (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_VISTA) -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_) NTKERNELAPI ULONG @@ -481,7 +481,7 @@ $endif (_NTIFS_) $if (_WDMDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_NTIFS_) #if (NTDDI_VERSION >= NTDDI_VISTA || (NTDDI_VERSION >= NTDDI_WINXPSP2 && NTDDI_VERSION < NTDDI_WS03)) Modified: trunk/reactos/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/setypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/setypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/setypes.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -303,7 +303,7 @@ #endif /* !_NTLSA_AUDIT_ */ #endif /* !_NTLSA_IFS_ */ -$endif +$endif (_WDMDDK_) $if (_NTDDK_) #define SE_UNSOLICITED_INPUT_PRIVILEGE 6 @@ -392,7 +392,7 @@ WinConsoleLogonSid = 81, WinThisOrganizationCertificateSid = 82, } WELL_KNOWN_SID_TYPE; -$endif +$endif (_NTDDK_) $if (_NTIFS_) #ifndef SID_IDENTIFIER_AUTHORITY_DEFINED #define SID_IDENTIFIER_AUTHORITY_DEFINED @@ -1131,4 +1131,14 @@ typedef NTSTATUS (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE)( IN PLUID LogonId); + +typedef struct _SECURITY_CLIENT_CONTEXT { + SECURITY_QUALITY_OF_SERVICE SecurityQos; + PACCESS_TOKEN ClientToken; + BOOLEAN DirectlyAccessClientToken; + BOOLEAN DirectAccessEffectiveOnly; + BOOLEAN ServerIsRemote; + TOKEN_CONTROL ClientTokenControl; +} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; + $endif (_NTIFS_) Modified: trunk/reactos/include/xdk/zwfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/zwfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/zwfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/zwfuncs.h [iso-8859-1] Fri Jan 13 17:45:26 2012 @@ -642,7 +642,7 @@ $if (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_VISTA) -$endif +$endif (_WDMDDK_ || _NTIFS_) $if (_WDMDDK_) NTSYSAPI @@ -1025,7 +1025,7 @@ $endif (_NTIFS_) $if (_WDMDDK_ || _NTIFS_) #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ -$endif +$endif (_WDMDDK_ || _NTIFS_) #if (NTDDI_VERSION >= NTDDI_WIN7) $if (_WDMDDK_)

1 0

[rharabien] 54936: [SHELL32] - Display free and used space and capacity in bytes and gigabytes for all drives in drive properties dialog - Format date and time in file properties according to syste...
by rharabien＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: rharabien Date: Fri Jan 13 17:42:27 2012 New Revision: 54936 URL: http://svn.reactos.org/svn/reactos?rev=54936&view=rev Log: [SHELL32] - Display free and used space and capacity in bytes and gigabytes for all drives in drive properties dialog - Format date and time in file properties according to system locale - Initialize checkboxes in file properties dialog - Improve polish translation Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp trunk/reactos/dll/win32/shell32/drvdefext.h trunk/reactos/dll/win32/shell32/filedefext.cpp trunk/reactos/dll/win32/shell32/filedefext.h trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex… ============================================================================== --- trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] Fri Jan 13 17:42:27 2012 @@ -39,6 +39,7 @@ LPGUID lpGuids, UINT uNumberOfGuids, HWPAGE_DISPLAYMODE DisplayMode); +UINT SH_FormatByteSize(LONGLONG cbSize, LPWSTR pwszResult, UINT cchResultMax); static VOID GetDriveNameWithLetter(LPWSTR pwszText, UINT cchTextMax, LPCWSTR pwszDrive) @@ -211,19 +212,15 @@ HPEN hDarkBluePen = CreatePen(PS_SOLID, 1, RGB(0, 0, 128)); HPEN hDarkMagPen = CreatePen(PS_SOLID, 1, RGB(128, 0, 128)); - WCHAR wszBuf[20]; - GetDlgItemTextW(hwndDlg, 14006, wszBuf, _countof(wszBuf)); - UINT cFreeSpace = _wtoi(wszBuf); - INT xCenter = (pDrawItem->rcItem.left + pDrawItem->rcItem.right)/2; INT yCenter = (pDrawItem->rcItem.top + pDrawItem->rcItem.bottom - 10)/2; INT cx = pDrawItem->rcItem.right - pDrawItem->rcItem.left; INT cy = pDrawItem->rcItem.bottom - pDrawItem->rcItem.top - 10; - TRACE("FreeSpace %u a %f cx %d\n", cFreeSpace, M_PI+cFreeSpace/100.0f*M_PI*2.0f, cx); + TRACE("FreeSpace %u a %f cx %d\n", m_FreeSpacePerc, M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f, cx); HBRUSH hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush); - INT xRadial = xCenter + (INT)(cosf(M_PI+cFreeSpace/100.0f*M_PI*2.0f)*cx/2); - INT yRadial = yCenter - (INT)(sinf(M_PI+cFreeSpace/100.0f*M_PI*2.0f)*cy/2); + INT xRadial = xCenter + (INT)(cosf(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cx/2); + INT yRadial = yCenter - (INT)(sinf(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cy/2); Pie(pDrawItem->hDC, pDrawItem->rcItem.left, pDrawItem->rcItem.top, pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10, @@ -241,7 +238,7 @@ HPEN hOldPen = (HPEN)SelectObject(pDrawItem->hDC, hDarkBluePen); for (INT x = pDrawItem->rcItem.left; x < pDrawItem->rcItem.right; ++x) { - if (cFreeSpace < 50 && x == xRadial) + if (m_FreeSpacePerc < 50 && x == xRadial) SelectObject(pDrawItem->hDC, hDarkMagPen); float cos_val = (x - xCenter)*2.0f/cx; @@ -269,61 +266,53 @@ bRet = GetVolumeInformationW(m_wszDrive, wszVolumeName, _countof(wszVolumeName), NULL, NULL, NULL, wszFileSystem, _countof(wszFileSystem)); if (bRet) { - /* set volume label */ + /* Set volume label and filesystem */ SetDlgItemTextW(hwndDlg, 14000, wszVolumeName); - - /* set filesystem type */ SetDlgItemTextW(hwndDlg, 14002, wszFileSystem); } + /* Set drive type and icon */ UINT DriveType = GetDriveTypeW(m_wszDrive); - if (DriveType == DRIVE_FIXED || DriveType == DRIVE_CDROM) - { - ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes; - if(GetDiskFreeSpaceExW(m_wszDrive, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) - { - ULONG SpacePercent; - HANDLE hVolume; - DWORD BytesReturned = 0; - - swprintf(wszBuf, L"\\\\.\\%c:", towupper(m_wszDrive[0])); - hVolume = CreateFileW(wszBuf, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); - if (hVolume != INVALID_HANDLE_VALUE) - { - bRet = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&TotalNumberOfBytes, sizeof(ULARGE_INTEGER), &BytesReturned, NULL); - if (bRet && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) - SetDlgItemTextW(hwndDlg, 14007, wszBuf); - - CloseHandle(hVolume); - } - - TRACE("wszBuf %s hVolume %p bRet %d LengthInformation %ul BytesReturned %d\n", debugstr_w(wszBuf), hVolume, bRet, TotalNumberOfBytes.QuadPart, BytesReturned); - - if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) - SetDlgItemTextW(hwndDlg, 14003, wszBuf); - - if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) - SetDlgItemTextW(hwndDlg, 14005, wszBuf); - - SpacePercent = (ULONG)(TotalNumberOfFreeBytes.QuadPart*100ull/TotalNumberOfBytes.QuadPart); - /* set free bytes percentage */ - swprintf(wszBuf, L"%u%%", SpacePercent); + UINT IconId, TypeStrId = 0; + switch (DriveType) + { + case DRIVE_CDROM: IconId = IDI_SHELL_CDROM; TypeStrId = IDS_DRIVE_CDROM; break; + case DRIVE_REMOVABLE: IconId = IDI_SHELL_FLOPPY; break; + case DRIVE_RAMDISK: IconId = IDI_SHELL_RAMDISK; break; + default: IconId = IDI_SHELL_DRIVE; TypeStrId = IDS_DRIVE_FIXED; + } + HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IconId), IMAGE_ICON, 32, 32, LR_SHARED); + if (hIcon) + SendDlgItemMessageW(hwndDlg, 14016, STM_SETICON, (WPARAM)hIcon, 0); + if (TypeStrId && LoadStringW(shell32_hInstance, TypeStrId, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14001, wszBuf); + + ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes; + if(GetDiskFreeSpaceExW(m_wszDrive, &FreeBytesAvailable, &TotalNumberOfBytes, NULL)) + { + /* Init free space percentage used for drawing piechart */ + m_FreeSpacePerc = (UINT)(FreeBytesAvailable.QuadPart * 100ull / TotalNumberOfBytes.QuadPart); + + /* Used space */ + if (SH_FormatByteSize(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14003, wszBuf); + + if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14004, wszBuf); + + /* Free space */ + if (SH_FormatByteSize(FreeBytesAvailable.QuadPart, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14005, wszBuf); + + if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, wszBuf, _countof(wszBuf))) SetDlgItemTextW(hwndDlg, 14006, wszBuf); - /* store used share amount */ - SpacePercent = 100 - SpacePercent; - swprintf(wszBuf, L"%u%%", SpacePercent); - SetDlgItemTextW(hwndDlg, 14004, wszBuf); - if (DriveType == DRIVE_FIXED) - { - if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) - SetDlgItemTextW(hwndDlg, 14001, wszBuf); - } - else /* DriveType == DRIVE_CDROM) */ - { - if (LoadStringW(shell32_hInstance, IDS_DRIVE_CDROM, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) - SetDlgItemTextW(hwndDlg, 14001, wszBuf); - } - } + + /* Total space */ + if (SH_FormatByteSize(FreeBytesAvailable.QuadPart, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14007, wszBuf); + + if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14008, wszBuf); } /* Set drive description */ @@ -331,18 +320,6 @@ GetDlgItemTextW(hwndDlg, 14009, wszFormat, _countof(wszFormat)); swprintf(wszBuf, wszFormat, m_wszDrive[0]); SetDlgItemTextW(hwndDlg, 14009, wszBuf); - - /* Set drive icon */ - UINT IconId; - switch (DriveType) - { - case DRIVE_CDROM: IconId = IDI_SHELL_CDROM; break; - case DRIVE_REMOVABLE: IconId = IDI_SHELL_FLOPPY; break; - case DRIVE_RAMDISK: IconId = IDI_SHELL_RAMDISK; break; - default: IconId = IDI_SHELL_DRIVE; - } - HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IconId), IMAGE_ICON, 32, 32, LR_SHARED); - SendDlgItemMessageW(hwndDlg, 14016, STM_SETICON, (WPARAM)hIcon, 0); } INT_PTR CALLBACK @@ -371,7 +348,8 @@ if (pDrawItem->CtlID >= 14013 && pDrawItem->CtlID <= 14015) { - CDrvDefExt::PaintStaticControls(hwndDlg, pDrawItem); + CDrvDefExt *pDrvDefExt = (CDrvDefExt*)GetWindowLongPtr(hwndDlg, DWLP_USER); + pDrvDefExt->PaintStaticControls(hwndDlg, pDrawItem); return TRUE; } break; Modified: trunk/reactos/dll/win32/shell32/drvdefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex… ============================================================================== --- trunk/reactos/dll/win32/shell32/drvdefext.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drvdefext.h [iso-8859-1] Fri Jan 13 17:42:27 2012 @@ -30,13 +30,14 @@ public IObjectWithSite { private: - static VOID PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem); + VOID PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem); VOID InitGeneralPage(HWND hwndDlg); static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); WCHAR m_wszDrive[MAX_PATH]; + UINT m_FreeSpacePerc; public: CDrvDefExt(); Modified: trunk/reactos/dll/win32/shell32/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.cpp [iso-8859-1] Fri Jan 13 17:42:27 2012 @@ -122,64 +122,35 @@ return m_wszLang; } -/************************************************************************* - * - * SH_FormatFileSizeWithBytes - * - * Format a size in bytes to string. - * - * lpQwSize = Pointer to 64bit large integer to format - * pszBuf = Buffer to fill with output string - * cchBuf = size of pszBuf in characters - * - */ - -LPWSTR -SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf) -{ +UINT +SH_FormatInteger(LONGLONG Num, LPWSTR pwszResult, UINT cchResultMax) +{ + // Print the number in uniform mode + WCHAR wszNumber[24]; + swprintf(wszNumber, L"%I64u", Num); + + // Get system strings for decimal and thousand separators. + WCHAR wszDecimalSep[8], wszThousandSep[8]; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, wszDecimalSep, _countof(wszDecimalSep)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, wszThousandSep, _countof(wszThousandSep)); + + // Initialize format for printing the number in bytes NUMBERFMTW nf; - WCHAR szNumber[24]; - WCHAR szDecimalSep[8]; - WCHAR szThousandSep[8]; - WCHAR szGrouping[12]; - int Len, cchFormatted, i; - size_t cchRemaining; - LPWSTR Ptr; - - // Try to build first Format byte string - if (StrFormatByteSizeW(lpQwSize->QuadPart, pszBuf, cchBuf) == NULL) - return NULL; - - // If there is less bytes than 1KB, we have nothing to do - if (lpQwSize->QuadPart < 1024) - return pszBuf; - - // Print the number in uniform mode - swprintf(szNumber, L"%I64u", lpQwSize->QuadPart); - - // Get system strings for decimal and thousand separators. - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSep, sizeof(szDecimalSep) / sizeof(*szDecimalSep)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szThousandSep, sizeof(szThousandSep) / sizeof(*szThousandSep)); - - // Initialize format for printing the number in bytes ZeroMemory(&nf, sizeof(nf)); - nf.NumDigits = 0; - nf.LeadingZero = 0; - nf.Grouping = 0; - nf.lpDecimalSep = szDecimalSep; - nf.lpThousandSep = szThousandSep; - nf.NegativeOrder = 0; + nf.lpDecimalSep = wszDecimalSep; + nf.lpThousandSep = wszThousandSep; // Get system string for groups separator - Len = GetLocaleInfoW(LOCALE_USER_DEFAULT, - LOCALE_SGROUPING, - szGrouping, - sizeof(szGrouping) / sizeof(*szGrouping)); + WCHAR wszGrouping[12]; + INT cchGrouping = GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_SGROUPING, + wszGrouping, + _countof(wszGrouping)); // Convert grouping specs from string to integer - for (i = 0; i < Len; i++) - { - WCHAR wch = szGrouping[i]; + for (INT i = 0; i < cchGrouping; i++) + { + WCHAR wch = wszGrouping[i]; if (wch >= L'0' && wch <= L'9') nf.Grouping = nf.Grouping * 10 + (wch - L'0'); @@ -192,38 +163,77 @@ else nf.Grouping *= 10; - // Concate " (" at the end of buffer - Len = wcslen(pszBuf); - Ptr = pszBuf + Len; - cchRemaining = cchBuf - Len; - StringCchCopyExW(Ptr, cchRemaining, L" (", &Ptr, &cchRemaining, 0); - - // Save formatted number of bytes in buffer - cchFormatted = GetNumberFormatW(LOCALE_USER_DEFAULT, + // Format the number + INT cchResult = GetNumberFormatW(LOCALE_USER_DEFAULT, 0, - szNumber, + wszNumber, &nf, - Ptr, - cchRemaining); - - if (cchFormatted == 0) + pwszResult, + cchResultMax); + + if (!cchResult) + return 0; + + // GetNumberFormatW returns number of characters including UNICODE_NULL + return cchResult - 1; +} + +UINT +SH_FormatByteSize(LONGLONG cbSize, LPWSTR pwszResult, UINT cchResultMax) +{ + /* Write formated bytes count */ + INT cchWritten = SH_FormatInteger(cbSize, pwszResult, cchResultMax); + if (!cchWritten) + return 0; + + /* Copy " bytes" to buffer */ + LPWSTR pwszEnd = pwszResult + cchWritten; + size_t cchRemaining = cchResultMax - cchWritten; + StringCchCopyExW(pwszEnd, cchRemaining, L" ", &pwszEnd, &cchRemaining, NULL); + cchWritten = LoadStringW(shell32_hInstance, IDS_BYTES_FORMAT, pwszEnd, cchRemaining); + cchRemaining -= cchWritten; + + return cchResultMax - cchRemaining; +} + +/************************************************************************* + * + * SH_FormatFileSizeWithBytes + * + * Format a size in bytes to string. + * + * lpQwSize = Pointer to 64bit large integer to format + * pszBuf = Buffer to fill with output string + * cchBuf = size of pszBuf in characters + * + */ + +LPWSTR +SH_FormatFileSizeWithBytes(const PULARGE_INTEGER lpQwSize, LPWSTR pwszResult, UINT cchResultMax) +{ + /* Format bytes in KBs, MBs etc */ + if (StrFormatByteSizeW(lpQwSize->QuadPart, pwszResult, cchResultMax) == NULL) return NULL; - // cchFormatted is number of characters including NULL - make it a real length - --cchFormatted; - - // Copy ' ' to buffer - Ptr += cchFormatted; - cchRemaining -= cchFormatted; - StringCchCopyExW(Ptr, cchRemaining, L" ", &Ptr, &cchRemaining, 0); - - // Copy 'bytes' string and remaining ')' - Len = LoadStringW(shell32_hInstance, IDS_BYTES_FORMAT, Ptr, cchRemaining); - Ptr += Len; - cchRemaining -= Len; - StringCchCopy(Ptr, cchRemaining, L")"); - - return pszBuf; + /* If there is less bytes than 1KB, we have nothing to do */ + if (lpQwSize->QuadPart < 1024) + return pwszResult; + + /* Concate " (" */ + UINT cchWritten = wcslen(pwszResult); + LPWSTR pwszEnd = pwszResult + cchWritten; + size_t cchRemaining = cchResultMax - cchWritten; + StringCchCopyExW(pwszEnd, cchRemaining, L" (", &pwszEnd, &cchRemaining, 0); + + /* Write formated bytes count */ + cchWritten = SH_FormatByteSize(lpQwSize->QuadPart, pwszEnd, cchRemaining); + pwszEnd += cchWritten; + cchRemaining -= cchWritten; + + /* Copy ")" to the buffer */ + StringCchCopyW(pwszEnd, cchRemaining, L")"); + + return pwszResult; } /************************************************************************* @@ -412,23 +422,32 @@ */ BOOL -CFileDefExt::GetFileTimeString(LPFILETIME lpFileTime, WCHAR *lpResult) +CFileDefExt::GetFileTimeString(LPFILETIME lpFileTime, LPWSTR pwszResult, UINT cchResult) { FILETIME ft; SYSTEMTIME st; - if (lpFileTime == NULL || lpResult == NULL) - return FALSE; - - if (!FileTimeToLocalFileTime(lpFileTime, &ft)) - return FALSE; - - FileTimeToSystemTime(&ft, &st); - - /* ddmmyy */ - swprintf(lpResult, L"%02hu/%02hu/%04hu %02hu:%02hu", st.wDay, st.wMonth, st.wYear, st.wHour, st.wMinute); - - TRACE("result %s\n", debugstr_w(lpResult)); + if (!FileTimeToLocalFileTime(lpFileTime, &ft) || !FileTimeToSystemTime(&ft, &st)) + return FALSE; + + size_t cchRemaining = cchResult; + LPWSTR pwszEnd = pwszResult; + int cchWritten = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, pwszEnd, cchRemaining); + if (cchWritten) + --cchWritten; // GetDateFormatW returns count with terminating zero + else + ERR("GetDateFormatW failed\n"); + cchRemaining -= cchWritten; + pwszEnd += cchWritten; + + StringCchCopyExW(pwszEnd, cchRemaining, L", ", &pwszEnd, &cchRemaining, 0); + + cchWritten = GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, pwszEnd, cchRemaining); + if (cchWritten) + --cchWritten; // GetTimeFormatW returns count with terminating zero + else + ERR("GetTimeFormatW failed\n"); + TRACE("result %s\n", debugstr_w(pwszResult)); return TRUE; } @@ -509,13 +528,13 @@ CloseHandle(hFile); - if (GetFileTimeString(&CreateTime, wszBuf)) + if (GetFileTimeString(&CreateTime, wszBuf, _countof(wszBuf))) SetDlgItemTextW(hwndDlg, 14015, wszBuf); - if (GetFileTimeString(&AccessedTime, wszBuf)) + if (GetFileTimeString(&AccessedTime, wszBuf, _countof(wszBuf))) SetDlgItemTextW(hwndDlg, 14019, wszBuf); - if (GetFileTimeString(&WriteTime, wszBuf)) + if (GetFileTimeString(&WriteTime, wszBuf, _countof(wszBuf))) SetDlgItemTextW(hwndDlg, 14017, wszBuf); if (SH_FormatFileSizeWithBytes((PULARGE_INTEGER)&FileSize, @@ -566,6 +585,14 @@ /* Set file created/modfied/accessed time */ InitFileSizeTime(hwndDlg); + + DWORD dwAttr = GetFileAttributesW(m_wszPath); + if (dwAttr & FILE_ATTRIBUTE_READONLY) + SendDlgItemMessage(hwndDlg, 14021, BM_SETCHECK, BST_CHECKED, 0); + if (dwAttr & FILE_ATTRIBUTE_HIDDEN) + SendDlgItemMessage(hwndDlg, 14022, BM_SETCHECK, BST_CHECKED, 0); + if (dwAttr & FILE_ATTRIBUTE_ARCHIVE) + SendDlgItemMessage(hwndDlg, 14023, BM_SETCHECK, BST_CHECKED, 0); return TRUE; } Modified: trunk/reactos/dll/win32/shell32/filedefext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/filedefe… ============================================================================== --- trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/filedefext.h [iso-8859-1] Fri Jan 13 17:42:27 2012 @@ -64,7 +64,7 @@ private: VOID InitOpensWithField(HWND hwndDlg); BOOL InitFileType(HWND hwndDlg); - static BOOL GetFileTimeString(LPFILETIME lpFileTime, WCHAR *lpResult); + static BOOL GetFileTimeString(LPFILETIME lpFileTime, LPWSTR pwszResult, UINT cchResult); BOOL InitFilePath(HWND hwndDlg); BOOL InitFileSizeTime(HWND hwndDlg); BOOL InitGeneralPage(HWND hwndDlg); Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Jan 13 17:42:27 2012 @@ -312,9 +312,9 @@ CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 135, 100, 30 LTEXT "NapÄd %c", 14009, 100, 170, 40, 10 - PUSHBUTTON "Czyszczenie dysku", 14010, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Kompresja danych na dysku", 14011, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "ZezwÃ³l UsÅudze Indeksowania na zaindeksowanie tego dysku (szybkie przeszukiwanie plikÃ³w)", 14012, 15, 220, 200, 10, WS_DISABLED + PUSHBUTTON "Oczyszczanie dysku", 14010, 170, 175, 60, 15, WS_TABSTOP + CHECKBOX "Kompresuj dysk, aby zaoszczÄdziÄ miejsce na dysku", 14011, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Zezwalaj na indeksowanie tego dysku, aby przyÅpieszyÄ wyszukiwanie plikÃ³w", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 @@ -324,13 +324,13 @@ BEGIN GROUPBOX "Sprawdzanie bÅÄdÃ³w", -1, 5, 5, 230, 60 LTEXT "Ta opcja sprawdzi wolumin w poszukiwaniu bÅÄdÃ³w.", -1, 40, 25, 160, 20 - PUSHBUTTON "SprawdÅº", 14000, 130, 45, 90, 15, WS_TABSTOP + PUSHBUTTON "SprawdÅº...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentacja", -1, 5, 65, 230, 60 - LTEXT "Ta opcja zdefragmentuje pliki na woluminie", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragmentuj", 14001, 130, 105, 90, 15, WS_TABSTOP + LTEXT "Ta opcja dokona defragmentacji plikÃ³w woluminu.", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragmentuj...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Kopia zapasowa", -1, 5, 130, 230, 60 - LTEXT "Ta opcja wykona kopiÄ zapasowÄ plikÃ³w na woluminie.", -1, 40, 150, 160, 20 - PUSHBUTTON "StwÃ³rz kopiÄ", 14002, 130, 170, 90, 15, WS_TABSTOP + LTEXT "Ta opcja wykona kopiÄ zapasowÄ plikÃ³w tego woluminu.", -1, 40, 150, 160, 20 + PUSHBUTTON "Wykonaj kopiÄ zapasowÄ...", 14002, 130, 170, 90, 15, WS_TABSTOP END DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230

1 0

[akhaldi] 54935: [USBDRV] * Mark dev_mgr_cancel_irp as NTAPI.
by akhaldi＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: akhaldi Date: Fri Jan 13 14:34:28 2012 New Revision: 54935 URL: http://svn.reactos.org/svn/reactos?rev=54935&view=rev Log: [USBDRV] * Mark dev_mgr_cancel_irp as NTAPI. Modified: trunk/reactos/drivers/usb/nt4compat/usbdrv/devmgr.c trunk/reactos/drivers/usb/nt4compat/usbdrv/devmgr.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdrv/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdrv/devmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdrv/devmgr.c [iso-8859-1] Fri Jan 13 14:34:28 2012 @@ -1499,6 +1499,7 @@ } VOID +NTAPI dev_mgr_cancel_irp(PDEVICE_OBJECT dev_obj, PIRP pirp) { PUSB_DEV_MANAGER dev_mgr; Modified: trunk/reactos/drivers/usb/nt4compat/usbdrv/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdrv/devmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdrv/devmgr.h [iso-8859-1] Fri Jan 13 14:34:28 2012 @@ -276,6 +276,6 @@ LONG dev_mgr_score_driver_for_dev(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver, PUSB_DEVICE_DESC pdev_desc); NTSTATUS dev_mgr_destroy_usb_config(PUSB_CONFIGURATION pcfg); BOOLEAN dev_mgr_start_select_driver(PUSB_DEV pdev); -VOID dev_mgr_cancel_irp(PDEVICE_OBJECT pdev_obj, PIRP pirp); +VOID NTAPI dev_mgr_cancel_irp(PDEVICE_OBJECT pdev_obj, PIRP pirp); #endif

1 0

[cgutman] 54934: [TCPIP] - Fix a bug where a static IP configuration was not properly restored after a media state change
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 10:47:44 2012 New Revision: 54934 URL: http://svn.reactos.org/svn/reactos?rev=54934&view=rev Log: [TCPIP] - Fix a bug where a static IP configuration was not properly restored after a media state change Modified: 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/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 10:47:44 2012 @@ -1568,6 +1568,7 @@ TI_DbgPrint(MID_TRACE,("New Netmask : %x\n", IF->Netmask.Address.IPv4Address)); + IF->DhcpEnabled = FALSE; IPAddInterfaceRoute( IF ); IpAddrChange->Address = IF->Index; @@ -1599,6 +1600,8 @@ 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 10:47:44 2012 @@ -214,6 +214,7 @@ 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

[cgutman] 54933: [DHCPCSVC] - Fix an issue assigning a private address after the IpReleaseAddress API was used prior to IpRenewAddress - Move the IP refresh hack into dhcpcsvc so it now properly re...
by cgutman＠svn.reactos.org 13 Jan '12

13 Jan '12

Author: cgutman Date: Fri Jan 13 10:03:38 2012 New Revision: 54933 URL: http://svn.reactos.org/svn/reactos?rev=54933&view=rev Log: [DHCPCSVC] - Fix an issue assigning a private address after the IpReleaseAddress API was used prior to IpRenewAddress - Move the IP refresh hack into dhcpcsvc so it now properly refresh IP information after an adapter is disconnected and reconnected (wired and wireless) - When a state change occurs (connecting to a different wireless network or unplugging and plugging in the Ethernet cable), TCP/IP will flush routes and the neighbor cache then set the IP address to 0.0.0.0. DHCP will detect that IP address (that part is the hack since we do it via polling instead of events) then send a DHCP discover packet out via the new network connection. No more ipconfig /renew to get a new DHCP lease after network changes. It's all seamless now :D Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/adapter.c branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/api.c branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dhclient.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 10:03:38 2012 @@ -200,6 +200,84 @@ return 0; } +BOOL +IsReconnectHackNeeded(PDHCP_ADAPTER Adapter, const MIB_IFROW* IfEntry) +{ + struct protocol *proto; + PIP_ADAPTER_INFO AdapterInfo, Orig; + DWORD Size, Ret; + char *ZeroAddress = "0.0.0.0"; + + proto = find_protocol_by_adapter(&Adapter->DhclientInfo); + + if (!proto) + return FALSE; + + if (Adapter->DhclientInfo.client->state != S_BOUND) + return FALSE; + + ApiUnlock(); + + Orig = AdapterInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(IP_ADAPTER_INFO)); + Size = sizeof(IP_ADAPTER_INFO); + if (!AdapterInfo) + { + ApiLock(); + return FALSE; + } + + Ret = GetAdaptersInfo(AdapterInfo, &Size); + if (Ret == ERROR_BUFFER_OVERFLOW) + { + HeapFree(GetProcessHeap(), 0, AdapterInfo); + AdapterInfo = HeapAlloc(GetProcessHeap(), 0, Size); + if (!AdapterInfo) + { + ApiLock(); + return FALSE; + } + + if (GetAdaptersInfo(AdapterInfo, &Size) != NO_ERROR) + { + ApiLock(); + return FALSE; + } + + Orig = AdapterInfo; + for (; AdapterInfo != NULL; AdapterInfo = AdapterInfo->Next) + { + if (AdapterInfo->Index == IfEntry->dwIndex) + break; + } + + if (AdapterInfo == NULL) + { + HeapFree(GetProcessHeap(), 0, Orig); + ApiLock(); + return FALSE; + } + } + else if (Ret != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, Orig); + ApiLock(); + return FALSE; + } + + if (!strcmp(AdapterInfo->IpAddressList.IpAddress.String, ZeroAddress)) + { + HeapFree(GetProcessHeap(), 0, Orig); + ApiLock(); + return TRUE; + } + else + { + HeapFree(GetProcessHeap(), 0, Orig); + ApiLock(); + return FALSE; + } +} + /* * XXX Figure out the way to bind a specific adapter to a socket. */ @@ -241,12 +319,34 @@ if ((Adapter = AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen))) { + proto = find_protocol_by_adapter(&Adapter->DhclientInfo); + /* This is an existing adapter */ if (InterfaceConnected(&Table->table[i])) { /* We're still active so we stay in the list */ ifi = &Adapter->DhclientInfo; + + /* This is a hack because IP helper API sucks */ + if (IsReconnectHackNeeded(Adapter, &Table->table[i])) + { + /* This handles a disconnect/reconnect */ + + remove_protocol(proto); + Adapter->DhclientInfo.client->state = S_INIT; + + /* These are already invalid since the media state change */ + Adapter->RouterMib.dwForwardNextHop = 0; + Adapter->NteContext = 0; + + add_protocol(Adapter->DhclientInfo.name, + Adapter->DhclientInfo.rfdesc, + got_one, &Adapter->DhclientInfo); + state_init(&Adapter->DhclientInfo); + + SetEvent(AdapterStateChangedEvent); + } + } else { - proto = find_protocol_by_adapter(&Adapter->DhclientInfo); if (proto) remove_protocol(proto); Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/dhcpcsvc… ============================================================================== --- branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] Fri Jan 13 10:03:38 2012 @@ -101,9 +101,15 @@ if( Adapter ) { if (Adapter->NteContext) + { DeleteIPAddress( Adapter->NteContext ); + Adapter->NteContext = 0; + } if (Adapter->RouterMib.dwForwardNextHop) + { DeleteIpForwardEntry( &Adapter->RouterMib ); + Adapter->RouterMib.dwForwardNextHop = 0; + } proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); if (proto) @@ -171,9 +177,15 @@ if( Adapter ) { if (Adapter->NteContext) + { DeleteIPAddress( Adapter->NteContext ); + Adapter->NteContext = 0; + } if (Adapter->RouterMib.dwForwardNextHop) + { DeleteIpForwardEntry( &Adapter->RouterMib ); + Adapter->RouterMib.dwForwardNextHop = 0; + } Adapter->DhclientState.state = S_STATIC; proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); Modified: branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/dhcpcsvc… ============================================================================== --- branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] Fri Jan 13 10:03:38 2012 @@ -548,7 +548,10 @@ if( Adapter->NteContext ) + { DeleteIPAddress( Adapter->NteContext ); + Adapter->NteContext = 0; + } /* Set up our default router if we got one from the DHCP server */ if( new_lease->options[DHO_SUBNET_MASK].len ) { @@ -1007,7 +1010,7 @@ we haven't found anything for this interface yet. */ if (interval > ip->client->config->timeout) { state_panic(ip); - return; + ip->client->first_sending = cur_time; } /* If we're selecting media, try the whole list before doing @@ -1100,16 +1103,8 @@ { struct interface_info *ip = ipp; PDHCP_ADAPTER Adapter = AdapterFindInfo(ip); - time_t cur_time; - - time(&cur_time); note("No DHCPOFFERS received."); - - note("No working leases in persistent database - sleeping.\n"); - ip->client->state = S_INIT; - add_timeout(cur_time + ip->client->config->retry_interval, state_init, - ip); if (!Adapter->NteContext) { @@ -1181,7 +1176,10 @@ discover a new address. */ if( Adapter ) + { DeleteIPAddress( Adapter->NteContext ); + Adapter->NteContext = 0; + } ip->client->state = S_INIT; state_init(ip);

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