Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 37558: -AttachThreadInput is a direct call to kernel space, good job Dmitry!
by jimtabor＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: jimtabor Date: Sat Nov 22 10:23:43 2008 New Revision: 37558 URL: http://svn.reactos.org/svn/reactos?rev=37558&view=rev Log: -AttachThreadInput is a direct call to kernel space, good job Dmitry! Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.def Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sat Nov 22 10:23:43 2008 @@ -14,20 +14,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -/* - * @unimplemented - */ -BOOL -STDCALL -AttachThreadInput( - DWORD idAttach, - DWORD idAttachTo, - BOOL fAttach) -{ - return NtUserAttachThreadInput(idAttach, idAttachTo, fAttach); -} - /* * @unimplemented Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Sat Nov 22 10:23:43 2008 @@ -12,7 +12,7 @@ AppendMenuA@16 AppendMenuW@16 ArrangeIconicWindows@4 -AttachThreadInput@12 +AttachThreadInput@12=NtUserAttachThreadInput@12 BeginDeferWindowPos@4 BeginPaint@8 BlockInput@4

1 0

[greatlrd] 37557: start implement DCICreatePrimary, it is not finish or tested yet.
by greatlrd＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: greatlrd Date: Sat Nov 22 10:10:53 2008 New Revision: 37557 URL: http://svn.reactos.org/svn/reactos?rev=37557&view=rev Log: start implement DCICreatePrimary, it is not finish or tested yet. Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sat Nov 22 10:10:53 2008 @@ -1,6 +1,13 @@ #include <windows.h> +#include <ndk/ntndk.h> +#include <stdio.h> #include <dciman.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> +#include <pseh/pseh.h> CRITICAL_SECTION ddcs; @@ -80,11 +87,82 @@ } +typedef struct _DCISURFACE_LCL +{ + BOOL LostSurface; + DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal; + DDRAWI_DDRAWSURFACE_LCL SurfaceLocal; + DDHAL_DDCALLBACKS DDCallbacks; + DDHAL_DDSURFACECALLBACKS DDSurfaceCallbacks; +} DCISURFACE_LCL, *LPDCISURFACE_LCL; + +typedef struct _DCISURFACE_INT +{ + DCISURFACE_LCL DciSurface_lcl; + DCISURFACEINFO DciSurfaceInfo; +} DCISURFACE_INT, *LPDCISURFACE_INT; + + int WINAPI -DCICreatePrimary(HDC hdc, LPDCISURFACEINFO *pDciSurfaceInfo) +DCICreatePrimary(HDC hDC, LPDCISURFACEINFO *pDciSurfaceInfo) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return DCI_FAIL_UNSUPPORTED; + int retvalue = DCI_OK; + BOOL bNewMode = FALSE; + LPDCISURFACE_INT pDciSurface_int; + DDHALINFO HalInfo; + DDHAL_DDPALETTECALLBACKS DDPaletteCallbacks; + + if ( (pDciSurface_int = (LPDCISURFACE_INT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DCISURFACE_INT) )) == NULL ) + { + retvalue = DCI_ERR_OUTOFMEMORY; + } + else + { + /* Activate the DirectX support from HAL, if any of these function fail, we was not avail setup infomrations we need to create our frame */ + if ( ( DdCreateDirectDrawObject( &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal, + hDC) == FALSE) || + ( DdReenableDirectDrawObject(&pDciSurface_int->DciSurface_lcl.DirectDrawGlobal, + &bNewMode) == FALSE) || + ( DdQueryDirectDrawObject( &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal, + &HalInfo, + &pDciSurface_int->DciSurface_lcl.DDCallbacks, + &pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks, + &DDPaletteCallbacks, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL) == FALSE) ) + { + retvalue = DCI_FAIL_UNSUPPORTED; + } + else + { + pDciSurface_int->DciSurface_lcl.LostSurface = FALSE; + + /* FIXME Add the real code now to create the primary surface after we create the dx hal interface */ + + pDciSurface_int->DciSurfaceInfo.dwSize = sizeof(DCISURFACEINFO); + *pDciSurfaceInfo = (LPDCISURFACEINFO) &pDciSurface_int->DciSurfaceInfo; + } + } + +/* Cleanup code when we fail */ + if (retvalue < DCI_OK) + { + if (pDciSurface_int->DciSurface_lcl.DirectDrawGlobal.hDD != 0) + { + DdDeleteDirectDrawObject(&pDciSurface_int->DciSurface_lcl.DirectDrawGlobal); + } + + if (pDciSurface_int != NULL) + { + HeapFree(GetProcessHeap(), 0, pDciSurface_int); + } + } + + return retvalue; }

1 0

[cgutman] 37556: - Don't store an invalid interrupt in the miniport block if IoConnectInterrupt fails - Stop using MiniportBusy - MiniQueueWorkItem can now be used to properly requeue a failed packet - Change MiniDequeueWorkItem to dequeue the FirstPendingPacket if there is one - Allocate the Lookahead buffer as needed - Break apart ProSend
by cgutman＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: cgutman Date: Sat Nov 22 09:47:48 2008 New Revision: 37556 URL: http://svn.reactos.org/svn/reactos?rev=37556&view=rev Log: - Don't store an invalid interrupt in the miniport block if IoConnectInterrupt fails - Stop using MiniportBusy - MiniQueueWorkItem can now be used to properly requeue a failed packet - Change MiniDequeueWorkItem to dequeue the FirstPendingPacket if there is one - Allocate the Lookahead buffer as needed - Break apart ProSend Modified: branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h [iso-8859-1] Sat Nov 22 09:47:48 2008 @@ -75,7 +75,6 @@ typedef struct _LOGICAL_ADAPTER { NDIS_MINIPORT_BLOCK NdisMiniportBlock; /* NDIS defined fields */ - BOOLEAN MiniportBusy; /* A MiniportXxx routine is executing */ PNDIS_MINIPORT_WORK_ITEM WorkQueueHead; /* Head of work queue */ PNDIS_MINIPORT_WORK_ITEM WorkQueueTail; /* Tail of work queue */ LIST_ENTRY ListEntry; /* Entry on global list */ @@ -84,8 +83,6 @@ ULONG MediumHeaderSize; /* Size of medium header */ HARDWARE_ADDRESS Address; /* Hardware address of adapter */ ULONG AddressLength; /* Length of hardware address */ - PUCHAR LookaheadBuffer; /* Pointer to lookahead buffer */ - ULONG LookaheadLength; /* Length of lookahead buffer */ PMINIPORT_BUGCHECK_CONTEXT BugcheckContext; /* Adapter's shutdown handler */ } LOGICAL_ADAPTER, *PLOGICAL_ADAPTER; @@ -130,12 +127,13 @@ PVOID Buffer, PULONG BytesWritten); -NDIS_STATUS +VOID FASTCALL MiniQueueWorkItem( PLOGICAL_ADAPTER Adapter, NDIS_WORK_ITEM_TYPE WorkItemType, - PVOID WorkItemContext); + PVOID WorkItemContext, + BOOLEAN Top); NDIS_STATUS FASTCALL @@ -161,7 +159,9 @@ VOID NTAPI -MiniportWorker(IN PVOID WorkItem); +MiniportWorker( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID WorkItem); VOID NTAPI MiniSendComplete( Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Sat Nov 22 09:47:48 2008 @@ -551,6 +551,10 @@ { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); IoDisconnectInterrupt(Interrupt->InterruptObject); + Interrupt->Miniport->RegisteredInterrupts--; + + if (Interrupt->Miniport->Interrupt == Interrupt) + Interrupt->Miniport->Interrupt = NULL; } @@ -780,8 +784,6 @@ Interrupt->IsrRequested = RequestIsr; Interrupt->Miniport = &Adapter->NdisMiniportBlock; - Adapter->NdisMiniportBlock.Interrupt = Interrupt; - MappedIRQ = HalGetInterruptVector(Adapter->NdisMiniportBlock.BusType, Adapter->NdisMiniportBlock.BusNumber, InterruptLevel, InterruptVector, &DIrql, &Affinity); @@ -793,8 +795,11 @@ NDIS_DbgPrint(MAX_TRACE, ("Leaving. Status (0x%X).\n", Status)); - if (NT_SUCCESS(Status)) - return NDIS_STATUS_SUCCESS; + if (NT_SUCCESS(Status)) { + Adapter->NdisMiniportBlock.Interrupt = Interrupt; + Adapter->NdisMiniportBlock.RegisteredInterrupts++; + return NDIS_STATUS_SUCCESS; + } if (Status == STATUS_INSUFFICIENT_RESOURCES) { Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Nov 22 09:47:48 2008 @@ -286,8 +286,6 @@ CurrentEntry = CurrentEntry->Flink; } - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -299,7 +297,6 @@ IN PNDIS_REQUEST Request, IN NDIS_STATUS Status) { - PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; KIRQL OldIrql; @@ -312,9 +309,6 @@ Request, Status); } - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); } @@ -332,7 +326,6 @@ * Status = Status of send operation */ { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; @@ -345,9 +338,6 @@ AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); } @@ -369,7 +359,6 @@ IN NDIS_STATUS Status, IN UINT BytesTransferred) { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; @@ -382,9 +371,6 @@ AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); } @@ -614,13 +600,6 @@ NDIS_STATUS Status; KIRQL OldIrql; - if (Adapter->MiniportBusy) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - return NDIS_STATUS_PENDING; - } - NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); @@ -633,10 +612,6 @@ if (Status != NDIS_STATUS_PENDING) { NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); NdisMIndicateStatusComplete(Adapter); - } else { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - Adapter->MiniportBusy = TRUE; - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } return Status; @@ -662,72 +637,76 @@ } -NDIS_STATUS +VOID FASTCALL MiniQueueWorkItem( PLOGICAL_ADAPTER Adapter, NDIS_WORK_ITEM_TYPE WorkItemType, - PVOID WorkItemContext) + PVOID WorkItemContext, + BOOLEAN Top) /* * FUNCTION: Queues a work item for execution at a later time * ARGUMENTS: * Adapter = Pointer to the logical adapter object to queue work item on * WorkItemType = Type of work item to queue * WorkItemContext = Pointer to context information for work item - * NOTES: - * Adapter lock must be held when called * RETURNS: * Status of operation */ { PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PNDIS_WORK_ITEM NdisWorkItem; - PWORK_QUEUE_ITEM WorkQueueItem; + PIO_WORKITEM IoWorkItem; + KIRQL OldIrql; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); ASSERT(Adapter); - ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); - - MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); - if (!MiniportWorkItem) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return NDIS_STATUS_RESOURCES; - } - - NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); - if (!NdisWorkItem) - { - ExFreePool(MiniportWorkItem); - return NDIS_STATUS_RESOURCES; - } - - MiniportWorkItem->WorkItemType = WorkItemType; - MiniportWorkItem->WorkItemContext = WorkItemContext; - - /* safe due to adapter lock held */ - MiniportWorkItem->Link.Next = NULL; - if (!Adapter->WorkQueueHead) - { - Adapter->WorkQueueHead = MiniportWorkItem; - Adapter->WorkQueueTail = MiniportWorkItem; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + if (Top) + { + if (WorkItemType == NdisWorkItemSend) + { + Adapter->NdisMiniportBlock.FirstPendingPacket = WorkItemContext; + } + else + { + //This should never happen + ASSERT(FALSE); + } } else { - Adapter->WorkQueueTail->Link.Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; - Adapter->WorkQueueTail = MiniportWorkItem; - } - - WorkQueueItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; - - NdisWorkItem->Context = Adapter; - - ExInitializeWorkItem(WorkQueueItem, MiniportWorker, NdisWorkItem); - - ExQueueWorkItem(WorkQueueItem, CriticalWorkQueue); - - return NDIS_STATUS_SUCCESS; + MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); + if (!MiniportWorkItem) + { + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return; + } + + MiniportWorkItem->WorkItemType = WorkItemType; + MiniportWorkItem->WorkItemContext = WorkItemContext; + + /* safe due to adapter lock held */ + MiniportWorkItem->Link.Next = NULL; + if (!Adapter->WorkQueueHead) + { + Adapter->WorkQueueHead = MiniportWorkItem; + Adapter->WorkQueueTail = MiniportWorkItem; + } + else + { + Adapter->WorkQueueTail->Link.Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; + Adapter->WorkQueueTail = MiniportWorkItem; + } + } + + IoWorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); + if (IoWorkItem) + IoQueueWorkItem(IoWorkItem, MiniportWorker, CriticalWorkQueue, IoWorkItem); + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -751,26 +730,22 @@ */ { PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PNDIS_WORK_ITEM NdisWorkItem; - PWORK_QUEUE_ITEM WorkQueueItem; - + PNDIS_PACKET Packet; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - if (Adapter->MiniportBusy) { - NDIS_DbgPrint(MID_TRACE, ("Waiting for miniport to become free.\n")); - NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); - if (!NdisWorkItem) return NDIS_STATUS_RESOURCES; - WorkQueueItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; - NdisWorkItem->Context = Adapter; - ExInitializeWorkItem(WorkQueueItem, MiniportWorker, NdisWorkItem); - ExQueueWorkItem(WorkQueueItem, CriticalWorkQueue); - return NDIS_STATUS_FAILURE; - } - MiniportWorkItem = Adapter->WorkQueueHead; - if (MiniportWorkItem) + if ((Packet = Adapter->NdisMiniportBlock.FirstPendingPacket)) + { + Adapter->NdisMiniportBlock.FirstPendingPacket = NULL; + + *WorkItemType = NdisWorkItemSend; + *WorkItemContext = Packet; + + return NDIS_STATUS_SUCCESS; + } + else if (MiniportWorkItem) { /* safe due to adapter lock held */ Adapter->WorkQueueHead = (PNDIS_MINIPORT_WORK_ITEM)MiniportWorkItem->Link.Next; @@ -783,12 +758,12 @@ ExFreePool(MiniportWorkItem); - Adapter->MiniportBusy = TRUE; - return NDIS_STATUS_SUCCESS; } - - return NDIS_STATUS_FAILURE; + else + { + return NDIS_STATUS_FAILURE; + } } @@ -808,8 +783,6 @@ NDIS_STATUS Status; KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - Adapter->NdisMiniportBlock.MediaRequest = NdisRequest; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); switch (NdisRequest->RequestType) @@ -838,14 +811,29 @@ Status = NDIS_STATUS_FAILURE; } - if (Status == NDIS_STATUS_PENDING) { - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = TRUE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - } - KeLowerIrql(OldIrql); return Status; +} + + +/* + * @implemented + */ +#undef NdisMSetInformationComplete +VOID +EXPORT +NdisMSetInformationComplete( + IN NDIS_HANDLE MiniportAdapterHandle, + IN NDIS_STATUS Status) +{ + PLOGICAL_ADAPTER Adapter = + (PLOGICAL_ADAPTER)MiniportAdapterHandle; + KIRQL OldIrql; + ASSERT(Adapter); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + if (Adapter->NdisMiniportBlock.SetCompleteHandler) + (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); + KeLowerIrql(OldIrql); } @@ -866,21 +854,21 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( Adapter->NdisMiniportBlock.QueryCompleteHandler ) (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); } -VOID NTAPI MiniportWorker(IN PVOID WorkItem) -{ - PNDIS_WORK_ITEM NdisWorkItem = WorkItem; - PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(NdisWorkItem->Context); +VOID +NTAPI +MiniportWorker(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) +{ + PLOGICAL_ADAPTER Adapter = DeviceObject->DeviceExtension; KIRQL OldIrql, RaiseOldIrql; NDIS_STATUS NdisStatus; PVOID WorkItemContext; NDIS_WORK_ITEM_TYPE WorkItemType; BOOLEAN AddressingReset; + + IoFreeWorkItem((PIO_WORKITEM)Context); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); @@ -898,9 +886,7 @@ /* * called by ProSend when protocols want to send packets to the miniport */ -#ifdef DBG - MiniDisplayPacket((PNDIS_PACKET)WorkItemContext); -#endif + if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) { if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) @@ -923,9 +909,7 @@ NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); if( NdisStatus == NDIS_STATUS_RESOURCES ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); break; } } @@ -949,9 +933,7 @@ NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); KeLowerIrql(RaiseOldIrql); if( NdisStatus == NDIS_STATUS_RESOURCES ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); break; } } @@ -1028,14 +1010,6 @@ break; } } - - if( NdisStatus != NDIS_STATUS_PENDING ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - } - - ExFreePool(WorkItem); } @@ -1433,15 +1407,6 @@ } NDIS_DbgPrint(DEBUG_MINIPORT, ("CurLookaheadLength (0x%X).\n", Adapter->NdisMiniportBlock.CurrentLookahead)); - - if (Adapter->NdisMiniportBlock.MaximumLookahead != 0) - { - Adapter->LookaheadLength = Adapter->NdisMiniportBlock.MaximumLookahead + Adapter->MediumHeaderSize; - Adapter->LookaheadBuffer = ExAllocatePool(NonPagedPool, Adapter->LookaheadLength); - - if (!Adapter->LookaheadBuffer) - return NDIS_STATUS_RESOURCES; - } return STATUS_SUCCESS; } @@ -1721,12 +1686,6 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { NDIS_DbgPrint(MAX_TRACE, ("couldn't create filter (%x)\n", NdisStatus)); - if (Adapter->LookaheadBuffer) - { - ExFreePool(Adapter->LookaheadBuffer); - Adapter->LookaheadBuffer = NULL; - } - ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return NdisStatus; } @@ -1775,11 +1734,6 @@ (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.HaltHandler)(Adapter); - if (Adapter->LookaheadBuffer) - { - ExFreePool(Adapter->LookaheadBuffer); - Adapter->LookaheadBuffer = NULL; - } if (Adapter->NdisMiniportBlock.AllocatedResources) { ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); @@ -2183,29 +2137,6 @@ IN UINT BytesTransferred) { MiniTransferDataComplete(MiniportAdapterHandle, Packet, Status, BytesTransferred); -} - - -/* - * @implemented - */ -#undef NdisMSetInformationComplete -VOID -EXPORT -NdisMSetInformationComplete( - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_STATUS Status) -{ - PLOGICAL_ADAPTER Adapter = - (PLOGICAL_ADAPTER)MiniportAdapterHandle; - KIRQL OldIrql; - ASSERT(Adapter); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - KeLowerIrql(OldIrql); } Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sat Nov 22 09:47:48 2008 @@ -20,6 +20,8 @@ LIST_ENTRY ProtocolListHead; KSPIN_LOCK ProtocolListLock; +#define WORKER_TEST 0 + /* * @implemented @@ -68,6 +70,7 @@ UINT BufferedLength; UINT PacketLength; KIRQL OldIrql; + PUCHAR LookaheadBuffer; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -75,36 +78,34 @@ MiniDisplayPacket(Packet); #endif + LookaheadBuffer = ExAllocatePool(NonPagedPool, Adapter->NdisMiniportBlock.CurrentLookahead + Adapter->MediumHeaderSize); + if (!LookaheadBuffer) + return NDIS_STATUS_RESOURCES; + NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { - Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = Packet; - BufferedLength = CopyPacketToBuffer(Adapter->LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead); + BufferedLength = CopyPacketToBuffer(LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead); } KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); if (BufferedLength > Adapter->MediumHeaderSize) { /* XXX Change this to call SendPackets so we don't have to duplicate this wacky logic */ - MiniIndicateData(Adapter, NULL, Adapter->LookaheadBuffer, Adapter->MediumHeaderSize, - &Adapter->LookaheadBuffer[Adapter->MediumHeaderSize], BufferedLength - Adapter->MediumHeaderSize, + MiniIndicateData(Adapter, NULL, LookaheadBuffer, Adapter->MediumHeaderSize, + &LookaheadBuffer[Adapter->MediumHeaderSize], BufferedLength - Adapter->MediumHeaderSize, PacketLength - Adapter->MediumHeaderSize); } else { - MiniIndicateData(Adapter, NULL, Adapter->LookaheadBuffer, Adapter->MediumHeaderSize, NULL, 0, 0); - } - - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - { - Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = NULL; - } - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - - return STATUS_SUCCESS; + MiniIndicateData(Adapter, NULL, LookaheadBuffer, Adapter->MediumHeaderSize, NULL, 0, 0); + } + + ExFreePool(LookaheadBuffer); + + return NDIS_STATUS_SUCCESS; } @@ -121,7 +122,6 @@ * Status of operation */ { - KIRQL OldIrql; PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; @@ -136,21 +136,12 @@ MacBlock->Binding = &AdapterBinding->NdisOpenBlock; - /* - * If the miniport is already busy, queue a workitem - */ - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - { - if (Adapter->MiniportBusy) { - MiniQueueWorkItem(Adapter, NdisWorkItemRequest, (PVOID)NdisRequest); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - return NDIS_STATUS_PENDING; - } - } - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - +#if WORKER_TEST + MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); + return NDIS_STATUS_PENDING; +#else return MiniDoRequest(Adapter, NdisRequest); +#endif } @@ -161,6 +152,74 @@ UNIMPLEMENTED return NDIS_STATUS_FAILURE; +} + +NDIS_STATUS +proSendPacketToMiniport(PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet) +{ +#if WORKER_TEST + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); + return NDIS_STATUS_PENDING; +#else + KIRQL RaiseOldIrql; + NDIS_STATUS NdisStatus; + + if(Adapter->NdisMiniportBlock.FirstPendingPacket) { + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); + return NDIS_STATUS_PENDING; + } + + if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) + { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); + NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + } else { + /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); + } + KeLowerIrql(RaiseOldIrql); + + NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + if (NdisStatus == NDIS_STATUS_RESOURCES) { + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); + NdisStatus = NDIS_STATUS_PENDING; + } + } + + return NdisStatus; + } else { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + } else { + /* Send is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + KeLowerIrql(RaiseOldIrql); + + if (NdisStatus == NDIS_STATUS_RESOURCES) { + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); + NdisStatus = NDIS_STATUS_PENDING; + } + } + + return NdisStatus; + } +#endif } @@ -176,15 +235,10 @@ * RETURNS: * NDIS_STATUS_SUCCESS if the packet was successfully sent * NDIS_STATUS_PENDING if the miniport was busy or a serialized miniport returned NDIS_STATUS_RESOURCES - * NOTES: - * TODO: - * - Break this up - */ -{ - KIRQL SpinOldIrql, RaiseOldIrql; + */ +{ PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; - NDIS_STATUS NdisStatus; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -210,83 +264,18 @@ * this is a loopback frame. */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); - if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK) && MiniAdapterHasAddress(Adapter, Packet)) { - if(Adapter->MiniportBusy) { - MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - return NDIS_STATUS_PENDING; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - +#if WORKER_TEST + MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, Packet, FALSE); + return NDIS_STATUS_PENDING; +#else return ProIndicatePacket(Adapter, Packet); +#endif } else { - if(Adapter->MiniportBusy) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - return NDIS_STATUS_PENDING; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - - if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) - { - if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) - { - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); - NdisStatus = NDIS_GET_PACKET_STATUS(Packet); - } else { - /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ - KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); - { - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); - } - KeLowerIrql(RaiseOldIrql); - - NdisStatus = NDIS_GET_PACKET_STATUS(Packet); - if( NdisStatus == NDIS_STATUS_RESOURCES ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - NdisStatus = NDIS_STATUS_PENDING; - } - } - - return NdisStatus; - } else { - if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) - { - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); - NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); - NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); - } else { - /* Send is called at DISPATCH_LEVEL for all serialized miniports */ - KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); - NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); - NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); - KeLowerIrql(RaiseOldIrql); - if( NdisStatus == NDIS_STATUS_RESOURCES ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - NdisStatus = NDIS_STATUS_PENDING; - } - } - - return NdisStatus; - } - } + return proSendPacketToMiniport(Adapter, Packet); + } }

1 0

[dchapyshev] 37555: - Update GetCurrencyFormatW. +34 wine tests passed
by dchapyshev＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dchapyshev Date: Sat Nov 22 07:45:17 2008 New Revision: 37555 URL: http://svn.reactos.org/svn/reactos?rev=37555&view=rev Log: - Update GetCurrencyFormatW. +34 wine tests passed Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Sat Nov 22 07:45:17 2008 @@ -1358,370 +1358,286 @@ LPCWSTR lpszValue, const CURRENCYFMTW *lpFormat, LPWSTR lpCurrencyStr, int cchOut) { - static const BYTE NLS_NegCyFormats[16] = - { - CF_PARENS|CF_CY_LEFT, /* ($1.1) */ - CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT, /* -$1.1 */ - CF_MINUS_LEFT|CF_CY_LEFT, /* $-1.1 */ - CF_MINUS_RIGHT|CF_CY_LEFT, /* $1.1- */ - CF_PARENS|CF_CY_RIGHT, /* (1.1$) */ - CF_MINUS_LEFT|CF_CY_RIGHT, /* -1.1$ */ - CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT, /* 1.1-$ */ - CF_MINUS_RIGHT|CF_CY_RIGHT, /* 1.1$- */ - CF_MINUS_LEFT|CF_CY_RIGHT|CF_CY_SPACE, /* -1.1 $ */ - CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT|CF_CY_SPACE, /* -$ 1.1 */ - CF_MINUS_RIGHT|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $- */ - CF_MINUS_RIGHT|CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1- */ - CF_MINUS_LEFT|CF_CY_LEFT|CF_CY_SPACE, /* $ -1.1 */ - CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1- $ */ - CF_PARENS|CF_CY_LEFT|CF_CY_SPACE, /* ($ 1.1) */ - CF_PARENS|CF_CY_RIGHT|CF_CY_SPACE, /* (1.1 $) */ - }; - static const BYTE NLS_PosCyFormats[4] = - { - CF_CY_LEFT, /* $1.1 */ - CF_CY_RIGHT, /* 1.1$ */ - CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1 */ - CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $ */ - }; - - WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; - WCHAR szNegBuff[8]; - const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc, *lpszCy, *lpszCyStart; - DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; - INT iRet; - - DPRINT1("GetCurrencyFormatW(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", - lcid, - dwFlags, - lpszValue, - lpFormat, - lpCurrencyStr, - cchOut); - - if(NLS_isSystemLocale(lcid)) - { - lcid = NLS_getDefaultLocale(lcid); - } - else if(!IsValidLocale(lcid, 0)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || - (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep || - !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || - lpFormat->PositiveOrder > 3))) - { - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; - } - - if (!lpFormat) - { - const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); - - if (!node) + static const BYTE NLS_NegCyFormats[16] = + { + CF_PARENS|CF_CY_LEFT, /* ($1.1) */ + CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT, /* -$1.1 */ + CF_MINUS_LEFT|CF_CY_LEFT, /* $-1.1 */ + CF_MINUS_RIGHT|CF_CY_LEFT, /* $1.1- */ + CF_PARENS|CF_CY_RIGHT, /* (1.1$) */ + CF_MINUS_LEFT|CF_CY_RIGHT, /* -1.1$ */ + CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT, /* 1.1-$ */ + CF_MINUS_RIGHT|CF_CY_RIGHT, /* 1.1$- */ + CF_MINUS_LEFT|CF_CY_RIGHT|CF_CY_SPACE, /* -1.1 $ */ + CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT|CF_CY_SPACE, /* -$ 1.1 */ + CF_MINUS_RIGHT|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $- */ + CF_MINUS_RIGHT|CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1- */ + CF_MINUS_LEFT|CF_CY_LEFT|CF_CY_SPACE, /* $ -1.1 */ + CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1- $ */ + CF_PARENS|CF_CY_LEFT|CF_CY_SPACE, /* ($ 1.1) */ + CF_PARENS|CF_CY_RIGHT|CF_CY_SPACE, /* (1.1 $) */ + }; + static const BYTE NLS_PosCyFormats[4] = + { + CF_CY_LEFT, /* $1.1 */ + CF_CY_RIGHT, /* 1.1$ */ + CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1 */ + CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $ */ + }; + WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; + WCHAR szNegBuff[8]; + const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc, *lpszCy, *lpszCyStart; + DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; + INT iRet; + + DPRINT1("GetCurrencyFormatW(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", + lcid, + dwFlags, + lpszValue, + lpFormat, + lpCurrencyStr, + cchOut); + + if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || + !IsValidLocale(lcid, 0) || + (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep || + !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || + lpFormat->PositiveOrder > 3))) + { +GetCurrencyFormatW_Error: + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; + } + + if (!lpFormat) + { + const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); + + if (!node) + goto GetCurrencyFormatW_Error; + lpFormat = &node->cyfmt; + lpszNegStart = lpszNeg = GetNegative(node); + } + else + { + GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE), + szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR)); + lpszNegStart = lpszNeg = szNegBuff; + } + dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP); + + lpszNeg = lpszNeg + strlenW(lpszNeg) - 1; + lpszCyStart = lpFormat->lpCurrencySymbol; + lpszCy = lpszCyStart + strlenW(lpszCyStart) - 1; + + /* Format the currency backwards into a temporary buffer */ + + szSrc = lpszValue; + *szOut-- = '\0'; + + /* Check the number for validity */ + while (*szSrc) + { + if (*szSrc >= '0' && *szSrc <= '9') + { + dwState |= NF_DIGITS; + if (dwState & NF_ISREAL) + dwDecimals++; + } + else if (*szSrc == '-') + { + if (dwState) + goto GetCurrencyFormatW_Error; /* '-' not first character */ + dwState |= NF_ISNEGATIVE; + } + else if (*szSrc == '.') + { + if (dwState & NF_ISREAL) + goto GetCurrencyFormatW_Error; /* More than one '.' */ + dwState |= NF_ISREAL; + } + else + goto GetCurrencyFormatW_Error; /* Invalid char */ + szSrc++; + } + szSrc--; /* Point to last character */ + + if (!(dwState & NF_DIGITS)) + goto GetCurrencyFormatW_Error; /* No digits */ + + if (dwState & NF_ISNEGATIVE) + dwFmt = NLS_NegCyFormats[lpFormat->NegativeOrder]; + else + dwFmt = NLS_PosCyFormats[lpFormat->PositiveOrder]; + + /* Add any trailing negative or currency signs */ + if (dwFmt & CF_PARENS) + *szOut-- = ')'; + + while (dwFmt & (CF_MINUS_RIGHT|CF_CY_RIGHT)) + { + switch (dwFmt & (CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT)) + { + case CF_MINUS_RIGHT: + case CF_MINUS_RIGHT|CF_CY_RIGHT: + while (lpszNeg >= lpszNegStart) + *szOut-- = *lpszNeg--; + dwFmt &= ~CF_MINUS_RIGHT; + break; + + case CF_CY_RIGHT: + case CF_MINUS_BEFORE|CF_CY_RIGHT: + case CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT: + while (lpszCy >= lpszCyStart) + *szOut-- = *lpszCy--; + if (dwFmt & CF_CY_SPACE) + *szOut-- = ' '; + dwFmt &= ~(CF_CY_RIGHT|CF_MINUS_BEFORE); + break; + } + } + + /* Copy all digits up to the decimal point */ + if (!lpFormat->NumDigits) + { + if (dwState & NF_ISREAL) + { + while (*szSrc != '.') /* Don't write any decimals or a separator */ + { + if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND))) + dwState |= NF_ROUND; + else + dwState &= ~NF_ROUND; + szSrc--; + } + szSrc--; + } + } + else + { + LPWSTR lpszDec = lpFormat->lpDecimalSep + strlenW(lpFormat->lpDecimalSep) - 1; + + if (dwDecimals <= lpFormat->NumDigits) + { + dwDecimals = lpFormat->NumDigits - dwDecimals; + while (dwDecimals--) + *szOut-- = '0'; /* Pad to correct number of dp */ + } + else + { + dwDecimals -= lpFormat->NumDigits; + /* Skip excess decimals, and determine if we have to round the number */ + while (dwDecimals--) + { + if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND))) + dwState |= NF_ROUND; + else + dwState &= ~NF_ROUND; + szSrc--; + } + } + + if (dwState & NF_ISREAL) + { + while (*szSrc != '.') + { + if (dwState & NF_ROUND) { - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; - } - lpFormat = &node->cyfmt; - lpszNegStart = lpszNeg = GetNegative(node); - } - else - { - GetLocaleInfoW(lcid, - LOCALE_SNEGATIVESIGN | (dwFlags & LOCALE_NOUSEROVERRIDE), - szNegBuff, - sizeof(szNegBuff)/sizeof(WCHAR)); - lpszNegStart = lpszNeg = szNegBuff; - } - - dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP); - - lpszNeg = lpszNeg + strlenW(lpszNeg) - 1; - lpszCyStart = lpFormat->lpCurrencySymbol; - lpszCy = lpszCyStart + strlenW(lpszCyStart) - 1; - - /* Format the currency backwards into a temporary buffer */ - - szSrc = lpszValue; - *szOut-- = '\0'; - - /* Check the number for validity */ - while (*szSrc) - { - if (*szSrc >= '0' && *szSrc <= '9') - { - dwState |= NF_DIGITS; - if (dwState & NF_ISREAL) - { - dwDecimals++; - } - } - else if (*szSrc == '-') - { - if (dwState) // '-' not first character - { - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; - } - dwState |= NF_ISNEGATIVE; - } - else if (*szSrc == '.') - { - if (dwState & NF_ISREAL) // More than one '.' - { - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; - } - dwState |= NF_ISREAL; - } - else // Invalid char - { - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; - } - szSrc++; - } // while (*szSrc) - - szSrc--; // Point to last character - - if (!(dwState & NF_DIGITS)) // No digits - { - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; - } - - // Sel fmt table - dwFmt = (dwState & NF_ISNEGATIVE)?NLS_NegCyFormats[lpFormat->NegativeOrder]: - NLS_PosCyFormats[lpFormat->PositiveOrder]; - - // Add any trailing negative or currency signs - if (dwFmt & CF_PARENS) - { - *szOut-- = ')'; - } - - while (dwFmt & (CF_MINUS_RIGHT|CF_CY_RIGHT)) - { - switch (dwFmt & (CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT)) - { - case CF_MINUS_RIGHT: // Add right negative sign - case CF_MINUS_RIGHT|CF_CY_RIGHT: - while (lpszNeg >= lpszNegStart) - { - *szOut-- = *lpszNeg--; - } - dwFmt &= ~CF_MINUS_RIGHT; - break; - - case CF_CY_RIGHT: // Add right currency sign - case CF_MINUS_BEFORE|CF_CY_RIGHT: - case CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT: - while (lpszCy >= lpszCyStart) - { - *szOut-- = *lpszCy--; - } - if (dwFmt & CF_CY_SPACE) - { - *szOut-- = ' '; - } - dwFmt &= ~(CF_CY_RIGHT|CF_MINUS_BEFORE); - break; - } - } - - // Copy all digits up to the decimal point - if (!lpFormat->NumDigits) - { - if (dwState & NF_ISREAL) - { - while (*szSrc != '.') // Don't write any decimals or a separator - { - if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND))) - { - dwState |= NF_ROUND; - } - else - { - dwState &= ~NF_ROUND; - } - szSrc--; - } - szSrc--; - } - } - else - { - LPWSTR lpszDec = lpFormat->lpDecimalSep + strlenW(lpFormat->lpDecimalSep) - 1; - - if (dwDecimals <= lpFormat->NumDigits) - { - dwDecimals = lpFormat->NumDigits - dwDecimals; - while (dwDecimals--) - { - *szOut-- = '0'; // Pad to correct number of dp - } + if (*szSrc == '9') + *szOut-- = '0'; /* continue rounding */ + else + { + dwState &= ~NF_ROUND; + *szOut-- = (*szSrc)+1; + } + szSrc--; } else - { - dwDecimals -= lpFormat->NumDigits; - // Skip excess decimals, and determine if we have to round the number - while (dwDecimals--) - { - if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND))) - { - dwState |= NF_ROUND; - } - else - { - dwState &= ~NF_ROUND; - } - szSrc--; - } - } - - if (dwState & NF_ISREAL) - { - while (*szSrc != '.') - { - if (dwState & NF_ROUND) - { - if (*szSrc == '9') - { - *szOut-- = '0'; // continue rounding - } - else - { - dwState &= ~NF_ROUND; - *szOut-- = (*szSrc)+1; - } - szSrc--; - } - else - { - *szOut-- = *szSrc--; /* Write existing decimals */ - } - } - szSrc--; // Skip '.' - } - - while (lpszDec >= lpFormat->lpDecimalSep) - { - *szOut-- = *lpszDec--; // Write decimal separator - } - } // if (!lpFormat->NumDigits) - - dwGroupCount = lpFormat->Grouping; - // FIXME: windows XP support complicated grouping ie: "2;3;0" - - // Write the remaining whole number digits, including grouping chars - while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9') - { - if (dwState & NF_ROUND) - { - if (*szSrc == '9') - { - *szOut-- = '0'; // continue rounding - } - else - { - dwState &= ~NF_ROUND; - *szOut-- = (*szSrc)+1; - } - szSrc--; - } - else - *szOut-- = *szSrc--; - - dwState |= NF_DIGITS_OUT; - dwCurrentGroupCount++; - if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount) - { - // Group sep string - LPWSTR lpszGrp = lpFormat->lpThousandSep + - strlenW(lpFormat->lpThousandSep) - 1; - - while (lpszGrp >= lpFormat->lpThousandSep) - { - *szOut-- = *lpszGrp--; // Write grouping char - } - - dwCurrentGroupCount = 0; - } - } - - // Correct negative result, delete unnecessary group sep - if(dwState & NF_ISNEGATIVE) - { - szOut += strlenW(lpFormat->lpThousandSep); - } - + *szOut-- = *szSrc--; /* Write existing decimals */ + } + szSrc--; /* Skip '.' */ + } + while (lpszDec >= lpFormat->lpDecimalSep) + *szOut-- = *lpszDec--; /* Write decimal separator */ + } + + dwGroupCount = lpFormat->Grouping; + + /* Write the remaining whole number digits, including grouping chars */ + while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9') + { if (dwState & NF_ROUND) { - *szOut-- = '1'; // e.g. .6 > 1.0 - } - else if (!(dwState & NF_DIGITS_OUT) && lpFormat->LeadingZero) - { - *szOut-- = '0'; // Add leading 0 if we have no digits before the decimal point - } - - // Add any leading negative or currency sign - while (dwFmt & (CF_MINUS_LEFT|CF_CY_LEFT)) - { - switch (dwFmt & (CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT)) - { - case CF_MINUS_LEFT: // Add left negative sign - case CF_MINUS_LEFT|CF_CY_LEFT: - while (lpszNeg >= lpszNegStart) - { - *szOut-- = *lpszNeg--; - } - dwFmt &= ~CF_MINUS_LEFT; - break; - - case CF_CY_LEFT: // Add left currency sign - case CF_CY_LEFT|CF_MINUS_BEFORE: - case CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT: - if (dwFmt & CF_CY_SPACE) - { - *szOut-- = ' '; - } - while (lpszCy >= lpszCyStart) - { - *szOut-- = *lpszCy--; - } - dwFmt &= ~(CF_CY_LEFT|CF_MINUS_BEFORE); - break; - } - } - - // Add left bracket - if (dwFmt & CF_PARENS) - { - *szOut-- = '('; - } - szOut++; - - iRet = strlenW(szOut) + 1; - if (cchOut) - { - if (iRet <= cchOut) - { - memcpy(lpCurrencyStr, szOut, iRet * sizeof(WCHAR)); - } - else - { - memcpy(lpCurrencyStr, szOut, cchOut * sizeof(WCHAR)); - lpCurrencyStr[cchOut - 1] = '\0'; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - iRet = 0; - } - } - return iRet; + if (*szSrc == '9') + *szOut-- = '0'; /* continue rounding */ + else + { + dwState &= ~NF_ROUND; + *szOut-- = (*szSrc)+1; + } + szSrc--; + } + else + *szOut-- = *szSrc--; + + dwState |= NF_DIGITS_OUT; + dwCurrentGroupCount++; + if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount) + { + LPWSTR lpszGrp = lpFormat->lpThousandSep + strlenW(lpFormat->lpThousandSep) - 1; + + while (lpszGrp >= lpFormat->lpThousandSep) + *szOut-- = *lpszGrp--; /* Write grouping char */ + + dwCurrentGroupCount = 0; + } + } + if (dwState & NF_ROUND) + *szOut-- = '1'; /* e.g. .6 > 1.0 */ + else if (!(dwState & NF_DIGITS_OUT) && lpFormat->LeadingZero) + *szOut-- = '0'; /* Add leading 0 if we have no digits before the decimal point */ + + /* Add any leading negative or currency sign */ + while (dwFmt & (CF_MINUS_LEFT|CF_CY_LEFT)) + { + switch (dwFmt & (CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT)) + { + case CF_MINUS_LEFT: + case CF_MINUS_LEFT|CF_CY_LEFT: + while (lpszNeg >= lpszNegStart) + *szOut-- = *lpszNeg--; + dwFmt &= ~CF_MINUS_LEFT; + break; + + case CF_CY_LEFT: + case CF_CY_LEFT|CF_MINUS_BEFORE: + case CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT: + if (dwFmt & CF_CY_SPACE) + *szOut-- = ' '; + while (lpszCy >= lpszCyStart) + *szOut-- = *lpszCy--; + dwFmt &= ~(CF_CY_LEFT|CF_MINUS_BEFORE); + break; + } + } + if (dwFmt & CF_PARENS) + *szOut-- = '('; + szOut++; + + iRet = strlenW(szOut) + 1; + if (cchOut) + { + if (iRet <= cchOut) + memcpy(lpCurrencyStr, szOut, iRet * sizeof(WCHAR)); + else + { + memcpy(lpCurrencyStr, szOut, cchOut * sizeof(WCHAR)); + lpCurrencyStr[cchOut - 1] = '\0'; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + iRet = 0; + } + } + return iRet; } /* FIXME: Everything below here needs to move somewhere else along with the

1 0

[dchapyshev] 37554: - Fix RtlTimeFieldsToTime. Now GetDateFormatW passed all wine tests
by dchapyshev＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dchapyshev Date: Sat Nov 22 07:21:33 2008 New Revision: 37554 URL: http://svn.reactos.org/svn/reactos?rev=37554&view=rev Log: - Fix RtlTimeFieldsToTime. Now GetDateFormatW passed all wine tests Modified: trunk/reactos/dll/win32/kernel32/misc/time.c trunk/reactos/lib/rtl/time.c Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] Sat Nov 22 07:21:33 2008 @@ -378,6 +378,8 @@ lpFileTime->dwHighDateTime = liTime.u.HighPart; return TRUE; } + + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } Modified: trunk/reactos/lib/rtl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/time.c?rev=37554&r… ============================================================================== --- trunk/reactos/lib/rtl/time.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/time.c [iso-8859-1] Sat Nov 22 07:21:33 2008 @@ -186,6 +186,19 @@ TimeFields, sizeof(TIME_FIELDS)); + if (TimeFields->Milliseconds < 0 || TimeFields->Milliseconds > 999 || + TimeFields->Second < 0 || TimeFields->Second > 59 || + TimeFields->Minute < 0 || TimeFields->Minute > 59 || + TimeFields->Hour < 0 || TimeFields->Hour > 23 || + TimeFields->Month < 1 || TimeFields->Month > 12 || + TimeFields->Day < 1 || + TimeFields->Day > MonthLengths[TimeFields->Month == 2 || + IsLeapYear(TimeFields->Year)][TimeFields->Month - 1] || + TimeFields->Year < 1601) + { + return FALSE; + } + /* Normalize the TIME_FIELDS structure here */ while (IntTimeFields.Second >= SECSPERMIN) {

1 0

[dchapyshev] 37553: - Fix 2 wine tests for GetTimeFormatA/W
by dchapyshev＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dchapyshev Date: Sat Nov 22 06:15:24 2008 New Revision: 37553 URL: http://svn.reactos.org/svn/reactos?rev=37553&view=rev Log: - Fix 2 wine tests for GetTimeFormatA/W Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Sat Nov 22 06:15:24 2008 @@ -346,6 +346,8 @@ */ BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) { + lcid = ConvertDefaultLocale(lcid); + switch (PRIMARYLANGID(lcid)) { case LANG_ARMENIAN: @@ -374,10 +376,10 @@ #define IsTimeFmtChar(p) (p == 'H'||p == 'h'||p == 'm'||p == 's'||p == 't') /* Only the following flags can be given if a date/time format is specified */ -#define DATE_FORMAT_FLAGS (DATE_DATEVARSONLY|LOCALE_NOUSEROVERRIDE) +#define DATE_FORMAT_FLAGS (DATE_DATEVARSONLY) #define TIME_FORMAT_FLAGS (TIME_TIMEVARSONLY|TIME_FORCE24HOURFORMAT| \ TIME_NOMINUTESORSECONDS|TIME_NOSECONDS| \ - TIME_NOTIMEMARKER|LOCALE_NOUSEROVERRIDE) + TIME_NOTIMEMARKER) /****************************************************************************** * NLS_GetDateTimeFormatW <internal> @@ -755,7 +757,7 @@ if (lpStr) { if (szOut[0]) - WideCharToMultiByte(cp, 0, szOut, -1, lpStr, cchOut, 0, 0); + WideCharToMultiByte(cp, 0, szOut, iRet ? -1 : cchOut, lpStr, cchOut, 0, 0); else if (cchOut && iRet) *lpStr = '\0'; }

1 0

[sginsberg] 37552: - Make sure allocation succeeded (CID 467)
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Sat Nov 22 05:51:01 2008 New Revision: 37552 URL: http://svn.reactos.org/svn/reactos?rev=37552&view=rev Log: - Make sure allocation succeeded (CID 467) Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sat Nov 22 05:51:01 2008 @@ -62,6 +62,7 @@ nInBufferSize, lpOutBuffer, nOutBufferSize, FALSE, &Event, &Iosb); + if (!Irp) return ERROR_NOT_ENOUGH_MEMORY; Status = IoCallDriver(DeviceObject, Irp);

1 0

[dchapyshev] 37551: - Fix EnumDateFormatsA implementation. + 7 passed tests
by dchapyshev＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dchapyshev Date: Sat Nov 22 05:32:08 2008 New Revision: 37551 URL: http://svn.reactos.org/svn/reactos?rev=37551&view=rev Log: - Fix EnumDateFormatsA implementation. + 7 passed tests Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Sat Nov 22 05:32:08 2008 @@ -1730,302 +1730,77 @@ /************************************************************************** * EnumDateFormatsA (KERNEL32.@) */ -BOOL WINAPI EnumDateFormatsA( DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID Locale, DWORD dwFlags) -{ - LCID Loc = GetUserDefaultLCID(); - if(!lpDateFmtEnumProc) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - switch( Loc ) - { - - case 0x00000407: /* (Loc,"de_DE") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("dd.MM.yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d.M.yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d.MM.yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d.M.yy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dddd,d. MMMM yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d. MMMM yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d. MMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x0000040c: /* (Loc,"fr_FR") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd.MM.yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd-MM-yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd/MM/yyyy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dddd d MMMM yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d MMM yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00000c0c: /* (Loc,"fr_CA") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("yy-MM-dd")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd-MM-yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("yy MM dd")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("d MMMM, yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d MMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00000809: /* (Loc,"en_UK") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd/MM/yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d/M/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d.M.yy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dd MMMM yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00000c09: /* (Loc,"en_AU") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("d/MM/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d/M/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dddd,d MMMM yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00001009: /* (Loc,"en_CA") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d/M/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("yy-MM-dd")) return TRUE; - if(!(*lpDateFmtEnumProc)("M/dd/yy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("d-MMM-yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("MMMM d, yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00001409: /* (Loc,"en_NZ") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("d/MM/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d.MM.yy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dddd, d MMMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00001809: /* (Loc,"en_IE") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d/M/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d.M.yy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dd MMMM yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00001c09: /* (Loc,"en_ZA") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("yy/MM/dd")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dd MMMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00002009: /* (Loc,"en_JM") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("dd/MM/yyyy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dddd,MMMM dd,yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("MMMM dd,yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dddd,dd MMMM,yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd MMMM,yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - case 0x00002809: /* (Loc,"en_BZ") */ - case 0x00002c09: /* (Loc,"en_TT") */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("dd/MM/yyyy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dddd,dd MMMM yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - default: /* default to US English "en_US" */ - { - switch(dwFlags) - { - case DATE_SHORTDATE: - if(!(*lpDateFmtEnumProc)("M/d/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("M/d/yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("MM/dd/yy")) return TRUE; - if(!(*lpDateFmtEnumProc)("MM/dd/yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("yy/MM/dd")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd-MMM-yy")) return TRUE; - return TRUE; - case DATE_LONGDATE: - if(!(*lpDateFmtEnumProc)("dddd, MMMM dd, yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("MMMM dd, yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dddd, dd MMMM, yyyy")) return TRUE; - if(!(*lpDateFmtEnumProc)("dd MMMM, yyyy")) return TRUE; - return TRUE; - default: - FIXME("Unknown date format (%ld)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - } +BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID Locale, DWORD dwFlags) +{ + char buf[256]; + + if (!lpDateFmtEnumProc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (dwFlags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoA(Locale, LOCALE_SSHORTDATE | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) + lpDateFmtEnumProc(buf); + break; + + case DATE_LONGDATE: + if (GetLocaleInfoA(Locale, LOCALE_SLONGDATE | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) + lpDateFmtEnumProc(buf); + break; + + case DATE_YEARMONTH: + if (GetLocaleInfoA(Locale, LOCALE_SYEARMONTH | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) + lpDateFmtEnumProc(buf); + break; + + default: + FIXME("Unknown date format (%d)\n", dwFlags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; } /************************************************************************** * EnumDateFormatsW (KERNEL32.@) */ -BOOL WINAPI EnumDateFormatsW( DATEFMT_ENUMPROCW proc, LCID lcid, DWORD flags ) +BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW lpDateFmtEnumProc, LCID Locale, DWORD dwFlags) { WCHAR buf[256]; - if (!proc) + if (!lpDateFmtEnumProc) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - switch (flags & ~LOCALE_USE_CP_ACP) - { - case 0: - case DATE_SHORTDATE: - if (GetLocaleInfoW(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); + switch (dwFlags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoW(Locale, LOCALE_SSHORTDATE | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) + lpDateFmtEnumProc(buf); break; - case DATE_LONGDATE: - if (GetLocaleInfoW(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); + case DATE_LONGDATE: + if (GetLocaleInfoW(Locale, LOCALE_SLONGDATE | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) + lpDateFmtEnumProc(buf); break; - case DATE_YEARMONTH: - if (GetLocaleInfoW(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); + case DATE_YEARMONTH: + if (GetLocaleInfoW(Locale, LOCALE_SYEARMONTH | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) + lpDateFmtEnumProc(buf); break; - default: - FIXME("Unknown date format (%d)\n", flags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + default: + FIXME("Unknown date format (%d)\n", dwFlags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } return TRUE; }

1 0

[sginsberg] 37550: - Don't. Include. ntdef.h. From. User. Mode.
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Sat Nov 22 05:17:17 2008 New Revision: 37550 URL: http://svn.reactos.org/svn/reactos?rev=37550&view=rev Log: - Don't. Include. ntdef.h. From. User. Mode. Modified: trunk/rostests/winetests/rpcrt4/rpc.c Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Sat Nov 22 05:17:17 2008 @@ -28,7 +28,7 @@ #include <winbase.h> #include <winnt.h> #include <winerror.h> -#include <ntdef.h> +#include <ntsecapi.h> #include "rpc.h" #include "rpcdce.h"

1 0

[sginsberg] 37549: - Remove system_header too
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Sat Nov 22 05:04:49 2008 New Revision: 37549 URL: http://svn.reactos.org/svn/reactos?rev=37549&view=rev Log: - Remove system_header too Modified: trunk/reactos/include/ddk/ntdef.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sat Nov 22 05:04:49 2008 @@ -1,9 +1,5 @@ #ifndef _NTDEF_H #define _NTDEF_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #include <stdarg.h> #include <windef.h>

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