Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 57251: [Win32SS] - HAX: Fix menu test crash! - Contract be damned. This number 2 on my list to move server side!
by jimtabor＠svn.reactos.org 08 Sep '12

08 Sep '12

Author: jimtabor Date: Sat Sep 8 06:09:19 2012 New Revision: 57251 URL: http://svn.reactos.org/svn/reactos?rev=57251&view=rev Log: [Win32SS] - HAX: Fix menu test crash! - Contract be damned. This number 2 on my list to move server side! Modified: trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/user32/user32.spec trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sat Sep 8 06:09:19 2012 @@ -1814,14 +1814,29 @@ } if (MenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM) kmbi.fBarFocused = TRUE; + + if (MenuObject->MenuItemList) + { SubMenuObject = UserGetMenuObject(MenuObject->MenuItemList->hSubMenu); if(SubMenuObject) kmbi.hwndMenu = SubMenuObject->MenuInfo.Wnd; + } TRACE("OBJID_MENU, idItem = %d\n",idItem); break; } case OBJID_CLIENT: { PMENU_OBJECT SubMenuObject, XSubMenuObject; + HMENU hMenuChk; + // Windows does this! Wine checks for Atom and uses GetWindowLongPtrW. + hMenuChk = (HMENU)co_IntSendMessage(hwnd, MN_GETHMENU, 0, 0); + + if (!(MenuObject = UserGetMenuObject(hMenuChk))) + { + ERR("Window does not have a Popup Menu!\n"); + EngSetLastError(ERROR_INVALID_MENU_HANDLE); + RETURN(FALSE); + } + SubMenuObject = UserGetMenuObject(MenuObject->MenuItemList->hSubMenu); if(SubMenuObject) kmbi.hMenu = SubMenuObject->MenuInfo.Self; else Modified: trunk/reactos/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… ============================================================================== --- trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] Sat Sep 8 06:09:19 2012 @@ -302,7 +302,7 @@ @ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) NtUserGetLayeredWindowAttributes @ stdcall GetListBoxInfo(long) NtUserGetListBoxInfo @ stdcall GetMenu(long) -@ stdcall GetMenuBarInfo(long long long ptr) NtUserGetMenuBarInfo +@ stdcall GetMenuBarInfo(long long long ptr) ; tempo haxzo NtUserGetMenuBarInfo @ stdcall GetMenuCheckMarkDimensions() @ stdcall GetMenuContextHelpId(long) @ stdcall GetMenuDefaultItem(long long long) Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Sat Sep 8 06:09:19 2012 @@ -4219,6 +4219,26 @@ /* * @implemented */ +BOOL WINAPI GetMenuBarInfo( HWND hwnd, LONG idObject, LONG idItem, PMENUBARINFO pmbi ) +{ + BOOL Ret; + Ret = NtUserGetMenuBarInfo( hwnd, idObject, idItem, pmbi); + // Reason to move to server side!!!!! + if (!Ret) return Ret; + // EL HAXZO!!! + pmbi->fBarFocused = top_popup_hmenu == pmbi->hMenu; + if (!idItem) + { + pmbi->fFocused = pmbi->fBarFocused; + } + + return TRUE; +} + + +/* + * @implemented + */ LONG WINAPI GetMenuCheckMarkDimensions(VOID) {

1 0

[spetreolle] 57250: [NDIS] Remove spurious form feeds from NDIS code. Patch by Lee Schroeder. See issue #7310 for more details.
by spetreolle＠svn.reactos.org 07 Sep '12

07 Sep '12

Author: spetreolle Date: Fri Sep 7 12:01:14 2012 New Revision: 57250 URL: http://svn.reactos.org/svn/reactos?rev=57250&view=rev Log: [NDIS] Remove spurious form feeds from NDIS code. Patch by Lee Schroeder. See issue #7310 for more details. Modified: trunk/reactos/drivers/network/ndis/ndis/40stubs.c trunk/reactos/drivers/network/ndis/ndis/control.c trunk/reactos/drivers/network/ndis/ndis/hardware.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/main.c trunk/reactos/drivers/network/ndis/ndis/memory.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/ndis/ndis/string.c trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/40stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -262,7 +262,6 @@ /* No-op. */ } - /* * @unimplemented */ @@ -277,7 +276,6 @@ UNIMPLEMENTED } - /* * @unimplemented */ 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] Fri Sep 7 12:01:14 2012 @@ -12,7 +12,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -33,7 +32,6 @@ KeInitializeSpinLock(&Lock->SpinLock); } - /* * @implemented */ @@ -94,7 +92,6 @@ } } - /* * @implemented */ @@ -129,7 +126,6 @@ } } - /* * @implemented */ @@ -147,7 +143,6 @@ KeAcquireSpinLock(&SpinLock->SpinLock, &SpinLock->OldIrql); } - /* * @implemented */ @@ -165,7 +160,6 @@ KeInitializeSpinLock(&SpinLock->SpinLock); } - /* * @implemented */ @@ -184,7 +178,6 @@ SpinLock->OldIrql = DISPATCH_LEVEL; } - /* * @implemented */ @@ -202,7 +195,6 @@ KeReleaseSpinLockFromDpcLevel(&SpinLock->SpinLock); } - /* * @implemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -14,7 +14,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -33,7 +32,6 @@ WrapperContext->SlotNumber, Buffer, Offset, Length); } - /* * @implemented */ @@ -52,7 +50,6 @@ WrapperContext->SlotNumber, Buffer, Offset, Length); } - /* * @implemented */ @@ -96,7 +93,8 @@ return NdisMPciAssignResources(Adapter, SlotNumber, AssignedResources); -} +} + /* * @implemented */ @@ -193,7 +191,6 @@ Buffer, Offset, Length); } - /* * @implemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -13,7 +13,6 @@ #include "ndissys.h" - VOID NTAPI HandleDeferredProcessing( IN PKDPC Dpc, IN PVOID DeferredContext, @@ -47,7 +46,6 @@ NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); } - BOOLEAN NTAPI ServiceRoutine( IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) @@ -94,7 +92,6 @@ return InterruptRecognized; } - /* * @implemented */ @@ -109,7 +106,6 @@ *Data = READ_PORT_UCHAR(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -124,7 +120,6 @@ *Data = READ_PORT_ULONG(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -139,7 +134,6 @@ *Data = READ_PORT_USHORT(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -154,7 +148,6 @@ WRITE_PORT_UCHAR(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -169,7 +162,6 @@ WRITE_PORT_ULONG(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext? } - /* * @implemented */ @@ -212,7 +204,8 @@ /* We have to hold the object open to keep our lock on the system DMA controller */ return KeepObject; -} +} + IO_ALLOCATION_ACTION NTAPI NdisBusMasterMapRegisterCallback ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -242,7 +235,8 @@ /* We're a bus master so we can go ahead and deallocate the object now */ return DeallocateObjectKeepRegisters; -} +} + /* * @implemented */ @@ -635,7 +629,6 @@ *ArraySize = LoopCount; } - /* * @implemented */ @@ -673,7 +666,6 @@ Adapter->NdisMiniportBlock.MapRegisters[PhysicalMapRegister].WriteToDevice); } - /* * @implemented */ @@ -693,7 +685,6 @@ ExFreePool(DmaBlock); } - /* * @implemented */ @@ -715,7 +706,6 @@ Interrupt->Miniport->Interrupt = NULL; } - /* * @implemented */ @@ -769,7 +759,6 @@ ExFreePool(Adapter->NdisMiniportBlock.MapRegisters); } - /* * @implemented */ @@ -822,7 +811,6 @@ return NDIS_STATUS_SUCCESS; } - /* * @implemented */ @@ -840,7 +828,6 @@ return AdapterObject->DmaOperations->ReadDmaCounter(AdapterObject); } - /* * @implemented */ @@ -858,7 +845,6 @@ return AdapterObject->DmaOperations->GetDmaAlignment(AdapterObject); } - /* * @implemented */ @@ -938,7 +924,8 @@ FALSE, DmaDescription, MaximumLength); -} +} + /* * @implemented */ @@ -1016,7 +1003,6 @@ return NDIS_STATUS_FAILURE; } - /* * @implemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -23,7 +23,7 @@ LONG CancelId; - + VOID NTAPI MainUnload( PDRIVER_OBJECT DriverObject) /* @@ -35,7 +35,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); } - + NTSTATUS NTAPI DriverEntry( @@ -68,7 +68,7 @@ return STATUS_SUCCESS; } - + /* * @implemented */ @@ -96,7 +96,7 @@ /* ASSERT(0); */ } - + /* * @implemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -13,7 +13,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -50,7 +49,6 @@ } - /* * @implemented */ @@ -104,7 +102,6 @@ return NDIS_STATUS_SUCCESS; } - /* * @implemented */ @@ -143,7 +140,6 @@ } } - /* * @implemented */ @@ -184,7 +180,6 @@ Adapter->NdisMiniportBlock.SystemAdapterObject, Length, PhysicalAddress, Cached); } - VOID NTAPI NdisMFreeSharedMemoryPassive( @@ -212,7 +207,6 @@ ExFreePool(Memory); } - /* * @implemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -167,7 +167,6 @@ return Busy; } - VOID MiniIndicateData( PLOGICAL_ADAPTER Adapter, @@ -282,7 +281,8 @@ KeLowerIrql(OldIrql); } } -} +} + VOID NTAPI MiniIndicateReceivePacket( IN NDIS_HANDLE MiniportAdapterHandle, @@ -425,7 +425,6 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - VOID NTAPI MiniResetComplete( IN NDIS_HANDLE MiniportAdapterHandle, @@ -917,7 +916,6 @@ } } - VOID FASTCALL MiniQueueWorkItem( @@ -991,7 +989,6 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - NDIS_STATUS FASTCALL MiniDequeueWorkItem( @@ -1050,7 +1047,6 @@ } } - NDIS_STATUS MiniDoRequest( PLOGICAL_ADAPTER Adapter, @@ -1121,7 +1117,6 @@ return Status; } - /* * @implemented */ @@ -1142,7 +1137,6 @@ KeLowerIrql(OldIrql); } - /* * @implemented */ @@ -1322,7 +1316,6 @@ } - VOID NTAPI MiniStatus( @@ -1356,7 +1349,6 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - VOID NTAPI MiniStatusComplete( @@ -1384,7 +1376,6 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } - /* * @implemented */ @@ -1529,7 +1520,6 @@ MiniStatusComplete(MiniportAdapterHandle); } - /* * @implemented */ @@ -1614,7 +1604,6 @@ *NdisWrapperHandle = Miniport; } - VOID NTAPI NdisIBugcheckCallback( IN PVOID Buffer, IN ULONG Length) @@ -1634,7 +1623,6 @@ sh(Context->DriverContext); } - /* * @implemented */ @@ -1685,7 +1673,6 @@ IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); } - NDIS_STATUS DoQueries( PLOGICAL_ADAPTER Adapter, @@ -1775,7 +1762,6 @@ return STATUS_SUCCESS; } - NTSTATUS NTAPI NdisIForwardIrpAndWaitCompletionRoutine( @@ -1791,7 +1777,6 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS NTAPI NdisIForwardIrpAndWait(PLOGICAL_ADAPTER Adapter, PIRP Irp) @@ -1826,7 +1811,6 @@ return STATUS_SUCCESS; } - NTSTATUS NTAPI NdisIPnPStartDevice( @@ -2153,7 +2137,6 @@ return STATUS_SUCCESS; } - NTSTATUS NTAPI NdisIPnPStopDevice( @@ -2275,7 +2258,6 @@ return Status; } - NTSTATUS NTAPI NdisIDispatchPnp( @@ -2348,7 +2330,6 @@ return IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp); } - NTSTATUS NTAPI NdisIAddDevice( @@ -2713,7 +2694,6 @@ return NDIS_STATUS_SUCCESS; } - /* * @implemented */ @@ -2728,7 +2708,6 @@ MiniResetComplete(MiniportAdapterHandle, Status, AddressingReset); } - /* * @implemented */ @@ -2751,7 +2730,6 @@ MiniSendComplete(MiniportAdapterHandle, Packet, Status); } - /* * @implemented */ @@ -2764,7 +2742,6 @@ MiniSendResourcesAvailable(MiniportAdapterHandle); } - /* * @implemented */ @@ -2780,7 +2757,6 @@ MiniTransferDataComplete(MiniportAdapterHandle, Packet, Status, BytesTransferred); } - /* * @implemented */ @@ -2807,7 +2783,6 @@ AdapterType); } - /* * @implemented */ @@ -2853,7 +2828,6 @@ } } - /* * @implemented */ @@ -2881,7 +2855,6 @@ KeWaitForSingleObject(&Timer, Executive, KernelMode, FALSE, 0); } - /* * @implemented */ @@ -2897,7 +2870,6 @@ SynchronizeContext)); } - /* * @unimplemented */ @@ -2940,7 +2912,6 @@ return NDIS_STATUS_FAILURE; } - /* * @implemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -185,7 +185,6 @@ return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } - /* * @implemented */ @@ -240,7 +239,6 @@ ExInterlockedRemoveEntryList(&Protocol->ListEntry, &ProtocolListLock); } - NDIS_STATUS ProIndicatePacket( PLOGICAL_ADAPTER Adapter, @@ -306,7 +304,6 @@ return NDIS_STATUS_SUCCESS; } - NDIS_STATUS NTAPI ProRequest( IN NDIS_HANDLE MacBindingHandle, @@ -456,7 +453,6 @@ #endif } - NDIS_STATUS NTAPI ProSend( IN NDIS_HANDLE MacBindingHandle, @@ -561,7 +557,6 @@ } } - VOID NTAPI ProSendPackets( IN NDIS_HANDLE NdisBindingHandle, @@ -624,7 +619,6 @@ } } - NDIS_STATUS NTAPI ProTransferData( IN NDIS_HANDLE MacBindingHandle, @@ -1221,7 +1215,6 @@ } } - /* * @implemented */ @@ -1242,7 +1235,6 @@ *Status = ProRequest(NdisBindingHandle, NdisRequest); } - /* * @implemented */ @@ -1255,7 +1247,6 @@ *Status = ProReset(NdisBindingHandle); } - /* * @implemented */ @@ -1277,7 +1268,6 @@ *Status = ProSend(NdisBindingHandle, Packet); } - /* * @implemented */ @@ -1292,7 +1282,6 @@ ProSendPackets(NdisBindingHandle, PacketArray, NumberOfPackets); } - /* * @implemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/string.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/string.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -12,7 +12,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -41,7 +40,6 @@ } - /* * @implemented */ @@ -71,7 +69,6 @@ CaseInsensitive); } - /* * @implemented */ @@ -96,7 +93,6 @@ RtlInitString((PANSI_STRING)DestinationString, (PCSZ)SourceString); } - /* * @implemented */ @@ -125,7 +121,6 @@ RtlAnsiStringToUnicodeString((PUNICODE_STRING)DestinationString, &AnsiString, TRUE); } - /* * @implemented */ @@ -150,7 +145,6 @@ RtlInitUnicodeString((PUNICODE_STRING)DestinationString, SourceString); } - /* * @implemented */ @@ -179,7 +173,6 @@ FALSE); } - /* * @implemented */ Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Fri Sep 7 12:01:14 2012 @@ -19,7 +19,6 @@ #include "ndissys.h" - /* * @implemented */ @@ -43,7 +42,6 @@ *TimerCancelled = KeCancelTimer (&Timer->Timer); } - /* * @implemented */ @@ -65,7 +63,6 @@ KeQuerySystemTime (pSystemTime); } - /* * @implemented */ @@ -126,7 +123,6 @@ } } - /* * @implemented */ @@ -188,7 +184,6 @@ SystemArgument2); } - /* * @implemented */ @@ -223,7 +218,6 @@ Timer->NextDeferredTimer = NULL; } - /* * @implemented */ @@ -269,7 +263,6 @@ KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } - /* * @implemented */ @@ -316,7 +309,6 @@ KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc); } - /* * @implemented */

1 0

[jimtabor] 57249: - turn off debugs.
by jimtabor＠svn.reactos.org 07 Sep '12

07 Sep '12

Author: jimtabor Date: Fri Sep 7 05:50:11 2012 New Revision: 57249 URL: http://svn.reactos.org/svn/reactos?rev=57249&view=rev Log: - turn off debugs. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Fri Sep 7 05:50:11 2012 @@ -2227,9 +2227,9 @@ Window = UserGetWindowObject(hWnd); if (Window) { - ERR("FNID_DESKTOP IN\n"); + //ERR("FNID_DESKTOP IN\n"); Ret = DesktopWindowProc(Window, Msg, wParam, lParam, &lResult); - ERR("FNID_DESKTOP OUT\n"); + //ERR("FNID_DESKTOP OUT\n"); } break; }

1 0

[dgorbachev] 57248: [MOUNTMGR][NDIS] Fix some string length calculations. [CRT] Declare variables extern. [DMUSIC] Fix a bug, already fixed in Wine.
by dgorbachev＠svn.reactos.org 06 Sep '12

06 Sep '12

Author: dgorbachev Date: Thu Sep 6 21:11:44 2012 New Revision: 57248 URL: http://svn.reactos.org/svn/reactos?rev=57248&view=rev Log: [MOUNTMGR][NDIS] Fix some string length calculations. [CRT] Declare variables extern. [DMUSIC] Fix a bug, already fixed in Wine. Modified: trunk/reactos/dll/directx/dmusic/collection.c trunk/reactos/drivers/filters/mountmgr/mountmgr.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/lib/sdk/crt/locale/locale.c Modified: trunk/reactos/dll/directx/dmusic/collection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/collect… ============================================================================== --- trunk/reactos/dll/directx/dmusic/collection.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dmusic/collection.c [iso-8859-1] Thu Sep 6 21:11:44 2012 @@ -209,8 +209,8 @@ if (pDesc->dwValidData & DMUS_OBJ_DATE) This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + This->pDesc->llMemLength = pDesc->llMemLength; + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Thu Sep 6 21:11:44 2012 @@ -38,7 +38,7 @@ KEVENT UnloadEvent; LONG Unloading; -PWSTR Cunc = L"\\??\\C:"; +static const WCHAR Cunc[] = L"\\??\\C:"; /* * TODO: Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Thu Sep 6 21:11:44 2012 @@ -139,7 +139,7 @@ return (NDIS_HANDLE)obj; } -const WCHAR* NDIS_FILE_FOLDER = L"\\SystemRoot\\System32\\Drivers\\"; +static const WCHAR NDIS_FILE_FOLDER[] = L"\\SystemRoot\\System32\\Drivers\\"; /* * @implemented @@ -242,8 +242,8 @@ *Status = NDIS_STATUS_SUCCESS; FullFileName.Buffer = NULL; - FullFileName.Length = sizeof(NDIS_FILE_FOLDER); - FullFileName.MaximumLength = FileName->MaximumLength + sizeof(NDIS_FILE_FOLDER); + FullFileName.Length = sizeof(NDIS_FILE_FOLDER) - sizeof(UNICODE_NULL); + FullFileName.MaximumLength = FileName->MaximumLength + FullFileName.Length; FullFileName.Buffer = ExAllocatePool ( NonPagedPool, FullFileName.MaximumLength ); if ( !FullFileName.Buffer ) Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Thu Sep 6 21:11:44 2012 @@ -74,8 +74,8 @@ LANGID found_lang_id; } locale_search_t; -unsigned int __setlc_active; -unsigned int __unguarded_readlc_active; +extern unsigned int __setlc_active; +extern unsigned int __unguarded_readlc_active; int _current_category; /* used by setlocale */ const char *_current_locale;

1 0

[dgorbachev] 57247: [OPENGL] Silence GCC warning.
by dgorbachev＠svn.reactos.org 06 Sep '12

06 Sep '12

Author: dgorbachev Date: Thu Sep 6 21:09:36 2012 New Revision: 57247 URL: http://svn.reactos.org/svn/reactos?rev=57247&view=rev Log: [OPENGL] Silence GCC warning. Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/CMakeLists… ============================================================================== --- trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] Thu Sep 6 21:09:36 2012 @@ -14,6 +14,9 @@ if(NOT MSVC) add_compile_flags_language("-std=gnu99" "C") add_compile_flags("-Wno-deprecated-declarations") + if(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) + add_compile_flags("-Wno-error=unused-local-typedefs") + endif() # optimizations (builtin memcmp is slow on some gcc versions) used in SConsript files add_compile_flags("-ffast-math -fno-builtin-memcmp") else() @@ -32,4 +35,4 @@ # our DBG definitions conflict with mesa source code remove_definitions(-DDBG=1 -DDBG=0) -add_subdirectory(src) +add_subdirectory(src)

1 0

[akhaldi] 57246: [FORMATTING] * No code changes.
by akhaldi＠svn.reactos.org 06 Sep '12

06 Sep '12

Author: akhaldi Date: Thu Sep 6 18:36:48 2012 New Revision: 57246 URL: http://svn.reactos.org/svn/reactos?rev=57246&view=rev Log: [FORMATTING] * No code changes. Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Thu Sep 6 18:36:48 2012 @@ -8,504 +8,602 @@ */ +/* INCLUDES *****************************************************************/ + #define NDEBUG #include "vfat.h" - -// function like DosDateTimeToFileTime +/* FUNCTIONS ****************************************************************/ + +/* Function like DosDateTimeToFileTime */ BOOLEAN -FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, USHORT DosDate, USHORT DosTime, PLARGE_INTEGER SystemTime) -{ - PDOSTIME pdtime = (PDOSTIME) &DosTime; - PDOSDATE pddate = (PDOSDATE) &DosDate; - TIME_FIELDS TimeFields; - LARGE_INTEGER LocalTime; - - if (SystemTime == NULL) - return FALSE; - - TimeFields.Milliseconds = 0; - TimeFields.Second = pdtime->Second * 2; - TimeFields.Minute = pdtime->Minute; - TimeFields.Hour = pdtime->Hour; - - TimeFields.Day = pddate->Day; - TimeFields.Month = pddate->Month; - TimeFields.Year = (CSHORT)(DeviceExt->BaseDateYear + pddate->Year); - - RtlTimeFieldsToTime (&TimeFields, &LocalTime); - ExLocalTimeToSystemTime(&LocalTime, SystemTime); - - return TRUE; -} - -// function like FileTimeToDosDateTime +FsdDosDateTimeToSystemTime(PDEVICE_EXTENSION DeviceExt, + USHORT DosDate, + USHORT DosTime, + PLARGE_INTEGER SystemTime) +{ + PDOSTIME pdtime = (PDOSTIME)&DosTime; + PDOSDATE pddate = (PDOSDATE)&DosDate; + TIME_FIELDS TimeFields; + LARGE_INTEGER LocalTime; + + if (SystemTime == NULL) + return FALSE; + + TimeFields.Milliseconds = 0; + TimeFields.Second = pdtime->Second * 2; + TimeFields.Minute = pdtime->Minute; + TimeFields.Hour = pdtime->Hour; + + TimeFields.Day = pddate->Day; + TimeFields.Month = pddate->Month; + TimeFields.Year = (CSHORT)(DeviceExt->BaseDateYear + pddate->Year); + + RtlTimeFieldsToTime(&TimeFields, &LocalTime); + ExLocalTimeToSystemTime(&LocalTime, SystemTime); + + return TRUE; +} + +/* Function like FileTimeToDosDateTime */ BOOLEAN -FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt, PLARGE_INTEGER SystemTime, USHORT *pDosDate, USHORT *pDosTime) -{ - PDOSTIME pdtime = (PDOSTIME) pDosTime; - PDOSDATE pddate = (PDOSDATE) pDosDate; - TIME_FIELDS TimeFields; - LARGE_INTEGER LocalTime; - - if (SystemTime == NULL) - return FALSE; - - ExSystemTimeToLocalTime (SystemTime, &LocalTime); - RtlTimeToTimeFields (&LocalTime, &TimeFields); - - if (pdtime) - { - pdtime->Second = TimeFields.Second / 2; - pdtime->Minute = TimeFields.Minute; - pdtime->Hour = TimeFields.Hour; - } - - if (pddate) - { - pddate->Day = TimeFields.Day; - pddate->Month = TimeFields.Month; - pddate->Year = (USHORT) (TimeFields.Year - DeviceExt->BaseDateYear); - } - - return TRUE; +FsdSystemTimeToDosDateTime(PDEVICE_EXTENSION DeviceExt, + PLARGE_INTEGER SystemTime, + PUSHORT pDosDate, + PUSHORT pDosTime) +{ + PDOSTIME pdtime = (PDOSTIME)pDosTime; + PDOSDATE pddate = (PDOSDATE)pDosDate; + TIME_FIELDS TimeFields; + LARGE_INTEGER LocalTime; + + if (SystemTime == NULL) + return FALSE; + + ExSystemTimeToLocalTime(SystemTime, &LocalTime); + RtlTimeToTimeFields(&LocalTime, &TimeFields); + + if (pdtime) + { + pdtime->Second = TimeFields.Second / 2; + pdtime->Minute = TimeFields.Minute; + pdtime->Hour = TimeFields.Hour; + } + + if (pddate) + { + pddate->Day = TimeFields.Day; + pddate->Month = TimeFields.Month; + pddate->Year = (USHORT) (TimeFields.Year - DeviceExt->BaseDateYear); + } + + return TRUE; } #define ULONG_ROUND_UP(x) ROUND_UP((x), (sizeof(ULONG))) static NTSTATUS -VfatGetFileNameInformation (PVFAT_DIRENTRY_CONTEXT DirContext, - PFILE_NAMES_INFORMATION pInfo, ULONG BufferLength) -{ - if ((sizeof (FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) - return STATUS_BUFFER_OVERFLOW; - pInfo->FileNameLength = DirContext->LongNameU.Length; - pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); - RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); - return STATUS_SUCCESS; +VfatGetFileNameInformation(PVFAT_DIRENTRY_CONTEXT DirContext, + PFILE_NAMES_INFORMATION pInfo, + ULONG BufferLength) +{ + if ((sizeof(FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) + return STATUS_BUFFER_OVERFLOW; + + pInfo->FileNameLength = DirContext->LongNameU.Length; + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + + DirContext->LongNameU.Length); + + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + DirContext->LongNameU.Length); + + return STATUS_SUCCESS; } static NTSTATUS -VfatGetFileDirectoryInformation (PVFAT_DIRENTRY_CONTEXT DirContext, - PDEVICE_EXTENSION DeviceExt, - PFILE_DIRECTORY_INFORMATION pInfo, - ULONG BufferLength) -{ - if ((sizeof (FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) - return STATUS_BUFFER_OVERFLOW; - pInfo->FileNameLength = DirContext->LongNameU.Length; - pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); - RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); -// pInfo->FileIndex=; - if (DeviceExt->Flags & VCB_IS_FATX) - { - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.CreationDate, - DirContext->DirEntry.FatX.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.AccessDate, - DirContext->DirEntry.FatX.AccessTime, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.UpdateDate, - DirContext->DirEntry.FatX.UpdateTime, - &pInfo->LastWriteTime); - pInfo->ChangeTime = pInfo->LastWriteTime; - if (DirContext->DirEntry.FatX.Attrib & FILE_ATTRIBUTE_DIRECTORY) - { - pInfo->EndOfFile.QuadPart = 0; - pInfo->AllocationSize.QuadPart = 0; - } +VfatGetFileDirectoryInformation(PVFAT_DIRENTRY_CONTEXT DirContext, + PDEVICE_EXTENSION DeviceExt, + PFILE_DIRECTORY_INFORMATION pInfo, + ULONG BufferLength) +{ + if ((sizeof(FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) + return STATUS_BUFFER_OVERFLOW; + + pInfo->FileNameLength = DirContext->LongNameU.Length; + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + + DirContext->LongNameU.Length); + /* pInfo->FileIndex = ; */ + + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + DirContext->LongNameU.Length); + + if (DeviceExt->Flags & VCB_IS_FATX) + { + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.CreationDate, + DirContext->DirEntry.FatX.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.AccessDate, + DirContext->DirEntry.FatX.AccessTime, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.UpdateDate, + DirContext->DirEntry.FatX.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + + if (DirContext->DirEntry.FatX.Attrib & FILE_ATTRIBUTE_DIRECTORY) + { + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; + } + else + { + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + } + + pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; + } else - { + { + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.CreationDate, + DirContext->DirEntry.Fat.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.AccessDate, + 0, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.UpdateDate, + DirContext->DirEntry.Fat.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + + if (DirContext->DirEntry.Fat.Attrib & FILE_ATTRIBUTE_DIRECTORY) + { + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; + } + else + { + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + } + + pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS +VfatGetFileFullDirectoryInformation(PVFAT_DIRENTRY_CONTEXT DirContext, + PDEVICE_EXTENSION DeviceExt, + PFILE_FULL_DIR_INFORMATION pInfo, + ULONG BufferLength) +{ + if ((sizeof(FILE_FULL_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) + return STATUS_BUFFER_OVERFLOW; + + pInfo->FileNameLength = DirContext->LongNameU.Length; + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_FULL_DIR_INFORMATION) + + DirContext->LongNameU.Length); + /* pInfo->FileIndex = ; */ + /* pInfo->EaSize = ; */ + + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + DirContext->LongNameU.Length); + + if (DeviceExt->Flags & VCB_IS_FATX) + { + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.CreationDate, + DirContext->DirEntry.FatX.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.AccessDate, + DirContext->DirEntry.FatX.AccessTime, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.UpdateDate, + DirContext->DirEntry.FatX.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; pInfo->EndOfFile.u.HighPart = 0; pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; /* Make allocsize a rounded up multiple of BytesPerCluster */ pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, DeviceExt->FatInfo.BytesPerCluster); - } - pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; - } - else - { - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.CreationDate, - DirContext->DirEntry.Fat.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.AccessDate, 0, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.UpdateDate, - DirContext->DirEntry.Fat.UpdateTime, - &pInfo->LastWriteTime); - pInfo->ChangeTime = pInfo->LastWriteTime; - if (DirContext->DirEntry.Fat.Attrib & FILE_ATTRIBUTE_DIRECTORY) - { - pInfo->EndOfFile.QuadPart = 0; - pInfo->AllocationSize.QuadPart = 0; - } + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; + } else - { + { + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.CreationDate, + DirContext->DirEntry.Fat.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.AccessDate, + 0, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.UpdateDate, + DirContext->DirEntry.Fat.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; pInfo->EndOfFile.u.HighPart = 0; pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; /* Make allocsize a rounded up multiple of BytesPerCluster */ pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, DeviceExt->FatInfo.BytesPerCluster); - } - pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; - } - - return STATUS_SUCCESS; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; + } + + return STATUS_SUCCESS; } static NTSTATUS -VfatGetFileFullDirectoryInformation (PVFAT_DIRENTRY_CONTEXT DirContext, - PDEVICE_EXTENSION DeviceExt, - PFILE_FULL_DIR_INFORMATION pInfo, - ULONG BufferLength) -{ - if ((sizeof (FILE_FULL_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) - return STATUS_BUFFER_OVERFLOW; - pInfo->FileNameLength = DirContext->LongNameU.Length; - pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_FULL_DIR_INFORMATION) + DirContext->LongNameU.Length); - RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); -// pInfo->FileIndex=; - if (DeviceExt->Flags & VCB_IS_FATX) - { - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.CreationDate, - DirContext->DirEntry.FatX.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.AccessDate, - DirContext->DirEntry.FatX.AccessTime, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.UpdateDate, - DirContext->DirEntry.FatX.UpdateTime, - &pInfo->LastWriteTime); - pInfo->ChangeTime = pInfo->LastWriteTime; - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, DeviceExt->FatInfo.BytesPerCluster); - pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; - } - else - { - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.CreationDate, - DirContext->DirEntry.Fat.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.AccessDate, - 0, &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.UpdateDate, - DirContext->DirEntry.Fat.UpdateTime, - &pInfo->LastWriteTime); - pInfo->ChangeTime = pInfo->LastWriteTime; - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, DeviceExt->FatInfo.BytesPerCluster); - pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; - } -// pInfo->EaSize=; - return STATUS_SUCCESS; +VfatGetFileBothInformation(PVFAT_DIRENTRY_CONTEXT DirContext, + PDEVICE_EXTENSION DeviceExt, + PFILE_BOTH_DIR_INFORMATION pInfo, + ULONG BufferLength) +{ + if ((sizeof(FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) + return STATUS_BUFFER_OVERFLOW; + + pInfo->EaSize = 0; + + if (DeviceExt->Flags & VCB_IS_FATX) + { + pInfo->FileNameLength = DirContext->LongNameU.Length; + + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + DirContext->LongNameU.Length); + + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + + DirContext->LongNameU.Length); + pInfo->ShortName[0] = 0; + pInfo->ShortNameLength = 0; + /* pInfo->FileIndex = ; */ + + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.CreationDate, + DirContext->DirEntry.FatX.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.AccessDate, + DirContext->DirEntry.FatX.AccessTime, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.UpdateDate, + DirContext->DirEntry.FatX.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + + if (DirContext->DirEntry.FatX.Attrib & FILE_ATTRIBUTE_DIRECTORY) + { + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; + } + else + { + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + } + + pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; + } + else + { + pInfo->FileNameLength = DirContext->LongNameU.Length; + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + + DirContext->LongNameU.Length); + + RtlCopyMemory(pInfo->ShortName, + DirContext->ShortNameU.Buffer, + DirContext->ShortNameU.Length); + + pInfo->ShortNameLength = (CCHAR)DirContext->ShortNameU.Length; + + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + DirContext->LongNameU.Length); + + /* pInfo->FileIndex = ; */ + + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.CreationDate, + DirContext->DirEntry.Fat.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.AccessDate, + 0, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.UpdateDate, + DirContext->DirEntry.Fat.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + + if (DirContext->DirEntry.Fat.Attrib & FILE_ATTRIBUTE_DIRECTORY) + { + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; + } + else + { + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, DeviceExt->FatInfo.BytesPerCluster); + } + + pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; + } + + return STATUS_SUCCESS; } static NTSTATUS -VfatGetFileBothInformation (PVFAT_DIRENTRY_CONTEXT DirContext, - PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIR_INFORMATION pInfo, - ULONG BufferLength) -{ - if ((sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) - return STATUS_BUFFER_OVERFLOW; - - if (DeviceExt->Flags & VCB_IS_FATX) - { - pInfo->FileNameLength = DirContext->LongNameU.Length; - RtlCopyMemory(pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); - pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length); - pInfo->ShortName[0] = 0; - pInfo->ShortNameLength = 0; - // pInfo->FileIndex=; - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.CreationDate, - DirContext->DirEntry.FatX.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.AccessDate, - DirContext->DirEntry.FatX.AccessTime, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.FatX.UpdateDate, - DirContext->DirEntry.FatX.UpdateTime, - &pInfo->LastWriteTime); - pInfo->ChangeTime = pInfo->LastWriteTime; - if (DirContext->DirEntry.FatX.Attrib & FILE_ATTRIBUTE_DIRECTORY) - { - pInfo->EndOfFile.QuadPart = 0; - pInfo->AllocationSize.QuadPart = 0; - } +DoQuery(PVFAT_IRP_CONTEXT IrpContext) +{ + NTSTATUS Status = STATUS_SUCCESS; + LONG BufferLength = 0; + PUNICODE_STRING pSearchPattern = NULL; + FILE_INFORMATION_CLASS FileInformationClass; + PUCHAR Buffer = NULL; + PFILE_NAMES_INFORMATION Buffer0 = NULL; + PVFATFCB pFcb; + PVFATCCB pCcb; + BOOLEAN FirstQuery = FALSE; + BOOLEAN FirstCall = TRUE; + VFAT_DIRENTRY_CONTEXT DirContext; + WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH + 1]; + WCHAR ShortNameBuffer[13]; + + PIO_STACK_LOCATION Stack = IrpContext->Stack; + + pCcb = (PVFATCCB)IrpContext->FileObject->FsContext2; + pFcb = (PVFATFCB)IrpContext->FileObject->FsContext; + + /* Determine Buffer for result : */ + BufferLength = Stack->Parameters.QueryDirectory.Length; +#if 0 + /* Do not probe the user buffer until SEH is available */ + if (IrpContext->Irp->RequestorMode != KernelMode && + IrpContext->Irp->MdlAddress == NULL && + IrpContext->Irp->UserBuffer != NULL) + { + ProbeForWrite(IrpContext->Irp->UserBuffer, BufferLength, 1); + } +#endif + Buffer = VfatGetUserBuffer(IrpContext->Irp); + + if (!ExAcquireResourceSharedLite(&pFcb->MainResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + Status = VfatLockUserBuffer(IrpContext->Irp, BufferLength, IoWriteAccess); + if (NT_SUCCESS(Status)) + Status = STATUS_PENDING; + + return Status; + } + + /* Obtain the callers parameters */ +#ifdef _MSC_VER + /* HACKHACK: Bug in the MS ntifs.h header: + * FileName is really a PUNICODE_STRING, not a PSTRING */ + pSearchPattern = (PUNICODE_STRING)Stack->Parameters.QueryDirectory.FileName; +#else + pSearchPattern = Stack->Parameters.QueryDirectory.FileName; +#endif + FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; + + if (pSearchPattern) + { + if (!pCcb->SearchPattern.Buffer) + { + FirstQuery = TRUE; + pCcb->SearchPattern.MaximumLength = pSearchPattern->Length + sizeof(WCHAR); + pCcb->SearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, + pCcb->SearchPattern.MaximumLength, + TAG_VFAT); + if (!pCcb->SearchPattern.Buffer) + { + ExReleaseResourceLite(&pFcb->MainResource); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlCopyUnicodeString(&pCcb->SearchPattern, pSearchPattern); + pCcb->SearchPattern.Buffer[pCcb->SearchPattern.Length / sizeof(WCHAR)] = 0; + } + } + else if (!pCcb->SearchPattern.Buffer) + { + FirstQuery = TRUE; + pCcb->SearchPattern.MaximumLength = 2 * sizeof(WCHAR); + pCcb->SearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, + 2 * sizeof(WCHAR), + TAG_VFAT); + if (!pCcb->SearchPattern.Buffer) + { + ExReleaseResourceLite(&pFcb->MainResource); + return STATUS_INSUFFICIENT_RESOURCES; + } + pCcb->SearchPattern.Buffer[0] = L'*'; + pCcb->SearchPattern.Buffer[1] = 0; + pCcb->SearchPattern.Length = sizeof(WCHAR); + } + + if (IrpContext->Stack->Flags & SL_INDEX_SPECIFIED) + { + DirContext.DirIndex = pCcb->Entry = Stack->Parameters.QueryDirectory.FileIndex; + } + else if (FirstQuery || (IrpContext->Stack->Flags & SL_RESTART_SCAN)) + { + DirContext.DirIndex = pCcb->Entry = 0; + } else - { - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, DeviceExt->FatInfo.BytesPerCluster); - } - pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; - } - else - { - pInfo->FileNameLength = DirContext->LongNameU.Length; - pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length); - RtlCopyMemory(pInfo->ShortName, DirContext->ShortNameU.Buffer, DirContext->ShortNameU.Length); - pInfo->ShortNameLength = (CCHAR)DirContext->ShortNameU.Length; - RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); - // pInfo->FileIndex=; - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.CreationDate, - DirContext->DirEntry.Fat.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.AccessDate, 0, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime (DeviceExt, DirContext->DirEntry.Fat.UpdateDate, - DirContext->DirEntry.Fat.UpdateTime, - &pInfo->LastWriteTime); - pInfo->ChangeTime = pInfo->LastWriteTime; - if (DirContext->DirEntry.Fat.Attrib & FILE_ATTRIBUTE_DIRECTORY) - { - pInfo->EndOfFile.QuadPart = 0; - pInfo->AllocationSize.QuadPart = 0; - } - else - { - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, DeviceExt->FatInfo.BytesPerCluster); - } - pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; - } - pInfo->EaSize=0; - return STATUS_SUCCESS; -} - -static NTSTATUS DoQuery (PVFAT_IRP_CONTEXT IrpContext) -{ - NTSTATUS RC = STATUS_SUCCESS; - long BufferLength = 0; - PUNICODE_STRING pSearchPattern = NULL; - FILE_INFORMATION_CLASS FileInformationClass; - unsigned char *Buffer = NULL; - PFILE_NAMES_INFORMATION Buffer0 = NULL; - PVFATFCB pFcb; - PVFATCCB pCcb; - BOOLEAN FirstQuery = FALSE; - BOOLEAN FirstCall = TRUE; - VFAT_DIRENTRY_CONTEXT DirContext; - WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH + 1]; - WCHAR ShortNameBuffer[13]; - - PIO_STACK_LOCATION Stack = IrpContext->Stack; - - pCcb = (PVFATCCB) IrpContext->FileObject->FsContext2; - pFcb = (PVFATFCB) IrpContext->FileObject->FsContext; - - // determine Buffer for result : - BufferLength = Stack->Parameters.QueryDirectory.Length; -#if 0 - /* Do not probe the user buffer until SEH is available */ - if (IrpContext->Irp->RequestorMode != KernelMode && - IrpContext->Irp->MdlAddress == NULL && - IrpContext->Irp->UserBuffer != NULL) - { - ProbeForWrite(IrpContext->Irp->UserBuffer, BufferLength, 1); - } -#endif - Buffer = VfatGetUserBuffer(IrpContext->Irp); - - if (!ExAcquireResourceSharedLite(&pFcb->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) - { - RC = VfatLockUserBuffer(IrpContext->Irp, BufferLength, IoWriteAccess); - if (NT_SUCCESS(RC)) - { - RC = STATUS_PENDING; - } - return RC; - } - - /* Obtain the callers parameters */ -#ifdef _MSC_VER - /* HACKHACK: Bug in the MS ntifs.h header: - * FileName is really a PUNICODE_STRING, not a PSTRING */ - pSearchPattern = (PUNICODE_STRING)Stack->Parameters.QueryDirectory.FileName; -#else - pSearchPattern = Stack->Parameters.QueryDirectory.FileName; -#endif - FileInformationClass = - Stack->Parameters.QueryDirectory.FileInformationClass; - if (pSearchPattern) - { - if (!pCcb->SearchPattern.Buffer) - { - FirstQuery = TRUE; - pCcb->SearchPattern.MaximumLength = pSearchPattern->Length + sizeof(WCHAR); - pCcb->SearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, pCcb->SearchPattern.MaximumLength, TAG_VFAT); - if (!pCcb->SearchPattern.Buffer) + { + DirContext.DirIndex = pCcb->Entry; + } + + DPRINT("Buffer=%p tofind=%wZ\n", Buffer, &pCcb->SearchPattern); + + DirContext.LongNameU.Buffer = LongNameBuffer; + DirContext.LongNameU.MaximumLength = sizeof(LongNameBuffer); + DirContext.ShortNameU.Buffer = ShortNameBuffer; + DirContext.ShortNameU.MaximumLength = sizeof(ShortNameBuffer); + + while ((Status == STATUS_SUCCESS) && (BufferLength > 0)) + { + Status = FindFile(IrpContext->DeviceExt, + pFcb, + &pCcb->SearchPattern, + &DirContext, + FirstCall); + pCcb->Entry = DirContext.DirIndex; + + DPRINT("Found %wZ, Status=%x, entry %x\n", &DirContext.LongNameU, Status, pCcb->Entry); + + FirstCall = FALSE; + if (NT_SUCCESS(Status)) + { + switch (FileInformationClass) { - ExReleaseResourceLite(&pFcb->MainResource); - return STATUS_INSUFFICIENT_RESOURCES; + case FileNameInformation: + Status = VfatGetFileNameInformation(&DirContext, + (PFILE_NAMES_INFORMATION)Buffer, + BufferLength); + break; + + case FileDirectoryInformation: + Status = VfatGetFileDirectoryInformation(&DirContext, + IrpContext->DeviceExt, + (PFILE_DIRECTORY_INFORMATION)Buffer, + BufferLength); + break; + + case FileFullDirectoryInformation: + Status = VfatGetFileFullDirectoryInformation(&DirContext, + IrpContext->DeviceExt, + (PFILE_FULL_DIR_INFORMATION)Buffer, + BufferLength); + break; + + case FileBothDirectoryInformation: + Status = VfatGetFileBothInformation(&DirContext, + IrpContext->DeviceExt, + (PFILE_BOTH_DIR_INFORMATION)Buffer, + BufferLength); + break; + + default: + Status = STATUS_INVALID_INFO_CLASS; + break; } - RtlCopyUnicodeString(&pCcb->SearchPattern, pSearchPattern); - pCcb->SearchPattern.Buffer[pCcb->SearchPattern.Length / sizeof(WCHAR)] = 0; - } - } - else if (!pCcb->SearchPattern.Buffer) - { - FirstQuery = TRUE; - pCcb->SearchPattern.MaximumLength = 2 * sizeof(WCHAR); - pCcb->SearchPattern.Buffer = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), TAG_VFAT); - if (!pCcb->SearchPattern.Buffer) - { - ExReleaseResourceLite(&pFcb->MainResource); - return STATUS_INSUFFICIENT_RESOURCES; - } - pCcb->SearchPattern.Buffer[0] = L'*'; - pCcb->SearchPattern.Buffer[1] = 0; - pCcb->SearchPattern.Length = sizeof(WCHAR); - } - - if (IrpContext->Stack->Flags & SL_INDEX_SPECIFIED) - { - DirContext.DirIndex = pCcb->Entry = Stack->Parameters.QueryDirectory.FileIndex; - } - else if (FirstQuery || (IrpContext->Stack->Flags & SL_RESTART_SCAN)) - { - DirContext.DirIndex = pCcb->Entry = 0; - } - else - { - DirContext.DirIndex = pCcb->Entry; - } - - DPRINT ("Buffer=%p tofind=%wZ\n", Buffer, &pCcb->SearchPattern); - - DirContext.LongNameU.Buffer = LongNameBuffer; - DirContext.LongNameU.MaximumLength = sizeof(LongNameBuffer); - DirContext.ShortNameU.Buffer = ShortNameBuffer; - DirContext.ShortNameU.MaximumLength = sizeof(ShortNameBuffer); - - while (RC == STATUS_SUCCESS && BufferLength > 0) - { - RC = FindFile (IrpContext->DeviceExt, pFcb, - &pCcb->SearchPattern, &DirContext, FirstCall); - pCcb->Entry = DirContext.DirIndex; - DPRINT ("Found %wZ, RC=%x, entry %x\n", &DirContext.LongNameU, RC, pCcb->Entry); - FirstCall = FALSE; - if (NT_SUCCESS (RC)) - { - switch (FileInformationClass) - { - case FileNameInformation: - RC = VfatGetFileNameInformation (&DirContext, - (PFILE_NAMES_INFORMATION) Buffer, - BufferLength); + + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_INVALID_INFO_CLASS) break; - case FileDirectoryInformation: - RC = VfatGetFileDirectoryInformation (&DirContext, - IrpContext->DeviceExt, - (PFILE_DIRECTORY_INFORMATION) Buffer, - BufferLength); - break; - case FileFullDirectoryInformation: - RC = VfatGetFileFullDirectoryInformation (&DirContext, - IrpContext->DeviceExt, - (PFILE_FULL_DIR_INFORMATION) Buffer, - BufferLength); - break; - case FileBothDirectoryInformation: - RC = VfatGetFileBothInformation (&DirContext, - IrpContext->DeviceExt, - (PFILE_BOTH_DIR_INFORMATION) Buffer, - BufferLength); - break; - default: - RC = STATUS_INVALID_INFO_CLASS; - } - if (RC == STATUS_BUFFER_OVERFLOW || RC == STATUS_INVALID_INFO_CLASS) - { - break; - } - } - else - { - if (FirstQuery) - { - RC = STATUS_NO_SUCH_FILE; - } - else - { - RC = STATUS_NO_MORE_FILES; - } - break; - } - Buffer0 = (PFILE_NAMES_INFORMATION) Buffer; - Buffer0->FileIndex = DirContext.DirIndex; - pCcb->Entry = ++DirContext.DirIndex; - BufferLength -= Buffer0->NextEntryOffset; - if (IrpContext->Stack->Flags & SL_RETURN_SINGLE_ENTRY) - { - break; - } - Buffer += Buffer0->NextEntryOffset; - } - if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - RC = STATUS_SUCCESS; - IrpContext->Irp->IoStatus.Information = Stack->Parameters.QueryDirectory.Length - BufferLength; - - } - ExReleaseResourceLite(&pFcb->MainResource); - return RC; -} - - -NTSTATUS VfatDirectoryControl (PVFAT_IRP_CONTEXT IrpContext) + } + else + { + Status = (FirstQuery ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES); + break; + } + + Buffer0 = (PFILE_NAMES_INFORMATION) Buffer; + Buffer0->FileIndex = DirContext.DirIndex; + pCcb->Entry = ++DirContext.DirIndex; + BufferLength -= Buffer0->NextEntryOffset; + + if (IrpContext->Stack->Flags & SL_RETURN_SINGLE_ENTRY) + break; + + Buffer += Buffer0->NextEntryOffset; + } + + if (Buffer0) + { + Buffer0->NextEntryOffset = 0; + Status = STATUS_SUCCESS; + IrpContext->Irp->IoStatus.Information = Stack->Parameters.QueryDirectory.Length - BufferLength; + } + + ExReleaseResourceLite(&pFcb->MainResource); + + return Status; +} + + /* * FUNCTION: directory control : read/write directory informations */ -{ - NTSTATUS RC = STATUS_SUCCESS; - IrpContext->Irp->IoStatus.Information = 0; - switch (IrpContext->MinorFunction) - { - case IRP_MN_QUERY_DIRECTORY: - RC = DoQuery (IrpContext); - break; - case IRP_MN_NOTIFY_CHANGE_DIRECTORY: - DPRINT (" vfat, dir : change\n"); - RC = STATUS_NOT_IMPLEMENTED; - break; - default: - // error - DbgPrint ("unexpected minor function %x in VFAT driver\n", - IrpContext->MinorFunction); - RC = STATUS_INVALID_DEVICE_REQUEST; - break; - } - if (RC == STATUS_PENDING) - { - RC = VfatQueueRequest(IrpContext); - } - else - { - IrpContext->Irp->IoStatus.Status = RC; - IoCompleteRequest (IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); - } - return RC; -} - - +NTSTATUS +VfatDirectoryControl(PVFAT_IRP_CONTEXT IrpContext) +{ + NTSTATUS Status = STATUS_SUCCESS; + + IrpContext->Irp->IoStatus.Information = 0; + + switch (IrpContext->MinorFunction) + { + case IRP_MN_QUERY_DIRECTORY: + Status = DoQuery (IrpContext); + break; + + case IRP_MN_NOTIFY_CHANGE_DIRECTORY: + DPRINT("VFAT, dir : change\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + /* Error */ + DPRINT("Unexpected minor function %x in VFAT driver\n", + IrpContext->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + if (Status == STATUS_PENDING) + { + Status = VfatQueueRequest(IrpContext); + } + else + { + IrpContext->Irp->IoStatus.Status = Status; + IoCompleteRequest (IrpContext->Irp, IO_NO_INCREMENT); + VfatFreeIrpContext(IrpContext); + } + + return Status; +} + +/* EOF */

1 0

[jimtabor] 57245: [SDK|UndocUser] - Add missing scroll flags.
by jimtabor＠svn.reactos.org 06 Sep '12

06 Sep '12

Author: jimtabor Date: Thu Sep 6 15:44:10 2012 New Revision: 57245 URL: http://svn.reactos.org/svn/reactos?rev=57245&view=rev Log: [SDK|UndocUser] - Add missing scroll flags. Modified: trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Thu Sep 6 15:44:10 2012 @@ -2501,6 +2501,9 @@ #define SW_SCROLLCHILDREN 1 #define SW_INVALIDATE 2 #define SW_ERASE 4 +#if(WINVER >= 0x0500) +#define SW_SMOOTHSCROLL 16 +#endif #define SC_SIZE 0xF000 #define SC_MOVE 0xF010 #define SC_MINIMIZE 0xF020 Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Thu Sep 6 15:44:10 2012 @@ -71,6 +71,9 @@ /* NtUserSetScrollInfo mask to return original position before it is change */ #define SIF_PREVIOUSPOS 4096 +/* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ +#define SW_SCROLLWNDDCE 0x8000 + /* Non SDK Queue state flags. */ #define QS_SMRESULT 0x8000 /* see "Undoc. Windows" */

1 0

[akhaldi] 57244: [PSDK] * Use __attribute__((weak)) instead of __declspec(selectany) until http://llvm.org/bugs/show_bug.cgi?id=13778 is fixed.
by akhaldi＠svn.reactos.org 06 Sep '12

06 Sep '12

Author: akhaldi Date: Thu Sep 6 12:28:53 2012 New Revision: 57244 URL: http://svn.reactos.org/svn/reactos?rev=57244&view=rev Log: [PSDK] * Use __attribute__((weak)) instead of __declspec(selectany) until http://llvm.org/bugs/show_bug.cgi?id=13778 is fixed. Modified: trunk/reactos/include/psdk/guiddef.h Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Thu Sep 6 12:28:53 2012 @@ -32,7 +32,12 @@ #endif #ifndef DECLSPEC_SELECTANY +#ifdef __clang__ +/* FIXME: http://llvm.org/bugs/show_bug.cgi?id=13778 */ +#define DECLSPEC_SELECTANY __attribute__((weak)) +#else #define DECLSPEC_SELECTANY __declspec(selectany) +#endif #endif #ifndef EXTERN_C

1 0

[dgorbachev] 57243: Remove "bashisms" from configure.sh script, simplify it a bit.
by dgorbachev＠svn.reactos.org 05 Sep '12

05 Sep '12

Author: dgorbachev Date: Wed Sep 5 21:40:14 2012 New Revision: 57243 URL: http://svn.reactos.org/svn/reactos?rev=57243&view=rev Log: Remove "bashisms" from configure.sh script, simplify it a bit. Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=57243&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Wed Sep 5 21:40:14 2012 @@ -1,6 +1,6 @@ -#!/bin/bash -if [ "x$ROS_ARCH" == "x" ] -then +#!/bin/sh + +if [ "x$ROS_ARCH" = "x" ]; then echo Could not detect RosBE. exit 1 fi @@ -10,34 +10,25 @@ REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] -then +if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then echo Creating directories in $REACTOS_OUTPUT_PATH - mkdir -p $REACTOS_OUTPUT_PATH + mkdir -p "$REACTOS_OUTPUT_PATH" cd "$REACTOS_OUTPUT_PATH" fi -mkdir -p host-tools -mkdir -p reactos +mkdir -p host-tools reactos echo Preparing host tools... cd host-tools -if [ -f CMakeCache.txt ] -then - rm -f CMakeCache.txt -fi +rm -f CMakeCache.txt REACTOS_BUILD_TOOLS_DIR="$PWD" cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" echo Preparing reactos... cd ../reactos -if [ -f CMakeCache.txt ] -then - rm -f CMakeCache.txt -fi +rm -f CMakeCache.txt cmake -G "Unix Makefiles" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands$ex: make, makex, etc...$. -

1 0

[dgorbachev] 57242: [ATACTL] Add set_cpp() to CMake script. [LIBUSB][UNIATA] Compile with no RTTI and exception handling.
by dgorbachev＠svn.reactos.org 05 Sep '12

05 Sep '12

Author: dgorbachev Date: Wed Sep 5 21:39:43 2012 New Revision: 57242 URL: http://svn.reactos.org/svn/reactos?rev=57242&view=rev Log: [ATACTL] Add set_cpp() to CMake script. [LIBUSB][UNIATA] Compile with no RTTI and exception handling. Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/drivers/usb/usbd/CMakeLists.txt trunk/reactos/drivers/usb/usbehci/CMakeLists.txt trunk/reactos/lib/drivers/libusb/CMakeLists.txt Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/C… ============================================================================== --- trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -1,3 +1,4 @@ +set_cpp() add_definitions(-DUSER_MODE) include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata) Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -22,10 +22,14 @@ ${SOURCE} idedma.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 +if(MSVC) + #add_target_compile_flags(uniata "/GR-") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") +else() #allow_warnings(uniata) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") + #add_target_compile_flags(uniata "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti -Wno-error") endif() add_pch(uniata stdafx.h) Modified: trunk/reactos/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/CMakeList… ============================================================================== --- trunk/reactos/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -10,4 +10,4 @@ add_importlibs(usbd ntoskrnl hal) -add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -34,4 +34,4 @@ set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal usbd) -add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/lib/drivers/libusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/CMakeLi… ============================================================================== --- trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012 @@ -19,3 +19,11 @@ add_library(libusb ${SOURCE}) add_dependencies(libusb bugcodes) +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 +if(MSVC) + #add_target_compile_flags(libusb "/GR-") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") +else() + #add_target_compile_flags(libusb "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif()

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