Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[cgutman] 40934: - Restore the old loopback implementation - Should fix the buildbot test hang
by cgutman＠svn.reactos.org 16 May '09

16 May '09

Author: cgutman Date: Sat May 16 05:44:20 2009 New Revision: 40934 URL: http://svn.reactos.org/svn/reactos?rev=40934&view=rev Log: - Restore the old loopback implementation - Should fix the buildbot test hang Modified: trunk/reactos/lib/drivers/ip/network/loopback.c Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat May 16 05:44:20 2009 @@ -1,14 +1,128 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS TCP/IP protocol driver - * FILE: lib/drivers/ip/network/loopback.c + * FILE: datalink/loopback.c * PURPOSE: Loopback adapter - * PROGRAMMERS: Cameron Gutman (cgutman(a)reactos.org) + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * REVISIONS: + * CSH 01/08-2000 Created */ #include "precomp.h" PIP_INTERFACE Loopback = NULL; +typedef struct _LAN_WQ_ITEM { + LIST_ENTRY ListEntry; + PNDIS_PACKET Packet; + PLAN_ADAPTER Adapter; + UINT BytesTransferred; +} LAN_WQ_ITEM, *PLAN_WQ_ITEM; + +/* Work around being called back into afd at Dpc level */ +KSPIN_LOCK LoopWorkLock; +LIST_ENTRY LoopWorkList; +WORK_QUEUE_ITEM LoopWorkItem; +BOOLEAN LoopReceiveWorkerBusy = FALSE; + +VOID NTAPI LoopReceiveWorker( PVOID Context ) { + PLIST_ENTRY ListEntry; + PLAN_WQ_ITEM WorkItem; + PNDIS_PACKET Packet; + PLAN_ADAPTER Adapter; + UINT BytesTransferred; + PNDIS_BUFFER NdisBuffer; + IP_PACKET IPPacket; + KIRQL OldIrql; + + TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + + TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); + while( !IsListEmpty(&LoopWorkList) ) + { + ListEntry = RemoveHeadList( &LoopWorkList ); + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); + + WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); + + TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); + + Packet = WorkItem->Packet; + Adapter = WorkItem->Adapter; + BytesTransferred = WorkItem->BytesTransferred; + + exFreePool( WorkItem ); + + IPInitializePacket(&IPPacket, 0); + + IPPacket.NdisPacket = Packet; + + TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", + Packet, Adapter, BytesTransferred)); + + NdisGetFirstBufferFromPacket(Packet, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; + /* Determine which upper layer protocol that should receive + this packet and pass it to the correct receive handler */ + + TI_DbgPrint + (MID_TRACE, + ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize, + BytesTransferred)); + + IPPacket.Position = 0; + + IPReceive(Loopback, &IPPacket); + + FreeNdisPacket( Packet ); + TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); + } + TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); + LoopReceiveWorkerBusy = FALSE; + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); +} + +VOID LoopSubmitReceiveWork( + NDIS_HANDLE BindingContext, + PNDIS_PACKET Packet, + NDIS_STATUS Status, + UINT BytesTransferred) { + PLAN_WQ_ITEM WQItem; + PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; + KIRQL OldIrql; + + TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); + + WQItem = exAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); + if( !WQItem ) { + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); + return; + } + + WQItem->Packet = Packet; + WQItem->Adapter = Adapter; + WQItem->BytesTransferred = BytesTransferred; + InsertTailList( &LoopWorkList, &WQItem->ListEntry ); + + TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n", + Packet, Adapter, BytesTransferred)); + + if( !LoopReceiveWorkerBusy ) { + LoopReceiveWorkerBusy = TRUE; + ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); + TI_DbgPrint(DEBUG_DATALINK, + ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); + } else { + TI_DbgPrint(DEBUG_DATALINK, + ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); + } + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); +} VOID LoopTransmit( PVOID Context, @@ -26,46 +140,31 @@ * Type = LAN protocol type (unused) */ { - IP_PACKET IPPacket; - PNDIS_PACKET XmitPacket; - PNDIS_BUFFER NdisBuffer; - NDIS_STATUS NdisStatus; PCHAR PacketBuffer; UINT PacketLength; - - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); - - GetDataPtr( NdisPacket, Offset, &PacketBuffer, &PacketLength ); + PNDIS_PACKET XmitPacket; + NDIS_STATUS NdisStatus; + + ASSERT_KM_POINTER(NdisPacket); + ASSERT_KM_POINTER(PC(NdisPacket)); + ASSERT_KM_POINTER(PC(NdisPacket)->DLComplete); + + TI_DbgPrint(MAX_TRACE, ("Called (NdisPacket = %x)\n", NdisPacket)); + + GetDataPtr( NdisPacket, MaxLLHeaderSize, &PacketBuffer, &PacketLength ); NdisStatus = AllocatePacketWithBuffer ( &XmitPacket, PacketBuffer, PacketLength ); - if (NdisStatus != NDIS_STATUS_SUCCESS) - { - (PC(NdisPacket)->DLComplete)( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); - return; - } - - IPInitializePacket(&IPPacket, 0); - - NdisGetFirstBufferFromPacket(XmitPacket, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.NdisPacket = XmitPacket; - IPPacket.Position = 0; - - TI_DbgPrint(MID_TRACE, - ("ContigSize: %d, TotalSize: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize)); - - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket(XmitPacket); - - (PC(NdisPacket)->DLComplete)( PC(NdisPacket)->Context, NdisPacket, NDIS_STATUS_SUCCESS ); + if( NT_SUCCESS(NdisStatus) ) { + LoopSubmitReceiveWork + ( NULL, XmitPacket, STATUS_SUCCESS, PacketLength ); + } + + (PC(NdisPacket)->DLComplete) + ( PC(NdisPacket)->Context, NdisPacket, STATUS_SUCCESS ); + + TI_DbgPrint(MAX_TRACE, ("Done\n")); } NDIS_STATUS LoopRegisterAdapter( @@ -80,9 +179,15 @@ * Status of operation */ { + NDIS_STATUS Status; LLIP_BIND_INFO BindInfo; + Status = NDIS_STATUS_SUCCESS; + TI_DbgPrint(MID_TRACE, ("Called.\n")); + + InitializeListHead( &LoopWorkList ); + ExInitializeWorkItem( &LoopWorkItem, LoopReceiveWorker, NULL ); /* Bind the adapter to network (IP) layer */ BindInfo.Context = NULL; @@ -108,7 +213,7 @@ TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return NDIS_STATUS_SUCCESS; + return Status; }

1 0

[cgutman] 40933: - Set up the TCP interface data as needed in TCPFindInterface
by cgutman＠svn.reactos.org 16 May '09

16 May '09

Author: cgutman Date: Sat May 16 05:24:21 2009 New Revision: 40933 URL: http://svn.reactos.org/svn/reactos?rev=40933&view=rev Log: - Set up the TCP interface data as needed in TCPFindInterface Modified: trunk/reactos/drivers/network/tcpip/include/tcp.h trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/transport/tcp/if.c Modified: trunk/reactos/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] Sat May 16 05:24:21 2009 @@ -158,10 +158,6 @@ NTSTATUS TCPClose( PCONNECTION_ENDPOINT Connection ); -PVOID TCPPrepareInterface( PIP_INTERFACE IF ); - -VOID TCPDisposeInterfaceData( PVOID Data ); - NTSTATUS TCPTranslateError( int OskitError ); VOID TCPTimeout(); 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] Sat May 16 05:24:21 2009 @@ -219,6 +219,13 @@ TcpipInitializeSpinLock(&IF->Lock); + IF->TCPContext = exAllocatePool + ( NonPagedPool, sizeof(OSK_IFADDR) + 2 * sizeof( struct sockaddr_in ) ); + if (!IF->TCPContext) { + exFreePool(IF); + return NULL; + } + #ifdef __NTDRIVER__ InsertTDIInterfaceEntity( IF ); #endif @@ -241,6 +248,7 @@ RemoveTDIInterfaceEntity( IF ); #endif + exFreePool(IF->TCPContext); exFreePool(IF); } @@ -263,9 +271,6 @@ TI_DbgPrint(MIN_TRACE, ("Could not add route due to insufficient resources.\n")); return; } - - /* Allow TCP to hang some configuration on this interface */ - IF->TCPContext = TCPPrepareInterface( IF ); } BOOLEAN IPRegisterInterface( @@ -317,11 +322,6 @@ NCE = NBLocateNeighbor(&IF->Unicast); if (NCE) { - if ( IF->TCPContext ) { - TCPDisposeInterfaceData( IF->TCPContext ); - IF->TCPContext = NULL; - } - TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); TI_DbgPrint(DEBUG_IP,(" Mask %s\n", A2S(&IF->Netmask))); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Sat May 16 05:24:21 2009 @@ -30,17 +30,20 @@ * parameters. */ -PVOID TCPPrepareInterface( PIP_INTERFACE IF ) { +POSK_IFADDR TCPGetInterfaceData( PIP_INTERFACE IF ) { NTSTATUS Status; - POSK_IFADDR ifaddr = exAllocatePool - ( NonPagedPool, sizeof(*ifaddr) + 2 * sizeof( struct sockaddr_in ) ); - if( !ifaddr ) return NULL; + POSK_IFADDR ifaddr = IF->TCPContext; + ASSERT(ifaddr); + + RtlZeroMemory(ifaddr, sizeof(OSK_IFADDR) + 2 * sizeof( struct sockaddr_in )); + struct sockaddr_in *addr_in = (struct sockaddr_in *)&ifaddr[1]; struct sockaddr_in *dstaddr_in = (struct sockaddr_in *)&addr_in[1]; TI_DbgPrint(DEBUG_TCPIF,("Called\n")); ifaddr->ifa_dstaddr = (struct sockaddr *)dstaddr_in; + /* XXX - Point-to-point interfaces not supported yet */ memset( &ifaddr->ifa_dstaddr, 0, sizeof( struct sockaddr ) ); @@ -49,10 +52,9 @@ ADE_UNICAST, (PULONG)&addr_in->sin_addr.s_addr ); - if( !NT_SUCCESS(Status) ) - addr_in->sin_addr.s_addr = 0; + ASSERT(NT_SUCCESS(Status)); - TI_DbgPrint(DEBUG_TCPIF,("Prepare interface %x : addr %x\n", + TI_DbgPrint(DEBUG_TCPIF,("interface %x : addr %x\n", IF, addr_in->sin_addr.s_addr)); ifaddr->ifa_flags = 0; /* XXX what goes here? */ @@ -65,10 +67,6 @@ return ifaddr; } -VOID TCPDisposeInterfaceData( PVOID Ptr ) { - exFreePool( Ptr ); -} - POSK_IFADDR TCPFindInterface( void *ClientData, OSK_UINT AddrType, OSK_UINT FindType, @@ -77,6 +75,7 @@ PIP_INTERFACE IF; IP_ADDRESS Destination; struct sockaddr_in *addr_in = (struct sockaddr_in *)ReqAddr; + POSK_IFADDR InterfaceData; TI_DbgPrint(DEBUG_TCPIF,("called for type %d\n", FindType)); @@ -91,19 +90,15 @@ TI_DbgPrint(DEBUG_TCPIF,("Address is %x\n", addr_in->sin_addr.s_addr)); IF = FindOnLinkInterface(&Destination); + if (!IF) return NULL; - if (!IF || !IF->TCPContext) { - /* TCPContext can be NULL if we don't have an IP address yet */ - TI_DbgPrint(DEBUG_TCPIF, ("No interface or TCP context (%x) (%x)\n", - IF, IF ? IF->TCPContext : 0)); - return NULL; - } + InterfaceData = TCPGetInterfaceData(IF); addr_in = (struct sockaddr_in *) - ((POSK_IFADDR)IF->TCPContext)->ifa_addr; + InterfaceData->ifa_addr; TI_DbgPrint(DEBUG_TCPIF,("returning addr %x\n", addr_in->sin_addr.s_addr)); - return IF->TCPContext; + return InterfaceData; }

1 0

[mjmartin] 40932: - timer_queue_thread_proc: Add missing and required RtlExitUserThread before function exit. Fixes crashing of kernel32_winetest for sync.
by mjmartin＠svn.reactos.org 16 May '09

16 May '09

Author: mjmartin Date: Sat May 16 04:48:14 2009 New Revision: 40932 URL: http://svn.reactos.org/svn/reactos?rev=40932&view=rev Log: - timer_queue_thread_proc: Add missing and required RtlExitUserThread before function exit. Fixes crashing of kernel32_winetest for sync. Modified: trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=4… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Sat May 16 04:48:14 2009 @@ -239,6 +239,7 @@ NtClose(q->event); RtlDeleteCriticalSection(&q->cs); RtlFreeHeap(RtlGetProcessHeap(), 0, q); + RtlExitUserThread(STATUS_SUCCESS); } static void queue_destroy_timer(struct queue_timer *t)

1 0

[dchapyshev] 40931: - Add support of additional paths of loading dlls (fixes loading dlls in X-Chat) See issue #4201 for more details.
by dchapyshev＠svn.reactos.org 15 May '09

15 May '09

Author: dchapyshev Date: Fri May 15 21:48:18 2009 New Revision: 40931 URL: http://svn.reactos.org/svn/reactos?rev=40931&view=rev Log: - Add support of additional paths of loading dlls (fixes loading dlls in X-Chat) See issue #4201 for more details. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Fri May 15 21:48:18 2009 @@ -178,6 +178,108 @@ } LdrpTlsCallback(Module, dwReason); return ((PDLLMAIN_FUNC)Module->EntryPoint)(Module->DllBase, dwReason, lpReserved); +} + +static PWSTR +LdrpQueryAppPaths(IN PCWSTR ImageName) +{ + PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + WCHAR SearchPathBuffer[MAX_PATH]; + UNICODE_STRING ValueNameString; + UNICODE_STRING KeyName; + WCHAR NameBuffer[256]; + ULONG KeyInfoSize; + ULONG ResultSize; + ULONG len; + HANDLE KeyHandle; + NTSTATUS Status; + PWSTR Path = NULL; + + swprintf(NameBuffer, + L"\\Registry\\Machine\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s", ImageName); + + RtlInitUnicodeString(&KeyName, NameBuffer); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&KeyHandle, + KEY_READ, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT ("NtOpenKey() failed (Status %lx)\n", Status); + return NULL; + } + + KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 256 * sizeof(WCHAR); + + KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, KeyInfoSize); + if (KeyInfo == NULL) + { + DPRINT("RtlAllocateHeap() failed\n"); + NtClose(KeyHandle); + return NULL; + } + + RtlInitUnicodeString(&ValueNameString, + L"Path"); + + Status = NtQueryValueKey(KeyHandle, + &ValueNameString, + KeyValuePartialInformation, + KeyInfo, + KeyInfoSize, + &ResultSize); + + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(SearchPathBuffer, + &KeyInfo->Data, + KeyInfo->DataLength); + + /* get application running path */ + wcscat(SearchPathBuffer, L";"); + wcscat (SearchPathBuffer, NtCurrentPeb()->ProcessParameters->ImagePathName.Buffer); + + len = wcslen (SearchPathBuffer); + + while (len && SearchPathBuffer[len - 1] != L'\\') + len--; + + if (len) SearchPathBuffer[len-1] = L'\0'; + + wcscat (SearchPathBuffer, L";"); + + wcscat (SearchPathBuffer, SharedUserData->NtSystemRoot); + wcscat (SearchPathBuffer, L"\\system32;"); + wcscat (SearchPathBuffer, SharedUserData->NtSystemRoot); + wcscat (SearchPathBuffer, L";."); + + Path = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + wcslen(SearchPathBuffer) * sizeof(WCHAR)); + + if (Path == NULL) + { + DPRINT("RtlAllocateHeap() failed\n"); + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + NtClose(KeyHandle); + return NULL; + } + + Path = SearchPathBuffer; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + + NtClose(KeyHandle); + + return Path; } static NTSTATUS @@ -1676,6 +1778,7 @@ NTSTATUS Status; PLDR_DATA_TABLE_ENTRY ImportedModule; PCHAR ImportedName; + PWSTR ModulePath; ULONG Size; DPRINT("LdrFixupImports(SearchPath %S, Module %p)\n", SearchPath, Module); @@ -1855,12 +1958,22 @@ ImportedName = (PCHAR)Module->DllBase + ImportModuleDirectoryCurrent->Name; TRACE_LDR("%wZ imports functions from %s\n", &Module->BaseDllName, ImportedName); + if (SearchPath == NULL) + { + ModulePath = LdrpQueryAppPaths(Module->BaseDllName.Buffer); + + Status = LdrpGetOrLoadModule(ModulePath, ImportedName, &ImportedModule, TRUE); + if (ModulePath != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, ModulePath); + if (NT_SUCCESS(Status)) goto Success; + } + Status = LdrpGetOrLoadModule(SearchPath, ImportedName, &ImportedModule, TRUE); if (!NT_SUCCESS(Status)) { DPRINT1("failed to load %s\n", ImportedName); return Status; } +Success: if (Module == ImportedModule) { LdrpDecrementLoadCount(Module, FALSE);

1 0

[janderwald] 40930: - Remove unused WdmAudWriteCompleted - check for a valid object header in KsSynchronousIoControlDevice - Apply alignment restrictions to all allocated buffers - Fix handling IRP_MN_QUERY_INTERFACE, IRP_MN_QUERY_DEVICE_RELATIONS, IRP_MN_FILTER_RESOURCE_REQUIREMENTS - IMiniportWaveCyclic::NewStream && IMiniportWavePci::NewStream take first the pin id and THEN the parameter capture. Fixes playback for ES1371 (VmWare) driver and many others - Store IPortFilterWavePci, IPortFilter
by janderwald＠svn.reactos.org 15 May '09

15 May '09

Author: janderwald Date: Fri May 15 19:24:29 2009 New Revision: 40930 URL: http://svn.reactos.org/svn/reactos?rev=40930&view=rev Log: - Remove unused WdmAudWriteCompleted - check for a valid object header in KsSynchronousIoControlDevice - Apply alignment restrictions to all allocated buffers - Fix handling IRP_MN_QUERY_INTERFACE, IRP_MN_QUERY_DEVICE_RELATIONS, IRP_MN_FILTER_RESOURCE_REQUIREMENTS - IMiniportWaveCyclic::NewStream && IMiniportWavePci::NewStream take first the pin id and THEN the parameter capture. Fixes playback for ES1371 (VmWare) driver and many others - Store IPortFilterWavePci, IPortFilterWaveRT, IPortFilterWaveCyclic in their corresponding port Modified: trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -284,12 +284,22 @@ /* get object header */ ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; + if (!ObjectHeader) + { + DPRINT("Expected object header\n"); + return STATUS_UNSUCCESSFUL; + } + /* check if there is fast device io function */ if (ObjectHeader->DispatchTable.FastDeviceIoControl) { + IoStatusBlock.Status = STATUS_UNSUCCESSFUL; + IoStatusBlock.Information = 0; + /* it is send the request */ Status = ObjectHeader->DispatchTable.FastDeviceIoControl(FileObject, TRUE, InBuffer, InSize, OutBuffer, OutSize, IoControl, &IoStatusBlock, DeviceObject); /* check if the request was handled */ + DPRINT("Handled %u Status %x Length %u\n", Status, IoStatusBlock.Status, IoStatusBlock.Information); if (Status) { /* store bytes returned */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -524,11 +524,12 @@ IDmaChannelInit_fnGetAdapterObject, IDmaChannelInit_fnCopyTo, IDmaChannelInit_fnCopyFrom, - /* IDmaChannelInit methods */ + /* IDmaChannelSlave methods */ IDmaChannelInit_fnStart, IDmaChannelInit_fnStop, IDmaChannelInit_fnReadCounter, IDmaChannelInit_fnWaitForTC, + /* IDmaChannelInit methods */ IDmaChannelInit_fnInit }; 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] Fri May 15 19:24:29 2009 @@ -195,7 +195,8 @@ IN KSPIN_CONNECT *ConnectDetails, IN PKSDATAFORMAT DataFormat, IN PDEVICE_OBJECT DeviceObject, - IN ULONG FrameSize); + IN ULONG FrameSize, + IN ULONG Alignment); STDMETHOD_(NTSTATUS, AddMapping)(THIS_ IN PUCHAR Buffer, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -126,23 +126,21 @@ case IRP_MN_QUERY_INTERFACE: DPRINT("IRP_MN_QUERY_INTERFACE\n"); Status = PcForwardIrpSynchronous(DeviceObject, Irp); - Irp->IoStatus.Status = Status; + return Status; + + case IRP_MN_QUERY_DEVICE_RELATIONS: + DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS\n"); + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; - - case IRP_MN_QUERY_DEVICE_RELATIONS: - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; - case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); Status = PcForwardIrpSynchronous(DeviceObject, Irp); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } 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] Fri May 15 19:24:29 2009 @@ -39,6 +39,7 @@ ULONG OutOfMapping; ULONG MaxFrameSize; + ULONG Alignment; }IIrpQueueImpl; @@ -118,13 +119,15 @@ IN KSPIN_CONNECT *ConnectDetails, IN PKSDATAFORMAT DataFormat, IN PDEVICE_OBJECT DeviceObject, - IN ULONG FrameSize) + IN ULONG FrameSize, + IN ULONG Alignment) { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; This->ConnectDetails = ConnectDetails; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; This->MaxFrameSize = FrameSize; + This->Alignment = Alignment; InitializeListHead(&This->ListHead); InitializeListHead(&This->FreeHead); @@ -185,7 +188,7 @@ else Offset = 0; - Mapping->Buffer = (PVOID)UlongToPtr(PtrToUlong(Header->Data) + Offset); + Mapping->Buffer = (PVOID)UlongToPtr((PtrToUlong(Header->Data) + Offset + 3) & ~(0x3)); if (This->MaxFrameSize) Mapping->BufferSize = min(Header->DataUsed - Offset, This->MaxFrameSize); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -1137,7 +1137,7 @@ This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); } - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, 0); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, 0, 0); if (!NT_SUCCESS(Status)) { DPRINT1("IrpQueue_Init failed with %x\n", Status); 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] Fri May 15 19:24:29 2009 @@ -993,7 +993,7 @@ if (!NT_SUCCESS(Status)) return Status; - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0, 0); if (!NT_SUCCESS(Status)) { This->IrpQueue->lpVtbl->Release(This->IrpQueue); @@ -1018,8 +1018,8 @@ &This->Stream, NULL, NonPagedPool, + ConnectDetails->PinId, Capture, - ConnectDetails->PinId, This->Format, &This->DmaChannel, &This->ServiceGroup); @@ -1062,7 +1062,10 @@ Status = This->Stream->lpVtbl->SetNotificationFreq(This->Stream, 10, &This->FrameSize); - This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); + //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); + DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); + DPRINT1("Setting state to run %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); + This->State = KSSTATE_PAUSE; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -201,8 +201,20 @@ ASSERT_IRQL(DISPATCH_LEVEL); + if (This->IrpQueue->lpVtbl->HasLastMappingFailed(This->IrpQueue)) + { + This->IrpQueue->lpVtbl->PrintQueueStatus(This->IrpQueue); + if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue) == 0) + { + DPRINT("Stopping stream...\n"); + SetStreamState(This, KSSTATE_STOP); + } + } + Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); DPRINT("Position %lu Status %x\n", Position, Status); + + This->Stream->lpVtbl->Service(This->Stream); } static IServiceSinkVtbl vt_IServiceSink = @@ -598,9 +610,9 @@ PIRP Irp; IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + DPRINT("IPortPinWavePci_fnFastWrite entered Total %u Pre %u Post %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted); + InterlockedIncrement((PLONG)&This->TotalPackets); - - DPRINT("IPortPinWavePci_fnFastWrite entered Total %u Pre %u Post %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted); Packet = (PCONTEXT_WRITE)Buffer; @@ -710,8 +722,8 @@ NULL, NonPagedPool, This->WaveStream, + ConnectDetails->PinId, Capture, - ConnectDetails->PinId, This->Format, &This->DmaChannel, &This->ServiceGroup); @@ -742,7 +754,11 @@ return Status; } - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, AllocatorFraming.FrameSize); + DPRINT("OptionFlags %x RequirementsFlag %x PoolType %x Frames %lu FrameSize %lu FileAlignment %lu\n", + AllocatorFraming.OptionsFlags, AllocatorFraming.RequirementsFlags, AllocatorFraming.PoolType, AllocatorFraming.Frames, AllocatorFraming.FrameSize, AllocatorFraming.FileAlignment); + + + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, AllocatorFraming.FrameSize, AllocatorFraming.FileAlignment); if (!NT_SUCCESS(Status)) { DPRINT1("IrpQueue_Init failed with %x\n", Status); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -912,7 +912,7 @@ goto cleanup; } - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0, 0); if (!NT_SUCCESS(Status)) { goto cleanup; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -617,6 +617,7 @@ } *OutTarget = (IIrpTarget*)Filter; + This->Filter = Filter; return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -679,6 +679,7 @@ } *OutTarget = (IIrpTarget*)Filter; + This->Filter = Filter; return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -519,6 +519,7 @@ } *OutTarget = (IIrpTarget*)Filter; + This->Filter = Filter; return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] Fri May 15 19:24:29 2009 @@ -159,7 +159,7 @@ ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - DPRINT("IRegistryKey_fnNewSubKey entered %S\n", SubKeyName); + DPRINT("IRegistryKey_fnNewSubKey entered %S\n", SubKeyName->Buffer); if (This->Deleted) { @@ -381,7 +381,7 @@ This->hKey = hHandle; This->lpVtbl = &vt_IRegistryKey; - This->ref = 2; + This->ref = 1; *OutRegistryKey = (PREGISTRYKEY)&This->lpVtbl; DPRINT("PcNewRegistryKey result %p\n", *OutRegistryKey); 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] Fri May 15 19:24:29 2009 @@ -390,23 +390,6 @@ return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } -NTSTATUS -NTAPI -WdmAudWriteCompleted( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Ctx) -{ - PWRITE_CONTEXT Context = (PWRITE_CONTEXT)Ctx; - - Context->Irp->IoStatus.Information = Context->Length; - Context->Irp->IoStatus.Status = Irp->IoStatus.Status; - IoCompleteRequest(Context->Irp, IO_SOUND_INCREMENT); - - ExFreePool(Context); - return STATUS_SUCCESS; -} - ULONG CheckFormatSupport( IN PKSDATARANGE_AUDIO DataRangeAudio, @@ -684,6 +667,7 @@ { /* invalid parameter */ DPRINT1("Error: device type not set\n"); + ObDereferenceObject(FileObject); return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } @@ -691,6 +675,7 @@ { /* file object parameter */ DPRINT1("Error: file object is not attached\n"); + ObDereferenceObject(FileObject); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } ClientInfo = (PWDMAUD_CLIENT)IoStack->FileObject->FsContext; @@ -716,6 +701,7 @@ { /* no memory */ ExFreePool(Packet); + ObDereferenceObject(FileObject); return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } Packet->Header.Data = Buffer; @@ -737,12 +723,12 @@ DPRINT1("Invalid buffer supplied\n"); ExFreePool(Buffer); ExFreePool(Packet); + ObDereferenceObject(FileObject); return SetIrpIoStatus(Irp, Status, 0); } KsStreamIo(FileObject, NULL, NULL, NULL, NULL, 0, &IoStatusBlock, Packet, sizeof(CONTEXT_WRITE), KSSTREAM_WRITE, KernelMode); - - + ObDereferenceObject(FileObject); return IoStatusBlock.Status; }

1 0

[tkreuzer] 40929: Remove the old explorer from amd64 builds. It only makes problems and explorer_new will hopefully be ready in time ; -)
by tkreuzer＠svn.reactos.org 15 May '09

15 May '09

Author: tkreuzer Date: Fri May 15 17:12:20 2009 New Revision: 40929 URL: http://svn.reactos.org/svn/reactos?rev=40929&view=rev Log: Remove the old explorer from amd64 builds. It only makes problems and explorer_new will hopefully be ready in time ;-) Modified: branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild Modified: branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] Fri May 15 17:12:20 2009 @@ -4,9 +4,11 @@ <directory name="cmd"> <xi:include href="cmd/cmd.rbuild" /> </directory> - <directory name="explorer"> - <xi:include href="explorer/explorer.rbuild" /> - </directory> + <ifnot property="ARCH" value="amd64"> + <directory name="explorer"> + <xi:include href="explorer/explorer.rbuild" /> + </directory> + </ifnot> <directory name="explorer-new"> <xi:include href="explorer-new/explorer.rbuild" /> </directory>

1 0

[tkreuzer] 40928: cmd: Cast the result of GetProcAddress to PVOID before assigning to a function pointer. Fixes a warning on 64 bit builds.
by tkreuzer＠svn.reactos.org 15 May '09

15 May '09

Author: tkreuzer Date: Fri May 15 17:09:20 2009 New Revision: 40928 URL: http://svn.reactos.org/svn/reactos?rev=40928&view=rev Log: cmd: Cast the result of GetProcAddress to PVOID before assigning to a function pointer. Fixes a warning on 64 bit builds. Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/memory.c Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/cmd/memory.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/cmd/memory.c [iso-8859-1] Fri May 15 17:09:20 2009 @@ -33,7 +33,7 @@ } BOOL (WINAPI *GlobalMemoryStatusEx)(LPMEMORYSTATUSEX) - = GetProcAddress(GetModuleHandle(_T("KERNEL32")), "GlobalMemoryStatusEx"); + = (PVOID)GetProcAddress(GetModuleHandle(_T("KERNEL32")), "GlobalMemoryStatusEx"); if (GlobalMemoryStatusEx) { msex.dwLength = sizeof(MEMORYSTATUSEX);

1 0

[tkreuzer] 40927: bmfd: HGLYPH is an ULONG. Use offset to glyph entry as HGLYPH instead of the pointer to fix 64bit build.
by tkreuzer＠svn.reactos.org 15 May '09

15 May '09

Author: tkreuzer Date: Fri May 15 16:24:00 2009 New Revision: 40927 URL: http://svn.reactos.org/svn/reactos?rev=40927&view=rev Log: bmfd: HGLYPH is an ULONG. Use offset to glyph entry as HGLYPH instead of the pointer to fix 64bit build. Modified: branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/font.c branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/glyph.c Modified: branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] Fri May 15 16:24:00 2009 @@ -389,7 +389,7 @@ { PBMFD_FILE pfile = (PBMFD_FILE)iFile; PBMFD_FACE pface; - ULONG i, j, cjOffset, cjSize, cGlyphs, cRuns; + ULONG i, j, cjSize, cGlyphs, cRuns; CHAR ch, chFirst, ach[256]; WCHAR wc, awc[256]; PFD_GLYPHSET pGlyphSet; @@ -475,14 +475,13 @@ pwcrun[0].wcLow = awc[0]; pwcrun[0].cGlyphs = 1; pwcrun[0].phg = phglyphs; - phglyphs[0] = (HGLYPH)pface->pCharTable; + phglyphs[0] = 0; /* Walk through all supported chars */ for (i = 1, j = 0; i < cGlyphs; i++) { - /* Use pointer to glyph entry as hglyph */ - cjOffset = (ach[i] - chFirst) * pface->cjEntrySize; - phglyphs[i] = (HGLYPH)(pface->pCharTable + cjOffset); + /* Use offset to glyph entry as hglyph */ + phglyphs[i] = (ach[i] - chFirst) * pface->cjEntrySize; /* Check whether we can append the wchar to a run */ if (awc[i] == awc[i - 1] + 1) Modified: branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/glyph.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/glyph.c [iso-8859-1] Fri May 15 16:24:00 2009 @@ -80,7 +80,7 @@ ULONG cjSize) { PBMFD_FACE pface = pfont->pface; - PGLYPHENTRY pge = (PGLYPHENTRY)hg; + PGLYPHENTRY pge = (PGLYPHENTRY)(pface->pCharTable + hg); ULONG xSrc, ySrc, cxSrc, cySrc; ULONG xDst, yDst, cxDst, cyDst; ULONG xScale, yScale;

1 0

[tkreuzer] 40926: return ERROR_INVALID_FUNCTION on amd64, not ERROR_INVALID_ACCESS from VideoPortEn/DisableInterrupt. Fixes compilation of videoprt for amd64.
by tkreuzer＠svn.reactos.org 15 May '09

15 May '09

Author: tkreuzer Date: Fri May 15 16:11:44 2009 New Revision: 40926 URL: http://svn.reactos.org/svn/reactos?rev=40926&view=rev Log: return ERROR_INVALID_FUNCTION on amd64, not ERROR_INVALID_ACCESS from VideoPortEn/DisableInterrupt. Fixes compilation of videoprt for amd64. Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/interrupt.c Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/interrupt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] Fri May 15 16:11:44 2009 @@ -128,7 +128,7 @@ #else /* FIXME: Function still present? If so what to use instead of HalEnableSystemInterrupt? */ UNIMPLEMENTED; - return ERROR_INVALID_ACCESS; + return ERROR_INVALID_FUNCTION; #endif } @@ -155,6 +155,6 @@ #else /* FIXME: Function still present? If so what to use instead of HalDisableSystemInterrupt? */ UNIMPLEMENTED; - return ERROR_INVALID_ACCESS; + return ERROR_INVALID_FUNCTION; #endif }

1 0

[tkreuzer] 40925: remove obsolete def file
by tkreuzer＠svn.reactos.org 15 May '09

15 May '09

Author: tkreuzer Date: Fri May 15 15:33:10 2009 New Revision: 40925 URL: http://svn.reactos.org/svn/reactos?rev=40925&view=rev Log: remove obsolete def file Removed: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def Removed: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def (removed) @@ -1,15 +1,0 @@ -LIBRARY BOOTVID.DLL - -EXPORTS -VidBitBlt -VidBufferToScreenBlt -VidCleanUp -VidDisplayString -VidDisplayStringXY -VidInitialize -VidResetDisplay -VidScreenToBufferBlt -VidSetScrollRegion -VidSetTextColor -VidSolidColorFill -

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
51
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 May 2009