Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[dchapyshev] 41971: - Currently, SearchPathW fails with path such as subdir\binary.exe. This patch is there to address it. It permits VBoxService to launch, and probably others. Patch by zefklop (jerome.gardou@laposte.net) See issue #4697 for more details.
by dchapyshev＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: dchapyshev Date: Wed Jul 15 17:27:59 2009 New Revision: 41971 URL: http://svn.reactos.org/svn/reactos?rev=41971&view=rev Log: - Currently, SearchPathW fails with path such as subdir\binary.exe. This patch is there to address it. It permits VBoxService to launch, and probably others. Patch by zefklop (jerome.gardou(a)laposte.net) See issue #4697 for more details. Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Wed Jul 15 17:27:59 2009 @@ -1006,23 +1006,26 @@ PWCHAR EnvironmentBufferW = NULL; PWCHAR AppPathW = NULL; WCHAR Buffer; - BOOL HasExtension; + BOOL HasExtension = FALSE, IsAbsolute = FALSE; LPCWSTR p; PWCHAR Name; TRACE("SearchPath\n"); - HasExtension = FALSE; p = lpFileName + wcslen(lpFileName); while (lpFileName < p && L'\\' != *(p - 1) && - L'/' != *(p - 1) && - L':' != *(p - 1)) + L'/' != *(p - 1)) { HasExtension = HasExtension || L'.' == *(p - 1); + if (p >= lpFileName && L'\\' == *(p-1)) + { + if (':' == *p) + IsAbsolute = TRUE; + } p--; } - if (lpFileName < p) + if (IsAbsolute) { if (HasExtension || NULL == lpExtension) { @@ -1041,7 +1044,7 @@ } wcscat(wcscpy(Name, lpFileName), lpExtension); } - if (RtlDoesFileExists_U(Name)) + if (RtlDoesFileExists_U(Name)) { retCode = RtlGetFullPathName_U (Name, nBufferLength * sizeof(WCHAR),

1 0

[janderwald] 41970: - Interrupt is only shareable if the type is latched - Only transfer as maximum the FrameSize which was obtained by IMiniportWaveCyclicStream::SetNotficationFreq - Remove the pin service group member before queing the workitem to close the stream
by janderwald＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: janderwald Date: Wed Jul 15 16:11:00 2009 New Revision: 41970 URL: http://svn.reactos.org/svn/reactos?rev=41970&view=rev Log: - Interrupt is only shareable if the type is latched - Only transfer as maximum the FrameSize which was obtained by IMiniportWaveCyclicStream::SetNotficationFreq - Remove the pin service group member before queing the workitem to close the stream Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Wed Jul 15 16:11:00 2009 @@ -138,11 +138,6 @@ return Status; } - /* release existing pin */ - if (This->Pins[ConnectDetails->PinId]) - { - This->Pins[ConnectDetails->PinId]->lpVtbl->Release(This->Pins[ConnectDetails->PinId]); - } /* store pin */ This->Pins[ConnectDetails->PinId] = Pin; @@ -409,6 +404,7 @@ { if (This->Pins[Index] == Pin) { + This->Descriptor->Factory.Instances[Index].CurrentPinInstanceCount--; This->Pins[Index]->lpVtbl->Release(This->Pins[Index]); This->Pins[Index] = NULL; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] Wed Jul 15 16:11:00 2009 @@ -138,11 +138,6 @@ return Status; } - /* release existing pin */ - if (This->Pins[ConnectDetails->PinId]) - { - This->Pins[ConnectDetails->PinId]->lpVtbl->Release(This->Pins[ConnectDetails->PinId]); - } /* store pin */ This->Pins[ConnectDetails->PinId] = Pin; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Wed Jul 15 16:11:00 2009 @@ -213,7 +213,7 @@ STDMETHOD_(ULONG, NumMappings)(THIS); - STDMETHOD_(ULONG, MinMappings)(THIS); + STDMETHOD_(ULONG, NumData)(THIS); STDMETHOD_(BOOL, MinimumDataAvailable)(THIS); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Wed Jul 15 16:11:00 2009 @@ -255,12 +255,12 @@ IInterruptServiceRoutine, (PVOID)This, &This->Lock, - Descriptor->u.Interrupt.Vector, + Descriptor->u.Interrupt.Vector, Descriptor->u.Interrupt.Level, - Descriptor->u.Interrupt.Level, //FIXME - Descriptor->Flags, - TRUE, - Descriptor->u.Interrupt.Affinity, + Descriptor->u.Interrupt.Level, + (Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED), + (Descriptor->Flags != CM_RESOURCE_INTERRUPT_LATCHED), + Descriptor->u.Interrupt.Affinity, FALSE); DPRINT("IInterruptSync_fnConnect result %x\n", Status); @@ -347,7 +347,7 @@ DPRINT("PcNewInterruptSync entered OutInterruptSync %p OuterUnknown %p ResourceList %p ResourceIndex %u Mode %d\n", OutInterruptSync, OuterUnknown, ResourceList, ResourceIndex, Mode); - if (!OutInterruptSync || !ResourceList || Mode > InterruptSyncModeRepeat || Mode < InterruptSyncModeNormal || Mode > InterruptSyncModeRepeat) + if (!OutInterruptSync || !ResourceList || Mode < InterruptSyncModeNormal || Mode > InterruptSyncModeRepeat) return STATUS_INVALID_PARAMETER; if (ResourceIndex > ResourceList->lpVtbl->NumberOfEntriesOfType(ResourceList, CmResourceTypeInterrupt)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Wed Jul 15 16:11:00 2009 @@ -296,10 +296,11 @@ ULONG NTAPI -IIrpQueue_fnMinMappings( +IIrpQueue_fnNumData( IN IIrpQueue *iface) { - return 25; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + return This->NumDataAvailable; } @@ -320,8 +321,9 @@ Result = TRUE; } else + { Result = FALSE; - + } return Result; } @@ -345,6 +347,7 @@ IIrpQueueImpl * This = (IIrpQueueImpl*)iface; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; This->StartStream = FALSE; + This->NumDataAvailable = 0; } @@ -483,7 +486,7 @@ IIrpQueue_fnGetMapping, IIrpQueue_fnUpdateMapping, IIrpQueue_fnNumMappings, - IIrpQueue_fnMinMappings, + IIrpQueue_fnNumData, IIrpQueue_fnMinimumDataAvailable, IIrpQueue_fnCancelBuffers, IIrpQueue_fnUpdateFormat, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Wed Jul 15 16:11:00 2009 @@ -38,6 +38,7 @@ ULONG PreCompleted; ULONG PostCompleted; + ULONG Delay; }IPortPinWaveCyclicImpl; @@ -114,7 +115,8 @@ VOID UpdateCommonBuffer( IPortPinWaveCyclicImpl * This, - ULONG Position) + ULONG Position, + ULONG MaxTransferCount) { ULONG BufferLength; ULONG BytesToCopy; @@ -123,6 +125,8 @@ NTSTATUS Status; BufferLength = Position - This->CommonBufferOffset; + BufferLength = min(BufferLength, MaxTransferCount); + while(BufferLength) { Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); @@ -130,7 +134,6 @@ return; BytesToCopy = min(BufferLength, BufferSize); - if (This->Capture) { @@ -158,16 +161,18 @@ VOID UpdateCommonBufferOverlap( IPortPinWaveCyclicImpl * This, - ULONG Position) -{ - ULONG BufferLength; + ULONG Position, + ULONG MaxTransferCount) +{ + ULONG BufferLength, Length, Gap; ULONG BytesToCopy; ULONG BufferSize; PUCHAR Buffer; NTSTATUS Status; - BufferLength = This->CommonBufferSize - This->CommonBufferOffset; + BufferLength = Gap = This->CommonBufferSize - This->CommonBufferOffset; + BufferLength = Length = min(BufferLength, MaxTransferCount); while(BufferLength) { Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); @@ -196,8 +201,18 @@ BufferLength = This->CommonBufferSize - This->CommonBufferOffset; } - This->CommonBufferOffset = 0; - UpdateCommonBuffer(This, Position); + + if (Gap == Length) + { + This->CommonBufferOffset = 0; + + MaxTransferCount -= Length; + + if (MaxTransferCount) + { + UpdateCommonBuffer(This, Position, MaxTransferCount); + } + } } VOID @@ -232,6 +247,11 @@ This->IrpQueue->lpVtbl->CancelBuffers(This->IrpQueue); //FIX function name DPRINT1("Stopping PreCompleted %u PostCompleted %u\n", This->PreCompleted, This->PostCompleted); } + if (This->State == KSSTATE_RUN) + { + DPRINT1("State RUN %x MinAvailable %u\n", State, This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)); + + } } } @@ -307,11 +327,11 @@ if (Position < This->CommonBufferOffset) { - UpdateCommonBufferOverlap(This, Position); + UpdateCommonBufferOverlap(This, Position, This->FrameSize); } else if (Position >= This->CommonBufferOffset) { - UpdateCommonBuffer(This, Position); + UpdateCommonBuffer(This, Position, This->FrameSize); } } @@ -431,6 +451,7 @@ { PKSSTATE State = (PKSSTATE)Irp->UserBuffer; + ASSERT_IRQL(DISPATCH_LEVEL); if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSSTATE)) { Irp->IoStatus.Information = sizeof(KSSTATE); @@ -674,9 +695,6 @@ IN PVOID Context) { PMINIPORTWAVECYCLICSTREAM Stream; - NTSTATUS Status; - ISubdevice *ISubDevice; - PSUBDEVICE_DESCRIPTOR Descriptor; IPortPinWaveCyclicImpl * This; PCLOSESTREAM_CONTEXT Ctx = (PCLOSESTREAM_CONTEXT)Context; @@ -691,19 +709,6 @@ } } - This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); - - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); - if (NT_SUCCESS(Status)) - { - Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); - if (NT_SUCCESS(Status)) - { - ISubDevice->lpVtbl->Release(ISubDevice); - Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; - } - } - if (This->Format) { ExFreePool(This->Format); @@ -751,26 +756,30 @@ if (This->Stream) { + /* allocate a close context */ Ctx = AllocateItem(NonPagedPool, sizeof(CLOSESTREAM_CONTEXT), TAG_PORTCLASS); if (!Ctx) { DPRINT1("Failed to allocate stream context\n"); goto cleanup; } - + /* allocate work context */ Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); if (!Ctx->WorkItem) { DPRINT1("Failed to allocate work item\n"); goto cleanup; } - + /* setup the close context */ Ctx->Irp = Irp; Ctx->Pin = (PVOID)This; IoMarkIrpPending(Irp); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_PENDING; + + /* remove member from service group */ + This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); /* defer work item */ IoQueueWorkItem(Ctx->WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)Ctx); @@ -910,7 +919,7 @@ InterlockedIncrement((PLONG)&This->TotalPackets); - DPRINT1("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted); + DPRINT("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u State %x MinData %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue)); Packet = (PCONTEXT_WRITE)Buffer; @@ -1057,6 +1066,8 @@ This->CommonBufferSize = This->DmaChannel->lpVtbl->AllocatedBufferSize(This->DmaChannel); This->CommonBuffer = This->DmaChannel->lpVtbl->SystemAddress(This->DmaChannel); This->Capture = Capture; + /* delay of 10 milisec */ + This->Delay = Int32x32To64(10, -10000); Status = This->Stream->lpVtbl->SetNotificationFreq(This->Stream, 10, &This->FrameSize); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Wed Jul 15 16:11:00 2009 @@ -238,7 +238,7 @@ break; case STATUS_WAIT_1: PsTerminateSystemThread(STATUS_SUCCESS); - break; + return; } }while(TRUE); }

1 0

[sginsberg] 41969: - The 4th parameter of NtCreateDebugObject is not a BOOLEAN -- it is a ULONG, meaning it could contain several flags (but only 0x1 seems to be valid). Add DBGK_KILL_PROCESS_ON_EXIT as this flag and use it.
by sginsberg＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: sginsberg Date: Wed Jul 15 16:01:15 2009 New Revision: 41969 URL: http://svn.reactos.org/svn/reactos?rev=41969&view=rev Log: - The 4th parameter of NtCreateDebugObject is not a BOOLEAN -- it is a ULONG, meaning it could contain several flags (but only 0x1 seems to be valid). Add DBGK_KILL_PROCESS_ON_EXIT as this flag and use it. Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c trunk/reactos/include/ndk/dbgkfuncs.h trunk/reactos/include/ndk/dbgktypes.h trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] Wed Jul 15 16:01:15 2009 @@ -33,7 +33,7 @@ return ZwCreateDebugObject(&NtCurrentTeb()->DbgSsReserved[1], DEBUG_OBJECT_ALL_ACCESS, &ObjectAttributes, - TRUE); + DBGK_KILL_PROCESS_ON_EXIT); } /* Modified: trunk/reactos/include/ndk/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgkfuncs.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgkfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/dbgkfuncs.h [iso-8859-1] Wed Jul 15 16:01:15 2009 @@ -43,7 +43,7 @@ OUT PHANDLE DebugHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN KillProcessOnExit + IN ULONG Flags ); NTSYSCALLAPI Modified: trunk/reactos/include/ndk/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgktypes.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgktypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/dbgktypes.h [iso-8859-1] Wed Jul 15 16:01:15 2009 @@ -42,6 +42,12 @@ #define DEBUG_EVENT_RELEASE (0x08) #define DEBUG_EVENT_PROTECT_FAILED (0x10) #define DEBUG_EVENT_SUSPEND (0x20) + +// +// NtCreateDebugObject Flags +// +#define DBGK_KILL_PROCESS_ON_EXIT (0x1) +#define DBGK_ALL_FLAGS (DBGK_KILL_PROCESS_ON_EXIT) // // Debug Object Information Classes for NtQueryDebugObject Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Wed Jul 15 16:01:15 2009 @@ -1512,7 +1512,7 @@ NtCreateDebugObject(OUT PHANDLE DebugHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN KillProcessOnExit) + IN ULONG Flags) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PDEBUG_OBJECT DebugObject; @@ -1536,6 +1536,9 @@ } _SEH2_END; if (!NT_SUCCESS(Status)) return Status; } + + /* Check for invalid flags */ + if (Flags & ~DBGK_ALL_FLAGS) return STATUS_INVALID_PARAMETER; /* Create the Object */ Status = ObCreateObject(PreviousMode, @@ -1561,7 +1564,7 @@ FALSE); /* Set the Flags */ - DebugObject->KillProcessOnExit = KillProcessOnExit; + DebugObject->Flags = Flags; /* Insert it */ Status = ObInsertObject((PVOID)DebugObject,

1 0

[dgorbachev] 41968: Update Romanian translations. Petru Dimitriu, bug #4692.
by dgorbachev＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: dgorbachev Date: Wed Jul 15 15:04:16 2009 New Revision: 41968 URL: http://svn.reactos.org/svn/reactos?rev=41968&view=rev Log: Update Romanian translations. Petru Dimitriu, bug #4692. Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/paint/lang/ro-RO.rc trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/system/winlogon/lang/ro-RO.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc trunk/reactos/dll/cpl/console/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/input/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/joy/lang/ro-RO.rc trunk/reactos/dll/cpl/main/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/telephon/lang/ro-RO.rc trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/modemui/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/user32/lang/ro-RO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/paint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… Modified: trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/system/winlogon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ro-RO… Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ro-RO.rc?… Modified: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/telephon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ro-R… Modified: trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ro-R… Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… Modified: trunk/reactos/dll/win32/modemui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/ro-… Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… Modified: trunk/reactos/dll/win32/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/ro-R…

1 0

[dgorbachev] 41967: Update Norwegian translation. Patch by LMH1, bug #4695.
by dgorbachev＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: dgorbachev Date: Wed Jul 15 12:54:37 2009 New Revision: 41967 URL: http://svn.reactos.org/svn/reactos?rev=41967&view=rev Log: Update Norwegian translation. Patch by LMH1, bug #4695. Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] Wed Jul 15 12:54:37 2009 @@ -5,7 +5,7 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "Oppgavebehandler", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "&Lås oppgavelinjen", ID_LOCKTASKBAR MENUITEM "E&genskaper", ID_SHELL_CMD_PROPERTIES @@ -35,14 +35,14 @@ MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sikkerhet...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Nettverk tilkoblinger", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED - MENUITEM "&Printere og Fakser", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED - MENUITEM "&Oppgavelinje og Start meny", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + MENUITEM "&Skrivere og fakser", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "&Oppgavelinje og Startmeny", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END POPUP "Sø&k", IDM_SEARCH BEGIN MENUITEM "", -1, MFT_SEPARATOR END - MENUITEM "&Hjelp og Støtte", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "&Hjelp og støtte", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Kjør...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "S&ynkroniser", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED @@ -53,6 +53,67 @@ END END + +IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Oppgavelinje" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6,6,240,121, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21, WS_DISABLED + AUTOCHECKBOX "&Lås oppgavelinjen", IDC_TASKBARPROP_LOCK, 13,45,200,10, WS_DISABLED + AUTOCHECKBOX "&Skjul oppgavelinjen automatisk", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED + AUTOCHECKBOX "Behold &oppgavelinjen på toppen over andre vinduer", IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED + AUTOCHECKBOX "&Grupper og lignende knapper på oppgavelinjen", IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED + AUTOCHECKBOX "Vis &hurtigstart", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED + AUTOCHECKBOX "&Vis vinduforhåndvisning (miniaturbilde)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED +END + +IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Startmeny" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + AUTORADIOBUTTON "&Startmeny", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + LTEXT "Denne meny stilen gir deg enkelt tilgang til dine mapper, favoritt programmer, og søk.", IDC_STATIC, 20,17,150,24, WS_DISABLED + PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED + AUTORADIOBUTTON "Klassisk Start&meny", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + LTEXT "Denne menystilen gir deg en klassisk utsende og funksjoner",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + GROUPBOX "Personvern",IDC_STATIC, 7,100,238,42 + AUTOCHECKBOX "Lagre og vis en liste av sist åpnet &filer", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "Lagre og vis en liste av sist åpnet &programmer",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED +END + +IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Systemstatusfelt" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED + GROUPBOX "Ikoner", IDC_STATIC, 6,33,240,58, WS_DISABLED + LTEXT "Du kan beholde systemfeltet ryddig ved å skjule ikoner som du ikke har brukt så ofte.", IDC_STATIC, 13,48,223,16, WS_DISABLED + AUTOCHECKBOX "&Skjul inaktive ikoner", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED + GROUPBOX "Systemikoner", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "Velg hvilken systemikoner som skal vises.", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "&Klokke", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + AUTOCHECKBOX "&Volum", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED + AUTOCHECKBOX "&Nettverk", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "&Strøm", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED + +END + +IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Verktøylinje" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + LTEXT "Velg hvilken av verktøylinjene som skal legges til på oppgavelinjen.", IDC_STATIC, 7,7,223,12, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE +END + + STRINGTABLE DISCARDABLE BEGIN IDS_START "Start" @@ -61,68 +122,7 @@ IDS_EXPLORE_ALL_USERS "U&tforsk alle brukere" END - -IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Taskbar" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121, WS_DISABLED - CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21, WS_DISABLED - AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10, WS_DISABLED - AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED - AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED - AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED - AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED - AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED -END - -IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Start Menu" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED - AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED - LTEXT "This menu style gives you the classic look and functionality",-1,20,57,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED - GROUPBOX "Privacy",IDC_STATIC, 7,100,238,42 - AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED - AUTOCHECKBOX "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED -END - -IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Notification Area" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED - GROUPBOX "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED - GROUPBOX "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED - LTEXT "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED - AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED - AUTOCHECKBOX "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED - AUTOCHECKBOX "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED - AUTOCHECKBOX "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED - -END - -IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Toolbars" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - LTEXT "Select which toolbars to add to the taskbar.", IDC_STATIC, 7,7,223,12, WS_DISABLED - CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE -END - - STRINGTABLE DISCARDABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu Properties" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Egenskaper for oppgavelinjen og startmeny" END

1 0

[janderwald] 41966: - ReactOS only supports WAVE_FORMAT_PCM - Helps apps like Adobe Flash Player to output the supported format
by janderwald＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: janderwald Date: Wed Jul 15 12:49:17 2009 New Revision: 41966 URL: http://svn.reactos.org/svn/reactos?rev=41966&view=rev Log: - ReactOS only supports WAVE_FORMAT_PCM - Helps apps like Adobe Flash Player to output the supported format Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Wed Jul 15 12:49:17 2009 @@ -159,6 +159,12 @@ return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } + if (DeviceInfo->u.WaveFormatEx.wFormatTag != WAVE_FORMAT_PCM) + { + DPRINT("FIXME: Only WAVE_FORMAT_PCM is supported RequestFormat %x\n", DeviceInfo->u.WaveFormatEx.wFormatTag); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + Status = GetFilterIdAndPinId(DeviceObject, DeviceInfo, ClientInfo, &FilterId, &PinId); if (!NT_SUCCESS(Status)) { @@ -236,9 +242,6 @@ DataFormat->DataFormat.Flags = 0; DataFormat->DataFormat.Reserved = 0; DataFormat->DataFormat.MajorFormat = KSDATAFORMAT_TYPE_AUDIO; - - if (DeviceInfo->u.WaveFormatEx.wFormatTag != WAVE_FORMAT_PCM) - DPRINT1("FIXME\n"); DataFormat->DataFormat.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; DataFormat->DataFormat.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX;

1 0

[sginsberg] 41965: - Don't use Kf* and Kef* in portable code.
by sginsberg＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: sginsberg Date: Wed Jul 15 12:22:05 2009 New Revision: 41965 URL: http://svn.reactos.org/svn/reactos?rev=41965&view=rev Log: - Don't use Kf* and Kef* in portable code. Modified: trunk/reactos/drivers/network/ndis/ndis/control.c trunk/reactos/drivers/video/videoprt/spinlock.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/spinlock.c Modified: trunk/reactos/drivers/network/ndis/ndis/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -83,9 +83,9 @@ if (Lock->Context != PsGetCurrentThread()) { /* Wait for the exclusive lock to be released. */ Lock->RefCount[KeGetCurrentProcessorNumber()].RefCount--; - KefAcquireSpinLockAtDpcLevel(&Lock->SpinLock); + KeAcquireSpinLockAtDpcLevel(&Lock->SpinLock); Lock->RefCount[KeGetCurrentProcessorNumber()].RefCount++; - KefReleaseSpinLockFromDpcLevel(&Lock->SpinLock); + KeReleaseSpinLockFromDpcLevel(&Lock->SpinLock); } } } @@ -124,7 +124,7 @@ case 4: /* Exclusive write lock */ Lock->Context = NULL; LockState->LockState = -1; - KfReleaseSpinLock(&Lock->SpinLock, LockState->OldIrql); + KeReleaseSpinLock(&Lock->SpinLock, LockState->OldIrql); return; } } Modified: trunk/reactos/drivers/video/videoprt/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/spi… ============================================================================== --- trunk/reactos/drivers/video/videoprt/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/spinlock.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -77,7 +77,7 @@ IN PSPIN_LOCK SpinLock) { TRACE_(VIDEOPRT, "VideoPortAcquireSpinLockAtDpcLevel\n"); - KefAcquireSpinLockAtDpcLevel((PKSPIN_LOCK)SpinLock); + KeAcquireSpinLockAtDpcLevel((PKSPIN_LOCK)SpinLock); } /* @@ -104,5 +104,5 @@ IN PSPIN_LOCK SpinLock) { TRACE_(VIDEOPRT, "VideoPortReleaseSpinLockFromDpcLevel\n"); - KefReleaseSpinLockFromDpcLevel((PKSPIN_LOCK)SpinLock); + KeReleaseSpinLockFromDpcLevel((PKSPIN_LOCK)SpinLock); } Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -1045,12 +1045,12 @@ case VpHighPriority: OldIrql = KeGetCurrentIrql(); if (OldIrql < SYNCH_LEVEL) - OldIrql = KfRaiseIrql(SYNCH_LEVEL); + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); Ret = (*SynchronizeRoutine)(Context); if (OldIrql < SYNCH_LEVEL) - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); break; default: Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=4196… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -578,7 +578,7 @@ while (DpcData->DpcQueueDepth != 0) { /* Lock the DPC data and get the DPC entry*/ - KefAcquireSpinLockAtDpcLevel(&DpcData->DpcLock); + KeAcquireSpinLockAtDpcLevel(&DpcData->DpcLock); DpcEntry = ListHead->Flink; /* Make sure we have an entry */ @@ -602,7 +602,7 @@ Prcb->DebugDpcTime = 0; /* Release the lock */ - KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); + KeReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); /* Re-enable interrupts */ _enable(); @@ -623,7 +623,7 @@ ASSERT(DpcData->DpcQueueDepth == 0); /* Release DPC Lock */ - KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); + KeReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); } } Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -85,6 +85,38 @@ } /* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +KIRQL +NTAPI +KeAcquireInterruptSpinLock(IN PKINTERRUPT Interrupt) +{ + KIRQL OldIrql; + + /* Raise IRQL */ + KeRaiseIrql(Interrupt->SynchronizeIrql, &OldIrql); + + /* Acquire spinlock on MP */ + KeAcquireSpinLockAtDpcLevel(Interrupt->ActualLock); + return OldIrql; +} + +/* + * @implemented + */ +VOID +NTAPI +KeReleaseInterruptSpinLock(IN PKINTERRUPT Interrupt, + IN KIRQL OldIrql) +{ + /* Release lock on MP */ + KeReleaseSpinLockFromDpcLevel(Interrupt->ActualLock); + + /* Lower IRQL */ + KeLowerIrql(OldIrql); +} /* * @implemented @@ -229,38 +261,6 @@ } /* - * @implemented - */ -KIRQL -NTAPI -KeAcquireInterruptSpinLock(IN PKINTERRUPT Interrupt) -{ - KIRQL OldIrql; - - /* Raise IRQL */ - KeRaiseIrql(Interrupt->SynchronizeIrql, &OldIrql); - - /* Acquire spinlock on MP */ - KefAcquireSpinLockAtDpcLevel(Interrupt->ActualLock); - return OldIrql; -} - -/* - * @implemented - */ -VOID -NTAPI -KeReleaseInterruptSpinLock(IN PKINTERRUPT Interrupt, - IN KIRQL OldIrql) -{ - /* Release lock on MP */ - KefReleaseSpinLockFromDpcLevel(Interrupt->ActualLock); - - /* Lower IRQL */ - KeLowerIrql(OldIrql); -} - -/* * @unimplemented */ KIRQL

1 0

[dchapyshev] 41964: - Update Russian translation
by dchapyshev＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: dchapyshev Date: Wed Jul 15 07:49:29 2009 New Revision: 41964 URL: http://svn.reactos.org/svn/reactos?rev=41964&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Wed Jul 15 07:49:29 2009 @@ -58,48 +58,48 @@ IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ïàíåëü Çàäà÷" +CAPTION "Ïàíåëü çàäà÷" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Ñâîéñòâà ïàíåëè çàäà÷", IDC_STATIC, 6,6,240,121, WS_DISABLED CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21, WS_DISABLED AUTOCHECKBOX "&Çàêðåïèòü ïàíåëü çàäà÷", IDC_TASKBARPROP_LOCK, 13,45,200,10, WS_DISABLED - AUTOCHECKBOX "À&âòîìàòè÷åñêè ñêðûâàòü ïàíåëü çàäà÷", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED + AUTOCHECKBOX "&Àâòîìàòè÷åñêè ñêðûâàòü ïàíåëü çàäà÷", IDC_TASKBARPROP_HIDE, 13,58,200,10, WS_DISABLED AUTOCHECKBOX "&Ïîâåðõ äðóãèõ îêîí", IDC_TASKBARPROP_ONTOP, 13,71,200,10, WS_DISABLED AUTOCHECKBOX "&Ãðóïïèðîâàòü ñõîæèå êíîïêè", IDC_TASKBARPROP_GROUP, 13,84,200,10, WS_DISABLED - AUTOCHECKBOX "Îòîáðàæàòü &Áûñòðûé çàïóñê", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED - AUTOCHECKBOX "&Îòîáðàæàòü ïðåäâàðèòåëüíûé ïðîñìîòð îêîí", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED + AUTOCHECKBOX "Îòîáðàæàòü ïàíåëü &áûñòðîãî çàïóñêà", IDC_TASKBARPROP_SHOWQL, 13,97,200,10, WS_DISABLED + AUTOCHECKBOX "Îòîáðà&æàòü îáðàçöû îêîí (ýñêèçû)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10, WS_DISABLED END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ìåíþ Ïóñê" +CAPTION "Ìåíþ ""Ïóñê""" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - AUTORADIOBUTTON "&Ìåíþ ïóñê", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 - LTEXT "Ýòî ìåíþ ïðåäîñòàâëÿåò óäîáíûé äîñòóï ê èçáðàííûì ïðîðãðàììàì, ïàïêàì è ïîèñêó,.", IDC_STATIC, 20,17,150,24, WS_DISABLED + AUTORADIOBUTTON "Ì&åíþ ""Ïóñê""", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + LTEXT "Ýòîò ñòèëü ìåíþ îáåñïå÷èâàåò óäîáíûé äîñòóï ê ïàïêàì, ÷àñòî èñïîëüçóåìûì ïðîãðàììàì è ïîèñêó.", IDC_STATIC, 20,17,150,24, WS_DISABLED PUSHBUTTON "&Íàñòðîèòü...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED - AUTORADIOBUTTON "Êëàññè÷åññêîå &ìåíþ Ïóñê", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED - LTEXT "Êëàññè÷åññêèé ñòèëü îòîáðàæåíèÿ ìåíþ Ïóñê",-1,20,57,150,24, WS_DISABLED - PUSHBUTTON "&Íàñòðîèòü...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED - GROUPBOX "Ïåðñîíàëèçàöèÿ",IDC_STATIC, 7,100,238,42 - AUTOCHECKBOX "Ñîçäàâàòü è îòîáðàæàòü ëèñò ÷àñòî èñïîëüçóåìûõ &ôàéëîâ", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED - AUTOCHECKBOX "Îòîáðàæàòü ñïèñîê ÷àñòî èñïîëüçóåìûõ &ïðîãðàìì",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED + AUTORADIOBUTTON "&Êëàññè÷åññêîå ìåíþ ""Ïóñê""", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + LTEXT "Êëàññè÷åññêèé ñòèëü îòîáðàæåíèÿ ìåíþ ""Ïóñê"".",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "Í&àñòðîèòü...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + GROUPBOX "Êîíôèäåíöèàëüíîñòü",IDC_STATIC, 7,100,238,50 + AUTOCHECKBOX "Õðàíèòü è îòîáðàæàòü ñïèñîê íåäàâíî îòêðûâàâøèõñÿ ôà&éëîâ", IDC_TASKBARPROP_RECENTFILES, 14,114,227,10, WS_DISABLED + AUTOCHECKBOX "Õðàíèòü è îòîáðàæàòü ñïèñîê íåäàâíî îòêðûâàâøèõñÿ &ïðîãðàìì",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,17, WS_DISABLED | BS_MULTILINE END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Îáëàñòü îïîâåùåíèé" +CAPTION "Îáëàñòü óâåäîìëåíèé" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED - GROUPBOX "Èêîíêè", IDC_STATIC, 6,33,240,58, WS_DISABLED - LTEXT "Îáëàñòü îïîâåùåíèÿ ìîæåò ñêðûâàòü èêîíêè ðåäêî èñïîëüçóåìûõ ïðîãðàìì.", IDC_STATIC, 13,48,223,16, WS_DISABLED - AUTOCHECKBOX "&Ñêðûâàòü ïàññèâíûå èêîíêè", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + GROUPBOX "Çíà÷êè", IDC_STATIC, 6,33,240,58, WS_DISABLED + LTEXT "Ìîæíî èçáåæàòü çàãðîìîæäåíèÿ îáëàñòè óâåäîìëåíèé, ñêðûâàÿ çíà÷êè, êîòîðûå äàâíî íå èñïîëüçîâàëèñü.", IDC_STATIC, 13,48,223,16, WS_DISABLED + AUTOCHECKBOX "&Ñêðûâàòü íåèñïîëüçóåìûå çíà÷êè", IDC_TASKBARPROP_HIDEICONS, 13,70,140,10, WS_DISABLED PUSHBUTTON "&Íàñòðîèòü...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED - GROUPBOX "Ñèñòåìíûå èêîíêè", IDC_STATIC, 6,97,240,84, WS_DISABLED - LTEXT "Âûáåðèòå èêîíêè îòîáðàæàåìûå âñåãäà.", IDC_STATIC, 13,112,223,16, WS_DISABLED - AUTOCHECKBOX "×àñ&û", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + GROUPBOX "Ñèñòåìíûå çíà÷êè", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "Âûáåðèòå ïîñòîÿííî îòîáðàæàåìûå ñèñòåìíûå çíà÷êè.", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "&×àñû", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED AUTOCHECKBOX "&Ãðîìêîñòü", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED AUTOCHECKBOX "&Ñåòü", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED AUTOCHECKBOX "&Ïèòàíèå", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED @@ -108,10 +108,10 @@ IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Èíñòðóìåíòû" +CAPTION "Ïàíåëè èíñòðóìåíòîâ" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Âûáåðèòå èíñòðóìåíòû äëÿ äîáàâëåíèÿ â ïàíåëü çàäà÷.", IDC_STATIC, 7,7,223,12, WS_DISABLED + LTEXT "Âûáåðèòå ïàíåëè èíñòðóìåíòîâ, îòîáðàæàåìûå íà ïàíåëè çàäà÷.", IDC_STATIC, 7,7,238,12, WS_DISABLED CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END

1 0

[jimtabor] 41963: - Implement support for HWND_MESSAGE. Need full testing!
by jimtabor＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: jimtabor Date: Wed Jul 15 07:33:21 2009 New Revision: 41963 URL: http://svn.reactos.org/svn/reactos?rev=41963&view=rev Log: - Implement support for HWND_MESSAGE. Need full testing! Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c trunk/reactos/dll/win32/user32/include/controls.h trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/regcontrol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/regcontrol.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -23,7 +23,6 @@ { &POPUPMENU_builtin_class, FNID_MENU }, { &COMBO_builtin_class, FNID_COMBOBOX }, { &COMBOLBOX_builtin_class, FNID_COMBOLBOX }, - { &DESKTOP_builtin_class, FNID_DESKTOP }, { &MDICLIENT_builtin_class, FNID_MDICLIENT }, #if 0 { &MENU_builtin_class, FNID_MENU }, @@ -63,7 +62,7 @@ } -#if 0 + static PFNCLIENT pfnClientA; static PFNCLIENT pfnClientW; static PFNCLIENTWORKER pfnClientWorker; @@ -72,12 +71,12 @@ { NTSTATUS Status; - pfnClientA.pfnScrollBarWndProc = ScrollBarWndProcA; - pfnClientW.pfnScrollBarWndProc = ScrollBarWndProcW; - pfnClientA.pfnTitleWndProc = IconTitleWndProc; - pfnClientW.pfnTitleWndProc = IconTitleWndProc; - pfnClientA.pfnMenuWndProc = PopupMenuWndProcA; - pfnClientW.pfnMenuWndProc = PopupMenuWndProcW; +// pfnClientA.pfnScrollBarWndProc = ScrollBarWndProcA; +// pfnClientW.pfnScrollBarWndProc = ScrollBarWndProcW; +// pfnClientA.pfnTitleWndProc = IconTitleWndProc; +// pfnClientW.pfnTitleWndProc = IconTitleWndProc; +// pfnClientA.pfnMenuWndProc = PopupMenuWndProcA; +// pfnClientW.pfnMenuWndProc = PopupMenuWndProcW; pfnClientA.pfnDesktopWndProc = DesktopWndProc; // Fixme! pfnClientW.pfnDesktopWndProc = DesktopWndProc; pfnClientA.pfnDefWindowProc = DefWindowProcA; @@ -86,22 +85,22 @@ pfnClientW.pfnMessageWindowProc = DefWindowProcW; pfnClientA.pfnSwitchWindowProc = DefWindowProcA; pfnClientW.pfnSwitchWindowProc = DefWindowProcW; - pfnClientA.pfnButtonWndProc = ButtonWndProcA; - pfnClientW.pfnButtonWndProc = ButtonWndProcW - pfnClientA.pfnComboBoxWndProc = ComboWndProcA; - pfnClientW.pfnComboBoxWndProc = ComboWndProcW; - pfnClientA.pfnComboListBoxProc = ListBoxWndProcA; - pfnClientW.pfnComboListBoxProc = ListBoxWndProcW; - pfnClientA.pfnDialogWndProc = DefDlgProcA; - pfnClientW.pfnDialogWndProc = DefDlgProcW; - pfnClientA.pfnEditWndProc = EditWndProcA; - pfnClientW.pfnEditWndProc = EditWndProcW; - pfnClientA.pfnListBoxWndProc = ListBoxWndProcA; - pfnClientW.pfnListBoxWndProc = ListBoxWndProcW; - pfnClientA.pfnMDIClientWndProc = MDIClientWndProcA; - pfnClientW.pfnMDIClientWndProc = MDIClientWndProcW; - pfnClientA.pfnStaticWndProc = StaticWndProcA; - pfnClientW.pfnStaticWndProc = StaticWndProcW; +// pfnClientA.pfnButtonWndProc = ButtonWndProcA; +// pfnClientW.pfnButtonWndProc = ButtonWndProcW +// pfnClientA.pfnComboBoxWndProc = ComboWndProcA; +// pfnClientW.pfnComboBoxWndProc = ComboWndProcW; +// pfnClientA.pfnComboListBoxProc = ListBoxWndProcA; +// pfnClientW.pfnComboListBoxProc = ListBoxWndProcW; +// pfnClientA.pfnDialogWndProc = DefDlgProcA; +// pfnClientW.pfnDialogWndProc = DefDlgProcW; +// pfnClientA.pfnEditWndProc = EditWndProcA; +// pfnClientW.pfnEditWndProc = EditWndProcW; +// pfnClientA.pfnListBoxWndProc = ListBoxWndProcA; +// pfnClientW.pfnListBoxWndProc = ListBoxWndProcW; +// pfnClientA.pfnMDIClientWndProc = MDIClientWndProcA; +// pfnClientW.pfnMDIClientWndProc = MDIClientWndProcW; +// pfnClientA.pfnStaticWndProc = StaticWndProcA; +// pfnClientW.pfnStaticWndProc = StaticWndProcW; pfnClientA.pfnImeWndProc = DefWindowProcA; pfnClientW.pfnImeWndProc = DefWindowProcW; pfnClientA.pfnGhostWndProc = DefWindowProcA; @@ -119,14 +118,14 @@ pfnClientA.pfnMDIActivateDlgProc = DefWindowProcA; pfnClientW.pfnMDIActivateDlgProc = DefWindowProcW; - pfnClientWorker.pfnButtonWndProc = ButtonWndProc_common; - pfnClientWorker.pfnComboBoxWndProc = ComboWndProc_common; - pfnClientWorker.pfnComboListBoxProc = ListBoxWndProc_common; -// pfnClientWorker.pfnDialogWndProc = DefDlgProc_common; - pfnClientWorker.pfnEditWndProc = EditWndProc_common; - pfnClientWorker.pfnListBoxWndProc = ListBoxWndProc_common; - pfnClientWorker.pfnMDIClientWndProc = MDIClientWndProc_common; - pfnClientWorker.pfnStaticWndProc = StaticWndProc_common; +// pfnClientWorker.pfnButtonWndProc = ButtonWndProc_common; +// pfnClientWorker.pfnComboBoxWndProc = ComboWndProc_common; +// pfnClientWorker.pfnComboListBoxProc = ListBoxWndProc_common; +//// pfnClientWorker.pfnDialogWndProc = DefDlgProc_common; +// pfnClientWorker.pfnEditWndProc = EditWndProc_common; +// pfnClientWorker.pfnListBoxWndProc = ListBoxWndProc_common; +// pfnClientWorker.pfnMDIClientWndProc = MDIClientWndProc_common; +// pfnClientWorker.pfnStaticWndProc = StaticWndProc_common; pfnClientWorker.pfnImeWndProc = User32DefWindowProc; pfnClientWorker.pfnGhostWndProc = User32DefWindowProc; pfnClientWorker.pfnCtfHookProc = User32DefWindowProc; @@ -138,4 +137,3 @@ return NT_SUCCESS(Status) ? TRUE : FALSE; } -#endif Modified: trunk/reactos/dll/win32/user32/include/controls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -106,4 +106,9 @@ #define LB_ADDSTRING_UPPER 0x1AC #define LB_ADDSTRING_LOWER 0x1AD +#define DESKTOP_CLASS_ATOM MAKEINTATOMA(32769) /* Desktop */ +LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI User32DefWindowProc(HWND,UINT,WPARAM,LPARAM,BOOL); +BOOL WINAPI RegisterClientPFN(VOID); + #endif /* _ROS_CONTROLS_H */ Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -14,12 +14,10 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -#define DESKTOP_CLASS_ATOM MAKEINTATOMA(32769) /* Desktop */ -static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); - /********************************************************************* * desktop class descriptor */ +#if 0 // Kept for referencing. const struct builtin_class_descr DESKTOP_builtin_class = { (LPCWSTR) DESKTOP_CLASS_ATOM, /* name */ @@ -30,13 +28,12 @@ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_BACKGROUND+1) /* brush */ }; - -static +#endif LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - FIXME("Desktop Class Atom!\n"); + TRACE("Desktop Class Atom! hWnd 0x%x, Msg %d\n", hwnd, message); if (message == WM_NCCREATE) return TRUE; return 0; /* all other messages are ignored */ } Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -242,6 +242,7 @@ gHandleEntries = SharedPtrToUser(gHandleTable->handles); //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); + RegisterClientPFN(); /* Allocate an index for user32 thread local data. */ User32TlsIndex = TlsAlloc(); if (User32TlsIndex != TLS_OUT_OF_INDEXES) @@ -349,4 +350,7 @@ g_psi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); -} + + RegisterClientPFN(); + +} Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -553,7 +553,7 @@ PVOID aheList; // Handle Entry List PVOID pDispInfo; // global PDISPLAYINFO pointer ULONG_PTR ulSharedDelta; // Heap delta - WNDMSG awmControl[31]; + WNDMSG awmControl[FNID_LAST - FNID_FIRST]; WNDMSG DefWindowMsgs; WNDMSG DefWindowSpecMsgs; } SHAREDINFO, *PSHAREDINFO; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -11,7 +11,7 @@ #include "w32csr.h" #include <debug.h> -#define DESKTOP_WINDOW_ATOM 32880 +#define DESKTOP_WINDOW_ATOM 32769 //32880 #define PM_SHOW_DESKTOP 1 #define PM_HIDE_DESKTOP 2 Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -78,6 +78,18 @@ OUT PWINDOWCLASS *BaseClass OPTIONAL, OUT PWINDOWCLASS **Link OPTIONAL); +#define REGISTERCLASS_SYSTEM 0x4 + +PWINDOWCLASS +FASTCALL +IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, + IN PUNICODE_STRING ClassName, + IN PUNICODE_STRING MenuName, + IN WNDPROC wpExtra, + IN DWORD dwFlags, + IN PDESKTOP Desktop, + IN PPROCESSINFO pi); + PCALLPROC UserFindCallProc(IN PWINDOWCLASS Class, IN WNDPROC WndProc, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -37,8 +37,6 @@ /* WINDOWCLASS ***************************************************************/ -#define REGISTERCLASS_SYSTEM 0x4 - static VOID IntFreeClassMenuName(IN OUT PWINDOWCLASS Class) { @@ -168,6 +166,20 @@ } else AtomName = ClassName->Buffer; + + /* If an Atom, need to verify, if it was already added to the global atom list. */ + if (IS_ATOM(AtomName)) + { + *pAtom = (RTL_ATOM)((ULONG_PTR)AtomName); + Status = RtlQueryAtomInAtomTable( gAtomTable, + *pAtom, + NULL, + NULL, + NULL, + NULL); + + if (NT_SUCCESS(Status)) return TRUE; + } Status = RtlAddAtomToAtomTable(gAtomTable, AtomName, @@ -786,7 +798,8 @@ return Ret; } -static PWINDOWCLASS +PWINDOWCLASS +FASTCALL IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, IN PUNICODE_STRING MenuName, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -854,7 +854,6 @@ } /* SYSCALLS *******************************************************************/ - /* * NtUserCreateDesktop * @@ -898,7 +897,7 @@ { OBJECT_ATTRIBUTES ObjectAttributes; PTHREADINFO W32Thread; -// HWND hwndMessage; + HWND hwndMessage; PWINSTATION_OBJECT WinStaObject; PDESKTOP DesktopObject; UNICODE_STRING DesktopName; @@ -912,7 +911,10 @@ ULONG_PTR HeapSize = 4 * 1024 * 1024; /* FIXME */ HWINSTA hWindowStation = NULL ; PUNICODE_STRING lpszDesktopName = NULL; -// UNICODE_STRING AtomName; + UNICODE_STRING ClassName, WindowName, MenuName; + PPROCESSINFO pi = GetW32ProcessInfo(); + WNDCLASSEXW wc; + PWINDOWCLASS Class; DECLARE_RETURN(HDESK); DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName); @@ -1072,7 +1074,12 @@ } /* - * Create a handle for CSRSS and notify CSRSS + * Create a handle for CSRSS and notify CSRSS for Creating Desktop Window. + * + * Honestly, I believe this is a cleverly written hack that allowed ReactOS + * to function at the beginning of the project by ramroding the GUI into + * operation and making the desktop window work from user space. + * (jt) */ Request.Type = MAKE_CSR_API(CREATE_DESKTOP, CSR_GUI); Status = CsrInsertObject(Desktop, @@ -1100,28 +1107,50 @@ if (!W32Thread->Desktop) IntSetThreadDesktop(DesktopObject,FALSE); -#if 0 /* - Based on wine/server/window.c line 1804 in get_desktop_window. - We create an atom to be used for create desktop to create - the message window. + Based on wine/server/window.c in get_desktop_window. */ - // FIXME! - // ReactOS CreateWindow does not know how to correctly use Atom Classes. - // So we have this HAX! - { // Warning! HACK! Yes it is very wrong! - - // Normally, this would have been performed during the win32k init phase. - // AtomMessage = IntAddGlobalAtom(L"Message", TRUE); // <- correct, but should be in ntuser.c - - AtomMessage = - } - AtomName.Buffer = ((PWSTR)((ULONG_PTR)(WORD)(AtomMessage))); - AtomName.Length = 0; + + ClassName.Buffer = ((PWSTR)((ULONG_PTR)(WORD)(AtomMessage))); + ClassName.Length = 0; + RtlZeroMemory(&MenuName, sizeof(MenuName)); + RtlZeroMemory(&WindowName, sizeof(WindowName)); + + wc.cbSize = sizeof(wc); + wc.style = CS_DBLCLKS|CS_PARENTDC; + wc.lpfnWndProc = gpsi->apfnClientW.pfnDesktopWndProc; // Use User32 Desktop Proc. + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = pi->hModUser; // hModClient; + wc.hIcon = NULL; + wc.hCursor = NULL; + wc.hbrBackground = 0; + wc.lpszMenuName = NULL; + wc.lpszClassName = ClassName.Buffer; + wc.hIconSm = NULL; + + Class = IntCreateClass( &wc, + &ClassName, + &MenuName, + NULL, + REGISTERCLASS_SYSTEM, + NULL, + pi); + if (Class != NULL) + { + ASSERT(Class->System); + Class->Next = pi->SystemClassList; + (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, + Class); + } + else + { + DPRINT1("!!! Registering Message system class failed!\n"); + } hwndMessage = co_IntCreateWindowEx( 0, - &AtomName, - NULL, + &ClassName, + &WindowName, (WS_POPUP|WS_CLIPCHILDREN), 0, 0, @@ -1129,7 +1158,7 @@ 100, NULL, NULL, - NULL,//hModuleWin, // pi->hModUser; ? no! + pi->hModUser, // hModClient; NULL, 0, TRUE); @@ -1141,7 +1170,7 @@ { DesktopObject->spwndMessage = hwndMessage; } -#endif + RETURN( Desktop); CLEANUP: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -235,6 +235,8 @@ PWINDOW_OBJECT Child; HWND *List; UINT Index, NumChildren = 0; + + if (!Window) return NULL; for (Child = Window->FirstChild; Child; Child = Child->NextSibling) ++NumChildren; @@ -1594,8 +1596,8 @@ * native ole32.OleInitialize uses HWND_MESSAGE to create the * message window (style: WS_POPUP|WS_DISABLED) */ - DPRINT1("FIXME - Parent is HWND_MESSAGE\n"); - // ParentWindowHandle = IntGetMessageWindow(); + ParentWindowHandle = IntGetMessageWindow(); + DPRINT1("Parent is HWND_MESSAGE 0x%x\n", ParentWindowHandle); } else if (hWndParent) { @@ -1784,7 +1786,7 @@ InitializeListHead(&Wnd->PropListHead); InitializeListHead(&Window->WndObjListHead); - if (NULL != WindowName->Buffer && WindowName->Length > 0) + if ( NULL != WindowName->Buffer && WindowName->Length > 0 ) { Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop, WindowName->Length + sizeof(UNICODE_NULL)); @@ -1887,6 +1889,8 @@ Cs.x = Pos.x; Cs.y = Pos.y; Cs.style = Wnd->Style; +// Cs.lpszName = (LPCWSTR) WindowName->Buffer; +// Cs.lpszClass = (LPCWSTR) ClassName->Buffer; Cs.lpszName = (LPCWSTR) WindowName; Cs.lpszClass = (LPCWSTR) ClassName; Cs.dwExStyle = dwExStyle; @@ -2771,12 +2775,10 @@ if(hwndParent == NULL) hwndParent = Desktop; - /* FIXME else if(hwndParent == HWND_MESSAGE) { hwndParent = IntGetMessageWindow(); } - */ if(!(Parent = UserGetWindowObject(hwndParent))) { @@ -3236,7 +3238,7 @@ } else if (hWndNewParent == HWND_MESSAGE) { - // hWndNewParent = IntGetMessageWindow(); + hWndNewParent = IntGetMessageWindow(); } RETURN( co_UserSetParent(hWndChild, hWndNewParent)); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -1034,6 +1034,8 @@ } } + if (!Window->Wnd) return FALSE; + OldWindowRect = Window->Wnd->WindowRect; OldClientRect = Window->Wnd->ClientRect; Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Wed Jul 15 07:33:21 2009 @@ -375,6 +375,8 @@ HDC Ret; NTSTATUS Status = STATUS_SUCCESS; + if (!Device) return UserGetDesktopDC(iType,FALSE,TRUE); + if (InitData) { _SEH2_TRY

1 0

[cgutman] 41962: - Start reporting packet statistics - We currently only report received bytes, sent bytes, discarded packets due to unknown protocol, send errors, and receive errors - The network adapter properties window now shows correct send/receive bytes info
by cgutman＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: cgutman Date: Wed Jul 15 05:14:13 2009 New Revision: 41962 URL: http://svn.reactos.org/svn/reactos?rev=41962&view=rev Log: - Start reporting packet statistics - We currently only report received bytes, sent bytes, discarded packets due to unknown protocol, send errors, and receive errors - The network adapter properties window now shows correct send/receive bytes info Modified: trunk/reactos/drivers/network/tcpip/include/ip.h trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/receive.c trunk/reactos/lib/drivers/ip/network/transmit.c Modified: trunk/reactos/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/ip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/ip.h [iso-8859-1] Wed Jul 15 05:14:13 2009 @@ -134,6 +134,19 @@ LL_TRANSMIT_ROUTINE Transmit; /* Transmit function for this interface */ } LLIP_BIND_INFO, *PLLIP_BIND_INFO; +typedef struct _SEND_RECV_STATS { + UINT InBytes; + UINT InUnicast; + UINT InNUnicast; + UINT InDiscarded; + UINT InErrors; + UINT InDiscardedUnknownProto; + UINT OutBytes; + UINT OutUnicast; + UINT OutNUnicast; + UINT OutDiscarded; + UINT OutErrors; +} SEND_RECV_STATS, *PSEND_RECV_STATS; /* Information about an IP interface */ typedef struct _IP_INTERFACE { @@ -157,6 +170,7 @@ UINT Index; /* Index of adapter (used to add ip addr) */ LL_TRANSMIT_ROUTINE Transmit; /* Pointer to transmit function */ PVOID TCPContext; /* TCP Content for this interface */ + SEND_RECV_STATS Stats; /* Send/Receive statistics */ } IP_INTERFACE, *PIP_INTERFACE; typedef struct _IP_SET_ADDRESS { Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Wed Jul 15 05:14:13 2009 @@ -20,6 +20,7 @@ PCHAR IFDescr; ULONG Size; UINT DescrLenMax = MAX_IFDESCR_LEN - 1; + NDIS_STATUS NdisStatus; TI_DbgPrint(DEBUG_INFO, ("Getting IFEntry MIB (IF %08x LA %08x) (%04x:%d)\n", @@ -57,6 +58,28 @@ ("IF Speed = %d * 100bps\n", OutData->Speed)); memcpy(OutData->PhysAddr,Interface->Address,Interface->AddressLength); TI_DbgPrint(DEBUG_INFO, ("Got HWAddr\n")); + + memcpy(&OutData->InOctets, &Interface->Stats, sizeof(SEND_RECV_STATS)); + + NdisStatus = NDISCall(IF, + NdisRequestQueryInformation, + OID_GEN_XMIT_ERROR, + &OutData->OutErrors, + sizeof(ULONG)); + if (NdisStatus != NDIS_STATUS_SUCCESS) + OutData->OutErrors = 0; + + TI_DbgPrint(DEBUG_INFO, ("OutErrors = %d\n", OutData->OutErrors)); + + NdisStatus = NDISCall(IF, + NdisRequestQueryInformation, + OID_GEN_RCV_ERROR, + &OutData->InErrors, + sizeof(ULONG)); + if (NdisStatus != NDIS_STATUS_SUCCESS) + OutData->InErrors = 0; + + TI_DbgPrint(DEBUG_INFO, ("InErrors = %d\n", OutData->InErrors)); } GetInterfaceName( Interface, IFDescr, MAX_IFDESCR_LEN - 1 ); Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Wed Jul 15 05:14:13 2009 @@ -323,6 +323,8 @@ { TI_DbgPrint(MID_TRACE, ("[IF %x] Packet of unknown Internet protocol " "discarded.\n", Interface)); + + Interface->Stats.InDiscardedUnknownProto++; } Modified: trunk/reactos/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rec… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] Wed Jul 15 05:14:13 2009 @@ -463,6 +463,8 @@ /* Give the packet to the protocol dispatcher */ IPDispatchProtocol(IF, &Datagram); + + IF->Stats.InBytes += Datagram.TotalSize; /* We're done with this datagram */ exFreePool(Datagram.Header); Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Wed Jul 15 05:14:13 2009 @@ -240,6 +240,8 @@ * send routine (IPSendFragment) */ { + UINT PacketSize; + TI_DbgPrint(MAX_TRACE, ("Called. IPPacket (0x%X) NCE (0x%X)\n", IPPacket, NCE)); DISPLAY_IP_PACKET(IPPacket); @@ -264,6 +266,14 @@ IPPacket->Flags)); } + NdisQueryPacket(IPPacket->NdisPacket, + NULL, + NULL, + NULL, + &PacketSize); + + NCE->Interface->Stats.OutBytes += PacketSize; + return SendFragments(IPPacket, NCE, NCE->Interface->MTU, Complete, Context); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009