Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 41402: - Fix 5 winetests for CreateProcessA/W
by dchapyshev＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: dchapyshev Date: Sat Jun 13 16:24:51 2009 New Revision: 41402 URL: http://svn.reactos.org/svn/reactos?rev=41402&view=rev Log: - Fix 5 winetests for CreateProcessA/W Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ut… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Sat Jun 13 16:24:51 2009 @@ -412,10 +412,14 @@ RelativeName.Handle = NULL; /* Find the application name */ - RtlDosPathNameToNtPathName_U(lpApplicationName, - ApplicationName, - NULL, - &RelativeName); + if (!RtlDosPathNameToNtPathName_U(lpApplicationName, + ApplicationName, + NULL, + &RelativeName)) + { + return STATUS_OBJECT_PATH_NOT_FOUND; + } + DPRINT("ApplicationName %wZ\n", ApplicationName); DPRINT("RelativeName %wZ\n", &RelativeName.DosPath); @@ -442,7 +446,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open file\n"); - SetLastErrorByStatus (Status); + SetLastErrorByStatus(Status); return Status; } Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Sat Jun 13 16:24:51 2009 @@ -1072,6 +1072,11 @@ &StartupInfo, lpProcessInformation); + case STATUS_OBJECT_NAME_NOT_FOUND: + case STATUS_OBJECT_PATH_NOT_FOUND: + SetLastErrorByStatus(Status); + goto Cleanup; + default: /* Invalid Image Type */ SetLastError(ERROR_BAD_EXE_FORMAT);

1 0

[cgutman] 41401: - Header cleanup
by cgutman＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cgutman Date: Sat Jun 13 09:51:44 2009 New Revision: 41401 URL: http://svn.reactos.org/svn/reactos?rev=41401&view=rev Log: - Header cleanup Modified: trunk/reactos/drivers/network/ndis/include/buffer.h trunk/reactos/drivers/network/ndis/include/ndissys.h Modified: trunk/reactos/drivers/network/ndis/include/buffer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/buffer.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/buffer.h [iso-8859-1] Sat Jun 13 09:51:44 2009 @@ -25,6 +25,12 @@ NETWORK_HEADER Buffers[0]; } NDIS_BUFFER_POOL, *PNDIS_BUFFER_POOL; +typedef struct _NDISI_PACKET_POOL { + NDIS_SPIN_LOCK SpinLock; + struct _NDIS_PACKET *FreeList; + UINT PacketLength; + UCHAR Buffer[1]; +} NDISI_PACKET_POOL, * PNDISI_PACKET_POOL; UINT CopyBufferToBufferChain( PNDIS_BUFFER DstBuffer, Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Sat Jun 13 09:51:44 2009 @@ -10,8 +10,6 @@ #ifndef __NDISSYS_H #define __NDISSYS_H -typedef unsigned long NDIS_STATS; - #include <ntifs.h> #include <ndis.h> #include <xfilter.h> @@ -19,474 +17,11 @@ #include <atm.h> #include <ndistapi.h> #include <ndisguid.h> - -struct _ADAPTER_BINDING; - -typedef struct _NDISI_PACKET_POOL { - NDIS_SPIN_LOCK SpinLock; - struct _NDIS_PACKET *FreeList; - UINT PacketLength; - UCHAR Buffer[1]; -} NDISI_PACKET_POOL, * PNDISI_PACKET_POOL; - -/* WDK Compatibility. Taken from w32api DDK */ -#ifndef __NDIS_H -typedef struct _X_FILTER FDDI_FILTER, *PFDDI_FILTER; - -typedef VOID -(NTAPI *FDDI_RCV_COMPLETE_HANDLER)( - IN PFDDI_FILTER Filter); - -typedef VOID -(NTAPI *FDDI_RCV_INDICATE_HANDLER)( - IN PFDDI_FILTER Filter, - IN NDIS_HANDLE MacReceiveContext, - IN PCHAR Address, - IN UINT AddressLength, - IN PVOID HeaderBuffer, - IN UINT HeaderBufferSize, - IN PVOID LookaheadBuffer, - IN UINT LookaheadBufferSize, - IN UINT PacketSize); - -typedef enum _NDIS_WORK_ITEM_TYPE { - NdisWorkItemRequest, - NdisWorkItemSend, - NdisWorkItemReturnPackets, - NdisWorkItemResetRequested, - NdisWorkItemResetInProgress, - NdisWorkItemHalt, - NdisWorkItemSendLoopback, - NdisWorkItemMiniportCallback, - NdisMaxWorkItems -} NDIS_WORK_ITEM_TYPE, *PNDIS_WORK_ITEM_TYPE; - -#define NUMBER_OF_WORK_ITEM_TYPES NdisMaxWorkItems -#define NUMBER_OF_SINGLE_WORK_ITEMS 6 - -typedef struct _NDIS_MINIPORT_WORK_ITEM { - SINGLE_LIST_ENTRY Link; - NDIS_WORK_ITEM_TYPE WorkItemType; - PVOID WorkItemContext; -} NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM; - -typedef VOID (NTAPI *W_MINIPORT_CALLBACK)( - IN NDIS_HANDLE MiniportAdapterContext, - IN PVOID CallbackContext); - -typedef struct _NDIS_BIND_PATHS { - UINT Number; - NDIS_STRING Paths[1]; -} NDIS_BIND_PATHS, *PNDIS_BIND_PATHS; - -#if ARCNET -#define FILTERDBS_ARCNET_S \ - PARC_FILTER ArcDB; -#else /* !ARCNET */ -#define FILTERDBS_ARCNET_S \ - PVOID XXXDB; -#endif /* !ARCNET */ - -#define FILTERDBS_S \ - union { \ - PETH_FILTER EthDB; \ - PNULL_FILTER NullDB; \ - }; \ - PTR_FILTER TrDB; \ - PFDDI_FILTER FddiDB; \ - FILTERDBS_ARCNET_S - -typedef struct _NDIS_LOG { - PNDIS_MINIPORT_BLOCK Miniport; - KSPIN_LOCK LogLock; - PIRP Irp; - UINT TotalSize; - UINT CurrentSize; - UINT InPtr; - UINT OutPtr; - UCHAR LogBuf[1]; -} NDIS_LOG, *PNDIS_LOG; - -typedef enum _NDIS_PNP_DEVICE_STATE { - NdisPnPDeviceAdded, - NdisPnPDeviceStarted, - NdisPnPDeviceQueryStopped, - NdisPnPDeviceStopped, - NdisPnPDeviceQueryRemoved, - NdisPnPDeviceRemoved, - NdisPnPDeviceSurpriseRemoved -} NDIS_PNP_DEVICE_STATE; - -typedef struct _OID_LIST OID_LIST, *POID_LIST; - -struct _NDIS_MINIPORT_BLOCK { - PVOID Signature; - PNDIS_MINIPORT_BLOCK NextMiniport; - PNDIS_M_DRIVER_BLOCK DriverHandle; - NDIS_HANDLE MiniportAdapterContext; - UNICODE_STRING MiniportName; - PNDIS_BIND_PATHS BindPaths; - NDIS_HANDLE OpenQueue; - REFERENCE ShortRef; - NDIS_HANDLE DeviceContext; - UCHAR Padding1; - UCHAR LockAcquired; - UCHAR PmodeOpens; - UCHAR AssignedProcessor; - KSPIN_LOCK Lock; - PNDIS_REQUEST MediaRequest; - PNDIS_MINIPORT_INTERRUPT Interrupt; - ULONG Flags; - ULONG PnPFlags; - LIST_ENTRY PacketList; - PNDIS_PACKET FirstPendingPacket; - PNDIS_PACKET ReturnPacketsQueue; - ULONG RequestBuffer; - PVOID SetMCastBuffer; - PNDIS_MINIPORT_BLOCK PrimaryMiniport; - PVOID WrapperContext; - PVOID BusDataContext; - ULONG PnPCapabilities; - PCM_RESOURCE_LIST Resources; - NDIS_TIMER WakeUpDpcTimer; - UNICODE_STRING BaseName; - UNICODE_STRING SymbolicLinkName; - ULONG CheckForHangSeconds; - USHORT CFHangTicks; - USHORT CFHangCurrentTick; - NDIS_STATUS ResetStatus; - NDIS_HANDLE ResetOpen; - FILTERDBS_S - FILTER_PACKET_INDICATION_HANDLER PacketIndicateHandler; - NDIS_M_SEND_COMPLETE_HANDLER SendCompleteHandler; - NDIS_M_SEND_RESOURCES_HANDLER SendResourcesHandler; - NDIS_M_RESET_COMPLETE_HANDLER ResetCompleteHandler; - NDIS_MEDIUM MediaType; - ULONG BusNumber; - NDIS_INTERFACE_TYPE BusType; - NDIS_INTERFACE_TYPE AdapterType; - PDEVICE_OBJECT DeviceObject; - PDEVICE_OBJECT PhysicalDeviceObject; - PDEVICE_OBJECT NextDeviceObject; - PMAP_REGISTER_ENTRY MapRegisters; - PNDIS_AF_LIST CallMgrAfList; - PVOID MiniportThread; - PVOID SetInfoBuf; - USHORT SetInfoBufLen; - USHORT MaxSendPackets; - NDIS_STATUS FakeStatus; - PVOID LockHandler; - PUNICODE_STRING pAdapterInstanceName; - PNDIS_MINIPORT_TIMER TimerQueue; - UINT MacOptions; - PNDIS_REQUEST PendingRequest; - UINT MaximumLongAddresses; - UINT MaximumShortAddresses; - UINT CurrentLookahead; - UINT MaximumLookahead; - W_HANDLE_INTERRUPT_HANDLER HandleInterruptHandler; - W_DISABLE_INTERRUPT_HANDLER DisableInterruptHandler; - W_ENABLE_INTERRUPT_HANDLER EnableInterruptHandler; - W_SEND_PACKETS_HANDLER SendPacketsHandler; - NDIS_M_START_SENDS DeferredSendHandler; - ETH_RCV_INDICATE_HANDLER EthRxIndicateHandler; - TR_RCV_INDICATE_HANDLER TrRxIndicateHandler; - FDDI_RCV_INDICATE_HANDLER FddiRxIndicateHandler; - ETH_RCV_COMPLETE_HANDLER EthRxCompleteHandler; - TR_RCV_COMPLETE_HANDLER TrRxCompleteHandler; - FDDI_RCV_COMPLETE_HANDLER FddiRxCompleteHandler; - NDIS_M_STATUS_HANDLER StatusHandler; - NDIS_M_STS_COMPLETE_HANDLER StatusCompleteHandler; - NDIS_M_TD_COMPLETE_HANDLER TDCompleteHandler; - NDIS_M_REQ_COMPLETE_HANDLER QueryCompleteHandler; - NDIS_M_REQ_COMPLETE_HANDLER SetCompleteHandler; - NDIS_WM_SEND_COMPLETE_HANDLER WanSendCompleteHandler; - WAN_RCV_HANDLER WanRcvHandler; - WAN_RCV_COMPLETE_HANDLER WanRcvCompleteHandler; -#if defined(NDIS_WRAPPER) - PNDIS_MINIPORT_BLOCK NextGlobalMiniport; - SINGLE_LIST_ENTRY WorkQueue[NUMBER_OF_WORK_ITEM_TYPES]; - SINGLE_LIST_ENTRY SingleWorkItems[NUMBER_OF_SINGLE_WORK_ITEMS]; - UCHAR SendFlags; - UCHAR TrResetRing; - UCHAR ArcnetAddress; - UCHAR XState; - union { -#if ARCNET - PNDIS_ARC_BUF ArcBuf; -#endif - PVOID BusInterface; - }; - PNDIS_LOG Log; - ULONG SlotNumber; - PCM_RESOURCE_LIST AllocatedResources; - PCM_RESOURCE_LIST AllocatedResourcesTranslated; - SINGLE_LIST_ENTRY PatternList; - NDIS_PNP_CAPABILITIES PMCapabilities; - DEVICE_CAPABILITIES DeviceCaps; - ULONG WakeUpEnable; - DEVICE_POWER_STATE CurrentDevicePowerState; - PIRP pIrpWaitWake; - SYSTEM_POWER_STATE WaitWakeSystemState; - LARGE_INTEGER VcIndex; - KSPIN_LOCK VcCountLock; - LIST_ENTRY WmiEnabledVcs; - PNDIS_GUID pNdisGuidMap; - PNDIS_GUID pCustomGuidMap; - USHORT VcCount; - USHORT cNdisGuidMap; - USHORT cCustomGuidMap; - USHORT CurrentMapRegister; - PKEVENT AllocationEvent; - USHORT BaseMapRegistersNeeded; - USHORT SGMapRegistersNeeded; - ULONG MaximumPhysicalMapping; - NDIS_TIMER MediaDisconnectTimer; - USHORT MediaDisconnectTimeOut; - USHORT InstanceNumber; - NDIS_EVENT OpenReadyEvent; - NDIS_PNP_DEVICE_STATE PnPDeviceState; - NDIS_PNP_DEVICE_STATE OldPnPDeviceState; - PGET_SET_DEVICE_DATA SetBusData; - PGET_SET_DEVICE_DATA GetBusData; - KDPC DeferredDpc; -#if 0 - /* FIXME: */ - NDIS_STATS NdisStats; -#else - ULONG NdisStats; -#endif - PNDIS_PACKET IndicatedPacket[MAXIMUM_PROCESSORS]; - PKEVENT RemoveReadyEvent; - PKEVENT AllOpensClosedEvent; - PKEVENT AllRequestsCompletedEvent; - ULONG InitTimeMs; - NDIS_MINIPORT_WORK_ITEM WorkItemBuffer[NUMBER_OF_SINGLE_WORK_ITEMS]; - PDMA_ADAPTER SystemAdapterObject; - ULONG DriverVerifyFlags; - POID_LIST OidList; - USHORT InternalResetCount; - USHORT MiniportResetCount; - USHORT MediaSenseConnectCount; - USHORT MediaSenseDisconnectCount; - PNDIS_PACKET *xPackets; - ULONG UserModeOpenReferences; - union { - PVOID SavedSendHandler; - PVOID SavedWanSendHandler; - }; - PVOID SavedSendPacketsHandler; - PVOID SavedCancelSendPacketsHandler; - W_SEND_PACKETS_HANDLER WSendPacketsHandler; - ULONG MiniportAttributes; - PDMA_ADAPTER SavedSystemAdapterObject; - USHORT NumOpens; - USHORT CFHangXTicks; - ULONG RequestCount; - ULONG IndicatedPacketsCount; - ULONG PhysicalMediumType; - PNDIS_REQUEST LastRequest; - LONG DmaAdapterRefCount; - PVOID FakeMac; - ULONG LockDbg; - ULONG LockDbgX; - PVOID LockThread; - ULONG InfoFlags; - KSPIN_LOCK TimerQueueLock; - PKEVENT ResetCompletedEvent; - PKEVENT QueuedBindingCompletedEvent; - PKEVENT DmaResourcesReleasedEvent; - FILTER_PACKET_INDICATION_HANDLER SavedPacketIndicateHandler; - ULONG RegisteredInterrupts; - PNPAGED_LOOKASIDE_LIST SGListLookasideList; - ULONG ScatterGatherListSize; -#endif /* _NDIS_ */ -}; - -#if 1 -/* FIXME: */ -typedef PVOID QUEUED_CLOSE; -#endif - -#if defined(NDIS_WRAPPER) -#define NDIS_COMMON_OPEN_BLOCK_WRAPPER_S \ - ULONG Flags; \ - ULONG References; \ - KSPIN_LOCK SpinLock; \ - NDIS_HANDLE FilterHandle; \ - ULONG ProtocolOptions; \ - USHORT CurrentLookahead; \ - USHORT ConnectDampTicks; \ - USHORT DisconnectDampTicks; \ - W_SEND_HANDLER WSendHandler; \ - W_TRANSFER_DATA_HANDLER WTransferDataHandler; \ - W_SEND_PACKETS_HANDLER WSendPacketsHandler; \ - W_CANCEL_SEND_PACKETS_HANDLER CancelSendPacketsHandler; \ - ULONG WakeUpEnable; \ - PKEVENT CloseCompleteEvent; \ - QUEUED_CLOSE QC; \ - ULONG AfReferences; \ - PNDIS_OPEN_BLOCK NextGlobalOpen; -#else -#define NDIS_COMMON_OPEN_BLOCK_WRAPPER_S -#endif - -#define NDIS_COMMON_OPEN_BLOCK_S \ - PVOID MacHandle; \ - NDIS_HANDLE BindingHandle; \ - PNDIS_MINIPORT_BLOCK MiniportHandle; \ - PNDIS_PROTOCOL_BLOCK ProtocolHandle; \ - NDIS_HANDLE ProtocolBindingContext; \ - PNDIS_OPEN_BLOCK MiniportNextOpen; \ - PNDIS_OPEN_BLOCK ProtocolNextOpen; \ - NDIS_HANDLE MiniportAdapterContext; \ - BOOLEAN Reserved1; \ - BOOLEAN Reserved2; \ - BOOLEAN Reserved3; \ - BOOLEAN Reserved4; \ - PNDIS_STRING BindDeviceName; \ - KSPIN_LOCK Reserved5; \ - PNDIS_STRING RootDeviceName; \ - union { \ - SEND_HANDLER SendHandler; \ - WAN_SEND_HANDLER WanSendHandler; \ - }; \ - TRANSFER_DATA_HANDLER TransferDataHandler; \ - SEND_COMPLETE_HANDLER SendCompleteHandler; \ - TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \ - RECEIVE_HANDLER ReceiveHandler; \ - RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \ - WAN_RECEIVE_HANDLER WanReceiveHandler; \ - REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \ - RECEIVE_PACKET_HANDLER ReceivePacketHandler; \ - SEND_PACKETS_HANDLER SendPacketsHandler; \ - RESET_HANDLER ResetHandler; \ - REQUEST_HANDLER RequestHandler; \ - RESET_COMPLETE_HANDLER ResetCompleteHandler; \ - STATUS_HANDLER StatusHandler; \ - STATUS_COMPLETE_HANDLER StatusCompleteHandler; \ - NDIS_COMMON_OPEN_BLOCK_WRAPPER_S - -typedef struct _NDIS_COMMON_OPEN_BLOCK { - NDIS_COMMON_OPEN_BLOCK_S -} NDIS_COMMON_OPEN_BLOCK; - -struct _NDIS_OPEN_BLOCK -{ -#ifdef __cplusplus - NDIS_COMMON_OPEN_BLOCK NdisCommonOpenBlock; -#else - NDIS_COMMON_OPEN_BLOCK_S -#endif -#if defined(NDIS_WRAPPER) - struct _NDIS_OPEN_CO - { - struct _NDIS_CO_AF_BLOCK * NextAf; - W_CO_CREATE_VC_HANDLER MiniportCoCreateVcHandler; - W_CO_REQUEST_HANDLER MiniportCoRequestHandler; - CO_CREATE_VC_HANDLER CoCreateVcHandler; - CO_DELETE_VC_HANDLER CoDeleteVcHandler; - PVOID CmActivateVcCompleteHandler; - PVOID CmDeactivateVcCompleteHandler; - PVOID CoRequestCompleteHandler; - LIST_ENTRY ActiveVcHead; - LIST_ENTRY InactiveVcHead; - LONG PendingAfNotifications; - PKEVENT AfNotifyCompleteEvent; - }; -#endif /* _NDIS_ */ -}; - -#define NDIS30_PROTOCOL_CHARACTERISTICS_S \ - UCHAR MajorNdisVersion; \ - UCHAR MinorNdisVersion; \ - USHORT Filler; \ - union { \ - UINT Reserved; \ - UINT Flags; \ - }; \ - OPEN_ADAPTER_COMPLETE_HANDLER OpenAdapterCompleteHandler; \ - CLOSE_ADAPTER_COMPLETE_HANDLER CloseAdapterCompleteHandler; \ - union { \ - SEND_COMPLETE_HANDLER SendCompleteHandler; \ - WAN_SEND_COMPLETE_HANDLER WanSendCompleteHandler; \ - }; \ - union { \ - TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \ - WAN_TRANSFER_DATA_COMPLETE_HANDLER WanTransferDataCompleteHandler; \ - }; \ - RESET_COMPLETE_HANDLER ResetCompleteHandler; \ - REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \ - union { \ - RECEIVE_HANDLER ReceiveHandler; \ - WAN_RECEIVE_HANDLER WanReceiveHandler; \ - }; \ - RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \ - STATUS_HANDLER StatusHandler; \ - STATUS_COMPLETE_HANDLER StatusCompleteHandler; \ - NDIS_STRING Name; - -typedef struct _NDIS30_PROTOCOL_CHARACTERISTICS { - NDIS30_PROTOCOL_CHARACTERISTICS_S -} NDIS30_PROTOCOL_CHARACTERISTICS, *PNDIS30_PROTOCOL_CHARACTERISTICS; - -#define NDIS30_MINIPORT_CHARACTERISTICS_S \ - UCHAR MajorNdisVersion; \ - UCHAR MinorNdisVersion; \ - USHORT Filler; \ - UINT Reserved; \ - W_CHECK_FOR_HANG_HANDLER CheckForHangHandler; \ - W_DISABLE_INTERRUPT_HANDLER DisableInterruptHandler; \ - W_ENABLE_INTERRUPT_HANDLER EnableInterruptHandler; \ - W_HALT_HANDLER HaltHandler; \ - W_HANDLE_INTERRUPT_HANDLER HandleInterruptHandler; \ - W_INITIALIZE_HANDLER InitializeHandler; \ - W_ISR_HANDLER ISRHandler; \ - W_QUERY_INFORMATION_HANDLER QueryInformationHandler; \ - W_RECONFIGURE_HANDLER ReconfigureHandler; \ - W_RESET_HANDLER ResetHandler; \ - union { \ - W_SEND_HANDLER SendHandler; \ - WM_SEND_HANDLER WanSendHandler; \ - }u1; \ - W_SET_INFORMATION_HANDLER SetInformationHandler; \ - union { \ - W_TRANSFER_DATA_HANDLER TransferDataHandler; \ - WM_TRANSFER_DATA_HANDLER WanTransferDataHandler; \ - }u2; - -typedef struct _NDIS30_MINIPORT_CHARACTERISTICS { - NDIS30_MINIPORT_CHARACTERISTICS_S -} NDIS30_MINIPORT_CHARACTERISTICS, *PSNDIS30_MINIPORT_CHARACTERISTICS; - -#ifdef __cplusplus - -#define NDIS40_MINIPORT_CHARACTERISTICS_S \ - NDIS30_MINIPORT_CHARACTERISTICS Ndis30Chars; \ - W_RETURN_PACKET_HANDLER ReturnPacketHandler; \ - W_SEND_PACKETS_HANDLER SendPacketsHandler; \ - W_ALLOCATE_COMPLETE_HANDLER AllocateCompleteHandler; - -#else /* !__cplusplus */ - -#define NDIS40_MINIPORT_CHARACTERISTICS_S \ - NDIS30_MINIPORT_CHARACTERISTICS_S \ - W_RETURN_PACKET_HANDLER ReturnPacketHandler; \ - W_SEND_PACKETS_HANDLER SendPacketsHandler; \ - W_ALLOCATE_COMPLETE_HANDLER AllocateCompleteHandler; - -#endif /* !__cplusplus */ - -typedef struct _NDIS40_MINIPORT_CHARACTERISTICS { - NDIS40_MINIPORT_CHARACTERISTICS_S -} NDIS40_MINIPORT_CHARACTERISTICS, *PNDIS40_MINIPORT_CHARACTERISTICS; - -#endif +#include <debug.h> #include "miniport.h" #include "protocol.h" - -#include <debug.h> +#include "buffer.h" /* Exported functions */ #ifndef EXPORT

1 0

[cgutman] 41400: - Implement NdisIMCopySendPerPacketInfo and NdisIMCopySendCompletePerPacketInfo
by cgutman＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cgutman Date: Sat Jun 13 09:37:16 2009 New Revision: 41400 URL: http://svn.reactos.org/svn/reactos?rev=41400&view=rev Log: - Implement NdisIMCopySendPerPacketInfo and NdisIMCopySendCompletePerPacketInfo Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sat Jun 13 09:37:16 2009 @@ -451,44 +451,6 @@ */ VOID EXPORT -NdisIMCopySendCompletePerPacketInfo( - IN PNDIS_PACKET DstPacket, - IN PNDIS_PACKET SrcPacket) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisIMCopySendPerPacketInfo( - IN PNDIS_PACKET DstPacket, - IN PNDIS_PACKET SrcPacket) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT NdisIMDeregisterLayeredMiniport( IN NDIS_HANDLE DriverHandle) /* Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Sat Jun 13 09:37:16 2009 @@ -1320,4 +1320,57 @@ *BytesCopied = Total; } +/* + * @implemented + */ +VOID +EXPORT +NdisIMCopySendCompletePerPacketInfo( + IN PNDIS_PACKET DstPacket, + IN PNDIS_PACKET SrcPacket) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + /* FIXME: What is the difference between NdisIMCopySendPerPacketInfo and + * NdisIMCopySendCompletePerPacketInfo? + */ + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + RtlCopyMemory(NDIS_PACKET_EXTENSION_FROM_PACKET(DstPacket), + NDIS_PACKET_EXTENSION_FROM_PACKET(SrcPacket), + sizeof(NDIS_PACKET_EXTENSION)); +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisIMCopySendPerPacketInfo( + IN PNDIS_PACKET DstPacket, + IN PNDIS_PACKET SrcPacket) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + /* FIXME: What is the difference between NdisIMCopySendPerPacketInfo and + * NdisIMCopySendCompletePerPacketInfo? + */ + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + RtlCopyMemory(NDIS_PACKET_EXTENSION_FROM_PACKET(DstPacket), + NDIS_PACKET_EXTENSION_FROM_PACKET(SrcPacket), + sizeof(NDIS_PACKET_EXTENSION)); +} + /* EOF */

1 0

[cgutman] 41399: - Implement NdisGeneratePartialCancelId
by cgutman＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cgutman Date: Sat Jun 13 09:25:54 2009 New Revision: 41399 URL: http://svn.reactos.org/svn/reactos?rev=41399&view=rev Log: - Implement NdisGeneratePartialCancelId Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sat Jun 13 09:25:54 2009 @@ -66,18 +66,6 @@ *StacksRemaining = FALSE; return NULL; -} - -/* - * @unimplemented - */ -UCHAR -EXPORT -NdisGeneratePartialCancelId(VOID) -{ - UNIMPLEMENTED - - return 0; } /* Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Sat Jun 13 09:25:54 2009 @@ -511,4 +511,20 @@ return (UINT) 0x501; } +/* + * @implemented + */ +UCHAR +EXPORT +NdisGeneratePartialCancelId(VOID) +{ + static UCHAR CancelId = 0; + + CancelId++; + + NDIS_DbgPrint(MAX_TRACE, ("Cancel ID %u\n", CancelId)); + + return CancelId; +} + /* EOF */

1 0

[cfinck] 434: - Actually make use of the "desc" parameter. - Remove "perpage" function again, add a "limit" instead and use that for the default search. This way, we don't need to wait till testman has found all >700 results.
by cfinck＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cfinck Date: Sat Jun 13 06:05:10 2009 New Revision: 434 URL: http://svn.reactos.org/svn/reactos?rev=434&view=rev Log: - Actually make use of the "desc" parameter. - Remove "perpage" function again, add a "limit" instead and use that for the default search. This way, we don't need to wait till testman has found all >700 results. Modified: branches/danny-web/www/www.reactos.org/testman/ajax-search.php branches/danny-web/www/www.reactos.org/testman/config.inc.php branches/danny-web/www/www.reactos.org/testman/js/index.js.php Modified: branches/danny-web/www/www.reactos.org/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] Sat Jun 13 06:05:10 2009 @@ -12,9 +12,7 @@ require_once("connect.db.php"); require_once("utils.inc.php"); - // We may supply any "perpage" value as long as it doesn't exceed RESULTS_PER_PAGE - // This is currently only used for the default search - if(!isset($_GET["user"]) || !isset($_GET["perpage"]) || !is_numeric($_GET["perpage"]) || $_GET["perpage"] < 0 || $_GET["perpage"] > RESULTS_PER_PAGE) + if(!isset($_GET["user"])) die("<error>Necessary information not specified!</error>"); try @@ -63,11 +61,16 @@ $result_count = $stmt->fetchColumn(); - if($result_count > $_GET["perpage"]) + if($_GET["limit"] && $result_count > $_GET["limit"]) + { + $result_count = (int)$_GET["limit"]; + echo "<moreresults>0</moreresults>"; + } + else if($result_count > RESULTS_PER_PAGE) { // The number of results exceeds the number of results per page. // Therefore we will only output all results up to the maximum number of results per page with this call. - $result_count = $_GET["perpage"]; + $result_count = RESULTS_PER_PAGE; echo "<moreresults>1</moreresults>"; } else @@ -89,7 +92,7 @@ $stmt = $dbh->query( "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . $tables . $where . $order . - "LIMIT " . $_GET["perpage"] + "LIMIT " . $result_count ) or die("<error>Query failed #2</error>"); $first = true; Modified: branches/danny-web/www/www.reactos.org/testman/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] Sat Jun 13 06:05:10 2009 @@ -10,7 +10,7 @@ define("SHARED_PATH", "../shared/"); define("TESTMAN_PATH", ""); - define("DEFAULT_SEARCH_RESULTS_PER_PAGE", 10); + define("DEFAULT_SEARCH_LIMIT", 10); define("DEFAULT_SEARCH_USER", "Debug-Buildslave"); define("MAX_COMPARE_RESULTS", 5); define("RESULTS_PER_PAGE", 100); Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] Sat Jun 13 06:05:10 2009 @@ -187,7 +187,6 @@ data["endrev"] = inputbox_endrev; data["user"] = document.getElementById("search_user").value; data["platform"] = document.getElementById("search_platform").value; - data["perpage"] = <?php echo RESULTS_PER_PAGE; ?>; data["resultlist"] = 1; data["requesttype"] = REQUESTTYPE_FULLLOAD; @@ -237,7 +236,8 @@ CurrentPage = 1; - data["perpage"] = <?php echo DEFAULT_SEARCH_RESULTS_PER_PAGE; ?>; + data["desc"] = 1; + data["limit"] = <?php echo DEFAULT_SEARCH_LIMIT; ?>; data["user"] = "<?php echo DEFAULT_SEARCH_USER; ?>"; data["resultlist"] = 1;

1 0

[cfinck] 433: Forgot to change that value back...
by cfinck＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cfinck Date: Sat Jun 13 05:50:13 2009 New Revision: 433 URL: http://svn.reactos.org/svn/reactos?rev=433&view=rev Log: Forgot to change that value back... Modified: branches/danny-web/www/www.reactos.org/testman/config.inc.php Modified: branches/danny-web/www/www.reactos.org/testman/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] Sat Jun 13 05:50:13 2009 @@ -11,7 +11,7 @@ define("TESTMAN_PATH", ""); define("DEFAULT_SEARCH_RESULTS_PER_PAGE", 10); - define("DEFAULT_SEARCH_USER", "Admin"); + define("DEFAULT_SEARCH_USER", "Debug-Buildslave"); define("MAX_COMPARE_RESULTS", 5); define("RESULTS_PER_PAGE", 100); define("VIEWVC_TRUNK", "http://svn.reactos.org/svn/reactos/trunk");

1 0

[cfinck] 432: - Rearrange the testman interface: Use one search interface instead of two and put all controls into it. - Add a checkbox "Open in new window": This was the previous default setting to open all results in a new browser window. If you uncheck it, the results will now be shown below the search interface. Note for IE users: If you want to make use of this feature, you have to update to IE8. - Spin off GetCookieValue() into a shared JavaScript file and fix that function for multiple co
by cfinck＠svn.reactos.org 13 Jun '09

13 Jun '09

Author: cfinck Date: Sat Jun 13 05:47:10 2009 New Revision: 432 URL: http://svn.reactos.org/svn/reactos?rev=432&view=rev Log: - Rearrange the testman interface: Use one search interface instead of two and put all controls into it. - Add a checkbox "Open in new window": This was the previous default setting to open all results in a new browser window. If you uncheck it, the results will now be shown below the search interface. Note for IE users: If you want to make use of this feature, you have to update to IE8. - Spin off GetCookieValue() into a shared JavaScript file and fix that function for multiple cookies. - Use <label> tags where appropriate - Add general support for descending order and individual perpage values to the AJAX backend script. Currently, these are only used internally and can't be manually set. Thanks to Timo for the suggestions on the mailing list! Added: branches/danny-web/www/www.reactos.org/testman/js/shared.js (with props) Modified: branches/danny-web/www/www.reactos.org/testman/ajax-search.php branches/danny-web/www/www.reactos.org/testman/compare.php branches/danny-web/www/www.reactos.org/testman/config.inc.php branches/danny-web/www/www.reactos.org/testman/css/index.css branches/danny-web/www/www.reactos.org/testman/index.php branches/danny-web/www/www.reactos.org/testman/js/compare.js.php branches/danny-web/www/www.reactos.org/testman/js/index.js.php branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php Modified: branches/danny-web/www/www.reactos.org/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -8,13 +8,14 @@ header("Content-type: text/xml"); - if(!isset($_GET["startrev"]) || !isset($_GET["endrev"]) || !isset($_GET["user"]) || !isset($_GET["platform"])) - die("<error>Necessary information not specified!</error>"); - - require_once("config.inc.php"); require_once("connect.db.php"); require_once("utils.inc.php"); + + // We may supply any "perpage" value as long as it doesn't exceed RESULTS_PER_PAGE + // This is currently only used for the default search + if(!isset($_GET["user"]) || !isset($_GET["perpage"]) || !is_numeric($_GET["perpage"]) || $_GET["perpage"] < 0 || $_GET["perpage"] > RESULTS_PER_PAGE) + die("<error>Necessary information not specified!</error>"); try { @@ -49,7 +50,11 @@ // Prepare some clauses $tables = "FROM " . DB_TESTMAN . ".winetest_runs r JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id "; - $order = "ORDER BY revision ASC, r.id ASC "; + + if($_GET["desc"]) + $order = "ORDER BY revision DESC, r.id DESC "; + else + $order = "ORDER BY revision ASC, r.id ASC "; echo "<results>"; @@ -58,11 +63,11 @@ $result_count = $stmt->fetchColumn(); - if($result_count > RESULTS_PER_PAGE) + if($result_count > $_GET["perpage"]) { // The number of results exceeds the number of results per page. // Therefore we will only output all results up to the maximum number of results per page with this call. - $result_count = RESULTS_PER_PAGE; + $result_count = $_GET["perpage"]; echo "<moreresults>1</moreresults>"; } else @@ -84,7 +89,7 @@ $stmt = $dbh->query( "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . $tables . $where . $order . - "LIMIT " . RESULTS_PER_PAGE + "LIMIT " . $_GET["perpage"] ) or die("<error>Query failed #2</error>"); $first = true; Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -59,6 +59,7 @@ <link rel="stylesheet" type="text/css" href="../shared/css/basic.css" /> <link rel="stylesheet" type="text/css" href="../shared/css/reactos.css" /> <link rel="stylesheet" type="text/css" href="css/compare.css" /> + <script type="text/javascript" src="js/shared.js"></script> <script type="text/javascript"> //<![CDATA[ <?php require_once("js/compare.js.php"); ?> @@ -89,7 +90,7 @@ if(count($id_array) > 1) { echo '<div>'; - printf('<input type="checkbox" id="showchanged" onclick="ShowChangedCheckbox_OnClick(this)" /> %s', $testman_langres["showchanged"]); + printf('<input type="checkbox" id="showchanged" onclick="ShowChangedCheckbox_OnClick(this)" /> <label for="showchanged">%s</label>', $testman_langres["showchanged"]); echo '</div><br />'; } ?> Modified: branches/danny-web/www/www.reactos.org/testman/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/config.inc.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -10,7 +10,9 @@ define("SHARED_PATH", "../shared/"); define("TESTMAN_PATH", ""); + define("DEFAULT_SEARCH_RESULTS_PER_PAGE", 10); + define("DEFAULT_SEARCH_USER", "Admin"); + define("MAX_COMPARE_RESULTS", 5); define("RESULTS_PER_PAGE", 100); - define("MAX_COMPARE_RESULTS", 5); define("VIEWVC_TRUNK", "http://svn.reactos.org/svn/reactos/trunk"); ?> Modified: branches/danny-web/www/www.reactos.org/testman/css/index.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/css/index.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/css/index.css [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -39,9 +39,20 @@ vertical-align: top; } +.controlgroup { + padding-right: 40px; + vertical-align: top; +} + +.controlgroup input[type=checkbox] { + margin-left: 10px; +} + +.controlgroup input[type=checkbox], label { + vertical-align: top; +} + #ajax_loading_search { - font-weight: bold; - margin-left: 20px; visibility: hidden; } @@ -57,3 +68,12 @@ font-weight: bold; text-align: right; } + +#resultcount, #selectedresultcount { + font-weight: bold; +} + +#comparepage_frame { + display: none; + width: 100%; +} Modified: branches/danny-web/www/www.reactos.org/testman/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/index.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/index.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -37,13 +37,14 @@ //]]> </script> <script type="text/javascript" src="../shared/js/ajax.js"></script> + <script type="text/javascript" src="js/shared.js"></script> <script type="text/javascript"> //<![CDATA[ <?php require_once("js/index.js.php"); ?> //]]> </script> </head> -<body> +<body onload="Load()"> <?php BasicLayout($lang); @@ -76,177 +77,70 @@ </noscript> <div id="js_stuff"> - <table width="100%" cellspacing="0" cellpadding="0"> - <tr> - <td id="mainbox_td"> - <div class="bubble_bg"> - <div class="rounded_ll"> - <div class="rounded_lr"> - <div class="rounded_ul"> - <div class="rounded_ur"> - - <div class="bubble"> - <h1><?php echo $testman_langres["lastresults_header"]; ?></h1> + <div class="bubble_bg"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <h1><?php echo $testman_langres["search_header"]; ?></h1> + + <table id="searchform"> + <tr> + <td><label for="search_revision"><?php echo $testman_langres["revision"]; ?>:</label></td> + <td> + <input type="text" id="search_revision" value="" size="24" onkeypress="SearchInputs_OnKeyPress(event)" onkeyup="SearchRevisionInput_OnKeyUp(this)" /><br /> - <button onclick="CompareLastTwoButton_OnClick()"><?php echo $testman_langres["comparelasttwo_button"]; ?></button> - <br /><br /> - - <table id="lastresults" class="datatable" cellspacing="0" cellpadding="0"> - <thead> - <tr class="head"> - <th class="TestCheckbox"></th> - <th><?php echo $testman_langres["revision"]; ?></th> - <th><?php echo $testman_langres["date"]; ?></th> - <th><?php echo $testman_langres["user"]; ?></th> - <th><?php echo $testman_langres["platform"]; ?></th> - <th><?php echo $testman_langres["comment"]; ?></th> - </tr> - </thead> - <tbody> - <?php - try - { - $dbh = new PDO("mysql:host=" . DB_HOST, DB_USER, DB_PASS); - } - catch(PDOException $e) - { - // Give no exact error message here, so no server internals are exposed - die("<error>Could not establish the DB connection</error>"); - } - - $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . - "FROM " . DB_TESTMAN . ".winetest_runs r " . - "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . - "ORDER BY revision DESC, r.id DESC " . - "LIMIT 10" - ) or die("Query failed #1"); - - $oddeven = false; - $ids = array(); - - while($row = $stmt->fetch(PDO::FETCH_ASSOC)) - { - $ids[] = $row["id"]; - - printf('<tr class="%s" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">', ($oddeven ? "odd" : "even")); - printf('<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_%s" /></td>', $row["id"]); - printf('<td onclick="Result_OnCellClick(this)">%s</td>', $row["revision"]); - printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetDateString($row["timestamp"])); - printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["name"])); - printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetPlatformString($row["platform"])); - printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["comment"])); - echo "</tr>"; - - $oddeven = !$oddeven; - } - ?> - </tbody> - </table> - - <?php - // Ensure that all checkboxes are unchecked with a JavaScript (some browsers keep them checked after a reload) - echo "<script type=\"text/javascript\">\n"; - echo "//<![CDATA[\n"; - - foreach($ids as $id) - printf('document.getElementsByName("test_%s")[0].checked = false;', $id); - - echo "\n//]]>\n"; - echo "</script>"; - ?> - </div> - - </div> - </div> - </div> - </div> - </div> - - <div class="bubble_bg"> - <div class="rounded_ll"> - <div class="rounded_lr"> - <div class="rounded_ul"> - <div class="rounded_ur"> - - <div class="bubble"> - <h1><?php echo $testman_langres["search_header"]; ?></h1> - - <table id="searchform"> - <tr> - <td><?php echo $testman_langres["revision"]; ?>:</td> - <td> - <input type="text" id="search_revision" value="" size="12" onkeypress="SearchInputs_OnKeyPress(event)" onkeyup="SearchRevisionInput_OnKeyUp(this)" /><br /> - - <img src="../shared/images/info.gif" alt="" /> <?php printf($shared_langres["rangeinfo"], $rev, ($rev - 50), $rev); ?> - </td> - </tr> - <tr> - <td><?php echo $testman_langres["user"]; ?>:</td> - <td> - <input type="text" id="search_user" value="" size="24" onkeypress="SearchInputs_OnKeyPress(event)" /> - </td> - </tr> - <tr> - <td><?php echo $testman_langres["platform"]; ?>:</td> - <td> - <select id="search_platform" size="1" onkeypress="SearchInputs_OnKeyPress(event)"> - <option></option> - <option value="reactos">ReactOS</option> - <option value="5.0">Windows 2000</option> - <option value="5.1">Windows XP</option> - <option value="5.2">Windows XP x64/Server 2003</option> - <option value="6.0">Windows Vista/Server 2008</option> - <option value="6.1">Windows 7</option> - </select> - </td> - </tr> - </table><br /> - - <button onclick="SearchButton_OnClick()"><?php echo $testman_langres["search_button"]; ?></button> - - <span id="ajax_loading_search"> - <img src="../shared/images/ajax_loading.gif" alt="" /> <?php echo $testman_langres["searching"]; ?>... - </span> - - <div id="searchtable"> -  - </div> - </div> - - </div> - </div> - </div> - </div> - </div> - </td> + <img src="../shared/images/info.gif" alt="" /> <?php printf($shared_langres["rangeinfo"], $rev, ($rev - 50), $rev); ?> + </td> + </tr> + <tr> + <td><label for="search_user"><?php echo $testman_langres["user"]; ?>:</label></td> + <td> + <input type="text" id="search_user" value="" size="24" onkeypress="SearchInputs_OnKeyPress(event)" /> + </td> + </tr> + <tr> + <td><label for="search_platform"><?php echo $testman_langres["platform"]; ?>:</label></td> + <td> + <select id="search_platform" size="1" onkeypress="SearchInputs_OnKeyPress(event)"> + <option></option> + <option value="reactos">ReactOS</option> + <option value="5.0">Windows 2000</option> + <option value="5.1">Windows XP</option> + <option value="5.2">Windows XP x64/Server 2003</option> + <option value="6.0">Windows Vista/Server 2008</option> + <option value="6.1">Windows 7</option> + </select> + </td> + </tr> + </table><br /> - <td id="rightbox_td"> - <div class="bubble_bg"> - <div class="rounded_ll"> - <div class="rounded_lr"> - <div class="rounded_ul"> - <div class="rounded_ur"> - - <div class="bubble"> - <div id="status"><?php printf($testman_langres["status"], "<b>0</b>"); ?></div><br /> - - <button onclick="CompareButton_OnClick()"><?php echo $testman_langres["compare_button"]; ?></button> - </div> - - </div> - </div> - </div> - </div> - </div> - </td> - </tr> - </table> + <span class="controlgroup"> + <button onclick="SearchButton_OnClick()"><?php echo $testman_langres["search_button"]; ?></button> + <img id="ajax_loading_search" src="../shared/images/ajax_loading.gif" alt="" /> + </span> + + <span class="controlgroup"> + <button onclick="CompareFirstTwoButton_OnClick()"><?php echo $testman_langres["comparefirsttwo_button"]; ?></button> + <button onclick="CompareSelectedButton_OnClick()"><?php echo $testman_langres["compareselected_button"]; ?></button> + <input type="checkbox" id="opennewwindow" onclick="OpenNewWindowCheckbox_OnClick(this)" /> <label for="opennewwindow"><?php echo $testman_langres["opennewwindow_checkbox"]; ?></label> + </span> + + <div id="searchtable"> +  + </div> + </div> + + </div> + </div> + </div> + </div> + </div><br /> + + <iframe id="comparepage_frame" frameborder="0" onload="ResizeIFrame()" scrolling="no"></iframe> </div> - -</td> -</tr> -</table> </body> </html> Modified: branches/danny-web/www/www.reactos.org/testman/js/compare.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/compare.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/compare.js.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -54,6 +54,10 @@ document.getElementById("suite_" + UnchangedRows[i]).style.display = value; document.cookie = "showchanged=" + (checkbox.checked ? "1" : "0"); + + // Report the size change to the parent window if "Open in new window" was disabled + if(parent.ResizeIFrame) + parent.ResizeIFrame(); } function GetValueForResult(td) @@ -300,21 +304,6 @@ CurrentRightDragBorder = MaxRightDragBorder; } -function GetCookieValue(cookie) -{ - var cookies = document.cookie.split(";"); - - for(var i = 0; i < cookies.length; i++) - { - var data = cookies[i].split("="); - - if(data[0] == cookie) - return data[1]; - } - - return null; -} - function Load() { // Prepare the Drag & Drop feature Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -76,7 +76,7 @@ } // Update the status message - document.getElementById("status").innerHTML = "<?php printf($testman_langres["status"], '<b>" + SelectedResultCount + "<\/b>'); ?>"; + document.getElementById("status").innerHTML = '<?php printf($testman_langres["status"], '<span id="selectedresultcount">\' + SelectedResultCount + \'<\/span>'); ?>'; } /** @@ -187,6 +187,7 @@ data["endrev"] = inputbox_endrev; data["user"] = document.getElementById("search_user").value; data["platform"] = document.getElementById("search_platform").value; + data["perpage"] = <?php echo RESULTS_PER_PAGE; ?>; data["resultlist"] = 1; data["requesttype"] = REQUESTTYPE_FULLLOAD; @@ -194,6 +195,57 @@ SearchCall(); } +function DetectObsoleteIE() +{ + var position = navigator.userAgent.indexOf("MSIE"); + + if(position >= 0) + { + var version = navigator.userAgent.substr(position + 5, 1); + return (version < 8); + } + + return false; +} + +function ResizeIFrame() +{ + if(DetectObsoleteIE()) + return; + + var iframe = document.getElementById("comparepage_frame"); + iframe.height = iframe.contentDocument.body.offsetHeight + 16; +} + +function Load() +{ + // General settings + var iframe = document.getElementById("comparepage_frame"); + + if(DetectObsoleteIE()) + { + document.getElementById("opennewwindow").checked = true; + document.getElementById("opennewwindow").disabled = true; + } + else + { + document.getElementById("opennewwindow").checked = parseInt(GetCookieValue("opennewwindow")); + } + + // Show the last revisions + data = new Array(); + + CurrentPage = 1; + + data["perpage"] = <?php echo DEFAULT_SEARCH_RESULTS_PER_PAGE; ?>; + data["user"] = "<?php echo DEFAULT_SEARCH_USER; ?>"; + + data["resultlist"] = 1; + data["requesttype"] = REQUESTTYPE_FULLLOAD; + + SearchCall(); +} + function GetTagData(RootElement, TagName) { var Child = RootElement.getElementsByTagName(TagName)[0].firstChild; @@ -230,6 +282,10 @@ html += document.getElementById("infobox").innerHTML; } + html += '<\/td>'; + + html += '<td id="status">'; + html += '<?php printf(addslashes($testman_langres["status"]), '<span id="selectedresultcount">0<\/span>'); ?>'; html += '<\/td>'; // Page number boxes @@ -278,7 +334,7 @@ html += '<\/td><\/tr><\/table>'; // File table - html += '<table class="datatable" cellspacing="0" cellpadding="0">'; + html += '<table id="resulttable" class="datatable" cellspacing="0" cellpadding="0">'; html += '<thead><tr class="head">'; html += '<th class="TestCheckbox"><\/th>'; @@ -367,19 +423,36 @@ document.getElementById("ajax_loading_search").style.visibility = "hidden"; } -function CompareLastTwoButton_OnClick() +function OpenComparePage(parameters) +{ + if(document.getElementById("opennewwindow").checked || DetectObsoleteIE()) + { + window.open("compare.php?" + parameters); + } + else + { + var iframe = document.getElementById("comparepage_frame"); + + iframe.src = "compare.php?" + parameters; + iframe.style.display = "block"; + } +} + +function CompareFirstTwoButton_OnClick() { var parameters = "ids="; - var trs = document.getElementById("lastresults").getElementsByTagName("tbody")[0].getElementsByTagName("tr"); - - if(trs.length < 2) - return; - - // Get the IDs through the "name" attribute of the checkboxes - parameters += trs[1].firstChild.firstChild.name.substr(5) + ","; + var trs = document.getElementById("resulttable").getElementsByTagName("tbody")[0].getElementsByTagName("tr"); + + if(trs[0].firstChild.firstChild.nodeName != "INPUT") + return; + + // Get the IDs through the "name" attribute of the checkboxes parameters += trs[0].firstChild.firstChild.name.substr(5); - window.open("compare.php?" + parameters); + if(trs[1]) + parameters += "," + trs[1].firstChild.firstChild.name.substr(5); + + OpenComparePage(parameters); } function PageSwitch(NewPage, StartID) @@ -427,7 +500,7 @@ return a - b; } -function CompareButton_OnClick() +function CompareSelectedButton_OnClick() { var parameters = "ids="; var IDArray = new Array(); @@ -456,5 +529,11 @@ parameters += "," + IDArray[i]; } - window.open("compare.php?" + parameters); -} + OpenComparePage(parameters); +} + +function OpenNewWindowCheckbox_OnClick(checkbox) +{ + document.cookie = "opennewwindow=" + (checkbox.checked ? "1" : "0"); + document.getElementById("comparepage_frame").style.display = "none"; +} Added: branches/danny-web/www/www.reactos.org/testman/js/shared.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/shared.js (added) +++ branches/danny-web/www/www.reactos.org/testman/js/shared.js [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -1,0 +1,23 @@ +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Shared JavaScript functions + COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + + charset=utf-8 +*/ + +function GetCookieValue(cookie) +{ + var cookies = document.cookie.split("; "); + + for(var i = 0; i < cookies.length; i++) + { + var data = cookies[i].split("="); + + if(data[0] == cookie) + return data[1]; + } + + return null; +} Propchange: branches/danny-web/www/www.reactos.org/testman/js/shared.js ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -16,8 +16,6 @@ "index_intro" => "Mit dieser OberflÃ¤che kÃ¶nnen Sie die Ergebnisse automatisch ausgefÃ¼hrter Regression-Tests suchen, anzeigen und vergleichen.", "js_disclaimer" => "Sie mÃ¼ssen JavaScript aktivieren, um die OberflÃ¤che zu benutzen!", - "lastresults_header" => "Letzte 10 Testergebnisse", - "comparelasttwo_button" => "Letzte zwei Ergebnisse vergleichen", "date" => "Datum", "revision" => "Revision", "user" => "Benutzer", @@ -26,13 +24,13 @@ "search_header" => "Nach Testergebnissen suchen", "search_button" => "Suchen", - "searching" => "Testergebnisse werden gesucht", + "comparefirsttwo_button" => "Erste zwei Ergebnisse vergleichen", + "compareselected_button" => "GewÃ¤hlte Ergebnisse vergleichen", + "opennewwindow_checkbox" => "In neuem Fenster Ã¶ffnen", "foundresults" => "%s Ergebnisse gefunden!", "noresults" => "Keine Suchergebnisse!", - - "status" => "<b>%s</b> Tests zum Vergleich ausgewÃ¤hlt", - "compare_button" => "Jetzt vergleichen", + "status" => "%s Tests zum Vergleich ausgewÃ¤hlt", "noselection" => "Sie haben keine Ergebnisse ausgewÃ¤hlt!", "maxselection" => "Sie dÃ¼rfen nur bis zu %d Ergebnisse zum Vergleich auswÃ¤hlen!", Modified: branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -16,8 +16,6 @@ "index_intro" => "This interface enables you to find, view and compare Results of automatically performed Regression Tests.", "js_disclaimer" => "You have to activate JavaScript to use the interface!", - "lastresults_header" => "Last 10 Test Results", - "comparelasttwo_button" => "Compare last two Results", "date" => "Date", "revision" => "Revision", "user" => "User", @@ -26,13 +24,13 @@ "search_header" => "Search for Test Results", "search_button" => "Search", - "searching" => "Searching for Test Results", + "comparefirsttwo_button" => "Compare first two Results", + "compareselected_button" => "Compare selected Results", + "opennewwindow_checkbox" => "Open in new Window", "foundresults" => "Found %s Results!", "noresults" => "No Search Results!", - - "status" => "<b>%s</b> Tests selected for comparison", - "compare_button" => "Compare Now", + "status" => "%s Tests selected for comparison", "noselection" => "You did not select any results!", "maxselection" => "You may only select up to %d results for comparison!", Modified: branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php [iso-8859-1] Sat Jun 13 05:47:10 2009 @@ -17,8 +17,6 @@ "index_intro" => "Ten interfejs pozwala Tobie znaleÅºÄ, zobaczyÄ i porÃ³wnaÄ wyniki przeprowadzanych automatycznie testÃ³w regresji.", "js_disclaimer" => "Musisz wÅÄczyÄ obsÅugÄ JavaScriptu, aby uÅ¼ywaÄ tego interfejsu!", - "lastresults_header" => "10 ostatnich wynikÃ³w testÃ³w", - "comparelasttwo_button" => "PorÃ³wnaj dwa ostatnie wyniki testÃ³w", "date" => "Data", "revision" => "Rewizja", "user" => "UÅ¼ytkownik", @@ -27,13 +25,13 @@ "search_header" => "Szukaj wynikÃ³w testÃ³w", "search_button" => "Szukaj", - "searching" => "Trwa szukanie w wynikach testÃ³w", + "comparefirsttwo_button" => "PorÃ³wnaj dwa ostatnie wyniki testÃ³w", + "compareselected_button" => "PorÃ³wnaj dwa pierwsze wyniki testÃ³w", + "opennewwindow_checkbox" => "OtwÃ³rz w nowym oknie", "foundresults" => "Znaleziono %s wynikÃ³w!", - "noresults" => "Brak wynikÃ³w wyszukiwania!", - - "status" => "<b>%s</b> testÃ³w wybranych do porÃ³wnania", - "compare_button" => "PorÃ³wnaj", + "noresults" => "Brak wynikÃ³w wyszukiwania!", + "status" => "%s testÃ³w wybranych do porÃ³wnania", "noselection" => "Nie wybraÅeÅ/aÅ Å¼adnych wynikÃ³w!", "maxselection" => "MoÅ¼esz zaznaczyÄ do porÃ³wnania maksymalnie %d wynikÃ³w!",

1 0

[tkreuzer] 41398: Patch by Olaf Siejka (caemyr gmail com): add stubs for unimplmented cases in ScsiPortNotification
by tkreuzer＠svn.reactos.org 12 Jun '09

12 Jun '09

Author: tkreuzer Date: Sat Jun 13 02:31:02 2009 New Revision: 41398 URL: http://svn.reactos.org/svn/reactos?rev=41398&view=rev Log: Patch by Olaf Siejka (caemyr gmail com): add stubs for unimplmented cases in ScsiPortNotification Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sat Jun 13 02:31:02 2009 @@ -1981,8 +1981,24 @@ SCSI_PORT_RESET | SCSI_PORT_RESET_REPORTED; break; + case CallDisableInterrupts: + DPRINT1("UNIMPLEMENTED SCSI Notification called: CallDisableInterrupts!\n"); + break; + + case CallEnableInterrupts: + DPRINT1("UNIMPLEMENTED SCSI Notification called: CallEnableInterrupts!\n"); + break; + + case RequestTimerCall: + DPRINT1("UNIMPLEMENTED SCSI Notification called: RequestTimerCall!\n"); + break; + + case BusChangeDetected: + DPRINT1("UNIMPLEMENTED SCSI Notification called: BusChangeDetected!\n"); + break; + default: - DPRINT1 ("Unsupported notification %lu\n", NotificationType); + DPRINT1 ("Unsupported notification from WMI: %lu\n", NotificationType); break; }

1 0

[dgorbachev] 41397: Fix bug #4558 ("buildno" is not compatible with SVN 1.6).
by dgorbachev＠svn.reactos.org 12 Jun '09

12 Jun '09

Author: dgorbachev Date: Sat Jun 13 01:42:32 2009 New Revision: 41397 URL: http://svn.reactos.org/svn/reactos?rev=41397&view=rev Log: Fix bug #4558 ("buildno" is not compatible with SVN 1.6). Modified: trunk/reactos/tools/buildno/buildno.cpp Modified: trunk/reactos/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.cpp?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/buildno/buildno.cpp [iso-8859-1] Sat Jun 13 01:42:32 2009 @@ -45,38 +45,35 @@ return i; } -char * -GetRev(void) +long +GetRev(char *Revision, size_t length) { - static char Unknown[] = "UNKNOWN"; - static char Revision[10]; /* 999999999 revisions should be enough for everyone... */ - - /* SVN 1.4.x-1.5.x */ + long revno = 0; + char *p; + FILE *fp = NULL; - char ch; - size_t count = 0, chars = 0; fp = fopen(".svn/entries", "r"); if (fp != NULL) { - ch=fgetc(fp); - if (ch == 56 || ch == 57) /* some kind of header? */ - { - while((ch=fgetc(fp)) != EOF) + if (fgets(Revision, length, fp) != NULL) + { + /* If the first character of the file is not a digit, + then it is probably in XML format. */ + if (isdigit(Revision[0])) { - if (ch == 10) - count++; /* seems to used as a seperator */ - if (count > 3) - break; - if ((count == 3) && (chars < sizeof(Revision))) + while (fgets(Revision, length, fp) != NULL) { - if (chars != 0) - Revision[chars - 1] = ch; - chars++; + revno = strtol(Revision, &p, 10); + if (revno != 0) + { + *p = '\0'; + fclose(fp); + return revno; + } } } - fclose(fp); - return Revision; - } + } + fclose(fp); } try @@ -113,20 +110,21 @@ } if ("revision" == Attribute->name) { - if (sizeof(Revision) <= Attribute->value.length() + 1) + if (length <= Attribute->value.length() + 1) { strcpy(Revision, "revtoobig"); } else { strcpy(Revision, Attribute->value.c_str()); + revno = strtol(Revision, NULL, 10); } GotRevision = true; } if (GotName && GotKind && GotRevision) { delete head; - return Revision; + return revno; } } } @@ -139,11 +137,12 @@ ; } - return Unknown; + strcpy(Revision, "UNKNOWN"); + return revno; } void -write_h (int build, char *buildstr) +write_h (int build, char *buildstr, long revno) { FILE *h = NULL; char* s; @@ -159,7 +158,7 @@ s = s + sprintf (s, "#define _INC_REACTOS_BUILDNO\n" ); s = s + sprintf (s, "#define KERNEL_VERSION_BUILD\t%d\n", build); - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_HEX\t0x%x\n", atoi(GetRev())); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_HEX\t0x%lx\n", revno); s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%s\"\n", buildstr); s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%s\\0\"\n", buildstr); s = s + sprintf (s, "#define KERNEL_RELEASE_RC\t\"%d.%d", @@ -285,7 +284,8 @@ int quiet = FALSE; int build = 0; - char buildstr[64]; + long revno; + char buildstr[64], revision[10]; time_t t1 = 0; struct tm * t1_tm = NULL; @@ -382,7 +382,8 @@ build_tag = new_build_tag; } - sprintf(buildstr, "%d-r%s", build, GetRev()); + revno = GetRev(revision, sizeof(revision)); + sprintf(buildstr, "%d-r%s", build, revision); if (! quiet) { @@ -399,7 +400,7 @@ /* (Over)write the include file, unless the user switched on -p. */ if (! print_only) { - write_h (build, buildstr); + write_h (build, buildstr, revno); } else {

1 0

[dchapyshev] 41396: - Revert r41390
by dchapyshev＠svn.reactos.org 12 Jun '09

12 Jun '09

Author: dchapyshev Date: Fri Jun 12 21:54:51 2009 New Revision: 41396 URL: http://svn.reactos.org/svn/reactos?rev=41396&view=rev Log: - Revert r41390 Modified: trunk/reactos/subsystems/win32/csrss/init.c Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] Fri Jun 12 21:54:51 2009 @@ -639,7 +639,6 @@ UNICODE_STRING CommandLine; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; RTL_USER_PROCESS_INFORMATION ProcessInfo; - PROCESS_PRIORITY_CLASS PriorityClass; DPRINT("CSR: %s called\n", __FUNCTION__); @@ -676,18 +675,6 @@ __FUNCTION__, Status); } - PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_HIGH; - PriorityClass.Foreground = FALSE; - - /* Set priority for process */ - if (!NT_SUCCESS(NtSetInformationProcess(ProcessInfo.ProcessHandle, - ProcessPriorityClass, - &PriorityClass, - sizeof(PROCESS_PRIORITY_CLASS)))) - { - DPRINT1("Unable to set process priority for winlogon.exe\n"); - } - ZwResumeThread(ProcessInfo.ThreadHandle, NULL); return Status; }

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