Ros-diffs September 2009

ros-diffs@reactos.org

16 participants
270 discussions

[jimtabor] 43176: - [NtDDraw] - Export global DD context size. Create a container for both PDev and EDDG structures. When allocating PDev and add the DD context size if not zero.
by jimtabor＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: jimtabor Date: Sun Sep 27 05:12:02 2009 New Revision: 43176 URL: http://svn.reactos.org/svn/reactos?rev=43176&view=rev Log: - [NtDDraw] - Export global DD context size. Create a container for both PDev and EDDG structures. When allocating PDev and add the DD context size if not zero. Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Sun Sep 27 05:12:02 2009 @@ -1,5 +1,7 @@ #ifndef __WIN32K_PDEVOBJ_H #define __WIN32K_PDEVOBJ_H + +#include <drivers/directx/directxint.h> /* PDEVOBJ flags */ #define PDEV_DISPLAY 0x00000001 /* Display device */ @@ -134,4 +136,13 @@ struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; } PDEVOBJ, *PPDEVOBJ; +/* PDEV and EDDX extra data container.*/ +typedef struct _PDEVEDD +{ + PDEVOBJ pdevobj; + EDD_DIRECTDRAW_GLOBAL EDDgpl; +} PDEVEDD, *PPDEVEDD; + +extern ULONG gdwDirectDrawContext; + #endif /* !__WIN32K_PDEVOBJ_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Sep 27 05:12:02 2009 @@ -22,7 +22,7 @@ DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl]; HANDLE ghDxGraphics = NULL; -ULONG gdwDirectDrawContext; +ULONG gdwDirectDrawContext = 0; #define DXDBG 1 Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Sun Sep 27 05:12:02 2009 @@ -229,7 +229,7 @@ RtlZeroMemory(&PrimarySurface, sizeof(PrimarySurface)); -// if (!pPrimarySurface) pPrimarySurface = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), TAG_GDIPDEV); +// if (!pPrimarySurface) pPrimarySurface = ExAllocatePoolWithTag(PagedPool, gdwDirectDrawContext + sizeof(PDEVOBJ), TAG_GDIPDEV); PrimarySurface.VideoFileObject = DRIVER_FindMPDriver(DisplayNumber);

1 0

[janderwald] 43175: - Rewrite registering physical connection handling to support KSPROPERTY_PIN_PHYSICALCONNECTION
by janderwald＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: janderwald Date: Sun Sep 27 02:50:06 2009 New Revision: 43175 URL: http://svn.reactos.org/svn/reactos?rev=43175&view=rev Log: - Rewrite registering physical connection handling to support KSPROPERTY_PIN_PHYSICALCONNECTION Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -135,10 +135,6 @@ portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; // set up the start device function portcls_ext->StartDevice = StartDevice; - // prepare the subdevice list - InitializeListHead(&portcls_ext->SubDeviceList); - // prepare the physical connection list - InitializeListHead(&portcls_ext->PhysicalConnectionList); // initialize timer lock KeInitializeSpinLock(&portcls_ext->TimerListLock); // initialize timer list @@ -214,10 +210,9 @@ NTSTATUS Status; ISubdevice *SubDevice; UNICODE_STRING SymbolicLinkName; - SUBDEVICE_DESCRIPTOR * SubDeviceDescriptor; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; ULONG Index; UNICODE_STRING RefName; - PSUBDEVICE_ENTRY Entry; PSYMBOLICLINK_ENTRY SymEntry; DPRINT1("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); @@ -259,36 +254,19 @@ return STATUS_UNSUCCESSFUL; } - // allocate subdevice entry - Entry = (PSUBDEVICE_ENTRY)AllocateItem(NonPagedPool, sizeof(SUBDEVICE_ENTRY), TAG_PORTCLASS); - if (!Entry) - { - // Insufficient memory - SubDevice->Release(); - return STATUS_INSUFFICIENT_RESOURCES; - } - // add an create item to the device header Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PcCreateItemDispatch, (PVOID)SubDevice, Name, NULL); if (!NT_SUCCESS(Status)) { // failed to attach SubDevice->Release(); - FreeItem(Entry, TAG_PORTCLASS); DPRINT1("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); return Status; } // initialize reference string RtlInitUnicodeString(&RefName, Name); - - // initialize subdevice entry - Entry->SubDevice = SubDevice; - RtlInitUnicodeString(&Entry->Name, Name); - InitializeListHead(&Entry->SymbolicLinkList); - - // store subdevice entry - InsertTailList(&DeviceExt->SubDeviceList, &Entry->Entry); + RtlInitUnicodeString(&SubDeviceDescriptor->RefString, Name); for(Index = 0; Index < SubDeviceDescriptor->InterfaceCount; Index++) { @@ -311,7 +289,7 @@ // initialize symbolic link item RtlInitUnicodeString(&SymEntry->SymbolicLink, SymbolicLinkName.Buffer); // store item - InsertTailList(&Entry->SymbolicLinkList, &SymEntry->Entry); + InsertTailList(&SubDeviceDescriptor->SymbolicLinkList, &SymEntry->Entry); } else { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -81,107 +81,8 @@ IN PUNICODE_STRING ToString, IN ULONG ToPin) { - PLIST_ENTRY Entry; - PPHYSICAL_CONNECTION Connection; - PPCLASS_DEVICE_EXTENSION DeviceExt; - NTSTATUS Status; - ISubdevice * FromSubDevice = NULL; - ISubdevice * ToSubDevice = NULL; - ULONG bFound; - - DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (FromUnknown) - { - // get our private interface - Status = FromUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&FromSubDevice); - if (!NT_SUCCESS(Status)) - return STATUS_INVALID_PARAMETER; - } - - if (ToUnknown) - { - Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice); - if (!NT_SUCCESS(Status)) - goto cleanup; - } - - - Entry = DeviceExt->PhysicalConnectionList.Flink; - bFound = FALSE; - // loop physical connection list - while(Entry != &DeviceExt->PhysicalConnectionList) - { - Connection = (PPHYSICAL_CONNECTION)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION, Entry); - // compare current entry - if (Connection->FromPin == FromPin && Connection->ToPin == ToPin && - Connection->FromSubDevice == FromSubDevice && Connection->ToSubDevice == ToSubDevice) - { - if (FromString && Connection->FromUnicodeString.Buffer) - { - if (!RtlCompareUnicodeString(FromString, &Connection->FromUnicodeString, TRUE)) - { - // UnregisterPhysicalConnectionFromExternal - bFound = TRUE; - break; - } - } - else if (ToString && Connection->ToUnicodeString.Buffer) - { - if (!RtlCompareUnicodeString(ToString, &Connection->ToUnicodeString, TRUE)) - { - // UnregisterPhysicalConnectionToExternal - bFound = TRUE; - break; - } - } - else - { - // UnregisterPhysicalConnection - bFound = TRUE; - break; - } - } - Entry = Entry->Flink; - } - - if (!bFound) - { - // not found - Status = STATUS_NOT_FOUND; - goto cleanup; - } - - // remove list entry - RemoveEntryList(&Connection->Entry); - - // release resources - if (Connection->FromSubDevice) - Connection->FromSubDevice->Release(); - - - if (Connection->ToSubDevice) - Connection->ToSubDevice->Release(); - - if (Connection->FromUnicodeString.Buffer) - RtlFreeUnicodeString(&Connection->FromUnicodeString); - - if (Connection->ToUnicodeString.Buffer) - RtlFreeUnicodeString(&Connection->ToUnicodeString); - - FreeItem(Connection, TAG_PORTCLASS); - Status = STATUS_SUCCESS; - -cleanup: - - if (FromSubDevice) - FromSubDevice->Release(); - - if (ToSubDevice) - ToSubDevice->Release(); - - return Status; - + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -255,67 +156,100 @@ IN PUNICODE_STRING ToString, IN ULONG ToPin) { - PHYSICAL_CONNECTION *NewConnection; - PPCLASS_DEVICE_EXTENSION DeviceExt; + PSUBDEVICE_DESCRIPTOR FromSubDeviceDescriptor, ToSubDeviceDescriptor; + PSYMBOLICLINK_ENTRY SymEntry; + ISubdevice * FromSubDevice = NULL, *ToSubDevice = NULL; NTSTATUS Status; - - DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - NewConnection = (PPHYSICAL_CONNECTION)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION), TAG_PORTCLASS); - if (!NewConnection) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - + PPHYSICAL_CONNECTION_ENTRY FromEntry = NULL, ToEntry = NULL; if (FromUnknown) { - Status = FromUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&NewConnection->FromSubDevice); + Status = FromUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&FromSubDevice); if (!NT_SUCCESS(Status)) goto cleanup; - } - else - { - if (!RtlCreateUnicodeString(&NewConnection->FromUnicodeString, (PCWSTR)FromString)) + + Status = FromSubDevice->GetDescriptor(&FromSubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + goto cleanup; + + if (IsListEmpty(&FromSubDeviceDescriptor->SymbolicLinkList)) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_UNSUCCESSFUL; goto cleanup; } - } + + SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(FromSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); + FromString = &SymEntry->SymbolicLink; + } + if (ToUnknown) { - Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&NewConnection->ToSubDevice); + Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice); if (!NT_SUCCESS(Status)) goto cleanup; - } - else - { - if (!RtlCreateUnicodeString(&NewConnection->ToUnicodeString, (PCWSTR)ToString)) + + Status = ToSubDevice->GetDescriptor(&ToSubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + goto cleanup; + + if (IsListEmpty(&ToSubDeviceDescriptor->SymbolicLinkList)) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_UNSUCCESSFUL; goto cleanup; } - } - - InsertTailList(&DeviceExt->PhysicalConnectionList, &NewConnection->Entry); + + + SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(ToSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); + ToString = &SymEntry->SymbolicLink; + + } + + FromEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + ToString->MaximumLength, TAG_PORTCLASS); + if (!FromEntry) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + ToEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + FromString->MaximumLength, TAG_PORTCLASS); + if (!ToEntry) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + FromEntry->FromPin = FromPin; + FromEntry->Connection.Pin = ToPin; + FromEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + ToString->MaximumLength; + RtlMoveMemory(&FromEntry->Connection.SymbolicLinkName, ToString->Buffer, ToString->MaximumLength); + FromEntry->Connection.SymbolicLinkName[ToString->Length / sizeof(WCHAR)] = L'\0'; + + ToEntry->FromPin = ToPin; + ToEntry->Connection.Pin = FromPin; + ToEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + FromString->MaximumLength; + RtlMoveMemory(&ToEntry->Connection.SymbolicLinkName, FromString->Buffer, FromString->MaximumLength); + ToEntry->Connection.SymbolicLinkName[FromString->Length / sizeof(WCHAR)] = L'\0'; + + + InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); + InsertTailList(&ToSubDeviceDescriptor->PhysicalConnectionList, &ToEntry->Entry); + return STATUS_SUCCESS; cleanup: - if (NewConnection->FromSubDevice) - NewConnection->FromSubDevice->Release(); - - if (NewConnection->ToSubDevice) - NewConnection->ToSubDevice->Release(); - - if (NewConnection->FromUnicodeString.Buffer) - RtlFreeUnicodeString(&NewConnection->FromUnicodeString); - - if (NewConnection->ToUnicodeString.Buffer) - RtlFreeUnicodeString(&NewConnection->ToUnicodeString); - - FreeItem(NewConnection, TAG_PORTCLASS); + if (FromSubDevice) + FromSubDevice->Release(); + + if (ToSubDevice) + ToSubDevice->Release(); + + if (FromEntry) + FreeItem(FromEntry, TAG_PORTCLASS); + + if (ToEntry) + FreeItem(ToEntry, TAG_PORTCLASS); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -91,6 +91,17 @@ PIO_STACK_LOCATION IoStack; IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) + { + DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + PC_ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); return PcPropertyHandler(Irp, m_Descriptor); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -170,6 +170,19 @@ typedef struct { + LIST_ENTRY Entry; + UNICODE_STRING SymbolicLink; +}SYMBOLICLINK_ENTRY, *PSYMBOLICLINK_ENTRY; + +typedef struct +{ + LIST_ENTRY Entry; + ULONG FromPin; + KSPIN_PHYSICALCONNECTION Connection; +}PHYSICAL_CONNECTION_ENTRY, *PPHYSICAL_CONNECTION_ENTRY; + +typedef struct +{ ULONG MaxGlobalInstanceCount; ULONG MaxFilterInstanceCount; ULONG MinFilterInstanceCount; @@ -202,6 +215,9 @@ PPCFILTER_DESCRIPTOR DeviceDescriptor; KSTOPOLOGY* Topology; + LIST_ENTRY SymbolicLinkList; + LIST_ENTRY PhysicalConnectionList; + UNICODE_STRING RefString; }SUBDEVICE_DESCRIPTOR, *PSUBDEVICE_DESCRIPTOR; #undef INTERFACE Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -174,32 +174,10 @@ IN PIRP Irp) { PPCLASS_DEVICE_EXTENSION DeviceExtension; - PLIST_ENTRY Entry; - PPHYSICAL_CONNECTION Connection; DPRINT("PortClsShutdown called\n"); // get device extension DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - while(!IsListEmpty(&DeviceExtension->PhysicalConnectionList)) - { - // get connection entry - Entry = RemoveHeadList(&DeviceExtension->PhysicalConnectionList); - Connection = (PPHYSICAL_CONNECTION)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION, Entry); - - if (Connection->FromSubDevice) - { - // release subdevice - Connection->FromSubDevice->Release(); - } - - if (Connection->ToSubDevice) - { - // release subdevice - Connection->ToSubDevice->Release(); - } - FreeItem(Connection, TAG_PORTCLASS); - } if (DeviceExtension->AdapterPowerManagement) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -25,7 +25,6 @@ STDMETHODIMP_(ULONG) Release() { InterlockedDecrement(&m_Ref); - DPRINT1("Release %u\n", m_Ref); if (!m_Ref) { //delete this; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -348,32 +348,6 @@ typedef struct { - LIST_ENTRY Entry; - UNICODE_STRING SymbolicLink; -}SYMBOLICLINK_ENTRY, *PSYMBOLICLINK_ENTRY; - - -typedef struct -{ - LIST_ENTRY Entry; - ISubdevice *SubDevice; - UNICODE_STRING Name; - LIST_ENTRY SymbolicLinkList; -}SUBDEVICE_ENTRY, *PSUBDEVICE_ENTRY; - -typedef struct -{ - LIST_ENTRY Entry; - ISubdevice * FromSubDevice; - UNICODE_STRING FromUnicodeString; - ULONG FromPin; - ISubdevice * ToSubDevice; - UNICODE_STRING ToUnicodeString; - ULONG ToPin; -}PHYSICAL_CONNECTION, *PPHYSICAL_CONNECTION; - -typedef struct -{ KSDEVICE_HEADER KsDeviceHeader; PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT PrevDeviceObject; @@ -384,8 +358,6 @@ KSOBJECT_CREATE_ITEM * CreateItems; IResourceList* resources; - LIST_ENTRY SubDeviceList; - LIST_ENTRY PhysicalConnectionList; LIST_ENTRY TimerList; KSPIN_LOCK TimerListLock; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -114,6 +114,71 @@ return Status; } +NTSTATUS +HandlePhysicalConnection( + IN PIO_STATUS_BLOCK IoStatus, + IN PKSIDENTIFIER Request, + IN ULONG RequestLength, + IN OUT PVOID Data, + IN ULONG DataLength, + IN PSUBDEVICE_DESCRIPTOR Descriptor) +{ + PKSP_PIN Pin; + PLIST_ENTRY Entry; + PKSPIN_PHYSICALCONNECTION Connection; + PPHYSICAL_CONNECTION_ENTRY ConEntry; + + // get pin + Pin = (PKSP_PIN)Request; + + if (RequestLength < sizeof(KSP_PIN)) + { + // input buffer must be at least sizeof KSP_PIN + DPRINT1("input length too small\n"); + return STATUS_INVALID_PARAMETER; + } + + if (IsListEmpty(&Descriptor->PhysicalConnectionList)) + { + DPRINT1("no connection\n"); + return STATUS_NOT_FOUND; + } + + // get first item + Entry = Descriptor->PhysicalConnectionList.Flink; + + do + { + ConEntry = (PPHYSICAL_CONNECTION_ENTRY)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION_ENTRY, Entry); + + if (ConEntry->FromPin == Pin->PinId) + { + Connection = (PKSPIN_PHYSICALCONNECTION)Data; + DPRINT("FoundEntry %S Size %u\n", ConEntry->Connection.SymbolicLinkName, ConEntry->Connection.Size); + IoStatus->Information = ConEntry->Connection.Size; + + if (!DataLength) + { + IoStatus->Information = ConEntry->Connection.Size; + return STATUS_MORE_ENTRIES; + } + + if (DataLength < ConEntry->Connection.Size) + { + return STATUS_BUFFER_TOO_SMALL; + } + + RtlMoveMemory(Data, &ConEntry->Connection, ConEntry->Connection.Size); + return STATUS_SUCCESS; + } + + // move to next item + Entry = Entry->Flink; + }while(Entry != &Descriptor->PhysicalConnectionList); + + IoStatus->Information = 0; + return STATUS_NOT_FOUND; +} NTSTATUS NTAPI @@ -188,6 +253,8 @@ Status = HandleDataIntersection(&Irp->IoStatus, Request, Data, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Descriptor, SubDevice); break; case KSPROPERTY_PIN_PHYSICALCONNECTION: + Status = HandlePhysicalConnection(&Irp->IoStatus, Request, IoStack->Parameters.DeviceIoControl.InputBufferLength, Data, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Descriptor); + break; case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: UNIMPLEMENTED Status = STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -165,6 +165,10 @@ if (!Descriptor) return STATUS_INSUFFICIENT_RESOURCES; + // initialize physical / symbolic link connection list + InitializeListHead(&Descriptor->SymbolicLinkList); + InitializeListHead(&Descriptor->PhysicalConnectionList); + Descriptor->Interfaces = (GUID*)AllocateItem(NonPagedPool, sizeof(GUID) * InterfaceCount, TAG_PORTCLASS); if (!Descriptor->Interfaces) goto cleanup; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -66,10 +66,9 @@ { PPCLASS_DEVICE_EXTENSION DeviceExtension; PLIST_ENTRY Entry; - PSUBDEVICE_ENTRY SubDeviceEntry; PSYMBOLICLINK_ENTRY SymLinkEntry; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; ISubdevice *SubDevice; - ULONG Found; ULONG Index; NTSTATUS Status; @@ -93,32 +92,18 @@ return STATUS_INVALID_PARAMETER; } - Entry = DeviceExtension->SubDeviceList.Flink; - Found = FALSE; - // loop subdevice entry list and search for the subdevice - while(Entry != &DeviceExtension->SubDeviceList) + Status = SubDevice->GetDescriptor(&SubDeviceDescriptor); + if (!NT_SUCCESS(Status)) { - SubDeviceEntry = (PSUBDEVICE_ENTRY)CONTAINING_RECORD(Entry, SUBDEVICE_ENTRY, Entry); - if (SubDeviceEntry->SubDevice == SubDevice) - { - Found = TRUE; - break; - } - Entry = Entry->Flink; + DPRINT1("Failed to retrieve subdevice descriptor %x\n", Status); + // the provided port driver doesnt support ISubdevice + return STATUS_INVALID_PARAMETER; } - // release the subdevice - SubDevice->Release(); - - if (!Found) - return STATUS_NOT_FOUND; - - // remove subdevice entry - RemoveEntryList(&SubDeviceEntry->Entry); // loop our create items and disable the create handler for(Index = 0; Index < DeviceExtension->MaxSubDevices; Index++) { - if (!RtlCompareUnicodeString(&SubDeviceEntry->Name, &DeviceExtension->CreateItems[Index].ObjectClass, TRUE)) + if (!RtlCompareUnicodeString(&SubDeviceDescriptor->RefString, &DeviceExtension->CreateItems[Index].ObjectClass, TRUE)) { DeviceExtension->CreateItems[Index].Create = NULL; RtlInitUnicodeString(&DeviceExtension->CreateItems[Index].ObjectClass, NULL); @@ -127,10 +112,10 @@ } // now unregister device interfaces - while(!IsListEmpty(&SubDeviceEntry->SymbolicLinkList)) + while(!IsListEmpty(&SubDeviceDescriptor->SymbolicLinkList)) { // remove entry - Entry = RemoveHeadList(&SubDeviceEntry->SymbolicLinkList); + Entry = RemoveHeadList(&SubDeviceDescriptor->SymbolicLinkList); // get symlink entry SymLinkEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(Entry, SYMBOLICLINK_ENTRY, Entry); @@ -141,9 +126,6 @@ // free sym entry FreeItem(SymLinkEntry, TAG_PORTCLASS); } - - // free subdevice entry - ExFreePool(SubDeviceEntry); return STATUS_SUCCESS; }

1 0

[tkreuzer] 43174: Add rbuild files for x64 build. Dedicated to encoded.
by tkreuzer＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: tkreuzer Date: Sat Sep 26 23:52:00 2009 New Revision: 43174 URL: http://svn.reactos.org/svn/reactos?rev=43174&view=rev Log: Add rbuild files for x64 build. Dedicated to encoded. Added: trunk/reactos/ReactOS-amd64.rbuild (with props) trunk/reactos/config-amd64.template.rbuild (with props) Added: trunk/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-amd64.rbuild?rev=4… ============================================================================== --- trunk/reactos/ReactOS-amd64.rbuild (added) +++ trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sat Sep 26 23:52:00 2009 @@ -1,0 +1,320 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config-amd64.rbuild"> + <xi:fallback> + <xi:include href="config-amd64.template.rbuild" /> + </xi:fallback> + </xi:include> + + <define name="_M_AMD64" /> + <define name="_AMD64_" /> + <define name="_M_AXP64" /> + <define name="__x86_64__" /> +  + <define name="_WIN64" /> + <define name="TARGET_amd64" host="true" /> + + <define name="USE_COMPILER_EXCEPTIONS" /> + + <property name="PLATFORM" value="PC"/> + <property name="usewrc" value="false"/> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> + <property name="NTOSKRNL_SHARED" value="-shared"/> + + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + </if> + + <compilerflag>-U_X86_</compilerflag> + <compilerflag>-mpreferred-stack-boundary=4</compilerflag> + <compilerflag>-fno-strict-aliasing</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wno-multichar</compilerflag> + <compilerflag>-Wno-format</compilerflag> +  + <linkerflag>-disable-stdcall-fixup</linkerflag> + <linkerflag>-static</linkerflag> + <linkerflag>--unique=.eh_frame</linkerflag> + + + + <xi:include href="baseaddress.rbuild" /> + + <define name="__REACTOS__" /> + <define name="__REACTOS__" host="true" /> + + <if property="DBG" value="1"> + <define name="DBG">1</define> + <define name="_SEH_ENABLE_TRACE" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="DBG" value="0"> + <define name="DBG">0</define> + </if> + + <if property="KDBG" value="1"> + <define name="KDBG">1</define> + <property name="DBG_OR_KDBG" value="true" /> + </if> + +  + <property name="VERSION_TARGET" value="NT52" /> + + <if property="VERSION_TARGET" value="NT4"> + <define name="WINVER">0x400</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x400</define> + <define name="_WIN32_WINDOWS">0x400</define> + <define name="_SETUPAPI_VER">0x400</define> + </if> + + <if property="VERSION_TARGET" value="NT5"> + <define name="WINVER">0x500</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x500</define> + <define name="_WIN32_WINDOWS">0x500</define> + <define name="_SETUPAPI_VER">0x500</define> + </if> + + <if property="VERSION_TARGET" value="NT51"> + <define name="WINVER">0x501</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="_WIN32_WINDOWS">0x501</define> + <define name="_SETUPAPI_VER">0x501</define> + </if> + + <if property="VERSION_TARGET" value="NT52"> + <define name="WINVER">0x502</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x502</define> + <define name="_WIN32_WINDOWS">0x502</define> + <define name="_SETUPAPI_VER">0x502</define> + </if> + + <if property="VERSION_TARGET" value="NT6"> + <define name="WINVER">0x600</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <define name="_WIN32_WINDOWS">0x600</define> + <define name="_SETUPAPI_VER">0x600</define> + </if> + + <include>.</include> + <include>include</include> + <include root="intermediate">include</include> + <include>include/psdk</include> + <include root="intermediate">include/psdk</include> + <include>include/dxsdk</include> + <include root="intermediate">include/dxsdk</include> + <include>include/crt</include> + <include>include/crt/mingw32</include> + <include>include/ddk</include> + <include>include/GL</include> + <include>include/ndk</include> + <include>include/reactos</include> + <include root="intermediate">include/reactos</include> + <include root="intermediate">include/reactos/mc</include> + <include>include/reactos/libs</include> + + <include host="true">include</include> + <include host="true" root="intermediate">include</include> + <include host="true">include/reactos</include> + <include host="true">include/reactos/wine</include> + + <if property="USERMODE" value="1"> + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> + + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> + </directory> + </if> + + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + + <directory name="drivers"> + <directory name="base"> + <xi:include href="drivers/base/directory.rbuild" /> + </directory> + <directory name="bus"> + <xi:include href="drivers/bus/directory.rbuild" /> + </directory> + <directory name="directx"> + <xi:include href="drivers/directx/directory.rbuild" /> + </directory> + <directory name="filesystems"> + <xi:include href="drivers/filesystems/directory.rbuild" /> + </directory> + <directory name="input"> + <xi:include href="drivers/input/directory.rbuild" /> + </directory> + <directory name="ksfilter"> + <xi:include href="drivers/ksfilter/directory.rbuild" /> + </directory> + +  + + <directory name="network"> + <xi:include href="drivers/network/directory.rbuild" /> + </directory> + <directory name="parallel"> + <xi:include href="drivers/parallel/directory.rbuild" /> + </directory> + <directory name="serial"> + <xi:include href="drivers/serial/directory.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="drivers/setup/directory.rbuild" /> + </directory> + <directory name="storage"> + <xi:include href="drivers/storage/directory.rbuild" /> + </directory> + <directory name="usb"> + <xi:include href="drivers/usb/directory.rbuild" /> + </directory> + <directory name="video"> + <xi:include href="drivers/video/directory.rbuild" /> + </directory> + <directory name="wdm"> + <xi:include href="drivers/wdm/wdm.rbuild" /> + </directory> + <directory name="wmi"> + <xi:include href="drivers/wmi/wmilib.rbuild" /> + </directory> + </directory> + + <directory name="hal"> + <xi:include href="hal/hal.rbuild" /> + </directory> + + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + + <directory name="lib"> + <directory name="3rdparty"> + <directory name="adns"> + <xi:include href="lib/3rdparty/adns/adns.rbuild" /> + </directory> + <directory name="bzip2"> + <xi:include href="lib/3rdparty/bzip2/bzip2.rbuild" /> + </directory> + <directory name="expat"> + <xi:include href="lib/3rdparty/expat/expat.rbuild" /> + </directory> + <directory name="freetype"> + <xi:include href="lib/3rdparty/freetype/freetype.rbuild" /> + </directory> + <directory name="icu4ros"> + <xi:include href="lib/3rdparty/icu4ros/icu4ros.rbuild" /> + </directory> + <directory name="libsamplerate"> + <xi:include href="lib/3rdparty/libsamplerate/libsamplerate.rbuild" /> + </directory> + <directory name="libwine"> + <xi:include href="lib/3rdparty/libwine/libwine.rbuild" /> + </directory> + <directory name="libxml2"> + <xi:include href="lib/3rdparty/libxml2/libxml2.rbuild" /> + </directory> + + <if property="USERMODE" value="1"> + <directory name="mingw"> + <xi:include href="lib/3rdparty/mingw/mingw.rbuild" /> + </directory> + </if> + <directory name="zlib"> + <xi:include href="lib/3rdparty/zlib/zlib.rbuild" /> + </directory> + </directory> + <directory name="sdk"> + <xi:include href="lib/sdk/sdk.rbuild" /> + </directory> + <directory name="cmlib"> + <xi:include href="lib/cmlib/cmlib.rbuild" /> + </directory> + <directory name="debugsup"> + <xi:include href="lib/debugsup/debugsup.rbuild" /> + </directory> + <directory name="drivers"> + <xi:include href="lib/drivers/directory.rbuild" /> + </directory> + <directory name="epsapi"> + <xi:include href="lib/epsapi/epsapi.rbuild" /> + </directory> + <directory name="fslib"> + <xi:include href="lib/fslib/directory.rbuild" /> + </directory> + <directory name="host"> + <xi:include href="lib/host/directory.rbuild" /> + </directory> + <directory name="inflib"> + <xi:include href="lib/inflib/inflib.rbuild" /> + </directory> + <directory name="nls"> + <xi:include href="lib/nls/nls.rbuild" /> + </directory> + <directory name="ntdllsys"> + <xi:include href="lib/ntdllsys/ntdllsys.rbuild" /> + </directory> + <directory name="pseh"> + <xi:include href="lib/pseh/pseh.rbuild" /> + </directory> + <directory name="recyclebin"> + <xi:include href="lib/recyclebin/recyclebin.rbuild" /> + </directory> + <directory name="rossym"> + <xi:include href="lib/rossym/rossym.rbuild" /> + </directory> + <directory name="rtl"> + <xi:include href="lib/rtl/rtl.rbuild" /> + </directory> + <directory name="smlib"> + <xi:include href="lib/smlib/smlib.rbuild" /> + </directory> + <directory name="win32ksys"> + <xi:include href="lib/win32ksys/win32ksys.rbuild" /> + </directory> + </directory> + + <directory name="media"> + <xi:include href="media/media.rbuild" /> + </directory> + + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + + <directory name="subsystems"> + <xi:include href="subsystems/subsystems.rbuild" /> + </directory> + + <directory name="tools"> + <xi:include href="tools/tools.rbuild" /> + </directory> + + + +</project> Propchange: trunk/reactos/ReactOS-amd64.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/config-amd64.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-amd64.template.rbui… ============================================================================== --- trunk/reactos/config-amd64.template.rbuild (added) +++ trunk/reactos/config-amd64.template.rbuild [iso-8859-1] Sat Sep 26 23:52:00 2009 @@ -1,0 +1,92 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group> + + + + + +<property name="SARCH" value="" /> + + + +<property name="OARCH" value="athlon64" /> + + + +<property name="OPTIMIZE" value="1" /> + + + +<property name="KDBG" value="0" /> + + + +<property name="DBG" value="1" /> + + + +<property name="GDB" value="0" /> + + + +<property name="NSWPAT" value="1" /> + + +<property name="_WINKD_" value="1" /> + + +<property name="_ELF_" value="0" /> + + +<property name="USERMODE" value="1" /> + + +</group> Propchange: trunk/reactos/config-amd64.template.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 43173: Merge HAL changes 34743, 34812, 34839, 34917, 35515, 35771, 35902, 35904, 35905, 35906, 35942, 35947, 35948, 35949, 35953, 36013, 36388, 36389, 36570, 37873, 37991, 39151 from amd64 branch
by tkreuzer＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: tkreuzer Date: Sat Sep 26 23:32:53 2009 New Revision: 43173 URL: http://svn.reactos.org/svn/reactos?rev=43173&view=rev Log: Merge HAL changes 34743, 34812, 34839, 34917, 35515, 35771, 35902, 35904, 35905, 35906, 35942, 35947, 35948, 35949, 35953, 36013, 36388, 36389, 36570, 37873, 37991, 39151 from amd64 branch Added: trunk/reactos/hal/hal/hal_amd64.def (with props) trunk/reactos/hal/halamd64/ - copied from r34743, branches/ros-amd64-bringup/reactos/hal/halamd64/ trunk/reactos/hal/halamd64/directory.rbuild - copied unchanged from r34812, branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild trunk/reactos/hal/halamd64/generic/ - copied from r34812, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/ trunk/reactos/hal/halamd64/generic/halinit.c - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/halinit.c trunk/reactos/hal/halamd64/generic/irq.S - copied, changed from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S trunk/reactos/hal/halamd64/generic/misc.c - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/misc.c trunk/reactos/hal/halamd64/generic/mps.S - copied unchanged from r35947, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/mps.S trunk/reactos/hal/halamd64/generic/systimer.S - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/systimer.S trunk/reactos/hal/halamd64/include/ - copied from r34812, branches/ros-amd64-bringup/reactos/hal/halamd64/include/ trunk/reactos/hal/halamd64/include/bus.h - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/include/bus.h trunk/reactos/hal/halamd64/up/ - copied from r34812, branches/ros-amd64-bringup/reactos/hal/halamd64/up/ trunk/reactos/hal/halamd64/up/processor.c - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c trunk/reactos/hal/halx86/hal_generic_amd64.rbuild - copied, changed from r35905, branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild Modified: trunk/reactos/ (props changed) trunk/reactos/hal/hal.rbuild trunk/reactos/hal/hal/hal.c trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/halamd64/generic/generic.rbuild trunk/reactos/hal/halamd64/include/hal.h trunk/reactos/hal/halamd64/include/halp.h trunk/reactos/hal/halamd64/up/halup.rbuild trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/apic.h trunk/reactos/hal/halx86/include/bus.h trunk/reactos/hal/halx86/include/hal.h trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/mp/apic.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 26 23:32:53 2009 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/reactos:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 +/branches/ros-amd64-bringup/reactos:34743,34812,34839,34917,35515,35746,35771,35789,35902,35904-35906,35942,35947-35949,35953,36013,36388-36389,36570,36614,36930,37873,37991,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=43173&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -26,4 +26,12 @@ <xi:include href="halarm/directory.rbuild" /> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="halx86"> + <xi:include href="halx86/hal_generic_amd64.rbuild" /> + </directory> + <directory name="halamd64"> + <xi:include href="halamd64/directory.rbuild" /> + </directory> + </if> </group> Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=43173&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.c [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -75,6 +75,7 @@ return Interval; } +#ifndef _M_AMD64 VOID FASTCALL ExAcquireFastMutex( @@ -101,7 +102,7 @@ return TRUE; } - +#endif VOID NTAPI @@ -466,7 +467,7 @@ VOID NTAPI HalRequestIpi( - ULONG Unknown) + KAFFINITY TargetSet) { UNIMPLEMENTED; } @@ -747,7 +748,7 @@ return 0; } - +#ifndef _M_AMD64 VOID FASTCALL KeAcquireInStackQueuedSpinLock( @@ -776,6 +777,7 @@ { UNIMPLEMENTED; } +#endif VOID NTAPI @@ -784,6 +786,7 @@ UNIMPLEMENTED; } +#ifndef _M_AMD64 #undef KeGetCurrentIrql KIRQL NTAPI @@ -802,6 +805,7 @@ { UNIMPLEMENTED; } +#endif LARGE_INTEGER @@ -818,6 +822,7 @@ return Value; } +#ifndef _M_AMD64 #undef KeRaiseIrql VOID NTAPI @@ -847,7 +852,9 @@ return (KIRQL)0; } - +#endif + +#ifndef _M_AMD64 #undef KeReleaseSpinLock VOID NTAPI @@ -857,7 +864,7 @@ { UNIMPLEMENTED; } - +#endif VOID NTAPI @@ -891,7 +898,7 @@ return FALSE; } - +#if !defined(_M_AMD64) KIRQL FASTCALL KfAcquireSpinLock( @@ -931,8 +938,9 @@ { UNIMPLEMENTED; } - - +#endif + +#if !defined(_M_AMD64) VOID NTAPI READ_PORT_BUFFER_UCHAR( @@ -1058,6 +1066,7 @@ { UNIMPLEMENTED; } +#endif KIRQL FASTCALL Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=431… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -10,8 +10,8 @@ <file>hal.c</file> <file>hal.rc</file> </module> - </if> - <if property="ARCH" value="i386"> + </if> + <if property="ARCH" value="i386"> <module name="hal" type="kernelmodedll"> <importlibrary definition="hal.pspec" /> <include base="ntoskrnl">include</include> @@ -20,7 +20,7 @@ <file>hal.c</file> <file>hal.rc</file> </module> - </if> + </if> <if property="ARCH" value="i386"> <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> </module> @@ -30,4 +30,14 @@ <if property="ARCH" value="powerpc"> <module name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halppc_up"/> </if> + <if property="ARCH" value="amd64"> + <module name="hal" type="kernelmodedll"> + <importlibrary definition="hal_amd64.def" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <define name="_NTHAL_" /> + <file>hal.c</file> + <file>hal.rc</file> + </module> + </if> </group> Added: trunk/reactos/hal/hal/hal_amd64.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_amd64.def?rev=… ============================================================================== --- trunk/reactos/hal/hal/hal_amd64.def (added) +++ trunk/reactos/hal/hal/hal_amd64.def [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,0 +1,86 @@ +; Hardware Abstraction Layer - ReactOS Operating System + +LIBRARY hal.dll + +EXPORTS +HalAcquireDisplayOwnership +HalAdjustResourceList +HalAllProcessorsStarted +HalAllocateAdapterChannel +HalAllocateCommonBuffer +HalAllocateCrashDumpRegisters +HalAssignSlotResources +;HalBugCheckSystem +HalCalibratePerformanceCounter +HalClearSoftwareInterrupt +;HalConvertDeviceIdtToIrql +;HalDisableInterrupt +HalDisplayString +;HalEnableInterrupt +;HalEnumerateEnvironmentVariablesEx +;HalEnumerateProcessors +HalFlushCommonBuffer +HalFreeCommonBuffer +HalGetAdapter +HalGetBusData +HalGetBusDataByOffset +HalGetEnvironmentVariable +;HalGetEnvironmentVariableEx +;HalGetInterruptTargetInformation +HalGetInterruptVector +;HalGetMessageRoutingInfo +;HalGetProcessorIdByNtNumber +;HalGetVectorInput +;HalHandleMcheck +HalHandleNMI +HalInitSystem +;HalInitializeBios +;HalInitializeOnResume +HalInitializeProcessor +;HalIsHyperThreadingEnabled +HalMakeBeep +HalProcessorIdle +HalQueryDisplayParameters +;HalQueryEnvironmentVariableInfoEx +;HalQueryMaximumProcessorCount +HalQueryRealTimeClock +HalReadDmaCounter +;HalRegisterDynamicProcessor +;HalRegisterErrataCallbacks +HalReportResourceUsage +HalRequestIpi +HalRequestSoftwareInterrupt +HalReturnToFirmware +;HalSendNMI +;HalSendSoftwareInterrupt +HalSetBusData +HalSetBusDataByOffset +HalSetDisplayParameters +HalSetEnvironmentVariable +;HalSetEnvironmentVariableEx +HalSetProfileInterval +HalSetRealTimeClock +HalSetTimeIncrement +;HalStartDynamicProcessor +HalStartNextProcessor +HalStartProfileInterrupt +HalStopProfileInterrupt +HalSystemVectorDispatchEntry +HalTranslateBusAddress +IoAssignDriveLetters +IoFlushAdapterBuffers +IoFreeAdapterChannel +IoFreeMapRegisters +IoMapTransfer +IoReadPartitionTable +IoSetPartitionInformation +IoWritePartitionTable +KdComPortInUse=_KdComPortInUse DATA +KeFlushWriteBuffer +KeQueryPerformanceCounter +KeStallExecutionProcessor +;x86BiosAllocateBuffer +;x86BiosCall +;x86BiosFreeBuffer +;x86BiosReadMemory +;x86BiosWriteMemory Propchange: trunk/reactos/hal/hal/hal_amd64.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halamd64/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/generic/gener… ============================================================================== --- trunk/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,10 +1,16 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halamd64_generic" type="objectlibrary"> - <include base="halamd64_generic">../include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <file>hal.c</file> - <pch>../include/hal.h</pch> -</module> +<group> + <module name="hal_generic" type="objectlibrary"> + <include base="hal_generic">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <file>halinit.c</file> + <file>irq.S</file> + <file>misc.c</file> + <file>mps.S</file> + <file>systimer.S</file> + <pch>../include/hal.h</pch> + </module> +</group> Copied: trunk/reactos/hal/halamd64/generic/irq.S (from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/generic/irq.S… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/generic/irq.S [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -14,7 +14,7 @@ .macro UNIMPLEMENTED func jmp 2f 1: - .ascii "Sory, asm function " + .ascii "Sorry, asm function " .ascii func .ascii " is unimplemented!\n\0" 2: @@ -34,13 +34,44 @@ .globl _HalpInitPICs .func _HalpInitPICs _HalpInitPICs: -UNIMPLEMENTED "HalpInitPICs" + UNIMPLEMENTED "HalpInitPICs" +.endfunc +.global _HalEnableInterrupt +.func _HalEnableInterrupt +_HalEnableInterrupt: + UNIMPLEMENTED "HalEnableInterrupt" .endfunc + +.global _HalDisableInterrupt +.func _HalDisableInterrupt +_HalDisableInterrupt: + UNIMPLEMENTED "HalDisableInterrupt" +.endfunc + +.global _HalRequestSoftwareInterrupt +.func _HalRequestSoftwareInterrupt +_HalRequestSoftwareInterrupt: + UNIMPLEMENTED "HalRequestSoftwareInterrupt" +.endfunc + +.global _HalSendSoftwareInterrupt +.func _HalSendSoftwareInterrupt +_HalSendSoftwareInterrupt: + UNIMPLEMENTED "HalSendSoftwareInterrupt" +.endfunc + +.global _HalEndSystemInterrupt +.func _HalEndSystemInterrupt +_HalEndSystemInterrupt: + UNIMPLEMENTED "HalEndSystemInterrupt" +.endfunc + .globl _HalClearSoftwareInterrupt .func _HalClearSoftwareInterrupt _HalClearSoftwareInterrupt: + UNIMPLEMENTED "HalClearSoftwareInterrupt" /* Get IRR mask */ mov eax, 1 @@ -52,42 +83,9 @@ ret .endfunc -.globl _HalRequestSoftwareInterrupt -.func _HalRequestSoftwareInterrupt -_HalRequestSoftwareInterrupt: -UNIMPLEMENTED "HalRequestSoftwareInterrupt" -.endfunc - .globl _HalBeginSystemInterrupt .func _HalBeginSystemInterrupt _HalBeginSystemInterrupt: -UNIMPLEMENTED "HalBeginSystemInterrupt" + UNIMPLEMENTED "HalBeginSystemInterrupt" .endfunc -.globl _HalpApcInterrupt -.func _HalpApcInterrupt -//TRAP_FIXUPS hapc_a, hapc_t, DoFixupV86, DoFixupAbios -_HalpApcInterrupt: -UNIMPLEMENTED "HalpApcInterrupt" -.endfunc - -.globl _HalpApcInterrupt2ndEntry -.func _HalpApcInterrupt2ndEntry -_HalpApcInterrupt2ndEntry: -UNIMPLEMENTED "HalpApcInterrupt2ndEntry" -.endfunc - -.globl _HalpDispatchInterrupt -.func _HalpDispatchInterrupt -//TRAP_FIXUPS hdpc_a, hdpc_t, DoFixupV86, DoFixupAbios -_HalpDispatchInterrupt: -UNIMPLEMENTED "HalpDispatchInterrupt" -.endfunc - - -.globl _HalpDispatchInterrupt2ndEntry -.func _HalpDispatchInterrupt2ndEntry -_HalpDispatchInterrupt2ndEntry: -UNIMPLEMENTED "HalpDispatchInterrupt2ndEntry" -.endfunc - Modified: trunk/reactos/hal/halamd64/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/include/hal.h… ============================================================================== --- trunk/reactos/hal/halamd64/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/include/hal.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS HAL - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halarm/include/hal.h - * PURPOSE: Hardware Abstraction Layer Header - * PROGRAMMERS: ReactOS Portable Systems Group + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Hardware Abstraction Layer + * FILE: hal/halx86/include/hal.h + * PURPOSE: HAL Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES ******************************************************************/ @@ -28,14 +28,23 @@ #include <arc/arc.h> #include <iotypes.h> #include <kefuncs.h> -#include <intrin.h> #include <halfuncs.h> #include <iofuncs.h> #include <ldrtypes.h> #include <obfuncs.h> +/* Internal kernel headers */ +#include "internal/pci.h" +#include "internal/i386/intrin_i.h" + /* Internal HAL Headers */ +//#include "apic.h" +#include "bus.h" +//#include "halirq.h" +//#include "haldma.h" #include "halp.h" +//#include "mps.h" +//#include "ioapic.h" /* Helper Header */ #include <reactos/helper.h> Modified: trunk/reactos/hal/halamd64/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/include/halp.… ============================================================================== --- trunk/reactos/hal/halamd64/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/include/halp.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,22 +1,172 @@ +/* + * + */ + #ifndef __INTERNAL_HAL_HAL_H #define __INTERNAL_HAL_HAL_H -// -// ARM Headers -// -#include <internal/arm/ke.h> -#include <internal/arm/intrin_i.h> +#define HAL_APC_REQUEST 0 +#define HAL_DPC_REQUEST 1 + +/* CMOS Registers and Ports */ +#define CMOS_CONTROL_PORT (PUCHAR)0x70 +#define CMOS_DATA_PORT (PUCHAR)0x71 +#define RTC_REGISTER_A 0x0A +#define RTC_REGISTER_B 0x0B +#define RTC_REG_A_UIP 0x80 +#define RTC_REGISTER_CENTURY 0x32 + +/* Timer Registers and Ports */ +#define TIMER_CONTROL_PORT 0x43 +#define TIMER_DATA_PORT0 0x40 +#define TIMER_SC0 0 +#define TIMER_BOTH 0x30 +#define TIMER_MD2 0x4 + +/* Conversion functions */ +#define BCD_INT(bcd) \ + (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F)) +#define INT_BCD(int) \ + (UCHAR)(((int / 10) << 4) + (int % 10)) + +/* adapter.c */ +PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); + +/* bus.c */ +VOID NTAPI HalpInitNonBusHandler (VOID); + +/* irql.c */ +VOID NTAPI HalpInitPICs(VOID); + +/* udelay.c */ +VOID NTAPI HalpInitializeClock(VOID); + +/* pci.c */ +VOID HalpInitPciBus (VOID); + +/* dma.c */ +VOID HalpInitDma (VOID); + +/* Non-generic initialization */ +VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); +VOID HalpInitPhase1(VOID); +VOID NTAPI HalpClockInterrupt(VOID); // -// Versatile Peripherals +// KD Support // -#include <peripherals/pl011.h> -#include <peripherals/pl190.h> -#include <peripherals/sp804.h> +VOID +NTAPI +HalpCheckPowerButton( + VOID +); + +VOID +NTAPI +HalpRegisterKdSupportFunctions( + VOID +); + +NTSTATUS +NTAPI +HalpSetupPciDeviceForDebugging( + IN PVOID LoaderBlock, + IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice +); + +NTSTATUS +NTAPI +HalpReleasePciDeviceForDebugging( + IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice +); // -// WDK Hack +// Memory routines // -#define KdComPortInUse _KdComPortInUse +PVOID +NTAPI +HalpMapPhysicalMemory64( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG NumberPage +); + +VOID +NTAPI +HalpUnmapVirtualAddress( + IN PVOID VirtualAddress, + IN ULONG NumberPages +); + +/* sysinfo.c */ +NTSTATUS +NTAPI +HaliQuerySystemInformation( + IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength +); + +NTSTATUS +NTAPI +HaliSetSystemInformation( + IN HAL_SET_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer +); + +// +// BIOS Routines +// +BOOLEAN +NTAPI +HalpBiosDisplayReset( + VOID +); + +ULONG +NTAPI +HalpBorrowTss( + VOID +); + +ULONG +NTAPI +HalpReturnTss( + ULONG SavedTss +); + +VOID +NTAPI +HalpBiosCall( + VOID +); + +VOID +NTAPI +HalpTrap0D( + VOID +); + +VOID +NTAPI +HalpTrap06( + VOID +); + +PDMA_ADAPTER +NTAPI +HalpGetDmaAdapter( + IN PVOID Context, + IN PDEVICE_DESCRIPTION DeviceDescription, + OUT PULONG NumberOfMapRegisters); + +VOID HaliInitBSP(VOID); +VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); + +extern PVOID HalpRealModeStart; +extern PVOID HalpRealModeEnd; + +extern KSPIN_LOCK HalpSystemHardwareLock; #endif /* __INTERNAL_HAL_HAL_H */ Modified: trunk/reactos/hal/halamd64/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/up/halup.rbui… ============================================================================== --- trunk/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,14 +1,16 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll"> - <importlibrary definition="../../hal/hal_amd64.def" /> +<module name="halup" type="kernelmodedll" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="hal_amd64.def" /> <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> - <include base="halamd64_generic">../include</include> + <include base="halup">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> - <library>halamd64_generic</library> + <library>hal_generic_amd64</library> + <library>hal_generic</library> <library>ntoskrnl</library> <file>halinit_up.c</file> <file>halup.rc</file> + <file>processor.c</file> </module> Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -48,7 +48,7 @@ PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Increment; USHORT RollOver; - ULONG Flags; + ULONG_PTR Flags; /* Check the CPU Type */ if (Prcb->CpuType <= 4) @@ -92,7 +92,7 @@ HalCalibratePerformanceCounter(IN volatile PLONG Count, IN ULONGLONG NewCount) { - ULONG Flags; + ULONG_PTR Flags; /* Disable interrupts */ Flags = __readeflags(); Copied: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild (from r35905, branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -13,13 +13,14 @@ <file>dma.c</file> <file>drive.c</file> <file>display.c</file> + <file>pci.c</file> <file>profil.c</file> <file>reboot.c</file> <file>sysinfo.c</file> <file>timer.c</file> </directory> <directory name="mp"> -  + <file>apic.c</file> </directory> <directory name="include"> <pch>hal.h</pch> Modified: trunk/reactos/hal/halx86/include/apic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/apic.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/apic.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/apic.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -5,7 +5,11 @@ #ifndef __INTERNAL_HAL_APIC_H #define __INTERNAL_HAL_APIC_H +#ifdef _M_AMD64 +#define APIC_DEFAULT_BASE 0xfffffffffee00000ULL; +#else #define APIC_DEFAULT_BASE 0xFEE00000 /* Default Local APIC Base Register Address */ +#endif /* APIC Register Address Map */ #define APIC_ID 0x0020 /* Local APIC ID Register (R/W) */ @@ -115,30 +119,6 @@ #define APIC_TDCR_128 0x0A #define APIC_TDCR_1 0x0B -#define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ -#define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ - -#define APIC_LVT3_DM (0x7 << 8) -#define APIC_LVT3_IIPP (0x1 << 13) -#define APIC_LVT3_TM (0x1 << 15) -#define APIC_LVT3_MASKED (0x1 << 16) -#define APIC_LVT3_OS (0x1 << 17) - -#define APIC_TDCR_TMBASE (0x1 << 2) -#define APIC_TDCR_MASK 0x0F -#define APIC_TDCR_2 0x00 -#define APIC_TDCR_4 0x01 -#define APIC_TDCR_8 0x02 -#define APIC_TDCR_16 0x03 -#define APIC_TDCR_32 0x08 -#define APIC_TDCR_64 0x09 -#define APIC_TDCR_128 0x0A -#define APIC_TDCR_1 0x0B - #define APIC_TARGET_SELF 0x100 #define APIC_TARGET_ALL 0x200 #define APIC_TARGET_ALL_BUT_SELF 0x300 @@ -206,7 +186,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); return *p; } @@ -216,7 +196,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); *p = Value; } @@ -230,7 +210,7 @@ lastregw[CPU] = Offset; lastvalw[CPU] = Value; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); *p = Value; } @@ -241,7 +221,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); return *p; } #else @@ -253,7 +233,7 @@ lastregr[CPU] = Offset; lastvalr[CPU] = 0; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); lastvalr[CPU] = *p; return lastvalr[CPU]; Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -43,7 +43,7 @@ #define TYPE1_READ(x, y) \ TYPE1_START(x, y) \ *((POINTER_TO_(y))Buffer) = \ - READ_FROM(y)((POINTER_TO_(y))(BusData->Config.Type1.Data + i)); \ + READ_FROM(y)((POINTER_TO_(y))(ULONG_PTR)(BusData->Config.Type1.Data + i)); \ TYPE1_END(y) // @@ -51,7 +51,7 @@ // #define TYPE1_WRITE(x, y) \ TYPE1_START(x, y) \ - WRITE_TO(y)((POINTER_TO_(y))(BusData->Config.Type1.Data + i), \ + WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)(BusData->Config.Type1.Data + i), \ *((POINTER_TO_(y))Buffer)); \ TYPE1_END(y) @@ -69,7 +69,7 @@ #define TYPE2_READ(x, y) \ TYPE2_START(x, y) \ *((POINTER_TO_(y))Buffer) = \ - READ_FROM(y)((POINTER_TO_(y))(ULONG)PciCfg->u.AsUSHORT); \ + READ_FROM(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT); \ TYPE2_END(y) // @@ -77,7 +77,7 @@ // #define TYPE2_WRITE(x, y) \ TYPE2_START(x, y) \ - WRITE_TO(y)((POINTER_TO_(y))(ULONG)PciCfg->u.AsUSHORT, \ + WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT, \ *((POINTER_TO_(y))Buffer)); \ TYPE2_END(y) Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -34,7 +34,11 @@ /* Internal kernel headers */ #include "internal/pci.h" +#ifdef _M_AMD64 +#include "internal/amd64/intrin_i.h" +#else #include "internal/i386/intrin_i.h" +#endif /* Internal HAL Headers */ #include "apic.h" Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -154,6 +154,17 @@ VOID ); +#ifdef _M_AMD64 +#define KfLowerIrql KeLowerIrql +#ifndef CONFIG_SMP +/* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ +#define KiAcquireSpinLock(SpinLock) +#define KiReleaseSpinLock(SpinLock) +#define KfAcquireSpinLock(SpinLock) KfRaiseIrql(DISPATCH_LEVEL); +#define KfReleaseSpinLock(SpinLock, OldIrql) KeLowerIrql(OldIrql); +#endif // !CONFIG_SMP +#endif // _M_AMD64 + extern PVOID HalpRealModeStart; extern PVOID HalpRealModeEnd; Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=4… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -709,6 +709,9 @@ MpsIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, PKTRAP_FRAME TrapFrame) { +#ifdef _M_AMD64 + UNIMPLEMENTED; +#else TrapFrame->SegGs = (USHORT)IrqTrapFrame->Gs; TrapFrame->SegFs = (USHORT)IrqTrapFrame->Fs; TrapFrame->SegEs = (USHORT)IrqTrapFrame->Es; @@ -724,6 +727,7 @@ TrapFrame->Eip = IrqTrapFrame->Eip; TrapFrame->SegCs = IrqTrapFrame->Cs; TrapFrame->EFlags = IrqTrapFrame->Eflags; +#endif } VOID @@ -798,7 +802,7 @@ APICSetupLVTT(1000000000); - TSCPresent = ((PKIPCR)KeGetPcr())->PrcbData.FeatureBits & KF_RDTSC ? TRUE : FALSE; + TSCPresent = KeGetCurrentPrcb()->FeatureBits & KF_RDTSC ? TRUE : FALSE; /* * The timer chip counts down to zero. Let's wait @@ -827,7 +831,7 @@ DPRINT("CPU clock speed is %ld.%04ld MHz.\n", CPUMap[CPU].CoreSpeed/1000000, CPUMap[CPU].CoreSpeed%1000000); - ((PKIPCR)KeGetPcr())->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; + KeGetCurrentPrcb()->MHz = CPUMap[CPU].CoreSpeed/1000000; } CPUMap[CPU].BusSpeed = (HZ * (long)(tt1 - tt2) * APIC_DIVISOR); @@ -843,8 +847,25 @@ } VOID -SetInterruptGate(ULONG index, ULONG address) -{ +SetInterruptGate(ULONG index, ULONG_PTR address) +{ +#ifdef _M_AMD64 + KIDTENTRY64 *idt; + + idt = &KeGetPcr()->IdtBase[index]; + + idt->OffsetLow = address & 0xffff; + idt->Selector = KGDT_64_R0_CODE; + idt->IstIndex = 0; + idt->Reserved0 = 0; + idt->Type = 0x0e; + idt->Dpl = 0; + idt->Present = 1; + idt->OffsetMiddle = (address >> 16) & 0xffff; + idt->OffsetHigh = address >> 32; + idt->Reserved1 = 0; + idt->Alignment = 0; +#else KIDTENTRY *idt; KIDT_ACCESS Access; @@ -860,6 +881,7 @@ idt->Selector = KGDT_R0_CODE; idt->Access = Access.Value; idt->ExtendedOffset = (USHORT)(address >> 16); +#endif } VOID HaliInitBSP(VOID) @@ -880,11 +902,11 @@ BSPInitialized = TRUE; /* Setup interrupt handlers */ - SetInterruptGate(LOCAL_TIMER_VECTOR, (ULONG)MpsTimerInterrupt); - SetInterruptGate(ERROR_VECTOR, (ULONG)MpsErrorInterrupt); - SetInterruptGate(SPURIOUS_VECTOR, (ULONG)MpsSpuriousInterrupt); + SetInterruptGate(LOCAL_TIMER_VECTOR, (ULONG_PTR)MpsTimerInterrupt); + SetInterruptGate(ERROR_VECTOR, (ULONG_PTR)MpsErrorInterrupt); + SetInterruptGate(SPURIOUS_VECTOR, (ULONG_PTR)MpsSpuriousInterrupt); #ifdef CONFIG_SMP - SetInterruptGate(IPI_VECTOR, (ULONG)MpsIpiInterrupt); + SetInterruptGate(IPI_VECTOR, (ULONG_PTR)MpsIpiInterrupt); #endif DPRINT("APIC is mapped at 0x%X\n", APICBase); @@ -913,18 +935,18 @@ CommonBase = (PULONG)COMMON_AREA; /* Copy bootstrap code to common area */ - memcpy((PVOID)((ULONG)CommonBase + PAGE_SIZE), + memcpy((PVOID)((ULONG_PTR)CommonBase + PAGE_SIZE), &APstart, - (ULONG)&APend - (ULONG)&APstart + 1); + (ULONG_PTR)&APend - (ULONG_PTR)&APstart + 1); /* Set shutdown code */ CMOS_WRITE(0xF, 0xA); /* Set warm reset vector */ - ps = (PUSHORT)((ULONG)BIOSBase + 0x467); + ps = (PUSHORT)((ULONG_PTR)BIOSBase + 0x467); *ps = (COMMON_AREA + PAGE_SIZE) & 0xF; - ps = (PUSHORT)((ULONG)BIOSBase + 0x469); + ps = (PUSHORT)((ULONG_PTR)BIOSBase + 0x469); *ps = (COMMON_AREA + PAGE_SIZE) >> 4; #endif

1 0

[janderwald] 43172: - Add macros
by janderwald＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: janderwald Date: Sat Sep 26 22:19:28 2009 New Revision: 43172 URL: http://svn.reactos.org/svn/reactos?rev=43172&view=rev Log: - Add macros Modified: trunk/reactos/include/psdk/mmreg.h Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Sat Sep 26 22:19:28 2009 @@ -133,6 +133,9 @@ #define WAVE_FORMAT_OLISBC 0x1003 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIOPR 0x1004 /* Ing C. Olivetti & C., S.p.A. */ +#define MM_UNMAPPED 0xffff +#define MM_PID_UNMAPPED MM_UNMAPPED + #if !defined(WAVE_FORMAT_EXTENSIBLE) #define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */ #endif

1 0

[tkreuzer] 43171: Add global compilerflag to ignore format warnings
by tkreuzer＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: tkreuzer Date: Sat Sep 26 21:54:59 2009 New Revision: 43171 URL: http://svn.reactos.org/svn/reactos?rev=43171&view=rev Log: Add global compilerflag to ignore format warnings Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sat Sep 26 21:54:59 2009 @@ -46,6 +46,7 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> + <compilerflag>-Wno-format</compilerflag>  <linkerflag>-disable-stdcall-fixup</linkerflag> <linkerflag>-static</linkerflag> Modified: branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] Sat Sep 26 21:54:59 2009 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe"> - <compilerflag>-Wno-format</compilerflag> <include base="msiexec">.</include> <include base="ReactOS">include/wine</include> <define name="__WINESRC__" />

1 0

[gschneider] 43170: Don't add quick launch icon copies after showing a context menu See issue #2453 for more details.
by gschneider＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: gschneider Date: Sat Sep 26 21:24:39 2009 New Revision: 43170 URL: http://svn.reactos.org/svn/reactos?rev=43170&view=rev Log: Don't add quick launch icon copies after showing a context menu See issue #2453 for more details. Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Sat Sep 26 21:24:39 2009 @@ -252,9 +252,7 @@ if (entry) { // entry is NULL for desktop switch buttons HRESULT hr = entry->do_context_menu(_hwnd, screen_pt, _cm_ifs); - if (SUCCEEDED(hr)) - AddShortcuts(); //refresh(); - else + if (!SUCCEEDED(hr)) CHECKERROR(hr); } else goto def;

1 0

[dgorbachev] 43169: - Import Breton, Romansh, and Welsh NLS files from Wine. - Sync locale RC files. - Move language-specific stuff to more visible to translators place. ; )
by dgorbachev＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: dgorbachev Date: Sat Sep 26 19:37:25 2009 New Revision: 43169 URL: http://svn.reactos.org/svn/reactos?rev=43169&view=rev Log: - Import Breton, Romansh, and Welsh NLS files from Wine. - Sync locale RC files. - Move language-specific stuff to more visible to translators place. ;) Added: trunk/reactos/dll/win32/kernel32/nls/brf.nls (with props) trunk/reactos/dll/win32/kernel32/nls/cym.nls (with props) trunk/reactos/dll/win32/kernel32/nls/rmc.nls (with props) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/locale_rc.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -5,6 +5,9 @@ #include <reactos/version.rc> #include "windows.h" -#include "errcodes.rc" #include "locale_rc.rc" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "windef.h" @@ -44,9 +44,9 @@ #include "nls/arh.nls" /* 0x3c01 LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN */ #include "nls/arq.nls" /* 0x4001 LANG_ARABIC, SUBLANG_ARABIC_QATAR */ -#include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_NEUTRAL */ - -#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_NEUTRAL */ +#include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_DEFAULT */ + +#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_DEFAULT */ #include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ #include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */ @@ -54,9 +54,9 @@ #include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */ #include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ -#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_NEUTRAL */ - -#include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_NEUTRAL */ +#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */ + +#include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_DEFAULT */ #include "nls/deu.nls" /* 0x0407 LANG_GERMAN, SUBLANG_GERMAN */ #include "nls/des.nls" /* 0x0807 LANG_GERMAN, SUBLANG_GERMAN_SWISS */ @@ -64,7 +64,7 @@ #include "nls/del.nls" /* 0x1007 LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG */ #include "nls/dec.nls" /* 0x1407 LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN */ -#include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_NEUTRAL */ +#include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_DEFAULT */ #include "nls/enu.nls" /* 0x0409 LANG_ENGLISH, SUBLANG_ENGLISH_US */ #include "nls/eng.nls" /* 0x0809 LANG_ENGLISH, SUBLANG_ENGLISH_UK */ @@ -101,7 +101,7 @@ #include "nls/esi.nls" /* 0x4c0a LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA */ #include "nls/esu.nls" /* 0x500a LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO */ -#include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_NEUTRAL */ +#include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_DEFAULT */ #include "nls/fra.nls" /* 0x040c LANG_FRENCH, SUBLANG_FRENCH */ #include "nls/frb.nls" /* 0x080c LANG_FRENCH, SUBLANG_FRENCH_BELGIAN */ @@ -110,16 +110,16 @@ #include "nls/frl.nls" /* 0x140c LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG */ #include "nls/frm.nls" /* 0x180c LANG_FRENCH, SUBLANG_FRENCH_MONACO */ -#include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_NEUTRAL */ - -#include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_NEUTRAL */ - -#include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_NEUTRAL */ +#include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_DEFAULT */ + +#include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_DEFAULT */ + +#include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_DEFAULT */ #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_NEUTRAL */ +#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ #include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ @@ -129,124 +129,122 @@ #include "nls/nor.nls" /* 0x0414 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL */ #include "nls/non.nls" /* 0x0814 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK */ -#include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_NEUTRAL */ +#include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_DEFAULT */ #include "nls/ptb.nls" /* 0x0416 LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN */ #include "nls/ptg.nls" /* 0x0816 LANG_PORTUGUESE, SUBLANG_PORTUGUESE */ -#include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_NEUTRAL */ - -#include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_NEUTRAL */ - -#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_NEUTRAL */ +//#include "nls/rmc.nls" /* 0x0417 LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND */ + +#include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_DEFAULT */ + +#include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_DEFAULT */ + +#include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ -#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_NEUTRAL */ - -#include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_NEUTRAL */ - -#include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_NEUTRAL */ +#include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ + +#include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_DEFAULT */ + +#include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_SWEDISH */ #include "nls/svf.nls" /* 0x081d LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND */ -#include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_NEUTRAL */ - -#include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_NEUTRAL */ +#include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_DEFAULT */ + +#include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_DEFAULT */ #include "nls/urd.nls" /* 0x0420 LANG_URDU, SUBLANG_URDU_PAKISTAN */ -#include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_NEUTRAL */ - -#include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_NEUTRAL */ - -#include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_NEUTRAL */ - -#include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_NEUTRAL */ - -#include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_NEUTRAL */ - -#include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_NEUTRAL */ +#include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_DEFAULT */ + +#include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_DEFAULT */ + +#include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_DEFAULT */ + +#include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_DEFAULT */ + +#include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_DEFAULT */ + +#include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_DEFAULT */ #include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ -#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_NEUTRAL */ - -#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_NEUTRAL */ - -#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_NEUTRAL */ +#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_DEFAULT */ + +#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_DEFAULT */ + +#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_DEFAULT */ #include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ #include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ -#include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_NEUTRAL */ - -#include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_NEUTRAL */ - -#include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_NEUTRAL */ - -#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_NEUTRAL */ - -#include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_NEUTRAL */ - -#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_NEUTRAL */ +#include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_DEFAULT */ + +#include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_DEFAULT */ + +#include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_DEFAULT */ + +#include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_DEFAULT */ + +#include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_DEFAULT */ + +#include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */ #include "nls/msl.nls" /* 0x043e LANG_MALAY, SUBLANG_MALAY_MALAYSIA */ #include "nls/msb.nls" /* 0x083e LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */ -#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_NEUTRAL */ - -#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_NEUTRAL */ - -#include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_NEUTRAL */ +#include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_DEFAULT */ + +#include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_DEFAULT */ + +#include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_DEFAULT */ #include "nls/uzl.nls" /* 0x0443 LANG_UZBEK, SUBLANG_UZBEK_LATIN */ #include "nls/uzb.nls" /* 0x0843 LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC */ -#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_NEUTRAL */ - -#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_NEUTRAL */ - -#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_NEUTRAL */ - -#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_NEUTRAL */ - -#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_NEUTRAL */ - -#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_NEUTRAL */ - -#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_NEUTRAL */ - -#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_NEUTRAL */ - -#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_NEUTRAL */ - -#include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_NEUTRAL */ - -#include "nls/knk.nls" /* 0x0457 LANG_KONKANI, SUBLANG_NEUTRAL */ - -#include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_NEUTRAL */ - -#include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_NEUTRAL */ +#include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ + +#include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ + +#include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ + +#include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_DEFAULT */ + +#include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_DEFAULT */ + +#include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_DEFAULT */ + +#include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_DEFAULT */ + +#include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_DEFAULT */ + +#include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_DEFAULT */ + +//#include "nls/cym.nls" /* 0x0452 LANG_WELSH, SUBLANG_DEFAULT */ + +#include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_DEFAULT */ + +#include "nls/knk.nls" /* 0x0457 LANG_KONKANI, SUBLANG_DEFAULT */ + +#include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ + +#include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ + +//#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_DEFAULT */ /* Wine extensions */ //#include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */ -//#include "nls/gae.nls" /* 0x043c LANG_GAELIC, SUBLANG_GAELIC */ -//#include "nls/gdh.nls" /* 0x083c LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */ -//#include "nls/gdv.nls" /* 0x0c3c LANG_GAELIC, SUBLANG_GAELIC_MANX */ - -//#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_NEUTRAL */ - -//#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_NEUTRAL */ - -//#include "nls/cor.nls" /* 0x0491 LANG_CORNISH, SUBLANG_NEUTRAL */ - -//#include "nls/cym.nls" /* 0x0492 LANG_WELSH, SUBLANG_NEUTRAL */ - -//#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_NEUTRAL */ - -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/ru-RU.rc" +//#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */ + +//#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_DEFAULT */ + +//#include "nls/cor.nls" /* 0x0491 LANG_CORNISH, SUBLANG_DEFAULT */ + +//#include "nls/gae.nls" /* 0x0494 LANG_GAELIC, SUBLANG_GAELIC */ +//#include "nls/gdh.nls" /* 0x0894 LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH */ +//#include "nls/gdv.nls" /* 0x0c94 LANG_GAELIC, SUBLANG_GAELIC_MANX */ Added: trunk/reactos/dll/win32/kernel32/nls/brf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/brf… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/brf.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/brf.nls [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -1,0 +1,157 @@ +/* + * Locale definitions for Breton (France) + * + * Copyright 1998 Marcel Baur + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0013\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "33" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "33" + LOCALE_IDEFAULTEBCDICCODEPAGE "20297" + LOCALE_IDEFAULTLANGUAGE "040c" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0493" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "FRA" + LOCALE_SABBREVDAYNAME1 "Lun" + LOCALE_SABBREVDAYNAME2 "Meu" + LOCALE_SABBREVDAYNAME3 "Mer" + LOCALE_SABBREVDAYNAME4 "Yao" + LOCALE_SABBREVDAYNAME5 "Gwe" + LOCALE_SABBREVDAYNAME6 "Sad" + LOCALE_SABBREVDAYNAME7 "Sul" + LOCALE_SABBREVLANGNAME "BRF" + LOCALE_SABBREVMONTHNAME1 "Gen" + LOCALE_SABBREVMONTHNAME2 "C'h" + LOCALE_SABBREVMONTHNAME3 "Meu" + LOCALE_SABBREVMONTHNAME4 "Ebr" + LOCALE_SABBREVMONTHNAME5 "Mae" + LOCALE_SABBREVMONTHNAME6 "Mez" + LOCALE_SABBREVMONTHNAME7 "Gou" + LOCALE_SABBREVMONTHNAME8 "Eos" + LOCALE_SABBREVMONTHNAME9 "Gwe" + LOCALE_SABBREVMONTHNAME10 "Her" + LOCALE_SABBREVMONTHNAME11 "Du" + LOCALE_SABBREVMONTHNAME12 "Ker" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "France" + LOCALE_SCURRENCY "" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Lun" + LOCALE_SDAYNAME2 "Meurzh" + LOCALE_SDAYNAME3 "Merc'her" + LOCALE_SDAYNAME4 "Yaou" + LOCALE_SDAYNAME5 "Gwener" + LOCALE_SDAYNAME6 "Sadorn" + LOCALE_SDAYNAME7 "Sul" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "France" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Breton" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "FR" + LOCALE_SISO639LANGNAME "br" + LOCALE_SLANGUAGE "Brezhoneg" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd d MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Genver" + LOCALE_SMONTHNAME2 "C'hwevrer" + LOCALE_SMONTHNAME3 "Meurzh" + LOCALE_SMONTHNAME4 "Ebrel" + LOCALE_SMONTHNAME5 "Mae" + LOCALE_SMONTHNAME6 "Mezheven" + LOCALE_SMONTHNAME7 "Gouere" + LOCALE_SMONTHNAME8 "Eost" + LOCALE_SMONTHNAME9 "Gwengolo" + LOCALE_SMONTHNAME10 "Here" + LOCALE_SMONTHNAME11 "Du" + LOCALE_SMONTHNAME12 "Kerzu" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP " " + LOCALE_SNAME "br-FR" + LOCALE_SNATIVECTRYNAME "Bro-C'haill" + LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Brezhoneg" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND " " + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} Propchange: trunk/reactos/dll/win32/kernel32/nls/brf.nls ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/kernel32/nls/cym.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cym… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/cym.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/cym.nls [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -1,0 +1,157 @@ +/* + * Locale definitions for Welsh (United Kingdom) + * + * Copyright 1998 Marcel Baur + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(28604) + +STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x01ff\x003f\x8000\xffff" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "44" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "0" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "28604" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "44" + LOCALE_IDEFAULTEBCDICCODEPAGE "20285" + LOCALE_IDEFAULTLANGUAGE "0409" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28604" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0492" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "1" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "3" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "0" + LOCALE_IPOSSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "yb" + LOCALE_S2359 "yp" + LOCALE_SABBREVCTRYNAME "GBR" + LOCALE_SABBREVDAYNAME1 "Lln" + LOCALE_SABBREVDAYNAME2 "Maw" + LOCALE_SABBREVDAYNAME3 "Mer" + LOCALE_SABBREVDAYNAME4 "Iau" + LOCALE_SABBREVDAYNAME5 "Gwe" + LOCALE_SABBREVDAYNAME6 "Sad" + LOCALE_SABBREVDAYNAME7 "Sul" + LOCALE_SABBREVLANGNAME "CYM" + LOCALE_SABBREVMONTHNAME1 "Ion" + LOCALE_SABBREVMONTHNAME2 "Chw" + LOCALE_SABBREVMONTHNAME3 "Maw" + LOCALE_SABBREVMONTHNAME4 "Ebr" + LOCALE_SABBREVMONTHNAME5 "Mai" + LOCALE_SABBREVMONTHNAME6 "Meh" + LOCALE_SABBREVMONTHNAME7 "Gor" + LOCALE_SABBREVMONTHNAME8 "Aws" + LOCALE_SABBREVMONTHNAME9 "Med" + LOCALE_SABBREVMONTHNAME10 "Hyd" + LOCALE_SABBREVMONTHNAME11 "Tch" + LOCALE_SABBREVMONTHNAME12 "Rhg" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Cymru" + LOCALE_SCURRENCY "£" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Dydd Llun" + LOCALE_SDAYNAME2 "Dydd Mawrth" + LOCALE_SDAYNAME3 "Dydd Mercher" + LOCALE_SDAYNAME4 "Dydd Iau" + LOCALE_SDAYNAME5 "Dydd Gwener" + LOCALE_SDAYNAME6 "Dydd Sadwrn" + LOCALE_SDAYNAME7 "Dydd Sul" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Wales" + LOCALE_SENGCURRNAME "UK Pound Sterling" + LOCALE_SENGLANGUAGE "Welsh" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "GBP" + LOCALE_SISO3166CTRYNAME "GB" + LOCALE_SISO639LANGNAME "cy" + LOCALE_SLANGUAGE "Welsh (United Kingdom)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Ionawr" + LOCALE_SMONTHNAME2 "Chwefror" + LOCALE_SMONTHNAME3 "Mawrth" + LOCALE_SMONTHNAME4 "Ebrill" + LOCALE_SMONTHNAME5 "Mai" + LOCALE_SMONTHNAME6 "Mehefin" + LOCALE_SMONTHNAME7 "Gorffennaf" + LOCALE_SMONTHNAME8 "Awst" + LOCALE_SMONTHNAME9 "Medi" + LOCALE_SMONTHNAME10 "Hydref" + LOCALE_SMONTHNAME11 "Tachwedd" + LOCALE_SMONTHNAME12 "Rhagfyr" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "cy-GB" + LOCALE_SNATIVECTRYNAME "Cymru" + LOCALE_SNATIVECURRNAME "punt" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Cymraeg" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "dd/MM/yy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} Propchange: trunk/reactos/dll/win32/kernel32/nls/cym.nls ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/kernel32/nls/rmc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rmc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/rmc.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/rmc.nls [iso-8859-1] Sat Sep 26 19:37:25 2009 @@ -1,0 +1,167 @@ +/* + * Locale definitions for Romansh (Switzerland) + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * Copyright 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* +- Windows Vista (at least the NLS information about it on www.microsoft.com) + has the wrong short date format dd/MM/yyyy e.g. 01/08/1996 instead of the + correct d-M-yyyy e.g 1-8-1996. This file uses the right short date format as + seen on http://www.liarumantscha.ch/ and in the glibc-morelocales.patch for + glibc-2.6. +- As decimal separator this file uses the "," like http://www.liarumantscha.ch/ + does and not the "." used by Windows Vista and the Swiss German language. +*/ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0093\x0000\x0000\xcdd4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "41" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "41" + LOCALE_IDEFAULTEBCDICCODEPAGE "20273" + LOCALE_IDEFAULTLANGUAGE "0417" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "2" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0417" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGCURR "2" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "CHE" + LOCALE_SABBREVDAYNAME1 "gli" + LOCALE_SABBREVDAYNAME2 "ma" + LOCALE_SABBREVDAYNAME3 "me" + LOCALE_SABBREVDAYNAME4 "gie" + LOCALE_SABBREVDAYNAME5 "ve" + LOCALE_SABBREVDAYNAME6 "so" + LOCALE_SABBREVDAYNAME7 "du" + LOCALE_SABBREVLANGNAME "RMC" + LOCALE_SABBREVMONTHNAME1 "schan" + LOCALE_SABBREVMONTHNAME2 "favr" + LOCALE_SABBREVMONTHNAME3 "mars" + LOCALE_SABBREVMONTHNAME4 "avr" + LOCALE_SABBREVMONTHNAME5 "matg" + LOCALE_SABBREVMONTHNAME6 "zercl" + LOCALE_SABBREVMONTHNAME7 "fan" + LOCALE_SABBREVMONTHNAME8 "avust" + LOCALE_SABBREVMONTHNAME9 "sett" + LOCALE_SABBREVMONTHNAME10 "oct" + LOCALE_SABBREVMONTHNAME11 "nov" + LOCALE_SABBREVMONTHNAME12 "dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Switzerland" + LOCALE_SCURRENCY "fr." + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "glindesdi" + LOCALE_SDAYNAME2 "mardi" + LOCALE_SDAYNAME3 "mesemna" + LOCALE_SDAYNAME4 "gievgia" + LOCALE_SDAYNAME5 "venderdi" + LOCALE_SDAYNAME6 "sonda" + LOCALE_SDAYNAME7 "dumengia" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Switzerland" + LOCALE_SENGCURRNAME "Swiss Franc" + LOCALE_SENGLANGUAGE "Romansh" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "CHF" + LOCALE_SISO3166CTRYNAME "CH" + LOCALE_SISO639LANGNAME "rm" + LOCALE_SLANGUAGE "Romansh (Switzerland)" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "schaner" + LOCALE_SMONTHNAME2 "favrer" + LOCALE_SMONTHNAME3 "mars" + LOCALE_SMONTHNAME4 "avrigl" + LOCALE_SMONTHNAME5 "matg" + LOCALE_SMONTHNAME6 "zercladur" + LOCALE_SMONTHNAME7 "fanadur" + LOCALE_SMONTHNAME8 "avust" + LOCALE_SMONTHNAME9 "settember" + LOCALE_SMONTHNAME10 "october" + LOCALE_SMONTHNAME11 "november" + LOCALE_SMONTHNAME12 "december" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "'" + LOCALE_SNAME "rm-CH" + LOCALE_SNATIVECTRYNAME "Svizra" + LOCALE_SNATIVECURRNAME "Franc svizzer" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Rumantsch (Svizra)" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "'" + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} Propchange: trunk/reactos/dll/win32/kernel32/nls/rmc.nls ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 43168: Fix one of the most awesome "_MSC_VER means compiling with Microsoft's header set" assumptions, revision 30728. Instead of breaking linking for user mode CRT to hide header incompatibilities we now use a less exciting solution; do not include the incompatible headers when implementing the affected functions -- abs.c and labs.c don't need anything at all, and strset.c only needs size_t, so define it there.
by sginsberg＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: sginsberg Date: Sat Sep 26 17:42:34 2009 New Revision: 43168 URL: http://svn.reactos.org/svn/reactos?rev=43168&view=rev Log: Fix one of the most awesome "_MSC_VER means compiling with Microsoft's header set" assumptions, revision 30728. Instead of breaking linking for user mode CRT to hide header incompatibilities we now use a less exciting solution; do not include the incompatible headers when implementing the affected functions -- abs.c and labs.c don't need anything at all, and strset.c only needs size_t, so define it there. Modified: trunk/reactos/lib/sdk/crt/math/abs.c trunk/reactos/lib/sdk/crt/math/labs.c trunk/reactos/lib/sdk/crt/string/strset.c Modified: trunk/reactos/lib/sdk/crt/math/abs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/abs.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] Sat Sep 26 17:42:34 2009 @@ -1,13 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <stdlib.h> /* * @implemented */ -#ifndef _MSC_VER int abs(int j) { return j<0 ? -j : j; } -#endif Modified: trunk/reactos/lib/sdk/crt/math/labs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/labs.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/labs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/labs.c [iso-8859-1] Sat Sep 26 17:42:34 2009 @@ -1,13 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <precomp.h> /* * @implemented */ -#ifndef _MSC_VER long labs(long j) { return j<0 ? -j : j; } -#endif Modified: trunk/reactos/lib/sdk/crt/string/strset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strset.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strset.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strset.c [iso-8859-1] Sat Sep 26 17:42:34 2009 @@ -8,7 +8,15 @@ * 25/11/05: Added license header */ -#include <precomp.h> +#if defined(__GNUC__) +#define __int64 long long +#endif + +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else +typedef unsigned int size_t; +#endif /* * @implemented @@ -30,7 +38,6 @@ /* * @implemented */ -#ifndef _MSC_VER char* _strset(char* szToFill, int szFill) { char *t = szToFill; @@ -42,4 +49,3 @@ } return t; } -#endif

1 0

[sginsberg] 43167: - HAL: Make /W3 friendly - Everywhere else: Use casts instead of -1U to fix C4146 (this is compatible with both compilers)
by sginsberg＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: sginsberg Date: Sat Sep 26 15:41:57 2009 New Revision: 43167 URL: http://svn.reactos.org/svn/reactos?rev=43167&view=rev Log: - HAL: Make /W3 friendly - Everywhere else: Use casts instead of -1U to fix C4146 (this is compatible with both compilers) Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/hal/halx86/include/ioapic.h trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/hal/halx86/mp/ioapic.c trunk/reactos/hal/halx86/mp/mpconfig.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/rtl/debug.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -311,7 +311,7 @@ Length = _vsnprintf(Buffer, 512, Format, ap); /* Check if we went past the buffer */ - if (Length == -1U) + if (Length == (ULONG)-1) { /* Terminate it if we went over-board */ Buffer[sizeof(Buffer) - 1] = '\n'; Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -116,7 +116,7 @@ break; } - if (red == -1U) + if (red == (DWORD)-1) { red = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_GETPOS, 0, 0); if (HIWORD(red)) @@ -127,7 +127,7 @@ red = LOBYTE(red); } - if (green == -1U) + if (green == (DWORD)-1) { green = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_GETPOS, 0, 0); if (HIWORD(green)) @@ -138,7 +138,7 @@ green = LOBYTE(green); } - if (blue == -1U) + if (blue == (DWORD)-1) { blue = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_GETPOS, 0, 0); if (HIWORD(blue)) Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -160,7 +160,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); - if (pConInfo->WindowPosition != -1U) + if (pConInfo->WindowPosition != (DWORD)-1) { SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, LOWORD(pConInfo->WindowPosition), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, HIWORD(pConInfo->WindowPosition), FALSE); Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -968,7 +968,7 @@ GetSysColor(COLOR_WINDOWTEXT)); } - if (lpdis->itemID != -1U) + if (lpdis->itemID != (UINT)-1) { CopyRect(&rc, &lpdis->rcItem); rc.left += 5; Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -232,7 +232,7 @@ CLIENT_ID ClientId; /* If we don't have a PID, look it up */ - if (dwProcessId == -1U) dwProcessId = (DWORD)CsrGetProcessId(); + if (dwProcessId == (DWORD)-1) dwProcessId = (DWORD)CsrGetProcessId(); /* Open a handle to the process */ ClientId.UniqueThread = NULL; Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -534,7 +534,7 @@ *lpDistanceToMoveHigh = FilePosition.CurrentByteOffset.u.HighPart; } - if (FilePosition.CurrentByteOffset.u.LowPart == -1U) + if (FilePosition.CurrentByteOffset.u.LowPart == (DWORD)-1) { /* The value of -1 is valid here, especially when the new file position is greater than 4 GB. Since NtSetInformationFile Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -21,7 +21,7 @@ /* global vars */ /* Do not assume it have the free value -1 set, any value can be in here */ -DWORD OPENGL32_tls = -1U; +DWORD OPENGL32_tls = -1; GLPROCESSDATA OPENGL32_processdata; @@ -103,7 +103,7 @@ TRUE /* bInheritHandle */ }; OPENGL32_tls = TlsAlloc(); - if (-1U == OPENGL32_tls) + if ((DWORD)-1 == OPENGL32_tls) return FALSE; memset( &OPENGL32_processdata, 0, sizeof (OPENGL32_processdata) ); @@ -179,7 +179,7 @@ CloseHandle( OPENGL32_processdata.dcdata_mutex ); /* free TLS */ - if (OPENGL32_tls != -1U) + if (OPENGL32_tls != (DWORD)-1) TlsFree(OPENGL32_tls); } Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -1991,7 +1991,7 @@ 0); /* Check if nothing was found */ - if (MapRegisterNumber == -1U) + if (MapRegisterNumber == (ULONG)-1) { /* No free registers found, so use the base registers */ RtlSetBits(MasterAdapter->MapRegisters, Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -572,7 +572,7 @@ { ResourceCount++; - Offset = FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); + Offset = (UCHAR)FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); /* Write 0xFFFFFFFF there */ WriteBuffer = 0xffffffff; Modified: trunk/reactos/hal/halx86/include/ioapic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/ioapic.… ============================================================================== --- trunk/reactos/hal/halx86/include/ioapic.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/ioapic.h [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -15,7 +15,7 @@ #define IOAPIC_REDTBL 0x0010 /* Redirection Table (0-23 64-bit registers) (R/W) */ #define IOAPIC_ID_MASK (0xF << 24) -#define GET_IOAPIC_ID(x) (((x) & IOAPIC_ID_MASK) >> 24) +#define GET_IOAPIC_ID(x) ((UCHAR)(((x) & IOAPIC_ID_MASK) >> 24)) #define SET_IOAPIC_ID(x) ((x) << 24) #define IOAPIC_VER_MASK (0xFF) @@ -68,8 +68,8 @@ typedef struct _IOAPIC_INFO { - ULONG ApicId; /* APIC ID */ - ULONG ApicVersion; /* APIC version */ + UCHAR ApicId; /* APIC ID */ + UCHAR ApicVersion; /* APIC version */ ULONG ApicAddress; /* APIC address */ ULONG EntryCount; /* Number of redirection entries */ } IOAPIC_INFO, *PIOAPIC_INFO; Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=4… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -823,7 +823,7 @@ if (TSCPresent) { t2.QuadPart = (LONGLONG)__rdtsc(); - CPUMap[CPU].CoreSpeed = (HZ * (t2.QuadPart - t1.QuadPart)); + CPUMap[CPU].CoreSpeed = (HZ * (ULONG)(t2.QuadPart - t1.QuadPart)); DPRINT("CPU clock speed is %ld.%04ld MHz.\n", CPUMap[CPU].CoreSpeed/1000000, CPUMap[CPU].CoreSpeed%1000000); @@ -856,10 +856,10 @@ Access.SegmentType = I386_INTERRUPT_GATE; idt = (KIDTENTRY*)((ULONG)KeGetPcr()->IDT + index * sizeof(KIDTENTRY)); - idt->Offset = address & 0xffff; + idt->Offset = (USHORT)(address & 0xffff); idt->Selector = KGDT_R0_CODE; idt->Access = Access.Value; - idt->ExtendedOffset = address >> 16; + idt->ExtendedOffset = (USHORT)(address >> 16); } VOID HaliInitBSP(VOID) Modified: trunk/reactos/hal/halx86/mp/ioapic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/ioapic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/mp/ioapic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/ioapic.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -661,7 +661,7 @@ VOID Disable8259AIrq(ULONG irq) { - ULONG tmp; + UCHAR tmp; if (irq >= 8) { Modified: trunk/reactos/hal/halx86/mp/mpconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpconfig.c?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpconfig.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpconfig.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -83,7 +83,7 @@ static VOID HaliMPProcessorInfo(PMP_CONFIGURATION_PROCESSOR m) { - ULONG ver; + UCHAR ver; if (!(m->CpuFlags & CPU_FLAG_ENABLED)) return; @@ -176,7 +176,7 @@ static VOID HaliMPBusInfo(PMP_CONFIGURATION_BUS m) { - static ULONG CurrentPCIBusId = 0; + static UCHAR CurrentPCIBusId = 0; DPRINT("Bus #%d is %.*s\n", m->BusId, 6, m->BusType); @@ -357,7 +357,7 @@ HaliConstructDefaultIOIrqMPTable(ULONG Type) { MP_CONFIGURATION_INTSRC intsrc; - ULONG i; + UCHAR i; intsrc.Type = MPCTE_INTSRC; intsrc.IrqFlag = 0; /* conforming */ @@ -394,8 +394,8 @@ MP_CONFIGURATION_BUS bus; MP_CONFIGURATION_IOAPIC ioapic; MP_CONFIGURATION_INTLOCAL lintsrc; - ULONG linttypes[2] = { INT_EXTINT, INT_NMI }; - ULONG i; + UCHAR linttypes[2] = { INT_EXTINT, INT_NMI }; + UCHAR i; /* * 2 CPUs, numbered 0 & 1. Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=4… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -80,7 +80,7 @@ // // Cell Magic Values // -#define HCELL_NIL -1U +#define HCELL_NIL (ULONG)-1 #define HCELL_CACHED 1 #define HCELL_TYPE_MASK 0x80000000 Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=43167&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -61,7 +61,7 @@ EXCEPTION_RECORD ExceptionRecord; /* Check if we should print it or not */ - if ((ComponentId != -1U) && + if ((ComponentId != (ULONG)-1) && !(NtQueryDebugFilterState(ComponentId, Level))) { /* This message is masked */ @@ -96,7 +96,7 @@ _SEH2_END; /* Check if we went past the buffer */ - if (Length == -1U) + if (Length == (ULONG)-1) { /* Terminate it if we went over-board */ Buffer[sizeof(Buffer) - 1] = '\n'; Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=431… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -466,7 +466,7 @@ /* Make sure the buffer is a valid string which within the given length */ if ((NtInitialUserProcessBufferType != REG_SZ) || - ((NtInitialUserProcessBufferLength != -1U) && + ((NtInitialUserProcessBufferLength != (ULONG)-1) && ((NtInitialUserProcessBufferLength < sizeof(WCHAR)) || (NtInitialUserProcessBufferLength > sizeof(NtInitialUserProcessBuffer) - sizeof(WCHAR))))) @@ -1429,7 +1429,7 @@ if (!ExpRealTimeIsUniversal) { /* Check if we don't have a valid bias */ - if (ExpLastTimeZoneBias == -1U) + if (ExpLastTimeZoneBias == (ULONG)-1) { /* Reset */ ResetBias = TRUE; Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Sep 26 15:41:57 2009 @@ -443,7 +443,7 @@ /* Now multiply limits by 1MB */ PspDefaultPagedLimit <<= 20; PspDefaultNonPagedLimit <<= 20; - if (PspDefaultPagefileLimit != -1U) PspDefaultPagefileLimit <<= 20; + if (PspDefaultPagefileLimit != (ULONG)-1) PspDefaultPagefileLimit <<= 20; /* Initialize the Active Process List */ InitializeListHead(&PsActiveProcessHead);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
27
Older →

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 September 2009