Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43051: - Check if a shortcut to shortcut is made and resolve it in that case - Fixes bug 4720
by janderwald＠svn.reactos.org 14 Sep '09

14 Sep '09

Author: janderwald Date: Tue Sep 15 00:55:44 2009 New Revision: 43051 URL: http://svn.reactos.org/svn/reactos?rev=43051&view=rev Log: - Check if a shortcut to shortcut is made and resolve it in that case - Fixes bug 4720 Modified: trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Tue Sep 15 00:55:44 2009 @@ -12,13 +12,109 @@ #include "appwiz.h" +BOOL +IsShortcut(HKEY hKey) +{ + WCHAR Value[10]; + DWORD Size; + DWORD Type; + + Size = sizeof(Value); + if (RegQueryValueExW(hKey, L"IsShortcut", NULL, &Type, (LPBYTE)Value, &Size) != ERROR_SUCCESS) + return FALSE; + + if (Type != REG_SZ) + return FALSE; + + return (wcsicmp(Value, L"yes") == 0); +} + +BOOL +IsExtensionAShortcut(LPWSTR lpExtension) +{ + HKEY hKey; + WCHAR Buffer[100]; + DWORD Size; + DWORD Type; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, lpExtension, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return FALSE; + + if (IsShortcut(hKey)) + { + RegCloseKey(hKey); + return TRUE; + } + + Size = sizeof(Buffer); + if (RegQueryValueEx(hKey, NULL, NULL, &Type, (LPBYTE)Buffer, &Size) != ERROR_SUCCESS || Type != REG_SZ) + { + RegCloseKey(hKey); + return FALSE; + } + + RegCloseKey(hKey); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, Buffer, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return FALSE; + + if (IsShortcut(hKey)) + { + RegCloseKey(hKey); + return TRUE; + } + + RegCloseKey(hKey); + return FALSE; +} BOOL CreateShortcut(PCREATE_LINK_CONTEXT pContext) { - IShellLinkW *pShellLink; + IShellLinkW *pShellLink, *pSourceShellLink; IPersistFile *pPersistFile; HRESULT hr; + WCHAR Path[MAX_PATH]; + LPWSTR lpExtension; + + /* get the extension */ + lpExtension = wcsrchr(pContext->szTarget, '.'); + + if (IsExtensionAShortcut(lpExtension)) + { + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL, &IID_IShellLink, (void**)&pSourceShellLink); + + if (hr != S_OK) + return FALSE; + + hr = pSourceShellLink->lpVtbl->QueryInterface(pSourceShellLink, &IID_IPersistFile, (void**)&pPersistFile); + if (hr != S_OK) + { + pSourceShellLink->lpVtbl->Release(pSourceShellLink); + return FALSE; + } + + hr = pPersistFile->lpVtbl->Load(pPersistFile, (LPCOLESTR)pContext->szTarget, STGM_READ); + pPersistFile->lpVtbl->Release(pPersistFile); + + if (hr != S_OK) + { + pSourceShellLink->lpVtbl->Release(pSourceShellLink); + return FALSE; + } + + hr = pSourceShellLink->lpVtbl->GetPath(pSourceShellLink, Path, sizeof(Path) / sizeof(WCHAR), NULL, 0); + pSourceShellLink->lpVtbl->Release(pSourceShellLink); + + if (hr != S_OK) + { + return FALSE; + } + } + else + { + wcscpy(Path, pContext->szTarget); + } hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL, &IID_IShellLink, (void**)&pShellLink); @@ -27,7 +123,7 @@ return FALSE; - pShellLink->lpVtbl->SetPath(pShellLink, pContext->szTarget); + pShellLink->lpVtbl->SetPath(pShellLink, Path); pShellLink->lpVtbl->SetDescription(pShellLink, pContext->szDescription); pShellLink->lpVtbl->SetWorkingDirectory(pShellLink, pContext->szWorkingDirectory);

1 0

[dchapyshev] 43050: - Handle potential null-pointer access. Found by Amine Khaldi.
by dchapyshev＠svn.reactos.org 14 Sep '09

14 Sep '09

Author: dchapyshev Date: Mon Sep 14 13:13:54 2009 New Revision: 43050 URL: http://svn.reactos.org/svn/reactos?rev=43050&view=rev Log: - Handle potential null-pointer access. Found by Amine Khaldi. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Mon Sep 14 13:13:54 2009 @@ -1573,6 +1573,7 @@ PEHCI_QTD_CONTENT ptdc; PEHCI_QH_CONTENT pqhc; PEHCI_ELEM_LINKS pelnk; + PEHCI_ELEM_LINKS plnk; if (ehci == NULL || purb == NULL) return STATUS_INVALID_PARAMETER; @@ -1685,7 +1686,17 @@ RemoveEntryList(&td_list); elem_pool_lock(qh_pool, TRUE); - pqh = (PEHCI_QH) ((ULONG) elem_pool_alloc_elem(qh_pool)->phys_part & PHYS_PART_ADDR_MASK); + + plnk = elem_pool_alloc_elem(qh_pool); + if (plnk == NULL) + { + // free the qtds + elem_safe_free(pthis, TRUE); + if (qh_pool) elem_pool_unlock(qh_pool, TRUE); + return STATUS_UNSUCCESSFUL; + } + + pqh = (PEHCI_QH) ((ULONG) plnk->phys_part & PHYS_PART_ADDR_MASK); elem_pool_unlock(qh_pool, TRUE); if (pqh == NULL)

1 0

[mjmartin] 43049: NtAllocateVirtualMemory: Add check to make sure that BaseAddress + RegionSize is inside MemoryArea. For AllocationType of MEM_RESET add FIXME's and return STATUS_SUCCESS, without modifying attributes of region. Fixes 2 virtual tests for kernel32_winetest.
by mjmartin＠svn.reactos.org 14 Sep '09

14 Sep '09

Author: mjmartin Date: Mon Sep 14 11:21:05 2009 New Revision: 43049 URL: http://svn.reactos.org/svn/reactos?rev=43049&view=rev Log: NtAllocateVirtualMemory: Add check to make sure that BaseAddress + RegionSize is inside MemoryArea. For AllocationType of MEM_RESET add FIXME's and return STATUS_SUCCESS, without modifying attributes of region. Fixes 2 virtual tests for kernel32_winetest. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Sep 14 11:21:05 2009 @@ -729,6 +729,36 @@ { MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; + + if (((ULONG)BaseAddress + RegionSize) > (ULONG)MemoryArea->EndingAddress) + { + DPRINT("BaseAddress + RegionSize %x is larger than MemoryArea's EndingAddress %x\n", + (ULONG)BaseAddress + RegionSize, MemoryArea->EndingAddress); + + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + + return STATUS_MEMORY_NOT_ALLOCATED; + } + + if (AllocationType == MEM_RESET) + { + if (MmIsPagePresent(Process, BaseAddress)) + { + /* FIXME: mark pages as not modified */ + } + else + { + /* FIXME: if pages are in paging file discard them and bring in pages of zeros */ + } + + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + + /* MEM_RESET does not modify any attributes of region */ + return STATUS_SUCCESS; + } + if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && MemoryAreaLength >= RegionSize) {

1 0

[cgutman] 43048: - Rework our aging neighbor cache system that never quite worked correctly - Fixes several memory leaks - Fix the event timer and NCE timeouts - We now keep our neighbor cache updated and remove stale entries
by cgutman＠svn.reactos.org 14 Sep '09

14 Sep '09

Author: cgutman Date: Mon Sep 14 06:20:05 2009 New Revision: 43048 URL: http://svn.reactos.org/svn/reactos?rev=43048&view=rev Log: - Rework our aging neighbor cache system that never quite worked correctly - Fixes several memory leaks - Fix the event timer and NCE timeouts - We now keep our neighbor cache updated and remove stale entries Modified: trunk/reactos/drivers/network/tcpip/include/neighbor.h trunk/reactos/lib/drivers/ip/network/arp.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] Mon Sep 14 06:20:05 2009 @@ -29,7 +29,6 @@ typedef struct NEIGHBOR_CACHE_ENTRY { DEFINE_TAG struct NEIGHBOR_CACHE_ENTRY *Next; /* Pointer to next entry */ - struct NEIGHBOR_CACHE_TABLE *Table; /* Pointer to table */ UCHAR State; /* State of NCE */ UINT EventTimer; /* Ticks since last event */ UINT EventCount; /* Number of events */ @@ -41,28 +40,18 @@ } NEIGHBOR_CACHE_ENTRY, *PNEIGHBOR_CACHE_ENTRY; /* NCE states */ -#define NUD_NONE 0x00 #define NUD_INCOMPLETE 0x01 #define NUD_REACHABLE 0x02 -#define NUD_STALE 0x04 -#define NUD_DELAY 0x08 -#define NUD_PROBE 0x10 -#define NUD_FAILED 0x20 -#define NUD_NOARP 0x40 -#define NUD_PERMANENT 0x80 +#define NUD_PERMANENT 0x04 -#define NUD_IN_TIMER (NUD_INCOMPLETE | NUD_DELAY | NUD_PROBE) -#define NUD_VALID (NUD_REACHABLE | NUD_NOARP | NUD_STALE | NUD_DELAY | \ - NUD_PROBE | NUD_PERMANENT) -#define NUD_CONNECTED (NUD_PERMANENT | NUD_NOARP | NUD_REACHABLE) +#define NUD_BROADCAST (NUD_PERMANENT | NUD_REACHABLE) +#define NUD_LOCAL (NUD_PERMANENT | NUD_REACHABLE) +/* Number of seconds before the NCE times out */ +#define ARP_TIMEOUT 30 -/* Maximum number of retransmissions of multicast solicits */ -#define MAX_MULTICAST_SOLICIT 3 /* 3 transmissions */ - -/* Number of ticks between address resolution messages */ -#define RETRANS_TIMER IP_TICKS_SECOND /* One second */ - +/* Number of seconds between ARP transmissions */ +#define ARP_RATE 10 extern NEIGHBOR_CACHE_TABLE NeighborCache[NB_HASHMASK + 1]; @@ -84,7 +73,8 @@ PIP_ADDRESS Address, PVOID LinkAddress, UINT LinkAddressLength, - UCHAR Type); + UCHAR Type, + UINT EventTimer); VOID NBUpdateNeighbor( PNEIGHBOR_CACHE_ENTRY NCE, Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Mon Sep 14 06:20:05 2009 @@ -210,6 +210,7 @@ /* Check if we know the sender */ AddrInitIPv4(&Address, *((PULONG)SenderProtoAddress)); + NCE = NBLocateNeighbor(&Address); if (NCE) { /* We know the sender. Update the hardware address @@ -220,7 +221,7 @@ may want to communicate with us soon, so add his address to our address cache */ NCE = NBAddNeighbor(Interface, &Address, SenderHWAddress, - Header->HWAddrLen, NUD_REACHABLE); + Header->HWAddrLen, NUD_REACHABLE, ARP_TIMEOUT); } if (Header->Opcode != ARP_OPCODE_REQUEST) 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] Mon Sep 14 06:20:05 2009 @@ -212,7 +212,7 @@ /* Add a permanent neighbor for this NTE */ NCE = NBAddNeighbor(IF, &IF->Unicast, IF->Address, IF->AddressLength, - NUD_PERMANENT); + NUD_LOCAL, 0); if (!NCE) { TI_DbgPrint(MIN_TRACE, ("Could not create NCE.\n")); return; Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Mon Sep 14 06:20:05 2009 @@ -30,8 +30,7 @@ PNEIGHBOR_PACKET Packet; UINT HashValue; - if(!(NCE->State & NUD_CONNECTED)) - return; + ASSERT(NCE->State & NUD_REACHABLE); HashValue = *(PULONG)(&NCE->Address.Address); HashValue ^= HashValue >> 16; @@ -89,58 +88,6 @@ } } -VOID NCETimeout( - PNEIGHBOR_CACHE_ENTRY NCE) -/* - * FUNCTION: Neighbor cache entry timeout handler - * NOTES: - * The neighbor cache lock must be held - */ -{ - TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X).\n", NCE)); - TI_DbgPrint(DEBUG_NCACHE, ("NCE->State is (0x%X).\n", NCE->State)); - - switch (NCE->State) - { - case NUD_INCOMPLETE: - /* Retransmission timer expired */ - if (NCE->EventCount++ > MAX_MULTICAST_SOLICIT) - { - /* We have retransmitted too many times */ - - /* Calling IPSendComplete with cache lock held is not - a great thing to do. We don't get here very often - so maybe it's not that big a problem */ - - /* Flush packet queue */ - NBFlushPacketQueue( NCE, NDIS_STATUS_REQUEST_ABORTED ); - NCE->EventCount = 0; - } - else - { - /* Retransmit request */ - NBSendSolicit(NCE); - } - break; - - case NUD_DELAY: - /* FIXME: Delayed state */ - TI_DbgPrint(DEBUG_NCACHE, ("NCE delay state.\n")); - break; - - case NUD_PROBE: - /* FIXME: Probe state */ - TI_DbgPrint(DEBUG_NCACHE, ("NCE probe state.\n")); - break; - - default: - /* Should not happen since the event timer is not used in the other states */ - TI_DbgPrint(MIN_TRACE, ("Invalid NCE state (%d).\n", NCE->State)); - break; - } -} - - VOID NBTimeout(VOID) /* * FUNCTION: Neighbor address cache timeout handler @@ -151,21 +98,33 @@ { UINT i; KIRQL OldIrql; + PNEIGHBOR_CACHE_ENTRY *PrevNCE; PNEIGHBOR_CACHE_ENTRY NCE; for (i = 0; i <= NB_HASHMASK; i++) { TcpipAcquireSpinLock(&NeighborCache[i].Lock, &OldIrql); - for (NCE = NeighborCache[i].Cache; - NCE != NULL; NCE = NCE->Next) { + for (PrevNCE = &NeighborCache[i].Cache; + (NCE = *PrevNCE) != NULL;) { /* Check if event timer is running */ if (NCE->EventTimer > 0) { - NCE->EventTimer--; - if (NCE->EventTimer == 0) { - /* Call timeout handler for NCE */ - NCETimeout(NCE); + NCE->EventCount++; + if (NCE->EventCount % ARP_RATE == 0) + NBSendSolicit(NCE); + if (NCE->EventTimer - NCE->EventCount == 0) { + ASSERT(!(NCE->State & NUD_PERMANENT)); + + /* Flush packet queue */ + NBFlushPacketQueue( NCE, NDIS_STATUS_REQUEST_ABORTED ); + + *PrevNCE = NCE->Next; + + exFreePool(NCE); + + continue; } } + PrevNCE = &NCE->Next; } TcpipReleaseSpinLock(&NeighborCache[i].Lock, OldIrql); @@ -211,6 +170,8 @@ /* Flush wait queue */ NBFlushPacketQueue( CurNCE, NDIS_STATUS_NOT_ACCEPTED ); + exFreePool(CurNCE); + CurNCE = NextNCE; } @@ -233,18 +194,7 @@ { TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X).\n", NCE)); - if (NCE->State & NUD_INCOMPLETE) - { - /* This is the first solicitation of this neighbor. Broadcast - a request for the neighbor */ - - TI_DbgPrint(MID_TRACE,("NCE: %x\n", NCE)); - - ARPTransmit(&NCE->Address, NCE->Interface); - } else { - /* FIXME: Unicast solicitation since we have a cached address */ - TI_DbgPrint(MIN_TRACE, ("Uninplemented unicast solicitation.\n")); - } + ARPTransmit(&NCE->Address, NCE->Interface); } PNEIGHBOR_CACHE_ENTRY NBAddNeighbor( @@ -252,7 +202,8 @@ PIP_ADDRESS Address, PVOID LinkAddress, UINT LinkAddressLength, - UCHAR State) + UCHAR State, + UINT EventTimer) /* * FUNCTION: Adds a neighbor to the neighbor cache * ARGUMENTS: @@ -298,7 +249,8 @@ else memset(NCE->LinkAddress, 0xff, LinkAddressLength); NCE->State = State; - NCE->EventTimer = 0; /* Not in use */ + NCE->EventTimer = EventTimer; + NCE->EventCount = 0; InitializeListHead( &NCE->PacketQueue ); TI_DbgPrint(MID_TRACE,("NCE: %x\n", NCE)); @@ -309,8 +261,6 @@ HashValue ^= HashValue >> 4; HashValue &= NB_HASHMASK; - NCE->Table = &NeighborCache[HashValue]; - TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); NCE->Next = NeighborCache[HashValue].Cache; @@ -350,10 +300,11 @@ RtlCopyMemory(NCE->LinkAddress, LinkAddress, NCE->LinkAddressLength); NCE->State = State; + NCE->EventCount = 0; TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); - if( NCE->State & NUD_CONNECTED ) + if( NCE->State & NUD_REACHABLE ) NBSendPackets( NCE ); } @@ -425,16 +376,12 @@ AddrIsUnspecified(Address) ) { TI_DbgPrint(MID_TRACE,("Packet targeted at broadcast addr\n")); NCE = NBAddNeighbor(Interface, Address, NULL, - Interface->AddressLength, NUD_CONNECTED); - if (!NCE) return NULL; - NCE->EventTimer = 0; - NCE->EventCount = 0; + Interface->AddressLength, NUD_BROADCAST, 0); } else { NCE = NBAddNeighbor(Interface, Address, NULL, - Interface->AddressLength, NUD_INCOMPLETE); + Interface->AddressLength, NUD_INCOMPLETE, ARP_TIMEOUT); if (!NCE) return NULL; - NCE->EventTimer = 1; - NCE->EventCount = 0; + NBSendSolicit(NCE); } } @@ -483,12 +430,11 @@ TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); - if( NCE->State & NUD_CONNECTED ) + if( NCE->State & NUD_REACHABLE ) NBSendPackets( NCE ); return TRUE; } - VOID NBRemoveNeighbor( PNEIGHBOR_CACHE_ENTRY NCE) @@ -559,10 +505,8 @@ ArpTable[Size].LogAddr = CurNCE->Address.Address.IPv4Address; if( CurNCE->State & NUD_PERMANENT ) ArpTable[Size].Type = ARP_ENTRY_STATIC; - else if( CurNCE->State & NUD_CONNECTED ) + else if( CurNCE->State & NUD_REACHABLE ) ArpTable[Size].Type = ARP_ENTRY_DYNAMIC; - else if( !(CurNCE->State & NUD_VALID) ) - ArpTable[Size].Type = ARP_ENTRY_INVALID; else ArpTable[Size].Type = ARP_ENTRY_OTHER; }

1 0

[dchapyshev] 43047: - Fix starting Imdisk applet. Patch by Johnny Adams (johnyadams[at]hotmail[dot]com) See issue #4481 for more details.
by dchapyshev＠svn.reactos.org 14 Sep '09

14 Sep '09

Author: dchapyshev Date: Mon Sep 14 04:28:50 2009 New Revision: 43047 URL: http://svn.reactos.org/svn/reactos?rev=43047&view=rev Log: - Fix starting Imdisk applet. Patch by Johnny Adams (johnyadams[at]hotmail[dot]com) See issue #4481 for more details. Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] Mon Sep 14 04:28:50 2009 @@ -415,8 +415,8 @@ } } if (applet->info[sp].dwSize) { - if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) - applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData); + if (!applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData)) + applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts); } Control_UnloadApplet(applet); }

1 0

[jimtabor] 43046: - Remove redundant null check. Spotted by Amine Khaldi.
by jimtabor＠svn.reactos.org 14 Sep '09

14 Sep '09

Author: jimtabor Date: Mon Sep 14 02:36:08 2009 New Revision: 43046 URL: http://svn.reactos.org/svn/reactos?rev=43046&view=rev Log: - Remove redundant null check. Spotted by Amine Khaldi. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Sep 14 02:36:08 2009 @@ -228,11 +228,7 @@ PTHREADINFO W32Thread; PHOOKTABLE Table = IntGetTable(Hook); - ASSERT(NULL != Table); - if (NULL == Table) - { - return; - } + ASSERT(NULL != Table); // At this point this should not be null! W32Thread = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); ASSERT(W32Thread != NULL);

1 0

[janderwald] 43045: - Remove obsolete code - Fix closing of virtual audio devices introduced 43035
by janderwald＠svn.reactos.org 13 Sep '09

13 Sep '09

Author: janderwald Date: Mon Sep 14 00:26:59 2009 New Revision: 43045 URL: http://svn.reactos.org/svn/reactos?rev=43045&view=rev Log: - Remove obsolete code - Fix closing of virtual audio devices introduced 43035 Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Mon Sep 14 00:26:59 2009 @@ -61,31 +61,43 @@ return Status; } + + NTSTATUS NTAPI -Pin_fnRead( +Pin_fnWrite( PDEVICE_OBJECT DeviceObject, PIRP Irp) { PDISPATCH_CONTEXT Context; PIO_STACK_LOCATION IoStack; - ULONG BytesReturned; PFILE_OBJECT FileObject; NTSTATUS Status; + ULONG Length; /* Get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); + Length = IoStack->Parameters.Write.Length; + /* The dispatch context is stored in the FsContext member */ Context = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; /* Sanity check */ ASSERT(Context); + if (Context->hMixerPin) + { + // FIXME + // call kmixer to convert stream + UNIMPLEMENTED + } + /* acquire real pin file object */ Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) { + DPRINT1("failed\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; /* Complete the irp */ @@ -93,179 +105,19 @@ return Status; } - /* Re-dispatch the request to the real target pin */ - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_READ_STREAM, - MmGetMdlVirtualAddress(Irp->MdlAddress), - IoStack->Parameters.Read.Length, - NULL, - 0, - &BytesReturned); - - /* release file object */ - ObDereferenceObject(FileObject); - - if (Context->hMixerPin) - { - // FIXME - // call kmixer to convert stream - UNIMPLEMENTED - } - - /* Save status and information */ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Done */ - return Status; -} - -NTSTATUS -NTAPI -Pin_fnWrite( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PDISPATCH_CONTEXT Context; - PIO_STACK_LOCATION IoStack; - PFILE_OBJECT FileObject; - PVOID Buffer; - NTSTATUS Status; - ULONG BytesReturned; - - /* Get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* The dispatch context is stored in the FsContext member */ - Context = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - - /* Sanity check */ - ASSERT(Context); - - if (Context->hMixerPin) - { - // FIXME - // call kmixer to convert stream - UNIMPLEMENTED - } - - /* acquire real pin file object */ - Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); - - if (!Buffer) - { - /* insufficient resources */ - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - - - /* call the portcls audio pin */ - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, - NULL, - 0, - Buffer, - IoStack->Parameters.Write.Length, - &BytesReturned); - - /* Release file object */ - ObDereferenceObject(FileObject); - - /* Save status and information */ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = BytesReturned; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Done */ - return Status; -} - -NTSTATUS -NTAPI -Pin_fnFlush( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PDISPATCH_CONTEXT Context; - PIO_STACK_LOCATION IoStack; - PDEVICE_OBJECT PinDeviceObject; - PIRP PinIrp; - PFILE_OBJECT FileObject; - IO_STATUS_BLOCK IoStatus; - KEVENT Event; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - /* Get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* The dispatch context is stored in the FsContext member */ - Context = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; - - /* Sanity check */ - ASSERT(Context); - - - /* acquire real pin file object */ - Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - /* Get Pin's device object */ - PinDeviceObject = IoGetRelatedDeviceObject(FileObject); - - /* release file object */ - ObDereferenceObject(FileObject); - - /* Initialize notification event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* build target irp */ - PinIrp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, PinDeviceObject, NULL, 0, NULL, &Event, &IoStatus); - if (PinIrp) - { - - /* Get the next stack location */ - IoStack = IoGetNextIrpStackLocation(PinIrp); - /* The file object must be present in the irp as it contains the KSOBJECT_HEADER */ - IoStack->FileObject = FileObject; - - /* call the driver */ - Status = IoCallDriver(PinDeviceObject, PinIrp); - /* Has request already completed ? */ - if (Status == STATUS_PENDING) - { - /* Wait untill the request has completed */ - KeWaitForSingleObject(&Event, UserRequest, KernelMode, FALSE, NULL); - /* Update status */ - Status = IoStatus.Status; - } - } - - /* store status */ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - /* Complete the irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Done */ - return Status; + /* skip current irp location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + /* store file object of next device object */ + IoStack->FileObject = FileObject; + IoStack->MajorFunction = IRP_MJ_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_WRITE_STREAM; //FIXME + IoStack->Parameters.DeviceIoControl.OutputBufferLength = Length; + + /* now call the driver */ + return IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); } NTSTATUS @@ -297,68 +149,6 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -Pin_fnQuerySecurity( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - DPRINT("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -Pin_fnSetSecurity( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - - DPRINT("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -BOOLEAN -NTAPI -Pin_fnFastDeviceIoControl( - PFILE_OBJECT FileObject, - BOOLEAN Wait, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - ULONG IoControlCode, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - return FALSE; -} - - -BOOLEAN -NTAPI -Pin_fnFastRead( - PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - ULONG LockKey, - PVOID Buffer, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - return FALSE; - } BOOLEAN @@ -404,7 +194,7 @@ Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, UserMode); - //ObDereferenceObject(RealFileObject); + ObDereferenceObject(RealFileObject); if (NT_SUCCESS(Status)) return TRUE; @@ -415,14 +205,14 @@ static KSDISPATCH_TABLE PinTable = { Pin_fnDeviceIoControl, - Pin_fnRead, + KsDispatchInvalidDeviceRequest, Pin_fnWrite, - Pin_fnFlush, + KsDispatchInvalidDeviceRequest, Pin_fnClose, - Pin_fnQuerySecurity, - Pin_fnSetSecurity, - Pin_fnFastDeviceIoControl, - Pin_fnFastRead, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchFastIoDeviceControlFailure, + KsDispatchFastReadFailure, Pin_fnFastWrite, };

1 0

[janderwald] 43044: - Add back PHYSICAL_ADDRESS workarround for IDmaChannel::PhysicalAddress - Only define guids for gcc - Add missing PURE interface function definitions - Silence debug spam - Initialize ResourceList members - Fix calculation when allocating new resources entries - Fix building of portcls with msvc
by janderwald＠svn.reactos.org 13 Sep '09

13 Sep '09

Author: janderwald Date: Mon Sep 14 00:13:48 2009 New Revision: 43044 URL: http://svn.reactos.org/svn/reactos?rev=43044&view=rev Log: - Add back PHYSICAL_ADDRESS workarround for IDmaChannel::PhysicalAddress - Only define guids for gcc - Add missing PURE interface function definitions - Silence debug spam - Initialize ResourceList members - Fix calculation when allocating new resources entries - Fix building of portcls with msvc Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -196,11 +196,16 @@ PHYSICAL_ADDRESS NTAPI -CDmaChannelInit::PhysicalAddress() +CDmaChannelInit::PhysicalAddress( + PPHYSICAL_ADDRESS Address) { DPRINT("CDmaChannelInit_PhysicalAdress: this %p Virtuell %p Physical High %x Low %x%\n", this, m_Buffer, m_Address.HighPart, m_Address.LowPart); - return m_Address; + PHYSICAL_ADDRESS Result; + + Address->QuadPart = m_Address.QuadPart; + Result.QuadPart = (PtrToUlong(Address)); + return Result; } VOID Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -6,9 +6,12 @@ * PROGRAMMER: Johannes Anderwald */ - +#ifdef _MSC_VER +#define PUT_GUIDS_HERE +#endif #include "private.hpp" +#ifndef _MSC_VER const GUID CLSID_PortTopology = {0xb4c90a32L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID CLSID_PortMidi = {0xb4c90a43L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID CLSID_PortWaveCyclic = {0xb4c90a2aL, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; @@ -98,3 +101,4 @@ const GUID IID_IUnregisterSubdevice = {0x16738177, 0xe199, 0x41f9, {0x9a, 0x87, 0xab, 0xb2, 0xa5, 0x43, 0x2f, 0x21}}; const GUID IID_IUnregisterPhysicalConnection = {0x6c38e231, 0x2a0d, 0x428d, {0x81, 0xf8, 0x07, 0xcc, 0x42, 0x8b, 0xb9, 0xa4}}; +#endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -304,46 +304,46 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG FrameSize, IN ULONG Alignment, - IN PVOID SilenceBuffer); + IN PVOID SilenceBuffer) PURE; STDMETHOD_(NTSTATUS, AddMapping)(THIS_ IN PUCHAR Buffer, IN ULONG BufferSize, - IN PIRP Irp); + IN PIRP Irp) PURE; STDMETHOD_(NTSTATUS, GetMapping)(THIS_ OUT PUCHAR * Buffer, - OUT PULONG BufferSize); + OUT PULONG BufferSize) PURE; STDMETHOD_(VOID, UpdateMapping)(THIS_ - IN ULONG BytesWritten); - - STDMETHOD_(ULONG, NumMappings)(THIS); - - STDMETHOD_(ULONG, NumData)(THIS); - - STDMETHOD_(BOOL, MinimumDataAvailable)(THIS); - - STDMETHOD_(BOOL, CancelBuffers)(THIS); + IN ULONG BytesWritten) PURE; + + STDMETHOD_(ULONG, NumMappings)(THIS) PURE; + + STDMETHOD_(ULONG, NumData)(THIS) PURE; + + STDMETHOD_(BOOL, MinimumDataAvailable)(THIS) PURE; + + STDMETHOD_(BOOL, CancelBuffers)(THIS) PURE; STDMETHOD_(VOID, UpdateFormat)(THIS_ - IN PKSDATAFORMAT DataFormat); + IN PKSDATAFORMAT DataFormat) PURE; STDMETHOD_(NTSTATUS, GetMappingWithTag)(THIS_ IN PVOID Tag, OUT PPHYSICAL_ADDRESS PhysicalAddress, OUT PVOID *VirtualAddress, OUT PULONG ByteCount, - OUT PULONG Flags); + OUT PULONG Flags) PURE; STDMETHOD_(NTSTATUS, ReleaseMappingWithTag)(THIS_ - IN PVOID Tag); - - STDMETHOD_(BOOL, HasLastMappingFailed)(THIS); - STDMETHOD_(VOID, PrintQueueStatus)(THIS); + IN PVOID Tag) PURE; + + STDMETHOD_(BOOL, HasLastMappingFailed)(THIS) PURE; + STDMETHOD_(VOID, PrintQueueStatus)(THIS) PURE; STDMETHOD_(VOID, SetMinimumDataThreshold)(THIS_ - IN ULONG MinimumDataThreshold); - STDMETHOD_(ULONG, GetMinimumDataThreshold)(THIS); + IN ULONG MinimumDataThreshold) PURE; + STDMETHOD_(ULONG, GetMinimumDataThreshold)(THIS) PURE; }; @@ -633,20 +633,20 @@ IN KSPIN_DESCRIPTOR * PinDescriptor, IN PDEVICE_OBJECT DeviceObject) PURE; - STDMETHOD_(PVOID, GetIrpStream)(THIS); - STDMETHOD_(PMINIPORT, GetMiniport)(THIS); + STDMETHOD_(PVOID, GetIrpStream)(THIS) PURE; + STDMETHOD_(PMINIPORT, GetMiniport)(THIS) PURE; }; #define IMP_IPortPinWavePci \ IMP_IIrpTarget; \ STDMETHODIMP_(NTSTATUS) Init(THIS_ \ IN PPORTWAVEPCI Port, \ - IN PPORTFILTERWAVEPCI Filter, \ + IN PPORTFILTERWAVEPCI Filter, \ IN KSPIN_CONNECT * ConnectDetails, \ IN KSPIN_DESCRIPTOR * PinDescriptor, \ IN PDEVICE_OBJECT DeviceObject); \ \ - STDMETHODIMP_(PVOID) GetIrpStream(THIS); \ + STDMETHODIMP_(PVOID) GetIrpStream(); \ STDMETHODIMP_(PMINIPORT) GetMiniport(THIS) @@ -771,11 +771,11 @@ IN KSPIN_CONNECT * ConnectDetails, IN KSPIN_DESCRIPTOR * PinDescriptor) PURE; - STDMETHOD_(ULONG, GetCompletedPosition)(THIS); - STDMETHOD_(ULONG, GetCycleCount)(THIS); - STDMETHOD_(ULONG, GetDeviceBufferSize)(THIS); - STDMETHOD_(PVOID, GetIrpStream)(THIS); - STDMETHOD_(PMINIPORT, GetMiniport)(THIS); + STDMETHOD_(ULONG, GetCompletedPosition)(THIS) PURE; + STDMETHOD_(ULONG, GetCycleCount)(THIS) PURE; + STDMETHOD_(ULONG, GetDeviceBufferSize)(THIS) PURE; + STDMETHOD_(PVOID, GetIrpStream)(THIS) PURE; + STDMETHOD_(PMINIPORT, GetMiniport)(THIS) PURE; }; #define IMP_IPortPinWaveCyclic \ @@ -814,7 +814,7 @@ STDMETHOD_(NTSTATUS, FreePin)(THIS_ IN struct IPortPinDMus* Pin)PURE; - STDMETHOD_(VOID, NotifyPins)(THIS); + STDMETHOD_(VOID, NotifyPins)(THIS) PURE; }; typedef IPortFilterDMus *PPORTFILTERDMUS; @@ -848,7 +848,7 @@ IN KSPIN_DESCRIPTOR * PinDescriptor, IN PDEVICE_OBJECT DeviceObject) PURE; - STDMETHOD_(VOID, Notify)(THIS); + STDMETHOD_(VOID, Notify)(THIS) PURE; }; #define IMP_IPortPinDMus \ @@ -868,28 +868,95 @@ ***************************************************************************** */ +#define IMP_IDmaChannelEx \ + STDMETHODIMP_(NTSTATUS) AllocateBuffer( \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ + \ + STDMETHODIMP_(void) FreeBuffer(void); \ + STDMETHODIMP_(ULONG) TransferCount(void); \ + STDMETHODIMP_(ULONG) MaximumBufferSize(void); \ + STDMETHODIMP_(ULONG) AllocatedBufferSize(void); \ + STDMETHODIMP_(ULONG) BufferSize(void); \ + \ + STDMETHODIMP_(void) SetBufferSize( \ + IN ULONG BufferSize); \ + \ + STDMETHODIMP_(PVOID) SystemAddress(void); \ + STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress( \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ + STDMETHODIMP_(PADAPTER_OBJECT) GetAdapterObject(void); \ + \ + STDMETHODIMP_(void) CopyTo( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount); \ + \ + STDMETHODIMP_(void) CopyFrom( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) + +#define IMP_IDmaChannelSlaveEx \ + IMP_IDmaChannelEx; \ + STDMETHODIMP_(NTSTATUS) Start( \ + IN ULONG MapSize, \ + IN BOOLEAN WriteToDevice); \ + \ + STDMETHODIMP_(NTSTATUS) Stop(void); \ + STDMETHODIMP_(ULONG) ReadCounter(void); \ + \ + STDMETHODIMP_(NTSTATUS) WaitForTC( \ + ULONG Timeout) + +#define IMP_IDmaChannelInit\ + IMP_IDmaChannelSlaveEx;\ + STDMETHODIMP_(NTSTATUS) Init( \ + IN PDEVICE_DESCRIPTION DeviceDescription, \ + IN PDEVICE_OBJECT DeviceObject) + +#define DEFINE_ABSTRACT_DMACHANNEL_EX() \ + STDMETHOD_(NTSTATUS, AllocateBuffer)( THIS_ \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) PURE; \ +\ + STDMETHOD_(void, FreeBuffer)( THIS ) PURE; \ + STDMETHOD_(ULONG, TransferCount)( THIS ) PURE; \ + STDMETHOD_(ULONG, MaximumBufferSize)( THIS ) PURE; \ + STDMETHOD_(ULONG, AllocatedBufferSize)( THIS ) PURE; \ + STDMETHOD_(ULONG, BufferSize)( THIS ) PURE; \ +\ + STDMETHOD_(void, SetBufferSize)( THIS_ \ + IN ULONG BufferSize) PURE; \ +\ + STDMETHOD_(PVOID, SystemAddress)( THIS ) PURE; \ + STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS_ \ + IN PPHYSICAL_ADDRESS Address) PURE; \ + STDMETHOD_(PADAPTER_OBJECT, GetAdapterObject)( THIS ) PURE; \ +\ + STDMETHOD_(void, CopyTo)( THIS_ \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) PURE; \ +\ + STDMETHOD_(void, CopyFrom)( THIS_ \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) PURE; + #undef INTERFACE #define INTERFACE IDmaChannelInit DECLARE_INTERFACE_(IDmaChannelInit, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() - DEFINE_ABSTRACT_DMACHANNEL() + DEFINE_ABSTRACT_DMACHANNEL_EX() DEFINE_ABSTRACT_DMACHANNELSLAVE() STDMETHOD_(NTSTATUS, Init)( THIS_ IN PDEVICE_DESCRIPTION DeviceDescription, IN PDEVICE_OBJECT DeviceObject) PURE; }; - - - -#define IMP_IDmaChannelInit\ - IMP_IDmaChannelSlave;\ - STDMETHODIMP_(NTSTATUS) Init( \ - IN PDEVICE_DESCRIPTION DeviceDescription, \ - IN PDEVICE_OBJECT DeviceObject) - #undef INTERFACE @@ -1021,7 +1088,4 @@ IN ULONG Index \ ) - - - #endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -15,6 +15,10 @@ <group compilerset="gcc"> <compilerflag compiler="cxx">-fno-exceptions</compilerflag> <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> + + <group compilerset="msc"> + <compilerflag compiler="cxx">/GR-</compilerflag> </group> <file>adapter.cpp</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -12,7 +12,7 @@ #include <ntddk.h> #include <portcls.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <dmusicks.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Mon Sep 14 00:13:48 2009 @@ -34,7 +34,7 @@ } IMP_IResourceList; - CResourceList(IUnknown * OuterUnknown) {} + CResourceList(IUnknown * OuterUnknown) : m_OuterUnknown(OuterUnknown), m_PoolType(NonPagedPool), m_TranslatedResourceList(0), m_UntranslatedResourceList(0), m_NumberOfEntries(0) {} virtual ~CResourceList() {} public: @@ -88,7 +88,7 @@ IN CM_RESOURCE_TYPE Type) { ULONG Index, Count = 0; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor, UnPartialDescriptor; PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -97,17 +97,30 @@ // no resource list return 0; } - + PC_ASSERT(m_TranslatedResourceList->List[0].PartialResourceList.Count == m_UntranslatedResourceList->List[0].PartialResourceList.Count); // I guess the translated and untranslated lists will be same length? for (Index = 0; Index < m_TranslatedResourceList->List[0].PartialResourceList.Count; Index ++ ) { PartialDescriptor = &m_TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; - DPRINT("Descriptor Type %u\n", PartialDescriptor->Type); + UnPartialDescriptor = &m_UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; + DPRINT1("Descriptor Type %u\n", PartialDescriptor->Type); if (PartialDescriptor->Type == Type) { // Yay! Finally found one that matches! Count++; } + + if (PartialDescriptor->Type == CmResourceTypeInterrupt) + { + DPRINT1("Index %u TRANS Interrupt Number Affinity %x Level %u Vector %u\n", Index, PartialDescriptor->u.Interrupt.Affinity, PartialDescriptor->u.Interrupt.Level, PartialDescriptor->u.Interrupt.Vector, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); + DPRINT1("Index %u UNTRANS Interrupt Number Affinity %x Level %u Vector %u\n", Index, UnPartialDescriptor->u.Interrupt.Affinity, UnPartialDescriptor->u.Interrupt.Level, UnPartialDescriptor->u.Interrupt.Vector, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); + + } + else if (PartialDescriptor->Type == CmResourceTypePort) + { + DPRINT1("Index %u TRANS Port Length %u Start %u %u Flags %x\n", Index, PartialDescriptor->u.Port.Length, PartialDescriptor->u.Port.Start.HighPart, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); + DPRINT1("Index %u UNTRANS Port Length %u Start %u %u Flags %x\n", Index, UnPartialDescriptor->u.Port.Length, UnPartialDescriptor->u.Port.Start.HighPart, UnPartialDescriptor->u.Port.Start.LowPart, UnPartialDescriptor->Flags); + } } DPRINT("Found %d type %d\n", Count, Type); @@ -200,9 +213,8 @@ NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount+1]); TranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); #else - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount+1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); - TranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); - + NewTranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount+1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + TranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); #endif NewTranslatedResources = (PCM_RESOURCE_LIST)AllocateItem(m_PoolType, NewTranslatedSize, TAG_PORTCLASS); if (!NewTranslatedResources) @@ -216,9 +228,8 @@ NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount+1]); UntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); #else - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount+1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); - UntranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); - + NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount+1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + UntranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); #endif @@ -361,7 +372,7 @@ #ifdef _MSC_VER NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); #else - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); + NewTranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); #endif // store resource count @@ -372,7 +383,7 @@ #ifdef _MSC_VER NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); #else - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + (ResourceCount > 0 ? (ResourceCount-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) : 0); + NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + (ResourceCount) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); #endif // allocate translated resource list @@ -454,6 +465,7 @@ NewList->m_OuterUnknown = OuterUnknown; NewList->m_PoolType = PoolType; NewList->m_Ref = 1; + NewList->m_NumberOfEntries = 0; *OutResourceList = (IResourceList*)NewList;

1 0

[jimtabor] 43043: - Add query window for real process Id.
by jimtabor＠svn.reactos.org 13 Sep '09

13 Sep '09

Author: jimtabor Date: Mon Sep 14 00:06:58 2009 New Revision: 43043 URL: http://svn.reactos.org/svn/reactos?rev=43043&view=rev Log: - Add query window for real process Id. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c 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] Mon Sep 14 00:06:58 2009 @@ -2301,6 +2301,7 @@ #define QUERY_WINDOW_ACTIVE 0x02 #define QUERY_WINDOW_FOCUS 0x03 #define QUERY_WINDOW_ISHUNG 0x04 +#define QUERY_WINDOW_REAL_ID 0x05 DWORD NTAPI NtUserQueryWindow( Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Sep 14 00:06:58 2009 @@ -276,6 +276,7 @@ } Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); + Win32Thread->pEThread = Thread; } else { 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] Mon Sep 14 00:06:58 2009 @@ -4161,16 +4161,19 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) { PWINDOW_OBJECT Window; + PWND pWnd; DWORD Result; DECLARE_RETURN(UINT); DPRINT("Enter NtUserQueryWindow\n"); UserEnterShared(); - if (!(Window = UserGetWindowObject(hWnd))) + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) { RETURN( 0); } + + pWnd = Window->Wnd; switch(Index) { @@ -4193,6 +4196,9 @@ case QUERY_WINDOW_ISHUNG: Result = (DWORD)MsqIsHung(Window->MessageQueue); break; + + case QUERY_WINDOW_REAL_ID: + Result = (DWORD)pWnd->head.pti->pEThread->Cid.UniqueProcess; default: Result = (DWORD)NULL;

1 0

[dgorbachev] 43042: Fix r43040 mistake.
by dgorbachev＠svn.reactos.org 13 Sep '09

13 Sep '09

Author: dgorbachev Date: Sun Sep 13 23:26:46 2009 New Revision: 43042 URL: http://svn.reactos.org/svn/reactos?rev=43042&view=rev Log: Fix r43040 mistake. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Sep 13 23:26:46 2009 @@ -743,7 +743,7 @@ const string& TARGET_CCValue = Environment::GetVariable ( "TARGET_CC" ); const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" ); - if ( ROS_PREFIXValue.length () > 0 ) + if ( TARGET_CCValue.length () > 0 ) { compilerPrefix = ""; compilerCommand = TARGET_CCValue;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs