diff --git a/drivers/base/condrv/control.c b/drivers/base/condrv/control.c index 78ce5b402a1..e9a26e03e52 100644 --- a/drivers/base/condrv/control.c +++ b/drivers/base/condrv/control.c @@ -77,7 +77,7 @@ ConDrvDeleteController(IN PDRIVER_OBJECT DriverObject) RtlInitUnicodeString(&SymlinkName, DD_CONDRV_CTRL_SYMLNK_NAME_U); IoDeleteSymbolicLink(&SymlinkName); - + /* Delete the controller device itself */ IoDeleteDevice(Controller); diff --git a/drivers/base/kdgdb/gdb_receive.c b/drivers/base/kdgdb/gdb_receive.c index b97769d1742..a64b293df24 100644 --- a/drivers/base/kdgdb/gdb_receive.c +++ b/drivers/base/kdgdb/gdb_receive.c @@ -59,13 +59,13 @@ get_packet: break; } CheckSum += (CHAR)Byte; - + /* See if we should escape */ if (Byte == 0x7d) { Status = KdpReceiveByte(&Byte); if (Status != KdPacketReceived) - return Status; + return Status; CheckSum += (CHAR)Byte; Byte ^= 0x20; } @@ -100,7 +100,7 @@ end: case '$': KDDBGPRINT("Received new packet just after %s.\n", gdb_input); goto get_packet; - case 0x03: + case 0x03: KdContext->KdpControlCPending = TRUE; break; } diff --git a/drivers/base/kdgdb/gdb_send.c b/drivers/base/kdgdb/gdb_send.c index 4921e895968..a28aa9d4c2a 100644 --- a/drivers/base/kdgdb/gdb_send.c +++ b/drivers/base/kdgdb/gdb_send.c @@ -104,7 +104,7 @@ send_gdb_packet(_In_ const CHAR* Buffer) return finish_gdb_packet(); } -ULONG +ULONG send_gdb_partial_binary( _In_ const VOID* Buffer, _In_ size_t Length) @@ -136,7 +136,7 @@ send_gdb_partial_binary( return Sent; } -void +void send_gdb_partial_memory( _In_ const VOID* Buffer, _In_ size_t Length) @@ -172,7 +172,7 @@ gdb_send_debug_io( CHAR gdb_out[3]; CHAR* ptr = String->Buffer; USHORT Length = String->Length; - + gdb_out[2] = '\0'; start_gdb_packet(); diff --git a/drivers/base/kdgdb/utils.c b/drivers/base/kdgdb/utils.c index 2817f648bdf..9d786267524 100644 --- a/drivers/base/kdgdb/utils.c +++ b/drivers/base/kdgdb/utils.c @@ -52,7 +52,7 @@ find_thread( if ( #if !MONOPROCESS - (Pid == 0) && + (Pid == 0) && #endif (Tid == 0)) { diff --git a/drivers/bluetooth/fbtusb/fbtusb.c b/drivers/bluetooth/fbtusb/fbtusb.c index 1a288a52172..5b8ee43cc32 100644 --- a/drivers/bluetooth/fbtusb/fbtusb.c +++ b/drivers/bluetooth/fbtusb/fbtusb.c @@ -201,7 +201,7 @@ NTSTATUS NTAPI FreeBT_AddDevice(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJEC deviceExtension->OutStandingIO = 1; KeInitializeSpinLock(&deviceExtension->IOCountLock); -#ifdef ENABLE_WMI +#ifdef ENABLE_WMI // Delegating to WMILIB ntStatus = FreeBT_WmiRegistration(deviceExtension); if (!NT_SUCCESS(ntStatus)) diff --git a/drivers/bluetooth/fbtusb/include/fbtHciParms.h b/drivers/bluetooth/fbtusb/include/fbtHciParms.h index 727fe511afd..d178b721b4f 100644 --- a/drivers/bluetooth/fbtusb/include/fbtHciParms.h +++ b/drivers/bluetooth/fbtusb/include/fbtHciParms.h @@ -44,7 +44,7 @@ #define FBT_HCI_PACKET_BOUNDARY_FRAGMENT 0x01 #define FBT_HCI_PACKET_BOUNDARY_START 0x02 -#define FBT_HCI_BROADCAST_POINT_TO_POINT 0x00 +#define FBT_HCI_BROADCAST_POINT_TO_POINT 0x00 #define FBT_HCI_BROADCAST_ACTIVE_SLAVE 0x01 #define FBT_HCI_BROADCAST_PARKED_SLAVE 0x02 diff --git a/drivers/bluetooth/fbtusb/include/fbtreg.h b/drivers/bluetooth/fbtusb/include/fbtreg.h index 38ac78b1177..c116b26a793 100644 --- a/drivers/bluetooth/fbtusb/include/fbtreg.h +++ b/drivers/bluetooth/fbtusb/include/fbtreg.h @@ -6,7 +6,7 @@ class CReg public: // Constructor CReg(LPCSTR lpszSubKey, HKEY hRootKey=HKEY_CURRENT_USER, REGSAM regSam=KEY_ALL_ACCESS, BOOL bCreate=TRUE); - + // Destructor ~CReg(); @@ -16,7 +16,7 @@ class CReg // BOOL GetValue(LPCSTR lpszValueName, CString &szData, DWORD *dwDataType=NULL); BOOL GetValue(LPCSTR lpszValueName, DWORD &dwData); BOOL GetValue(LPCSTR lpszValueName, BOOL &bData); - + // Set the specified registry value BOOL SetValue(LPCSTR lpszValueName, const LPVOID lpvData, DWORD dwDataSize, DWORD dwDataType=REG_SZ); BOOL SetValue(LPCSTR lpszValueName, LPCSTR lpszValue, DWORD dwDataSize=0, DWORD dwDataType=REG_SZ); @@ -30,13 +30,13 @@ class CReg // Delete all the values in the key BOOL DeleteValues(); - + // Delete a sub key BOOL DeleteKey(LPCSTR lpszKeyName); // Retrieve the names of the values in the key // BOOL EnumerateValues(CStringArray &nszValueNames); - + BOOL IsValid() {return m_hKey!=NULL;} protected: @@ -47,12 +47,12 @@ class CReg LONG Open(LPCSTR lpszSubKey, HKEY hRootKey, HKEY *hKey=NULL, REGSAM regSam=NULL, BOOL bCreate=TRUE); BOOL DeleteKey(HKEY hRootKey, HKEY hKey, LPCSTR szKey, LPCSTR szSubKey); - + // CString m_szKey; // Name of key this object wraps char m_szKey[1024]; // Name of key this object wraps HKEY m_hRootKey; // Root key of the wrapped key HKEY m_hKey; // Key generated by Open/Create - + }; #endif \ No newline at end of file diff --git a/drivers/bus/acpi/busmgr/button.c b/drivers/bus/acpi/busmgr/button.c index c4be270c52c..d74bc1cf9a4 100644 --- a/drivers/bus/acpi/busmgr/button.c +++ b/drivers/bus/acpi/busmgr/button.c @@ -92,7 +92,7 @@ acpi_button_notify_fixed ( void *data) { struct acpi_button *button = (struct acpi_button *) data; - + ACPI_FUNCTION_TRACE("acpi_button_notify_fixed"); if (!button) @@ -134,35 +134,35 @@ acpi_button_add ( button->type = ACPI_BUTTON_TYPE_POWER; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_POWER); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_POWER); } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_POWERF)) { button->type = ACPI_BUTTON_TYPE_POWERF; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_POWERF); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_POWER); } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_SLEEP)) { button->type = ACPI_BUTTON_TYPE_SLEEP; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_SLEEP); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_SLEEP); } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_SLEEPF)) { button->type = ACPI_BUTTON_TYPE_SLEEPF; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_SLEEPF); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_SLEEP); } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_LID)) { button->type = ACPI_BUTTON_TYPE_LID; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_LID); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID); } else { @@ -239,7 +239,7 @@ acpi_button_add ( goto end; } - DPRINT("%s [%s]\n", + DPRINT("%s [%s]\n", acpi_device_name(device), acpi_device_bid(device)); end: @@ -294,7 +294,7 @@ acpi_button_remove (struct acpi_device *device, int type) } -int +int acpi_button_init (void) { int result = 0; @@ -310,7 +310,7 @@ acpi_button_init (void) } -void +void acpi_button_exit (void) { ACPI_FUNCTION_TRACE("acpi_button_exit"); diff --git a/drivers/bus/acpi/busmgr/system.c b/drivers/bus/acpi/busmgr/system.c index e08280e5df9..8e5164aa909 100644 --- a/drivers/bus/acpi/busmgr/system.c +++ b/drivers/bus/acpi/busmgr/system.c @@ -24,7 +24,7 @@ */ /* Modified for ReactOS and latest ACPICA - * Copyright (C)2009 Samuel Serapion + * Copyright (C)2009 Samuel Serapion */ #include @@ -84,7 +84,7 @@ acpi_system_add ( sprintf(acpi_device_class(device), "%s", ACPI_SYSTEM_CLASS); acpi_driver_data(device) = system; - DPRINT("%s [%s] (supports", + DPRINT("%s [%s] (supports", acpi_device_name(device), acpi_device_bid(device)); for (i=0; istates[i] = 1; } /* no break */ - default: + default: if (ACPI_SUCCESS(status)) { system->states[i] = 1; DPRINT(" S%d", i); @@ -156,7 +156,7 @@ ACPI_STATUS acpi_system_restore_state( UINT32 state) { - /* + /* * We should only be here if we're coming back from STR or STD. * And, in the case of the latter, the memory image should have already * been loaded from disk. @@ -167,7 +167,7 @@ acpi_system_restore_state( /* Do _early_ resume for irqs. Required by * ACPI specs. */ - /* TBD: call arch dependant reinitialization of the + /* TBD: call arch dependant reinitialization of the * interrupts. */ #ifdef _X86_ @@ -239,7 +239,7 @@ acpi_system_save_state( // return error; // } // } - + /* flush caches */ ACPI_FLUSH_CPU_CACHE(); @@ -395,7 +395,7 @@ acpi_suspend ( return status; } -int +int acpi_system_init (void) { int result = 0; diff --git a/drivers/bus/acpi/busmgr/utils.c b/drivers/bus/acpi/busmgr/utils.c index fc41f34fdb5..220e659de76 100644 --- a/drivers/bus/acpi/busmgr/utils.c +++ b/drivers/bus/acpi/busmgr/utils.c @@ -30,7 +30,7 @@ #include /* Modified for ReactOS and latest ACPICA - * Copyright (C)2009 Samuel Serapion + * Copyright (C)2009 Samuel Serapion */ #define _COMPONENT ACPI_BUS_COMPONENT @@ -301,24 +301,24 @@ acpi_evaluate_reference ( package = (ACPI_OBJECT *) buffer.Pointer; if ((buffer.Length == 0) || !package) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "No return object (len %X ptr %p)\n", + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "No return object (len %X ptr %p)\n", buffer.Length, package)); status = AE_BAD_DATA; acpi_util_eval_error(handle, pathname, status); goto end; } if (package->Type != ACPI_TYPE_PACKAGE) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "Expecting a [Package], found type %X\n", + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "Expecting a [Package], found type %X\n", package->Type)); status = AE_BAD_DATA; acpi_util_eval_error(handle, pathname, status); goto end; } if (!package->Package.Count) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "[Package] has zero elements (%p)\n", + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "[Package] has zero elements (%p)\n", package)); status = AE_BAD_DATA; acpi_util_eval_error(handle, pathname, status); @@ -338,13 +338,13 @@ acpi_evaluate_reference ( if (element->Type != ACPI_TYPE_LOCAL_REFERENCE) { status = AE_BAD_DATA; - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Expecting a [Reference] package element, found type %X\n", element->type)); acpi_util_eval_error(handle, pathname, status); break; } - + if (!element->Reference.Handle) { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid reference in" " package %s\n", pathname)); diff --git a/drivers/bus/acpi/buspdo.c b/drivers/bus/acpi/buspdo.c index 35c452bfc59..e91d09fecf5 100644 --- a/drivers/bus/acpi/buspdo.c +++ b/drivers/bus/acpi/buspdo.c @@ -184,7 +184,7 @@ Bus_PDO_PnP ( PoSetPowerState(DeviceData->Common.Self, DevicePowerState, state); DeviceData->Common.DevicePowerState = PowerDeviceD3; } - + SET_NEW_PNP_STATE(DeviceData->Common, Stopped); status = STATUS_SUCCESS; break; @@ -541,7 +541,7 @@ Bus_PDO_QueryDeviceId( if (DeviceData->AcpiHandle) { acpi_bus_get_device(DeviceData->AcpiHandle, &Device); - + if (!Device->flags.hardware_id) { /* We don't have the ID to satisfy this request */ @@ -615,10 +615,10 @@ Bus_PDO_QueryDeviceId( /* We don't have the ID to satisfy this request */ break; } - + DPRINT("Device name: %s\n", Device->pnp.device_name); DPRINT("Hardware ID: %s\n", Device->pnp.hardware_id); - + if (strcmp(Device->pnp.hardware_id, "Processor") == 0) { length += swprintf(&temp[length], @@ -640,13 +640,13 @@ Bus_PDO_QueryDeviceId( L"ACPI\\%hs", Device->pnp.cid_list->Ids[i].String); temp[length++] = UNICODE_NULL; - + length += swprintf(&temp[length], L"*%hs", Device->pnp.cid_list->Ids[i].String); temp[length++] = UNICODE_NULL; } - + temp[length++] = UNICODE_NULL; } else @@ -654,7 +654,7 @@ Bus_PDO_QueryDeviceId( /* No compatible IDs */ break; } - + NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp)); buffer = ExAllocatePoolWithTag(PagedPool, length * sizeof(WCHAR), 'IpcA'); diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/bus/acpi/cmbatt/cmbatt.c index cdac118c531..69000fcf032 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/drivers/bus/acpi/cmbatt/cmbatt.c @@ -22,7 +22,7 @@ KTIMER CmBattWakeDpcTimerObject; KDPC CmBattWakeDpcObject; PDEVICE_OBJECT AcAdapterPdo; LARGE_INTEGER CmBattWakeDpcDelay; - + /* FUNCTIONS ******************************************************************/ VOID @@ -35,7 +35,7 @@ CmBattPowerCallBack(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, PDEVICE_OBJECT DeviceObject; if (CmBattDebug & 0x10) DbgPrint("CmBattPowerCallBack: action: %d, value: %d \n", Action, Value); - + /* Check if a transition is going to happen */ if (Action == PO_CB_SYSTEM_STATE_LOCK) { @@ -82,7 +82,7 @@ CmBattWakeDpc(IN PKDPC Dpc, PCMBATT_DEVICE_EXTENSION DeviceExtension; ULONG ArFlag; if (CmBattDebug & 2) DbgPrint("CmBattWakeDpc: Entered.\n"); - + /* Loop all device objects */ for (CurrentObject = FdoExtension->DeviceObject; CurrentObject; @@ -91,7 +91,7 @@ CmBattWakeDpc(IN PKDPC Dpc, /* Turn delay flag off, we're back in S0 */ DeviceExtension = CurrentObject->DeviceExtension; DeviceExtension->DelayNotification = 0; - + /* Check if this is an AC adapter */ if (DeviceExtension->FdoType == CmBattAcAdapter) { @@ -145,20 +145,20 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, ULONG ArFlag; PCMBATT_DEVICE_EXTENSION FdoExtension; PDEVICE_OBJECT DeviceObject; - + if (CmBattDebug & (CMBATT_ACPI_ASSERT | CMBATT_PNP_INFO)) DbgPrint("CmBattNotifyHandler: CmBatt 0x%08x Type %d Number %d Notify Value: %x\n", DeviceExtension, DeviceExtension->FdoType, DeviceExtension->DeviceId, NotifyValue); - + /* Check what kind of notification was received */ switch (NotifyValue) { /* ACPI Specification says is sends a "Bus Check" when power source changes */ case ACPI_BUS_CHECK: - + /* We treat it as possible physical change */ DeviceExtension->ArFlag |= (CMBATT_AR_NOTIFY | CMBATT_AR_INSERT); if ((DeviceExtension->Tag) && @@ -166,26 +166,26 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattNotifyHandler: Received battery #%x insertion, but tag was not invalid.\n", DeviceExtension->DeviceId); break; - + /* Status of the battery has changed */ case ACPI_BATT_NOTIFY_STATUS: - + /* All we'll do is notify the class driver */ DeviceExtension->ArFlag |= CMBATT_AR_NOTIFY; break; - + /* Information on the battery has changed, such as physical presence */ case ACPI_DEVICE_CHECK: case ACPI_BATT_NOTIFY_INFO: - + /* Reset all state and let the class driver re-evaluate it all */ DeviceExtension->ArFlag |= (CMBATT_AR_NOTIFY | CMBATT_AR_INSERT | CMBATT_AR_REMOVE); break; - + default: - + if (CmBattDebug & CMBATT_PNP_INFO) DbgPrint("CmBattNotifyHandler: Unknown Notify Value: %x\n", NotifyValue); } @@ -201,7 +201,7 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, } /* We're going to handle this now */ - if (CmBattDebug & CMBATT_PNP_INFO) + if (CmBattDebug & CMBATT_PNP_INFO) DbgPrint("CmBattNotifyHandler: Performing ARs: %01x\n", DeviceExtension->ArFlag); /* Check if this is a battery or AC adapter notification */ @@ -209,16 +209,16 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, { /* Reset the current trip point */ DeviceExtension->TripPointValue = BATTERY_UNKNOWN_CAPACITY; - + /* Check what ARs have to be done */ ArFlag = DeviceExtension->ArFlag; - + /* New battery inserted, reset lock value */ if (ArFlag & CMBATT_AR_INSERT) InterlockedExchange(&DeviceExtension->ArLockValue, 0); /* Check if the battery may have been removed */ if (ArFlag & CMBATT_AR_REMOVE) DeviceExtension->Tag = 0; - + /* Check if there's been any sort of change to the battery */ if (ArFlag & CMBATT_AR_NOTIFY) { @@ -244,7 +244,7 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, } } } - + /* ARs have been processed */ DeviceExtension->ArFlag = 0; } @@ -254,7 +254,7 @@ NTAPI CmBattUnload(IN PDRIVER_OBJECT DriverObject) { if (CmBattDebug & CMBATT_GENERIC_INFO) DPRINT("CmBattUnload: \n"); - + /* Check if we have a registered power callback */ if (CmBattPowerCallBackObject) { @@ -262,7 +262,7 @@ CmBattUnload(IN PDRIVER_OBJECT DriverObject) ExUnregisterCallback(CmBattPowerCallBackRegistration); ObDereferenceObject(CmBattPowerCallBackObject); } - + /* Free the registry buffer if it exists */ if (GlobalRegistryPath.Buffer) ExFreePool(GlobalRegistryPath.Buffer); @@ -279,7 +279,7 @@ CmBattVerifyStaticInfo(PCMBATT_DEVICE_EXTENSION DeviceExtension, ULONG BatteryTag) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -298,7 +298,7 @@ CmBattOpenClose(IN PDEVICE_OBJECT DeviceObject, /* Grab the device extension and lock it */ DeviceExtension = DeviceObject->DeviceExtension; ExAcquireFastMutex(&DeviceExtension->FastMutex); - + /* Check if someone is trying to open a device that doesn't exist yet */ Count = DeviceExtension->HandleCount; if (Count == 0xFFFFFFFF) @@ -312,14 +312,14 @@ CmBattOpenClose(IN PDEVICE_OBJECT DeviceObject, } goto Complete; } - + /* Check if this is an open or close */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); Major = IoStackLocation->MajorFunction; if (Major == IRP_MJ_CREATE) { /* Increment the open count */ - DeviceExtension->HandleCount = Count + 1; + DeviceExtension->HandleCount = Count + 1; if (CmBattDebug & CMBATT_PNP_INFO) { DbgPrint("CmBattOpenClose: Open (DeviceNumber = %x)(count = %x).\n", @@ -342,7 +342,7 @@ Complete: ExReleaseFastMutex(&DeviceExtension->FastMutex); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return Status; } NTSTATUS @@ -366,7 +366,7 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_DEVICE_REMOVED; } - + /* There's nothing to do for an AC adapter */ if (DeviceExtension->FdoType == CmBattAcAdapter) { @@ -376,7 +376,7 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); return Status; } - + /* Send to class driver */ Status = BatteryClassIoctl(DeviceExtension->ClassData, Irp); if (Status == STATUS_NOT_SUPPORTED) @@ -388,12 +388,12 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, InputBufferLength = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; if (CmBattDebug & 4) DbgPrint("CmBattIoctl: Received Direct Access IOCTL %x\n", IoControlCode); - + /* Handle internal IOCTLs */ switch (IoControlCode) { case IOCTL_BATTERY_QUERY_UNIQUE_ID: - + /* Data is 4 bytes long */ if (OutputBufferLength == sizeof(ULONG)) { @@ -408,9 +408,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_QUERY_STA: - + /* Data is 4 bytes long */ if (OutputBufferLength == sizeof(ULONG)) { @@ -425,9 +425,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_QUERY_PSR: - + /* Data is 4 bytes long */ if (OutputBufferLength == sizeof(ULONG)) { @@ -451,9 +451,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_SET_TRIP_POINT: - + /* Data is 4 bytes long */ if (InputBufferLength == sizeof(ULONG)) { @@ -468,9 +468,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_QUERY_BIF: - + /* Data is 1060 bytes long */ if (OutputBufferLength == sizeof(ACPI_BIF_DATA)) { @@ -485,9 +485,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_QUERY_BST: - + /* Data is 16 bytes long */ if (OutputBufferLength == sizeof(ACPI_BST_DATA)) { @@ -502,15 +502,15 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + default: - + /* Unknown, let us pass it on to ACPI */ if (CmBattDebug & 0xC) DbgPrint("CmBattIoctl: Unknown IOCTL %x\n", IoControlCode); break; } - + /* Did someone pick it up? */ if (Status != STATUS_NOT_SUPPORTED) { @@ -544,11 +544,11 @@ CmBattQueryTag(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (CmBattDebug & (CMBATT_ACPI_WARNING | CMBATT_GENERIC_INFO)) DbgPrint("CmBattQueryTag - Tag (%d), Battery %x, Device %d\n", *Tag, DeviceExtension, DeviceExtension->DeviceId); - - /* Get PDO and clear notification flag */ + + /* Get PDO and clear notification flag */ PdoDevice = DeviceExtension->PdoDeviceObject; DeviceExtension->NotifySent = 0; - + /* Get _STA from PDO (we need the machine status, not the battery status) */ Status = CmBattGetStaData(PdoDevice, &StaData); if (NT_SUCCESS(Status)) @@ -565,11 +565,11 @@ CmBattQueryTag(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DeviceExtension->Tag = NewTag; if (CmBattDebug & CMBATT_GENERIC_INFO) DbgPrint("CmBattQueryTag - New Tag: (%d)\n", DeviceExtension->Tag); - + /* Reset trip point data */ DeviceExtension->TripPointOld = 0; DeviceExtension->TripPointValue = BATTERY_UNKNOWN_CAPACITY; - + /* Clear AR lock and set new interrupt time */ InterlockedExchange(&DeviceExtension->ArLockValue, 0); DeviceExtension->InterruptTime = KeQueryInterruptTime(); @@ -582,7 +582,7 @@ CmBattQueryTag(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, Status = STATUS_NO_SUCH_DEVICE; } } - + /* Return the tag and status result */ *Tag = DeviceExtension->Tag; if (CmBattDebug & CMBATT_ACPI_WARNING) @@ -626,7 +626,7 @@ CmBattDisableStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension) /* Nothing we can do */ Status = STATUS_OBJECT_NAME_NOT_FOUND; } - + /* Return status */ return Status; } @@ -645,14 +645,14 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (CmBattDebug & (CMBATT_ACPI_WARNING | CMBATT_GENERIC_INFO)) DbgPrint("CmBattSetStatusNotify: Tag (%d) Target(0x%x)\n", BatteryTag, BatteryNotify->LowCapacity); - - /* Update any ACPI evaluations */ + + /* Update any ACPI evaluations */ Status = CmBattVerifyStaticInfo(DeviceExtension, BatteryTag); if (!NT_SUCCESS(Status)) return Status; - + /* Trip point not supported, fail */ if (!DeviceExtension->TripPointSet) return STATUS_OBJECT_NAME_NOT_FOUND; - + /* Are both capacities known? */ if ((BatteryNotify->HighCapacity == BATTERY_UNKNOWN_CAPACITY) || (BatteryNotify->LowCapacity == BATTERY_UNKNOWN_CAPACITY)) @@ -662,7 +662,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattSetStatusNotify: Failing request because of BATTERY_UNKNOWN_CAPACITY.\n"); return STATUS_NOT_SUPPORTED; } - + /* Is the battery charging? */ Charging = DeviceExtension->BstData.State & ACPI_BATT_STAT_CHARGING; if (Charging) @@ -704,7 +704,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, Status = STATUS_NOT_SUPPORTED; if (CmBattDebug & CMBATT_ACPI_WARNING) DbgPrint("CmBattSetStatusNotify: Can't calculate BTP, DesignVoltage = 0x%08x\n", - DesignVoltage); + DesignVoltage); } } else if (Charging) @@ -726,7 +726,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattSetStatusNotify: Keeping original setting: %X\n", DeviceExtension->TripPointValue); return STATUS_SUCCESS; } - + /* Set the trip point with ACPI and check for success */ DeviceExtension->TripPointValue = NewTripPoint; Status = CmBattSetTripPpoint(DeviceExtension, NewTripPoint); @@ -739,7 +739,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattSetStatusNotify: SetTripPoint failed - %x\n", Status); return Status; } - + /* Read the new BST data to see the latest state */ Status = CmBattGetBstData(DeviceExtension, &BstData); if (!NT_SUCCESS(Status)) @@ -762,7 +762,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (CmBattDebug & CMBATT_GENERIC_WARNING) DbgPrint("CmBattSetStatusNotify: Trip point already crossed (1): TP = %08x, remaining capacity = %08x\n", NewTripPoint, BstData.RemainingCapacity); - CmBattNotifyHandler(DeviceExtension, ACPI_BATT_NOTIFY_STATUS); + CmBattNotifyHandler(DeviceExtension, ACPI_BATT_NOTIFY_STATUS); } /* All should've went well if we got here, unless BST failed... return! */ @@ -789,8 +789,8 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, PAGED_CODE(); if (CmBattDebug & CMBATT_GENERIC_INFO) DbgPrint("CmBattGetBatteryStatus - CmBatt (%08x) Tag (%d)\n", DeviceExtension, Tag); - - /* Validate ACPI data */ + + /* Validate ACPI data */ Status = CmBattVerifyStaticInfo(DeviceExtension, Tag); if (!NT_SUCCESS(Status)) return Status; @@ -810,8 +810,8 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, InterlockedExchange(&DeviceExtension->ArLockValue, 0); return Status; } - - /* Clear current BST information */ + + /* Clear current BST information */ DeviceExtension->State = 0; DeviceExtension->RemainingCapacity = 0; DeviceExtension->PresentVoltage = 0; @@ -819,7 +819,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, /* Get battery state */ BstState = DeviceExtension->BstData.State; - + /* Is the battery both charging and discharging? */ if ((BstState & ACPI_BATT_STAT_DISCHARG) && (BstState & ACPI_BATT_STAT_CHARGING) && (CmBattDebug & (CMBATT_ACPI_WARNING | CMBATT_GENERIC_WARNING))) @@ -827,8 +827,8 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, "CmBattGetBatteryStatus: Invalid state: _BST method returned 0x%08x for Battery State.\n" "* One battery cannot be charging and discharging at the same time.\n", BstState); - - /* Is the battery discharging? */ + + /* Is the battery discharging? */ if (BstState & ACPI_BATT_STAT_DISCHARG) { /* Set power state and check if it just started discharging now */ @@ -844,13 +844,13 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, /* Battery is charging, update power state */ DeviceExtension->State |= (BATTERY_CHARGING | BATTERY_POWER_ON_LINE); } - + /* Is the battery in a critical state? */ if (BstState & ACPI_BATT_STAT_CRITICAL) DeviceExtension->State |= BATTERY_CRITICAL; - - /* Read the voltage data */ + + /* Read the voltage data */ DeviceExtension->PresentVoltage = DeviceExtension->BstData.PresentVoltage; - + /* Check if we have an A/C adapter */ if (AcAdapterPdo) { @@ -868,10 +868,10 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, else { /* Assume no charger */ - PsrData = 0; + PsrData = 0; } } - + /* Is there a charger? */ if (PsrData) { @@ -882,21 +882,21 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, } else if (CmBattDebug & (CMBATT_GENERIC_INFO | CMBATT_GENERIC_STATUS)) { - DbgPrint("CmBattGetBatteryStatus: AC adapter is NOT connected\n"); + DbgPrint("CmBattGetBatteryStatus: AC adapter is NOT connected\n"); } - + /* Get some data we'll need */ DesignVoltage = DeviceExtension->BifData.DesignVoltage; PresentRate = DeviceExtension->BstData.PresentRate; RemainingCapacity = DeviceExtension->BstData.RemainingCapacity; - + /* Check if we have battery data in Watts instead of Amps */ if (DeviceExtension->BifData.PowerUnit == ACPI_BATT_POWER_UNIT_WATTS) { /* Get the data from the BST */ DeviceExtension->RemainingCapacity = RemainingCapacity; DeviceExtension->Rate = PresentRate; - + /* Check if the rate is invalid */ if (PresentRate > CM_MAX_VALUE) { @@ -927,7 +927,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, /* Compute the capacity with the information we have */ DeviceExtension->RemainingCapacity = (DesignVoltage * RemainingCapacity + 500) / 1000; } - + /* Check if we have a rate */ if (PresentRate != CM_UNKNOWN_VALUE) { @@ -942,14 +942,14 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("---------------------- Overflow: PresentRate = 0x%08x\n", PresentRate); } } - + /* Compute the rate */ DeviceExtension->Rate = (PresentRate * DesignVoltage + 500) / 1000; } else { /* We don't have a rate, so set unknown value */ - DeviceExtension->Rate = BATTERY_UNKNOWN_RATE; + DeviceExtension->Rate = BATTERY_UNKNOWN_RATE; if (CmBattDebug & CMBATT_ACPI_WARNING) { DbgPrint("CmBattGetBatteryStatus - Can't calculate Rate \n"); @@ -968,7 +968,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("---------------------- DesignVoltage = 0x%08x\n", DesignVoltage); } } - + /* Check if we have an unknown rate */ if (DeviceExtension->Rate == BATTERY_UNKNOWN_RATE) { @@ -990,7 +990,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DeviceExtension->Rate); DeviceExtension->Rate = 0; } - + /* Done */ return STATUS_SUCCESS; } @@ -1036,9 +1036,9 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, QueryData = &FdoExtension->BatteryInformation; QueryLength = sizeof(BATTERY_INFORMATION); break; - + case BatteryGranularityInformation: - + /* Return our static information, we have two scales */ BatteryReportingScale[0].Granularity = FdoExtension->BatteryCapacityGranularity1; BatteryReportingScale[0].Capacity = FdoExtension->BatteryInformation.DefaultAlert1; @@ -1047,25 +1047,25 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, QueryData = BatteryReportingScale; QueryLength = sizeof(BATTERY_REPORTING_SCALE) * 2; break; - + case BatteryEstimatedTime: - + /* Check if it's been more than 2 1/2 minutes since the last change */ if ((KeQueryInterruptTime() - 150000000) > (FdoExtension->InterruptTime)) { /* Get new battery status */ CmBattGetBatteryStatus(FdoExtension, FdoExtension->Tag); - + /* If the caller didn't specify a rate, use our static one */ Rate = AtRate; if (!Rate) Rate = FdoExtension->Rate; - + /* If we don't have a valid negative rate, use unknown value */ if (Rate >= 0) Rate = BATTERY_UNKNOWN_RATE; - + /* Grab the remaining capacity */ RemainingCapacity = FdoExtension->RemainingCapacity; - + /* See if we don't know one or the other */ if ((Rate == BATTERY_UNKNOWN_RATE) || (RemainingCapacity == BATTERY_UNKNOWN_CAPACITY)) @@ -1074,7 +1074,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, if ((FdoExtension->BstData.State & ACPI_BATT_STAT_DISCHARG) && (CmBattDebug & CMBATT_GENERIC_WARNING)) DbgPrint("CmBattQueryInformation: Can't calculate EstimatedTime.\n"); - + /* Check if we don't have a rate and capacity is going down */ if ((FdoExtension->Rate == BATTERY_UNKNOWN_RATE) && (FdoExtension->BstData.State & ACPI_BATT_STAT_DISCHARG)) @@ -1084,7 +1084,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, if (CmBattDebug & CMBATT_GENERIC_WARNING) DbgPrint("---------------------- PresentRate = BATTERY_UNKNOWN_RATE\n"); } - + /* If we don't have capacity, the rate is useless */ if (RemainingCapacity == BATTERY_UNKNOWN_CAPACITY) { @@ -1110,49 +1110,49 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, } } } - + /* Return the remaining time */ QueryData = &RemainingTime; QueryLength = sizeof(ULONG); break; - + case BatteryDeviceName: - + /* Build the model number string */ RtlInitAnsiString(&TempString, FdoExtension->ModelNumber); /* Convert it to Unicode */ InfoString.Buffer = InfoBuffer; - InfoString.MaximumLength = sizeof(InfoBuffer); + InfoString.MaximumLength = sizeof(InfoBuffer); Status = RtlAnsiStringToUnicodeString(&InfoString, &TempString, 0); - + /* Return the unicode buffer */ QueryData = InfoString.Buffer; QueryLength = InfoString.Length; break; - + case BatteryTemperature: case BatteryManufactureDate: - + /* We don't support these */ Status = STATUS_INVALID_DEVICE_REQUEST; break; - + case BatteryManufactureName: - + /* Build the OEM info string */ RtlInitAnsiString(&TempString, FdoExtension->OemInfo); - + /* Convert it to Unicode */ InfoString.Buffer = InfoBuffer; InfoString.MaximumLength = sizeof(InfoBuffer); Status = RtlAnsiStringToUnicodeString(&InfoString, &TempString, 0); - + /* Return the unicode buffer */ QueryData = InfoString.Buffer; QueryLength = InfoString.Length; break; - + case BatteryUniqueID: /* Build the serial number string */ @@ -1166,32 +1166,32 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, /* Setup a temporary string for concatenation */ TempString2.Buffer = TempBuffer; TempString2.MaximumLength = sizeof(TempBuffer); - + /* Check if there's an OEM string */ if (FdoExtension->OemInfo[0]) { /* Build the OEM info string */ RtlInitAnsiString(&TempString, FdoExtension->OemInfo); - + /* Convert it to Unicode and append it */ RtlAnsiStringToUnicodeString(&TempString2, &TempString, 0); RtlAppendUnicodeStringToString(&InfoString, &TempString2); } - + /* Build the model number string */ RtlInitAnsiString(&TempString, FdoExtension->ModelNumber); - + /* Convert it to Unicode and append it */ RtlAnsiStringToUnicodeString(&TempString2, &TempString, 0); RtlAppendUnicodeStringToString(&InfoString, &TempString2); - + /* Return the final appended string */ QueryData = InfoString.Buffer; QueryLength = InfoString.Length; break; - + default: - + /* Everything else is unknown */ Status = STATUS_INVALID_PARAMETER; break; @@ -1203,7 +1203,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, /* Copy the data if there's enough space and it exists */ if ((NT_SUCCESS(Status)) && (QueryData)) RtlCopyMemory(Buffer, QueryData, QueryLength); - + /* Return function result */ return Status; } @@ -1218,7 +1218,7 @@ CmBattQueryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, PAGED_CODE(); if (CmBattDebug & (CMBATT_ACPI_WARNING | CMBATT_GENERIC_INFO)) DbgPrint("CmBattQueryStatus - Tag (%d) Device %x\n", Tag, DeviceExtension->DeviceId); - + /* Query ACPI information */ Status = CmBattGetBatteryStatus(DeviceExtension, Tag); if (NT_SUCCESS(Status)) @@ -1228,7 +1228,7 @@ CmBattQueryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, BatteryStatus->Voltage = DeviceExtension->PresentVoltage; BatteryStatus->Rate = DeviceExtension->Rate; } - + /* Return status */ if (CmBattDebug & (CMBATT_GENERIC_INFO)) DbgPrint("CmBattQueryStatus: Returning [%#08lx][%#08lx][%#08lx][%#08lx]\n", @@ -1262,14 +1262,14 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, DbgPrint("CmBatt: Couldn't allocate pool for registry path."); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Buffer allocated, copy the string */ RtlCopyUnicodeString(&GlobalRegistryPath, RegistryPath); if (CmBattDebug & CMBATT_GENERIC_INFO) DbgPrint("CmBatt DriverEntry - Obj (%08x) Path \"%ws\"\n", DriverObject, RegistryPath->Buffer); - + /* Setup the major dispatchers */ DriverObject->MajorFunction[IRP_MJ_CREATE] = CmBattOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = CmBattOpenClose; @@ -1280,12 +1280,12 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, /* And the unload routine */ DriverObject->DriverUnload = CmBattUnload; - + /* And the add device routine */ DriverExtension = DriverObject->DriverExtension; DriverExtension->AddDevice = CmBattAddDevice; - /* Create a power callback */ + /* Create a power callback */ RtlInitUnicodeString(&CallbackName, L"\\Callback\\PowerState"); InitializeObjectAttributes(&ObjectAttributes, &CallbackName, @@ -1318,7 +1318,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, if (CmBattDebug & CMBATT_GENERIC_WARNING) DbgPrint("CmBattRegisterPowerCallBack: ExRegisterCallback failed.\n"); } - + /* All good */ Status = STATUS_SUCCESS; } diff --git a/drivers/bus/acpi/cmbatt/cmbatt.h b/drivers/bus/acpi/cmbatt/cmbatt.h index bc16b28d432..feec959fb42 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.h +++ b/drivers/bus/acpi/cmbatt/cmbatt.h @@ -15,13 +15,13 @@ #include #define IOCTL_BATTERY_QUERY_UNIQUE_ID \ - CTL_CODE(FILE_DEVICE_BATTERY, 0x101, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294404 - + CTL_CODE(FILE_DEVICE_BATTERY, 0x101, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294404 + #define IOCTL_BATTERY_QUERY_STA \ CTL_CODE(FILE_DEVICE_BATTERY, 0x102, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294408 #define IOCTL_BATTERY_QUERY_PSR \ - CTL_CODE(FILE_DEVICE_BATTERY, 0x103, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x29440C + CTL_CODE(FILE_DEVICE_BATTERY, 0x103, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x29440C #define IOCTL_BATTERY_SET_TRIP_POINT \ CTL_CODE(FILE_DEVICE_BATTERY, 0x104, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294410 @@ -31,7 +31,7 @@ #define IOCTL_BATTERY_QUERY_BST \ CTL_CODE(FILE_DEVICE_BATTERY, 0x106, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294418 - + #define CMBATT_GENERIC_STATUS 0x01 #define CMBATT_GENERIC_INFO 0x02 #define CMBATT_GENERIC_WARNING 0x04 @@ -246,7 +246,7 @@ CmBattQueryInformation( IN ULONG BufferLength, OUT PULONG ReturnedLength ); - + NTSTATUS NTAPI CmBattQueryStatus( diff --git a/drivers/bus/acpi/cmbatt/cmbwmi.c b/drivers/bus/acpi/cmbatt/cmbwmi.c index 2a5a73f4603..4f27e3762bc 100644 --- a/drivers/bus/acpi/cmbatt/cmbwmi.c +++ b/drivers/bus/acpi/cmbatt/cmbwmi.c @@ -64,7 +64,7 @@ CmBattQueryWmiRegInfo(PDEVICE_OBJECT DeviceObject, UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - + NTSTATUS NTAPI CmBattQueryWmiDataBlock(PDEVICE_OBJECT DeviceObject, @@ -83,7 +83,7 @@ CmBattQueryWmiDataBlock(PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI CmBattSetWmiDataBlock(PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, ULONG GuidIndex, ULONG InstanceIndex, ULONG BufferSize, @@ -112,10 +112,10 @@ NTAPI CmBattWmiDeRegistration(IN PCMBATT_DEVICE_EXTENSION DeviceExtension) { PAGED_CODE(); - + /* De-register */ return IoWMIRegistrationControl(DeviceExtension->FdoDeviceObject, - WMIREG_ACTION_DEREGISTER); + WMIREG_ACTION_DEREGISTER); } NTSTATUS @@ -123,12 +123,12 @@ NTAPI CmBattWmiRegistration(IN PCMBATT_DEVICE_EXTENSION DeviceExtension) { PAGED_CODE(); - + /* GUID information */ DeviceExtension->WmiLibInfo.GuidCount = sizeof(CmBattWmiGuidList) / sizeof(WMIGUIDREGINFO); DeviceExtension->WmiLibInfo.GuidList = CmBattWmiGuidList; - + /* Callbacks */ DeviceExtension->WmiLibInfo.QueryWmiRegInfo = CmBattQueryWmiRegInfo; DeviceExtension->WmiLibInfo.QueryWmiDataBlock = CmBattQueryWmiDataBlock; @@ -136,7 +136,7 @@ CmBattWmiRegistration(IN PCMBATT_DEVICE_EXTENSION DeviceExtension) DeviceExtension->WmiLibInfo.SetWmiDataItem = CmBattSetWmiDataItem; DeviceExtension->WmiLibInfo.ExecuteWmiMethod = NULL; DeviceExtension->WmiLibInfo.WmiFunctionControl = NULL; - + /* Register */ return IoWMIRegistrationControl(DeviceExtension->FdoDeviceObject, WMIREG_ACTION_REGISTER); @@ -155,7 +155,7 @@ CmBattSystemControl(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: %s\n", WMIMinorFunctionString(IoGetCurrentIrpStackLocation(Irp)->MinorFunction)); - + /* Acquire the remove lock */ DeviceExtension = DeviceObject->DeviceExtension; Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, 0); @@ -166,7 +166,7 @@ CmBattSystemControl(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_DEVICE_REMOVED; } - + /* What kind of device is this? */ WmiLibContext = &DeviceExtension->WmiLibInfo; if (DeviceExtension->FdoType == CmBattBattery) @@ -191,26 +191,26 @@ CmBattSystemControl(IN PDEVICE_OBJECT DeviceObject, switch (Disposition) { case IrpNotCompleted: - + /* Complete it here */ if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: Irp Not Completed.\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); break; - + case IrpForward: - + /* Forward it to ACPI */ if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: Irp Forward.\n"); IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); break; - + case IrpProcessed: - + /* Nothing to do */ if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: Irp Processed.\n"); break; - + default: ASSERT(FALSE); } @@ -219,5 +219,5 @@ CmBattSystemControl(IN PDEVICE_OBJECT DeviceObject, IoReleaseRemoveLock(&DeviceExtension->RemoveLock, 0); return Status; } - + /* EOF */ diff --git a/drivers/bus/acpi/cmbatt/cmexec.c b/drivers/bus/acpi/cmbatt/cmexec.c index f808b5d4c0f..284bd3cb449 100644 --- a/drivers/bus/acpi/cmbatt/cmexec.c +++ b/drivers/bus/acpi/cmbatt/cmexec.c @@ -21,7 +21,7 @@ GetDwordElement(IN PACPI_METHOD_ARGUMENT Argument, OUT PULONG Value) { NTSTATUS Status; - + /* Must have an integer */ if (Argument->Type != ACPI_METHOD_ARGUMENT_INTEGER) { @@ -37,7 +37,7 @@ GetDwordElement(IN PACPI_METHOD_ARGUMENT Argument, *Value = Argument->Argument; Status = STATUS_SUCCESS; } - + /* Return status */ return Status; } @@ -48,7 +48,7 @@ GetStringElement(IN PACPI_METHOD_ARGUMENT Argument, OUT PCHAR Value) { NTSTATUS Status; - + /* Must have a string of buffer */ if ((Argument->Type == ACPI_METHOD_ARGUMENT_STRING) || (Argument->Type == ACPI_METHOD_ARGUMENT_BUFFER)) @@ -75,7 +75,7 @@ GetStringElement(IN PACPI_METHOD_ARGUMENT Argument, if (CmBattDebug & 0x4C) DbgPrint("GetStringElement: Object contained wrong data type - %d\n", Argument->Type); } - + /* Return the status */ return Status; } @@ -97,7 +97,7 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, /* Initialize our wait event */ KeInitializeEvent(&Event, SynchronizationEvent, 0); - + /* Allocate the IRP */ Irp = IoBuildDeviceIoControlRequest(IoControlCode, DeviceObject, @@ -115,7 +115,7 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, DbgPrint("CmBattSendDownStreamIrp: Failed to allocate Irp\n"); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Call ACPI */ if (CmBattDebug & 0x40) DbgPrint("CmBattSendDownStreamIrp: Irp %x [Tid] %x\n", @@ -131,7 +131,7 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, NULL); Status = Irp->IoStatus.Status; } - + /* Check if caller wanted output */ if (OutputBuffer) { @@ -143,7 +143,7 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_ACPI_INVALID_DATA; } } - + /* Return status */ if (CmBattDebug & 0x40) DbgPrint("CmBattSendDownStreamIrp: Irp %x completed %x! [Tid] %x\n", @@ -163,11 +163,11 @@ CmBattGetPsrData(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 0x40) DbgPrint("CmBattGetPsrData: Entered with Pdo %x Tid %x\n", DeviceObject, KeGetCurrentThread()); - + /* Initialize to zero */ ASSERT(PsrData != NULL); *PsrData = 0; - + /* Request the _PSR method */ *(PULONG)InputBuffer.MethodName = 'RSP_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; @@ -191,7 +191,7 @@ CmBattGetPsrData(IN PDEVICE_OBJECT DeviceObject, /* Failure */ DbgPrint("CmBattGetPsrData: Failed _PSR method - Status (0x%x)\n", Status); } - + /* Return status */ return Status; } @@ -208,11 +208,11 @@ CmBattGetStaData(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 0x40) DbgPrint("CmBattGetStaData: Entered with Pdo %x Tid %x\n", DeviceObject, KeGetCurrentThread()); - + /* Initialize to zero */ ASSERT(StaData != NULL); *StaData = 0; - + /* Request the _PSR method */ *(PULONG)InputBuffer.MethodName = 'ATS_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; @@ -237,7 +237,7 @@ CmBattGetStaData(IN PDEVICE_OBJECT DeviceObject, DbgPrint("CmBattGetStaData: Failed _STA method - Status (0x%x)\n", Status); Status = STATUS_NO_SUCH_DEVICE; } - + /* Return status */ return Status; } @@ -254,11 +254,11 @@ CmBattGetUniqueId(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 0x40) DbgPrint("CmBattGetUniqueId: Entered with Pdo %x Tid %x\n", DeviceObject, KeGetCurrentThread()); - + /* Initialize to zero */ ASSERT(UniqueId != NULL); *UniqueId = 0; - + /* Request the _PSR method */ *(PULONG)InputBuffer.MethodName = 'DIU_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; @@ -283,7 +283,7 @@ CmBattGetUniqueId(IN PDEVICE_OBJECT DeviceObject, DbgPrint("CmBattGetUniqueId: Failed _UID method - Status (0x%x)\n", Status); Status = STATUS_NO_SUCH_DEVICE; } - + /* Return status */ return Status; } @@ -299,7 +299,7 @@ CmBattSetTripPpoint(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (CmBattDebug & 0x440) DbgPrint("CmBattSetTripPpoint: _BTP Alarm Value %x Device %x Tid %x\n", AlarmValue, DeviceExtension->DeviceId, KeGetCurrentThread); - + /* Request the _BTP method */ *(PULONG)InputBuffer.MethodName = 'PTB_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER_SIGNATURE; @@ -315,7 +315,7 @@ CmBattSetTripPpoint(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (!(NT_SUCCESS(Status)) && (CmBattDebug & 0x440)) DbgPrint("CmBattSetTripPpoint: Failed _BTP method on device %x - Status (0x%x)\n", DeviceExtension->DeviceId, Status); - + /* Return status */ return Status; } diff --git a/drivers/bus/acpi/compbatt/compbatt.c b/drivers/bus/acpi/compbatt/compbatt.c index c22f4c720ce..e6ef0d738d9 100644 --- a/drivers/bus/acpi/compbatt/compbatt.c +++ b/drivers/bus/acpi/compbatt/compbatt.c @@ -25,12 +25,12 @@ CompBattOpenClose(IN PDEVICE_OBJECT DeviceObject, { PAGED_CODE(); if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING OpenClose\n"); - + /* Complete the IRP with success */ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - + /* Return success */ if (CompBattDebug & 0x100) DbgPrint("CompBatt: Exiting OpenClose\n"); return STATUS_SUCCESS; @@ -45,7 +45,7 @@ CompBattSystemControl(IN PDEVICE_OBJECT DeviceObject, NTSTATUS Status; PAGED_CODE(); if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING System Control\n"); - + /* Are we attached yet? */ if (DeviceExtension->AttachedDevice) { @@ -60,7 +60,7 @@ CompBattSystemControl(IN PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); } - + /* Return status */ return Status; } @@ -109,13 +109,13 @@ CompBattRecalculateTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) DeviceExtension->NextTag = Tag + 1; break; } - + /* No tag for this device extension, clear it */ DeviceExtension->Tag = 0; NextEntry = NextEntry->Flink; } - - /* We're done */ + + /* We're done */ ExReleaseFastMutex(&DeviceExtension->Lock); if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING CompBattRecalculateTag\n"); } @@ -159,7 +159,7 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, /* Assign one */ CompBattRecalculateTag(DeviceExtension); } - + /* Do we have a tag now? */ if ((DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED) && (DeviceExtension->Tag)) { @@ -173,7 +173,7 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, *Tag = 0; Status = STATUS_NO_SUCH_DEVICE; } - + /* Return status */ if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING QueryTag\n"); return Status; @@ -236,12 +236,12 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, PCOMPBATT_BATTERY_DATA BatteryData; PLIST_ENTRY ListHead, NextEntry; if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteryInformation\n"); - + /* Set defaults */ BatteryInfo->DefaultAlert1 = 0; BatteryInfo->DefaultAlert2 = 0; BatteryInfo->CriticalBias = 0; - + /* Loop the battery list */ ExAcquireFastMutex(&DeviceExtension->Lock); ListHead = &DeviceExtension->BatteryList; @@ -254,12 +254,12 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, { /* Now release the device lock since the battery can't go away */ ExReleaseFastMutex(&DeviceExtension->Lock); - + /* Build the query */ InputBuffer.BatteryTag = BatteryData->Tag; InputBuffer.InformationLevel = BatteryInformation; InputBuffer.AtRate = 0; - + /* Make sure the battery has a tag */ if (BatteryData->Tag) { @@ -284,7 +284,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); break; } - + /* Next time we can use the static copy */ BatteryData->Flags |= COMPBATT_BATTERY_INFORMATION_PRESENT; if (CompBattDebug & 2) @@ -307,7 +307,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, /* Combine capabilities */ BatteryInfo->Capabilities |= BatteryData->BatteryInformation.Capabilities; - + /* Add-on capacity */ if (BatteryData->BatteryInformation.DesignedCapacity != BATTERY_UNKNOWN_CAPACITY) { @@ -319,7 +319,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, { BatteryInfo->FullChargedCapacity += BatteryData->BatteryInformation.FullChargedCapacity; } - + /* Choose the highest alert */ BatteryInfo->DefaultAlert1 = max(BatteryInfo->DefaultAlert1, BatteryData->BatteryInformation.DefaultAlert1); @@ -327,22 +327,22 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, /* Choose the highest alert */ BatteryInfo->DefaultAlert2 = max(BatteryInfo->DefaultAlert2, BatteryData->BatteryInformation.DefaultAlert2); - + /* Choose the highest critical bias */ BatteryInfo->CriticalBias = max(BatteryInfo->CriticalBias, BatteryData->BatteryInformation.CriticalBias); } - + /* Re-acquire the device extension lock and release the remove lock */ ExAcquireFastMutex(&DeviceExtension->Lock); IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); } - + /* Next entry */ NextEntry = NextEntry->Flink; } - - /* We are done with the list, check if the information was queried okay */ + + /* We are done with the list, check if the information was queried okay */ ExReleaseFastMutex(&DeviceExtension->Lock); if (NT_SUCCESS(Status)) { @@ -351,7 +351,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, { BatteryInfo->FullChargedCapacity = BatteryInfo->DesignedCapacity; } - + /* Print out final combined data */ if (CompBattDebug & 2) DbgPrint("CompBattGetBatteryInformation: Returning BATTERY_INFORMATION\n" @@ -369,14 +369,14 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, BatteryInfo->DefaultAlert2, BatteryInfo->CriticalBias, BatteryInfo->CycleCount); - + /* Copy the data into the device extension */ RtlCopyMemory(&DeviceExtension->BatteryInformation, BatteryInfo, sizeof(DeviceExtension->BatteryInformation)); DeviceExtension->Flags |= COMPBATT_BATTERY_INFORMATION_PRESENT; } - + /* We are done */ if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteryInformation\n"); return Status; @@ -394,13 +394,13 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, PLIST_ENTRY ListHead, NextEntry; ULONG i; if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteryGranularity\n"); - + /* Set defaults */ ReportingScale[0].Granularity = -1; ReportingScale[1].Granularity = -1; ReportingScale[2].Granularity = -1; ReportingScale[3].Granularity = -1; - + /* Loop the battery list */ ExAcquireFastMutex(&DeviceExtension->Lock); ListHead = &DeviceExtension->BatteryList; @@ -413,11 +413,11 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, { /* Now release the device lock since the battery can't go away */ ExReleaseFastMutex(&DeviceExtension->Lock); - + /* Build the query */ InputBuffer.BatteryTag = BatteryData->Tag; InputBuffer.InformationLevel = BatteryGranularityInformation; - + /* Make sure the battery has a tag */ if (BatteryData->Tag) { @@ -438,7 +438,7 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); break; } - + /* Loop all 4 scales */ for (i = 0; i < 4; i++) { @@ -449,10 +449,10 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, ReportingScale[i].Granularity = min(BatteryScale[i].Granularity, ReportingScale[i].Granularity); } - + } } - + /* Re-acquire the device extension lock and release the remove lock */ ExAcquireFastMutex(&DeviceExtension->Lock); IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); @@ -461,7 +461,7 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, /* Next entry */ NextEntry = NextEntry->Flink; } - + /* All done */ ExReleaseFastMutex(&DeviceExtension->Lock); if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteryGranularity\n"); @@ -476,7 +476,7 @@ CompBattGetEstimatedTime(OUT PULONG Time, UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - + NTSTATUS NTAPI CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, @@ -505,12 +505,12 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, /* Not right, so fail */ return STATUS_NO_SUCH_DEVICE; } - + /* Check what caller wants */ switch (InfoLevel) { case BatteryInformation: - + /* Query combined battery information */ RtlZeroMemory(&BatteryInfo, sizeof(BatteryInfo)); Status = CompBattGetBatteryInformation(&BatteryInfo, DeviceExtension); @@ -521,7 +521,7 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, QueryLength = sizeof(BatteryInfo); } break; - + case BatteryGranularityInformation: /* Query combined granularity information */ @@ -534,9 +534,9 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, QueryData = &BatteryGranularity; } break; - + case BatteryEstimatedTime: - + /* Query combined time estimate information */ RtlZeroMemory(&Time, sizeof(Time)); Status = CompBattGetEstimatedTime(&Time, DeviceExtension); @@ -544,20 +544,20 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, { /* Return the data if successful */ QueryLength = sizeof(Time); - QueryData = &Time; + QueryData = &Time; } break; - + case BatteryManufactureName: case BatteryDeviceName: - + /* Return the static buffer */ QueryData = BatteryName; QueryLength = sizeof(L"Composite Battery"); break; - + case BatteryManufactureDate: - + /* Static data */ //Date.Day = 26; //Date.Month = 06; @@ -572,7 +572,7 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, QueryData = &Dummy; QueryLength = sizeof(Dummy); break; - + default: /* Everything else is unknown */ Status = STATUS_INVALID_PARAMETER; @@ -585,7 +585,7 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, /* Copy the data if there's enough space and it exists */ if ((NT_SUCCESS(Status)) && (QueryData)) RtlCopyMemory(Buffer, QueryData, QueryLength); - + /* Return function result */ if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING QueryInformation\n"); return Status; @@ -598,7 +598,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, { /* Register add device routine */ DriverObject->DriverExtension->AddDevice = CompBattAddDevice; - + /* Register other handlers */ DriverObject->MajorFunction[IRP_MJ_CREATE] = CompBattOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = CompBattOpenClose; diff --git a/drivers/bus/acpi/compbatt/compbatt.h b/drivers/bus/acpi/compbatt/compbatt.h index 0c31fdb9e3c..950e5a5f7dd 100644 --- a/drivers/bus/acpi/compbatt/compbatt.h +++ b/drivers/bus/acpi/compbatt/compbatt.h @@ -88,7 +88,7 @@ CompBattQueryInformation( IN ULONG BufferLength, OUT PULONG ReturnedLength ); - + NTSTATUS NTAPI CompBattQueryStatus( @@ -144,7 +144,7 @@ CompBattGetDeviceObjectPointer( NTSTATUS NTAPI BatteryIoctl( - IN ULONG IoControlCode, + IN ULONG IoControlCode, IN PDEVICE_OBJECT DeviceObject, IN PVOID InputBuffer, IN ULONG InputBufferLength, diff --git a/drivers/bus/acpi/eval.c b/drivers/bus/acpi/eval.c index 57aba36c680..aeef1535cc5 100644 --- a/drivers/bus/acpi/eval.c +++ b/drivers/bus/acpi/eval.c @@ -250,6 +250,6 @@ Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, else { DPRINT1("Query method %4s failed on %p\n", EvalInputBuff->MethodName, DeviceData->AcpiHandle); - return STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } diff --git a/drivers/bus/acpi/include/acpi_bus.h b/drivers/bus/acpi/include/acpi_bus.h index 59bc666634c..fa3ca02daf7 100644 --- a/drivers/bus/acpi/include/acpi_bus.h +++ b/drivers/bus/acpi/include/acpi_bus.h @@ -203,7 +203,7 @@ struct acpi_device_power_flags { struct acpi_device_power_state { struct { - UINT8 valid:1; + UINT8 valid:1; UINT8 explicit_set:1; /* _PSx present? */ UINT8 reserved:6; } flags; @@ -227,7 +227,7 @@ struct acpi_device_perf_flags { struct acpi_device_perf_state { struct { - UINT8 valid:1; + UINT8 valid:1; UINT8 reserved:7; } flags; UINT8 power; /* % Power (compared to P0) */ diff --git a/drivers/bus/acpi/include/acpi_drivers.h b/drivers/bus/acpi/include/acpi_drivers.h index 6506e44882b..1cbb964efa4 100644 --- a/drivers/bus/acpi/include/acpi_drivers.h +++ b/drivers/bus/acpi/include/acpi_drivers.h @@ -87,7 +87,7 @@ #define ACPI_BUTTON_NOTIFY_STATUS 0x80 #define ACPI_BUTTON_SUBCLASS_POWER "power" -#define ACPI_BUTTON_HID_POWER "PNP0C0C" +#define ACPI_BUTTON_HID_POWER "PNP0C0C" #define ACPI_BUTTON_HID_POWERF "ACPI_FPB" #define ACPI_BUTTON_DEVICE_NAME_POWER "Power Button (CM)" #define ACPI_BUTTON_DEVICE_NAME_POWERF "Power Button (FF)" diff --git a/drivers/bus/acpi/include/list.h b/drivers/bus/acpi/include/list.h index 90546906624..c1341c6d6b6 100644 --- a/drivers/bus/acpi/include/list.h +++ b/drivers/bus/acpi/include/list.h @@ -1,6 +1,6 @@ #ifndef _LINUX_LIST_H #define _LINUX_LIST_H - + /* * Simple doubly linked list implementation. @@ -11,23 +11,23 @@ * generate better code by using them directly rather than * using the generic single-entry routines. */ - + struct list_head { struct list_head *next, *prev; }; - + #define LIST_HEAD_INIT(name) { &(name), &(name) } - + #define LIST_HEAD(name) \ struct list_head name = LIST_HEAD_INIT(name) - + #define INIT_LIST_HEAD(ptr) do { \ (ptr)->next = (ptr); (ptr)->prev = (ptr); \ } while (0) - + /* - * Insert a new entry between two known consecutive entries. + * Insert a new entry between two known consecutive entries. * * This is only for internal list manipulation where we know * the prev/next entries already! @@ -41,7 +41,7 @@ new->prev = prev; prev->next = new; } - + /** * list_add - add a new entry * @new: new entry to be added @@ -54,7 +54,7 @@ { __list_add(new, head, head->next); } - + /** * list_add_tail - add a new entry * @new: new entry to be added @@ -67,7 +67,7 @@ { __list_add(new, head->prev, head); } - + /* * Delete a list entry by making the prev/next entries * point to each other. @@ -80,7 +80,7 @@ next->prev = prev; prev->next = next; } - + /** * list_del - deletes entry from list. * @entry: the element to delete from the list. @@ -92,7 +92,7 @@ entry->next = (void *) 0; entry->prev = (void *) 0; } - + /** * list_del_init - deletes entry from list and reinitialize it. * @entry: the element to delete from the list. @@ -100,9 +100,9 @@ static inline void list_del_init(struct list_head *entry) { __list_del(entry->prev, entry->next); - INIT_LIST_HEAD(entry); + INIT_LIST_HEAD(entry); } - + /** * list_move - delete from one list and add as another's head * @list: the entry to move @@ -113,7 +113,7 @@ __list_del(list->prev, list->next); list_add(list, head); } - + /** * list_move_tail - delete from one list and add as another's tail * @list: the entry to move @@ -125,7 +125,7 @@ __list_del(list->prev, list->next); list_add_tail(list, head); } - + /** * list_empty - tests whether a list is empty * @head: the list to test. @@ -134,21 +134,21 @@ { return head->next == head; } - + static inline void __list_splice(struct list_head *list, struct list_head *head) { struct list_head *first = list->next; struct list_head *last = list->prev; struct list_head *at = head->next; - + first->prev = head; head->next = first; - + last->next = at; at->prev = last; } - + /** * list_splice - join two lists * @list: the new list to add. @@ -159,7 +159,7 @@ if (!list_empty(list)) __list_splice(list, head); } - + /** * list_splice_init - join two lists and reinitialise the emptied list. * @list: the new list to add. @@ -175,7 +175,7 @@ INIT_LIST_HEAD(list); } } - + /** * list_entry - get the struct for this entry * @ptr: the &struct list_head pointer. @@ -184,7 +184,7 @@ */ #define list_entry(ptr, type, member) \ ((type *)((char *)(ptr)-(uintptr_t)(&((type *)0)->member))) - + /** * list_for_each - iterate over a list * @pos: the &struct list_head to use as a loop counter. @@ -201,7 +201,7 @@ #define list_for_each_prev(pos, head) \ for (pos = (head)->prev; pos != (head); \ pos = pos->prev) - + /** * list_for_each_safe - iterate over a list safe against removal of list entry * @pos: the &struct list_head to use as a loop counter. @@ -211,7 +211,7 @@ #define list_for_each_safe(pos, n, head) \ for (pos = (head)->next, n = pos->next; pos != (head); \ pos = n, n = pos->next) - + /** * list_for_each_entry - iterate over list of given type * @pos: the type * to use as a loop counter. @@ -222,7 +222,7 @@ for (pos = list_entry((head)->next, typeof(*pos), member); \ &pos->member != (head); \ pos = list_entry(pos->member.next, typeof(*pos), member)) - + /** * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry * @pos: the type * to use as a loop counter. @@ -235,7 +235,7 @@ n = list_entry(pos->member.next, typeof(*pos), member); \ &pos->member != (head); \ pos = n, n = list_entry(n->member.next, typeof(*n), member)) - + /** * list_for_each_entry_continue - iterate over list of given type * continuing after existing point @@ -247,5 +247,5 @@ for (pos = list_entry(pos->member.next, typeof(*pos), member); \ &pos->member != (head); \ pos = list_entry(pos->member.next, typeof(*pos), member)) - + #endif diff --git a/drivers/bus/acpi/main.c b/drivers/bus/acpi/main.c index df1c7de2c0a..e7c43b5069c 100644 --- a/drivers/bus/acpi/main.c +++ b/drivers/bus/acpi/main.c @@ -311,7 +311,7 @@ ACPIDispatchDeviceControl( status = STATUS_PENDING; break; - + case IOCTL_BATTERY_QUERY_TAG: DPRINT("IOCTL_BATTERY_QUERY_TAG is not supported!\n"); break; diff --git a/drivers/bus/acpi/pnp.c b/drivers/bus/acpi/pnp.c index 3b867e0ee47..54fe8182701 100644 --- a/drivers/bus/acpi/pnp.c +++ b/drivers/bus/acpi/pnp.c @@ -78,7 +78,7 @@ Bus_FDO_PnP ( { NTSTATUS status; ULONG length, prevcount, numPdosPresent; - PLIST_ENTRY entry; + PLIST_ENTRY entry; PPDO_DEVICE_DATA pdoData; PDEVICE_RELATIONS relations, oldRelations; @@ -105,7 +105,7 @@ Bus_FDO_PnP ( // // The PnP manager is trying to stop the device - // for resource rebalancing. + // for resource rebalancing. // SET_NEW_PNP_STATE(DeviceData->Common, StopPending); Irp->IoStatus.Status = STATUS_SUCCESS; diff --git a/drivers/bus/acpi/power.c b/drivers/bus/acpi/power.c index fbff56e46db..de1a3c33162 100644 --- a/drivers/bus/acpi/power.c +++ b/drivers/bus/acpi/power.c @@ -72,7 +72,7 @@ Bus_FDO_Power ( DbgDevicePowerString(powerState.DeviceState))); if (powerType == SystemPowerState) - { + { switch (powerState.SystemState) { case PowerSystemSleeping1: AcpiState = ACPI_STATE_S1; diff --git a/drivers/bus/pcix/debug.c b/drivers/bus/pcix/debug.c index 4b7e0154f3c..fe1c5d3e539 100644 --- a/drivers/bus/pcix/debug.c +++ b/drivers/bus/pcix/debug.c @@ -374,7 +374,7 @@ PciDebugPrintCmResList(IN PCM_RESOURCE_LIST PartialList) ListCount = PartialList->Count; FullDescriptor = PartialList->List; DPRINT1(" CM_RESOURCE_LIST (PCI Bus Driver) (List Count = %u)\n", PartialList->Count); - + /* Loop full list */ for (i = 0; i < ListCount; i++) { diff --git a/drivers/bus/pcix/enum.c b/drivers/bus/pcix/enum.c index fc3563d2c21..d39ea687062 100644 --- a/drivers/bus/pcix/enum.c +++ b/drivers/bus/pcix/enum.c @@ -1601,7 +1601,7 @@ PciScanBus(IN PPCI_FDO_EXTENSION DeviceExtension) /* Check for hack which only allows bus to have one child device */ if (PdoExtension->HackFlags & PCI_HACK_ONE_CHILD) MaxDevice = 1; - + /* Check if the secondary bus number has changed */ PciReadDeviceConfig(PdoExtension, &SecondaryBus, diff --git a/drivers/bus/pcix/pci/id.c b/drivers/bus/pcix/pci/id.c index 9053e391301..5fd87201396 100644 --- a/drivers/bus/pcix/pci/id.c +++ b/drivers/bus/pcix/pci/id.c @@ -128,7 +128,7 @@ PciIdPrintf(IN PPCI_ID_BUFFER IdBuffer, va_list va; ASSERT(IdBuffer->Count < MAX_ANSI_STRINGS); - + /* Do the actual string formatting into the character buffer */ va_start(va, Format); vsprintf(IdBuffer->CharBuffer, Format, va); @@ -137,19 +137,19 @@ PciIdPrintf(IN PPCI_ID_BUFFER IdBuffer, /* Initialize the ANSI_STRING that will hold this string buffer */ AnsiString = &IdBuffer->Strings[IdBuffer->Count]; RtlInitAnsiString(AnsiString, IdBuffer->CharBuffer); - + /* Calculate the final size of the string, in Unicode */ Size = RtlAnsiStringToUnicodeSize(AnsiString); - + /* Update hte buffer with the size,and update the character pointer */ IdBuffer->StringSize[IdBuffer->Count] = Size; IdBuffer->TotalLength += Size; Length = AnsiString->Length + sizeof(ANSI_NULL); IdBuffer->CharBuffer += Length; - + /* Move to the next string for next time */ IdBuffer->Count++; - + /* Return the length */ return Length; } @@ -165,13 +165,13 @@ PciIdPrintfAppend(IN PPCI_ID_BUFFER IdBuffer, va_list va; ASSERT(IdBuffer->Count); - + /* Choose the next static ANSI_STRING to use */ NextId = IdBuffer->Count - 1; - + /* Max length is from the end of the buffer up until the current pointer */ - MaxLength = (PCHAR)(IdBuffer + 1) - IdBuffer->CharBuffer; - + MaxLength = (PCHAR)(IdBuffer + 1) - IdBuffer->CharBuffer; + /* Do the actual append, and return the length this string took */ va_start(va, Format); Length = vsprintf(IdBuffer->CharBuffer - 1, Format, va); @@ -182,15 +182,15 @@ PciIdPrintfAppend(IN PPCI_ID_BUFFER IdBuffer, AnsiString = &IdBuffer->Strings[NextId]; AnsiString->Length += Length; AnsiString->MaximumLength += Length; - + /* Calculate the final size of the string, in Unicode */ Size = RtlAnsiStringToUnicodeSize(AnsiString); - + /* Update the buffer with the size, and update the character pointer */ IdBuffer->StringSize[NextId] = Size; IdBuffer->TotalLength += Size; IdBuffer->CharBuffer += Length; - + /* Return the size */ return Size; } @@ -212,28 +212,28 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, UNICODE_STRING DestinationString; PCI_ID_BUFFER IdBuffer; PAGED_CODE(); - + /* Assume failure */ Status = STATUS_SUCCESS; *Buffer = NULL; - + /* Start with the genric vendor string, which is the vendor ID + device ID */ sprintf(VendorString, "PCI\\VEN_%04X&DEV_%04X", DeviceExtension->VendorId, DeviceExtension->DeviceId); - + /* Initialize the PCI ID Buffer */ PciInitIdBuffer(&IdBuffer); - + /* Build the subsystem ID as shown in PCI ID Strings */ SubsysId = DeviceExtension->SubsystemVendorId | (DeviceExtension->SubsystemId << 16); - + /* Check what the caller is requesting */ switch (QueryType) { case BusQueryDeviceID: - + /* A single ID, the vendor string + the revision ID */ PciIdPrintf(&IdBuffer, "%s&SUBSYS_%08X&REV_%02X", @@ -241,22 +241,22 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, SubsysId, DeviceExtension->RevisionId); break; - + case BusQueryHardwareIDs: - + /* First the vendor string + the subsystem ID + the revision ID */ PciIdPrintf(&IdBuffer, "%s&SUBSYS_%08X&REV_%02X", VendorString, SubsysId, DeviceExtension->RevisionId); - + /* Next, without the revision */ PciIdPrintf(&IdBuffer, "%s&SUBSYS_%08X", VendorString, SubsysId); - + /* Next, the vendor string + the base class + sub class + progif */ PciIdPrintf(&IdBuffer, "%s&CC_%02X%02X%02X", @@ -271,13 +271,13 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, VendorString, DeviceExtension->BaseClass, DeviceExtension->SubClass); - + /* And finally, a terminator */ PciIdPrintf(&IdBuffer, "\0"); break; - + case BusQueryCompatibleIDs: - + /* First, the vendor + revision ID only */ PciIdPrintf(&IdBuffer, "%s&REV_%02X", @@ -286,7 +286,7 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, /* Next, the vendor string alone */ PciIdPrintf(&IdBuffer, "%s", VendorString); - + /* Next, the vendor ID + the base class + the sub class + progif */ PciIdPrintf(&IdBuffer, "PCI\\VEN_%04X&CC_%02X%02X%02X", @@ -319,22 +319,22 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, "PCI\\CC_%02X%02X", DeviceExtension->BaseClass, DeviceExtension->SubClass); - + /* And finally, a terminator */ PciIdPrintf(&IdBuffer, "\0"); break; - + case BusQueryInstanceID: - + /* Start with a terminator */ PciIdPrintf(&IdBuffer, "\0"); - + /* And then encode the device and function number */ PciIdPrintfAppend(&IdBuffer, "%02X", (DeviceExtension->Slot.u.bits.DeviceNumber << 3) | DeviceExtension->Slot.u.bits.FunctionNumber); - + /* Loop every parent until the root */ ParentExtension = DeviceExtension->ParentFdoExtension; while (!PCI_IS_ROOT_FDO(ParentExtension)) @@ -347,37 +347,37 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, PdoExtension->Slot.u.bits.FunctionNumber); } break; - + default: - + /* Unknown query type */ DPRINT1("PciQueryId expected ID type = %d\n", QueryType); return STATUS_NOT_SUPPORTED; } - + /* Something should've been generated if this has been reached */ ASSERT(IdBuffer.Count > 0); - + /* Allocate the final string buffer to hold the ID */ StringBuffer = ExAllocatePoolWithTag(PagedPool, IdBuffer.TotalLength, 'BicP'); if (!StringBuffer) return STATUS_INSUFFICIENT_RESOURCES; - + /* Build the UNICODE_STRING structure for it */ DPRINT1("PciQueryId(%d)\n", QueryType); DestinationString.Buffer = StringBuffer; DestinationString.MaximumLength = IdBuffer.TotalLength; - + /* Loop every ID in the buffer */ for (i = 0; i < IdBuffer.Count; i++) { /* Select the ANSI_STRING for the ID */ NextString = &IdBuffer.Strings[i]; DPRINT1(" <- \"%s\"\n", NextString->Buffer); - + /* Convert it to a UNICODE_STRING */ Status = RtlAnsiStringToUnicodeString(&DestinationString, NextString, FALSE); ASSERT(NT_SUCCESS(Status)); - + /* Add it into the final destination buffer */ Size = IdBuffer.StringSize[i]; DestinationString.MaximumLength -= Size; @@ -399,25 +399,25 @@ PciQueryDeviceText(IN PPCI_PDO_EXTENSION PdoExtension, PWCHAR MessageBuffer, LocationBuffer; ULONG Length; NTSTATUS Status; - + UNREFERENCED_PARAMETER(Locale); /* Check what the caller is requesting */ switch (QueryType) { case DeviceTextDescription: - + /* Get the message from the resource section */ MessageBuffer = PciGetDeviceDescriptionMessage(PdoExtension->BaseClass, PdoExtension->SubClass); - + /* Return it to the caller, and select proper status code */ *Buffer = MessageBuffer; Status = MessageBuffer ? STATUS_SUCCESS : STATUS_NOT_SUPPORTED; break; - + case DeviceTextLocationInformation: - + /* Get the message from the resource section */ MessageBuffer = PciGetDescriptionMessage(0x10000, &Length); if (!MessageBuffer) @@ -426,14 +426,14 @@ PciQueryDeviceText(IN PPCI_PDO_EXTENSION PdoExtension, Status = STATUS_NOT_SUPPORTED; break; } - + /* Add space for a null-terminator, and allocate the buffer */ Length += 2 * sizeof(UNICODE_NULL); LocationBuffer = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), 'BicP'); *Buffer = LocationBuffer; - + /* Check if the allocation succeeded */ if (LocationBuffer) { @@ -444,21 +444,21 @@ PciQueryDeviceText(IN PPCI_PDO_EXTENSION PdoExtension, PdoExtension->Slot.u.bits.FunctionNumber, PdoExtension->Slot.u.bits.DeviceNumber); } - + /* Free the original string from the resource section */ ExFreePoolWithTag(MessageBuffer, 0); - + /* Select the correct status */ Status = LocationBuffer ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; break; - + default: - + /* Anything else is unsupported */ Status = STATUS_NOT_SUPPORTED; break; } - + /* Return whether or not a device text string was indeed found */ return Status; } diff --git a/drivers/bus/pcix/utils.c b/drivers/bus/pcix/utils.c index fe231559264..928941594ed 100644 --- a/drivers/bus/pcix/utils.c +++ b/drivers/bus/pcix/utils.c @@ -611,7 +611,7 @@ PciGetHackFlags(IN USHORT VendorId, ULONGLONG HackFlags; ULONG LastWeight, MatchWeight; ULONG EntryFlags; - + /* ReactOS SetupLDR Hack */ if (!PciHackTable) return 0; diff --git a/drivers/filesystems/btrfs/resource.h b/drivers/filesystems/btrfs/resource.h index 28ddb4b1010..ce6edb75867 100644 --- a/drivers/filesystems/btrfs/resource.h +++ b/drivers/filesystems/btrfs/resource.h @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/drivers/filesystems/cdfs/allocsup.c b/drivers/filesystems/cdfs/allocsup.c index 44a330111e5..0ffd6ddc135 100644 --- a/drivers/filesystems/cdfs/allocsup.c +++ b/drivers/filesystems/cdfs/allocsup.c @@ -83,12 +83,12 @@ CdDiskOffsetFromMcbEntry ( #pragma alloc_text(PAGE, CdUninitializeMcb) #endif - + _Requires_lock_held_(_Global_critical_region_) VOID #ifdef _MSC_VER // PREFast currently has no way to express the Fcb==Fcb->Vcb->VolumeDasdFcb early return -#pragma warning(suppress: 6001 6101) +#pragma warning(suppress: 6001 6101) #endif CdLookupAllocation ( _In_ PIRP_CONTEXT IrpContext, @@ -330,7 +330,7 @@ Return Value: return; } - + VOID CdAddAllocationFromDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -479,7 +479,7 @@ Return Value: return; } - + VOID CdAddInitialAllocation ( _In_ PIRP_CONTEXT IrpContext, @@ -494,10 +494,10 @@ Routine Description: This routine is called to set up the initial entry in an Mcb. - This routine handles the single initial entry for a directory file. We will - round the start block down to a sector boundary. Our caller has already - biased the DataLength with any adjustments. This is used for the case - where there is a single entry and we want to align the data on a sector + This routine handles the single initial entry for a directory file. We will + round the start block down to a sector boundary. Our caller has already + biased the DataLength with any adjustments. This is used for the case + where there is a single entry and we want to align the data on a sector boundary. Arguments: @@ -570,7 +570,7 @@ Return Value: return; } - + VOID CdTruncateAllocation ( _In_ PIRP_CONTEXT IrpContext, @@ -623,7 +623,7 @@ Return Value: return; } - + _At_(Fcb->NodeByteSize, _In_range_(>=, FIELD_OFFSET( FCB, FcbType ))) VOID CdInitializeMcb ( @@ -655,7 +655,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + ASSERT_IRP_CONTEXT( IrpContext ); ASSERT_FCB( Fcb ); @@ -672,7 +672,7 @@ Return Value: return; } - + _At_(Fcb->NodeByteSize, _In_range_(>=, FIELD_OFFSET( FCB, FcbType ))) _When_(Fcb->NodeTypeCode == CDFS_NTC_FCB_PATH_TABLE, _At_(Fcb->NodeByteSize, _In_range_(==, SIZEOF_FCB_INDEX))) _When_(Fcb->NodeTypeCode == CDFS_NTC_FCB_INDEX, _At_(Fcb->NodeByteSize, _In_range_(==, SIZEOF_FCB_INDEX))) @@ -707,7 +707,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + ASSERT_IRP_CONTEXT( IrpContext ); ASSERT_FCB( Fcb ); @@ -723,7 +723,7 @@ Return Value: return; } - + // // Local suupport routine // @@ -764,7 +764,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + ASSERT_IRP_CONTEXT( IrpContext ); ASSERT_FCB( Fcb ); ASSERT_LOCKED_FCB( Fcb ); @@ -803,7 +803,7 @@ Return Value: return CurrentMcbOffset; } - + // // Local support routine // @@ -858,7 +858,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + ASSERT_IRP_CONTEXT( IrpContext ); // diff --git a/drivers/filesystems/cdfs/cachesup.c b/drivers/filesystems/cdfs/cachesup.c index 37ac74437a0..5f4a59ee683 100644 --- a/drivers/filesystems/cdfs/cachesup.c +++ b/drivers/filesystems/cdfs/cachesup.c @@ -33,7 +33,7 @@ Abstract: #pragma alloc_text(PAGE, CdPurgeVolume) #endif - + VOID CdCreateInternalStream ( _In_ PIRP_CONTEXT IrpContext, @@ -128,9 +128,9 @@ Return Value: StreamFileOpen, Fcb, NULL ); - + // - // We'll give stream file objects a name to aid IO profiling etc. We + // We'll give stream file objects a name to aid IO profiling etc. We // NULL this in CdDeleteInternalStream before OB deletes the file object, // and before CdRemovePrefix is called (which frees Fcb names). // @@ -328,7 +328,7 @@ Return Value: return; } - + VOID CdDeleteInternalStream ( _In_ PIRP_CONTEXT IrpContext, @@ -398,7 +398,7 @@ Return Value: // Null the name pointer, since the stream file object never actually // 'owns' the names, we just point it to existing ones. // - + FileObject->FileName.Buffer = NULL; FileObject->FileName.MaximumLength = FileObject->FileName.Length = 0; @@ -406,7 +406,7 @@ Return Value: } } - + NTSTATUS CdCompleteMdl ( _In_ PIRP_CONTEXT IrpContext, @@ -458,7 +458,7 @@ Return Value: return STATUS_SUCCESS; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS diff --git a/drivers/filesystems/cdfs/cd.h b/drivers/filesystems/cdfs/cd.h index f830210a7bf..5311ca82d8f 100644 --- a/drivers/filesystems/cdfs/cd.h +++ b/drivers/filesystems/cdfs/cd.h @@ -99,7 +99,7 @@ typedef FILE_ID *PFILE_ID; #define TOC_DATA_TRACK (0x04) #define TOC_LAST_TRACK (0xaa) - + // // There is considerable rearrangement of the volume descriptors for // ISO and HSG. However, within each standard the same structure can @@ -122,7 +122,7 @@ typedef FILE_ID *PFILE_ID; #define MAX_FILE_ID_LENGTH (255) - + typedef struct _RAW_ISO_VD { UCHAR DescType; // volume type: 1 = standard, 2 = coded @@ -165,7 +165,7 @@ typedef struct _RAW_ISO_VD { } RAW_ISO_VD; typedef RAW_ISO_VD *PRAW_ISO_VD; - + typedef struct _RAW_HSG_VD { ULONG BlkNumI; // logical block number Intel @@ -209,7 +209,7 @@ typedef struct _RAW_HSG_VD { } RAW_HSG_VD; typedef RAW_HSG_VD *PRAW_HSG_VD; - + typedef struct _RAW_JOLIET_VD { UCHAR DescType; // volume type: 2 = coded @@ -316,7 +316,7 @@ typedef RAW_JOLIET_VD *PRAW_JOLIET_VD; ((PRAW_ISO_VD) (R))->VolSpaceI \ ) - + // // This structure is used to overlay a region of a disk sector // to retrieve a single directory entry. There is a difference @@ -409,7 +409,7 @@ typedef RAW_DIRENT *PRAW_DIRENT; } \ } - + // // The on-disk representation of a Path Table entry differs between // the ISO version and the HSG version. The fields are the same @@ -470,7 +470,7 @@ typedef RAW_PATH_HSG *PRAW_PATH_HSG; (RP)->DirLoc \ ) - + // // System use are for XA data. The following is the system use area for // directory entries on XA data disks. diff --git a/drivers/filesystems/cdfs/cddata.c b/drivers/filesystems/cdfs/cddata.c index 70af0b127be..a47982b01df 100644 --- a/drivers/filesystems/cdfs/cddata.c +++ b/drivers/filesystems/cdfs/cddata.c @@ -24,7 +24,7 @@ BOOLEAN CdTestTopLevel = TRUE; BOOLEAN CdTestRaisedStatus = TRUE; BOOLEAN CdBreakOnAnyRaise = FALSE; BOOLEAN CdTraceRaises = FALSE; -NTSTATUS CdInterestingExceptionCodes[] = { STATUS_DISK_CORRUPT_ERROR, +NTSTATUS CdInterestingExceptionCodes[] = { STATUS_DISK_CORRUPT_ERROR, STATUS_FILE_CORRUPT_ERROR, 0, 0, 0, 0, 0, 0, 0, 0 }; #endif @@ -427,7 +427,7 @@ Return Value: break; case IRP_MJ_SHUTDOWN : - + Status = CdCommonShutdown( IrpContext, Irp ); break; @@ -469,7 +469,7 @@ CdRaiseStatusEx ( ) { BOOLEAN BreakIn = FALSE; - + AssertVerifyDevice( IrpContext, Status); if (CdTraceRaises) { @@ -481,8 +481,8 @@ CdRaiseStatusEx ( ULONG Index; - for (Index = 0; - Index < (sizeof( CdInterestingExceptionCodes) / sizeof( CdInterestingExceptionCodes[0])); + for (Index = 0; + Index < (sizeof( CdInterestingExceptionCodes) / sizeof( CdInterestingExceptionCodes[0])); Index++) { if ((STATUS_SUCCESS != CdInterestingExceptionCodes[Index]) && @@ -495,7 +495,7 @@ CdRaiseStatusEx ( } if (BreakIn || CdBreakOnAnyRaise) { - + DbgPrint( "CDFS: Breaking on raised status %08x (BI=%d,BA=%d)\n", Status, BreakIn, CdBreakOnAnyRaise); DbgPrint( "CDFS: (FILEID %d LINE %d)\n", FileId, Line); DbgPrint( "CDFS: Contact CDFS.SYS component owner for triage.\n"); @@ -503,7 +503,7 @@ CdRaiseStatusEx ( NT_ASSERT(FALSE); } - + if (NormalizeStatus) { IrpContext->ExceptionStatus = FsRtlNormalizeNtstatus( Status, STATUS_UNEXPECTED_IO_ERROR); @@ -514,7 +514,7 @@ CdRaiseStatusEx ( } IrpContext->RaisedAtLineFile = (FileId << 16) | Line; - + ExRaiseStatus( IrpContext->ExceptionStatus); } @@ -591,7 +591,7 @@ Return Value: } AssertVerifyDevice( IrpContext, IrpContext->ExceptionStatus ); - + // // Bug check if this status is not supported. // @@ -610,7 +610,7 @@ Return Value: return EXCEPTION_EXECUTE_HANDLER; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS @@ -653,7 +653,7 @@ Return Value: ASSERT_OPTIONAL_IRP_CONTEXT( IrpContext ); ASSERT_IRP( Irp ); - + // // If there is not an irp context, then complete the request with the // current status code. @@ -679,7 +679,7 @@ Return Value: // or we are forcing this to be posted. // // - Status code is STATUS_VERIFY_REQUIRED and we are at APC level - // or higher, or within a guarded region. Can't wait for IO in + // or higher, or within a guarded region. Can't wait for IO in // the verify path in this case. // // Set the MORE_PROCESSING flag in the IrpContext to keep if from being @@ -697,17 +697,17 @@ Return Value: ExceptionCode = CdFsdPostRequest( IrpContext, Irp ); } - } + } else if ((ExceptionCode == STATUS_VERIFY_REQUIRED) && FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_TOP_LEVEL ) && KeAreAllApcsDisabled()) { - + ExceptionCode = CdFsdPostRequest( IrpContext, Irp ); } } _SEH2_EXCEPT( CdExceptionFilter( IrpContext, _SEH2_GetExceptionInformation() )) { - - ExceptionCode = _SEH2_GetExceptionCode(); + + ExceptionCode = _SEH2_GetExceptionCode(); } _SEH2_END; // // If we posted the request or our caller will retry then just return here. @@ -756,7 +756,7 @@ Return Value: Device = IoGetDeviceToVerify( Irp->Tail.Overlay.Thread ); IoSetDeviceToVerify( Irp->Tail.Overlay.Thread, NULL ); - + // // If there is no device in that location then check in the // current thread. @@ -772,10 +772,10 @@ Return Value: } // - // It turns out some storage drivers really do set invalid non-NULL device + // It turns out some storage drivers really do set invalid non-NULL device // objects to verify. // - // To work around this, completely ignore the device to verify in the thread, + // To work around this, completely ignore the device to verify in the thread, // and just use our real device object instead. // @@ -817,7 +817,7 @@ Return Value: return ExceptionCode; - } + } // // Generate a pop-up. // @@ -850,10 +850,10 @@ Return Value: } // - // It turns out some storage drivers really do set invalid non-NULL device + // It turns out some storage drivers really do set invalid non-NULL device // objects to verify. // - // To work around this, completely ignore the device to verify in the thread, + // To work around this, completely ignore the device to verify in the thread, // and just use our real device object instead. // @@ -909,7 +909,7 @@ Return Value: return ExceptionCode; } - + VOID CdCompleteRequest ( _Inout_opt_ PIRP_CONTEXT IrpContext, @@ -969,14 +969,14 @@ Return Value: Irp->IoStatus.Status = Status; AssertVerifyDeviceIrp( Irp ); - + IoCompleteRequest( Irp, IO_CD_ROM_INCREMENT ); } return; } - + VOID CdSetThreadContext ( _Inout_ PIRP_CONTEXT IrpContext, @@ -1180,7 +1180,7 @@ Return Value: return FALSE; } - + ULONG CdSerial32 ( _In_reads_bytes_(ByteCount) PCHAR Buffer, diff --git a/drivers/filesystems/cdfs/cdinit.c b/drivers/filesystems/cdfs/cdinit.c index 871419ac575..7553db17605 100644 --- a/drivers/filesystems/cdfs/cdinit.c +++ b/drivers/filesystems/cdfs/cdinit.c @@ -57,7 +57,7 @@ CdInitializeGlobalData ( #pragma alloc_text(INIT, CdInitializeGlobalData) #endif - + // // Local support routine // @@ -174,7 +174,7 @@ Return Value: DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = DriverObject->MajorFunction[IRP_MJ_CLEANUP] = - DriverObject->MajorFunction[IRP_MJ_PNP] = + DriverObject->MajorFunction[IRP_MJ_PNP] = DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = (PDRIVER_DISPATCH) CdFsdDispatch; #ifdef _MSC_VER #pragma prefast(pop) @@ -302,7 +302,7 @@ Return Value: ObDereferenceObject (CdData.HddFileSystemDeviceObject); #endif } - + // // Local support routine // @@ -364,7 +364,7 @@ Return Value: CdFastIoDispatch.AcquireFileForNtCreateSection = NULL; CdFastIoDispatch.ReleaseFileForNtCreateSection = CdReleaseForCreateSection; CdFastIoDispatch.FastIoQueryNetworkOpenInfo = CdFastQueryNetworkInfo; // QueryNetworkInfo - + CdFastIoDispatch.MdlRead = FsRtlMdlReadDev; CdFastIoDispatch.MdlReadComplete = FsRtlMdlReadCompleteDev; CdFastIoDispatch.PrepareMdlWrite = FsRtlPrepareMdlWriteDev; @@ -417,7 +417,7 @@ Return Value: CdData.CloseItem = IoAllocateWorkItem (FileSystemDeviceObject); if (CdData.CloseItem == NULL) { - + ExDeleteResourceLite( &CdData.DataResource ); return STATUS_INSUFFICIENT_RESOURCES; } diff --git a/drivers/filesystems/cdfs/cdprocs.h b/drivers/filesystems/cdfs/cdprocs.h index 442b8902c65..5f6420d3647 100644 --- a/drivers/filesystems/cdfs/cdprocs.h +++ b/drivers/filesystems/cdfs/cdprocs.h @@ -145,7 +145,7 @@ Abstract: DELETE | \ WRITE_DAC )) - + // // Allocation support routines, implemented in AllocSup.c // @@ -203,7 +203,7 @@ CdUninitializeMcb ( _Inout_updates_bytes_(Fcb->NodeByteSize) PFCB Fcb ); - + // // Buffer control routines for data caching, implemented in CacheSup.c // @@ -247,12 +247,12 @@ CdVerifyOrCreateDirStreamFile ( // // Unsafe test to see if call / lock neccessary. // - + if (NULL == Fcb->FileObject) { - + CdCreateInternalStream( IrpContext, Fcb->Vcb, - Fcb, + Fcb, &Fcb->FileNamePrefix.ExactCaseName.FileName); } } @@ -269,7 +269,7 @@ CdVerifyOrCreateDirStreamFile ( #define CdUnpinData(IC,B) \ if (*(B) != NULL) { CcUnpinData( *(B) ); *(B) = NULL; } - + // // Device I/O routines, implemented in DevIoSup.c // @@ -387,8 +387,8 @@ CdHijackIrpAndFlushDevice ( if (NULL == *(UB)) { \ CdRaiseStatus( (IC), STATUS_INSUFFICIENT_RESOURCES); \ } \ - } - + } + #define CdLockUserBuffer(IC,BL,OP) { \ if ((IC)->Irp->MdlAddress == NULL) { \ @@ -396,7 +396,7 @@ CdHijackIrpAndFlushDevice ( } \ } - + // // Dirent support routines, implemented in DirSup.c // @@ -417,7 +417,7 @@ CdLookupNextDirent ( _Inout_ PDIRENT_ENUM_CONTEXT NextDirContext ); -_At_(Dirent->CdTime, _Post_notnull_) +_At_(Dirent->CdTime, _Post_notnull_) VOID CdUpdateDirentFromRawDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -558,7 +558,7 @@ CdCleanupFileContext ( &(FC)->InitialDirent->DirContext, \ &(FC)->InitialDirent->Dirent ) - + // // The following routines are used to manipulate the fscontext fields // of the file object, implemented in FilObSup.c @@ -609,7 +609,7 @@ CdFastDecodeFileObject ( _Out_ PFCB *Fcb ); - + // // Name support routines, implemented in NameSup.c // @@ -687,7 +687,7 @@ CdFullCompareNames ( _In_ PUNICODE_STRING NameB ); - + // // Filesystem control operations. Implemented in Fsctrl.c // @@ -708,7 +708,7 @@ CdUnlockVolumeInternal ( _In_opt_ PFILE_OBJECT FileObject ); - + // // Path table enumeration routines. Implemented in PathSup.c // @@ -729,7 +729,7 @@ CdLookupNextPathEntry ( _Inout_ PPATH_ENTRY PathEntry ); -_Success_(return != FALSE) +_Success_(return != FALSE) BOOLEAN CdFindPathEntry ( _In_ PIRP_CONTEXT IrpContext, @@ -773,7 +773,7 @@ CdUpdatePathEntryName ( } \ } - + // // Largest matching prefix searching routines, implemented in PrefxSup.c // @@ -803,7 +803,7 @@ CdFindPrefix ( _In_ BOOLEAN IgnoreCase ); - + // // Synchronization routines. Implemented in Resrcsup.c // @@ -825,7 +825,7 @@ CdFindPrefix ( // typedef enum _TYPE_OF_ACQUIRE { - + AcquireExclusive, AcquireShared, AcquireSharedStarveExclusive @@ -960,10 +960,10 @@ CdAcquireResource ( #define CdAcquireCacheForRead( IC) \ ExAcquireResourceSharedLite( &(IC)->Vcb->SectorCacheResource, TRUE) - + #define CdAcquireCacheForUpdate( IC) \ ExAcquireResourceExclusiveLite( &(IC)->Vcb->SectorCacheResource, TRUE) - + #define CdReleaseCache( IC) \ ExReleaseResourceLite( &(IC)->Vcb->SectorCacheResource); @@ -1132,7 +1132,7 @@ CdReleaseForCreateSection ( _In_ PFILE_OBJECT FileObject ); - + // // In-memory structure support routines. Implemented in StrucSup.c // @@ -1394,7 +1394,7 @@ CdOperationIsDasdOpen ( ) { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( IrpContext->Irp); - + return ((IrpContext->MajorFunction == IRP_MJ_CREATE) && (IrpSp->FileObject->FileName.Length == 0) && (IrpSp->FileObject->RelatedFileObject == NULL)); @@ -1449,7 +1449,7 @@ CdDismountVcb ( #define CdUpdateVcbCondition( V, C) (V)->VcbCondition = (C) #define CdMarkRealDevForVerify( DO) SetFlag( (DO)->Flags, DO_VERIFY_VOLUME) - + #define CdMarkRealDevVerifyOk( DO) ClearFlag( (DO)->Flags, DO_VERIFY_VOLUME) @@ -1468,7 +1468,7 @@ CdDismountVcb ( ((S) == STATUS_NO_MEDIA_IN_DEVICE) \ ) - + // // Work queue routines for posting and retrieving an Irp, implemented in // workque.c @@ -1497,7 +1497,7 @@ CdOplockComplete ( _Inout_ PIRP Irp ); - + // // Miscellaneous support routines // @@ -1604,7 +1604,7 @@ CdOplockComplete ( static /* ReactOS Change: GCC "multiple definition" */ INLINE ULONG -SectorsFromLlBytes( +SectorsFromLlBytes( ULONGLONG Bytes ) { @@ -2025,7 +2025,7 @@ CdSerial32 ( FastIoIsPossible)) \ ) - + // // The FSP level dispatch/main routine. This is the routine that takes // IRP's off of the work queue and calls the appropriate FSP level @@ -2146,7 +2146,7 @@ CdCommonShutdown ( // Implemented in Shutdown.c ); - + // // The following macros are used to establish the semantics needed // to do a return from within a try-finally clause. As a rule every diff --git a/drivers/filesystems/cdfs/cdstruc.h b/drivers/filesystems/cdfs/cdstruc.h index 78143456d37..06b741ee16f 100644 --- a/drivers/filesystems/cdfs/cdstruc.h +++ b/drivers/filesystems/cdfs/cdstruc.h @@ -69,7 +69,7 @@ Abstract: +--------+ | Child | | File | +--------+ - + Attached to each Directory Fcb is a prefix table containing the names of children of this directory for which there is an Fcb. Not all Fcb's will necessarily have an entry in this table. @@ -112,7 +112,7 @@ Abstract: | Object| +--------+ - + Synchronization: 1. A resource in the CdData synchronizes access to the Vcb queue. This @@ -170,7 +170,7 @@ typedef PVOID PBCB; //**** Bcb's are now part of the cache module #define BYTE_COUNT_EMBEDDED_NAME (32) - + // // The CD_MCB is used to store the mapping of logical file offset to // logical disk offset. NOTE - This package only deals with the @@ -226,7 +226,7 @@ typedef struct _CD_MCB_ENTRY { } CD_MCB_ENTRY; typedef CD_MCB_ENTRY *PCD_MCB_ENTRY; - + // // Cd name structure. The following structure is used to represent the // full Cdrom name. This name can be stored in either Unicode or ANSI @@ -265,7 +265,7 @@ typedef struct _NAME_LINK { } NAME_LINK; typedef NAME_LINK *PNAME_LINK; - + // // Prefix entry. There is one of these for each name in the prefix table. // An Fcb will have one of these embedded for the long name and an optional @@ -306,7 +306,7 @@ typedef PREFIX_ENTRY *PPREFIX_ENTRY; #define PREFIX_FLAG_EXACT_CASE_IN_TREE (0x00000001) #define PREFIX_FLAG_IGNORE_CASE_IN_TREE (0x00000002) - + // // The CD_DATA record is the top record in the CDROM file system in-memory // data structure. This structure must be allocated from non-paged pool. @@ -426,7 +426,7 @@ typedef CD_DATA *PCD_DATA; // Since DVD drives allow > 100 "sessions", we need to use a larger TOC // than the legacy CD definition. The maximum is theoretically 0xaa-16 (max // number of open tracks in a session), but it's quite possible that some -// drive does not enforce this, so we'll go with 169 (track 0xaa is always the +// drive does not enforce this, so we'll go with 169 (track 0xaa is always the // leadout). // @@ -447,14 +447,14 @@ typedef struct _CDROM_TOC_LARGE { // TRACK_DATA TrackData[ MAXIMUM_NUMBER_TRACKS_LARGE]; - + } CDROM_TOC_LARGE, *PCDROM_TOC_LARGE; typedef struct _CD_SECTOR_CACHE_CHUNK { ULONG BaseLbn; PUCHAR Buffer; - + } CD_SECTOR_CACHE_CHUNK, *PCD_SECTOR_CACHE_CHUNK; #define CD_SEC_CACHE_CHUNKS 4 @@ -670,7 +670,7 @@ typedef struct _VCB { // Directory block cache. Read large numbers of blocks on directory // reads, hoping to benefit from the fact that most mastered/pressed // discs clump metadata in one place thus allowing us to crudely - // pre-cache and reduce seeks back to directory data during app install, + // pre-cache and reduce seeks back to directory data during app install, // file copy etc. // // Note that the purpose of this is to PRE cache unread data, @@ -681,7 +681,7 @@ typedef struct _VCB { PUCHAR SectorCacheBuffer; CD_SECTOR_CACHE_CHUNK SecCacheChunks[ CD_SEC_CACHE_CHUNKS]; ULONG SecCacheLRUChunkIndex; - + PIRP SectorCacheIrp; KEVENT SectorCacheEvent; ERESOURCE SectorCacheResource; @@ -715,7 +715,7 @@ typedef struct _VCB { #define VCB_STATE_SHUTDOWN (0x00000400) #define VCB_STATE_DISMOUNTED (0x00000800) - + // // The Volume Device Object is an I/O system device object with a // workqueue and an VCB record appended to the end. There are multiple @@ -768,7 +768,7 @@ typedef struct _VOLUME_DEVICE_OBJECT { } VOLUME_DEVICE_OBJECT; typedef VOLUME_DEVICE_OBJECT *PVOLUME_DEVICE_OBJECT; - + // // The following two structures are the separate union structures for // data and index Fcb's. The path table is actually the same structure @@ -1059,7 +1059,7 @@ typedef FCB *PFCB; #define SIZEOF_FCB_INDEX \ (FIELD_OFFSET( FCB, FcbType ) + sizeof( FCB_INDEX )) - + // // The Ccb record is allocated for every file object // @@ -1119,7 +1119,7 @@ typedef CCB *PCCB; #define CCB_FLAG_ENUM_INITIALIZED (0x00200000) #define CCB_FLAG_ENUM_NOMATCH_CONSTANT_ENTRY (0x00400000) - + // // The Irp Context record is allocated for every orginating Irp. It is // created by the Fsd dispatch routines, and deallocated by the CdComplete @@ -1265,7 +1265,7 @@ typedef IRP_CONTEXT *PIRP_CONTEXT; IRP_CONTEXT_FLAG_IN_FSP \ ) - + // // Following structure is used to queue a request to the delayed close queue. // This structure should be the minimum block allocation size. @@ -1307,7 +1307,7 @@ typedef struct _IRP_CONTEXT_LITE { } IRP_CONTEXT_LITE; typedef IRP_CONTEXT_LITE *PIRP_CONTEXT_LITE; - + // // Context structure for asynchronous I/O calls. Most of these fields // are actually only required for the ReadMultiple routines, but @@ -1350,7 +1350,7 @@ typedef struct _CD_IO_CONTEXT { } CD_IO_CONTEXT; typedef CD_IO_CONTEXT *PCD_IO_CONTEXT; - + // // Following structure is used to track the top level request. Each Cdfs // Fsd and Fsp entry point will examine the top level irp location in the @@ -1385,7 +1385,7 @@ typedef struct _THREAD_CONTEXT { } THREAD_CONTEXT; typedef THREAD_CONTEXT *PTHREAD_CONTEXT; - + // // The following structure is used for enumerating the entries in the // path table. We will always map this two sectors at a time so we don't @@ -1452,7 +1452,7 @@ typedef PATH_ENUM_CONTEXT *PPATH_ENUM_CONTEXT; #define VACB_MAPPING_MASK (VACB_MAPPING_GRANULARITY - 1) #define LAST_VACB_SECTOR_OFFSET (VACB_MAPPING_GRANULARITY - SECTOR_SIZE) - + // // Path Entry. This is our representation of the on disk data. // @@ -1516,7 +1516,7 @@ typedef PATH_ENTRY *PPATH_ENTRY; #define PATH_ENTRY_FLAG_ALLOC_BUFFER (0x00000001) - + // // Compound path entry. This structure combines the on-disk entries // with the in-memory structures. @@ -1530,7 +1530,7 @@ typedef struct _COMPOUND_PATH_ENTRY { } COMPOUND_PATH_ENTRY; typedef COMPOUND_PATH_ENTRY *PCOMPOUND_PATH_ENTRY; - + // // The following is used for enumerating through a directory via the // dirents. @@ -1568,7 +1568,7 @@ typedef struct _DIRENT_ENUM_CONTEXT { } DIRENT_ENUM_CONTEXT; typedef DIRENT_ENUM_CONTEXT *PDIRENT_ENUM_CONTEXT; - + // // Following structure is used to smooth out the differences in the HSG, ISO // and Joliett directory entries. @@ -1672,7 +1672,7 @@ typedef DIRENT *PDIRENT; #define DIRENT_FLAG_NOT_PERSISTENT (0) - + // // Following structure combines the on-disk information with the normalized // structure. @@ -1686,7 +1686,7 @@ typedef struct _COMPOUND_DIRENT { } COMPOUND_DIRENT; typedef COMPOUND_DIRENT *PCOMPOUND_DIRENT; - + // // The following structure is used to enumerate the files in a directory. // It contains three DirContext/Dirent pairs and then self pointers to @@ -1738,7 +1738,7 @@ typedef FILE_ENUM_CONTEXT *PFILE_ENUM_CONTEXT; #define FILE_CONTEXT_MULTIPLE_DIRENTS (0x00000001) - + // // RIFF header. Prepended to the data of a file containing XA sectors. // This is a hard-coded structure except that we bias the 'ChunkSize' and @@ -1787,7 +1787,7 @@ typedef struct _AUDIO_PLAY_HEADER { } AUDIO_PLAY_HEADER; typedef AUDIO_PLAY_HEADER *PAUDIO_PLAY_HEADER; - + // // Some macros for supporting the use of a Generic Table // containing all the FCB/DCBs and indexed by their FileId. diff --git a/drivers/filesystems/cdfs/cleanup.c b/drivers/filesystems/cdfs/cleanup.c index 0cdda166f57..141ef7ae38a 100644 --- a/drivers/filesystems/cdfs/cleanup.c +++ b/drivers/filesystems/cdfs/cleanup.c @@ -132,9 +132,9 @@ Return Value: // Vcb = Fcb->Vcb; - + // - // Synchronise with reads while we set the cleanup complete + // Synchronise with reads while we set the cleanup complete // flag on this fileobject. Once this flag is set, any further // reads will be rejected (CdVerifyFcbOperation) // @@ -152,30 +152,30 @@ Return Value: if (TypeOfOpen == UserVolumeOpen) { // - // For a force dismount, physically disconnect this Vcb from the device so - // a new mount can occur. Vcb deletion cannot happen at this time since - // there is a reference on it associated with this very request, but we'll + // For a force dismount, physically disconnect this Vcb from the device so + // a new mount can occur. Vcb deletion cannot happen at this time since + // there is a reference on it associated with this very request, but we'll // call check for dismount again later after we process this close. // - + if (FlagOn( Ccb->Flags, CCB_FLAG_DISMOUNT_ON_CLOSE )) { - + CdAcquireCdData( IrpContext ); - + CdCheckForDismount( IrpContext, Vcb, TRUE ); - + CdReleaseCdData( IrpContext ); - + // // If this handle actually wrote something, flush the device buffers, // and then set the verify bit now just to be safe (in case there is no // dismount). // - + } else if (FlagOn( FileObject->Flags, FO_FILE_MODIFIED )) { - + CdHijackIrpAndFlushDevice( IrpContext, Irp, Vcb->TargetDeviceObject ); - + CdMarkDevForVerifyIfVcbMounted( Vcb ); } } @@ -185,13 +185,13 @@ Return Value: // CdAcquireFcbExclusive( IrpContext, Fcb, FALSE ); - + // // Use a try-finally to facilitate cleanup. // _SEH2_TRY { - + // // Case on the type of open that we are trying to cleanup. // @@ -259,7 +259,7 @@ Return Value: default : #ifdef _MSC_VER -#pragma prefast( suppress:__WARNING_USE_OTHER_FUNCTION, "argument bogus" ) +#pragma prefast( suppress:__WARNING_USE_OTHER_FUNCTION, "argument bogus" ) #endif CdBugCheck( TypeOfOpen, 0, 0 ); } @@ -293,14 +293,14 @@ Return Value: NT_ASSERT( FlagOn( Vcb->VcbState, VCB_STATE_LOCKED)); - IoAcquireVpbSpinLock( &SavedIrql ); + IoAcquireVpbSpinLock( &SavedIrql ); ClearFlag( Vcb->Vpb->Flags, VPB_LOCKED); ClearFlag( Vcb->VcbState, VCB_STATE_LOCKED ); Vcb->VolumeLockFileObject = NULL; SendUnlockNotification = TRUE; - IoReleaseVpbSpinLock( SavedIrql ); + IoReleaseVpbSpinLock( SavedIrql ); } CdUnlockVcb( IrpContext, Vcb ); @@ -316,9 +316,9 @@ Return Value: } _SEH2_FINALLY { CdReleaseFcb( IrpContext, Fcb ); - + if (SendUnlockNotification) { - + FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK ); } } _SEH2_END; @@ -328,7 +328,7 @@ Return Value: // this very fileobject we were cleaning up be the last reason for the // volume to remain, teardown will commence on completion of this Irp. // - + if (AttemptTeardown) { // @@ -336,20 +336,20 @@ Return Value: // may acquire CdData if there is a possibility of tearing the volume // down. // - + CdAcquireCdData( IrpContext); _SEH2_TRY { - + CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); VcbAcquired = TRUE; - + CdPurgeVolume( IrpContext, Vcb, FALSE ); } _SEH2_FINALLY { if (VcbAcquired) { CdReleaseVcb( IrpContext, Vcb ); } - + CdReleaseCdData( IrpContext); } _SEH2_END; } diff --git a/drivers/filesystems/cdfs/close.c b/drivers/filesystems/cdfs/close.c index fecb1e6dbfb..457d827a90d 100644 --- a/drivers/filesystems/cdfs/close.c +++ b/drivers/filesystems/cdfs/close.c @@ -229,7 +229,7 @@ Return Value: // to do here is prevent this routine starving other threads which // may need this Vcb exclusively. // - // Note that the check for potential teardown below is unsafe. We'll + // Note that the check for potential teardown below is unsafe. We'll // repeat later within the cddata lock. // @@ -260,7 +260,7 @@ Return Value: (Fcb->Vcb->VcbCondition != VcbMounted) && (Fcb->Vcb->VcbCondition != VcbMountInProgress) && (Fcb->Vcb->VcbCleanup == 0); - + if (!PotentialVcbTeardown) { CdReleaseCdData( IrpContext); @@ -270,7 +270,7 @@ Return Value: CurrentVcb = Fcb->Vcb; _Analysis_assume_( CurrentVcb != NULL ); - + CdAcquireVcbShared( IrpContext, CurrentVcb, FALSE ); VcbHoldCount = 0; @@ -404,7 +404,7 @@ Return Value: // // Clean up any CCB associated with this open. // - + if (Ccb != NULL) { UserReference = 1; @@ -417,7 +417,7 @@ Return Value: } // - // If this is the last reference to a user file or directory on a + // If this is the last reference to a user file or directory on a // currently mounted volume, then post it to the delayed close queue. Note // that the VcbCondition check is unsafe, but it doesn't really matter - // we just might delay the volume teardown a little by posting this close. @@ -436,7 +436,7 @@ Return Value: // if we can't acquire all of the resources. // - } + } else { // @@ -449,7 +449,7 @@ Return Value: // a number of other Fcbs (and thus their references), a simple check // on reference count is not appropriate. // - // Do an unsafe check first to avoid taking the (global) cddata lock in the + // Do an unsafe check first to avoid taking the (global) cddata lock in the // common case. // @@ -487,7 +487,7 @@ Return Value: CdReleaseCdData( IrpContext ); } } - + // // Call the worker routine to perform the actual work. This routine // should never raise except for a fatal error. @@ -507,7 +507,7 @@ Return Value: // the request. // - } + } else if (PotentialVcbTeardown) { CdCheckForDismount( IrpContext, Vcb, FALSE ); @@ -532,7 +532,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local support routine // @@ -685,7 +685,7 @@ Return Value: CdFspClose (NULL); } - + VOID CdQueueClose ( _In_ PIRP_CONTEXT IrpContext, @@ -868,7 +868,7 @@ Return Value: return; } - + // // Local support routine // diff --git a/drivers/filesystems/cdfs/create.c b/drivers/filesystems/cdfs/create.c index 1fb744139e1..f4a2903c24c 100644 --- a/drivers/filesystems/cdfs/create.c +++ b/drivers/filesystems/cdfs/create.c @@ -116,7 +116,7 @@ CdCompleteFcbOpen ( #pragma alloc_text(PAGE, CdOpenFileFromFileContext) #endif - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS #ifdef _MSC_VER @@ -1018,7 +1018,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -1106,7 +1106,7 @@ Return Value: // This is here because the Win32 layer can't avoid sending me double // beginning backslashes. // - + if ((FileName->Length > sizeof( WCHAR )) && (FileName->Buffer[1] == L'\\') && (FileName->Buffer[0] == L'\\')) { @@ -1246,12 +1246,12 @@ Return Value: // // Check for an overflow of the maximum filename size. // - + if (BufferLength > MAXUSHORT) { return STATUS_INVALID_PARAMETER; } - + // // Now see if we need to allocate a new buffer. // @@ -1469,7 +1469,7 @@ Return Value: #endif } - + // // Local support routine // @@ -1973,7 +1973,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2075,7 +2075,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2257,7 +2257,7 @@ Return Value: ParentFcb = *CurrentFcb; *CurrentFcb = NextFcb; - + // Lock object is acquired using internal state _Analysis_suppress_lock_checking_(NextFcb->FcbNonpaged->FcbResource); @@ -2358,7 +2358,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2648,7 +2648,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2714,12 +2714,12 @@ Return Value: // if (MAXIMUM_ALLOWED == DesiredAccess) { - + DesiredAccess = FILE_ALL_ACCESS & ~((TypeOfOpen != UserVolumeOpen ? (FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA | FILE_WRITE_EA | - FILE_ADD_FILE | + FILE_ADD_FILE | FILE_ADD_SUBDIRECTORY | FILE_APPEND_DATA) : 0) | FILE_DELETE_CHILD | @@ -2778,7 +2778,7 @@ Return Value: return STATUS_SHARING_VIOLATION; } } - + // // If the Fcb already existed then we need to check the oplocks and // the share access. diff --git a/drivers/filesystems/cdfs/devctrl.c b/drivers/filesystems/cdfs/devctrl.c index 4d0a70ad55e..f9b959254db 100644 --- a/drivers/filesystems/cdfs/devctrl.c +++ b/drivers/filesystems/cdfs/devctrl.c @@ -41,7 +41,7 @@ CdDevCtrlCompletionRoutine ( #pragma alloc_text(PAGE, CdCommonDevControl) #endif - + NTSTATUS CdCommonDevControl ( _Inout_ PIRP_CONTEXT IrpContext, @@ -167,7 +167,7 @@ Return Value: return Status; } - + // // Local support routine // diff --git a/drivers/filesystems/cdfs/deviosup.c b/drivers/filesystems/cdfs/deviosup.c index 517a094a7ed..9f1e5e262c9 100644 --- a/drivers/filesystems/cdfs/deviosup.c +++ b/drivers/filesystems/cdfs/deviosup.c @@ -237,17 +237,17 @@ Routine Description: Arguments: Msf - on output, set to 0xMmSsFf representation of blocks. - + --*/ { PAGED_CODE(); Blocks += 150; // Lbn 0 == 00:02:00, 1sec == 75 frames. - + Msf[0] = (UCHAR)(Blocks % 75); // Frames Blocks /= 75; // -> Seconds - Msf[1] = (UCHAR)(Blocks % 60); // Seconds + Msf[1] = (UCHAR)(Blocks % 60); // Seconds Blocks /= 60; // -> Minutes Msf[2] = (UCHAR)Blocks; // Minutes } @@ -289,16 +289,16 @@ Return Value: return CDDA; } - + // // FCB_STATE_MODE2_FILE // - + return YellowMode2; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS CdNonCachedRead ( _In_ PIRP_CONTEXT IrpContext, @@ -388,7 +388,7 @@ Return Value: // If we're going to use the sector cache for this request, then // mark the request waitable. // - + if ((SafeNodeType( Fcb) == CDFS_NTC_FCB_INDEX) && (NULL != Fcb->Vcb->SectorCacheBuffer) && (VcbMounted == IrpContext->Vcb->VcbCondition)) { @@ -418,7 +418,7 @@ Return Value: // // Call prepare buffers to set up the next entries // in the IoRuns array. Remember if there are any - // unaligned entries. This routine will raise CANT_WAIT + // unaligned entries. This routine will raise CANT_WAIT // if there are unaligned entries for an async request. // @@ -529,7 +529,7 @@ Return Value: FlushIoBuffers = TRUE; } - + CleanupRunCount = 0; // @@ -583,9 +583,9 @@ Return Value: return Status; } - - -_Requires_lock_held_(_Global_critical_region_) + + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS CdNonCachedXARead ( _In_ PIRP_CONTEXT IrpContext, @@ -726,14 +726,14 @@ Return Value: // // Note: LBN 0 == 0:2:0 (MSF) // - + // // Fill in the address (both MSF and Lbn format) and length fields. // - + SwapCopyUchar4( &Address, TrackData->Address); CdLbnToMmSsFf( Address, AudioPlayHeader->TrackAddress); - + SwapCopyUchar4( &AudioPlayHeader->StartingSector, TrackData->Address); // @@ -809,9 +809,9 @@ Return Value: // // CD-XA non-audio // - - } else { - + + } else { + NT_ASSERT( FlagOn( Fcb->FcbState, FCB_STATE_MODE2_FILE | FCB_STATE_MODE2FORM2_FILE )); RiffHeader = &LocalRiffHeader; @@ -869,7 +869,7 @@ Return Value: // if (!TryingYellowbookMode2) { - + RtlZeroMemory( IoRuns, sizeof( IoRuns )); RtlZeroMemory( RawReads, sizeof( RawReads )); @@ -884,7 +884,7 @@ Return Value: &CleanupRunCount, &ThisByteCount ); } - + // // Perform multiple Io to read in the data. Note that // there may be no Io to do if we were able to use an @@ -914,7 +914,7 @@ Return Value: if (!NT_SUCCESS( Status )) { - if (!TryingYellowbookMode2 && + if (!TryingYellowbookMode2 && FlagOn( Fcb->FcbState, FCB_STATE_MODE2FORM2_FILE )) { // @@ -926,11 +926,11 @@ Return Value: TryingYellowbookMode2 = TRUE; TrackMode = YellowMode2; - + // // Clear our 'cumulative' error status value // - + IrpContext->IoContext->Status = STATUS_SUCCESS; continue; @@ -938,9 +938,9 @@ Return Value: try_return( NOTHING ); } - + CleanupRunCount = 0; - + if (TryingYellowbookMode2) { // @@ -1008,7 +1008,7 @@ CdVolumeDasdWrite ( Routine Description: This routine performs the non-cached writes to 'cooked' sectors (2048 bytes - per sector). This is done by filling the IoRun for the desired request + per sector). This is done by filling the IoRun for the desired request and send it down to the device. Arguments: @@ -1075,7 +1075,7 @@ Return Value: } - + BOOLEAN CdReadSectors ( _In_ PIRP_CONTEXT IrpContext, @@ -1216,7 +1216,7 @@ Return Value: } } - + NTSTATUS CdCreateUserMdl ( _In_ PIRP_CONTEXT IrpContext, @@ -1324,7 +1324,7 @@ Return Value: return Status; } - + NTSTATUS CdPerformDevIoCtrlEx ( _In_ PIRP_CONTEXT IrpContext, @@ -1456,20 +1456,20 @@ CdPerformDevIoCtrl ( { PAGED_CODE(); - return CdPerformDevIoCtrlEx( IrpContext, - IoControlCode, - Device, - NULL, - 0, - OutputBuffer, - OutputBufferLength, + return CdPerformDevIoCtrlEx( IrpContext, + IoControlCode, + Device, + NULL, + 0, + OutputBuffer, + OutputBufferLength, InternalDeviceIoControl, OverrideVerify, Iosb); } - + // // Local support routine // @@ -1628,7 +1628,7 @@ Return Value: (CurrentByteCount < SECTOR_SIZE))) { NT_ASSERT( SafeNodeType(Fcb) != CDFS_NTC_FCB_INDEX); - + // // If we can't wait then raise. // @@ -1769,7 +1769,7 @@ Return Value: return FoundUnaligned; } - + // // Local support routine // @@ -1893,7 +1893,7 @@ Return Value: CurrentRawOffset = (LONGLONG) ((ULONG) CurrentRawOffset / RAW_SECTOR_SIZE); #ifdef _MSC_VER -#pragma prefast( suppress: __WARNING_RESULTOFSHIFTCASTTOLARGERSIZE, "This is fine beacuse raw sector size > sector shift" ) +#pragma prefast( suppress: __WARNING_RESULTOFSHIFTCASTTOLARGERSIZE, "This is fine beacuse raw sector size > sector shift" ) #endif CurrentCookedOffset = (LONGLONG) ((ULONG) CurrentRawOffset << SECTOR_SHIFT ); @@ -1940,7 +1940,7 @@ Return Value: *RunCount += 1; // - // Initialize the current position in the IoRuns array. Find the + // Initialize the current position in the IoRuns array. Find the // eventual destination in the user's buffer for this portion of the transfer. // @@ -2050,7 +2050,7 @@ Return Value: // following are true: // // If we are to store the beginning of the raw sector in the user's buffer. - // The current scratch buffer precedes the destination in the user's buffer + // The current scratch buffer precedes the destination in the user's buffer // (and hence also lies within it) // There are enough bytes remaining in the buffer for at least one // raw sector. @@ -2068,7 +2068,7 @@ Return Value: if (CurrentCookedByteCount <= Fcb->Vcb->MaximumTransferRawSectors * SECTOR_SIZE) { CurrentRawByteCount = (SectorAlign( CurrentCookedByteCount) >> SECTOR_SHIFT) * RAW_SECTOR_SIZE; - + } else { CurrentCookedByteCount = Fcb->Vcb->MaximumTransferRawSectors * SECTOR_SIZE; @@ -2079,7 +2079,7 @@ Return Value: // Now make sure we are within the page transfer limit. // - while (ADDRESS_AND_SIZE_TO_SPAN_PAGES(CurrentUserBuffer, RawSectorAlign( CurrentRawByteCount)) > + while (ADDRESS_AND_SIZE_TO_SPAN_PAGES(CurrentUserBuffer, RawSectorAlign( CurrentRawByteCount)) > Fcb->Vcb->MaximumPhysicalPages ) { CurrentRawByteCount -= RAW_SECTOR_SIZE; @@ -2105,7 +2105,7 @@ Return Value: CurrentRawByteCount = RemainingRawByteCount; } - + // // Update the IO run array. We point to the scratch buffer as // well as the buffer and Mdl in the original Irp. @@ -2119,7 +2119,7 @@ Return Value: ThisIoRun->TransferBuffer = CurrentUserBuffer; ThisIoRun->TransferMdl = Irp->MdlAddress; - ThisIoRun->TransferVirtualAddress = Add2Ptr( Irp->UserBuffer, + ThisIoRun->TransferVirtualAddress = Add2Ptr( Irp->UserBuffer, CurrentUserBufferOffset, PVOID); @@ -2210,7 +2210,7 @@ Return Value: return; } - + // // Local support routine // @@ -2423,7 +2423,7 @@ Return Value: // // We don't want IO to get our IRP and free it. // - + return STATUS_MORE_PROCESSING_REQUIRED; } @@ -2452,7 +2452,7 @@ Return Value: PAGED_CODE(); if (NULL != IrpContext->Vcb->SectorCacheBuffer) { - + CdAcquireCacheForUpdate( IrpContext); CdFreePool( &IrpContext->Vcb->SectorCacheBuffer); CdReleaseCache( IrpContext); @@ -2465,7 +2465,7 @@ CdReadDirDataThroughCache ( _In_ PIRP_CONTEXT IrpContext, _In_ PIO_RUN Run ) - + /*++ Routine Description: @@ -2520,18 +2520,18 @@ Return Value: CdAcquireCacheForRead( IrpContext); _SEH2_TRY { - + // // Check the cache hasn't gone away due to volume verify failure (which - // is the *only* reason it'll go away). If this is the case we raise + // is the *only* reason it'll go away). If this is the case we raise // the same error any I/O would return if the cache weren't here. // - + if (NULL == Vcb->SectorCacheBuffer) { - + CdRaiseStatus( IrpContext, STATUS_VERIFY_REQUIRED); } - + while (Remaining) { Buffer = NULL; @@ -2539,7 +2539,7 @@ Return Value: // // Look to see if any portion is currently cached. // - + for (Index = 0; Index < CD_SEC_CACHE_CHUNKS; Index++) { if ((Vcb->SecCacheChunks[ Index].BaseLbn != -1) && @@ -2560,8 +2560,8 @@ Return Value: BufferSectorOffset = Lbn - Buffer->BaseLbn; Found = Min( CD_SEC_CHUNK_BLOCKS - BufferSectorOffset, Remaining); - RtlCopyMemory( UserBuffer, - Buffer->Buffer + BytesFromSectors( BufferSectorOffset), + RtlCopyMemory( UserBuffer, + Buffer->Buffer + BytesFromSectors( BufferSectorOffset), BytesFromSectors( Found)); Remaining -= Found; @@ -2571,14 +2571,14 @@ Return Value: // // Update stats. Don't count a hit if we've just read the data in. // - + if (!JustRead) { - + InterlockedIncrement( (LONG*)&Vcb->SecCacheHits); } - + JustRead = FALSE; -#endif +#endif continue; } @@ -2589,18 +2589,18 @@ Return Value: CdReleaseCache( IrpContext); CdAcquireCacheForUpdate( IrpContext); -#if DBG +#if DBG Vcb->SecCacheMisses += 1; #endif // - // Select the chunk to replace and calculate the start block of the - // chunk to cache. We cache blocks which start on Lbns aligned on + // Select the chunk to replace and calculate the start block of the + // chunk to cache. We cache blocks which start on Lbns aligned on // multiples of chunk size, treating block 16 (VRS start) as block // zero. // Buffer = &Vcb->SecCacheChunks[ Vcb->SecCacheLRUChunkIndex]; - + StartBlock = Lbn - ((Lbn - 16) % CD_SEC_CHUNK_BLOCKS); // @@ -2635,58 +2635,58 @@ Return Value: // // Now build / send the read request. // - + IoReuseIrp( Vcb->SectorCacheIrp, STATUS_SUCCESS); KeClearEvent( &Vcb->SectorCacheEvent); Vcb->SectorCacheIrp->Tail.Overlay.Thread = PsGetCurrentThread(); - + // // Get a pointer to the stack location of the first driver which will be // invoked. This is where the function codes and the parameters are set. // - + IrpSp = IoGetNextIrpStackLocation( Vcb->SectorCacheIrp); IrpSp->MajorFunction = (UCHAR) IRP_MJ_READ; // // Build an MDL to describe the buffer. // - + IoAllocateMdl( Buffer->Buffer, - BytesFromSectors( Blocks), - FALSE, - FALSE, + BytesFromSectors( Blocks), + FALSE, + FALSE, Vcb->SectorCacheIrp); - + if (NULL == Vcb->SectorCacheIrp->MdlAddress) { - + IrpContext->Irp->IoStatus.Information = 0; CdRaiseStatus( IrpContext, STATUS_INSUFFICIENT_RESOURCES); } - + // // We're reading/writing into the block cache (paged pool). Lock the // pages and update the MDL with physical page information. // - + _SEH2_TRY { - + MmProbeAndLockPages( Vcb->SectorCacheIrp->MdlAddress, KernelMode, (LOCK_OPERATION) IoWriteAccess ); - } + } #ifdef _MSC_VER #pragma warning(suppress: 6320) #endif _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - + IoFreeMdl( Vcb->SectorCacheIrp->MdlAddress ); Vcb->SectorCacheIrp->MdlAddress = NULL; } _SEH2_END; - + if (NULL == Vcb->SectorCacheIrp->MdlAddress) { - + CdRaiseStatus( IrpContext, STATUS_INSUFFICIENT_RESOURCES ); } @@ -2706,11 +2706,11 @@ Return Value: TRUE, TRUE, TRUE ); - + Vcb->SectorCacheIrp->UserIosb = &Iosb; Status = IoCallDriver( Vcb->TargetDeviceObject, Vcb->SectorCacheIrp ); - + if (STATUS_PENDING == Status) { @@ -2719,7 +2719,7 @@ Return Value: KernelMode, FALSE, NULL ); - + Status = Vcb->SectorCacheIrp->IoStatus.Status; } @@ -2745,8 +2745,8 @@ Return Value: Buffer->BaseLbn = StartBlock; Vcb->SecCacheLRUChunkIndex = (Vcb->SecCacheLRUChunkIndex + 1) % CD_SEC_CACHE_CHUNKS; - - CdConvertCacheToShared( IrpContext); + + CdConvertCacheToShared( IrpContext); #if DBG JustRead = TRUE; #endif @@ -2841,7 +2841,7 @@ Return Value: // // For directories, use the sector cache. // - + if ((SafeNodeType( Fcb) == CDFS_NTC_FCB_INDEX) && (NULL != Fcb->Vcb->SectorCacheBuffer) && (VcbMounted == IrpContext->Vcb->VcbCondition)) { @@ -2974,7 +2974,7 @@ Return Value: return; } - + // // We only need to set the associated IRP count in the master irp to // make it a master IRP. But we set the count to one more than our @@ -3023,7 +3023,7 @@ Return Value: IoRuns[UnwindRunCount].SavedIrp = NULL; if (NULL != Irp) { - + // // If IoCallDriver returns an error, it has completed the Irp // and the error will be caught by our completion routines @@ -3035,7 +3035,7 @@ Return Value: } } - + // // Local support routine // @@ -3134,12 +3134,12 @@ Return Value: IrpContext->Irp->IoStatus.Information = 0; CdRaiseStatus( IrpContext, STATUS_INSUFFICIENT_RESOURCES ); } - + // - // Should have been passed a byte count of at least one sector, and + // Should have been passed a byte count of at least one sector, and // must be a multiple of sector size // - + NT_ASSERT( ThisIoRun->DiskByteCount && !SectorOffset(ThisIoRun->DiskByteCount)); RawByteCount = SectorsFromBytes( ThisIoRun->DiskByteCount) * RAW_SECTOR_SIZE; @@ -3261,7 +3261,7 @@ Return Value: return; } - + // // Local support routine // @@ -3305,7 +3305,7 @@ Return Value: // // For directories, look in the sector cache, // - + if ((SafeNodeType( Fcb) == CDFS_NTC_FCB_INDEX) && (NULL != Fcb->Vcb->SectorCacheBuffer) && (VcbMounted == IrpContext->Vcb->VcbCondition)) { @@ -3313,7 +3313,7 @@ Return Value: if (CdReadDirDataThroughCache( IrpContext, Run )) { if (FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT)) { - + IrpContext->Irp->IoStatus.Status = STATUS_SUCCESS; KeSetEvent( &IrpContext->IoContext->SyncEvent, 0, FALSE ); } @@ -3341,11 +3341,11 @@ Return Value: // if (FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_TOP_LEVEL )) { - + NT_ASSERT( IrpContext->IoContext->ResourceThreadId == (ERESOURCE_THREAD)PsGetCurrentThread() ); - + IrpContext->IoContext->ResourceThreadId = ((ULONG_PTR)IrpContext->IoContext) | 3; - + ExSetResourceOwnerPointer( IrpContext->IoContext->Resource, (PVOID)IrpContext->IoContext->ResourceThreadId ); } @@ -3390,7 +3390,7 @@ Return Value: (VOID)IoCallDriver( IrpContext->Vcb->TargetDeviceObject, IrpContext->Irp ); } - + // // Local support routine // @@ -3428,7 +3428,7 @@ Return Value: KeClearEvent( &IrpContext->IoContext->SyncEvent ); } - + // // Local support routine // @@ -3516,7 +3516,7 @@ Return Value: return STATUS_MORE_PROCESSING_REQUIRED; } - + // // Local support routine // @@ -3636,7 +3636,7 @@ Return Value: } - + // // Local support routine // @@ -3683,9 +3683,9 @@ Return Value: _Analysis_assume_(Context != NULL); UNREFERENCED_PARAMETER( DeviceObject ); - + AssertVerifyDeviceIrp( Irp ); - + // // Store the correct information field into the Irp. // @@ -3700,7 +3700,7 @@ Return Value: return STATUS_MORE_PROCESSING_REQUIRED; } - + // // Local support routine // @@ -3743,7 +3743,7 @@ Return Value: _Analysis_assume_(IoContext != NULL); AssertVerifyDeviceIrp( Irp ); - + // // Update the information field with the correct value for bytes read. // @@ -3777,7 +3777,7 @@ Return Value: } - + // // Local support routine // @@ -4139,7 +4139,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Get the next stack location, and copy over the stack location // diff --git a/drivers/filesystems/cdfs/dirctrl.c b/drivers/filesystems/cdfs/dirctrl.c index 08e8317f949..f4ffd4201b7 100644 --- a/drivers/filesystems/cdfs/dirctrl.c +++ b/drivers/filesystems/cdfs/dirctrl.c @@ -73,7 +73,7 @@ CdEnumerateIndex ( #pragma alloc_text(PAGE, CdQueryDirectory) #endif - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS @@ -151,7 +151,7 @@ Return Value: return Status; } - + // // Local support routines // @@ -503,16 +503,16 @@ Return Value: // to guard against a user messing with the page protection and other // such trickery. // - + _SEH2_TRY { - + // // Zero and initialize the base part of the current entry. // RtlZeroMemory( Add2Ptr( UserBuffer, NextEntry, PVOID ), BaseLength ); - + // // Now we have an entry to return to our caller. // We'll case on the type of information requested and fill up @@ -520,64 +520,64 @@ Return Value: // switch (IrpSp->Parameters.QueryDirectory.FileInformationClass) { - + case FileBothDirectoryInformation: case FileFullDirectoryInformation: case FileIdBothDirectoryInformation: case FileIdFullDirectoryInformation: case FileDirectoryInformation: - + DirInfo = Add2Ptr( UserBuffer, NextEntry, PFILE_BOTH_DIR_INFORMATION ); - + // // Use the create time for all the time stamps. // - + CdConvertCdTimeToNtTime( IrpContext, FileContext.InitialDirent->Dirent.CdTime, &DirInfo->CreationTime ); - + DirInfo->LastWriteTime = DirInfo->ChangeTime = DirInfo->CreationTime; - + // // Set the attributes and sizes separately for directories and // files. // - + if (FlagOn( ThisDirent->DirentFlags, CD_ATTRIBUTE_DIRECTORY )) { - + DirInfo->EndOfFile.QuadPart = DirInfo->AllocationSize.QuadPart = 0; - + SetFlag( DirInfo->FileAttributes, FILE_ATTRIBUTE_DIRECTORY); - + } else { - + DirInfo->EndOfFile.QuadPart = FileContext.FileSize; DirInfo->AllocationSize.QuadPart = LlSectorAlign( FileContext.FileSize ); - + SetFlag( DirInfo->FileAttributes, FILE_ATTRIBUTE_READONLY); } if (FlagOn( ThisDirent->DirentFlags, CD_ATTRIBUTE_HIDDEN )) { - + SetFlag( DirInfo->FileAttributes, FILE_ATTRIBUTE_HIDDEN ); } - + DirInfo->FileIndex = ThisDirent->DirentOffset; - + DirInfo->FileNameLength = FileNameBytes + SeparatorBytes + VersionStringBytes; - + break; - + case FileNamesInformation: - + NamesInfo = Add2Ptr( UserBuffer, NextEntry, PFILE_NAMES_INFORMATION ); - + NamesInfo->FileIndex = ThisDirent->DirentOffset; - + NamesInfo->FileNameLength = FileNameBytes + SeparatorBytes + VersionStringBytes; - + break; /* ReactOS Change: GCC "enumeration value not handled in switch" */ @@ -605,30 +605,30 @@ Return Value: default: break; } - + // // Now copy as much of the name as possible. We also may have a version // string to copy. // - + if (FileNameBytes != 0) { - + // // This is a Unicode name, we can copy the bytes directly. // - + RtlCopyMemory( Add2Ptr( UserBuffer, NextEntry + BaseLength, PVOID ), ThisDirent->CdFileName.FileName.Buffer, FileNameBytes ); - + if (SeparatorBytes != 0) { - + *(Add2Ptr( UserBuffer, NextEntry + BaseLength + FileNameBytes, PWCHAR )) = L';'; - + if (VersionStringBytes != 0) { - + RtlCopyMemory( Add2Ptr( UserBuffer, NextEntry + BaseLength + FileNameBytes + sizeof( WCHAR ), PVOID ), @@ -650,40 +650,40 @@ Return Value: IrpSp->Parameters.QueryDirectory.FileInformationClass == FileIdBothDirectoryInformation) && (Ccb->SearchExpression.VersionString.Length == 0) && !FlagOn( ThisDirent->Flags, DIRENT_FLAG_CONSTANT_ENTRY )) { - + // // If we already have the short name then copy into the user's buffer. // - + if (FileContext.ShortName.FileName.Length != 0) { - + RtlCopyMemory( DirInfo->ShortName, FileContext.ShortName.FileName.Buffer, FileContext.ShortName.FileName.Length ); - + DirInfo->ShortNameLength = (CCHAR) FileContext.ShortName.FileName.Length; - + // // If the short name length is currently zero then check if // the long name is not 8.3. We can copy the short name in // unicode form directly into the caller's buffer. // - + } else { - + if (!CdIs8dot3Name( IrpContext, ThisDirent->CdFileName.FileName )) { - + CdGenerate8dot3Name( IrpContext, &ThisDirent->CdCaseFileName.FileName, ThisDirent->DirentOffset, DirInfo->ShortName, &FileContext.ShortName.FileName.Length ); - + DirInfo->ShortNameLength = (CCHAR) FileContext.ShortName.FileName.Length; } } - + } // @@ -714,7 +714,7 @@ Return Value: LastEntry = NextEntry; NextEntry = QuadAlign( Information ); - + #ifdef _MSC_VER #pragma warning(suppress: 6320) #endif @@ -725,19 +725,19 @@ Return Value: // fail this request. This is the only reason any exception // would have occured at this level. // - + Information = 0; try_leave( Status = _SEH2_GetExceptionCode()); } _SEH2_END; } - + DoCcbUpdate = TRUE; } _SEH2_FINALLY { // // Cleanup our search context - *before* aquiring the FCB mutex exclusive, - // else can block on threads in cdcreateinternalstream/purge which + // else can block on threads in cdcreateinternalstream/purge which // hold the FCB but are waiting for all maps in this stream to be released. // @@ -748,13 +748,13 @@ Return Value: // if (DoCcbUpdate && !NT_ERROR( Status )) { - + // // Update the Ccb to show the current state of the enumeration. // CdLockFcb( IrpContext, Fcb ); - + Ccb->CurrentDirentOffset = ThisDirent->DirentOffset; ClearFlag( Ccb->Flags, CCB_FLAG_ENUM_RETURN_NEXT ); @@ -784,7 +784,7 @@ Return Value: return Status; } - + // // Local support routines // @@ -884,7 +884,7 @@ Return Value: return STATUS_PENDING; } - + // // Local support routine // @@ -954,7 +954,7 @@ Return Value: PAGED_CODE(); // - // If the user has specified that the scan be restarted, and has specicified + // If the user has specified that the scan be restarted, and has specicified // a new query pattern, reinitialize the CCB. // @@ -1349,7 +1349,7 @@ Return Value: return; } - + // // Local support routine // @@ -1418,7 +1418,7 @@ Return Value: ThisDirent = &FileContext->InitialDirent->Dirent; CdUpdateDirentName( IrpContext, ThisDirent, FlagOn( Ccb->Flags, CCB_FLAG_IGNORE_CASE )); - + } else { ReturnNextEntry = TRUE; @@ -1427,7 +1427,7 @@ Return Value: // // Don't bother if we have a constant entry and are ignoring them. // - + if (FlagOn( ThisDirent->Flags, DIRENT_FLAG_CONSTANT_ENTRY ) && FlagOn( Ccb->Flags, CCB_FLAG_ENUM_NOMATCH_CONSTANT_ENTRY )) { diff --git a/drivers/filesystems/cdfs/dirsup.c b/drivers/filesystems/cdfs/dirsup.c index 364b78e8e99..13c8b35722e 100644 --- a/drivers/filesystems/cdfs/dirsup.c +++ b/drivers/filesystems/cdfs/dirsup.c @@ -120,7 +120,7 @@ CdCheckForXAExtent ( #pragma alloc_text(PAGE, CdUpdateDirentName) #endif - + VOID CdLookupDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -203,7 +203,7 @@ Return Value: return; } - + BOOLEAN CdLookupNextDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -391,7 +391,7 @@ Return Value: } -_At_(Dirent->CdTime, _Post_notnull_) +_At_(Dirent->CdTime, _Post_notnull_) VOID CdUpdateDirentFromRawDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -529,7 +529,7 @@ Return Value: return; } - + VOID CdUpdateDirentName ( _In_ PIRP_CONTEXT IrpContext, @@ -819,7 +819,7 @@ Return Value: return; } - + _Success_(return != FALSE) BOOLEAN CdFindFile ( _In_ PIRP_CONTEXT IrpContext, @@ -992,7 +992,7 @@ Return Value: return Found; } - + BOOLEAN CdFindDirectory ( _In_ PIRP_CONTEXT IrpContext, @@ -1102,7 +1102,7 @@ Return Value: return Found; } - + _At_(FileContext->ShortName.FileName.MaximumLength, _In_range_(>=, BYTE_COUNT_8_DOT_3)) BOOLEAN CdFindFileByShortName ( @@ -1270,7 +1270,7 @@ Return Value: return Found; } - + BOOLEAN CdLookupNextInitialFileDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -1421,7 +1421,7 @@ Return Value: return FoundDirent; } - + VOID CdLookupLastFileDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -1631,7 +1631,7 @@ Return Value: return; } - + VOID CdCleanupFileContext ( _In_ PIRP_CONTEXT IrpContext, @@ -1679,7 +1679,7 @@ Return Value: return; } - + // // Local support routine // @@ -1781,7 +1781,7 @@ Return Value: return NextDirentOffset; } - + // // Local support routine // @@ -1848,12 +1848,12 @@ Return Value: // // Check for XA data. Note that a number of discs (video CDs) - // have files marked as type XA Mode 2 Form 1 (2048 bytes of - // user data), but actually record these sectors as Mode2 Form 2 - // (2352). We will fail to read these files, since for M2F1, + // have files marked as type XA Mode 2 Form 1 (2048 bytes of + // user data), but actually record these sectors as Mode2 Form 2 + // (2352). We will fail to read these files, since for M2F1, // a normal read CD command is issued (as per SCSI specs). // - + ExtentType = Mode2Form2Data; } diff --git a/drivers/filesystems/cdfs/fileinfo.c b/drivers/filesystems/cdfs/fileinfo.c index 40056c586f6..5820fda6e6a 100644 --- a/drivers/filesystems/cdfs/fileinfo.c +++ b/drivers/filesystems/cdfs/fileinfo.c @@ -108,7 +108,7 @@ CdQueryNetworkInfo ( #pragma alloc_text(PAGE, CdQueryStandardInfo) #endif - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS CdCommonQueryInfo ( @@ -348,7 +348,7 @@ Return Value: return Status; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS CdCommonSetInfo ( @@ -463,7 +463,7 @@ Return Value: _Function_class_(FAST_IO_QUERY_BASIC_INFO) -_IRQL_requires_same_ +_IRQL_requires_same_ _Success_(return != FALSE) BOOLEAN NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ @@ -855,7 +855,7 @@ Return Value: return Result; } - + // // Local support routine // @@ -918,7 +918,7 @@ Return Value: return; } - + // // Local support routine // @@ -993,7 +993,7 @@ Return Value: return; } - + // // Local support routine // @@ -1043,7 +1043,7 @@ Return Value: return; } - + // // Local support routine // @@ -1094,7 +1094,7 @@ Return Value: return; } - + // // Local support routine // @@ -1149,7 +1149,7 @@ Return Value: return; } - + // // Local support routine // @@ -1193,7 +1193,7 @@ Return Value: UNREFERENCED_PARAMETER( IrpContext ); NT_ASSERT(*Length >= sizeof(ULONG)); - + // // Simply copy the name in the file object to the user's buffer. // @@ -1225,7 +1225,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -1317,7 +1317,7 @@ Return Value: ParentFcb = Fcb->ParentFcb; CdAcquireFileShared( IrpContext, ParentFcb ); ReleaseParentFcb = TRUE; - + CdVerifyOrCreateDirStreamFile( IrpContext, ParentFcb); if (CdFidIsDirectory( Fcb->FileId)) { @@ -1359,23 +1359,23 @@ Return Value: NameToUse = &FileContext.InitialDirent->Dirent.CdCaseFileName.FileName; DirentOffset = FileContext.InitialDirent->Dirent.DirentOffset; - + } else { // // Initialize the search dirent structures. // - + CdInitializeDirContext( IrpContext, &DirContext ); CdInitializeDirent( IrpContext, &Dirent ); - + CleanupFileLookup = TRUE; - + CdLookupDirent( IrpContext, ParentFcb, CdQueryFidDirentOffset( Fcb->FileId ), &DirContext ); - + CdUpdateDirentFromRawDirent( IrpContext, ParentFcb, &DirContext, @@ -1384,9 +1384,9 @@ Return Value: // // Now update the dirent name. // - + CdUpdateDirentName( IrpContext, &Dirent, TRUE ); - + NameToUse = &Dirent.CdCaseFileName.FileName; DirentOffset = Dirent.DirentOffset; } @@ -1454,7 +1454,7 @@ Return Value: return Status; } - + // // Local support routine // diff --git a/drivers/filesystems/cdfs/filobsup.c b/drivers/filesystems/cdfs/filobsup.c index d957a795c4e..377505a2f16 100644 --- a/drivers/filesystems/cdfs/filobsup.c +++ b/drivers/filesystems/cdfs/filobsup.c @@ -187,7 +187,7 @@ Return Value: *Fcb = FileObject->FsContext; *Ccb = FileObject->FsContext2; - + #ifdef _MSC_VER #pragma warning( suppress: 4213 ) #endif @@ -201,7 +201,7 @@ Return Value: return TypeOfOpen; } - + TYPE_OF_OPEN CdFastDecodeFileObject ( _In_ PFILE_OBJECT FileObject, diff --git a/drivers/filesystems/cdfs/fsctrl.c b/drivers/filesystems/cdfs/fsctrl.c index e330699fc32..f28bcece341 100644 --- a/drivers/filesystems/cdfs/fsctrl.c +++ b/drivers/filesystems/cdfs/fsctrl.c @@ -172,7 +172,7 @@ CdFindActiveVolDescriptor ( #pragma alloc_text(PAGE, CdVerifyVolume) #endif - + // // Local support routine // @@ -193,13 +193,13 @@ Routine Description: This routine performs the actual lock volume operation. It will be called by anyone wishing to try to protect the volume for a long duration. PNP operations are such a user. - + The volume must be held exclusive by the caller. Arguments: Vcb - The volume being locked. - + FileObject - File corresponding to the handle locking the volume. If this is not specified, a system lock is assumed. @@ -223,7 +223,7 @@ Return Value: // to get rid of all of the other user references. If there is only one // remaining after the purge then we can allow the volume to be locked. // - + CdPurgeVolume( IrpContext, Vcb, FALSE ); // @@ -253,7 +253,7 @@ Return Value: SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT ); CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); - + if (!NT_SUCCESS( Status )) { return Status; @@ -266,9 +266,9 @@ Return Value: // Vpb locked flag as an 'explicit lock' flag in the same way as Fat. // - IoAcquireVpbSpinLock( &SavedIrql ); - - if (!FlagOn( Vcb->Vpb->Flags, VPB_LOCKED ) && + IoAcquireVpbSpinLock( &SavedIrql ); + + if (!FlagOn( Vcb->Vpb->Flags, VPB_LOCKED ) && (Vcb->VcbCleanup == RemainingUserReferences) && (Vcb->VcbUserReference == CDFS_RESIDUAL_USER_REFERENCE + RemainingUserReferences)) { @@ -277,13 +277,13 @@ Return Value: Vcb->VolumeLockFileObject = FileObject; FinalStatus = STATUS_SUCCESS; } - - IoReleaseVpbSpinLock( SavedIrql ); - + + IoReleaseVpbSpinLock( SavedIrql ); + return FinalStatus; } - + NTSTATUS CdUnlockVolumeInternal ( _In_ PIRP_CONTEXT IrpContext, @@ -295,21 +295,21 @@ CdUnlockVolumeInternal ( Routine Description: - This routine performs the actual unlock volume operation. - + This routine performs the actual unlock volume operation. + The volume must be held exclusive by the caller. Arguments: Vcb - The volume being locked. - + FileObject - File corresponding to the handle locking the volume. If this is not specified, a system lock is assumed. Return Value: NTSTATUS - The return status for the operation - + Attempting to remove a system lock that did not exist is OK. --*/ @@ -325,10 +325,10 @@ Return Value: // lock flag. The Vpb flag is only set for an explicit lock request, not // for the implicit lock obtained on a volume open with zero share mode. // - - IoAcquireVpbSpinLock( &SavedIrql ); - - if (FlagOn(Vcb->Vpb->Flags, VPB_LOCKED) && + + IoAcquireVpbSpinLock( &SavedIrql ); + + if (FlagOn(Vcb->Vpb->Flags, VPB_LOCKED) && (FileObject == Vcb->VolumeLockFileObject)) { ClearFlag( Vcb->VcbState, VCB_STATE_LOCKED ); @@ -336,13 +336,13 @@ Return Value: Vcb->VolumeLockFileObject = NULL; Status = STATUS_SUCCESS; } - - IoReleaseVpbSpinLock( SavedIrql ); + + IoReleaseVpbSpinLock( SavedIrql ); return Status; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS @@ -407,7 +407,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -527,7 +527,7 @@ CdReMountOldVcb ( PUCHAR Buffer; UNREFERENCED_PARAMETER( IrpContext ); - + ObDereferenceObject( OldVcb->TargetDeviceObject ); IoAcquireVpbSpinLock( &SavedIrql ); @@ -536,10 +536,10 @@ CdReMountOldVcb ( #pragma prefast(suppress: 28175, "this is a filesystem driver, touching the vpb is allowed") #endif NewVcb->Vpb->RealDevice->Vpb = OldVcb->Vpb; - + OldVcb->Vpb->RealDevice = NewVcb->Vpb->RealDevice; OldVcb->TargetDeviceObject = DeviceObjectWeTalkTo; - + CdUpdateVcbCondition( OldVcb, VcbMounted); CdUpdateMediaChangeCount( OldVcb, NewVcb->MediaChangeCount); @@ -549,12 +549,12 @@ CdReMountOldVcb ( NewVcb->SectorCacheBuffer = NULL; if (NULL != Buffer) { - + for (Index = 0; Index < CD_SEC_CACHE_CHUNKS; Index++) { - + OldVcb->SecCacheChunks[ Index].Buffer = Buffer; OldVcb->SecCacheChunks[ Index].BaseLbn = (ULONG)-1; - + Buffer += CD_SEC_CHUNK_BLOCKS * SECTOR_SIZE; } } @@ -616,7 +616,7 @@ Return Value: PVCB Vcb = NULL; PVCB OldVcb; UCHAR StackSize; - + BOOLEAN FoundPvd = FALSE; BOOLEAN SetDoVerifyOnFail; @@ -725,11 +725,11 @@ Return Value: &Iosb ); if (!NT_SUCCESS( Status )) { - + CdCompleteRequest( IrpContext, Irp, Status ); return Status; } - + if (Iosb.Information != sizeof(ULONG)) { // @@ -873,7 +873,7 @@ Return Value: // If we failed to read the TOC, then bail out. Probably blank media. // - if (Status != STATUS_SUCCESS) { + if (Status != STATUS_SUCCESS) { #ifdef __REACTOS__ @@ -886,7 +886,7 @@ Return Value: Status = STATUS_SUCCESS; } else { #endif - try_leave( Status ); + try_leave( Status ); #ifdef __REACTOS__ } #endif @@ -957,7 +957,7 @@ Return Value: // Lock object is acquired and released using internal state _Analysis_suppress_lock_checking_(Vcb->VcbResource); - + // // Store the Vcb in the IrpContext as we didn't have one before. // @@ -980,7 +980,7 @@ Return Value: CdMarkRealDevVerifyOk( Vcb->Vpb->RealDevice); if (!FlagOn( Vcb->VcbState, VCB_STATE_AUDIO_DISK)) { - + // // Allocate a buffer to read in the volume descriptors. We allocate a full // page to make sure we don't hit any alignment problems. @@ -1007,7 +1007,7 @@ Return Value: // We failed to find a valid VD in the data track, but there were also // audio tracks on this disc, so we'll try to mount it as an audio CD. // Since we're always last in the mount order, we won't be preventing - // any other FS from trying to mount the data track. However if the + // any other FS from trying to mount the data track. However if the // data track was at the start of the disc, then we abort, to avoid // having to filter it from our synthesised directory listing later. We // already filtered off any data track at the end. @@ -1015,7 +1015,7 @@ Return Value: if (!(TocDiskFlags & CDROM_DISK_AUDIO_TRACK) || BooleanFlagOn( Vcb->CdromToc->TrackData[0].Control, TOC_DATA_TRACK)) { - + try_leave( Status = STATUS_UNRECOGNIZED_VOLUME); } @@ -1025,7 +1025,7 @@ Return Value: RawIsoVd = NULL; } } - + // // Look and see if there is a secondary volume descriptor we want to // use. @@ -1058,7 +1058,7 @@ Return Value: // Allocate a block cache to speed directory operations. We can't // use the cache if there is any chance the volume has link blocks // in the data area (i.e. was packet written and then finalized to - // Joliet/9660). So we simply only allow the cache to operate on + // Joliet/9660). So we simply only allow the cache to operate on // media with a single track - since we're really targetting pressed // installation media here. We can't be more precise, since D/CD-ROM // drives don't support READ_TRACK_INFO, which is the only way for @@ -1076,10 +1076,10 @@ Return Value: ULONG Index; PUCHAR Buffer; - Buffer = - Vcb->SectorCacheBuffer = FsRtlAllocatePool( CdPagedPool, + Buffer = + Vcb->SectorCacheBuffer = FsRtlAllocatePool( CdPagedPool, CD_SEC_CACHE_CHUNKS * - CD_SEC_CHUNK_BLOCKS * + CD_SEC_CHUNK_BLOCKS * SECTOR_SIZE); for (Index = 0; Index < (ULONG)CD_SEC_CACHE_CHUNKS; Index++) { @@ -1096,11 +1096,11 @@ Return Value: try_leave( Status = STATUS_INSUFFICIENT_RESOURCES ); } - - IoInitializeIrp( Vcb->SectorCacheIrp, - IoSizeOfIrp( StackSize), + + IoInitializeIrp( Vcb->SectorCacheIrp, + IoSizeOfIrp( StackSize), (CCHAR)StackSize); - + KeInitializeEvent( &Vcb->SectorCacheEvent, SynchronizationEvent, FALSE); ExInitializeResourceLite( &Vcb->SectorCacheResource); } @@ -1116,13 +1116,13 @@ Return Value: // // Link the old Vcb to point to the new device object that we - // should be talking to, dereferencing the previous. Call a + // should be talking to, dereferencing the previous. Call a // nonpaged routine to do this since we take the Vpb spinlock. // - CdReMountOldVcb( IrpContext, - OldVcb, - Vcb, + CdReMountOldVcb( IrpContext, + OldVcb, + Vcb, DeviceObjectWeTalkTo); // @@ -1132,15 +1132,15 @@ Return Value: // Note that we do not send mount on normal remounts - that would duplicate the media // arrival notification of the device driver. // - + if (FlagOn( OldVcb->VcbState, VCB_STATE_NOTIFY_REMOUNT )) { - + ClearFlag( OldVcb->VcbState, VCB_STATE_NOTIFY_REMOUNT ); - + FileObjectToNotify = OldVcb->RootIndexFcb->FileObject; ObReferenceObject( FileObjectToNotify ); } - + try_leave( Status = STATUS_SUCCESS ); } @@ -1233,8 +1233,8 @@ Return Value: // // If we are not mounting the device, then set the verify bit again. // - - if ((_SEH2_AbnormalTermination() || (Status != STATUS_SUCCESS)) && + + if ((_SEH2_AbnormalTermination() || (Status != STATUS_SUCCESS)) && SetDoVerifyOnFail) { CdMarkRealDevForVerify( IrpContext->RealDevice); @@ -1276,7 +1276,7 @@ Return Value: // // Now send mount notification. // - + if (FileObjectToNotify) { FsRtlNotifyVolumeEvent( FileObjectToNotify, FSRTL_VOLUME_MOUNT ); @@ -1301,7 +1301,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -1426,7 +1426,7 @@ Return Value: try_return( Status ); } - + if (Iosb.Information != sizeof(ULONG)) { // @@ -1543,7 +1543,7 @@ Return Value: try_return( Status = STATUS_WRONG_VOLUME ); - } + } else { // @@ -1674,11 +1674,11 @@ Return Value: if (FlagOn( Vcb->VcbState, VCB_STATE_NOTIFY_REMOUNT )) { ClearFlag( Vcb->VcbState, VCB_STATE_NOTIFY_REMOUNT ); - + FileObjectToNotify = Vcb->RootIndexFcb->FileObject; ObReferenceObject( FileObjectToNotify ); } - + try_exit: NOTHING; // @@ -1691,9 +1691,9 @@ Return Value: // // If the volume was already unmounted, nothing more to do. // - + if (Vcb->VcbCondition == VcbNotMounted) { - + Status = STATUS_WRONG_VOLUME; // @@ -1722,7 +1722,7 @@ Return Value: if (Vcb->VcbCleanup == 0) { if (NT_SUCCESS( CdPurgeVolume( IrpContext, Vcb, FALSE ))) { - + ReleaseVcb = CdCheckForDismount( IrpContext, Vcb, FALSE ); } } @@ -1758,13 +1758,13 @@ Return Value: // // Now send mount notification. // - + if (FileObjectToNotify) { FsRtlNotifyVolumeEvent( FileObjectToNotify, FSRTL_VOLUME_MOUNT ); ObDereferenceObject( FileObjectToNotify ); } - + // // Complete the request if no exception. // @@ -1773,7 +1773,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -1930,7 +1930,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2013,7 +2013,7 @@ Return Value: // CdReleaseVcb( IrpContext, Vcb ); - + if (_SEH2_AbnormalTermination() || !NT_SUCCESS( Status )) { FsRtlNotifyVolumeEvent( IrpSp->FileObject, FSRTL_VOLUME_LOCK_FAILED ); @@ -2028,7 +2028,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2118,7 +2118,7 @@ Return Value: } - + // // Local support routine // @@ -2179,7 +2179,7 @@ Return Value: // SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT); - + // // Acquire exclusive access to the Vcb, and take the global resource to // sync. against mounts, verifies etc. @@ -2206,26 +2206,26 @@ Return Value: // on the volume fail and grease the rails toward dismount. // By definition there is no going back from a SURPRISE. // - + CdLockVcb( IrpContext, Vcb ); - + if (Vcb->VcbCondition != VcbDismountInProgress) { - + CdUpdateVcbCondition( Vcb, VcbInvalid ); } SetFlag( Vcb->VcbState, VCB_STATE_DISMOUNTED ); - + CdUnlockVcb( IrpContext, Vcb ); - + // // Set flag to tell the close path that we want to force dismount // the volume when this handle is closed. // - + SetFlag( Ccb->Flags, CCB_FLAG_DISMOUNT_ON_CLOSE); - + Status = STATUS_SUCCESS; } @@ -2250,7 +2250,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2344,14 +2344,14 @@ Return Value: // Now set up to return the clean state. CDs obviously can never be dirty // but we want to make sure we have enforced the full semantics of this call. // - + Irp->IoStatus.Information = sizeof( ULONG ); CdCompleteRequest( IrpContext, Irp, STATUS_SUCCESS ); return STATUS_SUCCESS; } - + // // Local support routine // @@ -2412,7 +2412,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local support routine // @@ -2447,7 +2447,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local support routine // @@ -2481,9 +2481,9 @@ Return Value: NTSTATUS Status; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); KIRQL SavedIrql; - + BOOLEAN UnlockVcb = FALSE; - + LUID TcbPrivilege = {SE_TCB_PRIVILEGE, 0}; HANDLE Handle; @@ -2498,7 +2498,7 @@ Return Value: // // We only allow the invalidate call to come in on our file system devices. // - + #ifndef __REACTOS__ if (IrpSp->DeviceObject != CdData.FileSystemDeviceObject) { #else @@ -2530,7 +2530,7 @@ Return Value: #if defined(_WIN64) && BUILD_WOW64_ENABLED if (IoIs32bitProcess( Irp )) { - + if (IrpSp->Parameters.FileSystemControl.InputBufferLength != sizeof( UINT32 )) { CdCompleteRequest( IrpContext, Irp, STATUS_INVALID_PARAMETER ); @@ -2538,7 +2538,7 @@ Return Value: } Handle = (HANDLE) LongToHandle( *((PUINT32) Irp->AssociatedIrp.SystemBuffer) ); - + } else #endif @@ -2588,7 +2588,7 @@ Return Value: // // Synchronise with pnp/mount/verify paths. // - + CdAcquireCdData( IrpContext ); // @@ -2621,18 +2621,18 @@ Return Value: if (Vcb->Vpb->RealDevice == DeviceToMarkBad) { // - // Take the VPB spinlock, and look to see if this volume is the - // one currently mounted on the actual device. If it is, pull it + // Take the VPB spinlock, and look to see if this volume is the + // one currently mounted on the actual device. If it is, pull it // off immediately. // - + IoAcquireVpbSpinLock( &SavedIrql ); #ifdef _MSC_VER #pragma prefast(suppress: 28175, "this is a filesystem driver, touching the vpb is allowed") #endif if (DeviceToMarkBad->Vpb == Vcb->Vpb) { - + PVPB NewVpb = Vcb->SwapVpb; NT_ASSERT( FlagOn( Vcb->Vpb->Flags, VPB_MOUNTED)); @@ -2660,14 +2660,14 @@ Return Value: IoReleaseVpbSpinLock( SavedIrql ); if (Vcb->VcbCondition != VcbDismountInProgress) { - + CdUpdateVcbCondition( Vcb, VcbInvalid); } CdUnlockVcb( IrpContext, Vcb ); CdAcquireVcbExclusive( IrpContext, Vcb, FALSE); - + CdPurgeVolume( IrpContext, Vcb, FALSE ); UnlockVcb = CdCheckForDismount( IrpContext, Vcb, FALSE ); @@ -2675,9 +2675,9 @@ Return Value: // // prefast: if UnlockVcb is false, then the VCB was already deleted, so we better not touch the Vcb. // tell Prefast something nice so it stops complaining about us leaking it. - // - - __analysis_assert( UnlockVcb == TRUE ); + // + + __analysis_assert( UnlockVcb == TRUE ); if (UnlockVcb) { @@ -2818,7 +2818,7 @@ Return Value: return; } - + // // Local support routine // @@ -2898,7 +2898,7 @@ Return Value: return FALSE; } - + // // We will make at most two passes through the volume descriptor sequence. // @@ -3131,7 +3131,7 @@ Return Value: return FoundVd; } - + // // Local support routine // @@ -3256,7 +3256,7 @@ Return Value: // serial numbers, volume label and TOC. // - } + } else if ((OldVpb->SerialNumber == Vpb->SerialNumber) && (Vcb->TocLength == (*OldVcb)->TocLength) && ((Vcb->TocLength == 0) || RtlEqualMemory( Vcb->CdromToc, @@ -3280,7 +3280,7 @@ Return Value: return Remount; } - + // // Local support routine // @@ -3388,7 +3388,7 @@ Return Value: ESC_SEQ_LEN ))) { if (!VerifyVolume) { - + // // Update the Vcb with the new volume descriptor. // @@ -3398,7 +3398,7 @@ Return Value: Vcb->VdSectorOffset = SectorOffset; } - + FoundSecondaryVd = TRUE; break; } @@ -3427,12 +3427,12 @@ Return Value: // If we're in the verify path, our work is done, since we don't want // to update any Vcb/Vpb values. // - + if (VerifyVolume) { return; } - + // // Compute the serial number and volume label from the volume descriptor. // diff --git a/drivers/filesystems/cdfs/fspdisp.c b/drivers/filesystems/cdfs/fspdisp.c index e119b117e87..66b74e2d4c6 100644 --- a/drivers/filesystems/cdfs/fspdisp.c +++ b/drivers/filesystems/cdfs/fspdisp.c @@ -22,7 +22,7 @@ Abstract: #define BugCheckFileId (CDFS_BUG_CHECK_FSPDISP) - + VOID NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFspDispatch ( @@ -238,7 +238,7 @@ Return Value: } else { - VolDo->PostedRequestCount -= 1; + VolDo->PostedRequestCount -= 1; Entry = NULL; } @@ -250,9 +250,9 @@ Return Value: // the Ex Worker thread. // - if (Entry == NULL) { + if (Entry == NULL) { - break; + break; } // diff --git a/drivers/filesystems/cdfs/lockctrl.c b/drivers/filesystems/cdfs/lockctrl.c index 6c0352c9ab7..d79768e7b2d 100644 --- a/drivers/filesystems/cdfs/lockctrl.c +++ b/drivers/filesystems/cdfs/lockctrl.c @@ -30,7 +30,7 @@ Abstract: #pragma alloc_text(PAGE, CdFastUnlockSingle) #endif - + NTSTATUS CdCommonLockControl ( _Inout_ PIRP_CONTEXT IrpContext, @@ -136,7 +136,7 @@ Return Value: return Status; } - + BOOLEAN NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastLock ( @@ -288,7 +288,7 @@ Return Value: return Results; } - + BOOLEAN NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockSingle ( @@ -336,7 +336,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + IoStatus->Information = 0; // @@ -431,7 +431,7 @@ Return Value: return Results; } - + BOOLEAN NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockAll ( @@ -470,7 +470,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + IoStatus->Information = 0; // @@ -556,7 +556,7 @@ Return Value: return Results; } - + BOOLEAN NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdFastUnlockAllByKey ( @@ -598,7 +598,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + IoStatus->Information = 0; // diff --git a/drivers/filesystems/cdfs/namesup.c b/drivers/filesystems/cdfs/namesup.c index 96e3aa3d3e0..dd1a9d717ea 100644 --- a/drivers/filesystems/cdfs/namesup.c +++ b/drivers/filesystems/cdfs/namesup.c @@ -34,7 +34,7 @@ Abstract: #pragma alloc_text(PAGE, CdUpcaseName) #endif - + _Post_satisfies_(_Old_(CdName->FileName.Length) >= CdName->FileName.Length + CdName->VersionString.Length) VOID @@ -105,7 +105,7 @@ Return Value: return; } - + VOID CdConvertBigToLittleEndian ( _In_ PIRP_CONTEXT IrpContext, @@ -189,7 +189,7 @@ Return Value: return; } - + VOID CdUpcaseName ( _In_ PIRP_CONTEXT IrpContext, @@ -222,7 +222,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // If the name structures are different then initialize the different components. // @@ -278,7 +278,7 @@ Return Value: NT_ASSERT( Status == STATUS_SUCCESS ); __analysis_assert( Status == STATUS_SUCCESS ); - + if (Name->VersionString.Length != 0) { Status = RtlUpcaseUnicodeString( &UpcaseName->VersionString, @@ -290,13 +290,13 @@ Return Value: // NT_ASSERT( Status == STATUS_SUCCESS ); - __analysis_assert( Status == STATUS_SUCCESS ); + __analysis_assert( Status == STATUS_SUCCESS ); } return; } - + VOID CdDissectName ( _In_ PIRP_CONTEXT IrpContext, @@ -331,7 +331,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Find the offset of the next component separators. // @@ -372,7 +372,7 @@ Return Value: return; } - + BOOLEAN CdIsLegalName ( _In_ PIRP_CONTEXT IrpContext, @@ -424,7 +424,7 @@ Return Value: return TRUE; } - + BOOLEAN CdIs8dot3Name ( _In_ PIRP_CONTEXT IrpContext, @@ -461,7 +461,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // The length must be less than 24 bytes. // @@ -545,7 +545,7 @@ Return Value: return FsRtlIsFatDbcsLegal( DbcsName, FALSE, FALSE, FALSE ); } - + VOID CdGenerate8dot3Name ( _In_ PIRP_CONTEXT IrpContext, @@ -591,9 +591,9 @@ Return Value: --*/ -{ +{ NTSTATUS Status; - + UNICODE_STRING ShortName; UNICODE_STRING BiasedShortName; WCHAR ShortNameBuffer[ BYTE_COUNT_8_DOT_3 / sizeof( WCHAR ) ] = {0}; @@ -664,19 +664,19 @@ Return Value: // Generate an OEM version of the string so that we can check for double // byte characters. // - + Status = RtlUnicodeStringToOemString(&OemName, &ShortName, TRUE); // // If this failed, bail out. Don't expect any problems other than no mem. // - + if (!NT_SUCCESS( Status)) { NT_ASSERT( STATUS_INSUFFICIENT_RESOURCES == Status); CdRaiseStatus( IrpContext, Status); } - + Length = 0; // @@ -777,12 +777,12 @@ Return Value: OemNameOffset += 2; if ((OemNameOffset + (BiasedShortName.Length / sizeof(WCHAR))) > 8) { - + OverflowBuffer = TRUE; } } else { - + OemNameOffset++; } @@ -839,7 +839,7 @@ Return Value: *ShortByteCount = Length; } - + BOOLEAN CdIsNameInExpression ( _In_ PIRP_CONTEXT IrpContext, @@ -883,7 +883,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // If there are wildcards in the expression then we call the // appropriate FsRtlRoutine. @@ -950,7 +950,7 @@ Return Value: return Match; } - + ULONG CdShortNameDirentOffset ( _In_ PIRP_CONTEXT IrpContext, @@ -988,7 +988,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Walk through the name until we either reach the end of the name // or find a tilde character. @@ -1055,7 +1055,7 @@ Return Value: return ResultOffset; } - + // // Local support routine // @@ -1096,7 +1096,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Figure out the minimum of the two lengths // diff --git a/drivers/filesystems/cdfs/nodetype.h b/drivers/filesystems/cdfs/nodetype.h index 41e2eefa313..edef76024de 100644 --- a/drivers/filesystems/cdfs/nodetype.h +++ b/drivers/filesystems/cdfs/nodetype.h @@ -53,7 +53,7 @@ typedef CSHORT NODE_BYTE_SIZE; #ifndef SafeNodeType #define SafeNodeType(Ptr) (*((PNODE_TYPE_CODE)(Ptr))) #endif - + // // The following definitions are used to generate meaningful blue bugcheck // screens. On a bugcheck the file system can output 4 ulongs of useful diff --git a/drivers/filesystems/cdfs/pathsup.c b/drivers/filesystems/cdfs/pathsup.c index 97d3468598a..2eb416c08bf 100644 --- a/drivers/filesystems/cdfs/pathsup.c +++ b/drivers/filesystems/cdfs/pathsup.c @@ -127,7 +127,7 @@ CdUpdatePathEntryFromRawPathEntry ( #pragma alloc_text(PAGE, CdUpdatePathEntryName) #endif - + VOID CdLookupPathEntry ( _In_ PIRP_CONTEXT IrpContext, @@ -202,7 +202,7 @@ Return Value: &CompoundPathEntry->PathEntry ); } - + BOOLEAN CdLookupNextPathEntry ( _In_ PIRP_CONTEXT IrpContext, @@ -289,7 +289,7 @@ Return Value: // Now update the path entry with the values from the on-disk // structure. // - + return CdUpdatePathEntryFromRawPathEntry( IrpContext, PathEntry->Ordinal + 1, TRUE, @@ -297,7 +297,7 @@ Return Value: PathEntry ); } -_Success_(return != FALSE) +_Success_(return != FALSE) BOOLEAN CdFindPathEntry ( _In_ PIRP_CONTEXT IrpContext, @@ -475,7 +475,7 @@ Return Value: return Found; } - + // // Local support routine // @@ -521,7 +521,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Map the new block and set the enumeration context to this // point. Allocate an auxilary buffer if necessary. @@ -628,7 +628,7 @@ Return Value: return; } - + // // Local support routine // @@ -663,7 +663,7 @@ Arguments: Return Value: - TRUE if updated ok, + TRUE if updated ok, FALSE if we've hit the end of the pathtable - zero name length && PT size is a multiple of blocksize. This is a workaround for some Video CDs. Win 9x works around this. @@ -676,31 +676,31 @@ Return Value: ULONG RemainingDataLength; PAGED_CODE(); - + // // Check for a name length of zero. This is the first byte of the record, - // and there must be at least one byte remaining in the buffer else we + // and there must be at least one byte remaining in the buffer else we // wouldn't be here (caller would have spotted buffer end). // - + PathEntry->DirNameLen = CdRawPathIdLen( IrpContext, RawPathEntry ); - + if (0 == PathEntry->DirNameLen) { // - // If we are in the last block, and the path table size (ie last block) is a + // If we are in the last block, and the path table size (ie last block) is a // multiple of block size, then we will consider this the end of the path table // rather than raising an error. Workaround for NTI Cd Maker video CDs which // round path table length to blocksize multiple. In all other cases we consider // a zero length name to be corruption. // - - if ( PathContext->LastDataBlock && + + if ( PathContext->LastDataBlock && (0 == BlockOffset( IrpContext->Vcb, PathContext->DataLength))) { - + return FALSE; } - + CdRaiseStatus( IrpContext, STATUS_DISK_CORRUPT_ERROR ); } @@ -708,7 +708,7 @@ Return Value: // Check if we should verify the path entry. If we are not in the last // data block then there is nothing to check. // - + if (PathContext->LastDataBlock && VerifyBounds) { // @@ -748,7 +748,7 @@ Return Value: // // We know we can safely access all of the fields of the raw path table at // this point. - + // // Bias the disk offset by the number of logical blocks // @@ -772,7 +772,7 @@ Return Value: return TRUE; } - + // // Local support routine // @@ -935,7 +935,7 @@ Return Value: PathEntry->DirNameLen ); NT_ASSERT( Status == STATUS_SUCCESS ); - __analysis_assert( Status == STATUS_SUCCESS ); + __analysis_assert( Status == STATUS_SUCCESS ); PathEntry->CdDirName.FileName.Length = (USHORT) Length; } else { diff --git a/drivers/filesystems/cdfs/pnp.c b/drivers/filesystems/cdfs/pnp.c index 02609e72f1a..63787eacca2 100644 --- a/drivers/filesystems/cdfs/pnp.c +++ b/drivers/filesystems/cdfs/pnp.c @@ -104,7 +104,7 @@ Return Value: { NTSTATUS Status = STATUS_SUCCESS; BOOLEAN PassThrough = FALSE; - + PIO_STACK_LOCATION IrpSp; PVOLUME_DEVICE_OBJECT OurDeviceObject; @@ -128,19 +128,19 @@ Return Value: OurDeviceObject = (PVOLUME_DEVICE_OBJECT) IrpSp->DeviceObject; // - // IO holds a handle reference on our VDO and holds the device lock, which - // syncs us against mounts/verifies. However we hold no reference on the - // volume, which may already have been torn down (and the Vpb freed), for + // IO holds a handle reference on our VDO and holds the device lock, which + // syncs us against mounts/verifies. However we hold no reference on the + // volume, which may already have been torn down (and the Vpb freed), for // example by a force dismount. Check for this condition. We must hold this // lock until the pnp worker functions take additional locks/refs on the Vcb. // CdAcquireCdData( IrpContext); - + // // Make sure this device object really is big enough to be a volume device // object. If it isn't, we need to get out before we try to reference some - // field that takes us past the end of an ordinary device object. + // field that takes us past the end of an ordinary device object. // #ifdef _MSC_VER @@ -148,11 +148,11 @@ Return Value: #endif if (OurDeviceObject->DeviceObject.Size != sizeof(VOLUME_DEVICE_OBJECT) || NodeType( &OurDeviceObject->Vcb ) != CDFS_NTC_VCB) { - + // // We were called with something we don't understand. // - + Status = STATUS_INVALID_PARAMETER; CdReleaseCdData( IrpContext); CdCompleteRequest( IrpContext, Irp, Status ); @@ -171,7 +171,7 @@ Return Value: // Check that the Vcb hasn't already been deleted. If so, just pass the // request through to the driver below, we don't need to do anything. // - + if (NULL == Vcb->Vpb) { PassThrough = TRUE; @@ -181,16 +181,16 @@ Return Value: // // Case on the minor code. // - + switch ( IrpSp->MinorFunction ) { case IRP_MN_QUERY_REMOVE_DEVICE: - + Status = CdPnpQueryRemove( IrpContext, Irp, Vcb ); break; - + case IRP_MN_SURPRISE_REMOVAL: - + Status = CdPnpSurpriseRemove( IrpContext, Irp, Vcb ); break; @@ -200,7 +200,7 @@ Return Value: break; case IRP_MN_CANCEL_REMOVE_DEVICE: - + Status = CdPnpCancelRemove( IrpContext, Irp, Vcb ); break; @@ -219,18 +219,18 @@ Return Value: // Just pass the IRP on. As we do not need to be in the // way on return, ellide ourselves out of the stack. // - + IoSkipCurrentIrpStackLocation( Irp ); Status = IoCallDriver(Vcb->TargetDeviceObject, Irp); - + // // Cleanup our Irp Context. The driver has completed the Irp. // - + CdCompleteRequest( IrpContext, NULL, STATUS_SUCCESS ); } - + return Status; } @@ -251,13 +251,13 @@ Routine Description: is responsible for answering whether there are any reasons it sees that the volume can not go away (and the device removed). Initiation of the dismount begins when we answer yes to this question. - + Query will be followed by a Cancel or Remove. Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being queried. Return Value: @@ -280,7 +280,7 @@ Return Value: // underlying storage stack is undefined (and may block) // until the bounding CANCEL or REMOVE is sent. // - // Acquire the global resource so that we can try to vaporize the volume, + // Acquire the global resource so that we can try to vaporize the volume, // and the vcb resource itself. // @@ -289,11 +289,11 @@ Return Value: // // Drop a reference on the Vcb to keep it around after we drop the locks. // - + CdLockVcb( IrpContext, Vcb); Vcb->VcbReference += 1; CdUnlockVcb( IrpContext, Vcb); - + CdReleaseCdData( IrpContext); Status = CdLockVolumeInternal( IrpContext, Vcb, NULL ); @@ -301,27 +301,27 @@ Return Value: // // Reacquire the global lock, which means dropping the Vcb resource. // - + CdReleaseVcb( IrpContext, Vcb ); - + CdAcquireCdData( IrpContext ); CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); // // Remove our extra reference. // - + CdLockVcb( IrpContext, Vcb); Vcb->VcbReference -= 1; CdUnlockVcb( IrpContext, Vcb); - + if (NT_SUCCESS( Status )) { // // We need to pass this down before starting the dismount, which // could disconnect us immediately from the stack. // - + // // Get the next stack location, and copy over the stack location // @@ -331,7 +331,7 @@ Return Value: // // Set up the completion routine // - + KeInitializeEvent( &Event, NotificationEvent, FALSE ); IoSetCompletionRoutine( Irp, CdPnpCompletionRoutine, @@ -374,19 +374,19 @@ Return Value: // if (NT_SUCCESS( Status )) { - + VcbPresent = CdCheckForDismount( IrpContext, Vcb, TRUE ); - + NT_ASSERT( !VcbPresent || Vcb->VcbCondition == VcbDismountInProgress ); } // - // Note: Normally everything will complete and the internal streams will + // Note: Normally everything will complete and the internal streams will // vaporise. However there is some code in the system which drops additional // references on fileobjects, including our internal stream file objects, // for (WMI) tracing purposes. If that happens to run concurrently with our // teardown, our internal streams will not vaporise until those references - // are removed. So it's possible that the volume still remains at this + // are removed. So it's possible that the volume still remains at this // point. The pnp query remove will fail due to our references on the device. // To be cleaner we will return an error here. We could pend the pnp // IRP until the volume goes away, but since we don't know when that will @@ -405,11 +405,11 @@ Return Value: Status = STATUS_DEVICE_BUSY; } } - + // // Release the Vcb if it could still remain. // - + if (VcbPresent) { CdReleaseVcb( IrpContext, Vcb ); @@ -419,7 +419,7 @@ Return Value: } CdReleaseCdData( IrpContext ); - + // // Cleanup our IrpContext and complete the IRP if neccesary. // @@ -450,7 +450,7 @@ Routine Description: Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being removed. Return Value: @@ -478,12 +478,12 @@ Return Value: // for a REMOVE in the first two cases, as we try to intiate // dismount. // - + // // Acquire the global resource so that we can try to vaporize // the volume, and the vcb resource itself. // - + CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); // @@ -502,22 +502,22 @@ Return Value: if (!NT_SUCCESS( Status )) { CdLockVcb( IrpContext, Vcb ); - + if (Vcb->VcbCondition != VcbDismountInProgress) { - + CdUpdateVcbCondition( Vcb, VcbInvalid); } - + CdUnlockVcb( IrpContext, Vcb ); - + Status = STATUS_SUCCESS; } - + // // We need to pass this down before starting the dismount, which // could disconnect us immediately from the stack. // - + // // Get the next stack location, and copy over the stack location // @@ -562,13 +562,13 @@ Return Value: // couldn't get off of it immediately. // - + VcbPresent = CdCheckForDismount( IrpContext, Vcb, TRUE ); // // Release the Vcb if it could still remain. // - + if (VcbPresent) { CdReleaseVcb( IrpContext, Vcb ); @@ -578,7 +578,7 @@ Return Value: } CdReleaseCdData( IrpContext ); - + // // Cleanup our IrpContext and complete the IRP. // @@ -605,17 +605,17 @@ Routine Description: type of notification that the underlying storage device for the volume we have is gone, and is excellent indication that the volume will never reappear. The filesystem is responsible for initiation or completion the dismount. - + For the most part, only "real" drivers care about the distinction of a surprise remove, which is a result of our noticing that a user (usually) physically reached into the machine and pulled something out. - + Surprise will be followed by a Remove when all references have been shut down. Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being removed. Return Value: @@ -632,14 +632,14 @@ Return Value: PAGED_CODE(); ASSERT_EXCLUSIVE_CDDATA; - + // // SURPRISE - a device was physically yanked away without // any warning. This means external forces. // - + CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); - + // // Invalidate the volume right now. // @@ -647,21 +647,21 @@ Return Value: // on the volume fail and grease the rails toward dismount. // By definition there is no going back from a SURPRISE. // - + CdLockVcb( IrpContext, Vcb ); - + if (Vcb->VcbCondition != VcbDismountInProgress) { - + CdUpdateVcbCondition( Vcb, VcbInvalid); } - + CdUnlockVcb( IrpContext, Vcb ); - + // // We need to pass this down before starting the dismount, which // could disconnect us immediately from the stack. // - + // // Get the next stack location, and copy over the stack location // @@ -696,20 +696,20 @@ Return Value: Status = Irp->IoStatus.Status; } - + // // Now make our dismount happen. This may not vaporize the // Vcb, of course, since there could be any number of handles // outstanding since this is an out of band notification. // - + VcbPresent = CdCheckForDismount( IrpContext, Vcb, TRUE ); - + // // Release the Vcb if it could still remain. // - + if (VcbPresent) { CdReleaseVcb( IrpContext, Vcb ); @@ -719,7 +719,7 @@ Return Value: } CdReleaseCdData( IrpContext ); - + // // Cleanup our IrpContext and complete the IRP. // @@ -746,11 +746,11 @@ Routine Description: notification that a previously proposed remove (query) was eventually vetoed by a component. The filesystem is responsible for cleaning up and getting ready for more IO. - + Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being removed. Return Value: @@ -781,7 +781,7 @@ Return Value: // with respect to the Vcb getting torn apart - merely referencing // the volume device object is insufficient to keep us intact. // - + CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); CdReleaseCdData( IrpContext); diff --git a/drivers/filesystems/cdfs/prefxsup.c b/drivers/filesystems/cdfs/prefxsup.c index 2acb2bc62c6..b450d486d38 100644 --- a/drivers/filesystems/cdfs/prefxsup.c +++ b/drivers/filesystems/cdfs/prefxsup.c @@ -47,7 +47,7 @@ CdInsertNameLink ( #pragma alloc_text(PAGE, CdRemovePrefix) #endif - + VOID CdInsertPrefix ( _In_ PIRP_CONTEXT IrpContext, @@ -202,7 +202,7 @@ Return Value: return; } - + VOID CdRemovePrefix ( _In_ PIRP_CONTEXT IrpContext, @@ -228,9 +228,9 @@ Return Value: { PAGED_CODE(); - + UNREFERENCED_PARAMETER( IrpContext ); - + // // Start with the short name prefix entry. // @@ -282,7 +282,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID @@ -456,7 +456,7 @@ Return Value: } } - + // // Local support routine // @@ -559,7 +559,7 @@ Return Value: return NULL; } - + // // Local support routine // diff --git a/drivers/filesystems/cdfs/read.c b/drivers/filesystems/cdfs/read.c index 4e3046d4448..13dfe95c5ed 100644 --- a/drivers/filesystems/cdfs/read.c +++ b/drivers/filesystems/cdfs/read.c @@ -63,7 +63,7 @@ __pragma(warning(suppress: 6320)) \ #pragma alloc_text(PAGE, CdCommonRead) #endif - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS @@ -116,7 +116,7 @@ Return Value: BOOLEAN ReleaseFile = TRUE; CD_IO_CONTEXT LocalIoContext; - + PAGED_CODE(); // @@ -186,9 +186,9 @@ Return Value: if (PagingIo) { CdAcquireFileSharedStarveExclusive( IrpContext, Fcb ); - + } else { - + CdAcquireFileShared( IrpContext, Fcb ); } @@ -199,13 +199,13 @@ Return Value: _SEH2_TRY { // - // Verify the Fcb. Allow reads if this is a DASD handle that is + // Verify the Fcb. Allow reads if this is a DASD handle that is // dismounting the volume. // if ((TypeOfOpen != UserVolumeOpen) || (NULL == Ccb) || !FlagOn( Ccb->Flags, CCB_FLAG_DISMOUNT_ON_CLOSE)) { - + CdVerifyFcbOperation( IrpContext, Fcb ); } @@ -435,7 +435,7 @@ Return Value: } else if (ReadByteCount != ByteCount) { CdMapUserBuffer( IrpContext, &UserBuffer); - + SafeZeroMemory( IrpContext, Add2Ptr( UserBuffer, ByteCount, diff --git a/drivers/filesystems/cdfs/resrcsup.c b/drivers/filesystems/cdfs/resrcsup.c index 9b1d4ae83a8..2d82f6d7f9d 100644 --- a/drivers/filesystems/cdfs/resrcsup.c +++ b/drivers/filesystems/cdfs/resrcsup.c @@ -31,7 +31,7 @@ Abstract: #pragma alloc_text(PAGE, CdReleaseFromCache) #endif - + _Requires_lock_held_(_Global_critical_region_) _When_(Type == AcquireExclusive && return != FALSE, _Acquires_exclusive_lock_(*Resource)) @@ -130,7 +130,7 @@ Return Value: return Acquired; } - + _Requires_lock_held_(_Global_critical_region_) _When_(return!=0, _Acquires_shared_lock_(*Fcb->Resource)) @@ -175,7 +175,7 @@ Return Value: return TRUE; } - + _Requires_lock_held_(_Global_critical_region_) _Releases_lock_(*Fcb->Resource) VOID @@ -208,11 +208,11 @@ Return Value: NT_ASSERT(IoGetTopLevelIrp() == (PIRP)FSRTL_CACHE_TOP_LEVEL_IRP); IoSetTopLevelIrp( NULL ); - + ExReleaseResourceLite( Fcb->Resource ); } - + BOOLEAN NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdNoopAcquire ( @@ -244,11 +244,11 @@ Return Value: UNREFERENCED_PARAMETER( Fcb ); UNREFERENCED_PARAMETER( Wait ); - + return TRUE; } - + VOID NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ CdNoopRelease ( @@ -314,7 +314,7 @@ Return Value: PAGED_CODE(); - + NT_ASSERT( CallbackData->Operation == FS_FILTER_ACQUIRE_FOR_SECTION_SYNCHRONIZATION ); NT_ASSERT( CallbackData->SizeOfFsFilterCallbackData == sizeof(FS_FILTER_CALLBACK_DATA) ); @@ -330,14 +330,14 @@ Return Value: ExAcquireResourceExclusiveLite( &((PFCB) FileObject->FsContext)->FcbNonpaged->FcbResource, TRUE ); - + // - // Take the File resource shared. We need this later on when MM calls - // QueryStandardInfo to get the file size. + // Take the File resource shared. We need this later on when MM calls + // QueryStandardInfo to get the file size. // - // If we don't use StarveExclusive, then we can get wedged behind an - // exclusive waiter who is waiting on someone else holding it shared in the - // read->initializecachemap path (which calls createsection) who is in turn + // If we don't use StarveExclusive, then we can get wedged behind an + // exclusive waiter who is waiting on someone else holding it shared in the + // read->initializecachemap path (which calls createsection) who is in turn // waiting on us to finish the create section. // @@ -362,7 +362,7 @@ Return Value: UNREFERENCED_PARAMETER( CompletionContext ); } - + _Function_class_(FAST_IO_RELEASE_FILE) _Requires_lock_held_(_Global_critical_region_) VOID diff --git a/drivers/filesystems/cdfs/strucsup.c b/drivers/filesystems/cdfs/strucsup.c index 7aa9c7211af..f1730d944b2 100644 --- a/drivers/filesystems/cdfs/strucsup.c +++ b/drivers/filesystems/cdfs/strucsup.c @@ -236,7 +236,7 @@ UNICODE_STRING CdInternalStreamNames[] = { { 2, 2, L"\\"} }; - + VOID CdInitializeVcb ( _In_ PIRP_CONTEXT IrpContext, @@ -314,13 +314,13 @@ Return Value: InitializeListHead( &Vcb->DirNotifyList ); FsRtlNotifyInitializeSync( &Vcb->NotifySync ); - + // // Pick up a VPB right now so we know we can pull this filesystem stack - // off of the storage stack on demand. This can raise - if it does, + // off of the storage stack on demand. This can raise - if it does, // uninitialize the notify structures before returning. // - + _SEH2_TRY { Vcb->SwapVpb = FsRtlAllocatePoolWithTag( CdNonPagedPool, @@ -330,7 +330,7 @@ Return Value: _SEH2_FINALLY { if (_SEH2_AbnormalTermination()) { - + FsRtlNotifyUninitializeSync( &Vcb->NotifySync ); } } _SEH2_END; @@ -340,7 +340,7 @@ Return Value: // RtlZeroMemory( Vcb->SwapVpb, sizeof( VPB ) ); - + // // Initialize the resource variable for the Vcb and files. // @@ -431,7 +431,7 @@ Return Value: CdUpdateMediaChangeCount( Vcb, MediaChangeCount); } - + VOID CdUpdateVcbFromVolDescriptor ( _In_ PIRP_CONTEXT IrpContext, @@ -496,7 +496,7 @@ Return Value: // // We no longer accept media where blocksize != sector size. // - + if (Vcb->BlockSize != SECTOR_SIZE) { CdRaiseStatus( IrpContext, STATUS_DISK_CORRUPT_ERROR ); @@ -505,7 +505,7 @@ Return Value: Vcb->BlocksPerSector = SECTOR_SIZE / Vcb->BlockSize; Vcb->BlockMask = Vcb->BlockSize - 1; Vcb->BlockInverseMask = ~Vcb->BlockMask; - + Vcb->BlockToSectorShift = 0; Vcb->BlockToByteShift = SECTOR_SHIFT; @@ -659,16 +659,16 @@ Return Value: McbEntry = Vcb->VolumeDasdFcb->Mcb.McbArray; - McbEntry->FileOffset = + McbEntry->FileOffset = McbEntry->DiskOffset = 0; - + McbEntry->ByteCount = Vcb->VolumeDasdFcb->AllocationSize.QuadPart; - + McbEntry->DataBlockByteCount = McbEntry->TotalBlockByteCount = McbEntry->ByteCount; - + Vcb->VolumeDasdFcb->Mcb.CurrentEntryCount = 1; - + CdUnlockFcb( IrpContext, Vcb->VolumeDasdFcb ); // @@ -864,14 +864,14 @@ Return Value: SetFlag( Vcb->VcbState, VCB_STATE_ISO ); } - + } _SEH2_FINALLY { if (UnlockVcb) { CdUnlockVcb( IrpContext, Vcb ); } } _SEH2_END; } - + VOID CdDeleteVcb ( _In_ PIRP_CONTEXT IrpContext, @@ -901,15 +901,15 @@ Return Value: ASSERT_EXCLUSIVE_CDDATA; ASSERT_EXCLUSIVE_VCB( Vcb ); - + UNREFERENCED_PARAMETER( IrpContext ); - + // // Chuck the backpocket Vpb we kept just in case. // CdFreePool( &Vcb->SwapVpb ); - + // // If there is a Vpb then we must delete it ourselves. // @@ -921,7 +921,7 @@ Return Value: // if (Vcb->TargetDeviceObject != NULL) { - + ObDereferenceObject( Vcb->TargetDeviceObject ); } @@ -981,7 +981,7 @@ Return Value: return; } - + PFCB CdCreateFcb ( _In_ PIRP_CONTEXT IrpContext, @@ -1075,7 +1075,7 @@ Return Value: default: #ifdef _MSC_VER -#pragma prefast( suppress: __WARNING_USE_OTHER_FUNCTION, "This is a bug." ) +#pragma prefast( suppress: __WARNING_USE_OTHER_FUNCTION, "This is a bug." ) #endif CdBugCheck( 0, 0, 0 ); } @@ -1115,7 +1115,7 @@ Return Value: // ExInitializeFastMutex( &NewFcb->FcbNonpaged->AdvancedFcbHeaderMutex ); - FsRtlSetupAdvancedHeader( &NewFcb->Header, + FsRtlSetupAdvancedHeader( &NewFcb->Header, &NewFcb->FcbNonpaged->AdvancedFcbHeaderMutex ); if (NodeTypeCode == CDFS_NTC_FCB_DATA) { @@ -1131,7 +1131,7 @@ Return Value: return NewFcb; } - + VOID CdInitializeFcbFromPathEntry ( _In_ PIRP_CONTEXT IrpContext, @@ -1220,7 +1220,7 @@ Return Value: return; } - + VOID CdInitializeFcbFromFileContext ( _In_ PIRP_CONTEXT IrpContext, @@ -1400,7 +1400,7 @@ Return Value: return; } - + PCCB CdCreateCcb ( _In_ PIRP_CONTEXT IrpContext, @@ -1431,7 +1431,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Allocate and initialize the structure. // @@ -1457,7 +1457,7 @@ Return Value: return NewCcb; } - + VOID CdDeleteCcb ( _In_ PIRP_CONTEXT IrpContext, @@ -1483,7 +1483,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + if (Ccb->SearchExpression.FileName.Buffer != NULL) { CdFreePool( &Ccb->SearchExpression.FileName.Buffer ); @@ -1493,7 +1493,7 @@ Return Value: return; } - + _When_(RaiseOnError || return, _At_(Fcb->FileLock, _Post_notnull_)) _When_(RaiseOnError, _At_(IrpContext, _Pre_notnull_)) BOOLEAN @@ -1554,7 +1554,7 @@ Return Value: // if (FileLock == NULL) { - + if (RaiseOnError) { NT_ASSERT( ARGUMENT_PRESENT( IrpContext )); @@ -1568,7 +1568,7 @@ Return Value: return Result; } - + _Ret_valid_ PIRP_CONTEXT CdCreateIrpContext ( _In_ PIRP Irp, @@ -1623,11 +1623,11 @@ Return Value: } NT_ASSERT( IrpSp->FileObject != NULL || - + (IrpSp->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && IrpSp->MinorFunction == IRP_MN_USER_FS_REQUEST && IrpSp->Parameters.FileSystemControl.FsControlCode == FSCTL_INVALIDATE_VOLUMES) || - + (IrpSp->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && IrpSp->MinorFunction == IRP_MN_MOUNT_VOLUME ) || @@ -1698,7 +1698,7 @@ Return Value: #endif NewIrpContext->Vcb = &((PVOLUME_DEVICE_OBJECT) IrpSp->DeviceObject)->Vcb; - + } // @@ -1728,7 +1728,7 @@ Return Value: return NewIrpContext; } - + VOID CdCleanupIrpContext ( _In_ PIRP_CONTEXT IrpContext, @@ -1834,7 +1834,7 @@ Return Value: return; } - + VOID CdInitializeStackIrpContext ( _Out_ PIRP_CONTEXT IrpContext, @@ -1910,7 +1910,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID @@ -2102,7 +2102,7 @@ Return Value: return; } - + PFCB CdLookupFcbTable ( _In_ PIRP_CONTEXT IrpContext, @@ -2150,7 +2150,7 @@ Return Value: UNREFERENCED_PARAMETER( IrpContext ); } - + PFCB CdGetNextFcb ( _In_ PIRP_CONTEXT IrpContext, @@ -2185,7 +2185,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + Fcb = (PFCB) RtlEnumerateGenericTableWithoutSplaying( &Vcb->FcbTable, RestartKey ); if (Fcb != NULL) { @@ -2196,7 +2196,7 @@ Return Value: return Fcb; } - + NTSTATUS CdProcessToc ( _In_ PIRP_CONTEXT IrpContext, @@ -2260,7 +2260,7 @@ Return Value: // Zero the command block. This conveniently corresponds to an // LBA mode READ_TOC request. // - + RtlZeroMemory( &Command, sizeof( Command)); RetryReadToc: @@ -2361,7 +2361,7 @@ RetryReadToc: // Knock 2.5 minutes off the current track to hide the final leadin. // 2.5 min = 150 sec = (x 75) 11250 frames (sectors). // - + SwapCopyUchar4( &Address, &Track->Address); Address -= 11250; SwapCopyUchar4( &Track->Address, &Address); @@ -2415,7 +2415,7 @@ RetryReadToc: return Status; } - + // // Local support routine // @@ -2546,7 +2546,7 @@ Return Value: return; } - + // // Local support routine // @@ -2575,9 +2575,9 @@ Return Value: PFCB_NONPAGED FcbNonpaged; PAGED_CODE(); - + UNREFERENCED_PARAMETER( IrpContext ); - + // // Allocate the non-paged pool and initialize the various // synchronization objects. @@ -2599,7 +2599,7 @@ Return Value: return FcbNonpaged; } - + // // Local support routine // @@ -2628,9 +2628,9 @@ Return Value: { PAGED_CODE(); - + UNREFERENCED_PARAMETER( IrpContext ); - + ExDeleteResourceLite( &FcbNonpaged->FcbResource ); CdDeallocateFcbNonpaged( IrpContext, *(PVOID*)&FcbNonpaged );/* ReactOS Change: GCC "passing argument 1 from incompatible pointer type" */ @@ -2638,7 +2638,7 @@ Return Value: return; } - + // // Local support routine // @@ -2696,7 +2696,7 @@ Return Value: UNREFERENCED_PARAMETER( FcbTable ); } - + // // Local support routine // @@ -2728,13 +2728,13 @@ Return Value: { PAGED_CODE(); - + UNREFERENCED_PARAMETER( FcbTable ); return( FsRtlAllocatePoolWithTag( CdPagedPool, ByteSize, TAG_FCB_TABLE )); } - + // // Local support routine // @@ -2770,7 +2770,7 @@ Return Value: UNREFERENCED_PARAMETER( FcbTable ); } - + // // Local support routine // @@ -2814,7 +2814,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Check if there are two tracks or fewer. // @@ -2834,10 +2834,10 @@ Return Value: // while (ThisTrack != LastTrack) { - + SwapCopyUchar4( &Address, ThisTrack->Address); CdLbnToMmSsFf( Address, (PUCHAR)&MsfAddress); - + SerialNumber += MsfAddress; ThisTrack += 1; } diff --git a/drivers/filesystems/cdfs/verfysup.c b/drivers/filesystems/cdfs/verfysup.c index f53769a215b..45b78aa1e06 100644 --- a/drivers/filesystems/cdfs/verfysup.c +++ b/drivers/filesystems/cdfs/verfysup.c @@ -107,9 +107,9 @@ Return Value: // // Acquire the Vcb so we're working with a stable VcbCondition. // - + CdAcquireVcbShared( IrpContext, Vcb, FALSE); - + // // If the verify operation completed it will return // either STATUS_SUCCESS or STATUS_WRONG_VOLUME, exactly. @@ -129,12 +129,12 @@ Return Value: // // If the verify succeeded, but our volume is not mounted, - // then some other volume is on the device. + // then some other volume is on the device. // Status = STATUS_WRONG_VOLUME; - } - + } + // // Do a quick unprotected check here. The routine will do // a safe check. After here we can release the resource. @@ -188,7 +188,7 @@ Return Value: // // Fill in the device object if required. // - + if (IoIsErrorUserInduced( Status ) ) { IoSetHardErrorOrVerifyDevice( Irp, DeviceToVerify ); @@ -220,7 +220,7 @@ Return Value: return Status; } - + _Requires_lock_held_(_Global_critical_region_) BOOLEAN @@ -248,14 +248,14 @@ Routine Description: Arguments: Vcb - Vcb for the volume to try to dismount. - + Force - Whether we will force this volume to be dismounted. Return Value: BOOLEAN - True if the Vcb was not gone by the time this function finished, False if it was deleted. - + This is only a trustworthy indication to the caller if it had the vcb exclusive itself. @@ -397,10 +397,10 @@ Return Value: // // Flag this to avoid the VPB spinlock in future passes. // - + SetFlag( Vcb->VcbState, VCB_STATE_VPB_NOT_ON_DEVICE); } - + IoReleaseVpbSpinLock( SavedIrql ); return Marked; @@ -448,7 +448,7 @@ Return Value: // if ((Vcb->VcbCondition == VcbInvalid) || - ((Vcb->VcbCondition == VcbDismountInProgress) && + ((Vcb->VcbCondition == VcbDismountInProgress) && (IrpContext->MajorFunction != IRP_MJ_CREATE))) { if (FlagOn( Vcb->VcbState, VCB_STATE_DISMOUNTED )) { @@ -460,15 +460,15 @@ Return Value: CdRaiseStatus( IrpContext, STATUS_FILE_INVALID ); } } - + // // Capture the real device verify state. // - + DevMarkedForVerify = CdRealDevNeedsVerify( Vcb->Vpb->RealDevice); - + if (FlagOn( Vcb->VcbState, VCB_STATE_REMOVABLE_MEDIA ) && !DevMarkedForVerify) { - + // // If the media is removable and the verify volume flag in the // device object is not set then we want to ping the device @@ -487,11 +487,11 @@ Return Value: &Iosb ); if (Iosb.Information != sizeof(ULONG)) { - + // // Be safe about the count in case the driver didn't fill it in // - + MediaChangeCount = 0; } @@ -504,9 +504,9 @@ Return Value: // set, but could be due to hardware condition) // 3. Media change count doesn't match the one in the Vcb // - + if (((Vcb->VcbCondition == VcbMounted) && - CdIsRawDevice( IrpContext, Status )) + CdIsRawDevice( IrpContext, Status )) || (Status == STATUS_VERIFY_REQUIRED) || @@ -532,13 +532,13 @@ Return Value: // do so only when we've actually completed a verify at a particular // change count value. // - } + } } // // This is the 4th verify case. // - // We ALWAYS force CREATE requests on unmounted volumes through the + // We ALWAYS force CREATE requests on unmounted volumes through the // verify path. These requests could have been in limbo between // IoCheckMountedVpb and us when a verify/mount took place and caused // a completely different fs/volume to be mounted. In this case the @@ -567,14 +567,14 @@ Return Value: // // Raise the verify / error if neccessary. // - + if (ForceVerify || DevMarkedForVerify || !NT_SUCCESS( Status)) { - + IoSetHardErrorOrVerifyDevice( IrpContext->Irp, Vcb->Vpb->RealDevice ); - - CdRaiseStatus( IrpContext, (ForceVerify || DevMarkedForVerify) - ? STATUS_VERIFY_REQUIRED + + CdRaiseStatus( IrpContext, (ForceVerify || DevMarkedForVerify) + ? STATUS_VERIFY_REQUIRED : Status); } @@ -604,7 +604,7 @@ Return Value: CdRaiseStatus( IrpContext, STATUS_FILE_INVALID ); } break; - + /* ReactOS Change: GCC "enumeration value not handled in switch" */ default: break; } @@ -644,18 +644,18 @@ Return Value: PIRP Irp; PAGED_CODE(); - + // // Check that the fileobject has not been cleaned up. // - + if ( ARGUMENT_PRESENT( IrpContext )) { PFILE_OBJECT FileObject; Irp = IrpContext->Irp; FileObject = IoGetCurrentIrpStackLocation( Irp)->FileObject; - + if ( FileObject && FlagOn( FileObject->Flags, FO_CLEANUP_COMPLETE)) { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); @@ -664,7 +664,7 @@ Return Value: // Following FAT, we allow certain operations even on cleaned up // file objects. Everything else, we fail. // - + if ( (FlagOn(Irp->Flags, IRP_PAGING_IO)) || (IrpSp->MajorFunction == IRP_MJ_CLOSE ) || (IrpSp->MajorFunction == IRP_MJ_QUERY_INFORMATION) || @@ -695,7 +695,7 @@ Return Value: CdRaiseStatus( IrpContext, STATUS_VOLUME_DISMOUNTED ); } else { - + CdRaiseStatus( IrpContext, STATUS_FILE_INVALID ); } } @@ -753,7 +753,7 @@ Return Value: return TRUE; } - + _Requires_lock_held_(_Global_critical_region_) BOOLEAN @@ -922,7 +922,7 @@ Return Value: // Indicate we used up the swap. // - Vcb->SwapVpb = NULL; + Vcb->SwapVpb = NULL; CdUnlockVcb( IrpContext, Vcb ); diff --git a/drivers/filesystems/cdfs/volinfo.c b/drivers/filesystems/cdfs/volinfo.c index 0a0ef10bd57..656085b954b 100644 --- a/drivers/filesystems/cdfs/volinfo.c +++ b/drivers/filesystems/cdfs/volinfo.c @@ -80,7 +80,7 @@ CdQueryFsSectorSizeInfo ( #pragma alloc_text(PAGE, CdQueryFsSectorSizeInfo) #endif - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS CdCommonQueryVolInfo ( @@ -221,7 +221,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -314,7 +314,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -377,7 +377,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local support routine // @@ -441,7 +441,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local support routine // diff --git a/drivers/filesystems/cdfs/workque.c b/drivers/filesystems/cdfs/workque.c index e3975a8c476..84797f50b38 100644 --- a/drivers/filesystems/cdfs/workque.c +++ b/drivers/filesystems/cdfs/workque.c @@ -45,7 +45,7 @@ CdAddToWorkque ( #pragma alloc_text(PAGE, CdPrePostIrp) #endif - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS CdFsdPostRequest ( @@ -96,8 +96,8 @@ Return Value: return STATUS_PENDING; } - - + + _Requires_lock_held_(_Global_critical_region_) VOID NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ @@ -221,7 +221,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID @@ -316,7 +316,7 @@ Return Value: return; } - + // // Local support routine // diff --git a/drivers/filesystems/cdfs/write.c b/drivers/filesystems/cdfs/write.c index 70c8494e088..8a8c28f2899 100644 --- a/drivers/filesystems/cdfs/write.c +++ b/drivers/filesystems/cdfs/write.c @@ -57,7 +57,7 @@ __pragma(warning(suppress: 6320)) \ #pragma alloc_text(PAGE, CdCommonWrite) #endif - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS CdCommonWrite ( @@ -165,7 +165,7 @@ Return Value: _SEH2_TRY { // - // Verify the Fcb. Allow writes if this is a DASD handle that is + // Verify the Fcb. Allow writes if this is a DASD handle that is // dismounting the volume. // @@ -334,7 +334,7 @@ Return Value: } else if (WriteByteCount != ByteCount) { CdMapUserBuffer( IrpContext, &UserBuffer ); - + SafeZeroMemory( IrpContext, Add2Ptr( UserBuffer, ByteCount, diff --git a/drivers/filesystems/ext2/inc/ext2fs.h b/drivers/filesystems/ext2/inc/ext2fs.h index 08fd465f934..3cf098635dc 100644 --- a/drivers/filesystems/ext2/inc/ext2fs.h +++ b/drivers/filesystems/ext2/inc/ext2fs.h @@ -931,7 +931,7 @@ struct _EXT2_MCB { // List Link to Vcb->McbList LIST_ENTRY Link; - + struct inode Inode; struct dentry *de; diff --git a/drivers/filesystems/ext2/inc/linux/module.h b/drivers/filesystems/ext2/inc/linux/module.h index 65607b6e2fe..f16b8b7bb23 100644 --- a/drivers/filesystems/ext2/inc/linux/module.h +++ b/drivers/filesystems/ext2/inc/linux/module.h @@ -765,7 +765,7 @@ static inline int test_clear_buffer_##name(struct buffer_head *bh) \ { \ return test_and_clear_bit(BH_##bit, &(bh)->b_state); \ } \ - + /* * Emit the buffer bitops functions. Note that there are also functions * of the form "mark_buffer_foo()". These are higher-level functions which diff --git a/drivers/filesystems/ext2/src/create.c b/drivers/filesystems/ext2/src/create.c index 01c5cfb0d5d..5c4ca3b6335 100644 --- a/drivers/filesystems/ext2/src/create.c +++ b/drivers/filesystems/ext2/src/create.c @@ -192,7 +192,7 @@ Ext2FollowLink ( SetLongFlag(Mcb->Flags, MCB_TYPE_SYMLINK); ClearLongFlag(Mcb->Flags, MCB_TYPE_SPECIAL); ASSERT(Mcb->Target->Refercount > 0); - + } else { Mcb->Target = Target; diff --git a/drivers/filesystems/ext2/src/dispatch.c b/drivers/filesystems/ext2/src/dispatch.c index 3e13af649a9..5b278714b41 100644 --- a/drivers/filesystems/ext2/src/dispatch.c +++ b/drivers/filesystems/ext2/src/dispatch.c @@ -276,7 +276,7 @@ Ext2DispatchRequest (IN PEXT2_IRP_CONTEXT IrpContext) #if (_WIN32_WINNT >= 0x0500) case IRP_MJ_PNP: return Ext2Pnp(IrpContext); -#endif //(_WIN32_WINNT >= 0x0500) +#endif //(_WIN32_WINNT >= 0x0500) default: DEBUG(DL_ERR, ( "Ext2DispatchRequest: Unexpected major function: %xh\n", IrpContext->MajorFunction)); diff --git a/drivers/filesystems/ext2/src/ea.c b/drivers/filesystems/ext2/src/ea.c index 2f7d4ce2bfc..c717bf0b519 100644 --- a/drivers/filesystems/ext2/src/ea.c +++ b/drivers/filesystems/ext2/src/ea.c @@ -262,7 +262,7 @@ Ext2QueryEa ( // Link FullEa and LastFullEa together if (LastFullEa) - LastFullEa->NextEntryOffset = (ULONG)((PCHAR)FullEa - + LastFullEa->NextEntryOffset = (ULONG)((PCHAR)FullEa - (PCHAR)LastFullEa); LastFullEa = FullEa; diff --git a/drivers/filesystems/ext2/src/ext3/generic.c b/drivers/filesystems/ext2/src/ext3/generic.c index 377f11f3a82..d6dd8c4eb6c 100644 --- a/drivers/filesystems/ext2/src/ext3/generic.c +++ b/drivers/filesystems/ext2/src/ext3/generic.c @@ -686,7 +686,7 @@ Ext2LoadBlock (IN PEXT2_VCB Vcb, fini_bh(&bh); } _SEH2_END; - return rc; + return rc; } @@ -1352,7 +1352,7 @@ repeat: } if ((gd->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) || - (ext4_used_dirs_count(sb, gd) << 8 < + (ext4_used_dirs_count(sb, gd) << 8 < ext4_free_inodes_count(sb, gd)) ) { Group = i + 1; break; @@ -1437,7 +1437,7 @@ repeat: /* this group is 100% cocucpied */ fini_bh(&gb); - + i = GroupHint; /* @@ -1461,7 +1461,7 @@ repeat: break; } - fini_bh(&gb); + fini_bh(&gb); } } diff --git a/drivers/filesystems/ext2/src/ext3/indirect.c b/drivers/filesystems/ext2/src/ext3/indirect.c index 4850f5af0dd..f770c85cea7 100644 --- a/drivers/filesystems/ext2/src/ext3/indirect.c +++ b/drivers/filesystems/ext2/src/ext3/indirect.c @@ -892,7 +892,7 @@ Ext2MapIndirect( } } - if (Layer == 0) + if (Layer == 0) dwArray = Vcb->max_blocks_per_layer[Layer] - Index; else dwArray = 1; diff --git a/drivers/filesystems/ext2/src/ext4/ext4_bh.c b/drivers/filesystems/ext2/src/ext4/ext4_bh.c index a874bbdd8e0..fa42f96ced0 100644 --- a/drivers/filesystems/ext2/src/ext4/ext4_bh.c +++ b/drivers/filesystems/ext2/src/ext4/ext4_bh.c @@ -4,7 +4,7 @@ /* * extents_bread: This function is a wrapper of CcPinRead routine. - * + * * @sb: the device we need to undergo buffered IO on. * @block: the block we want to read from. * @@ -19,7 +19,7 @@ extents_bread(struct super_block *sb, sector_t block) /* * extents_bwrite: This function is a wrapper of CcPreparePinWrite routine. - * + * * @sb: the device we need to undergo buffered IO on. * @block: the block we want to write to. */ @@ -33,7 +33,7 @@ extents_bwrite(struct super_block *sb, sector_t block) /* * extents_mark_buffer_dirty: Mark the buffer dirtied and so * that changes will be written back. - * + * * @bh: The corresponding buffer header that is modified. */ void extents_mark_buffer_dirty(struct buffer_head *bh) diff --git a/drivers/filesystems/ext2/src/ext4/ext4_extents.c b/drivers/filesystems/ext2/src/ext4/ext4_extents.c index 4ef64b4fd79..68743f0c182 100644 --- a/drivers/filesystems/ext2/src/ext4/ext4_extents.c +++ b/drivers/filesystems/ext2/src/ext4/ext4_extents.c @@ -1955,7 +1955,7 @@ ext4_ext_rm_leaf(void *icb, handle_t *handle, struct inode *inode, path[depth].p_ext = ex; a = ex_ee_block > start ? ex_ee_block : start; - b = (unsigned long long)ex_ee_block + ex_ee_len - 1 < + b = (unsigned long long)ex_ee_block + ex_ee_len - 1 < EXT_MAX_BLOCKS ? ex_ee_block + ex_ee_len - 1 : EXT_MAX_BLOCKS; @@ -2343,7 +2343,7 @@ static int ext4_ext_convert_to_initialized ( assert (le32_to_cpu(ex->ee_block) <= split); - if (split + blocks == le32_to_cpu(ex->ee_block) + + if (split + blocks == le32_to_cpu(ex->ee_block) + ext4_ext_get_actual_len(ex)) { /* split and initialize right part */ @@ -2477,7 +2477,7 @@ int ext4_ext_get_blocks(void *icb, handle_t *handle, struct inode *inode, ext4_f le16_to_cpu(newex.ee_len), get_default_free_blocks_flags(inode)); goto out2; } - + ext4_mark_inode_dirty(icb, handle, inode); /* previous routine could use block we allocated */ diff --git a/drivers/filesystems/ext2/src/ext4/ext4_xattr.c b/drivers/filesystems/ext2/src/ext4/ext4_xattr.c index e1a26e94dae..cb4a3779a36 100644 --- a/drivers/filesystems/ext2/src/ext4/ext4_xattr.c +++ b/drivers/filesystems/ext2/src/ext4/ext4_xattr.c @@ -137,7 +137,7 @@ ext4_xattr_block_checksum(PEXT2_MCB inode_ref, /* Then calculate crc32 checksum block number */ checksum = ext4_crc32c(checksum, &le64_blocknr, sizeof(le64_blocknr)); - /* Finally calculate crc32 checksum against + /* Finally calculate crc32 checksum against * the entire xattr block */ checksum = ext4_crc32c(checksum, header, ext4_sb_get_block_size(sb)); @@ -169,7 +169,7 @@ static int ext4_xattr_item_cmp(struct rb_node *_a, if (a->is_data && !b->is_data) return -1; - + if (!a->is_data && b->is_data) return 1; diff --git a/drivers/filesystems/ext2/src/ext4/extents.c b/drivers/filesystems/ext2/src/ext4/extents.c index c132911e855..4b1752b8152 100644 --- a/drivers/filesystems/ext2/src/ext4/extents.c +++ b/drivers/filesystems/ext2/src/ext4/extents.c @@ -67,7 +67,7 @@ Ext2MapExtent( flags = EXT4_GET_BLOCKS_IO_CREATE_EXT; max_blocks = EXT_UNWRITTEN_MAX_LEN; } - + if (Alloc) { if (Number && !*Number) { if (max_blocks > *Number) { diff --git a/drivers/filesystems/ext2/src/fileinfo.c b/drivers/filesystems/ext2/src/fileinfo.c index a9aeb8975a7..61ee0c8ef8c 100644 --- a/drivers/filesystems/ext2/src/fileinfo.c +++ b/drivers/filesystems/ext2/src/fileinfo.c @@ -750,7 +750,7 @@ Ext2SetFileInformation (IN PEXT2_IRP_CONTEXT IrpContext) if (AllocationSize.QuadPart > Fcb->Header.AllocationSize.QuadPart) { - Status = Ext2ExpandFile(IrpContext, Vcb, Mcb, &AllocationSize); + Status = Ext2ExpandFile(IrpContext, Vcb, Mcb, &AllocationSize); Fcb->Header.AllocationSize = AllocationSize; NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; SetLongFlag(Fcb->Flags, FCB_ALLOC_IN_SETINFO); @@ -1169,7 +1169,7 @@ Ext2ExpandFile( return STATUS_INVALID_DEVICE_REQUEST; } - /* expandind file extents */ + /* expandind file extents */ if (INODE_HAS_EXTENT(&Mcb->Inode)) { status = Ext2ExpandExtent(IrpContext, Vcb, Mcb, Start, End, Size); diff --git a/drivers/filesystems/ext2/src/fsctl.c b/drivers/filesystems/ext2/src/fsctl.c index 0216528155b..ae3ab75c608 100644 --- a/drivers/filesystems/ext2/src/fsctl.c +++ b/drivers/filesystems/ext2/src/fsctl.c @@ -1406,7 +1406,7 @@ Ext2GetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) UNICODE_STRING UniName; OEM_STRING OemName; - + PCHAR OemNameBuffer = NULL; int OemNameLength = 0, i; @@ -1419,7 +1419,7 @@ Ext2GetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) Mcb = IrpContext->Fcb->Mcb; Irp = IrpContext->Irp; IrpSp = IoGetCurrentIrpStackLocation(Irp); - + _SEH2_TRY { if (!Mcb || !IsInodeSymLink(&Mcb->Inode) || @@ -1427,7 +1427,7 @@ Ext2GetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) Status = STATUS_NOT_A_REPARSE_POINT; _SEH2_LEAVE; } - + OutputBuffer = (PVOID)Irp->AssociatedIrp.SystemBuffer; OutputBufferLength = IrpSp->Parameters.FileSystemControl.OutputBufferLength; @@ -1493,11 +1493,11 @@ Ext2GetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) RtlMoveMemory( (PUCHAR)RDB->SymbolicLinkReparseBuffer.PathBuffer + RDB->SymbolicLinkReparseBuffer.SubstituteNameOffset, UniName.Buffer, UniName.Length); - + Status = STATUS_SUCCESS; } _SEH2_FINALLY { - + if (OemNameBuffer) { Ext2FreePool(OemNameBuffer, 'NL2E'); } @@ -1510,7 +1510,7 @@ Ext2GetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } @@ -1582,7 +1582,7 @@ Ext2SetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) PEXT2_MCB Mcb = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; - + PVOID InputBuffer; ULONG InputBufferLength; ULONG BytesWritten = 0; @@ -1594,7 +1594,7 @@ Ext2SetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) UNICODE_STRING UniName; OEM_STRING OemName; - + PCHAR OemNameBuffer = NULL; int OemNameLength = 0, i; @@ -1641,7 +1641,7 @@ Ext2SetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) _SEH2_LEAVE; } MainResourceAcquired = TRUE; - + InputBuffer = Irp->AssociatedIrp.SystemBuffer; InputBufferLength = IrpSp->Parameters.FileSystemControl.InputBufferLength; @@ -1717,11 +1717,11 @@ Ext2SetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) if (MainResourceAcquired) { ExReleaseResourceLite(&Fcb->MainResource); } - + if (OemNameBuffer) { Ext2FreePool(OemNameBuffer, 'NL2E'); } - + if (NT_SUCCESS(Status)) { Ext2NotifyReportChange( IrpContext, @@ -1743,7 +1743,7 @@ Ext2SetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) Ext2ReleaseFcb(ParentDcb); } } _SEH2_END; - + return Status; } @@ -1759,7 +1759,7 @@ Ext2TruncateSymlink( PUCHAR data = (PUCHAR)&Mcb->Inode.i_block; ULONG len = (ULONG)Mcb->Inode.i_size; LARGE_INTEGER NewSize; - + if (len < EXT2_LINKLEN_IN_INODE && !Mcb->Inode.i_blocks) { RtlZeroMemory(data + Size, EXT2_LINKLEN_IN_INODE - Size); @@ -1773,7 +1773,7 @@ Ext2TruncateSymlink( goto out; } } - + out: return status; } @@ -1799,7 +1799,7 @@ Ext2DeleteReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) BOOLEAN FcbLockAcquired = FALSE; BOOLEAN MainResourceAcquired = FALSE; - + _SEH2_TRY { @@ -1868,7 +1868,7 @@ Ext2DeleteReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) if (MainResourceAcquired) { ExReleaseResourceLite(&Fcb->MainResource); } - + if (NT_SUCCESS(Status)) { Ext2NotifyReportChange( IrpContext, @@ -1878,7 +1878,7 @@ Ext2DeleteReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) FILE_ACTION_MODIFIED ); } - + if (!_SEH2_AbnormalTermination()) { if (Status == STATUS_PENDING || Status == STATUS_CANT_WAIT) { Status = Ext2QueueRequest(IrpContext); @@ -1895,7 +1895,7 @@ Ext2DeleteReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) Ext2ReleaseFcb(Fcb); } } _SEH2_END; - + return Status; } @@ -1928,11 +1928,11 @@ Ext2UserFsRequest (IN PEXT2_IRP_CONTEXT IrpContext) case FSCTL_GET_REPARSE_POINT: Status = Ext2GetReparsePoint(IrpContext); break; - + case FSCTL_SET_REPARSE_POINT: Status = Ext2SetReparsePoint(IrpContext); break; - + case FSCTL_DELETE_REPARSE_POINT: Status = Ext2DeleteReparsePoint(IrpContext); break; @@ -2615,7 +2615,7 @@ Ext2CheckDismount ( ExAcquireResourceExclusiveLite( &Vcb->MainResource, TRUE ); - if (IrpContext && + if (IrpContext && IrpContext->MajorFunction == IRP_MJ_CREATE && IrpContext->RealDevice == Vcb->RealDevice) { UnCleanCount = 2; diff --git a/drivers/filesystems/ext2/src/linux.c b/drivers/filesystems/ext2/src/linux.c index 4fb73ff5f8f..85975c3515e 100644 --- a/drivers/filesystems/ext2/src/linux.c +++ b/drivers/filesystems/ext2/src/linux.c @@ -432,7 +432,7 @@ get_block_bh_mdl( sector_t block, unsigned long size, int zero -) +) { PEXT2_VCB Vcb = bdev->bd_priv; LARGE_INTEGER offset; @@ -613,7 +613,7 @@ get_block_bh_pin( sector_t block, unsigned long size, int zero -) +) { PEXT2_VCB Vcb = bdev->bd_priv; LARGE_INTEGER offset; @@ -758,7 +758,7 @@ get_block_bh( sector_t block, unsigned long size, int zero -) +) { return get_block_bh_mdl(bdev, block, size, zero); } @@ -776,7 +776,7 @@ get_block_bh( sector_t block, unsigned long size, int zero -) +) { return get_block_bh_pin(bdev, block, size, zero); } diff --git a/drivers/filesystems/ext2/src/memory.c b/drivers/filesystems/ext2/src/memory.c index f0eaac5e127..26d342e1b0a 100644 --- a/drivers/filesystems/ext2/src/memory.c +++ b/drivers/filesystems/ext2/src/memory.c @@ -210,7 +210,7 @@ Ext2UnlinkFcb(IN PEXT2_FCB Fcb) DEBUG(DL_INF, ("Ext2FreeFcb: Fcb (%p) to be unlinked: %wZ.\n", Fcb, Mcb ? &Mcb->FullName : NULL)); - if ((Mcb != NULL) && + if ((Mcb != NULL) && (Mcb->Identifier.Type == EXT2MCB) && (Mcb->Identifier.Size == sizeof(EXT2_MCB))) { diff --git a/drivers/filesystems/ext2/src/write.c b/drivers/filesystems/ext2/src/write.c index 6f7d51aa9a0..08b74c4fcdf 100644 --- a/drivers/filesystems/ext2/src/write.c +++ b/drivers/filesystems/ext2/src/write.c @@ -1131,7 +1131,7 @@ Ext2WriteFile(IN PEXT2_IRP_CONTEXT IrpContext) } if (!CcCopyWrite(FileObject, &ByteOffset, Length, Ext2CanIWait(), Buffer)) { - if (Ext2CanIWait() || + if (Ext2CanIWait() || !CcCopyWrite(FileObject, &ByteOffset, Length, TRUE, Buffer)) { Status = STATUS_PENDING; DbgBreak(); diff --git a/drivers/filesystems/fastfat/direntry.c b/drivers/filesystems/fastfat/direntry.c index aa1e12f5a54..2247637c8b3 100644 --- a/drivers/filesystems/fastfat/direntry.c +++ b/drivers/filesystems/fastfat/direntry.c @@ -340,7 +340,7 @@ FATGetNextDirEntry( *pContext = NULL; return STATUS_NO_MORE_ENTRIES; } - + if (FAT_ENTRY_DELETED(fatDirEntry)) { dirMap = 0; @@ -365,7 +365,7 @@ FATGetNextDirEntry( 2, longNameEntry->name11_12); index = longNameEntry->id & 0x3f; // Note: it can be 0 for corrupted FS - + /* Make sure index is valid and we have enough space in buffer (we count one char for \0) */ if (index > 0 && @@ -462,7 +462,7 @@ FATGetNextDirEntry( DirContext->LongNameU.Buffer[DirContext->LongNameU.MaximumLength / sizeof(WCHAR) - 1] = UNICODE_NULL; DirContext->LongNameU.Length = wcslen(DirContext->LongNameU.Buffer) * sizeof(WCHAR); - + /* Init short name */ vfat8Dot3ToString(&DirContext->DirEntry.Fat, &DirContext->ShortNameU); diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index 2aec457057d..e7a260422ce 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -500,7 +500,7 @@ FATAddEntry( ASSERT(SearchContext.DirEntry.Fat.FileSize == MoveContext->FileSize); break; } - } + } } } if (i == 100) /* FIXME : what to do after this ? */ @@ -537,7 +537,7 @@ FATAddEntry( needLong = TRUE; break; } - + if (c == L'.') { InExtension = TRUE; diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 49738122b1e..ab5591e4b12 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -728,7 +728,7 @@ VfatSetRenameInformation( if (RenameInfo->RootDirectory != NULL) { - /* Here, copy first absolute and then append relative */ + /* Here, copy first absolute and then append relative */ RtlCopyUnicodeString(&NewName, &RootFCB->PathNameU); NewName.Buffer[NewName.Length / sizeof(WCHAR)] = L'\\'; NewName.Length += sizeof(WCHAR); diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index 6764a67d329..9b4018097d6 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -354,7 +354,7 @@ VfatHasFileSystem( * Set it to 0 if you wish to use the associated FCB with caching. * In that specific case, Device parameter is expected to be the VCB! * VolumeLabel parameter is expected to be a preallocated UNICODE_STRING (ie, with buffer) - * Its buffer has to be able to contain MAXIMUM_VOLUME_LABEL_LENGTH bytes + * Its buffer has to be able to contain MAXIMUM_VOLUME_LABEL_LENGTH bytes */ static NTSTATUS diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index d57497c1fa5..4e51b5ce34a 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -483,7 +483,7 @@ typedef struct _VFATFCB /* List of FCB's for this volume */ LIST_ENTRY FcbListEntry; - /* List of FCB's for the parent */ + /* List of FCB's for the parent */ LIST_ENTRY ParentListEntry; /* pointer to the parent fcb */ diff --git a/drivers/filesystems/fastfat_new/acchksup.c b/drivers/filesystems/fastfat_new/acchksup.c index b6924e5e409..ef6ca91f902 100644 --- a/drivers/filesystems/fastfat_new/acchksup.c +++ b/drivers/filesystems/fastfat_new/acchksup.c @@ -34,7 +34,7 @@ FatCreateRestrictEveryoneToken( #pragma alloc_text(PAGE, FatExplicitDeviceAccessGranted) #endif - + BOOLEAN FatCheckFileAccess ( PIRP_CONTEXT IrpContext, @@ -144,12 +144,12 @@ Return Value: // // If this is a subdirectory also allow add file/directory and delete. // - + if (FlagOn(DirentAttributes, FAT_DIRENT_ATTR_DIRECTORY)) { AccessMask |= FILE_ADD_SUBDIRECTORY | FILE_ADD_FILE | FILE_DELETE_CHILD; } - + if (FlagOn(*DesiredAccess, ~AccessMask)) { DebugTrace(0, Dbg, "Cannot open readonly\n", 0); @@ -189,7 +189,7 @@ Routine Description: Arguments: AccessState - the access state describing the security context to be checked - + ProcessorMode - the mode this check should occur against Return Value: @@ -220,7 +220,7 @@ Return Value: return FALSE; } - + NTSTATUS FatExplicitDeviceAccessGranted ( IN PIRP_CONTEXT IrpContext, @@ -241,9 +241,9 @@ Routine Description: Arguments: DeviceObject - the device whose ACL will be checked - + AccessState - the access state describing the security context to be checked - + ProcessorMode - the mode this check should occur against Return Value: @@ -257,9 +257,9 @@ Return Value: PACCESS_TOKEN OriginalAccessToken; PACCESS_TOKEN RestrictedAccessToken; - + PACCESS_TOKEN *EffectiveToken; - + ACCESS_MASK GrantedAccess; PAGED_CODE(); @@ -295,7 +295,7 @@ Return Value: // SeLockSubjectContext( &AccessState->SubjectSecurityContext ); - + // // Convert the token in the subject context into one which does not // acquire access through the Everyone SID. @@ -304,7 +304,7 @@ Return Value: // SeQuerySubjectContextToken; since there is no natural way // of getting a pointer to it, do it by hand. // - + if (ARGUMENT_PRESENT( AccessState->SubjectSecurityContext.ClientToken )) { EffectiveToken = &AccessState->SubjectSecurityContext.ClientToken; } else { @@ -315,7 +315,7 @@ Return Value: Status = FatCreateRestrictEveryoneToken( OriginalAccessToken, &RestrictedAccessToken ); if (!NT_SUCCESS(Status)) { - + SeReleaseSubjectContext( &AccessState->SubjectSecurityContext ); return Status; } @@ -327,7 +327,7 @@ Return Value: // *EffectiveToken = RestrictedAccessToken; - + #ifdef _MSC_VER #pragma prefast( suppress: 28175, "we're a file system, this is ok to touch" ) #endif @@ -341,9 +341,9 @@ Return Value: ProcessorMode, &GrantedAccess, &Status ); - + *EffectiveToken = OriginalAccessToken; - + // // Cleanup and return. // @@ -354,7 +354,7 @@ Return Value: return Status; } - + NTSTATUS FatCreateRestrictEveryoneToken ( IN PACCESS_TOKEN Token, diff --git a/drivers/filesystems/fastfat_new/cachesup.c b/drivers/filesystems/fastfat_new/cachesup.c index 7fcc3898597..ccc1085247b 100644 --- a/drivers/filesystems/fastfat_new/cachesup.c +++ b/drivers/filesystems/fastfat_new/cachesup.c @@ -97,7 +97,7 @@ Routine Description: } #endif } - + VOID FatReadVolumeFile ( IN PIRP_CONTEXT IrpContext, @@ -183,8 +183,8 @@ Arguments: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatPrepareWriteVolumeFile ( IN PIRP_CONTEXT IrpContext, @@ -228,7 +228,7 @@ Arguments: Reversible - Supplies TRUE if the specified range of modification should be repinned so that the operation can be reversed in a controlled fashion if errors are encountered. - + Zero - Supplies TRUE if the specified range of bytes should be zeroed --*/ @@ -237,7 +237,7 @@ Arguments: LARGE_INTEGER Vbo; PAGED_CODE(); - + // // Check to see that all references are within the Bios Parameter Block // or the fat(s). @@ -284,7 +284,7 @@ Arguments: _SEH2_TRY { if (Zero) { - + RtlZeroMemory( *Buffer, ByteCount ); } @@ -303,7 +303,7 @@ Arguments: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID FatReadDirectoryFile ( @@ -349,7 +349,7 @@ Arguments: LARGE_INTEGER Vbo; PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatReadDirectoryFile\n", 0); DebugTrace( 0, Dbg, "Dcb = %p\n", Dcb); DebugTrace( 0, Dbg, "StartingVbo = %08lx\n", StartingVbo); @@ -445,7 +445,7 @@ Arguments: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID FatPrepareWriteDirectoryFile ( @@ -484,11 +484,11 @@ Arguments: Buffer - Returns a pointer to the sectors, which is valid until unpinned Zero - Supplies TRUE if the specified range of bytes should be zeroed - + Reversible - Supplies TRUE if the specified range of modification should be repinned so that the operation can be reversed in a controlled fashion if errors are encountered. - + Status - Returns the status of the operation. --*/ @@ -503,7 +503,7 @@ Arguments: ULONG MappingGranularity = PAGE_SIZE; PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatPrepareWriteDirectoryFile\n", 0); DebugTrace( 0, Dbg, "Dcb = %p\n", Dcb); DebugTrace( 0, Dbg, "StartingVbo = %08lx\n", (ULONG)StartingVbo); @@ -586,22 +586,22 @@ Arguments: // // We must pin in terms of pages below the boundary of the initial request. // Once we pass the end of the request, we are free to expand the pin size to - // VACB_MAPPING_GRANULARITY. This will prevent Cc from returning OBCBs - // and hence will prevent bugchecks when we then attempt to repin one, yet + // VACB_MAPPING_GRANULARITY. This will prevent Cc from returning OBCBs + // and hence will prevent bugchecks when we then attempt to repin one, yet // allow us to be more efficient by pinning in 256KB chunks instead of 4KB pages. // if (Vbo.QuadPart > StartingVbo + InitialRequest) { - + MappingGranularity = VACB_MAPPING_GRANULARITY; } // - // If the first and final byte are both described by the same page, pin + // If the first and final byte are both described by the same page, pin // the entire range. Note we pin in pages to prevent cache manager from // returning OBCBs, which would result in a bugcheck on CcRepinBcb. // - + if ((Vbo.QuadPart / MappingGranularity) == ((Vbo.QuadPart + ByteCount - 1) / MappingGranularity)) { @@ -619,7 +619,7 @@ Arguments: BooleanFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT), &LocalBcb, &LocalBuffer )) { - + // // Could not read the data without waiting (cache miss). // @@ -630,7 +630,7 @@ Arguments: // // Update our caller with the beginning of their request. // - + if (*Buffer == NULL) { *Buffer = LocalBuffer; @@ -640,13 +640,13 @@ Arguments: DbgDoit( IrpContext->PinCount += 1 ) if (Zero) { - + // // We set this guy dirty right now so that we can raise CANT_WAIT when // it needs to be done. It'd be beautiful if we could noop the read IO // since we know we don't care about it. // - + RtlZeroMemory( LocalBuffer, BytesToPin ); CcSetDirtyPinnedData( LocalBcb, NULL ); } @@ -655,7 +655,7 @@ Arguments: Vbo.QuadPart += BytesToPin; if (*Bcb != LocalBcb) { - + FatRepinBcb( IrpContext, LocalBcb ); FatUnpinBcb( IrpContext, LocalBcb ); } @@ -684,14 +684,14 @@ Arguments: FatUnpinBcb( IrpContext, LocalBcb ); } - + FatUnpinBcb(IrpContext, *Bcb); // // These steps are carefully arranged - FatTruncateFileAllocation can raise. // Make sure we unpin the buffer. If FTFA raises, the effect should be benign. // - + if (UnwindWeAllocatedDiskSpace == TRUE) { // @@ -714,7 +714,7 @@ Arguments: return; } - + #if DBG BOOLEAN FatDisableParentCheck = 0; @@ -734,32 +734,32 @@ FatIsCurrentOperationSynchedForDcbTeardown ( ULONG Index = 0; PAGED_CODE(); - + // // While mounting, we're OK without having to own anything. // - + if (Stack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && Stack->MinorFunction == IRP_MN_MOUNT_VOLUME) { return TRUE; } - + // // With the Vcb held, the close path is blocked out. // - + if (ExIsResourceAcquiredSharedLite( &Dcb->Vcb->Resource ) || ExIsResourceAcquiredExclusiveLite( &Dcb->Vcb->Resource )) { return TRUE; } - + // // Accept this assertion at face value. It comes from GetDirentForFcbOrDcb, // and is reliable. // - + if (FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_PARENT_BY_CHILD )) { return TRUE; @@ -776,29 +776,29 @@ FatIsCurrentOperationSynchedForDcbTeardown ( } if (Stack->FileObject) { - + ToCheck[Index++] = Stack->FileObject; } ToCheck[Index] = NULL; - + // // If the fileobjects we have are for this dcb or a child of it, we are // also guaranteed that this dcb isn't going anywhere (even without // the Vcb). // - + for (Index = 0; ToCheck[Index] != NULL; Index++) { - + (VOID) FatDecodeFileObject( ToCheck[Index], &Vcb, &Fcb, &Ccb ); while ( Fcb ) { - + if (Fcb == Dcb) { - + return TRUE; } - + Fcb = Fcb->ParentDcb; } } @@ -832,7 +832,7 @@ Return Value: { PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatOpenDirectoryFile\n", 0); DebugTrace( 0, Dbg, "Dcb = %p\n", Dcb); @@ -843,7 +843,7 @@ Return Value: // // I really wish we had a proper Fcb synchronization model (like CDFS/UDFS/NTFS). // - + NT_ASSERT( FatIsCurrentOperationSynchedForDcbTeardown( IrpContext, Dcb )); // @@ -925,7 +925,7 @@ Return Value: InterlockedIncrement( (LONG*)&Dcb->Specific.Dcb.DirectoryFileOpenCount ); Dcb->Specific.Dcb.DirectoryFile = DirectoryFileObject; - + // // Indicate we're happy with the fileobject now. // @@ -940,9 +940,9 @@ Return Value: // // Rip the object up if we couldn't get the close context. // - + if (DirectoryFileObject) { - + ObDereferenceObject( DirectoryFileObject ); } } _SEH2_END; @@ -974,7 +974,7 @@ Return Value: - + PFILE_OBJECT FatOpenEaFile ( IN PIRP_CONTEXT IrpContext, @@ -1002,7 +1002,7 @@ Return Value: PDEVICE_OBJECT RealDevice; PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatOpenEaFile\n", 0); DebugTrace( 0, Dbg, "EaFcb = %p\n", EaFcb); @@ -1051,7 +1051,7 @@ Return Value: EaFcb ); CcSetAdditionalCacheAttributes( EaFileObject, TRUE, TRUE ); - + } _SEH2_FINALLY { // @@ -1060,9 +1060,9 @@ Return Value: // we lost trying to build the cache map - in which case we're // OK for the close context if we have to. // - + if (_SEH2_AbnormalTermination()) { - + ObDereferenceObject( EaFileObject ); } } _SEH2_END; @@ -1074,7 +1074,7 @@ Return Value: return EaFileObject; } - + VOID FatCloseEaFile ( IN PIRP_CONTEXT IrpContext, @@ -1088,26 +1088,26 @@ Routine Description: This routine shuts down the ea file. Usually this is required when the volume begins to leave the system: after verify, dismount, deletion, pnp. - + Arguments: Vcb - the volume to close the ea file on - + FlushFirst - whether the file should be flushed - + Return Value: None. As a side effect, the EA fileobject in the Vcb is cleared. - + Caller must have the Vcb exclusive. - + --*/ { PFILE_OBJECT EaFileObject = Vcb->VirtualEaFile; PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatCloseEaFile\n", 0); DebugTrace( 0, Dbg, "Vcb = %p\n", Vcb); @@ -1138,12 +1138,12 @@ Return Value: ObDereferenceObject( EaFileObject ); } - + DebugTrace(-1, Dbg, "FatCloseEaFile -> %p\n", EaFileObject); } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatSetDirtyBcb ( IN PIRP_CONTEXT IrpContext, @@ -1166,13 +1166,13 @@ Routine Description: Arguments: Bcb - Supplies the Bcb being set dirty - + Vcb - Supplies the volume being marked dirty - + Reversible - Supplies TRUE if the specified range of bcb should be repinned so that the changes can be reversed in a controlled fashion if errors are encountered. - + Return Value: None. @@ -1190,7 +1190,7 @@ Return Value: // if (Reversible) { - + FatRepinBcb( IrpContext, Bcb ); } @@ -1260,7 +1260,7 @@ Return Value: // // We use a shorter volume clean timer for hot plug volumes. // - + CleanVolumeTimer.QuadPart = FlagOn( Vcb->VcbState, VCB_STATE_FLAG_DEFERRED_FLUSH) ? (LONG)-1500*1000*10 : (LONG)-8*1000*1000*10; @@ -1312,7 +1312,7 @@ Return Value: DebugTrace(-1, Dbg, "FatSetDirtyBcb -> VOID\n", 0 ); } - + VOID FatRepinBcb ( IN PIRP_CONTEXT IrpContext, @@ -1342,7 +1342,7 @@ Return Value: ULONG i; PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatRepinBcb\n", 0 ); DebugTrace( 0, Dbg, "IrpContext = %p\n", IrpContext ); DebugTrace( 0, Dbg, "Bcb = %p\n", Bcb ); @@ -1402,7 +1402,7 @@ Return Value: } } - + VOID FatUnpinRepinnedBcbs ( IN PIRP_CONTEXT IrpContext @@ -1432,7 +1432,7 @@ Return Value: PFCB FcbOrDcb = NULL; PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatUnpinRepinnedBcbs\n", 0 ); DebugTrace( 0, Dbg, "IrpContext = %p\n", IrpContext ); @@ -1453,21 +1453,21 @@ Return Value: // Extract main FCB pointer from the irp context - we // will need it later to detect new file creation operation. // - + if (IrpContext->MajorFunction == IRP_MJ_CREATE && IrpContext->OriginatingIrp != NULL) { PIO_STACK_LOCATION IrpSp; - + IrpSp = IoGetCurrentIrpStackLocation( IrpContext->OriginatingIrp ); - + if (IrpSp != NULL && IrpSp->FileObject != NULL && IrpSp->FileObject->FsContext != NULL) { - + FcbOrDcb = IrpSp->FileObject->FsContext; } } - + // // If the request is write through or the media is deferred flush, // unpin the bcb's write through. @@ -1496,7 +1496,7 @@ Return Value: IO_STATUS_BLOCK Iosb; - if (WriteThroughToDisk && + if (WriteThroughToDisk && FlagOn(IrpContext->Vcb->VcbState, VCB_STATE_FLAG_DEFERRED_FLUSH)) { FileObject = CcGetFileObjectFromBcb( Repinned->Bcb[i] ); @@ -1524,9 +1524,9 @@ Return Value: (IrpContext->MajorFunction != IRP_MJ_CLEANUP) && (IrpContext->MajorFunction != IRP_MJ_FLUSH_BUFFERS) && (IrpContext->MajorFunction != IRP_MJ_SET_INFORMATION) - + && - + // // WinSE bug #307418 "Occasional data corruption when // standby/resume while copying files to removable FAT @@ -1540,7 +1540,7 @@ Return Value: // Instead FatCommonCreate() will unroll the file creation // changes for these pages. // - + !(IrpContext->MajorFunction == IRP_MJ_CREATE && Iosb.Status == STATUS_VERIFY_REQUIRED && FcbOrDcb != NULL && @@ -1567,26 +1567,26 @@ Return Value: PREPINNED_BCBS RepinnedToPurge = Repinned; while( RepinnedToPurge != NULL ) { - + for (j = k; j < REPINNED_BCBS_ARRAY_SIZE; j++) { if (RepinnedToPurge->Bcb[j] != NULL) { - + if (CcGetFileObjectFromBcb( RepinnedToPurge->Bcb[j] ) == FileObject) { CcUnpinRepinnedBcb( RepinnedToPurge->Bcb[j], FALSE, &Iosb ); - + RepinnedToPurge->Bcb[j] = NULL; } } } - + RepinnedToPurge = RepinnedToPurge->Next; k = 0; } - + CcPurgeCacheSection( FileObject->SectionObjectPointer, NULL, 0, @@ -1644,7 +1644,7 @@ Return Value: if (!FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_DISABLE_RAISE )) { if (IrpContext->OriginatingIrp) { IrpContext->OriginatingIrp->IoStatus = RaiseIosb; - } + } FatNormalizeAndRaiseStatus( IrpContext, RaiseIosb.Status ); } } @@ -1654,7 +1654,7 @@ Return Value: return; } - + FINISHED FatZeroData ( IN PIRP_CONTEXT IrpContext, @@ -1684,7 +1684,7 @@ FatZeroData ( BOOLEAN Finished; PAGED_CODE(); - + SectorSize = (ULONG)Vcb->Bpb.BytesPerSector; ZeroStart.LowPart = (StartingZero + (SectorSize - 1)) & ~(SectorSize - 1); @@ -1693,23 +1693,23 @@ FatZeroData ( // Detect overflow if we were asked to zero in the last sector of the file, // which must be "zeroed" already (or we're in trouble). // - + if (StartingZero != 0 && ZeroStart.LowPart == 0) { - + return TRUE; } // // Note that BeyondZeroEnd can take the value 4gb. // - + BeyondZeroEnd.QuadPart = ((ULONGLONG) StartingZero + ByteCount + (SectorSize - 1)) & (~((LONGLONG) SectorSize - 1)); // // If we were called to just zero part of a sector we are in trouble. // - + if ( ZeroStart.QuadPart == BeyondZeroEnd.QuadPart ) { return TRUE; @@ -1723,7 +1723,7 @@ FatZeroData ( return Finished; } - + NTSTATUS FatCompleteMdl ( IN PIRP_CONTEXT IrpContext, @@ -1752,7 +1752,7 @@ Return Value: PIO_STACK_LOCATION IrpSp; PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatCompleteMdl\n", 0 ); DebugTrace( 0, Dbg, "IrpContext = %p\n", IrpContext ); DebugTrace( 0, Dbg, "Irp = %p\n", Irp ); @@ -1807,7 +1807,7 @@ Return Value: return STATUS_SUCCESS; } - + VOID FatSyncUninitializeCacheMap ( IN PIRP_CONTEXT IrpContext, @@ -1835,7 +1835,7 @@ Return Value: UNREFERENCED_PARAMETER( IrpContext ); PAGED_CODE(); - + KeInitializeEvent( &UninitializeCompleteEvent.Event, SynchronizationEvent, FALSE); @@ -1861,7 +1861,7 @@ Return Value: NT_ASSERT(WaitStatus == STATUS_SUCCESS); } - + VOID FatPinMappedData ( IN PIRP_CONTEXT IrpContext, @@ -1893,7 +1893,7 @@ Arguments: LARGE_INTEGER Vbo; PAGED_CODE(); - + DebugTrace(+1, Dbg, "FatPinMappedData\n", 0); DebugTrace( 0, Dbg, "Dcb = %p\n", Dcb); DebugTrace( 0, Dbg, "StartingVbo = %08lx\n", StartingVbo); @@ -1924,7 +1924,7 @@ Arguments: } #if (NTDDI_VERSION >= NTDDI_WIN8) - + NTSTATUS FatPrefetchPages ( IN PIRP_CONTEXT IrpContext, diff --git a/drivers/filesystems/fastfat_new/cleanup.c b/drivers/filesystems/fastfat_new/cleanup.c index 26034f05487..e87e3fcddba 100644 --- a/drivers/filesystems/fastfat_new/cleanup.c +++ b/drivers/filesystems/fastfat_new/cleanup.c @@ -43,7 +43,7 @@ FatAutoUnlock ( #pragma alloc_text(PAGE, FatFsdCleanup) #endif - + _Function_class_(IRP_MJ_CLEANUP) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -139,8 +139,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonCleanup ( IN PIRP_CONTEXT IrpContext, @@ -270,7 +270,7 @@ Return Value: if ((TypeOfOpen == UserFileOpen) || (TypeOfOpen == UserDirectoryOpen)) { NT_ASSERT( Fcb != NULL ); - + (VOID)FatAcquireExclusiveFcb( IrpContext, Fcb ); AcquiredFcb = TRUE; @@ -410,28 +410,28 @@ Return Value: // If so we may need to break an oplock. We do this in the try block // so that resources will be properly released. // - + if (ProcessingDeleteOnClose && FatIsFileOplockable( Fcb ) && ((NodeType( Fcb ) != FAT_NTC_DCB) || FatIsDirectoryEmpty( IrpContext, Fcb ))) { - + Status = FsRtlCheckOplockEx( FatGetFcbOplock(Fcb), Irp, OPLOCK_FLAG_CLOSING_DELETE_ON_CLOSE, IrpContext, FatOplockComplete, FatPrePostIrp ); - + if (Status != STATUS_SUCCESS) { - + if (Status == STATUS_PENDING) { - + SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_CLEANUP_BREAKING_OPLOCK ); try_return( Status ); - + } else { - + FatNormalizeAndRaiseStatus( IrpContext, Status ); } } @@ -466,7 +466,7 @@ Return Value: if (FlagOn( Ccb->Flags, CCB_FLAG_COMPLETE_DISMOUNT )) { FatCheckForDismount( IrpContext, Vcb, TRUE ); - + // // If this handle had write access, and actually wrote something, // flush the device buffers, and then set the verify bit now @@ -533,9 +533,9 @@ Return Value: // // Clear the deny defrag bit, if the handle we're cleaning up was the one that set it. // - + if( FlagOn(Fcb->FcbState, FCB_STATE_DENY_DEFRAG) && FlagOn(Ccb->Flags, CCB_FLAG_DENY_DEFRAG) ) { - + ClearFlag(Ccb->Flags, CCB_FLAG_DENY_DEFRAG); ClearFlag(Fcb->FcbState, FCB_STATE_DENY_DEFRAG ); } @@ -575,9 +575,9 @@ Return Value: // // Even if something goes wrong, we cannot turn back! // - + _SEH2_TRY { - + DELETE_CONTEXT DeleteContext; @@ -585,45 +585,45 @@ Return Value: // Before truncating file allocation remember this // info for FatDeleteDirent. // - + DeleteContext.FileSize = Fcb->Header.FileSize.LowPart; DeleteContext.FirstClusterOfFile = Fcb->FirstClusterOfFile; - + // // Synchronize here with paging IO // - + (VOID)ExAcquireResourceExclusiveLite( Fcb->Header.PagingIoResource, TRUE ); - + Fcb->Header.FileSize.LowPart = 0; - + ExReleaseResourceLite( Fcb->Header.PagingIoResource ); - + // // Truncate the file allocation down to zero // - + DebugTrace(0, Dbg, "Delete File allocation\n", 0); - + FatTruncateFileAllocation( IrpContext, Fcb, 0 ); if (Fcb->Header.AllocationSize.LowPart == 0) { - + // // Tunnel and remove the dirent for the directory // - + DebugTrace(0, Dbg, "Delete the directory dirent\n", 0); - + FatTunnelFcbOrDcb( Fcb, NULL ); - + FatDeleteDirent( IrpContext, Fcb, &DeleteContext, TRUE ); - + // // Report that we have removed an entry. // - + FatNotifyReportChange( IrpContext, Vcb, Fcb, @@ -633,7 +633,7 @@ Return Value: } _SEH2_EXCEPT( FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { - + FatResetExceptionState( IrpContext ); } _SEH2_END; @@ -644,16 +644,16 @@ Return Value: // to recreate the same file over again before we // get a close irp. // - + FatRemoveNames( IrpContext, Fcb ); -#if (NTDDI_VERSION >= NTDDI_WIN8) +#if (NTDDI_VERSION >= NTDDI_WIN8) // - // We've removed the names so break any parent directory oplock. + // We've removed the names so break any parent directory oplock. // Directory oplock breaks are always advisory, so we will never // block/get STATUS_PENDING here. // - + BreakStatus = FsRtlCheckOplockEx( FatGetFcbOplock(Fcb->ParentDcb), Irp, (OPLOCK_FLAG_PARENT_OBJECT | @@ -661,7 +661,7 @@ Return Value: NULL, NULL, NULL ); - + ASSERT( BreakStatus != STATUS_PENDING ); #endif } @@ -676,7 +676,7 @@ Return Value: Fcb->UncleanCount -= 1; break; - + case UserFileOpen: DebugTrace(0, Dbg, "Cleanup UserFileOpen\n", 0); @@ -705,9 +705,9 @@ Return Value: // // Clear the deny defrag bit, if the handle we're cleaning up was the one that set it. // - + if( FlagOn(Fcb->FcbState, FCB_STATE_DENY_DEFRAG) && FlagOn(Ccb->Flags, CCB_FLAG_DENY_DEFRAG) ) { - + ClearFlag(Ccb->Flags, CCB_FLAG_DENY_DEFRAG); ClearFlag(Fcb->FcbState, FCB_STATE_DENY_DEFRAG ); } @@ -728,93 +728,93 @@ Return Value: // and we can still write to it if it hasn't been shutdown. Remember that // we toss all sections in the failed-verify and dismount cases. // - + if ((Vcb->VcbCondition == VcbGood) && !FlagOn(Vcb->VcbState, VCB_STATE_FLAG_SHUTDOWN)) { - + if (Fcb->FcbCondition == FcbGood) { FatUpdateDirentFromFcb( IrpContext, FileObject, Fcb, Ccb ); } - + // // If the file has a unclean count of 1 then we know // that this is the last handle for the file object. // - + if ( (Fcb->UncleanCount == 1) && (Fcb->FcbCondition == FcbGood) ) { - + DELETE_CONTEXT DeleteContext; - + // // Check if we should be deleting the file. The // delete operation really deletes the file but // keeps the Fcb around for close to do away with. // - + if (FlagOn(Fcb->FcbState, FCB_STATE_DELETE_ON_CLOSE) && !FlagOn(Vcb->VcbState, VCB_STATE_FLAG_WRITE_PROTECTED)) { - + // // Before truncating file allocation remember this // info for FatDeleteDirent. // - + DeleteContext.FileSize = Fcb->Header.FileSize.LowPart; DeleteContext.FirstClusterOfFile = Fcb->FirstClusterOfFile; - + DebugTrace(0, Dbg, "Delete File allocation\n", 0); - + // // Synchronize here with paging IO // - + (VOID)ExAcquireResourceExclusiveLite( Fcb->Header.PagingIoResource, TRUE ); - + Fcb->Header.FileSize.LowPart = 0; Fcb->Header.ValidDataLength.LowPart = 0; Fcb->ValidDataToDisk = 0; - + ExReleaseResourceLite( Fcb->Header.PagingIoResource ); - + _SEH2_TRY { - + FatSetFileSizeInDirent( IrpContext, Fcb, NULL ); - + } _SEH2_EXCEPT( FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { - + FatResetExceptionState( IrpContext ); } _SEH2_END; - + Fcb->FcbState |= FCB_STATE_TRUNCATE_ON_CLOSE; - + } else { - + // // We must zero between ValidDataLength and FileSize // - + if (!FlagOn(Fcb->FcbState, FCB_STATE_PAGING_FILE) && (Fcb->Header.ValidDataLength.LowPart < Fcb->Header.FileSize.LowPart)) { - + ULONG ValidDataLength; - + ValidDataLength = Fcb->Header.ValidDataLength.LowPart; - + if (ValidDataLength < Fcb->ValidDataToDisk) { ValidDataLength = Fcb->ValidDataToDisk; } - + // // Recheck, VDD can be >= FS // - + if (ValidDataLength < Fcb->Header.FileSize.LowPart) { - + _SEH2_TRY { (VOID)FatZeroData( IrpContext, @@ -858,18 +858,18 @@ Return Value: } } } - + // // See if we are supposed to truncate the file on the last // close. If we cannot wait we'll ship this off to the fsp // - + _SEH2_TRY { - + if (FlagOn(Fcb->FcbState, FCB_STATE_TRUNCATE_ON_CLOSE)) { - + DebugTrace(0, Dbg, "truncate file allocation\n", 0); - + if (Vcb->VcbCondition == VcbGood) { @@ -879,61 +879,61 @@ Return Value: } - + // // We also have to get rid of the Cache Map because // this is the only way we have of trashing the // truncated pages. // - + LocalTruncateSize = Fcb->Header.FileSize; TruncateSize = &LocalTruncateSize; - + // // Mark the Fcb as having now been truncated, just incase // we have to reship this off to the fsp. // - + Fcb->FcbState &= ~FCB_STATE_TRUNCATE_ON_CLOSE; } - + // // Now check again if we are to delete the file and if // so then we remove the file from the disk. // - + if (FlagOn(Fcb->FcbState, FCB_STATE_DELETE_ON_CLOSE) && Fcb->Header.AllocationSize.LowPart == 0) { - + DebugTrace(0, Dbg, "Delete File\n", 0); - + // // Now tunnel and delete the dirent // - + FatTunnelFcbOrDcb( Fcb, Ccb ); - + FatDeleteDirent( IrpContext, Fcb, &DeleteContext, TRUE ); - + // // Report that we have removed an entry. // - + FatNotifyReportChange( IrpContext, Vcb, Fcb, FILE_NOTIFY_CHANGE_FILE_NAME, FILE_ACTION_REMOVED ); } - + } _SEH2_EXCEPT( FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { - + FatResetExceptionState( IrpContext ); } _SEH2_END; - + if (FlagOn(Fcb->FcbState, FCB_STATE_DELETE_ON_CLOSE)) { - + #if (NTDDI_VERSION >= NTDDI_WIN8) NTSTATUS BreakStatus; #endif @@ -946,16 +946,16 @@ Return Value: // Note that we remove the name even if we couldn't // truncate the allocation and remove the dirent above. // - + FatRemoveNames( IrpContext, Fcb ); #if (NTDDI_VERSION >= NTDDI_WIN8) // - // We've removed the names so break any parent directory oplock. + // We've removed the names so break any parent directory oplock. // Directory oplock breaks are always advisory, so we will never // block/get STATUS_PENDING here. // - + BreakStatus = FsRtlCheckOplockEx( FatGetFcbOplock(Fcb->ParentDcb), Irp, (OPLOCK_FLAG_PARENT_OBJECT | @@ -963,13 +963,13 @@ Return Value: NULL, NULL, NULL ); - + ASSERT( BreakStatus != STATUS_PENDING ); #endif } } } - + // // We've just finished everything associated with an unclean // fcb so now decrement the unclean count before releasing @@ -996,13 +996,13 @@ Return Value: (Fcb->NonPaged->SectionObjectPointers.DataSectionObject != NULL)) { CcFlushCache( &Fcb->NonPaged->SectionObjectPointers, NULL, 0, NULL ); - + // // Grab and release PagingIo to serialize ourselves with the lazy writer. // This will work to ensure that all IO has completed on the cached // data and we will succesfully tear away the cache section. // - + ExAcquireResourceExclusiveLite( Fcb->Header.PagingIoResource, TRUE); ExReleaseResourceLite( Fcb->Header.PagingIoResource ); @@ -1015,7 +1015,7 @@ Return Value: // // If the file is invalid, hint to the cache that we should throw everything out. // - + if ( Fcb->FcbCondition == FcbBad ) { TruncateSize = &FatLargeZero; @@ -1097,7 +1097,7 @@ Return Value: // Flush the file. // - if ((TypeOfOpen == UserFileOpen) && + if ((TypeOfOpen == UserFileOpen) && FlagOn(FileObject->Flags, FO_FILE_MODIFIED)) { Status = FatFlushFile( IrpContext, Fcb, Flush ); @@ -1107,7 +1107,7 @@ Return Value: // If that worked ok, then see if we should flush the FAT as well. // - if (NT_SUCCESS(Status) && Fcb && !FatIsFat12( Vcb) && + if (NT_SUCCESS(Status) && Fcb && !FatIsFat12( Vcb) && FlagOn( Fcb->FcbState, FCB_STATE_FLUSH_FAT)) { Status = FatFlushFat( IrpContext, Vcb); @@ -1117,7 +1117,7 @@ Return Value: // if (NT_SUCCESS(Status) && (Fcb->ParentDcb != NULL)) { - + Status = FatFlushFile( IrpContext, Fcb->ParentDcb, Flush ); } } @@ -1142,7 +1142,7 @@ Return Value: if (AcquiredVcb) { FatReleaseVcb( IrpContext, Vcb ); } if (SendUnlockNotification) { - + FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK ); } @@ -1175,7 +1175,7 @@ FatAutoUnlock ( // UNREFERENCED_PARAMETER( IrpContext ); - + IoAcquireVpbSpinLock( &SavedIrql ); ClearFlag( Vcb->Vpb->Flags, (VPB_LOCKED | VPB_DIRECT_WRITES_ALLOWED) ); diff --git a/drivers/filesystems/fastfat_new/close.c b/drivers/filesystems/fastfat_new/close.c index e92aad02285..0bbda6c04dd 100644 --- a/drivers/filesystems/fastfat_new/close.c +++ b/drivers/filesystems/fastfat_new/close.c @@ -76,7 +76,7 @@ FatCloseWorker ( #pragma alloc_text(PAGE, FatCloseWorker) #endif - + _Function_class_(IRP_MJ_CLOSE) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -183,17 +183,17 @@ Return Value: // call the oplock package to get rid of any oplock state. This can only // be safely done in the FSD path. // - + if ((Fcb != NULL) && !FlagOn( FileObject->Flags, FO_CLEANUP_COMPLETE ) && FatIsFileOplockable( Fcb )) { - + // // This is equivalent to handling cleanup, and it always cleans up any // oplock immediately. Also, we don't need any locking of the FCB here; // the oplock's own lock will be sufficient for this purpose. // - + FsRtlCheckOplockEx( FatGetFcbOplock(Fcb), Irp, 0, @@ -204,7 +204,7 @@ Return Value: #endif // - // Metadata streams have had close contexts preallocated. Pull one out now, while we're + // Metadata streams have had close contexts preallocated. Pull one out now, while we're // guaranteed the VCB exists. // @@ -221,7 +221,7 @@ Return Value: // Call the common Close routine if we are not delaying this close. // - if ((((TypeOfOpen == UserFileOpen) || + if ((((TypeOfOpen == UserFileOpen) || (TypeOfOpen == UserDirectoryOpen)) && FlagOn(Fcb->FcbState, FCB_STATE_DELAY_CLOSE) && !FatData.ShutdownStarted) || @@ -238,7 +238,7 @@ Return Value: // if( CloseContext == NULL ) { - + // // Free up any query template strings before using the close context fields, // which overlap (union) @@ -248,7 +248,7 @@ Return Value: CloseContext = &Ccb->CloseContext; CloseContext->Free = FALSE; - + SetFlag( Ccb->Flags, CCB_FLAG_CLOSE_CONTEXT ); } @@ -272,12 +272,12 @@ Return Value: (BOOLEAN)(Fcb && FlagOn(Fcb->FcbState, FCB_STATE_DELAY_CLOSE))); } else { - + // // The close proceeded synchronously, so for the metadata objects we // can now drop the close context we preallocated. // - + if ((TypeOfOpen == VirtualVolumeFile) || (TypeOfOpen == DirectoryFile) || (TypeOfOpen == EaFile) @@ -286,19 +286,19 @@ Return Value: if (CloseContext != NULL) { ExFreePool( CloseContext ); - + } } } FatCompleteRequest( FatNull, Irp, Status ); - } + } _SEH2_EXCEPT(FatExceptionFilter( NULL, _SEH2_GetExceptionInformation() )) { // // We had some trouble trying to perform the requested - // operation, so we'll abort the I/O request with the + // operation, so we'll abort the I/O request with the // error status that we get back from the exception code. // @@ -346,15 +346,15 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + FsRtlEnterFileSystem(); - + FatFspClose (Context); - + FsRtlExitFileSystem(); } - + _Requires_lock_held_(_Global_critical_region_) VOID FatFspClose ( @@ -394,9 +394,9 @@ Return Value: // // Set the top level IRP for the true FSP operation. // - + if (!ARGUMENT_PRESENT( Vcb )) { - + IoSetTopLevelIrp( (PIRP)FSRTL_FSP_TOP_LEVEL_IRP ); TopLevel = TRUE; } @@ -413,7 +413,7 @@ Return Value: // if (!ARGUMENT_PRESENT(Vcb)) { - + if (!FatData.ShutdownStarted) { if (CloseContext->Vcb != CurrentVcb) { @@ -520,7 +520,7 @@ Return Value: // // Drop the context if it came from pool. // - + if (FreeContext) { ExFreePool( CloseContext ); @@ -539,12 +539,12 @@ Return Value: // // Clean up the top level IRP hint if we owned it. // - + if (!ARGUMENT_PRESENT( Vcb )) { - + IoSetTopLevelIrp( NULL ); } - + // // And return to our caller // @@ -552,8 +552,8 @@ Return Value: DebugTrace(-1, Dbg, "FatFspClose -> NULL\n", 0); } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatQueueClose ( IN PCLOSE_CONTEXT CloseContext, @@ -569,7 +569,7 @@ Routine Description: Arguments: CloseContext - a close context to enqueue for the delayed close thread. - + DelayClose - whether this should go on the delayed close queue (unreferenced objects). @@ -624,8 +624,8 @@ Return Value: } } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) PCLOSE_CONTEXT FatRemoveClose ( PVCB Vcb OPTIONAL, @@ -641,7 +641,7 @@ Routine Description: Arguments: Vcb - if specified, only returns close for this volume. - + LastVcbHint - if specified and other starvation avoidance is required by the system condition, will attempt to return closes for this volume. @@ -664,7 +664,7 @@ Return Value: // Remember if this is the worker thread, so we can pull down the active // flag should we run everything out. // - + WorkerThread = (Vcb == NULL); // @@ -685,20 +685,20 @@ Return Value: // Flip over to aggressive at twice the legal limit, and flip it // off at the legal limit. // - + if (!FatData.HighAsync && FatData.AsyncCloseCount > FatMaxDelayedCloseCount*2) { FatData.HighAsync = TRUE; - + } else if (FatData.HighAsync && FatData.AsyncCloseCount < FatMaxDelayedCloseCount) { FatData.HighAsync = FALSE; } - + if (!FatData.HighDelayed && FatData.DelayedCloseCount > FatMaxDelayedCloseCount*2) { FatData.HighDelayed = TRUE; - + } else if (FatData.HighDelayed && FatData.DelayedCloseCount < FatMaxDelayedCloseCount) { FatData.HighDelayed = FALSE; @@ -709,7 +709,7 @@ Return Value: Vcb = LastVcbHint; } } - + // // Do the case when we don't care about which Vcb the close is on. // This is the case when we are in an ExWorkerThread and aren't @@ -762,7 +762,7 @@ Return Value: CloseContext = NULL; if (WorkerThread) { - + FatData.AsyncCloseActive = FALSE; } } @@ -770,7 +770,7 @@ Return Value: // // We're running down a specific volume. // - + } else { @@ -801,9 +801,9 @@ Return Value: CloseContext = CONTAINING_RECORD( Entry, CLOSE_CONTEXT, VcbLinks ); - + RemoveEntryList( &CloseContext->GlobalLinks ); - + // // If we were trying to run down the queues but didn't find anything for this // volume, flip over to accept anything and try again. @@ -812,7 +812,7 @@ Return Value: } else if (LastVcbHint) { goto AnyClose; - + // // There are no more closes to perform; show that we are done. // @@ -828,8 +828,8 @@ Return Value: return CloseContext; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonClose ( IN PVCB Vcb, @@ -918,7 +918,7 @@ Return Value: IrpContext.NodeByteSize = sizeof( IrpContext ); IrpContext.MajorFunction = IRP_MJ_CLOSE; IrpContext.Vcb = Vcb; - + if (Wait) { SetFlag( IrpContext.Flags, IRP_CONTEXT_FLAG_WAIT ); @@ -1090,10 +1090,10 @@ Return Value: ObDereferenceObject( DirectoryFileObject ); } - Fcb->OpenCount -= 1; + Fcb->OpenCount -= 1; Vcb->OpenFileCount -= 1; if (FlagOn(Ccb->Flags, CCB_FLAG_READ_ONLY)) { Vcb->ReadOnlyCount -= 1; } - + FatDeleteCcb( &IrpContext, &Ccb ); break; @@ -1195,7 +1195,7 @@ Return Value: // // See if there is only one open left. If so, it is ours. We only want // to check for a dismount if a dismount is not already in progress. - // We also only do this if the Vcb condition is not VcbGood and the + // We also only do this if the Vcb condition is not VcbGood and the // caller can handle the VCB going away. This is determined by whether // they passed in the VcbDeleted argument. This request also needs // to be top level. diff --git a/drivers/filesystems/fastfat_new/create.c b/drivers/filesystems/fastfat_new/create.c index 97b0c8b120c..fa9b651e364 100644 --- a/drivers/filesystems/fastfat_new/create.c +++ b/drivers/filesystems/fastfat_new/create.c @@ -274,7 +274,7 @@ FatCheckShareAccess ( #pragma alloc_text(PAGE, FatSetFullNameInFcb) #endif - + _Function_class_(IRP_MJ_CREATE) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -2576,7 +2576,7 @@ Return Value: return Iosb; } - + // // Internal support routine // @@ -2751,7 +2751,7 @@ Arguments: return Iosb; } - + // // Internal support routine // @@ -3171,7 +3171,7 @@ Return Value: return Iosb; } - + // // Internal support routine // @@ -3913,7 +3913,7 @@ Return Value: return Iosb; } - + // // Internal support routine // @@ -4122,7 +4122,7 @@ Return Value: } - + // // Internal support routine // @@ -4402,7 +4402,7 @@ Return Value: return Iosb; } - + // // Internal support routine // @@ -4882,7 +4882,7 @@ Return Value: return Iosb; } - + // // Internal support routine // @@ -5596,7 +5596,7 @@ Return Value: return Iosb; } - + // // Internal support routine // @@ -6344,7 +6344,7 @@ Return Value: return Iosb; } - + // // Internal support routine // @@ -6823,7 +6823,7 @@ Return Value: } } - + NTSTATUS FatCheckSystemSecurityAccess ( _In_ PIRP_CONTEXT IrpContext @@ -6865,7 +6865,7 @@ FatCheckSystemSecurityAccess ( return STATUS_SUCCESS; } - + NTSTATUS FatCheckShareAccess ( _In_ PIRP_CONTEXT IrpContext, diff --git a/drivers/filesystems/fastfat_new/devctrl.c b/drivers/filesystems/fastfat_new/devctrl.c index 0abbcec6764..7a918f62283 100644 --- a/drivers/filesystems/fastfat_new/devctrl.c +++ b/drivers/filesystems/fastfat_new/devctrl.c @@ -44,7 +44,7 @@ FatDeviceControlCompletionRoutine( #pragma alloc_text(PAGE, FatFsdDeviceControl) #endif - + _Function_class_(IRP_MJ_DEVICE_CONTROL) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -120,7 +120,7 @@ Return Value: return Status; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonDeviceControl ( @@ -357,7 +357,7 @@ Return Value: // // Release all the resources that we held because of a - // VOLSNAP_FLUSH_AND_HOLD. + // VOLSNAP_FLUSH_AND_HOLD. // NT_ASSERT( IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_VOLSNAP_FLUSH_AND_HOLD_WRITES ); @@ -380,7 +380,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -395,7 +395,7 @@ FatDeviceControlCompletionRoutine( { PKEVENT Event = (PKEVENT) Contxt; - + // // If there is an event, this is a synch request. Signal and // let I/O know this isn't done yet. diff --git a/drivers/filesystems/fastfat_new/deviosup.c b/drivers/filesystems/fastfat_new/deviosup.c index a1712a396a6..eb2a3cefed0 100644 --- a/drivers/filesystems/fastfat_new/deviosup.c +++ b/drivers/filesystems/fastfat_new/deviosup.c @@ -187,7 +187,7 @@ FatSingleNonAlignedSync ( #else #define FatUpdateIOCountersPCW(IsAWrite,Count) #endif - + #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, FatMultipleAsync) #pragma alloc_text(PAGE, FatSingleAsync) @@ -206,7 +206,7 @@ typedef struct FAT_PAGING_FILE_CONTEXT { PMDL RestoreMdl; } FAT_PAGING_FILE_CONTEXT, *PFAT_PAGING_FILE_CONTEXT; - + VOID FatPagingFileIo ( IN PIRP Irp, @@ -520,7 +520,7 @@ Return Value: AssocIrp = IoMakeAssociatedIrp( Irp, (CCHAR)(DeviceObject->StackSize + 1) ); } - + if (AssocIrp == NULL) { AssocIrp = Irp; @@ -542,7 +542,7 @@ Return Value: // Note that since we failed to launch this associated Irp, that the completion // code at the bottom will take care of completing the master Irp. // - + if (!NT_SUCCESS(Irp->IoStatus.Status)) { NT_ASSERT( IrpCount ); @@ -550,22 +550,22 @@ Return Value: } } else { - + // // Indicate we used an associated Irp. // IrpCount -= 1; } - + // // With an associated IRP, we must take over the first stack location so // we can have one to put the completion routine on. When re-using the // master IRP, its already there. // - + if (!IrpIsMaster) { - + // // Get the first IRP stack location in the associated Irp // @@ -587,7 +587,7 @@ Return Value: // NextIrpSp->DeviceObject = IrpSp->DeviceObject; - + } else { // @@ -617,7 +617,7 @@ Return Value: // if (IrpIsMaster) { - + IoSetCompletionRoutine( AssocIrp, FatPagingFileCompletionRoutineCatch, &Context, @@ -626,7 +626,7 @@ Return Value: TRUE ); } else { - + IoSetCompletionRoutine( AssocIrp, FatPagingFileCompletionRoutine, Irp, @@ -671,7 +671,7 @@ Return Value: // if (IrpIsMaster) { - + KeWaitForSingleObject( &Context.Event, Executive, KernelMode, FALSE, NULL ); IrpIsMaster = MdlIsReserve = FALSE; @@ -684,7 +684,7 @@ Return Value: // associated Irp, and thus the completion code at the bottom will take care // of that for us. // - + if (!NT_SUCCESS(Irp->IoStatus.Status)) { NT_ASSERT( IrpCount ); @@ -710,14 +710,14 @@ Return Value: // // Advance the Lbo/Vbo if we have more to do in the current run. // - + NextLbo += NextByteCount; NextVbo += NextByteCount; NextByteCount = RemainingByteCount; - + } else { - + CurrentIndex += 1; if ( CurrentIndex <= LastIndex ) { @@ -739,11 +739,11 @@ Return Value: // If we didn't get enough associated Irps going to make this asynchronous, we // twiddle our thumbs and wait for those we did launch to complete. // - + if (IrpCount) { while (Irp->AssociatedIrp.IrpCount != IrpCount) { - + KeDelayExecutionThread (KernelMode, FALSE, &Fat30Milliseconds); } @@ -775,7 +775,7 @@ Arguments: Irp - Supplies the requesting Irp. ByteCount - The lengh of the operation. - + Return Value: None. @@ -875,9 +875,9 @@ Return Value: #endif - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatNonCachedIo ( IN PIRP_CONTEXT IrpContext, @@ -886,7 +886,7 @@ FatNonCachedIo ( IN ULONG StartingVbo, IN ULONG ByteCount, IN ULONG UserByteCount, - IN ULONG StreamFlags + IN ULONG StreamFlags ) /*++ @@ -907,7 +907,7 @@ Arguments: StartingVbo - The starting point for the operation. ByteCount - The lengh of the operation. - + UserByteCount - The last byte the user can see, rest to be zeroed. StreamFlags - flag to indicate special attributes for a NonCachedIo. @@ -1122,7 +1122,7 @@ Return Value: Stats->Fat.NonCachedDiskWrites += 1; } } - + DebugTrace( 0, Dbg, "Passing 1 Irp on to Disk Driver\n", 0 ); FatSingleAsync( IrpContext, @@ -1207,7 +1207,7 @@ Return Value: IoRuns[NextRun].Offset = BufferOffset; IoRuns[NextRun].ByteCount = NextByteCount; NextRun += 1; - + // // Now adjust everything for the next pass through the loop. // @@ -1233,7 +1233,7 @@ Return Value: &NextByteCount ); - NT_ASSERT(NextVbo == StartingVbo); + NT_ASSERT(NextVbo == StartingVbo); } @@ -1289,8 +1289,8 @@ Return Value: return Irp->IoStatus.Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatNonCachedNonAlignedRead ( IN PIRP_CONTEXT IrpContext, @@ -1617,7 +1617,7 @@ Return Value: return; } - + VOID FatMultipleAsync ( IN PIRP_CONTEXT IrpContext, @@ -1875,7 +1875,7 @@ Return Value: // // For async requests if we acquired locks, transition the lock owners to an - // object, since when we return this thread could go away before request + // object, since when we return this thread could go away before request // completion, and the resource package may try to boost priority. // @@ -1952,8 +1952,8 @@ Return Value: if (!ExceptionExpected) { NT_ASSERT( ExceptionExpected ); #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) -#endif +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#endif FatBugCheck( 0, 0, 0 ); } @@ -1985,7 +1985,7 @@ Return Value: return; } - + VOID FatSingleAsync ( IN PIRP_CONTEXT IrpContext, @@ -2095,15 +2095,15 @@ Return Value: // // If this I/O requires override verify, bypass the verify logic. // - + if (FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_OVERRIDE_VERIFY )) { - + SetFlag( IrpSp->Flags, SL_OVERRIDE_VERIFY_VOLUME ); } // // For async requests if we acquired locks, transition the lock owners to an - // object, since when we return this thread could go away before request + // object, since when we return this thread could go away before request // completion, and the resource package may try to boost priority. // @@ -2128,7 +2128,7 @@ Return Value: // // Back up a copy of the IrpContext flags for later use in async completion. // - + IrpContext->FatIoContext->IrpContextFlags = IrpContext->Flags; // @@ -2166,7 +2166,7 @@ Return Value: return; } - + VOID FatSingleNonAlignedSync ( IN PIRP_CONTEXT IrpContext, @@ -2310,9 +2310,9 @@ Return Value: // // If this I/O requires override verify, bypass the verify logic. // - + if (FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_OVERRIDE_VERIFY )) { - + SetFlag( IrpSp->Flags, SL_OVERRIDE_VERIFY_VOLUME ); } @@ -2362,7 +2362,7 @@ Return Value: return; } - + VOID FatWaitSync ( IN PIRP_CONTEXT IrpContext @@ -2396,7 +2396,7 @@ Return Value: DebugTrace(-1, Dbg, "FatWaitSync -> VOID\n", 0 ); } - + // // Internal Support Routine // @@ -2497,7 +2497,7 @@ Return Value: return STATUS_MORE_PROCESSING_REQUIRED; } - + // // Internal Support Routine // @@ -2574,11 +2574,11 @@ Return Value: #endif MasterIrp->IoStatus = Irp->IoStatus; - + } NT_ASSERT( !(NT_SUCCESS( Irp->IoStatus.Status ) && Irp->IoStatus.Information == 0 )); - + if (InterlockedDecrement(&Context->IrpCount) == 0) { FatDoCompletionZero( MasterIrp, Context ); @@ -2600,19 +2600,19 @@ Return Value: IoGetCurrentIrpStackLocation(MasterIrp)->MajorFunction == IRP_MJ_READ ? FO_FILE_FAST_IO_READ : FO_FILE_MODIFIED ); } - + } else { // // Post STATUS_VERIFY_REQUIRED failures. Only post top level IRPs, because recursive I/Os // cannot process volume verification. // - - if (!FlagOn(Context->IrpContextFlags, IRP_CONTEXT_FLAG_RECURSIVE_CALL) && + + if (!FlagOn(Context->IrpContextFlags, IRP_CONTEXT_FLAG_RECURSIVE_CALL) && (MasterIrp->IoStatus.Status == STATUS_VERIFY_REQUIRED)) { PostRequest = TRUE; - } - + } + } // @@ -2643,7 +2643,7 @@ Return Value: } if (Context->Wait.Async.Resource2 != NULL) { - + ExReleaseResourceForThreadLite( Context->Wait.Async.Resource2, Context->Wait.Async.ResourceThreadId ); } @@ -2665,22 +2665,22 @@ Return Value: PIRP_CONTEXT IrpContext = NULL; _SEH2_TRY { - + IrpContext = FatCreateIrpContext(Irp, TRUE ); ClearFlag(IrpContext->Flags, IRP_CONTEXT_FLAG_RECURSIVE_CALL); FatFsdPostRequest( IrpContext, Irp ); Status = STATUS_MORE_PROCESSING_REQUIRED; - + } _SEH2_EXCEPT( FatExceptionFilter(NULL, _SEH2_GetExceptionInformation()) ) { // // If we failed to post the IRP, we just have to return the failure // to the user. :( // - + NOTHING; } _SEH2_END; - } + } } DebugTrace(-1, Dbg, "FatMultiAsyncCompletionRoutine -> SUCCESS\n", 0 ); @@ -2690,7 +2690,7 @@ Return Value: return Status; } - + NTSTATUS FatPagingFileErrorHandler ( IN PIRP Irp, @@ -2703,36 +2703,36 @@ Routine Description: This routine attempts to guarantee that the media is marked dirty with the surface test bit if a paging file IO fails. - + The work done here has several basic problems - + 1) when paging file writes start failing, this is a good sign that the rest of the system is about to fall down around us - + 2) it has no forward progress guarantee - + With Whistler, it is actually quite intentional that we're rejiggering the paging file write path to make forward progress at all times. This means that the cases where it *does* fail, we're truly seeing media errors and this is probably going to mean the paging file is going to stop working very soon. - + It'd be nice to make this guarantee progress. It would need - + 1) a guaranteed worker thread which can only be used by items which will make forward progress (i.e., not block out this one) - + 2) the virtual volume file's pages containing the boot sector and 1st FAT entry would have to be pinned resident and have a guaranteed mapping address - + 3) mark volume would have to have a stashed irp/mdl and roll the write irp, or use a generalized mechanism to guarantee issue of the irp - + 4) the lower stack would have to guarantee progress - + Of these, 1 and 4 may actually exist shortly. - + Arguments: Irp - Pointer to the associated Irp which is being failed. @@ -2795,7 +2795,7 @@ Return Value: return Status; } - + // // Internal Support Routine // @@ -2822,9 +2822,9 @@ Routine Description: worker item to write out the dirty bit so that the next time we run we will do a autochk /r. This is not forward progress guaranteed at the moment. - + Clean up the Mdl used for this partial request. - + Note that if the Irp is failing, the error code is already where we want it. @@ -2849,7 +2849,7 @@ Return Value: UNREFERENCED_PARAMETER( DeviceObject ); DebugTrace(+1, Dbg, "FatPagingFileCompletionRoutineCatch, Context = %p\n", Context ); - + // // Cleanup the existing Mdl, perhaps by returning the reserve. // @@ -2858,7 +2858,7 @@ Return Value: MmPrepareMdlForReuse( Irp->MdlAddress ); KeSetEvent( &FatReserveEvent, 0, FALSE ); - + } else { IoFreeMdl( Irp->MdlAddress ); @@ -2885,10 +2885,10 @@ Return Value: } return STATUS_MORE_PROCESSING_REQUIRED; - + } - + // // Internal Support Routine // @@ -2957,7 +2957,7 @@ Return Value: return FatPagingFileErrorHandler( Irp, NULL ); } - + // // Internal Support Routine // @@ -3024,7 +3024,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Internal Support Routine // @@ -3096,7 +3096,7 @@ Return Value: return STATUS_MORE_PROCESSING_REQUIRED; } - + // // Internal Support Routine // @@ -3142,7 +3142,7 @@ Return Value: { NTSTATUS Status = STATUS_SUCCESS; - + PFAT_IO_CONTEXT Context = Contxt; BOOLEAN PostRequest = FALSE; @@ -3178,7 +3178,7 @@ Return Value: DbgBreakPoint(); } #endif - + #ifdef SYSCACHE_COMPILE DbgPrint( "FAT SYSCACHE: SingleAsync (IRP %08x) -> %08x\n", Irp, Irp->IoStatus ); #endif @@ -3187,8 +3187,8 @@ Return Value: // Post STATUS_VERIFY_REQUIRED failures. Only post top level IRPs, because recursive I/Os // cannot process volume verification. // - - if (!FlagOn(Context->IrpContextFlags, IRP_CONTEXT_FLAG_RECURSIVE_CALL) && + + if (!FlagOn(Context->IrpContextFlags, IRP_CONTEXT_FLAG_RECURSIVE_CALL) && (Irp->IoStatus.Status == STATUS_VERIFY_REQUIRED)) { PostRequest = TRUE; } @@ -3218,13 +3218,13 @@ Return Value: // if (Context->Wait.Async.Resource != NULL) { - + ExReleaseResourceForThreadLite( Context->Wait.Async.Resource, Context->Wait.Async.ResourceThreadId ); } - + if (Context->Wait.Async.Resource2 != NULL) { - + ExReleaseResourceForThreadLite( Context->Wait.Async.Resource2, Context->Wait.Async.ResourceThreadId ); } @@ -3246,19 +3246,19 @@ Return Value: PIRP_CONTEXT IrpContext = NULL; _SEH2_TRY { - + IrpContext = FatCreateIrpContext(Irp, TRUE ); - ClearFlag(IrpContext->Flags, IRP_CONTEXT_FLAG_RECURSIVE_CALL); + ClearFlag(IrpContext->Flags, IRP_CONTEXT_FLAG_RECURSIVE_CALL); FatFsdPostRequest( IrpContext, Irp ); Status = STATUS_MORE_PROCESSING_REQUIRED; - + } _SEH2_EXCEPT( FatExceptionFilter(NULL, _SEH2_GetExceptionInformation()) ) { // // If we failed to post the IRP, we just have to return the failure // to the user. :( // - + NOTHING; } _SEH2_END; } @@ -3271,7 +3271,7 @@ Return Value: return Status; } - + VOID FatLockUserBuffer ( IN PIRP_CONTEXT IrpContext, @@ -3352,7 +3352,7 @@ Return Value: UNREFERENCED_PARAMETER( IrpContext ); } - + PVOID FatMapUserBuffer ( IN PIRP_CONTEXT IrpContext, @@ -3366,7 +3366,7 @@ Routine Description: This routine conditionally maps the user buffer for the current I/O request in the specified mode. If the buffer is already mapped, it just returns its address. - + Note that this is the *input/output* buffer. Arguments: @@ -3392,7 +3392,7 @@ Return Value: if (Irp->MdlAddress == NULL) { return Irp->UserBuffer; - + } else { PVOID Address = MmGetSystemAddressForMdlSafe( Irp->MdlAddress, NormalPagePriority | MdlMappingNoExecute ); @@ -3406,7 +3406,7 @@ Return Value: } } - + PVOID FatBufferUserBuffer ( IN PIRP_CONTEXT IrpContext, @@ -3420,7 +3420,7 @@ Routine Description: This routine conditionally buffers the user buffer for the current I/O request. If the buffer is already buffered, it just returns its address. - + Note that this is the *input* buffer. Arguments: @@ -3428,7 +3428,7 @@ Arguments: Irp - Pointer to the Irp for the request. BufferLength - Length of user buffer. - + Return Value: Buffered address. @@ -3445,12 +3445,12 @@ Return Value: // // Handle the no buffer case. // - + if (BufferLength == 0) { return NULL; } - + // // If there is no system buffer we must have been supplied an Mdl // describing the users input buffer, which we will now snapshot. @@ -3478,19 +3478,19 @@ Return Value: BufferLength ); } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { - + NTSTATUS Status; - + Status = _SEH2_GetExceptionCode(); FatRaiseStatus( IrpContext, FsRtlIsNtstatusExpected(Status) ? Status : STATUS_INVALID_USER_BUFFER ); } _SEH2_END; } - + return Irp->AssociatedIrp.SystemBuffer; } - + NTSTATUS FatToggleMediaEjectDisable ( IN PIRP_CONTEXT IrpContext, @@ -3560,7 +3560,7 @@ Return Value: // So passing NULL for the final parameter is ok in this special case. // #ifdef _MSC_VER -#pragma warning(suppress: 6387) +#pragma warning(suppress: 6387) #endif Irp = IoBuildDeviceIoControlRequest( IOCTL_DISK_MEDIA_REMOVAL, Vcb->TargetDeviceObject, @@ -3600,7 +3600,7 @@ Return Value: Status = IoCallDriver( Vcb->TargetDeviceObject, Irp ); if (Status == STATUS_PENDING) { - + (VOID) KeWaitForSingleObject( &SyncContext.Event, Executive, KernelMode, @@ -3616,7 +3616,7 @@ Return Value: return STATUS_INSUFFICIENT_RESOURCES; } - + NTSTATUS FatPerformDevIoCtrl ( IN PIRP_CONTEXT IrpContext, diff --git a/drivers/filesystems/fastfat_new/dirctrl.c b/drivers/filesystems/fastfat_new/dirctrl.c index f25d2a2e7eb..2d437af6a38 100644 --- a/drivers/filesystems/fastfat_new/dirctrl.c +++ b/drivers/filesystems/fastfat_new/dirctrl.c @@ -65,7 +65,7 @@ FatNotifyChangeDirectory ( #endif - + _Function_class_(IRP_MJ_DIRECTORY_CONTROL) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -146,7 +146,7 @@ Return Value: return Status; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonDirectoryControl ( @@ -219,7 +219,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -290,7 +290,7 @@ Return Value: PFILE_ID_BOTH_DIR_INFORMATION IdBothDirInfo; PFILE_NAMES_INFORMATION NamesInfo; - + PAGED_CODE(); // @@ -334,7 +334,7 @@ Return Value: // but UserDirectoryOpens. Also check that the filename is a valid // UNICODE string. // - + if (FatDecodeFileObject( IrpSp->FileObject, &Vcb, &Dcb, @@ -375,8 +375,8 @@ Return Value: // order to update the search string in the Ccb. We may // discover that we are not the initial query once we grab the Fcb // and downgrade our status. - // - // If restartscan is set, we may be replacing the query template, + // + // If restartscan is set, we may be replacing the query template, // so take the FCB exclusive to protect against multiple people // changing the CCB at once. // @@ -457,19 +457,19 @@ Return Value: // name. // - if (InitialQuery || + if (InitialQuery || (RestartScan && UniArgFileName != NULL && UniArgFileName->Length != 0)) { // // If we're restarting the scan, clear out the pattern in the Ccb and regenerate it, // - + if (RestartScan) { - + if (Ccb->UnicodeQueryTemplate.Buffer) { if (FlagOn(Ccb->Flags, CCB_FLAG_FREE_UNICODE)) { - + ExFreePoolWithTag(Ccb->UnicodeQueryTemplate.Buffer, TAG_FILENAME_BUFFER); ClearFlag(Ccb->Flags, CCB_FLAG_FREE_UNICODE); } @@ -486,7 +486,7 @@ Return Value: RtlFreeOemString( &Ccb->OemQueryTemplate.Wild ); ClearFlag(Ccb->Flags, CCB_FLAG_FREE_OEM_BEST_FIT); } - + Ccb->OemQueryTemplate.Wild.Buffer = NULL; Ccb->OemQueryTemplate.Wild.Length = 0; Ccb->OemQueryTemplate.Wild.MaximumLength = 0; @@ -833,11 +833,11 @@ Return Value: // We'll case on the type of information requested and fill up // the user buffer if everything fits. // - + // // Determine the UNICODE length of the file name. // - + FileNameLength = RtlOemStringToCountedUnicodeSize(&Fat8Dot3String); // @@ -855,18 +855,18 @@ Return Value: // STATUS_SUCCESS is returned. A subsequent query will // pick up with this record. // - + BytesRemainingInBuffer = UserBufferLength - NextEntry; - + if ( (NextEntry != 0) && ( (BaseLength + FileNameLength > BytesRemainingInBuffer) || (UserBufferLength < NextEntry) ) ) { - + DebugTrace(0, Dbg, "Next entry won't fit\n", 0); - + try_return( Status = STATUS_SUCCESS ); } - + NT_ASSERT( BytesRemainingInBuffer >= BaseLength ); // @@ -876,53 +876,53 @@ Return Value: RtlZeroMemory( &Buffer[NextEntry], BaseLength ); switch ( FileInformationClass ) { - + // // Now fill the base parts of the strucure that are applicable. // - + case FileBothDirectoryInformation: case FileFullDirectoryInformation: case FileIdBothDirectoryInformation: case FileIdFullDirectoryInformation: DebugTrace(0, Dbg, "FatQueryDirectory -> Getting file full directory information\n", 0); - + // // Get the Ea file length. // - + FullDirInfo = (PFILE_FULL_DIR_INFORMATION)&Buffer[NextEntry]; - + // // If the EAs are corrupt, ignore the error. We don't want // to abort the directory query. // - + _SEH2_TRY { - + FatGetEaLength( IrpContext, Vcb, Dirent, &FullDirInfo->EaSize ); - + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - + FatResetExceptionState( IrpContext ); FullDirInfo->EaSize = 0; } _SEH2_END; - + case FileDirectoryInformation: - + DirInfo = (PFILE_DIRECTORY_INFORMATION)&Buffer[NextEntry]; - + FatGetDirTimes( IrpContext, Dirent, DirInfo ); - + DirInfo->EndOfFile.QuadPart = Dirent->FileSize; if (!FlagOn( Dirent->Attributes, FAT_DIRENT_ATTR_DIRECTORY )) { - + DirInfo->AllocationSize.QuadPart = (((Dirent->FileSize + DiskAllocSize - 1) / DiskAllocSize) * DiskAllocSize ); @@ -937,87 +937,87 @@ Return Value: DirInfo->FileAttributes = 0; DirInfo->FileAttributes |= FILE_ATTRIBUTE_NORMAL; - } - + } + DirInfo->FileIndex = NextVbo; - + DirInfo->FileNameLength = FileNameLength; - + DebugTrace(0, Dbg, "FatQueryDirectory -> Name = \"%Z\"\n", &Fat8Dot3String); - + break; - + case FileNamesInformation: - + DebugTrace(0, Dbg, "FatQueryDirectory -> Getting file names information\n", 0); - + NamesInfo = (PFILE_NAMES_INFORMATION)&Buffer[NextEntry]; - + NamesInfo->FileIndex = NextVbo; - + NamesInfo->FileNameLength = FileNameLength; - + DebugTrace(0, Dbg, "FatQueryDirectory -> Name = \"%Z\"\n", &Fat8Dot3String ); - + break; - + default: - + #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif FatBugCheck( FileInformationClass, 0, 0 ); } BytesConverted = 0; - + Status = RtlOemToUnicodeN( (PWCH)&Buffer[NextEntry + BaseLength], BytesRemainingInBuffer - BaseLength, &BytesConverted, Fat8Dot3String.Buffer, Fat8Dot3String.Length ); - + // // Check for the case that a single entry doesn't fit. // This should only get this far on the first entry // - + if (BytesConverted < FileNameLength) { - + NT_ASSERT( NextEntry == 0 ); Status = STATUS_BUFFER_OVERFLOW; } - + // // Set up the previous next entry offset // - + *((PULONG)(&Buffer[LastEntry])) = NextEntry - LastEntry; - + // // And indicate how much of the user buffer we have currently // used up. We must compute this value before we long align // ourselves for the next entry // - + Irp->IoStatus.Information = QuadAlign( Irp->IoStatus.Information ) + BaseLength + BytesConverted; - + // // If something happened with the conversion, bail here. // - + if ( !NT_SUCCESS( Status ) ) { - + try_return( NOTHING ); } } else { ULONG ShortNameLength; - + FileNameLength = LongFileName.Length; - + // // Here are the rules concerning filling up the buffer: // @@ -1033,20 +1033,20 @@ Return Value: // STATUS_SUCCESS is returned. A subsequent query will // pick up with this record. // - + BytesRemainingInBuffer = UserBufferLength - NextEntry; - + if ( (NextEntry != 0) && ( (BaseLength + FileNameLength > BytesRemainingInBuffer) || (UserBufferLength < NextEntry) ) ) { - + DebugTrace(0, Dbg, "Next entry won't fit\n", 0); - + try_return( Status = STATUS_SUCCESS ); } - + NT_ASSERT( BytesRemainingInBuffer >= BaseLength ); - + // // Zero the base part of the structure. // @@ -1054,90 +1054,90 @@ Return Value: RtlZeroMemory( &Buffer[NextEntry], BaseLength ); switch ( FileInformationClass ) { - + // // Now fill the base parts of the strucure that are applicable. // - + case FileBothDirectoryInformation: case FileIdBothDirectoryInformation: - + BothDirInfo = (PFILE_BOTH_DIR_INFORMATION)&Buffer[NextEntry]; - + // // Now we have an entry to return to our caller. We'll convert // the name from the form in the dirent to a . form. // We'll case on the type of information requested and fill up // the user buffer if everything fits. // - + Fat8dot3ToString( IrpContext, Dirent, FALSE, &Fat8Dot3String ); - + NT_ASSERT( Fat8Dot3String.Length <= 12 ); - + Status = RtlOemToUnicodeN( &BothDirInfo->ShortName[0], 12*sizeof(WCHAR), &ShortNameLength, Fat8Dot3String.Buffer, Fat8Dot3String.Length ); - + NT_ASSERT( Status != STATUS_BUFFER_OVERFLOW ); NT_ASSERT( ShortNameLength <= 12*sizeof(WCHAR) ); - + // // Copy the length into the dirinfo structure. Note // that the LHS below is a USHORT, so it can not // be specificed as the OUT parameter above. // - + BothDirInfo->ShortNameLength = (UCHAR)ShortNameLength; - + // // If something happened with the conversion, bail here. // - + if ( !NT_SUCCESS( Status ) ) { - + try_return( NOTHING ); } - + case FileFullDirectoryInformation: case FileIdFullDirectoryInformation: - + DebugTrace(0, Dbg, "FatQueryDirectory -> Getting file full directory information\n", 0); - + // // Get the Ea file length. // - + FullDirInfo = (PFILE_FULL_DIR_INFORMATION)&Buffer[NextEntry]; - + // // If the EAs are corrupt, ignore the error. We don't want // to abort the directory query. // - + _SEH2_TRY { - + FatGetEaLength( IrpContext, Vcb, Dirent, &FullDirInfo->EaSize ); - + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - + FatResetExceptionState( IrpContext ); FullDirInfo->EaSize = 0; } _SEH2_END; - + case FileDirectoryInformation: - + DirInfo = (PFILE_DIRECTORY_INFORMATION)&Buffer[NextEntry]; - + FatGetDirTimes( IrpContext, Dirent, DirInfo ); - + DirInfo->EndOfFile.QuadPart = Dirent->FileSize; - + if (!FlagOn( Dirent->Attributes, FAT_DIRENT_ATTR_DIRECTORY )) { @@ -1147,7 +1147,7 @@ Return Value: / DiskAllocSize ) * DiskAllocSize ); } - + if (Dirent->Attributes != 0) { DirInfo->FileAttributes = Dirent->Attributes; @@ -1162,31 +1162,31 @@ Return Value: DirInfo->FileIndex = NextVbo; - + DirInfo->FileNameLength = FileNameLength; - + DebugTrace(0, Dbg, "FatQueryDirectory -> Name = \"%Z\"\n", &Fat8Dot3String); - + break; - + case FileNamesInformation: - + DebugTrace(0, Dbg, "FatQueryDirectory -> Getting file names information\n", 0); - + NamesInfo = (PFILE_NAMES_INFORMATION)&Buffer[NextEntry]; - + NamesInfo->FileIndex = NextVbo; - + NamesInfo->FileNameLength = FileNameLength; - + DebugTrace(0, Dbg, "FatQueryDirectory -> Name = \"%Z\"\n", &Fat8Dot3String ); - + break; - + default: #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif FatBugCheck( FileInformationClass, 0, 0 ); } @@ -1194,15 +1194,15 @@ Return Value: BytesConverted = BytesRemainingInBuffer - BaseLength >= FileNameLength ? FileNameLength : BytesRemainingInBuffer - BaseLength; - + RtlCopyMemory( &Buffer[NextEntry + BaseLength], &LongFileName.Buffer[0], BytesConverted ); - + // // Set up the previous next entry offset // - + *((PULONG)(&Buffer[LastEntry])) = NextEntry - LastEntry; // @@ -1210,7 +1210,7 @@ Return Value: // used up. We must compute this value before we long align // ourselves for the next entry // - + Irp->IoStatus.Information = QuadAlign( Irp->IoStatus.Information ) + BaseLength + BytesConverted; @@ -1248,7 +1248,7 @@ Return Value: default: break; } - + } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { // @@ -1256,7 +1256,7 @@ Return Value: // fail this request. This is the only reason any exception // would have occured at this level. // - + Irp->IoStatus.Information = 0; UpdateCcb = FALSE; try_return( Status = _SEH2_GetExceptionCode()); @@ -1268,7 +1268,7 @@ Return Value: LastEntry = NextEntry; NextEntry += (ULONG)QuadAlign(BaseLength + BytesConverted); - + CurrentVbo = NextVbo + sizeof( DIRENT ); } @@ -1321,7 +1321,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -1442,7 +1442,7 @@ Return Value: } } - + // // Local Support Routine // diff --git a/drivers/filesystems/fastfat_new/dirsup.c b/drivers/filesystems/fastfat_new/dirsup.c index 8c3bccdb9fd..451da1f9289 100644 --- a/drivers/filesystems/fastfat_new/dirsup.c +++ b/drivers/filesystems/fastfat_new/dirsup.c @@ -194,7 +194,7 @@ FatDefragDirectory ( #endif - + _Requires_lock_held_(_Global_critical_region_) ULONG FatCreateNewDirent ( @@ -213,7 +213,7 @@ Routine Description: because the disk is full or the root directory is full) then it raises the appropriate status. The dirent itself is neither initialized nor pinned by this procedure. - + Arguments: ParentDirectory - Supplies the DCB for the directory in which @@ -373,7 +373,7 @@ Return Value: // if (ParentDirectory->Header.AllocationSize.LowPart >= (64 * 1024 * sizeof(DIRENT)) || - + // // Make sure we are not trying to expand the root directory on non // FAT32. FAT16 and FAT12 have fixed size allocations. @@ -381,7 +381,7 @@ Return Value: (!FatIsFat32(ParentDirectory->Vcb) && NodeType(ParentDirectory) == FAT_NTC_ROOT_DCB)) { - + DebugTrace(0, Dbg, "Full root directory or too big on FAT32. Raise Status.\n", 0); FatRaiseStatus( IrpContext, STATUS_CANNOT_MAKE ); @@ -545,7 +545,7 @@ Return Value: return ByteOffset; } - + _Requires_lock_held_(_Global_critical_region_) VOID @@ -647,7 +647,7 @@ Return Value: return; } - + VOID FatTunnelFcbOrDcb ( IN PFCB FcbOrDcb, @@ -755,7 +755,7 @@ Return Value: if ((i*sizeof(WCHAR)) < ShortNameWithCase.Length) { DownCaseSeg.Buffer = &ShortNameWithCase.Buffer[i]; DownCaseSeg.MaximumLength = DownCaseSeg.Length = ShortNameWithCase.Length - i*sizeof(WCHAR); - + RtlDowncaseUnicodeString(&DownCaseSeg, &DownCaseSeg, FALSE); } } @@ -779,9 +779,9 @@ Return Value: return; } - - -_Requires_lock_held_(_Global_critical_region_) + + +_Requires_lock_held_(_Global_critical_region_) VOID FatDeleteDirent ( IN PIRP_CONTEXT IrpContext, @@ -838,7 +838,7 @@ Return Value: // Among other reasons, it'd be unfortunate if this raced with the // rename path. // - + NT_ASSERT( ExIsResourceAcquiredExclusiveLite( &FcbOrDcb->Vcb->Resource )); // @@ -857,9 +857,9 @@ Return Value: (FcbOrDcb->Header.FileSize.LowPart != 0)))) { DebugTrace( 0, Dbg, "Called with non zero allocation/file size.\n", 0); - + #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif FatBugCheck( 0, 0, 0 ); } @@ -879,9 +879,9 @@ Return Value: // // This relies on our bottom up lockorder. // - + ExAcquireResourceExclusiveLite( FcbOrDcb->ParentDcb->Header.Resource, TRUE ); - + for ( Offset = FcbOrDcb->LfnOffsetWithinDirectory; Offset <= FcbOrDcb->DirentOffsetWithinDirectory; Offset += sizeof(DIRENT), Dirent += 1 ) { @@ -966,7 +966,7 @@ Return Value: Dirent->FileSize = DeleteContext->FileSize; - + Dirent->FirstClusterOfFile = (USHORT)DeleteContext->FirstClusterOfFile; } @@ -985,11 +985,11 @@ Return Value: } _SEH2_FINALLY { FatUnpinBcb( IrpContext, Bcb ); - + // // Release our parent. // - + ExReleaseResourceLite( FcbOrDcb->ParentDcb->Header.Resource ); } _SEH2_END; @@ -1017,7 +1017,7 @@ Arguments: Lfn - The Lfn to look for - Lfn - Temporary buffer to use to search for Lfn with (if < MAX_LFN then this + Lfn - Temporary buffer to use to search for Lfn with (if < MAX_LFN then this function may cause it to be allocated from pool if not large enough. Retrn Value: @@ -1045,7 +1045,7 @@ Retrn Value: Ccb.Flags = CCB_FLAG_SKIP_SHORT_NAME_COMPARE | CCB_FLAG_QUERY_TEMPLATE_MIXED; _SEH2_TRY { - + FatLocateDirent( IrpContext, Dcb, &Ccb, @@ -1057,20 +1057,20 @@ Retrn Value: NULL, LfnTmp, NULL ); - + } _SEH2_FINALLY { if (DirentBcb) { Result = TRUE; } - + FatUnpinBcb(IrpContext, DirentBcb); } _SEH2_END; return Result; } - + _Requires_lock_held_(_Global_critical_region_) VOID @@ -1085,7 +1085,7 @@ FatLocateDirent ( OUT PVBO ByteOffset, OUT PBOOLEAN FileNameDos OPTIONAL, IN OUT PUNICODE_STRING LongFileName OPTIONAL, - IN OUT PUNICODE_STRING OrigLongFileName OPTIONAL + IN OUT PUNICODE_STRING OrigLongFileName OPTIONAL ) /*++ @@ -1138,7 +1138,7 @@ Return Value: UNICODE_STRING UpcasedLfn = {0}; WCHAR LocalLfnBuffer[32]; - + BOOLEAN LfnInProgress = FALSE; UCHAR LfnChecksum = 0; ULONG LfnSize = 0; @@ -1162,7 +1162,7 @@ Return Value: // We must have acquired the parent or the vcb to synchronize with deletion. This // is important since we can't survive racing a thread marking a series of lfn // dirents deleted - we'd get a bogus ordinal, and otherwise get really messed up. - // + // // This routine cannot do the acquire since it would be out-of-order with respect // to the Bcb resources on iterative calls. Our order has Bcbs as the inferior resource. // @@ -1176,7 +1176,7 @@ Return Value: ExIsResourceAcquiredExclusiveLite( ParentDirectory->Header.Resource ) || ExIsResourceAcquiredSharedLite( &ParentDirectory->Vcb->Resource ) || ExIsResourceAcquiredExclusiveLite( &ParentDirectory->Vcb->Resource )); - + // // The algorithm here is pretty simple. We just walk through the // parent directory until we: @@ -1188,7 +1188,7 @@ Return Value: // // In the first case we found it, in the latter three cases we did not. // - + UNREFERENCED_PARAMETER( Flags ); // future use @@ -1297,7 +1297,7 @@ Return Value: // If the entry is marked deleted, skip. If there was an Lfn in // progress we throw it out at this point. // - + if ((*Dirent)->FileName[0] == FAT_DIRENT_DELETED) { LfnInProgress = FALSE; @@ -1392,7 +1392,7 @@ Return Value: LfnIndex = (Ordinal - 1) * 13; - FatEnsureStringBufferEnough( LongFileName, + FatEnsureStringBufferEnough( LongFileName, (USHORT)((LfnIndex + 13) << 1)); RtlCopyMemory( &LongFileName->Buffer[LfnIndex+0], @@ -1475,7 +1475,7 @@ Return Value: // If we actually were asked to hand back volume labels, // do it. // - + if (FlagOn(Ccb->Flags, CCB_FLAG_MATCH_VOLUME_ID)) { break; @@ -1510,7 +1510,7 @@ Return Value: } - + // // If we are supposed to match all entries, then match this entry. // @@ -1630,7 +1630,7 @@ Return Value: // We need a buffer. Try to avoid doing an allocation. // - FatEnsureStringBufferEnough( &UpcasedLfn, + FatEnsureStringBufferEnough( &UpcasedLfn, LongFileName->Length); Status = RtlUpcaseUnicodeString( &UpcasedLfn, @@ -1644,7 +1644,7 @@ Return Value: UpcasedLfnValid = TRUE; - + } // @@ -1671,7 +1671,7 @@ Return Value: break; } - + } } @@ -1705,7 +1705,7 @@ GetNextDirent: FatFreeStringBuffer( &UpcasedLfn ); - + } _SEH2_END; DebugTrace(-1, Dbg, "FatLocateDirent -> (VOID)\n", 0); @@ -1715,8 +1715,8 @@ GetNextDirent: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatLocateSimpleOemDirent ( IN PIRP_CONTEXT IrpContext, @@ -1793,7 +1793,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID @@ -1935,7 +1935,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID @@ -2029,17 +2029,17 @@ Return Value: // verify) but we'll handle and raise here to save all callers checking the // pointers. // - + if ((NULL == *Dirent) && !ReturnOnFailure) { NT_ASSERT( FALSE); FatRaiseStatus( IrpContext, STATUS_FILE_CORRUPT_ERROR); } - + DebugTrace(-1, Dbg, "FatGetDirentFromFcbOrDcb -> (VOID)\n", 0); } - + _Requires_lock_held_(_Global_critical_region_) BOOLEAN @@ -2139,10 +2139,10 @@ Return Value: if ((Dirent->FileName[0] != FAT_DIRENT_DELETED) && (Dirent->Attributes != FAT_DIRENT_ATTR_LFN)) { - + break; - + } // @@ -2163,10 +2163,10 @@ Return Value: return IsDirectoryEmpty; } - - + + VOID FatConstructDirent ( IN PIRP_CONTEXT IrpContext, @@ -2248,7 +2248,7 @@ Return Value: FALSE, &Dirent->CreationTime, &Dirent->CreationMSec )) { - + // // No tunneled time or the tunneled time was bogus. Since we aren't // responsible for initializing the to-be-created Fcb with creation @@ -2435,7 +2435,7 @@ Return Value: return; } - + VOID FatConstructLabelDirent ( IN PIRP_CONTEXT IrpContext, @@ -2494,8 +2494,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatSetFileSizeInDirent ( IN PIRP_CONTEXT IrpContext, @@ -2549,7 +2549,7 @@ Return Value: } _SEH2_END; } -_Requires_lock_held_(_Global_critical_region_) +_Requires_lock_held_(_Global_critical_region_) VOID FatSetFileSizeInDirentNoRaise ( IN PIRP_CONTEXT IrpContext, @@ -2580,9 +2580,9 @@ Return Value: { _SEH2_TRY { - + FatSetFileSizeInDirent( IrpContext, Fcb, AlternativeFileSize ); - + } _SEH2_EXCEPT(FatExceptionFilter( IrpContext, _SEH2_GetExceptionInformation() )) { NOTHING; @@ -2590,7 +2590,7 @@ Return Value: } -_Requires_lock_held_(_Global_critical_region_) +_Requires_lock_held_(_Global_critical_region_) VOID FatUpdateDirentFromFcb ( IN PIRP_CONTEXT IrpContext, @@ -2611,9 +2611,9 @@ Routine Description: Arguments: FileObject - Fileobject representing the handle involved - + FcbOrDcb - File/Dir involved - + Ccb - User context involved Return Value: @@ -2645,7 +2645,7 @@ Return Value: // Nothing to do if the fcb is bad, volume is readonly or we got the // root dir. // - + if (FcbOrDcb->FcbCondition != FcbGood || NodeType(FcbOrDcb) == FAT_NTC_ROOT_DCB || FlagOn(FcbOrDcb->Vcb->VcbState, VCB_STATE_FLAG_WRITE_PROTECTED)) { @@ -2722,7 +2722,7 @@ Return Value: // Break parent directory oplock. Directory oplock breaks are // always advisory, so we will never block/get STATUS_PENDING here. // - + if (FcbOrDcb->ParentDcb != NULL) { FsRtlCheckOplockEx( FatGetFcbOplock(FcbOrDcb->ParentDcb), @@ -2733,7 +2733,7 @@ Return Value: NULL ); } #endif - + // // Get the dirent // @@ -2757,7 +2757,7 @@ Return Value: Dirent->Attributes |= FILE_ATTRIBUTE_ARCHIVE; FcbOrDcb->DirentFatFlags |= FILE_ATTRIBUTE_ARCHIVE; - + NotifyFilter |= FILE_NOTIFY_CHANGE_ATTRIBUTES; UpdateDirent = TRUE; } @@ -2813,15 +2813,15 @@ Return Value: // NT_ASSERT( NodeType(FcbOrDcb) == FAT_NTC_FCB ); - + if (Dirent->FileSize != FcbOrDcb->Header.FileSize.LowPart) { - + // // Update the dirent file size // - + Dirent->FileSize = FcbOrDcb->Header.FileSize.LowPart; - + // // We call the notify package to report that the // size has changed. @@ -2829,9 +2829,9 @@ Return Value: NotifyFilter |= FILE_NOTIFY_CHANGE_SIZE; UpdateDirent = TRUE; - } + } + - } @@ -2869,7 +2869,7 @@ Return Value: } - + // // Internal support routine // @@ -2913,7 +2913,7 @@ Return Value: return Checksum; } - + #if 0 // It turns out Win95 is still creating short names without a ~ @@ -3078,7 +3078,7 @@ Return Value: return TRUE; } #endif //0 - + // // Internal support routine // @@ -3294,7 +3294,7 @@ Return Value: return; } - + // // Internal support routine // @@ -3444,7 +3444,7 @@ Return Value: McbInitialized = TRUE; do { - + FatLocateDirent( IrpContext, Dcb, &Ccb, @@ -3668,7 +3668,7 @@ Return Value: // _SEH2_TRY { - + FatUnpinRepinnedBcbs( IrpContext ); } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? @@ -3705,18 +3705,18 @@ Return Value: // to update the Fcb. If this raises, we have to give up and blow // evenyone else away too. // - + if (!InvalidateFcbs) { - + _SEH2_TRY { - + FatLocateSimpleOemDirent( IrpContext, Dcb, &Fcb->ShortName.Name.Oem, &TmpDirent, &TmpBcb, (PVBO)&TmpOffset ); - + } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { diff --git a/drivers/filesystems/fastfat_new/dumpsup.c b/drivers/filesystems/fastfat_new/dumpsup.c index 4a87bf412a7..9e5f0d156df 100644 --- a/drivers/filesystems/fastfat_new/dumpsup.c +++ b/drivers/filesystems/fastfat_new/dumpsup.c @@ -77,7 +77,7 @@ ULONG FatDumpCurrentColumn; } \ } - + VOID FatDump ( IN PVOID Ptr @@ -136,7 +136,7 @@ Return Value: return; } - + VOID FatDumpDataHeader ( ) @@ -186,7 +186,7 @@ Return Value: return; } - + VOID FatDumpVcb ( IN PVCB Ptr @@ -249,7 +249,7 @@ Return Value: return; } - + VOID FatDumpFcb ( IN PFCB Ptr @@ -338,7 +338,7 @@ Return Value: return; } - + VOID FatDumpCcb ( IN PCCB Ptr diff --git a/drivers/filesystems/fastfat_new/ea.c b/drivers/filesystems/fastfat_new/ea.c index 6e70f0d8889..0d7bbdaec6a 100644 --- a/drivers/filesystems/fastfat_new/ea.c +++ b/drivers/filesystems/fastfat_new/ea.c @@ -164,7 +164,7 @@ Return Value: return Status; } - + _Function_class_(IRP_MJ_SET_EA) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -245,7 +245,7 @@ Return Value: return Status; } - + NTSTATUS FatCommonQueryEa ( IN PIRP_CONTEXT IrpContext, @@ -270,7 +270,7 @@ Return Value: --*/ { -#if 0 +#if 0 PIO_STACK_LOCATION IrpSp; NTSTATUS Status; @@ -306,7 +306,7 @@ Return Value: FatCompleteRequest( IrpContext, Irp, STATUS_INVALID_DEVICE_REQUEST); return STATUS_INVALID_DEVICE_REQUEST; - + #if 0 // // Get the current Irp stack location @@ -654,7 +654,7 @@ Return Value: #endif } - + NTSTATUS FatCommonSetEa ( IN PIRP_CONTEXT IrpContext, @@ -679,7 +679,7 @@ Return Value: --*/ { -#if 0 +#if 0 PIO_STACK_LOCATION IrpSp; NTSTATUS Status; @@ -716,9 +716,9 @@ Return Value: FatCompleteRequest( IrpContext, Irp, STATUS_INVALID_DEVICE_REQUEST); return STATUS_INVALID_DEVICE_REQUEST; - + #if 0 - + // // The following booleans are used in the unwind process. // @@ -856,7 +856,7 @@ Return Value: // // Now go pick up everything // - + FatAcquireSharedVcb( IrpContext, Fcb->Vcb ); AcquiredVcb = TRUE; FatAcquireExclusiveFcb( IrpContext, Fcb ); @@ -1601,7 +1601,7 @@ Return Value: return Iosb; } - + // // Local Support Routine // @@ -1739,7 +1739,7 @@ Return Value: } - + // // Local Support Routine // @@ -1957,7 +1957,7 @@ Return Value: } - + // // Local Support Routine // diff --git a/drivers/filesystems/fastfat_new/easup.c b/drivers/filesystems/fastfat_new/easup.c index a86e0ede2ee..9c6b8c9b16d 100644 --- a/drivers/filesystems/fastfat_new/easup.c +++ b/drivers/filesystems/fastfat_new/easup.c @@ -48,7 +48,7 @@ Abstract: #define EA_SECTION_SIZE (0x00040000) - + _Requires_lock_held_(_Global_critical_region_) VOID FatGetEaLength ( @@ -202,8 +202,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatGetNeedEaCount ( IN PIRP_CONTEXT IrpContext, @@ -349,8 +349,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatCreateEa ( IN PIRP_CONTEXT IrpContext, @@ -779,7 +779,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID FatGetEaFile ( @@ -1160,7 +1160,7 @@ Return Value: // The discerning reader will note that this doesn't take // FAT32 into account, which is of course intentional. // - + (*EaDirent)->FirstClusterOfFile = (USHORT) FatGetIndexFromLbo( Vcb, FirstLboOfFile ); } @@ -1268,7 +1268,7 @@ Return Value: FatReleaseFcb( IrpContext, Vcb->EaFcb ); } - + // // Dereference the Ea stream file if created. // @@ -1283,7 +1283,7 @@ Return Value: // Always release the root Dcb (our caller releases the EA Fcb if we // do not raise). // - + if (UnwindLockedRootDcb) { FatReleaseFcb( IrpContext, Vcb->RootDcb ); @@ -1301,7 +1301,7 @@ Return Value: return; } - + VOID FatReadEaSet ( IN PIRP_CONTEXT IrpContext, @@ -1531,8 +1531,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatDeleteEaSet ( IN PIRP_CONTEXT IrpContext, @@ -2003,7 +2003,7 @@ Return Value: // if (UnwindPrevFileSize) { - + EaFcb->Header.FileSize.LowPart = UnwindPrevFileSize; EaFcb->Header.AllocationSize.LowPart = UnwindPrevFileSize; EaDirent->FileSize = UnwindPrevFileSize; @@ -2014,7 +2014,7 @@ Return Value: (PCC_FILE_SIZES)&EaFcb->Header.AllocationSize ); } } - + // // If we merged the tail with the // ea file header. We split it out @@ -2086,9 +2086,9 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatAddEaSet ( IN PIRP_CONTEXT IrpContext, @@ -2390,7 +2390,7 @@ Return Value: FatRaiseStatus( IrpContext, STATUS_INSUFFICIENT_RESOURCES ); } - + FsRtlInitializeLargeMcb( &EaSetMcb, PagedPool ); UnwindInitializedEaSetMcb = TRUE; @@ -2809,7 +2809,7 @@ Return Value: // if (UnwindPrevFileSize) { - + EaFcb->Header.FileSize.LowPart = UnwindPrevFileSize; EaFcb->Header.AllocationSize.LowPart = UnwindPrevFileSize; EaDirent->FileSize = UnwindPrevFileSize; @@ -2820,7 +2820,7 @@ Return Value: (PCC_FILE_SIZES)&EaFcb->Header.AllocationSize ); } } - + // // If we merged the tail then split it off. // @@ -2962,7 +2962,7 @@ Return Value: return; } - + VOID FatAppendPackedEa ( IN PIRP_CONTEXT IrpContext, @@ -3143,7 +3143,7 @@ Return Value: return; } - + VOID FatDeletePackedEa ( IN PIRP_CONTEXT IrpContext, @@ -3252,7 +3252,7 @@ Return Value: return; } - + ULONG FatLocateNextEa ( IN PIRP_CONTEXT IrpContext, @@ -3339,7 +3339,7 @@ Return Value: return Offset; } - + BOOLEAN FatLocateEaByName ( IN PIRP_CONTEXT IrpContext, @@ -3424,7 +3424,7 @@ Return Value: return FALSE; } - + BOOLEAN FatIsEaNameValid ( IN PIRP_CONTEXT IrpContext, @@ -3507,7 +3507,7 @@ Return Value: return TRUE; } - + VOID FatPinEaRange ( IN PIRP_CONTEXT IrpContext, @@ -3584,7 +3584,7 @@ Return Value: EaRange->AuxilaryBuffer = TRUE; DestinationBuffer = EaRange->Data; - + } else { // @@ -3704,7 +3704,7 @@ Return Value: return; } - + VOID FatMarkEaRangeDirty ( IN PIRP_CONTEXT IrpContext, @@ -3739,7 +3739,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // If there is an auxilary buffer we need to copy the data back into the cache. // @@ -3777,7 +3777,7 @@ Return Value: return; } - + VOID FatUnpinEaRange ( IN PIRP_CONTEXT IrpContext, diff --git a/drivers/filesystems/fastfat_new/fat.h b/drivers/filesystems/fastfat_new/fat.h index 1e59844a0c0..05ce34cea31 100644 --- a/drivers/filesystems/fastfat_new/fat.h +++ b/drivers/filesystems/fastfat_new/fat.h @@ -38,7 +38,7 @@ typedef LBO *PLBO; typedef ULONG32 VBO; typedef VBO *PVBO; - + // // The boot sector is the first physical sector (LBN == 0) on the volume. // Part of the sector contains a BIOS Parameter Block. The BIOS in the @@ -295,7 +295,7 @@ typedef FAT_TIME_STAMP *PFAT_TIME_STAMP; typedef UCHAR FAT8DOT3[11]; typedef FAT8DOT3 *PFAT8DOT3; - + // // The directory entry record exists for every file/directory on the // disk except for the root directory. @@ -343,14 +343,14 @@ typedef DIRENT *PDIRENT; // // These two bits are used for EFS on FAT // 0x1 means the file contents are encrypted -// -// 0x2 means the EFS metadata header is big. -// (this optimization means we don't have to read -// in the first sector of the file stream to get +// +// 0x2 means the EFS metadata header is big. +// (this optimization means we don't have to read +// in the first sector of the file stream to get // the normal header size) // -#define FAT_DIRENT_NT_BYTE_ENCRYPTED 0x01 +#define FAT_DIRENT_NT_BYTE_ENCRYPTED 0x01 #define FAT_DIRENT_NT_BYTE_BIG_HEADER 0x02 // @@ -385,7 +385,7 @@ typedef DIRENT *PDIRENT; #define FAT_EFS_EXTENSION_CHARCOUNT (6) #define FAT_EFS_EXTENSION_BYTECOUNT (12) - + // // These macros convert a number of fields in the Bpb to bytes from sectors // @@ -621,7 +621,7 @@ typedef DIRENT *PDIRENT; RtlEqualMemory((TIME1),(TIME2), sizeof(FAT_TIME_STAMP)) \ ) - + #define EA_FILE_SIGNATURE (0x4445) // "ED" #define EA_SET_SIGNATURE (0x4145) // "EA" diff --git a/drivers/filesystems/fastfat_new/fatdata.c b/drivers/filesystems/fastfat_new/fatdata.c index 1a7ead0cb23..513c1d2652b 100644 --- a/drivers/filesystems/fastfat_new/fatdata.c +++ b/drivers/filesystems/fastfat_new/fatdata.c @@ -161,7 +161,7 @@ NTSTATUS FatBreakOnInterestingIrpCompletion = 0; #endif - + #if DBG ULONG FatBugCheckExceptionFilter ( @@ -174,7 +174,7 @@ Routine Description: An exception filter which acts as an assert that the exception should never occur. - + This is only valid on debug builds, we don't want the overhead on retail. Arguments: @@ -190,7 +190,7 @@ Return Value: { PAGED_CODE(); - + FatBugCheck( (ULONG_PTR)ExceptionPointer->ExceptionRecord, (ULONG_PTR)ExceptionPointer->ContextRecord, (ULONG_PTR)ExceptionPointer->ExceptionRecord->ExceptionAddress ); @@ -199,7 +199,7 @@ Return Value: } #endif - + ULONG FatExceptionFilter ( IN PIRP_CONTEXT IrpContext, @@ -238,7 +238,7 @@ Return Value: if( FatBreakOnInterestingExceptionStatus != 0 && ExceptionCode == FatBreakOnInterestingExceptionStatus ) { DbgBreakPoint(); } - + #endif // @@ -316,8 +316,8 @@ Return Value: return EXCEPTION_EXECUTE_HANDLER; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatProcessException ( IN PIRP_CONTEXT IrpContext, @@ -373,7 +373,7 @@ Return Value: ExceptionCode = IrpContext->ExceptionStatus; FatResetExceptionState( IrpContext ); - + // // If this is an Mdl write request, then take care of the Mdl // here so that things get cleaned up properly. Cc now leaves @@ -472,7 +472,7 @@ Return Value: ExceptionCode = STATUS_FILE_LOCK_CONFLICT; } - + FatCompleteRequest( IrpContext, Irp, ExceptionCode ); return ExceptionCode; @@ -511,10 +511,10 @@ Return Value: } // - // It turns out some storage drivers really do set invalid non-NULL device + // It turns out some storage drivers really do set invalid non-NULL device // objects to verify. // - // To work around this, completely ignore the device to verify in the thread, + // To work around this, completely ignore the device to verify in the thread, // and just use our real device object instead. // @@ -527,7 +527,7 @@ Return Value: // // For FSCTLs, IrpContext->Vcb may not be populated, so get the IrpContext->RealDevice instead // - + Device = IrpContext->RealDevice; } @@ -597,10 +597,10 @@ Return Value: } // - // It turns out some storage drivers really do set invalid non-NULL device + // It turns out some storage drivers really do set invalid non-NULL device // objects to verify. // - // To work around this, completely ignore the device to verify in the thread, + // To work around this, completely ignore the device to verify in the thread, // and just use our real device object instead. // @@ -613,7 +613,7 @@ Return Value: // // For FSCTLs, IrpContext->Vcb may not be populated, so get the IrpContext->RealDevice instead // - + RealDevice = IrpContext->RealDevice; } @@ -706,14 +706,14 @@ Return Value: // FatAcquireExclusiveVcbNoOpCheck( IrpContext, Vcb); - + _SEH2_TRY { if (VcbGood == Vcb->VcbCondition) { FatMarkVolume( IrpContext, Vcb, TransitionState ); } - } + } _SEH2_EXCEPT( FatExceptionFilter( IrpContext, _SEH2_GetExceptionInformation() ) ) { NOTHING; @@ -761,7 +761,7 @@ Return Value: if ( (FatBreakOnInterestingIrpCompletion != 0) && (Status == FatBreakOnInterestingIrpCompletion) ) { DbgBreakPoint(); } - + #endif // @@ -854,7 +854,7 @@ Return Value: } -_Function_class_(FAST_IO_CHECK_IF_POSSIBLE) +_Function_class_(FAST_IO_CHECK_IF_POSSIBLE) BOOLEAN NTAPI FatFastIoCheckIfPossible ( @@ -963,7 +963,7 @@ Return Value: } -_Function_class_(FAST_IO_QUERY_BASIC_INFO) +_Function_class_(FAST_IO_QUERY_BASIC_INFO) BOOLEAN NTAPI FatFastQueryBasicInfo ( @@ -1010,7 +1010,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + // // Prepare the dummy irp context // @@ -1143,7 +1143,7 @@ Return Value: } -_Function_class_(FAST_IO_QUERY_STANDARD_INFO) +_Function_class_(FAST_IO_QUERY_STANDARD_INFO) BOOLEAN NTAPI FatFastQueryStdInfo ( @@ -1191,7 +1191,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + // // Prepare the dummy irp context // @@ -1302,7 +1302,7 @@ Return Value: return Results; } - + _Function_class_(FAST_IO_QUERY_NETWORK_OPEN_INFO) BOOLEAN @@ -1350,9 +1350,9 @@ Return Value: BOOLEAN FcbAcquired = FALSE; PAGED_CODE(); - + UNREFERENCED_PARAMETER( DeviceObject ); - + // // Prepare the dummy irp context // @@ -1502,8 +1502,8 @@ Return Value: return Results; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatPopUpFileCorrupt ( IN PIRP_CONTEXT IrpContext, diff --git a/drivers/filesystems/fastfat_new/fatinit.c b/drivers/filesystems/fastfat_new/fatinit.c index 1da067f72f3..d0188c878a6 100644 --- a/drivers/filesystems/fastfat_new/fatinit.c +++ b/drivers/filesystems/fastfat_new/fatinit.c @@ -64,7 +64,7 @@ FatIsFujitsuFMR ( #define FUJITSU_FMR_NAME_W L"FUJITSU FMR-" - + NTSTATUS NTAPI DriverEntry( @@ -201,7 +201,7 @@ Return Value: #ifdef _MSC_VER #pragma prefast( pop ) #endif - + // // Initialize the filter callbacks we use. // @@ -247,7 +247,7 @@ Return Value: InitializeListHead( &FatData.AsyncCloseList ); InitializeListHead( &FatData.DelayedCloseList ); - + FatData.FatCloseItem = IoAllocateWorkItem( FatDiskFileSystemDeviceObject); if (FatData.FatCloseItem == NULL) { @@ -263,7 +263,7 @@ Return Value: FatData.ZeroPage = ExAllocatePoolWithTag( NonPagedPoolNx, PAGE_SIZE, 'ZtaF' ); if (FatData.ZeroPage == NULL) { IoDeleteDevice (FatDiskFileSystemDeviceObject); - IoDeleteDevice (FatCdromFileSystemDeviceObject); + IoDeleteDevice (FatCdromFileSystemDeviceObject); return STATUS_INSUFFICIENT_RESOURCES; } RtlZeroMemory( FatData.ZeroPage, PAGE_SIZE ); @@ -293,7 +293,7 @@ Return Value: case MmLargeSystem: default: - + MaxDepth = 16; FatMaxDelayedCloseCount = 16 * FAT_MAX_DELAYED_CLOSES; break; @@ -320,8 +320,8 @@ Return Value: FatData.OurProcess = PsGetCurrentProcess(); - // - // Setup the number of processors we support for statistics as the current number + // + // Setup the number of processors we support for statistics as the current number // running. // @@ -438,7 +438,7 @@ Return Value: } -_Function_class_(DRIVER_UNLOAD) +_Function_class_(DRIVER_UNLOAD) VOID NTAPI FatUnload( @@ -474,7 +474,7 @@ Return Value: ObDereferenceObject( FatCdromFileSystemDeviceObject); } - + // // Local Support routine // @@ -615,7 +615,7 @@ Return Value: return Status; } - + // // Local Support routine // diff --git a/drivers/filesystems/fastfat_new/fatstruc.h b/drivers/filesystems/fastfat_new/fatstruc.h index edd1f283ca4..ccf6572d0b0 100644 --- a/drivers/filesystems/fastfat_new/fatstruc.h +++ b/drivers/filesystems/fastfat_new/fatstruc.h @@ -22,7 +22,7 @@ typedef PVOID PBCB; //**** Bcb's are now part of the cache module #ifdef __REACTOS__ #define __volatile volatile #endif - + // // The FAT_DATA record is the top record in the Fat file system in-memory // data structure. This structure must be allocated from non-paged pool. @@ -610,7 +610,7 @@ typedef struct _FILE_SYSTEM_STATISTICS { typedef FILE_SYSTEM_STATISTICS *PFILE_SYSTEM_STATISTICS; - + // // The Volume Device Object is an I/O system device object with a workqueue // and an VCB record appended to the end. There are multiple of these @@ -670,7 +670,7 @@ typedef struct _VOLUME_DEVICE_OBJECT { typedef VOLUME_DEVICE_OBJECT *PVOLUME_DEVICE_OBJECT; - + // // This is the structure used to contains the short name for a file // @@ -1239,7 +1239,7 @@ typedef DCB *PDCB; #define FCB_LOOKUP_ALLOCATIONSIZE_HINT ((LONGLONG) -1) - + // // The Ccb record is allocated for every file object. Note that this // record is exactly 0x34 long on x86 so that it will fit into a 0x40 @@ -1372,7 +1372,7 @@ typedef struct _CCB { ULONG Flags:24; BOOLEAN ContainsWildCards; - + // // Pointer to EDP context. // @@ -1447,7 +1447,7 @@ typedef struct _CCB { } CCB; typedef CCB *PCCB; - + // // The Irp Context record is allocated for every orginating Irp. It is // created by the Fsd dispatch routines, and deallocated by the FatComplete @@ -1576,7 +1576,7 @@ typedef IRP_CONTEXT *PIRP_CONTEXT; #define IRP_CONTEXT_FLAG_PARENT_BY_CHILD (0x80000000) - + // // Context structure for non-cached I/O calls. Most of these fields // are actually only required for the Read/Write Multiple routines, but @@ -1591,7 +1591,7 @@ typedef struct _FAT_IO_CONTEXT { // A copy of the IrpContext flags preserved for use in // async I/O completion. // - + ULONG IrpContextFlags; // diff --git a/drivers/filesystems/fastfat_new/fileinfo.c b/drivers/filesystems/fastfat_new/fileinfo.c index fc37f7cf25e..ff2f3f7ba06 100644 --- a/drivers/filesystems/fastfat_new/fileinfo.c +++ b/drivers/filesystems/fastfat_new/fileinfo.c @@ -276,7 +276,7 @@ Return Value: return Status; } - + _Function_class_(IRP_MJ_SET_INFORMATION) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -357,8 +357,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonQueryInformation ( IN PIRP_CONTEXT IrpContext, @@ -494,8 +494,8 @@ Return Value: // relies on the file system to validate its mapping information after a // power transition. // - - if (!FlagOn( Fcb->FcbState, FCB_STATE_PAGING_FILE ) || + + if (!FlagOn( Fcb->FcbState, FCB_STATE_PAGING_FILE ) || FlagOn(Fcb->Vcb->VcbState, VCB_STATE_FLAG_REMOVABLE_MEDIA)) { if (!FatAcquireSharedFcb( IrpContext, Fcb )) { @@ -657,8 +657,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonSetInformation ( IN PIRP_CONTEXT IrpContext, @@ -826,7 +826,7 @@ Return Value: // if (FlagOn( Vcb->VcbState, VCB_STATE_FLAG_CREATE_IN_PROGRESS)) { - + #ifdef _MSC_VER #pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif @@ -850,7 +850,7 @@ Return Value: // power transition. // - if (!FlagOn( Fcb->FcbState, FCB_STATE_PAGING_FILE ) || + if (!FlagOn( Fcb->FcbState, FCB_STATE_PAGING_FILE ) || FlagOn(Fcb->Vcb->VcbState, VCB_STATE_FLAG_REMOVABLE_MEDIA)) { if (!FatAcquireExclusiveFcb( IrpContext, Fcb )) { @@ -908,14 +908,14 @@ Return Value: Irp = NULL; IrpContext = NULL; } - + if (!NT_SUCCESS( Status ) || (Status == STATUS_PENDING)) { try_return( Status ); } } - + // // Based on the information class we'll do different // actions. Each of the procedures that we're calling will either @@ -1021,7 +1021,7 @@ Return Value: DebugUnwind( FatCommonSetInformation ); if (FcbAcquired) { FatReleaseFcb( IrpContext, Fcb ); } - + if (VcbAcquired) { FatReleaseVcb( IrpContext, Vcb ); } if (!_SEH2_AbnormalTermination()) { @@ -1035,7 +1035,7 @@ Return Value: return Status; } - + // // Internal Support Routine // @@ -1077,7 +1077,7 @@ Return Value: UNREFERENCED_PARAMETER( FileObject ); UNREFERENCED_PARAMETER( IrpContext ); - + DebugTrace(+1, Dbg, "FatQueryBasicInfo...\n", 0); // @@ -1114,7 +1114,7 @@ Return Value: Buffer->FileAttributes = Fcb->DirentFatFlags; - + // // If the temporary flag is set, then set it in the buffer. // @@ -1146,7 +1146,7 @@ Return Value: return; } - + // // Internal Support Routine // @@ -1233,7 +1233,7 @@ Return Value: return; } - + // // Internal Support Routine // @@ -1272,7 +1272,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + DebugTrace(+1, Dbg, "FatQueryInternalInfo...\n", 0); _SEH2_TRY { @@ -1297,7 +1297,7 @@ Return Value: return; } - + // // Internal Support Routine // @@ -1339,7 +1339,7 @@ Return Value: UNREFERENCED_PARAMETER( Fcb ); UNREFERENCED_PARAMETER( IrpContext ); - + DebugTrace(+1, Dbg, "FatQueryEaInfo...\n", 0); Bcb = NULL; @@ -1408,7 +1408,7 @@ Return Value: } _SEH2_END; } - + // // Internal Support Routine // @@ -1469,7 +1469,7 @@ Return Value: return; } - + // // Internal Support Routine // @@ -1677,7 +1677,7 @@ Return Value: return; } - + // // Internal Support Routine // @@ -1776,7 +1776,7 @@ Return Value: return; } - + // // Internal Support Routine // @@ -1816,8 +1816,8 @@ Return Value: { PAGED_CODE(); - - UNREFERENCED_PARAMETER( FileObject ); + + UNREFERENCED_PARAMETER( FileObject ); DebugTrace(+1, Dbg, "FatQueryNetworkInfo...\n", 0); @@ -1855,7 +1855,7 @@ Return Value: Buffer->FileAttributes = Fcb->DirentFatFlags; - + // // If the temporary flag is set, then set it in the buffer. // @@ -1903,7 +1903,7 @@ Return Value: return; } - + // // Internal Support routine // @@ -2423,7 +2423,7 @@ Return Value: return Status; } - + // // Internal Support Routine // @@ -2685,7 +2685,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Internal Support Routine // @@ -2784,11 +2784,11 @@ Return Value: ULONG TargetDirentOffset = 0; ULONG TargetLfnOffset = 0; - // NewName comes from the IRP buffer or the TargetFileObject, so we can't + // NewName comes from the IRP buffer or the TargetFileObject, so we can't // go around modifying it. Instead we modify NewNameCopy. UNICODE_STRING NewName; - // NB: these five UNICODE_STRINGS are allocated + // NB: these five UNICODE_STRINGS are allocated // from one chopped up pool allocation called UnicodeBuffer. UNICODE_STRING NewNameCopy; UNICODE_STRING NewUpcasedName; @@ -2803,7 +2803,7 @@ Return Value: WCHAR UniTunneledShortNameBuffer[12]; UNICODE_STRING UniTunneledLongName; WCHAR UniTunneledLongNameBuffer[26]; - + LARGE_INTEGER TunneledCreationTime; ULONG TunneledDataSize; BOOLEAN HaveTunneledInformation = FALSE; @@ -2874,7 +2874,7 @@ Return Value: UniTunneledLongName.Length = 0; UniTunneledLongName.MaximumLength = sizeof(UniTunneledLongNameBuffer); UniTunneledLongName.Buffer = &UniTunneledLongNameBuffer[0]; - + // // Remember the name in case we have to modify the name // value in the ea. @@ -2960,7 +2960,7 @@ Return Value: if (FatIsFileOplockable( TempFcb ) && (FsRtlCurrentBatchOplock( FatGetFcbOplock(TempFcb) ) #if (NTDDI_VERSION >= NTDDI_WIN7) - || + || FsRtlCurrentOplockH( FatGetFcbOplock(TempFcb) ) #endif )) { @@ -3114,9 +3114,9 @@ Return Value: NewName = *((PUNICODE_STRING)&TargetFileObject->FileName); RtlCopyUnicodeString(&NewNameCopy,&NewName); - + } - + // // We will need an upcased version of the unicode name and the // old name as well. @@ -3175,7 +3175,7 @@ Return Value: RenamedAcrossDirectories = TRUE; } - + // // Upcase the name and convert it to the Oem code page. // @@ -3254,7 +3254,7 @@ Return Value: DirentsRequired = 1; - + } } @@ -3451,7 +3451,7 @@ Return Value: ExFreePool( UnicodeBuffer ); FatUnpinBcb( IrpContext, TargetDirentBcb ); - + } } _SEH2_END; @@ -3757,7 +3757,7 @@ Return Value: // breaks are always advisory, so we will never block/get STATUS_PENDING // here. // - + FsRtlCheckOplockEx( FatGetFcbOplock(OldParentDcb), IrpContext->OriginatingIrp, OPLOCK_FLAG_PARENT_OBJECT, @@ -3778,7 +3778,7 @@ Return Value: // breaks are always advisory, so we will never block/get STATUS_PENDING // here. // - + FsRtlCheckOplockEx( FatGetFcbOplock(TargetDcb), IrpContext->OriginatingIrp, OPLOCK_FLAG_PARENT_OBJECT, @@ -3980,7 +3980,7 @@ Return Value: DebugTrace(0, Dbg, "Uninitialize our parent Stream Cache Map\n", 0); CcUninitializeCacheMap( DirectoryFileObject, NULL, NULL ); - + ObDereferenceObject( DirectoryFileObject ); } @@ -4001,7 +4001,7 @@ Return Value: return Status; } - + // // Internal Support Routine // @@ -4079,7 +4079,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Internal Support Routine // @@ -4377,7 +4377,7 @@ Return Value: return Status; } - + // // Internal Support Routine // @@ -4563,9 +4563,9 @@ Return Value: _SEH2_TRY { - if ( NewFileSize > Dirent->FileSize ) { + if ( NewFileSize > Dirent->FileSize ) { Dirent->FileSize = NewFileSize; - + FatSetDirtyBcb( IrpContext, DirentBcb, Fcb->Vcb, TRUE ); // @@ -4739,7 +4739,7 @@ Return Value: *CcGetFileSizePointer(FileObject) = Fcb->Header.FileSize; } - + // // WinSE bug #307418 "Occasional data corruption when // standby/resume while copying files to removable FAT @@ -4753,7 +4753,7 @@ Return Value: // we'll also try to un-roll the change to Dirent to keep // in-memory and on-disk metadata in sync. // - + FatSetFileSizeInDirentNoRaise( IrpContext, Fcb, NULL ); } @@ -4836,7 +4836,7 @@ Return Value: // // User must have manage volume privilege to explicitly tweak the VDL // - + if ((Ccb == NULL) || !FlagOn( Ccb->Flags, CCB_FLAG_MANAGE_VOLUME_ACCESS )) { try_return( Status = STATUS_INVALID_PARAMETER ); @@ -4874,7 +4874,7 @@ Return Value: if ((NewValidDataLength < Fcb->Header.ValidDataLength.LowPart) || (NewValidDataLength > Fcb->Header.FileSize.LowPart)) { - + try_return( Status = STATUS_INVALID_PARAMETER ); } @@ -4962,7 +4962,7 @@ Return Value: return Status; } - + // // Internal Support Routine @@ -5117,7 +5117,7 @@ FatDeleteFile ( NT_ASSERT( Fcb->LfnOffsetWithinDirectory == LfnOffset ); if ( Fcb->UncleanCount != 0 ) { - + #ifdef _MSC_VER #pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif diff --git a/drivers/filesystems/fastfat_new/filobsup.c b/drivers/filesystems/fastfat_new/filobsup.c index 12fad7b3183..7b4dfeb49ce 100644 --- a/drivers/filesystems/fastfat_new/filobsup.c +++ b/drivers/filesystems/fastfat_new/filobsup.c @@ -34,7 +34,7 @@ Abstract: #pragma alloc_text(PAGE, FatDecodeFileObject) #endif - + VOID FatSetFileObject ( IN PFILE_OBJECT FileObject OPTIONAL, @@ -292,10 +292,10 @@ Return Value: *Vcb = (*FcbOrDcb)->Vcb; if (*Ccb != NULL ) { - + TypeOfOpen = UserFileOpen; - DebugTrace(0, Dbg, "Referencing file: %wZ\n", &(*FcbOrDcb)->FullFileName); - + DebugTrace(0, Dbg, "Referencing file: %wZ\n", &(*FcbOrDcb)->FullFileName); + } else { // @@ -304,16 +304,16 @@ Return Value: if ( *FcbOrDcb == (*Vcb)->EaFcb ) { - + TypeOfOpen = EaFile; - DebugTrace(0, Dbg, "Referencing EA file: %wZ\n", &(*FcbOrDcb)->FullFileName); - + DebugTrace(0, Dbg, "Referencing EA file: %wZ\n", &(*FcbOrDcb)->FullFileName); + } else { - + #ifdef _MSC_VER #pragma prefast(suppress:28159, "things are seriously wrong if we get here") #endif - FatBugCheck( NodeType(FsContext), 0, 0 ); + FatBugCheck( NodeType(FsContext), 0, 0 ); } @@ -362,7 +362,7 @@ Arguments: Fcb - Supplies a pointer to either an fcb or a dcb FlushType - Specifies the kind of flushing to perform - + Return Value: None. @@ -417,8 +417,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatForceCacheMiss ( IN PIRP_CONTEXT IrpContext, @@ -443,7 +443,7 @@ Arguments: Fcb - Supplies a pointer to an fcb FlushType - Specifies the kind of flushing to perform - + Return Value: None. diff --git a/drivers/filesystems/fastfat_new/flush.c b/drivers/filesystems/fastfat_new/flush.c index 850f215237b..42289bbd078 100644 --- a/drivers/filesystems/fastfat_new/flush.c +++ b/drivers/filesystems/fastfat_new/flush.c @@ -66,7 +66,7 @@ FatHijackCompletionRoutine ( _Function_class_(IRP_MJ_FLUSH_BUFFERS) -_Function_class_(DRIVER_DISPATCH) +_Function_class_(DRIVER_DISPATCH) NTSTATUS NTAPI FatFsdFlushBuffers ( @@ -144,8 +144,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonFlushBuffers ( IN PIRP_CONTEXT IrpContext, @@ -280,7 +280,7 @@ Return Value: Status = FatFlushFile( IrpContext, Fcb, Flush ); // - // Also flush the file's dirent in the parent directory if the file + // Also flush the file's dirent in the parent directory if the file // flush worked. // @@ -312,11 +312,11 @@ Return Value: // // Make sure the Fcb is OK. // - + _SEH2_TRY { - + FatVerifyFcb( IrpContext, NextFcb ); - + } _SEH2_EXCEPT( FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { @@ -326,16 +326,16 @@ Return Value: if (NextFcb->FcbCondition == FcbGood) { NTSTATUS LocalStatus; - + LocalStatus = FatFlushFile( IrpContext, NextFcb, Flush ); - + if (!NT_SUCCESS(LocalStatus)) { - + Status = LocalStatus; } if (FlagOn(NextFcb->FcbState, FCB_STATE_FLUSH_FAT)) { - + FatFlushRequired = TRUE; } } @@ -389,8 +389,8 @@ Return Value: { BOOLEAN Finished; #ifdef _MSC_VER -#pragma prefast( suppress:28931, "needed for debug build" ) -#endif +#pragma prefast( suppress:28931, "needed for debug build" ) +#endif Finished = FatAcquireExclusiveVcb( IrpContext, Vcb ); NT_ASSERT( Finished ); } @@ -442,7 +442,7 @@ Return Value: break; default: - + #ifdef _MSC_VER #pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif @@ -456,7 +456,7 @@ Return Value: DebugUnwind( FatCommonFlushBuffers ); if (VcbAcquired) { FatReleaseVcb( IrpContext, Vcb ); } - + if (FcbAcquired) { FatReleaseFcb( IrpContext, Fcb ); } // @@ -496,7 +496,7 @@ Return Value: DriverStatus = IoCallDriver(Vcb->TargetDeviceObject, Irp); - if ((DriverStatus == STATUS_PENDING) || + if ((DriverStatus == STATUS_PENDING) || (!NT_SUCCESS(DriverStatus) && (DriverStatus != STATUS_INVALID_DEVICE_REQUEST))) { @@ -523,8 +523,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatFlushDirectory ( IN PIRP_CONTEXT IrpContext, @@ -543,7 +543,7 @@ Arguments: Dcb - Supplies the Dcb being flushed FlushType - Specifies the kind of flushing to perform - + Return Value: VOID @@ -612,44 +612,44 @@ Return Value: // doing the flush dance. We may encounter corruption, and // should continue flushing the volume as much as possible. // - + _SEH2_TRY { - + // // Standard handler to release resources, etc. // - + _SEH2_TRY { - + // // Make sure the Fcb is OK. // - + _SEH2_TRY { - + FatVerifyFcb( IrpContext, Fcb ); - + } _SEH2_EXCEPT( FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { - + FatResetExceptionState( IrpContext ); } _SEH2_END; - + // // If this Fcb is not good skip it. Note that a 'continue' // here would be very expensive as we inside a try{} body. // - + if (Fcb->FcbCondition != FcbGood) { - + try_leave( NOTHING); } - + // // In case a handle was never closed and the FS and AS are more // than a cluster different, do this truncate. // - + if ( FlagOn(Fcb->FcbState, FCB_STATE_TRUNCATE_ON_CLOSE) ) { @@ -659,7 +659,7 @@ Return Value: } - + // // Also compare the file's dirent in the parent directory // with the size information in the Fcb and update @@ -667,7 +667,7 @@ Return Value: // because we will be flushing the file object presently, and // Mm knows what's really dirty. // - + FatGetDirentFromFcbOrDcb( IrpContext, Fcb, FALSE, @@ -675,14 +675,14 @@ Return Value: &DirentBcb ); - CorrectedFileSize = Fcb->Header.FileSize.LowPart; + CorrectedFileSize = Fcb->Header.FileSize.LowPart; + - if (Dirent->FileSize != CorrectedFileSize) { - + Dirent->FileSize = CorrectedFileSize; - + } // @@ -692,33 +692,33 @@ Return Value: // more children as a result, we will try to initiate teardown on it // and Cc will deadlock against the active count of this Bcb. // - + FatUnpinBcb( IrpContext, DirentBcb ); - + // // Now flush the file. Note that this may make the Fcb // go away if Mm dereferences its file object. // - + Status = FatFlushFile( IrpContext, Fcb, FlushType ); - + if (!NT_SUCCESS(Status)) { - + ReturnStatus = Status; } - + } _SEH2_FINALLY { - + FatUnpinBcb( IrpContext, DirentBcb ); - + // // Since we have the Vcb exclusive we know that if any closes // come in it is because the CcPurgeCacheSection caused the // Fcb to go away. // - + if ( !FlagOn(Vcb->VcbState, VCB_STATE_FLAG_DELETED_FCB) ) { - + FatReleaseFcb( (IRPCONTEXT), Fcb ); } } _SEH2_END; @@ -796,7 +796,7 @@ Return Value: return ReturnStatus; } - + NTSTATUS FatFlushFat ( IN PIRP_CONTEXT IrpContext, @@ -814,7 +814,7 @@ Routine Description: Arguments: Vcb - Supplies the Vcb whose FAT is being flushed - + Return Value: VOID @@ -902,7 +902,7 @@ Return Value: PIN_WAIT | PIN_IF_BCB, &Bcb, &DontCare )) { - + CcSetDirtyPinnedData( Bcb, NULL ); CcRepinBcb( Bcb ); CcUnpinData( Bcb ); @@ -937,7 +937,7 @@ Return Value: PIN_WAIT | PIN_IF_BCB, &Bcb, &DontCare )) { - + CcSetDirtyPinnedData( Bcb, NULL ); CcRepinBcb( Bcb ); CcUnpinData( Bcb ); @@ -957,7 +957,7 @@ Return Value: return ReturnStatus; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS @@ -979,7 +979,7 @@ Arguments: Vcb - Supplies the volume being flushed FlushType - Specifies the kind of flushing to perform - + Return Value: NTSTATUS - The Status from the flush. @@ -1036,8 +1036,8 @@ Return Value: return ReturnStatus; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatFlushFile ( IN PIRP_CONTEXT IrpContext, @@ -1056,7 +1056,7 @@ Arguments: Fcb - Supplies the file being flushed FlushType - Specifies the kind of flushing to perform - + Return Value: NTSTATUS - The Status from the flush. @@ -1073,7 +1073,7 @@ Return Value: if ( !FlagOn( Vcb->VcbState, VCB_STATE_FLAG_DELETED_FCB )) { - + // // Grab and release PagingIo to serialize ourselves with the lazy writer. // This will work to ensure that all IO has completed on the cached @@ -1082,21 +1082,21 @@ Return Value: // If we are to invalidate the file, now is the right time to do it. Do // it non-recursively so we don't thump children before their time. // - + ExAcquireResourceExclusiveLite( Fcb->Header.PagingIoResource, TRUE); - + if (FlushType == FlushAndInvalidate) { - + FatMarkFcbCondition( IrpContext, Fcb, FcbBad, FALSE ); } - + ExReleaseResourceLite( Fcb->Header.PagingIoResource ); } return Iosb.Status; } - + NTSTATUS FatHijackIrpAndFlushDevice ( IN PIRP_CONTEXT IrpContext, @@ -1133,9 +1133,9 @@ Return Value: PIO_STACK_LOCATION NextIrpSp; PAGED_CODE(); - + UNREFERENCED_PARAMETER( IrpContext ); - + // // Get the next stack location, and copy over the stack location // @@ -1186,7 +1186,7 @@ Return Value: return Status; } - + VOID FatFlushFatEntries ( IN PIRP_CONTEXT IrpContext, @@ -1259,7 +1259,7 @@ Return Value: } } - + VOID FatFlushDirentForFile ( IN PIRP_CONTEXT IrpContext, @@ -1306,7 +1306,7 @@ Return Value: } } - + // // Local support routine // @@ -1321,7 +1321,7 @@ FatFlushCompletionRoutine ( { NTSTATUS Status = (NTSTATUS) (ULONG_PTR) Contxt; - + if ( Irp->PendingReturned ) { IoMarkIrpPending( Irp ); @@ -1343,7 +1343,7 @@ FatFlushCompletionRoutine ( return STATUS_SUCCESS; } - + // // Local support routine // diff --git a/drivers/filesystems/fastfat_new/fsctrl.c b/drivers/filesystems/fastfat_new/fsctrl.c index d5ec06b3155..d7b51527471 100644 --- a/drivers/filesystems/fastfat_new/fsctrl.c +++ b/drivers/filesystems/fastfat_new/fsctrl.c @@ -168,7 +168,7 @@ FatGetBootAreaInfo ( _In_ PIRP Irp ); -_Requires_lock_held_(_Global_critical_region_) +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatGetRetrievalPointerBase ( _In_ PIRP_CONTEXT IrpContext, @@ -353,13 +353,13 @@ FatNonSparseMcb( Index++; } - + *Vbo = (VBO)llVbo; - + return TRUE; } - + BOOLEAN FatAddMcbEntry ( IN PVCB Vcb, @@ -413,7 +413,7 @@ FatAddMcbEntry ( return Result; } - + BOOLEAN FatLookupMcbEntry ( IN PVCB Vcb, @@ -536,7 +536,7 @@ FatLookupLastMcbEntry ( return Results; } - + BOOLEAN FatGetNextMcbEntry ( IN PVCB Vcb, @@ -594,7 +594,7 @@ FatGetNextMcbEntry ( return Results; } - + VOID FatRemoveMcbEntry ( IN PVCB Vcb, @@ -631,7 +631,7 @@ FatRemoveMcbEntry ( } - + _Function_class_(IRP_MJ_FILE_SYSTEM_CONTROL) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -745,8 +745,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonFileSystemControl ( IN PIRP_CONTEXT IrpContext, @@ -838,7 +838,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -979,9 +979,9 @@ Return Value: return Status; } - + } - + if (Iosb.Information != sizeof(ULONG)) { // @@ -992,7 +992,7 @@ Return Value: } // - // If this is a CD class device, then check to see if there is a + // If this is a CD class device, then check to see if there is a // 'data track' or not. This is to avoid issuing paging reads which will // fail later in the mount process (e.g. CD-DA or blank CD media) // @@ -1109,10 +1109,10 @@ Return Value: VolDo->DeviceObject.StackSize = (CCHAR)(TargetDeviceObject->StackSize + 1); // - // We must also set the sector size correctly in our device object + // We must also set the sector size correctly in our device object // before clearing the device initializing flag. // - + Status = FatPerformDevIoCtrl( IrpContext, IOCTL_DISK_GET_DRIVE_GEOMETRY, TargetDeviceObject, @@ -1167,10 +1167,10 @@ Return Value: // Initialize the new vcb // - FatInitializeVcb( IrpContext, - &VolDo->Vcb, - TargetDeviceObject, - Vpb, + FatInitializeVcb( IrpContext, + &VolDo->Vcb, + TargetDeviceObject, + Vpb, FsDeviceObject); // // Get a reference to the Vcb hanging off the end of the device object @@ -1185,18 +1185,18 @@ Return Value: // // We need to commute errors on CD so that CDFS will get its crack. Audio - // and even data media may not be universally readable on sector zero. + // and even data media may not be universally readable on sector zero. // - + _SEH2_TRY { - + FatReadVolumeFile( IrpContext, Vcb, 0, // Starting Byte sizeof(PACKED_BOOT_SECTOR), &BootBcb, (PVOID *)&BootSector ); - + } _SEH2_EXCEPT( Vpb->RealDevice->DeviceType == FILE_DEVICE_CD_ROM ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { @@ -1210,7 +1210,7 @@ Return Value: if (BootBcb == NULL || !FatIsBootSectorFat( BootSector)) { DebugTrace(0, Dbg, "Not a Fat Volume\n", 0); - + // // Complete the request and return to our caller // @@ -1229,7 +1229,7 @@ Return Value: // // Stash a copy away in the VCB. // - + RtlCopyMemory( &Vcb->VolumeGuid, &VolumeGuid, sizeof(GUID)); } @@ -1285,11 +1285,11 @@ Return Value: Vcb->Bpb.Sectors < 0x80)) { DebugTrace( 0, Dbg, "OS/2 Boot Manager volume detected, volume not mounted. \n", 0 ); - + // // Complete the request and return to our caller // - + try_return( Status = STATUS_UNRECOGNIZED_VOLUME ); } @@ -1298,7 +1298,7 @@ Return Value: // device currently reports it's sector size to be. // - if ( !NT_SUCCESS( Status) || + if ( !NT_SUCCESS( Status) || (Geometry.BytesPerSector != Vcb->Bpb.BytesPerSector)) { try_return( Status = STATUS_UNRECOGNIZED_VOLUME ); @@ -1393,15 +1393,15 @@ Return Value: // enough of the Vcb to pull this off. // - FatCheckDirtyBit( IrpContext, + FatCheckDirtyBit( IrpContext, Vcb ); - + // // Set the dirty bit if it is not set already // if ( !FlagOn(Vcb->VcbState, VCB_STATE_FLAG_MOUNTED_DIRTY)) { - + SetFlag( Vcb->VcbState, VCB_STATE_FLAG_MOUNT_IN_PROGRESS ); FatMarkVolume( IrpContext, Vcb, VolumeDirty ); ClearFlag( Vcb->VcbState, VCB_STATE_FLAG_MOUNT_IN_PROGRESS ); @@ -1831,7 +1831,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -2024,7 +2024,7 @@ Return Value: // // Only send down IOCTL_DISK_CHECK_VERIFY if it is removable media. // - + if (FlagOn(Vcb->TargetDeviceObject->Characteristics, FILE_REMOVABLE_MEDIA)) { // @@ -2056,9 +2056,9 @@ Return Value: FatNormalizeAndRaiseStatus( IrpContext, Status ); } - + } - + if (Iosb.Information != sizeof(ULONG)) { // @@ -2076,7 +2076,7 @@ Return Value: Vcb->ChangeCount = ChangeCount; // - // If this is a CD class device, then check to see if there is a + // If this is a CD class device, then check to see if there is a // 'data track' or not. This is to avoid issuing paging reads which will // fail later in the mount process (e.g. CD-DA or blank CD media) // @@ -2214,7 +2214,7 @@ Return Value: if (FatRootDirectorySize(&Bpb) > 0) { RootDirectorySize = FatRootDirectorySize(&Bpb); - + } else { RootDirectorySize = FatBytesPerCluster(&Bpb); @@ -2384,7 +2384,7 @@ Return Value: FatAcquireExclusiveVolume( IrpContext, Vcb ); ReleaseEntireVolume = TRUE; } - + // // Get rid of any cached data, without flushing // @@ -2419,7 +2419,7 @@ Return Value: FatAcquireExclusiveVolume( IrpContext, Vcb ); ReleaseEntireVolume = TRUE; } - + // // Get rid of any cached data, flushing first. // @@ -2513,7 +2513,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -2669,7 +2669,7 @@ Return Value: return Result; } - + // // Local Support Routine // @@ -2704,7 +2704,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Query the partition table // @@ -2754,7 +2754,7 @@ Return Value: return (BOOLEAN)(Status == STATUS_MEDIA_WRITE_PROTECTED); } - + // // Local Support Routine // @@ -2912,7 +2912,7 @@ Return Value: case FSCTL_SET_PURGE_FAILURE_MODE: Status = FatSetPurgeFailureMode( IrpContext, Irp ); - break; + break; #endif @@ -2937,7 +2937,7 @@ Return Value: } - + // // Local support routine // @@ -3185,7 +3185,7 @@ Return Value: // // Once we call FsRtlOplockFsctrl, we no longer own the IRP and we should not complete it. // - + Irp = NULL; // @@ -3203,7 +3203,7 @@ Return Value: // if (AcquiredVcb) { - + FatReleaseVcb( IrpContext, Fcb->Vcb ); } @@ -3220,7 +3220,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -3324,7 +3324,7 @@ Return Value: // if (!_SEH2_AbnormalTermination() || ExIsResourceAcquiredExclusiveLite( &Vcb->Resource )) { - + FatReleaseVcb( IrpContext, Vcb ); } @@ -3345,7 +3345,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -3427,8 +3427,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatLockVolumeInternal ( IN PIRP_CONTEXT IrpContext, @@ -3523,7 +3523,7 @@ Return Value: } // - // The act of closing and purging may have touched pages in various + // The act of closing and purging may have touched pages in various // parent DCBs. We handle this by purging a second time. // @@ -3596,7 +3596,7 @@ Return Value: return Status; } - + NTSTATUS FatUnlockVolumeInternal ( IN PIRP_CONTEXT IrpContext, @@ -3653,7 +3653,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -3816,7 +3816,7 @@ Return Value: // FatSetVcbCondition( Vcb, VcbBad); - + SetFlag( Vcb->VcbState, VCB_STATE_FLAG_VOLUME_DISMOUNTED ); // @@ -3840,7 +3840,7 @@ Return Value: #endif if (VcbHeld) { - + FatReleaseVolume( IrpContext, Vcb ); } @@ -3869,7 +3869,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -3956,7 +3956,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local Support Routine // @@ -4087,7 +4087,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local Support Routine // @@ -4159,7 +4159,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -4204,7 +4204,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local Support Routine // @@ -4290,7 +4290,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local Support Routine // @@ -4358,7 +4358,7 @@ Return Value: if (IoIs32bitProcess( Irp )) { if (IrpSp->Parameters.FileSystemControl.InputBufferLength != sizeof(UINT32)) { - + FatCompleteRequest( FatNull, Irp, STATUS_INVALID_PARAMETER ); DebugTrace(-1, Dbg, "FatInvalidateVolumes -> %08lx\n", STATUS_INVALID_PARAMETER); @@ -4477,7 +4477,7 @@ Return Value: if (ExistingVcb->Vpb == DeviceToMarkBad->Vpb) { KIRQL OldIrql; - + IoAcquireVpbSpinLock( &OldIrql ); if (FlagOn( DeviceToMarkBad->Vpb->Flags, VPB_MOUNTED )) { @@ -4487,13 +4487,13 @@ Return Value: NewVpb = ExistingVcb->SwapVpb; ExistingVcb->SwapVpb = NULL; SetFlag( ExistingVcb->VcbState, VCB_STATE_FLAG_VPB_MUST_BE_FREED ); - + RtlZeroMemory( NewVpb, sizeof( VPB ) ); NewVpb->Type = IO_TYPE_VPB; NewVpb->Size = sizeof( VPB ); NewVpb->RealDevice = DeviceToMarkBad; NewVpb->Flags = FlagOn( DeviceToMarkBad->Vpb->Flags, VPB_REMOVE_PENDING ); - + DeviceToMarkBad->Vpb = NewVpb; } @@ -4545,7 +4545,7 @@ Return Value: // if (!VcbDeleted) { - + FatReleaseVcb( &IrpContext, ExistingVcb ); } } @@ -4560,7 +4560,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local Support routine // @@ -4690,7 +4690,7 @@ Return Value: return TRUE; } - + // // Local Support Routine // @@ -4752,7 +4752,7 @@ Return Value: // // Make this a synchronous IRP because we need access to the input buffer and // this Irp is marked METHOD_NEITHER. - // + // SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT ); @@ -4766,7 +4766,7 @@ Return Value: (VOID)FatDecodeFileObject( IrpSp->FileObject, &Vcb, &Fcb, &Ccb ); if (Irp->RequestorMode != KernelMode || - Fcb == NULL || + Fcb == NULL || !FlagOn(Fcb->FcbState, FCB_STATE_PAGING_FILE) ) { FatCompleteRequest( IrpContext, Irp, STATUS_INVALID_PARAMETER ); @@ -4816,11 +4816,11 @@ Return Value: // the case where it isn't. // - Result = FatLookupMcbEntry( Fcb->Vcb, - &Fcb->Mcb, - RequestedMapSize->LowPart - 1, - &Lbo, - NULL, + Result = FatLookupMcbEntry( Fcb->Vcb, + &Fcb->Mcb, + RequestedMapSize->LowPart - 1, + &Lbo, + NULL, &Index ); if (!Result) { @@ -4828,7 +4828,7 @@ Return Value: NT_ASSERT(FALSE); try_leave( Status = STATUS_FILE_CORRUPT_ERROR); } - + *MappingPairs = FsRtlAllocatePoolWithTag( NonPagedPoolNx, (Index + 2) * (2 * sizeof(LARGE_INTEGER)), TAG_OUTPUT_MAPPINGPAIRS ); @@ -4858,8 +4858,8 @@ Return Value: (*MappingPairs)[ i*2 + 0 ].QuadPart = 0; Status = STATUS_SUCCESS; - } - _SEH2_FINALLY { + } + _SEH2_FINALLY { DebugUnwind( FatQueryRetrievalPointers ); @@ -4883,7 +4883,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -4989,7 +4989,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -5056,7 +5056,7 @@ Return Value: // // Make this a synchronous IRP because we need access to the input buffer and // this Irp is marked METHOD_NEITHER. - // + // SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT ); @@ -5246,7 +5246,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -5321,10 +5321,10 @@ Return Value: // // Make this a synchronous IRP because we need access to the input buffer and // this Irp is marked METHOD_NEITHER. - // + // SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT ); - + // // Extract and decode the file object and check for type of open. // @@ -5364,7 +5364,7 @@ Return Value: // recursive, as well as recognizing this is safe anyway. // if( (TypeOfOpen == UserFileOpen) || (TypeOfOpen == UserDirectoryOpen) ) { - + if (FlagOn( FcbOrDcb->Vcb->VcbState, VCB_STATE_FLAG_WRITE_PROTECTED )) { (VOID)FatAcquireSharedFcb( IrpContext, FcbOrDcb ); @@ -5382,7 +5382,7 @@ Return Value: DebugTrace(-1, Dbg, "FatMoveFile -> 0x%x\n", STATUS_ACCESS_DENIED); return STATUS_ACCESS_DENIED; } - + (VOID)FatAcquireExclusiveVcb(IrpContext, Vcb); } @@ -5393,9 +5393,9 @@ Return Value: // if( (TypeOfOpen == UserFileOpen) || (TypeOfOpen == UserDirectoryOpen) ) { - + FatVerifyFcb( IrpContext, FcbOrDcb ); - + // // If we haven't yet set the correct AllocationSize, do so. // @@ -5421,13 +5421,13 @@ Return Value: ClusterShift = Vcb->AllocationSupport.LogOfBytesPerCluster; #ifdef _MSC_VER -#pragma prefast( suppress:28931, "calculate it anyway, in case someone adds code that uses this in the future" ) -#endif +#pragma prefast( suppress:28931, "calculate it anyway, in case someone adds code that uses this in the future" ) +#endif ClusterSize = 1 << ClusterShift; - + AllocationSize = FcbOrDcb->Header.AllocationSize.LowPart; McbToUse = &FcbOrDcb->Mcb; - + } else if ((TypeOfOpen == UserVolumeOpen )) { FatQuickVerifyVcb( IrpContext, Vcb ); @@ -5441,29 +5441,29 @@ Return Value: FatRaiseStatus(IrpContext, STATUS_FILE_CORRUPT_ERROR ); } - - ClusterShift = Vcb->AllocationSupport.LogOfBytesPerCluster; + + ClusterShift = Vcb->AllocationSupport.LogOfBytesPerCluster; ClusterSize = 1 << ClusterShift; - + if (!FatLookupLastMcbEntry(Vcb, &Vcb->BadBlockMcb, &LastVbo, &LastLbo, &LastIndex)) { AllocationSize = 0; } else { - + // // Round the allocation size to a multiple of of the cluster size. // - + AllocationSize = (LastVbo + ((LONGLONG)ClusterSize-1)) & ~((LONGLONG)ClusterSize-1); } - + McbToUse = &Vcb->BadBlockMcb; - + } // // Check if a starting cluster was specified. // - + _SEH2_TRY { if (Irp->RequestorMode != KernelMode) { @@ -5561,8 +5561,8 @@ Return Value: if (!FatGetNextMcbEntry(Vcb, McbToUse, Run, (PVBO)&Vcn, &Lbo, &ByteLength)) { #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) -#endif +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#endif FatBugCheck( (ULONG_PTR)FcbOrDcb, (ULONG_PTR)McbToUse, Run ); } @@ -5610,15 +5610,15 @@ Return Value: // // Release resources // - + if( (TypeOfOpen == UserFileOpen) || (TypeOfOpen == UserDirectoryOpen) ) { - + FatReleaseFcb( IrpContext, FcbOrDcb ); } else if ((TypeOfOpen == UserVolumeOpen )) { - + FatReleaseVcb(IrpContext, Vcb); } - + // // If nothing raised then complete the irp. // @@ -5634,7 +5634,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -5648,7 +5648,7 @@ FatMoveFileNeedsWriteThrough ( ) { PAGED_CODE(); - + if (NodeType(FcbOrDcb) == FAT_NTC_FCB) { @@ -5656,15 +5656,15 @@ FatMoveFileNeedsWriteThrough ( ClearFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WRITE_THROUGH ); - SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_DISABLE_WRITE_THROUGH ); + SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_DISABLE_WRITE_THROUGH ); - } else { + } else { IrpContext->Flags &= ~(IRP_CONTEXT_FLAG_WRITE_THROUGH|IRP_CONTEXT_FLAG_DISABLE_WRITE_THROUGH); - IrpContext->Flags |= OldWriteThroughFlags; + IrpContext->Flags |= OldWriteThroughFlags; - } - } + } + } } _Requires_lock_held_(_Global_critical_region_) @@ -5798,7 +5798,7 @@ Return Value: // // Do a quick check on the input buffer. // - + #if defined(_WIN64) && defined(BUILD_WOW64_ENABLED) if (IoIs32bitProcess( Irp )) { @@ -5837,7 +5837,7 @@ Return Value: (TargetCluster + InputBuffer->ClusterCount < TargetCluster) || (TargetCluster + InputBuffer->ClusterCount > MaxClusters + 2) || (InputBuffer->StartingVcn.LowPart >= MaxClusters) || - InputBuffer->ClusterCount == 0 + InputBuffer->ClusterCount == 0 ) { FatCompleteRequest( IrpContext, Irp, STATUS_INVALID_PARAMETER ); @@ -5916,17 +5916,17 @@ Return Value: // // If the VDL of the file is zero, it has no valid data in it anyway. // So it should be safe to avoid flushing the FAT entries and let them be - // lazily written out. + // lazily written out. // - // This is done so that bitlocker's cover file doesn't cause - // unnecessary FAT table I/O when it's moved around. + // This is done so that bitlocker's cover file doesn't cause + // unnecessary FAT table I/O when it's moved around. // (See Win8 bug 106505) // // // If this is a file, and the VDL is zero, clear write through. // - + FatMoveFileNeedsWriteThrough(IrpContext, FcbOrDcb, OldWriteThroughFlags); @@ -6060,7 +6060,7 @@ Return Value: (VOID)FatAcquireExclusiveFcb( IrpContext, FcbOrDcb ); FcbAcquired = TRUE; - + FatVerifyFcb( IrpContext, FcbOrDcb ); } @@ -6180,21 +6180,21 @@ Return Value: // // If the VDL of the file is zero, it has no valid data in it anyway. // So it should be safe to avoid flushing the FAT entries and let them be - // lazily written out. + // lazily written out. // - // This is done so that bitlocker's cover file doesn't cause - // unnecessary FAT table I/O when it's moved around. + // This is done so that bitlocker's cover file doesn't cause + // unnecessary FAT table I/O when it's moved around. // (See Win8 bug 106505) // if ((FcbOrDcb->Header.ValidDataLength.QuadPart != 0) || (NodeType(FcbOrDcb) != FAT_NTC_FCB)) { - + FatFlushFatEntries( IrpContext, Vcb, TargetCluster, BytesToReallocate >> ClusterShift ); } - + // // Aqcuire both resources exclusive now, guaranteeing that NOBODY // is in either the read or write paths. @@ -6339,7 +6339,7 @@ Return Value: FatFlushFatEntries( IrpContext, Vcb, SecondSpliceSourceCluster, 1 ); } - + // // Now do the first splice OR update the dirent in the parent // and flush the respective object. After this flush the file @@ -6355,12 +6355,12 @@ Return Value: // to update our parent directory. // - FatGetDirentFromFcbOrDcb( IrpContext, - FcbOrDcb, - FALSE, - &Dirent, + FatGetDirentFromFcbOrDcb( IrpContext, + FcbOrDcb, + FALSE, + &Dirent, &DirentBcb ); - + Dirent->FirstClusterOfFile = (USHORT)FirstSpliceTargetCluster; if (FatIsFat32(Vcb)) { @@ -6387,7 +6387,7 @@ Return Value: (FAT_ENTRY)FirstSpliceTargetCluster ); if ((FcbOrDcb->Header.ValidDataLength.QuadPart != 0) || (NodeType(FcbOrDcb) != FAT_NTC_FCB)) { - + FatFlushFatEntries( IrpContext, Vcb, FirstSpliceSourceCluster, 1 ); } } @@ -6606,7 +6606,7 @@ Return Value: // if (FcbAcquired) { - + FatReleaseFcb( IrpContext, FcbOrDcb ); } @@ -6631,7 +6631,7 @@ Return Value: return Status; } - + // // Local Support Routine // @@ -6741,7 +6741,7 @@ Return Value: // // If there is more than our max, then reduce the byte count for this - // pass to our maximum. We must also align the file offset to a + // pass to our maximum. We must also align the file offset to a // buffer size byte boundary. // @@ -6813,7 +6813,7 @@ Return Value: } } - + // // Local Support Routine // @@ -6933,13 +6933,13 @@ Return Value: // // Run should always be present, but don't bugcheck in the case where it's not. // - + if (!Result) { NT_ASSERT( FALSE); FatRaiseStatus( IrpContext, STATUS_FILE_CORRUPT_ERROR); } - + // // At this point the variables: // @@ -6964,10 +6964,10 @@ Return Value: SourceBytesRemaining -= SourceMcbBytesInRun, SourceMcbVbo += SourceMcbBytesInRun) { - if (SourceMcbVbo != 0) { -#ifdef _MSC_VER -#pragma prefast( suppress:28931, "needed for debug build" ) -#endif + if (SourceMcbVbo != 0) { +#ifdef _MSC_VER +#pragma prefast( suppress:28931, "needed for debug build" ) +#endif Result = FatGetNextMcbEntry( Vcb, &FcbOrDcb->Mcb, SourceIndex, &SourceVbo, @@ -7017,7 +7017,7 @@ Return Value: } } - + NTSTATUS FatAllowExtendedDasdIo( IN PIRP_CONTEXT IrpContext, @@ -7079,8 +7079,8 @@ Return Value: } #if (NTDDI_VERSION >= NTDDI_WIN7) - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatGetRetrievalPointerBase ( _In_ PIRP_CONTEXT IrpContext, @@ -7139,11 +7139,11 @@ Return Value: // // Verify the handle has manage volume access. - // - + // + if ((Ccb == NULL) || !FlagOn( Ccb->Flags, CCB_FLAG_MANAGE_VOLUME_ACCESS )) { - FatCompleteRequest( IrpContext, Irp, STATUS_INVALID_PARAMETER ); + FatCompleteRequest( IrpContext, Irp, STATUS_INVALID_PARAMETER ); return STATUS_INVALID_PARAMETER; } @@ -7155,7 +7155,7 @@ Return Value: if (BufferLength < sizeof(RETRIEVAL_POINTER_BASE)) { - FatCompleteRequest( IrpContext, Irp, STATUS_BUFFER_TOO_SMALL ); + FatCompleteRequest( IrpContext, Irp, STATUS_BUFFER_TOO_SMALL ); return STATUS_BUFFER_TOO_SMALL; } @@ -7166,27 +7166,27 @@ Return Value: RtlZeroMemory( RetrievalPointerBase, BufferLength ); try { - + FatAcquireSharedVcb(IrpContext, Vcb); FatQuickVerifyVcb(IrpContext, Vcb); - + RetrievalPointerBase->FileAreaOffset.QuadPart = Vcb->AllocationSupport.FileAreaLbo >> Vcb->AllocationSupport.LogOfBytesPerSector; Irp->IoStatus.Information = sizeof( RETRIEVAL_POINTER_BASE ); - + } finally { FatReleaseVcb(IrpContext, Vcb); - + } - + FatCompleteRequest( IrpContext, Irp, STATUS_SUCCESS ); - + return STATUS_SUCCESS; - + } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatGetBootAreaInfo ( _In_ PIRP_CONTEXT IrpContext, @@ -7245,11 +7245,11 @@ Return Value: // // Verify the handle has manage volume access. - // - + // + if ((Ccb == NULL) || !FlagOn( Ccb->Flags, CCB_FLAG_MANAGE_VOLUME_ACCESS )) { - FatCompleteRequest( IrpContext, Irp, STATUS_INVALID_PARAMETER ); + FatCompleteRequest( IrpContext, Irp, STATUS_INVALID_PARAMETER ); return STATUS_INVALID_PARAMETER; } @@ -7261,7 +7261,7 @@ Return Value: if (BufferLength < sizeof(BOOT_AREA_INFO)) { - FatCompleteRequest( IrpContext, Irp, STATUS_BUFFER_TOO_SMALL ); + FatCompleteRequest( IrpContext, Irp, STATUS_BUFFER_TOO_SMALL ); return STATUS_BUFFER_TOO_SMALL; } @@ -7272,36 +7272,36 @@ Return Value: RtlZeroMemory( BootAreaInfo, BufferLength ); try { - + FatAcquireSharedVcb(IrpContext, Vcb); FatQuickVerifyVcb(IrpContext, Vcb); if (FatIsFat32( Vcb )) { - - BootAreaInfo->BootSectorCount = 2; + + BootAreaInfo->BootSectorCount = 2; BootAreaInfo->BootSectors[0].Offset.QuadPart = 0; BootAreaInfo->BootSectors[1].Offset.QuadPart = 6; } else { - + BootAreaInfo->BootSectorCount = 1; - BootAreaInfo->BootSectors[0].Offset.QuadPart = 0; + BootAreaInfo->BootSectors[0].Offset.QuadPart = 0; } - + Irp->IoStatus.Information = sizeof( BOOT_AREA_INFO ); - + } finally { FatReleaseVcb(IrpContext, Vcb); } - + FatCompleteRequest( IrpContext, Irp, STATUS_SUCCESS ); return STATUS_SUCCESS; } #endif - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatMarkHandle ( _In_ PIRP_CONTEXT IrpContext, @@ -7333,9 +7333,9 @@ Return Value: PCCB DasdCcb = NULL; TYPE_OF_OPEN TypeOfOpen; PMARK_HANDLE_INFO HandleInfo = NULL; - PFILE_OBJECT DasdFileObject = NULL; + PFILE_OBJECT DasdFileObject = NULL; BOOLEAN ReleaseFcb = FALSE; - + #if defined(_WIN64) && defined(BUILD_WOW64_ENABLED) MARK_HANDLE_INFO LocalMarkHandleInfo = {0}; #endif @@ -7346,7 +7346,7 @@ Return Value: // // Always make this a synchronous IRP. - // + // SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT ); @@ -7411,13 +7411,13 @@ Return Value: #endif // - // Check that only legal bits are being set. + // Check that only legal bits are being set. // We currently only support two bits: protect clusters and unprotect clusters. // // Note that we don't actually support the USN journal, but we must ignore the flags in order // to preserve compatibility. // - + if (FlagOn( HandleInfo->HandleInfo, ~(MARK_HANDLE_PROTECT_CLUSTERS)) || (FlagOn( HandleInfo->HandleInfo, @@ -7498,49 +7498,49 @@ Return Value: FatCompleteRequest( IrpContext, Irp, STATUS_ACCESS_DENIED ); return STATUS_ACCESS_DENIED; } - + } _SEH2_TRY { - + FatAcquireExclusiveFcb(IrpContext, Fcb); ReleaseFcb = TRUE; FatVerifyFcb( IrpContext, Fcb ); if (HandleInfo->HandleInfo & MARK_HANDLE_PROTECT_CLUSTERS) { - + if (Fcb->FcbState & FCB_STATE_DENY_DEFRAG) { // // It's already set, bail out. // - + try_return( Status = STATUS_ACCESS_DENIED ); - } - + } + Ccb->Flags |= CCB_FLAG_DENY_DEFRAG; Fcb->FcbState|= FCB_STATE_DENY_DEFRAG; - + } try_exit: NOTHING; - + } _SEH2_FINALLY { - + if (ReleaseFcb) { - + FatReleaseFcb(IrpContext, Fcb); } } _SEH2_END; - + FatCompleteRequest( IrpContext, Irp, Status ); return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatFlushAndCleanVolume( IN PIRP_CONTEXT IrpContext, @@ -7663,7 +7663,7 @@ Return Value: #if (NTDDI_VERSION >= NTDDI_WIN8) - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS FatSetPurgeFailureMode ( @@ -7680,8 +7680,8 @@ FatSetPurgeFailureMode ( force error propagation, particulary when a filter has mapped a section for the purposes of scanning the file in the background. - The purge failure mode is a reference count because it is set - per mapped section and there may be multiple sections backed by + The purge failure mode is a reference count because it is set + per mapped section and there may be multiple sections backed by the file. Arguments: @@ -7705,7 +7705,7 @@ Return Value: BOOLEAN FcbAcquired = FALSE; PAGED_CODE(); - + IrpSp = IoGetCurrentIrpStackLocation( Irp ); // @@ -7767,7 +7767,7 @@ Return Value: // Acquire the FCB exclusively to synchronize with coherency flush // and purge. // - + FatAcquireExclusiveFcb( IrpContext, Fcb ); FcbAcquired = TRUE; @@ -7781,7 +7781,7 @@ Return Value: } Fcb->PurgeFailureModeEnableCount += 1; - + } else { ASSERT( FlagOn( SetPurgeInput->Flags, SET_PURGE_FAILURE_MODE_DISABLED )); @@ -7802,7 +7802,7 @@ Return Value: FatReleaseFcb( IrpContext, Fcb ); } } - + // // Complete the irp if we terminated normally. // @@ -7814,7 +7814,7 @@ Return Value: #endif - + NTSTATUS FatSearchBufferForLabel( IN PIRP_CONTEXT IrpContext, @@ -7964,7 +7964,7 @@ Return Value: return STATUS_SUCCESS; } - + VOID FatVerifyLookupFatEntry ( IN PIRP_CONTEXT IrpContext, @@ -8086,7 +8086,7 @@ Return Value: continue; } - + #ifdef _MSC_VER #pragma prefast( pop ) #endif @@ -8149,7 +8149,7 @@ FatSetZeroOnDeallocate ( if ((TypeOfOpen != UserFileOpen) || (!IrpSp->FileObject->WriteAccess) ) { - + FatCompleteRequest( IrpContext, Irp, STATUS_ACCESS_DENIED ); return STATUS_ACCESS_DENIED; } @@ -8174,17 +8174,17 @@ FatSetZeroOnDeallocate ( _SEH2_TRY { SetFlag( FcbOrDcb->FcbState, FCB_STATE_ZERO_ON_DEALLOCATION ); - - } _SEH2_FINALLY { - + + } _SEH2_FINALLY { + if (ReleaseFcb) { FatReleaseFcb(IrpContext, FcbOrDcb); } - + } _SEH2_END; - - FatCompleteRequest( IrpContext, Irp, Status ); - return Status; + + FatCompleteRequest( IrpContext, Irp, Status ); + return Status; } #endif diff --git a/drivers/filesystems/fastfat_new/fspdisp.c b/drivers/filesystems/fastfat_new/fspdisp.c index 2a91496ecb6..8382dbe0eb8 100644 --- a/drivers/filesystems/fastfat_new/fspdisp.c +++ b/drivers/filesystems/fastfat_new/fspdisp.c @@ -35,7 +35,7 @@ FatRemoveOverflowEntry ( #pragma alloc_text(PAGE, FatFspDispatch) #endif - + VOID NTAPI FatFspDispatch ( @@ -122,7 +122,7 @@ Return Value: while ( TRUE ) { ExceptionCompletedIrp = FALSE; - + DebugTrace(0, Dbg, "FatFspDispatch: Irp = %p\n", Irp); // @@ -384,12 +384,12 @@ Return Value: if (MajorFunction == IRP_MJ_CREATE && !ExceptionCompletedIrp && Status != STATUS_PENDING) { - + // // Creates are completed here. IrpContext is also freed here. // - FatCompleteRequest( IrpContext, Irp, Status ); + FatCompleteRequest( IrpContext, Irp, Status ); } // @@ -443,7 +443,7 @@ Return Value: return; } - + // // Internal support routine, spinlock wrapper. // diff --git a/drivers/filesystems/fastfat_new/lockctrl.c b/drivers/filesystems/fastfat_new/lockctrl.c index 13b5d5052b5..000d2adc72e 100644 --- a/drivers/filesystems/fastfat_new/lockctrl.c +++ b/drivers/filesystems/fastfat_new/lockctrl.c @@ -31,7 +31,7 @@ Abstract: #pragma alloc_text(PAGE, FatFsdLockControl) #endif - + _Function_class_(IRP_MJ_LOCK_CONTROL) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -113,7 +113,7 @@ Return Value: } -_Function_class_(FAST_IO_LOCK) +_Function_class_(FAST_IO_LOCK) BOOLEAN NTAPI FatFastLock ( @@ -253,7 +253,7 @@ Return Value: } -_Function_class_(FAST_IO_UNLOCK_SINGLE) +_Function_class_(FAST_IO_UNLOCK_SINGLE) BOOLEAN NTAPI FatFastUnlockSingle ( @@ -301,7 +301,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + DebugTrace(+1, Dbg, "FatFastUnlockSingle\n", 0); IoStatus->Information = 0; @@ -375,7 +375,7 @@ Return Value: } -_Function_class_(FAST_IO_UNLOCK_ALL) +_Function_class_(FAST_IO_UNLOCK_ALL) BOOLEAN NTAPI FatFastUnlockAll ( @@ -414,7 +414,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + DebugTrace(+1, Dbg, "FatFastUnlockAll\n", 0); IoStatus->Information = 0; @@ -487,7 +487,7 @@ Return Value: return Results; } - + _Function_class_(FAST_IO_UNLOCK_ALL_BY_KEY) BOOLEAN NTAPI @@ -530,7 +530,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + DebugTrace(+1, Dbg, "FatFastUnlockAllByKey\n", 0); IoStatus->Information = 0; @@ -604,8 +604,8 @@ Return Value: return Results; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonLockControl ( IN PIRP_CONTEXT IrpContext, diff --git a/drivers/filesystems/fastfat_new/namesup.c b/drivers/filesystems/fastfat_new/namesup.c index be8702c97a2..b8d010ef114 100644 --- a/drivers/filesystems/fastfat_new/namesup.c +++ b/drivers/filesystems/fastfat_new/namesup.c @@ -30,7 +30,7 @@ Abstract: #pragma alloc_text(PAGE, FatUnicodeRestoreShortNameCase) #endif - + BOOLEAN FatIsNameInExpression ( IN PIRP_CONTEXT IrpContext, @@ -74,7 +74,7 @@ Return Value: UNREFERENCED_PARAMETER( IrpContext ); } - + VOID FatStringTo8dot3 ( _In_ PIRP_CONTEXT IrpContext, @@ -174,7 +174,7 @@ Return Value: return; } - + VOID Fat8dot3ToString ( _In_ PIRP_CONTEXT IrpContext, @@ -267,13 +267,13 @@ Return Value: // there could be double-byte OEM characters lying in wait here. // Gotta skip them. // - + if (FsRtlIsLeadDbcsCharacter(OutputString->Buffer[StringIndex])) { StringIndex += 1; continue; } - + if ((OutputString->Buffer[StringIndex] >= 'A') && (OutputString->Buffer[StringIndex] <= 'Z')) { @@ -338,13 +338,13 @@ Return Value: // there could be double-byte OEM characters lying in wait here. // Gotta skip them. // - + if (FsRtlIsLeadDbcsCharacter(OutputString->Buffer[StringIndex])) { StringIndex += 1; continue; } - + if ((OutputString->Buffer[StringIndex] >= 'A') && (OutputString->Buffer[StringIndex] <= 'Z')) { @@ -412,7 +412,7 @@ Return Value: PAGED_CODE(); NT_ASSERT((MAX_LFN_CHARACTERS * sizeof( WCHAR)) == Lfn->MaximumLength); - + // // We'll start by locating the dirent for the name. // @@ -463,7 +463,7 @@ Return Value: // we're as dead. This shouldn't happen in normal operation, but // if someone scrambles a directory by hand ... // - + NT_ASSERT( Fcb->LfnOffsetWithinDirectory == Fcb->DirentOffsetWithinDirectory ); if (Fcb->LfnOffsetWithinDirectory != Fcb->DirentOffsetWithinDirectory) { @@ -627,7 +627,7 @@ Return Value: } _SEH2_END; } } - + VOID FatUnicodeToUpcaseOem ( IN PIRP_CONTEXT IrpContext, @@ -694,7 +694,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) VOID FatSelectNames ( @@ -749,7 +749,7 @@ Return Value: { BOOLEAN GenerateShortName; - + PAGED_CODE(); // @@ -773,7 +773,7 @@ Return Value: GenerateShortName = TRUE; TrySuggestedShortName = (SuggestedShortName != NULL); - + // // Now generate a short name. // @@ -785,7 +785,7 @@ Return Value: RtlZeroMemory( &Context, sizeof( GENERATE_NAME_CONTEXT ) ); _SEH2_TRY { - + while ( TRUE ) { FatUnpinBcb( IrpContext, Bcb ); @@ -836,7 +836,7 @@ Return Value: } } _SEH2_FINALLY { - + FatUnpinBcb( IrpContext, Bcb ); } _SEH2_END; @@ -886,7 +886,7 @@ Return Value: return; } - + VOID FatEvaluateNameCase ( IN PIRP_CONTEXT IrpContext, @@ -928,7 +928,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + *CreateLfn = FALSE; for (i = 0; i < UnicodeName->Length / sizeof(WCHAR); i++) { @@ -998,7 +998,7 @@ Return Value: return; } - + BOOLEAN FatSpaceInName ( IN PIRP_CONTEXT IrpContext, @@ -1026,7 +1026,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + for (i=0; i < UnicodeName->Length/sizeof(WCHAR); i++) { if (UnicodeName->Buffer[i] == L' ') { @@ -1038,7 +1038,7 @@ Return Value: } VOID -FatUnicodeRestoreShortNameCase( +FatUnicodeRestoreShortNameCase( IN PUNICODE_STRING ShortNameWithCase, IN BOOLEAN LowerCase8, IN BOOLEAN LowerCase3 @@ -1055,12 +1055,12 @@ Arguments: ShortNameWithCase - the UNICODE_STRING containing the short name. LowerCase8, LowerCase3 - the flag indicating whether to downcase the 8dot3 name component. - + Return Value: None. ---*/ +--*/ { USHORT i; UNICODE_STRING DownCaseSeg; @@ -1068,7 +1068,7 @@ Return Value: PAGED_CODE(); NT_ASSERT( ShortNameWithCase->Length <= 24 ); - + // // Have to repair the case of the short name // @@ -1108,7 +1108,7 @@ Return Value: RtlDowncaseUnicodeString(&DownCaseSeg, &DownCaseSeg, FALSE); } } - + } diff --git a/drivers/filesystems/fastfat_new/nodetype.h b/drivers/filesystems/fastfat_new/nodetype.h index c2ed4085a7d..da9516b08ac 100644 --- a/drivers/filesystems/fastfat_new/nodetype.h +++ b/drivers/filesystems/fastfat_new/nodetype.h @@ -103,7 +103,7 @@ typedef CSHORT NODE_BYTE_SIZE; #define FatBugCheck(A,B,C) { KeBugCheckEx(FAT_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); } - + // // In this module we'll also define some globally known constants // diff --git a/drivers/filesystems/fastfat_new/pnp.c b/drivers/filesystems/fastfat_new/pnp.c index 1f78cf58191..fa8d8393e40 100644 --- a/drivers/filesystems/fastfat_new/pnp.c +++ b/drivers/filesystems/fastfat_new/pnp.c @@ -76,7 +76,7 @@ FatPnpCompletionRoutine ( #pragma alloc_text(PAGE, FatPnpSurpriseRemove) #endif - + _Function_class_(IRP_MJ_PNP) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -127,7 +127,7 @@ Return Value: // wait. Since at the moment we don't have any concept of pending Pnp // operations, this is a bit nitpicky. // - + if (IoGetCurrentIrpStackLocation( Irp )->FileObject == NULL) { Wait = TRUE; @@ -168,8 +168,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonPnp ( IN PIRP_CONTEXT IrpContext, @@ -195,7 +195,7 @@ Return Value: { NTSTATUS Status; - + PIO_STACK_LOCATION IrpSp; PVOLUME_DEVICE_OBJECT OurDeviceObject; @@ -206,9 +206,9 @@ Return Value: // // Force everything to wait. // - + SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT); - + // // Get the current Irp stack location. // @@ -231,12 +231,12 @@ Return Value: #pragma prefast( disable: 28193, "this will always wait" ) #endif - FatAcquireExclusiveGlobal( IrpContext ); + FatAcquireExclusiveGlobal( IrpContext ); #ifdef _MSC_VER #pragma prefast( pop ) #endif - + // // Make sure this device object really is big enough to be a volume device // object. If it isn't, we need to get out before we try to reference some @@ -244,17 +244,17 @@ Return Value: // #ifdef _MSC_VER -#pragma prefast( suppress: 28175, "touching Size is ok for a filesystem" ) +#pragma prefast( suppress: 28175, "touching Size is ok for a filesystem" ) #endif if (OurDeviceObject->DeviceObject.Size != sizeof(VOLUME_DEVICE_OBJECT) || NodeType( &OurDeviceObject->Vcb ) != FAT_NTC_VCB) { - + // // We were called with something we don't understand. // FatReleaseGlobal( IrpContext ); - + Status = STATUS_INVALID_PARAMETER; FatCompleteRequest( IrpContext, Irp, Status ); return Status; @@ -265,16 +265,16 @@ Return Value: // // Case on the minor code. // - + switch ( IrpSp->MinorFunction ) { case IRP_MN_QUERY_REMOVE_DEVICE: - + Status = FatPnpQueryRemove( IrpContext, Irp, Vcb ); break; - + case IRP_MN_SURPRISE_REMOVAL: - + Status = FatPnpSurpriseRemove( IrpContext, Irp, Vcb ); break; @@ -284,44 +284,44 @@ Return Value: break; case IRP_MN_CANCEL_REMOVE_DEVICE: - + Status = FatPnpCancelRemove( IrpContext, Irp, Vcb ); break; default: FatReleaseGlobal( IrpContext ); - + // // Just pass the IRP on. As we do not need to be in the // way on return, ellide ourselves out of the stack. // - + IoSkipCurrentIrpStackLocation( Irp ); - + Status = IoCallDriver(Vcb->TargetDeviceObject, Irp); - + // // Cleanup our Irp Context. The driver has completed the Irp. // - + FatCompleteRequest( IrpContext, NULL, STATUS_SUCCESS ); - + break; } - + return Status; } VOID -FatPnpAdjustVpbRefCount( +FatPnpAdjustVpbRefCount( IN PVCB Vcb, IN ULONG Delta ) { KIRQL OldIrql; - + IoAcquireVpbSpinLock( &OldIrql); Vcb->Vpb->ReferenceCount += Delta; IoReleaseVpbSpinLock( OldIrql); @@ -344,13 +344,13 @@ Routine Description: is responsible for answering whether there are any reasons it sees that the volume can not go away (and the device removed). Initiation of the dismount begins when we answer yes to this question. - + Query will be followed by a Cancel or Remove. Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being queried. Return Value: @@ -379,16 +379,16 @@ Return Value: GlobalHeld = FALSE; _SEH2_TRY { - + Status = FatLockVolumeInternal( IrpContext, Vcb, NULL ); // // Drop an additional reference on the Vpb so that the volume cannot be // torn down when we drop all the locks below. // - + FatPnpAdjustVpbRefCount( Vcb, 1); - + // // Drop and reacquire the resources in the right order. // @@ -405,7 +405,7 @@ Return Value: FatAcquireExclusiveGlobal( IrpContext ); GlobalHeld = TRUE; - + #ifdef _MSC_VER #pragma prefast( pop ) #endif @@ -415,7 +415,7 @@ Return Value: // // Drop the reference we added above. // - + FatPnpAdjustVpbRefCount( Vcb, (ULONG)-1); if (NT_SUCCESS( Status )) { @@ -493,7 +493,7 @@ Return Value: } } _SEH2_FINALLY { - + // // Release the Vcb if it could still remain. // @@ -504,11 +504,11 @@ Return Value: } if (GlobalHeld) { - + FatReleaseGlobal( IrpContext ); } } _SEH2_END; - + // // Cleanup our IrpContext and complete the IRP if neccesary. // @@ -518,7 +518,7 @@ Return Value: return Status; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS @@ -536,11 +536,11 @@ Routine Description: that the underlying storage device for the volume we have is gone, and an excellent indication that the volume will never reappear. The filesystem is responsible for initiation or completion of the dismount. - + Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being removed. Return Value: @@ -566,7 +566,7 @@ Return Value: // for a REMOVE in the first two cases, as we try to intiate // dismount. // - + // // Acquire the global resource so that we can try to vaporize // the volume, and the vcb resource itself. @@ -580,12 +580,12 @@ Return Value: // (VOID) FatUnlockVolumeInternal( IrpContext, Vcb, NULL ); - + // // We need to pass this down before starting the dismount, which // could disconnect us immediately from the stack. // - + // // Get the next stack location, and copy over the stack location // @@ -622,7 +622,7 @@ Return Value: } _SEH2_TRY { - + // // Knock as many files down for this volume as we can. // @@ -641,7 +641,7 @@ Return Value: VcbDeleted = FatCheckForDismount( IrpContext, Vcb, TRUE ); } _SEH2_FINALLY { - + // // Release the Vcb if it could still remain. // @@ -663,8 +663,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatPnpSurpriseRemove ( PIRP_CONTEXT IrpContext, @@ -680,17 +680,17 @@ Routine Description: type of notification that the underlying storage device for the volume we have is gone, and is excellent indication that the volume will never reappear. The filesystem is responsible for initiation or completion the dismount. - + For the most part, only "real" drivers care about the distinction of a surprise remove, which is a result of our noticing that a user (usually) physically reached into the machine and pulled something out. - + Surprise will be followed by a Remove when all references have been shut down. Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being removed. Return Value: @@ -710,14 +710,14 @@ Return Value: // SURPRISE - a device was physically yanked away without // any warning. This means external forces. // - + FatAcquireExclusiveVcb( IrpContext, Vcb ); - + // // We need to pass this down before starting the dismount, which // could disconnect us immediately from the stack. // - + // // Get the next stack location, and copy over the stack location // @@ -752,9 +752,9 @@ Return Value: Status = Irp->IoStatus.Status; } - + _SEH2_TRY { - + // // Knock as many files down for this volume as we can. // @@ -770,7 +770,7 @@ Return Value: VcbDeleted = FatCheckForDismount( IrpContext, Vcb, TRUE ); } _SEH2_FINALLY { - + // // Release the Vcb if it could still remain. // @@ -782,7 +782,7 @@ Return Value: FatReleaseGlobal( IrpContext ); } _SEH2_END; - + // // Cleanup our IrpContext and complete the IRP. // @@ -792,8 +792,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatPnpCancelRemove ( PIRP_CONTEXT IrpContext, @@ -809,11 +809,11 @@ Routine Description: notification that a previously proposed remove (query) was eventually vetoed by a component. The filesystem is responsible for cleaning up and getting ready for more IO. - + Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being removed. Return Value: @@ -842,10 +842,10 @@ Return Value: // with respect to the Vcb getting torn apart - merely referencing // the volume device object is insufficient to keep us intact. // - + FatAcquireExclusiveVcb( IrpContext, Vcb ); FatReleaseGlobal( IrpContext); - + // // Unlock the volume. This is benign if we never had seen // a QUERY. @@ -854,7 +854,7 @@ Return Value: (VOID)FatUnlockVolumeInternal( IrpContext, Vcb, NULL ); _SEH2_TRY { - + // // Send the request. The underlying driver will complete the // IRP. Since we don't need to be in the way, simply ellide @@ -864,9 +864,9 @@ Return Value: IoSkipCurrentIrpStackLocation( Irp ); Status = IoCallDriver(Vcb->TargetDeviceObject, Irp); - } + } _SEH2_FINALLY { - + FatReleaseVcb( IrpContext, Vcb ); } _SEH2_END; @@ -875,7 +875,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -896,7 +896,7 @@ FatPnpCompletionRoutine ( UNREFERENCED_PARAMETER( DeviceObject ); UNREFERENCED_PARAMETER( Contxt ); - UNREFERENCED_PARAMETER( Irp ); + UNREFERENCED_PARAMETER( Irp ); } diff --git a/drivers/filesystems/fastfat_new/read.c b/drivers/filesystems/fastfat_new/read.c index 48affe31142..e1003e921d7 100644 --- a/drivers/filesystems/fastfat_new/read.c +++ b/drivers/filesystems/fastfat_new/read.c @@ -112,7 +112,7 @@ FatOverflowPagingFileRead ( #pragma alloc_text(PAGE, FatCommonRead) #endif - + _Function_class_(IRP_MJ_READ) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -275,7 +275,7 @@ Return Value: return Status; } - + // // Internal support routine // @@ -327,7 +327,7 @@ Return Value: // Preacquire the resource the read path will require so we know the // worker thread can proceed without waiting. // - + if (FlagOn(Irp->Flags, IRP_PAGING_IO) && (Fcb->Header.PagingIoResource != NULL)) { Resource = Fcb->Header.PagingIoResource; @@ -336,7 +336,7 @@ Return Value: Resource = Fcb->Header.Resource; } - + // // If there are no resources assodicated with the file (case: the virtual // volume file), it is OK. No resources will be acquired on the other side @@ -344,21 +344,21 @@ Return Value: // if (Resource) { - + ExAcquireResourceSharedLite( Resource, TRUE ); } if (NodeType( Fcb ) == FAT_NTC_VCB) { Vcb = (PVCB) Fcb; - + } else { Vcb = Fcb->Vcb; } - + _SEH2_TRY { - + // // Make the Irp just like a regular post request and // then send the Irp to the special overflow thread. @@ -400,7 +400,7 @@ Return Value: return STATUS_PENDING; } - + // // Internal support routine // @@ -457,11 +457,11 @@ Return Value: FileObject->FsContext; if (NodeType( Fcb ) == FAT_NTC_VCB) { - + Vcb = (PVCB) Fcb; - + } else { - + Vcb = Fcb->Vcb; } @@ -518,8 +518,8 @@ Return Value: KeSetEvent( Event, 0, FALSE ); } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonRead ( IN PIRP_CONTEXT IrpContext, @@ -726,7 +726,7 @@ Return Value: } - + // // These two cases correspond to either a general opened volume, ie. // open ("a:"), or a read of the volume file (boot sector + fat(s)) @@ -761,7 +761,7 @@ Return Value: // // If the caller previously sent a format unit command, then we will allow // their read/write requests to ignore the verify flag on the device, since some - // devices send a media change event after format unit, but we don't want to + // devices send a media change event after format unit, but we don't want to // process it yet since we're probably in the process of formatting the // media. // @@ -918,7 +918,7 @@ Return Value: FatCompleteRequest( IrpContext, Irp, Status ); return Status; } - + // // At this point we know there is an Fcb/Dcb. // @@ -1066,11 +1066,11 @@ Return Value: // // We now check whether we can proceed based on the state of - // the file oplocks. + // the file oplocks. // if (!PagingIo) { - + Status = FsRtlCheckOplock( FatGetFcbOplock(FcbOrDcb), Irp, IrpContext, @@ -1137,7 +1137,7 @@ Return Value: } } - + // // HANDLE THE NON-CACHED CASE // @@ -1172,7 +1172,7 @@ Return Value: if (StartingVbo < ValidDataLength) { ULONG ZeroingOffset; - + // // Now zero out the user's request sector aligned beyond // vdl. We will handle the straddling sector at completion @@ -1193,13 +1193,13 @@ Return Value: // that the read ends in the last sector and the zeroing will be // done at completion. // - + if (ByteCount > ZeroingOffset) { - + SafeZeroMemory( (PUCHAR) SystemBuffer + ZeroingOffset, ByteCount - ZeroingOffset); - } + } } else { @@ -1280,7 +1280,7 @@ Return Value: // // Set BytesToRead to ByteCount to satify the following ASSERT. // - + #ifdef _MSC_VER #pragma prefast( suppress:28931, "needed for debug build" ) #endif @@ -1292,7 +1292,7 @@ Return Value: // Perform the actual IO // - + if (FatNonCachedIo( IrpContext, Irp, FcbOrDcb, @@ -1339,7 +1339,7 @@ Return Value: } // if No Intermediate Buffering - + // // HANDLE CACHED CASE // @@ -1386,7 +1386,7 @@ Return Value: CcSetReadAheadGranularity( FileObject, READ_AHEAD_GRANULARITY ); } - + // // DO A NORMAL CACHED READ, if the MDL bit is not set, // @@ -1434,7 +1434,7 @@ Return Value: try_return( Status ); } - + // // HANDLE A MDL READ // @@ -1459,7 +1459,7 @@ Return Value: } } } - + // // These cases correspond to a system read directory file or // ea file. @@ -1473,7 +1473,7 @@ Return Value: #if FASTFATDBG if ( TypeOfOpen == DirectoryFile ) { - DebugTrace(0, Dbg, "Type of read is directoryfile\n", 0); + DebugTrace(0, Dbg, "Type of read is directoryfile\n", 0); } else if ( TypeOfOpen == EaFile) { DebugTrace(0, Dbg, "Type of read is eafile\n", 0); } @@ -1498,7 +1498,7 @@ Return Value: NT_ASSERT( NonCachedIo && PagingIo ); NT_ASSERT( ((StartingVbo | ByteCount) & (SectorSize - 1)) == 0 ); - + // // These calls must allways be within the allocation size // @@ -1518,7 +1518,7 @@ Return Value: ByteCount = FcbOrDcb->Header.AllocationSize.LowPart - StartingVbo; } - + // // Perform the actual IO // @@ -1662,7 +1662,7 @@ Return Value: // if (!PostIrp) { - + // // If we had a stack io context, we have to make sure the contents // are cleaned up before we leave. @@ -1696,7 +1696,7 @@ Return Value: return Status; } - + // // Local support routine // diff --git a/drivers/filesystems/fastfat_new/resrcsup.c b/drivers/filesystems/fastfat_new/resrcsup.c index 7a0ba1db8cf..4a1f402a337 100644 --- a/drivers/filesystems/fastfat_new/resrcsup.c +++ b/drivers/filesystems/fastfat_new/resrcsup.c @@ -37,7 +37,7 @@ _When_(return != FALSE && NoOpCheck != FALSE, _Acquires_exclusive_lock_(Vcb->Res FINISHED FatAcquireExclusiveVcb_Real ( IN PIRP_CONTEXT IrpContext, - IN PVCB Vcb, + IN PVCB Vcb, IN BOOLEAN NoOpCheck ) @@ -72,7 +72,7 @@ Return Value: if (ExAcquireResourceExclusiveLite( &Vcb->Resource, BooleanFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT))) { if (!NoOpCheck) { - + _SEH2_TRY { FatVerifyOperationIsLegal( IrpContext ); @@ -123,7 +123,7 @@ Return Value: { PAGED_CODE(); - if (ExAcquireResourceSharedLite( &Vcb->Resource, + if (ExAcquireResourceSharedLite( &Vcb->Resource, BooleanFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT))) { _SEH2_TRY { @@ -224,7 +224,7 @@ RetryFcbExclusive: return FALSE; } - + _Requires_lock_held_(_Global_critical_region_) _Acquires_shared_lock_(*Fcb->Header.Resource) FINISHED @@ -305,8 +305,8 @@ RetryFcbShared: } } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) _When_(return != 0, _Acquires_shared_lock_(*Fcb->Header.Resource)) FINISHED FatAcquireSharedFcbWaitForEx ( @@ -386,8 +386,8 @@ RetryFcbSharedWaitEx: } } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) BOOLEAN NTAPI FatAcquireFcbForLazyWrite ( @@ -429,8 +429,8 @@ Return Value: // // - // Note that we do not need to disable APC delivery to guard - // against a rogue user issuing a suspend APC. That is because + // Note that we do not need to disable APC delivery to guard + // against a rogue user issuing a suspend APC. That is because // it is guaranteed that the caller is either in the system context, // to which a user cannot deliver a suspend APC, or the caller has // already disabled kernel APC delivery before calling. This is true @@ -480,8 +480,8 @@ Return Value: return TRUE; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID NTAPI FatReleaseFcbFromLazyWrite ( @@ -545,7 +545,7 @@ Return Value: return; } - + _Requires_lock_held_(_Global_critical_region_) BOOLEAN NTAPI @@ -585,10 +585,10 @@ Return Value: // We acquire the normal file resource shared here to synchronize // correctly with purges. // - + // - // Note that we do not need to disable APC delivery to guard - // against a rogue user issuing a suspend APC. That is because + // Note that we do not need to disable APC delivery to guard + // against a rogue user issuing a suspend APC. That is because // it is guaranteed that the caller is either in the system context, // to which a user cannot deliver a suspend APC, or the caller has // already disabled kernel APC delivery before calling. This is true @@ -615,8 +615,8 @@ Return Value: return TRUE; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID NTAPI FatReleaseFcbFromReadAhead ( @@ -659,8 +659,8 @@ Return Value: } -_Function_class_(FAST_IO_ACQUIRE_FOR_CCFLUSH) -_Requires_lock_held_(_Global_critical_region_) +_Function_class_(FAST_IO_ACQUIRE_FOR_CCFLUSH) +_Requires_lock_held_(_Global_critical_region_) NTSTATUS NTAPI FatAcquireForCcFlush ( @@ -676,7 +676,7 @@ FatAcquireForCcFlush ( PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + // // Once again, the hack for making this look like // a recursive call if needed. We cannot let ourselves @@ -687,9 +687,9 @@ FatAcquireForCcFlush ( // NT_ASSERT( IoGetTopLevelIrp() != (PIRP)FSRTL_CACHE_TOP_LEVEL_IRP ); - + if (IoGetTopLevelIrp() == NULL) { - + IoSetTopLevelIrp((PIRP)FSRTL_CACHE_TOP_LEVEL_IRP); } @@ -709,8 +709,8 @@ FatAcquireForCcFlush ( // // - // Note that we do not need to disable APC delivery to guard - // against a rogue user issuing a suspend APC. That is because + // Note that we do not need to disable APC delivery to guard + // against a rogue user issuing a suspend APC. That is because // it is guaranteed that the caller is either in the system context, // to which a user cannot deliver a suspend APC, or the caller has // already disabled kernel APC delivery before calling. This is true @@ -721,30 +721,30 @@ FatAcquireForCcFlush ( Header = (PFSRTL_COMMON_FCB_HEADER) FileObject->FsContext; if (Type < DirectoryFile) { - + if (Header->Resource) { - + if (!ExIsResourceAcquiredSharedLite( Header->Resource )) { - + ExAcquireResourceExclusiveLite( Header->Resource, TRUE ); - + } else { - + ExAcquireResourceSharedLite( Header->Resource, TRUE ); } } } if (Header->PagingIoResource) { - + ExAcquireResourceSharedLite( Header->PagingIoResource, TRUE ); } - + return STATUS_SUCCESS; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS NTAPI FatReleaseForCcFlush ( @@ -760,11 +760,11 @@ FatReleaseForCcFlush ( PAGED_CODE(); UNREFERENCED_PARAMETER( DeviceObject ); - + // // Clear up our hint. // - + if (IoGetTopLevelIrp() == (PIRP)FSRTL_CACHE_TOP_LEVEL_IRP) { IoSetTopLevelIrp( NULL ); @@ -774,22 +774,22 @@ FatReleaseForCcFlush ( Header = (PFSRTL_COMMON_FCB_HEADER) FileObject->FsContext; if (Type < DirectoryFile) { - + if (Header->Resource) { - + ExReleaseResourceLite( Header->Resource ); } } if (Header->PagingIoResource) { - + ExReleaseResourceLite( Header->PagingIoResource ); } return STATUS_SUCCESS; } - + BOOLEAN NTAPI FatNoOpAcquire ( @@ -836,7 +836,7 @@ Return Value: return TRUE; } - + VOID NTAPI FatNoOpRelease ( @@ -876,8 +876,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS NTAPI FatFilterCallbackAcquireForCreateSection ( @@ -915,7 +915,7 @@ Return Value: PFCB Fcb; PAGED_CODE(); - + NT_ASSERT( CallbackData->Operation == FS_FILTER_ACQUIRE_FOR_SECTION_SYNCHRONIZATION ); NT_ASSERT( CallbackData->SizeOfFsFilterCallbackData == sizeof(FS_FILTER_CALLBACK_DATA) ); @@ -930,8 +930,8 @@ Return Value: // // - // Note that we do not need to disable APC delivery to guard - // against a rogue user issuing a suspend APC. That is because + // Note that we do not need to disable APC delivery to guard + // against a rogue user issuing a suspend APC. That is because // it is guaranteed that the caller is either in the system context, // to which a user cannot deliver a suspend APC, or the caller has // already disabled kernel APC delivery before calling. This is true diff --git a/drivers/filesystems/fastfat_new/shutdown.c b/drivers/filesystems/fastfat_new/shutdown.c index bdfdb78f711..52794ef117a 100644 --- a/drivers/filesystems/fastfat_new/shutdown.c +++ b/drivers/filesystems/fastfat_new/shutdown.c @@ -28,7 +28,7 @@ Abstract: _Function_class_(IRP_MJ_SHUTDOWN) -_Function_class_(DRIVER_DISPATCH) +_Function_class_(DRIVER_DISPATCH) NTSTATUS NTAPI FatFsdShutdown ( @@ -112,8 +112,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonShutdown ( IN PIRP_CONTEXT IrpContext, @@ -165,12 +165,12 @@ Return Value: // Indicate that shutdown has started. This is used in FatFspClose. // - FatData.ShutdownStarted = TRUE; + FatData.ShutdownStarted = TRUE; // // Get everyone else out of the way // - + NT_ASSERT( FlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT) ); #ifdef _MSC_VER @@ -285,7 +285,7 @@ Return Value: FALSE ); if (!VcbDeleted) { - + FatReleaseVolume( IrpContext, Vcb ); } } @@ -298,7 +298,7 @@ Return Value: // // Unregister the file system. // - + IoUnregisterFileSystem( FatDiskFileSystemDeviceObject); IoUnregisterFileSystem( FatCdromFileSystemDeviceObject); IoDeleteDevice( FatDiskFileSystemDeviceObject); diff --git a/drivers/filesystems/fastfat_new/splaysup.c b/drivers/filesystems/fastfat_new/splaysup.c index 4952a27647b..e1071823628 100644 --- a/drivers/filesystems/fastfat_new/splaysup.c +++ b/drivers/filesystems/fastfat_new/splaysup.c @@ -34,7 +34,7 @@ Abstract: #pragma alloc_text(PAGE, FatCompareNames) #endif - + VOID FatInsertName ( IN PIRP_CONTEXT IrpContext, @@ -116,12 +116,12 @@ Restart: // The old one is gone. Only if the old one is in normal state // do we really have a problem. // - + if (Node->Fcb->FcbState == FcbGood) { #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) -#endif +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#endif FatBugCheck( (ULONG_PTR)*RootNode, (ULONG_PTR)Name, (ULONG_PTR)Node ); } @@ -130,7 +130,7 @@ Restart: // of the tree. Note that we aren't properly synchronized to // recursively mark bad. // - + FatMarkFcbCondition( IrpContext, Node->Fcb, FcbBad, FALSE ); FatRemoveNames( IrpContext, Node->Fcb ); @@ -247,7 +247,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + Parent = Fcb->ParentDcb; // @@ -301,7 +301,7 @@ Return Value: return; } - + PFCB FatFindFcb ( IN PIRP_CONTEXT IrpContext, @@ -339,7 +339,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + Links = *RootNode; while (Links != NULL) { @@ -412,7 +412,7 @@ Return Value: return NULL; } - + // // Local support routine // diff --git a/drivers/filesystems/fastfat_new/strucsup.c b/drivers/filesystems/fastfat_new/strucsup.c index 1efb143706d..45bfb335a9a 100644 --- a/drivers/filesystems/fastfat_new/strucsup.c +++ b/drivers/filesystems/fastfat_new/strucsup.c @@ -219,7 +219,7 @@ FatFreeIrpContext ( #pragma alloc_text(PAGE, FatScanForDataTrack) #endif - + _Requires_lock_held_(_Global_critical_region_) VOID FatInitializeVcb ( @@ -278,7 +278,7 @@ Return Value: PFILE_SYSTEM_STATISTICS UnwindStatistics = NULL; BOOLEAN UnwindWeAllocatedBadBlockMap = FALSE; BOOLEAN CloseContextAllocated = FALSE; - + PAGED_CODE(); UNREFERENCED_PARAMETER( FsDeviceObject ); @@ -633,8 +633,8 @@ Return Value: if (UnwindWeAllocatedBadBlockMap) { FsRtlUninitializeLargeMcb(&Vcb->BadBlockMcb ); } if (UnwindEntryList != NULL) { #ifdef _MSC_VER -#pragma prefast( suppress: 28137, "prefast wants the wait to be a constant, but that isn't possible for the way fastfat is designed" ) -#endif +#pragma prefast( suppress: 28137, "prefast wants the wait to be a constant, but that isn't possible for the way fastfat is designed" ) +#endif (VOID)FatAcquireExclusiveGlobal( IrpContext ); RemoveEntryList( UnwindEntryList ); FatReleaseGlobal( IrpContext ); @@ -644,22 +644,22 @@ Return Value: // // Cleanup the close context we preallocated above. // - + if (CloseContextAllocated && (Vcb->VirtualVolumeFile == NULL)) { // // FatAllocateCloseContext does not allocate memory, it // pulls a close context off the preallocated slist queue. // - // Doing this here is necessary to balance out the one we - // preallocated for the Vcb earlier in this function, but + // Doing this here is necessary to balance out the one we + // preallocated for the Vcb earlier in this function, but // only if we failed to create the virtual volume file. // // If VirtualVolumeFile is not NULL, then this CloseContext // will get cleaned up when the close comes in for it during // Vcb teardown. // - + PCLOSE_CONTEXT CloseContext = FatAllocateCloseContext(Vcb); ExFreePool( CloseContext ); @@ -679,7 +679,7 @@ Return Value: return; } - + VOID FatTearDownVcb ( IN PIRP_CONTEXT IrpContext, @@ -767,7 +767,7 @@ Return Value: FatSetVcbCondition( Vcb, VcbBad ); } - + VOID FatDeleteVcb ( IN PIRP_CONTEXT IrpContext, @@ -989,8 +989,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatCreateRootDcb ( IN PIRP_CONTEXT IrpContext, @@ -1041,8 +1041,8 @@ Return Value: DebugDump("Error trying to create multiple root dcbs\n", 0, Vcb); #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) -#endif +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#endif FatBugCheck( 0, 0, 0 ); } @@ -1209,7 +1209,7 @@ Return Value: // // Initialize the oplock structure. // - + FsRtlInitializeOplock( FatGetFcbOplock(Dcb) ); #endif @@ -1247,7 +1247,7 @@ Return Value: return; } - + PFCB FatCreateFcb ( IN PIRP_CONTEXT IrpContext, @@ -1257,7 +1257,7 @@ FatCreateFcb ( IN ULONG DirentOffsetWithinDirectory, IN PDIRENT Dirent, IN PUNICODE_STRING Lfn OPTIONAL, - IN PUNICODE_STRING OrigLfn OPTIONAL, + IN PUNICODE_STRING OrigLfn OPTIONAL, IN BOOLEAN IsPagingFile, IN BOOLEAN SingleResource ) @@ -1317,7 +1317,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( OrigLfn ); - + DebugTrace(+1, Dbg, "FatCreateFcb\n", 0); _SEH2_TRY { @@ -1409,11 +1409,11 @@ Return Value: // This is important to let us maintain whole-volume lockorder // via BottomUp enumeration. // - + InsertTailList( &ParentDcb->Specific.Dcb.ParentDcbQueue, &Fcb->ParentDcbLinks ); UnwindEntryList = &Fcb->ParentDcbLinks; - + // // Point back to our parent dcb // @@ -1618,7 +1618,7 @@ Return Value: return Fcb; } - + PDCB FatCreateDcb ( IN PIRP_CONTEXT IrpContext, @@ -1947,7 +1947,7 @@ Return Value: return Dcb; } - + VOID FatDeleteFcb ( IN PIRP_CONTEXT IrpContext, @@ -1987,7 +1987,7 @@ Return Value: DebugDump("Error deleting Fcb, Still Open\n", 0, Fcb); #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif FatBugCheck( 0, 0, 0 ); } @@ -2029,7 +2029,7 @@ Return Value: // // Uninitialize the oplock. // - + FsRtlUninitializeOplock( FatGetFcbOplock(Fcb) ); #endif @@ -2296,7 +2296,7 @@ Return Value: UNREFERENCED_PARAMETER( IrpContext ); } - + PIRP_CONTEXT FatCreateIrpContext ( IN PIRP Irp, @@ -2455,7 +2455,7 @@ Return Value: return IrpContext; } - + VOID FatDeleteIrpContext_Real ( @@ -2520,7 +2520,7 @@ Return Value: return; } - + PFCB FatGetNextFcbBottomUp ( IN PIRP_CONTEXT IrpContext, @@ -2725,7 +2725,7 @@ Return Value: } } - + BOOLEAN FatSwapVpb ( IN PIRP_CONTEXT IrpContext, @@ -2839,8 +2839,8 @@ Return Value: return Result; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) BOOLEAN FatCheckForDismount ( IN PIRP_CONTEXT IrpContext, @@ -3017,7 +3017,7 @@ Return Value: return VcbDeleted; } - + VOID FatConstructNamesInFcb ( IN PIRP_CONTEXT IrpContext, @@ -3481,8 +3481,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatCheckFreeDirentBitmap ( IN PIRP_CONTEXT IrpContext, @@ -3609,7 +3609,7 @@ Return Value: } } - + BOOLEAN FatIsHandleCountZero ( IN PIRP_CONTEXT IrpContext, diff --git a/drivers/filesystems/fastfat_new/timesup.c b/drivers/filesystems/fastfat_new/timesup.c index 2228d73fa95..aeb0eb5a144 100644 --- a/drivers/filesystems/fastfat_new/timesup.c +++ b/drivers/filesystems/fastfat_new/timesup.c @@ -74,7 +74,7 @@ Return Value: // // Add almost two seconds to round up to the nearest double second. // - + NtTime->QuadPart = NtTime->QuadPart + AlmostTwoSeconds; } @@ -166,7 +166,7 @@ Return Value: return TRUE; } - + LARGE_INTEGER FatFatDateToNtTime ( _In_ PIRP_CONTEXT IrpContext, @@ -228,7 +228,7 @@ Return Value: UNREFERENCED_PARAMETER( IrpContext ); } - + LARGE_INTEGER FatFatTimeToNtTime ( _In_ PIRP_CONTEXT IrpContext, @@ -312,7 +312,7 @@ Return Value: UNREFERENCED_PARAMETER( IrpContext ); } - + FAT_TIME_STAMP FatGetCurrentFatTime ( _In_ PIRP_CONTEXT IrpContext diff --git a/drivers/filesystems/fastfat_new/verfysup.c b/drivers/filesystems/fastfat_new/verfysup.c index 969c332ab89..7b844265bc9 100644 --- a/drivers/filesystems/fastfat_new/verfysup.c +++ b/drivers/filesystems/fastfat_new/verfysup.c @@ -84,7 +84,7 @@ FatMarkVolumeCompletionRoutine( #pragma alloc_text(PAGE, FatVerifyFcb) #endif - + VOID FatMarkFcbCondition ( IN PIRP_CONTEXT IrpContext, @@ -200,7 +200,7 @@ Return Value: if (FcbCondition == FcbNeedsToBeVerified) { FatResetFcb( IrpContext, Fcb ); } - + } } @@ -265,7 +265,7 @@ Return Value: return Marked; } - + VOID FatVerifyVcb ( IN PIRP_CONTEXT IrpContext, @@ -306,7 +306,7 @@ Return Value: // DevMarkedForVerify = BooleanFlagOn(Vcb->Vpb->RealDevice->Flags, DO_VERIFY_VOLUME); - + // // We ALWAYS force CREATE requests on unmounted volumes through the // verify path. These requests could have been in limbo between @@ -356,8 +356,8 @@ Return Value: DebugTrace(-1, Dbg, "FatVerifyVcb -> VOID\n", 0); } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatVerifyFcb ( IN PIRP_CONTEXT IrpContext, @@ -481,10 +481,10 @@ Return Value: default: DebugDump("Invalid FcbCondition\n", 0, Fcb); - + #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) -#endif +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#endif FatBugCheck( Fcb->FcbCondition, 0, 0 ); } @@ -492,7 +492,7 @@ Return Value: return; } - + VOID NTAPI @@ -555,8 +555,8 @@ Return Value: #ifdef _MSC_VER #pragma prefast( push ) -#pragma prefast( disable: 28193, "this will always wait" ) -#endif +#pragma prefast( disable: 28193, "this will always wait" ) +#endif FatAcquireSharedGlobal( &IrpContext ); #ifdef _MSC_VER #pragma prefast( pop ) @@ -648,7 +648,7 @@ Return Value: } - + VOID NTAPI FatCleanVolumeDpc ( @@ -723,7 +723,7 @@ Return Value: ClearFlag( Packet->Vcb->VcbState, VCB_STATE_FLAG_VOLUME_DIRTY ); ExInitializeWorkItem( &Packet->Item, &FatDeferredCleanVolume, Packet ); - + #ifdef _MSC_VER #pragma prefast( suppress:28159, "prefast indicates this is an obsolete API, but it is ok for fastfat to keep using it" ) #endif @@ -733,8 +733,8 @@ Return Value: return; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) VOID FatMarkVolume ( IN PIRP_CONTEXT IrpContext, @@ -1092,7 +1092,7 @@ Return Value: return; } - + VOID NTAPI FatFspMarkVolumeDirtyWithRecover( @@ -1180,7 +1180,7 @@ Return Value: DebugTrace(-1, Dbg, "FatFspMarkVolumeDirtyWithRecover -> VOID\n", 0); } - + VOID FatCheckDirtyBit ( IN PIRP_CONTEXT IrpContext, @@ -1299,7 +1299,7 @@ Return Value: } _SEH2_END; } - + VOID FatVerifyOperationIsLegal ( IN PIRP_CONTEXT IrpContext @@ -1386,7 +1386,7 @@ Return Value: return; } - + // // Internal support routine @@ -1425,7 +1425,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + // // Don't do the two following operations for the Root Dcb // of a non FAT32 volume or paging files. Paging files!? @@ -1489,7 +1489,7 @@ Return Value: } } - + BOOLEAN FatMatchFileSize ( @@ -1587,7 +1587,7 @@ Return Value: if (DirentBcb == NULL) { FatMarkFcbCondition( IrpContext, Fcb, FcbBad, FALSE ); - + return; } @@ -1624,7 +1624,7 @@ Return Value: || !FatMatchFileSize(IrpContext, Dirent, Fcb ) - + || (FirstClusterOfFile != Fcb->FirstClusterOfFile) @@ -1652,7 +1652,7 @@ Return Value: return; } - + // // Internal support routine @@ -1779,13 +1779,13 @@ Return Value: DebugDump("Invalid VcbCondition\n", 0, Vcb); #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif FatBugCheck( Vcb->VcbCondition, 0, 0 ); } } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatPerformVerify ( _In_ PIRP_CONTEXT IrpContext, @@ -1920,7 +1920,7 @@ Return Value: #ifdef _MSC_VER #pragma prefast( push ) -#pragma prefast( disable: 28137, "prefast wants the wait to be a constant, but that isn't possible for the way fastfat is designed" ) +#pragma prefast( disable: 28137, "prefast wants the wait to be a constant, but that isn't possible for the way fastfat is designed" ) #pragma prefast( disable: 28193 ) #endif FatAcquireExclusiveGlobal( IrpContext ); @@ -2003,7 +2003,7 @@ Return Value: return Status; } - + // // Local support routine // diff --git a/drivers/filesystems/fastfat_new/volinfo.c b/drivers/filesystems/fastfat_new/volinfo.c index c9f76aa7625..a5c3a7ab2f5 100644 --- a/drivers/filesystems/fastfat_new/volinfo.c +++ b/drivers/filesystems/fastfat_new/volinfo.c @@ -95,7 +95,7 @@ FatQueryFsSectorSizeInfo ( #endif #endif - + _Function_class_(IRP_MJ_QUERY_VOLUME_INFORMATION) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -176,7 +176,7 @@ Return Value: return Status; } - + _Function_class_(IRP_MJ_SET_VOLUME_INFORMATION) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -257,7 +257,7 @@ Return Value: return Status; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonQueryVolumeInfo ( @@ -434,7 +434,7 @@ Return Value: return Status; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonSetVolumeInfo ( @@ -572,7 +572,7 @@ Return Value: return Status; } - + // // Internal support routine // @@ -666,7 +666,7 @@ Return Value: return Status; } - + // // Internal support routine // @@ -735,7 +735,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Internal support routine // @@ -800,7 +800,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Internal support routine // @@ -856,7 +856,7 @@ Return Value: SetFlag( Buffer->FileSystemAttributes, FILE_READ_ONLY_VOLUME ); } - + Buffer->MaximumComponentNameLength = FatData.ChicagoMode ? 255 : 12; if (FatIsFat32(Vcb)) { @@ -923,7 +923,7 @@ Return Value: return Status; } - + // // Internal support routine // @@ -989,7 +989,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Internal support routine // diff --git a/drivers/filesystems/fastfat_new/write.c b/drivers/filesystems/fastfat_new/write.c index 60109d76261..47dba114449 100644 --- a/drivers/filesystems/fastfat_new/write.c +++ b/drivers/filesystems/fastfat_new/write.c @@ -73,7 +73,7 @@ FatDeferredFlush ( #pragma alloc_text(PAGE, FatCommonWrite) #endif - + _Function_class_(IRP_MJ_WRITE) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -216,8 +216,8 @@ Return Value: return Status; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS FatCommonWrite ( IN PIRP_CONTEXT IrpContext, @@ -485,7 +485,7 @@ Return Value: IrpContext->FatIoContext->Wait.Async.FileObject = FileObject; } - + } // @@ -641,9 +641,9 @@ Return Value: DirtyVbo = (VBO)DirtyLbo; DebugTrace(0, Dbg, "Last dirty fat Mcb entry was a hole: corrupt.\n", 0); - + #ifdef _MSC_VER -#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) +#pragma prefast( suppress:28159, "things are seriously wrong if we get here" ) #endif FatBugCheck( 0, 0, 0 ); @@ -876,7 +876,7 @@ Return Value: FatCompleteRequest( IrpContext, Irp, Status ); return Status; } - + // // This case corresponds to a general opened volume (DASD), ie. // open ("a:"). @@ -947,13 +947,13 @@ Return Value: // // If the caller previously sent a format unit command, then we will allow // their read/write requests to ignore the verify flag on the device, since some - // devices send a media change event after format unit, but we don't want to + // devices send a media change event after format unit, but we don't want to // process it yet since we're probably in the process of formatting the // media. // - + if (FlagOn( Ccb->Flags, CCB_FLAG_SENT_FORMAT_UNIT )) { - + SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_OVERRIDE_VERIFY ); } @@ -970,7 +970,7 @@ Return Value: // but a repro case for another bug happens to dance into this race // condition pretty easily. Eh. // - + SetFlag( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT ); FatAcquireExclusiveVolume( IrpContext, Vcb ); @@ -1132,7 +1132,7 @@ Return Value: FatCompleteRequest( IrpContext, Irp, Status ); return Status; } - + // // At this point we know there is an Fcb/Dcb. // @@ -1263,13 +1263,13 @@ Return Value: // // Purge failure mode only applies to user files. // - + NT_ASSERT( TypeOfOpen == UserFileOpen ); // // Do not swallow the purge failure if in purge failure // mode. Someone outside the file system intends to handle - // the error and prevent any application compatibilty + // the error and prevent any application compatibilty // issue. // // NOTE: If the file system were not preventing a pagefault @@ -1279,8 +1279,8 @@ Return Value: // not a memory mapped read could bring in a stale page before // the write makes it to disk. // - - try_return( Status = STATUS_PURGE_FAILED ); + + try_return( Status = STATUS_PURGE_FAILED ); } // @@ -1290,7 +1290,7 @@ Return Value: // // PagingIo must be held all the way through. // - + FcbCanDemoteToShared = TRUE; } @@ -1299,7 +1299,7 @@ Return Value: // NT_ASSERT( WriteToEof ? !PagingIo : TRUE ); - + // // First let's acquire the Fcb shared. Shared is enough if we // are not writing beyond EOF. @@ -1336,13 +1336,13 @@ Return Value: // We may already have the Fcb due to noncached coherency // work done just above; however, we may still have to extend // valid data length. We can't demote this to shared, matching - // what occured before, until we figure that out a bit later. + // what occured before, until we figure that out a bit later. // // We kept ahold of it since our lockorder is main->paging, // and paging must now held across the noncached write from // the purge on. // - + // // If this is async I/O, we will wait if there is an exclusive // waiter. @@ -1366,7 +1366,7 @@ Return Value: IrpContext->FatIoContext->Wait.Async.Resource = FcbOrDcb->Header.Resource; if (FcbCanDemoteToShared) { - + IrpContext->FatIoContext->Wait.Async.Resource2 = FcbOrDcb->Header.PagingIoResource; } } else { @@ -1608,9 +1608,9 @@ Return Value: // The Fcb may already be acquired exclusive due to coherency // work performed earlier. If so, obviously no work to do. // - + if (!FcbAcquiredExclusive) { - + FatReleaseFcb( IrpContext, FcbOrDcb ); FcbOrDcbAcquired = FALSE; @@ -1622,7 +1622,7 @@ Return Value: } FcbOrDcbAcquired = TRUE; - + #ifdef _MSC_VER #pragma prefast( suppress:28931, "convenient for debugging" ) #endif @@ -1705,7 +1705,7 @@ Return Value: Irp->IoStatus.Information = 0; try_return( Status = STATUS_SUCCESS ); } - + ByteCount = IrpSp->Parameters.Write.Length; if (ByteCount > FileSize - StartingVbo) { @@ -1755,9 +1755,9 @@ Return Value: // this is a WriteToEof operation. // - + if (!FatIsIoRangeValid( Vcb, StartingByte, ByteCount)) { - + Irp->IoStatus.Information = 0; try_return( Status = STATUS_DISK_FULL ); } @@ -1835,7 +1835,7 @@ Return Value: // if (FlagOn(Vcb->VcbState, VCB_STATE_FLAG_DEFERRED_FLUSH)) { - + SetFlag(IrpContext->Flags, IRP_CONTEXT_FLAG_DISABLE_WRITE_THROUGH); } @@ -1871,7 +1871,7 @@ Return Value: ULONGLONG ApproximateClusterCount; ULONGLONG TargetAllocation; - ULONGLONG AddedAllocation; + ULONGLONG AddedAllocation; ULONGLONG Multiplier; ULONG BytesPerCluster; ULONG ClusterAlignedFileSize; @@ -1937,56 +1937,56 @@ Return Value: // so forth - 2^(16 - 5 + 21) == 2^32). Since this implies a partition // of 32gb and a number of clusters (and cluster size) we plan to // disallow in format for FAT32, the odds of this happening are pretty - // low anyway. + // low anyway. Multiplier = ((Vcb->AllocationSupport.NumberOfFreeClusters * (BytesPerCluster >> 5)) / (ClusterAlignedFileSize - FcbOrDcb->Header.AllocationSize.LowPart)) + 1; - + if (Multiplier > 32) { Multiplier = 32; } - // These computations will never overflow a ULONGLONG because a file is capped at 4GB, and + // These computations will never overflow a ULONGLONG because a file is capped at 4GB, and // a single write can be a max of 4GB. AddedAllocation = Multiplier * (ClusterAlignedFileSize - FcbOrDcb->Header.AllocationSize.LowPart); TargetAllocation = FcbOrDcb->Header.AllocationSize.LowPart + AddedAllocation; - + // // We know that TargetAllocation is in whole clusters. Now // we check if it exceeded the maximum valid FAT file size. // If it did, we fall back to allocating up to the maximum legal size. // - + if (TargetAllocation > ~BytesPerCluster + 1) { - + TargetAllocation = ~BytesPerCluster + 1; AddedAllocation = TargetAllocation - FcbOrDcb->Header.AllocationSize.LowPart; } - + // // Now do an unsafe check here to see if we should even // try to allocate this much. If not, just allocate // the minimum size we need, if so so try it, but if it // fails, just allocate the minimum size we need. // - + ApproximateClusterCount = (AddedAllocation / BytesPerCluster); - + if (ApproximateClusterCount <= Vcb->AllocationSupport.NumberOfFreeClusters) { - + _SEH2_TRY { - + FatAddFileAllocation( IrpContext, FcbOrDcb, FileObject, (ULONG)TargetAllocation ); - + AllocateMinimumSize = FALSE; SetFlag( FcbOrDcb->FcbState, FCB_STATE_TRUNCATE_ON_CLOSE ); - + } _SEH2_EXCEPT( _SEH2_GetExceptionCode() == STATUS_DISK_FULL ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { - + FatResetExceptionState( IrpContext ); } _SEH2_END; } @@ -2021,7 +2021,7 @@ Return Value: NT_ASSERT( FileSize <= FcbOrDcb->Header.AllocationSize.LowPart ); - + FcbOrDcb->Header.FileSize.LowPart = FileSize; // @@ -2043,7 +2043,7 @@ Return Value: (StartingVbo + ByteCount > ValidDataLength) ) { ExtendingValidData = TRUE; - + } else { // @@ -2058,7 +2058,7 @@ Return Value: // // Note that we've still got PagingIo exclusive in these cases. // - + if (FcbCanDemoteToShared) { NT_ASSERT( FcbAcquiredExclusive && ExIsResourceAcquiredExclusiveLite( FcbOrDcb->Header.Resource )); @@ -2066,18 +2066,18 @@ Return Value: FcbAcquiredExclusive = FALSE; } } - + if (ValidDataToDisk > ValidDataLength) { - + ValidDataToCheck = ValidDataToDisk; - + } else { - + ValidDataToCheck = ValidDataLength; } - + // // HANDLE THE NON-CACHED CASE // @@ -2289,7 +2289,7 @@ Return Value: // IRP, and have thus lost synchronization. Note that we should // not hit this case anymore since we will not re-async vdl extension. // - + NT_ASSERT( !ExtendingValidData ); try_return( Status = STATUS_PENDING ); @@ -2340,7 +2340,7 @@ Return Value: } // if No Intermediate Buffering - + // // HANDLE CACHED CASE // @@ -2470,7 +2470,7 @@ Return Value: WriteFileSizeToDirent = BooleanFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WRITE_THROUGH); - + // // DO A NORMAL CACHED WRITE, if the MDL bit is not set, // @@ -2536,7 +2536,7 @@ Return Value: } } } - + // // These two cases correspond to a system write directory file and // ea file. @@ -2549,7 +2549,7 @@ Return Value: #if FASTFATDBG if ( TypeOfOpen == DirectoryFile ) { - DebugTrace(0, Dbg, "Type of write is directoryfile\n", 0); + DebugTrace(0, Dbg, "Type of write is directoryfile\n", 0); } else if ( TypeOfOpen == EaFile) { DebugTrace(0, Dbg, "Type of write is eafile\n", 0); } @@ -2612,7 +2612,7 @@ Return Value: // For the noncached case, assert that everything is sector // alligned. // - + #ifdef _MSC_VER #pragma prefast( suppress:28931, "needed for debug build" ) #endif @@ -2648,7 +2648,7 @@ Return Value: ByteCount = FcbOrDcb->Header.FileSize.LowPart - StartingVbo; } - + // // Perform the actual IO // @@ -2708,7 +2708,7 @@ Return Value: FatBugCheck( TypeOfOpen, (ULONG_PTR) FcbOrDcb, 0 ); try_exit: NOTHING; - + // // If the request was not posted and there is still an Irp, @@ -2821,9 +2821,9 @@ Return Value: CcSetFileSizes( FileObject, (PCC_FILE_SIZES)&FcbOrDcb->Header.AllocationSize ); } } - + } - + // // Note that we have to unpin repinned Bcbs here after the above // work, but if we are going to post the request, we must do this @@ -2951,7 +2951,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -3006,7 +3006,7 @@ Return Value: ExQueueWorkItem( &FlushContext->Item, CriticalWorkQueue ); } - + // // Local support routine // @@ -3046,7 +3046,7 @@ Return Value: FatDecodeFileObject(File, &Vcb, &FcbOrDcb, &Ccb); NT_ASSERT( FcbOrDcb != NULL ); - + // // Make us appear as a top level FSP request so that we will // receive any errors from the flush. @@ -3056,7 +3056,7 @@ Return Value: ExAcquireResourceExclusiveLite( FcbOrDcb->Header.Resource, TRUE ); ExAcquireResourceSharedLite( FcbOrDcb->Header.PagingIoResource, TRUE ); - + CcFlushCache( File->SectionObjectPointer, NULL, 0, NULL ); ExReleaseResourceLite( FcbOrDcb->Header.PagingIoResource ); diff --git a/drivers/filesystems/ffs/inc/bootblock.h b/drivers/filesystems/ffs/inc/bootblock.h index f6bf3e07585..f49b93fab01 100644 --- a/drivers/filesystems/ffs/inc/bootblock.h +++ b/drivers/filesystems/ffs/inc/bootblock.h @@ -367,9 +367,9 @@ int xlat_mbr_fstype(int); /* in sys/lib/libkern/xlat_mbr_fstype.c */ struct mbr_sector { /* Jump instruction to boot code. */ /* Usually 0xE9nnnn or 0xEBnn90 */ - uint8_t mbr_jmpboot[3]; + uint8_t mbr_jmpboot[3]; /* OEM name and version */ - uint8_t mbr_oemname[8]; + uint8_t mbr_oemname[8]; union { /* BIOS Parameter Block */ struct mbr_bpbFAT12 bpb12; struct mbr_bpbFAT16 bpb16; diff --git a/drivers/filesystems/ffs/inc/ffsdrv.h b/drivers/filesystems/ffs/inc/ffsdrv.h index 41d395d373f..c30f8566e8b 100644 --- a/drivers/filesystems/ffs/inc/ffsdrv.h +++ b/drivers/filesystems/ffs/inc/ffsdrv.h @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * ffsdrv.h @@ -618,7 +618,7 @@ typedef struct _FFS_FCB { #if DBG // The Ansi Filename for debugging - OEM_STRING AnsiFileName; + OEM_STRING AnsiFileName; #endif @@ -854,7 +854,7 @@ FFSReadDisk( IN PVOID Buffer, IN BOOLEAN bVerify); -NTSTATUS +NTSTATUS FFSDiskIoControl( IN PDEVICE_OBJECT DeviceOjbect, IN ULONG IoctlCode, @@ -996,7 +996,7 @@ FFSCreateFile( __drv_mustHoldCriticalRegion NTSTATUS FFSCreateVolume( - IN PFFS_IRP_CONTEXT IrpContext, + IN PFFS_IRP_CONTEXT IrpContext, IN PFFS_VCB Vcb); __drv_mustHoldCriticalRegion @@ -1071,7 +1071,7 @@ extern ULONG ProcessNameOffset; (PCHAR) PsGetCurrentProcess() + ProcessNameOffset \ ) -ULONG +ULONG FFSGetProcessNameOffset( VOID); @@ -1344,8 +1344,8 @@ FFSv1BuildBDL( IN PFFS_IRP_CONTEXT IrpContext, IN PFFS_VCB Vcb, IN PFFSv1_INODE dinode1, - IN ULONGLONG Offset, - IN ULONG Size, + IN ULONGLONG Offset, + IN ULONG Size, OUT PFFS_BDL *ffs_bdl); ULONG @@ -1353,8 +1353,8 @@ FFSv2BuildBDL( IN PFFS_IRP_CONTEXT IrpContext, IN PFFS_VCB Vcb, IN PFFSv2_INODE dinode2, - IN ULONGLONG Offset, - IN ULONG Size, + IN ULONGLONG Offset, + IN ULONG Size, OUT PFFS_BDL *ffs_bdl); BOOLEAN @@ -1362,7 +1362,7 @@ FFSNewBlock( PFFS_IRP_CONTEXT IrpContext, PFFS_VCB Vcb, ULONG GroupHint, - ULONG BlockHint, + ULONG BlockHint, PULONG dwRet); BOOLEAN @@ -1647,7 +1647,7 @@ FFSSetInformation( BOOLEAN FFSExpandFile( - PFFS_IRP_CONTEXT IrpContext, + PFFS_IRP_CONTEXT IrpContext, PFFS_VCB Vcb, PFFS_FCB Fcb, PLARGE_INTEGER AllocationSize); @@ -1821,7 +1821,7 @@ FFSFileSystemControl( BOOLEAN FFSQueryParameters( - IN PUNICODE_STRING RegistryPath); + IN PUNICODE_STRING RegistryPath); #ifdef _PREFAST_ DRIVER_INITIALIZE DriverEntry; @@ -1967,8 +1967,8 @@ FFSRemoveVcb( __drv_mustHoldCriticalRegion NTSTATUS FFSInitializeVcb( - IN PFFS_IRP_CONTEXT IrpContext, - IN PFFS_VCB Vcb, + IN PFFS_IRP_CONTEXT IrpContext, + IN PFFS_VCB Vcb, IN PFFS_SUPER_BLOCK FFSSb, IN PDEVICE_OBJECT TargetDevice, IN PDEVICE_OBJECT VolumeDevice, @@ -2065,7 +2065,7 @@ FFSPnpSurpriseRemove( // Read.c // -BOOLEAN +BOOLEAN FFSCopyRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, diff --git a/drivers/filesystems/ffs/inc/fs.h b/drivers/filesystems/ffs/inc/fs.h index dde9bef3d98..40afed40258 100644 --- a/drivers/filesystems/ffs/inc/fs.h +++ b/drivers/filesystems/ffs/inc/fs.h @@ -58,7 +58,7 @@ * the ``cgbase(fs, cg)'' macro. * * Depending on the architecture and the media, the superblock may - * reside in any one of four places. For tiny media where every block + * reside in any one of four places. For tiny media where every block * counts, it is placed at the very front of the partition. Historically, * UFS1 placed it 8K from the front to leave room for the disk label and * a small bootstrap. For UFS2 it got moved to 64K from the front to leave @@ -327,7 +327,7 @@ struct fs { int32_t fs_sparecon32[26]; /* reserved for future constants */ uint32_t fs_flags; /* see FS_ flags below */ /* back to stuff that has been around a while (again) */ - int32_t fs_contigsumsize; /* size of cluster summary array */ + int32_t fs_contigsumsize; /* size of cluster summary array */ int32_t fs_maxsymlinklen; /* max length of an internal symlink */ int32_t fs_old_inodefmt; /* format of on-disk inodes */ u_int64_t fs_maxfilesize; /* maximum representable file size */ @@ -546,7 +546,7 @@ struct ocg { #define cg_clustersum(cgp, ns) \ ((int32_t *)((u_int8_t *)(cgp) + \ ufs_rw32((cgp)->cg_clustersumoff, (ns)))) - + /* * Turn file system block numbers into disk block addresses. diff --git a/drivers/filesystems/ffs/src/block.c b/drivers/filesystems/ffs/src/block.c index 8507695974a..e32f77d43ad 100644 --- a/drivers/filesystems/ffs/src/block.c +++ b/drivers/filesystems/ffs/src/block.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * block.c @@ -422,7 +422,7 @@ FFSReadSync( if (bVerify) { - SetFlag(IoGetNextIrpStackLocation(Irp)->Flags, + SetFlag(IoGetNextIrpStackLocation(Irp)->Flags, SL_OVERRIDE_VERIFY_VOLUME); } @@ -472,7 +472,7 @@ FFSReadDisk( goto errorout; } - Status = FFSReadSync(Vcb, + Status = FFSReadSync(Vcb, Lba, Length, Buf, @@ -496,7 +496,7 @@ errorout: } -NTSTATUS +NTSTATUS FFSDiskIoControl( IN PDEVICE_OBJECT DeviceObject, IN ULONG IoctlCode, diff --git a/drivers/filesystems/ffs/src/cleanup.c b/drivers/filesystems/ffs/src/cleanup.c index c3be1ed0205..3916ec5fba1 100644 --- a/drivers/filesystems/ffs/src/cleanup.c +++ b/drivers/filesystems/ffs/src/cleanup.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * cleanup.c @@ -51,13 +51,13 @@ FFSCleanup( (IrpContext->Identifier.Size == sizeof(FFS_IRP_CONTEXT))); DeviceObject = IrpContext->DeviceObject; - + if (DeviceObject == FFSGlobal->DeviceObject) { Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + Vcb = (PFFS_VCB)DeviceObject->DeviceExtension; ASSERT(Vcb != NULL); @@ -137,7 +137,7 @@ FFSCleanup( FcbResourceAcquired = TRUE; } - + Ccb = (PFFS_CCB)FileObject->FsContext2; if (!Ccb) @@ -157,9 +157,9 @@ FFSCleanup( _SEH2_LEAVE; } - + ASSERT((Ccb->Identifier.Type == FFSCCB) && - (Ccb->Identifier.Size == sizeof(FFS_CCB))); + (Ccb->Identifier.Size == sizeof(FFS_CCB))); Irp = IrpContext->Irp; Fcb->OpenHandleCount--; @@ -339,7 +339,7 @@ FFSCleanup( _SEH2_FINALLY { - + if (FcbPagingIoAcquired) { ExReleaseResourceForThreadLite( diff --git a/drivers/filesystems/ffs/src/close.c b/drivers/filesystems/ffs/src/close.c index 50ace27c162..b8749783ad5 100644 --- a/drivers/filesystems/ffs/src/close.c +++ b/drivers/filesystems/ffs/src/close.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * close.c @@ -146,8 +146,8 @@ FFSClose( ASSERT((Fcb->Identifier.Type == FFSFCB) && (Fcb->Identifier.Size == sizeof(FFS_FCB))); - /* - if ((!IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) && + /* + if ((!IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) && (!IsFlagOn(Fcb->Flags, FCB_PAGE_FILE))) */ { diff --git a/drivers/filesystems/ffs/src/cmcb.c b/drivers/filesystems/ffs/src/cmcb.c index b8e90a9b039..4b2743dc72c 100644 --- a/drivers/filesystems/ffs/src/cmcb.c +++ b/drivers/filesystems/ffs/src/cmcb.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * cmcb.c @@ -59,7 +59,7 @@ FFSAcquireForLazyWrite( if (!IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY)) { - FFSPrint((DBG_INFO, "FFSAcquireForLazyWrite: Inode=%xh %S\n", + FFSPrint((DBG_INFO, "FFSAcquireForLazyWrite: Inode=%xh %S\n", Fcb->FFSMcb->Inode, Fcb->FFSMcb->ShortName.Buffer)); if(!ExAcquireResourceSharedLite( @@ -103,7 +103,7 @@ FFSReleaseFromLazyWrite( if (!IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY)) { - FFSPrint((DBG_INFO, "FFSReleaseFromLazyWrite: Inode=%xh %S\n", + FFSPrint((DBG_INFO, "FFSReleaseFromLazyWrite: Inode=%xh %S\n", Fcb->FFSMcb->Inode, Fcb->FFSMcb->ShortName.Buffer)); ExReleaseResourceLite(&Fcb->PagingIoResource); @@ -133,7 +133,7 @@ FFSAcquireForReadAhead( ASSERT((Fcb->Identifier.Type == FFSFCB) && (Fcb->Identifier.Size == sizeof(FFS_FCB))); - FFSPrint((DBG_INFO, "FFSAcquireForReadAhead: Inode=%xh %S\n", + FFSPrint((DBG_INFO, "FFSAcquireForReadAhead: Inode=%xh %S\n", Fcb->FFSMcb->Inode, Fcb->FFSMcb->ShortName.Buffer)); if (!ExAcquireResourceSharedLite( @@ -164,7 +164,7 @@ FFSReleaseFromReadAhead( ASSERT((Fcb->Identifier.Type == FFSFCB) && (Fcb->Identifier.Size == sizeof(FFS_FCB))); - FFSPrint((DBG_INFO, "FFSReleaseFromReadAhead: Inode=%xh %S\n", + FFSPrint((DBG_INFO, "FFSReleaseFromReadAhead: Inode=%xh %S\n", Fcb->FFSMcb->Inode, Fcb->FFSMcb->ShortName.Buffer)); IoSetTopLevelIrp(NULL); diff --git a/drivers/filesystems/ffs/src/create.c b/drivers/filesystems/ffs/src/create.c index f21e90519dc..93a282183e6 100644 --- a/drivers/filesystems/ffs/src/create.c +++ b/drivers/filesystems/ffs/src/create.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * create.c @@ -83,7 +83,7 @@ FFSv1LookupFileName( { if (!FFSv1LoadInode(Vcb, ParentMcb->Inode, dinode1)) { - return Status; + return Status; } *FFSMcb = Vcb->McbTree; @@ -171,7 +171,7 @@ FFSv1LookupFileName( else { #if 0 - if (IsFlagOn(SUPER_BLOCK->s_feature_incompat, + if (IsFlagOn(SUPER_BLOCK->s_feature_incompat, FFS_FEATURE_INCOMPAT_FILETYPE)) { if (ffs_dir.d_type == FFS_FT_DIR) @@ -282,7 +282,7 @@ FFSv2LookupFileName( { if (!FFSv2LoadInode(Vcb, ParentMcb->Inode, dinode2)) { - return Status; + return Status; } *FFSMcb = Vcb->McbTree; @@ -370,7 +370,7 @@ FFSv2LookupFileName( else { #if 0 - if (IsFlagOn(SUPER_BLOCK->s_feature_incompat, + if (IsFlagOn(SUPER_BLOCK->s_feature_incompat, FFS_FEATURE_INCOMPAT_FILETYPE)) { if (ffs_dir.d_type == FFS_FT_DIR) @@ -757,9 +757,9 @@ FFSSearchFcbList( if (TmpFcb && TmpFcb->Identifier.Type == FCB) { #if DBG - FFSPrint((DBG_INFO, "FFSSearchFcbList: [%s,%xh]\n", + FFSPrint((DBG_INFO, "FFSSearchFcbList: [%s,%xh]\n", TmpFcb->AnsiFileName.Buffer, TmpFcb->Inode)); -#endif +#endif if (TmpFcb->Inode == inode) { FFSPrint((DBG_INFO, "FFSSearchMcb: Found FCB for %xh.\n", inode)); @@ -869,7 +869,7 @@ FFSCreateFile( VcbResourceAcquired = TRUE; - if (Irp->Overlay.AllocationSize.HighPart) + if (Irp->Overlay.AllocationSize.HighPart) { Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; @@ -902,7 +902,7 @@ FFSCreateFile( FileName.Buffer = ExAllocatePoolWithTag(PagedPool, FileName.MaximumLength, FFS_POOL_TAG); if (!FileName.Buffer) - { + { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } @@ -1073,7 +1073,7 @@ Dissecting: { if (FS_VERSION == 1) { - PFFSv1_INODE pTmpInode = ExAllocatePoolWithTag(PagedPool, + PFFSv1_INODE pTmpInode = ExAllocatePoolWithTag(PagedPool, DINODE1_SIZE, FFS_POOL_TAG); if (!pTmpInode) { @@ -1098,7 +1098,7 @@ Dissecting: } else { - PFFSv2_INODE pTmpInode = ExAllocatePoolWithTag(PagedPool, + PFFSv2_INODE pTmpInode = ExAllocatePoolWithTag(PagedPool, DINODE2_SIZE, FFS_POOL_TAG); if (!pTmpInode) { @@ -1167,9 +1167,9 @@ Dissecting: if (DirectoryFile) { - if (ParentFcb->FFSMcb->Inode == FFS_ROOT_INO) + if (ParentFcb->FFSMcb->Inode == FFS_ROOT_INO) { - if ((RealName.Length == 0x10) && + if ((RealName.Length == 0x10) && memcmp(RealName.Buffer, L"Recycled\0", 0x10) == 0) { SetFlag(IrpSp->Parameters.Create.FileAttributes, @@ -1179,7 +1179,7 @@ Dissecting: Status = FFSCreateInode( IrpContext, - Vcb, + Vcb, ParentFcb, DT_DIR, IrpSp->Parameters.Create.FileAttributes, @@ -1331,7 +1331,7 @@ Dissecting: _SEH2_LEAVE; } - if (NonDirectoryFile) + if (NonDirectoryFile) { Status = STATUS_FILE_IS_A_DIRECTORY; _SEH2_LEAVE; @@ -1540,7 +1540,7 @@ Openit: } } - if (Fcb->OpenHandleCount > 0) + if (Fcb->OpenHandleCount > 0) { Status = IoCheckShareAccess(DesiredAccess, ShareAccess, @@ -1552,8 +1552,8 @@ Openit: { _SEH2_LEAVE; } - } - else + } + else { IoSetShareAccess(DesiredAccess, ShareAccess, @@ -1592,8 +1592,8 @@ Openit: if (!bCreated && !IsDirectory(Fcb)) { - if (DeleteOnClose || - IsFlagOn(DesiredAccess, FILE_WRITE_DATA) || + if (DeleteOnClose || + IsFlagOn(DesiredAccess, FILE_WRITE_DATA) || (CreateDisposition == FILE_OVERWRITE) || (CreateDisposition == FILE_OVERWRITE_IF)) { @@ -1771,26 +1771,26 @@ FFSCreateVolume( return STATUS_INVALID_PARAMETER; } - if ((CreateDisposition != FILE_OPEN) && - (CreateDisposition != FILE_OPEN_IF)) + if ((CreateDisposition != FILE_OPEN) && + (CreateDisposition != FILE_OPEN_IF)) { return STATUS_ACCESS_DENIED; } Status = STATUS_SUCCESS; - if (Vcb->OpenHandleCount > 0) + if (Vcb->OpenHandleCount > 0) { Status = IoCheckShareAccess(DesiredAccess, ShareAccess, IrpSp->FileObject, &(Vcb->ShareAccess), TRUE); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { goto errorout; } - } - else + } + else { IoSetShareAccess(DesiredAccess, ShareAccess, IrpSp->FileObject, @@ -1852,7 +1852,7 @@ FFSCreate( /* µå¶óÀ̹ö°¡ ·Îµå µÇ¾ú´ÂÁö °Ë»çÇÒ ¶§ ¸¶¿îÆ®°¡ µÇ¾î ÀÖÁö ¾ÊÀº °æ¿ìµµ Àֱ⠶§¹®¿¡ ¸ØÃß¸é ¾ÈµÊ. */ ASSERT(IsMounted(Vcb)); -#endif +#endif Irp = IrpContext->Irp; @@ -1870,7 +1870,7 @@ FFSCreate( FFSUnpinRepinnedBcbs(IrpContext); - FFSCompleteIrpContext(IrpContext, Status); + FFSCompleteIrpContext(IrpContext, Status); return Status; @@ -1891,7 +1891,7 @@ FFSCreate( } if (((IrpSp->FileObject->FileName.Length == 0) && - (IrpSp->FileObject->RelatedFileObject == NULL)) || + (IrpSp->FileObject->RelatedFileObject == NULL)) || (Xcb && Xcb->Identifier.Type == FFSVCB)) { Status = FFSCreateVolume(IrpContext, Vcb); @@ -1942,8 +1942,8 @@ FFSCreateInode( FFSPrint((DBG_INFO, "FFSCreateInode: %S in %S(Inode=%xh)\n", - FileName->Buffer, - ParentFcb->FFSMcb->ShortName.Buffer, + FileName->Buffer, + ParentFcb->FFSMcb->ShortName.Buffer, ParentFcb->FFSMcb->Inode)); Status = FFSNewInode(IrpContext, Vcb, Group,Type, &Inode); @@ -2015,7 +2015,7 @@ FFSSupersedeOrOverWriteFile( AllocationSize.QuadPart = (LONGLONG)0; - if (!MmCanFileBeTruncated(&(Fcb->SectionObject), &(AllocationSize))) + if (!MmCanFileBeTruncated(&(Fcb->SectionObject), &(AllocationSize))) { Status = STATUS_USER_MAPPED_FILE; @@ -2026,7 +2026,7 @@ FFSSupersedeOrOverWriteFile( if (bRet) { - Fcb->Header.AllocationSize.QuadPart = + Fcb->Header.AllocationSize.QuadPart = Fcb->Header.FileSize.QuadPart = (LONGLONG)0; Fcb->dinode1->di_size = 0; diff --git a/drivers/filesystems/ffs/src/debug.c b/drivers/filesystems/ffs/src/debug.c index fd8d07fc7be..012cb32a40c 100644 --- a/drivers/filesystems/ffs/src/debug.c +++ b/drivers/filesystems/ffs/src/debug.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * debug.c @@ -141,7 +141,7 @@ static PCHAR FsInformationClassStrings[] = { * Return Value: * N/A * - * NOTES: + * NOTES: * N/A */ @@ -195,7 +195,7 @@ FFSPrintf( * Return Value: * N/A * - * NOTES: + * NOTES: * N/A */ @@ -234,7 +234,7 @@ FFSNIPrintf( } // FFSNIPrintf() -ULONG +ULONG FFSGetProcessNameOffset( VOID) { @@ -452,7 +452,7 @@ FFSDbgPrintCall( else { FFSPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s Unknown FileInformationClass %u\n", FFSGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -479,7 +479,7 @@ FFSDbgPrintCall( else { FFSPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s Unknown FsInformationClass %u\n", FFSGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -572,7 +572,7 @@ FFSDbgPrintCall( else { FFSPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s Unknown FileInformationClass %u\n", FFSGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -606,7 +606,7 @@ FFSDbgPrintCall( { #if !defined(_GNU_NTIFS_) || defined(__REACTOS__) FFSPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s IRP_MN_USER_FS_REQUEST FsControlCode: %#x\n", FFSGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -614,7 +614,7 @@ FFSDbgPrintCall( IoStackLocation->Parameters.FileSystemControl.FsControlCode)); #else FFSPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s IRP_MN_USER_FS_REQUEST FsControlCode: %#x\n", FFSGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -626,7 +626,7 @@ FFSDbgPrintCall( else if (IoStackLocation->MinorFunction == IRP_MN_MOUNT_VOLUME) { FFSPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s IRP_MN_MOUNT_VOLUME DeviceObject: %#x\n", FFSGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -636,7 +636,7 @@ FFSDbgPrintCall( else if (IoStackLocation->MinorFunction == IRP_MN_VERIFY_VOLUME) { FFSPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s IRP_MN_VERIFY_VOLUME DeviceObject: %#x\n", FFSGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], diff --git a/drivers/filesystems/ffs/src/devctl.c b/drivers/filesystems/ffs/src/devctl.c index 140e34a22dc..ba8146292c0 100644 --- a/drivers/filesystems/ffs/src/devctl.c +++ b/drivers/filesystems/ffs/src/devctl.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * devctl.c diff --git a/drivers/filesystems/ffs/src/dirctl.c b/drivers/filesystems/ffs/src/dirctl.c index 6db9b4bc3cd..8973c4b52d6 100644 --- a/drivers/filesystems/ffs/src/dirctl.c +++ b/drivers/filesystems/ffs/src/dirctl.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * dirctl.c @@ -156,7 +156,7 @@ FFSProcessDirEntry( FDI->FileNameLength = NameLength; RtlCopyMemory(FDI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; } else @@ -179,7 +179,7 @@ FFSProcessDirEntry( FDI->FileNameLength = NameLength; RtlCopyMemory(FDI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; } @@ -211,7 +211,7 @@ FFSProcessDirEntry( FFI->FileNameLength = NameLength; RtlCopyMemory(FFI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; } @@ -235,7 +235,7 @@ FFSProcessDirEntry( FFI->FileNameLength = NameLength; RtlCopyMemory(FFI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; } @@ -268,7 +268,7 @@ FFSProcessDirEntry( FBI->FileAttributes |= FILE_ATTRIBUTE_DIRECTORY; FBI->FileNameLength = NameLength; RtlCopyMemory(FBI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; } @@ -293,7 +293,7 @@ FFSProcessDirEntry( FBI->FileAttributes |= FILE_ATTRIBUTE_DIRECTORY; FBI->FileNameLength = NameLength; RtlCopyMemory(FBI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; } @@ -306,7 +306,7 @@ FFSProcessDirEntry( FNI->NextEntryOffset = 0; FNI->FileNameLength = NameLength; RtlCopyMemory(FNI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; @@ -687,7 +687,7 @@ FFSQueryDirectory( } RtlZeroMemory( - InodeFileName.Buffer, + InodeFileName.Buffer, InodeFileNameLength + 2); Status = FFSOEMToUnicode(&InodeFileName, @@ -714,7 +714,7 @@ FFSQueryDirectory( Vcb, FileInformationClass, pDir->d_ino, Buffer, - UsedLength, + UsedLength, Length - UsedLength, (FileIndex + dwBytes), &InodeFileName, @@ -839,7 +839,7 @@ ProcessNextEntryv1: } RtlZeroMemory( - InodeFileName.Buffer, + InodeFileName.Buffer, InodeFileNameLength + 2); Status = FFSOEMToUnicode(&InodeFileName, @@ -866,7 +866,7 @@ ProcessNextEntryv1: Vcb, FileInformationClass, pDir->d_ino, Buffer, - UsedLength, + UsedLength, Length - UsedLength, (FileIndex + dwBytes), &InodeFileName, @@ -1221,7 +1221,7 @@ FFSNotifyReportChange( } } - Offset = (USHORT)(FullName->Length - + Offset = (USHORT)(FullName->Length - Fcb->FFSMcb->ShortName.Length); FsRtlNotifyFullReportChange(Vcb->NotifySync, @@ -1341,7 +1341,7 @@ FFSIsDirectoryEmpty( if (pTarget->d_namlen == 1 && pTarget->d_name[0] == '.') { } - else if (pTarget->d_namlen == 2 && pTarget->d_name[0] == '.' && + else if (pTarget->d_namlen == 2 && pTarget->d_name[0] == '.' && pTarget->d_name[1] == '.') { } diff --git a/drivers/filesystems/ffs/src/dispatch.c b/drivers/filesystems/ffs/src/dispatch.c index 0a8d048b82c..97c0136bdf1 100644 --- a/drivers/filesystems/ffs/src/dispatch.c +++ b/drivers/filesystems/ffs/src/dispatch.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * dipatch.c @@ -165,7 +165,7 @@ FFSDispatchRequest( #if (_WIN32_WINNT >= 0x0500) case IRP_MJ_PNP: return FFSPnp(IrpContext); -#endif //(_WIN32_WINNT >= 0x0500) +#endif //(_WIN32_WINNT >= 0x0500) default: FFSPrint((DBG_ERROR, "FFSDispatchRequest: Unexpected major function: %xh\n", IrpContext->MajorFunction)); @@ -245,7 +245,7 @@ FFSBuildRequest( if (AtIrqlPassiveLevel) { FsRtlExitFileSystem(); - } + } } _SEH2_END; return Status; diff --git a/drivers/filesystems/ffs/src/except.c b/drivers/filesystems/ffs/src/except.c index 167c2178745..b995db63013 100644 --- a/drivers/filesystems/ffs/src/except.c +++ b/drivers/filesystems/ffs/src/except.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * except.c @@ -123,7 +123,7 @@ FFSExceptionHandler( if (IrpContext) { - if ((IrpContext->Identifier.Type != FFSICX) || + if ((IrpContext->Identifier.Type != FFSICX) || (IrpContext->Identifier.Size != sizeof(FFS_IRP_CONTEXT))) { FFSBreakPoint(); diff --git a/drivers/filesystems/ffs/src/fastio.c b/drivers/filesystems/ffs/src/fastio.c index 06c4269f16c..83c067dd900 100644 --- a/drivers/filesystems/ffs/src/fastio.c +++ b/drivers/filesystems/ffs/src/fastio.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * fastio.c @@ -127,7 +127,7 @@ FFSFastIoCheckIfPossible( "FASTIO_CHECK_IF_POSSIBLE", Fcb->AnsiFileName.Buffer)); - FFSPrint((DBG_INFO, + FFSPrint((DBG_INFO, "FFSFastIIOCheckPossible: Offset: %I64xg Length: %xh Key: %u %s %s\n", FileOffset->QuadPart, Length, @@ -294,7 +294,7 @@ FFSFastIoQueryBasicInfo( ASSERT((Fcb->Identifier.Type == FFSFCB) && (Fcb->Identifier.Size == sizeof(FFS_FCB))); - FFSPrint((DBG_INFO, + FFSPrint((DBG_INFO, "FFSFastIoQueryBasicInfo: %s %s %s\n", FFSGetCurrentProcessName(), "FASTIO_QUERY_BASIC_INFO", @@ -368,14 +368,14 @@ FFSFastIoQueryBasicInfo( if (Status == FALSE) { - FFSPrint((DBG_ERROR, + FFSPrint((DBG_ERROR, "FFSFastIoQueryBasicInfo: %s %s *** Status: FALSE ***\n", FFSGetCurrentProcessName(), "FASTIO_QUERY_BASIC_INFO")); } else if (IoStatus->Status != STATUS_SUCCESS) { - FFSPrint((DBG_ERROR, + FFSPrint((DBG_ERROR, "FFSFastIoQueryBasicInfo: %s %s *** Status: %s (%#x) ***\n", FFSFastIoQueryBasicInfo, "FASTIO_QUERY_BASIC_INFO", @@ -599,7 +599,7 @@ FFSFastIoQueryNetworkOpenInfo( ASSERT((Fcb->Identifier.Type == FFSFCB) && (Fcb->Identifier.Size == sizeof(FFS_FCB))); - FFSPrint((DBG_INFO, + FFSPrint((DBG_INFO, "%-16.16s %-31s %s\n", FFSGetCurrentProcessName(), "FASTIO_QUERY_NETWORK_OPEN_INFO", @@ -808,10 +808,10 @@ FFSFastIoLock( FsRtlExitFileSystem(); } _SEH2_END; -#if DBG +#if DBG if (Status == FALSE) { - FFSPrint((DBG_ERROR, + FFSPrint((DBG_ERROR, "FFSFastIoLock: %s %s *** Status: FALSE ***\n", (PUCHAR) Process + ProcessNameOffset, "FASTIO_LOCK")); @@ -902,7 +902,7 @@ FFSFastIoUnlockSingle( Process, Key, NULL, - FALSE); + FALSE); IoStatus->Information = 0; @@ -919,7 +919,7 @@ FFSFastIoUnlockSingle( FsRtlExitFileSystem(); } _SEH2_END; -#if DBG +#if DBG if (Status == FALSE) { FFSPrint((DBG_ERROR, @@ -936,7 +936,7 @@ FFSFastIoUnlockSingle( FFSNtStatusToString(IoStatus->Status), IoStatus->Status)); } -#endif +#endif return Status; } @@ -1016,7 +1016,7 @@ FFSFastIoUnlockAll( FsRtlExitFileSystem(); } _SEH2_END; -#if DBG +#if DBG if (Status == FALSE) { FFSPrint((DBG_ERROR, @@ -1033,7 +1033,7 @@ FFSFastIoUnlockAll( FFSNtStatusToString(IoStatus->Status), IoStatus->Status)); } -#endif +#endif return Status; } @@ -1106,7 +1106,7 @@ FFSFastIoUnlockAllByKey( FileObject, Process, Key, - NULL); + NULL); IoStatus->Information = 0; @@ -1124,7 +1124,7 @@ FFSFastIoUnlockAllByKey( { FsRtlExitFileSystem(); } _SEH2_END; -#if DBG +#if DBG if (Status == FALSE) { FFSPrint((DBG_ERROR, @@ -1141,6 +1141,6 @@ FFSFastIoUnlockAllByKey( FFSNtStatusToString(IoStatus->Status), IoStatus->Status)); } -#endif +#endif return Status; } diff --git a/drivers/filesystems/ffs/src/ffs.c b/drivers/filesystems/ffs/src/ffs.c index ab73bab5a4b..a1a1ce682d8 100644 --- a/drivers/filesystems/ffs/src/ffs.c +++ b/drivers/filesystems/ffs/src/ffs.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * ffs.c @@ -259,7 +259,7 @@ FFSv1GetInodeLba( } #endif - loc = cgimin(Vcb->ffs_super_block, ino_to_cg(Vcb->ffs_super_block, inode)) + loc = cgimin(Vcb->ffs_super_block, ino_to_cg(Vcb->ffs_super_block, inode)) * Vcb->ffs_super_block->fs_fsize + ((inode % Vcb->ffs_super_block->fs_ipg) * 128); *offset = loc; @@ -288,7 +288,7 @@ FFSv2GetInodeLba( } #endif - loc = cgimin(Vcb->ffs_super_block, ino_to_cg(Vcb->ffs_super_block, inode)) + loc = cgimin(Vcb->ffs_super_block, ino_to_cg(Vcb->ffs_super_block, inode)) * Vcb->ffs_super_block->fs_fsize + ((inode % Vcb->ffs_super_block->fs_ipg) * 256); *offset = loc; @@ -417,7 +417,7 @@ FFSv1SaveInode( PAGED_CODE(); KeQuerySystemTime(&CurrentTime); - dinode1->di_mtime = dinode1->di_atime = + dinode1->di_mtime = dinode1->di_atime = (ULONG)(FFSInodeTime(CurrentTime)); FFSPrint((DBG_INFO, "FFSv1SaveInode: Saving Inode %xh: Mode=%xh Size=%xh\n", @@ -724,7 +724,7 @@ FFSv1BlockMap( FFSBreakPoint(); return 0; - } + } /* Á÷Á¢, °£Á¢, 2Áß °£Á¢ ó¸® */ for (i = 0; i < FFS_BLOCK_TYPES; i++) @@ -736,7 +736,7 @@ FFSv1BlockMap( else dwBlk = dinode1->di_ib[i - 1]; /* °£Á¢ */ #if DBG - { + { ULONG dwRet = FFSv1GetBlock(Vcb, dwBlk, Index , i); KdPrint(("FFSv1BlockMap: i : %d, Index : %d, dwBlk : %x, Data Block : %X\n", i, Index, dwRet, (dwRet * 0x400))); @@ -782,7 +782,7 @@ FFSv2BlockMap( FFSBreakPoint(); return 0; - } + } /* Á÷Á¢, °£Á¢, 2Áß °£Á¢ ó¸® */ for (i = 0; i < FFS_BLOCK_TYPES; i++) @@ -794,7 +794,7 @@ FFSv2BlockMap( else dwBlk = (ULONGLONG)dinode2->di_ib[i - 1]; /* °£Á¢ */ #if 0 - { + { ULONGLONG dwRet = FFSv2GetBlock(Vcb, dwBlk, Index , i); KdPrint(("FFSv2BlockMap: i : %d, Index : %d, dwBlk : %x, Data Block : %X\n", i, Index, dwRet, (dwRet * 0x400))); @@ -818,8 +818,8 @@ FFSv1BuildBDL( IN PFFS_IRP_CONTEXT IrpContext, IN PFFS_VCB Vcb, IN PFFSv1_INODE dinode1, - IN ULONGLONG Offset, - IN ULONG Size, + IN ULONGLONG Offset, + IN ULONG Size, OUT PFFS_BDL *ffs_bdl) { ULONG nBeg, nEnd, nBlocks; @@ -955,8 +955,8 @@ FFSv2BuildBDL( IN PFFS_IRP_CONTEXT IrpContext, IN PFFS_VCB Vcb, IN PFFSv2_INODE dinode2, - IN ULONGLONG Offset, - IN ULONG Size, + IN ULONGLONG Offset, + IN ULONG Size, OUT PFFS_BDL *ffs_bdl) { ULONG nBeg, nEnd, nBlocks; @@ -1095,7 +1095,7 @@ FFSNewBlock( PFFS_IRP_CONTEXT IrpContext, PFFS_VCB Vcb, ULONG GroupHint, - ULONG BlockHint, + ULONG BlockHint, PULONG dwRet) { RTL_BITMAP BlockBitmap; @@ -1128,7 +1128,7 @@ ScanBitmap: if (Vcb->ffs_group_desc[GroupHint].bg_free_blocks_count) { Offset.QuadPart = (LONGLONG) Vcb->BlockSize; - Offset.QuadPart = Offset.QuadPart * + Offset.QuadPart = Offset.QuadPart * Vcb->ffs_group_desc[GroupHint].bg_block_bitmap; if (GroupHint == Vcb->ffs_groups - 1) @@ -1600,7 +1600,7 @@ FFSExpandInode( Vcb, Fcb, dwBlk, Index, i, bNewBlock, - &dwNewBlk); + &dwNewBlk); if (bRet) { @@ -1676,7 +1676,7 @@ repeat: { i = (j + GroupHint) % (Vcb->ffs_groups); - if ((Vcb->ffs_group_desc[i].bg_used_dirs_count << 8) < + if ((Vcb->ffs_group_desc[i].bg_used_dirs_count << 8) < Vcb->ffs_group_desc[i].bg_free_inodes_count) { Group = i + 1; @@ -1696,7 +1696,7 @@ repeat: } } } - else + else { /* * Try to place the inode in its parent directory (GroupHint) @@ -1717,7 +1717,7 @@ repeat: { i += j; - if (i > Vcb->ffs_groups) + if (i > Vcb->ffs_groups) i -= Vcb->ffs_groups; if (Vcb->ffs_group_desc[i].bg_free_inodes_count) @@ -1767,7 +1767,7 @@ repeat: if (Group == Vcb->ffs_groups - 1) { Length = INODES_COUNT % INODES_PER_GROUP; - if (!Length) + if (!Length) { /* INODES_COUNT is integer multiple of INODES_PER_GROUP */ Length = INODES_PER_GROUP; @@ -1813,7 +1813,7 @@ repeat: { Vcb->ffs_group_desc[Group].bg_free_inodes_count = 0; - FFSSaveGroup(IrpContext, Vcb); + FFSSaveGroup(IrpContext, Vcb); } goto repeat; @@ -1844,7 +1844,7 @@ repeat: Vcb->ffs_super_block->s_free_inodes_count--; FFSSaveSuper(IrpContext, Vcb); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } return STATUS_DISK_FULL; @@ -2018,7 +2018,7 @@ FFSAddEntry( } #if 0 - if (IsFlagOn(SUPER_BLOCK->s_feature_incompat, + if (IsFlagOn(SUPER_BLOCK->s_feature_incompat, FFS_FEATURE_INCOMPAT_FILETYPE)) { pDir->d_type = (UCHAR)FileType; @@ -2072,7 +2072,7 @@ Repeat: _SEH2_LEAVE; } - if (((pTarget->d_ino == 0) && pTarget->d_reclen >= pDir->d_reclen) || + if (((pTarget->d_ino == 0) && pTarget->d_reclen >= pDir->d_reclen) || (pTarget->d_reclen >= FFS_DIR_REC_LEN(pTarget->d_namlen) + pDir->d_reclen)) { if (pTarget->d_ino) @@ -2142,7 +2142,7 @@ Repeat: } else { - // We should expand the size of the dir inode + // We should expand the size of the dir inode if (!bAdding) { ULONG dwRet; @@ -2229,7 +2229,7 @@ FFSRemoveEntry( return FALSE; } - MainResourceAcquired = + MainResourceAcquired = ExAcquireResourceExclusiveLite(&Dcb->MainResource, TRUE); _SEH2_TRY @@ -2387,7 +2387,7 @@ FFSSetParentEntry( return Status; } - MainResourceAcquired = + MainResourceAcquired = ExAcquireResourceExclusiveLite(&Dcb->MainResource, TRUE); _SEH2_TRY @@ -2432,7 +2432,7 @@ FFSSetParentEntry( pParent->d_ino = NewParent; Status = FFSv1WriteInode(IrpContext, - Vcb, + Vcb, Dcb->dinode1, Offset, pSelf, @@ -2499,7 +2499,7 @@ FFSTruncateBlock( if (bRet) { ASSERT(dinode1->di_blocks >= (Vcb->BlockSize / SECTOR_SIZE)); - dinode1->di_blocks -= (Vcb->BlockSize / SECTOR_SIZE); + dinode1->di_blocks -= (Vcb->BlockSize / SECTOR_SIZE); } } else @@ -2601,7 +2601,7 @@ FFSTruncateInode( Index = (ULONG)(Fcb->Header.AllocationSize.QuadPart >> BLOCK_BITS); - if (Index > 0) + if (Index > 0) { Index--; } @@ -2629,7 +2629,7 @@ FFSTruncateInode( { dwBlk = Inode->i_block[i == 0 ? (Index) : (i + NDADDR - 1)]; - bRet = FFSTruncateBlock(IrpContext, Vcb, Fcb, dwBlk, Index , i, &bFreed); + bRet = FFSTruncateBlock(IrpContext, Vcb, Fcb, dwBlk, Index , i, &bFreed); if (bRet) { @@ -2760,12 +2760,12 @@ FFSAddMcbEntry( FFSBreakPoint(); - for (Index = 0; + for (Index = 0; FsRtlGetNextLargeMcbEntry(&(Vcb->DirtyMcbs), Index, &DirtyVba, &DirtyLba, - &DirtyLength); + &DirtyLength); Index++) { FFSPrint((DBG_INFO, "Index = %xh\n", Index)); diff --git a/drivers/filesystems/ffs/src/fileinfo.c b/drivers/filesystems/ffs/src/fileinfo.c index 09b6353ad79..0874512482f 100644 --- a/drivers/filesystems/ffs/src/fileinfo.c +++ b/drivers/filesystems/ffs/src/fileinfo.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * fileinfo.c @@ -91,7 +91,7 @@ FFSQueryInformation( ASSERT((Fcb->Identifier.Type == FFSFCB) && (Fcb->Identifier.Size == sizeof(FFS_FCB))); - /* + /* if (!IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY) && !FlagOn(Fcb->Flags, FCB_PAGE_FILE)) */ @@ -228,7 +228,7 @@ FFSQueryInformation( if (IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY)) FileStandardInformation->DeletePending = FALSE; else - FileStandardInformation->DeletePending = IsFlagOn(Fcb->Flags, FCB_DELETE_PENDING); + FileStandardInformation->DeletePending = IsFlagOn(Fcb->Flags, FCB_DELETE_PENDING); if (Fcb->FFSMcb->FileAttr & FILE_ATTRIBUTE_DIRECTORY) { @@ -708,8 +708,8 @@ FFSSetInformation( FcbPagingIoResourceAcquired = TRUE; } - /* - if (FileInformationClass != FileDispositionInformation + /* + if (FileInformationClass != FileDispositionInformation && FlagOn(Fcb->Flags, FCB_DELETE_PENDING)) { Status = STATUS_DELETE_PENDING; @@ -745,7 +745,7 @@ FFSSetInformation( dinode1->di_mtime = (ULONG)(FFSInodeTime(FBI->LastWriteTime)); } - if (IsFlagOn(FBI->FileAttributes, FILE_ATTRIBUTE_READONLY)) + if (IsFlagOn(FBI->FileAttributes, FILE_ATTRIBUTE_READONLY)) { FFSSetReadOnly(Fcb->dinode1->di_mode); SetFlag(Fcb->FFSMcb->FileAttr, FILE_ATTRIBUTE_READONLY); @@ -761,11 +761,11 @@ FFSSetInformation( Status = STATUS_SUCCESS; } - if (FBI->FileAttributes & FILE_ATTRIBUTE_TEMPORARY) + if (FBI->FileAttributes & FILE_ATTRIBUTE_TEMPORARY) { SetFlag(FileObject->Flags, FO_TEMPORARY_FILE); - } - else + } + else { ClearFlag(FileObject->Flags, FO_TEMPORARY_FILE); } @@ -789,7 +789,7 @@ FFSSetInformation( dinode2->di_mtime = (ULONG)(FFSInodeTime(FBI->LastWriteTime)); } - if (IsFlagOn(FBI->FileAttributes, FILE_ATTRIBUTE_READONLY)) + if (IsFlagOn(FBI->FileAttributes, FILE_ATTRIBUTE_READONLY)) { FFSSetReadOnly(Fcb->dinode2->di_mode); SetFlag(Fcb->FFSMcb->FileAttr, FILE_ATTRIBUTE_READONLY); @@ -805,11 +805,11 @@ FFSSetInformation( Status = STATUS_SUCCESS; } - if (FBI->FileAttributes & FILE_ATTRIBUTE_TEMPORARY) + if (FBI->FileAttributes & FILE_ATTRIBUTE_TEMPORARY) { SetFlag(FileObject->Flags, FO_TEMPORARY_FILE); - } - else + } + else { ClearFlag(FileObject->Flags, FO_TEMPORARY_FILE); } @@ -834,7 +834,7 @@ FFSSetInformation( _SEH2_LEAVE; } - if (FAI->AllocationSize.QuadPart == + if (FAI->AllocationSize.QuadPart == Fcb->Header.AllocationSize.QuadPart) { Status = STATUS_SUCCESS; @@ -861,7 +861,7 @@ FFSSetInformation( } else { - if (MmCanFileBeTruncated(&(Fcb->SectionObject), &(FAI->AllocationSize))) + if (MmCanFileBeTruncated(&(Fcb->SectionObject), &(FAI->AllocationSize))) { LARGE_INTEGER EndOfFile; @@ -870,10 +870,10 @@ FFSSetInformation( if(FFSTruncateFile(IrpContext, Vcb, Fcb, &(EndOfFile))) { - if (FAI->AllocationSize.QuadPart < + if (FAI->AllocationSize.QuadPart < Fcb->Header.FileSize.QuadPart) { - Fcb->Header.FileSize.QuadPart = + Fcb->Header.FileSize.QuadPart = FAI->AllocationSize.QuadPart; } @@ -894,7 +894,7 @@ FFSSetInformation( if (NT_SUCCESS(Status)) { - CcSetFileSizes(FileObject, + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); SetFlag(FileObject->Flags, FO_FILE_MODIFIED); @@ -947,12 +947,12 @@ FFSSetInformation( CacheInitialized = TRUE; } - if (FEOFI->EndOfFile.QuadPart == + if (FEOFI->EndOfFile.QuadPart == Fcb->Header.AllocationSize.QuadPart) { Status = STATUS_SUCCESS; } - else if (FEOFI->EndOfFile.QuadPart > + else if (FEOFI->EndOfFile.QuadPart > Fcb->Header.AllocationSize.QuadPart) { LARGE_INTEGER FileSize = Fcb->Header.FileSize; @@ -960,10 +960,10 @@ FFSSetInformation( if(FFSExpandFile(IrpContext, Vcb, Fcb, &(FEOFI->EndOfFile))) { { - Fcb->Header.FileSize.QuadPart = + Fcb->Header.FileSize.QuadPart = FEOFI->EndOfFile.QuadPart; Fcb->dinode1->di_size = (ULONG)FEOFI->EndOfFile.QuadPart; - Fcb->Header.ValidDataLength.QuadPart = + Fcb->Header.ValidDataLength.QuadPart = (LONGLONG)(0x7fffffffffffffff); } @@ -983,15 +983,15 @@ FFSSetInformation( if (NT_SUCCESS(Status)) { - CcSetFileSizes(FileObject, + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); SetFlag(FileObject->Flags, FO_FILE_MODIFIED); - FFSZeroHoles(IrpContext, - Vcb, FileObject, + FFSZeroHoles(IrpContext, + Vcb, FileObject, FileSize.QuadPart, - Fcb->Header.AllocationSize.QuadPart - + Fcb->Header.AllocationSize.QuadPart - FileSize.QuadPart); NotifyFilter = FILE_NOTIFY_CHANGE_SIZE | @@ -1001,16 +1001,16 @@ FFSSetInformation( } else { - if (MmCanFileBeTruncated(&(Fcb->SectionObject), &(FEOFI->EndOfFile))) + if (MmCanFileBeTruncated(&(Fcb->SectionObject), &(FEOFI->EndOfFile))) { LARGE_INTEGER EndOfFile = FEOFI->EndOfFile; - EndOfFile.QuadPart = EndOfFile.QuadPart + + EndOfFile.QuadPart = EndOfFile.QuadPart + (LONGLONG)(Vcb->BlockSize - 1); if(FFSTruncateFile(IrpContext, Vcb, Fcb, &(EndOfFile))) { - Fcb->Header.FileSize.QuadPart = + Fcb->Header.FileSize.QuadPart = FEOFI->EndOfFile.QuadPart; Fcb->dinode1->di_size = (ULONG)FEOFI->EndOfFile.QuadPart; @@ -1030,7 +1030,7 @@ FFSSetInformation( if (NT_SUCCESS(Status)) { - CcSetFileSizes(FileObject, + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); SetFlag(FileObject->Flags, FO_FILE_MODIFIED); @@ -1154,7 +1154,7 @@ FFSSetInformation( BOOLEAN FFSExpandFile( - PFFS_IRP_CONTEXT IrpContext, + PFFS_IRP_CONTEXT IrpContext, PFFS_VCB Vcb, PFFS_FCB Fcb, PLARGE_INTEGER AllocationSize) @@ -1224,7 +1224,7 @@ FFSSetDispositionInfo( if (bDelete) { - FFSPrint((DBG_INFO, "FFSSetDispositionInformation: MmFlushImageSection on %s.\n", + FFSPrint((DBG_INFO, "FFSSetDispositionInformation: MmFlushImageSection on %s.\n", Fcb->AnsiFileName.Buffer)); if (!MmFlushImageSection(&Fcb->SectionObject, @@ -1270,7 +1270,7 @@ FFSSetDispositionInfo( } return STATUS_SUCCESS; -} +} __drv_mustHoldCriticalRegion @@ -1413,9 +1413,9 @@ FFSSetRenameInfo( &FileName, TargetMcb, &Mcb, - &dinode1); + &dinode1); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { if ((!ReplaceIfExists) || (IsFlagOn(Mcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY)) || @@ -1435,7 +1435,7 @@ FFSSetRenameInfo( if (IsDirectory(Fcb)) { - Status = FFSRemoveEntry(IrpContext, Vcb, + Status = FFSRemoveEntry(IrpContext, Vcb, Fcb->FFSMcb->Parent->FFSFcb, DT_DIR, Fcb->FFSMcb->Inode); @@ -1447,7 +1447,7 @@ FFSSetRenameInfo( goto errorout; } - Status = FFSAddEntry(IrpContext, Vcb, + Status = FFSAddEntry(IrpContext, Vcb, TargetDcb, DT_DIR, Fcb->FFSMcb->Inode, @@ -1457,7 +1457,7 @@ FFSSetRenameInfo( { FFSBreakPoint(); - FFSAddEntry(IrpContext, Vcb, + FFSAddEntry(IrpContext, Vcb, Fcb->FFSMcb->Parent->FFSFcb, DT_DIR, Fcb->FFSMcb->Inode, @@ -1467,7 +1467,7 @@ FFSSetRenameInfo( } if(!FFSv1SaveInode(IrpContext, - Vcb, + Vcb, TargetMcb->Inode, TargetDcb->dinode1)) { @@ -1479,7 +1479,7 @@ FFSSetRenameInfo( } if(!FFSv1SaveInode(IrpContext, - Vcb, + Vcb, Fcb->FFSMcb->Parent->Inode, Fcb->FFSMcb->Parent->FFSFcb->dinode1)) { @@ -1523,7 +1523,7 @@ FFSSetRenameInfo( { FFSBreakPoint(); - FFSAddEntry(IrpContext, Vcb, + FFSAddEntry(IrpContext, Vcb, Fcb->FFSMcb->Parent->FFSFcb, DT_REG, Fcb->FFSMcb->Inode, @@ -1538,7 +1538,7 @@ FFSSetRenameInfo( if (Fcb->FFSMcb->ShortName.MaximumLength < (FileName.Length + 2)) { ExFreePool(Fcb->FFSMcb->ShortName.Buffer); - Fcb->FFSMcb->ShortName.Buffer = + Fcb->FFSMcb->ShortName.Buffer = ExAllocatePoolWithTag(PagedPool, FileName.Length + 2, FFS_POOL_TAG); if (!Fcb->FFSMcb->ShortName.Buffer) @@ -1560,7 +1560,7 @@ FFSSetRenameInfo( Fcb->FFSMcb->ShortName.Length = FileName.Length; } -#if DBG +#if DBG Fcb->AnsiFileName.Length = (USHORT) RtlxUnicodeStringToOemSize(&FileName); @@ -1569,7 +1569,7 @@ FFSSetRenameInfo( { ExFreePool(Fcb->AnsiFileName.Buffer); - Fcb->AnsiFileName.Buffer = + Fcb->AnsiFileName.Buffer = ExAllocatePoolWithTag(PagedPool, Fcb->AnsiFileName.Length + 1, FFS_POOL_TAG); if (!Fcb->AnsiFileName.Buffer) @@ -1578,9 +1578,9 @@ FFSSetRenameInfo( goto errorout; } - RtlZeroMemory(Fcb->AnsiFileName.Buffer, + RtlZeroMemory(Fcb->AnsiFileName.Buffer, Fcb->AnsiFileName.Length + 1); - Fcb->AnsiFileName.MaximumLength = + Fcb->AnsiFileName.MaximumLength = Fcb->AnsiFileName.Length + 1; } @@ -1690,7 +1690,7 @@ FFSDeleteFile( if (Fcb->FFSMcb->Parent->FFSFcb) { Status = FFSRemoveEntry( - IrpContext, Vcb, + IrpContext, Vcb, Fcb->FFSMcb->Parent->FFSFcb, (FlagOn(Fcb->FFSMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY) ? DT_DIR : DT_REG), diff --git a/drivers/filesystems/ffs/src/flush.c b/drivers/filesystems/ffs/src/flush.c index f3f42319a2d..3f4bdc38aaf 100644 --- a/drivers/filesystems/ffs/src/flush.c +++ b/drivers/filesystems/ffs/src/flush.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * flush.c @@ -125,7 +125,7 @@ FFSFlushVolume( CcFlushCache(&(Vcb->SectionObject), NULL, 0, &IoStatus); - return IoStatus.Status; + return IoStatus.Status; } @@ -145,11 +145,11 @@ FFSFlushFile( if (IsDirectory(Fcb)) return STATUS_SUCCESS; - FFSPrint((DBG_INFO, "FFSFlushFile: Flushing File Inode=%xh %S ...\n", + FFSPrint((DBG_INFO, "FFSFlushFile: Flushing File Inode=%xh %S ...\n", Fcb->FFSMcb->Inode, Fcb->FFSMcb->ShortName.Buffer)); /* { - ULONG ResShCnt, ResExCnt; + ULONG ResShCnt, ResExCnt; ResShCnt = ExIsResourceAcquiredSharedLite(&Fcb->PagingIoResource); ResExCnt = ExIsResourceAcquiredExclusiveLite(&Fcb->PagingIoResource); diff --git a/drivers/filesystems/ffs/src/fsctl.c b/drivers/filesystems/ffs/src/fsctl.c index 1542c63df5e..b42d6bfe0a5 100644 --- a/drivers/filesystems/ffs/src/fsctl.c +++ b/drivers/filesystems/ffs/src/fsctl.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * fsctl.c @@ -154,7 +154,7 @@ FFSLoadDiskLabel( PAGED_CODE(); Disklabel = (PDISKLABEL)ExAllocatePoolWithTag(PagedPool, sizeof(DISKLABEL), FFS_POOL_TAG); - + FFSReadDisk(Vcb, (LABELSECTOR * SECTOR_SIZE + LABELOFFSET), sizeof(DISKLABEL), (PVOID)Disklabel, FALSE); if (Disklabel->d_magic == DISKMAGIC) @@ -262,7 +262,7 @@ FFSLoadDiskLabel( } FS_VERSION = 1; - + if (i == (int)Vcb->PartitionNumber) { Vcb->ffs_super_block = FFSSb; @@ -465,7 +465,7 @@ FFSLockVolume( VcbResourceAcquired = TRUE; - Status = FFSLockVcb(Vcb, IrpSp->FileObject); + Status = FFSLockVcb(Vcb, IrpSp->FileObject); } _SEH2_FINALLY @@ -972,11 +972,11 @@ FFSMountVolume( VolumeDeviceObject->StackSize = (CCHAR)(TargetDeviceObject->StackSize + 1); - if (TargetDeviceObject->AlignmentRequirement > + if (TargetDeviceObject->AlignmentRequirement > VolumeDeviceObject->AlignmentRequirement) { - VolumeDeviceObject->AlignmentRequirement = + VolumeDeviceObject->AlignmentRequirement = TargetDeviceObject->AlignmentRequirement; } @@ -1006,7 +1006,7 @@ FFSMountVolume( Vcb->BlockSize = FFSSb->fs_bsize; Vcb->SectorBits = FFSLog2(SECTOR_SIZE); - Status = FFSInitializeVcb(IrpContext, Vcb, FFSSb, TargetDeviceObject, + Status = FFSInitializeVcb(IrpContext, Vcb, FFSSb, TargetDeviceObject, VolumeDeviceObject, IoStackLocation->Parameters.MountVolume.Vpb); if (NT_SUCCESS(Status)) @@ -1280,7 +1280,7 @@ FFSDismountVolume( _SEH2_LEAVE; } - /* + /* if (!FlagOn(Vcb->Flags, VCB_VOLUME_LOCKED)) { FFSPrint((DBG_ERROR, "FFSDismount: Volume is not locked.\n")); @@ -1398,7 +1398,7 @@ FFSCheckDismount( #define TAG_VPB ' bpV' - NewVpb = ExAllocatePoolWithTag(NonPagedPoolMustSucceed, + NewVpb = ExAllocatePoolWithTag(NonPagedPoolMustSucceed, sizeof(VPB), TAG_VPB); NewVpb->Type = IO_TYPE_VPB; @@ -1572,7 +1572,7 @@ FFSPurgeFile( !IsFlagOn(Fcb->Vcb->Flags, VCB_WRITE_PROTECTED)) { - FFSPrint((DBG_INFO, "FFSPurgeFile: CcFlushCache on %s.\n", + FFSPrint((DBG_INFO, "FFSPurgeFile: CcFlushCache on %s.\n", Fcb->AnsiFileName.Buffer)); ExAcquireSharedStarveExclusive(&Fcb->PagingIoResource, TRUE); @@ -1586,7 +1586,7 @@ FFSPurgeFile( if (Fcb->SectionObject.ImageSectionObject) { - FFSPrint((DBG_INFO, "FFSPurgeFile: MmFlushImageSection on %s.\n", + FFSPrint((DBG_INFO, "FFSPurgeFile: MmFlushImageSection on %s.\n", Fcb->AnsiFileName.Buffer)); MmFlushImageSection(&Fcb->SectionObject, MmFlushForWrite); diff --git a/drivers/filesystems/ffs/src/init.c b/drivers/filesystems/ffs/src/init.c index bf867a23f68..a4e49706918 100644 --- a/drivers/filesystems/ffs/src/init.c +++ b/drivers/filesystems/ffs/src/init.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * init.c @@ -224,7 +224,7 @@ DriverEntry( DbgPrint( "ffsdrv --" - " Version " + " Version " FFSDRV_VERSION #if FFS_READ_ONLY " (ReadOnly)" @@ -232,7 +232,7 @@ DriverEntry( #if DBG " Checked" #else - " Free" + " Free" #endif " - Built at " __DATE__" " diff --git a/drivers/filesystems/ffs/src/lock.c b/drivers/filesystems/ffs/src/lock.c index 9ff3ba9b814..4041ea9fb4e 100644 --- a/drivers/filesystems/ffs/src/lock.c +++ b/drivers/filesystems/ffs/src/lock.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * lock.c @@ -111,7 +111,7 @@ FFSLockControl( if (!NT_SUCCESS(Status)) { - FFSPrint((DBG_ERROR, + FFSPrint((DBG_ERROR, "FFSLockControl: %-16.16s %-31s *** Status: %s (%#x) ***\n", FFSGetCurrentProcessName(), "IRP_MJ_LOCK_CONTROL", diff --git a/drivers/filesystems/ffs/src/memory.c b/drivers/filesystems/ffs/src/memory.c index 790a04b854f..8dabad87404 100644 --- a/drivers/filesystems/ffs/src/memory.c +++ b/drivers/filesystems/ffs/src/memory.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * memory.c @@ -121,7 +121,7 @@ FFSAllocateIrpContext( { if (IoStackLocation->Parameters.MountVolume.Vpb) { - IrpContext->RealDevice = + IrpContext->RealDevice = IoStackLocation->Parameters.MountVolume.Vpb->RealDevice; } } @@ -155,7 +155,7 @@ FFSAllocateIrpContext( IrpContext->IsSynchronous = IoIsOperationSynchronous(Irp); } -#if 0 +#if 0 // // Temporary workaround for a bug in close that makes it reference a // fileobject when it is no longer valid. @@ -430,12 +430,12 @@ FFSv1AllocateFcb( Fcb->Vcb = Vcb; -#if DBG +#if DBG Fcb->AnsiFileName.MaximumLength = (USHORT) RtlxUnicodeStringToOemSize(&(FFSMcb->ShortName)) + 1; - Fcb->AnsiFileName.Buffer = (PUCHAR) + Fcb->AnsiFileName.Buffer = (PUCHAR) ExAllocatePoolWithTag(PagedPool, Fcb->AnsiFileName.MaximumLength, FFS_POOL_TAG); if (!Fcb->AnsiFileName.Buffer) @@ -457,7 +457,7 @@ FFSv1AllocateFcb( SetFlag(FFSMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY); } - if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || + if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || FFSIsReadOnly(dinode1->di_mode)) { SetFlag(FFSMcb->FileAttr, FILE_ATTRIBUTE_READONLY); @@ -478,7 +478,7 @@ FFSv1AllocateFcb( { ULONG Totalblocks = (Fcb->dinode1->di_blocks); - Fcb->Header.AllocationSize.QuadPart = + Fcb->Header.AllocationSize.QuadPart = (((LONGLONG)FFSDataBlocks(Vcb, Totalblocks)) << BLOCK_BITS); } @@ -596,12 +596,12 @@ FFSv2AllocateFcb( Fcb->Vcb = Vcb; -#if DBG +#if DBG Fcb->AnsiFileName.MaximumLength = (USHORT) RtlxUnicodeStringToOemSize(&(FFSMcb->ShortName)) + 1; - Fcb->AnsiFileName.Buffer = (PUCHAR) + Fcb->AnsiFileName.Buffer = (PUCHAR) ExAllocatePoolWithTag(PagedPool, Fcb->AnsiFileName.MaximumLength, FFS_POOL_TAG); if (!Fcb->AnsiFileName.Buffer) @@ -623,7 +623,7 @@ FFSv2AllocateFcb( SetFlag(FFSMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY); } - if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || + if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || FFSIsReadOnly(dinode2->di_mode)) { SetFlag(FFSMcb->FileAttr, FILE_ATTRIBUTE_READONLY); @@ -644,7 +644,7 @@ FFSv2AllocateFcb( { ULONG Totalblocks = (ULONG)(Fcb->dinode2->di_blocks); - Fcb->Header.AllocationSize.QuadPart = + Fcb->Header.AllocationSize.QuadPart = (((LONGLONG)FFSDataBlocks(Vcb, Totalblocks)) << BLOCK_BITS); } @@ -749,7 +749,7 @@ FFSFreeFcb( Fcb->LongName.Buffer = NULL; } -#if DBG +#if DBG ExFreePool(Fcb->AnsiFileName.Buffer); #endif @@ -901,12 +901,12 @@ FFSAllocateMcb( #define MCB_NUM_SHIFT 0x04 if (FFSGlobal->McbAllocated > (FFSGlobal->MaxDepth << MCB_NUM_SHIFT)) - Extra = FFSGlobal->McbAllocated - + Extra = FFSGlobal->McbAllocated - (FFSGlobal->MaxDepth << MCB_NUM_SHIFT) + FFSGlobal->MaxDepth; FFSPrint((DBG_INFO, - "FFSAllocateMcb: CurrDepth=%xh/%xh/%xh FileName=%S\n", + "FFSAllocateMcb: CurrDepth=%xh/%xh/%xh FileName=%S\n", FFSGlobal->McbAllocated, FFSGlobal->MaxDepth << MCB_NUM_SHIFT, FFSGlobal->FcbAllocated, @@ -978,7 +978,7 @@ FFSAllocateMcb( RtlZeroMemory(Mcb->ShortName.Buffer, Mcb->ShortName.MaximumLength); RtlCopyMemory(Mcb->ShortName.Buffer, FileName->Buffer, Mcb->ShortName.Length); - } + } Mcb->FileAttr = FileAttr; @@ -1549,8 +1549,8 @@ FFSRemoveVcb( __drv_mustHoldCriticalRegion NTSTATUS FFSInitializeVcb( - IN PFFS_IRP_CONTEXT IrpContext, - IN PFFS_VCB Vcb, + IN PFFS_IRP_CONTEXT IrpContext, + IN PFFS_VCB Vcb, IN PFFS_SUPER_BLOCK FFSSb, IN PDEVICE_OBJECT TargetDevice, IN PDEVICE_OBJECT VolumeDevice, @@ -1775,7 +1775,7 @@ FFSInitializeVcb( Vcb->Header.AllocationSize.QuadPart = Vcb->Header.FileSize.QuadPart = PartSize; - Vcb->Header.ValidDataLength.QuadPart = + Vcb->Header.ValidDataLength.QuadPart = (LONGLONG)(0x7fffffffffffffff); /* Vcb->Header.AllocationSize.QuadPart = (LONGLONG)(ffs_super_block->s_blocks_count - ffs_super_block->s_free_blocks_count) diff --git a/drivers/filesystems/ffs/src/misc.c b/drivers/filesystems/ffs/src/misc.c index da42a752d89..d1fcd4a75a2 100644 --- a/drivers/filesystems/ffs/src/misc.c +++ b/drivers/filesystems/ffs/src/misc.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * misc.c @@ -86,7 +86,7 @@ FFSOEMToUnicode( PAGED_CODE(); Status = RtlOemStringToUnicodeString( - Unicode, + Unicode, Oem, FALSE); diff --git a/drivers/filesystems/ffs/src/pnp.c b/drivers/filesystems/ffs/src/pnp.c index 7c8427f9dc1..a3bde28bec1 100644 --- a/drivers/filesystems/ffs/src/pnp.c +++ b/drivers/filesystems/ffs/src/pnp.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * misc.c @@ -221,7 +221,7 @@ FFSPnpQueryRemove( TRUE); FFSPrint((DBG_PNP, "FFSPnpQueryRemove: Call lower level driver...\n")); - Status = IoCallDriver(Vcb->TargetDeviceObject, + Status = IoCallDriver(Vcb->TargetDeviceObject, IrpContext->Irp); if (Status == STATUS_PENDING) @@ -307,7 +307,7 @@ FFSPnpRemove( TRUE, TRUE); - Status = IoCallDriver(Vcb->TargetDeviceObject, + Status = IoCallDriver(Vcb->TargetDeviceObject, IrpContext->Irp); if (Status == STATUS_PENDING) @@ -389,7 +389,7 @@ FFSPnpSurpriseRemove( TRUE, TRUE); - Status = IoCallDriver(Vcb->TargetDeviceObject, + Status = IoCallDriver(Vcb->TargetDeviceObject, IrpContext->Irp); if (Status == STATUS_PENDING) diff --git a/drivers/filesystems/ffs/src/read.c b/drivers/filesystems/ffs/src/read.c index b5a5cc585a6..52b7b6425fb 100644 --- a/drivers/filesystems/ffs/src/read.c +++ b/drivers/filesystems/ffs/src/read.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * read.c @@ -75,7 +75,7 @@ FFSCompleteIrpContext( Irp, bPrint, (CCHAR)(NT_SUCCESS(Status)? IO_DISK_INCREMENT : IO_NO_INCREMENT)); - IrpContext->Irp = NULL; + IrpContext->Irp = NULL; } FFSFreeIrpContext(IrpContext); @@ -84,7 +84,7 @@ FFSCompleteIrpContext( } -BOOLEAN +BOOLEAN FFSCopyRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -126,7 +126,7 @@ FFSCopyRead( IoStatus->Information = Length; CcUnpinData(Bcb); return TRUE; - + } else { @@ -551,16 +551,16 @@ FFSv1ReadInode( IoStatus.Information = 0; #if DBG - KdPrint(("FFSv1ReadInode() i : %d, Lba : %x, Length : %x, Offset : %x\n", + KdPrint(("FFSv1ReadInode() i : %d, Lba : %x, Length : %x, Offset : %x\n", i, ffs_bdl[i].Lba, ffs_bdl[i].Length, ffs_bdl[i].Offset)); #endif FFSCopyRead( - Vcb->StreamObj, - (PLARGE_INTEGER)(&(ffs_bdl[i].Lba)), + Vcb->StreamObj, + (PLARGE_INTEGER)(&(ffs_bdl[i].Lba)), ffs_bdl[i].Length, PIN_WAIT, - (PVOID)((PUCHAR)Buffer + ffs_bdl[i].Offset), + (PVOID)((PUCHAR)Buffer + ffs_bdl[i].Offset), &IoStatus); Status = IoStatus.Status; @@ -640,16 +640,16 @@ FFSv2ReadInode( IoStatus.Information = 0; #if 0 - KdPrint(("FFSv2ReadInode() i : %d, Lba : %x, Length : %x, Offset : %x\n", + KdPrint(("FFSv2ReadInode() i : %d, Lba : %x, Length : %x, Offset : %x\n", i, ffs_bdl[i].Lba, ffs_bdl[i].Length, ffs_bdl[i].Offset)); #endif FFSCopyRead( - Vcb->StreamObj, - (PLARGE_INTEGER)(&(ffs_bdl[i].Lba)), + Vcb->StreamObj, + (PLARGE_INTEGER)(&(ffs_bdl[i].Lba)), ffs_bdl[i].Length, PIN_WAIT, - (PVOID)((PUCHAR)Buffer + ffs_bdl[i].Offset), + (PVOID)((PUCHAR)Buffer + ffs_bdl[i].Offset), &IoStatus); Status = IoStatus.Status; @@ -927,7 +927,7 @@ FFSReadFile( if (FS_VERSION == 1) { - Status = + Status = FFSv1ReadInode( IrpContext, Vcb, @@ -939,7 +939,7 @@ FFSReadFile( } else { - Status = + Status = FFSv2ReadInode( IrpContext, Vcb, diff --git a/drivers/filesystems/ffs/src/shutdown.c b/drivers/filesystems/ffs/src/shutdown.c index ecfcf25ff45..aa4b0b3b3f8 100644 --- a/drivers/filesystems/ffs/src/shutdown.c +++ b/drivers/filesystems/ffs/src/shutdown.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * read.c diff --git a/drivers/filesystems/ffs/src/volinfo.c b/drivers/filesystems/ffs/src/volinfo.c index 680a30ecd1b..a1f32e353cc 100644 --- a/drivers/filesystems/ffs/src/volinfo.c +++ b/drivers/filesystems/ffs/src/volinfo.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * volinfo.c @@ -437,7 +437,7 @@ FFSSetVolumeInformation( FFSUnicodeToOEM(&OemName, &LabelName); - Vcb->Vpb->VolumeLabelLength = + Vcb->Vpb->VolumeLabelLength = (USHORT)VolLabelLen; if (FFSSaveSuper(IrpContext, Vcb)) diff --git a/drivers/filesystems/ffs/src/write.c b/drivers/filesystems/ffs/src/write.c index 24e04b79354..5777822cf72 100644 --- a/drivers/filesystems/ffs/src/write.c +++ b/drivers/filesystems/ffs/src/write.c @@ -1,4 +1,4 @@ -/* +/* * FFS File System Driver for Windows * * write.c @@ -380,7 +380,7 @@ FFSWriteVolume( _SEH2_LEAVE; } - } + } if (Nocache && (ByteOffset.LowPart & (SECTOR_SIZE - 1) || @@ -440,7 +440,7 @@ FFSWriteVolume( #endif - if (Nocache && !PagingIo && (Vcb->SectionObject.DataSectionObject != NULL)) + if (Nocache && !PagingIo && (Vcb->SectionObject.DataSectionObject != NULL)) { ExAcquireResourceExclusiveLite(&Vcb->MainResource, TRUE); MainResourceAcquired = TRUE; @@ -453,7 +453,7 @@ FFSWriteVolume( Length, &(Irp->IoStatus)); - if (!NT_SUCCESS(Irp->IoStatus.Status)) + if (!NT_SUCCESS(Irp->IoStatus.Status)) { Status = Irp->IoStatus.Status; _SEH2_LEAVE; @@ -487,7 +487,7 @@ FFSWriteVolume( else { /* - ULONG ResShCnt, ResExCnt; + ULONG ResShCnt, ResExCnt; ResShCnt = ExIsResourceAcquiredSharedLite(&Vcb->PagingIoResource); ResExCnt = ExIsResourceAcquiredExclusiveLite(&Vcb->PagingIoResource); @@ -594,7 +594,7 @@ FFSWriteVolume( _SEH2_LEAVE; } - ffs_bdl = ExAllocatePoolWithTag(PagedPool, + ffs_bdl = ExAllocatePoolWithTag(PagedPool, (Length / Vcb->BlockSize) * sizeof(FFS_BDL), FFS_POOL_TAG); @@ -611,7 +611,7 @@ FFSWriteVolume( { DirtyStart = DirtyLba; - if (FFSLookupMcbEntry(Vcb, + if (FFSLookupMcbEntry(Vcb, DirtyStart, &DirtyLba, &DirtyLength, @@ -624,7 +624,7 @@ FFSWriteVolume( { DirtyLba = DirtyStart + DirtyLength; - RemainLength = ByteOffset.QuadPart + + RemainLength = ByteOffset.QuadPart + (LONGLONG)Length - DirtyLba; continue; @@ -634,7 +634,7 @@ FFSWriteVolume( ffs_bdl[Blocks].Lba = DirtyLba; ffs_bdl[Blocks].Offset = (ULONG)((LONGLONG)Length + DirtyStart - - RemainLength - + RemainLength - DirtyLba); if (DirtyLba + DirtyLength > DirtyStart + RemainLength) @@ -662,7 +662,7 @@ FFSWriteVolume( ExFreePool(ffs_bdl); // - // Lookup fails at the first time, ie. + // Lookup fails at the first time, ie. // no dirty blocks in the run // @@ -1099,10 +1099,10 @@ FFSWriteFile( // // Do flushing for such cases // - if (Nocache && !PagingIo && (Fcb->SectionObject.DataSectionObject != NULL)) + if (Nocache && !PagingIo && (Fcb->SectionObject.DataSectionObject != NULL)) { #pragma prefast( suppress: 28137, "by design" ) - ExAcquireResourceExclusiveLite(&Fcb->MainResource, + ExAcquireResourceExclusiveLite(&Fcb->MainResource, IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT)); MainResourceAcquired = TRUE; @@ -1116,7 +1116,7 @@ FFSWriteFile( &(Irp->IoStatus)); ClearFlag(Fcb->Flags, FCB_FILE_MODIFIED); - if (!NT_SUCCESS(Irp->IoStatus.Status)) + if (!NT_SUCCESS(Irp->IoStatus.Status)) { Status = Irp->IoStatus.Status; _SEH2_LEAVE; @@ -1150,7 +1150,7 @@ FFSWriteFile( else { /* - ULONG ResShCnt, ResExCnt; + ULONG ResShCnt, ResExCnt; ResShCnt = ExIsResourceAcquiredSharedLite(&Fcb->PagingIoResource); ResExCnt = ExIsResourceAcquiredExclusiveLite(&Fcb->PagingIoResource); @@ -1184,7 +1184,7 @@ FFSWriteFile( if ((ByteOffset.QuadPart + Length) > Fcb->Header.AllocationSize.QuadPart) { - if (ByteOffset.QuadPart >= + if (ByteOffset.QuadPart >= Fcb->Header.AllocationSize.QuadPart) { Status = STATUS_SUCCESS; @@ -1224,7 +1224,7 @@ FFSWriteFile( READ_AHEAD_GRANULARITY); CcSetFileSizes( - FileObject, + FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); } @@ -1264,13 +1264,13 @@ FFSWriteFile( if (ByteOffset.QuadPart > FileSize.QuadPart) { - FFSZeroHoles(IrpContext, Vcb, FileObject, FileSize.QuadPart, + FFSZeroHoles(IrpContext, Vcb, FileObject, FileSize.QuadPart, ByteOffset.QuadPart - FileSize.QuadPart); } if (Fcb->Header.AllocationSize.QuadPart > ExtendSize.QuadPart) { - FFSZeroHoles(IrpContext, Vcb, FileObject, ExtendSize.QuadPart, + FFSZeroHoles(IrpContext, Vcb, FileObject, ExtendSize.QuadPart, Fcb->Header.AllocationSize.QuadPart - ExtendSize.QuadPart); } } @@ -1352,7 +1352,7 @@ FFSWriteFile( Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length; - Status = + Status = FFSv1WriteInode( IrpContext, Vcb, diff --git a/drivers/filesystems/fs_rec/ffs.h b/drivers/filesystems/fs_rec/ffs.h index 43271b5a770..148ed5b1cbb 100644 --- a/drivers/filesystems/fs_rec/ffs.h +++ b/drivers/filesystems/fs_rec/ffs.h @@ -162,7 +162,7 @@ typedef struct fs { INT32 fs_sparecon32[26]; /* reserved for future constants */ INT32 fs_flags; /* see FS_ flags below */ /* back to stuff that has been around a while (again) */ - INT32 fs_contigsumsize; /* size of cluster summary array */ + INT32 fs_contigsumsize; /* size of cluster summary array */ INT32 fs_maxsymlinklen; /* max length of an internal symlink */ INT32 fs_old_inodefmt; /* format of on-disk inodes */ UINT64 fs_maxfilesize; /* maximum representable file size */ diff --git a/drivers/filesystems/fs_rec/reiserfs.c b/drivers/filesystems/fs_rec/reiserfs.c index 89bf0dc42f2..2854b2336b8 100644 --- a/drivers/filesystems/fs_rec/reiserfs.c +++ b/drivers/filesystems/fs_rec/reiserfs.c @@ -25,9 +25,9 @@ FsRecIsReiserfsVolume(IN PRFSD_SUPER_BLOCK sb) UCHAR currentChar; int i; - // If any characters read from disk don't match the expected magic key, we don't have a ReiserFS volume. - for (i = 0; i < MAGIC_KEY_LENGTH; i++) - { + // If any characters read from disk don't match the expected magic key, we don't have a ReiserFS volume. + for (i = 0; i < MAGIC_KEY_LENGTH; i++) + { currentChar = sb->s_magic[i]; if (currentChar != sz_MagicKey[i]) { diff --git a/drivers/filesystems/fs_rec/reiserfs.h b/drivers/filesystems/fs_rec/reiserfs.h index a2c9eed7409..6507a808106 100644 --- a/drivers/filesystems/fs_rec/reiserfs.h +++ b/drivers/filesystems/fs_rec/reiserfs.h @@ -47,7 +47,7 @@ typedef struct _RFSD_SUPER_BLOCK char s_magic[10]; /* reiserfs magic string indicates that * file system is reiserfs: * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */ - + // State of the partition: valid(1), error (2) UINT16 s_fs_state; /* it is set to used by fsck to mark which phase of rebuilding is done */ diff --git a/drivers/filesystems/nfs/nfs41_debug.c b/drivers/filesystems/nfs/nfs41_debug.c index 29b8dd7abdc..ac7a7c4a296 100644 --- a/drivers/filesystems/nfs/nfs41_debug.c +++ b/drivers/filesystems/nfs/nfs41_debug.c @@ -58,12 +58,12 @@ ULONG __cdecl DbgP(IN PCCH fmt, ...) ExSystemTimeToLocalTime(×tamp,&local_time); RtlTimeToTimeFields(&local_time, &time_fields); - DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, - "[%ld].[%02u:%02u:%02u.%u] %s", IoGetCurrentProcess(), - time_fields.Hour, time_fields.Minute, time_fields.Second, + DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, + "[%ld].[%02u:%02u:%02u.%u] %s", IoGetCurrentProcess(), + time_fields.Hour, time_fields.Minute, time_fields.Second, time_fields.Milliseconds, msg); #else - DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, + DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, "[%04x] %s", PsGetCurrentProcessId(), msg); #endif } @@ -90,12 +90,12 @@ ULONG __cdecl print_error(IN PCCH fmt, ...) ExSystemTimeToLocalTime(×tamp,&local_time); RtlTimeToTimeFields(&local_time, &time_fields); - DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, - "[%ld].[%02u:%02u:%02u.%u] %s", IoGetCurrentProcess(), - time_fields.Hour, time_fields.Minute, time_fields.Second, + DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, + "[%ld].[%02u:%02u:%02u.%u] %s", IoGetCurrentProcess(), + time_fields.Hour, time_fields.Minute, time_fields.Second, time_fields.Milliseconds, msg); #else - DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, + DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, "[%04x] %s", PsGetCurrentProcessId(), msg); #endif } @@ -104,7 +104,7 @@ ULONG __cdecl print_error(IN PCCH fmt, ...) return 0; } -void print_hexbuf(int on, unsigned char *title, unsigned char *buf, int len) +void print_hexbuf(int on, unsigned char *title, unsigned char *buf, int len) { int j, k; LARGE_INTEGER timestamp, local_time; @@ -116,9 +116,9 @@ void print_hexbuf(int on, unsigned char *title, unsigned char *buf, int len) ExSystemTimeToLocalTime(×tamp,&local_time); RtlTimeToTimeFields(&local_time, &time_fields); - DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, - "[%ld].[%02u:%02u:%02u.%u] %s\n", IoGetCurrentProcess(), - time_fields.Hour, time_fields.Minute, time_fields.Second, + DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, + "[%ld].[%02u:%02u:%02u.%u] %s\n", IoGetCurrentProcess(), + time_fields.Hour, time_fields.Minute, time_fields.Second, time_fields.Milliseconds, title); for(j = 0, k = 0; j < len; j++, k++) { DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, @@ -206,15 +206,15 @@ void print_basic_info(int on, PFILE_BASIC_INFORMATION info) if (!on) return; DbgP("BASIC_INFO: Create=%lx Access=%lx Write=%lx Change=%lx Attr=%x\n", info->CreationTime.QuadPart, info->LastAccessTime.QuadPart, - info->LastWriteTime.QuadPart, info->ChangeTime.QuadPart, + info->LastWriteTime.QuadPart, info->ChangeTime.QuadPart, info->FileAttributes); } void print_std_info(int on, PFILE_STANDARD_INFORMATION info) { if (!on) return; DbgP("STD_INFO: Type=%s #Links=%d Alloc=%lx EOF=%lx Delete=%d\n", - info->Directory?"DIR":"FILE", info->NumberOfLinks, - info->AllocationSize.QuadPart, info->EndOfFile.QuadPart, + info->Directory?"DIR":"FILE", info->NumberOfLinks, + info->AllocationSize.QuadPart, info->EndOfFile.QuadPart, info->DeletePending); } @@ -224,16 +224,16 @@ void print_ea_info(int on, PFILE_FULL_EA_INFORMATION info) DbgP("FULL_EA_INFO: NextOffset=%d Flags=%x EaNameLength=%d " "ExValueLength=%x EaName=%s\n", info->NextEntryOffset, info->Flags, info->EaNameLength, info->EaValueLength, info->EaName); - if (info->EaValueLength) - print_hexbuf(0, (unsigned char *)"eavalue", - (unsigned char *)info->EaName + info->EaNameLength + 1, + if (info->EaValueLength) + print_hexbuf(0, (unsigned char *)"eavalue", + (unsigned char *)info->EaName + info->EaNameLength + 1, info->EaValueLength); } void print_get_ea(int on, PFILE_GET_EA_INFORMATION info) { if (!on || !info) return; - DbgP("GET_EA_INFO: NextOffset=%d EaNameLength=%d EaName=%s\n", + DbgP("GET_EA_INFO: NextOffset=%d EaNameLength=%d EaName=%s\n", info->NextEntryOffset, info->EaNameLength, info->EaName); } @@ -301,7 +301,7 @@ VOID print_v_net_root(int on, IN PMRX_V_NET_ROOT p) void print_file_object(int on, PFILE_OBJECT file) { - if (!on) return; + if (!on) return; DbgP("FsContext %p FsContext2 %p\n", file->FsContext, file->FsContext2); DbgP("DeletePending %d ReadAccess %d WriteAccess %d DeleteAccess %d\n", file->DeletePending, file->WriteAccess, file->DeleteAccess); @@ -313,7 +313,7 @@ void print_fo_all(int on, PRX_CONTEXT c) { if (!on) return; if (c->pFcb && c->pRelevantSrvOpen) - DbgP("OpenCount %d FCB %p SRV %p FOBX %p VNET %p NET %p\n", + DbgP("OpenCount %d FCB %p SRV %p FOBX %p VNET %p NET %p\n", c->pFcb->OpenCount, c->pFcb, c->pRelevantSrvOpen, c->pFobx, c->pRelevantSrvOpen->pVNetRoot, c->pFcb->pNetRoot); } @@ -384,11 +384,11 @@ VOID print_fobx(int on, IN PMRX_FOBX p) #endif } -VOID print_irp_flags(int on, PIRP irp) +VOID print_irp_flags(int on, PIRP irp) { if (!on) return; if (irp->Flags) - DbgP("IRP FLAGS: 0x%x %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", + DbgP("IRP FLAGS: 0x%x %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", irp->Flags, (irp->Flags & IRP_NOCACHE)?"NOCACHE":"", (irp->Flags & IRP_PAGING_IO)?"PAGING_IO":"", @@ -420,7 +420,7 @@ void print_nt_create_params(int on, NT_CREATE_PARAMETERS params) { if (!on) return; if (params.FileAttributes) - DbgP("File attributes %x: %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", + DbgP("File attributes %x: %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", params.FileAttributes, (params.FileAttributes & FILE_ATTRIBUTE_TEMPORARY)?"TEMPFILE ":"", (params.FileAttributes & FILE_ATTRIBUTE_READONLY)?"READONLY ":"", @@ -436,7 +436,7 @@ void print_nt_create_params(int on, NT_CREATE_PARAMETERS params) (params.FileAttributes & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED)?"NOT INDEXED ":"", (params.FileAttributes & FILE_ATTRIBUTE_ENCRYPTED)?"ENCRYPTED ":"", (params.FileAttributes & FILE_ATTRIBUTE_VIRTUAL)?"VIRTUAL":""); - + if (params.Disposition == FILE_SUPERSEDE) DbgP("Create Dispositions: FILE_SUPERSEDE\n"); if (params.Disposition == FILE_CREATE) @@ -451,7 +451,7 @@ void print_nt_create_params(int on, NT_CREATE_PARAMETERS params) DbgP("Create Dispositions: FILE_OVERWRITE_IF\n"); DbgP("Create Attributes: 0x%x %s %s %s %s %s %s %s %s %s %s %s %s %s %s " - "%s %s\n", params.CreateOptions, + "%s %s\n", params.CreateOptions, (params.CreateOptions & FILE_DIRECTORY_FILE)?"DIRFILE":"", (params.CreateOptions & FILE_NON_DIRECTORY_FILE)?"FILE":"", (params.CreateOptions & FILE_DELETE_ON_CLOSE)?"DELETE_ON_CLOSE":"", @@ -469,12 +469,12 @@ void print_nt_create_params(int on, NT_CREATE_PARAMETERS params) (params.CreateOptions & FILE_OPEN_FOR_BACKUP_INTENT)?"4_BACKUP":"", (params.CreateOptions & FILE_RESERVE_OPFILTER)?"OPFILTER":""); - DbgP("Share Access: %s %s %s\n", + DbgP("Share Access: %s %s %s\n", (params.ShareAccess & FILE_SHARE_READ)?"READ":"", (params.ShareAccess & FILE_SHARE_WRITE)?"WRITE":"", (params.ShareAccess & FILE_SHARE_DELETE)?"DELETE":""); - DbgP("Desired Access: 0x%x %s %s %s %s %s %s %s %s %s %s %s\n", + DbgP("Desired Access: 0x%x %s %s %s %s %s %s %s %s %s %s %s\n", params.DesiredAccess, (params.DesiredAccess & FILE_READ_DATA)?"READ":"", (params.DesiredAccess & STANDARD_RIGHTS_READ)?"READ_ACL":"", @@ -495,7 +495,7 @@ void print_nt_create_params(int on, NT_CREATE_PARAMETERS params) (params.DesiredAccess & SYNCHRONIZE)?"SYNCHRONIZE":""); } -unsigned char * print_file_information_class(int InfoClass) +unsigned char * print_file_information_class(int InfoClass) { switch(InfoClass) { case FileBothDirectoryInformation: @@ -583,7 +583,7 @@ void print_caching_level(int on, ULONG flag, PUNICODE_STRING name) { if (!on) return; switch(flag) { - case 0: + case 0: DbgP("enable_caching: DISABLE_CACHING %wZ\n", name); break; case 1: @@ -594,7 +594,7 @@ void print_caching_level(int on, ULONG flag, PUNICODE_STRING name) break; case 3: DbgP("enable_caching: ENABLE_READWRITE_CACHING %wZ\n", name); - break; + break; } } @@ -685,14 +685,14 @@ void print_open_error(int on, int status) } } -void print_wait_status(int on, const char *prefix, NTSTATUS status, +void print_wait_status(int on, const char *prefix, NTSTATUS status, const char *opcode, PVOID entry, LONGLONG xid) { if (!on) return; switch (status) { case STATUS_SUCCESS: if (opcode) - DbgP("%s Got a wakeup call, finishing %s entry=%p xid=%lld\n", + DbgP("%s Got a wakeup call, finishing %s entry=%p xid=%lld\n", prefix, opcode, entry, xid); else DbgP("%s Got a wakeup call\n", prefix); diff --git a/drivers/filesystems/nfs/nfs41_debug.h b/drivers/filesystems/nfs/nfs41_debug.h index 4bc4e9ad153..c7cb55d3fab 100644 --- a/drivers/filesystems/nfs/nfs41_debug.h +++ b/drivers/filesystems/nfs/nfs41_debug.h @@ -50,14 +50,14 @@ void print_get_ea(int on, PFILE_GET_EA_INFORMATION info); void print_caching_level(int on, ULONG flag, PUNICODE_STRING s); const char *opcode2string(int opcode); void print_open_error(int on, int status); -void print_wait_status(int on, const char *str, NTSTATUS status, +void print_wait_status(int on, const char *str, NTSTATUS status, const char *opcode, PVOID entry, LONGLONG xid); void print_acl_args(SECURITY_INFORMATION info); #define DbgEn() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \ "--> [%s] [%04x] %s\n", _DRIVER_NAME_, PsGetCurrentProcessId(), \ __FUNCTION__); _SEH2_TRY { - + #define DbgEx() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \ "<-- [%s] [%04x] %s status = %08lx\n", _DRIVER_NAME_, PsGetCurrentProcessId(), \ __FUNCTION__, status); \ diff --git a/drivers/filesystems/ntfs/attrib.c b/drivers/filesystems/ntfs/attrib.c index 006465ce975..f878a5a139f 100644 --- a/drivers/filesystems/ntfs/attrib.c +++ b/drivers/filesystems/ntfs/attrib.c @@ -334,7 +334,7 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, FileNameAttribute->NameType = NTFS_FILE_NAME_WIN32_AND_DOS; else FileNameAttribute->NameType = NTFS_FILE_NAME_POSIX; - + FileRecord->LinkCount++; AttributeAddress->Length = ResidentHeaderLength + @@ -382,7 +382,7 @@ AddFileName(PFILE_RECORD_HEADER FileRecord, * Only adding the attribute to the end of the file record is supported; AttributeAddress must * be of type AttributeEnd. * This could be improved by adding an $ATTRIBUTE_LIST to the file record if there's not enough space. -* +* */ NTSTATUS AddIndexAllocation(PNTFS_VCB Vcb, @@ -430,7 +430,7 @@ AddIndexAllocation(PNTFS_VCB Vcb, // Set fields of attribute header RtlZeroMemory(AttributeAddress, RecordLength); - + AttributeAddress->Type = AttributeIndexAllocation; AttributeAddress->Length = RecordLength; AttributeAddress->IsNonResident = TRUE; @@ -584,7 +584,7 @@ AddIndexRoot(PNTFS_VCB Vcb, * * @return * STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute. -* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails or if we fail to allocate a +* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails or if we fail to allocate a * buffer for the new data runs. * STATUS_INSUFFICIENT_RESOURCES or STATUS_UNSUCCESSFUL if FsRtlAddLargeMcbEntry() fails. * STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails. @@ -592,7 +592,7 @@ AddIndexRoot(PNTFS_VCB Vcb, * * @remarks * Clusters should have been allocated previously with NtfsAllocateClusters(). -* +* * */ NTSTATUS @@ -629,7 +629,7 @@ AddRun(PNTFS_VCB Vcb, ExRaiseStatus(STATUS_UNSUCCESSFUL); } } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Failed to add LargeMcb Entry!\n"); _SEH2_YIELD(return _SEH2_GetExceptionCode()); @@ -717,8 +717,8 @@ AddRun(PNTFS_VCB Vcb, AttrContext->pRecord->NonResident.HighestVCN); // Write data runs to destination attribute - RtlCopyMemory((PVOID)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), - RunBuffer, + RtlCopyMemory((PVOID)((ULONG_PTR)DestinationAttribute + DestinationAttribute->NonResident.MappingPairsOffset), + RunBuffer, RunBufferSize); // Update the attribute record in the attribute context @@ -1121,7 +1121,7 @@ FreeClusters(PNTFS_VCB Vcb, ReadAttribute(Vcb, DataContext, 0, (PCHAR)BitmapData, (ULONG)BitmapDataSize); RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, Vcb->NtfsInfo.ClusterCount); - + // free clusters in $BITMAP file while (ClustersLeftToFree > 0) { @@ -1161,7 +1161,7 @@ FreeClusters(PNTFS_VCB Vcb, ReleaseAttributeContext(DataContext); ExFreePoolWithTag(BitmapData, TAG_NTFS); ExFreeToNPagedLookasideList(&Vcb->FileRecLookasideList, BitmapRecord); - + // Save updated data runs to file record // Allocate some memory for a new RunBuffer @@ -1358,7 +1358,7 @@ InternalGetNextAttribute(PFIND_ATTR_CONTXT Context) Context->CurrAttr = (PVOID)-1; return NULL; } - + Context->Offset += ((ULONG_PTR)NextAttribute - (ULONG_PTR)Context->CurrAttr); Context->CurrAttr = NextAttribute; @@ -1604,7 +1604,7 @@ NtfsDumpIndexRootAttribute(PNTFS_ATTR_RECORD Attribute) PULONGLONG SubNodeVCN = (PULONGLONG)((ULONG_PTR)currentIndexExtry + currentIndexExtry->Length - sizeof(ULONGLONG)); DbgPrint(" VCN of sub-node: 0x%llx\n", *SubNodeVCN); } - + CurrentOffset += currentIndexExtry->Length; ASSERT(currentIndexExtry->Length); } @@ -1920,16 +1920,16 @@ GetLastClusterInDataRun(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_RECORD Attribute, PULO while (1) { DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); - + if (DataRunOffset != -1) { // Normal data run. DataRunStartLCN = LastLCN + DataRunOffset; LastLCN = DataRunStartLCN; *LastCluster = LastLCN + DataRunLength - 1; - } + } - if (*DataRun == 0) + if (*DataRun == 0) break; } diff --git a/drivers/filesystems/ntfs/blockdev.c b/drivers/filesystems/ntfs/blockdev.c index 70658b03c3f..8698b220d0e 100644 --- a/drivers/filesystems/ntfs/blockdev.c +++ b/drivers/filesystems/ntfs/blockdev.c @@ -189,8 +189,8 @@ NtfsWriteDisk(IN PDEVICE_OBJECT DeviceObject, { ULONGLONG relativeOffset; - // We need to do a read-modify-write. We'll start be copying the entire - // contents of every sector that will be overwritten. + // We need to do a read-modify-write. We'll start be copying the entire + // contents of every sector that will be overwritten. // TODO: Optimize (read no more than necessary) RealWriteOffset = ROUND_DOWN(StartingOffset, SectorSize); @@ -257,7 +257,7 @@ NtfsWriteDisk(IN PDEVICE_OBJECT DeviceObject, // TODO: Forward the existing IRP instead Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, DeviceObject, - // if we allocated a temp buffer, use that instead of the Buffer parameter + // if we allocated a temp buffer, use that instead of the Buffer parameter ((AllocatedBuffer) ? TempBuffer : Buffer), RealLength, &Offset, diff --git a/drivers/filesystems/ntfs/btree.c b/drivers/filesystems/ntfs/btree.c index 2e772dd03c1..e8462ae8308 100644 --- a/drivers/filesystems/ntfs/btree.c +++ b/drivers/filesystems/ntfs/btree.c @@ -107,7 +107,7 @@ PrintAllVCNs(PDEVICE_EXTENSION Vcb, * @returns * STATUS_SUCCESS in case of success. * STATUS_NOT_IMPLEMENTED if there's no $I30 bitmap attribute in the file record. -* +* * @remarks * AllocateIndexNode() doesn't write any data to the index record it creates. Called by UpdateIndexNode(). * Don't call PrintAllVCNs() or NtfsDumpFileRecord() after calling AllocateIndexNode() before UpdateIndexNode() finishes. @@ -173,7 +173,7 @@ AllocateIndexNode(PDEVICE_EXTENSION DeviceExt, // Windows seems to allocate the bitmap in 8-byte chunks to keep any bytes from being wasted on padding BytesNeeded = ALIGN_UP(BytesNeeded, ATTR_RECORD_ALIGNMENT); - // Allocate memory for the bitmap, including some padding; RtlInitializeBitmap() wants a pointer + // Allocate memory for the bitmap, including some padding; RtlInitializeBitmap() wants a pointer // that's ULONG-aligned, and it wants the size of the memory allocated for it to be a ULONG-multiple. BitmapMem = ExAllocatePoolWithTag(NonPagedPool, BytesNeeded + sizeof(ULONG), TAG_NTFS); if (!BitmapMem) @@ -248,7 +248,7 @@ AllocateIndexNode(PDEVICE_EXTENSION DeviceExt, // Set the bit for the new index record RtlSetBits(&Bitmap, NextNodeNumber, 1); - + // Write the new bitmap attribute Status = WriteAttribute(DeviceExt, BitmapCtx, @@ -304,7 +304,7 @@ CreateDummyKey(BOOLEAN HasChildNode) } RtlZeroMemory(NewIndexEntry, EntrySize); - + if (HasChildNode) { NewIndexEntry->Flags = NTFS_INDEX_ENTRY_NODE | NTFS_INDEX_ENTRY_END; @@ -443,7 +443,7 @@ CompareTreeKeys(PB_TREE_KEY Key1, PB_TREE_KEY Key2, BOOLEAN CaseSensitive) { // Truncate KeyName2 to be the same length as KeyName1 Key2Name.Length = Key1Name.Length; - + // Compare the names of the same length Comparison = RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); @@ -471,12 +471,12 @@ CompareTreeKeys(PB_TREE_KEY Key1, PB_TREE_KEY Key2, BOOLEAN CaseSensitive) /** * @name CountBTreeKeys * @implemented -* +* * Counts the number of linked B-Tree keys, starting with FirstKey. * * @param FirstKey * Pointer to a B_TREE_KEY that will be the first key to be counted. -* +* * @return * The number of keys in a linked-list, including FirstKey and the final dummy key. */ @@ -485,7 +485,7 @@ CountBTreeKeys(PB_TREE_KEY FirstKey) { ULONG Count = 0; PB_TREE_KEY Current = FirstKey; - + while (Current != NULL) { Count++; @@ -674,7 +674,7 @@ CreateBTreeNodeFromIndexNode(PDEVICE_EXTENSION Vcb, * @returns * STATUS_SUCCESS on success. * STATUS_INSUFFICIENT_RESOURCES if an allocation fails. -* +* * @remarks * Allocates memory for the entire tree. Caller is responsible for destroying the tree with DestroyBTree(). */ @@ -861,7 +861,7 @@ GetSizeOfIndexEntries(PB_TREE_FILENAME_NODE Node) PB_TREE_KEY CurrentKey = Node->FirstKey; ULONG i; for (i = 0; i < Node->KeyCount; i++) - { + { ASSERT(CurrentKey->IndexEntry->Length != 0); // Add the length of the current node @@ -902,7 +902,7 @@ GetSizeOfIndexEntries(PB_TREE_FILENAME_NODE Node) * STATUS_SUCCESS on success. * STATUS_INSUFFICIENT_RESOURCES if an allocation fails. * STATUS_NOT_IMPLEMENTED if the new index can't fit within MaxIndexSize. -* +* * @remarks * If the function succeeds, it's the caller's responsibility to free IndexRoot with ExFreePoolWithTag(). */ @@ -953,7 +953,7 @@ CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, // Setup each Node Entry CurrentKey = Tree->RootNode->FirstKey; - CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)NewIndexRoot + CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)NewIndexRoot + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + NewIndexRoot->Header.FirstEntryOffset); for (i = 0; i < Tree->RootNode->KeyCount; i++) @@ -1021,7 +1021,7 @@ CreateIndexBufferFromBTreeNode(PDEVICE_EXTENSION DeviceExt, // Windows seems to alternate between using 0x28 and 0x40 for the first entry offset of each index buffer. // Interestingly, neither Windows nor chkdsk seem to mind if we just use 0x28 for every index record. - IndexBuffer->Header.FirstEntryOffset = 0x28; + IndexBuffer->Header.FirstEntryOffset = 0x28; IndexBuffer->Header.AllocatedSize = BufferSize - FIELD_OFFSET(INDEX_BUFFER, Header); // Start summing the total size of this node's entries @@ -1237,7 +1237,7 @@ UpdateIndexAllocation(PDEVICE_EXTENSION DeviceExt, return Status; } - // Advance end marker + // Advance end marker EndMarker = (PNTFS_ATTR_RECORD)((ULONG_PTR)EndMarker + EndMarker->Length); // Add index bitmap to the very end of the file record @@ -1355,7 +1355,7 @@ UpdateIndexNode(PDEVICE_EXTENSION DeviceExt, DPRINT1("ERROR: Failed to update child node!\n"); return Status; } - + // Is the Index Entry large enough to store the VCN? if (!BooleanFlagOn(CurrentKey->IndexEntry->Flags, NTFS_INDEX_ENTRY_NODE)) { @@ -1756,7 +1756,7 @@ NtfsInsertKey(PB_TREE Tree, CaseSensitive, MaxIndexRootSize, IndexRecordSize, - &NewLeftKey, + &NewLeftKey, &NewChild); if (!NT_SUCCESS(Status)) { @@ -1821,9 +1821,9 @@ NtfsInsertKey(PB_TREE Tree, // Calculate maximum size of index entries without any headers AllocatedNodeSize = IndexRecordSize - FIELD_OFFSET(INDEX_BUFFER, Header); - // TODO: Replace magic with math + // TODO: Replace magic with math MaxNodeSizeWithoutHeader = AllocatedNodeSize - 0x28; - + // Has the node grown larger than its allocated size? if (NodeSize > MaxNodeSizeWithoutHeader) { @@ -1870,7 +1870,7 @@ NtfsInsertKey(PB_TREE Tree, * @param CaseSensitive * Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE * if an application created the file with the FILE_FLAG_POSIX_SEMANTICS flag. -* +* * @return * STATUS_SUCCESS on success. * STATUS_INSUFFICIENT_RESOURCES if an allocation fails. diff --git a/drivers/filesystems/ntfs/create.c b/drivers/filesystems/ntfs/create.c index f5b5d518ee2..8b99b9814ff 100644 --- a/drivers/filesystems/ntfs/create.c +++ b/drivers/filesystems/ntfs/create.c @@ -499,7 +499,7 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject, } // TODO: check for appropriate access - + ExAcquireResourceExclusiveLite(&(Fcb->MainResource), TRUE); fileRecord = ExAllocateFromNPagedLookasideList(&Fcb->Vcb->FileRecLookasideList); @@ -522,8 +522,8 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject, else { Status = STATUS_NO_MEMORY; - } - + } + DoneOverwriting: if (fileRecord) ExFreeToNPagedLookasideList(&Fcb->Vcb->FileRecLookasideList, fileRecord); @@ -536,7 +536,7 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject, { NtfsCloseFile(DeviceExt, FileObject); return Status; - } + } if (RequestedDisposition == FILE_SUPERSEDE) { @@ -740,7 +740,7 @@ NtfsCreateDirectory(PDEVICE_EXTENSION DeviceExt, } // Calculate maximum size of index root - MaxIndexRootSize = DeviceExt->NtfsInfo.BytesPerFileRecord + MaxIndexRootSize = DeviceExt->NtfsInfo.BytesPerFileRecord - ((ULONG_PTR)NextAttribute - (ULONG_PTR)FileRecord) - sizeof(ULONG) * 2; @@ -810,7 +810,7 @@ NtfsCreateDirectory(PDEVICE_EXTENSION DeviceExt, * * @param DeviceExt * Pointer to the DEVICE_EXTENSION of the target volume the file record will be stored on. -* +* * @return * A pointer to the newly-created FILE_RECORD_HEADER if the function succeeds, NULL otherwise. */ @@ -875,11 +875,11 @@ NtfsCreateEmptyFileRecord(PDEVICE_EXTENSION DeviceExt) * @param CanWait * Boolean indicating if the function is allowed to wait for exclusive access to the master file table. * This will only be relevant if the MFT doesn't have any free file records and needs to be enlarged. -* +* * @return -* STATUS_SUCCESS on success. +* STATUS_SUCCESS on success. * STATUS_INSUFFICIENT_RESOURCES if unable to allocate memory for the file record. -* STATUS_CANT_WAIT if CanWait was FALSE and the function needed to resize the MFT but +* STATUS_CANT_WAIT if CanWait was FALSE and the function needed to resize the MFT but * couldn't get immediate, exclusive access to it. */ NTSTATUS diff --git a/drivers/filesystems/ntfs/fcb.c b/drivers/filesystems/ntfs/fcb.c index 955b84a676e..2ff5ac5395f 100644 --- a/drivers/filesystems/ntfs/fcb.c +++ b/drivers/filesystems/ntfs/fcb.c @@ -140,7 +140,7 @@ NtfsFCBIsReparsePoint(PNTFS_FCB Fcb) BOOLEAN NtfsFCBIsCompressed(PNTFS_FCB Fcb) { - return ((Fcb->Entry.FileAttributes & NTFS_FILE_TYPE_COMPRESSED) == NTFS_FILE_TYPE_COMPRESSED); + return ((Fcb->Entry.FileAttributes & NTFS_FILE_TYPE_COMPRESSED) == NTFS_FILE_TYPE_COMPRESSED); } BOOLEAN @@ -723,7 +723,7 @@ NtfsGetFCBForFile(PNTFS_VCB Vcb, NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb, PNTFS_FCB pFCB, - ULONG Type, + ULONG Type, PCWSTR Name, ULONG NameLength, PVOID * Data) diff --git a/drivers/filesystems/ntfs/finfo.c b/drivers/filesystems/ntfs/finfo.c index 757c971e159..b8c039a5d15 100644 --- a/drivers/filesystems/ntfs/finfo.c +++ b/drivers/filesystems/ntfs/finfo.c @@ -554,8 +554,8 @@ NtfsQueryInformation(PNTFS_IRP_CONTEXT IrpContext) * STATUS_INSUFFICIENT_RESOURCES if an allocation failed, * STATUS_ACCESS_DENIED if target file is a volume or if paging is involved. * -* @remarks As this function sets the size of a file at the file-level -* (and not at the attribute level) it's not recommended to use this +* @remarks As this function sets the size of a file at the file-level +* (and not at the attribute level) it's not recommended to use this * function alongside functions that operate on the data attribute directly. * */ @@ -711,7 +711,7 @@ NtfsSetEndOfFile(PNTFS_FCB Fcb, * * @remarks Called by NtfsDispatch() in response to an IRP_MJ_SET_INFORMATION request. * Only the FileEndOfFileInformation InformationClass is fully implemented. FileAllocationInformation -* is a hack and not a true implementation, but it's enough to make SetEndOfFile() work. +* is a hack and not a true implementation, but it's enough to make SetEndOfFile() work. * All other information classes are TODO. * */ @@ -752,9 +752,9 @@ NtfsSetInformation(PNTFS_IRP_CONTEXT IrpContext) { PFILE_END_OF_FILE_INFORMATION EndOfFileInfo; - /* TODO: Allocation size is not actually the same as file end for NTFS, + /* TODO: Allocation size is not actually the same as file end for NTFS, however, few applications are likely to make the distinction. */ - case FileAllocationInformation: + case FileAllocationInformation: DPRINT1("FIXME: Using hacky method of setting FileAllocationInformation.\n"); case FileEndOfFileInformation: EndOfFileInfo = (PFILE_END_OF_FILE_INFORMATION)SystemBuffer; @@ -765,7 +765,7 @@ NtfsSetInformation(PNTFS_IRP_CONTEXT IrpContext) BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE), &EndOfFileInfo->EndOfFile); break; - + // TODO: all other information classes default: diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index a08a227c3dd..83a75e6d196 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -22,7 +22,7 @@ * PURPOSE: NTFS filesystem driver * PROGRAMMER: Eric Kohl * Valentin Verkhovsky - * Pierre Schweitzer + * Pierre Schweitzer */ /* INCLUDES *****************************************************************/ @@ -147,7 +147,7 @@ NtfsHasFileSystem(PDEVICE_OBJECT DeviceToMount) /* Check cluster size */ ClusterSize = BootSector->BPB.BytesPerSector * BootSector->BPB.SectorsPerCluster; - if (ClusterSize != 512 && ClusterSize != 1024 && + if (ClusterSize != 512 && ClusterSize != 1024 && ClusterSize != 2048 && ClusterSize != 4096 && ClusterSize != 8192 && ClusterSize != 16384 && ClusterSize != 32768 && ClusterSize != 65536) diff --git a/drivers/filesystems/ntfs/mft.c b/drivers/filesystems/ntfs/mft.c index e1411f0ac96..8ab2265519d 100644 --- a/drivers/filesystems/ntfs/mft.c +++ b/drivers/filesystems/ntfs/mft.c @@ -120,7 +120,7 @@ ReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context) /** * @name FindAttribute * @implemented -* +* * Searches a file record for an attribute matching the given type and name. * * @param Offset @@ -400,7 +400,7 @@ IncreaseMftSize(PDEVICE_EXTENSION Vcb, BOOLEAN CanWait) ReleaseAttributeContext(BitmapContext); return Status; } - + // We'll need to find the bitmap again, because its offset will have changed after resizing the data attribute ReleaseAttributeContext(BitmapContext); Status = FindAttribute(Vcb, Vcb->MasterFileTable, AttributeBitmap, L"", 0, &BitmapContext, &BitmapOffset); @@ -421,7 +421,7 @@ IncreaseMftSize(PDEVICE_EXTENSION Vcb, BOOLEAN CanWait) Status = SetNonResidentAttributeDataLength(Vcb, BitmapContext, BitmapOffset, Vcb->MasterFileTable, &BitmapSize); else Status = SetResidentAttributeDataLength(Vcb, BitmapContext, BitmapOffset, Vcb->MasterFileTable, &BitmapSize); - + if (!NT_SUCCESS(Status)) { DPRINT1("ERROR: Failed to set size of bitmap attribute!\n"); @@ -608,7 +608,7 @@ InternalSetResidentAttributeLength(PDEVICE_EXTENSION DeviceExt, /** * @parameter FileRecord -* Pointer to a file record. Must be a full record at least +* Pointer to a file record. Must be a full record at least * Fcb->Vcb->NtfsInfo.BytesPerFileRecord bytes large, not just the header. */ NTSTATUS @@ -697,10 +697,10 @@ SetAttributeDataLength(PFILE_OBJECT FileObject, * to memory allocated for the FileRecord. Must be aligned to an 8-byte boundary (relative to FileRecord). * * @param EndMarker -* This value will be written after AttributeEnd but isn't critical at all. When Windows resizes -* a file record, it preserves the final ULONG that previously ended the record, even though this +* This value will be written after AttributeEnd but isn't critical at all. When Windows resizes +* a file record, it preserves the final ULONG that previously ended the record, even though this * value is (to my knowledge) never used. We emulate this behavior. -* +* */ VOID SetFileRecordEnd(PFILE_RECORD_HEADER FileRecord, @@ -748,7 +748,7 @@ SetFileRecordEnd(PFILE_RECORD_HEADER FileRecord, * STATUS_INVALID_PARAMETER if we can't find the last cluster in the data run. * * @remarks -* Called by SetAttributeDataLength() and IncreaseMftSize(). Use SetAttributeDataLength() unless you have a good +* Called by SetAttributeDataLength() and IncreaseMftSize(). Use SetAttributeDataLength() unless you have a good * reason to use this. Doesn't update the file record on disk. Doesn't inform the cache controller of changes with * any associated files. Synchronization is the callers responsibility. */ @@ -842,8 +842,8 @@ SetNonResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, DestinationAttribute->NonResident.AllocatedSize = AllocationSize; DestinationAttribute->NonResident.DataSize = DataSize->QuadPart; DestinationAttribute->NonResident.InitializedSize = DataSize->QuadPart; - - // HighestVCN seems to be set incorrectly somewhere. Apply a hack-fix to reset it. + + // HighestVCN seems to be set incorrectly somewhere. Apply a hack-fix to reset it. // HACKHACK FIXME: Fix for sparse files; this math won't work in that case. AttrContext->pRecord->NonResident.HighestVCN = ((ULONGLONG)AllocationSize / Vcb->NtfsInfo.BytesPerCluster) - 1; DestinationAttribute->NonResident.HighestVCN = AttrContext->pRecord->NonResident.HighestVCN; @@ -999,7 +999,7 @@ SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, { FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Unable to create LargeMcb!\n"); if (AttribDataSize.QuadPart > 0) @@ -1077,7 +1077,7 @@ ReadAttribute(PDEVICE_EXTENSION Vcb, ULONG ReadLength; ULONG AlreadyRead; NTSTATUS Status; - + //TEMPTEMP PUCHAR TempBuffer; @@ -1331,10 +1331,10 @@ WriteAttribute(PDEVICE_EXTENSION Vcb, PUCHAR SourceBuffer = Buffer; LONGLONG StartingOffset; BOOLEAN FileRecordAllocated = FALSE; - + //TEMPTEMP PUCHAR TempBuffer; - + DPRINT("WriteAttribute(%p, %p, %I64u, %p, %lu, %p, %p)\n", Vcb, Context, Offset, Buffer, Length, RealLengthWritten, FileRecord); @@ -1423,7 +1423,7 @@ WriteAttribute(PDEVICE_EXTENSION Vcb, // This is a non-resident attribute. - // I. Find the corresponding start data run. + // I. Find the corresponding start data run. // FIXME: Cache seems to be non-working. Disable it for now //if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * Volume->ClusterSize) @@ -1439,7 +1439,7 @@ WriteAttribute(PDEVICE_EXTENSION Vcb, { ULONG UsedBufferSize; LastLCN = 0; - CurrentOffset = 0; + CurrentOffset = 0; // This will be rewritten in the next iteration to just use the DataRuns MCB directly TempBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); @@ -1460,14 +1460,14 @@ WriteAttribute(PDEVICE_EXTENSION Vcb, DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); if (DataRunOffset != -1) { - // Normal data run. + // Normal data run. // DPRINT1("Writing to normal data run, LastLCN %I64u DataRunOffset %I64d\n", LastLCN, DataRunOffset); DataRunStartLCN = LastLCN + DataRunOffset; LastLCN = DataRunStartLCN; } else { - // Sparse data run. We can't support writing to sparse files yet + // Sparse data run. We can't support writing to sparse files yet // (it may require increasing the allocation size). DataRunStartLCN = -1; DPRINT1("FIXME: Writing to sparse files is not supported yet!\n"); @@ -1485,7 +1485,7 @@ WriteAttribute(PDEVICE_EXTENSION Vcb, if (*DataRun == 0) { // We reached the last assigned cluster - // TODO: assign new clusters to the end of the file. + // TODO: assign new clusters to the end of the file. // (Presently, this code will rarely be reached, the write will usually have already failed by now) // [We can reach here by creating a new file record when the MFT isn't large enough] DPRINT1("FIXME: Master File Table needs to be enlarged.\n"); @@ -1552,7 +1552,7 @@ WriteAttribute(PDEVICE_EXTENSION Vcb, { // Make sure we don't write past the end of the current data run WriteLength = (ULONG)min(DataRunLength * Vcb->NtfsInfo.BytesPerCluster, Length); - + // Are we dealing with a sparse data run? if (DataRunStartLCN == -1) { @@ -1576,7 +1576,7 @@ WriteAttribute(PDEVICE_EXTENSION Vcb, SourceBuffer += WriteLength; *RealLengthWritten += WriteLength; - // We finished this request, but there's still data in this data run. + // We finished this request, but there's still data in this data run. if (Length == 0 && WriteLength != DataRunLength * Vcb->NtfsInfo.BytesPerCluster) break; @@ -1607,7 +1607,7 @@ WriteAttribute(PDEVICE_EXTENSION Vcb, } else { - // Sparse data run. + // Sparse data run. DataRunStartLCN = -1; } } // end while (Length > 0) [more data to write] @@ -1653,7 +1653,7 @@ ReadFileRecord(PDEVICE_EXTENSION Vcb, * Searches a file's parent directory (given the parent's index in the mft) * for the given file. Upon finding an index entry for that file, updates * Data Size and Allocated Size values in the $FILE_NAME attribute of that entry. -* +* * (Most of this code was copied from NtfsFindMftRecord) */ NTSTATUS @@ -1723,17 +1723,17 @@ UpdateFileNameRecord(PDEVICE_EXTENSION Vcb, IndexRoot = (PINDEX_ROOT_ATTRIBUTE)IndexRecord; IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)&IndexRoot->Header + IndexRoot->Header.FirstEntryOffset); - // Index root is always resident. + // Index root is always resident. IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + IndexRoot->Header.TotalSizeOfEntries); DPRINT("IndexRecordSize: %x IndexBlockSize: %x\n", Vcb->NtfsInfo.BytesPerIndexRecord, IndexRoot->SizeOfEntry); - Status = UpdateIndexEntryFileNameSize(Vcb, - MftRecord, - IndexRecord, - IndexRoot->SizeOfEntry, - IndexEntry, - IndexEntryEnd, + Status = UpdateIndexEntryFileNameSize(Vcb, + MftRecord, + IndexRecord, + IndexRoot->SizeOfEntry, + IndexEntry, + IndexEntryEnd, FileName, &CurrentEntry, &CurrentEntry, @@ -1922,8 +1922,8 @@ UpdateIndexEntryFileNameSize(PDEVICE_EXTENSION Vcb, * * @param FileRecord * Pointer to the complete file record which will be written to the master file table. -* -* @return +* +* @return * STATUS_SUCCESSFUL on success. An error passed from WriteAttribute() otherwise. * */ @@ -1941,7 +1941,7 @@ UpdateFileRecord(PDEVICE_EXTENSION Vcb, AddFixupArray(Vcb, &FileRecord->Ntfs); // write the file record to the master file table - Status = WriteAttribute(Vcb, + Status = WriteAttribute(Vcb, Vcb->MFTContext, MftIndex * Vcb->NtfsInfo.BytesPerFileRecord, (const PUCHAR)FileRecord, @@ -2013,7 +2013,7 @@ FixupUpdateSequenceArray(PDEVICE_EXTENSION Vcb, * * @return * STATUS_SUCCESS on success. -* STATUS_OBJECT_NAME_NOT_FOUND if we can't find the MFT's $Bitmap or if we weren't able +* STATUS_OBJECT_NAME_NOT_FOUND if we can't find the MFT's $Bitmap or if we weren't able * to read the attribute. * STATUS_INSUFFICIENT_RESOURCES if we can't allocate enough memory for a copy of $Bitmap. * STATUS_CANT_WAIT if CanWait was FALSE and the function could not get immediate, exclusive access to the MFT. @@ -2368,7 +2368,7 @@ NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, AttributeLength = MinIndexRootSize.LowPart; AttributeLength += sizeof(INDEX_ROOT_ATTRIBUTE); - + // FIXME: IndexRoot will probably be invalid until we're finished. If we fail before we finish, the directory will probably be toast. // The potential for catastrophic data-loss exists!!! :) @@ -2432,7 +2432,7 @@ NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, } // The index allocation and index bitmap may have grown, leaving less room for the index root, - // so now we need to double-check that index root isn't too large + // so now we need to double-check that index root isn't too large NodeSize = GetSizeOfIndexEntries(NewTree->RootNode); if (NodeSize > NewMaxIndexRootSize) { @@ -2488,7 +2488,7 @@ NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, NewMaxIndexRootSize -= LengthOfAttributes; } - + } // Create the Index Root from the B*Tree @@ -2512,7 +2512,7 @@ NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, // CreateIndexRootFromBTree() should have verified that the index root fits within MaxIndexSize. // We can't set the size as we normally would, because $INDEX_ROOT must always be resident. AttributeLength = NewIndexRoot->Header.AllocatedSize + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header); - + if (AttributeLength != IndexRootContext->pRecord->Resident.ValueLength) { // Update the length of the attribute in the file record of the parent directory @@ -2656,7 +2656,7 @@ CompareFileName(PUNICODE_STRING FileName, UNICODE_STRING EntryName; EntryName.Buffer = IndexEntry->FileName.Name; - EntryName.Length = + EntryName.Length = EntryName.MaximumLength = IndexEntry->FileName.NameLength * sizeof(WCHAR); if (DirSearch) @@ -2704,7 +2704,7 @@ CompareFileName(PUNICODE_STRING FileName, * * @remarks * NTFS maintains up-to-date copies of the first several mft entries in the $MFTMirr file. Usually, the first 4 file -* records from the mft are stored. The exact number of entries is determined by the size of $MFTMirr's $DATA. +* records from the mft are stored. The exact number of entries is determined by the size of $MFTMirr's $DATA. * If $MFTMirr is not up-to-date, chkdsk will reject every change it can find prior to when $MFTMirr was last updated. * Therefore, it's recommended to call this function if the volume changes considerably. For instance, IncreaseMftSize() * relies on this function to keep chkdsk from deleting the mft entries it creates. Note that under most instances, creating @@ -3033,7 +3033,7 @@ BrowseIndexEntries(PDEVICE_EXTENSION Vcb, // Get the length of the bitmap attribute BitmapLength = AttributeDataLength(BitmapContext->pRecord); - // Allocate memory for the bitmap, including some padding; RtlInitializeBitmap() wants a pointer + // Allocate memory for the bitmap, including some padding; RtlInitializeBitmap() wants a pointer // that's ULONG-aligned, and it wants the size of the memory allocated for it to be a ULONG-multiple. BitmapMem = ExAllocatePoolWithTag(NonPagedPool, BitmapLength + sizeof(ULONG), TAG_NTFS); if (!BitmapMem) @@ -3068,7 +3068,7 @@ BrowseIndexEntries(PDEVICE_EXTENSION Vcb, // Couldn't find an index allocation IndexAllocationContext = NULL; } - + // Loop through all Index Entries of index, starting with FirstEntry IndexEntry = FirstEntry; diff --git a/drivers/filesystems/ntfs/misc.c b/drivers/filesystems/ntfs/misc.c index 76b77134c9d..777426f980e 100644 --- a/drivers/filesystems/ntfs/misc.c +++ b/drivers/filesystems/ntfs/misc.c @@ -58,7 +58,7 @@ NtfsIsIrpTopLevel(PIRP Irp) /* * FUNCTION: Allocate and fill an NTFS_IRP_CONTEXT struct in order to use it for IRP * ARGUMENTS: - * DeviceObject = Used to fill in struct + * DeviceObject = Used to fill in struct * Irp = The IRP that need IRP_CONTEXT struct * RETURNS: NULL or PNTFS_IRP_CONTEXT */ @@ -147,10 +147,10 @@ NtfsGetUserBuffer(PIRP Irp, * IoReadAccess, IoWriteAccess, or IoModifyAccess. * * @return -* STATUS_SUCCESS in case of success, STATUS_INSUFFICIENT_RESOURCES +* STATUS_SUCCESS in case of success, STATUS_INSUFFICIENT_RESOURCES * or an exception code otherwise. * -* @remarks Trevor Thompson shamelessly ripped this from +* @remarks Trevor Thompson shamelessly ripped this from * VfatLockUserBuffer(). Only the name was changed. * */ diff --git a/drivers/filesystems/ntfs/ntfs.h b/drivers/filesystems/ntfs/ntfs.h index 046037edfbc..7707d52c2b8 100644 --- a/drivers/filesystems/ntfs/ntfs.h +++ b/drivers/filesystems/ntfs/ntfs.h @@ -179,7 +179,7 @@ typedef enum // FILE_RECORD_END seems to follow AttributeEnd in every file record starting with $Quota. // No clue what data is being represented here. -#define FILE_RECORD_END 0x11477982 +#define FILE_RECORD_END 0x11477982 #define NTFS_FILE_MFT 0 #define NTFS_FILE_MFTMIRR 1 @@ -975,7 +975,7 @@ NtfsGetFCBForFile(PNTFS_VCB Vcb, NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb, PNTFS_FCB pFCB, - ULONG Type, + ULONG Type, PCWSTR Name, ULONG NameLength, PVOID * Data); @@ -1157,7 +1157,7 @@ ReadVCN(PDEVICE_EXTENSION Vcb, ULONG count, PVOID buffer); -NTSTATUS +NTSTATUS FixupUpdateSequenceArray(PDEVICE_EXTENSION Vcb, PNTFS_RECORD_HEADER Record); diff --git a/drivers/filesystems/ntfs/rw.c b/drivers/filesystems/ntfs/rw.c index 1d18b0648c6..a060adbb411 100644 --- a/drivers/filesystems/ntfs/rw.c +++ b/drivers/filesystems/ntfs/rw.c @@ -261,7 +261,7 @@ NtfsRead(PNTFS_IRP_CONTEXT IrpContext) * @implemented * * Writes a file to the disk. It presently borrows a lot of code from NtfsReadFile() and -* VFatWriteFileData(). It needs some more work before it will be complete; it won't handle +* VFatWriteFileData(). It needs some more work before it will be complete; it won't handle * page files, asnyc io, cached writes, etc. * * @param DeviceExt diff --git a/drivers/filesystems/ntfs/volinfo.c b/drivers/filesystems/ntfs/volinfo.c index 3e6123f8205..0fd9186612d 100644 --- a/drivers/filesystems/ntfs/volinfo.c +++ b/drivers/filesystems/ntfs/volinfo.c @@ -97,15 +97,15 @@ NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt) return FreeClusters; } -/** -* NtfsAllocateClusters +/** +* NtfsAllocateClusters * Allocates a run of clusters. The run allocated might be smaller than DesiredClusters. */ NTSTATUS NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt, ULONG FirstDesiredCluster, - ULONG DesiredClusters, - PULONG FirstAssignedCluster, + ULONG DesiredClusters, + PULONG FirstAssignedCluster, PULONG AssignedClusters) { NTSTATUS Status; @@ -168,7 +168,7 @@ NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt, ExFreeToNPagedLookasideList(&DeviceExt->FileRecLookasideList, BitmapRecord); return STATUS_DISK_FULL; } - + // TODO: Observe MFT reservation zone // Can we get one contiguous run? @@ -183,17 +183,17 @@ NtfsAllocateClusters(PDEVICE_EXTENSION DeviceExt, { // we can't get one contiguous run *AssignedClusters = RtlFindNextForwardRunClear(&Bitmap, FirstDesiredCluster, FirstAssignedCluster); - + if (*AssignedClusters == 0) { // we couldn't find any runs starting at DesiredFirstCluster *AssignedClusters = RtlFindLongestRunClear(&Bitmap, FirstAssignedCluster); } - + } - + Status = WriteAttribute(DeviceExt, DataContext, 0, BitmapData, (ULONG)BitmapDataSize, &LengthWritten, BitmapRecord); - + ReleaseAttributeContext(DataContext); ExFreePoolWithTag(BitmapData, TAG_NTFS); diff --git a/drivers/filesystems/reiserfs/inc/linux/bitops.h b/drivers/filesystems/reiserfs/inc/linux/bitops.h index 6a930d3e70f..ce6f73ad7e0 100644 --- a/drivers/filesystems/reiserfs/inc/linux/bitops.h +++ b/drivers/filesystems/reiserfs/inc/linux/bitops.h @@ -262,7 +262,7 @@ static inline int fls64(__u64 x) static __inline int get_bitmask_order(unsigned int count) { int order; - + order = fls(count); return order; /* We could be slightly more clever with -1 here... */ } @@ -270,7 +270,7 @@ static __inline int get_bitmask_order(unsigned int count) static __inline int get_count_order(unsigned int count) { int order; - + order = fls(count) - 1; if (count & (count - 1)) order++; diff --git a/drivers/filesystems/reiserfs/inc/linux/module.h b/drivers/filesystems/reiserfs/inc/linux/module.h index 95d490763fb..3458af73a50 100644 --- a/drivers/filesystems/reiserfs/inc/linux/module.h +++ b/drivers/filesystems/reiserfs/inc/linux/module.h @@ -4,8 +4,8 @@ * FILE: module.h * PURPOSE: Header file: nls structures & linux kernel ... * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ #ifndef _RFSD_MODULE_HEADER_ diff --git a/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h b/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h index 0c59d3eb32c..98a04720588 100644 --- a/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h +++ b/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h @@ -9,7 +9,7 @@ #define __PACKED __attribute__((packed)) #endif #else - #define __PACKED + #define __PACKED #endif /* this file has an amazingly stupid @@ -84,7 +84,7 @@ /* debug levels. Right now, CONFIG_REISERFS_CHECK means print all debug ** messages. */ -#define REISERFS_DEBUG_CODE 5 /* extra messages to help find/debug errors */ +#define REISERFS_DEBUG_CODE 5 /* extra messages to help find/debug errors */ void reiserfs_warning (struct super_block *s, const char * fmt, ...); /* assertions handling */ @@ -147,7 +147,7 @@ struct reiserfs_super_block_v1 * get_objectid() commentary */ __u16 s_oid_cursize; /* current size of object id array */ __u16 s_umount_state; /* this is set to 1 when filesystem was - * umounted, to 2 - when not */ + * umounted, to 2 - when not */ char s_magic[10]; /* reiserfs magic string indicates that * file system is reiserfs: * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */ @@ -162,7 +162,7 @@ struct reiserfs_super_block_v1 * with non-standard journal */ __u16 s_reserved_for_journal; /* size in blocks of journal area on main * device, we need to keep after - * making fs with non-standard journal */ + * making fs with non-standard journal */ } __PACKED; #ifndef __GCC__ #pragma pack(pop) @@ -228,7 +228,7 @@ struct reiserfs_super_block #define PUT_SB_TREE_HEIGHT(s, val) \ do { SB_V1_DISK_SUPER_BLOCK(s)->s_tree_height = cpu_to_le16(val); } while (0) #define PUT_SB_REISERFS_STATE(s, val) \ - do { SB_V1_DISK_SUPER_BLOCK(s)->s_umount_state = cpu_to_le16(val); } while (0) + do { SB_V1_DISK_SUPER_BLOCK(s)->s_umount_state = cpu_to_le16(val); } while (0) #define PUT_SB_VERSION(s, val) \ do { SB_V1_DISK_SUPER_BLOCK(s)->s_version = cpu_to_le16(val); } while (0) #define PUT_SB_BMAP_NR(s, val) \ @@ -249,7 +249,7 @@ struct reiserfs_super_block block >= SB_JOURNAL_1st_RESERVED_BLOCK(s) \ && block < SB_JOURNAL_1st_RESERVED_BLOCK(s) + \ ((!is_reiserfs_jr(SB_DISK_SUPER_BLOCK(s)) ? \ - SB_ONDISK_JOURNAL_SIZE(s) + 1 : SB_ONDISK_RESERVED_FOR_JOURNAL(s))) + SB_ONDISK_JOURNAL_SIZE(s) + 1 : SB_ONDISK_RESERVED_FOR_JOURNAL(s))) @@ -350,7 +350,7 @@ struct unfm_nodeinfo { file would fit into one DIRECT item. Primary intention for this one is to increase performance by decreasing seeking. -*/ +*/ #define STORE_TAIL_IN_UNFM_S2(n_file_size,n_tail_size,n_block_size) \ (\ (!(n_tail_size)) || \ @@ -371,8 +371,8 @@ struct unfm_nodeinfo { #define TYPE_STAT_DATA 0 #define TYPE_INDIRECT 1 #define TYPE_DIRECT 2 -#define TYPE_DIRENTRY 3 -#define TYPE_MAXTYPE 3 +#define TYPE_DIRENTRY 3 +#define TYPE_MAXTYPE 3 #define TYPE_ANY 15 // FIXME: comment is required /***************************************************************************/ @@ -432,7 +432,7 @@ typedef union { #pragma pack(pop) #endif - + #else # define offset_v2_k_type(v2) ((v2)->k_type) # define set_offset_v2_k_type(v2,val) (offset_v2_k_type(v2) = (val)) @@ -527,10 +527,10 @@ struct item_head item. Note that the key, not this field, is used to determine the item type, and thus which field this union contains. */ - __u16 ih_free_space_reserved; + __u16 ih_free_space_reserved; /* Iff this is a directory item, this field equals the number of directory entries in the directory item. */ - __u16 ih_entry_count; + __u16 ih_entry_count; } __PACKED u; __u16 ih_item_len; /* total size of the item body */ __u16 ih_item_location; /* an offset to the item body @@ -568,7 +568,7 @@ struct item_head /* these operate on indirect items, where you've got an array of ints ** at a possibly unaligned location. These are a noop on ia32 -** +** ** p is the array of __u32, i is the index into the array, v is the value ** to store there. */ @@ -651,7 +651,7 @@ static inline __u32 type2uniqueness (int type) ( ! COMP_SHORT_KEYS(p_s_ih, p_s_key) && \ I_OFF_BYTE_IN_ITEM(p_s_ih, k_offset (p_s_key), n_blocksize) ) -/* maximal length of item */ +/* maximal length of item */ #define MAX_ITEM_LEN(block_size) (block_size - BLKH_SIZE - IH_SIZE) #define MIN_ITEM_LEN 1 @@ -664,7 +664,7 @@ extern struct reiserfs_key root_key; -/* +/* * Picture represents a leaf of the S+tree * ______________________________________________________ * | | Array of | | | @@ -675,7 +675,7 @@ extern struct reiserfs_key root_key; /* Header of a disk block. More precisely, header of a formatted leaf or internal node, and not the header of an unformatted node. */ -struct block_head { +struct block_head { __u16 blk_level; /* Level of a block in the tree. */ __u16 blk_nr_item; /* Number of keys/items in a block. */ __u16 blk_free_space; /* Block free space in bytes. */ @@ -847,7 +847,7 @@ struct stat_data { union { __u32 sd_rdev; __u32 sd_generation; - //__u32 sd_first_direct_byte; + //__u32 sd_first_direct_byte; /* first byte of file which is stored in a direct item: except that if it equals 1 it is a symlink and if it equals @@ -900,7 +900,7 @@ struct stat_data { /***************************************************************************/ /* DIRECTORY STRUCTURE */ /***************************************************************************/ -/* +/* Picture represents the structure of directory items ________________________________________________ | Array of | | | | | | @@ -923,12 +923,12 @@ struct stat_data { #define FIRST_ITEM_OFFSET 1 /* - Q: How to get key of object pointed to by entry from entry? + Q: How to get key of object pointed to by entry from entry? A: Each directory entry has its header. This header has deh_dir_id and deh_objectid fields, those are key of object, entry points to */ -/* NOT IMPLEMENTED: +/* NOT IMPLEMENTED: Directory will someday contain stat data of object */ @@ -1029,7 +1029,7 @@ extern void make_empty_dir_item (char * body, __u32 dirid, __u32 objid, #define I_DEH_N_ENTRY_LENGTH(ih,deh,i) \ ((i) ? (deh_location((deh)-1) - deh_location((deh))) : (ih_item_len((ih)) - deh_location((deh)))) */ -static inline int entry_length (const struct buffer_head * bh, +static inline int entry_length (const struct buffer_head * bh, const struct item_head * ih, int pos_in_item) { struct reiserfs_de_head * deh; @@ -1075,7 +1075,7 @@ struct reiserfs_dir_entry struct cpu_key de_entry_key; }; - + /* these defines are useful when a particular member of a reiserfs_dir_entry is needed */ /* pointer to file name, stored in entry */ @@ -1130,7 +1130,7 @@ struct disk_child { #define B_N_CHILD_NUM(p_s_bh,n_pos) (dc_block_number(B_N_CHILD(p_s_bh,n_pos))) #define PUT_B_N_CHILD_NUM(p_s_bh,n_pos, val) (put_dc_block_number(B_N_CHILD(p_s_bh,n_pos), val )) - /* maximal value of field child_size in structure disk_child */ + /* maximal value of field child_size in structure disk_child */ /* child size is the combined size of all items and their headers */ #define MAX_CHILD_SIZE(bh) ((int)( (bh)->b_size - BLKH_SIZE )) @@ -1177,7 +1177,7 @@ struct path_element { invalid, and this means we must check it when using it to see if it is still valid. You'll need to read search_by_key and the comments in it, especially about decrement_counters_in_path(), to understand - this structure. + this structure. Paths make the code so much harder to work with and debug.... An enormous number of bugs are due to them, and trying to write or modify @@ -1227,7 +1227,7 @@ struct path var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,} where root has level == 0. That is why we need these defines */ #define PATH_H_PBUFFER(p_s_path, h) PATH_OFFSET_PBUFFER (p_s_path, p_s_path->path_length - (h)) /* tb->S[h] */ #define PATH_H_PPARENT(path, h) PATH_H_PBUFFER (path, (h) + 1) /* tb->F[h] or tb->S[0]->b_parent */ -#define PATH_H_POSITION(path, h) PATH_OFFSET_POSITION (path, path->path_length - (h)) +#define PATH_H_POSITION(path, h) PATH_OFFSET_POSITION (path, path->path_length - (h)) #define PATH_H_B_ITEM_ORDER(path, h) PATH_H_POSITION(path, h + 1) /* tb->S[h]->b_item_order */ #define PATH_H_PATH_OFFSET(p_s_path, n_h) ((p_s_path)->path_length - (n_h)) @@ -1328,7 +1328,7 @@ struct virtual_node unsigned short vn_nr_item; /* number of items in virtual node */ short vn_size; /* size of node , that node would have if it has unlimited size and no balancing is performed */ short vn_mode; /* mode of balancing (paste, insert, delete, cut) */ - short vn_affected_item_num; + short vn_affected_item_num; short vn_pos_in_item; struct item_head * vn_ins_ih; /* item header of inserted item, 0 for other modes */ const void * vn_data; @@ -1486,7 +1486,7 @@ struct buffer_info { +-------------------+------------+--------------+------------+ | stat data | 0 | 0 | no | +-------------------+------------+--------------+------------+ -| 1st directory item| DOT_OFFSET |DIRENTRY_UNIQUENESS| no | +| 1st directory item| DOT_OFFSET |DIRENTRY_UNIQUENESS| no | | non 1st directory | hash value | | yes | | item | | | | +-------------------+------------+--------------+------------+ @@ -1503,9 +1503,9 @@ struct item_operations { void (*print_item) (struct item_head *, char * item); void (*check_item) (struct item_head *, char * item); - int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi, + int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi, int is_affected, int insert_size); - int (*check_left) (struct virtual_item * vi, int free, + int (*check_left) (struct virtual_item * vi, int free, int start_skip, int end_skip); int (*check_right) (struct virtual_item * vi, int free); int (*part_size) (struct virtual_item * vi, int from, int to); @@ -1540,7 +1540,7 @@ extern struct item_operations * item_ops [TYPE_ANY + 1]; /* number of bytes contained by the direct item or the unformatted nodes the indirect item points to */ -/* get the item header */ +/* get the item header */ #define B_N_PITEM_HEAD(bh,item_num) ( (struct item_head * )((bh)->b_data + BLKH_SIZE) + (item_num) ) /* get key */ @@ -1634,7 +1634,7 @@ struct reiserfs_journal_header { #define JOURNAL_TRANS_MIN_DEFAULT 256 #define JOURNAL_MAX_BATCH_DEFAULT 900 /* max blocks to batch into one transaction, don't make this any bigger than 900 */ #define JOURNAL_MIN_RATIO 2 -#define JOURNAL_MAX_COMMIT_AGE 30 +#define JOURNAL_MAX_COMMIT_AGE 30 #define JOURNAL_MAX_TRANS_AGE 30 #define JOURNAL_PER_BALANCE_CNT (3 * (MAX_HEIGHT-2) + 9) #ifdef CONFIG_QUOTA @@ -1647,12 +1647,12 @@ struct reiserfs_journal_header { /* both of these can be as low as 1, or as high as you want. The min is the ** number of 4k bitmap nodes preallocated on mount. New nodes are allocated -** as needed, and released when transactions are committed. On release, if -** the current number of nodes is > max, the node is freed, otherwise, +** as needed, and released when transactions are committed. On release, if +** the current number of nodes is > max, the node is freed, otherwise, ** it is put on a free list for faster use later. */ -#define REISERFS_MIN_BITMAP_NODES 10 -#define REISERFS_MAX_BITMAP_NODES 100 +#define REISERFS_MIN_BITMAP_NODES 10 +#define REISERFS_MAX_BITMAP_NODES 100 #define JBH_HASH_SHIFT 13 /* these are based on journal hash size of 8192 */ #define JBH_HASH_MASK 8191 @@ -1802,13 +1802,13 @@ extern int comp_short_le_keys (const struct reiserfs_key *, const struct reiserf static inline int le_key_version (const struct reiserfs_key * key) { int type; - + type = offset_v2_k_type( &(key->u.k_offset_v2)); if (type != TYPE_DIRECT && type != TYPE_INDIRECT && type != TYPE_DIRENTRY) return KEY_FORMAT_3_5; return KEY_FORMAT_3_6; - + } @@ -1821,11 +1821,11 @@ static inline void copy_key (struct reiserfs_key *to, const struct reiserfs_key int comp_items (const struct item_head * stored_ih, const struct path * p_s_path); const struct reiserfs_key * get_rkey (const struct path * p_s_chk_path, const struct super_block * p_s_sb); -int search_by_key (struct super_block *, const struct cpu_key *, +int search_by_key (struct super_block *, const struct cpu_key *, struct path *, int); #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL) -int search_for_position_by_key (struct super_block * p_s_sb, - const struct cpu_key * p_s_cpu_key, +int search_for_position_by_key (struct super_block * p_s_sb, + const struct cpu_key * p_s_cpu_key, struct path * p_s_search_path); extern void decrement_bcount (struct buffer_head * p_s_bh); void decrement_counters_in_path (struct path * p_s_search_path); @@ -1833,8 +1833,8 @@ void pathrelse (struct path * p_s_search_path); int reiserfs_check_path(struct path *p) ; void pathrelse_and_restore (struct super_block *s, struct path * p_s_search_path); -int reiserfs_insert_item (struct reiserfs_transaction_handle *th, - struct path * path, +int reiserfs_insert_item (struct reiserfs_transaction_handle *th, + struct path * path, const struct cpu_key * key, struct item_head * ih, struct inode *inode, const char * body); @@ -1853,16 +1853,16 @@ int reiserfs_cut_from_item (struct reiserfs_transaction_handle *th, loff_t new_file_size); int reiserfs_delete_item (struct reiserfs_transaction_handle *th, - struct path * path, + struct path * path, const struct cpu_key * key, - struct inode * inode, + struct inode * inode, struct buffer_head * p_s_un_bh); void reiserfs_delete_solid_item (struct reiserfs_transaction_handle *th, struct inode *inode, struct reiserfs_key * key); int reiserfs_delete_object (struct reiserfs_transaction_handle *th, struct inode * p_s_inode); int reiserfs_do_truncate (struct reiserfs_transaction_handle *th, - struct inode * p_s_inode, struct page *, + struct inode * p_s_inode, struct page *, int update_timestamps); #define i_block_size(inode) ((inode)->i_sb->s_blocksize) @@ -1895,21 +1895,21 @@ struct dentry *reiserfs_decode_fh(struct super_block *sb, __u32 *data, int len, int fhtype, int (*acceptable)(void *contect, struct dentry *de), void *context) ; -int reiserfs_encode_fh( struct dentry *dentry, __u32 *data, int *lenp, +int reiserfs_encode_fh( struct dentry *dentry, __u32 *data, int *lenp, int connectable ); int reiserfs_truncate_file(struct inode *, int update_timestamps) ; void make_cpu_key (struct cpu_key * cpu_key, struct inode * inode, loff_t offset, int type, int key_length); -void make_le_item_head (struct item_head * ih, const struct cpu_key * key, +void make_le_item_head (struct item_head * ih, const struct cpu_key * key, int version, loff_t offset, int type, int length, int entry_count); -struct inode * reiserfs_iget (struct super_block * s, +struct inode * reiserfs_iget (struct super_block * s, const struct cpu_key * key); -int reiserfs_new_inode (struct reiserfs_transaction_handle *th, - struct inode * dir, int mode, +int reiserfs_new_inode (struct reiserfs_transaction_handle *th, + struct inode * dir, int mode, const char * symname, loff_t i_size, struct dentry *dentry, struct inode *inode); @@ -1928,8 +1928,8 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr); /* namei.c */ void set_de_name_and_namelen (struct reiserfs_dir_entry * de); -int search_by_entry_key (struct super_block * sb, const struct cpu_key * key, - struct path * path, +int search_by_entry_key (struct super_block * sb, const struct cpu_key * key, + struct path * path, struct reiserfs_dir_entry * de); struct dentry *reiserfs_get_parent(struct dentry *) ; /* procfs.c */ @@ -1942,7 +1942,7 @@ struct dentry *reiserfs_get_parent(struct dentry *) ; int reiserfs_proc_info_init( struct super_block *sb ); int reiserfs_proc_info_done( struct super_block *sb ); -struct proc_dir_entry *reiserfs_proc_register_global( char *name, +struct proc_dir_entry *reiserfs_proc_register_global( char *name, read_proc_t *func ); void reiserfs_proc_unregister_global( const char *name ); int reiserfs_proc_info_global_init( void ); @@ -2008,7 +2008,7 @@ static inline void reiserfs_kfree(const void *vp, size_t size, } #endif -int fix_nodes (int n_op_mode, struct tree_balance * p_s_tb, +int fix_nodes (int n_op_mode, struct tree_balance * p_s_tb, struct item_head * p_s_ins_ih, const void *); void unfix_nodes (struct tree_balance *); @@ -2041,16 +2041,16 @@ int leaf_move_items (int shift_mode, struct tree_balance * tb, int mov_num, int int leaf_shift_left (struct tree_balance * tb, int shift_num, int shift_bytes); int leaf_shift_right (struct tree_balance * tb, int shift_num, int shift_bytes); void leaf_delete_items (struct buffer_info * cur_bi, int last_first, int first, int del_num, int del_bytes); -void leaf_insert_into_buf (struct buffer_info * bi, int before, +void leaf_insert_into_buf (struct buffer_info * bi, int before, struct item_head * inserted_item_ih, const char * inserted_item_body, int zeros_number); -void leaf_paste_in_buffer (struct buffer_info * bi, int pasted_item_num, +void leaf_paste_in_buffer (struct buffer_info * bi, int pasted_item_num, int pos_in_item, int paste_size, const char * body, int zeros_number); -void leaf_cut_from_buffer (struct buffer_info * bi, int cut_item_num, int pos_in_item, +void leaf_cut_from_buffer (struct buffer_info * bi, int cut_item_num, int pos_in_item, int cut_size); -void leaf_paste_entries (struct buffer_head * bh, int item_num, int before, +void leaf_paste_entries (struct buffer_head * bh, int item_num, int before, int new_entry_count, struct reiserfs_de_head * new_dehs, const char * records, int paste_size); /* ibalance.c */ -int balance_internal (struct tree_balance * , int, int, struct item_head * , +int balance_internal (struct tree_balance * , int, int, struct item_head * , struct buffer_head **); /* do_balance.c */ @@ -2059,7 +2059,7 @@ void do_balance_mark_leaf_dirty (struct tree_balance * tb, #define do_balance_mark_internal_dirty do_balance_mark_leaf_dirty #define do_balance_mark_sb_dirty do_balance_mark_leaf_dirty -void do_balance (struct tree_balance * tb, struct item_head * ih, +void do_balance (struct tree_balance * tb, struct item_head * ih, const char * body, int flag); void reiserfs_invalidate_buffer (struct tree_balance * tb, struct buffer_head * bh); @@ -2155,7 +2155,7 @@ extern inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle return reiserfs_allocate_blocknrs(&hint, new_blocknrs, 1, 0); } -void reiserfs_discard_prealloc (struct reiserfs_transaction_handle *th, +void reiserfs_discard_prealloc (struct reiserfs_transaction_handle *th, struct inode * inode); void reiserfs_discard_all_prealloc (struct reiserfs_transaction_handle *th); #endif @@ -2188,9 +2188,9 @@ __u32 r5_hash (const signed char *msg, int len); /* prototypes from ioctl.c */ -int reiserfs_ioctl (struct inode * inode, struct file * filp, +int reiserfs_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, unsigned long arg); - + /* ioctl's command */ #define REISERFS_IOC_UNPACK _IOW(0xCD,1,long) /* define following flags to be the same as in ext2, so that chattr(1), @@ -2205,7 +2205,7 @@ int reiserfs_ioctl (struct inode * inode, struct file * filp, would evolve into real per-fs locks */ #define reiserfs_write_lock( sb ) lock_kernel() #define reiserfs_write_unlock( sb ) unlock_kernel() - + /* xattr stuff */ #define REISERFS_XATTR_DIR_SEM(s) (REISERFS_SB(s)->xattr_dir_sem) diff --git a/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs_sb.h b/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs_sb.h index 37a3a7afbec..0303177b88f 100644 --- a/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs_sb.h +++ b/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs_sb.h @@ -14,7 +14,7 @@ typedef enum { } reiserfs_super_block_flags; /* struct reiserfs_super_block accessors/mutators - * since this is a disk structure, it will always be in + * since this is a disk structure, it will always be in * little endian format. */ #define sb_block_count(sbp) (le32_to_cpu((sbp)->s_v1.s_block_count)) #define set_sb_block_count(sbp,v) ((sbp)->s_v1.s_block_count = cpu_to_le32(v)) @@ -61,7 +61,7 @@ typedef enum { #define sb_umount_state(sbp) (le16_to_cpu((sbp)->s_v1.s_umount_state)) #define set_sb_umount_state(sbp,v) ((sbp)->s_v1.s_umount_state = cpu_to_le16(v)) #define sb_fs_state(sbp) (le16_to_cpu((sbp)->s_v1.s_fs_state)) -#define set_sb_fs_state(sbp,v) ((sbp)->s_v1.s_fs_state = cpu_to_le16(v)) +#define set_sb_fs_state(sbp,v) ((sbp)->s_v1.s_fs_state = cpu_to_le16(v)) #define sb_hash_function_code(sbp) \ (le32_to_cpu((sbp)->s_v1.s_hash_function_code)) #define set_sb_hash_function_code(sbp,v) \ @@ -80,16 +80,16 @@ typedef enum { /* LOGGING -- */ -/* These all interelate for performance. +/* These all interelate for performance. ** -** If the journal block count is smaller than n transactions, you lose speed. +** If the journal block count is smaller than n transactions, you lose speed. ** I don't know what n is yet, I'm guessing 8-16. ** ** typical transaction size depends on the application, how often fsync is -** called, and how many metadata blocks you dirty in a 30 second period. +** called, and how many metadata blocks you dirty in a 30 second period. ** The more small files (<16k) you use, the larger your transactions will ** be. -** +** ** If your journal fills faster than dirty buffers get flushed to disk, it must flush them before allowing the journal ** to wrap, which slows things down. If you need high speed meta data updates, the journal should be big enough ** to prevent wrapping before dirty meta blocks get to disk. @@ -105,7 +105,7 @@ typedef enum { /* we have a node size define somewhere in reiserfs_fs.h. -Hans */ #define JOURNAL_BLOCK_SIZE 4096 /* BUG gotta get rid of this */ #define JOURNAL_MAX_CNODE 1500 /* max cnodes to allocate. */ -#define JOURNAL_HASH_SIZE 8192 +#define JOURNAL_HASH_SIZE 8192 #define JOURNAL_NUM_BITMAPS 5 /* number of copies of the bitmaps to have floating. Must be >= 2 */ /* One of these for every block in every transaction @@ -178,10 +178,10 @@ struct reiserfs_journal { struct reiserfs_journal_cnode *j_first ; /* oldest journal block. start here for traverse */ struct file *j_dev_file; - struct block_device *j_dev_bd; - int j_1st_reserved_block; /* first block on s_dev of reserved area journal */ - - long j_state ; + struct block_device *j_dev_bd; + int j_1st_reserved_block; /* first block on s_dev of reserved area journal */ + + long j_state ; unsigned long j_trans_id ; unsigned long j_mount_id ; unsigned long j_start ; /* start of current waiting commit (index into j_ap_blocks) */ @@ -191,7 +191,7 @@ struct reiserfs_journal { unsigned long j_bcount ; /* batch count. allows turning X transactions into 1 */ unsigned long j_first_unflushed_offset ; /* first unflushed transactions offset */ unsigned long j_last_flush_trans_id ; /* last fully flushed journal timestamp */ - struct buffer_head *j_header_bh ; + struct buffer_head *j_header_bh ; time_t j_trans_start_time ; /* time this transaction started */ struct semaphore j_lock; @@ -238,8 +238,8 @@ struct reiserfs_journal { struct list_head j_working_list; struct reiserfs_list_bitmap j_list_bitmap[JOURNAL_NUM_BITMAPS] ; /* array of bitmaps to record the deleted blocks */ - struct reiserfs_journal_cnode *j_hash_table[JOURNAL_HASH_SIZE] ; /* hash table for real buffer heads in current trans */ - struct reiserfs_journal_cnode *j_list_hash_table[JOURNAL_HASH_SIZE] ; /* hash table for all the real buffer heads in all + struct reiserfs_journal_cnode *j_hash_table[JOURNAL_HASH_SIZE] ; /* hash table for real buffer heads in current trans */ + struct reiserfs_journal_cnode *j_list_hash_table[JOURNAL_HASH_SIZE] ; /* hash table for all the real buffer heads in all the transactions */ struct list_head j_prealloc_list; /* list of inodes which have preallocated blocks */ int j_persistent_trans; @@ -357,7 +357,7 @@ struct reiserfs_sb_info struct reiserfs_bitmap_info * s_ap_bitmap; struct reiserfs_journal *s_journal ; /* pointer to journal information */ unsigned short s_mount_state; /* reiserfs state (valid, invalid) */ - + /* Comment? -Hans */ void (*end_io_handler)(struct buffer_head *, int); hashf_t s_hash_function; /* pointer to function which is used @@ -384,7 +384,7 @@ struct reiserfs_sb_info // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ - + /* session statistics */ int s_kmallocs; int s_disk_reads; @@ -431,7 +431,7 @@ enum reiserfs_mount_options { partition will be dealt with in a manner of 3.5.x */ -/* -o hash={tea, rupasov, r5, detect} is meant for properly mounting +/* -o hash={tea, rupasov, r5, detect} is meant for properly mounting ** reiserfs disks from 3.5.19 or earlier. 99% of the time, this option ** is not required. If the normal autodection code can't determine which ** hash to use (because both hases had the same value for a file) @@ -513,7 +513,7 @@ int reiserfs_resize(struct super_block *, unsigned long) ; #define SB_BUFFER_WITH_SB(s) (REISERFS_SB(s)->s_sbh) #define SB_JOURNAL(s) (REISERFS_SB(s)->s_journal) #define SB_JOURNAL_1st_RESERVED_BLOCK(s) (SB_JOURNAL(s)->j_1st_reserved_block) -#define SB_JOURNAL_LEN_FREE(s) (SB_JOURNAL(s)->j_journal_len_free) +#define SB_JOURNAL_LEN_FREE(s) (SB_JOURNAL(s)->j_journal_len_free) #define SB_AP_BITMAP(s) (REISERFS_SB(s)->s_ap_bitmap) #define SB_DISK_JOURNAL_HEAD(s) (SB_JOURNAL(s)->j_header_bh->) diff --git a/drivers/filesystems/reiserfs/inc/linux/types.h b/drivers/filesystems/reiserfs/inc/linux/types.h index 73e19e274a6..1ff6008b3d8 100644 --- a/drivers/filesystems/reiserfs/inc/linux/types.h +++ b/drivers/filesystems/reiserfs/inc/linux/types.h @@ -57,7 +57,7 @@ typedef __u32 blk_t; #define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ #define EXT2_NOCOMP_FL 0x00000400 /* Don't compress */ #define EXT2_ECOMPR_FL 0x00000800 /* Compression error */ -/* End compression flags --- maybe not all used */ +/* End compression flags --- maybe not all used */ #define EXT2_BTREE_FL 0x00001000 /* btree format dir */ #define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ diff --git a/drivers/filesystems/reiserfs/inc/reiserfs.h b/drivers/filesystems/reiserfs/inc/reiserfs.h index 85a1a782292..a37d519e0e2 100644 --- a/drivers/filesystems/reiserfs/inc/reiserfs.h +++ b/drivers/filesystems/reiserfs/inc/reiserfs.h @@ -10,7 +10,7 @@ #define __PACKED __attribute__((packed)) #endif #else - #define __PACKED + #define __PACKED #endif /***************************************************************************/ @@ -38,7 +38,7 @@ struct journal_params { // Original journal size. (Needed when using partition on systems w/ different default journal sizes). __u32 jp_journal_size; /* size of the journal */ - + __u32 jp_journal_trans_max; /* max number of blocks in a transaction. */ __u32 jp_journal_magic; /* random value made on fs creation (this was sb_journal_block_count) */ __u32 jp_journal_max_batch; /* max number of blocks to batch into a trans */ @@ -70,11 +70,11 @@ struct reiserfs_super_block_v1 __u16 s_oid_maxsize; /* max size of object id array, see get_objectid() commentary */ __u16 s_oid_cursize; /* current size of object id array */ - __u16 s_umount_state; /* this is set to 1 when filesystem was umounted, to 2 - when not */ + __u16 s_umount_state; /* this is set to 1 when filesystem was umounted, to 2 - when not */ char s_magic[10]; /* reiserfs magic string indicates that * file system is reiserfs: * "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */ - + // State of the partition: valid(1), error (2) __u16 s_fs_state; /* it is set to used by fsck to mark which phase of rebuilding is done */ @@ -83,13 +83,13 @@ struct reiserfs_super_block_v1 __u16 s_tree_height; /* height of disk tree */ __u16 s_bmap_nr; /* amount of bitmap blocks needed to address * each block of file system */ - + // The reiserfs version number __u16 s_version; /* this field is only reliable on filesystem * with non-standard journal */ __u16 s_reserved_for_journal; /* size in blocks of journal area on main * device, we need to keep after - * making fs with non-standard journal */ + * making fs with non-standard journal */ } __PACKED; #ifndef __GCC__ #pragma pack(pop) @@ -106,7 +106,7 @@ struct reiserfs_super_block_v1 struct reiserfs_super_block { struct reiserfs_super_block_v1 s_v1; - + // Number of the current inode generation (a counter that is increased every time the tree gets re-balanced). __u32 s_inode_generation; @@ -239,7 +239,7 @@ struct stat_data { union { __u32 sd_rdev; __u32 i_generation; - //__u32 sd_first_direct_byte; + //__u32 sd_first_direct_byte; /* first byte of file which is stored in a direct item: except that if it equals 1 it is a symlink and if it equals @@ -282,7 +282,7 @@ struct stat_data { #define RFSD_KEY_TYPE_v2_STAT_DATA 0 #define RFSD_KEY_TYPE_v2_INDIRECT 1 #define RFSD_KEY_TYPE_v2_DIRECT 2 -#define RFSD_KEY_TYPE_v2_DIRENTRY 3 +#define RFSD_KEY_TYPE_v2_DIRENTRY 3 @@ -383,10 +383,10 @@ struct item_head item. Note that the key, not this field, is used to determine the item type, and thus which field this union contains. */ - __u16 ih_free_space_reserved; + __u16 ih_free_space_reserved; /* Iff this is a directory item, this field equals the number of directory entries in the directory item. */ - __u16 ih_entry_count; + __u16 ih_entry_count; } u; __u16 ih_item_len; /* total size of the item body */ __u16 ih_item_location; /* an offset to the item body within the block */ @@ -409,7 +409,7 @@ struct item_head /// ... -/* +/* * Picture represents a leaf of the S+tree * ______________________________________________________ * | | Array of | | | @@ -425,7 +425,7 @@ struct item_head #pragma pack(push, 1) #endif -struct block_head { +struct block_head { __u16 blk_level; /* Level of a block in the tree. */ __u16 blk_nr_item; /* Number of keys/items in a block. */ __u16 blk_free_space; /* Block free space in bytes. */ @@ -447,7 +447,7 @@ struct block_head { /***************************************************************************/ /* DIRECTORY STRUCTURE */ /***************************************************************************/ -/* +/* Picture represents the structure of directory items ________________________________________________ | Array of | | | | | | @@ -464,12 +464,12 @@ struct block_head { // ... /* - Q: How to get key of object pointed to by entry from entry? + Q: How to get key of object pointed to by entry from entry? A: Each directory entry has its header. This header has deh_dir_id and deh_objectid fields, those are key of object, entry points to */ -/* NOT IMPLEMENTED: +/* NOT IMPLEMENTED: Directory will someday contain stat data of object */ diff --git a/drivers/filesystems/reiserfs/inc/rfsd.h b/drivers/filesystems/reiserfs/inc/rfsd.h index 5d8b200d018..968c9b986b7 100644 --- a/drivers/filesystems/reiserfs/inc/rfsd.h +++ b/drivers/filesystems/reiserfs/inc/rfsd.h @@ -4,8 +4,8 @@ * FILE: rfsd.h * PURPOSE: Header file: rfsd structures. * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ #ifndef _RFSD_HEADER_ @@ -39,8 +39,8 @@ typedef struct block_head RFSD_BLOCK_HEAD, *PRFSD_BLOCK_HEAD; // [mark] typedef struct reiserfs_de_head RFSD_DENTRY_HEAD, *PRFSD_DENTRY_HEAD; // [mark] typedef struct item_head RFSD_ITEM_HEAD, *PRFSD_ITEM_HEAD; // [mark] typedef struct reiserfs_key RFSD_KEY_ON_DISK, *PRFSD_KEY_ON_DISK; -typedef struct reiserfs_cpu_key RFSD_KEY_IN_MEMORY, *PRFSD_KEY_IN_MEMORY; -typedef struct disk_child RFSD_DISK_NODE_REF, *PRFSD_DISK_NODE_REF; +typedef struct reiserfs_cpu_key RFSD_KEY_IN_MEMORY, *PRFSD_KEY_IN_MEMORY; +typedef struct disk_child RFSD_DISK_NODE_REF, *PRFSD_DISK_NODE_REF; #define RFSD_NAME_LEN 255 /// Default length of buffers for filenames (although filenames may be longer) @@ -380,10 +380,10 @@ typedef struct _RFSD_REPINNED_BCBS { // typedef struct _RFSD_GLOBAL { - + // Identifier for this structure RFSD_IDENTIFIER Identifier; - + // Syncronization primitive for this structure ERESOURCE Resource; @@ -392,20 +392,20 @@ typedef struct _RFSD_GLOBAL { // Syncronization primitive for LookAside Lists ERESOURCE LAResource; - + // Table of pointers to the fast I/O entry points FAST_IO_DISPATCH FastIoDispatch; - + // Table of pointers to the Cache Manager callbacks CACHE_MANAGER_CALLBACKS CacheManagerCallbacks; CACHE_MANAGER_CALLBACKS CacheManagerNoOpCallbacks; - + // Pointer to the driver object PDRIVER_OBJECT DriverObject; - + // Pointer to the main device object PDEVICE_OBJECT DeviceObject; - + // List of mounted volumes LIST_ENTRY VcbList; @@ -426,7 +426,7 @@ typedef struct _RFSD_GLOBAL { // IRP_MJ_CLOSE : FCB USHORT IRPCloseCount; #endif - + // Global flags for the driver ULONG Flags; @@ -436,7 +436,7 @@ typedef struct _RFSD_GLOBAL { UCHAR AnsiName[CODEPAGE_MAXLEN]; struct nls_table * PageTable; } CodePage; - + } RFSD_GLOBAL, *PRFSD_GLOBAL; #define PAGE_TABLE RfsdGlobal->CodePage.PageTable @@ -458,14 +458,14 @@ typedef struct { typedef struct _RFSD_FCBVCB { - + // FCB header required by NT FSRTL_COMMON_FCB_HEADER CommonFCBHeader; SECTION_OBJECT_POINTERS SectionObject; ERESOURCE MainResource; ERESOURCE PagingIoResource; // end FCB header required by NT - + // Identifier for this structure RFSD_IDENTIFIER Identifier; } RFSD_FCBVCB, *PRFSD_FCBVCB; @@ -477,7 +477,7 @@ typedef struct _RFSD_FCBVCB { // It is allocated as the device extension of the volume device object // typedef struct _RFSD_VCB { - + // FCB header required by NT // The VCB is also used as an FCB for file objects // that represents the volume itself @@ -486,19 +486,19 @@ typedef struct _RFSD_VCB { ERESOURCE MainResource; ERESOURCE PagingIoResource; // end FCB header required by NT - + // Identifier for this structure RFSD_IDENTIFIER Identifier; - + LIST_ENTRY Next; - + // Share Access for the file object SHARE_ACCESS ShareAccess; // Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLEANUP // for files on this volume. ULONG OpenFileHandleCount; - + // Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLOSE // for both files on this volume and open instances of the // volume itself. @@ -510,7 +510,7 @@ typedef struct _RFSD_VCB { // ULONG ChangeCount; - + // Pointer to the VPB in the target device object PVPB Vpb; @@ -525,20 +525,20 @@ typedef struct _RFSD_VCB { // Pointer to syncronization primitive for this list PNOTIFY_SYNC NotifySync; - + // This volumes device object PDEVICE_OBJECT DeviceObject; - + // The physical device object (the disk) PDEVICE_OBJECT TargetDeviceObject; // The physical device object (the disk) PDEVICE_OBJECT RealDevice; - + // Information about the physical device object DISK_GEOMETRY DiskGeometry; PARTITION_INFORMATION PartitionInformation; - + PRFSD_SUPER_BLOCK SuperBlock; PVOID GroupDesc; // (NOTE: unused in ReiserFS, but preserved in order to minimize changes to existing code) // PVOID GroupDescBcb; @@ -555,7 +555,7 @@ typedef struct _RFSD_VCB { // Sector size in bits (NOTE: unused in ReiserFS) //ULONG SectorBits; - + ULONG dwData[RFSD_BLOCK_TYPES]; ULONG dwMeta[RFSD_BLOCK_TYPES]; @@ -574,7 +574,7 @@ typedef struct _RFSD_VCB { // Entry of Mcb Tree (Root Node) PRFSD_MCB McbTree; LIST_ENTRY McbList; - + } RFSD_VCB, *PRFSD_VCB; // @@ -601,20 +601,20 @@ typedef struct _RFSD_VCB { // There is a single instance of the FCB for every open file // typedef struct _RFSD_FCB { - + // FCB header required by NT FSRTL_COMMON_FCB_HEADER Header; SECTION_OBJECT_POINTERS SectionObject; ERESOURCE MainResource; ERESOURCE PagingIoResource; // end FCB header required by NT - + // Identifier for this structure RFSD_IDENTIFIER Identifier; - + // List of FCBs for this volume LIST_ENTRY Next; - + // Share Access for the file object SHARE_ACCESS ShareAccess; @@ -623,7 +623,7 @@ typedef struct _RFSD_FCB { // Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLEANUP ULONG OpenHandleCount; - + // Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLOSE ULONG ReferenceCount; @@ -633,13 +633,13 @@ typedef struct _RFSD_FCB { // Flags for the FCB ULONG Flags; - + // Pointer to the inode / stat data structure PRFSD_INODE Inode; // Hint block for next allocation ULONG BlkHint; - + // Vcb PRFSD_VCB Vcb; @@ -652,7 +652,7 @@ typedef struct _RFSD_FCB { #if DBG // The Ansi Filename for debugging - OEM_STRING AnsiFileName; + OEM_STRING AnsiFileName; #endif @@ -722,18 +722,18 @@ struct _RFSD_MCB { // There is one instance of the CCB for every instance of an open file // typedef struct _RFSD_CCB { - + // Identifier for this structure RFSD_IDENTIFIER Identifier; // Flags ULONG Flags; - + // State that may need to be maintained ULONG CurrentByteOffset; USHORT deh_location; UNICODE_STRING DirectorySearchPattern; - + } RFSD_CCB, *PRFSD_CCB; // @@ -750,20 +750,20 @@ typedef struct _RFSD_CCB { // Used to pass information about a request between the drivers functions // typedef struct _RFSD_IRP_CONTEXT { - + // Identifier for this structure RFSD_IDENTIFIER Identifier; - + // Pointer to the IRP this request describes PIRP Irp; // Flags ULONG Flags; - + // The major and minor function code for the request UCHAR MajorFunction; UCHAR MinorFunction; - + // The device object PDEVICE_OBJECT DeviceObject; @@ -775,25 +775,25 @@ typedef struct _RFSD_IRP_CONTEXT { PRFSD_FCB Fcb; PRFSD_CCB Ccb; - + // If the request is synchronous (we are allowed to block) BOOLEAN IsSynchronous; - + // If the request is top level BOOLEAN IsTopLevel; - + // Used if the request needs to be queued for later processing WORK_QUEUE_ITEM WorkQueueItem; - + // If an exception is currently in progress BOOLEAN ExceptionInProgress; - + // The exception code when an exception is in progress NTSTATUS ExceptionCode; // Repinned BCBs List RFSD_REPINNED_BCBS Repinned; - + } RFSD_IRP_CONTEXT, *PRFSD_IRP_CONTEXT; @@ -876,7 +876,7 @@ RfsdLoadItem( IN PRFSD_VCB Vcb, IN PRFSD_KEY_IN_MEMORY pItemKey, // The key of the item to find OUT PRFSD_ITEM_HEAD* ppMatchingItemHeader, - OUT PUCHAR* ppItemBuffer, + OUT PUCHAR* ppItemBuffer, OUT PUCHAR* ppBlockBuffer, // Block buffer, which backs the other output data structures. The caller must free this (even in the case of an error)! OUT PULONG pBlockNumber, // The ordinal disk block number at which the item was found IN RFSD_KEY_COMPARISON (*fpComparisonFunction)(PRFSD_KEY_IN_MEMORY, PRFSD_KEY_IN_MEMORY) @@ -924,7 +924,7 @@ RfsdReadDisk( IN PVOID Buffer, IN BOOLEAN bVerify ); -NTSTATUS +NTSTATUS RfsdDiskIoControl ( IN PDEVICE_OBJECT DeviceOjbect, IN ULONG IoctlCode, @@ -1023,7 +1023,7 @@ RfsdCreateFile( NTSTATUS RfsdCreateVolume( - IN PRFSD_IRP_CONTEXT IrpContext, + IN PRFSD_IRP_CONTEXT IrpContext, IN PRFSD_VCB Vcb ); NTSTATUS @@ -1096,7 +1096,7 @@ extern ULONG ProcessNameOffset; (PUCHAR) PsGetCurrentProcess() + ProcessNameOffset \ ) -ULONG +ULONG RfsdGetProcessNameOffset (VOID); VOID @@ -1327,7 +1327,7 @@ RfsdBlockMap( ); NTSTATUS -RfsdBuildBDL2( +RfsdBuildBDL2( IN PRFSD_VCB Vcb, IN PRFSD_KEY_IN_MEMORY pKey, IN PRFSD_INODE pInode, @@ -1335,13 +1335,13 @@ RfsdBuildBDL2( OUT PRFSD_BDL* out_ppBdl ); NTSTATUS -RfsdBuildBDL( +RfsdBuildBDL( IN PRFSD_IRP_CONTEXT IrpContext, IN PRFSD_VCB Vcb, IN PRFSD_KEY_IN_MEMORY InodeNo, IN PRFSD_INODE Inode, - IN ULONGLONG Offset, - IN ULONG Size, + IN ULONGLONG Offset, + IN ULONG Size, IN BOOLEAN bAlloc, OUT PRFSD_BDL * Bdls, OUT PULONG Count @@ -1352,7 +1352,7 @@ RfsdNewBlock( PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb, ULONG GroupHint, - ULONG BlockHint, + ULONG BlockHint, PULONG dwRet ); NTSTATUS @@ -1467,8 +1467,8 @@ ConvertKeyTypeUniqueness(__u32 k_uniqueness); void FillInMemoryKey( - IN PRFSD_KEY_ON_DISK pKeyOnDisk, - IN RFSD_KEY_VERSION KeyVersion, + IN PRFSD_KEY_ON_DISK pKeyOnDisk, + IN RFSD_KEY_VERSION KeyVersion, IN OUT PRFSD_KEY_IN_MEMORY pKeyInMemory ); RFSD_KEY_VERSION DetermineOnDiskKeyFormat(const PRFSD_KEY_ON_DISK key); @@ -1491,15 +1491,15 @@ CompareKeys( NTSTATUS NavigateToLeafNode( IN PRFSD_VCB Vcb, - IN PRFSD_KEY_IN_MEMORY Key, - IN ULONG StartingBlockNumber, + IN PRFSD_KEY_IN_MEMORY Key, + IN ULONG StartingBlockNumber, OUT PULONG out_NextBlockNumber ); NTSTATUS RfsdParseFilesystemTree( IN PRFSD_VCB Vcb, IN PRFSD_KEY_IN_MEMORY Key, // Key to search for. - IN ULONG StartingBlockNumber, // Block number of an internal or leaf node, to start the search from + IN ULONG StartingBlockNumber, // Block number of an internal or leaf node, to start the search from IN RFSD_CALLBACK(fpDirectoryCallback), // A function ptr to trigger on hitting a matching leaf block IN PVOID Context ); @@ -1508,13 +1508,13 @@ RfsdParseFilesystemTree( NTSTATUS _NavigateToLeafNode( IN PRFSD_VCB Vcb, - IN PRFSD_KEY_IN_MEMORY Key, - IN ULONG StartingBlockNumber, + IN PRFSD_KEY_IN_MEMORY Key, + IN ULONG StartingBlockNumber, OUT PULONG out_NextBlockNumber, IN BOOLEAN ReturnOnFirstMatch, IN RFSD_KEY_COMPARISON (*fpComparisonFunction)(PRFSD_KEY_IN_MEMORY, PRFSD_KEY_IN_MEMORY), RFSD_CALLBACK(fpDirectoryCallback), - IN PVOID pContext + IN PVOID pContext ); @@ -1869,7 +1869,7 @@ RfsdSearchMcb( PRFSD_VCB Vcb, PRFSD_MCB Parent, PUNICODE_STRING FileName); BOOLEAN -RfsdGetFullFileName( PRFSD_MCB Mcb, +RfsdGetFullFileName( PRFSD_MCB Mcb, PUNICODE_STRING FileName); VOID @@ -1882,7 +1882,7 @@ RfsdAddMcbNode( PRFSD_VCB Vcb, BOOLEAN RfsdDeleteMcbNode( - PRFSD_VCB Vcb, + PRFSD_VCB Vcb, PRFSD_MCB McbTree, PRFSD_MCB RfsdMcb); @@ -1905,8 +1905,8 @@ RfsdRemoveVcb(PRFSD_VCB Vcb); NTSTATUS RfsdInitializeVcb( - PRFSD_IRP_CONTEXT IrpContext, - PRFSD_VCB Vcb, + PRFSD_IRP_CONTEXT IrpContext, + PRFSD_VCB Vcb, PRFSD_SUPER_BLOCK RfsdSb, PDEVICE_OBJECT TargetDevice, PDEVICE_OBJECT VolumeDevice, @@ -2025,7 +2025,7 @@ RfsdPnpSurpriseRemove( // Read.c // -BOOLEAN +BOOLEAN RfsdCopyRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, diff --git a/drivers/filesystems/reiserfs/src/blockio.c b/drivers/filesystems/reiserfs/src/blockio.c index befe4136a56..799585e9bff 100644 --- a/drivers/filesystems/reiserfs/src/blockio.c +++ b/drivers/filesystems/reiserfs/src/blockio.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: blockio.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -73,35 +73,35 @@ RfsdLockUserBuffer (IN PIRP Irp, PAGED_CODE(); ASSERT(Irp != NULL); - + if (Irp->MdlAddress != NULL) { return STATUS_SUCCESS; } - + IoAllocateMdl(Irp->UserBuffer, Length, FALSE, FALSE, Irp); - + if (Irp->MdlAddress == NULL) { return STATUS_INSUFFICIENT_RESOURCES; } - + _SEH2_TRY { MmProbeAndLockPages(Irp->MdlAddress, Irp->RequestorMode, Operation); - + Status = STATUS_SUCCESS; } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { IoFreeMdl(Irp->MdlAddress); - + Irp->MdlAddress = NULL; DbgBreak(); - + Status = STATUS_INVALID_USER_BUFFER; } _SEH2_END; - + return Status; } @@ -111,7 +111,7 @@ RfsdGetUserBuffer (IN PIRP Irp ) PAGED_CODE(); ASSERT(Irp != NULL); - + if (Irp->MdlAddress) { #if (_WIN32_WINNT >= 0x0500) @@ -240,7 +240,7 @@ RfsdReadWriteBlocks( for (i = 0; i < Count; i++) { - Irp = IoMakeAssociatedIrp( + Irp = IoMakeAssociatedIrp( MasterIrp, (CCHAR)(Vcb->TargetDeviceObject->StackSize + 1) ); @@ -268,16 +268,16 @@ RfsdReadWriteBlocks( #endif _SEH2_LEAVE; } - + IoBuildPartialMdl( MasterIrp->MdlAddress, Mdl, (PCHAR)MasterIrp->UserBuffer + RfsdBDL[i].Offset, RfsdBDL[i].Length ); - + IoSetNextIrpStackLocation( Irp ); IrpSp = IoGetCurrentIrpStackLocation( Irp ); - - + + IrpSp->MajorFunction = IrpContext->MajorFunction; IrpSp->Parameters.Read.Length = RfsdBDL[i].Length; IrpSp->Parameters.Read.ByteOffset.QuadPart = RfsdBDL[i].Lba; @@ -382,7 +382,7 @@ RfsdReadSync( ASSERT(Buffer != NULL); _SEH2_TRY { - + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), RFSD_POOL_TAG); if (NULL == Event) { @@ -401,13 +401,13 @@ RfsdReadSync( &IoStatus ); - if (!Irp) { + if (!Irp) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } if (bVerify) { - SetFlag( IoGetNextIrpStackLocation(Irp)->Flags, + SetFlag( IoGetNextIrpStackLocation(Irp)->Flags, SL_OVERRIDE_VERIFY_VOLUME ); } @@ -440,7 +440,7 @@ RfsdReadDisk( IN PRFSD_VCB Vcb, IN ULONGLONG Offset, // Byte offset (relative to disk) to read from (need not be sector-aligned!) IN ULONG Size, - IN OUT PVOID Buffer, + IN OUT PVOID Buffer, IN BOOLEAN bVerify ) // True if the volume should be verified before reading { NTSTATUS Status; @@ -465,7 +465,7 @@ RfsdReadDisk( } // Read the data - Status = RfsdReadSync( Vcb, + Status = RfsdReadSync( Vcb, Lba, Length, Buf, @@ -488,7 +488,7 @@ errorout: return Status; } -NTSTATUS +NTSTATUS RfsdDiskIoControl ( IN PDEVICE_OBJECT DeviceObject, IN ULONG IoctlCode, @@ -506,14 +506,14 @@ RfsdDiskIoControl ( PAGED_CODE(); ASSERT(DeviceObject != NULL); - + if (OutputBufferSize) { OutBufferSize = *OutputBufferSize; } - + KeInitializeEvent(&Event, NotificationEvent, FALSE); - + Irp = IoBuildDeviceIoControlRequest( IoctlCode, DeviceObject, @@ -525,23 +525,23 @@ RfsdDiskIoControl ( &Event, &IoStatus ); - + if (Irp == NULL) { RfsdPrint((DBG_ERROR, "RfsdDiskIoControl: Building IRQ error!\n")); return STATUS_INSUFFICIENT_RESOURCES; } - + Status = IoCallDriver(DeviceObject, Irp); - + if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatus.Status; } - + if (OutputBufferSize) { *OutputBufferSize = (ULONG) IoStatus.Information; } - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/cleanup.c b/drivers/filesystems/reiserfs/src/cleanup.c index b1baecf0385..29da5c8c487 100644 --- a/drivers/filesystems/reiserfs/src/cleanup.c +++ b/drivers/filesystems/reiserfs/src/cleanup.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: cleanup.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -42,21 +42,21 @@ RfsdCleanup (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + if (DeviceObject == RfsdGlobal->DeviceObject) { Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); @@ -77,16 +77,16 @@ RfsdCleanup (IN PRFSD_IRP_CONTEXT IrpContext) } VcbResourceAcquired = TRUE; - + FileObject = IrpContext->FileObject; - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + if (!Fcb) { Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + if (Fcb->Identifier.Type == RFSDVCB) { if (IsFlagOn(Vcb->Flags, VCB_VOLUME_LOCKED) && (Vcb->LockFile == FileObject) ) { @@ -105,7 +105,7 @@ RfsdCleanup (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); @@ -128,7 +128,7 @@ RfsdCleanup (IN PRFSD_IRP_CONTEXT IrpContext) FcbResourceAcquired = TRUE; } - + Ccb = (PRFSD_CCB) FileObject->FsContext2; if (!Ccb) { @@ -144,9 +144,9 @@ RfsdCleanup (IN PRFSD_IRP_CONTEXT IrpContext) } _SEH2_LEAVE; } - + ASSERT((Ccb->Identifier.Type == RFSDCCB) && - (Ccb->Identifier.Size == sizeof(RFSD_CCB))); + (Ccb->Identifier.Size == sizeof(RFSD_CCB))); Irp = IrpContext->Irp; Fcb->OpenHandleCount--; @@ -269,7 +269,7 @@ DbgBreak(); #endif if (CcIsFileCached(FileObject)) { - CcSetFileSizes(FileObject, + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); SetFlag(FileObject->Flags, FO_FILE_MODIFIED); } @@ -308,7 +308,7 @@ DbgBreak(); } } _SEH2_FINALLY { - + if (FcbPagingIoAcquired) { ExReleaseResourceForThreadLite( &Fcb->PagingIoResource, @@ -320,13 +320,13 @@ DbgBreak(); &Fcb->MainResource, ExGetCurrentResourceThread() ); } - + if (VcbResourceAcquired) { ExReleaseResourceForThreadLite( &Vcb->MainResource, ExGetCurrentResourceThread()); } - + if (!IrpContext->ExceptionInProgress) { if (Status == STATUS_PENDING) { RfsdQueueRequest(IrpContext); @@ -336,6 +336,6 @@ DbgBreak(); } } } _SEH2_END; - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/close.c b/drivers/filesystems/reiserfs/src/close.c index 3fbd5efa423..73e3521ad0a 100644 --- a/drivers/filesystems/reiserfs/src/close.c +++ b/drivers/filesystems/reiserfs/src/close.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: close.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -43,10 +43,10 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; if (DeviceObject == RfsdGlobal->DeviceObject) @@ -54,11 +54,11 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); @@ -76,7 +76,7 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + VcbResourceAcquired = TRUE; FileObject = IrpContext->FileObject; @@ -86,7 +86,7 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) Ccb = IrpContext->Ccb; } else { Fcb = (PRFSD_FCB) FileObject->FsContext; - + if (!Fcb) { Status = STATUS_SUCCESS; @@ -97,7 +97,7 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) Ccb = (PRFSD_CCB) FileObject->FsContext2; } - + if (Fcb->Identifier.Type == RFSDVCB) { Vcb->ReferenceCount--; @@ -114,12 +114,12 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) FileObject->FsContext2 = Ccb = NULL; } } - + Status = STATUS_SUCCESS; - + _SEH2_LEAVE; } - + if (Fcb->Identifier.Type != RFSDFCB || Fcb->Identifier.Size != sizeof(RFSD_FCB)) { #if DBG @@ -140,8 +140,8 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); -/* - if ( (!IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) && +/* + if ( (!IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) && (!IsFlagOn(Fcb->Flags, FCB_PAGE_FILE)) ) */ { @@ -154,10 +154,10 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + FcbResourceAcquired = TRUE; } - + if (!Ccb) { Status = STATUS_SUCCESS; _SEH2_LEAVE; @@ -165,10 +165,10 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) ASSERT((Ccb->Identifier.Type == RFSDCCB) && (Ccb->Identifier.Size == sizeof(RFSD_CCB))); - + Fcb->ReferenceCount--; Vcb->ReferenceCount--; - + if (!Vcb->ReferenceCount && IsFlagOn(Vcb->Flags, VCB_DISMOUNT_PENDING)) { FreeVcb = TRUE; } @@ -196,7 +196,7 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) FcbResourceAcquired = FALSE; } - + Status = STATUS_SUCCESS; } _SEH2_FINALLY { @@ -212,26 +212,26 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) &Vcb->MainResource, ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { if (Status == STATUS_PENDING) { RfsdQueueCloseRequest(IrpContext); -/* +/* Status = STATUS_SUCCESS; if (IrpContext->Irp != NULL) { IrpContext->Irp->IoStatus.Status = Status; - + RfsdCompleteRequest( IrpContext->Irp, !IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_REQUEUED), (CCHAR) (NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT) ); - + IrpContext->Irp = NULL; } */ @@ -257,7 +257,7 @@ RfsdClose (IN PRFSD_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } @@ -267,10 +267,10 @@ RfsdQueueCloseRequest (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + if (!IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_DELAY_CLOSE)) { SetFlag(IrpContext->Flags, IRP_CONTEXT_FLAG_DELAY_CLOSE); @@ -282,12 +282,12 @@ RfsdQueueCloseRequest (IN PRFSD_IRP_CONTEXT IrpContext) // IsSynchronous means we can block (so we don't requeue it) IrpContext->IsSynchronous = TRUE; - + ExInitializeWorkItem( &IrpContext->WorkQueueItem, RfsdDeQueueCloseRequest, IrpContext); - + ExQueueWorkItem(&IrpContext->WorkQueueItem, CriticalWorkQueue); } @@ -299,12 +299,12 @@ RfsdDeQueueCloseRequest (IN PVOID Context) PAGED_CODE(); IrpContext = (PRFSD_IRP_CONTEXT) Context; - + ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + _SEH2_TRY { _SEH2_TRY { diff --git a/drivers/filesystems/reiserfs/src/cmcb.c b/drivers/filesystems/reiserfs/src/cmcb.c index ba4e5c2d2bb..585f46e10e4 100644 --- a/drivers/filesystems/reiserfs/src/cmcb.c +++ b/drivers/filesystems/reiserfs/src/cmcb.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: cmcb.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -38,9 +38,9 @@ RfsdAcquireForLazyWrite ( PAGED_CODE(); Fcb = (PRFSD_FCB) Context; - + ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); @@ -50,7 +50,7 @@ RfsdAcquireForLazyWrite ( Fcb->AnsiFileName.Buffer )); if (!IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY)) { - RfsdPrint(( DBG_INFO, "RfsdAcquireForLazyWrite: Key=%x,%xh %S\n", + RfsdPrint(( DBG_INFO, "RfsdAcquireForLazyWrite: Key=%x,%xh %S\n", Fcb->RfsdMcb->Key.k_dir_id, Fcb->RfsdMcb->Key.k_objectid, Fcb->RfsdMcb->ShortName.Buffer )); if(!ExAcquireResourceSharedLite( @@ -75,9 +75,9 @@ RfsdReleaseFromLazyWrite (IN PVOID Context) PAGED_CODE(); Fcb = (PRFSD_FCB) Context; - + ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); @@ -88,7 +88,7 @@ RfsdReleaseFromLazyWrite (IN PVOID Context) )); if (!IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY)) { - RfsdPrint(( DBG_INFO, "RfsdReleaseFromLazyWrite: Inode=%x%xh %S\n", + RfsdPrint(( DBG_INFO, "RfsdReleaseFromLazyWrite: Inode=%x%xh %S\n", Fcb->RfsdMcb->Key.k_dir_id, Fcb->RfsdMcb->Key.k_objectid, Fcb->RfsdMcb->ShortName.Buffer )); ExReleaseResourceLite(&Fcb->PagingIoResource); @@ -109,13 +109,13 @@ RfsdAcquireForReadAhead (IN PVOID Context, PAGED_CODE(); Fcb = (PRFSD_FCB) Context; - + ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - RfsdPrint(( DBG_INFO, "RfsdAcquireForReadAhead: Inode=%x,%xh %S\n", + RfsdPrint(( DBG_INFO, "RfsdAcquireForReadAhead: Inode=%x,%xh %S\n", Fcb->RfsdMcb->Key.k_dir_id, Fcb->RfsdMcb->Key.k_objectid, Fcb->RfsdMcb->ShortName.Buffer )); if (!ExAcquireResourceSharedLite( @@ -138,13 +138,13 @@ RfsdReleaseFromReadAhead (IN PVOID Context) PAGED_CODE(); Fcb = (PRFSD_FCB) Context; - + ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - RfsdPrint(( DBG_INFO, "RfsdReleaseFromReadAhead: Inode=%x,%xh %S\n", + RfsdPrint(( DBG_INFO, "RfsdReleaseFromReadAhead: Inode=%x,%xh %S\n", Fcb->RfsdMcb->Key.k_dir_id, Fcb->RfsdMcb->Key.k_objectid, Fcb->RfsdMcb->ShortName.Buffer )); IoSetTopLevelIrp( NULL ); diff --git a/drivers/filesystems/reiserfs/src/create.c b/drivers/filesystems/reiserfs/src/create.c index d373f7846a0..7d2ececd240 100644 --- a/drivers/filesystems/reiserfs/src/create.c +++ b/drivers/filesystems/reiserfs/src/create.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: create.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -92,9 +92,9 @@ RfsdLookupFileName (IN PRFSD_VCB Vcb, } // Only if we're looking up *exactly* the root node, load it, and return it - if (FullFileName->Length == 2 && FullFileName->Buffer[0] == L'\\') { + if (FullFileName->Length == 2 && FullFileName->Buffer[0] == L'\\') { if (!RfsdLoadInode(Vcb, &(ParentMcb->Key), Inode)) { - return Status; + return Status; } *RfsdMcb = Vcb->McbTree; @@ -125,7 +125,7 @@ RfsdLookupFileName (IN PRFSD_VCB Vcb, } else { // There remains a token between the path seperators... - + // FileName is a (non-null-terminated) view into the FullFileName structure FileName = *FullFileName; FileName.Buffer += Length; @@ -148,9 +148,9 @@ RfsdLookupFileName (IN PRFSD_VCB Vcb, } } else { // The parent has no child MCB, or there was no child MCB sibling named FileName. Check the disk using ScanDir... - + // Load the parent directory's inode / stat data structure - // For ReiserFS, I'd need the parent's key. This has to be a key leading to a directory... I'm just getting it to pass it to scan. + // For ReiserFS, I'd need the parent's key. This has to be a key leading to a directory... I'm just getting it to pass it to scan. if (!RfsdLoadInode(Vcb, &(ParentMcb->Key), &in)) { Status = STATUS_OBJECT_NAME_NOT_FOUND; break; @@ -184,13 +184,13 @@ RfsdLookupFileName (IN PRFSD_VCB Vcb, } else { // We've found what we were looking for... #if 0 // disabled by ffs too - if (IsFlagOn( SUPER_BLOCK->s_feature_incompat, + if (IsFlagOn( SUPER_BLOCK->s_feature_incompat, RFSD_FEATURE_INCOMPAT_FILETYPE)) { if (rfsd_dir.file_type == RFSD_FT_DIR) SetFlag(FileAttr, FILE_ATTRIBUTE_DIRECTORY); - } else -#endif - { + } else +#endif + { RFSD_KEY_IN_MEMORY key; key.k_dir_id = DirectoryEntry.deh_dir_id; key.k_objectid = DirectoryEntry.deh_objectid; @@ -214,10 +214,10 @@ RfsdLookupFileName (IN PRFSD_VCB Vcb, } // NOTE: It should be OK to leave off the 3rd / 4th part of key, because (AFAIK) the only place this is used is ScanDir - Mcb->Key.k_dir_id = DirectoryEntry.deh_dir_id; + Mcb->Key.k_dir_id = DirectoryEntry.deh_dir_id; Mcb->Key.k_objectid = DirectoryEntry.deh_objectid; Mcb->Key.k_offset = Mcb->Key.k_type = 0; - + Mcb->DeOffset = off; RfsdAddMcbNode(Vcb, ParentMcb, Mcb); ParentMcb = Mcb; @@ -244,7 +244,7 @@ RfsdLookupFileName (IN PRFSD_VCB Vcb, /** (This function is only called by LookupFileName.) NOTE: The offset and type of the key passed are irrelevant, as the function will always open a a directory for searching, and will search for the contents by file name -- not key. - + STATUS_INSUFFICIENT_RESOURCES if the filename or diskreading buffer could not be allocated STATUS_UNSUCCESSFUL if the buffer could not be read from disk STATUS_NO_SUCH_FILE if the FileName given was not found in the directory scanned @@ -267,7 +267,7 @@ RfsdScanDir (IN PRFSD_VCB Vcb, DirectoryKey.k_type = RFSD_KEY_TYPE_v2_DIRENTRY; // Request that the filesystem tree be parsed, looking for FileName in directory spans belonging to DirectoryKey - { + { RFSD_SCANDIR_CALLBACK_CONTEXT CallbackContext; CallbackContext.Vcb = Vcb; @@ -275,7 +275,7 @@ RfsdScanDir (IN PRFSD_VCB Vcb, CallbackContext.pTargetFilename = FileName; CallbackContext.idxCurrentDentry = 0; - + CallbackContext.pMatchingDentry = rfsd_dir; CallbackContext.pMatchingIndex = Index; @@ -349,7 +349,7 @@ RfsdCreateFile(PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb) IrpSp = IoGetCurrentIrpStackLocation(Irp); Options = IrpSp->Parameters.Create.Options; - + DirectoryFile = IsFlagOn(Options, FILE_DIRECTORY_FILE); OpenTargetDirectory = IsFlagOn(IrpSp->Flags, SL_OPEN_TARGET_DIRECTORY); @@ -385,14 +385,14 @@ RfsdCreateFile(PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb) ExAcquireResourceExclusiveLite( &Vcb->MainResource, TRUE ); - + VcbResourceAcquired = TRUE; if (Irp->Overlay.AllocationSize.HighPart) { Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + if (!(Inode = ExAllocatePoolWithTag( PagedPool, sizeof(RFSD_INODE), RFSD_POOL_TAG) )) { _SEH2_LEAVE; @@ -404,7 +404,7 @@ RfsdCreateFile(PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb) FileName.Length = IrpSp->FileObject->FileName.Length; FileName.Buffer = ExAllocatePoolWithTag(PagedPool, FileName.MaximumLength, RFSD_POOL_TAG); - if (!FileName.Buffer) { + if (!FileName.Buffer) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } @@ -419,21 +419,21 @@ RfsdCreateFile(PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb) if ((FileName.Length > sizeof(WCHAR)) && (FileName.Buffer[1] == L'\\') && (FileName.Buffer[0] == L'\\')) { - + FileName.Length -= sizeof(WCHAR); - + RtlMoveMemory( &FileName.Buffer[0], &FileName.Buffer[1], FileName.Length ); - + // // Bad Name if there are still beginning backslashes. // - + if ((FileName.Length > sizeof(WCHAR)) && (FileName.Buffer[1] == L'\\') && (FileName.Buffer[0] == L'\\')) { - + Status = STATUS_OBJECT_NAME_INVALID; _SEH2_LEAVE; @@ -534,13 +534,13 @@ Dissecting: if (!ParentFcb) { - PRFSD_INODE pTmpInode = ExAllocatePoolWithTag(PagedPool, + PRFSD_INODE pTmpInode = ExAllocatePoolWithTag(PagedPool, sizeof(RFSD_INODE), RFSD_POOL_TAG); if (!pTmpInode) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } - + if(!RfsdLoadInode(Vcb, &(ParentMcb->Key), pTmpInode)) { #ifdef __REACTOS__ ExFreePool(pTmpInode); @@ -593,7 +593,7 @@ Dissecting: if (DirectoryFile) { if ( RFSD_IS_ROOT_KEY(ParentFcb->RfsdMcb->Key) ) { - if ( (RealName.Length == 0x10) && + if ( (RealName.Length == 0x10) && memcmp(RealName.Buffer, L"Recycled\0", 0x10) == 0) { SetFlag( IrpSp->Parameters.Create.FileAttributes, FILE_ATTRIBUTE_READONLY ); @@ -603,7 +603,7 @@ Dissecting: Status = STATUS_UNSUCCESSFUL; #if DISABLED Status = RfsdCreateInode( IrpContext, - Vcb, + Vcb, ParentFcb, RFSD_FT_DIR, IrpSp->Parameters.Create.FileAttributes, @@ -620,12 +620,12 @@ Dissecting: &RealName); #endif } - + if (NT_SUCCESS(Status)) { bCreated = TRUE; - Irp->IoStatus.Information = FILE_CREATED; + Irp->IoStatus.Information = FILE_CREATED; Status = RfsdLookupFileName ( Vcb, &RealName, @@ -752,7 +752,7 @@ DbgBreak(); } Openit: - + if (RfsdMcb) { Fcb = RfsdMcb->RfsdFcb; @@ -762,7 +762,7 @@ Openit: bFcbAllocated = TRUE; } } - + if (Fcb) { if (IsFlagOn(Fcb->Flags, FCB_FILE_DELETED)) { @@ -815,7 +815,7 @@ DbgBreak(); Fcb->RfsdMcb->Parent->Inode, ParentFcb->Inode ); } else { -DbgBreak(); +DbgBreak(); #if DISABLED Status = RfsdExpandFile( IrpContext, Vcb, Fcb, @@ -927,7 +927,7 @@ DbgBreak(); Vcb->OpenFileHandleCount++; Vcb->ReferenceCount++; - + IrpSp->FileObject->FsContext = (void*)Fcb; IrpSp->FileObject->FsContext2 = (void*) Ccb; IrpSp->FileObject->PrivateCacheMap = NULL; @@ -944,8 +944,8 @@ DbgBreak(); } if (!bCreated && !IsDirectory(Fcb)) { - if ( DeleteOnClose || - IsFlagOn(DesiredAccess, FILE_WRITE_DATA) || + if ( DeleteOnClose || + IsFlagOn(DesiredAccess, FILE_WRITE_DATA) || (CreateDisposition == FILE_OVERWRITE) || (CreateDisposition == FILE_OVERWRITE_IF)) { if (!MmFlushImageSection( &Fcb->SectionObject, @@ -992,7 +992,7 @@ DbgBreak(); } DbgBreak(); -#if DISABLED +#if DISABLED Status = RfsdExpandFile( IrpContext, Vcb, @@ -1048,7 +1048,7 @@ DbgBreak(); ExFreePool(Inode); } } _SEH2_END; - + return Status; } @@ -1078,7 +1078,7 @@ RfsdCreateVolume(PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb) IrpSp = IoGetCurrentIrpStackLocation(Irp); Options = IrpSp->Parameters.Create.Options; - + DirectoryFile = IsFlagOn(Options, FILE_DIRECTORY_FILE); OpenTargetDirectory = IsFlagOn(IrpSp->Flags, SL_OPEN_TARGET_DIRECTORY); @@ -1095,7 +1095,7 @@ RfsdCreateVolume(PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb) return STATUS_INVALID_PARAMETER; } - if ( (CreateDisposition != FILE_OPEN) && + if ( (CreateDisposition != FILE_OPEN) && (CreateDisposition != FILE_OPEN_IF) ) { return STATUS_ACCESS_DENIED; } @@ -1166,27 +1166,27 @@ RfsdCreate (IN PRFSD_IRP_CONTEXT IrpContext) Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; ASSERT(IsMounted(Vcb)); - + Irp = IrpContext->Irp; - + IrpSp = IoGetCurrentIrpStackLocation(Irp); Xcb = (PRFSD_FCBVCB) (IrpSp->FileObject->FsContext); - + if (DeviceObject == RfsdGlobal->DeviceObject) { RfsdPrint((DBG_INFO, "RfsdCreate: Create on main device object.\n")); Status = STATUS_SUCCESS; - + Irp->IoStatus.Information = FILE_OPENED; RfsdUnpinRepinnedBcbs(IrpContext); - RfsdCompleteIrpContext(IrpContext, Status); + RfsdCompleteIrpContext(IrpContext, Status); return Status; } - + _SEH2_TRY { if (IsFlagOn(Vcb->Flags, VCB_VOLUME_LOCKED)) { @@ -1200,7 +1200,7 @@ RfsdCreate (IN PRFSD_IRP_CONTEXT IrpContext) } if ( ((IrpSp->FileObject->FileName.Length == 0) && - (IrpSp->FileObject->RelatedFileObject == NULL)) || + (IrpSp->FileObject->RelatedFileObject == NULL)) || (Xcb && Xcb->Identifier.Type == RFSDVCB) ) { Status = RfsdCreateVolume(IrpContext, Vcb); } else { @@ -1211,7 +1211,7 @@ RfsdCreate (IN PRFSD_IRP_CONTEXT IrpContext) if (!IrpContext->ExceptionInProgress) { RfsdUnpinRepinnedBcbs(IrpContext); - + RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; @@ -1246,8 +1246,8 @@ DbgBreak(); RfsdPrint(( DBG_INFO, "RfsdCreateInode: %S in %S(Key=%x,%xh)\n", - FileName->Buffer, - ParentFcb->RfsdMcb->ShortName.Buffer, + FileName->Buffer, + ParentFcb->RfsdMcb->ShortName.Buffer, ParentFcb->RfsdMcb->Key.k_dir_id, ParentFcb->RfsdMcb->Key.k_objectid)); Status = RfsdNewInode(IrpContext, Vcb, Group,Type, &Inode); @@ -1297,7 +1297,7 @@ DbgBreak(); RfsdSaveInode(IrpContext, Vcb, Inode, &RfsdIno); RfsdPrint((DBG_INFO, "RfsdCreateInode: New Inode = %xh (Type=%xh)\n", Inode, Type)); - + errorout: #endif // 0 return 0;//Status; @@ -1330,8 +1330,8 @@ DbgBreak(); Status = RfsdTruncateFile(IrpContext, Vcb, Fcb, &AllocationSize); #endif - if (NT_SUCCESS(Status)) { - Fcb->Header.AllocationSize.QuadPart = + if (NT_SUCCESS(Status)) { + Fcb->Header.AllocationSize.QuadPart = Fcb->Header.FileSize.QuadPart = (LONGLONG) 0; Fcb->Inode->i_size = 0; @@ -1357,7 +1357,7 @@ DbgBreak(); if (iSize.QuadPart > Fcb->Header.AllocationSize.QuadPart) iSize.QuadPart = Fcb->Header.AllocationSize.QuadPart; - + Fcb->Header.FileSize.QuadPart = iSize.QuadPart; Fcb->Inode->i_size = iSize.LowPart; @@ -1405,7 +1405,7 @@ RfsdScanDirCallback( // Load the block pBlockBuffer = RfsdAllocateAndLoadBlock(pCallbackContext->Vcb, BlockNumber); - if (!pBlockBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } + if (!pBlockBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } // Construct the item key to search for DirectoryKey = *(pCallbackContext->pDirectoryKey); @@ -1414,19 +1414,19 @@ RfsdScanDirCallback( // Get the item header and its information Status = RfsdFindItemHeaderInBlock( pCallbackContext->Vcb, &DirectoryKey, pBlockBuffer, - ( &pDirectoryItemHeader ), //< + ( &pDirectoryItemHeader ), //< &CompareKeysWithoutOffset - ); + ); // If this block doesn't happen to contain a directory item, skip it. if ( (Status == STATUS_NO_SUCH_MEMBER) || !pDirectoryItemHeader ) - { + { KdPrint(("Block %i did not contain the appropriate diritem header\n", BlockNumber)); - Status = STATUS_SUCCESS; _SEH2_LEAVE; + Status = STATUS_SUCCESS; _SEH2_LEAVE; } // Setup the item buffer - pDirectoryItemBuffer = (PUCHAR) pBlockBuffer + pDirectoryItemHeader->ih_item_location; + pDirectoryItemBuffer = (PUCHAR) pBlockBuffer + pDirectoryItemHeader->ih_item_location; @@ -1436,12 +1436,12 @@ RfsdScanDirCallback( while (!bFound && (idxDentryInSpan < pDirectoryItemHeader->u.ih_entry_count) ) { - OEM_STRING OemName; + OEM_STRING OemName; // // reading dir entries from Dcb - // - + // + PRFSD_DENTRY_HEAD pCurrentDentry = (PRFSD_DENTRY_HEAD) (pDirectoryItemBuffer + (idxDentryInSpan * sizeof(RFSD_DENTRY_HEAD))); // Skip the directory entry for the parent of the root directory (because it should not be shown, and has no stat data) @@ -1449,7 +1449,7 @@ RfsdScanDirCallback( if (pCurrentDentry->deh_dir_id == 0 /*&& pCurrentDentry->deh_objectid == 1*/) { goto ProcessNextEntry; } - // Retrieve the filename of the loaded directory entry from the buffer (encoded with the codepage) + // Retrieve the filename of the loaded directory entry from the buffer (encoded with the codepage) // NOTE: The filename is not gauranteed to be null-terminated, and so the end may implicitly be the start of the previous entry. OemName.Buffer = (PUCHAR) pDirectoryItemBuffer + pCurrentDentry->deh_location; OemName.MaximumLength = (pPrevDentry ? pPrevDentry->deh_location : // The end of this entry is the start of the previous @@ -1462,7 +1462,7 @@ RfsdScanDirCallback( // Convert that name to unicode { InodeFileNameLength = (USHORT) RfsdOEMToUnicodeSize(&OemName) + 2; - + // If the unicode InodeFileName.Buffer is not large enough, expand it if (InodeFileName.MaximumLength < InodeFileNameLength) { @@ -1472,13 +1472,13 @@ RfsdScanDirCallback( // Allocate a new larger buffer InodeFileName.Buffer = ExAllocatePoolWithTag(PagedPool, InodeFileNameLength, RFSD_POOL_TAG); if (!InodeFileName.Buffer) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } - InodeFileName.MaximumLength = InodeFileNameLength; + InodeFileName.MaximumLength = InodeFileNameLength; } InodeFileName.Length = 0; - + RtlZeroMemory( InodeFileName.Buffer, InodeFileNameLength); - + Status = RfsdOEMToUnicode( &InodeFileName, &OemName ); @@ -1494,17 +1494,17 @@ RfsdScanDirCallback( TRUE )) { // This entry MATCHED! Copy the matching dentry into the output field on the context bFound = TRUE; - + *(pCallbackContext->pMatchingIndex) = (pCallbackContext->idxCurrentDentry * sizeof(RFSD_DENTRY_HEAD)); - RtlCopyMemory(pCallbackContext->pMatchingDentry, pCurrentDentry, sizeof(RFSD_DENTRY_HEAD)); - + RtlCopyMemory(pCallbackContext->pMatchingDentry, pCurrentDentry, sizeof(RFSD_DENTRY_HEAD)); + RfsdPrint(( DBG_INFO, /*__FUNCTION__*/ ": Found: Name=%S Key=%xh,%xh\n", InodeFileName.Buffer, pCurrentDentry->deh_dir_id, pCurrentDentry->deh_objectid )); Status = STATUS_EVENT_DONE; break; } - + ProcessNextEntry: // Advance to the next directory entry pPrevDentry = pCurrentDentry; diff --git a/drivers/filesystems/reiserfs/src/debug.c b/drivers/filesystems/reiserfs/src/debug.c index 2d5e87e2bda..97f08c68f8b 100644 --- a/drivers/filesystems/reiserfs/src/debug.c +++ b/drivers/filesystems/reiserfs/src/debug.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: debug.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ #if DBG @@ -137,7 +137,7 @@ static PUCHAR FsInformationClassStrings[] = { * Return Value: * N/A * - * NOTES: + * NOTES: * N/A */ @@ -157,7 +157,7 @@ RfsdPrintf( if (DebugPrintLevel <= DebugLevel) { CHAR Buffer[0x100]; va_start(ap, DebugMessage); - + KeQuerySystemTime( &CurrentTime); RtlTimeToTimeFields(&CurrentTime, &TimeFields); @@ -193,7 +193,7 @@ RfsdPrintf( * Return Value: * N/A * - * NOTES: + * NOTES: * N/A */ @@ -213,7 +213,7 @@ RfsdNIPrintf( if (DebugPrintLevel <= DebugLevel) { CHAR Buffer[0x100]; va_start(ap, DebugMessage); - + KeQuerySystemTime( &CurrentTime); RtlTimeToTimeFields(&CurrentTime, &TimeFields); @@ -232,7 +232,7 @@ RfsdNIPrintf( } // RfsdNIPrintf() -ULONG +ULONG RfsdGetProcessNameOffset ( VOID ) { PEPROCESS Process; @@ -433,7 +433,7 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, )); } else { RfsdPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s Unknown FileInformationClass %u\n", RfsdGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -459,7 +459,7 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, )); } else { RfsdPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s Unknown FsInformationClass %u\n", RfsdGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -552,7 +552,7 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, } } else { RfsdPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s Unknown FileInformationClass %u\n", RfsdGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -584,7 +584,7 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, if (IoStackLocation->MinorFunction == IRP_MN_USER_FS_REQUEST) { #ifndef _GNU_NTIFS_ RfsdPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s IRP_MN_USER_FS_REQUEST FsControlCode: %#x\n", RfsdGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -593,7 +593,7 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, )); #else RfsdPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s IRP_MN_USER_FS_REQUEST FsControlCode: %#x\n", RfsdGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -604,7 +604,7 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, #endif } else if (IoStackLocation->MinorFunction == IRP_MN_MOUNT_VOLUME) { RfsdPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s IRP_MN_MOUNT_VOLUME DeviceObject: %#x\n", RfsdGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -613,7 +613,7 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, )); } else if (IoStackLocation->MinorFunction == IRP_MN_VERIFY_VOLUME) { RfsdPrintNoIndent(( - DBG_TRACE, + DBG_TRACE, "%s %s %s IRP_MN_VERIFY_VOLUME DeviceObject: %#x\n", RfsdGetCurrentProcessName(), IrpMjStrings[IoStackLocation->MajorFunction], @@ -661,9 +661,9 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, )); break; - + case IRP_MJ_LOCK_CONTROL: - + if (IoStackLocation->MinorFunction & IRP_MN_LOCK) { #ifndef _GNU_NTIFS_ RfsdPrintNoIndent(( @@ -753,9 +753,9 @@ RfsdDbgPrintCall (IN PDEVICE_OBJECT DeviceObject, IoStackLocation->MinorFunction )); } - + break; - + case IRP_MJ_CLEANUP: RfsdPrintNoIndent(( diff --git a/drivers/filesystems/reiserfs/src/devctl.c b/drivers/filesystems/reiserfs/src/devctl.c index 2ba0f0a4847..e9d24a02f40 100644 --- a/drivers/filesystems/reiserfs/src/devctl.c +++ b/drivers/filesystems/reiserfs/src/devctl.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: devctl.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -68,19 +68,19 @@ RfsdDeviceControlNormal (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + CompleteRequest = TRUE; DeviceObject = IrpContext->DeviceObject; - + if (DeviceObject == RfsdGlobal->DeviceObject) { Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + Irp = IrpContext->Irp; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -91,13 +91,13 @@ RfsdDeviceControlNormal (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + TargetDeviceObject = Vcb->TargetDeviceObject; - + // // Pass on the IOCTL to the driver below // - + CompleteRequest = FALSE; NextIrpSp = IoGetNextIrpStackLocation( Irp ); @@ -110,7 +110,7 @@ RfsdDeviceControlNormal (IN PRFSD_IRP_CONTEXT IrpContext) FALSE, TRUE, TRUE ); - + Status = IoCallDriver(TargetDeviceObject, Irp); } _SEH2_FINALLY { @@ -125,7 +125,7 @@ RfsdDeviceControlNormal (IN PRFSD_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } @@ -144,31 +144,31 @@ RfsdPrepareToUnload (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + if (DeviceObject != RfsdGlobal->DeviceObject) { Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + ExAcquireResourceExclusiveLite( &RfsdGlobal->Resource, TRUE ); - + GlobalDataResourceAcquired = TRUE; - + if (FlagOn(RfsdGlobal->Flags, RFSD_UNLOAD_PENDING)) { RfsdPrint((DBG_ERROR, "RfsdPrepareUnload: Already ready to unload.\n")); - + Status = STATUS_ACCESS_DENIED; - + _SEH2_LEAVE; } - + { PRFSD_VCB Vcb; PLIST_ENTRY ListEntry; @@ -193,23 +193,23 @@ RfsdPrepareToUnload (IN PRFSD_IRP_CONTEXT IrpContext) if (!IsListEmpty(&(RfsdGlobal->VcbList))) { RfsdPrint((DBG_ERROR, "RfsdPrepareUnload: Mounted volumes exists.\n")); - + Status = STATUS_ACCESS_DENIED; - + _SEH2_LEAVE; } - + IoUnregisterFileSystem(RfsdGlobal->DeviceObject); #ifdef _MSC_VER #pragma prefast( suppress: 28175, "allowed to unload" ) #endif RfsdGlobal->DriverObject->DriverUnload = DriverUnload; - + SetFlag(RfsdGlobal->Flags ,RFSD_UNLOAD_PENDING); - + RfsdPrint((DBG_INFO, "RfsdPrepareToUnload: Driver is ready to unload.\n")); - + Status = STATUS_SUCCESS; } _SEH2_FINALLY { @@ -220,12 +220,12 @@ RfsdPrepareToUnload (IN PRFSD_IRP_CONTEXT IrpContext) ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -243,27 +243,27 @@ RfsdDeviceControl (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + IoControlCode = IoStackLocation->Parameters.DeviceIoControl.IoControlCode; - + switch (IoControlCode) { #if RFSD_UNLOAD case IOCTL_PREPARE_TO_UNLOAD: Status = RfsdPrepareToUnload(IrpContext); break; -#endif +#endif default: Status = RfsdDeviceControlNormal(IrpContext); } - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/dirctl.c b/drivers/filesystems/reiserfs/src/dirctl.c index aadc77db1f8..0062d4f694d 100644 --- a/drivers/filesystems/reiserfs/src/dirctl.c +++ b/drivers/filesystems/reiserfs/src/dirctl.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: dirctl.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -24,23 +24,23 @@ RfsdDirectoryCallback( PVOID pContext); typedef struct _RFSD_CALLBACK_CONTEXT { - - PRFSD_VCB Vcb; + + PRFSD_VCB Vcb; PRFSD_CCB Ccb; PRFSD_KEY_IN_MEMORY pDirectoryKey; ULONG idxStartingDentry; // The dentry at which the callback should beging triggering output to the Buffer ULONG idxCurrentDentry; // The current dentry (relative to entire set of dentrys, across all spans) - // These parameters are forwarded to ProcessDirectoryEntry + // These parameters are forwarded to ProcessDirectoryEntry FILE_INFORMATION_CLASS FileInformationClass; // [s] PVOID Buffer; // [s] ULONG BufferLength; // [s] BOOLEAN ReturnSingleEntry; // [s] - PULONG pUsedLength; - PVOID pPreviousEntry; - + PULONG pUsedLength; + PVOID pPreviousEntry; + } RFSD_CALLBACK_CONTEXT, *PRFSD_CALLBACK_CONTEXT; #ifdef ALLOC_PRAGMA @@ -63,19 +63,19 @@ RfsdGetInfoLength(IN FILE_INFORMATION_CLASS FileInformationClass) case FileDirectoryInformation: return sizeof(FILE_DIRECTORY_INFORMATION); break; - + case FileFullDirectoryInformation: return sizeof(FILE_FULL_DIR_INFORMATION); break; - + case FileBothDirectoryInformation: return sizeof(FILE_BOTH_DIR_INFORMATION); break; - + case FileNamesInformation: return sizeof(FILE_NAMES_INFORMATION); break; - + default: break; } @@ -121,10 +121,10 @@ RfsdProcessDirEntry( } // Given the incoming key for this dentry, load the corresponding stat data. - { - RFSD_KEY_IN_MEMORY key; - key.k_dir_id = Key_ParentDirectoryID; - key.k_objectid = Key_ObjectID; + { + RFSD_KEY_IN_MEMORY key; + key.k_dir_id = Key_ParentDirectoryID; + key.k_objectid = Key_ObjectID; if(!RfsdLoadInode(Vcb, &key, &inode)) { RfsdPrint((DBG_ERROR, "RfsdPricessDirEntry: Loading stat data %xh, %xh error.\n", Key_ParentDirectoryID, Key_ObjectID)); @@ -139,7 +139,7 @@ RfsdProcessDirEntry( // Link the previous entry into this entry if (pPreviousEntry) { // NOTE: All entries begin with NextEntryOffset, so it doesn't matter what type I cast to. - ((PFILE_NAMES_INFORMATION) (pPreviousEntry))->NextEntryOffset = + ((PFILE_NAMES_INFORMATION) (pPreviousEntry))->NextEntryOffset = (ULONG) ((PUCHAR) Buffer + UsedLength - (PUCHAR) (pPreviousEntry)); } @@ -167,9 +167,9 @@ RfsdProcessDirEntry( FDI->FileNameLength = NameLength; RtlCopyMemory(FDI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; - + case FileFullDirectoryInformation: FFI = (PFILE_FULL_DIR_INFORMATION) ((PUCHAR)Buffer + UsedLength); @@ -193,10 +193,10 @@ RfsdProcessDirEntry( FFI->FileNameLength = NameLength; RtlCopyMemory(FFI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; - + case FileBothDirectoryInformation: FBI = (PFILE_BOTH_DIR_INFORMATION) ((PUCHAR)Buffer + UsedLength); @@ -221,21 +221,21 @@ RfsdProcessDirEntry( FBI->FileNameLength = NameLength; RtlCopyMemory(FBI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; - + case FileNamesInformation: - FNI = (PFILE_NAMES_INFORMATION) ((PUCHAR)Buffer + UsedLength); + FNI = (PFILE_NAMES_INFORMATION) ((PUCHAR)Buffer + UsedLength); FNI->NextEntryOffset = 0; FNI->FileNameLength = NameLength; RtlCopyMemory(FNI->FileName, pName->Buffer, NameLength); - dwBytes = InfoLength + NameLength - sizeof(WCHAR); + dwBytes = InfoLength + NameLength - sizeof(WCHAR); break; - + default: break; } @@ -279,12 +279,12 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + // // This request is not allowed on the main device object // @@ -292,24 +292,24 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); ASSERT(IsMounted(Vcb)); FileObject = IrpContext->FileObject; - + Fcb = (PRFSD_FCB) FileObject->FsContext; pQueryKey = &(Fcb->RfsdMcb->Key); - + ASSERT(Fcb); - - KdPrint(("QueryDirectory on Key {%x,%x,%x,%x}\n", + + KdPrint(("QueryDirectory on Key {%x,%x,%x,%x}\n", pQueryKey->k_dir_id, pQueryKey->k_objectid, pQueryKey->k_offset, pQueryKey->k_type)); // @@ -319,35 +319,35 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - + if (!IsDirectory(Fcb)) { Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + Ccb = (PRFSD_CCB) FileObject->FsContext2; - + ASSERT(Ccb); - + ASSERT((Ccb->Identifier.Type == RFSDCCB) && (Ccb->Identifier.Size == sizeof(RFSD_CCB))); - + Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + #ifndef _GNU_NTIFS_ - + FileInformationClass = IoStackLocation->Parameters.QueryDirectory.FileInformationClass; - + Length = IoStackLocation->Parameters.QueryDirectory.Length; - + FileName = IoStackLocation->Parameters.QueryDirectory.FileName; - + FileIndex = IoStackLocation->Parameters.QueryDirectory.FileIndex; RestartScan = FlagOn(IoStackLocation->Flags, SL_RESTART_SCAN); @@ -355,18 +355,18 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) ReturnSingleEntry = FlagOn(IoStackLocation->Flags, SL_RETURN_SINGLE_ENTRY); IndexSpecified = FlagOn(IoStackLocation->Flags, SL_INDEX_SPECIFIED); - + #else // _GNU_NTIFS_ - + FileInformationClass = ((PEXTENDED_IO_STACK_LOCATION) IoStackLocation)->Parameters.QueryDirectory.FileInformationClass; - + Length = ((PEXTENDED_IO_STACK_LOCATION) IoStackLocation)->Parameters.QueryDirectory.Length; - + FileName = ((PEXTENDED_IO_STACK_LOCATION) IoStackLocation)->Parameters.QueryDirectory.FileName; - + FileIndex = ((PEXTENDED_IO_STACK_LOCATION) IoStackLocation)->Parameters.QueryDirectory.FileIndex; @@ -378,9 +378,9 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) IndexSpecified = FlagOn(((PEXTENDED_IO_STACK_LOCATION) IoStackLocation)->Flags, SL_INDEX_SPECIFIED); - + #endif // _GNU_NTIFS_ - + /* if (!Irp->MdlAddress && Irp->UserBuffer) { ProbeForWrite(Irp->UserBuffer, Length, 1); @@ -395,13 +395,13 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_USER_BUFFER; _SEH2_LEAVE; } - + // Check if we have a synchronous or asynchronous request... if (!IrpContext->IsSynchronous) { Status = STATUS_PENDING; _SEH2_LEAVE; } - + if (!ExAcquireResourceSharedLite( &Fcb->MainResource, IrpContext->IsSynchronous )) { @@ -410,7 +410,7 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) } FcbResourceAcquired = TRUE; - + if (FileName != NULL) { // The caller provided a FileName to search on... @@ -418,15 +418,15 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) FirstQuery = FALSE; } else { FirstQuery = TRUE; - + // Set up the DirectorySearchPattern to simply be an uppercase copy of the FileName. Ccb->DirectorySearchPattern.Length = Ccb->DirectorySearchPattern.MaximumLength = FileName->Length; - + Ccb->DirectorySearchPattern.Buffer = ExAllocatePoolWithTag(PagedPool, FileName->Length, RFSD_POOL_TAG); - + if (Ccb->DirectorySearchPattern.Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; @@ -447,23 +447,23 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) // (The FileName and CCB's DirectorySearchPattern were null) FirstQuery = TRUE; - + Ccb->DirectorySearchPattern.Length = Ccb->DirectorySearchPattern.MaximumLength = 2; - + Ccb->DirectorySearchPattern.Buffer = ExAllocatePoolWithTag(PagedPool, 2, RFSD_POOL_TAG); - + if (Ccb->DirectorySearchPattern.Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } - + RtlCopyMemory( Ccb->DirectorySearchPattern.Buffer, L"*\0", 2); } - + if (!IndexSpecified) { if (RestartScan || FirstQuery) { FileIndex = Fcb->RfsdMcb->DeOffset = 0; @@ -473,18 +473,18 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) FileIndex = Ccb->CurrentByteOffset; } } - - + + RtlZeroMemory(Buffer, Length); // Leave if a previous query has already read the entire contents of the directory if (Fcb->Inode->i_size <= FileIndex) { Status = STATUS_NO_MORE_FILES; _SEH2_LEAVE; - } - - //////// - + } + + //////// + // Construct a context for the call, and call to parse the entire file system tree. // A callback will be triggered on any direntry span belonging to DirectoryKey. // This callback will fill the requested section of the user buffer. @@ -508,7 +508,7 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) RfsdParseFilesystemTree(Vcb, pQueryKey, Vcb->SuperBlock->s_root_block, &RfsdDirectoryCallback, &CallbackContext); } - + //================================================================ if (!UsedLength) { @@ -523,20 +523,20 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) } } _SEH2_FINALLY { - + if (FcbResourceAcquired) { ExReleaseResourceForThreadLite( &Fcb->MainResource, ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { if (Status == STATUS_PENDING) { Status = RfsdLockUserBuffer( IrpContext->Irp, Length, IoWriteAccess ); - + if (NT_SUCCESS(Status)) { Status = RfsdQueueRequest(IrpContext); } else { @@ -548,7 +548,7 @@ RfsdQueryDirectory (IN PRFSD_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } @@ -610,7 +610,7 @@ RfsdNotifyChangeDirectory ( ASSERT(Fcb); if (Fcb->Identifier.Type == RFSDVCB) { - DbgBreak(); + DbgBreak(); CompleteRequest = TRUE; Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; @@ -763,7 +763,7 @@ RfsdNotifyReportChange ( } } - Offset = (USHORT) ( FullName->Length - + Offset = (USHORT) ( FullName->Length - Fcb->RfsdMcb->ShortName.Length); FsRtlNotifyFullReportChange( Vcb->NotifySync, @@ -788,10 +788,10 @@ RfsdDirectoryControl (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + switch (IrpContext->MinorFunction) { case IRP_MN_QUERY_DIRECTORY: @@ -801,12 +801,12 @@ RfsdDirectoryControl (IN PRFSD_IRP_CONTEXT IrpContext) case IRP_MN_NOTIFY_CHANGE_DIRECTORY: Status = RfsdNotifyChangeDirectory(IrpContext); break; - + default: Status = STATUS_INVALID_DEVICE_REQUEST; RfsdCompleteIrpContext(IrpContext, Status); } - + return Status; } @@ -839,7 +839,7 @@ BOOLEAN RfsdIsDirectoryEmpty ( Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } - + dwBytes = 0; bRet = TRUE; @@ -866,7 +866,7 @@ BOOLEAN RfsdIsDirectoryEmpty ( if (pTarget->inode) { if (pTarget->name_len == 1 && pTarget->name[0] == '.') { - } else if (pTarget->name_len == 2 && pTarget->name[0] == '.' && + } else if (pTarget->name_len == 2 && pTarget->name[0] == '.' && pTarget->name[1] == '.') { } else { bRet = FALSE; @@ -919,7 +919,7 @@ RfsdDirectoryCallback( // Load the block pBlockBuffer = RfsdAllocateAndLoadBlock(pCallbackContext->Vcb, BlockNumber); - if (!pBlockBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; goto out; } + if (!pBlockBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; goto out; } // Construct the item key to search for DirectoryKey = *(pCallbackContext->pDirectoryKey); @@ -928,23 +928,23 @@ RfsdDirectoryCallback( // Get the item header and its information Status = RfsdFindItemHeaderInBlock( pCallbackContext->Vcb, &DirectoryKey, pBlockBuffer, - ( &pDirectoryItemHeader ), //< + ( &pDirectoryItemHeader ), //< &CompareKeysWithoutOffset - ); + ); // If this block doesn't happen to contain a directory item, skip it. if ( (Status == STATUS_NO_SUCH_MEMBER) || !pDirectoryItemHeader ) - { + { KdPrint(("Block %i did not contain the appropriate diritem header\n", BlockNumber)); - Status = STATUS_SUCCESS; goto out; + Status = STATUS_SUCCESS; goto out; } - + RfsdPrint((DBG_INFO, "Found %i dentries in block\n", pDirectoryItemHeader->u.ih_entry_count)); // Calculate if the requested result will be from this dentry span // If the end of this span is not greater than the requested start, it can be skipped. if ( !( (pCallbackContext->idxCurrentDentry + (USHORT)(pDirectoryItemHeader->u.ih_entry_count)) > pCallbackContext->idxStartingDentry ) ) - { + { RfsdPrint((DBG_TRACE, "SKIPPING block\n")); pCallbackContext->idxCurrentDentry += pDirectoryItemHeader->u.ih_entry_count; @@ -963,13 +963,13 @@ RfsdDirectoryCallback( // Skip ahead to the starting dentry in this span. ULONG idxDentryInSpan = pCallbackContext->idxStartingDentry - pCallbackContext->idxCurrentDentry; pCallbackContext->idxCurrentDentry += idxDentryInSpan; - + RfsdPrint((DBG_TRACE, "Sarting dentry: %i. skipped to %i dentry in span\n", pCallbackContext->idxStartingDentry, idxDentryInSpan)); - + offsetDentry_toSequentialSpan = pCallbackContext->idxCurrentDentry * sizeof(RFSD_DENTRY_HEAD); // Setup the item buffer - pDirectoryItemBuffer = (PUCHAR) pBlockBuffer + pDirectoryItemHeader->ih_item_location; + pDirectoryItemBuffer = (PUCHAR) pBlockBuffer + pDirectoryItemHeader->ih_item_location; while (bRun @@ -981,14 +981,14 @@ RfsdDirectoryCallback( PRFSD_DENTRY_HEAD pCurrentDentry; USHORT InodeFileNameLength = 0; - // Read a directory entry from the buffered directory item (from the file associated with the filled inode) - pCurrentDentry = (PRFSD_DENTRY_HEAD) (pDirectoryItemBuffer + (idxDentryInSpan * sizeof(RFSD_DENTRY_HEAD) )); - + // Read a directory entry from the buffered directory item (from the file associated with the filled inode) + pCurrentDentry = (PRFSD_DENTRY_HEAD) (pDirectoryItemBuffer + (idxDentryInSpan * sizeof(RFSD_DENTRY_HEAD) )); + // Skip the directory entry for the parent of the root directory (because it should not be shown, and has no stat data) // (NOTE: Any change made here should also be mirrored in RfsdScanDirCallback) if (pCurrentDentry->deh_dir_id == 0 /*&& pCurrentDentry->deh_objectid == 1*/) { goto ProcessNextEntry; } - + // Pull the name of the file out from the buffer. // NOTE: The filename is not gauranteed to be null-terminated, and so the end may implicitly be the start of the previous entry. OemName.Buffer = (PUCHAR) pDirectoryItemBuffer + pCurrentDentry->deh_location; @@ -1007,11 +1007,11 @@ RfsdDirectoryCallback( // Calculate the name's unicode length, allocate memory, and convert the codepaged name to unicode - InodeFileNameLength = (USHORT) RfsdOEMToUnicodeSize(&OemName); + InodeFileNameLength = (USHORT) RfsdOEMToUnicodeSize(&OemName); InodeFileName.Length = 0; InodeFileName.MaximumLength = InodeFileNameLength + 2; - - if (InodeFileNameLength <= 0) + + if (InodeFileNameLength <= 0) { break; } InodeFileName.Buffer = ExAllocatePoolWithTag( @@ -1024,9 +1024,9 @@ RfsdDirectoryCallback( } RtlZeroMemory(InodeFileName.Buffer, InodeFileNameLength + 2); - + Status = RfsdOEMToUnicode( &InodeFileName, &OemName ); - if (!NT_SUCCESS(Status)) { Status = STATUS_INTERNAL_ERROR; goto out; } // TODO: CHECK IF TIHS OK + if (!NT_SUCCESS(Status)) { Status = STATUS_INTERNAL_ERROR; goto out; } // TODO: CHECK IF TIHS OK ////////////// END OF MY PART if (FsRtlDoesNameContainWildCards( @@ -1041,7 +1041,7 @@ RfsdDirectoryCallback( &InodeFileName, TRUE) ) { // The name either contains wild cards, or matches the directory search pattern... - + { ULONG dwBytesWritten; dwBytesWritten = RfsdProcessDirEntry( @@ -1067,20 +1067,20 @@ RfsdDirectoryCallback( } } } - + if (InodeFileName.Buffer) { ExFreePool(InodeFileName.Buffer); InodeFileName.Buffer = NULL; } - ProcessNextEntry: + ProcessNextEntry: pPrevDentry = pCurrentDentry; if (bRun) { - ++idxDentryInSpan; + ++idxDentryInSpan; ++(pCallbackContext->idxCurrentDentry); ++(pCallbackContext->idxStartingDentry); offsetDentry_toSequentialSpan += sizeof(RFSD_DENTRY_HEAD); @@ -1088,18 +1088,18 @@ RfsdDirectoryCallback( // Store the current position, so that it will be available for the next call pCallbackContext->Ccb->CurrentByteOffset = offsetDentry_toSequentialSpan; } - + if ( ( *(pCallbackContext->pUsedLength) > 0) && pCallbackContext->ReturnSingleEntry) { Status = STATUS_EVENT_DONE; break; } - + } } - out: + out: if (pBlockBuffer) ExFreePool(pBlockBuffer); if (InodeFileName.Buffer) ExFreePool(InodeFileName.Buffer); diff --git a/drivers/filesystems/reiserfs/src/dispatch.c b/drivers/filesystems/reiserfs/src/dispatch.c index cf2c106571b..539aae590ff 100644 --- a/drivers/filesystems/reiserfs/src/dispatch.c +++ b/drivers/filesystems/reiserfs/src/dispatch.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: dispatch.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -31,24 +31,24 @@ RfsdQueueRequest (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + // IsSynchronous means we can block (so we don't requeue it) IrpContext->IsSynchronous = TRUE; SetFlag(IrpContext->Flags, IRP_CONTEXT_FLAG_REQUEUED); - + IoMarkIrpPending(IrpContext->Irp); - + ExInitializeWorkItem( &IrpContext->WorkQueueItem, RfsdDeQueueRequest, IrpContext ); - + ExQueueWorkItem(&IrpContext->WorkQueueItem, CriticalWorkQueue); - + return STATUS_PENDING; } @@ -99,18 +99,18 @@ RfsdDispatchRequest (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + switch (IrpContext->MajorFunction) { case IRP_MJ_CREATE: return RfsdCreate(IrpContext); - + case IRP_MJ_CLOSE: return RfsdClose(IrpContext); - + case IRP_MJ_READ: return RfsdRead(IrpContext); @@ -138,16 +138,16 @@ RfsdDispatchRequest (IN PRFSD_IRP_CONTEXT IrpContext) case IRP_MJ_DIRECTORY_CONTROL: return RfsdDirectoryControl(IrpContext); - + case IRP_MJ_FILE_SYSTEM_CONTROL: return RfsdFileSystemControl(IrpContext); case IRP_MJ_DEVICE_CONTROL: return RfsdDeviceControl(IrpContext); - + case IRP_MJ_LOCK_CONTROL: return RfsdLockControl(IrpContext); - + case IRP_MJ_CLEANUP: return RfsdCleanup(IrpContext); @@ -157,7 +157,7 @@ RfsdDispatchRequest (IN PRFSD_IRP_CONTEXT IrpContext) #if (_WIN32_WINNT >= 0x0500) case IRP_MJ_PNP: return RfsdPnp(IrpContext); -#endif //(_WIN32_WINNT >= 0x0500) +#endif //(_WIN32_WINNT >= 0x0500) default: { NTSTATUS DefaultRC = STATUS_INVALID_DEVICE_REQUEST; @@ -189,22 +189,22 @@ RfsdBuildRequest (PDEVICE_OBJECT DeviceObject, PIRP Irp) #if DBG RfsdDbgPrintCall(DeviceObject, Irp); #endif - + AtIrqlPassiveLevel = (KeGetCurrentIrql() == PASSIVE_LEVEL); - + if (AtIrqlPassiveLevel) { FsRtlEnterFileSystem(); } - + if (!IoGetTopLevelIrp()) { IsTopLevelIrp = TRUE; IoSetTopLevelIrp(Irp); } - + IrpContext = RfsdAllocateIrpContext(DeviceObject, Irp); - + if (!IrpContext) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -232,11 +232,11 @@ RfsdBuildRequest (PDEVICE_OBJECT DeviceObject, PIRP Irp) if (IsTopLevelIrp) { IoSetTopLevelIrp(NULL); } - + if (AtIrqlPassiveLevel) { FsRtlExitFileSystem(); - } + } } _SEH2_END; - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/except.c b/drivers/filesystems/reiserfs/src/except.c index 8b8d552e9bb..5ed7d240bf5 100644 --- a/drivers/filesystems/reiserfs/src/except.c +++ b/drivers/filesystems/reiserfs/src/except.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: except.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -72,9 +72,9 @@ RfsdExceptionFilter ( RfsdPrint((DBG_ERROR, "RfsdExceptionFilter: Catching exception %xh\n", ExceptionCode)); - + Status = EXCEPTION_EXECUTE_HANDLER; - + if (IrpContext) { IrpContext->ExceptionInProgress = TRUE; IrpContext->ExceptionCode = ExceptionCode; @@ -88,14 +88,14 @@ RfsdExceptionFilter ( RfsdPrint((DBG_ERROR, "RfsdExceptionFilter: Passing on exception %#x\n", ExceptionCode)); - + Status = EXCEPTION_CONTINUE_SEARCH; - + if (IrpContext) { RfsdFreeIrpContext(IrpContext); } } - + return Status; } @@ -103,9 +103,9 @@ NTSTATUS RfsdExceptionHandler (IN PRFSD_IRP_CONTEXT IrpContext) { NTSTATUS Status; - + if (IrpContext) { - if ( (IrpContext->Identifier.Type != RFSDICX) || + if ( (IrpContext->Identifier.Type != RFSDICX) || (IrpContext->Identifier.Size != sizeof(RFSD_IRP_CONTEXT))) { DbgBreak(); return STATUS_UNSUCCESSFUL; @@ -120,7 +120,7 @@ RfsdExceptionHandler (IN PRFSD_IRP_CONTEXT IrpContext) // PIRP Irp = IrpContext->Irp; - + if (IoIsErrorUserInduced(Status)) { @@ -171,18 +171,18 @@ RfsdExceptionHandler (IN PRFSD_IRP_CONTEXT IrpContext) } IrpContext->Irp->IoStatus.Status = Status; - + RfsdCompleteRequest(IrpContext->Irp, FALSE, IO_NO_INCREMENT); } errorout: - + RfsdFreeIrpContext(IrpContext); } else { Status = STATUS_INSUFFICIENT_RESOURCES; } - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/fastio.c b/drivers/filesystems/reiserfs/src/fastio.c index 6d71d197118..0cac9afeae7 100644 --- a/drivers/filesystems/reiserfs/src/fastio.c +++ b/drivers/filesystems/reiserfs/src/fastio.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: fastio.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -54,7 +54,7 @@ RfsdFastIoCheckIfPossible ( PAGED_CODE(); lLength.QuadPart = Length; - + _SEH2_TRY { _SEH2_TRY { @@ -64,22 +64,22 @@ RfsdFastIoCheckIfPossible ( if (DeviceObject == RfsdGlobal->DeviceObject) { _SEH2_LEAVE; } - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - + if (IsDirectory(Fcb)) { _SEH2_LEAVE; } - + if (CheckForReadOperation) { bPossible = FsRtlFastCheckLockForRead( @@ -112,7 +112,7 @@ RfsdFastIoCheckIfPossible ( Fcb->AnsiFileName.Buffer )); - RfsdPrint((DBG_INFO, + RfsdPrint((DBG_INFO, "RfsdFastIoCheckIfPossible: Offset: %I64xg Length: %xh Key: %u %s %s\n", FileOffset->QuadPart, Length, @@ -128,7 +128,7 @@ RfsdFastIoCheckIfPossible ( FsRtlExitFileSystem(); } _SEH2_END; - + return bPossible; } @@ -150,9 +150,9 @@ RfsdFastIoRead (IN PFILE_OBJECT FileObject, PAGED_CODE(); Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); @@ -169,7 +169,7 @@ RfsdFastIoRead (IN PFILE_OBJECT FileObject, Status = FsRtlCopyRead ( FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); - + return Status; } @@ -192,9 +192,9 @@ RfsdFastIoWrite ( PAGED_CODE(); Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); @@ -218,7 +218,7 @@ RfsdFastIoWrite ( bRet = FsRtlCopyWrite ( FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); - + return bRet; } @@ -250,38 +250,38 @@ RfsdFastIoQueryBasicInfo (IN PFILE_OBJECT FileObject, Status = TRUE; _SEH2_LEAVE; } - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { IoStatus->Status = STATUS_INVALID_PARAMETER; Status = TRUE; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - RfsdPrint((DBG_INFO, + RfsdPrint((DBG_INFO, "RfsdFastIoQueryBasicInfo: %s %s %s\n", RfsdGetCurrentProcessName(), "FASTIO_QUERY_BASIC_INFO", Fcb->AnsiFileName.Buffer )); - + if (!ExAcquireResourceSharedLite( &Fcb->MainResource, Wait)) { Status = FALSE; _SEH2_LEAVE; } - + FcbMainResourceAcquired = TRUE; - + RtlZeroMemory(Buffer, sizeof(FILE_BASIC_INFORMATION)); - + /* typedef struct _FILE_BASIC_INFORMATION { LARGE_INTEGER CreationTime; @@ -296,14 +296,14 @@ RfsdFastIoQueryBasicInfo (IN PFILE_OBJECT FileObject, Buffer->LastAccessTime = RfsdSysTime(Fcb->Inode->i_atime); Buffer->LastWriteTime = RfsdSysTime(Fcb->Inode->i_mtime); Buffer->ChangeTime = RfsdSysTime(Fcb->Inode->i_mtime); - - + + Buffer->FileAttributes = Fcb->RfsdMcb->FileAttr; - + IoStatus->Information = sizeof(FILE_BASIC_INFORMATION); - + IoStatus->Status = STATUS_SUCCESS; - + Status = TRUE; } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { @@ -320,21 +320,21 @@ RfsdFastIoQueryBasicInfo (IN PFILE_OBJECT FileObject, ExGetCurrentResourceThread() ); } - + FsRtlExitFileSystem(); } _SEH2_END; - - + + if (Status == FALSE) { - RfsdPrint((DBG_ERROR, + RfsdPrint((DBG_ERROR, "RfsdFastIoQueryBasicInfo: %s %s *** Status: FALSE ***\n", RfsdGetCurrentProcessName(), "FASTIO_QUERY_BASIC_INFO" )); } else if (IoStatus->Status != STATUS_SUCCESS) { - RfsdPrint((DBG_ERROR, + RfsdPrint((DBG_ERROR, "RfsdFastIoQueryBasicInfo: %s %s *** Status: %s (%#x) ***\n", RfsdGetCurrentProcessName(), "FASTIO_QUERY_BASIC_INFO", @@ -342,7 +342,7 @@ RfsdFastIoQueryBasicInfo (IN PFILE_OBJECT FileObject, IoStatus->Status )); } - + return Status; } @@ -376,17 +376,17 @@ RfsdFastIoQueryStandardInfo ( Status = TRUE; _SEH2_LEAVE; } - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { IoStatus->Status = STATUS_INVALID_PARAMETER; Status = TRUE; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); @@ -397,18 +397,18 @@ RfsdFastIoQueryStandardInfo ( Fcb->AnsiFileName.Buffer )); Vcb = Fcb->Vcb; - + if (!ExAcquireResourceSharedLite( &Fcb->MainResource, Wait )) { Status = FALSE; _SEH2_LEAVE; } - + FcbMainResourceAcquired = TRUE; - + RtlZeroMemory(Buffer, sizeof(FILE_STANDARD_INFORMATION)); - + /* typedef struct _FILE_STANDARD_INFORMATION { LARGE_INTEGER AllocationSize; @@ -431,23 +431,23 @@ RfsdFastIoQueryStandardInfo ( Buffer->AllocationSize.QuadPart = AllocationSize; Buffer->EndOfFile.QuadPart = FileSize; Buffer->NumberOfLinks = Fcb->Inode->i_links_count; - + if (IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY)) { Buffer->DeletePending = FALSE; } else { Buffer->DeletePending = IsFlagOn(Fcb->Flags, FCB_DELETE_PENDING); } - + if (FlagOn(Fcb->RfsdMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY)) { Buffer->Directory = TRUE; } else { Buffer->Directory = FALSE; } - + IoStatus->Information = sizeof(FILE_STANDARD_INFORMATION); - + IoStatus->Status = STATUS_SUCCESS; - + Status = TRUE; } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { @@ -463,7 +463,7 @@ RfsdFastIoQueryStandardInfo ( ExGetCurrentResourceThread() ); } - + FsRtlExitFileSystem(); } _SEH2_END; @@ -482,7 +482,7 @@ RfsdFastIoQueryStandardInfo ( IoStatus->Status )); } #endif - + return Status; } @@ -515,21 +515,21 @@ RfsdFastIoLock ( Status = TRUE; _SEH2_LEAVE; } - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { IoStatus->Status = STATUS_INVALID_PARAMETER; Status = TRUE; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - + if (IsDirectory(Fcb)) { DbgBreak(); IoStatus->Status = STATUS_INVALID_PARAMETER; @@ -550,7 +550,7 @@ RfsdFastIoLock ( Key, (FailImmediately ? "FailImmediately " : ""), (ExclusiveLock ? "ExclusiveLock " : "") )); - + if (Fcb->Header.IsFastIoPossible != FastIoIsQuestionable) { RfsdPrint((DBG_INFO, "RfsdFastIoLock: %s %s %s\n", @@ -560,7 +560,7 @@ RfsdFastIoLock ( Fcb->Header.IsFastIoPossible = FastIoIsQuestionable; } - + #ifdef _MSC_VER #pragma prefast( suppress: 28159, "bug in prefast" ) #endif @@ -585,9 +585,9 @@ RfsdFastIoLock ( FsRtlExitFileSystem(); } _SEH2_END; -#if DBG +#if DBG if (Status == FALSE) { - RfsdPrint((DBG_ERROR, + RfsdPrint((DBG_ERROR, "RfsdFastIoLock: %s %s *** Status: FALSE ***\n", RfsdGetCurrentProcessName(), "FASTIO_LOCK" @@ -602,7 +602,7 @@ RfsdFastIoLock ( )); } #endif - + return Status; } @@ -633,21 +633,21 @@ RfsdFastIoUnlockSingle ( Status = TRUE; _SEH2_LEAVE; } - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { DbgBreak(); IoStatus->Status = STATUS_INVALID_PARAMETER; Status = TRUE; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - + if (IsDirectory(Fcb)) { DbgBreak(); @@ -667,7 +667,7 @@ RfsdFastIoUnlockSingle ( FileOffset->QuadPart, Length->QuadPart, Key )); - + IoStatus->Status = FsRtlFastUnlockSingle( &Fcb->FileLockAnchor, FileObject, @@ -676,10 +676,10 @@ RfsdFastIoUnlockSingle ( Process, Key, NULL, - FALSE); - + FALSE); + IoStatus->Information = 0; - + Status = TRUE; } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { IoStatus->Status = _SEH2_GetExceptionCode(); @@ -691,7 +691,7 @@ RfsdFastIoUnlockSingle ( FsRtlExitFileSystem(); } _SEH2_END; -#if DBG +#if DBG if (Status == FALSE) { RfsdPrint((DBG_ERROR, @@ -706,7 +706,7 @@ RfsdFastIoUnlockSingle ( RfsdNtStatusToString(IoStatus->Status), IoStatus->Status )); } -#endif +#endif return Status; } @@ -734,21 +734,21 @@ RfsdFastIoUnlockAll ( Status = TRUE; _SEH2_LEAVE; } - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { DbgBreak(); IoStatus->Status = STATUS_INVALID_PARAMETER; Status = TRUE; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - + if (IsDirectory(Fcb)) { DbgBreak(); IoStatus->Status = STATUS_INVALID_PARAMETER; @@ -762,15 +762,15 @@ RfsdFastIoUnlockAll ( "FASTIO_UNLOCK_ALL", Fcb->AnsiFileName.Buffer )); - + IoStatus->Status = FsRtlFastUnlockAll( &Fcb->FileLockAnchor, FileObject, Process, NULL ); - + IoStatus->Information = 0; - + Status = TRUE; } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { IoStatus->Status = _SEH2_GetExceptionCode(); @@ -782,7 +782,7 @@ RfsdFastIoUnlockAll ( FsRtlExitFileSystem(); } _SEH2_END; -#if DBG +#if DBG if (Status == FALSE) { RfsdPrint((DBG_ERROR, @@ -799,7 +799,7 @@ RfsdFastIoUnlockAll ( IoStatus->Status )); } -#endif +#endif return Status; } @@ -833,21 +833,21 @@ RfsdFastIoUnlockAllByKey ( Status = TRUE; _SEH2_LEAVE; } - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { DbgBreak(); IoStatus->Status = STATUS_INVALID_PARAMETER; Status = TRUE; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - + if (IsDirectory(Fcb)) { DbgBreak(); @@ -867,17 +867,17 @@ RfsdFastIoUnlockAllByKey ( "RfsdFastIoUnlockAllByKey: Key: %u\n", Key )); - + IoStatus->Status = FsRtlFastUnlockAllByKey( &Fcb->FileLockAnchor, FileObject, Process, Key, NULL - ); - + ); + IoStatus->Information = 0; - + Status = TRUE; } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { @@ -890,7 +890,7 @@ RfsdFastIoUnlockAllByKey ( FsRtlExitFileSystem(); } _SEH2_END; -#if DBG +#if DBG if (Status == FALSE) { RfsdPrint((DBG_ERROR, @@ -908,7 +908,7 @@ RfsdFastIoUnlockAllByKey ( IoStatus->Status )); } -#endif +#endif return Status; } @@ -936,21 +936,21 @@ RfsdFastIoQueryNetworkOpenInfo ( IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { DbgBreak(); IoStatus->Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - RfsdPrint((DBG_INFO, + RfsdPrint((DBG_INFO, "%-16.16s %-31s %s\n", RfsdGetCurrentProcessName(), "FASTIO_QUERY_NETWORK_OPEN_INFO", @@ -969,7 +969,7 @@ RfsdFastIoQueryNetworkOpenInfo ( )) { _SEH2_LEAVE; } - + FcbResourceAcquired = TRUE; } @@ -999,7 +999,7 @@ RfsdFastIoQueryNetworkOpenInfo ( } _SEH2_FINALLY { if (FcbResourceAcquired) { - ExReleaseResourceLite(&Fcb->MainResource); + ExReleaseResourceLite(&Fcb->MainResource); } FsRtlExitFileSystem(); diff --git a/drivers/filesystems/reiserfs/src/fileinfo.c b/drivers/filesystems/reiserfs/src/fileinfo.c index 8e7c16b94d5..89b18ef1bb7 100644 --- a/drivers/filesystems/reiserfs/src/fileinfo.c +++ b/drivers/filesystems/reiserfs/src/fileinfo.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: fileinfo.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -54,12 +54,12 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + // // This request is not allowed on the main device object // @@ -67,13 +67,13 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + FileObject = IrpContext->FileObject; - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + // // This request is not allowed on volumes // @@ -81,13 +81,13 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); Vcb = Fcb->Vcb; -/* +/* if ( !IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY) && !FlagOn(Fcb->Flags, FCB_PAGE_FILE)) */ @@ -100,59 +100,59 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + FcbResourceAcquired = TRUE; } - + Ccb = (PRFSD_CCB) FileObject->FsContext2; - + ASSERT(Ccb != NULL); - + ASSERT((Ccb->Identifier.Type == RFSDCCB) && (Ccb->Identifier.Size == sizeof(RFSD_CCB))); - + Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + FileInformationClass = IoStackLocation->Parameters.QueryFile.FileInformationClass; - + Length = IoStackLocation->Parameters.QueryFile.Length; - + Buffer = Irp->AssociatedIrp.SystemBuffer; - + RtlZeroMemory(Buffer, Length); FileSize = (LONGLONG) Fcb->Inode->i_size; AllocationSize = CEILING_ALIGNED(FileSize, (ULONGLONG)Vcb->BlockSize); - + switch (FileInformationClass) { case FileBasicInformation: { PFILE_BASIC_INFORMATION FileBasicInformation; - + if (Length < sizeof(FILE_BASIC_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FileBasicInformation = (PFILE_BASIC_INFORMATION) Buffer; RtlZeroMemory(FileBasicInformation, sizeof(FILE_BASIC_INFORMATION)); - + FileBasicInformation->CreationTime = RfsdSysTime(Fcb->Inode->i_ctime); - + FileBasicInformation->LastAccessTime = RfsdSysTime(Fcb->Inode->i_atime); - + FileBasicInformation->LastWriteTime = RfsdSysTime(Fcb->Inode->i_mtime); - + FileBasicInformation->ChangeTime = RfsdSysTime(Fcb->Inode->i_mtime); - + FileBasicInformation->FileAttributes = Fcb->RfsdMcb->FileAttr; - + Irp->IoStatus.Information = sizeof(FILE_BASIC_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; @@ -163,17 +163,17 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) case FileAttributeTagInformation: { PFILE_ATTRIBUTE_TAG_INFORMATION FATI; - + if (Length < sizeof(FILE_ATTRIBUTE_TAG_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FATI = (PFILE_ATTRIBUTE_TAG_INFORMATION) Buffer; - + FATI->FileAttributes = Fcb->RfsdMcb->FileAttr; FATI->ReparseTag = 0; - + Irp->IoStatus.Information = sizeof(FILE_ATTRIBUTE_TAG_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; @@ -183,118 +183,118 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) case FileStandardInformation: { PFILE_STANDARD_INFORMATION FileStandardInformation; - + if (Length < sizeof(FILE_STANDARD_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FileStandardInformation = (PFILE_STANDARD_INFORMATION) Buffer; - + FileStandardInformation->AllocationSize.QuadPart = AllocationSize; FileStandardInformation->EndOfFile.QuadPart = FileSize; - + FileStandardInformation->NumberOfLinks = Fcb->Inode->i_links_count; - + if (IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY)) FileStandardInformation->DeletePending = FALSE; else - FileStandardInformation->DeletePending = IsFlagOn(Fcb->Flags, FCB_DELETE_PENDING); - + FileStandardInformation->DeletePending = IsFlagOn(Fcb->Flags, FCB_DELETE_PENDING); + if (Fcb->RfsdMcb->FileAttr & FILE_ATTRIBUTE_DIRECTORY) { FileStandardInformation->Directory = TRUE; } else { FileStandardInformation->Directory = FALSE; } - + Irp->IoStatus.Information = sizeof(FILE_STANDARD_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + case FileInternalInformation: { PFILE_INTERNAL_INFORMATION FileInternalInformation; - + if (Length < sizeof(FILE_INTERNAL_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FileInternalInformation = (PFILE_INTERNAL_INFORMATION) Buffer; - + // The "inode number" FileInternalInformation->IndexNumber.LowPart = Fcb->RfsdMcb->Key.k_dir_id; FileInternalInformation->IndexNumber.HighPart = Fcb->RfsdMcb->Key.k_objectid; - + Irp->IoStatus.Information = sizeof(FILE_INTERNAL_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + case FileEaInformation: { PFILE_EA_INFORMATION FileEaInformation; - + if (Length < sizeof(FILE_EA_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FileEaInformation = (PFILE_EA_INFORMATION) Buffer; - + // Romfs doesn't have any extended attributes FileEaInformation->EaSize = 0; - + Irp->IoStatus.Information = sizeof(FILE_EA_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + case FileNameInformation: { PFILE_NAME_INFORMATION FileNameInformation; - + if (Length < sizeof(FILE_NAME_INFORMATION) + Fcb->RfsdMcb->ShortName.Length - sizeof(WCHAR)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FileNameInformation = (PFILE_NAME_INFORMATION) Buffer; - + FileNameInformation->FileNameLength = Fcb->RfsdMcb->ShortName.Length; - + RtlCopyMemory( FileNameInformation->FileName, Fcb->RfsdMcb->ShortName.Buffer, Fcb->RfsdMcb->ShortName.Length ); - + Irp->IoStatus.Information = sizeof(FILE_NAME_INFORMATION) + Fcb->RfsdMcb->ShortName.Length - sizeof(WCHAR); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + case FilePositionInformation: { PFILE_POSITION_INFORMATION FilePositionInformation; - + if (Length < sizeof(FILE_POSITION_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FilePositionInformation = (PFILE_POSITION_INFORMATION) Buffer; - + FilePositionInformation->CurrentByteOffset = FileObject->CurrentByteOffset; - + Irp->IoStatus.Information = sizeof(FILE_POSITION_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + case FileAllInformation: { PFILE_ALL_INFORMATION FileAllInformation; @@ -304,132 +304,132 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) PFILE_EA_INFORMATION FileEaInformation; PFILE_POSITION_INFORMATION FilePositionInformation; PFILE_NAME_INFORMATION FileNameInformation; - + if (Length < sizeof(FILE_ALL_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FileAllInformation = (PFILE_ALL_INFORMATION) Buffer; - + FileBasicInformation = &FileAllInformation->BasicInformation; - + FileStandardInformation = &FileAllInformation->StandardInformation; - + FileInternalInformation = &FileAllInformation->InternalInformation; - + FileEaInformation = &FileAllInformation->EaInformation; - + FilePositionInformation = &FileAllInformation->PositionInformation; - + FileNameInformation = &FileAllInformation->NameInformation; - + FileBasicInformation->CreationTime = RfsdSysTime(Fcb->Inode->i_ctime); - + FileBasicInformation->LastAccessTime = RfsdSysTime(Fcb->Inode->i_atime); - + FileBasicInformation->LastWriteTime = RfsdSysTime(Fcb->Inode->i_mtime); - + FileBasicInformation->ChangeTime = RfsdSysTime(Fcb->Inode->i_mtime); - + FileBasicInformation->FileAttributes = Fcb->RfsdMcb->FileAttr; - + FileStandardInformation->AllocationSize.QuadPart = AllocationSize; - + FileStandardInformation->EndOfFile.QuadPart = FileSize; - + FileStandardInformation->NumberOfLinks = Fcb->Inode->i_links_count; if (IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY)) FileStandardInformation->DeletePending = FALSE; else FileStandardInformation->DeletePending = IsFlagOn(Fcb->Flags, FCB_DELETE_PENDING); - + if (FlagOn(Fcb->RfsdMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY)) { FileStandardInformation->Directory = TRUE; } else { FileStandardInformation->Directory = FALSE; } - + // The "inode number" FileInternalInformation->IndexNumber.LowPart = Fcb->RfsdMcb->Key.k_dir_id; FileInternalInformation->IndexNumber.HighPart = Fcb->RfsdMcb->Key.k_objectid; - + // Romfs doesn't have any extended attributes FileEaInformation->EaSize = 0; - + FilePositionInformation->CurrentByteOffset = FileObject->CurrentByteOffset; - + if (Length < sizeof(FILE_ALL_INFORMATION) + Fcb->RfsdMcb->ShortName.Length - sizeof(WCHAR)) { Irp->IoStatus.Information = sizeof(FILE_ALL_INFORMATION); Status = STATUS_BUFFER_OVERFLOW; _SEH2_LEAVE; } - + FileNameInformation->FileNameLength = Fcb->RfsdMcb->ShortName.Length; - + RtlCopyMemory( FileNameInformation->FileName, Fcb->RfsdMcb->ShortName.Buffer, Fcb->RfsdMcb->ShortName.Length ); - + Irp->IoStatus.Information = sizeof(FILE_ALL_INFORMATION) + Fcb->RfsdMcb->ShortName.Length - sizeof(WCHAR); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + /* case FileAlternateNameInformation: { // TODO: [ext2fsd] Handle FileAlternateNameInformation - + // Here we would like to use RtlGenerate8dot3Name but I don't // know how to use the argument PGENERATE_NAME_CONTEXT } */ - + case FileNetworkOpenInformation: { PFILE_NETWORK_OPEN_INFORMATION FileNetworkOpenInformation; - + if (Length < sizeof(FILE_NETWORK_OPEN_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FileNetworkOpenInformation = (PFILE_NETWORK_OPEN_INFORMATION) Buffer; - + FileNetworkOpenInformation->CreationTime = RfsdSysTime(Fcb->Inode->i_ctime); - + FileNetworkOpenInformation->LastAccessTime = RfsdSysTime(Fcb->Inode->i_atime); - + FileNetworkOpenInformation->LastWriteTime = RfsdSysTime(Fcb->Inode->i_mtime); - + FileNetworkOpenInformation->ChangeTime = RfsdSysTime(Fcb->Inode->i_mtime); - + FileNetworkOpenInformation->AllocationSize.QuadPart = AllocationSize; - + FileNetworkOpenInformation->EndOfFile.QuadPart = FileSize; - + FileNetworkOpenInformation->FileAttributes = Fcb->RfsdMcb->FileAttr; - + Irp->IoStatus.Information = sizeof(FILE_NETWORK_OPEN_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + default: Status = STATUS_INVALID_INFO_CLASS; } @@ -441,7 +441,7 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) &Fcb->MainResource, ExGetCurrentResourceThread()); } - + if (!IrpContext->ExceptionInProgress) { if (Status == STATUS_PENDING) { RfsdQueueRequest(IrpContext); @@ -450,7 +450,7 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } @@ -482,10 +482,10 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; // @@ -495,22 +495,22 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); ASSERT(IsMounted(Vcb)); FileObject = IrpContext->FileObject; - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + // // This request is not allowed on volumes // @@ -520,7 +520,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); @@ -530,21 +530,21 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) } Ccb = (PRFSD_CCB) FileObject->FsContext2; - + ASSERT(Ccb != NULL); - + ASSERT((Ccb->Identifier.Type == RFSDCCB) && (Ccb->Identifier.Size == sizeof(RFSD_CCB))); - + Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + FileInformationClass = IoStackLocation->Parameters.SetFile.FileInformationClass; - + Length = IoStackLocation->Parameters.SetFile.Length; - + Buffer = Irp->AssociatedIrp.SystemBuffer; if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { @@ -563,7 +563,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + VcbResourceAcquired = TRUE; } @@ -578,10 +578,10 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + FcbMainResourceAcquired = TRUE; } - + if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { if (FileInformationClass != FilePositionInformation) { @@ -605,12 +605,12 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + FcbPagingIoResourceAcquired = TRUE; } - -/* - if (FileInformationClass != FileDispositionInformation + +/* + if (FileInformationClass != FileDispositionInformation && FlagOn(Fcb->Flags, FCB_DELETE_PENDING)) { Status = STATUS_DELETE_PENDING; @@ -623,7 +623,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) #if 0 case FileBasicInformation: { - PFILE_BASIC_INFORMATION FBI = (PFILE_BASIC_INFORMATION) Buffer; + PFILE_BASIC_INFORMATION FBI = (PFILE_BASIC_INFORMATION) Buffer; PRFSD_INODE RfsdInode = Fcb->Inode; if (FBI->CreationTime.QuadPart) { @@ -675,7 +675,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_LEAVE; } - if ( FAI->AllocationSize.QuadPart == + if ( FAI->AllocationSize.QuadPart == Fcb->Header.AllocationSize.QuadPart) { Status = STATUS_SUCCESS; @@ -709,9 +709,9 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) if (NT_SUCCESS(Status)) { - if ( FAI->AllocationSize.QuadPart < + if ( FAI->AllocationSize.QuadPart < Fcb->Header.FileSize.QuadPart) { - Fcb->Header.FileSize.QuadPart = + Fcb->Header.FileSize.QuadPart = FAI->AllocationSize.QuadPart; } @@ -730,7 +730,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) if (NT_SUCCESS(Status)) { - CcSetFileSizes(FileObject, + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); SetFlag(FileObject->Flags, FO_FILE_MODIFIED); @@ -738,7 +738,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) FILE_NOTIFY_CHANGE_LAST_WRITE ; } - + } break; @@ -771,7 +771,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) ASSERT( !FlagOn( FileObject->Flags, FO_CLEANUP_COMPLETE ) ); - CcInitializeCacheMap( + CcInitializeCacheMap( FileObject, (PCC_FILE_SIZES)&(Fcb->Header.AllocationSize), FALSE, @@ -781,12 +781,12 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) CacheInitialized = TRUE; } - if ( FEOFI->EndOfFile.QuadPart == + if ( FEOFI->EndOfFile.QuadPart == Fcb->Header.AllocationSize.QuadPart) { Status = STATUS_SUCCESS; - } else if ( FEOFI->EndOfFile.QuadPart > + } else if ( FEOFI->EndOfFile.QuadPart > Fcb->Header.AllocationSize.QuadPart) { LARGE_INTEGER FileSize = Fcb->Header.FileSize; @@ -797,9 +797,9 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) Fcb->Header.FileSize.QuadPart = FEOFI->EndOfFile.QuadPart; - Fcb->Inode->i_size = FEOFI->EndOfFile.QuadPart; + Fcb->Inode->i_size = FEOFI->EndOfFile.QuadPart; - Fcb->Header.ValidDataLength.QuadPart = + Fcb->Header.ValidDataLength.QuadPart = (LONGLONG)(0x7fffffffffffffff); RfsdSaveInode( IrpContext, @@ -808,15 +808,15 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) Fcb->Inode); - CcSetFileSizes(FileObject, + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); SetFlag(FileObject->Flags, FO_FILE_MODIFIED); - RfsdZeroHoles( IrpContext, - Vcb, FileObject, + RfsdZeroHoles( IrpContext, + Vcb, FileObject, FileSize.QuadPart, - Fcb->Header.AllocationSize.QuadPart - + Fcb->Header.AllocationSize.QuadPart - FileSize.QuadPart ); NotifyFilter = FILE_NOTIFY_CHANGE_SIZE | @@ -829,7 +829,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) LARGE_INTEGER EndOfFile = FEOFI->EndOfFile; - EndOfFile.QuadPart = EndOfFile.QuadPart + + EndOfFile.QuadPart = EndOfFile.QuadPart + (LONGLONG)(Vcb->BlockSize - 1); Status = RfsdTruncateFile(IrpContext, Vcb, Fcb, &(EndOfFile)); @@ -837,14 +837,14 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) if (NT_SUCCESS(Status)) { Fcb->Header.FileSize.QuadPart = FEOFI->EndOfFile.QuadPart; - Fcb->Inode->i_size = FEOFI->EndOfFile.QuadPart; + Fcb->Inode->i_size = FEOFI->EndOfFile.QuadPart; RfsdSaveInode( IrpContext, Vcb, Fcb->RfsdMcb->Inode, Fcb->Inode); - CcSetFileSizes(FileObject, + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); SetFlag(FileObject->Flags, FO_FILE_MODIFIED); @@ -866,7 +866,7 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) case FileDispositionInformation: { PFILE_DISPOSITION_INFORMATION FDI = (PFILE_DISPOSITION_INFORMATION)Buffer; - + Status = RfsdSetDispositionInfo(IrpContext, Vcb, Fcb, FDI->DeleteFile); } @@ -888,42 +888,42 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) case FilePositionInformation: { PFILE_POSITION_INFORMATION FilePositionInformation; - + if (Length < sizeof(FILE_POSITION_INFORMATION)) { Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + FilePositionInformation = (PFILE_POSITION_INFORMATION) Buffer; - + if ((FlagOn(FileObject->Flags, FO_NO_INTERMEDIATE_BUFFERING)) && (FilePositionInformation->CurrentByteOffset.LowPart & DeviceObject->AlignmentRequirement) ) { Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + FileObject->CurrentByteOffset = FilePositionInformation->CurrentByteOffset; - + Status = STATUS_SUCCESS; _SEH2_LEAVE; } break; - + default: Status = STATUS_INVALID_INFO_CLASS; } } _SEH2_FINALLY { - + if (FcbPagingIoResourceAcquired) { ExReleaseResourceForThreadLite( &Fcb->PagingIoResource, ExGetCurrentResourceThread() ); } - + if (NT_SUCCESS(Status) && (NotifyFilter != 0)) { RfsdNotifyReportChange( IrpContext, @@ -939,13 +939,13 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) &Fcb->MainResource, ExGetCurrentResourceThread() ); } - + if (VcbResourceAcquired) { ExReleaseResourceForThreadLite( &Vcb->MainResource, ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { if (Status == STATUS_PENDING) { RfsdQueueRequest(IrpContext); @@ -954,14 +954,14 @@ RfsdSetInformation (IN PRFSD_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } #if !RFSD_READ_ONLY NTSTATUS -RfsdExpandFile( PRFSD_IRP_CONTEXT IrpContext, +RfsdExpandFile( PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb, PRFSD_FCB Fcb, PLARGE_INTEGER AllocationSize) { @@ -983,7 +983,7 @@ RfsdExpandFile( PRFSD_IRP_CONTEXT IrpContext, while (NT_SUCCESS(Status) && (AllocationSize->QuadPart > Fcb->Header.AllocationSize.QuadPart)) { Status = RfsdExpandInode(IrpContext, Vcb, Fcb, &dwRet); } - + return Status; } @@ -1019,10 +1019,10 @@ RfsdSetDispositionInfo( IrpSp = IoGetCurrentIrpStackLocation(Irp); RfsdPrint((DBG_INFO, "RfsdSetDispositionInfo: bDelete=%x\n", bDelete)); - + if (bDelete) { - RfsdPrint((DBG_INFO, "RfsdSetDispositionInformation: MmFlushImageSection on %s.\n", + RfsdPrint((DBG_INFO, "RfsdSetDispositionInformation: MmFlushImageSection on %s.\n", Fcb->AnsiFileName.Buffer)); if (!MmFlushImageSection( &Fcb->SectionObject, @@ -1078,7 +1078,7 @@ RfsdSetRenameInfo( RFSD_INODE Inode; UNICODE_STRING FileName; - + NTSTATUS Status; PIRP Irp; @@ -1131,7 +1131,7 @@ RfsdSetRenameInfo( TargetDcb = NULL; TargetMcb = Fcb->RfsdMcb->Parent; - + if (FileName.Length >= RFSD_NAME_LEN*sizeof(USHORT)) { Status = STATUS_OBJECT_NAME_INVALID; goto errorout; @@ -1193,7 +1193,7 @@ RfsdSetRenameInfo( &FileName, TargetMcb, &Mcb, - &Inode ); + &Inode ); if (NT_SUCCESS(Status)) { @@ -1212,7 +1212,7 @@ RfsdSetRenameInfo( if (IsDirectory(Fcb)) { - Status = RfsdRemoveEntry( IrpContext, Vcb, + Status = RfsdRemoveEntry( IrpContext, Vcb, Fcb->RfsdMcb->Parent->RfsdFcb, RFSD_FT_DIR, Fcb->RfsdMcb->Inode ); @@ -1223,7 +1223,7 @@ RfsdSetRenameInfo( goto errorout; } - Status = RfsdAddEntry( IrpContext, Vcb, + Status = RfsdAddEntry( IrpContext, Vcb, TargetDcb, RFSD_FT_DIR, Fcb->RfsdMcb->Inode, @@ -1233,7 +1233,7 @@ RfsdSetRenameInfo( DbgBreak(); - RfsdAddEntry( IrpContext, Vcb, + RfsdAddEntry( IrpContext, Vcb, Fcb->RfsdMcb->Parent->RfsdFcb, RFSD_FT_DIR, Fcb->RfsdMcb->Inode, @@ -1243,7 +1243,7 @@ RfsdSetRenameInfo( } if( !RfsdSaveInode( IrpContext, - Vcb, + Vcb, TargetMcb->Inode, TargetDcb->Inode)) { Status = STATUS_UNSUCCESSFUL; @@ -1254,7 +1254,7 @@ RfsdSetRenameInfo( } if( !RfsdSaveInode( IrpContext, - Vcb, + Vcb, Fcb->RfsdMcb->Parent->Inode, Fcb->RfsdMcb->Parent->RfsdFcb->Inode)) { @@ -1296,7 +1296,7 @@ RfsdSetRenameInfo( DbgBreak(); - RfsdAddEntry( IrpContext, Vcb, + RfsdAddEntry( IrpContext, Vcb, Fcb->RfsdMcb->Parent->RfsdFcb, RFSD_FT_REG_FILE, Fcb->RfsdMcb->Inode, @@ -1311,7 +1311,7 @@ RfsdSetRenameInfo( if (Fcb->RfsdMcb->ShortName.MaximumLength < (FileName.Length + 2)) { ExFreePool(Fcb->RfsdMcb->ShortName.Buffer); - Fcb->RfsdMcb->ShortName.Buffer = + Fcb->RfsdMcb->ShortName.Buffer = ExAllocatePoolWithTag(PagedPool, FileName.Length + 2, RFSD_POOL_TAG); if (!Fcb->RfsdMcb->ShortName.Buffer) { @@ -1331,8 +1331,8 @@ RfsdSetRenameInfo( Fcb->RfsdMcb->ShortName.Length = FileName.Length; } - -#if DBG + +#if DBG Fcb->AnsiFileName.Length = (USHORT) RfsdUnicodeToOEMSize(&FileName) + 1; @@ -1340,7 +1340,7 @@ RfsdSetRenameInfo( if (Fcb->AnsiFileName.MaximumLength < FileName.Length) { ExFreePool(Fcb->AnsiFileName.Buffer); - Fcb->AnsiFileName.Buffer = + Fcb->AnsiFileName.Buffer = ExAllocatePoolWithTag(PagedPool, Fcb->AnsiFileName.Length + 1, RFSD_POOL_TAG); if (!Fcb->AnsiFileName.Buffer) { @@ -1348,9 +1348,9 @@ RfsdSetRenameInfo( goto errorout; } - RtlZeroMemory( Fcb->AnsiFileName.Buffer, + RtlZeroMemory( Fcb->AnsiFileName.Buffer, Fcb->AnsiFileName.Length + 1); - Fcb->AnsiFileName.MaximumLength = + Fcb->AnsiFileName.MaximumLength = Fcb->AnsiFileName.Length + 1; } @@ -1438,7 +1438,7 @@ RfsdDeleteFile( if (FlagOn(Fcb->RfsdMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY)) { if (!RfsdIsDirectoryEmpty(Vcb, Fcb)) { ClearFlag(Fcb->Flags, FCB_DELETE_PENDING); - + return STATUS_DIRECTORY_NOT_EMPTY; } } @@ -1466,7 +1466,7 @@ RfsdDeleteFile( if (Fcb->RfsdMcb->Parent->RfsdFcb) { Status = RfsdRemoveEntry( - IrpContext, Vcb, + IrpContext, Vcb, Fcb->RfsdMcb->Parent->RfsdFcb, (FlagOn(Fcb->RfsdMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY) ? RFSD_FT_DIR : RFSD_FT_REG_FILE), @@ -1501,8 +1501,8 @@ RfsdDeleteFile( Fcb->Header.FileSize.QuadPart = Fcb->Header.AllocationSize.QuadPart; Fcb->Inode->i_size = Fcb->Header.AllocationSize.QuadPart; } - - Fcb->Inode->i_links_count = 0; + + Fcb->Inode->i_links_count = 0; RfsdSaveInode(IrpContext, Vcb, Fcb->RfsdMcb->Inode, Fcb->Inode); diff --git a/drivers/filesystems/reiserfs/src/flush.c b/drivers/filesystems/reiserfs/src/flush.c index 639f6db86b2..8a906fde926 100644 --- a/drivers/filesystems/reiserfs/src/flush.c +++ b/drivers/filesystems/reiserfs/src/flush.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: flush.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -123,18 +123,18 @@ RfsdFlushFile (IN PRFSD_FCB Fcb) PAGED_CODE(); ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); if (IsDirectory(Fcb)) return STATUS_SUCCESS; - RfsdPrint((DBG_INFO, "RfsdFlushFile: Flushing File Key=%x,%xh %S ...\n", + RfsdPrint((DBG_INFO, "RfsdFlushFile: Flushing File Key=%x,%xh %S ...\n", Fcb->RfsdMcb->Key.k_dir_id, Fcb->RfsdMcb->Key.k_objectid, Fcb->RfsdMcb->ShortName.Buffer)); /* { - ULONG ResShCnt, ResExCnt; + ULONG ResShCnt, ResExCnt; ResShCnt = ExIsResourceAcquiredSharedLite(&Fcb->PagingIoResource); ResExCnt = ExIsResourceAcquiredExclusiveLite(&Fcb->PagingIoResource); @@ -170,12 +170,12 @@ RfsdFlush (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); DeviceObject = IrpContext->DeviceObject; - + // // This request is not allowed on the main device object // @@ -183,9 +183,9 @@ RfsdFlush (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); ASSERT((Vcb->Identifier.Type == RFSDVCB) && @@ -200,13 +200,13 @@ RfsdFlush (IN PRFSD_IRP_CONTEXT IrpContext) } Irp = IrpContext->Irp; - + IrpSp = IoGetCurrentIrpStackLocation(Irp); FileObject = IrpContext->FileObject; - + FcbOrVcb = (PRFSD_FCBVCB) FileObject->FsContext; - + ASSERT(FcbOrVcb != NULL); #ifdef _MSC_VER @@ -218,7 +218,7 @@ RfsdFlush (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + MainResourceAcquired = TRUE; if (FcbOrVcb->Identifier.Type == RFSDVCB) { diff --git a/drivers/filesystems/reiserfs/src/fsctl.c b/drivers/filesystems/reiserfs/src/fsctl.c index 9e2e5215b5c..38ed3060b5b 100644 --- a/drivers/filesystems/reiserfs/src/fsctl.c +++ b/drivers/filesystems/reiserfs/src/fsctl.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: fsctl.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -50,11 +50,11 @@ RfsdSetVpbFlag ( IN USHORT Flag ) { KIRQL OldIrql; - + IoAcquireVpbSpinLock(&OldIrql); - + Vpb->Flags |= Flag; - + IoReleaseVpbSpinLock(OldIrql); } @@ -64,11 +64,11 @@ RfsdClearVpbFlag ( IN USHORT Flag ) { KIRQL OldIrql; - + IoAcquireVpbSpinLock(&OldIrql); - + Vpb->Flags &= ~Flag; - + IoReleaseVpbSpinLock(OldIrql); } @@ -112,42 +112,42 @@ RfsdLockVcb (IN PRFSD_VCB Vcb, if (FlagOn(Vcb->Flags, VCB_VOLUME_LOCKED)) { RfsdPrint((DBG_INFO, "RfsdLockVolume: Volume is already locked.\n")); - + Status = STATUS_ACCESS_DENIED; - + _SEH2_LEAVE; } - + if (Vcb->OpenFileHandleCount > (ULONG)(FileObject ? 1 : 0)) { RfsdPrint((DBG_INFO, "RfsdLockVcb: There are still opened files.\n")); - + Status = STATUS_ACCESS_DENIED; - + _SEH2_LEAVE; } - + if (!RfsdIsHandleCountZero(Vcb)) { RfsdPrint((DBG_INFO, "RfsdLockVcb: Thare are still opened files.\n")); - + Status = STATUS_ACCESS_DENIED; - + _SEH2_LEAVE; } - + SetFlag(Vcb->Flags, VCB_VOLUME_LOCKED); - + RfsdSetVpbFlag(Vcb->Vpb, VPB_LOCKED); Vcb->LockFile = FileObject; - + RfsdPrint((DBG_INFO, "RfsdLockVcb: Volume locked.\n")); - + Status = STATUS_SUCCESS; } _SEH2_FINALLY { // Nothing } _SEH2_END; - + return Status; } @@ -166,12 +166,12 @@ RfsdLockVolume (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + Status = STATUS_UNSUCCESSFUL; // @@ -181,9 +181,9 @@ RfsdLockVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); ASSERT((Vcb->Identifier.Type == RFSDVCB) && @@ -199,10 +199,10 @@ RfsdLockVolume (IN PRFSD_IRP_CONTEXT IrpContext) ExAcquireResourceExclusiveLite( &Vcb->MainResource, TRUE ); - + VcbResourceAcquired = TRUE; - Status = RfsdLockVcb(Vcb, IrpSp->FileObject); + Status = RfsdLockVcb(Vcb, IrpSp->FileObject); } _SEH2_FINALLY { @@ -212,12 +212,12 @@ RfsdLockVolume (IN PRFSD_IRP_CONTEXT IrpContext) ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -236,7 +236,7 @@ RfsdUnlockVcb ( IN PRFSD_VCB Vcb, Status = STATUS_NOT_LOCKED; _SEH2_LEAVE; } - + if (!FlagOn(Vcb->Flags, VCB_VOLUME_LOCKED)) { RfsdPrint((DBG_ERROR, ": RfsdUnlockVcb: Volume is not locked.\n")); Status = STATUS_NOT_LOCKED; @@ -246,11 +246,11 @@ RfsdUnlockVcb ( IN PRFSD_VCB Vcb, if (Vcb->LockFile == FileObject) { ClearFlag(Vcb->Flags, VCB_VOLUME_LOCKED); - + RfsdClearVpbFlag(Vcb->Vpb, VPB_LOCKED); - + RfsdPrint((DBG_INFO, "RfsdUnlockVcb: Volume unlocked.\n")); - + Status = STATUS_SUCCESS; } else { Status = STATUS_NOT_LOCKED; @@ -280,12 +280,12 @@ RfsdUnlockVolume ( _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + // // This request is not allowed on the main device object // @@ -293,11 +293,11 @@ RfsdUnlockVolume ( Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); @@ -308,7 +308,7 @@ RfsdUnlockVolume ( ExAcquireResourceExclusiveLite( &Vcb->MainResource, TRUE ); - + VcbResourceAcquired = TRUE; Status = RfsdUnlockVcb(Vcb, IrpSp->FileObject); @@ -321,12 +321,12 @@ RfsdUnlockVolume ( ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -414,7 +414,7 @@ RfsdInvalidateVolumes ( IN PRFSD_IRP_CONTEXT IrpContext ) RfsdPurgeVolume(Vcb, FALSE); ClearFlag(Vcb->Flags, VCB_MOUNTED); ExReleaseResourceLite(&Vcb->MainResource); - + // // Vcb is still attached on the list ...... // @@ -456,7 +456,7 @@ RfsdAllowExtendedDasdIo(IN PRFSD_IRP_CONTEXT IrpContext) Ccb = (PRFSD_CCB) IrpSp->FileObject->FsContext2; ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); @@ -485,14 +485,14 @@ RfsdUserFsRequest (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + #ifndef _GNU_NTIFS_ FsControlCode = IoStackLocation->Parameters.FileSystemControl.FsControlCode; @@ -500,21 +500,21 @@ RfsdUserFsRequest (IN PRFSD_IRP_CONTEXT IrpContext) FsControlCode = ((PEXTENDED_IO_STACK_LOCATION) IoStackLocation)->Parameters.FileSystemControl.FsControlCode; #endif - + switch (FsControlCode) { case FSCTL_LOCK_VOLUME: Status = RfsdLockVolume(IrpContext); break; - + case FSCTL_UNLOCK_VOLUME: Status = RfsdUnlockVolume(IrpContext); break; - + case FSCTL_DISMOUNT_VOLUME: Status = RfsdDismountVolume(IrpContext); break; - + case FSCTL_IS_VOLUME_MOUNTED: Status = RfsdIsVolumeMounted(IrpContext); break; @@ -528,7 +528,7 @@ RfsdUserFsRequest (IN PRFSD_IRP_CONTEXT IrpContext) Status = RfsdAllowExtendedDasdIo(IrpContext); break; #endif //(_WIN32_WINNT >= 0x0500) - + default: RfsdPrint((DBG_ERROR, "RfsdUserFsRequest: Invalid User Request: %xh.\n", FsControlCode)); @@ -536,7 +536,7 @@ RfsdUserFsRequest (IN PRFSD_IRP_CONTEXT IrpContext) RfsdCompleteIrpContext(IrpContext, Status); } - + return Status; } @@ -609,10 +609,10 @@ RfsdMountVolume (IN PRFSD_IRP_CONTEXT IrpContext) ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + MainDeviceObject = IrpContext->DeviceObject; // @@ -628,22 +628,22 @@ RfsdMountVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + ExAcquireResourceExclusiveLite( &(RfsdGlobal->Resource), TRUE ); - + GlobalDataResourceAcquired = TRUE; - + if (FlagOn(RfsdGlobal->Flags, RFSD_UNLOAD_PENDING)) { Status = STATUS_UNRECOGNIZED_VOLUME; _SEH2_LEAVE; } - + Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + TargetDeviceObject = IoStackLocation->Parameters.MountVolume.DeviceObject; @@ -655,11 +655,11 @@ RfsdMountVolume (IN PRFSD_IRP_CONTEXT IrpContext) 0, &DiskGeometry, &dwBytes ); - + if (!NT_SUCCESS(Status)) { _SEH2_LEAVE; } - + Status = IoCreateDevice( MainDeviceObject->DriverObject, sizeof(RFSD_VCB), @@ -668,27 +668,27 @@ RfsdMountVolume (IN PRFSD_IRP_CONTEXT IrpContext) 0, FALSE, &VolumeDeviceObject ); - + if (!NT_SUCCESS(Status)) { _SEH2_LEAVE; } VolumeDeviceObject->StackSize = (CCHAR)(TargetDeviceObject->StackSize + 1); - if (TargetDeviceObject->AlignmentRequirement > + if (TargetDeviceObject->AlignmentRequirement > VolumeDeviceObject->AlignmentRequirement) { - VolumeDeviceObject->AlignmentRequirement = + VolumeDeviceObject->AlignmentRequirement = TargetDeviceObject->AlignmentRequirement; } (IoStackLocation->Parameters.MountVolume.Vpb)->DeviceObject = VolumeDeviceObject; - + Vcb = (PRFSD_VCB) VolumeDeviceObject->DeviceExtension; RtlZeroMemory(Vcb, sizeof(RFSD_VCB)); - + Vcb->Identifier.Type = RFSDVCB; Vcb->Identifier.Size = sizeof(RFSD_VCB); @@ -709,12 +709,12 @@ RfsdMountVolume (IN PRFSD_IRP_CONTEXT IrpContext) if (!NT_SUCCESS(Status)) { _SEH2_LEAVE; } - + Vcb->BlockSize = RfsdSb->s_blocksize; // NOTE: FFS also does this here, since LoadGroup is not called in the non-ext2 drivers Vcb->GroupDesc = NULL; // NOTE: GroupDesc is not used for ReiserFS. Setting it to NULL will keep other code from barfing. // Vcb->SectorBits = RFSDLog(SECTOR_SIZE); // NOTE: SectorBits are unused for ReiserFS - - Status = RfsdInitializeVcb(IrpContext, Vcb, RfsdSb, TargetDeviceObject, + + Status = RfsdInitializeVcb(IrpContext, Vcb, RfsdSb, TargetDeviceObject, VolumeDeviceObject, IoStackLocation->Parameters.MountVolume.Vpb); if (NT_SUCCESS(Status)) { @@ -749,7 +749,7 @@ RfsdMountVolume (IN PRFSD_IRP_CONTEXT IrpContext) IoDeleteDevice(VolumeDeviceObject); } } - + if (!IrpContext->ExceptionInProgress) { if (NT_SUCCESS(Status)) { ClearFlag(VolumeDeviceObject->Flags, DO_DEVICE_INITIALIZING); @@ -757,7 +757,7 @@ RfsdMountVolume (IN PRFSD_IRP_CONTEXT IrpContext) RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -782,10 +782,10 @@ RfsdVerifyVolume (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; // // This request is not allowed on the main device object @@ -798,22 +798,22 @@ RfsdVerifyVolume (IN PRFSD_IRP_CONTEXT IrpContext) ExAcquireResourceExclusiveLite( &RfsdGlobal->Resource, TRUE ); - + GlobalResourceAcquired = TRUE; - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); ExAcquireResourceExclusiveLite( &Vcb->MainResource, TRUE ); - + VcbResourceAcquired = TRUE; - + if (!FlagOn(Vcb->TargetDeviceObject->Flags, DO_VERIFY_VOLUME)) { Status = STATUS_SUCCESS; _SEH2_LEAVE; @@ -837,11 +837,11 @@ RfsdVerifyVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_WRONG_VOLUME; _SEH2_LEAVE; } - + Irp = IrpContext->Irp; IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + rfsd_sb = RfsdLoadSuper(Vcb, TRUE); // FUTURE: use the volume name and uuid from the extended superblock to make this happen. @@ -856,7 +856,7 @@ RfsdVerifyVolume (IN PRFSD_IRP_CONTEXT IrpContext) } else { ClearFlag(Vcb->Flags, VCB_WRITE_PROTECTED); } - + RfsdPrint((DBG_INFO, "RfsdVerifyVolume: Volume verify succeeded.\n")); Status = STATUS_SUCCESS; @@ -864,11 +864,11 @@ RfsdVerifyVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_WRONG_VOLUME; RfsdPurgeVolume(Vcb, FALSE); - + SetFlag(Vcb->Flags, VCB_DISMOUNT_PENDING); - + ClearFlag(Vcb->TargetDeviceObject->Flags, DO_VERIFY_VOLUME); - + RfsdPrint((DBG_INFO, "RfsdVerifyVolume: Volume verify failed.\n")); } @@ -889,12 +889,12 @@ RfsdVerifyVolume (IN PRFSD_IRP_CONTEXT IrpContext) &RfsdGlobal->Resource, ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -926,10 +926,10 @@ RfsdDismountVolume (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; // @@ -939,11 +939,11 @@ RfsdDismountVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); @@ -952,7 +952,7 @@ RfsdDismountVolume (IN PRFSD_IRP_CONTEXT IrpContext) ExAcquireResourceExclusiveLite( &Vcb->MainResource, TRUE ); - + VcbResourceAcquired = TRUE; if ( IsFlagOn(Vcb->Flags, VCB_DISMOUNT_PENDING)) { @@ -960,12 +960,12 @@ RfsdDismountVolume (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_LEAVE; } -/* +/* if (!FlagOn(Vcb->Flags, VCB_VOLUME_LOCKED)) { RfsdPrint((DBG_ERROR, "RfsdDismount: Volume is not locked.\n")); - + Status = STATUS_ACCESS_DENIED; - + _SEH2_LEAVE; } */ @@ -996,12 +996,12 @@ RfsdDismountVolume (IN PRFSD_IRP_CONTEXT IrpContext) ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -1095,10 +1095,10 @@ RfsdPurgeVolume (IN PRFSD_VCB Vcb, _SEH2_TRY { ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); - + if ( IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || IsFlagOn(Vcb->Flags, VCB_WRITE_PROTECTED)) { FlushBeforePurge = FALSE; @@ -1106,7 +1106,7 @@ RfsdPurgeVolume (IN PRFSD_VCB Vcb, FcbListEntry= NULL; InitializeListHead(&FcbList); - + for (ListEntry = Vcb->FcbList.Flink; ListEntry != &Vcb->FcbList; ListEntry = ListEntry->Flink ) { @@ -1116,25 +1116,25 @@ RfsdPurgeVolume (IN PRFSD_VCB Vcb, Fcb->ReferenceCount++; RfsdPrint((DBG_INFO, "RfsdPurgeVolume: %s refercount=%xh\n", Fcb->AnsiFileName.Buffer, Fcb->ReferenceCount)); - + FcbListEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FCB_LIST_ENTRY), RFSD_POOL_TAG); if (FcbListEntry) { FcbListEntry->Fcb = Fcb; - + InsertTailList(&FcbList, &FcbListEntry->Next); } else { RfsdPrint((DBG_ERROR, "RfsdPurgeVolume: Error allocating FcbListEntry ...\n")); } } - + while (!IsListEmpty(&FcbList)) { ListEntry = RemoveHeadList(&FcbList); - + FcbListEntry = CONTAINING_RECORD(ListEntry, FCB_LIST_ENTRY, Next); - + Fcb = FcbListEntry->Fcb; if (ExAcquireResourceExclusiveLite( @@ -1152,7 +1152,7 @@ RfsdPurgeVolume (IN PRFSD_VCB Vcb, ExGetCurrentResourceThread()); } } - + ExFreePool(FcbListEntry); } @@ -1166,11 +1166,11 @@ RfsdPurgeVolume (IN PRFSD_VCB Vcb, if (Vcb->SectionObject.ImageSectionObject) { MmFlushImageSection(&Vcb->SectionObject, MmFlushForWrite); } - + if (Vcb->SectionObject.DataSectionObject) { CcPurgeCacheSection(&Vcb->SectionObject, NULL, 0, FALSE); } - + RfsdPrint((DBG_INFO, "RfsdPurgeVolume: Volume flushed and purged.\n")); } _SEH2_FINALLY { @@ -1190,15 +1190,15 @@ RfsdPurgeFile ( IN PRFSD_FCB Fcb, PAGED_CODE(); ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - + if( !IsFlagOn(Fcb->Vcb->Flags, VCB_READ_ONLY) && FlushBeforePurge && !IsFlagOn(Fcb->Vcb->Flags, VCB_WRITE_PROTECTED)) { - RfsdPrint((DBG_INFO, "RfsdPurgeFile: CcFlushCache on %s.\n", + RfsdPrint((DBG_INFO, "RfsdPurgeFile: CcFlushCache on %s.\n", Fcb->AnsiFileName.Buffer)); ExAcquireSharedStarveExclusive(&Fcb->PagingIoResource, TRUE); @@ -1208,15 +1208,15 @@ RfsdPurgeFile ( IN PRFSD_FCB Fcb, ClearFlag(Fcb->Flags, FCB_FILE_MODIFIED); } - + if (Fcb->SectionObject.ImageSectionObject) { - RfsdPrint((DBG_INFO, "RfsdPurgeFile: MmFlushImageSection on %s.\n", + RfsdPrint((DBG_INFO, "RfsdPurgeFile: MmFlushImageSection on %s.\n", Fcb->AnsiFileName.Buffer)); - + MmFlushImageSection(&Fcb->SectionObject, MmFlushForWrite); } - + if (Fcb->SectionObject.DataSectionObject) { RfsdPrint((DBG_INFO, "RfsdPurgeFile: CcPurgeCacheSection on %s.\n", @@ -1237,30 +1237,30 @@ RfsdFileSystemControl (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + switch (IrpContext->MinorFunction) { case IRP_MN_USER_FS_REQUEST: Status = RfsdUserFsRequest(IrpContext); break; - + case IRP_MN_MOUNT_VOLUME: Status = RfsdMountVolume(IrpContext); break; - + case IRP_MN_VERIFY_VOLUME: Status = RfsdVerifyVolume(IrpContext); break; - + default: RfsdPrint((DBG_ERROR, "RfsdFilsSystemControl: Invalid Device Request.\n")); Status = STATUS_INVALID_DEVICE_REQUEST; RfsdCompleteIrpContext(IrpContext, Status); } - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/init.c b/drivers/filesystems/reiserfs/src/init.c index fa6a7544c9a..2d987925358 100644 --- a/drivers/filesystems/reiserfs/src/init.c +++ b/drivers/filesystems/reiserfs/src/init.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: init.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -263,10 +263,10 @@ DriverEntry ( " " __DATE__ " " __TIME__ "\nCopyright (C) 1999-2015 Mark Piper, Matt Wu, Bo Branten.\n"); - RfsdPrint((DBG_FUNC, "Rfsd DriverEntry ...\n")); + RfsdPrint((DBG_FUNC, "Rfsd DriverEntry ...\n")); RtlInitUnicodeString(&DeviceName, DEVICE_NAME); - + Status = IoCreateDevice( DriverObject, sizeof(RFSDFS_EXT), @@ -275,7 +275,7 @@ DriverEntry ( 0, FALSE, &DeviceObject ); - + if (!NT_SUCCESS(Status)) { RfsdPrint((DBG_ERROR, "IoCreateDevice fs object error.\n")); return Status; @@ -283,7 +283,7 @@ DriverEntry ( DeviceExt = (PRFSDFS_EXT) DeviceObject->DeviceExtension; RtlZeroMemory(DeviceExt, sizeof(RFSDFS_EXT)); - + RfsdGlobal = &(DeviceExt->RfsdGlobal); RfsdGlobal->Identifier.Type = RFSDFGD; @@ -332,7 +332,7 @@ DriverEntry ( // Initialize the fast I/O entry points // FastIoDispatch = &(RfsdGlobal->FastIoDispatch); - + FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); FastIoDispatch->FastIoCheckIfPossible = RfsdFastIoCheckIfPossible; #if DBG diff --git a/drivers/filesystems/reiserfs/src/lockctl.c b/drivers/filesystems/reiserfs/src/lockctl.c index f8ecccc9b25..0e84b34635c 100644 --- a/drivers/filesystems/reiserfs/src/lockctl.c +++ b/drivers/filesystems/reiserfs/src/lockctl.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: lockctl.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -37,44 +37,44 @@ RfsdLockControl (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + if (DeviceObject == RfsdGlobal->DeviceObject) { CompleteRequest = TRUE; Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + FileObject = IrpContext->FileObject; - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb != NULL); - + if (Fcb->Identifier.Type == RFSDVCB) { CompleteRequest = TRUE; Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); - + if (FlagOn(Fcb->RfsdMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY)) { CompleteRequest = TRUE; Status = STATUS_INVALID_PARAMETER; _SEH2_LEAVE; } - + Irp = IrpContext->Irp; - + // // While the file has any byte range locks we set IsFastIoPossible to // FastIoIsQuestionable so that the FastIoCheckIfPossible function is @@ -91,21 +91,21 @@ RfsdLockControl (IN PRFSD_IRP_CONTEXT IrpContext) Fcb->Header.IsFastIoPossible = FastIoIsQuestionable; } - + // // FsRtlProcessFileLock acquires FileObject->FsContext->Resource while // modifying the file locks and calls IoCompleteRequest when it's done. // - + CompleteRequest = FALSE; - + Status = FsRtlProcessFileLock( &Fcb->FileLockAnchor, Irp, NULL ); - + if (!NT_SUCCESS(Status)) { - RfsdPrint((DBG_ERROR, + RfsdPrint((DBG_ERROR, "RfsdLockControl: %-16.16s %-31s *** Status: %s (%#x) ***\n", RfsdGetCurrentProcessName(), "IRP_MJ_LOCK_CONTROL", @@ -119,10 +119,10 @@ RfsdLockControl (IN PRFSD_IRP_CONTEXT IrpContext) if (!CompleteRequest) { IrpContext->Irp = NULL; } - + RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/memory.c b/drivers/filesystems/reiserfs/src/memory.c index 3bbdde5f6ee..8e1ab84588d 100644 --- a/drivers/filesystems/reiserfs/src/memory.c +++ b/drivers/filesystems/reiserfs/src/memory.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: memory.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -55,9 +55,9 @@ RfsdAllocateIrpContext (IN PDEVICE_OBJECT DeviceObject, ASSERT(DeviceObject != NULL); ASSERT(Irp != NULL); - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + ExAcquireResourceExclusiveLite( &RfsdGlobal->LAResource, TRUE ); @@ -92,28 +92,28 @@ RfsdAllocateIrpContext (IN PDEVICE_OBJECT DeviceObject, RtlZeroMemory(IrpContext, sizeof(RFSD_IRP_CONTEXT) ); } - + if (!IrpContext) { return NULL; } - + IrpContext->Identifier.Type = RFSDICX; IrpContext->Identifier.Size = sizeof(RFSD_IRP_CONTEXT); - + IrpContext->Irp = Irp; - + IrpContext->MajorFunction = IoStackLocation->MajorFunction; IrpContext->MinorFunction = IoStackLocation->MinorFunction; - + IrpContext->DeviceObject = DeviceObject; - + IrpContext->FileObject = IoStackLocation->FileObject; if (IrpContext->FileObject != NULL) { IrpContext->RealDevice = IrpContext->FileObject->DeviceObject; } else if (IrpContext->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) { if (IoStackLocation->Parameters.MountVolume.Vpb) { - IrpContext->RealDevice = + IrpContext->RealDevice = IoStackLocation->Parameters.MountVolume.Vpb->RealDevice; } } @@ -139,7 +139,7 @@ RfsdAllocateIrpContext (IN PDEVICE_OBJECT DeviceObject, IrpContext->IsSynchronous = IoIsOperationSynchronous(Irp); } -#if 0 +#if 0 // // Temporary workaround for a bug in close that makes it reference a // fileobject when it is no longer valid. @@ -148,11 +148,11 @@ RfsdAllocateIrpContext (IN PDEVICE_OBJECT DeviceObject, IrpContext->IsSynchronous = TRUE; } #endif - + IrpContext->IsTopLevel = (IoGetTopLevelIrp() == Irp); - + IrpContext->ExceptionInProgress = FALSE; - + return IrpContext; } @@ -163,7 +163,7 @@ RfsdCompleteIrpContext ( { PIRP Irp = NULL; BOOLEAN bPrint; - + Irp = IrpContext->Irp; if (Irp != NULL) { @@ -171,7 +171,7 @@ RfsdCompleteIrpContext ( if (NT_ERROR(Status)) { Irp->IoStatus.Information = 0; } - + Irp->IoStatus.Status = Status; bPrint = !IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_REQUEUED); @@ -179,7 +179,7 @@ RfsdCompleteIrpContext ( Irp, bPrint, (CCHAR)(NT_SUCCESS(Status)? IO_DISK_INCREMENT : IO_NO_INCREMENT) ); - IrpContext->Irp = NULL; + IrpContext->Irp = NULL; } RfsdFreeIrpContext(IrpContext); @@ -194,7 +194,7 @@ RfsdFreeIrpContext (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); @@ -346,7 +346,7 @@ RfsdUnpinRepinnedBcbs ( } } - if (Repinned != &IrpContext->Repinned) + if (Repinned != &IrpContext->Repinned) { PRFSD_REPINNED_BCBS Saved; @@ -412,7 +412,7 @@ RfsdAllocateFcb (IN PRFSD_VCB Vcb, if (!Fcb) { return NULL; } - + Fcb->Identifier.Type = RFSDFCB; Fcb->Identifier.Size = sizeof(RFSD_FCB); @@ -420,18 +420,18 @@ RfsdAllocateFcb (IN PRFSD_VCB Vcb, &Fcb->FileLockAnchor, NULL, NULL ); - + Fcb->OpenHandleCount = 0; Fcb->ReferenceCount = 0; - + Fcb->Vcb = Vcb; -#if DBG +#if DBG Fcb->AnsiFileName.MaximumLength = (USHORT) RfsdUnicodeToOEMSize(&(RfsdMcb->ShortName)) + 1; - Fcb->AnsiFileName.Buffer = (PUCHAR) + Fcb->AnsiFileName.Buffer = (PUCHAR) ExAllocatePoolWithTag(PagedPool, Fcb->AnsiFileName.MaximumLength, RFSD_POOL_TAG); if (!Fcb->AnsiFileName.Buffer) { @@ -446,23 +446,23 @@ RfsdAllocateFcb (IN PRFSD_VCB Vcb, #endif RfsdMcb->FileAttr = FILE_ATTRIBUTE_NORMAL; - + if (S_ISDIR(Inode->i_mode)) { SetFlag(RfsdMcb->FileAttr, FILE_ATTRIBUTE_DIRECTORY); } - if ( IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || + if ( IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || RfsdIsReadOnly(Inode->i_mode)) { SetFlag(RfsdMcb->FileAttr, FILE_ATTRIBUTE_READONLY); } - + Fcb->Inode = Inode; Fcb->RfsdMcb = RfsdMcb; RfsdMcb->RfsdFcb = Fcb; - + RtlZeroMemory(&Fcb->Header, sizeof(FSRTL_COMMON_FCB_HEADER)); - + Fcb->Header.NodeTypeCode = (USHORT) RFSDFCB; Fcb->Header.NodeByteSize = sizeof(RFSD_FCB); Fcb->Header.IsFastIoPossible = FastIoIsNotPossible; @@ -472,13 +472,13 @@ RfsdAllocateFcb (IN PRFSD_VCB Vcb, // NOTE: In EXT2, the low part was stored in i_size (a 32-bit value); the high part would be stored in the acl field... // However, on ReiserFS, the i_size is a 64-bit value. Fcb->Header.FileSize.QuadPart = Fcb->Inode->i_size; - - Fcb->Header.AllocationSize.QuadPart = + + Fcb->Header.AllocationSize.QuadPart = CEILING_ALIGNED(Fcb->Header.FileSize.QuadPart, (ULONGLONG)Vcb->BlockSize); Fcb->Header.ValidDataLength.QuadPart = (LONGLONG)(0x7fffffffffffffff); - + Fcb->SectionObject.DataSectionObject = NULL; Fcb->SectionObject.SharedCacheMap = NULL; Fcb->SectionObject.ImageSectionObject = NULL; @@ -500,7 +500,7 @@ RfsdAllocateFcb (IN PRFSD_VCB Vcb, &RfsdGlobal->CountResource, ExGetCurrentResourceThread() ); #endif - + return Fcb; #if DBG @@ -513,11 +513,11 @@ errorout: if (Fcb->AnsiFileName.Buffer) ExFreePool(Fcb->AnsiFileName.Buffer); #endif - + if (FlagOn(Fcb->Flags, FCB_FROM_POOL)) { - + ExFreePool( Fcb ); - + } else { ExAcquireResourceExclusiveLite( @@ -530,7 +530,7 @@ errorout: &RfsdGlobal->LAResource, ExGetCurrentResourceThread() ); } - + } return NULL; @@ -545,7 +545,7 @@ RfsdFreeFcb (IN PRFSD_FCB Fcb) PAGED_CODE(); ASSERT(Fcb != NULL); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); @@ -554,9 +554,9 @@ RfsdFreeFcb (IN PRFSD_FCB Fcb) FsRtlUninitializeFileLock(&Fcb->FileLockAnchor); ExDeleteResourceLite(&Fcb->MainResource); - + ExDeleteResourceLite(&Fcb->PagingIoResource); - + Fcb->RfsdMcb->RfsdFcb = NULL; if(IsFlagOn(Fcb->Flags, FCB_FILE_DELETED)) { @@ -571,7 +571,7 @@ RfsdFreeFcb (IN PRFSD_FCB Fcb) Fcb->LongName.Buffer = NULL; } -#if DBG +#if DBG ExFreePool(Fcb->AnsiFileName.Buffer); #endif @@ -629,7 +629,7 @@ RfsdAllocateCcb (VOID) ExReleaseResourceForThreadLite( &RfsdGlobal->LAResource, ExGetCurrentResourceThread() ); - + if (Ccb == NULL) { Ccb = (PRFSD_CCB) ExAllocatePoolWithTag(NonPagedPool, sizeof(RFSD_CCB), RFSD_POOL_TAG); @@ -643,16 +643,16 @@ RfsdAllocateCcb (VOID) if (!Ccb) { return NULL; } - + Ccb->Identifier.Type = RFSDCCB; Ccb->Identifier.Size = sizeof(RFSD_CCB); - + Ccb->CurrentByteOffset = 0; - + Ccb->DirectorySearchPattern.Length = 0; Ccb->DirectorySearchPattern.MaximumLength = 0; Ccb->DirectorySearchPattern.Buffer = 0; - + return Ccb; } @@ -663,10 +663,10 @@ RfsdFreeCcb (IN PRFSD_CCB Ccb) PAGED_CODE(); ASSERT(Ccb != NULL); - + ASSERT((Ccb->Identifier.Type == RFSDCCB) && (Ccb->Identifier.Size == sizeof(RFSD_CCB))); - + if (Ccb->DirectorySearchPattern.Buffer != NULL) { ExFreePool(Ccb->DirectorySearchPattern.Buffer); } @@ -702,12 +702,12 @@ RfsdAllocateMcb (PRFSD_VCB Vcb, PUNICODE_STRING FileName, ULONG FileAttr) #define MCB_NUM_SHIFT 0x04 if (RfsdGlobal->McbAllocated > (RfsdGlobal->MaxDepth << MCB_NUM_SHIFT)) - Extra = RfsdGlobal->McbAllocated - + Extra = RfsdGlobal->McbAllocated - (RfsdGlobal->MaxDepth << MCB_NUM_SHIFT) + RfsdGlobal->MaxDepth; RfsdPrint((DBG_INFO, - "RfsdAllocateMcb: CurrDepth=%xh/%xh/%xh FileName=%S\n", + "RfsdAllocateMcb: CurrDepth=%xh/%xh/%xh FileName=%S\n", RfsdGlobal->McbAllocated, RfsdGlobal->MaxDepth << MCB_NUM_SHIFT, RfsdGlobal->FcbAllocated, @@ -738,21 +738,21 @@ RfsdAllocateMcb (PRFSD_VCB Vcb, PUNICODE_STRING FileName, ULONG FileAttr) Mcb = (PRFSD_MCB) (ExAllocateFromPagedLookasideList( &(RfsdGlobal->RfsdMcbLookasideList))); - + ExReleaseResourceForThreadLite( &RfsdGlobal->LAResource, ExGetCurrentResourceThread() ); - + if (Mcb == NULL) { Mcb = (PRFSD_MCB) ExAllocatePoolWithTag(PagedPool, sizeof(RFSD_MCB), RFSD_POOL_TAG); - + RtlZeroMemory(Mcb, sizeof(RFSD_MCB)); - + SetFlag(Mcb->Flags, MCB_FROM_POOL); } else { RtlZeroMemory(Mcb, sizeof(RFSD_MCB)); } - + if (!Mcb) { return NULL; } @@ -772,7 +772,7 @@ RfsdAllocateMcb (PRFSD_VCB Vcb, PUNICODE_STRING FileName, ULONG FileAttr) RtlZeroMemory(Mcb->ShortName.Buffer, Mcb->ShortName.MaximumLength); RtlCopyMemory(Mcb->ShortName.Buffer, FileName->Buffer, Mcb->ShortName.Length); - } + } Mcb->FileAttr = FileAttr; @@ -825,7 +825,7 @@ RfsdFreeMcb (IN PRFSD_MCB Mcb) #endif ASSERT(Mcb != NULL); - + ASSERT((Mcb->Identifier.Type == RFSDMCB) && (Mcb->Identifier.Size == sizeof(RFSD_MCB))); @@ -833,7 +833,7 @@ RfsdFreeMcb (IN PRFSD_MCB Mcb) if (Mcb->ShortName.Buffer) ExFreePool(Mcb->ShortName.Buffer); - + if (FlagOn(Mcb->Flags, MCB_FROM_POOL)) { ExFreePool( Mcb ); @@ -917,7 +917,7 @@ RfsdGetFullFileName(PRFSD_MCB Mcb, PUNICODE_STRING FileName) if (Count ==0) Length = 2; - + FileName->Length = Length; FileName->MaximumLength = Length + 2; FileName->Buffer = ExAllocatePoolWithTag(PagedPool, Length + 2, RFSD_POOL_TAG); @@ -942,7 +942,7 @@ RfsdGetFullFileName(PRFSD_MCB Mcb, PUNICODE_STRING FileName) j += FileNames[i]->Length / 2; } - + return TRUE; } @@ -979,7 +979,7 @@ RfsdSearchMcbTree( PRFSD_VCB Vcb, return Mcb; } -/** +/** Returns NULL is the parent has no child, or if we search through the child's brothers and hit a NULL Otherwise, returns the MCB of one of the the parent's children, which matches FileName. */ @@ -1162,7 +1162,7 @@ RfsdCheckSetBlock(PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb, ULONG Block) if (dwBlk >= Length) return FALSE; - + if (!CcPinRead( Vcb->StreamObj, &Offset, Vcb->BlockSize, @@ -1215,10 +1215,10 @@ RfsdCheckBitmapConsistency(PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb) RfsdCheckSetBlock(IrpContext, Vcb, Vcb->GroupDesc[i].bg_block_bitmap); RfsdCheckSetBlock(IrpContext, Vcb, Vcb->GroupDesc[i].bg_inode_bitmap); - - + + if (i == Vcb->NumOfGroups - 1) { - InodeBlocks = ((INODES_COUNT % INODES_PER_GROUP) * + InodeBlocks = ((INODES_COUNT % INODES_PER_GROUP) * sizeof(RFSD_INODE) + Vcb->BlockSize - 1) / (Vcb->BlockSize); } else { @@ -1248,8 +1248,8 @@ RfsdRemoveVcb(PRFSD_VCB Vcb) __drv_mustHoldCriticalRegion NTSTATUS -RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, - IN PRFSD_VCB Vcb, +RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, + IN PRFSD_VCB Vcb, IN PRFSD_SUPER_BLOCK RfsdSb, IN PDEVICE_OBJECT TargetDevice, IN PDEVICE_OBJECT VolumeDevice, @@ -1315,7 +1315,7 @@ RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, ExInitializeResourceLite(&Vcb->PagingIoResource); ExInitializeResourceLite(&Vcb->McbResource); - + VcbResourceInitialized = TRUE; Vcb->Vpb = Vpb; @@ -1327,7 +1327,7 @@ RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, UNICODE_STRING LabelName; OEM_STRING OemName; - + LabelName.MaximumLength = 16 * 2; LabelName.Length = 0; @@ -1399,15 +1399,15 @@ RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, NotifySyncInitialized = TRUE; Vcb->DeviceObject = VolumeDevice; - + Vcb->TargetDeviceObject = TargetDevice; - + Vcb->OpenFileHandleCount = 0; - + Vcb->ReferenceCount = 0; - + Vcb->SuperBlock = RfsdSb; - + Vcb->Header.NodeTypeCode = (USHORT) RFSDVCB; Vcb->Header.NodeByteSize = sizeof(RFSD_VCB); Vcb->Header.IsFastIoPossible = FastIoIsNotPossible; @@ -1423,7 +1423,7 @@ RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, Vcb->DiskGeometry.BytesPerSector; IoctlSize = sizeof(PARTITION_INFORMATION); - + Status = RfsdDiskIoControl( TargetDevice, IOCTL_DISK_GET_PARTITION_INFO, @@ -1433,15 +1433,15 @@ RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, &IoctlSize ); PartSize = Vcb->PartitionInformation.PartitionLength.QuadPart; - + if (!NT_SUCCESS(Status)) { Vcb->PartitionInformation.StartingOffset.QuadPart = 0; - + Vcb->PartitionInformation.PartitionLength.QuadPart = DiskSize; PartSize = DiskSize; - + Status = STATUS_SUCCESS; } @@ -1463,7 +1463,7 @@ RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, Vcb->Header.AllocationSize.QuadPart = Vcb->Header.FileSize.QuadPart = PartSize; - Vcb->Header.ValidDataLength.QuadPart = + Vcb->Header.ValidDataLength.QuadPart = (LONGLONG)(0x7fffffffffffffff); /* Vcb->Header.AllocationSize.QuadPart = (LONGLONG)(rfsd_super_block->s_blocks_count - rfsd_super_block->s_free_blocks_count) @@ -1518,7 +1518,7 @@ RfsdInitializeVcb( IN PRFSD_IRP_CONTEXT IrpContext, Vcb->McbTree->Key.k_dir_id = RFSD_ROOT_PARENT_ID; Vcb->McbTree->Key.k_objectid = RFSD_ROOT_OBJECT_ID; Vcb->McbTree->Key.k_offset = 0; - Vcb->McbTree->Key.k_type = RFSD_KEY_TYPE_v1_STAT_DATA; + Vcb->McbTree->Key.k_type = RFSD_KEY_TYPE_v1_STAT_DATA; #ifdef DISABLED if (IsFlagOn(RfsdGlobal->Flags, RFSD_CHECKING_BITMAP)) { @@ -1583,10 +1583,10 @@ RfsdFreeVcb (IN PRFSD_VCB Vcb ) PAGED_CODE(); ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); - + FsRtlNotifyUninitializeSync(&Vcb->NotifySync); if (Vcb->StreamObj) { @@ -1631,7 +1631,7 @@ RfsdFreeVcb (IN PRFSD_VCB Vcb ) // CcUnpinData(Vcb->GroupDescBcb); Vcb->GroupDesc = NULL; } - + if (Vcb->SuperBlock) { ExFreePool(Vcb->SuperBlock); Vcb->SuperBlock = NULL; diff --git a/drivers/filesystems/reiserfs/src/misc.c b/drivers/filesystems/reiserfs/src/misc.c index 387e6b15e47..50c1a77662b 100644 --- a/drivers/filesystems/reiserfs/src/misc.c +++ b/drivers/filesystems/reiserfs/src/misc.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: misc.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -214,7 +214,7 @@ RfsdOEMToUnicode( Status = RtlOemStringToUnicodeString( - Unicode, + Unicode, Oem, FALSE ); @@ -274,7 +274,7 @@ RfsdUnicodeToOEM ( DbgBreak(); goto errorout; } - + errorout: return Status; diff --git a/drivers/filesystems/reiserfs/src/nls.c b/drivers/filesystems/reiserfs/src/nls.c index 0ce039619b4..85d4931dc71 100644 --- a/drivers/filesystems/reiserfs/src/nls.c +++ b/drivers/filesystems/reiserfs/src/nls.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: nls.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/reiserfs/src/nls/nls_base.c b/drivers/filesystems/reiserfs/src/nls/nls_base.c index 3f47f47d8e7..3c92c32410c 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_base.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_base.c @@ -52,7 +52,7 @@ utf8_mbtowc(wchar_t *p, const __u8 *s, int n) long l; int c0, c, nc; struct utf8_table *t; - + nc = 0; c0 = *s; l = c0; @@ -110,10 +110,10 @@ utf8_wctomb(__u8 *s, wchar_t wc, int maxlen) long l; int c, nc; struct utf8_table *t; - + if (s == 0) return 0; - + l = wc; nc = 0; for (t = utf8_table; t->cmask && maxlen; t++, maxlen--) { @@ -179,7 +179,7 @@ int register_nls(struct nls_table * nls) nls->next = tables; tables = nls; spin_unlock(&nls_lock); - return 0; + return 0; } int unregister_nls(struct nls_table * nls) @@ -230,7 +230,7 @@ struct nls_table *load_nls(char *charset) charset); return NULL; } - + sprintf(buf, "nls_%s", charset); ret = request_module(buf); if (ret != 0) { @@ -484,7 +484,7 @@ static struct nls_table default_table = { struct nls_table *load_nls_default(void) { struct nls_table *default_nls; - + default_nls = load_nls(CONFIG_NLS_DEFAULT); if (default_nls != NULL) return default_nls; diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp1251.c b/drivers/filesystems/reiserfs/src/nls/nls_cp1251.c index e51ada6fd2f..f6813fc49ba 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp1251.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp1251.c @@ -15,85 +15,85 @@ static wchar_t charset2uni[256] = { /* 0x00*/ - 0x0000, 0x0001, 0x0002, 0x0003, - 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000a, 0x000b, - 0x000c, 0x000d, 0x000e, 0x000f, + 0x0000, 0x0001, 0x0002, 0x0003, + 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000a, 0x000b, + 0x000c, 0x000d, 0x000e, 0x000f, /* 0x10*/ - 0x0010, 0x0011, 0x0012, 0x0013, - 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001a, 0x001b, - 0x001c, 0x001d, 0x001e, 0x001f, + 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001a, 0x001b, + 0x001c, 0x001d, 0x001e, 0x001f, /* 0x20*/ - 0x0020, 0x0021, 0x0022, 0x0023, - 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002a, 0x002b, - 0x002c, 0x002d, 0x002e, 0x002f, + 0x0020, 0x0021, 0x0022, 0x0023, + 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002a, 0x002b, + 0x002c, 0x002d, 0x002e, 0x002f, /* 0x30*/ - 0x0030, 0x0031, 0x0032, 0x0033, - 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003a, 0x003b, - 0x003c, 0x003d, 0x003e, 0x003f, + 0x0030, 0x0031, 0x0032, 0x0033, + 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003a, 0x003b, + 0x003c, 0x003d, 0x003e, 0x003f, /* 0x40*/ - 0x0040, 0x0041, 0x0042, 0x0043, - 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004a, 0x004b, - 0x004c, 0x004d, 0x004e, 0x004f, + 0x0040, 0x0041, 0x0042, 0x0043, + 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004a, 0x004b, + 0x004c, 0x004d, 0x004e, 0x004f, /* 0x50*/ - 0x0050, 0x0051, 0x0052, 0x0053, - 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005a, 0x005b, - 0x005c, 0x005d, 0x005e, 0x005f, + 0x0050, 0x0051, 0x0052, 0x0053, + 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005a, 0x005b, + 0x005c, 0x005d, 0x005e, 0x005f, /* 0x60*/ - 0x0060, 0x0061, 0x0062, 0x0063, - 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006a, 0x006b, - 0x006c, 0x006d, 0x006e, 0x006f, + 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006a, 0x006b, + 0x006c, 0x006d, 0x006e, 0x006f, /* 0x70*/ - 0x0070, 0x0071, 0x0072, 0x0073, - 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007a, 0x007b, - 0x007c, 0x007d, 0x007e, 0x007f, + 0x0070, 0x0071, 0x0072, 0x0073, + 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007a, 0x007b, + 0x007c, 0x007d, 0x007e, 0x007f, /* 0x80*/ - 0x0402, 0x0403, 0x201a, 0x0453, - 0x201e, 0x2026, 0x2020, 0x2021, - 0x20ac, 0x2030, 0x0409, 0x2039, - 0x040a, 0x040c, 0x040b, 0x040f, + 0x0402, 0x0403, 0x201a, 0x0453, + 0x201e, 0x2026, 0x2020, 0x2021, + 0x20ac, 0x2030, 0x0409, 0x2039, + 0x040a, 0x040c, 0x040b, 0x040f, /* 0x90*/ - 0x0452, 0x2018, 0x2019, 0x201c, - 0x201d, 0x2022, 0x2013, 0x2014, - 0x0000, 0x2122, 0x0459, 0x203a, - 0x045a, 0x045c, 0x045b, 0x045f, + 0x0452, 0x2018, 0x2019, 0x201c, + 0x201d, 0x2022, 0x2013, 0x2014, + 0x0000, 0x2122, 0x0459, 0x203a, + 0x045a, 0x045c, 0x045b, 0x045f, /* 0xa0*/ - 0x00a0, 0x040e, 0x045e, 0x0408, - 0x00a4, 0x0490, 0x00a6, 0x00a7, - 0x0401, 0x00a9, 0x0404, 0x00ab, - 0x00ac, 0x00ad, 0x00ae, 0x0407, + 0x00a0, 0x040e, 0x045e, 0x0408, + 0x00a4, 0x0490, 0x00a6, 0x00a7, + 0x0401, 0x00a9, 0x0404, 0x00ab, + 0x00ac, 0x00ad, 0x00ae, 0x0407, /* 0xb0*/ - 0x00b0, 0x00b1, 0x0406, 0x0456, - 0x0491, 0x00b5, 0x00b6, 0x00b7, - 0x0451, 0x2116, 0x0454, 0x00bb, - 0x0458, 0x0405, 0x0455, 0x0457, + 0x00b0, 0x00b1, 0x0406, 0x0456, + 0x0491, 0x00b5, 0x00b6, 0x00b7, + 0x0451, 0x2116, 0x0454, 0x00bb, + 0x0458, 0x0405, 0x0455, 0x0457, /* 0xc0*/ - 0x0410, 0x0411, 0x0412, 0x0413, - 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041a, 0x041b, - 0x041c, 0x041d, 0x041e, 0x041f, + 0x0410, 0x0411, 0x0412, 0x0413, + 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041a, 0x041b, + 0x041c, 0x041d, 0x041e, 0x041f, /* 0xd0*/ - 0x0420, 0x0421, 0x0422, 0x0423, - 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042a, 0x042b, - 0x042c, 0x042d, 0x042e, 0x042f, + 0x0420, 0x0421, 0x0422, 0x0423, + 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042a, 0x042b, + 0x042c, 0x042d, 0x042e, 0x042f, /* 0xe0*/ - 0x0430, 0x0431, 0x0432, 0x0433, - 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043a, 0x043b, - 0x043c, 0x043d, 0x043e, 0x043f, + 0x0430, 0x0431, 0x0432, 0x0433, + 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043a, 0x043b, + 0x043c, 0x043d, 0x043e, 0x043f, /* 0xf0*/ - 0x0440, 0x0441, 0x0442, 0x0443, - 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044a, 0x044b, - 0x044c, 0x044d, 0x044e, 0x044f, + 0x0440, 0x0441, 0x0442, 0x0443, + 0x0444, 0x0445, 0x0446, 0x0447, + 0x0448, 0x0449, 0x044a, 0x044b, + 0x044c, 0x044d, 0x044e, 0x044f, }; static unsigned char page00[256] = { @@ -175,11 +175,11 @@ static unsigned char page21[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, page21, NULL, NULL, NULL, NULL, NULL, NULL, + page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, page21, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp1255.c b/drivers/filesystems/reiserfs/src/nls/nls_cp1255.c index cebbd902873..2e82d0ef460 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp1255.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp1255.c @@ -254,11 +254,11 @@ static unsigned char page21[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, page02, NULL, NULL, page05, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, page21, NULL, NULL, NULL, NULL, NULL, NULL, + page00, page01, page02, NULL, NULL, page05, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, page21, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp437.c b/drivers/filesystems/reiserfs/src/nls/nls_cp437.c index a592fe8f1f0..67209488d29 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp437.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp437.c @@ -259,11 +259,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, page03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, page22, page23, NULL, page25, NULL, NULL, + page00, page01, NULL, page03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, page22, page23, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp737.c b/drivers/filesystems/reiserfs/src/nls/nls_cp737.c index 53c65bc9f29..3bc1be162fb 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp737.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp737.c @@ -222,11 +222,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, page03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, page22, NULL, NULL, page25, NULL, NULL, + page00, NULL, NULL, page03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, page22, NULL, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp775.c b/drivers/filesystems/reiserfs/src/nls/nls_cp775.c index f6f0686b846..3762edababc 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp775.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp775.c @@ -191,11 +191,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, page22, NULL, NULL, page25, NULL, NULL, + page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, page22, NULL, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp850.c b/drivers/filesystems/reiserfs/src/nls/nls_cp850.c index c38e89d61de..2180b07f1b7 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp850.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp850.c @@ -187,11 +187,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, NULL, NULL, NULL, page25, NULL, NULL, + page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, NULL, NULL, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp852.c b/drivers/filesystems/reiserfs/src/nls/nls_cp852.c index 82260bbe7ac..bfb55f901d3 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp852.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp852.c @@ -209,11 +209,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, page02, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, page25, NULL, NULL, + page00, page01, page02, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp855.c b/drivers/filesystems/reiserfs/src/nls/nls_cp855.c index 97f57690a62..378c4f3fb92 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp855.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp855.c @@ -171,11 +171,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, page21, NULL, NULL, NULL, page25, NULL, NULL, + page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, page21, NULL, NULL, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp857.c b/drivers/filesystems/reiserfs/src/nls/nls_cp857.c index 349ca72416b..e7ce949ca8d 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp857.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp857.c @@ -173,11 +173,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, page25, NULL, NULL, + page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp860.c b/drivers/filesystems/reiserfs/src/nls/nls_cp860.c index 23da03086ff..ca25833b4e7 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp860.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp860.c @@ -236,11 +236,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, page03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, page22, page23, NULL, page25, NULL, NULL, + page00, NULL, NULL, page03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, page22, page23, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp861.c b/drivers/filesystems/reiserfs/src/nls/nls_cp861.c index fe03d1e97e8..d18d044ea72 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp861.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp861.c @@ -259,11 +259,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, page03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, page22, page23, NULL, page25, NULL, NULL, + page00, page01, NULL, page03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, page22, page23, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp862.c b/drivers/filesystems/reiserfs/src/nls/nls_cp862.c index 6c452204d40..cd6f07438a1 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp862.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp862.c @@ -293,11 +293,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, page03, NULL, page05, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, page22, page23, NULL, page25, NULL, NULL, + page00, page01, NULL, page03, NULL, page05, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, page22, page23, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp863.c b/drivers/filesystems/reiserfs/src/nls/nls_cp863.c index 51e62d1bb51..371f7f310ae 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp863.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp863.c @@ -253,11 +253,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, page03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, page22, page23, NULL, page25, NULL, NULL, + page00, page01, NULL, page03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, page22, page23, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp864.c b/drivers/filesystems/reiserfs/src/nls/nls_cp864.c index f4e6a804db4..1fc03a8123b 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp864.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp864.c @@ -252,38 +252,38 @@ static unsigned char pagefe[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, page03, NULL, NULL, page06, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, page22, NULL, NULL, page25, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, pagefe, NULL, + page00, NULL, NULL, page03, NULL, NULL, page06, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, page22, NULL, NULL, page25, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, pagefe, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp865.c b/drivers/filesystems/reiserfs/src/nls/nls_cp865.c index 63c004fc41a..2f3160673e7 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp865.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp865.c @@ -259,11 +259,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, page03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, page22, page23, NULL, page25, NULL, NULL, + page00, page01, NULL, page03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, page22, page23, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp866.c b/drivers/filesystems/reiserfs/src/nls/nls_cp866.c index 118a55e271a..109ea454392 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp866.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp866.c @@ -177,11 +177,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, page21, page22, NULL, NULL, page25, NULL, NULL, + page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, page21, page22, NULL, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp869.c b/drivers/filesystems/reiserfs/src/nls/nls_cp869.c index d6535038317..51ff5aae1b6 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp869.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp869.c @@ -187,11 +187,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, page03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, NULL, NULL, NULL, page25, NULL, NULL, + page00, NULL, NULL, page03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, NULL, NULL, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp874.c b/drivers/filesystems/reiserfs/src/nls/nls_cp874.c index 061d68cc8b5..57299f19842 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp874.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp874.c @@ -145,11 +145,11 @@ static unsigned char page20[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, page0e, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, page0e, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp932.c b/drivers/filesystems/reiserfs/src/nls/nls_cp932.c index d2625d50f92..801327c30fb 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp932.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp932.c @@ -30,7 +30,7 @@ static wchar_t c2u_81[256] = { 0x201D,0xFF08,0xFF09,0x3014,0x3015,0xFF3B,0xFF3D,0xFF5B,/* 0x68-0x6F */ 0xFF5D,0x3008,0x3009,0x300A,0x300B,0x300C,0x300D,0x300E,/* 0x70-0x77 */ 0x300F,0x3010,0x3011,0xFF0B,0xFF0D,0x00B1,0x00D7,0x0000,/* 0x78-0x7F */ - + 0x00F7,0xFF1D,0x2260,0xFF1C,0xFF1E,0x2266,0x2267,0x221E,/* 0x80-0x87 */ 0x2234,0x2642,0x2640,0x00B0,0x2032,0x2033,0x2103,0xFFE5,/* 0x88-0x8F */ 0xFF04,0xFFE0,0xFFE1,0xFF05,0xFF03,0xFF06,0xFF0A,0xFF20,/* 0x90-0x97 */ @@ -66,7 +66,7 @@ static wchar_t c2u_82[256] = { 0xFF29,0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,/* 0x68-0x6F */ 0xFF31,0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,/* 0x70-0x77 */ 0xFF39,0xFF3A,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,0xFF47,/* 0x80-0x87 */ 0xFF48,0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,0xFF4F,/* 0x88-0x8F */ 0xFF50,0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,0xFF57,/* 0x90-0x97 */ @@ -101,7 +101,7 @@ static wchar_t c2u_83[256] = { 0x30C9,0x30CA,0x30CB,0x30CC,0x30CD,0x30CE,0x30CF,0x30D0,/* 0x68-0x6F */ 0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,0x30D8,/* 0x70-0x77 */ 0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,0x0000,/* 0x78-0x7F */ - + 0x30E0,0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,0x30E7,/* 0x80-0x87 */ 0x30E8,0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,0x30EE,0x30EF,/* 0x88-0x8F */ 0x30F0,0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6,0x0000,/* 0x90-0x97 */ @@ -132,7 +132,7 @@ static wchar_t c2u_84[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0451,0x0436,/* 0x70-0x77 */ 0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x0000,/* 0x78-0x7F */ - + 0x043E,0x043F,0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,/* 0x80-0x87 */ 0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,/* 0x88-0x8F */ 0x044E,0x044F,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -160,7 +160,7 @@ static wchar_t c2u_87[256] = { 0x3357,0x330D,0x3326,0x3323,0x332B,0x334A,0x333B,0x339C,/* 0x68-0x6F */ 0x339D,0x339E,0x338E,0x338F,0x33C4,0x33A1,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x337B,0x0000,/* 0x78-0x7F */ - + 0x301D,0x301F,0x2116,0x33CD,0x2121,0x32A4,0x32A5,0x32A6,/* 0x80-0x87 */ 0x32A7,0x32A8,0x3231,0x3232,0x3239,0x337E,0x337D,0x337C,/* 0x88-0x8F */ 0x2252,0x2261,0x222B,0x222E,0x2211,0x221A,0x22A5,0x2220,/* 0x90-0x97 */ @@ -184,7 +184,7 @@ static wchar_t c2u_88[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -220,7 +220,7 @@ static wchar_t c2u_89[256] = { 0x6804,0x6C38,0x6CF3,0x6D29,0x745B,0x76C8,0x7A4E,0x9834,/* 0x68-0x6F */ 0x82F1,0x885B,0x8A60,0x92ED,0x6DB2,0x75AB,0x76CA,0x99C5,/* 0x70-0x77 */ 0x60A6,0x8B01,0x8D8A,0x95B2,0x698E,0x53AD,0x5186,0x0000,/* 0x78-0x7F */ - + 0x5712,0x5830,0x5944,0x5BB4,0x5EF6,0x6028,0x63A9,0x63F4,/* 0x80-0x87 */ 0x6CBF,0x6F14,0x708E,0x7114,0x7159,0x71D5,0x733F,0x7E01,/* 0x88-0x8F */ 0x8276,0x82D1,0x8597,0x9060,0x925B,0x9D1B,0x5869,0x65BC,/* 0x90-0x97 */ @@ -256,7 +256,7 @@ static wchar_t c2u_8A[256] = { 0x64B9,0x683C,0x6838,0x6BBB,0x7372,0x78BA,0x7A6B,0x899A,/* 0x68-0x6F */ 0x89D2,0x8D6B,0x8F03,0x90ED,0x95A3,0x9694,0x9769,0x5B66,/* 0x70-0x77 */ 0x5CB3,0x697D,0x984D,0x984E,0x639B,0x7B20,0x6A2B,0x0000,/* 0x78-0x7F */ - + 0x6A7F,0x68B6,0x9C0D,0x6F5F,0x5272,0x559D,0x6070,0x62EC,/* 0x80-0x87 */ 0x6D3B,0x6E07,0x6ED1,0x845B,0x8910,0x8F44,0x4E14,0x9C39,/* 0x88-0x8F */ 0x53F6,0x691B,0x6A3A,0x9784,0x682A,0x515C,0x7AC3,0x84B2,/* 0x90-0x97 */ @@ -292,7 +292,7 @@ static wchar_t c2u_8B[256] = { 0x5403,0x55AB,0x6854,0x6A58,0x8A70,0x7827,0x6775,0x9ECD,/* 0x68-0x6F */ 0x5374,0x5BA2,0x811A,0x8650,0x9006,0x4E18,0x4E45,0x4EC7,/* 0x70-0x77 */ 0x4F11,0x53CA,0x5438,0x5BAE,0x5F13,0x6025,0x6551,0x0000,/* 0x78-0x7F */ - + 0x673D,0x6C42,0x6C72,0x6CE3,0x7078,0x7403,0x7A76,0x7AAE,/* 0x80-0x87 */ 0x7B08,0x7D1A,0x7CFE,0x7D66,0x65E7,0x725B,0x53BB,0x5C45,/* 0x88-0x8F */ 0x5DE8,0x62D2,0x62E0,0x6319,0x6E20,0x865A,0x8A31,0x8DDD,/* 0x90-0x97 */ @@ -328,7 +328,7 @@ static wchar_t c2u_8C[256] = { 0x656C,0x666F,0x6842,0x6E13,0x7566,0x7A3D,0x7CFB,0x7D4C,/* 0x68-0x6F */ 0x7D99,0x7E4B,0x7F6B,0x830E,0x834A,0x86CD,0x8A08,0x8A63,/* 0x70-0x77 */ 0x8B66,0x8EFD,0x981A,0x9D8F,0x82B8,0x8FCE,0x9BE8,0x0000,/* 0x78-0x7F */ - + 0x5287,0x621F,0x6483,0x6FC0,0x9699,0x6841,0x5091,0x6B20,/* 0x80-0x87 */ 0x6C7A,0x6F54,0x7A74,0x7D50,0x8840,0x8A23,0x6708,0x4EF6,/* 0x88-0x8F */ 0x5039,0x5026,0x5065,0x517C,0x5238,0x5263,0x55A7,0x570F,/* 0x90-0x97 */ @@ -364,7 +364,7 @@ static wchar_t c2u_8D[256] = { 0x7D18,0x7D5E,0x7DB1,0x8015,0x8003,0x80AF,0x80B1,0x8154,/* 0x68-0x6F */ 0x818F,0x822A,0x8352,0x884C,0x8861,0x8B1B,0x8CA2,0x8CFC,/* 0x70-0x77 */ 0x90CA,0x9175,0x9271,0x783F,0x92FC,0x95A4,0x964D,0x0000,/* 0x78-0x7F */ - + 0x9805,0x9999,0x9AD8,0x9D3B,0x525B,0x52AB,0x53F7,0x5408,/* 0x80-0x87 */ 0x58D5,0x62F7,0x6FE0,0x8C6A,0x8F5F,0x9EB9,0x514B,0x523B,/* 0x88-0x8F */ 0x544A,0x56FD,0x7A40,0x9177,0x9D60,0x9ED2,0x7344,0x6F09,/* 0x90-0x97 */ @@ -400,7 +400,7 @@ static wchar_t c2u_8E[256] = { 0x523A,0x53F8,0x53F2,0x55E3,0x56DB,0x58EB,0x59CB,0x59C9,/* 0x68-0x6F */ 0x59FF,0x5B50,0x5C4D,0x5E02,0x5E2B,0x5FD7,0x601D,0x6307,/* 0x70-0x77 */ 0x652F,0x5B5C,0x65AF,0x65BD,0x65E8,0x679D,0x6B62,0x0000,/* 0x78-0x7F */ - + 0x6B7B,0x6C0F,0x7345,0x7949,0x79C1,0x7CF8,0x7D19,0x7D2B,/* 0x80-0x87 */ 0x80A2,0x8102,0x81F3,0x8996,0x8A5E,0x8A69,0x8A66,0x8A8C,/* 0x88-0x8F */ 0x8AEE,0x8CC7,0x8CDC,0x96CC,0x98FC,0x6B6F,0x4E8B,0x4F3C,/* 0x90-0x97 */ @@ -436,7 +436,7 @@ static wchar_t c2u_8F[256] = { 0x5BBF,0x6DD1,0x795D,0x7E2E,0x7C9B,0x587E,0x719F,0x51FA,/* 0x68-0x6F */ 0x8853,0x8FF0,0x4FCA,0x5CFB,0x6625,0x77AC,0x7AE3,0x821C,/* 0x70-0x77 */ 0x99FF,0x51C6,0x5FAA,0x65EC,0x696F,0x6B89,0x6DF3,0x0000,/* 0x78-0x7F */ - + 0x6E96,0x6F64,0x76FE,0x7D14,0x5DE1,0x9075,0x9187,0x9806,/* 0x80-0x87 */ 0x51E6,0x521D,0x6240,0x6691,0x66D9,0x6E1A,0x5EB6,0x7DD2,/* 0x88-0x8F */ 0x7F72,0x66F8,0x85AF,0x85F7,0x8AF8,0x52A9,0x53D9,0x5973,/* 0x90-0x97 */ @@ -472,7 +472,7 @@ static wchar_t c2u_90[256] = { 0x8F9B,0x9032,0x91DD,0x9707,0x4EBA,0x4EC1,0x5203,0x5875,/* 0x68-0x6F */ 0x58EC,0x5C0B,0x751A,0x5C3D,0x814E,0x8A0A,0x8FC5,0x9663,/* 0x70-0x77 */ 0x976D,0x7B25,0x8ACF,0x9808,0x9162,0x56F3,0x53A8,0x0000,/* 0x78-0x7F */ - + 0x9017,0x5439,0x5782,0x5E25,0x63A8,0x6C34,0x708A,0x7761,/* 0x80-0x87 */ 0x7C8B,0x7FE0,0x8870,0x9042,0x9154,0x9310,0x9318,0x968F,/* 0x88-0x8F */ 0x745E,0x9AC4,0x5D07,0x5D69,0x6570,0x67A2,0x8DA8,0x96DB,/* 0x90-0x97 */ @@ -508,7 +508,7 @@ static wchar_t c2u_91[256] = { 0x8607,0x8A34,0x963B,0x9061,0x9F20,0x50E7,0x5275,0x53CC,/* 0x68-0x6F */ 0x53E2,0x5009,0x55AA,0x58EE,0x594F,0x723D,0x5B8B,0x5C64,/* 0x70-0x77 */ 0x531D,0x60E3,0x60F3,0x635C,0x6383,0x633F,0x63BB,0x0000,/* 0x78-0x7F */ - + 0x64CD,0x65E9,0x66F9,0x5DE3,0x69CD,0x69FD,0x6F15,0x71E5,/* 0x80-0x87 */ 0x4E89,0x75E9,0x76F8,0x7A93,0x7CDF,0x7DCF,0x7D9C,0x8061,/* 0x88-0x8F */ 0x8349,0x8358,0x846C,0x84BC,0x85FB,0x88C5,0x8D70,0x9001,/* 0x90-0x97 */ @@ -544,7 +544,7 @@ static wchar_t c2u_92[256] = { 0x6A80,0x6BB5,0x7537,0x8AC7,0x5024,0x77E5,0x5730,0x5F1B,/* 0x68-0x6F */ 0x6065,0x667A,0x6C60,0x75F4,0x7A1A,0x7F6E,0x81F4,0x8718,/* 0x70-0x77 */ 0x9045,0x99B3,0x7BC9,0x755C,0x7AF9,0x7B51,0x84C4,0x0000,/* 0x78-0x7F */ - + 0x9010,0x79E9,0x7A92,0x8336,0x5AE1,0x7740,0x4E2D,0x4EF2,/* 0x80-0x87 */ 0x5B99,0x5FE0,0x62BD,0x663C,0x67F1,0x6CE8,0x866B,0x8877,/* 0x88-0x8F */ 0x8A3B,0x914E,0x92F3,0x99D0,0x6A17,0x7026,0x732A,0x82E7,/* 0x90-0x97 */ @@ -580,7 +580,7 @@ static wchar_t c2u_93[256] = { 0x5857,0x59AC,0x5C60,0x5F92,0x6597,0x675C,0x6E21,0x767B,/* 0x68-0x6F */ 0x83DF,0x8CED,0x9014,0x90FD,0x934D,0x7825,0x783A,0x52AA,/* 0x70-0x77 */ 0x5EA6,0x571F,0x5974,0x6012,0x5012,0x515A,0x51AC,0x0000,/* 0x78-0x7F */ - + 0x51CD,0x5200,0x5510,0x5854,0x5858,0x5957,0x5B95,0x5CF6,/* 0x80-0x87 */ 0x5D8B,0x60BC,0x6295,0x642D,0x6771,0x6843,0x68BC,0x68DF,/* 0x88-0x8F */ 0x76D7,0x6DD8,0x6E6F,0x6D9B,0x706F,0x71C8,0x5F53,0x75D8,/* 0x90-0x97 */ @@ -616,7 +616,7 @@ static wchar_t c2u_94[256] = { 0x6D3E,0x7436,0x7834,0x5A46,0x7F75,0x82AD,0x99AC,0x4FF3,/* 0x68-0x6F */ 0x5EC3,0x62DD,0x6392,0x6557,0x676F,0x76C3,0x724C,0x80CC,/* 0x70-0x77 */ 0x80BA,0x8F29,0x914D,0x500D,0x57F9,0x5A92,0x6885,0x0000,/* 0x78-0x7F */ - + 0x6973,0x7164,0x72FD,0x8CB7,0x58F2,0x8CE0,0x966A,0x9019,/* 0x80-0x87 */ 0x877F,0x79E4,0x77E7,0x8429,0x4F2F,0x5265,0x535A,0x62CD,/* 0x88-0x8F */ 0x67CF,0x6CCA,0x767D,0x7B94,0x7C95,0x8236,0x8584,0x8FEB,/* 0x90-0x97 */ @@ -652,7 +652,7 @@ static wchar_t c2u_95[256] = { 0x9C2D,0x54C1,0x5F6C,0x658C,0x6D5C,0x7015,0x8CA7,0x8CD3,/* 0x68-0x6F */ 0x983B,0x654F,0x74F6,0x4E0D,0x4ED8,0x57E0,0x592B,0x5A66,/* 0x70-0x77 */ 0x5BCC,0x51A8,0x5E03,0x5E9C,0x6016,0x6276,0x6577,0x0000,/* 0x78-0x7F */ - + 0x65A7,0x666E,0x6D6E,0x7236,0x7B26,0x8150,0x819A,0x8299,/* 0x80-0x87 */ 0x8B5C,0x8CA0,0x8CE6,0x8D74,0x961C,0x9644,0x4FAE,0x64AB,/* 0x88-0x8F */ 0x6B66,0x821E,0x8461,0x856A,0x90E8,0x5C01,0x6953,0x98A8,/* 0x90-0x97 */ @@ -688,7 +688,7 @@ static wchar_t c2u_96[256] = { 0x9632,0x5420,0x982C,0x5317,0x50D5,0x535C,0x58A8,0x64B2,/* 0x68-0x6F */ 0x6734,0x7267,0x7766,0x7A46,0x91E6,0x52C3,0x6CA1,0x6B86,/* 0x70-0x77 */ 0x5800,0x5E4C,0x5954,0x672C,0x7FFB,0x51E1,0x76C6,0x0000,/* 0x78-0x7F */ - + 0x6469,0x78E8,0x9B54,0x9EBB,0x57CB,0x59B9,0x6627,0x679A,/* 0x80-0x87 */ 0x6BCE,0x54E9,0x69D9,0x5E55,0x819C,0x6795,0x9BAA,0x67FE,/* 0x88-0x8F */ 0x9C52,0x685D,0x4EA6,0x4FE3,0x53C8,0x62B9,0x672B,0x6CAB,/* 0x90-0x97 */ @@ -724,7 +724,7 @@ static wchar_t c2u_97[256] = { 0x63FA,0x64C1,0x66DC,0x694A,0x69D8,0x6D0B,0x6EB6,0x7194,/* 0x68-0x6F */ 0x7528,0x7AAF,0x7F8A,0x8000,0x8449,0x84C9,0x8981,0x8B21,/* 0x70-0x77 */ 0x8E0A,0x9065,0x967D,0x990A,0x617E,0x6291,0x6B32,0x0000,/* 0x78-0x7F */ - + 0x6C83,0x6D74,0x7FCC,0x7FFC,0x6DC0,0x7F85,0x87BA,0x88F8,/* 0x80-0x87 */ 0x6765,0x83B1,0x983C,0x96F7,0x6D1B,0x7D61,0x843D,0x916A,/* 0x88-0x8F */ 0x4E71,0x5375,0x5D50,0x6B04,0x6FEB,0x85CD,0x862D,0x89A7,/* 0x90-0x97 */ @@ -760,7 +760,7 @@ static wchar_t c2u_98[256] = { 0x9DF2,0x4E99,0x4E98,0x9C10,0x8A6B,0x85C1,0x8568,0x6900,/* 0x68-0x6F */ 0x6E7E,0x7897,0x8155,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -796,7 +796,7 @@ static wchar_t c2u_99[256] = { 0x5191,0x5193,0x5195,0x5196,0x51A4,0x51A6,0x51A2,0x51A9,/* 0x68-0x6F */ 0x51AA,0x51AB,0x51B3,0x51B1,0x51B2,0x51B0,0x51B5,0x51BD,/* 0x70-0x77 */ 0x51C5,0x51C9,0x51DB,0x51E0,0x8655,0x51E9,0x51ED,0x0000,/* 0x78-0x7F */ - + 0x51F0,0x51F5,0x51FE,0x5204,0x520B,0x5214,0x520E,0x5227,/* 0x80-0x87 */ 0x522A,0x522E,0x5233,0x5239,0x524F,0x5244,0x524B,0x524C,/* 0x88-0x8F */ 0x525E,0x5254,0x526A,0x5274,0x5269,0x5273,0x527F,0x527D,/* 0x90-0x97 */ @@ -832,7 +832,7 @@ static wchar_t c2u_9A[256] = { 0x5587,0x55A8,0x55DA,0x55C5,0x55DF,0x55C4,0x55DC,0x55E4,/* 0x68-0x6F */ 0x55D4,0x5614,0x55F7,0x5616,0x55FE,0x55FD,0x561B,0x55F9,/* 0x70-0x77 */ 0x564E,0x5650,0x71DF,0x5634,0x5636,0x5632,0x5638,0x0000,/* 0x78-0x7F */ - + 0x566B,0x5664,0x562F,0x566C,0x566A,0x5686,0x5680,0x568A,/* 0x80-0x87 */ 0x56A0,0x5694,0x568F,0x56A5,0x56AE,0x56B6,0x56B4,0x56C2,/* 0x88-0x8F */ 0x56BC,0x56C1,0x56C3,0x56C0,0x56C8,0x56CE,0x56D1,0x56D3,/* 0x90-0x97 */ @@ -868,7 +868,7 @@ static wchar_t c2u_9B[256] = { 0x5B0B,0x5B16,0x5B32,0x5AD0,0x5B2A,0x5B36,0x5B3E,0x5B43,/* 0x68-0x6F */ 0x5B45,0x5B40,0x5B51,0x5B55,0x5B5A,0x5B5B,0x5B65,0x5B69,/* 0x70-0x77 */ 0x5B70,0x5B73,0x5B75,0x5B78,0x6588,0x5B7A,0x5B80,0x0000,/* 0x78-0x7F */ - + 0x5B83,0x5BA6,0x5BB8,0x5BC3,0x5BC7,0x5BC9,0x5BD4,0x5BD0,/* 0x80-0x87 */ 0x5BE4,0x5BE6,0x5BE2,0x5BDE,0x5BE5,0x5BEB,0x5BF0,0x5BF6,/* 0x88-0x8F */ 0x5BF3,0x5C05,0x5C07,0x5C08,0x5C0D,0x5C13,0x5C20,0x5C22,/* 0x90-0x97 */ @@ -904,7 +904,7 @@ static wchar_t c2u_9C[256] = { 0x5F82,0x5F7F,0x5F8A,0x5F88,0x5F91,0x5F87,0x5F9E,0x5F99,/* 0x68-0x6F */ 0x5F98,0x5FA0,0x5FA8,0x5FAD,0x5FBC,0x5FD6,0x5FFB,0x5FE4,/* 0x70-0x77 */ 0x5FF8,0x5FF1,0x5FDD,0x60B3,0x5FFF,0x6021,0x6060,0x0000,/* 0x78-0x7F */ - + 0x6019,0x6010,0x6029,0x600E,0x6031,0x601B,0x6015,0x602B,/* 0x80-0x87 */ 0x6026,0x600F,0x603A,0x605A,0x6041,0x606A,0x6077,0x605F,/* 0x88-0x8F */ 0x604A,0x6046,0x604D,0x6063,0x6043,0x6064,0x6042,0x606C,/* 0x90-0x97 */ @@ -940,7 +940,7 @@ static wchar_t c2u_9D[256] = { 0x62EE,0x62F1,0x6327,0x6302,0x6308,0x62EF,0x62F5,0x6350,/* 0x68-0x6F */ 0x633E,0x634D,0x641C,0x634F,0x6396,0x638E,0x6380,0x63AB,/* 0x70-0x77 */ 0x6376,0x63A3,0x638F,0x6389,0x639F,0x63B5,0x636B,0x0000,/* 0x78-0x7F */ - + 0x6369,0x63BE,0x63E9,0x63C0,0x63C6,0x63E3,0x63C9,0x63D2,/* 0x80-0x87 */ 0x63F6,0x63C4,0x6416,0x6434,0x6406,0x6413,0x6426,0x6436,/* 0x88-0x8F */ 0x651D,0x6417,0x6428,0x640F,0x6467,0x646F,0x6476,0x644E,/* 0x90-0x97 */ @@ -976,7 +976,7 @@ static wchar_t c2u_9E[256] = { 0x67EF,0x67B4,0x67EC,0x67B3,0x67E9,0x67B8,0x67E4,0x67DE,/* 0x68-0x6F */ 0x67DD,0x67E2,0x67EE,0x67B9,0x67CE,0x67C6,0x67E7,0x6A9C,/* 0x70-0x77 */ 0x681E,0x6846,0x6829,0x6840,0x684D,0x6832,0x684E,0x0000,/* 0x78-0x7F */ - + 0x68B3,0x682B,0x6859,0x6863,0x6877,0x687F,0x689F,0x688F,/* 0x80-0x87 */ 0x68AD,0x6894,0x689D,0x689B,0x6883,0x6AAE,0x68B9,0x6874,/* 0x88-0x8F */ 0x68B5,0x68A0,0x68BA,0x690F,0x688D,0x687E,0x6901,0x68CA,/* 0x90-0x97 */ @@ -1012,7 +1012,7 @@ static wchar_t c2u_9F[256] = { 0x6B84,0x6B83,0x6B8D,0x6B98,0x6B95,0x6B9E,0x6BA4,0x6BAA,/* 0x68-0x6F */ 0x6BAB,0x6BAF,0x6BB2,0x6BB1,0x6BB3,0x6BB7,0x6BBC,0x6BC6,/* 0x70-0x77 */ 0x6BCB,0x6BD3,0x6BDF,0x6BEC,0x6BEB,0x6BF3,0x6BEF,0x0000,/* 0x78-0x7F */ - + 0x9EBE,0x6C08,0x6C13,0x6C14,0x6C1B,0x6C24,0x6C23,0x6C5E,/* 0x80-0x87 */ 0x6C55,0x6C62,0x6C6A,0x6C82,0x6C8D,0x6C9A,0x6C81,0x6C9B,/* 0x88-0x8F */ 0x6C7E,0x6C68,0x6C73,0x6C92,0x6C90,0x6CC4,0x6CF1,0x6CD3,/* 0x90-0x97 */ @@ -1048,7 +1048,7 @@ static wchar_t c2u_E0[256] = { 0x6FFE,0x701B,0x701A,0x6F74,0x701D,0x7018,0x701F,0x7030,/* 0x68-0x6F */ 0x703E,0x7032,0x7051,0x7063,0x7099,0x7092,0x70AF,0x70F1,/* 0x70-0x77 */ 0x70AC,0x70B8,0x70B3,0x70AE,0x70DF,0x70CB,0x70DD,0x0000,/* 0x78-0x7F */ - + 0x70D9,0x7109,0x70FD,0x711C,0x7119,0x7165,0x7155,0x7188,/* 0x80-0x87 */ 0x7166,0x7162,0x714C,0x7156,0x716C,0x718F,0x71FB,0x7184,/* 0x88-0x8F */ 0x7195,0x71A8,0x71AC,0x71D7,0x71B9,0x71BE,0x71D2,0x71C9,/* 0x90-0x97 */ @@ -1084,7 +1084,7 @@ static wchar_t c2u_E1[256] = { 0x7589,0x7582,0x7594,0x759A,0x759D,0x75A5,0x75A3,0x75C2,/* 0x68-0x6F */ 0x75B3,0x75C3,0x75B5,0x75BD,0x75B8,0x75BC,0x75B1,0x75CD,/* 0x70-0x77 */ 0x75CA,0x75D2,0x75D9,0x75E3,0x75DE,0x75FE,0x75FF,0x0000,/* 0x78-0x7F */ - + 0x75FC,0x7601,0x75F0,0x75FA,0x75F2,0x75F3,0x760B,0x760D,/* 0x80-0x87 */ 0x7609,0x761F,0x7627,0x7620,0x7621,0x7622,0x7624,0x7634,/* 0x88-0x8F */ 0x7630,0x763B,0x7647,0x7648,0x7646,0x765C,0x7658,0x7661,/* 0x90-0x97 */ @@ -1120,7 +1120,7 @@ static wchar_t c2u_E2[256] = { 0x7980,0x7A31,0x7A3B,0x7A3E,0x7A37,0x7A43,0x7A57,0x7A49,/* 0x68-0x6F */ 0x7A61,0x7A62,0x7A69,0x9F9D,0x7A70,0x7A79,0x7A7D,0x7A88,/* 0x70-0x77 */ 0x7A97,0x7A95,0x7A98,0x7A96,0x7AA9,0x7AC8,0x7AB0,0x0000,/* 0x78-0x7F */ - + 0x7AB6,0x7AC5,0x7AC4,0x7ABF,0x9083,0x7AC7,0x7ACA,0x7ACD,/* 0x80-0x87 */ 0x7ACF,0x7AD5,0x7AD3,0x7AD9,0x7ADA,0x7ADD,0x7AE1,0x7AE2,/* 0x88-0x8F */ 0x7AE6,0x7AED,0x7AF0,0x7B02,0x7B0F,0x7B0A,0x7B06,0x7B33,/* 0x90-0x97 */ @@ -1156,7 +1156,7 @@ static wchar_t c2u_E3[256] = { 0x7DDD,0x7DE4,0x7DDE,0x7DFB,0x7DF2,0x7DE1,0x7E05,0x7E0A,/* 0x68-0x6F */ 0x7E23,0x7E21,0x7E12,0x7E31,0x7E1F,0x7E09,0x7E0B,0x7E22,/* 0x70-0x77 */ 0x7E46,0x7E66,0x7E3B,0x7E35,0x7E39,0x7E43,0x7E37,0x0000,/* 0x78-0x7F */ - + 0x7E32,0x7E3A,0x7E67,0x7E5D,0x7E56,0x7E5E,0x7E59,0x7E5A,/* 0x80-0x87 */ 0x7E79,0x7E6A,0x7E69,0x7E7C,0x7E7B,0x7E83,0x7DD5,0x7E7D,/* 0x88-0x8F */ 0x8FAE,0x7E7F,0x7E88,0x7E89,0x7E8C,0x7E92,0x7E90,0x7E93,/* 0x90-0x97 */ @@ -1192,7 +1192,7 @@ static wchar_t c2u_E4[256] = { 0x81E7,0x81FA,0x81FB,0x81FE,0x8201,0x8202,0x8205,0x8207,/* 0x68-0x6F */ 0x820A,0x820D,0x8210,0x8216,0x8229,0x822B,0x8238,0x8233,/* 0x70-0x77 */ 0x8240,0x8259,0x8258,0x825D,0x825A,0x825F,0x8264,0x0000,/* 0x78-0x7F */ - + 0x8262,0x8268,0x826A,0x826B,0x822E,0x8271,0x8277,0x8278,/* 0x80-0x87 */ 0x827E,0x828D,0x8292,0x82AB,0x829F,0x82BB,0x82AC,0x82E1,/* 0x88-0x8F */ 0x82E3,0x82DF,0x82D2,0x82F4,0x82F3,0x82FA,0x8393,0x8303,/* 0x90-0x97 */ @@ -1228,7 +1228,7 @@ static wchar_t c2u_E5[256] = { 0x4E55,0x8654,0x865F,0x8667,0x8671,0x8693,0x86A3,0x86A9,/* 0x68-0x6F */ 0x86AA,0x868B,0x868C,0x86B6,0x86AF,0x86C4,0x86C6,0x86B0,/* 0x70-0x77 */ 0x86C9,0x8823,0x86AB,0x86D4,0x86DE,0x86E9,0x86EC,0x0000,/* 0x78-0x7F */ - + 0x86DF,0x86DB,0x86EF,0x8712,0x8706,0x8708,0x8700,0x8703,/* 0x80-0x87 */ 0x86FB,0x8711,0x8709,0x870D,0x86F9,0x870A,0x8734,0x873F,/* 0x88-0x8F */ 0x8737,0x873B,0x8725,0x8729,0x871A,0x8760,0x875F,0x8778,/* 0x90-0x97 */ @@ -1264,7 +1264,7 @@ static wchar_t c2u_E6[256] = { 0x8A46,0x8A48,0x8A7C,0x8A6D,0x8A6C,0x8A62,0x8A85,0x8A82,/* 0x68-0x6F */ 0x8A84,0x8AA8,0x8AA1,0x8A91,0x8AA5,0x8AA6,0x8A9A,0x8AA3,/* 0x70-0x77 */ 0x8AC4,0x8ACD,0x8AC2,0x8ADA,0x8AEB,0x8AF3,0x8AE7,0x0000,/* 0x78-0x7F */ - + 0x8AE4,0x8AF1,0x8B14,0x8AE0,0x8AE2,0x8AF7,0x8ADE,0x8ADB,/* 0x80-0x87 */ 0x8B0C,0x8B07,0x8B1A,0x8AE1,0x8B16,0x8B10,0x8B17,0x8B20,/* 0x88-0x8F */ 0x8B33,0x97AB,0x8B26,0x8B2B,0x8B3E,0x8B28,0x8B41,0x8B4C,/* 0x90-0x97 */ @@ -1300,7 +1300,7 @@ static wchar_t c2u_E7[256] = { 0x8F0A,0x8F05,0x8F15,0x8F12,0x8F19,0x8F13,0x8F1C,0x8F1F,/* 0x68-0x6F */ 0x8F1B,0x8F0C,0x8F26,0x8F33,0x8F3B,0x8F39,0x8F45,0x8F42,/* 0x70-0x77 */ 0x8F3E,0x8F4C,0x8F49,0x8F46,0x8F4E,0x8F57,0x8F5C,0x0000,/* 0x78-0x7F */ - + 0x8F62,0x8F63,0x8F64,0x8F9C,0x8F9F,0x8FA3,0x8FAD,0x8FAF,/* 0x80-0x87 */ 0x8FB7,0x8FDA,0x8FE5,0x8FE2,0x8FEA,0x8FEF,0x9087,0x8FF4,/* 0x88-0x8F */ 0x9005,0x8FF9,0x8FFA,0x9011,0x9015,0x9021,0x900D,0x901E,/* 0x90-0x97 */ @@ -1336,7 +1336,7 @@ static wchar_t c2u_E8[256] = { 0x9444,0x945B,0x9460,0x9462,0x945E,0x946A,0x9229,0x9470,/* 0x68-0x6F */ 0x9475,0x9477,0x947D,0x945A,0x947C,0x947E,0x9481,0x947F,/* 0x70-0x77 */ 0x9582,0x9587,0x958A,0x9594,0x9596,0x9598,0x9599,0x0000,/* 0x78-0x7F */ - + 0x95A0,0x95A8,0x95A7,0x95AD,0x95BC,0x95BB,0x95B9,0x95BE,/* 0x80-0x87 */ 0x95CA,0x6FF6,0x95C3,0x95CD,0x95CC,0x95D5,0x95D4,0x95D6,/* 0x88-0x8F */ 0x95DC,0x95E1,0x95E5,0x95E2,0x9621,0x9628,0x962E,0x962F,/* 0x90-0x97 */ @@ -1372,7 +1372,7 @@ static wchar_t c2u_E9[256] = { 0x99BC,0x99DF,0x99DB,0x99DD,0x99D8,0x99D1,0x99ED,0x99EE,/* 0x68-0x6F */ 0x99F1,0x99F2,0x99FB,0x99F8,0x9A01,0x9A0F,0x9A05,0x99E2,/* 0x70-0x77 */ 0x9A19,0x9A2B,0x9A37,0x9A45,0x9A42,0x9A40,0x9A43,0x0000,/* 0x78-0x7F */ - + 0x9A3E,0x9A55,0x9A4D,0x9A5B,0x9A57,0x9A5F,0x9A62,0x9A65,/* 0x80-0x87 */ 0x9A64,0x9A69,0x9A6B,0x9A6A,0x9AAD,0x9AB0,0x9ABC,0x9AC0,/* 0x88-0x8F */ 0x9ACF,0x9AD1,0x9AD3,0x9AD4,0x9ADE,0x9ADF,0x9AE2,0x9AE3,/* 0x90-0x97 */ @@ -1408,7 +1408,7 @@ static wchar_t c2u_EA[256] = { 0x9E8C,0x9E92,0x9E95,0x9E91,0x9E9D,0x9EA5,0x9EA9,0x9EB8,/* 0x68-0x6F */ 0x9EAA,0x9EAD,0x9761,0x9ECC,0x9ECE,0x9ECF,0x9ED0,0x9ED4,/* 0x70-0x77 */ 0x9EDC,0x9EDE,0x9EDD,0x9EE0,0x9EE5,0x9EE8,0x9EEF,0x0000,/* 0x78-0x7F */ - + 0x9EF4,0x9EF6,0x9EF7,0x9EF9,0x9EFB,0x9EFC,0x9EFD,0x9F07,/* 0x80-0x87 */ 0x9F08,0x76B7,0x9F15,0x9F21,0x9F2C,0x9F3E,0x9F4A,0x9F52,/* 0x88-0x8F */ 0x9F54,0x9F63,0x9F5F,0x9F60,0x9F61,0x9F66,0x9F67,0x9F6C,/* 0x90-0x97 */ @@ -1444,7 +1444,7 @@ static wchar_t c2u_ED[256] = { 0x529C,0x52A6,0x52C0,0x52DB,0x5300,0x5307,0x5324,0x5372,/* 0x68-0x6F */ 0x5393,0x53B2,0x53DD,0xFA0E,0x549C,0x548A,0x54A9,0x54FF,/* 0x70-0x77 */ 0x5586,0x5759,0x5765,0x57AC,0x57C8,0x57C7,0xFA0F,0x0000,/* 0x78-0x7F */ - + 0xFA10,0x589E,0x58B2,0x590B,0x5953,0x595B,0x595D,0x5963,/* 0x80-0x87 */ 0x59A4,0x59BA,0x5B56,0x5BC0,0x752F,0x5BD8,0x5BEC,0x5C1E,/* 0x88-0x8F */ 0x5CA6,0x5CBA,0x5CF5,0x5D27,0x5D53,0xFA11,0x5D42,0x5D6D,/* 0x90-0x97 */ @@ -1480,7 +1480,7 @@ static wchar_t c2u_EE[256] = { 0x7AE7,0xFA1C,0x7AEB,0x7B9E,0xFA1D,0x7D48,0x7D5C,0x7DB7,/* 0x68-0x6F */ 0x7DA0,0x7DD6,0x7E52,0x7F47,0x7FA1,0xFA1E,0x8301,0x8362,/* 0x70-0x77 */ 0x837F,0x83C7,0x83F6,0x8448,0x84B4,0x8553,0x8559,0x0000,/* 0x78-0x7F */ - + 0x856B,0xFA1F,0x85B0,0xFA20,0xFA21,0x8807,0x88F5,0x8A12,/* 0x80-0x87 */ 0x8A37,0x8A79,0x8AA7,0x8ABE,0x8ADF,0xFA22,0x8AF6,0x8B53,/* 0x88-0x8F */ 0x8B7F,0x8CF0,0x8CF4,0x8D12,0x8D76,0xFA23,0x8ECF,0xFA24,/* 0x90-0x97 */ @@ -1516,7 +1516,7 @@ static wchar_t c2u_FA[256] = { 0x4E28,0x4EE1,0x4EFC,0x4F00,0x4F03,0x4F39,0x4F56,0x4F92,/* 0x68-0x6F */ 0x4F8A,0x4F9A,0x4F94,0x4FCD,0x5040,0x5022,0x4FFF,0x501E,/* 0x70-0x77 */ 0x5046,0x5070,0x5042,0x5094,0x50F4,0x50D8,0x514A,0x0000,/* 0x78-0x7F */ - + 0x5164,0x519D,0x51BE,0x51EC,0x5215,0x529C,0x52A6,0x52C0,/* 0x80-0x87 */ 0x52DB,0x5300,0x5307,0x5324,0x5372,0x5393,0x53B2,0x53DD,/* 0x88-0x8F */ 0xFA0E,0x549C,0x548A,0x54A9,0x54FF,0x5586,0x5759,0x5765,/* 0x90-0x97 */ @@ -1552,7 +1552,7 @@ static wchar_t c2u_FB[256] = { 0x742A,0x7429,0x742E,0x7462,0x7489,0x749F,0x7501,0x756F,/* 0x68-0x6F */ 0x7682,0x769C,0x769E,0x769B,0x76A6,0xFA17,0x7746,0x52AF,/* 0x70-0x77 */ 0x7821,0x784E,0x7864,0x787A,0x7930,0xFA18,0xFA19,0x0000,/* 0x78-0x7F */ - + 0xFA1A,0x7994,0xFA1B,0x799B,0x7AD1,0x7AE7,0xFA1C,0x7AEB,/* 0x80-0x87 */ 0x7B9E,0xFA1D,0x7D48,0x7D5C,0x7DB7,0x7DA0,0x7DD6,0x7E52,/* 0x88-0x8F */ 0x7F47,0x7FA1,0xFA1E,0x8301,0x8362,0x837F,0x83C7,0x83F6,/* 0x90-0x97 */ @@ -1585,38 +1585,38 @@ static wchar_t c2u_FC[256] = { }; static wchar_t *page_charset2uni[256] = { - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, c2u_81, c2u_82, c2u_83, c2u_84, NULL, NULL, c2u_87, - c2u_88, c2u_89, c2u_8A, c2u_8B, c2u_8C, c2u_8D, c2u_8E, c2u_8F, - c2u_90, c2u_91, c2u_92, c2u_93, c2u_94, c2u_95, c2u_96, c2u_97, - c2u_98, c2u_99, c2u_9A, c2u_9B, c2u_9C, c2u_9D, c2u_9E, c2u_9F, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - c2u_E0, c2u_E1, c2u_E2, c2u_E3, c2u_E4, c2u_E5, c2u_E6, c2u_E7, - c2u_E8, c2u_E9, c2u_EA, NULL, NULL, c2u_ED, c2u_EE, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, c2u_FA, c2u_FB, c2u_FC, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, c2u_81, c2u_82, c2u_83, c2u_84, NULL, NULL, c2u_87, + c2u_88, c2u_89, c2u_8A, c2u_8B, c2u_8C, c2u_8D, c2u_8E, c2u_8F, + c2u_90, c2u_91, c2u_92, c2u_93, c2u_94, c2u_95, c2u_96, c2u_97, + c2u_98, c2u_99, c2u_9A, c2u_9B, c2u_9C, c2u_9D, c2u_9E, c2u_9F, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + c2u_E0, c2u_E1, c2u_E2, c2u_E3, c2u_E4, c2u_E5, c2u_E6, c2u_E7, + c2u_E8, c2u_E9, c2u_EA, NULL, NULL, c2u_ED, c2u_EE, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, c2u_FA, c2u_FB, c2u_FC, NULL, NULL, NULL, }; static unsigned char u2c_03[512] = { @@ -1652,7 +1652,7 @@ static unsigned char u2c_03[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -1749,7 +1749,7 @@ static unsigned char u2c_21[512] = { 0xEE, 0xF3, 0xEE, 0xF4, 0xEE, 0xF5, 0xEE, 0xF6, /* 0x74-0x77 */ 0xEE, 0xF7, 0xEE, 0xF8, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -1807,7 +1807,7 @@ static unsigned char u2c_22[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x81, 0xBC, 0x81, 0xBD, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x81, 0xBA, 0x81, 0xBB, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -1899,7 +1899,7 @@ static unsigned char u2c_25[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -1994,7 +1994,7 @@ static unsigned char u2c_30[512] = { 0x82, 0xD2, 0x82, 0xD3, 0x82, 0xD4, 0x82, 0xD5, /* 0x74-0x77 */ 0x82, 0xD6, 0x82, 0xD7, 0x82, 0xD8, 0x82, 0xD9, /* 0x78-0x7B */ 0x82, 0xDA, 0x82, 0xDB, 0x82, 0xDC, 0x82, 0xDD, /* 0x7C-0x7F */ - + 0x82, 0xDE, 0x82, 0xDF, 0x82, 0xE0, 0x82, 0xE1, /* 0x80-0x83 */ 0x82, 0xE2, 0x82, 0xE3, 0x82, 0xE4, 0x82, 0xE5, /* 0x84-0x87 */ 0x82, 0xE6, 0x82, 0xE7, 0x82, 0xE8, 0x82, 0xE9, /* 0x88-0x8B */ @@ -2062,7 +2062,7 @@ static unsigned char u2c_32[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -2109,7 +2109,7 @@ static unsigned char u2c_33[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x7E, /* 0x78-0x7B */ 0x87, 0x8F, 0x87, 0x8E, 0x87, 0x8D, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -2165,7 +2165,7 @@ static unsigned char u2c_4E[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x8A, 0xA3, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x8B, 0x54, 0x00, 0x00, 0x98, 0xAA, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x98, 0xAB, 0x97, 0xB9, 0x00, 0x00, /* 0x84-0x87 */ 0x97, 0x5C, 0x91, 0x88, 0x98, 0xAD, 0x8E, 0x96, /* 0x88-0x8B */ @@ -2233,7 +2233,7 @@ static unsigned char u2c_4F[512] = { 0x00, 0x00, 0x95, 0xB9, 0x98, 0xC9, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xCD, /* 0x78-0x7B */ 0x8C, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x67, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8A, 0xA4, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x98, 0xD2, 0x00, 0x00, /* 0x84-0x87 */ 0x98, 0xCA, 0x00, 0x00, 0xED, 0x54, 0x97, 0xE1, /* 0x88-0x8B */ @@ -2301,7 +2301,7 @@ static unsigned char u2c_50[512] = { 0x91, 0xA4, 0x92, 0xE3, 0x8B, 0xF4, 0x00, 0x00, /* 0x74-0x77 */ 0x98, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x8B, 0x55, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x98, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x98, 0xFA, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -2368,7 +2368,7 @@ static unsigned char u2c_51[512] = { 0x00, 0x00, 0x95, 0xBA, 0x91, 0xB4, 0x8B, 0xEF, /* 0x74-0x77 */ 0x93, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x8C, 0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x99, 0x62, 0x00, 0x00, 0x99, 0x63, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x93, 0xE0, 0x89, 0x7E, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x99, 0x66, 0x8D, 0xFB, 0x00, 0x00, /* 0x88-0x8B */ @@ -2436,7 +2436,7 @@ static unsigned char u2c_52[512] = { 0x99, 0x93, 0x91, 0x6E, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x99, 0x97, 0x00, 0x00, 0x99, 0x96, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x63, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x80, /* 0x84-0x87 */ 0x99, 0x9C, 0x97, 0xAB, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -2504,7 +2504,7 @@ static unsigned char u2c_53[512] = { 0x8B, 0x70, 0x97, 0x91, 0x00, 0x00, 0x99, 0xC9, /* 0x74-0x77 */ 0x89, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x99, 0xC8, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8B, 0xA8, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x99, 0xCA, 0x00, 0x00, /* 0x80-0x83 */ 0x96, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -2571,7 +2571,7 @@ static unsigned char u2c_54[512] = { 0x00, 0x00, 0x99, 0xE8, 0x99, 0xF1, 0x99, 0xEC, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0xEF, /* 0x78-0x7B */ 0x8C, 0xC4, 0x96, 0xBD, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x99, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x99, 0xF2, 0x00, 0x00, 0x99, 0xF4, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xED, 0x75, 0x8D, 0xEE, /* 0x88-0x8B */ @@ -2639,7 +2639,7 @@ static unsigned char u2c_55[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x60, /* 0x78-0x7B */ 0x9A, 0x65, 0x00, 0x00, 0x9A, 0x61, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x9A, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x66, /* 0x80-0x83 */ 0x91, 0x50, 0x00, 0x00, 0xED, 0x78, 0x9A, 0x68, /* 0x84-0x87 */ 0x00, 0x00, 0x8D, 0x41, 0x9A, 0x5E, 0x92, 0x9D, /* 0x88-0x8B */ @@ -2707,7 +2707,7 @@ static unsigned char u2c_56[512] = { 0x95, 0xAC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x93, 0xD3, 0x00, 0x00, 0x94, 0xB6, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x9A, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x9A, 0x85, 0x8A, 0x64, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x9A, 0x87, 0x00, 0x00, /* 0x88-0x8B */ @@ -2775,7 +2775,7 @@ static unsigned char u2c_57[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB2, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x90, 0x82, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x9A, 0xB0, 0x9A, 0xB3, 0x00, 0x00, 0x8C, 0x5E, /* 0x88-0x8B */ @@ -2843,7 +2843,7 @@ static unsigned char u2c_58[512] = { 0x00, 0x00, 0x90, 0x6F, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x9A, 0xCD, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x8F, 0x6D, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8B, 0xAB, /* 0x80-0x83 */ 0x00, 0x00, 0x9A, 0xCE, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -2911,7 +2911,7 @@ static unsigned char u2c_59[512] = { 0x93, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x9B, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x8D, 0x44, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x9B, 0x41, 0x94, 0x40, 0x94, 0xDC, /* 0x80-0x83 */ 0x96, 0xCF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x94, 0x44, 0x00, 0x00, /* 0x88-0x8B */ @@ -2979,7 +2979,7 @@ static unsigned char u2c_5A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0xB9, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3046,7 +3046,7 @@ static unsigned char u2c_5B[512] = { 0x00, 0x00, 0x9B, 0x7A, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x9B, 0x7B, 0x00, 0x00, 0x9B, 0x7D, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x9B, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x80, /* 0x80-0x83 */ 0x00, 0x00, 0x91, 0xEE, 0x00, 0x00, 0x89, 0x46, /* 0x84-0x87 */ 0x8E, 0xE7, 0x88, 0xC0, 0x00, 0x00, 0x91, 0x76, /* 0x88-0x8B */ @@ -3114,7 +3114,7 @@ static unsigned char u2c_5C[512] = { 0x00, 0x00, 0x00, 0x00, 0x9B, 0xA5, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x9B, 0xA6, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3182,7 +3182,7 @@ static unsigned char u2c_5D[512] = { 0x00, 0x00, 0x00, 0x00, 0x9B, 0xCC, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x9B, 0xCF, 0x00, 0x00, /* 0x80-0x83 */ 0x9B, 0xCE, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xCD, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x88, /* 0x88-0x8B */ @@ -3250,7 +3250,7 @@ static unsigned char u2c_5E[512] = { 0x94, 0x4E, 0x9B, 0xF2, 0x9B, 0xF3, 0x00, 0x00, /* 0x74-0x77 */ 0x8D, 0x4B, 0x8A, 0xB2, 0x9B, 0xF4, 0x8C, 0xB6, /* 0x78-0x7B */ 0x97, 0x63, 0x97, 0x48, 0x8A, 0xF4, 0x9B, 0xF6, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x92, 0xA1, 0x00, 0x00, 0x8D, 0x4C, /* 0x80-0x83 */ 0x8F, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x94, 0xDD, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x8F, 0xB0, 0x00, 0x00, /* 0x88-0x8B */ @@ -3318,7 +3318,7 @@ static unsigned char u2c_5F[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x66, /* 0x74-0x77 */ 0x00, 0x00, 0x96, 0xF0, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x94, 0xDE, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x69, /* 0x7C-0x7F */ - + 0x89, 0x9D, 0x90, 0xAA, 0x9C, 0x68, 0x9C, 0x67, /* 0x80-0x83 */ 0x8C, 0x61, 0x91, 0xD2, 0x00, 0x00, 0x9C, 0x6D, /* 0x84-0x87 */ 0x9C, 0x6B, 0x00, 0x00, 0x9C, 0x6A, 0x97, 0xA5, /* 0x88-0x8B */ @@ -3386,7 +3386,7 @@ static unsigned char u2c_60[512] = { 0x00, 0x00, 0x8C, 0x62, 0x00, 0x00, 0x9C, 0x8E, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x9C, 0x9A, 0x00, 0x00, 0x9C, 0x9D, /* 0x80-0x83 */ 0x9C, 0x9F, 0xED, 0xA1, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x8E, 0xBB, 0xED, 0xA2, 0x9C, 0xA5, /* 0x88-0x8B */ @@ -3453,7 +3453,7 @@ static unsigned char u2c_61[512] = { 0x9C, 0xD0, 0x9C, 0xD7, 0x8C, 0x63, 0x9C, 0xCB, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x97, 0x7C, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x97, 0x4A, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xDA, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x9C, 0xDE, 0x00, 0x00, /* 0x88-0x8B */ @@ -3521,7 +3521,7 @@ static unsigned char u2c_62[512] = { 0x00, 0x00, 0x00, 0x00, 0x95, 0x7D, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x94, 0xE1, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x9D, 0x4E, 0x00, 0x00, 0x9D, 0x51, 0x8F, 0xB3, /* 0x7C-0x7F */ - + 0x8B, 0x5A, 0x00, 0x00, 0x9D, 0x4F, 0x9D, 0x56, /* 0x80-0x83 */ 0x8F, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x9D, 0x50, 0x94, 0x63, 0x00, 0x00, /* 0x88-0x8B */ @@ -3589,7 +3589,7 @@ static unsigned char u2c_63[512] = { 0x00, 0x00, 0x00, 0x00, 0x9D, 0x78, 0x8F, 0xB7, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x93, 0xE6, 0x94, 0x50, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x9D, 0x76, 0x00, 0x00, 0x00, 0x00, 0x91, 0x7C, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x8E, 0xF6, 0x9D, 0x7B, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3656,7 +3656,7 @@ static unsigned char u2c_64[512] = { 0x00, 0x00, 0x00, 0x00, 0x9D, 0x96, 0x00, 0x00, /* 0x74-0x77 */ 0x96, 0xCC, 0x00, 0x00, 0x90, 0xA0, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x82, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x9D, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3724,7 +3724,7 @@ static unsigned char u2c_65[512] = { 0x90, 0xAE, 0x93, 0x47, 0x00, 0x00, 0x95, 0x7E, /* 0x74-0x77 */ 0x9D, 0xC9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x9D, 0xCA, 0x9D, 0xCB, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x95, 0xB6, /* 0x84-0x87 */ 0x9B, 0x7C, 0x90, 0xC4, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3791,7 +3791,7 @@ static unsigned char u2c_66[512] = { 0x90, 0xB0, 0x00, 0x00, 0x8F, 0xBB, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x92, 0x71, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x8B, 0xC5, 0x00, 0x00, 0x9D, 0xF1, /* 0x80-0x83 */ 0x9D, 0xF5, 0x00, 0x00, 0x00, 0x00, 0x89, 0xC9, /* 0x84-0x87 */ 0x9D, 0xF2, 0x9D, 0xF4, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3859,7 +3859,7 @@ static unsigned char u2c_67[512] = { 0x00, 0x00, 0x8B, 0x6E, 0x00, 0x00, 0x94, 0x66, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x9E, 0x60, 0x00, 0x00, 0x8F, 0xBC, 0x94, 0xC2, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x9E, 0x66, 0x00, 0x00, 0x94, 0xF8, /* 0x84-0x87 */ 0x00, 0x00, 0x9E, 0x5D, 0x00, 0x00, 0x9E, 0x63, /* 0x88-0x8B */ @@ -3927,7 +3927,7 @@ static unsigned char u2c_68[512] = { 0x9E, 0x8F, 0x00, 0x00, 0x89, 0xB1, 0x9E, 0x84, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x9E, 0x95, 0x9E, 0x85, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x97, 0xC0, 0x00, 0x00, 0x9E, 0x8C, /* 0x80-0x83 */ 0x00, 0x00, 0x94, 0x7E, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3994,7 +3994,7 @@ static unsigned char u2c_69[512] = { 0x9E, 0xBA, 0x8B, 0xC9, 0x00, 0x00, 0x9E, 0xB2, /* 0x74-0x77 */ 0x9E, 0xB4, 0x9E, 0xB1, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x98, 0x4F, 0x8A, 0x79, 0x9E, 0xB7, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x9E, 0xC1, 0x8A, 0x54, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x8D, 0xE5, 0x00, 0x00, /* 0x88-0x8B */ @@ -4062,7 +4062,7 @@ static unsigned char u2c_6A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x9E, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xED, 0xD5, 0x8A, 0x80, /* 0x7C-0x7F */ - + 0x92, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x9E, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4129,7 +4129,7 @@ static unsigned char u2c_6B[512] = { 0x97, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x9F, 0x64, 0x9F, 0x65, 0x00, 0x00, 0x8E, 0x80, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9F, 0x66, /* 0x7C-0x7F */ - + 0x9F, 0x67, 0x00, 0x00, 0x00, 0x00, 0x9F, 0x69, /* 0x80-0x83 */ 0x9F, 0x68, 0x00, 0x00, 0x96, 0x77, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x8F, 0x7D, 0x8E, 0xEA, 0x8E, 0x63, /* 0x88-0x8B */ @@ -4194,7 +4194,7 @@ static unsigned char u2c_6C[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x8C, 0x88, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x8B, 0x44, 0x9F, 0x90, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x9F, 0x8E, 0x9F, 0x8B, 0x97, 0x80, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xED, 0xDB, 0x00, 0x00, /* 0x84-0x87 */ 0x92, 0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4259,7 +4259,7 @@ static unsigned char u2c_6D[512] = { 0x97, 0x81, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x43, /* 0x74-0x77 */ 0x90, 0x5A, 0x9F, 0xB3, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x9F, 0xB8, 0x00, 0x00, 0xED, 0xDF, /* 0x84-0x87 */ 0x8F, 0xC1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4327,7 +4327,7 @@ static unsigned char u2c_6E[512] = { 0x00, 0x00, 0x00, 0x00, 0x9F, 0xD7, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x98, 0x70, 0x8E, 0xBC, /* 0x7C-0x7F */ - + 0x96, 0x9E, 0x00, 0x00, 0x9F, 0xE1, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4395,7 +4395,7 @@ static unsigned char u2c_6F[512] = { 0xE0, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xE0, 0x45, 0x00, 0x00, 0xE0, 0x44, 0x00, 0x00, /* 0x78-0x7B */ 0xE0, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xE0, 0x47, 0xE0, 0x46, 0xE0, 0x4C, 0x00, 0x00, /* 0x80-0x83 */ 0x90, 0x9F, 0x00, 0x00, 0xE0, 0x43, 0x00, 0x00, /* 0x84-0x87 */ 0xED, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4463,7 +4463,7 @@ static unsigned char u2c_70[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x8B, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x8E, 0xDC, 0x8D, 0xD0, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xED, 0xF2, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x98, 0x46, 0x90, 0x86, 0x00, 0x00, /* 0x88-0x8B */ @@ -4531,7 +4531,7 @@ static unsigned char u2c_71[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x90, 0xF8, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xE0, 0x8F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xE0, 0x87, 0x00, 0x00, 0x8C, 0x46, 0x00, 0x00, /* 0x88-0x8B */ @@ -4599,7 +4599,7 @@ static unsigned char u2c_72[512] = { 0xE0, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x93, 0xC1, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x8C, 0xA1, 0xE0, 0xB1, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x8D, 0xD2, 0xE0, 0xB3, 0xE0, 0xB2, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xB4, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4667,7 +4667,7 @@ static unsigned char u2c_73[512] = { 0x00, 0x00, 0xE0, 0xD8, 0x00, 0x00, 0xEE, 0x43, /* 0x74-0x77 */ 0xE0, 0xD7, 0x00, 0x00, 0xE0, 0xDA, 0xE0, 0xD9, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x8C, 0xBA, 0x00, 0x00, 0x00, 0x00, 0x97, 0xA6, /* 0x84-0x87 */ 0x00, 0x00, 0x8B, 0xCA, 0x00, 0x00, 0x89, 0xA4, /* 0x88-0x8B */ @@ -4735,7 +4735,7 @@ static unsigned char u2c_74[512] = { 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF4, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF5, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x9E, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xEE, 0x50, 0x00, 0x00, 0xE0, 0xF6, /* 0x88-0x8B */ @@ -4802,7 +4802,7 @@ static unsigned char u2c_75[512] = { 0xE1, 0x66, 0x00, 0x00, 0xE1, 0x63, 0x93, 0xEB, /* 0x74-0x77 */ 0xE1, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8B, 0x45, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE1, 0x69, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xE1, 0x64, 0xE1, 0x65, /* 0x84-0x87 */ 0x00, 0x00, 0xE1, 0x68, 0xE1, 0x67, 0x95, 0x44, /* 0x88-0x8B */ @@ -4870,7 +4870,7 @@ static unsigned char u2c_76[512] = { 0x00, 0x00, 0x00, 0x00, 0xE1, 0xA0, 0x00, 0x00, /* 0x74-0x77 */ 0xE1, 0xA1, 0x00, 0x00, 0x94, 0xAD, 0x93, 0x6F, /* 0x78-0x7B */ 0xE1, 0xA2, 0x94, 0x92, 0x95, 0x53, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xE1, 0xA3, 0x00, 0x00, 0xEE, 0x54, 0xE1, 0xA4, /* 0x80-0x83 */ 0x93, 0x49, 0x00, 0x00, 0x8A, 0x46, 0x8D, 0x63, /* 0x84-0x87 */ 0xE1, 0xA5, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xA6, /* 0x88-0x8B */ @@ -4938,7 +4938,7 @@ static unsigned char u2c_77[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xE1, 0xCF, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xE1, 0xCE, 0xE1, 0xCD, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xD1, /* 0x88-0x8B */ @@ -5006,7 +5006,7 @@ static unsigned char u2c_78[512] = { 0xE1, 0xEB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xEE, 0x5F, 0x00, 0x00, /* 0x78-0x7B */ 0xE1, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x8C, 0xE9, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xE1, 0xEC, 0x92, 0xF4, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5074,7 +5074,7 @@ static unsigned char u2c_79[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x98, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xE2, 0x51, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE2, 0x52, /* 0x7C-0x7F */ - + 0xE2, 0x68, 0x8B, 0xD6, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x98, 0x5C, 0x91, 0x54, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xE2, 0x53, 0x00, 0x00, /* 0x88-0x8B */ @@ -5141,7 +5141,7 @@ static unsigned char u2c_7A[512] = { 0x8C, 0x8A, 0x00, 0x00, 0x8B, 0x86, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xE2, 0x75, 0x8B, 0xF3, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE2, 0x76, 0x00, 0x00, 0x90, 0xFA, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x93, 0xCB, 0x00, 0x00, 0x90, 0xDE, /* 0x80-0x83 */ 0x8D, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xE2, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5209,7 +5209,7 @@ static unsigned char u2c_7B[512] = { 0xE2, 0xA7, 0xE2, 0xA5, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xE2, 0x9F, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x95, 0xCD, 0x89, 0xD3, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE2, 0xB3, /* 0x88-0x8B */ @@ -5275,7 +5275,7 @@ static unsigned char u2c_7C[512] = { 0x00, 0x00, 0xE2, 0xE0, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x96, 0xE0, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x8B, 0xCC, 0x8C, 0x48, 0xE2, 0xE1, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x95, 0xB2, 0x00, 0x00, 0x90, 0x88, /* 0x88-0x8B */ @@ -5343,7 +5343,7 @@ static unsigned char u2c_7D[512] = { 0x00, 0x00, 0x8A, 0x47, 0x90, 0xE2, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x8C, 0xA6, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE3, 0x57, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xE3, 0x54, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5410,7 +5410,7 @@ static unsigned char u2c_7E[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xE3, 0x88, 0x00, 0x00, 0xE3, 0x8C, /* 0x78-0x7B */ 0xE3, 0x8B, 0xE3, 0x8F, 0x00, 0x00, 0xE3, 0x91, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x8E, 0x5B, 0xE3, 0x8D, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xE3, 0x92, 0xE3, 0x93, 0xED, 0x40, 0x00, 0x00, /* 0x88-0x8B */ @@ -5454,7 +5454,7 @@ static unsigned char u2c_7F[512] = { 0x00, 0x00, 0x94, 0x6C, 0x00, 0x00, 0x94, 0xEB, /* 0x74-0x77 */ 0xE3, 0xAD, 0x9C, 0xEB, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE3, 0xAE, 0xE3, 0xB0, /* 0x80-0x83 */ 0x00, 0x00, 0x97, 0x85, 0xE3, 0xAF, 0xE3, 0xB2, /* 0x84-0x87 */ 0xE3, 0xB1, 0x00, 0x00, 0x97, 0x72, 0x00, 0x00, /* 0x88-0x8B */ @@ -5522,7 +5522,7 @@ static unsigned char u2c_80[512] = { 0x92, 0xAE, 0x00, 0x00, 0xE3, 0xE1, 0x90, 0x45, /* 0x74-0x77 */ 0x00, 0x00, 0xE3, 0xE2, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE3, 0xE3, 0x98, 0x57, 0xE3, 0xE4, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xE3, 0xE5, 0xE3, 0xE7, 0xE3, 0xE6, 0x94, 0xA3, /* 0x84-0x87 */ 0x00, 0x00, 0x93, 0xF7, 0x00, 0x00, 0x98, 0x5D, /* 0x88-0x8B */ @@ -5590,7 +5590,7 @@ static unsigned char u2c_81[512] = { 0xE4, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x92, 0xB0, 0x95, 0xA0, 0x91, 0x42, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xDA, /* 0x7C-0x7F */ - + 0xE4, 0x4E, 0x00, 0x00, 0xE4, 0x4F, 0xE4, 0x4B, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xE4, 0x4C, 0x00, 0x00, 0xE4, 0x4D, 0x00, 0x00, /* 0x88-0x8B */ @@ -5658,7 +5658,7 @@ static unsigned char u2c_82[512] = { 0x00, 0x00, 0x00, 0x00, 0x89, 0x90, 0xE4, 0x86, /* 0x74-0x77 */ 0xE4, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xE4, 0x88, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xF0, /* 0x88-0x8B */ @@ -5725,7 +5725,7 @@ static unsigned char u2c_83[512] = { 0x00, 0x00, 0xE4, 0xB9, 0x00, 0x00, 0x89, 0xD7, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0xAC, /* 0x78-0x7B */ 0xE4, 0xB6, 0x00, 0x00, 0x00, 0x00, 0xEE, 0x78, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xE4, 0xAC, 0x00, 0x00, 0xE4, 0xB4, /* 0x84-0x87 */ 0x00, 0x00, 0xE4, 0xBB, 0xE4, 0xB5, 0x00, 0x00, /* 0x88-0x8B */ @@ -5793,7 +5793,7 @@ static unsigned char u2c_84[512] = { 0x00, 0x00, 0x88, 0xA8, 0x00, 0x00, 0xE4, 0xD6, /* 0x74-0x77 */ 0x00, 0x00, 0xE4, 0xDF, 0x95, 0x98, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE4, 0xDA, 0x00, 0x00, /* 0x80-0x83 */ 0xE4, 0xD5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8F, 0xD3, /* 0x88-0x8B */ @@ -5861,7 +5861,7 @@ static unsigned char u2c_85[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE5, 0x50, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xE5, 0x51, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xE5, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x94, 0x96, 0x00, 0x00, 0x00, 0x00, 0xE5, 0x4E, /* 0x84-0x87 */ 0xE5, 0x46, 0x00, 0x00, 0xE5, 0x48, 0x00, 0x00, /* 0x88-0x8B */ @@ -5929,7 +5929,7 @@ static unsigned char u2c_86[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x93, 0xF8, 0x00, 0x00, 0x88, 0xB8, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x89, 0xE1, 0xE5, 0x71, /* 0x88-0x8B */ @@ -5997,7 +5997,7 @@ static unsigned char u2c_87[512] = { 0xE5, 0x9A, 0x00, 0x00, 0x92, 0xB1, 0x00, 0x00, /* 0x74-0x77 */ 0xE5, 0x97, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x88, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE5, 0xA5, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6065,7 +6065,7 @@ static unsigned char u2c_88[512] = { 0x00, 0x00, 0xE5, 0xD0, 0x00, 0x00, 0x92, 0x8F, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE5, 0xD1, 0xE5, 0xCE, 0x8B, 0xDC, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE5, 0xCD, 0xE5, 0xD4, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x8C, 0x55, 0x00, 0x00, 0x00, 0x00, 0x91, 0xDC, /* 0x88-0x8B */ @@ -6133,7 +6133,7 @@ static unsigned char u2c_89[512] = { 0xE6, 0x45, 0x00, 0x00, 0x00, 0x00, 0xE6, 0x46, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xE6, 0x47, 0x90, 0xBC, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x97, 0x76, 0x00, 0x00, 0xE6, 0x48, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x95, 0xA2, 0x94, 0x65, /* 0x84-0x87 */ 0xE6, 0x49, 0x00, 0x00, 0xE6, 0x4A, 0x8C, 0xA9, /* 0x88-0x8B */ @@ -6200,7 +6200,7 @@ static unsigned char u2c_8A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xEE, 0x89, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xE6, 0x6A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE6, 0x6F, 0x00, 0x00, /* 0x80-0x83 */ 0xE6, 0x70, 0xE6, 0x6E, 0x00, 0x00, 0x8C, 0xD6, /* 0x84-0x87 */ 0x00, 0x00, 0x97, 0x5F, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6268,7 +6268,7 @@ static unsigned char u2c_8B[512] = { 0xE6, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x8C, 0xEC, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE6, 0xA3, 0x00, 0x00, 0xEE, 0x90, /* 0x7C-0x7F */ - + 0xE6, 0xA4, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x5D, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x9D, 0xCC, 0x00, 0x00, /* 0x88-0x8B */ @@ -6311,7 +6311,7 @@ static unsigned char u2c_8C[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xE6, 0xB6, 0x95, 0x5E, 0xE6, 0xB7, 0x00, 0x00, /* 0x78-0x7B */ 0xE6, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE6, 0xB8, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xE6, 0xBA, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xE6, 0xB9, 0xE6, 0xBB, 0x00, 0x00, /* 0x88-0x8B */ @@ -6379,7 +6379,7 @@ static unsigned char u2c_8D[512] = { 0x95, 0x8B, 0x00, 0x00, 0xEE, 0x94, 0x8B, 0x4E, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE6, 0xE1, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x92, 0xB4, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x89, 0x7A, 0x00, 0x00, /* 0x88-0x8B */ @@ -6447,7 +6447,7 @@ static unsigned char u2c_8E[512] = { 0x8F, 0x52, 0x00, 0x00, 0xE7, 0x4B, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xE7, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE7, 0x4E, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xE7, 0x51, 0xE7, 0x50, 0x00, 0x00, 0xE7, 0x4F, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xE7, 0x53, 0xE7, 0x52, /* 0x88-0x8B */ @@ -6515,7 +6515,7 @@ static unsigned char u2c_8F[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6583,7 +6583,7 @@ static unsigned char u2c_90[512] = { 0x00, 0x00, 0x8F, 0x85, 0xE7, 0xAB, 0x91, 0x4A, /* 0x74-0x77 */ 0x91, 0x49, 0x00, 0x00, 0x88, 0xE2, 0x00, 0x00, /* 0x78-0x7B */ 0x97, 0xC9, 0xE7, 0xAF, 0x00, 0x00, 0x94, 0xF0, /* 0x7C-0x7F */ - + 0xE7, 0xB1, 0xE7, 0xB0, 0xE7, 0xAE, 0xE2, 0x84, /* 0x80-0x83 */ 0x8A, 0xD2, 0x00, 0x00, 0x00, 0x00, 0xE7, 0x8E, /* 0x84-0x87 */ 0x00, 0x00, 0xE7, 0xB3, 0xE7, 0xB2, 0x00, 0x00, /* 0x88-0x8B */ @@ -6651,7 +6651,7 @@ static unsigned char u2c_91[512] = { 0x00, 0x00, 0x8D, 0x79, 0x00, 0x00, 0x8D, 0x93, /* 0x74-0x77 */ 0x8E, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE7, 0xCC, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8F, 0x86, /* 0x84-0x87 */ 0x00, 0x00, 0xE7, 0xCB, 0x00, 0x00, 0xE7, 0xCA, /* 0x88-0x8B */ @@ -6719,7 +6719,7 @@ static unsigned char u2c_92[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEE, 0xB1, /* 0x74-0x77 */ 0xEE, 0xB2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x96, 0x67, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x8B, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x8F, 0x65, /* 0x80-0x83 */ 0x00, 0x00, 0x93, 0xBA, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xED, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6787,7 +6787,7 @@ static unsigned char u2c_93[512] = { 0x00, 0x00, 0x8C, 0xAE, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xE8, 0x49, 0x00, 0x00, 0x8F, 0xDF, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6854,7 +6854,7 @@ static unsigned char u2c_94[512] = { 0x00, 0x00, 0xE8, 0x70, 0x00, 0x00, 0xE8, 0x71, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xE8, 0x74, 0xE8, 0x72, 0xE8, 0x75, 0xE8, 0x77, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE8, 0x76, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ }; @@ -6891,7 +6891,7 @@ static unsigned char u2c_95[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0xB7, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x96, 0xE5, 0x00, 0x00, 0xE8, 0x78, 0x91, 0x4D, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x79, /* 0x84-0x87 */ 0x00, 0x00, 0x95, 0xC2, 0xE8, 0x7A, 0x8A, 0x4A, /* 0x88-0x8B */ @@ -6953,7 +6953,7 @@ static unsigned char u2c_96[512] = { 0x00, 0x00, 0x97, 0xCB, 0x93, 0xA9, 0xE8, 0x9C, /* 0x74-0x77 */ 0x97, 0xA4, 0x00, 0x00, 0x8C, 0xAF, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x97, 0x7A, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x8B, 0xF7, 0x97, 0xB2, 0x00, 0x00, /* 0x84-0x87 */ 0x8C, 0x47, 0x00, 0x00, 0x91, 0xE0, 0xE4, 0x40, /* 0x88-0x8B */ @@ -7020,7 +7020,7 @@ static unsigned char u2c_97[512] = { 0x8C, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xE8, 0xD6, 0xE8, 0xDA, 0x00, 0x00, /* 0x78-0x7B */ 0xE8, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE8, 0xD9, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x8A, 0x93, 0xE8, 0xD7, 0xE8, 0xDB, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE8, 0xDC, /* 0x88-0x8B */ @@ -7088,7 +7088,7 @@ static unsigned char u2c_98[512] = { 0xE9, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7156,7 +7156,7 @@ static unsigned char u2c_99[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7224,7 +7224,7 @@ static unsigned char u2c_9A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7291,7 +7291,7 @@ static unsigned char u2c_9B[512] = { 0xE9, 0xB5, 0xEE, 0xE2, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE9, 0xB7, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7357,7 +7357,7 @@ static unsigned char u2c_9C[512] = { 0x00, 0x00, 0x00, 0x00, 0xE9, 0xE6, 0x00, 0x00, /* 0x74-0x77 */ 0xE9, 0xE7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7423,7 +7423,7 @@ static unsigned char u2c_9D[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xEA, 0x4B, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEA, 0x48, /* 0x84-0x87 */ 0x00, 0x00, 0xEA, 0x47, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7491,7 +7491,7 @@ static unsigned char u2c_9E[512] = { 0x00, 0x00, 0xEA, 0x62, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x8C, 0xB2, 0xEA, 0x63, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xEA, 0x64, 0x00, 0x00, 0x8E, 0xAD, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xEA, 0x65, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xEA, 0x66, 0x00, 0x00, 0x00, 0x00, 0xEA, 0x67, /* 0x88-0x8B */ @@ -7559,7 +7559,7 @@ static unsigned char u2c_9F[512] = { 0x00, 0x00, 0x00, 0x00, 0xEA, 0x9B, 0xEA, 0x99, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7608,7 +7608,7 @@ static unsigned char u2c_F9[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7683,7 +7683,7 @@ static unsigned char u2c_FF[512] = { 0x00, 0xB4, 0x00, 0xB5, 0x00, 0xB6, 0x00, 0xB7, /* 0x74-0x77 */ 0x00, 0xB8, 0x00, 0xB9, 0x00, 0xBA, 0x00, 0xBB, /* 0x78-0x7B */ 0x00, 0xBC, 0x00, 0xBD, 0x00, 0xBE, 0x00, 0xBF, /* 0x7C-0x7F */ - + 0x00, 0xC0, 0x00, 0xC1, 0x00, 0xC2, 0x00, 0xC3, /* 0x80-0x83 */ 0x00, 0xC4, 0x00, 0xC5, 0x00, 0xC6, 0x00, 0xC7, /* 0x84-0x87 */ 0x00, 0xC8, 0x00, 0xC9, 0x00, 0xCA, 0x00, 0xCB, /* 0x88-0x8B */ @@ -7713,37 +7713,37 @@ static unsigned char u2c_FF[512] = { }; static unsigned char *page_uni2charset[256] = { - NULL, NULL, NULL, u2c_03, u2c_04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_30, NULL, u2c_32, u2c_33, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, u2c_4E, u2c_4F, - u2c_50, u2c_51, u2c_52, u2c_53, u2c_54, u2c_55, u2c_56, u2c_57, - u2c_58, u2c_59, u2c_5A, u2c_5B, u2c_5C, u2c_5D, u2c_5E, u2c_5F, - u2c_60, u2c_61, u2c_62, u2c_63, u2c_64, u2c_65, u2c_66, u2c_67, - u2c_68, u2c_69, u2c_6A, u2c_6B, u2c_6C, u2c_6D, u2c_6E, u2c_6F, - u2c_70, u2c_71, u2c_72, u2c_73, u2c_74, u2c_75, u2c_76, u2c_77, - u2c_78, u2c_79, u2c_7A, u2c_7B, u2c_7C, u2c_7D, u2c_7E, u2c_7F, - u2c_80, u2c_81, u2c_82, u2c_83, u2c_84, u2c_85, u2c_86, u2c_87, - u2c_88, u2c_89, u2c_8A, u2c_8B, u2c_8C, u2c_8D, u2c_8E, u2c_8F, - u2c_90, u2c_91, u2c_92, u2c_93, u2c_94, u2c_95, u2c_96, u2c_97, - u2c_98, u2c_99, u2c_9A, u2c_9B, u2c_9C, u2c_9D, u2c_9E, u2c_9F, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, u2c_03, u2c_04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_30, NULL, u2c_32, u2c_33, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, u2c_4E, u2c_4F, + u2c_50, u2c_51, u2c_52, u2c_53, u2c_54, u2c_55, u2c_56, u2c_57, + u2c_58, u2c_59, u2c_5A, u2c_5B, u2c_5C, u2c_5D, u2c_5E, u2c_5F, + u2c_60, u2c_61, u2c_62, u2c_63, u2c_64, u2c_65, u2c_66, u2c_67, + u2c_68, u2c_69, u2c_6A, u2c_6B, u2c_6C, u2c_6D, u2c_6E, u2c_6F, + u2c_70, u2c_71, u2c_72, u2c_73, u2c_74, u2c_75, u2c_76, u2c_77, + u2c_78, u2c_79, u2c_7A, u2c_7B, u2c_7C, u2c_7D, u2c_7E, u2c_7F, + u2c_80, u2c_81, u2c_82, u2c_83, u2c_84, u2c_85, u2c_86, u2c_87, + u2c_88, u2c_89, u2c_8A, u2c_8B, u2c_8C, u2c_8D, u2c_8E, u2c_8F, + u2c_90, u2c_91, u2c_92, u2c_93, u2c_94, u2c_95, u2c_96, u2c_97, + u2c_98, u2c_99, u2c_9A, u2c_9B, u2c_9C, u2c_9D, u2c_9E, u2c_9F, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, NULL, u2c_FF, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp936.c b/drivers/filesystems/reiserfs/src/nls/nls_cp936.c index 6716320f6f5..6c0e84a5ebc 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp936.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp936.c @@ -30,7 +30,7 @@ static wchar_t c2u_81[256] = { 0x4E6D,0x4E6E,0x4E6F,0x4E72,0x4E74,0x4E75,0x4E76,0x4E77,/* 0x68-0x6F */ 0x4E78,0x4E79,0x4E7A,0x4E7B,0x4E7C,0x4E7D,0x4E7F,0x4E80,/* 0x70-0x77 */ 0x4E81,0xF91B,0x4E83,0x4E84,0x4E85,0x4E87,0x4E8A,0x0000,/* 0x78-0x7F */ - + 0x4E90,0x4E96,0x4E97,0x4E99,0x4E9C,0x4E9D,0x4E9E,0x4EA3,/* 0x80-0x87 */ 0x4EAA,0x4EAF,0x4EB0,0x4EB1,0x4EB4,0x4EB6,0x4EB7,0x4EB8,/* 0x88-0x8F */ 0x4EB9,0x4EBC,0x4EBD,0x4EBE,0x4EC8,0x4ECC,0x4ECF,0x4ED0,/* 0x90-0x97 */ @@ -66,7 +66,7 @@ static wchar_t c2u_82[256] = { 0x4FEC,0x4FF0,0x4FF2,0x4FF4,0x4FF5,0x4FF6,0x4FF7,0x4FF9,/* 0x68-0x6F */ 0x4FFB,0x4FFC,0x4FFD,0x4FFF,0x5000,0x5001,0x5002,0x5003,/* 0x70-0x77 */ 0x5004,0x5005,0x5006,0x5007,0x5008,0x5009,0x500A,0x0000,/* 0x78-0x7F */ - + 0x500B,0x500E,0x5010,0x5011,0x5013,0x5015,0x5016,0x5017,/* 0x80-0x87 */ 0x501B,0x501D,0x501E,0x5020,0x5022,0x5023,0x5024,0x5027,/* 0x88-0x8F */ 0xF9D4,0x502F,0x5030,0x5031,0x5032,0x5033,0x5034,0x5035,/* 0x90-0x97 */ @@ -102,7 +102,7 @@ static wchar_t c2u_83[256] = { 0x50EA,0x50EB,0x50EF,0x50F0,0x50F1,0x50F2,0x50F4,0x50F6,/* 0x68-0x6F */ 0x50F7,0x50F8,0x50F9,0x50FA,0x50FC,0x50FD,0x50FE,0x50FF,/* 0x70-0x77 */ 0x5100,0x5101,0x5102,0x5103,0x5104,0x5105,0x5108,0x0000,/* 0x78-0x7F */ - + 0x5109,0x510A,0x510C,0x510D,0x510E,0x510F,0x5110,0x5111,/* 0x80-0x87 */ 0x5113,0x5114,0x5115,0x5116,0x5117,0x5118,0x5119,0x511A,/* 0x88-0x8F */ 0x511B,0x511C,0x511D,0x511E,0x511F,0x5120,0x5122,0x5123,/* 0x90-0x97 */ @@ -138,7 +138,7 @@ static wchar_t c2u_84[256] = { 0x522A,0x522C,0x522F,0x5231,0x5232,0x5234,0x5235,0x523C,/* 0x68-0x6F */ 0x523E,0x5244,0x5245,0x5246,0x5247,0x5248,0x5249,0x524B,/* 0x70-0x77 */ 0x524E,0x524F,0x5252,0x5253,0x5255,0x5257,0x5258,0x0000,/* 0x78-0x7F */ - + 0x5259,0x525A,0x525B,0x525D,0x525F,0x5260,0x5262,0x5263,/* 0x80-0x87 */ 0x5264,0x5266,0x5268,0x526B,0x526C,0x526D,0x526E,0x5270,/* 0x88-0x8F */ 0x5271,0x5273,0x5274,0x5275,0x5276,0x5277,0x5278,0x5279,/* 0x90-0x97 */ @@ -174,7 +174,7 @@ static wchar_t c2u_85[256] = { 0x5359,0x535B,0x535D,0x5365,0x5368,0x536A,0x536C,0x536D,/* 0x68-0x6F */ 0x5372,0x5376,0x5379,0x537B,0x537C,0x537D,0x537E,0x5380,/* 0x70-0x77 */ 0x5381,0x5383,0x5387,0x5388,0x538A,0x538E,0x538F,0x0000,/* 0x78-0x7F */ - + 0x5390,0x5391,0x5392,0x5393,0x5394,0x5396,0x5397,0x5399,/* 0x80-0x87 */ 0x539B,0x539C,0x539E,0x53A0,0x53A1,0x53A4,0x53A7,0x53AA,/* 0x88-0x8F */ 0x53AB,0x53AC,0x53AD,0x53AF,0x53B0,0x53B1,0x53B2,0x53B3,/* 0x90-0x97 */ @@ -210,7 +210,7 @@ static wchar_t c2u_86[256] = { 0x5504,0x5505,0x5508,0x550A,0x550B,0x550C,0x550D,0x550E,/* 0x68-0x6F */ 0x5512,0x5513,0x5515,0x5516,0x5517,0x5518,0x5519,0x551A,/* 0x70-0x77 */ 0x551C,0x551D,0x551E,0x551F,0x5521,0x5525,0x5526,0x0000,/* 0x78-0x7F */ - + 0x5528,0x5529,0x552B,0x552D,0x5532,0x5534,0x5535,0x5536,/* 0x80-0x87 */ 0x5538,0x5539,0x553A,0x553B,0x553D,0x5540,0x5542,0x5545,/* 0x88-0x8F */ 0x5547,0x5548,0x554B,0x554C,0x554D,0x554E,0x554F,0x5551,/* 0x90-0x97 */ @@ -246,7 +246,7 @@ static wchar_t c2u_87[256] = { 0x5643,0x5644,0x5645,0x5646,0x5647,0x5648,0x5649,0x564A,/* 0x68-0x6F */ 0x564B,0x564F,0x5650,0x5651,0x5652,0x5653,0x5655,0x5656,/* 0x70-0x77 */ 0x565A,0x565B,0x565D,0x565E,0x565F,0x5660,0x5661,0x0000,/* 0x78-0x7F */ - + 0x5663,0x5665,0x5666,0x5667,0x566D,0x566E,0x566F,0x5670,/* 0x80-0x87 */ 0x5672,0x5673,0x5674,0x5675,0x5677,0x5678,0x5679,0x567A,/* 0x88-0x8F */ 0x567D,0x567E,0x567F,0x5680,0x5681,0x5682,0x5683,0x5684,/* 0x90-0x97 */ @@ -282,7 +282,7 @@ static wchar_t c2u_88[256] = { 0x5754,0x5755,0x5756,0x5758,0x5759,0x5762,0x5763,0x5765,/* 0x68-0x6F */ 0x5767,0x576C,0x576E,0x5770,0x5771,0x5772,0x5774,0x5775,/* 0x70-0x77 */ 0x5778,0x5779,0x577A,0x577D,0x577E,0x577F,0x5780,0x0000,/* 0x78-0x7F */ - + 0x5781,0x5787,0x5788,0x5789,0x578A,0x578D,0x578E,0x578F,/* 0x80-0x87 */ 0x5790,0x5791,0x5794,0x5795,0x5796,0x5797,0x5798,0x5799,/* 0x88-0x8F */ 0x579A,0x579C,0x579D,0x579E,0x579F,0x57A5,0x57A8,0x57AA,/* 0x90-0x97 */ @@ -318,7 +318,7 @@ static wchar_t c2u_89[256] = { 0x5870,0x5871,0x5872,0x5873,0x5874,0x5875,0x5876,0x5877,/* 0x68-0x6F */ 0x5878,0x5879,0x587A,0x587B,0x587C,0x587D,0x587F,0x5882,/* 0x70-0x77 */ 0x5884,0x5886,0x5887,0x5888,0x588A,0x588B,0x588C,0x0000,/* 0x78-0x7F */ - + 0x588D,0x588E,0x588F,0x5890,0x5891,0x5894,0x5895,0x5896,/* 0x80-0x87 */ 0x5897,0x5898,0x589B,0x589C,0x589D,0x58A0,0x58A1,0x58A2,/* 0x88-0x8F */ 0x58A3,0x58A4,0x58A5,0x58A6,0x58A7,0x58AA,0x58AB,0x58AC,/* 0x90-0x97 */ @@ -354,7 +354,7 @@ static wchar_t c2u_8A[256] = { 0x597E,0x597F,0x5980,0x5985,0x5989,0x598B,0x598C,0x598E,/* 0x68-0x6F */ 0x598F,0x5990,0x5991,0x5994,0x5995,0x5998,0x599A,0x599B,/* 0x70-0x77 */ 0x599C,0x599D,0x599F,0x59A0,0x59A1,0x59A2,0x59A6,0x0000,/* 0x78-0x7F */ - + 0x59A7,0x59AC,0x59AD,0x59B0,0x59B1,0x59B3,0x59B4,0x59B5,/* 0x80-0x87 */ 0x59B6,0x59B7,0x59B8,0x59BA,0x59BC,0x59BD,0x59BF,0x59C0,/* 0x88-0x8F */ 0x59C1,0x59C2,0x59C3,0x59C4,0x59C5,0x59C7,0x59C8,0x59C9,/* 0x90-0x97 */ @@ -390,7 +390,7 @@ static wchar_t c2u_8B[256] = { 0x5A93,0x5A94,0x5A95,0x5A96,0x5A97,0x5A98,0x5A99,0x5A9C,/* 0x68-0x6F */ 0x5A9D,0x5A9E,0x5A9F,0x5AA0,0x5AA1,0x5AA2,0x5AA3,0x5AA4,/* 0x70-0x77 */ 0x5AA5,0x5AA6,0x5AA7,0x5AA8,0x5AA9,0x5AAB,0x5AAC,0x0000,/* 0x78-0x7F */ - + 0x5AAD,0x5AAE,0x5AAF,0x5AB0,0x5AB1,0x5AB4,0x5AB6,0x5AB7,/* 0x80-0x87 */ 0x5AB9,0x5ABA,0x5ABB,0x5ABC,0x5ABD,0x5ABF,0x5AC0,0x5AC3,/* 0x88-0x8F */ 0x5AC4,0x5AC5,0x5AC6,0x5AC7,0x5AC8,0x5ACA,0x5ACB,0x5ACD,/* 0x90-0x97 */ @@ -426,7 +426,7 @@ static wchar_t c2u_8C[256] = { 0x5BA7,0x5BA8,0x5BA9,0x5BAC,0x5BAD,0x5BAE,0x5BAF,0x5BB1,/* 0x68-0x6F */ 0x5BB2,0x5BB7,0x5BBA,0x5BBB,0x5BBC,0x5BC0,0x5BC1,0x5BC3,/* 0x70-0x77 */ 0x5BC8,0x5BC9,0x5BCA,0x5BCB,0x5BCD,0x5BCE,0x5BCF,0x0000,/* 0x78-0x7F */ - + 0x5BD1,0x5BD4,0x5BD5,0x5BD6,0x5BD7,0x5BD8,0x5BD9,0x5BDA,/* 0x80-0x87 */ 0x5BDB,0x5BDC,0x5BE0,0x5BE2,0x5BE3,0x5BE6,0xF9AA,0x5BE9,/* 0x88-0x8F */ 0x5BEA,0x5BEB,0x5BEC,0x5BED,0x5BEF,0x5BF1,0x5BF2,0x5BF3,/* 0x90-0x97 */ @@ -462,7 +462,7 @@ static wchar_t c2u_8D[256] = { 0x5CE2,0x5CE3,0x5CE7,0x5CE9,0x5CEB,0x5CEC,0x5CEE,0x5CEF,/* 0x68-0x6F */ 0x5CF1,0x5CF2,0x5CF3,0x5CF4,0x5CF5,0x5CF6,0x5CF7,0x5CF8,/* 0x70-0x77 */ 0x5CF9,0x5CFA,0x5CFC,0x5CFD,0x5CFE,0x5CFF,0x5D00,0x0000,/* 0x78-0x7F */ - + 0x5D01,0x5D04,0x5D05,0x5D08,0x5D09,0x5D0A,0x5D0B,0x5D0C,/* 0x80-0x87 */ 0x5D0D,0x5D0F,0x5D10,0x5D11,0x5D12,0x5D13,0x5D15,0x5D17,/* 0x88-0x8F */ 0x5D18,0xF9D5,0x5D1A,0x5D1C,0x5D1D,0x5D1F,0x5D20,0x5D21,/* 0x90-0x97 */ @@ -498,7 +498,7 @@ static wchar_t c2u_8E[256] = { 0x5DCB,0x5DCC,0x5DCE,0x5DCF,0x5DD0,0x5DD1,0x5DD2,0x5DD3,/* 0x68-0x6F */ 0x5DD4,0x5DD5,0x5DD6,0x5DD7,0x5DD8,0x5DD9,0x5DDA,0x5DDC,/* 0x70-0x77 */ 0x5DDF,0x5DE0,0x5DE3,0x5DE4,0x5DEA,0x5DEC,0x5DED,0x0000,/* 0x78-0x7F */ - + 0x5DF0,0x5DF5,0x5DF6,0x5DF8,0x5DF9,0x5DFA,0x5DFB,0x5DFC,/* 0x80-0x87 */ 0x5DFF,0x5E00,0x5E04,0x5E07,0x5E09,0x5E0A,0x5E0B,0x5E0D,/* 0x88-0x8F */ 0x5E0E,0x5E12,0x5E13,0x5E17,0x5E1E,0x5E1F,0x5E20,0x5E21,/* 0x90-0x97 */ @@ -534,7 +534,7 @@ static wchar_t c2u_8F[256] = { 0x5EFB,0x5EFC,0x5EFD,0x5F05,0x5F06,0x5F07,0x5F09,0x5F0C,/* 0x68-0x6F */ 0x5F0D,0x5F0E,0x5F10,0x5F12,0x5F14,0x5F16,0x5F19,0x5F1A,/* 0x70-0x77 */ 0x5F1C,0x5F1D,0x5F1E,0x5F21,0x5F22,0x5F23,0x5F24,0x0000,/* 0x78-0x7F */ - + 0x5F28,0x5F2B,0x5F2C,0x5F2E,0x5F30,0x5F32,0x5F33,0x5F34,/* 0x80-0x87 */ 0x5F35,0x5F36,0x5F37,0x5F38,0x5F3B,0x5F3D,0x5F3E,0x5F3F,/* 0x88-0x8F */ 0x5F41,0x5F42,0x5F43,0x5F44,0x5F45,0x5F46,0x5F47,0x5F48,/* 0x90-0x97 */ @@ -570,7 +570,7 @@ static wchar_t c2u_90[256] = { 0x604F,0x6051,0x6053,0x6054,0x6056,0x6057,0x6058,0x605B,/* 0x68-0x6F */ 0x605C,0x605E,0x605F,0x6060,0x6061,0x6065,0x6066,0x606E,/* 0x70-0x77 */ 0x6071,0x6072,0x6074,0x6075,0x6077,0x607E,0x6080,0x0000,/* 0x78-0x7F */ - + 0x6081,0x6082,0x6085,0x6086,0x6087,0x6088,0x608A,0x608B,/* 0x80-0x87 */ 0x608E,0x608F,0x6090,0x6091,0x6093,0x6095,0x6097,0x6098,/* 0x88-0x8F */ 0x6099,0x609C,0x609E,0x60A1,0x60A2,0x60A4,0x60A5,0x60A7,/* 0x90-0x97 */ @@ -606,7 +606,7 @@ static wchar_t c2u_91[256] = { 0x617C,0x617D,0x617E,0x617F,0x6180,0x6181,0x6182,0x6183,/* 0x68-0x6F */ 0x6184,0x6185,0x6186,0x6187,0x6188,0x6189,0x618A,0x618C,/* 0x70-0x77 */ 0x618D,0x618F,0xF98F,0x6191,0x6192,0x6193,0x6195,0x0000,/* 0x78-0x7F */ - + 0x6196,0x6197,0x6198,0x6199,0x619A,0x619B,0x619C,0x619E,/* 0x80-0x87 */ 0x619F,0x61A0,0x61A1,0x61A2,0x61A3,0x61A4,0x61A5,0x61A6,/* 0x88-0x8F */ 0x61AA,0x61AB,0x61AD,0x61AE,0x61AF,0x61B0,0x61B1,0x61B2,/* 0x90-0x97 */ @@ -642,7 +642,7 @@ static wchar_t c2u_92[256] = { 0x6299,0x629C,0x629D,0x629E,0x62A3,0x62A6,0x62A7,0x62A9,/* 0x68-0x6F */ 0x62AA,0x62AD,0x62AE,0x62AF,0x62B0,0x62B2,0x62B3,0x62B4,/* 0x70-0x77 */ 0x62B6,0x62B7,0x62B8,0x62BA,0x62BE,0x62C0,0x62C1,0x0000,/* 0x78-0x7F */ - + 0x62C3,0x62CB,0xF95B,0x62D1,0x62D5,0x62DD,0x62DE,0x62E0,/* 0x80-0x87 */ 0x62E1,0x62E4,0x62EA,0x62EB,0x62F0,0x62F2,0x62F5,0x62F8,/* 0x88-0x8F */ 0x62F9,0x62FA,0x62FB,0x6300,0x6303,0x6304,0x6305,0x6306,/* 0x90-0x97 */ @@ -678,7 +678,7 @@ static wchar_t c2u_93[256] = { 0x63FE,0x6403,0x6404,0x6406,0x6407,0x6408,0x6409,0x640A,/* 0x68-0x6F */ 0x640D,0x640E,0x6411,0x6412,0x6415,0x6416,0x6417,0x6418,/* 0x70-0x77 */ 0x6419,0x641A,0x641D,0x641F,0x6422,0x6423,0x6424,0x0000,/* 0x78-0x7F */ - + 0x6425,0x6427,0x6428,0x6429,0x642B,0x642E,0x642F,0x6430,/* 0x80-0x87 */ 0x6431,0x6432,0x6433,0x6435,0x6436,0x6437,0x6438,0x6439,/* 0x88-0x8F */ 0x643B,0x643C,0x643E,0x6440,0x6442,0x6443,0x6449,0x644B,/* 0x90-0x97 */ @@ -714,7 +714,7 @@ static wchar_t c2u_94[256] = { 0x6508,0x650A,0x650B,0x650C,0x650D,0x650E,0x650F,0x6510,/* 0x68-0x6F */ 0x6511,0x6513,0x6514,0x6515,0x6516,0x6517,0x6519,0x651A,/* 0x70-0x77 */ 0x651B,0x651C,0x651D,0x651E,0x651F,0x6520,0x6521,0x0000,/* 0x78-0x7F */ - + 0x6522,0x6523,0x6524,0x6526,0x6527,0x6528,0x6529,0x652A,/* 0x80-0x87 */ 0x652C,0x652D,0x6530,0x6531,0x6532,0x6533,0x6537,0x653A,/* 0x88-0x8F */ 0x653C,0x653D,0x6540,0x6541,0x6542,0x6543,0x6544,0x6546,/* 0x90-0x97 */ @@ -750,7 +750,7 @@ static wchar_t c2u_95[256] = { 0x6632,0x6633,0x6637,0x6638,0x6639,0x663A,0x663B,0x663D,/* 0x68-0x6F */ 0x663F,0x6640,0x6642,0x6644,0x6645,0x6646,0x6647,0x6648,/* 0x70-0x77 */ 0x6649,0x664A,0x664D,0x664E,0x6650,0x6651,0x6658,0x0000,/* 0x78-0x7F */ - + 0x6659,0x665B,0x665C,0x665D,0x665E,0x6660,0x6662,0x6663,/* 0x80-0x87 */ 0x6665,0x6667,0x6669,0x666A,0x666B,0x666C,0x666D,0x6671,/* 0x88-0x8F */ 0x6672,0x6673,0x6675,0x6678,0x6679,0x667B,0x667C,0x667D,/* 0x90-0x97 */ @@ -786,7 +786,7 @@ static wchar_t c2u_96[256] = { 0x674A,0x674B,0x674D,0x6752,0x6754,0x6755,0x6757,0x6758,/* 0x68-0x6F */ 0x6759,0x675A,0x675B,0x675D,0x6762,0x6763,0x6764,0x6766,/* 0x70-0x77 */ 0x6767,0x676B,0x676C,0x676E,0x6771,0x6774,0x6776,0x0000,/* 0x78-0x7F */ - + 0x6778,0x6779,0x677A,0xF9C8,0x677D,0x6780,0x6782,0x6783,/* 0x80-0x87 */ 0x6785,0x6786,0x6788,0x678A,0x678C,0x678D,0x678E,0x678F,/* 0x88-0x8F */ 0x6791,0x6792,0x6793,0x6794,0x6796,0x6799,0x679B,0x679F,/* 0x90-0x97 */ @@ -822,7 +822,7 @@ static wchar_t c2u_97[256] = { 0x6899,0x689A,0x689B,0x689C,0x689D,0x689E,0x689F,0x68A0,/* 0x68-0x6F */ 0x68A1,0x68A3,0x68A4,0x68A5,0x68A9,0x68AA,0x68AB,0x68AC,/* 0x70-0x77 */ 0x68AE,0x68B1,0x68B2,0x68B4,0x68B6,0x68B7,0x68B8,0x0000,/* 0x78-0x7F */ - + 0x68B9,0x68BA,0x68BB,0x68BC,0x68BD,0x68BE,0x68BF,0x68C1,/* 0x80-0x87 */ 0x68C3,0x68C4,0x68C5,0x68C6,0x68C7,0x68C8,0x68CA,0x68CC,/* 0x88-0x8F */ 0x68CE,0x68CF,0x68D0,0x68D1,0x68D3,0x68D4,0x68D6,0x68D7,/* 0x90-0x97 */ @@ -858,7 +858,7 @@ static wchar_t c2u_98[256] = { 0x699F,0x69A0,0x69A1,0x69A2,0x69A3,0x69A4,0x69A5,0x69A6,/* 0x68-0x6F */ 0x69A9,0x69AA,0x69AC,0x69AE,0x69AF,0x69B0,0x69B2,0x69B3,/* 0x70-0x77 */ 0x69B5,0x69B6,0x69B8,0x69B9,0x69BA,0x69BC,0x69BD,0x0000,/* 0x78-0x7F */ - + 0x69BE,0x69BF,0x69C0,0x69C2,0x69C3,0x69C4,0x69C5,0x69C6,/* 0x80-0x87 */ 0x69C7,0x69C8,0x69C9,0x69CB,0x69CD,0x69CF,0x69D1,0x69D2,/* 0x88-0x8F */ 0x69D3,0x69D5,0x69D6,0x69D7,0x69D8,0x69D9,0x69DA,0x69DC,/* 0x90-0x97 */ @@ -894,7 +894,7 @@ static wchar_t c2u_99[256] = { 0x6A8B,0x6A8C,0x6A8D,0x6A8F,0x6A92,0x6A93,0x6A94,0x6A95,/* 0x68-0x6F */ 0x6A96,0x6A98,0x6A99,0x6A9A,0x6A9B,0x6A9C,0x6A9D,0x6A9E,/* 0x70-0x77 */ 0x6A9F,0x6AA1,0x6AA2,0x6AA3,0x6AA4,0x6AA5,0x6AA6,0x0000,/* 0x78-0x7F */ - + 0x6AA7,0x6AA8,0x6AAA,0x6AAD,0x6AAE,0x6AAF,0x6AB0,0x6AB1,/* 0x80-0x87 */ 0x6AB2,0x6AB3,0x6AB4,0x6AB5,0x6AB6,0x6AB7,0x6AB8,0x6AB9,/* 0x88-0x8F */ 0x6ABA,0x6ABB,0x6ABC,0x6ABD,0x6ABE,0x6ABF,0x6AC0,0x6AC1,/* 0x90-0x97 */ @@ -930,7 +930,7 @@ static wchar_t c2u_9A[256] = { 0x6B68,0x6B69,0x6B6B,0x6B6C,0x6B6D,0x6B6E,0x6B6F,0x6B70,/* 0x68-0x6F */ 0x6B71,0x6B72,0x6B73,0x6B74,0x6B75,0x6B76,0xF98C,0x6B78,/* 0x70-0x77 */ 0x6B7A,0x6B7D,0x6B7E,0x6B7F,0x6B80,0x6B85,0x6B88,0x0000,/* 0x78-0x7F */ - + 0x6B8C,0x6B8E,0x6B8F,0x6B90,0x6B91,0x6B94,0x6B95,0x6B97,/* 0x80-0x87 */ 0x6B98,0x6B99,0x6B9C,0x6B9D,0x6B9E,0x6B9F,0x6BA0,0x6BA2,/* 0x88-0x8F */ 0x6BA3,0x6BA4,0x6BA5,0x6BA6,0x6BA7,0x6BA8,0x6BA9,0x6BAB,/* 0x90-0x97 */ @@ -966,7 +966,7 @@ static wchar_t c2u_9B[256] = { 0x6CA8,0x6CAC,0x6CAF,0x6CB0,0x6CB4,0x6CB5,0x6CB6,0x6CB7,/* 0x68-0x6F */ 0x6CBA,0x6CC0,0x6CC1,0x6CC2,0x6CC3,0x6CC6,0x6CC7,0x6CC8,/* 0x70-0x77 */ 0x6CCB,0x6CCD,0x6CCE,0x6CCF,0x6CD1,0x6CD2,0x6CD8,0x0000,/* 0x78-0x7F */ - + 0x6CD9,0x6CDA,0x6CDC,0x6CDD,0x6CDF,0x6CE4,0x6CE6,0x6CE7,/* 0x80-0x87 */ 0x6CE9,0x6CEC,0x6CED,0x6CF2,0x6CF4,0x6CF9,0x6CFF,0x6D00,/* 0x88-0x8F */ 0x6D02,0x6D03,0x6D05,0x6D06,0x6D08,0x6D09,0x6D0A,0x6D0D,/* 0x90-0x97 */ @@ -1002,7 +1002,7 @@ static wchar_t c2u_9C[256] = { 0x6E09,0x6E0B,0x6E0F,0x6E12,0x6E13,0x6E15,0x6E18,0x6E19,/* 0x68-0x6F */ 0x6E1B,0x6E1C,0x6E1E,0x6E1F,0x6E22,0x6E26,0x6E27,0x6E28,/* 0x70-0x77 */ 0x6E2A,0x6E2C,0x6E2E,0x6E30,0x6E31,0x6E33,0x6E35,0x0000,/* 0x78-0x7F */ - + 0x6E36,0x6E37,0x6E39,0x6E3B,0x6E3C,0x6E3D,0x6E3E,0x6E3F,/* 0x80-0x87 */ 0x6E40,0x6E41,0x6E42,0x6E45,0x6E46,0x6E47,0x6E48,0x6E49,/* 0x88-0x8F */ 0x6E4A,0x6E4B,0x6E4C,0x6E4F,0x6E50,0x6E51,0x6E52,0x6E55,/* 0x90-0x97 */ @@ -1038,7 +1038,7 @@ static wchar_t c2u_9D[256] = { 0x6F22,0xF992,0x6F25,0x6F26,0x6F27,0x6F28,0x6F2C,0x6F2E,/* 0x68-0x6F */ 0x6F30,0x6F32,0x6F34,0x6F35,0x6F37,0x6F38,0x6F39,0x6F3A,/* 0x70-0x77 */ 0x6F3B,0x6F3C,0x6F3D,0x6F3F,0x6F40,0x6F41,0x6F42,0x0000,/* 0x78-0x7F */ - + 0x6F43,0x6F44,0x6F45,0x6F48,0x6F49,0x6F4A,0x6F4C,0x6F4E,/* 0x80-0x87 */ 0x6F4F,0x6F50,0x6F51,0x6F52,0x6F53,0x6F54,0x6F55,0x6F56,/* 0x88-0x8F */ 0x6F57,0x6F59,0x6F5A,0x6F5B,0x6F5D,0x6F5F,0x6F60,0x6F61,/* 0x90-0x97 */ @@ -1074,7 +1074,7 @@ static wchar_t c2u_9E[256] = { 0x7010,0x7012,0x7013,0x7014,0x7015,0x7016,0x7017,0x7018,/* 0x68-0x6F */ 0x7019,0x701C,0x701D,0x701E,0x701F,0x7020,0x7021,0x7022,/* 0x70-0x77 */ 0x7024,0x7025,0x7026,0x7027,0x7028,0x7029,0x702A,0x0000,/* 0x78-0x7F */ - + 0x702B,0x702C,0x702D,0x702E,0x702F,0x7030,0x7031,0x7032,/* 0x80-0x87 */ 0x7033,0x7034,0x7036,0x7037,0x7038,0x703A,0x703B,0x703C,/* 0x88-0x8F */ 0x703D,0x703E,0x703F,0x7040,0x7041,0x7042,0x7043,0x7044,/* 0x90-0x97 */ @@ -1110,7 +1110,7 @@ static wchar_t c2u_9F[256] = { 0x7117,0x711B,0x711C,0x711D,0x711E,0x711F,0x7120,0x7121,/* 0x68-0x6F */ 0x7122,0x7123,0x7124,0x7125,0x7127,0x7128,0x7129,0x712A,/* 0x70-0x77 */ 0x712B,0x712C,0x712D,0x712E,0x7132,0x7133,0x7134,0x0000,/* 0x78-0x7F */ - + 0x7135,0x7137,0x7138,0x7139,0x713A,0x713B,0x713C,0x713D,/* 0x80-0x87 */ 0x713E,0x713F,0x7140,0x7141,0x7142,0x7143,0x7144,0x7146,/* 0x88-0x8F */ 0x7147,0x7148,0xF993,0x714B,0x714D,0x714F,0x7150,0x7151,/* 0x90-0x97 */ @@ -1146,7 +1146,7 @@ static wchar_t c2u_A0[256] = { 0x7203,0x7204,0x7205,0x7207,0x7208,0x7209,0x720A,0x720B,/* 0x68-0x6F */ 0x720C,0x720D,0x720E,0x720F,0xF932,0x7211,0x7212,0x7213,/* 0x70-0x77 */ 0x7214,0x7215,0x7216,0x7217,0x7218,0x7219,0x721A,0x0000,/* 0x78-0x7F */ - + 0xF91E,0x721C,0x721E,0x721F,0x7220,0x7221,0x7222,0x7223,/* 0x80-0x87 */ 0x7224,0x7225,0x7226,0x7227,0x7229,0x722B,0x722D,0x722E,/* 0x88-0x8F */ 0x722F,0x7232,0x7233,0x7234,0x723A,0x723C,0x723E,0x7240,/* 0x90-0x97 */ @@ -1182,7 +1182,7 @@ static wchar_t c2u_A1[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1218,7 +1218,7 @@ static wchar_t c2u_A2[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1254,7 +1254,7 @@ static wchar_t c2u_A3[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1290,7 +1290,7 @@ static wchar_t c2u_A4[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1325,7 +1325,7 @@ static wchar_t c2u_A5[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1360,7 +1360,7 @@ static wchar_t c2u_A6[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1395,7 +1395,7 @@ static wchar_t c2u_A7[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1430,7 +1430,7 @@ static wchar_t c2u_A8[256] = { 0x2564,0x2565,0x2566,0x2567,0x2568,0x2569,0x256A,0x256B,/* 0x68-0x6F */ 0x256C,0x256D,0x256E,0x256F,0x2570,0x2571,0x2572,0x2573,/* 0x70-0x77 */ 0x2581,0x2582,0x2583,0x2584,0x2585,0x2586,0x2587,0x0000,/* 0x78-0x7F */ - + 0x2588,0x2589,0x258A,0x258B,0x258C,0x258D,0x258E,0x258F,/* 0x80-0x87 */ 0x2593,0x2594,0x2595,0x25BC,0x25BD,0x25E2,0x25E3,0x25E4,/* 0x88-0x8F */ 0x25E5,0x2609,0x2295,0x3012,0x301D,0x301E,0x0000,0x0000,/* 0x90-0x97 */ @@ -1464,7 +1464,7 @@ static wchar_t c2u_A9[256] = { 0xFE49,0xFE4A,0xFE4B,0xFE4C,0xFE4D,0xFE4E,0xFE4F,0xFE50,/* 0x68-0x6F */ 0xFE51,0xFE52,0xFE54,0xFE55,0xFE56,0xFE57,0xFE59,0xFE5A,/* 0x70-0x77 */ 0xFE5B,0xFE5C,0xFE5D,0xFE5E,0xFE5F,0xFE60,0xFE61,0x0000,/* 0x78-0x7F */ - + 0xFE62,0xFE63,0xFE64,0xFE65,0xFE66,0xFE68,0xFE69,0xFE6A,/* 0x80-0x87 */ 0xFE6B,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x3007,0x0000,/* 0x90-0x97 */ @@ -1498,7 +1498,7 @@ static wchar_t c2u_AA[256] = { 0x7326,0x7327,0x7328,0x732D,0x732F,0x7330,0x7332,0x7333,/* 0x68-0x6F */ 0x7335,0x7336,0x733A,0x733B,0x733C,0x733D,0x7340,0x7341,/* 0x70-0x77 */ 0x7342,0x7343,0x7344,0x7345,0x7346,0x7347,0x7348,0x0000,/* 0x78-0x7F */ - + 0x7349,0x734A,0x734B,0x734C,0x734E,0x734F,0x7351,0x7353,/* 0x80-0x87 */ 0x7354,0x7355,0x7356,0x7358,0x7359,0x735A,0x735B,0x735C,/* 0x88-0x8F */ 0x735D,0x735E,0x735F,0x7361,0x7362,0x7363,0x7364,0x7365,/* 0x90-0x97 */ @@ -1523,7 +1523,7 @@ static wchar_t c2u_AB[256] = { 0x73A5,0x73A6,0x73A7,0x73A8,0x73AA,0x73AC,0x73AD,0x73B1,/* 0x68-0x6F */ 0x73B4,0x73B5,0x73B6,0x73B8,0x73B9,0x73BC,0x73BD,0x73BE,/* 0x70-0x77 */ 0x73BF,0x73C1,0x73C3,0x73C4,0x73C5,0x73C6,0x73C7,0x0000,/* 0x78-0x7F */ - + 0x73CB,0x73CC,0x73CE,0x73D2,0x73D3,0x73D4,0x73D5,0x73D6,/* 0x80-0x87 */ 0x73D7,0x73D8,0x73DA,0x73DB,0x73DC,0x73DD,0x73DF,0x73E1,/* 0x88-0x8F */ 0x73E2,0x73E3,0x73E4,0x73E6,0x73E8,0x73EA,0x73EB,0x73EC,/* 0x90-0x97 */ @@ -1548,7 +1548,7 @@ static wchar_t c2u_AC[256] = { 0x7431,0x7432,0x7437,0x7438,0x7439,0x743A,0x743B,0x743D,/* 0x68-0x6F */ 0x743E,0x743F,0x7440,0x7442,0x7443,0x7444,0x7445,0x7446,/* 0x70-0x77 */ 0x7447,0x7448,0x7449,0x744A,0x744B,0x744C,0x744D,0x0000,/* 0x78-0x7F */ - + 0x744E,0x744F,0x7450,0x7451,0x7452,0x7453,0x7454,0x7456,/* 0x80-0x87 */ 0x7458,0x745D,0x7460,0x7461,0x7462,0x7463,0x7464,0x7465,/* 0x88-0x8F */ 0x7466,0x7467,0x7468,0xF9AE,0x746A,0x746B,0x746C,0x746E,/* 0x90-0x97 */ @@ -1573,7 +1573,7 @@ static wchar_t c2u_AD[256] = { 0x74B0,0x74B1,0x74B2,0x74B3,0x74B4,0x74B5,0x74B6,0x74B7,/* 0x68-0x6F */ 0x74B8,0x74B9,0x74BB,0x74BC,0x74BD,0x74BE,0x74BF,0x74C0,/* 0x70-0x77 */ 0x74C1,0x74C2,0x74C3,0x74C4,0x74C5,0x74C6,0x74C7,0x0000,/* 0x78-0x7F */ - + 0x74C8,0x74C9,0x74CA,0x74CB,0x74CC,0x74CD,0x74CE,0x74CF,/* 0x80-0x87 */ 0x74D0,0x74D1,0x74D3,0x74D4,0x74D5,0x74D6,0x74D7,0x74D8,/* 0x88-0x8F */ 0x74D9,0x74DA,0x74DB,0x74DD,0x74DF,0x74E1,0x74E5,0x74E7,/* 0x90-0x97 */ @@ -1598,7 +1598,7 @@ static wchar_t c2u_AE[256] = { 0x7534,0x7536,0x7539,0x753C,0x753D,0x753F,0x7541,0x7542,/* 0x68-0x6F */ 0x7543,0x7544,0x7546,0x7547,0x7549,0x754A,0x754D,0x7550,/* 0x70-0x77 */ 0x7551,0x7552,0x7553,0x7555,0x7556,0x7557,0x7558,0x0000,/* 0x78-0x7F */ - + 0x755D,0x755E,0x755F,0x7560,0x7561,0x7562,0x7563,0x7564,/* 0x80-0x87 */ 0x7567,0x7568,0x7569,0x756B,0x756C,0x756D,0x756E,0x756F,/* 0x88-0x8F */ 0xF962,0x7571,0x7573,0x7575,0x7576,0x7577,0x757A,0x757B,/* 0x90-0x97 */ @@ -1623,7 +1623,7 @@ static wchar_t c2u_AF[256] = { 0x75DF,0x75E0,0x75E1,0x75E5,0x75E9,0x75EC,0x75ED,0x75EE,/* 0x68-0x6F */ 0x75EF,0x75F2,0x75F3,0x75F5,0x75F6,0x75F7,0x75F8,0x75FA,/* 0x70-0x77 */ 0x75FB,0x75FD,0x75FE,0x7602,0x7604,0x7606,0x7607,0x0000,/* 0x78-0x7F */ - + 0x7608,0x7609,0x760B,0x760D,0x760E,0x760F,0x7611,0x7612,/* 0x80-0x87 */ 0x7613,0x7614,0x7616,0x761A,0x761C,0x761D,0x761E,0x7621,/* 0x88-0x8F */ 0x7623,0x7627,0x7628,0x762C,0x762E,0x762F,0x7631,0x7632,/* 0x90-0x97 */ @@ -1648,7 +1648,7 @@ static wchar_t c2u_B0[256] = { 0x7676,0x7677,0x7679,0x767A,0x767C,0x767F,0x7680,0x7681,/* 0x68-0x6F */ 0x7683,0x7685,0x7689,0x768A,0x768C,0x768D,0x768F,0x7690,/* 0x70-0x77 */ 0x7692,0x7694,0x7695,0x7697,0x7698,0x769A,0x769B,0x0000,/* 0x78-0x7F */ - + 0x769C,0x769D,0x769E,0x769F,0x76A0,0x76A1,0x76A2,0x76A3,/* 0x80-0x87 */ 0x76A5,0x76A6,0x76A7,0x76A8,0x76A9,0x76AA,0x76AB,0x76AC,/* 0x88-0x8F */ 0x76AD,0x76AF,0x76B0,0x76B3,0x76B5,0x76B6,0x76B7,0x76B8,/* 0x90-0x97 */ @@ -1684,7 +1684,7 @@ static wchar_t c2u_B1[256] = { 0x770C,0x770E,0x770F,0x7710,0x7711,0x7712,0x7713,0x7714,/* 0x68-0x6F */ 0x7715,0x7716,0x7717,0x7718,0x771B,0x771C,0x771D,0x771E,/* 0x70-0x77 */ 0x7721,0x7723,0x7724,0x7725,0x7727,0x772A,0x772B,0x0000,/* 0x78-0x7F */ - + 0x772C,0x772E,0x7730,0x7731,0x7732,0x7733,0x7734,0x7739,/* 0x80-0x87 */ 0x773B,0x773D,0x773E,0x773F,0x7742,0x7744,0x7745,0x7746,/* 0x88-0x8F */ 0x7748,0x7749,0x774A,0x774B,0x774C,0x774D,0x774E,0x774F,/* 0x90-0x97 */ @@ -1720,7 +1720,7 @@ static wchar_t c2u_B2[256] = { 0x7799,0x779A,0x779B,0x779C,0x779D,0x779E,0x77A1,0x77A3,/* 0x68-0x6F */ 0x77A4,0x77A6,0x77A8,0x77AB,0x77AD,0x77AE,0x77AF,0x77B1,/* 0x70-0x77 */ 0x77B2,0x77B4,0x77B6,0x77B7,0x77B8,0x77B9,0x77BA,0x0000,/* 0x78-0x7F */ - + 0x77BC,0x77BE,0x77C0,0x77C1,0x77C2,0x77C3,0x77C4,0x77C5,/* 0x80-0x87 */ 0x77C6,0x77C7,0x77C8,0x77C9,0x77CA,0x77CB,0x77CC,0x77CE,/* 0x88-0x8F */ 0x77CF,0x77D0,0x77D1,0x77D2,0x77D3,0x77D4,0x77D5,0x77D6,/* 0x90-0x97 */ @@ -1756,7 +1756,7 @@ static wchar_t c2u_B3[256] = { 0x7832,0x7833,0x7835,0x7836,0x783D,0x783F,0x7841,0x7842,/* 0x68-0x6F */ 0x7843,0x7844,0x7846,0x7848,0x7849,0x784A,0x784B,0x784D,/* 0x70-0x77 */ 0x784F,0x7851,0x7853,0x7854,0x7858,0x7859,0x785A,0x0000,/* 0x78-0x7F */ - + 0x785B,0x785C,0x785E,0x785F,0x7860,0x7861,0x7862,0x7863,/* 0x80-0x87 */ 0x7864,0x7865,0x7866,0x7867,0x7868,0x7869,0x786F,0x7870,/* 0x88-0x8F */ 0x7871,0x7872,0x7873,0x7874,0x7875,0x7876,0x7878,0x7879,/* 0x90-0x97 */ @@ -1792,7 +1792,7 @@ static wchar_t c2u_B4[256] = { 0x78C6,0x78C7,0x78C8,0x78CC,0x78CD,0x78CE,0x78CF,0x78D1,/* 0x68-0x6F */ 0x78D2,0x78D3,0x78D6,0x78D7,0x78D8,0x78DA,0x78DB,0x78DC,/* 0x70-0x77 */ 0x78DD,0x78DE,0x78DF,0x78E0,0x78E1,0x78E2,0x78E3,0x0000,/* 0x78-0x7F */ - + 0x78E4,0x78E5,0x78E6,0x78E7,0x78E9,0x78EA,0x78EB,0x78ED,/* 0x80-0x87 */ 0x78EE,0x78EF,0x78F0,0x78F1,0x78F3,0x78F5,0x78F6,0x78F8,/* 0x88-0x8F */ 0x78F9,0xF964,0x78FC,0x78FD,0x78FE,0x78FF,0x7900,0x7902,/* 0x90-0x97 */ @@ -1828,7 +1828,7 @@ static wchar_t c2u_B5[256] = { 0x7939,0x793D,0x793F,0x7942,0x7943,0x7944,0x7945,0x7947,/* 0x68-0x6F */ 0x794A,0x794B,0x794C,0x794D,0x794E,0x794F,0x7950,0x7951,/* 0x70-0x77 */ 0x7952,0x7954,0x7955,0x7958,0x7959,0x7961,0x7963,0x0000,/* 0x78-0x7F */ - + 0x7964,0x7966,0x7969,0x796A,0x796B,0x796C,0x796E,0x7970,/* 0x80-0x87 */ 0x7971,0x7972,0x7973,0x7974,0x7975,0x7976,0x7979,0x797B,/* 0x88-0x8F */ 0x797C,0x797D,0x797E,0xF93C,0x7982,0x7983,0x7986,0x7987,/* 0x90-0x97 */ @@ -1864,7 +1864,7 @@ static wchar_t c2u_B6[256] = { 0x79C7,0x79C8,0x79CA,0x79CC,0x79CE,0x79CF,0x79D0,0x79D3,/* 0x68-0x6F */ 0x79D4,0x79D6,0x79D7,0x79D9,0x79DA,0x79DB,0x79DC,0x79DD,/* 0x70-0x77 */ 0x79DE,0x79E0,0x79E1,0x79E2,0x79E5,0x79E8,0x79EA,0x0000,/* 0x78-0x7F */ - + 0x79EC,0x79EE,0x79F1,0x79F2,0x79F3,0x79F4,0x79F5,0x79F6,/* 0x80-0x87 */ 0x79F7,0x79F9,0x79FA,0x79FC,0x79FE,0x79FF,0x7A01,0x7A04,/* 0x88-0x8F */ 0x7A05,0x7A07,0x7A08,0x7A09,0x7A0A,0x7A0C,0x7A0F,0x7A10,/* 0x90-0x97 */ @@ -1900,7 +1900,7 @@ static wchar_t c2u_B7[256] = { 0x7A50,0x7A52,0x7A53,0x7A54,0x7A55,0x7A56,0x7A58,0x7A59,/* 0x68-0x6F */ 0x7A5A,0x7A5B,0x7A5C,0x7A5D,0x7A5E,0x7A5F,0x7A60,0x7A61,/* 0x70-0x77 */ 0x7A62,0x7A63,0x7A64,0x7A65,0x7A66,0x7A67,0x7A68,0x0000,/* 0x78-0x7F */ - + 0x7A69,0x7A6A,0x7A6B,0x7A6C,0x7A6D,0x7A6E,0x7A6F,0x7A71,/* 0x80-0x87 */ 0x7A72,0x7A73,0x7A75,0x7A7B,0x7A7C,0x7A7D,0x7A7E,0x7A82,/* 0x88-0x8F */ 0x7A85,0x7A87,0x7A89,0x7A8A,0x7A8B,0x7A8C,0x7A8E,0x7A8F,/* 0x90-0x97 */ @@ -1936,7 +1936,7 @@ static wchar_t c2u_B8[256] = { 0x7AD3,0x7AD4,0x7AD5,0x7AD7,0x7AD8,0x7ADA,0x7ADB,0x7ADC,/* 0x68-0x6F */ 0x7ADD,0x7AE1,0x7AE2,0x7AE4,0x7AE7,0x7AE8,0x7AE9,0x7AEA,/* 0x70-0x77 */ 0x7AEB,0x7AEC,0x7AEE,0x7AF0,0x7AF1,0x7AF2,0x7AF3,0x0000,/* 0x78-0x7F */ - + 0x7AF4,0x7AF5,0x7AF6,0x7AF7,0x7AF8,0x7AFB,0x7AFC,0x7AFE,/* 0x80-0x87 */ 0x7B00,0x7B01,0x7B02,0x7B05,0x7B07,0x7B09,0x7B0C,0x7B0D,/* 0x88-0x8F */ 0x7B0E,0x7B10,0x7B12,0x7B13,0x7B16,0x7B17,0x7B18,0x7B1A,/* 0x90-0x97 */ @@ -1972,7 +1972,7 @@ static wchar_t c2u_B9[256] = { 0x7B6F,0x7B70,0x7B73,0x7B74,0x7B76,0x7B78,0x7B7A,0x7B7C,/* 0x68-0x6F */ 0x7B7D,0x7B7F,0x7B81,0x7B82,0x7B83,0x7B84,0x7B86,0x7B87,/* 0x70-0x77 */ 0x7B88,0x7B89,0x7B8A,0x7B8B,0x7B8C,0x7B8E,0x7B8F,0x0000,/* 0x78-0x7F */ - + 0x7B91,0x7B92,0x7B93,0x7B96,0x7B98,0x7B99,0x7B9A,0x7B9B,/* 0x80-0x87 */ 0x7B9E,0x7B9F,0x7BA0,0x7BA3,0x7BA4,0x7BA5,0x7BAE,0x7BAF,/* 0x88-0x8F */ 0x7BB0,0x7BB2,0x7BB3,0x7BB5,0x7BB6,0x7BB7,0x7BB9,0x7BBA,/* 0x90-0x97 */ @@ -2008,7 +2008,7 @@ static wchar_t c2u_BA[256] = { 0x7BFD,0x7BFF,0x7C00,0x7C01,0x7C02,0x7C03,0x7C04,0x7C05,/* 0x68-0x6F */ 0x7C06,0x7C08,0x7C09,0x7C0A,0x7C0D,0x7C0E,0x7C10,0x7C11,/* 0x70-0x77 */ 0x7C12,0x7C13,0x7C14,0x7C15,0x7C17,0x7C18,0x7C19,0x0000,/* 0x78-0x7F */ - + 0x7C1A,0x7C1B,0x7C1C,0x7C1D,0x7C1E,0x7C20,0x7C21,0x7C22,/* 0x80-0x87 */ 0x7C23,0x7C24,0x7C25,0x7C28,0x7C29,0x7C2B,0x7C2C,0x7C2D,/* 0x88-0x8F */ 0x7C2E,0x7C2F,0x7C30,0x7C31,0x7C32,0x7C33,0x7C34,0x7C35,/* 0x90-0x97 */ @@ -2044,7 +2044,7 @@ static wchar_t c2u_BB[256] = { 0x7C6C,0x7C6D,0x7C6E,0x7C6F,0x7C70,0x7C71,0x7C72,0x7C75,/* 0x68-0x6F */ 0x7C76,0x7C77,0x7C78,0x7C79,0x7C7A,0x7C7E,0x7C7F,0x7C80,/* 0x70-0x77 */ 0x7C81,0x7C82,0x7C83,0x7C84,0x7C85,0x7C86,0x7C87,0x0000,/* 0x78-0x7F */ - + 0x7C88,0x7C8A,0x7C8B,0x7C8C,0x7C8D,0x7C8E,0x7C8F,0x7C90,/* 0x80-0x87 */ 0x7C93,0x7C94,0x7C96,0x7C99,0x7C9A,0x7C9B,0x7CA0,0x7CA1,/* 0x88-0x8F */ 0x7CA3,0x7CA6,0x7CA7,0x7CA8,0x7CA9,0x7CAB,0x7CAC,0x7CAD,/* 0x90-0x97 */ @@ -2080,7 +2080,7 @@ static wchar_t c2u_BC[256] = { 0x7CF7,0x7CF9,0x7CFA,0x7CFC,0x7CFD,0x7CFE,0x7CFF,0x7D00,/* 0x68-0x6F */ 0x7D01,0x7D02,0x7D03,0x7D04,0x7D05,0x7D06,0x7D07,0x7D08,/* 0x70-0x77 */ 0x7D09,0x7D0B,0x7D0C,0x7D0D,0x7D0E,0x7D0F,0xF9CF,0x0000,/* 0x78-0x7F */ - + 0x7D11,0x7D12,0x7D13,0x7D14,0x7D15,0x7D16,0x7D17,0x7D18,/* 0x80-0x87 */ 0x7D19,0x7D1A,0x7D1B,0x7D1C,0x7D1D,0x7D1E,0x7D1F,0x7D21,/* 0x88-0x8F */ 0x7D23,0x7D24,0x7D25,0x7D26,0x7D28,0x7D29,0x7D2A,0x7D2C,/* 0x90-0x97 */ @@ -2116,7 +2116,7 @@ static wchar_t c2u_BD[256] = { 0x7D5F,0x7D60,0x7D61,0x7D62,0x7D63,0x7D64,0x7D65,0x7D66,/* 0x68-0x6F */ 0x7D67,0x7D68,0x7D69,0x7D6A,0x7D6B,0x7D6C,0x7D6D,0x7D6F,/* 0x70-0x77 */ 0x7D70,0x7D71,0x7D72,0x7D73,0x7D74,0x7D75,0x7D76,0x0000,/* 0x78-0x7F */ - + 0x7D78,0x7D79,0x7D7A,0x7D7B,0x7D7C,0x7D7D,0x7D7E,0x7D7F,/* 0x80-0x87 */ 0x7D80,0x7D81,0x7D82,0x7D83,0x7D84,0x7D85,0x7D86,0x7D87,/* 0x88-0x8F */ 0x7D88,0x7D89,0x7D8A,0x7D8B,0x7D8C,0x7D8D,0x7D8E,0x7D8F,/* 0x90-0x97 */ @@ -2152,7 +2152,7 @@ static wchar_t c2u_BE[256] = { 0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DC7,0x7DC8,0x7DC9,0x7DCA,/* 0x68-0x6F */ 0x7DCB,0x7DCC,0x7DCD,0x7DCE,0x7DCF,0x7DD0,0x7DD1,0x7DD2,/* 0x70-0x77 */ 0x7DD3,0x7DD4,0x7DD5,0x7DD6,0x7DD7,0x7DD8,0x7DD9,0x0000,/* 0x78-0x7F */ - + 0x7DDA,0x7DDB,0x7DDC,0x7DDD,0x7DDE,0x7DDF,0x7DE0,0x7DE1,/* 0x80-0x87 */ 0x7DE2,0x7DE3,0x7DE4,0x7DE5,0x7DE6,0x7DE7,0x7DE8,0x7DE9,/* 0x88-0x8F */ 0x7DEA,0x7DEB,0x7DEC,0x7DED,0x7DEE,0x7DEF,0x7DF0,0x7DF1,/* 0x90-0x97 */ @@ -2188,7 +2188,7 @@ static wchar_t c2u_BF[256] = { 0x7E23,0x7E24,0x7E25,0x7E26,0x7E27,0x7E28,0x7E29,0x7E2A,/* 0x68-0x6F */ 0x7E2B,0x7E2C,0x7E2D,0x7E2E,0x7E2F,0x7E30,0x7E31,0x7E32,/* 0x70-0x77 */ 0x7E33,0x7E34,0x7E35,0x7E36,0xF950,0x7E38,0x7E39,0x0000,/* 0x78-0x7F */ - + 0x7E3A,0x7E3C,0x7E3D,0x7E3E,0x7E3F,0x7E40,0x7E42,0x7E43,/* 0x80-0x87 */ 0x7E44,0x7E45,0x7E46,0x7E48,0x7E49,0x7E4A,0x7E4B,0x7E4C,/* 0x88-0x8F */ 0x7E4D,0x7E4E,0x7E4F,0x7E50,0x7E51,0x7E52,0x7E53,0x7E54,/* 0x90-0x97 */ @@ -2224,7 +2224,7 @@ static wchar_t c2u_C0[256] = { 0x7E87,0x7E88,0x7E89,0x7E8A,0x7E8B,0x7E8C,0x7E8D,0x7E8E,/* 0x68-0x6F */ 0x7E8F,0x7E90,0x7E91,0x7E92,0x7E93,0x7E94,0x7E95,0x7E96,/* 0x70-0x77 */ 0x7E97,0x7E98,0x7E99,0x7E9A,0x7E9C,0x7E9D,0x7E9E,0x0000,/* 0x78-0x7F */ - + 0x7EAE,0x7EB4,0x7EBB,0x7EBC,0x7ED6,0x7EE4,0x7EEC,0x7EF9,/* 0x80-0x87 */ 0x7F0A,0x7F10,0x7F1E,0x7F37,0x7F39,0x7F3B,0x7F3C,0x7F3D,/* 0x88-0x8F */ 0x7F3E,0x7F3F,0x7F40,0x7F41,0x7F43,0x7F46,0x7F47,0x7F48,/* 0x90-0x97 */ @@ -2260,7 +2260,7 @@ static wchar_t c2u_C1[256] = { 0x7F91,0x7F92,0x7F93,0x7F95,0x7F96,0x7F97,0x7F98,0x7F99,/* 0x68-0x6F */ 0x7F9B,0x7F9C,0x7FA0,0x7FA2,0x7FA3,0x7FA5,0x7FA6,0x7FA8,/* 0x70-0x77 */ 0x7FA9,0x7FAA,0x7FAB,0x7FAC,0x7FAD,0x7FAE,0x7FB1,0x0000,/* 0x78-0x7F */ - + 0x7FB3,0x7FB4,0x7FB5,0x7FB6,0x7FB7,0x7FBA,0x7FBB,0x7FBE,/* 0x80-0x87 */ 0x7FC0,0x7FC2,0x7FC3,0x7FC4,0x7FC6,0x7FC7,0x7FC8,0x7FC9,/* 0x88-0x8F */ 0x7FCB,0x7FCD,0x7FCF,0x7FD0,0x7FD1,0x7FD2,0x7FD3,0x7FD6,/* 0x90-0x97 */ @@ -2296,7 +2296,7 @@ static wchar_t c2u_C2[256] = { 0x802F,0x8030,0x8032,0x8034,0x8039,0x803A,0x803C,0x803E,/* 0x68-0x6F */ 0x8040,0x8041,0x8044,0x8045,0x8047,0x8048,0x8049,0x804E,/* 0x70-0x77 */ 0x804F,0x8050,0x8051,0x8053,0x8055,0x8056,0x8057,0x0000,/* 0x78-0x7F */ - + 0x8059,0x805B,0x805C,0x805D,0x805E,0x805F,0x8060,0x8061,/* 0x80-0x87 */ 0x8062,0x8063,0x8064,0x8065,0x8066,0x8067,0x8068,0x806B,/* 0x88-0x8F */ 0x806C,0x806D,0x806E,0xF997,0x8070,0x8072,0x8073,0x8074,/* 0x90-0x97 */ @@ -2332,7 +2332,7 @@ static wchar_t c2u_C3[256] = { 0x80D4,0x80D5,0x80D8,0x80DF,0x80E0,0x80E2,0x80E3,0x80E6,/* 0x68-0x6F */ 0x80EE,0x80F5,0x80F7,0x80F9,0x80FB,0x80FE,0x80FF,0x8100,/* 0x70-0x77 */ 0x8101,0x8103,0x8104,0x8105,0x8107,0x8108,0x810B,0x0000,/* 0x78-0x7F */ - + 0x810C,0x8115,0x8117,0x8119,0x811B,0x811C,0x811D,0x811F,/* 0x80-0x87 */ 0x8120,0x8121,0x8122,0x8123,0x8124,0x8125,0x8126,0x8127,/* 0x88-0x8F */ 0x8128,0x8129,0x812A,0x812B,0x812D,0x812E,0x8130,0x8133,/* 0x90-0x97 */ @@ -2368,7 +2368,7 @@ static wchar_t c2u_C4[256] = { 0x8186,0x8187,0x8189,0x818B,0x818C,0x818D,0x818E,0x8190,/* 0x68-0x6F */ 0x8192,0x8193,0x8194,0x8195,0x8196,0x8197,0x8199,0x819A,/* 0x70-0x77 */ 0x819E,0x819F,0x81A0,0x81A1,0x81A2,0x81A4,0x81A5,0x0000,/* 0x78-0x7F */ - + 0x81A7,0x81A9,0x81AB,0x81AC,0x81AD,0x81AE,0x81AF,0x81B0,/* 0x80-0x87 */ 0x81B1,0x81B2,0x81B4,0x81B5,0x81B6,0x81B7,0x81B8,0x81B9,/* 0x88-0x8F */ 0x81BC,0x81BD,0x81BE,0x81BF,0x81C4,0x81C5,0x81C7,0x81C8,/* 0x90-0x97 */ @@ -2404,7 +2404,7 @@ static wchar_t c2u_C5[256] = { 0x820E,0x820F,0x8211,0x8213,0x8215,0x8216,0x8217,0x8218,/* 0x68-0x6F */ 0x8219,0x821A,0x821D,0x8220,0x8224,0x8225,0x8226,0x8227,/* 0x70-0x77 */ 0x8229,0x822E,0x8232,0x823A,0x823C,0x823D,0x823F,0x0000,/* 0x78-0x7F */ - + 0x8240,0x8241,0x8242,0x8243,0x8245,0x8246,0x8248,0x824A,/* 0x80-0x87 */ 0x824C,0x824D,0x824E,0x8250,0x8251,0x8252,0x8253,0x8254,/* 0x88-0x8F */ 0x8255,0x8256,0x8257,0x8259,0x825B,0x825C,0x825D,0x825E,/* 0x90-0x97 */ @@ -2440,7 +2440,7 @@ static wchar_t c2u_C6[256] = { 0x82C3,0x82C5,0x82C6,0x82C9,0x82D0,0x82D6,0x82D9,0x82DA,/* 0x68-0x6F */ 0x82DD,0x82E2,0x82E7,0x82E8,0x82E9,0x82EA,0x82EC,0x82ED,/* 0x70-0x77 */ 0x82EE,0x82F0,0x82F2,0x82F3,0x82F5,0x82F6,0x82F8,0x0000,/* 0x78-0x7F */ - + 0x82FA,0x82FC,0x82FD,0x82FE,0x82FF,0x8300,0x830A,0x830B,/* 0x80-0x87 */ 0x830D,0x8310,0x8312,0x8313,0x8316,0x8318,0x8319,0x831D,/* 0x88-0x8F */ 0x831E,0x831F,0x8320,0x8321,0x8322,0x8323,0x8324,0x8325,/* 0x90-0x97 */ @@ -2476,7 +2476,7 @@ static wchar_t c2u_C7[256] = { 0x838C,0x838D,0x838F,0x8390,0x8391,0x8394,0x8395,0x8396,/* 0x68-0x6F */ 0x8397,0x8399,0x839A,0x839D,0x839F,0x83A1,0x83A2,0x83A3,/* 0x70-0x77 */ 0x83A4,0x83A5,0x83A6,0x83A7,0x83AC,0x83AD,0x83AE,0x0000,/* 0x78-0x7F */ - + 0x83AF,0x83B5,0x83BB,0x83BE,0x83BF,0x83C2,0x83C3,0x83C4,/* 0x80-0x87 */ 0x83C6,0x83C8,0xF93E,0x83CB,0x83CD,0x83CE,0x83D0,0x83D1,/* 0x88-0x8F */ 0x83D2,0x83D3,0x83D5,0x83D7,0x83D9,0x83DA,0x83DB,0x83DE,/* 0x90-0x97 */ @@ -2512,7 +2512,7 @@ static wchar_t c2u_C8[256] = { 0x842E,0x842F,0x8430,0x8432,0x8433,0x8434,0x8435,0x8436,/* 0x68-0x6F */ 0x8437,0x8439,0x843A,0x843B,0x843E,0x843F,0x8440,0x8441,/* 0x70-0x77 */ 0x8442,0x8443,0x8444,0x8445,0x8447,0x8448,0xF96E,0x0000,/* 0x78-0x7F */ - + 0x844A,0x844B,0x844C,0x844D,0x844E,0x844F,0x8450,0x8452,/* 0x80-0x87 */ 0x8453,0x8454,0x8455,0x8456,0x8458,0x845D,0x845E,0x845F,/* 0x88-0x8F */ 0x8460,0x8462,0x8464,0x8465,0x8466,0x8467,0x8468,0x846A,/* 0x90-0x97 */ @@ -2548,7 +2548,7 @@ static wchar_t c2u_C9[256] = { 0x84B1,0x84B3,0x84B5,0x84B6,0x84B7,0x84BB,0x84BC,0x84BE,/* 0x68-0x6F */ 0x84C0,0x84C2,0x84C3,0x84C5,0x84C6,0x84C7,0x84C8,0x84CB,/* 0x70-0x77 */ 0x84CC,0x84CE,0x84CF,0x84D2,0x84D4,0x84D5,0x84D7,0x0000,/* 0x78-0x7F */ - + 0x84D8,0x84D9,0x84DA,0x84DB,0x84DC,0x84DE,0x84E1,0x84E2,/* 0x80-0x87 */ 0x84E4,0x84E7,0x84E8,0x84E9,0x84EA,0x84EB,0x84ED,0xF999,/* 0x88-0x8F */ 0x84EF,0x84F1,0x84F2,0x84F3,0x84F4,0x84F5,0x84F6,0x84F7,/* 0x90-0x97 */ @@ -2584,7 +2584,7 @@ static wchar_t c2u_CA[256] = { 0x8534,0x8535,0x8536,0x853E,0x853F,0x8540,0x8541,0x8542,/* 0x68-0x6F */ 0x8544,0x8545,0x8546,0x8547,0x854B,0x854C,0x854D,0x854E,/* 0x70-0x77 */ 0x854F,0x8550,0x8551,0x8552,0x8553,0x8554,0x8555,0x0000,/* 0x78-0x7F */ - + 0x8557,0x8558,0x855A,0x855B,0x855C,0x855D,0x855F,0x8560,/* 0x80-0x87 */ 0x8561,0x8562,0x8563,0x8565,0x8566,0x8567,0x8569,0x856A,/* 0x88-0x8F */ 0x856B,0x856C,0x856D,0x856E,0x856F,0x8570,0x8571,0x8573,/* 0x90-0x97 */ @@ -2620,7 +2620,7 @@ static wchar_t c2u_CB[256] = { 0x85B6,0x85B8,0x85BA,0x85BB,0x85BC,0x85BD,0x85BE,0x85BF,/* 0x68-0x6F */ 0x85C0,0x85C2,0x85C3,0x85C4,0x85C5,0x85C6,0x85C7,0x85C8,/* 0x70-0x77 */ 0x85CA,0x85CB,0x85CC,0xF923,0x85CE,0x85D1,0x85D2,0x0000,/* 0x78-0x7F */ - + 0x85D4,0x85D6,0x85D7,0x85D8,0x85D9,0x85DA,0x85DB,0x85DD,/* 0x80-0x87 */ 0x85DE,0x85DF,0x85E0,0x85E1,0x85E2,0x85E3,0x85E5,0x85E6,/* 0x88-0x8F */ 0x85E7,0x85E8,0x85EA,0x85EB,0x85EC,0x85ED,0x85EE,0x85EF,/* 0x90-0x97 */ @@ -2656,7 +2656,7 @@ static wchar_t c2u_CC[256] = { 0x8626,0x8628,0x862A,0x862B,0x862C,0xF91F,0x862E,0x862F,/* 0x68-0x6F */ 0x8630,0x8631,0x8632,0x8633,0x8634,0x8635,0x8636,0x8637,/* 0x70-0x77 */ 0x8639,0x863A,0x863B,0x863D,0x863E,0xF910,0x8640,0x0000,/* 0x78-0x7F */ - + 0x8641,0x8642,0x8643,0x8644,0x8645,0x8646,0x8647,0x8648,/* 0x80-0x87 */ 0x8649,0x864A,0x864B,0x864C,0x8652,0x8653,0x8655,0x8656,/* 0x88-0x8F */ 0x8657,0x8658,0x8659,0x865B,0xF936,0x865D,0x865F,0x8660,/* 0x90-0x97 */ @@ -2692,7 +2692,7 @@ static wchar_t c2u_CD[256] = { 0x86B3,0x86B7,0x86B8,0x86B9,0x86BB,0x86BC,0x86BD,0x86BE,/* 0x68-0x6F */ 0x86BF,0x86C1,0x86C2,0x86C3,0x86C5,0x86C8,0x86CC,0x86CD,/* 0x70-0x77 */ 0x86D2,0x86D3,0x86D5,0x86D6,0x86D7,0x86DA,0x86DC,0x0000,/* 0x78-0x7F */ - + 0x86DD,0x86E0,0x86E1,0x86E2,0x86E3,0x86E5,0x86E6,0x86E7,/* 0x80-0x87 */ 0x86E8,0x86EA,0x86EB,0x86EC,0x86EF,0x86F5,0x86F6,0x86F7,/* 0x88-0x8F */ 0x86FA,0x86FB,0x86FC,0x86FD,0x86FF,0x8701,0x8704,0x8705,/* 0x90-0x97 */ @@ -2728,7 +2728,7 @@ static wchar_t c2u_CE[256] = { 0x8756,0x8758,0x875A,0x875B,0x875C,0x875D,0x875E,0x875F,/* 0x68-0x6F */ 0x8761,0x8762,0x8766,0x8767,0x8768,0x8769,0x876A,0x876B,/* 0x70-0x77 */ 0x876C,0x876D,0x876F,0x8771,0x8772,0x8773,0x8775,0x0000,/* 0x78-0x7F */ - + 0x8777,0x8778,0x8779,0x877A,0x877F,0x8780,0x8781,0x8784,/* 0x80-0x87 */ 0x8786,0x8787,0x8789,0x878A,0x878C,0x878E,0x878F,0x8790,/* 0x88-0x8F */ 0x8791,0x8792,0x8794,0x8795,0x8796,0x8798,0x8799,0x879A,/* 0x90-0x97 */ @@ -2764,7 +2764,7 @@ static wchar_t c2u_CF[256] = { 0x87DE,0x87DF,0x87E1,0x87E2,0x87E3,0x87E4,0x87E6,0x87E7,/* 0x68-0x6F */ 0x87E8,0x87E9,0x87EB,0x87EC,0x87ED,0x87EF,0x87F0,0x87F1,/* 0x70-0x77 */ 0x87F2,0x87F3,0x87F4,0x87F5,0x87F6,0x87F7,0x87F8,0x0000,/* 0x78-0x7F */ - + 0x87FA,0x87FB,0x87FC,0x87FD,0x87FF,0x8800,0x8801,0x8802,/* 0x80-0x87 */ 0x8804,0x8805,0x8806,0x8807,0x8808,0x8809,0x880B,0x880C,/* 0x88-0x8F */ 0x880D,0x880E,0x880F,0x8810,0x8811,0x8812,0x8814,0x8817,/* 0x90-0x97 */ @@ -2800,7 +2800,7 @@ static wchar_t c2u_D0[256] = { 0x8855,0x8856,0x8858,0x885A,0x885B,0x885C,0x885D,0x885E,/* 0x68-0x6F */ 0x885F,0x8860,0x8866,0x8867,0x886A,0x886D,0x886F,0x8871,/* 0x70-0x77 */ 0x8873,0x8874,0x8875,0x8876,0x8878,0x8879,0x887A,0x0000,/* 0x78-0x7F */ - + 0x887B,0x887C,0x8880,0x8883,0x8886,0x8887,0x8889,0x888A,/* 0x80-0x87 */ 0x888C,0x888E,0x888F,0x8890,0x8891,0x8893,0x8894,0x8895,/* 0x88-0x8F */ 0x8897,0x8898,0x8899,0x889A,0x889B,0x889D,0x889E,0x889F,/* 0x90-0x97 */ @@ -2836,7 +2836,7 @@ static wchar_t c2u_D1[256] = { 0x88E9,0x88EA,0x88EB,0x88EC,0x88ED,0x88EE,0x88EF,0x88F2,/* 0x68-0x6F */ 0x88F5,0x88F6,0x88F7,0x88FA,0x88FB,0x88FD,0x88FF,0x8900,/* 0x70-0x77 */ 0x8901,0x8903,0x8904,0x8905,0x8906,0x8907,0x8908,0x0000,/* 0x78-0x7F */ - + 0x8909,0x890B,0x890C,0x890D,0x890E,0x890F,0x8911,0x8914,/* 0x80-0x87 */ 0x8915,0x8916,0x8917,0x8918,0x891C,0x891D,0x891E,0x891F,/* 0x88-0x8F */ 0x8920,0x8922,0x8923,0x8924,0x8926,0x8927,0x8928,0x8929,/* 0x90-0x97 */ @@ -2872,7 +2872,7 @@ static wchar_t c2u_D2[256] = { 0xF924,0x8965,0x8967,0x8968,0x8969,0x896A,0x896B,0x896C,/* 0x68-0x6F */ 0x896D,0x896E,0x896F,0x8970,0x8971,0x8972,0x8973,0x8974,/* 0x70-0x77 */ 0x8975,0x8976,0x8977,0x8978,0x8979,0x897A,0x897C,0x0000,/* 0x78-0x7F */ - + 0x897D,0x897E,0x8980,0x8982,0x8984,0x8985,0x8987,0x8988,/* 0x80-0x87 */ 0x8989,0x898A,0xFA0A,0x898C,0x898D,0x898E,0x898F,0x8990,/* 0x88-0x8F */ 0x8991,0x8992,0x8993,0x8994,0x8995,0x8996,0x8997,0x8998,/* 0x90-0x97 */ @@ -2908,7 +2908,7 @@ static wchar_t c2u_D3[256] = { 0x89DD,0x89DF,0x89E0,0x89E1,0x89E2,0x89E4,0x89E7,0x89E8,/* 0x68-0x6F */ 0x89E9,0x89EA,0x89EC,0x89ED,0x89EE,0x89F0,0x89F1,0x89F2,/* 0x70-0x77 */ 0x89F4,0x89F5,0x89F6,0x89F7,0x89F8,0x89F9,0x89FA,0x0000,/* 0x78-0x7F */ - + 0x89FB,0x89FC,0x89FD,0x89FE,0x89FF,0x8A01,0x8A02,0x8A03,/* 0x80-0x87 */ 0x8A04,0x8A05,0x8A06,0x8A08,0x8A09,0x8A0A,0x8A0B,0x8A0C,/* 0x88-0x8F */ 0x8A0D,0x8A0E,0x8A0F,0x8A10,0x8A11,0x8A12,0x8A13,0x8A14,/* 0x90-0x97 */ @@ -2944,7 +2944,7 @@ static wchar_t c2u_D4[256] = { 0x8A47,0x8A49,0x8A4A,0x8A4B,0x8A4C,0x8A4D,0x8A4E,0x8A4F,/* 0x68-0x6F */ 0x8A50,0x8A51,0x8A52,0x8A53,0x8A54,0x8A55,0x8A56,0x8A57,/* 0x70-0x77 */ 0x8A58,0x8A59,0x8A5A,0x8A5B,0x8A5C,0x8A5D,0x8A5E,0x0000,/* 0x78-0x7F */ - + 0x8A5F,0x8A60,0x8A61,0x8A62,0x8A63,0x8A64,0x8A65,0x8A66,/* 0x80-0x87 */ 0x8A67,0x8A68,0x8A69,0x8A6A,0x8A6B,0x8A6C,0x8A6D,0x8A6E,/* 0x88-0x8F */ 0x8A6F,0x8A70,0x8A71,0x8A72,0x8A73,0x8A74,0x8A75,0x8A76,/* 0x90-0x97 */ @@ -2980,7 +2980,7 @@ static wchar_t c2u_D5[256] = { 0x8AAC,0x8AAD,0x8AAE,0x8AAF,0x8AB0,0x8AB1,0x8AB2,0x8AB3,/* 0x68-0x6F */ 0x8AB4,0x8AB5,0x8AB6,0x8AB7,0x8AB8,0x8AB9,0x8ABA,0x8ABB,/* 0x70-0x77 */ 0x8ABC,0x8ABD,0x8ABE,0x8ABF,0x8AC0,0x8AC1,0x8AC2,0x0000,/* 0x78-0x7F */ - + 0x8AC3,0x8AC4,0x8AC5,0x8AC6,0x8AC7,0x8AC8,0x8AC9,0x8ACA,/* 0x80-0x87 */ 0x8ACB,0x8ACC,0x8ACD,0x8ACE,0x8ACF,0x8AD0,0x8AD1,0xF97D,/* 0x88-0x8F */ 0x8AD3,0x8AD4,0x8AD5,0xF941,0x8AD7,0x8AD8,0x8AD9,0x8ADA,/* 0x90-0x97 */ @@ -3016,7 +3016,7 @@ static wchar_t c2u_D6[256] = { 0x8B0D,0x8B0E,0x8B0F,0x8B10,0x8B11,0x8B12,0x8B13,0x8B14,/* 0x68-0x6F */ 0x8B15,0x8B16,0x8B17,0x8B18,0x8B19,0x8B1A,0x8B1B,0x8B1C,/* 0x70-0x77 */ 0x8B1D,0x8B1E,0x8B1F,0x8B20,0x8B21,0x8B22,0x8B23,0x0000,/* 0x78-0x7F */ - + 0x8B24,0x8B25,0x8B27,0x8B28,0x8B29,0x8B2A,0x8B2B,0x8B2C,/* 0x80-0x87 */ 0x8B2D,0x8B2E,0x8B2F,0x8B30,0x8B31,0x8B32,0x8B33,0x8B34,/* 0x88-0x8F */ 0x8B35,0x8B36,0x8B37,0x8B38,0x8B39,0x8B3A,0x8B3B,0x8B3C,/* 0x90-0x97 */ @@ -3052,7 +3052,7 @@ static wchar_t c2u_D7[256] = { 0x8B70,0x8B71,0x8B72,0x8B73,0x8B74,0x8B75,0x8B76,0x8B77,/* 0x68-0x6F */ 0x8B78,0x8B79,0x8B7A,0x8B7B,0x8B7C,0x8B7D,0x8B7E,0x8B7F,/* 0x70-0x77 */ 0xF95A,0x8B81,0x8B82,0x8B83,0x8B84,0x8B85,0x8B86,0x0000,/* 0x78-0x7F */ - + 0x8B87,0x8B88,0x8B89,0x8B8A,0x8B8B,0x8B8C,0x8B8D,0x8B8E,/* 0x80-0x87 */ 0x8B8F,0x8B90,0x8B91,0x8B92,0x8B93,0x8B94,0x8B95,0x8B96,/* 0x88-0x8F */ 0x8B97,0x8B98,0x8B99,0x8B9A,0x8B9B,0x8B9C,0x8B9D,0x8B9E,/* 0x90-0x97 */ @@ -3088,7 +3088,7 @@ static wchar_t c2u_D8[256] = { 0x8C69,0xFA16,0x8C6D,0x8C6E,0x8C6F,0x8C70,0x8C71,0x8C72,/* 0x68-0x6F */ 0x8C74,0x8C75,0x8C76,0x8C77,0x8C7B,0x8C7C,0x8C7D,0x8C7E,/* 0x70-0x77 */ 0x8C7F,0x8C80,0x8C81,0x8C83,0x8C84,0x8C86,0x8C87,0x0000,/* 0x78-0x7F */ - + 0x8C88,0x8C8B,0x8C8D,0x8C8E,0x8C8F,0x8C90,0x8C91,0x8C92,/* 0x80-0x87 */ 0x8C93,0x8C95,0x8C96,0x8C97,0x8C99,0x8C9A,0x8C9B,0x8C9C,/* 0x88-0x8F */ 0x8C9D,0x8C9E,0x8C9F,0x8CA0,0x8CA1,0x8CA2,0x8CA3,0x8CA4,/* 0x90-0x97 */ @@ -3124,7 +3124,7 @@ static wchar_t c2u_D9[256] = { 0x8CD6,0x8CD7,0x8CD8,0x8CD9,0x8CDA,0x8CDB,0x8CDC,0x8CDD,/* 0x68-0x6F */ 0x8CDE,0x8CDF,0x8CE0,0x8CE1,0x8CE2,0x8CE3,0x8CE4,0x8CE5,/* 0x70-0x77 */ 0x8CE6,0x8CE7,0x8CE8,0x8CE9,0x8CEA,0x8CEB,0x8CEC,0x0000,/* 0x78-0x7F */ - + 0x8CED,0x8CEE,0x8CEF,0x8CF0,0x8CF1,0x8CF2,0x8CF3,0x8CF4,/* 0x80-0x87 */ 0x8CF5,0x8CF6,0x8CF7,0x8CF8,0x8CF9,0x8CFA,0x8CFB,0x8CFC,/* 0x88-0x8F */ 0x8CFD,0x8CFE,0x8CFF,0x8D00,0x8D01,0x8D02,0x8D03,0x8D04,/* 0x90-0x97 */ @@ -3160,7 +3160,7 @@ static wchar_t c2u_DA[256] = { 0x8D86,0x8D87,0x8D88,0x8D89,0x8D8C,0x8D8D,0x8D8E,0x8D8F,/* 0x68-0x6F */ 0x8D90,0x8D92,0x8D93,0x8D95,0x8D96,0x8D97,0x8D98,0x8D99,/* 0x70-0x77 */ 0x8D9A,0x8D9B,0x8D9C,0x8D9D,0x8D9E,0x8DA0,0x8DA1,0x0000,/* 0x78-0x7F */ - + 0x8DA2,0x8DA4,0x8DA5,0x8DA6,0x8DA7,0x8DA8,0x8DA9,0x8DAA,/* 0x80-0x87 */ 0x8DAB,0x8DAC,0x8DAD,0x8DAE,0x8DAF,0x8DB0,0x8DB2,0x8DB6,/* 0x88-0x8F */ 0x8DB7,0x8DB9,0x8DBB,0x8DBD,0x8DC0,0x8DC1,0x8DC2,0x8DC5,/* 0x90-0x97 */ @@ -3196,7 +3196,7 @@ static wchar_t c2u_DB[256] = { 0x8E19,0x8E1A,0x8E1B,0x8E1C,0x8E20,0x8E21,0x8E24,0x8E25,/* 0x68-0x6F */ 0x8E26,0x8E27,0x8E28,0x8E2B,0x8E2D,0x8E30,0x8E32,0x8E33,/* 0x70-0x77 */ 0x8E34,0x8E36,0x8E37,0x8E38,0x8E3B,0x8E3C,0x8E3E,0x0000,/* 0x78-0x7F */ - + 0x8E3F,0x8E43,0x8E45,0x8E46,0x8E4C,0x8E4D,0x8E4E,0x8E4F,/* 0x80-0x87 */ 0x8E50,0x8E53,0x8E54,0x8E55,0x8E56,0x8E57,0x8E58,0x8E5A,/* 0x88-0x8F */ 0x8E5B,0x8E5C,0x8E5D,0x8E5E,0x8E5F,0x8E60,0x8E61,0x8E62,/* 0x90-0x97 */ @@ -3232,7 +3232,7 @@ static wchar_t c2u_DC[256] = { 0x8EA7,0x8EA8,0x8EA9,0x8EAA,0x8EAD,0x8EAE,0x8EB0,0x8EB1,/* 0x68-0x6F */ 0x8EB3,0x8EB4,0x8EB5,0x8EB6,0x8EB7,0x8EB8,0x8EB9,0x8EBB,/* 0x70-0x77 */ 0x8EBC,0x8EBD,0x8EBE,0x8EBF,0x8EC0,0x8EC1,0x8EC2,0x0000,/* 0x78-0x7F */ - + 0x8EC3,0x8EC4,0x8EC5,0x8EC6,0x8EC7,0x8EC8,0x8EC9,0xF902,/* 0x80-0x87 */ 0x8ECB,0x8ECC,0x8ECD,0x8ECF,0x8ED0,0x8ED1,0x8ED2,0x8ED3,/* 0x88-0x8F */ 0x8ED4,0x8ED5,0x8ED6,0x8ED7,0x8ED8,0x8ED9,0x8EDA,0x8EDB,/* 0x90-0x97 */ @@ -3268,7 +3268,7 @@ static wchar_t c2u_DD[256] = { 0x8F0D,0x8F0E,0x8F0F,0x8F10,0x8F11,0x8F12,0x8F13,0x8F14,/* 0x68-0x6F */ 0x8F15,0x8F16,0x8F17,0x8F18,0x8F19,0x8F1A,0x8F1B,0x8F1C,/* 0x70-0x77 */ 0x8F1D,0x8F1E,0x8F1F,0x8F20,0x8F21,0x8F22,0x8F23,0x0000,/* 0x78-0x7F */ - + 0x8F24,0x8F25,0xF998,0x8F27,0x8F28,0x8F29,0xF9D7,0x8F2B,/* 0x80-0x87 */ 0x8F2C,0x8F2D,0x8F2E,0x8F2F,0x8F30,0x8F31,0x8F32,0x8F33,/* 0x88-0x8F */ 0x8F34,0x8F35,0x8F36,0x8F37,0x8F38,0x8F39,0x8F3A,0xFA07,/* 0x90-0x97 */ @@ -3304,7 +3304,7 @@ static wchar_t c2u_DE[256] = { 0x8FA2,0x8FA4,0x8FA5,0x8FA6,0x8FA7,0x8FAA,0x8FAC,0x8FAD,/* 0x68-0x6F */ 0x8FAE,0x8FAF,0x8FB2,0x8FB3,0x8FB4,0x8FB5,0x8FB7,0x8FB8,/* 0x70-0x77 */ 0x8FBA,0x8FBB,0x8FBC,0x8FBF,0x8FC0,0x8FC3,0x8FC6,0x0000,/* 0x78-0x7F */ - + 0x8FC9,0x8FCA,0x8FCB,0x8FCC,0x8FCD,0x8FCF,0x8FD2,0x8FD6,/* 0x80-0x87 */ 0x8FD7,0x8FDA,0x8FE0,0x8FE1,0x8FE3,0x8FE7,0x8FEC,0x8FEF,/* 0x88-0x8F */ 0x8FF1,0x8FF2,0x8FF4,0x8FF5,0x8FF6,0x8FFA,0x8FFB,0x8FFC,/* 0x90-0x97 */ @@ -3340,7 +3340,7 @@ static wchar_t c2u_DF[256] = { 0x9060,0x9061,0x9064,0x9066,0x9067,0x9069,0x906A,0x906B,/* 0x68-0x6F */ 0x906C,0x906F,0x9070,0x9071,0x9072,0x9073,0x9076,0x9077,/* 0x70-0x77 */ 0x9078,0x9079,0x907A,0x907B,0xF9C3,0x907E,0x9081,0x0000,/* 0x78-0x7F */ - + 0x9084,0x9085,0x9086,0x9087,0x9089,0x908A,0x908C,0x908D,/* 0x80-0x87 */ 0x908E,0xF913,0x9090,0x9092,0x9094,0x9096,0x9098,0x909A,/* 0x88-0x8F */ 0x909C,0x909E,0x909F,0x90A0,0x90A4,0x90A5,0x90A7,0x90A8,/* 0x90-0x97 */ @@ -3376,7 +3376,7 @@ static wchar_t c2u_E0[256] = { 0x9105,0x9106,0x9107,0x9108,0x9109,0x910A,0x910B,0x910C,/* 0x68-0x6F */ 0x910D,0x910E,0x910F,0x9110,0x9111,0x9112,0x9113,0x9114,/* 0x70-0x77 */ 0x9115,0x9116,0x9117,0x9118,0x911A,0x911B,0x911C,0x0000,/* 0x78-0x7F */ - + 0x911D,0x911F,0x9120,0x9121,0x9124,0x9125,0x9126,0x9127,/* 0x80-0x87 */ 0x9128,0x9129,0x912A,0x912B,0x912C,0x912D,0x912E,0x9130,/* 0x88-0x8F */ 0x9132,0x9133,0x9134,0x9135,0x9136,0x9137,0x9138,0x913A,/* 0x90-0x97 */ @@ -3412,7 +3412,7 @@ static wchar_t c2u_E1[256] = { 0x919C,0x919D,0x919E,0x919F,0x91A0,0x91A1,0x91A4,0x91A5,/* 0x68-0x6F */ 0x91A6,0x91A7,0x91A8,0x91A9,0x91AB,0x91AC,0x91B0,0x91B1,/* 0x70-0x77 */ 0x91B2,0x91B3,0x91B6,0x91B7,0x91B8,0x91B9,0x91BB,0x0000,/* 0x78-0x7F */ - + 0x91BC,0x91BD,0x91BE,0x91BF,0x91C0,0x91C1,0x91C2,0x91C3,/* 0x80-0x87 */ 0x91C4,0x91C5,0x91C6,0x91C8,0x91CB,0x91D0,0x91D2,0x91D3,/* 0x88-0x8F */ 0x91D4,0x91D5,0x91D6,0x91D7,0x91D8,0x91D9,0x91DA,0x91DB,/* 0x90-0x97 */ @@ -3448,7 +3448,7 @@ static wchar_t c2u_E2[256] = { 0x920E,0x920F,0x9210,0x9211,0x9212,0x9213,0x9214,0x9215,/* 0x68-0x6F */ 0x9216,0x9217,0x9218,0x9219,0x921A,0x921B,0x921C,0x921D,/* 0x70-0x77 */ 0x921E,0x921F,0x9220,0x9221,0x9222,0x9223,0x9224,0x0000,/* 0x78-0x7F */ - + 0x9225,0x9226,0x9227,0x9228,0x9229,0x922A,0x922B,0x922C,/* 0x80-0x87 */ 0x922D,0x922E,0x922F,0x9230,0x9231,0x9232,0x9233,0xF9B1,/* 0x88-0x8F */ 0x9235,0x9236,0x9237,0x9238,0x9239,0x923A,0x923B,0x923C,/* 0x90-0x97 */ @@ -3484,7 +3484,7 @@ static wchar_t c2u_E3[256] = { 0x926E,0x926F,0x9270,0x9271,0x9272,0x9273,0x9275,0x9276,/* 0x68-0x6F */ 0x9277,0x9278,0x9279,0x927A,0x927B,0x927C,0x927D,0x927E,/* 0x70-0x77 */ 0x927F,0x9280,0x9281,0x9282,0x9283,0x9284,0x9285,0x0000,/* 0x78-0x7F */ - + 0x9286,0x9287,0x9288,0x9289,0x928A,0x928B,0x928C,0x928D,/* 0x80-0x87 */ 0x928F,0x9290,0x9291,0x9292,0x9293,0x9294,0x9295,0x9296,/* 0x88-0x8F */ 0x9297,0x9298,0x9299,0x929A,0x929B,0x929C,0x929D,0x929E,/* 0x90-0x97 */ @@ -3520,7 +3520,7 @@ static wchar_t c2u_E4[256] = { 0x92D2,0x92D3,0x92D4,0x92D5,0x92D6,0x92D7,0x92D8,0x92D9,/* 0x68-0x6F */ 0x92DA,0x92DB,0x92DC,0x92DD,0x92DE,0x92DF,0x92E0,0x92E1,/* 0x70-0x77 */ 0x92E2,0x92E3,0x92E4,0x92E5,0x92E6,0x92E7,0x92E8,0x0000,/* 0x78-0x7F */ - + 0x92E9,0x92EA,0x92EB,0x92EC,0x92ED,0x92EE,0x92EF,0x92F0,/* 0x80-0x87 */ 0x92F1,0x92F2,0x92F3,0x92F4,0x92F5,0x92F6,0x92F7,0x92F8,/* 0x88-0x8F */ 0x92F9,0x92FA,0x92FB,0x92FC,0x92FD,0x92FE,0x92FF,0x9300,/* 0x90-0x97 */ @@ -3556,7 +3556,7 @@ static wchar_t c2u_E5[256] = { 0x9332,0x9333,0x9334,0x9335,0x9336,0x9337,0x9338,0x9339,/* 0x68-0x6F */ 0x933A,0x933B,0x933C,0x933D,0x933F,0x9340,0x9341,0x9342,/* 0x70-0x77 */ 0x9343,0x9344,0x9345,0x9346,0x9347,0x9348,0x9349,0x0000,/* 0x78-0x7F */ - + 0xF99B,0x934B,0x934C,0x934D,0x934E,0x934F,0x9350,0x9351,/* 0x80-0x87 */ 0x9352,0x9353,0x9354,0x9355,0x9356,0x9357,0x9358,0x9359,/* 0x88-0x8F */ 0x935A,0x935B,0x935C,0x935D,0x935E,0x935F,0x9360,0x9361,/* 0x90-0x97 */ @@ -3592,7 +3592,7 @@ static wchar_t c2u_E6[256] = { 0x9395,0x9396,0x9397,0x9398,0x9399,0x939A,0x939B,0x939C,/* 0x68-0x6F */ 0x939D,0x939E,0x939F,0x93A0,0x93A1,0x93A2,0x93A3,0x93A4,/* 0x70-0x77 */ 0x93A5,0x93A6,0x93A7,0x93A8,0x93A9,0x93AA,0x93AB,0x0000,/* 0x78-0x7F */ - + 0x93AC,0x93AD,0x93AE,0x93AF,0x93B0,0x93B1,0x93B2,0x93B3,/* 0x80-0x87 */ 0x93B4,0x93B5,0x93B6,0x93B7,0x93B8,0x93B9,0x93BA,0x93BB,/* 0x88-0x8F */ 0x93BC,0x93BD,0x93BE,0x93BF,0x93C0,0x93C1,0x93C2,0x93C3,/* 0x90-0x97 */ @@ -3628,7 +3628,7 @@ static wchar_t c2u_E7[256] = { 0x93F7,0x93F8,0x93F9,0x93FA,0x93FB,0x93FC,0x93FD,0x93FE,/* 0x68-0x6F */ 0x93FF,0x9400,0x9401,0x9402,0x9403,0x9404,0x9405,0x9406,/* 0x70-0x77 */ 0x9407,0x9408,0x9409,0x940A,0x940B,0x940C,0x940D,0x0000,/* 0x78-0x7F */ - + 0x940E,0x940F,0x9410,0x9411,0x9412,0x9413,0x9414,0x9415,/* 0x80-0x87 */ 0x9416,0x9417,0x9418,0x9419,0x941A,0x941B,0x941C,0x941D,/* 0x88-0x8F */ 0x941E,0x941F,0x9420,0x9421,0x9422,0x9423,0x9424,0x9425,/* 0x90-0x97 */ @@ -3664,7 +3664,7 @@ static wchar_t c2u_E8[256] = { 0x9458,0x9459,0x945A,0x945B,0x945C,0x945D,0x945E,0x945F,/* 0x68-0x6F */ 0x9460,0x9461,0x9462,0x9463,0x9464,0x9465,0x9466,0x9467,/* 0x70-0x77 */ 0x9468,0x9469,0x946A,0x946C,0x946D,0x946E,0x946F,0x0000,/* 0x78-0x7F */ - + 0x9470,0x9471,0x9472,0x9473,0x9474,0x9475,0x9476,0x9477,/* 0x80-0x87 */ 0x9478,0x9479,0x947A,0x947B,0x947C,0x947D,0x947E,0x947F,/* 0x88-0x8F */ 0x9480,0x9481,0x9482,0x9483,0x9484,0x9491,0x9496,0x9498,/* 0x90-0x97 */ @@ -3700,7 +3700,7 @@ static wchar_t c2u_E9[256] = { 0x9594,0x9595,0x9596,0x9597,0x9598,0x9599,0x959A,0x959B,/* 0x68-0x6F */ 0x959C,0x959D,0x959E,0x959F,0x95A0,0x95A1,0x95A2,0x95A3,/* 0x70-0x77 */ 0x95A4,0x95A5,0x95A6,0x95A7,0x95A8,0x95A9,0x95AA,0x0000,/* 0x78-0x7F */ - + 0x95AB,0x95AC,0xF986,0x95AE,0x95AF,0x95B0,0x95B1,0x95B2,/* 0x80-0x87 */ 0x95B3,0x95B4,0x95B5,0x95B6,0x95B7,0x95B8,0x95B9,0x95BA,/* 0x88-0x8F */ 0x95BB,0x95BC,0x95BD,0x95BE,0x95BF,0x95C0,0x95C1,0x95C2,/* 0x90-0x97 */ @@ -3736,7 +3736,7 @@ static wchar_t c2u_EA[256] = { 0x9627,0x9628,0x9629,0x962B,0x962C,0x962D,0x962F,0x9630,/* 0x68-0x6F */ 0x9637,0x9638,0x9639,0x963A,0x963E,0x9641,0x9643,0x964A,/* 0x70-0x77 */ 0x964E,0x964F,0x9651,0x9652,0x9653,0x9656,0x9657,0x0000,/* 0x78-0x7F */ - + 0x9658,0x9659,0x965A,0x965C,0x965D,0x965E,0x9660,0x9663,/* 0x80-0x87 */ 0x9665,0x9666,0x966B,0x966D,0x966E,0x966F,0x9670,0x9671,/* 0x88-0x8F */ 0x9673,0xF9D3,0x9679,0x967A,0x967B,0x967C,0x967D,0x967E,/* 0x90-0x97 */ @@ -3772,7 +3772,7 @@ static wchar_t c2u_EB[256] = { 0x96CB,0x96D0,0x96D1,0x96D3,0x96D4,0x96D6,0x96D7,0x96D8,/* 0x68-0x6F */ 0x96D9,0x96DA,0x96DB,0x96DC,0x96DD,0x96DE,0x96DF,0x96E1,/* 0x70-0x77 */ 0xF9EA,0x96E3,0x96E4,0x96E5,0x96E6,0x96E7,0x96EB,0x0000,/* 0x78-0x7F */ - + 0x96EC,0x96ED,0x96EE,0x96F0,0x96F1,0x96F2,0x96F4,0x96F5,/* 0x80-0x87 */ 0x96F8,0x96FA,0x96FB,0x96FC,0x96FD,0x96FF,0x9702,0x9703,/* 0x88-0x8F */ 0x9705,0x970A,0x970B,0x970C,0x9710,0x9711,0x9712,0x9714,/* 0x90-0x97 */ @@ -3808,7 +3808,7 @@ static wchar_t c2u_EC[256] = { 0x9750,0x9751,0x9754,0x9755,0x9757,0x9758,0x975A,0x975C,/* 0x68-0x6F */ 0x975D,0x975F,0x9763,0x9764,0x9766,0x9767,0x9768,0x976A,/* 0x70-0x77 */ 0x976B,0x976C,0x976D,0x976E,0x976F,0x9770,0x9771,0x0000,/* 0x78-0x7F */ - + 0x9772,0x9775,0x9777,0x9778,0x9779,0x977A,0x977B,0x977D,/* 0x80-0x87 */ 0x977E,0x977F,0x9780,0x9781,0x9782,0x9783,0x9784,0x9786,/* 0x88-0x8F */ 0x9787,0x9788,0x9789,0x978A,0x978C,0x978E,0x978F,0x9790,/* 0x90-0x97 */ @@ -3844,7 +3844,7 @@ static wchar_t c2u_ED[256] = { 0x97CD,0x97CE,0x97CF,0x97D0,0x97D1,0x97D2,0x97D3,0x97D4,/* 0x68-0x6F */ 0x97D5,0x97D6,0x97D7,0x97D8,0x97D9,0x97DA,0x97DB,0x97DC,/* 0x70-0x77 */ 0x97DD,0x97DE,0x97DF,0x97E0,0x97E1,0x97E2,0x97E3,0x0000,/* 0x78-0x7F */ - + 0x97E4,0x97E5,0x97E8,0x97EE,0x97EF,0x97F0,0x97F1,0x97F2,/* 0x80-0x87 */ 0x97F4,0x97F7,0x97F8,0x97F9,0x97FA,0x97FB,0x97FC,0x97FD,/* 0x88-0x8F */ 0x97FE,0x97FF,0x9800,0x9801,0x9802,0x9803,0x9804,0x9805,/* 0x90-0x97 */ @@ -3880,7 +3880,7 @@ static wchar_t c2u_EE[256] = { 0x9837,0x9838,0x9839,0x983A,0x983B,0x983C,0x983D,0x983E,/* 0x68-0x6F */ 0x983F,0x9840,0x9841,0x9842,0x9843,0x9844,0x9845,0x9846,/* 0x70-0x77 */ 0x9847,0x9848,0x9849,0x984A,0x984B,0x984C,0x984D,0x0000,/* 0x78-0x7F */ - + 0x984E,0x984F,0x9850,0x9851,0x9852,0x9853,0x9854,0x9855,/* 0x80-0x87 */ 0x9856,0x9857,0x9858,0x9859,0x985A,0x985B,0x985C,0x985D,/* 0x88-0x8F */ 0xF9D0,0x985F,0x9860,0x9861,0x9862,0x9863,0x9864,0x9865,/* 0x90-0x97 */ @@ -3916,7 +3916,7 @@ static wchar_t c2u_EF[256] = { 0x98C4,0x98C5,0x98C6,0x98C7,0x98C8,0x98C9,0x98CA,0x98CB,/* 0x68-0x6F */ 0x98CC,0x98CD,0x98CF,0x98D0,0x98D4,0x98D6,0x98D7,0x98DB,/* 0x70-0x77 */ 0x98DC,0x98DD,0x98E0,0x98E1,0x98E2,0x98E3,0x98E4,0x0000,/* 0x78-0x7F */ - + 0x98E5,0x98E6,0x98E9,0x98EA,0x98EB,0x98EC,0x98ED,0x98EE,/* 0x80-0x87 */ 0xFA2A,0x98F0,0x98F1,0x98F2,0x98F3,0x98F4,0x98F5,0x98F6,/* 0x88-0x8F */ 0x98F7,0x98F8,0x98F9,0x98FA,0x98FB,0xFA2B,0x98FD,0x98FE,/* 0x90-0x97 */ @@ -3952,7 +3952,7 @@ static wchar_t c2u_F0[256] = { 0x9933,0x9934,0x9935,0x9936,0x9937,0x9938,0x9939,0x993A,/* 0x68-0x6F */ 0x993B,0x993C,0x993D,0x993E,0x993F,0x9940,0x9941,0x9942,/* 0x70-0x77 */ 0x9943,0x9944,0x9945,0x9946,0x9947,0x9948,0x9949,0x0000,/* 0x78-0x7F */ - + 0x994A,0x994B,0x994C,0x994D,0x994E,0x994F,0x9950,0x9951,/* 0x80-0x87 */ 0x9952,0x9953,0x9956,0x9957,0x9958,0x9959,0x995A,0x995B,/* 0x88-0x8F */ 0x995C,0x995D,0x995E,0x995F,0x9960,0x9961,0x9962,0x9964,/* 0x90-0x97 */ @@ -3988,7 +3988,7 @@ static wchar_t c2u_F1[256] = { 0x99C2,0x99C3,0x99C4,0x99C5,0x99C6,0x99C7,0x99C8,0x99C9,/* 0x68-0x6F */ 0x99CA,0x99CB,0x99CC,0x99CD,0x99CE,0x99CF,0x99D0,0x99D1,/* 0x70-0x77 */ 0x99D2,0x99D3,0x99D4,0x99D5,0x99D6,0x99D7,0x99D8,0x0000,/* 0x78-0x7F */ - + 0x99D9,0x99DA,0x99DB,0x99DC,0x99DD,0x99DE,0x99DF,0x99E0,/* 0x80-0x87 */ 0x99E1,0x99E2,0x99E3,0x99E4,0x99E5,0x99E6,0x99E7,0x99E8,/* 0x88-0x8F */ 0x99E9,0x99EA,0x99EB,0x99EC,0x99ED,0x99EE,0x99EF,0x99F0,/* 0x90-0x97 */ @@ -4024,7 +4024,7 @@ static wchar_t c2u_F2[256] = { 0x9A22,0x9A23,0x9A24,0x9A25,0x9A26,0x9A27,0x9A28,0x9A29,/* 0x68-0x6F */ 0x9A2A,0x9A2B,0x9A2C,0x9A2D,0x9A2E,0x9A2F,0x9A30,0x9A31,/* 0x70-0x77 */ 0x9A32,0x9A33,0x9A34,0x9A35,0x9A36,0x9A37,0x9A38,0x0000,/* 0x78-0x7F */ - + 0x9A39,0x9A3A,0x9A3B,0x9A3C,0x9A3D,0x9A3E,0x9A3F,0x9A40,/* 0x80-0x87 */ 0x9A41,0x9A42,0x9A43,0x9A44,0x9A45,0x9A46,0x9A47,0x9A48,/* 0x88-0x8F */ 0x9A49,0x9A4A,0x9A4B,0x9A4C,0x9A4D,0x9A4E,0x9A4F,0x9A50,/* 0x90-0x97 */ @@ -4060,7 +4060,7 @@ static wchar_t c2u_F3[256] = { 0x9ABD,0x9ABE,0x9ABF,0x9AC3,0x9AC4,0x9AC6,0x9AC7,0x9AC8,/* 0x68-0x6F */ 0x9AC9,0x9ACA,0x9ACD,0x9ACE,0x9ACF,0x9AD0,0x9AD2,0x9AD4,/* 0x70-0x77 */ 0x9AD5,0x9AD6,0x9AD7,0x9AD9,0x9ADA,0x9ADB,0x9ADC,0x0000,/* 0x78-0x7F */ - + 0x9ADD,0x9ADE,0x9AE0,0x9AE2,0x9AE3,0x9AE4,0x9AE5,0x9AE7,/* 0x80-0x87 */ 0x9AE8,0x9AE9,0x9AEA,0x9AEC,0x9AEE,0x9AF0,0x9AF1,0x9AF2,/* 0x88-0x8F */ 0x9AF3,0x9AF4,0x9AF5,0x9AF6,0x9AF7,0x9AF8,0x9AFA,0x9AFC,/* 0x90-0x97 */ @@ -4096,7 +4096,7 @@ static wchar_t c2u_F4[256] = { 0x9B36,0x9B37,0x9B38,0x9B39,0x9B3A,0x9B3D,0x9B3E,0x9B3F,/* 0x68-0x6F */ 0x9B40,0x9B46,0x9B4A,0x9B4B,0x9B4C,0x9B4E,0x9B50,0x9B52,/* 0x70-0x77 */ 0x9B53,0x9B55,0x9B56,0x9B57,0x9B58,0x9B59,0x9B5A,0x0000,/* 0x78-0x7F */ - + 0x9B5B,0x9B5C,0x9B5D,0x9B5E,0x9B5F,0x9B60,0x9B61,0x9B62,/* 0x80-0x87 */ 0x9B63,0x9B64,0x9B65,0x9B66,0x9B67,0x9B68,0x9B69,0x9B6A,/* 0x88-0x8F */ 0x9B6B,0x9B6C,0x9B6D,0x9B6E,0xF939,0x9B70,0x9B71,0x9B72,/* 0x90-0x97 */ @@ -4132,7 +4132,7 @@ static wchar_t c2u_F5[256] = { 0x9BA4,0x9BA5,0x9BA6,0x9BA7,0x9BA8,0x9BA9,0x9BAA,0x9BAB,/* 0x68-0x6F */ 0x9BAC,0x9BAD,0x9BAE,0x9BAF,0x9BB0,0x9BB1,0x9BB2,0x9BB3,/* 0x70-0x77 */ 0x9BB4,0x9BB5,0x9BB6,0x9BB7,0x9BB8,0x9BB9,0x9BBA,0x0000,/* 0x78-0x7F */ - + 0x9BBB,0x9BBC,0x9BBD,0x9BBE,0x9BBF,0x9BC0,0x9BC1,0x9BC2,/* 0x80-0x87 */ 0x9BC3,0x9BC4,0x9BC5,0x9BC6,0x9BC7,0x9BC8,0x9BC9,0x9BCA,/* 0x88-0x8F */ 0x9BCB,0x9BCC,0x9BCD,0x9BCE,0x9BCF,0x9BD0,0x9BD1,0x9BD2,/* 0x90-0x97 */ @@ -4168,7 +4168,7 @@ static wchar_t c2u_F6[256] = { 0x9C04,0x9C05,0x9C06,0x9C07,0x9C08,0x9C09,0x9C0A,0x9C0B,/* 0x68-0x6F */ 0x9C0C,0x9C0D,0x9C0E,0x9C0F,0x9C10,0x9C11,0x9C12,0x9C13,/* 0x70-0x77 */ 0x9C14,0x9C15,0x9C16,0x9C17,0x9C18,0x9C19,0x9C1A,0x0000,/* 0x78-0x7F */ - + 0x9C1B,0x9C1C,0x9C1D,0x9C1E,0x9C1F,0x9C20,0x9C21,0x9C22,/* 0x80-0x87 */ 0x9C23,0x9C24,0x9C25,0x9C26,0x9C27,0x9C28,0x9C29,0x9C2A,/* 0x88-0x8F */ 0x9C2B,0x9C2C,0x9C2D,0x9C2E,0x9C2F,0x9C30,0x9C31,0x9C32,/* 0x90-0x97 */ @@ -4204,7 +4204,7 @@ static wchar_t c2u_F7[256] = { 0x9C64,0x9C65,0x9C66,0x9C67,0x9C68,0x9C69,0x9C6A,0x9C6B,/* 0x68-0x6F */ 0x9C6C,0x9C6D,0x9C6E,0x9C6F,0x9C70,0x9C71,0x9C72,0x9C73,/* 0x70-0x77 */ 0x9C74,0x9C75,0x9C76,0x9C77,0x9C78,0x9C79,0x9C7A,0x0000,/* 0x78-0x7F */ - + 0x9C7B,0x9C7D,0x9C7E,0x9C80,0x9C83,0x9C84,0x9C89,0x9C8A,/* 0x80-0x87 */ 0x9C8C,0x9C8F,0x9C93,0x9C96,0x9C97,0x9C98,0x9C99,0x9C9D,/* 0x88-0x8F */ 0x9CAA,0x9CAC,0x9CAF,0x9CB9,0x9CBE,0x9CBF,0x9CC0,0x9CC1,/* 0x90-0x97 */ @@ -4240,7 +4240,7 @@ static wchar_t c2u_F8[256] = { 0x9D0B,0x9D0C,0x9D0D,0x9D0E,0x9D0F,0x9D10,0x9D11,0x9D12,/* 0x68-0x6F */ 0x9D13,0x9D14,0x9D15,0x9D16,0x9D17,0x9D18,0x9D19,0x9D1A,/* 0x70-0x77 */ 0x9D1B,0x9D1C,0x9D1D,0x9D1E,0x9D1F,0x9D20,0x9D21,0x0000,/* 0x78-0x7F */ - + 0x9D22,0x9D23,0x9D24,0x9D25,0x9D26,0x9D27,0x9D28,0x9D29,/* 0x80-0x87 */ 0x9D2A,0x9D2B,0x9D2C,0x9D2D,0x9D2E,0x9D2F,0x9D30,0x9D31,/* 0x88-0x8F */ 0x9D32,0x9D33,0x9D34,0x9D35,0x9D36,0x9D37,0x9D38,0x9D39,/* 0x90-0x97 */ @@ -4276,7 +4276,7 @@ static wchar_t c2u_F9[256] = { 0x9D6B,0x9D6C,0x9D6D,0x9D6E,0x9D6F,0x9D70,0x9D71,0x9D72,/* 0x68-0x6F */ 0x9D73,0x9D74,0x9D75,0x9D76,0x9D77,0x9D78,0x9D79,0x9D7A,/* 0x70-0x77 */ 0x9D7B,0x9D7C,0x9D7D,0x9D7E,0x9D7F,0x9D80,0x9D81,0x0000,/* 0x78-0x7F */ - + 0x9D82,0x9D83,0x9D84,0x9D85,0x9D86,0x9D87,0x9D88,0x9D89,/* 0x80-0x87 */ 0x9D8A,0x9D8B,0x9D8C,0x9D8D,0x9D8E,0x9D8F,0x9D90,0x9D91,/* 0x88-0x8F */ 0x9D92,0x9D93,0x9D94,0x9D95,0x9D96,0x9D97,0x9D98,0x9D99,/* 0x90-0x97 */ @@ -4301,7 +4301,7 @@ static wchar_t c2u_FA[256] = { 0x9DCB,0x9DCC,0x9DCD,0x9DCE,0x9DCF,0x9DD0,0x9DD1,0x9DD2,/* 0x68-0x6F */ 0x9DD3,0x9DD4,0x9DD5,0x9DD6,0x9DD7,0x9DD8,0x9DD9,0x9DDA,/* 0x70-0x77 */ 0x9DDB,0x9DDC,0x9DDD,0x9DDE,0x9DDF,0x9DE0,0x9DE1,0x0000,/* 0x78-0x7F */ - + 0x9DE2,0x9DE3,0x9DE4,0x9DE5,0x9DE6,0x9DE7,0x9DE8,0x9DE9,/* 0x80-0x87 */ 0x9DEA,0x9DEB,0x9DEC,0x9DED,0x9DEE,0x9DEF,0x9DF0,0x9DF1,/* 0x88-0x8F */ 0x9DF2,0x9DF3,0x9DF4,0x9DF5,0x9DF6,0x9DF7,0x9DF8,0x9DF9,/* 0x90-0x97 */ @@ -4326,7 +4326,7 @@ static wchar_t c2u_FB[256] = { 0x9E54,0x9E56,0x9E59,0x9E5D,0x9E5F,0x9E60,0x9E61,0x9E62,/* 0x68-0x6F */ 0x9E65,0x9E6E,0x9E6F,0x9E72,0x9E74,0x9E75,0x9E76,0x9E77,/* 0x70-0x77 */ 0x9E78,0x9E79,0x9E7A,0x9E7B,0x9E7C,0x9E7D,0x9E80,0x0000,/* 0x78-0x7F */ - + 0x9E81,0x9E83,0x9E84,0x9E85,0x9E86,0x9E89,0x9E8A,0x9E8C,/* 0x80-0x87 */ 0x9E8D,0x9E8E,0x9E8F,0x9E90,0x9E91,0x9E94,0x9E95,0x9E96,/* 0x88-0x8F */ 0xF988,0x9E98,0x9E99,0x9E9A,0x9E9B,0x9E9C,0x9E9E,0x9EA0,/* 0x90-0x97 */ @@ -4351,7 +4351,7 @@ static wchar_t c2u_FC[256] = { 0x9EE8,0x9EEB,0x9EEC,0x9EED,0x9EEE,0x9EF0,0x9EF1,0x9EF2,/* 0x68-0x6F */ 0x9EF3,0x9EF4,0x9EF5,0x9EF6,0x9EF7,0x9EF8,0x9EFA,0x9EFD,/* 0x70-0x77 */ 0x9EFF,0x9F00,0x9F01,0x9F02,0x9F03,0x9F04,0x9F05,0x0000,/* 0x78-0x7F */ - + 0x9F06,0x9F07,0x9F08,0x9F09,0x9F0A,0x9F0C,0x9F0F,0x9F11,/* 0x80-0x87 */ 0x9F12,0x9F14,0x9F15,0x9F16,0x9F18,0x9F1A,0x9F1B,0x9F1C,/* 0x88-0x8F */ 0x9F1D,0x9F1E,0x9F1F,0x9F21,0x9F23,0x9F24,0x9F25,0x9F26,/* 0x90-0x97 */ @@ -4376,7 +4376,7 @@ static wchar_t c2u_FD[256] = { 0x9F62,0x9F63,0x9F64,0x9F65,0x9F66,0x9F67,0x9F68,0x9F69,/* 0x68-0x6F */ 0x9F6A,0x9F6B,0x9F6C,0x9F6D,0x9F6E,0x9F6F,0x9F70,0x9F71,/* 0x70-0x77 */ 0x9F72,0x9F73,0x9F74,0x9F75,0x9F76,0x9F77,0x9F78,0x0000,/* 0x78-0x7F */ - + 0x9F79,0x9F7A,0x9F7B,0x9F7C,0x9F7D,0x9F7E,0x9F81,0x9F82,/* 0x80-0x87 */ 0xF9C4,0x9F8E,0x9F8F,0x9F90,0x9F91,0x9F92,0x9F93,0x9F94,/* 0x88-0x8F */ 0x9F95,0x9F96,0x9F97,0x9F98,0xF908,0x9F9D,0x9F9E,0x9FA1,/* 0x90-0x97 */ @@ -4398,38 +4398,38 @@ static wchar_t c2u_FE[256] = { }; static wchar_t *page_charset2uni[256] = { - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, c2u_81, c2u_82, c2u_83, c2u_84, c2u_85, c2u_86, c2u_87, - c2u_88, c2u_89, c2u_8A, c2u_8B, c2u_8C, c2u_8D, c2u_8E, c2u_8F, - c2u_90, c2u_91, c2u_92, c2u_93, c2u_94, c2u_95, c2u_96, c2u_97, - c2u_98, c2u_99, c2u_9A, c2u_9B, c2u_9C, c2u_9D, c2u_9E, c2u_9F, - c2u_A0, c2u_A1, c2u_A2, c2u_A3, c2u_A4, c2u_A5, c2u_A6, c2u_A7, - c2u_A8, c2u_A9, c2u_AA, c2u_AB, c2u_AC, c2u_AD, c2u_AE, c2u_AF, - c2u_B0, c2u_B1, c2u_B2, c2u_B3, c2u_B4, c2u_B5, c2u_B6, c2u_B7, - c2u_B8, c2u_B9, c2u_BA, c2u_BB, c2u_BC, c2u_BD, c2u_BE, c2u_BF, - c2u_C0, c2u_C1, c2u_C2, c2u_C3, c2u_C4, c2u_C5, c2u_C6, c2u_C7, - c2u_C8, c2u_C9, c2u_CA, c2u_CB, c2u_CC, c2u_CD, c2u_CE, c2u_CF, - c2u_D0, c2u_D1, c2u_D2, c2u_D3, c2u_D4, c2u_D5, c2u_D6, c2u_D7, - c2u_D8, c2u_D9, c2u_DA, c2u_DB, c2u_DC, c2u_DD, c2u_DE, c2u_DF, - c2u_E0, c2u_E1, c2u_E2, c2u_E3, c2u_E4, c2u_E5, c2u_E6, c2u_E7, - c2u_E8, c2u_E9, c2u_EA, c2u_EB, c2u_EC, c2u_ED, c2u_EE, c2u_EF, - c2u_F0, c2u_F1, c2u_F2, c2u_F3, c2u_F4, c2u_F5, c2u_F6, c2u_F7, - c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, c2u_FE, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, c2u_81, c2u_82, c2u_83, c2u_84, c2u_85, c2u_86, c2u_87, + c2u_88, c2u_89, c2u_8A, c2u_8B, c2u_8C, c2u_8D, c2u_8E, c2u_8F, + c2u_90, c2u_91, c2u_92, c2u_93, c2u_94, c2u_95, c2u_96, c2u_97, + c2u_98, c2u_99, c2u_9A, c2u_9B, c2u_9C, c2u_9D, c2u_9E, c2u_9F, + c2u_A0, c2u_A1, c2u_A2, c2u_A3, c2u_A4, c2u_A5, c2u_A6, c2u_A7, + c2u_A8, c2u_A9, c2u_AA, c2u_AB, c2u_AC, c2u_AD, c2u_AE, c2u_AF, + c2u_B0, c2u_B1, c2u_B2, c2u_B3, c2u_B4, c2u_B5, c2u_B6, c2u_B7, + c2u_B8, c2u_B9, c2u_BA, c2u_BB, c2u_BC, c2u_BD, c2u_BE, c2u_BF, + c2u_C0, c2u_C1, c2u_C2, c2u_C3, c2u_C4, c2u_C5, c2u_C6, c2u_C7, + c2u_C8, c2u_C9, c2u_CA, c2u_CB, c2u_CC, c2u_CD, c2u_CE, c2u_CF, + c2u_D0, c2u_D1, c2u_D2, c2u_D3, c2u_D4, c2u_D5, c2u_D6, c2u_D7, + c2u_D8, c2u_D9, c2u_DA, c2u_DB, c2u_DC, c2u_DD, c2u_DE, c2u_DF, + c2u_E0, c2u_E1, c2u_E2, c2u_E3, c2u_E4, c2u_E5, c2u_E6, c2u_E7, + c2u_E8, c2u_E9, c2u_EA, c2u_EB, c2u_EC, c2u_ED, c2u_EE, c2u_EF, + c2u_F0, c2u_F1, c2u_F2, c2u_F3, c2u_F4, c2u_F5, c2u_F6, c2u_F7, + c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, c2u_FE, NULL, }; static unsigned char u2c_01[512] = { @@ -4465,7 +4465,7 @@ static unsigned char u2c_01[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4525,7 +4525,7 @@ static unsigned char u2c_02[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4584,7 +4584,7 @@ static unsigned char u2c_03[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4682,7 +4682,7 @@ static unsigned char u2c_21[512] = { 0xA2, 0xA5, 0xA2, 0xA6, 0xA2, 0xA7, 0xA2, 0xA8, /* 0x74-0x77 */ 0xA2, 0xA9, 0xA2, 0xAA, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4725,7 +4725,7 @@ static unsigned char u2c_22[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4785,7 +4785,7 @@ static unsigned char u2c_24[512] = { 0xA2, 0xC5, 0xA2, 0xC6, 0xA2, 0xC7, 0xA2, 0xC8, /* 0x74-0x77 */ 0xA2, 0xC9, 0xA2, 0xCA, 0xA2, 0xCB, 0xA2, 0xCC, /* 0x78-0x7B */ 0xA2, 0xCD, 0xA2, 0xCE, 0xA2, 0xCF, 0xA2, 0xD0, /* 0x7C-0x7F */ - + 0xA2, 0xD1, 0xA2, 0xD2, 0xA2, 0xD3, 0xA2, 0xD4, /* 0x80-0x83 */ 0xA2, 0xD5, 0xA2, 0xD6, 0xA2, 0xD7, 0xA2, 0xD8, /* 0x84-0x87 */ 0xA2, 0xB1, 0xA2, 0xB2, 0xA2, 0xB3, 0xA2, 0xB4, /* 0x88-0x8B */ @@ -4828,7 +4828,7 @@ static unsigned char u2c_25[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xA8, 0x78, 0xA8, 0x79, 0xA8, 0x7A, /* 0x80-0x83 */ 0xA8, 0x7B, 0xA8, 0x7C, 0xA8, 0x7D, 0xA8, 0x7E, /* 0x84-0x87 */ 0xA8, 0x80, 0xA8, 0x81, 0xA8, 0x82, 0xA8, 0x83, /* 0x88-0x8B */ @@ -4916,7 +4916,7 @@ static unsigned char u2c_30[512] = { 0xA4, 0xD4, 0xA4, 0xD5, 0xA4, 0xD6, 0xA4, 0xD7, /* 0x74-0x77 */ 0xA4, 0xD8, 0xA4, 0xD9, 0xA4, 0xDA, 0xA4, 0xDB, /* 0x78-0x7B */ 0xA4, 0xDC, 0xA4, 0xDD, 0xA4, 0xDE, 0xA4, 0xDF, /* 0x7C-0x7F */ - + 0xA4, 0xE0, 0xA4, 0xE1, 0xA4, 0xE2, 0xA4, 0xE3, /* 0x80-0x83 */ 0xA4, 0xE4, 0xA4, 0xE5, 0xA4, 0xE6, 0xA4, 0xE7, /* 0x84-0x87 */ 0xA4, 0xE8, 0xA4, 0xE9, 0xA4, 0xEA, 0xA4, 0xEB, /* 0x88-0x8B */ @@ -4984,7 +4984,7 @@ static unsigned char u2c_31[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5028,7 +5028,7 @@ static unsigned char u2c_32[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xD2, 0xBB, 0xB6, 0xFE, 0xC8, 0xFD, 0xCB, 0xC4, /* 0x80-0x83 */ 0xCE, 0xE5, 0xC1, 0xF9, 0xC6, 0xDF, 0xB0, 0xCB, /* 0x84-0x87 */ 0xBE, 0xC5, 0xCA, 0xAE, 0xD4, 0xC2, 0xBB, 0xF0, /* 0x88-0x8B */ @@ -5077,7 +5077,7 @@ static unsigned char u2c_33[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5135,7 +5135,7 @@ static unsigned char u2c_4E[512] = { 0x81, 0x6C, 0x81, 0x6D, 0x81, 0x6E, 0x81, 0x6F, /* 0x74-0x77 */ 0x81, 0x70, 0x81, 0x71, 0x81, 0x72, 0x81, 0x73, /* 0x78-0x7B */ 0x81, 0x74, 0x81, 0x75, 0xC7, 0xAC, 0x81, 0x76, /* 0x7C-0x7F */ - + 0x81, 0x77, 0x81, 0x78, 0x81, 0x79, 0x81, 0x7A, /* 0x80-0x83 */ 0x81, 0x7B, 0x81, 0x7C, 0xC1, 0xCB, 0x81, 0x7D, /* 0x84-0x87 */ 0xD3, 0xE8, 0xD5, 0xF9, 0x81, 0x7E, 0xCA, 0xC2, /* 0x88-0x8B */ @@ -5203,7 +5203,7 @@ static unsigned char u2c_4F[512] = { 0xD9, 0xA6, 0x81, 0xE3, 0xD9, 0xA5, 0x81, 0xE4, /* 0x74-0x77 */ 0x81, 0xE5, 0x81, 0xE6, 0x81, 0xE7, 0xD9, 0xAC, /* 0x78-0x7B */ 0xD9, 0xAE, 0x81, 0xE8, 0xD9, 0xAB, 0xCA, 0xB9, /* 0x7C-0x7F */ - + 0x81, 0xE9, 0x81, 0xEA, 0x81, 0xEB, 0xD9, 0xA9, /* 0x80-0x83 */ 0xD6, 0xB6, 0x81, 0xEC, 0x81, 0xED, 0x81, 0xEE, /* 0x84-0x87 */ 0xB3, 0xDE, 0xD9, 0xA8, 0x81, 0xEF, 0xC0, 0xFD, /* 0x88-0x8B */ @@ -5271,7 +5271,7 @@ static unsigned char u2c_50[512] = { 0x82, 0xC8, 0x82, 0xC9, 0xC5, 0xBC, 0xCD, 0xB5, /* 0x74-0x77 */ 0x82, 0xCA, 0x82, 0xCB, 0x82, 0xCC, 0xD9, 0xCD, /* 0x78-0x7B */ 0x82, 0xCD, 0x82, 0xCE, 0xD9, 0xC7, 0xB3, 0xA5, /* 0x7C-0x7F */ - + 0xBF, 0xFE, 0x82, 0xCF, 0x82, 0xD0, 0x82, 0xD1, /* 0x80-0x83 */ 0x82, 0xD2, 0xB8, 0xB5, 0x82, 0xD3, 0x82, 0xD4, /* 0x84-0x87 */ 0xC0, 0xFC, 0x82, 0xD5, 0x82, 0xD6, 0x82, 0xD7, /* 0x88-0x8B */ @@ -5339,7 +5339,7 @@ static unsigned char u2c_51[512] = { 0xD0, 0xCB, 0xB1, 0xF8, 0xC6, 0xE4, 0xBE, 0xDF, /* 0x74-0x77 */ 0xB5, 0xE4, 0xD7, 0xC8, 0x83, 0xCD, 0xD1, 0xF8, /* 0x78-0x7B */ 0xBC, 0xE6, 0xCA, 0xDE, 0x83, 0xCE, 0x83, 0xCF, /* 0x7C-0x7F */ - + 0xBC, 0xBD, 0xD9, 0xE6, 0xD8, 0xE7, 0x83, 0xD0, /* 0x80-0x83 */ 0x83, 0xD1, 0xC4, 0xDA, 0x83, 0xD2, 0x83, 0xD3, /* 0x84-0x87 */ 0xB8, 0xD4, 0xC8, 0xBD, 0x83, 0xD4, 0x83, 0xD5, /* 0x88-0x8B */ @@ -5407,7 +5407,7 @@ static unsigned char u2c_52[512] = { 0x84, 0x92, 0x84, 0x93, 0x84, 0x94, 0x84, 0x95, /* 0x74-0x77 */ 0x84, 0x96, 0x84, 0x97, 0x84, 0x98, 0x84, 0x99, /* 0x78-0x7B */ 0x84, 0x9A, 0xD8, 0xE2, 0x84, 0x9B, 0xBD, 0xCB, /* 0x7C-0x7F */ - + 0x84, 0x9C, 0xD8, 0xE4, 0xD8, 0xE3, 0x84, 0x9D, /* 0x80-0x83 */ 0x84, 0x9E, 0x84, 0x9F, 0x84, 0xA0, 0x84, 0xA1, /* 0x84-0x87 */ 0xC5, 0xFC, 0x84, 0xA2, 0x84, 0xA3, 0x84, 0xA4, /* 0x88-0x8B */ @@ -5475,7 +5475,7 @@ static unsigned char u2c_53[512] = { 0xC8, 0xB4, 0xC2, 0xD1, 0x85, 0x71, 0xBE, 0xED, /* 0x74-0x77 */ 0xD0, 0xB6, 0x85, 0x72, 0xDA, 0xE1, 0x85, 0x73, /* 0x78-0x7B */ 0x85, 0x74, 0x85, 0x75, 0x85, 0x76, 0xC7, 0xE4, /* 0x7C-0x7F */ - + 0x85, 0x77, 0x85, 0x78, 0xB3, 0xA7, 0x85, 0x79, /* 0x80-0x83 */ 0xB6, 0xF2, 0xCC, 0xFC, 0xC0, 0xFA, 0x85, 0x7A, /* 0x84-0x87 */ 0x85, 0x7B, 0xC0, 0xF7, 0x85, 0x7C, 0xD1, 0xB9, /* 0x88-0x8B */ @@ -5543,7 +5543,7 @@ static unsigned char u2c_54[512] = { 0x85, 0xE9, 0xBA, 0xC7, 0xDF, 0xCE, 0xDF, 0xC8, /* 0x74-0x77 */ 0xC5, 0xDE, 0x85, 0xEA, 0x85, 0xEB, 0xC9, 0xEB, /* 0x78-0x7B */ 0xBA, 0xF4, 0xC3, 0xFC, 0x85, 0xEC, 0x85, 0xED, /* 0x7C-0x7F */ - + 0xBE, 0xD7, 0x85, 0xEE, 0xDF, 0xC6, 0x85, 0xEF, /* 0x80-0x83 */ 0xDF, 0xCD, 0x85, 0xF0, 0xC5, 0xD8, 0x85, 0xF1, /* 0x84-0x87 */ 0x85, 0xF2, 0x85, 0xF3, 0x85, 0xF4, 0xD5, 0xA6, /* 0x88-0x8B */ @@ -5611,7 +5611,7 @@ static unsigned char u2c_55[512] = { 0x86, 0xAE, 0xE0, 0xA3, 0xE0, 0xA4, 0xE0, 0xA5, /* 0x74-0x77 */ 0xD0, 0xA5, 0x86, 0xAF, 0x86, 0xB0, 0xE0, 0xB4, /* 0x78-0x7B */ 0xCC, 0xE4, 0x86, 0xB1, 0xE0, 0xB1, 0x86, 0xB2, /* 0x7C-0x7F */ - + 0xBF, 0xA6, 0xE0, 0xAF, 0xCE, 0xB9, 0xE0, 0xAB, /* 0x80-0x83 */ 0xC9, 0xC6, 0x86, 0xB3, 0x86, 0xB4, 0xC0, 0xAE, /* 0x84-0x87 */ 0xE0, 0xAE, 0xBA, 0xED, 0xBA, 0xB0, 0xE0, 0xA9, /* 0x88-0x8B */ @@ -5679,7 +5679,7 @@ static unsigned char u2c_56[512] = { 0x87, 0x8A, 0x87, 0x8B, 0xB8, 0xC1, 0x87, 0x8C, /* 0x74-0x77 */ 0x87, 0x8D, 0x87, 0x8E, 0x87, 0x8F, 0xE0, 0xE7, /* 0x78-0x7B */ 0xE0, 0xE8, 0x87, 0x90, 0x87, 0x91, 0x87, 0x92, /* 0x7C-0x7F */ - + 0x87, 0x93, 0x87, 0x94, 0x87, 0x95, 0x87, 0x96, /* 0x80-0x83 */ 0x87, 0x97, 0xE0, 0xE9, 0xE0, 0xE3, 0x87, 0x98, /* 0x84-0x87 */ 0x87, 0x99, 0x87, 0x9A, 0x87, 0x9B, 0x87, 0x9C, /* 0x88-0x8B */ @@ -5747,7 +5747,7 @@ static unsigned char u2c_57[512] = { 0x88, 0x76, 0x88, 0x77, 0xDB, 0xE9, 0xBF, 0xC0, /* 0x74-0x77 */ 0x88, 0x78, 0x88, 0x79, 0x88, 0x7A, 0xDB, 0xE6, /* 0x78-0x7B */ 0xDB, 0xE5, 0x88, 0x7B, 0x88, 0x7C, 0x88, 0x7D, /* 0x7C-0x7F */ - + 0x88, 0x7E, 0x88, 0x80, 0xB4, 0xB9, 0xC0, 0xAC, /* 0x80-0x83 */ 0xC2, 0xA2, 0xDB, 0xE2, 0xDB, 0xE4, 0x88, 0x81, /* 0x84-0x87 */ 0x88, 0x82, 0x88, 0x83, 0x88, 0x84, 0xD0, 0xCD, /* 0x88-0x8B */ @@ -5815,7 +5815,7 @@ static unsigned char u2c_58[512] = { 0x89, 0x6C, 0x89, 0x6D, 0x89, 0x6E, 0x89, 0x6F, /* 0x74-0x77 */ 0x89, 0x70, 0x89, 0x71, 0x89, 0x72, 0x89, 0x73, /* 0x78-0x7B */ 0x89, 0x74, 0x89, 0x75, 0xDB, 0xD3, 0x89, 0x76, /* 0x7C-0x7F */ - + 0xDC, 0xAF, 0xDC, 0xAC, 0x89, 0x77, 0xBE, 0xB3, /* 0x80-0x83 */ 0x89, 0x78, 0xCA, 0xFB, 0x89, 0x79, 0x89, 0x7A, /* 0x84-0x87 */ 0x89, 0x7B, 0xDC, 0xAD, 0x89, 0x7C, 0x89, 0x7D, /* 0x88-0x8B */ @@ -5883,7 +5883,7 @@ static unsigned char u2c_59[512] = { 0xC5, 0xAB, 0x8A, 0x63, 0xC4, 0xCC, 0x8A, 0x64, /* 0x74-0x77 */ 0xBC, 0xE9, 0xCB, 0xFD, 0x8A, 0x65, 0x8A, 0x66, /* 0x78-0x7B */ 0x8A, 0x67, 0xBA, 0xC3, 0x8A, 0x68, 0x8A, 0x69, /* 0x7C-0x7F */ - + 0x8A, 0x6A, 0xE5, 0xF9, 0xC8, 0xE7, 0xE5, 0xFA, /* 0x80-0x83 */ 0xCD, 0xFD, 0x8A, 0x6B, 0xD7, 0xB1, 0xB8, 0xBE, /* 0x84-0x87 */ 0xC2, 0xE8, 0x8A, 0x6C, 0xC8, 0xD1, 0x8A, 0x6D, /* 0x88-0x8B */ @@ -5951,7 +5951,7 @@ static unsigned char u2c_5A[512] = { 0xD3, 0xA4, 0xE6, 0xBF, 0xC9, 0xF4, 0xE6, 0xC3, /* 0x74-0x77 */ 0x8B, 0x50, 0x8B, 0x51, 0xE6, 0xC4, 0x8B, 0x52, /* 0x78-0x7B */ 0x8B, 0x53, 0x8B, 0x54, 0x8B, 0x55, 0xD0, 0xF6, /* 0x7C-0x7F */ - + 0x8B, 0x56, 0x8B, 0x57, 0x8B, 0x58, 0x8B, 0x59, /* 0x80-0x83 */ 0x8B, 0x5A, 0x8B, 0x5B, 0x8B, 0x5C, 0x8B, 0x5D, /* 0x84-0x87 */ 0x8B, 0x5E, 0x8B, 0x5F, 0x8B, 0x60, 0x8B, 0x61, /* 0x88-0x8B */ @@ -6019,7 +6019,7 @@ static unsigned char u2c_5B[512] = { 0x8C, 0x54, 0xB7, 0xF5, 0x8C, 0x55, 0x8C, 0x56, /* 0x74-0x77 */ 0x8C, 0x57, 0x8C, 0x58, 0xC8, 0xE6, 0x8C, 0x59, /* 0x78-0x7B */ 0x8C, 0x5A, 0xC4, 0xF5, 0x8C, 0x5B, 0x8C, 0x5C, /* 0x7C-0x7F */ - + 0xE5, 0xB2, 0xC4, 0xFE, 0x8C, 0x5D, 0xCB, 0xFC, /* 0x80-0x83 */ 0xE5, 0xB3, 0xD5, 0xAC, 0x8C, 0x5E, 0xD3, 0xEE, /* 0x84-0x87 */ 0xCA, 0xD8, 0xB0, 0xB2, 0x8C, 0x5F, 0xCB, 0xCE, /* 0x88-0x8B */ @@ -6087,7 +6087,7 @@ static unsigned char u2c_5C[512] = { 0x8C, 0xDE, 0x8C, 0xDF, 0x8C, 0xE0, 0x8C, 0xE1, /* 0x74-0x77 */ 0x8C, 0xE2, 0xD2, 0xD9, 0xE1, 0xA8, 0x8C, 0xE3, /* 0x78-0x7B */ 0x8C, 0xE4, 0x8C, 0xE5, 0x8C, 0xE6, 0xD3, 0xEC, /* 0x7C-0x7F */ - + 0x8C, 0xE7, 0xCB, 0xEA, 0xC6, 0xF1, 0x8C, 0xE8, /* 0x80-0x83 */ 0x8C, 0xE9, 0x8C, 0xEA, 0x8C, 0xEB, 0x8C, 0xEC, /* 0x84-0x87 */ 0xE1, 0xAC, 0x8C, 0xED, 0x8C, 0xEE, 0x8C, 0xEF, /* 0x88-0x8B */ @@ -6155,7 +6155,7 @@ static unsigned char u2c_5D[512] = { 0xE1, 0xD5, 0x8D, 0xD6, 0x8D, 0xD7, 0x8D, 0xD8, /* 0x74-0x77 */ 0x8D, 0xD9, 0x8D, 0xDA, 0x8D, 0xDB, 0x8D, 0xDC, /* 0x78-0x7B */ 0x8D, 0xDD, 0x8D, 0xDE, 0x8D, 0xDF, 0x8D, 0xE0, /* 0x7C-0x7F */ - + 0x8D, 0xE1, 0x8D, 0xE2, 0xE1, 0xD6, 0x8D, 0xE3, /* 0x80-0x83 */ 0x8D, 0xE4, 0x8D, 0xE5, 0x8D, 0xE6, 0x8D, 0xE7, /* 0x84-0x87 */ 0x8D, 0xE8, 0x8D, 0xE9, 0x8D, 0xEA, 0x8D, 0xEB, /* 0x88-0x8B */ @@ -6223,7 +6223,7 @@ static unsigned char u2c_5E[512] = { 0xC4, 0xEA, 0x8E, 0xD4, 0xB2, 0xA2, 0x8E, 0xD5, /* 0x74-0x77 */ 0xD0, 0xD2, 0x8E, 0xD6, 0xE7, 0xDB, 0xBB, 0xC3, /* 0x78-0x7B */ 0xD3, 0xD7, 0xD3, 0xC4, 0x8E, 0xD7, 0xB9, 0xE3, /* 0x7C-0x7F */ - + 0xE2, 0xCF, 0x8E, 0xD8, 0x8E, 0xD9, 0x8E, 0xDA, /* 0x80-0x83 */ 0xD7, 0xAF, 0x8E, 0xDB, 0xC7, 0xEC, 0xB1, 0xD3, /* 0x84-0x87 */ 0x8E, 0xDC, 0x8E, 0xDD, 0xB4, 0xB2, 0xE2, 0xD1, /* 0x88-0x8B */ @@ -6291,7 +6291,7 @@ static unsigned char u2c_5F[512] = { 0x8F, 0xB0, 0x8F, 0xB1, 0x8F, 0xB2, 0xE1, 0xDD, /* 0x74-0x77 */ 0x8F, 0xB3, 0xD2, 0xDB, 0x8F, 0xB4, 0xB3, 0xB9, /* 0x78-0x7B */ 0xB1, 0xCB, 0x8F, 0xB5, 0x8F, 0xB6, 0x8F, 0xB7, /* 0x7C-0x7F */ - + 0xCD, 0xF9, 0xD5, 0xF7, 0xE1, 0xDE, 0x8F, 0xB8, /* 0x80-0x83 */ 0xBE, 0xB6, 0xB4, 0xFD, 0x8F, 0xB9, 0xE1, 0xDF, /* 0x84-0x87 */ 0xBA, 0xDC, 0xE1, 0xE0, 0xBB, 0xB2, 0xC2, 0xC9, /* 0x88-0x8B */ @@ -6359,7 +6359,7 @@ static unsigned char u2c_60[512] = { 0x90, 0x7A, 0x90, 0x7B, 0xB6, 0xF1, 0x90, 0x7C, /* 0x74-0x77 */ 0xE2, 0xFA, 0xE2, 0xFB, 0xE2, 0xFD, 0xE2, 0xFC, /* 0x78-0x7B */ 0xC4, 0xD5, 0xE3, 0xA2, 0x90, 0x7D, 0xD3, 0xC1, /* 0x7C-0x7F */ - + 0x90, 0x7E, 0x90, 0x80, 0x90, 0x81, 0xE3, 0xA7, /* 0x80-0x83 */ 0xC7, 0xC4, 0x90, 0x82, 0x90, 0x83, 0x90, 0x84, /* 0x84-0x87 */ 0x90, 0x85, 0xCF, 0xA4, 0x90, 0x86, 0x90, 0x87, /* 0x88-0x8B */ @@ -6427,7 +6427,7 @@ static unsigned char u2c_61[512] = { 0x91, 0x62, 0xE3, 0xBC, 0x91, 0x63, 0xBF, 0xB6, /* 0x74-0x77 */ 0x91, 0x64, 0x91, 0x65, 0x91, 0x66, 0x91, 0x67, /* 0x78-0x7B */ 0x91, 0x68, 0x91, 0x69, 0x91, 0x6A, 0x91, 0x6B, /* 0x7C-0x7F */ - + 0x91, 0x6C, 0x91, 0x6D, 0x91, 0x6E, 0x91, 0x6F, /* 0x80-0x83 */ 0x91, 0x70, 0x91, 0x71, 0x91, 0x72, 0x91, 0x73, /* 0x84-0x87 */ 0x91, 0x74, 0x91, 0x75, 0x91, 0x76, 0xB1, 0xEF, /* 0x88-0x8B */ @@ -6495,7 +6495,7 @@ static unsigned char u2c_62[512] = { 0x92, 0x53, 0x92, 0x54, 0xB7, 0xF6, 0x92, 0x55, /* 0x74-0x77 */ 0x92, 0x56, 0xC5, 0xFA, 0x92, 0x57, 0x92, 0x58, /* 0x78-0x7B */ 0xB6, 0xF3, 0x92, 0x59, 0xD5, 0xD2, 0xB3, 0xD0, /* 0x7C-0x7F */ - + 0xBC, 0xBC, 0x92, 0x5A, 0x92, 0x5B, 0x92, 0x5C, /* 0x80-0x83 */ 0xB3, 0xAD, 0x92, 0x5D, 0x92, 0x5E, 0x92, 0x5F, /* 0x84-0x87 */ 0x92, 0x60, 0xBE, 0xF1, 0xB0, 0xD1, 0x92, 0x61, /* 0x88-0x8B */ @@ -6563,7 +6563,7 @@ static unsigned char u2c_63[512] = { 0x92, 0xD6, 0x92, 0xD7, 0xB4, 0xB7, 0xBD, 0xDD, /* 0x74-0x77 */ 0x92, 0xD8, 0x92, 0xD9, 0xDE, 0xE0, 0xC4, 0xED, /* 0x78-0x7B */ 0x92, 0xDA, 0x92, 0xDB, 0x92, 0xDC, 0x92, 0xDD, /* 0x7C-0x7F */ - + 0xCF, 0xC6, 0x92, 0xDE, 0xB5, 0xE0, 0x92, 0xDF, /* 0x80-0x83 */ 0x92, 0xE0, 0x92, 0xE1, 0x92, 0xE2, 0xB6, 0xDE, /* 0x84-0x87 */ 0xCA, 0xDA, 0xB5, 0xF4, 0xDE, 0xE5, 0x92, 0xE3, /* 0x88-0x8B */ @@ -6631,7 +6631,7 @@ static unsigned char u2c_64[512] = { 0x93, 0xB9, 0x93, 0xBA, 0x93, 0xBB, 0x93, 0xBC, /* 0x74-0x77 */ 0xC3, 0xFE, 0xC4, 0xA1, 0xDF, 0xA1, 0x93, 0xBD, /* 0x78-0x7B */ 0x93, 0xBE, 0x93, 0xBF, 0x93, 0xC0, 0x93, 0xC1, /* 0x7C-0x7F */ - + 0x93, 0xC2, 0x93, 0xC3, 0xC1, 0xCC, 0x93, 0xC4, /* 0x80-0x83 */ 0xDE, 0xFC, 0xBE, 0xEF, 0x93, 0xC5, 0xC6, 0xB2, /* 0x84-0x87 */ 0x93, 0xC6, 0x93, 0xC7, 0x93, 0xC8, 0x93, 0xC9, /* 0x88-0x8B */ @@ -6699,7 +6699,7 @@ static unsigned char u2c_65[512] = { 0xD5, 0xFB, 0x94, 0xB3, 0x94, 0xB4, 0xB7, 0xF3, /* 0x74-0x77 */ 0x94, 0xB5, 0x94, 0xB6, 0x94, 0xB7, 0x94, 0xB8, /* 0x78-0x7B */ 0x94, 0xB9, 0x94, 0xBA, 0x94, 0xBB, 0x94, 0xBC, /* 0x7C-0x7F */ - + 0x94, 0xBD, 0x94, 0xBE, 0x94, 0xBF, 0x94, 0xC0, /* 0x80-0x83 */ 0x94, 0xC1, 0x94, 0xC2, 0x94, 0xC3, 0xCE, 0xC4, /* 0x84-0x87 */ 0x94, 0xC4, 0x94, 0xC5, 0x94, 0xC6, 0xD5, 0xAB, /* 0x88-0x8B */ @@ -6767,7 +6767,7 @@ static unsigned char u2c_66[512] = { 0xC7, 0xE7, 0x95, 0x92, 0xBE, 0xA7, 0xEA, 0xD0, /* 0x74-0x77 */ 0x95, 0x93, 0x95, 0x94, 0xD6, 0xC7, 0x95, 0x95, /* 0x78-0x7B */ 0x95, 0x96, 0x95, 0x97, 0xC1, 0xC0, 0x95, 0x98, /* 0x7C-0x7F */ - + 0x95, 0x99, 0x95, 0x9A, 0xD4, 0xDD, 0x95, 0x9B, /* 0x80-0x83 */ 0xEA, 0xD1, 0x95, 0x9C, 0x95, 0x9D, 0xCF, 0xBE, /* 0x84-0x87 */ 0x95, 0x9E, 0x95, 0x9F, 0x95, 0xA0, 0x95, 0xA1, /* 0x88-0x8B */ @@ -6835,7 +6835,7 @@ static unsigned char u2c_67[512] = { 0x96, 0x7D, 0xE8, 0xC6, 0x96, 0x7E, 0xE8, 0xCB, /* 0x74-0x77 */ 0x96, 0x80, 0x96, 0x81, 0x96, 0x82, 0x96, 0x83, /* 0x78-0x7B */ 0xE8, 0xCC, 0x96, 0x84, 0xCB, 0xC9, 0xB0, 0xE5, /* 0x7C-0x7F */ - + 0x96, 0x85, 0xBC, 0xAB, 0x96, 0x86, 0x96, 0x87, /* 0x80-0x83 */ 0xB9, 0xB9, 0x96, 0x88, 0x96, 0x89, 0xE8, 0xC1, /* 0x84-0x87 */ 0x96, 0x8A, 0xCD, 0xF7, 0x96, 0x8B, 0xE8, 0xCA, /* 0x88-0x8B */ @@ -6903,7 +6903,7 @@ static unsigned char u2c_68[512] = { 0xE8, 0xF5, 0x97, 0x4D, 0xCD, 0xB0, 0xE8, 0xF6, /* 0x74-0x77 */ 0x97, 0x4E, 0x97, 0x4F, 0x97, 0x50, 0x97, 0x51, /* 0x78-0x7B */ 0x97, 0x52, 0x97, 0x53, 0x97, 0x54, 0x97, 0x55, /* 0x7C-0x7F */ - + 0x97, 0x56, 0xC1, 0xBA, 0x97, 0x57, 0xE8, 0xE8, /* 0x80-0x83 */ 0x97, 0x58, 0xC3, 0xB7, 0xB0, 0xF0, 0x97, 0x59, /* 0x84-0x87 */ 0x97, 0x5A, 0x97, 0x5B, 0x97, 0x5C, 0x97, 0x5D, /* 0x88-0x8B */ @@ -6971,7 +6971,7 @@ static unsigned char u2c_69[512] = { 0x98, 0x4E, 0x98, 0x4F, 0x98, 0x50, 0xBF, 0xAC, /* 0x74-0x77 */ 0xE9, 0xB1, 0xE9, 0xBA, 0x98, 0x51, 0x98, 0x52, /* 0x78-0x7B */ 0xC2, 0xA5, 0x98, 0x53, 0x98, 0x54, 0x98, 0x55, /* 0x7C-0x7F */ - + 0xE9, 0xAF, 0x98, 0x56, 0xB8, 0xC5, 0x98, 0x57, /* 0x80-0x83 */ 0xE9, 0xAD, 0x98, 0x58, 0xD3, 0xDC, 0xE9, 0xB4, /* 0x84-0x87 */ 0xE9, 0xB5, 0xE9, 0xB7, 0x98, 0x59, 0x98, 0x5A, /* 0x88-0x8B */ @@ -7039,7 +7039,7 @@ static unsigned char u2c_6A[512] = { 0x99, 0x55, 0x99, 0x56, 0x99, 0x57, 0x99, 0x58, /* 0x74-0x77 */ 0x99, 0x59, 0xE9, 0xD6, 0x99, 0x5A, 0x99, 0x5B, /* 0x78-0x7B */ 0xE9, 0xDA, 0x99, 0x5C, 0x99, 0x5D, 0x99, 0x5E, /* 0x7C-0x7F */ - + 0xCC, 0xB4, 0x99, 0x5F, 0x99, 0x60, 0x99, 0x61, /* 0x80-0x83 */ 0xCF, 0xAD, 0x99, 0x62, 0x99, 0x63, 0x99, 0x64, /* 0x84-0x87 */ 0x99, 0x65, 0x99, 0x66, 0x99, 0x67, 0x99, 0x68, /* 0x88-0x8B */ @@ -7107,7 +7107,7 @@ static unsigned char u2c_6B[512] = { 0x9A, 0x73, 0x9A, 0x74, 0x9A, 0x75, 0x9A, 0x76, /* 0x74-0x77 */ 0x9A, 0x77, 0xB4, 0xF5, 0x9A, 0x78, 0xCB, 0xC0, /* 0x78-0x7B */ 0xBC, 0xDF, 0x9A, 0x79, 0x9A, 0x7A, 0x9A, 0x7B, /* 0x7C-0x7F */ - + 0x9A, 0x7C, 0xE9, 0xE2, 0xE9, 0xE3, 0xD1, 0xEA, /* 0x80-0x83 */ 0xE9, 0xE5, 0x9A, 0x7D, 0xB4, 0xF9, 0xE9, 0xE4, /* 0x84-0x87 */ 0x9A, 0x7E, 0xD1, 0xB3, 0xCA, 0xE2, 0xB2, 0xD0, /* 0x88-0x8B */ @@ -7175,7 +7175,7 @@ static unsigned char u2c_6C[512] = { 0xE3, 0xEA, 0x9B, 0x4E, 0xE3, 0xEB, 0x9B, 0x4F, /* 0x74-0x77 */ 0x9B, 0x50, 0xD0, 0xDA, 0x9B, 0x51, 0x9B, 0x52, /* 0x78-0x7B */ 0x9B, 0x53, 0xC6, 0xFB, 0xB7, 0xDA, 0x9B, 0x54, /* 0x7C-0x7F */ - + 0x9B, 0x55, 0xC7, 0xDF, 0xD2, 0xCA, 0xCE, 0xD6, /* 0x80-0x83 */ 0x9B, 0x56, 0xE3, 0xE4, 0xE3, 0xEC, 0x9B, 0x57, /* 0x84-0x87 */ 0xC9, 0xF2, 0xB3, 0xC1, 0x9B, 0x58, 0x9B, 0x59, /* 0x88-0x8B */ @@ -7243,7 +7243,7 @@ static unsigned char u2c_6D[512] = { 0xD4, 0xA1, 0x9B, 0xCF, 0x9B, 0xD0, 0xBA, 0xA3, /* 0x74-0x77 */ 0xBD, 0xFE, 0x9B, 0xD1, 0x9B, 0xD2, 0x9B, 0xD3, /* 0x78-0x7B */ 0xE4, 0xBC, 0x9B, 0xD4, 0x9B, 0xD5, 0x9B, 0xD6, /* 0x7C-0x7F */ - + 0x9B, 0xD7, 0x9B, 0xD8, 0xCD, 0xBF, 0x9B, 0xD9, /* 0x80-0x83 */ 0x9B, 0xDA, 0xC4, 0xF9, 0x9B, 0xDB, 0x9B, 0xDC, /* 0x84-0x87 */ 0xCF, 0xFB, 0xC9, 0xE6, 0x9B, 0xDD, 0x9B, 0xDE, /* 0x88-0x8B */ @@ -7311,7 +7311,7 @@ static unsigned char u2c_6E[512] = { 0x9C, 0xB0, 0x9C, 0xB1, 0x9C, 0xB2, 0x9C, 0xB3, /* 0x74-0x77 */ 0x9C, 0xB4, 0x9C, 0xB5, 0x9C, 0xB6, 0x9C, 0xB7, /* 0x78-0x7B */ 0x9C, 0xB8, 0x9C, 0xB9, 0xCD, 0xE5, 0xCA, 0xAA, /* 0x7C-0x7F */ - + 0x9C, 0xBA, 0x9C, 0xBB, 0x9C, 0xBC, 0xC0, 0xA3, /* 0x80-0x83 */ 0x9C, 0xBD, 0xBD, 0xA6, 0xE4, 0xD3, 0x9C, 0xBE, /* 0x84-0x87 */ 0x9C, 0xBF, 0xB8, 0xC8, 0x9C, 0xC0, 0x9C, 0xC1, /* 0x88-0x8B */ @@ -7379,7 +7379,7 @@ static unsigned char u2c_6F[512] = { 0xE4, 0xF3, 0x9D, 0xA5, 0x9D, 0xA6, 0x9D, 0xA7, /* 0x74-0x77 */ 0xE4, 0xFA, 0x9D, 0xA8, 0xE4, 0xFD, 0x9D, 0xA9, /* 0x78-0x7B */ 0xE4, 0xFC, 0x9D, 0xAA, 0x9D, 0xAB, 0x9D, 0xAC, /* 0x7C-0x7F */ - + 0x9D, 0xAD, 0x9D, 0xAE, 0x9D, 0xAF, 0x9D, 0xB0, /* 0x80-0x83 */ 0xB3, 0xCE, 0x9D, 0xB1, 0x9D, 0xB2, 0x9D, 0xB3, /* 0x84-0x87 */ 0xB3, 0xBA, 0xE4, 0xF7, 0x9D, 0xB4, 0x9D, 0xB5, /* 0x88-0x8B */ @@ -7447,7 +7447,7 @@ static unsigned char u2c_70[512] = { 0x9E, 0xBF, 0xC1, 0xE9, 0xD4, 0xEE, 0x9E, 0xC0, /* 0x74-0x77 */ 0xBE, 0xC4, 0x9E, 0xC1, 0x9E, 0xC2, 0x9E, 0xC3, /* 0x78-0x7B */ 0xD7, 0xC6, 0x9E, 0xC4, 0xD4, 0xD6, 0xB2, 0xD3, /* 0x7C-0x7F */ - + 0xEC, 0xBE, 0x9E, 0xC5, 0x9E, 0xC6, 0x9E, 0xC7, /* 0x80-0x83 */ 0x9E, 0xC8, 0xEA, 0xC1, 0x9E, 0xC9, 0x9E, 0xCA, /* 0x84-0x87 */ 0x9E, 0xCB, 0xC2, 0xAF, 0xB4, 0xB6, 0x9E, 0xCC, /* 0x88-0x8B */ @@ -7515,7 +7515,7 @@ static unsigned char u2c_71[512] = { 0x9F, 0xB1, 0x9F, 0xB2, 0x9F, 0xB3, 0x9F, 0xB4, /* 0x74-0x77 */ 0xEC, 0xD4, 0x9F, 0xB5, 0xEC, 0xD5, 0x9F, 0xB6, /* 0x78-0x7B */ 0x9F, 0xB7, 0xC9, 0xBF, 0x9F, 0xB8, 0x9F, 0xB9, /* 0x7C-0x7F */ - + 0x9F, 0xBA, 0x9F, 0xBB, 0x9F, 0xBC, 0x9F, 0xBD, /* 0x80-0x83 */ 0xCF, 0xA8, 0x9F, 0xBE, 0x9F, 0xBF, 0x9F, 0xC0, /* 0x84-0x87 */ 0x9F, 0xC1, 0x9F, 0xC2, 0xD0, 0xDC, 0x9F, 0xC3, /* 0x88-0x8B */ @@ -7583,7 +7583,7 @@ static unsigned char u2c_72[512] = { 0xA0, 0xB9, 0xC7, 0xA3, 0xA0, 0xBA, 0xA0, 0xBB, /* 0x74-0x77 */ 0xA0, 0xBC, 0xCC, 0xD8, 0xCE, 0xFE, 0xA0, 0xBD, /* 0x78-0x7B */ 0xA0, 0xBE, 0xA0, 0xBF, 0xEA, 0xF5, 0xEA, 0xF6, /* 0x7C-0x7F */ - + 0xCF, 0xAC, 0xC0, 0xE7, 0xA0, 0xC0, 0xA0, 0xC1, /* 0x80-0x83 */ 0xEA, 0xF7, 0xA0, 0xC2, 0xA0, 0xC3, 0xA0, 0xC4, /* 0x84-0x87 */ 0xA0, 0xC5, 0xA0, 0xC6, 0xB6, 0xBF, 0xEA, 0xF8, /* 0x88-0x8B */ @@ -7651,7 +7651,7 @@ static unsigned char u2c_73[512] = { 0xAB, 0x42, 0xAB, 0x43, 0xAB, 0x44, 0xAB, 0x45, /* 0x74-0x77 */ 0xAB, 0x46, 0xAB, 0x47, 0xAB, 0x48, 0xAB, 0x49, /* 0x78-0x7B */ 0xAB, 0x4A, 0xAB, 0x4B, 0xE2, 0xB5, 0xAB, 0x4C, /* 0x7C-0x7F */ - + 0xAB, 0x4D, 0xAB, 0x4E, 0xAB, 0x4F, 0xAB, 0x50, /* 0x80-0x83 */ 0xD0, 0xFE, 0xAB, 0x51, 0xAB, 0x52, 0xC2, 0xCA, /* 0x84-0x87 */ 0xAB, 0x53, 0xD3, 0xF1, 0xAB, 0x54, 0xCD, 0xF5, /* 0x88-0x8B */ @@ -7719,7 +7719,7 @@ static unsigned char u2c_74[512] = { 0xAC, 0x9C, 0xAC, 0x9D, 0xD1, 0xFE, 0xE8, 0xA8, /* 0x74-0x77 */ 0xAC, 0x9E, 0xAC, 0x9F, 0xAC, 0xA0, 0xAD, 0x40, /* 0x78-0x7B */ 0xAD, 0x41, 0xAD, 0x42, 0xE8, 0xAA, 0xAD, 0x43, /* 0x7C-0x7F */ - + 0xE8, 0xAD, 0xE8, 0xAE, 0xAD, 0x44, 0xC1, 0xA7, /* 0x80-0x83 */ 0xAD, 0x45, 0xAD, 0x46, 0xAD, 0x47, 0xE8, 0xAF, /* 0x84-0x87 */ 0xAD, 0x48, 0xAD, 0x49, 0xAD, 0x4A, 0xE8, 0xB0, /* 0x88-0x8B */ @@ -7787,7 +7787,7 @@ static unsigned char u2c_75[512] = { 0xB3, 0xEB, 0xAE, 0x93, 0xAE, 0x94, 0xAE, 0x95, /* 0x74-0x77 */ 0xBB, 0xFB, 0xEE, 0xB5, 0xAE, 0x96, 0xAE, 0x97, /* 0x78-0x7B */ 0xAE, 0x98, 0xAE, 0x99, 0xAE, 0x9A, 0xE7, 0xDC, /* 0x7C-0x7F */ - + 0xAE, 0x9B, 0xAE, 0x9C, 0xAE, 0x9D, 0xEE, 0xB6, /* 0x80-0x83 */ 0xAE, 0x9E, 0xAE, 0x9F, 0xBD, 0xAE, 0xAE, 0xA0, /* 0x84-0x87 */ 0xAF, 0x40, 0xAF, 0x41, 0xAF, 0x42, 0xF1, 0xE2, /* 0x88-0x8B */ @@ -7855,7 +7855,7 @@ static unsigned char u2c_76[512] = { 0xB0, 0x66, 0xB0, 0x67, 0xB0, 0x68, 0xB0, 0x69, /* 0x74-0x77 */ 0xB9, 0xEF, 0xB0, 0x6A, 0xB0, 0x6B, 0xB5, 0xC7, /* 0x78-0x7B */ 0xB0, 0x6C, 0xB0, 0xD7, 0xB0, 0xD9, 0xB0, 0x6D, /* 0x7C-0x7F */ - + 0xB0, 0x6E, 0xB0, 0x6F, 0xD4, 0xED, 0xB0, 0x70, /* 0x80-0x83 */ 0xB5, 0xC4, 0xB0, 0x71, 0xBD, 0xD4, 0xBB, 0xCA, /* 0x84-0x87 */ 0xF0, 0xA7, 0xB0, 0x72, 0xB0, 0x73, 0xB8, 0xDE, /* 0x88-0x8B */ @@ -7923,7 +7923,7 @@ static unsigned char u2c_77[512] = { 0xB2, 0x4F, 0xB2, 0x50, 0xB2, 0x51, 0xB2, 0x52, /* 0x74-0x77 */ 0xB2, 0x53, 0xB6, 0xC3, 0xB2, 0x54, 0xB2, 0x55, /* 0x78-0x7B */ 0xB2, 0x56, 0xEE, 0xA5, 0xD8, 0xBA, 0xEE, 0xA3, /* 0x7C-0x7F */ - + 0xEE, 0xA6, 0xB2, 0x57, 0xB2, 0x58, 0xB2, 0x59, /* 0x80-0x83 */ 0xC3, 0xE9, 0xB3, 0xF2, 0xB2, 0x5A, 0xB2, 0x5B, /* 0x84-0x87 */ 0xB2, 0x5C, 0xB2, 0x5D, 0xB2, 0x5E, 0xB2, 0x5F, /* 0x88-0x8B */ @@ -7991,7 +7991,7 @@ static unsigned char u2c_78[512] = { 0xB3, 0x93, 0xB3, 0x94, 0xB3, 0x95, 0xBC, 0xEF, /* 0x74-0x77 */ 0xB3, 0x96, 0xB3, 0x97, 0xB3, 0x98, 0xB3, 0x99, /* 0x78-0x7B */ 0xC5, 0xF0, 0xB3, 0x9A, 0xB3, 0x9B, 0xB3, 0x9C, /* 0x7C-0x7F */ - + 0xB3, 0x9D, 0xB3, 0x9E, 0xB3, 0x9F, 0xB3, 0xA0, /* 0x80-0x83 */ 0xB4, 0x40, 0xB4, 0x41, 0xB4, 0x42, 0xED, 0xD6, /* 0x84-0x87 */ 0xB4, 0x43, 0xB5, 0xEF, 0xB4, 0x44, 0xB4, 0x45, /* 0x88-0x8B */ @@ -8059,7 +8059,7 @@ static unsigned char u2c_79[512] = { 0xB5, 0x8B, 0xB5, 0x8C, 0xB5, 0x8D, 0xB5, 0xBB, /* 0x74-0x77 */ 0xBB, 0xF6, 0xB5, 0x8E, 0xEC, 0xF7, 0xB5, 0x8F, /* 0x78-0x7B */ 0xB5, 0x90, 0xB5, 0x91, 0xB5, 0x92, 0xB5, 0x93, /* 0x7C-0x7F */ - + 0xD9, 0xF7, 0xBD, 0xFB, 0xB5, 0x94, 0xB5, 0x95, /* 0x80-0x83 */ 0xC2, 0xBB, 0xEC, 0xF8, 0xB5, 0x96, 0xB5, 0x97, /* 0x84-0x87 */ 0xB5, 0x98, 0xB5, 0x99, 0xEC, 0xF9, 0xB5, 0x9A, /* 0x88-0x8B */ @@ -8127,7 +8127,7 @@ static unsigned char u2c_7A[512] = { 0xD1, 0xA8, 0xB7, 0x8A, 0xBE, 0xBF, 0xC7, 0xEE, /* 0x74-0x77 */ 0xF1, 0xB6, 0xF1, 0xB7, 0xBF, 0xD5, 0xB7, 0x8B, /* 0x78-0x7B */ 0xB7, 0x8C, 0xB7, 0x8D, 0xB7, 0x8E, 0xB4, 0xA9, /* 0x7C-0x7F */ - + 0xF1, 0xB8, 0xCD, 0xBB, 0xB7, 0x8F, 0xC7, 0xD4, /* 0x80-0x83 */ 0xD5, 0xAD, 0xB7, 0x90, 0xF1, 0xB9, 0xB7, 0x91, /* 0x84-0x87 */ 0xF1, 0xBA, 0xB7, 0x92, 0xB7, 0x93, 0xB7, 0x94, /* 0x88-0x8B */ @@ -8195,7 +8195,7 @@ static unsigned char u2c_7B[512] = { 0xB9, 0x6B, 0xF3, 0xDB, 0xB9, 0x6C, 0xBF, 0xEA, /* 0x74-0x77 */ 0xB9, 0x6D, 0xB3, 0xEF, 0xB9, 0x6E, 0xF3, 0xE0, /* 0x78-0x7B */ 0xB9, 0x6F, 0xB9, 0x70, 0xC7, 0xA9, 0xB9, 0x71, /* 0x7C-0x7F */ - + 0xBC, 0xF2, 0xB9, 0x72, 0xB9, 0x73, 0xB9, 0x74, /* 0x80-0x83 */ 0xB9, 0x75, 0xF3, 0xEB, 0xB9, 0x76, 0xB9, 0x77, /* 0x84-0x87 */ 0xB9, 0x78, 0xB9, 0x79, 0xB9, 0x7A, 0xB9, 0x7B, /* 0x88-0x8B */ @@ -8263,7 +8263,7 @@ static unsigned char u2c_7C[512] = { 0xD9, 0xE1, 0xBB, 0x6F, 0xBB, 0x70, 0xBB, 0x71, /* 0x74-0x77 */ 0xBB, 0x72, 0xBB, 0x73, 0xBB, 0x74, 0xC0, 0xE0, /* 0x78-0x7B */ 0xF4, 0xCC, 0xD7, 0xD1, 0xBB, 0x75, 0xBB, 0x76, /* 0x7C-0x7F */ - + 0xBB, 0x77, 0xBB, 0x78, 0xBB, 0x79, 0xBB, 0x7A, /* 0x80-0x83 */ 0xBB, 0x7B, 0xBB, 0x7C, 0xBB, 0x7D, 0xBB, 0x7E, /* 0x84-0x87 */ 0xBB, 0x80, 0xB7, 0xDB, 0xBB, 0x81, 0xBB, 0x82, /* 0x88-0x8B */ @@ -8331,7 +8331,7 @@ static unsigned char u2c_7D[512] = { 0xBD, 0x7C, 0xBD, 0x7D, 0xBD, 0x7E, 0xF4, 0xEA, /* 0x74-0x77 */ 0xBD, 0x80, 0xBD, 0x81, 0xBD, 0x82, 0xBD, 0x83, /* 0x78-0x7B */ 0xBD, 0x84, 0xBD, 0x85, 0xBD, 0x86, 0xBD, 0x87, /* 0x7C-0x7F */ - + 0xBD, 0x88, 0xBD, 0x89, 0xBD, 0x8A, 0xBD, 0x8B, /* 0x80-0x83 */ 0xBD, 0x8C, 0xBD, 0x8D, 0xBD, 0x8E, 0xBD, 0x8F, /* 0x84-0x87 */ 0xBD, 0x90, 0xBD, 0x91, 0xBD, 0x92, 0xBD, 0x93, /* 0x88-0x8B */ @@ -8399,7 +8399,7 @@ static unsigned char u2c_7E[512] = { 0xC0, 0x56, 0xC0, 0x57, 0xC0, 0x58, 0xC0, 0x59, /* 0x74-0x77 */ 0xC0, 0x5A, 0xC0, 0x5B, 0xC0, 0x5C, 0xC0, 0x5D, /* 0x78-0x7B */ 0xC0, 0x5E, 0xC0, 0x5F, 0xC0, 0x60, 0xC0, 0x61, /* 0x7C-0x7F */ - + 0xC0, 0x62, 0xC0, 0x63, 0xD7, 0xEB, 0xC0, 0x64, /* 0x80-0x83 */ 0xC0, 0x65, 0xC0, 0x66, 0xC0, 0x67, 0xC0, 0x68, /* 0x84-0x87 */ 0xC0, 0x69, 0xC0, 0x6A, 0xC0, 0x6B, 0xC0, 0x6C, /* 0x88-0x8B */ @@ -8467,7 +8467,7 @@ static unsigned char u2c_7F[512] = { 0xEE, 0xBC, 0xC1, 0x52, 0xC1, 0x53, 0xC1, 0x54, /* 0x74-0x77 */ 0xC1, 0x55, 0xEE, 0xBE, 0xC1, 0x56, 0xC1, 0x57, /* 0x78-0x7B */ 0xC1, 0x58, 0xC1, 0x59, 0xEE, 0xC0, 0xC1, 0x5A, /* 0x7C-0x7F */ - + 0xC1, 0x5B, 0xEE, 0xBF, 0xC1, 0x5C, 0xC1, 0x5D, /* 0x80-0x83 */ 0xC1, 0x5E, 0xC1, 0x5F, 0xC1, 0x60, 0xC1, 0x61, /* 0x84-0x87 */ 0xC1, 0x62, 0xC1, 0x63, 0xD1, 0xF2, 0xC1, 0x64, /* 0x88-0x8B */ @@ -8535,7 +8535,7 @@ static unsigned char u2c_80[512] = { 0xC2, 0x97, 0xC2, 0x98, 0xC2, 0x99, 0xC2, 0x9A, /* 0x74-0x77 */ 0xC2, 0x9B, 0xC2, 0x9C, 0xC2, 0x9D, 0xC2, 0x9E, /* 0x78-0x7B */ 0xC2, 0x9F, 0xC2, 0xA0, 0xC3, 0x40, 0xED, 0xB2, /* 0x7C-0x7F */ - + 0xED, 0xB1, 0xC3, 0x41, 0xC3, 0x42, 0xCB, 0xE0, /* 0x80-0x83 */ 0xD2, 0xDE, 0xC3, 0x43, 0xCB, 0xC1, 0xD5, 0xD8, /* 0x84-0x87 */ 0xC3, 0x44, 0xC8, 0xE2, 0xC3, 0x45, 0xC0, 0xDF, /* 0x88-0x8B */ @@ -8603,7 +8603,7 @@ static unsigned char u2c_81[512] = { 0xEB, 0xE9, 0xC4, 0x60, 0xC4, 0x61, 0xC4, 0x62, /* 0x74-0x77 */ 0xC4, 0x63, 0xB8, 0xB9, 0xCF, 0xD9, 0xC4, 0xE5, /* 0x78-0x7B */ 0xEB, 0xEF, 0xEB, 0xF0, 0xCC, 0xDA, 0xCD, 0xC8, /* 0x7C-0x7F */ - + 0xB0, 0xF2, 0xC4, 0x64, 0xEB, 0xF6, 0xC4, 0x65, /* 0x80-0x83 */ 0xC4, 0x66, 0xC4, 0x67, 0xC4, 0x68, 0xC4, 0x69, /* 0x84-0x87 */ 0xEB, 0xF5, 0xC4, 0x6A, 0xB2, 0xB2, 0xC4, 0x6B, /* 0x88-0x8B */ @@ -8671,7 +8671,7 @@ static unsigned char u2c_82[512] = { 0xE5, 0xF5, 0xC6, 0x45, 0xC6, 0x46, 0xC6, 0x47, /* 0x74-0x77 */ 0xC6, 0x48, 0xDC, 0xB3, 0xD2, 0xD5, 0xC6, 0x49, /* 0x78-0x7B */ 0xC6, 0x4A, 0xDC, 0xB4, 0xB0, 0xAC, 0xDC, 0xB5, /* 0x7C-0x7F */ - + 0xC6, 0x4B, 0xC6, 0x4C, 0xBD, 0xDA, 0xC6, 0x4D, /* 0x80-0x83 */ 0xDC, 0xB9, 0xC6, 0x4E, 0xC6, 0x4F, 0xC6, 0x50, /* 0x84-0x87 */ 0xD8, 0xC2, 0xC6, 0x51, 0xDC, 0xB7, 0xD3, 0xF3, /* 0x88-0x8B */ @@ -8739,7 +8739,7 @@ static unsigned char u2c_83[512] = { 0xC7, 0x58, 0xC7, 0x59, 0xC7, 0x5A, 0xBA, 0xC9, /* 0x74-0x77 */ 0xDD, 0xA9, 0xC7, 0x5B, 0xC7, 0x5C, 0xDD, 0xB6, /* 0x78-0x7B */ 0xDD, 0xB1, 0xDD, 0xB4, 0xC7, 0x5D, 0xC7, 0x5E, /* 0x7C-0x7F */ - + 0xC7, 0x5F, 0xC7, 0x60, 0xC7, 0x61, 0xC7, 0x62, /* 0x80-0x83 */ 0xC7, 0x63, 0xDD, 0xB0, 0xC6, 0xCE, 0xC7, 0x64, /* 0x84-0x87 */ 0xC7, 0x65, 0xC0, 0xF2, 0xC7, 0x66, 0xC7, 0x67, /* 0x88-0x8B */ @@ -8807,7 +8807,7 @@ static unsigned char u2c_84[512] = { 0xC8, 0x9C, 0xBF, 0xFB, 0xDD, 0xE3, 0xC8, 0x9D, /* 0x74-0x77 */ 0xDD, 0xDF, 0xC8, 0x9E, 0xDD, 0xDD, 0xC8, 0x9F, /* 0x78-0x7B */ 0xC8, 0xA0, 0xC9, 0x40, 0xC9, 0x41, 0xC9, 0x42, /* 0x7C-0x7F */ - + 0xC9, 0x43, 0xC9, 0x44, 0xB5, 0xD9, 0xC9, 0x45, /* 0x80-0x83 */ 0xC9, 0x46, 0xC9, 0x47, 0xC9, 0x48, 0xDD, 0xDB, /* 0x84-0x87 */ 0xDD, 0xDC, 0xDD, 0xDE, 0xC9, 0x49, 0xBD, 0xAF, /* 0x88-0x8B */ @@ -8875,7 +8875,7 @@ static unsigned char u2c_85[512] = { 0xD4, 0xCC, 0xCA, 0x98, 0xCA, 0x99, 0xCA, 0x9A, /* 0x74-0x77 */ 0xCA, 0x9B, 0xDE, 0xB3, 0xDE, 0xAA, 0xDE, 0xAE, /* 0x78-0x7B */ 0xCA, 0x9C, 0xCA, 0x9D, 0xC0, 0xD9, 0xCA, 0x9E, /* 0x7C-0x7F */ - + 0xCA, 0x9F, 0xCA, 0xA0, 0xCB, 0x40, 0xCB, 0x41, /* 0x80-0x83 */ 0xB1, 0xA1, 0xDE, 0xB6, 0xCB, 0x42, 0xDE, 0xB1, /* 0x84-0x87 */ 0xCB, 0x43, 0xCB, 0x44, 0xCB, 0x45, 0xCB, 0x46, /* 0x88-0x8B */ @@ -8943,7 +8943,7 @@ static unsigned char u2c_86[512] = { 0xCD, 0x45, 0xCD, 0x46, 0xCD, 0x47, 0xCD, 0x48, /* 0x74-0x77 */ 0xCD, 0x49, 0xBA, 0xE7, 0xF2, 0xB3, 0xF2, 0xB5, /* 0x78-0x7B */ 0xF2, 0xB4, 0xCB, 0xE4, 0xCF, 0xBA, 0xF2, 0xB2, /* 0x7C-0x7F */ - + 0xCA, 0xB4, 0xD2, 0xCF, 0xC2, 0xEC, 0xCD, 0x4A, /* 0x80-0x83 */ 0xCD, 0x4B, 0xCD, 0x4C, 0xCD, 0x4D, 0xCD, 0x4E, /* 0x84-0x87 */ 0xCD, 0x4F, 0xCD, 0x50, 0xCE, 0xC3, 0xF2, 0xB8, /* 0x88-0x8B */ @@ -9011,7 +9011,7 @@ static unsigned char u2c_87[512] = { 0xBA, 0xFB, 0xCE, 0x7E, 0xB5, 0xFB, 0xCE, 0x80, /* 0x74-0x77 */ 0xCE, 0x81, 0xCE, 0x82, 0xCE, 0x83, 0xF2, 0xEF, /* 0x78-0x7B */ 0xF2, 0xF7, 0xF2, 0xED, 0xF2, 0xEE, 0xCE, 0x84, /* 0x7C-0x7F */ - + 0xCE, 0x85, 0xCE, 0x86, 0xF2, 0xEB, 0xF3, 0xA6, /* 0x80-0x83 */ 0xCE, 0x87, 0xF3, 0xA3, 0xCE, 0x88, 0xCE, 0x89, /* 0x84-0x87 */ 0xF3, 0xA2, 0xCE, 0x8A, 0xCE, 0x8B, 0xF2, 0xF4, /* 0x88-0x8B */ @@ -9079,7 +9079,7 @@ static unsigned char u2c_88[512] = { 0xD0, 0x79, 0xD0, 0x7A, 0xD0, 0x7B, 0xD6, 0xD4, /* 0x74-0x77 */ 0xD0, 0x7C, 0xD0, 0x7D, 0xD0, 0x7E, 0xD0, 0x80, /* 0x78-0x7B */ 0xD0, 0x81, 0xF1, 0xC5, 0xF4, 0xC0, 0xF1, 0xC6, /* 0x7C-0x7F */ - + 0xD0, 0x82, 0xD4, 0xAC, 0xF1, 0xC7, 0xD0, 0x83, /* 0x80-0x83 */ 0xB0, 0xC0, 0xF4, 0xC1, 0xD0, 0x84, 0xD0, 0x85, /* 0x84-0x87 */ 0xF4, 0xC2, 0xD0, 0x86, 0xD0, 0x87, 0xB4, 0xFC, /* 0x88-0x8B */ @@ -9147,7 +9147,7 @@ static unsigned char u2c_89[512] = { 0xD2, 0x77, 0xD2, 0x78, 0xD2, 0x79, 0xD2, 0x7A, /* 0x74-0x77 */ 0xD2, 0x7B, 0xD2, 0x7C, 0xD2, 0x7D, 0xF1, 0xE1, /* 0x78-0x7B */ 0xD2, 0x7E, 0xD2, 0x80, 0xD2, 0x81, 0xCE, 0xF7, /* 0x7C-0x7F */ - + 0xD2, 0x82, 0xD2, 0xAA, 0xD2, 0x83, 0xF1, 0xFB, /* 0x80-0x83 */ 0xD2, 0x84, 0xD2, 0x85, 0xB8, 0xB2, 0xD2, 0x86, /* 0x84-0x87 */ 0xD2, 0x87, 0xD2, 0x88, 0xD2, 0x89, 0xD2, 0x8A, /* 0x88-0x8B */ @@ -9215,7 +9215,7 @@ static unsigned char u2c_8A[512] = { 0xD4, 0x95, 0xD4, 0x96, 0xD4, 0x97, 0xD4, 0x98, /* 0x74-0x77 */ 0xD4, 0x99, 0xD5, 0xB2, 0xD4, 0x9A, 0xD4, 0x9B, /* 0x78-0x7B */ 0xD4, 0x9C, 0xD4, 0x9D, 0xD4, 0x9E, 0xD4, 0x9F, /* 0x7C-0x7F */ - + 0xD4, 0xA0, 0xD5, 0x40, 0xD5, 0x41, 0xD5, 0x42, /* 0x80-0x83 */ 0xD5, 0x43, 0xD5, 0x44, 0xD5, 0x45, 0xD5, 0x46, /* 0x84-0x87 */ 0xD5, 0x47, 0xD3, 0xFE, 0xCC, 0xDC, 0xD5, 0x48, /* 0x88-0x8B */ @@ -9283,7 +9283,7 @@ static unsigned char u2c_8B[512] = { 0xD7, 0x6C, 0xD7, 0x6D, 0xD7, 0x6E, 0xD7, 0x6F, /* 0x74-0x77 */ 0xD7, 0x70, 0xD7, 0x71, 0xD7, 0x72, 0xD7, 0x73, /* 0x78-0x7B */ 0xD7, 0x74, 0xD7, 0x75, 0xD7, 0x76, 0xD7, 0x77, /* 0x7C-0x7F */ - + 0xD7, 0x78, 0xD7, 0x79, 0xD7, 0x7A, 0xD7, 0x7B, /* 0x80-0x83 */ 0xD7, 0x7C, 0xD7, 0x7D, 0xD7, 0x7E, 0xD7, 0x80, /* 0x84-0x87 */ 0xD7, 0x81, 0xD7, 0x82, 0xD7, 0x83, 0xD7, 0x84, /* 0x88-0x8B */ @@ -9351,7 +9351,7 @@ static unsigned char u2c_8C[512] = { 0xD8, 0x70, 0xD8, 0x71, 0xD8, 0x72, 0xD8, 0x73, /* 0x74-0x77 */ 0xF5, 0xF4, 0xB1, 0xAA, 0xB2, 0xF2, 0xD8, 0x74, /* 0x78-0x7B */ 0xD8, 0x75, 0xD8, 0x76, 0xD8, 0x77, 0xD8, 0x78, /* 0x7C-0x7F */ - + 0xD8, 0x79, 0xD8, 0x7A, 0xF5, 0xF5, 0xD8, 0x7B, /* 0x80-0x83 */ 0xD8, 0x7C, 0xF5, 0xF7, 0xD8, 0x7D, 0xD8, 0x7E, /* 0x84-0x87 */ 0xD8, 0x80, 0xBA, 0xD1, 0xF5, 0xF6, 0xD8, 0x81, /* 0x88-0x8B */ @@ -9419,7 +9419,7 @@ static unsigned char u2c_8D[512] = { 0xB8, 0xB0, 0xD5, 0xD4, 0xB8, 0xCF, 0xC6, 0xF0, /* 0x74-0x77 */ 0xDA, 0x5D, 0xDA, 0x5E, 0xDA, 0x5F, 0xDA, 0x60, /* 0x78-0x7B */ 0xDA, 0x61, 0xDA, 0x62, 0xDA, 0x63, 0xDA, 0x64, /* 0x7C-0x7F */ - + 0xDA, 0x65, 0xB3, 0xC3, 0xDA, 0x66, 0xDA, 0x67, /* 0x80-0x83 */ 0xF4, 0xF2, 0xB3, 0xAC, 0xDA, 0x68, 0xDA, 0x69, /* 0x84-0x87 */ 0xDA, 0x6A, 0xDA, 0x6B, 0xD4, 0xBD, 0xC7, 0xF7, /* 0x88-0x8B */ @@ -9487,7 +9487,7 @@ static unsigned char u2c_8E[512] = { 0xF5, 0xED, 0xDC, 0x41, 0xF5, 0xEA, 0xDC, 0x42, /* 0x74-0x77 */ 0xDC, 0x43, 0xDC, 0x44, 0xDC, 0x45, 0xDC, 0x46, /* 0x78-0x7B */ 0xF5, 0xEB, 0xDC, 0x47, 0xDC, 0x48, 0xB4, 0xDA, /* 0x7C-0x7F */ - + 0xDC, 0x49, 0xD4, 0xEA, 0xDC, 0x4A, 0xDC, 0x4B, /* 0x80-0x83 */ 0xDC, 0x4C, 0xF5, 0xEE, 0xDC, 0x4D, 0xB3, 0xF9, /* 0x84-0x87 */ 0xDC, 0x4E, 0xDC, 0x4F, 0xDC, 0x50, 0xDC, 0x51, /* 0x88-0x8B */ @@ -9555,7 +9555,7 @@ static unsigned char u2c_8F[512] = { 0xD6, 0xE1, 0xE9, 0xF2, 0xE9, 0xF3, 0xE9, 0xF5, /* 0x74-0x77 */ 0xE9, 0xF4, 0xE9, 0xF6, 0xE9, 0xF7, 0xC7, 0xE1, /* 0x78-0x7B */ 0xE9, 0xF8, 0xD4, 0xD8, 0xE9, 0xF9, 0xBD, 0xCE, /* 0x7C-0x7F */ - + 0xDE, 0x62, 0xE9, 0xFA, 0xE9, 0xFB, 0xBD, 0xCF, /* 0x80-0x83 */ 0xE9, 0xFC, 0xB8, 0xA8, 0xC1, 0xBE, 0xE9, 0xFD, /* 0x84-0x87 */ 0xB1, 0xB2, 0xBB, 0xD4, 0xB9, 0xF5, 0xE9, 0xFE, /* 0x88-0x8B */ @@ -9623,7 +9623,7 @@ static unsigned char u2c_90[512] = { 0xE5, 0xE0, 0xD7, 0xF1, 0xDF, 0x76, 0xDF, 0x77, /* 0x74-0x77 */ 0xDF, 0x78, 0xDF, 0x79, 0xDF, 0x7A, 0xDF, 0x7B, /* 0x78-0x7B */ 0xDF, 0x7C, 0xE5, 0xE1, 0xDF, 0x7D, 0xB1, 0xDC, /* 0x7C-0x7F */ - + 0xD1, 0xFB, 0xDF, 0x7E, 0xE5, 0xE2, 0xE5, 0xE4, /* 0x80-0x83 */ 0xDF, 0x80, 0xDF, 0x81, 0xDF, 0x82, 0xDF, 0x83, /* 0x84-0x87 */ 0xE5, 0xE3, 0xDF, 0x84, 0xDF, 0x85, 0xE5, 0xE5, /* 0x88-0x8B */ @@ -9691,7 +9691,7 @@ static unsigned char u2c_91[512] = { 0xF5, 0xA9, 0xBD, 0xCD, 0xC3, 0xB8, 0xBF, 0xE1, /* 0x74-0x77 */ 0xCB, 0xE1, 0xF5, 0xAA, 0xE1, 0x54, 0xE1, 0x55, /* 0x78-0x7B */ 0xE1, 0x56, 0xF5, 0xA6, 0xF5, 0xA7, 0xC4, 0xF0, /* 0x7C-0x7F */ - + 0xE1, 0x57, 0xE1, 0x58, 0xE1, 0x59, 0xE1, 0x5A, /* 0x80-0x83 */ 0xE1, 0x5B, 0xF5, 0xAC, 0xE1, 0x5C, 0xB4, 0xBC, /* 0x84-0x87 */ 0xE1, 0x5D, 0xD7, 0xED, 0xE1, 0x5E, 0xB4, 0xD7, /* 0x88-0x8B */ @@ -9759,7 +9759,7 @@ static unsigned char u2c_92[512] = { 0xBC, 0xF8, 0xE3, 0x6E, 0xE3, 0x6F, 0xE3, 0x70, /* 0x74-0x77 */ 0xE3, 0x71, 0xE3, 0x72, 0xE3, 0x73, 0xE3, 0x74, /* 0x78-0x7B */ 0xE3, 0x75, 0xE3, 0x76, 0xE3, 0x77, 0xE3, 0x78, /* 0x7C-0x7F */ - + 0xE3, 0x79, 0xE3, 0x7A, 0xE3, 0x7B, 0xE3, 0x7C, /* 0x80-0x83 */ 0xE3, 0x7D, 0xE3, 0x7E, 0xE3, 0x80, 0xE3, 0x81, /* 0x84-0x87 */ 0xE3, 0x82, 0xE3, 0x83, 0xE3, 0x84, 0xE3, 0x85, /* 0x88-0x8B */ @@ -9827,7 +9827,7 @@ static unsigned char u2c_93[512] = { 0xE6, 0x48, 0xE6, 0x49, 0xE6, 0x4A, 0xE6, 0x4B, /* 0x74-0x77 */ 0xE6, 0x4C, 0xE6, 0x4D, 0xE6, 0x4E, 0xE6, 0x4F, /* 0x78-0x7B */ 0xE6, 0x50, 0xE6, 0x51, 0xE6, 0x52, 0xE6, 0x53, /* 0x7C-0x7F */ - + 0xE6, 0x54, 0xE6, 0x55, 0xE6, 0x56, 0xE6, 0x57, /* 0x80-0x83 */ 0xE6, 0x58, 0xE6, 0x59, 0xE6, 0x5A, 0xE6, 0x5B, /* 0x84-0x87 */ 0xE6, 0x5C, 0xE6, 0x5D, 0xE6, 0x5E, 0xE6, 0x5F, /* 0x88-0x8B */ @@ -9895,7 +9895,7 @@ static unsigned char u2c_94[512] = { 0xE8, 0x84, 0xE8, 0x85, 0xE8, 0x86, 0xE8, 0x87, /* 0x74-0x77 */ 0xE8, 0x88, 0xE8, 0x89, 0xE8, 0x8A, 0xE8, 0x8B, /* 0x78-0x7B */ 0xE8, 0x8C, 0xE8, 0x8D, 0xE8, 0x8E, 0xE8, 0x8F, /* 0x7C-0x7F */ - + 0xE8, 0x90, 0xE8, 0x91, 0xE8, 0x92, 0xE8, 0x93, /* 0x80-0x83 */ 0xE8, 0x94, 0xEE, 0xC4, 0xEE, 0xC5, 0xEE, 0xC6, /* 0x84-0x87 */ 0xD5, 0xEB, 0xB6, 0xA4, 0xEE, 0xC8, 0xEE, 0xC7, /* 0x88-0x8B */ @@ -9963,7 +9963,7 @@ static unsigned char u2c_95[512] = { 0xE9, 0x4A, 0xE9, 0x4B, 0xCF, 0xE2, 0xE9, 0x4C, /* 0x74-0x77 */ 0xE9, 0x4D, 0xE9, 0x4E, 0xE9, 0x4F, 0xE9, 0x50, /* 0x78-0x7B */ 0xE9, 0x51, 0xE9, 0x52, 0xE9, 0x53, 0xB3, 0xA4, /* 0x7C-0x7F */ - + 0xE9, 0x54, 0xE9, 0x55, 0xE9, 0x56, 0xE9, 0x57, /* 0x80-0x83 */ 0xE9, 0x58, 0xE9, 0x59, 0xE9, 0x5A, 0xE9, 0x5B, /* 0x84-0x87 */ 0xE9, 0x5C, 0xE9, 0x5D, 0xE9, 0x5E, 0xE9, 0x5F, /* 0x88-0x8B */ @@ -10031,7 +10031,7 @@ static unsigned char u2c_96[512] = { 0xDA, 0xF0, 0xC1, 0xEA, 0xCC, 0xD5, 0xCF, 0xDD, /* 0x74-0x77 */ 0xEA, 0x91, 0xEA, 0x92, 0xEA, 0x93, 0xEA, 0x94, /* 0x78-0x7B */ 0xEA, 0x95, 0xEA, 0x96, 0xEA, 0x97, 0xEA, 0x98, /* 0x7C-0x7F */ - + 0xEA, 0x99, 0xEA, 0x9A, 0xEA, 0x9B, 0xEA, 0x9C, /* 0x80-0x83 */ 0xEA, 0x9D, 0xD3, 0xE7, 0xC2, 0xA1, 0xEA, 0x9E, /* 0x84-0x87 */ 0xDA, 0xF1, 0xEA, 0x9F, 0xEA, 0xA0, 0xCB, 0xE5, /* 0x88-0x8B */ @@ -10099,7 +10099,7 @@ static unsigned char u2c_97[512] = { 0xD1, 0xA5, 0xEC, 0x81, 0xB0, 0xD0, 0xEC, 0x82, /* 0x74-0x77 */ 0xEC, 0x83, 0xEC, 0x84, 0xEC, 0x85, 0xEC, 0x86, /* 0x78-0x7B */ 0xF7, 0xB0, 0xEC, 0x87, 0xEC, 0x88, 0xEC, 0x89, /* 0x7C-0x7F */ - + 0xEC, 0x8A, 0xEC, 0x8B, 0xEC, 0x8C, 0xEC, 0x8D, /* 0x80-0x83 */ 0xEC, 0x8E, 0xF7, 0xB1, 0xEC, 0x8F, 0xEC, 0x90, /* 0x84-0x87 */ 0xEC, 0x91, 0xEC, 0x92, 0xEC, 0x93, 0xD0, 0xAC, /* 0x88-0x8B */ @@ -10167,7 +10167,7 @@ static unsigned char u2c_98[512] = { 0xEF, 0x45, 0xD2, 0xB3, 0xB6, 0xA5, 0xC7, 0xEA, /* 0x74-0x77 */ 0xF1, 0xFC, 0xCF, 0xEE, 0xCB, 0xB3, 0xD0, 0xEB, /* 0x78-0x7B */ 0xE7, 0xEF, 0xCD, 0xE7, 0xB9, 0xCB, 0xB6, 0xD9, /* 0x7C-0x7F */ - + 0xF1, 0xFD, 0xB0, 0xE4, 0xCB, 0xCC, 0xF1, 0xFE, /* 0x80-0x83 */ 0xD4, 0xA4, 0xC2, 0xAD, 0xC1, 0xEC, 0xC6, 0xC4, /* 0x84-0x87 */ 0xBE, 0xB1, 0xF2, 0xA1, 0xBC, 0xD5, 0xEF, 0x46, /* 0x88-0x8B */ @@ -10235,7 +10235,7 @@ static unsigned char u2c_99[512] = { 0xE2, 0xC2, 0xB6, 0xFC, 0xC8, 0xC4, 0xE2, 0xC3, /* 0x74-0x77 */ 0xF0, 0x9A, 0xF0, 0x9B, 0xBD, 0xC8, 0xF0, 0x9C, /* 0x78-0x7B */ 0xB1, 0xFD, 0xE2, 0xC4, 0xF0, 0x9D, 0xB6, 0xF6, /* 0x7C-0x7F */ - + 0xE2, 0xC5, 0xC4, 0xD9, 0xF0, 0x9E, 0xF0, 0x9F, /* 0x80-0x83 */ 0xE2, 0xC6, 0xCF, 0xDA, 0xB9, 0xDD, 0xE2, 0xC7, /* 0x84-0x87 */ 0xC0, 0xA1, 0xF0, 0xA0, 0xE2, 0xC8, 0xB2, 0xF6, /* 0x88-0x8B */ @@ -10303,7 +10303,7 @@ static unsigned char u2c_9A[512] = { 0xC2, 0xBF, 0xE6, 0xE0, 0xCA, 0xBB, 0xE6, 0xE1, /* 0x74-0x77 */ 0xE6, 0xE2, 0xBE, 0xD4, 0xE6, 0xE3, 0xD7, 0xA4, /* 0x78-0x7B */ 0xCD, 0xD5, 0xE6, 0xE5, 0xBC, 0xDD, 0xE6, 0xE4, /* 0x7C-0x7F */ - + 0xE6, 0xE6, 0xE6, 0xE7, 0xC2, 0xEE, 0xF3, 0x53, /* 0x80-0x83 */ 0xBD, 0xBE, 0xE6, 0xE8, 0xC2, 0xE6, 0xBA, 0xA7, /* 0x84-0x87 */ 0xE6, 0xE9, 0xF3, 0x54, 0xE6, 0xEA, 0xB3, 0xD2, /* 0x88-0x8B */ @@ -10371,7 +10371,7 @@ static unsigned char u2c_9B[512] = { 0xF4, 0x99, 0xF4, 0x9A, 0xF4, 0x9B, 0xF4, 0x9C, /* 0x74-0x77 */ 0xF4, 0x9D, 0xF4, 0x9E, 0xF4, 0x9F, 0xF4, 0xA0, /* 0x78-0x7B */ 0xF5, 0x40, 0xF5, 0x41, 0xF5, 0x42, 0xF5, 0x43, /* 0x7C-0x7F */ - + 0xF5, 0x44, 0xF5, 0x45, 0xF5, 0x46, 0xF5, 0x47, /* 0x80-0x83 */ 0xF5, 0x48, 0xF5, 0x49, 0xF5, 0x4A, 0xF5, 0x4B, /* 0x84-0x87 */ 0xF5, 0x4C, 0xF5, 0x4D, 0xF5, 0x4E, 0xF5, 0x4F, /* 0x88-0x8B */ @@ -10439,7 +10439,7 @@ static unsigned char u2c_9C[512] = { 0xF7, 0x78, 0xF7, 0x79, 0xF7, 0x7A, 0xF7, 0x7B, /* 0x74-0x77 */ 0xF7, 0x7C, 0xF7, 0x7D, 0xF7, 0x7E, 0xF7, 0x80, /* 0x78-0x7B */ 0xD3, 0xE3, 0xF7, 0x81, 0xF7, 0x82, 0xF6, 0xCF, /* 0x7C-0x7F */ - + 0xF7, 0x83, 0xC2, 0xB3, 0xF6, 0xD0, 0xF7, 0x84, /* 0x80-0x83 */ 0xF7, 0x85, 0xF6, 0xD1, 0xF6, 0xD2, 0xF6, 0xD3, /* 0x84-0x87 */ 0xF6, 0xD4, 0xF7, 0x86, 0xF7, 0x87, 0xF6, 0xD6, /* 0x88-0x8B */ @@ -10507,7 +10507,7 @@ static unsigned char u2c_9D[512] = { 0xF9, 0x71, 0xF9, 0x72, 0xF9, 0x73, 0xF9, 0x74, /* 0x74-0x77 */ 0xF9, 0x75, 0xF9, 0x76, 0xF9, 0x77, 0xF9, 0x78, /* 0x78-0x7B */ 0xF9, 0x79, 0xF9, 0x7A, 0xF9, 0x7B, 0xF9, 0x7C, /* 0x7C-0x7F */ - + 0xF9, 0x7D, 0xF9, 0x7E, 0xF9, 0x80, 0xF9, 0x81, /* 0x80-0x83 */ 0xF9, 0x82, 0xF9, 0x83, 0xF9, 0x84, 0xF9, 0x85, /* 0x84-0x87 */ 0xF9, 0x86, 0xF9, 0x87, 0xF9, 0x88, 0xF9, 0x89, /* 0x88-0x8B */ @@ -10575,7 +10575,7 @@ static unsigned char u2c_9E[512] = { 0xFB, 0x74, 0xFB, 0x75, 0xFB, 0x76, 0xFB, 0x77, /* 0x74-0x77 */ 0xFB, 0x78, 0xFB, 0x79, 0xFB, 0x7A, 0xFB, 0x7B, /* 0x78-0x7B */ 0xFB, 0x7C, 0xFB, 0x7D, 0xF5, 0xBA, 0xC2, 0xB9, /* 0x7C-0x7F */ - + 0xFB, 0x7E, 0xFB, 0x80, 0xF7, 0xE4, 0xFB, 0x81, /* 0x80-0x83 */ 0xFB, 0x82, 0xFB, 0x83, 0xFB, 0x84, 0xF7, 0xE5, /* 0x84-0x87 */ 0xF7, 0xE6, 0xFB, 0x85, 0xFB, 0x86, 0xF7, 0xE7, /* 0x88-0x8B */ @@ -10643,7 +10643,7 @@ static unsigned char u2c_9F[512] = { 0xFD, 0x7A, 0xFD, 0x7B, 0xFD, 0x7C, 0xFD, 0x7D, /* 0x74-0x77 */ 0xFD, 0x7E, 0xFD, 0x80, 0xFD, 0x81, 0xFD, 0x82, /* 0x78-0x7B */ 0xFD, 0x83, 0xFD, 0x84, 0xFD, 0x85, 0xB3, 0xDD, /* 0x7C-0x7F */ - + 0xF6, 0xB3, 0xFD, 0x86, 0xFD, 0x87, 0xF6, 0xB4, /* 0x80-0x83 */ 0xC1, 0xE4, 0xF6, 0xB5, 0xF6, 0xB6, 0xF6, 0xB7, /* 0x84-0x87 */ 0xF6, 0xB8, 0xF6, 0xB9, 0xF6, 0xBA, 0xC8, 0xA3, /* 0x88-0x8B */ @@ -10693,7 +10693,7 @@ static unsigned char u2c_F9[512] = { 0xC8, 0xF4, 0xC2, 0xD3, 0xC2, 0xD4, 0xC1, 0xC1, /* 0x74-0x77 */ 0x83, 0xC9, 0xFD, 0x9D, 0xC1, 0xBA, 0xBC, 0x5A, /* 0x78-0x7B */ 0xC1, 0xBC, 0xD5, 0x8F, 0xC1, 0xBF, 0x84, 0xEE, /* 0x7C-0x7F */ - + 0x85, 0xCE, 0xC5, 0xAE, 0x8F, 0x5D, 0xC2, 0xC3, /* 0x80-0x83 */ 0x9E, 0x56, 0xB5, 0x5A, 0xE9, 0x82, 0xF3, 0x50, /* 0x84-0x87 */ 0xFB, 0x90, 0xC0, 0xE8, 0xC1, 0xA6, 0x95, 0xD1, /* 0x88-0x8B */ @@ -10806,7 +10806,7 @@ static unsigned char u2c_FF[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10836,37 +10836,37 @@ static unsigned char u2c_FF[512] = { }; static unsigned char *page_uni2charset[256] = { - NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, u2c_4E, u2c_4F, - u2c_50, u2c_51, u2c_52, u2c_53, u2c_54, u2c_55, u2c_56, u2c_57, - u2c_58, u2c_59, u2c_5A, u2c_5B, u2c_5C, u2c_5D, u2c_5E, u2c_5F, - u2c_60, u2c_61, u2c_62, u2c_63, u2c_64, u2c_65, u2c_66, u2c_67, - u2c_68, u2c_69, u2c_6A, u2c_6B, u2c_6C, u2c_6D, u2c_6E, u2c_6F, - u2c_70, u2c_71, u2c_72, u2c_73, u2c_74, u2c_75, u2c_76, u2c_77, - u2c_78, u2c_79, u2c_7A, u2c_7B, u2c_7C, u2c_7D, u2c_7E, u2c_7F, - u2c_80, u2c_81, u2c_82, u2c_83, u2c_84, u2c_85, u2c_86, u2c_87, - u2c_88, u2c_89, u2c_8A, u2c_8B, u2c_8C, u2c_8D, u2c_8E, u2c_8F, - u2c_90, u2c_91, u2c_92, u2c_93, u2c_94, u2c_95, u2c_96, u2c_97, - u2c_98, u2c_99, u2c_9A, u2c_9B, u2c_9C, u2c_9D, u2c_9E, u2c_9F, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, u2c_4E, u2c_4F, + u2c_50, u2c_51, u2c_52, u2c_53, u2c_54, u2c_55, u2c_56, u2c_57, + u2c_58, u2c_59, u2c_5A, u2c_5B, u2c_5C, u2c_5D, u2c_5E, u2c_5F, + u2c_60, u2c_61, u2c_62, u2c_63, u2c_64, u2c_65, u2c_66, u2c_67, + u2c_68, u2c_69, u2c_6A, u2c_6B, u2c_6C, u2c_6D, u2c_6E, u2c_6F, + u2c_70, u2c_71, u2c_72, u2c_73, u2c_74, u2c_75, u2c_76, u2c_77, + u2c_78, u2c_79, u2c_7A, u2c_7B, u2c_7C, u2c_7D, u2c_7E, u2c_7F, + u2c_80, u2c_81, u2c_82, u2c_83, u2c_84, u2c_85, u2c_86, u2c_87, + u2c_88, u2c_89, u2c_8A, u2c_8B, u2c_8C, u2c_8D, u2c_8E, u2c_8F, + u2c_90, u2c_91, u2c_92, u2c_93, u2c_94, u2c_95, u2c_96, u2c_97, + u2c_98, u2c_99, u2c_9A, u2c_9B, u2c_9C, u2c_9D, u2c_9E, u2c_9F, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp949.c b/drivers/filesystems/reiserfs/src/nls/nls_cp949.c index a1a869d0e86..164b8a1edc6 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp949.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp949.c @@ -30,7 +30,7 @@ static wchar_t c2u_81[256] = { 0xAC3F,0xAC41,0xAC42,0xAC43,0xAC44,0xAC45,0xAC46,0xAC47,/* 0x68-0x6F */ 0xAC48,0xAC49,0xAC4A,0xAC4C,0xAC4E,0xAC4F,0xAC50,0xAC51,/* 0x70-0x77 */ 0xAC52,0xAC53,0xAC55,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xAC56,0xAC57,0xAC59,0xAC5A,0xAC5B,0xAC5D,0xAC5E,/* 0x80-0x87 */ 0xAC5F,0xAC60,0xAC61,0xAC62,0xAC63,0xAC64,0xAC65,0xAC66,/* 0x88-0x8F */ 0xAC67,0xAC68,0xAC69,0xAC6A,0xAC6B,0xAC6C,0xAC6D,0xAC6E,/* 0x90-0x97 */ @@ -66,7 +66,7 @@ static wchar_t c2u_82[256] = { 0xAD3F,0xAD40,0xAD41,0xAD42,0xAD43,0xAD46,0xAD48,0xAD4A,/* 0x68-0x6F */ 0xAD4B,0xAD4C,0xAD4D,0xAD4E,0xAD4F,0xAD51,0xAD52,0xAD53,/* 0x70-0x77 */ 0xAD55,0xAD56,0xAD57,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xAD59,0xAD5A,0xAD5B,0xAD5C,0xAD5D,0xAD5E,0xAD5F,/* 0x80-0x87 */ 0xAD60,0xAD62,0xAD64,0xAD65,0xAD66,0xAD67,0xAD68,0xAD69,/* 0x88-0x8F */ 0xAD6A,0xAD6B,0xAD6E,0xAD6F,0xAD71,0xAD72,0xAD77,0xAD78,/* 0x90-0x97 */ @@ -102,7 +102,7 @@ static wchar_t c2u_83[256] = { 0xAE24,0xAE25,0xAE26,0xAE27,0xAE28,0xAE29,0xAE2A,0xAE2B,/* 0x68-0x6F */ 0xAE2C,0xAE2D,0xAE2E,0xAE2F,0xAE32,0xAE33,0xAE35,0xAE36,/* 0x70-0x77 */ 0xAE39,0xAE3B,0xAE3C,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xAE3D,0xAE3E,0xAE3F,0xAE42,0xAE44,0xAE47,0xAE48,/* 0x80-0x87 */ 0xAE49,0xAE4B,0xAE4F,0xAE51,0xAE52,0xAE53,0xAE55,0xAE57,/* 0x88-0x8F */ 0xAE58,0xAE59,0xAE5A,0xAE5B,0xAE5E,0xAE62,0xAE63,0xAE64,/* 0x90-0x97 */ @@ -138,7 +138,7 @@ static wchar_t c2u_84[256] = { 0xAF11,0xAF12,0xAF13,0xAF14,0xAF15,0xAF16,0xAF17,0xAF18,/* 0x68-0x6F */ 0xAF19,0xAF1A,0xAF1B,0xAF1C,0xAF1D,0xAF1E,0xAF1F,0xAF20,/* 0x70-0x77 */ 0xAF21,0xAF22,0xAF23,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xAF24,0xAF25,0xAF26,0xAF27,0xAF28,0xAF29,0xAF2A,/* 0x80-0x87 */ 0xAF2B,0xAF2E,0xAF2F,0xAF31,0xAF33,0xAF35,0xAF36,0xAF37,/* 0x88-0x8F */ 0xAF38,0xAF39,0xAF3A,0xAF3B,0xAF3E,0xAF40,0xAF44,0xAF45,/* 0x90-0x97 */ @@ -174,7 +174,7 @@ static wchar_t c2u_85[256] = { 0xAFEB,0xAFEC,0xAFED,0xAFEE,0xAFEF,0xAFF2,0xAFF3,0xAFF5,/* 0x68-0x6F */ 0xAFF6,0xAFF7,0xAFF9,0xAFFA,0xAFFB,0xAFFC,0xAFFD,0xAFFE,/* 0x70-0x77 */ 0xAFFF,0xB002,0xB003,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB005,0xB006,0xB007,0xB008,0xB009,0xB00A,0xB00B,/* 0x80-0x87 */ 0xB00D,0xB00E,0xB00F,0xB011,0xB012,0xB013,0xB015,0xB016,/* 0x88-0x8F */ 0xB017,0xB018,0xB019,0xB01A,0xB01B,0xB01E,0xB01F,0xB020,/* 0x90-0x97 */ @@ -210,7 +210,7 @@ static wchar_t c2u_86[256] = { 0xB0DC,0xB0DD,0xB0DE,0xB0DF,0xB0E1,0xB0E2,0xB0E3,0xB0E4,/* 0x68-0x6F */ 0xB0E6,0xB0E7,0xB0E8,0xB0E9,0xB0EA,0xB0EB,0xB0EC,0xB0ED,/* 0x70-0x77 */ 0xB0EE,0xB0EF,0xB0F0,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB0F1,0xB0F2,0xB0F3,0xB0F4,0xB0F5,0xB0F6,0xB0F7,/* 0x80-0x87 */ 0xB0F8,0xB0F9,0xB0FA,0xB0FB,0xB0FC,0xB0FD,0xB0FE,0xB0FF,/* 0x88-0x8F */ 0xB100,0xB101,0xB102,0xB103,0xB104,0xB105,0xB106,0xB107,/* 0x90-0x97 */ @@ -246,7 +246,7 @@ static wchar_t c2u_87[256] = { 0xB1C0,0xB1C1,0xB1C2,0xB1C3,0xB1C4,0xB1C5,0xB1C6,0xB1C7,/* 0x68-0x6F */ 0xB1C8,0xB1C9,0xB1CA,0xB1CB,0xB1CD,0xB1CE,0xB1CF,0xB1D1,/* 0x70-0x77 */ 0xB1D2,0xB1D3,0xB1D5,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB1D6,0xB1D7,0xB1D8,0xB1D9,0xB1DA,0xB1DB,0xB1DE,/* 0x80-0x87 */ 0xB1E0,0xB1E1,0xB1E2,0xB1E3,0xB1E4,0xB1E5,0xB1E6,0xB1E7,/* 0x88-0x8F */ 0xB1EA,0xB1EB,0xB1ED,0xB1EE,0xB1EF,0xB1F1,0xB1F2,0xB1F3,/* 0x90-0x97 */ @@ -282,7 +282,7 @@ static wchar_t c2u_88[256] = { 0xB29C,0xB29D,0xB29E,0xB29F,0xB2A2,0xB2A4,0xB2A7,0xB2A8,/* 0x68-0x6F */ 0xB2A9,0xB2AB,0xB2AD,0xB2AE,0xB2AF,0xB2B1,0xB2B2,0xB2B3,/* 0x70-0x77 */ 0xB2B5,0xB2B6,0xB2B7,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB2B8,0xB2B9,0xB2BA,0xB2BB,0xB2BC,0xB2BD,0xB2BE,/* 0x80-0x87 */ 0xB2BF,0xB2C0,0xB2C1,0xB2C2,0xB2C3,0xB2C4,0xB2C5,0xB2C6,/* 0x88-0x8F */ 0xB2C7,0xB2CA,0xB2CB,0xB2CD,0xB2CE,0xB2CF,0xB2D1,0xB2D3,/* 0x90-0x97 */ @@ -318,7 +318,7 @@ static wchar_t c2u_89[256] = { 0xB397,0xB398,0xB399,0xB39A,0xB39B,0xB39C,0xB39D,0xB39E,/* 0x68-0x6F */ 0xB39F,0xB3A2,0xB3A3,0xB3A4,0xB3A5,0xB3A6,0xB3A7,0xB3A9,/* 0x70-0x77 */ 0xB3AA,0xB3AB,0xB3AD,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB3AE,0xB3AF,0xB3B0,0xB3B1,0xB3B2,0xB3B3,0xB3B4,/* 0x80-0x87 */ 0xB3B5,0xB3B6,0xB3B7,0xB3B8,0xB3B9,0xB3BA,0xB3BB,0xB3BC,/* 0x88-0x8F */ 0xB3BD,0xB3BE,0xB3BF,0xB3C0,0xB3C1,0xB3C2,0xB3C3,0xB3C6,/* 0x90-0x97 */ @@ -354,7 +354,7 @@ static wchar_t c2u_8A[256] = { 0xB46F,0xB470,0xB471,0xB472,0xB473,0xB474,0xB475,0xB476,/* 0x68-0x6F */ 0xB477,0xB478,0xB479,0xB47A,0xB47B,0xB47C,0xB47D,0xB47E,/* 0x70-0x77 */ 0xB47F,0xB481,0xB482,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB483,0xB484,0xB485,0xB486,0xB487,0xB489,0xB48A,/* 0x80-0x87 */ 0xB48B,0xB48C,0xB48D,0xB48E,0xB48F,0xB490,0xB491,0xB492,/* 0x88-0x8F */ 0xB493,0xB494,0xB495,0xB496,0xB497,0xB498,0xB499,0xB49A,/* 0x90-0x97 */ @@ -390,7 +390,7 @@ static wchar_t c2u_8B[256] = { 0xB552,0xB553,0xB555,0xB556,0xB557,0xB558,0xB559,0xB55A,/* 0x68-0x6F */ 0xB55B,0xB55E,0xB562,0xB563,0xB564,0xB565,0xB566,0xB567,/* 0x70-0x77 */ 0xB568,0xB569,0xB56A,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB56B,0xB56C,0xB56D,0xB56E,0xB56F,0xB570,0xB571,/* 0x80-0x87 */ 0xB572,0xB573,0xB574,0xB575,0xB576,0xB577,0xB578,0xB579,/* 0x88-0x8F */ 0xB57A,0xB57B,0xB57C,0xB57D,0xB57E,0xB57F,0xB580,0xB581,/* 0x90-0x97 */ @@ -426,7 +426,7 @@ static wchar_t c2u_8C[256] = { 0xB626,0xB627,0xB628,0xB629,0xB62A,0xB62B,0xB62D,0xB62E,/* 0x68-0x6F */ 0xB62F,0xB630,0xB631,0xB632,0xB633,0xB635,0xB636,0xB637,/* 0x70-0x77 */ 0xB638,0xB639,0xB63A,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB63B,0xB63C,0xB63D,0xB63E,0xB63F,0xB640,0xB641,/* 0x80-0x87 */ 0xB642,0xB643,0xB644,0xB645,0xB646,0xB647,0xB649,0xB64A,/* 0x88-0x8F */ 0xB64B,0xB64C,0xB64D,0xB64E,0xB64F,0xB650,0xB651,0xB652,/* 0x90-0x97 */ @@ -462,7 +462,7 @@ static wchar_t c2u_8D[256] = { 0xB6E5,0xB6E6,0xB6E7,0xB6E8,0xB6E9,0xB6EA,0xB6EB,0xB6EC,/* 0x68-0x6F */ 0xB6ED,0xB6EE,0xB6EF,0xB6F1,0xB6F2,0xB6F3,0xB6F5,0xB6F6,/* 0x70-0x77 */ 0xB6F7,0xB6F9,0xB6FA,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB6FB,0xB6FC,0xB6FD,0xB6FE,0xB6FF,0xB702,0xB703,/* 0x80-0x87 */ 0xB704,0xB706,0xB707,0xB708,0xB709,0xB70A,0xB70B,0xB70C,/* 0x88-0x8F */ 0xB70D,0xB70E,0xB70F,0xB710,0xB711,0xB712,0xB713,0xB714,/* 0x90-0x97 */ @@ -498,7 +498,7 @@ static wchar_t c2u_8E[256] = { 0xB7CB,0xB7CC,0xB7CD,0xB7CE,0xB7CF,0xB7D0,0xB7D1,0xB7D2,/* 0x68-0x6F */ 0xB7D3,0xB7D4,0xB7D5,0xB7D6,0xB7D7,0xB7D8,0xB7D9,0xB7DA,/* 0x70-0x77 */ 0xB7DB,0xB7DC,0xB7DD,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB7DE,0xB7DF,0xB7E0,0xB7E1,0xB7E2,0xB7E3,0xB7E4,/* 0x80-0x87 */ 0xB7E5,0xB7E6,0xB7E7,0xB7E8,0xB7E9,0xB7EA,0xB7EB,0xB7EE,/* 0x88-0x8F */ 0xB7EF,0xB7F1,0xB7F2,0xB7F3,0xB7F5,0xB7F6,0xB7F7,0xB7F8,/* 0x90-0x97 */ @@ -534,7 +534,7 @@ static wchar_t c2u_8F[256] = { 0xB8A7,0xB8A9,0xB8AA,0xB8AB,0xB8AC,0xB8AD,0xB8AE,0xB8AF,/* 0x68-0x6F */ 0xB8B1,0xB8B2,0xB8B3,0xB8B5,0xB8B6,0xB8B7,0xB8B9,0xB8BA,/* 0x70-0x77 */ 0xB8BB,0xB8BC,0xB8BD,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB8BE,0xB8BF,0xB8C2,0xB8C4,0xB8C6,0xB8C7,0xB8C8,/* 0x80-0x87 */ 0xB8C9,0xB8CA,0xB8CB,0xB8CD,0xB8CE,0xB8CF,0xB8D1,0xB8D2,/* 0x88-0x8F */ 0xB8D3,0xB8D5,0xB8D6,0xB8D7,0xB8D8,0xB8D9,0xB8DA,0xB8DB,/* 0x90-0x97 */ @@ -570,7 +570,7 @@ static wchar_t c2u_90[256] = { 0xB988,0xB98B,0xB98C,0xB98F,0xB990,0xB991,0xB992,0xB993,/* 0x68-0x6F */ 0xB994,0xB995,0xB996,0xB997,0xB998,0xB999,0xB99A,0xB99B,/* 0x70-0x77 */ 0xB99C,0xB99D,0xB99E,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xB99F,0xB9A0,0xB9A1,0xB9A2,0xB9A3,0xB9A4,0xB9A5,/* 0x80-0x87 */ 0xB9A6,0xB9A7,0xB9A8,0xB9A9,0xB9AA,0xB9AB,0xB9AE,0xB9AF,/* 0x88-0x8F */ 0xB9B1,0xB9B2,0xB9B3,0xB9B5,0xB9B6,0xB9B7,0xB9B8,0xB9B9,/* 0x90-0x97 */ @@ -606,7 +606,7 @@ static wchar_t c2u_91[256] = { 0xBA7B,0xBA7C,0xBA7D,0xBA7E,0xBA7F,0xBA80,0xBA81,0xBA82,/* 0x68-0x6F */ 0xBA86,0xBA88,0xBA89,0xBA8A,0xBA8B,0xBA8D,0xBA8E,0xBA8F,/* 0x70-0x77 */ 0xBA90,0xBA91,0xBA92,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xBA93,0xBA94,0xBA95,0xBA96,0xBA97,0xBA98,0xBA99,/* 0x80-0x87 */ 0xBA9A,0xBA9B,0xBA9C,0xBA9D,0xBA9E,0xBA9F,0xBAA0,0xBAA1,/* 0x88-0x8F */ 0xBAA2,0xBAA3,0xBAA4,0xBAA5,0xBAA6,0xBAA7,0xBAAA,0xBAAD,/* 0x90-0x97 */ @@ -642,7 +642,7 @@ static wchar_t c2u_92[256] = { 0xBB5C,0xBB5D,0xBB5E,0xBB5F,0xBB60,0xBB62,0xBB64,0xBB65,/* 0x68-0x6F */ 0xBB66,0xBB67,0xBB68,0xBB69,0xBB6A,0xBB6B,0xBB6D,0xBB6E,/* 0x70-0x77 */ 0xBB6F,0xBB70,0xBB71,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xBB72,0xBB73,0xBB74,0xBB75,0xBB76,0xBB77,0xBB78,/* 0x80-0x87 */ 0xBB79,0xBB7A,0xBB7B,0xBB7C,0xBB7D,0xBB7E,0xBB7F,0xBB80,/* 0x88-0x8F */ 0xBB81,0xBB82,0xBB83,0xBB84,0xBB85,0xBB86,0xBB87,0xBB89,/* 0x90-0x97 */ @@ -678,7 +678,7 @@ static wchar_t c2u_93[256] = { 0xBC3E,0xBC3F,0xBC42,0xBC46,0xBC47,0xBC48,0xBC4A,0xBC4B,/* 0x68-0x6F */ 0xBC4E,0xBC4F,0xBC51,0xBC52,0xBC53,0xBC54,0xBC55,0xBC56,/* 0x70-0x77 */ 0xBC57,0xBC58,0xBC59,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xBC5A,0xBC5B,0xBC5C,0xBC5E,0xBC5F,0xBC60,0xBC61,/* 0x80-0x87 */ 0xBC62,0xBC63,0xBC64,0xBC65,0xBC66,0xBC67,0xBC68,0xBC69,/* 0x88-0x8F */ 0xBC6A,0xBC6B,0xBC6C,0xBC6D,0xBC6E,0xBC6F,0xBC70,0xBC71,/* 0x90-0x97 */ @@ -714,7 +714,7 @@ static wchar_t c2u_94[256] = { 0xBD26,0xBD27,0xBD28,0xBD29,0xBD2A,0xBD2B,0xBD2D,0xBD2E,/* 0x68-0x6F */ 0xBD2F,0xBD30,0xBD31,0xBD32,0xBD33,0xBD34,0xBD35,0xBD36,/* 0x70-0x77 */ 0xBD37,0xBD38,0xBD39,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xBD3A,0xBD3B,0xBD3C,0xBD3D,0xBD3E,0xBD3F,0xBD41,/* 0x80-0x87 */ 0xBD42,0xBD43,0xBD44,0xBD45,0xBD46,0xBD47,0xBD4A,0xBD4B,/* 0x88-0x8F */ 0xBD4D,0xBD4E,0xBD4F,0xBD51,0xBD52,0xBD53,0xBD54,0xBD55,/* 0x90-0x97 */ @@ -750,7 +750,7 @@ static wchar_t c2u_95[256] = { 0xBDFB,0xBDFC,0xBDFD,0xBDFE,0xBDFF,0xBE01,0xBE02,0xBE04,/* 0x68-0x6F */ 0xBE06,0xBE07,0xBE08,0xBE09,0xBE0A,0xBE0B,0xBE0E,0xBE0F,/* 0x70-0x77 */ 0xBE11,0xBE12,0xBE13,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xBE15,0xBE16,0xBE17,0xBE18,0xBE19,0xBE1A,0xBE1B,/* 0x80-0x87 */ 0xBE1E,0xBE20,0xBE21,0xBE22,0xBE23,0xBE24,0xBE25,0xBE26,/* 0x88-0x8F */ 0xBE27,0xBE28,0xBE29,0xBE2A,0xBE2B,0xBE2C,0xBE2D,0xBE2E,/* 0x90-0x97 */ @@ -786,7 +786,7 @@ static wchar_t c2u_96[256] = { 0xBEDE,0xBEDF,0xBEE1,0xBEE2,0xBEE6,0xBEE7,0xBEE8,0xBEE9,/* 0x68-0x6F */ 0xBEEA,0xBEEB,0xBEED,0xBEEE,0xBEEF,0xBEF0,0xBEF1,0xBEF2,/* 0x70-0x77 */ 0xBEF3,0xBEF4,0xBEF5,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xBEF6,0xBEF7,0xBEF8,0xBEF9,0xBEFA,0xBEFB,0xBEFC,/* 0x80-0x87 */ 0xBEFD,0xBEFE,0xBEFF,0xBF00,0xBF02,0xBF03,0xBF04,0xBF05,/* 0x88-0x8F */ 0xBF06,0xBF07,0xBF0A,0xBF0B,0xBF0C,0xBF0D,0xBF0E,0xBF0F,/* 0x90-0x97 */ @@ -822,7 +822,7 @@ static wchar_t c2u_97[256] = { 0xBFA5,0xBFA6,0xBFA7,0xBFA8,0xBFA9,0xBFAA,0xBFAB,0xBFAC,/* 0x68-0x6F */ 0xBFAD,0xBFAE,0xBFAF,0xBFB1,0xBFB2,0xBFB3,0xBFB4,0xBFB5,/* 0x70-0x77 */ 0xBFB6,0xBFB7,0xBFB8,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xBFB9,0xBFBA,0xBFBB,0xBFBC,0xBFBD,0xBFBE,0xBFBF,/* 0x80-0x87 */ 0xBFC0,0xBFC1,0xBFC2,0xBFC3,0xBFC4,0xBFC6,0xBFC7,0xBFC8,/* 0x88-0x8F */ 0xBFC9,0xBFCA,0xBFCB,0xBFCE,0xBFCF,0xBFD1,0xBFD2,0xBFD3,/* 0x90-0x97 */ @@ -858,7 +858,7 @@ static wchar_t c2u_98[256] = { 0xC065,0xC066,0xC067,0xC06A,0xC06B,0xC06C,0xC06D,0xC06E,/* 0x68-0x6F */ 0xC06F,0xC070,0xC071,0xC072,0xC073,0xC074,0xC075,0xC076,/* 0x70-0x77 */ 0xC077,0xC078,0xC079,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC07A,0xC07B,0xC07C,0xC07D,0xC07E,0xC07F,0xC080,/* 0x80-0x87 */ 0xC081,0xC082,0xC083,0xC084,0xC085,0xC086,0xC087,0xC088,/* 0x88-0x8F */ 0xC089,0xC08A,0xC08B,0xC08C,0xC08D,0xC08E,0xC08F,0xC092,/* 0x90-0x97 */ @@ -894,7 +894,7 @@ static wchar_t c2u_99[256] = { 0xC161,0xC162,0xC163,0xC166,0xC16A,0xC16B,0xC16C,0xC16D,/* 0x68-0x6F */ 0xC16E,0xC16F,0xC171,0xC172,0xC173,0xC175,0xC176,0xC177,/* 0x70-0x77 */ 0xC179,0xC17A,0xC17B,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC17C,0xC17D,0xC17E,0xC17F,0xC180,0xC181,0xC182,/* 0x80-0x87 */ 0xC183,0xC184,0xC186,0xC187,0xC188,0xC189,0xC18A,0xC18B,/* 0x88-0x8F */ 0xC18F,0xC191,0xC192,0xC193,0xC195,0xC197,0xC198,0xC199,/* 0x90-0x97 */ @@ -930,7 +930,7 @@ static wchar_t c2u_9A[256] = { 0xC24E,0xC24F,0xC252,0xC253,0xC255,0xC256,0xC257,0xC259,/* 0x68-0x6F */ 0xC25A,0xC25B,0xC25C,0xC25D,0xC25E,0xC25F,0xC261,0xC262,/* 0x70-0x77 */ 0xC263,0xC264,0xC266,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC267,0xC268,0xC269,0xC26A,0xC26B,0xC26E,0xC26F,/* 0x80-0x87 */ 0xC271,0xC272,0xC273,0xC275,0xC276,0xC277,0xC278,0xC279,/* 0x88-0x8F */ 0xC27A,0xC27B,0xC27E,0xC280,0xC282,0xC283,0xC284,0xC285,/* 0x90-0x97 */ @@ -966,7 +966,7 @@ static wchar_t c2u_9B[256] = { 0xC33A,0xC33B,0xC33C,0xC33D,0xC33E,0xC33F,0xC340,0xC341,/* 0x68-0x6F */ 0xC342,0xC343,0xC344,0xC346,0xC347,0xC348,0xC349,0xC34A,/* 0x70-0x77 */ 0xC34B,0xC34C,0xC34D,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC34E,0xC34F,0xC350,0xC351,0xC352,0xC353,0xC354,/* 0x80-0x87 */ 0xC355,0xC356,0xC357,0xC358,0xC359,0xC35A,0xC35B,0xC35C,/* 0x88-0x8F */ 0xC35D,0xC35E,0xC35F,0xC360,0xC361,0xC362,0xC363,0xC364,/* 0x90-0x97 */ @@ -1002,7 +1002,7 @@ static wchar_t c2u_9C[256] = { 0xC406,0xC407,0xC409,0xC40A,0xC40B,0xC40C,0xC40D,0xC40E,/* 0x68-0x6F */ 0xC40F,0xC411,0xC412,0xC413,0xC414,0xC415,0xC416,0xC417,/* 0x70-0x77 */ 0xC418,0xC419,0xC41A,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC41B,0xC41C,0xC41D,0xC41E,0xC41F,0xC420,0xC421,/* 0x80-0x87 */ 0xC422,0xC423,0xC425,0xC426,0xC427,0xC428,0xC429,0xC42A,/* 0x88-0x8F */ 0xC42B,0xC42D,0xC42E,0xC42F,0xC431,0xC432,0xC433,0xC435,/* 0x90-0x97 */ @@ -1038,7 +1038,7 @@ static wchar_t c2u_9D[256] = { 0xC4CD,0xC4CE,0xC4CF,0xC4D0,0xC4D1,0xC4D2,0xC4D3,0xC4D4,/* 0x68-0x6F */ 0xC4D5,0xC4D6,0xC4D7,0xC4D8,0xC4D9,0xC4DA,0xC4DB,0xC4DC,/* 0x70-0x77 */ 0xC4DD,0xC4DE,0xC4DF,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC4E0,0xC4E1,0xC4E2,0xC4E3,0xC4E4,0xC4E5,0xC4E6,/* 0x80-0x87 */ 0xC4E7,0xC4E8,0xC4EA,0xC4EB,0xC4EC,0xC4ED,0xC4EE,0xC4EF,/* 0x88-0x8F */ 0xC4F2,0xC4F3,0xC4F5,0xC4F6,0xC4F7,0xC4F9,0xC4FB,0xC4FC,/* 0x90-0x97 */ @@ -1074,7 +1074,7 @@ static wchar_t c2u_9E[256] = { 0xC5CB,0xC5CD,0xC5CF,0xC5D2,0xC5D3,0xC5D5,0xC5D6,0xC5D7,/* 0x68-0x6F */ 0xC5D9,0xC5DA,0xC5DB,0xC5DC,0xC5DD,0xC5DE,0xC5DF,0xC5E2,/* 0x70-0x77 */ 0xC5E4,0xC5E6,0xC5E7,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC5E8,0xC5E9,0xC5EA,0xC5EB,0xC5EF,0xC5F1,0xC5F2,/* 0x80-0x87 */ 0xC5F3,0xC5F5,0xC5F8,0xC5F9,0xC5FA,0xC5FB,0xC602,0xC603,/* 0x88-0x8F */ 0xC604,0xC609,0xC60A,0xC60B,0xC60D,0xC60E,0xC60F,0xC611,/* 0x90-0x97 */ @@ -1110,7 +1110,7 @@ static wchar_t c2u_9F[256] = { 0xC6D8,0xC6D9,0xC6DA,0xC6DB,0xC6DE,0xC6DF,0xC6E2,0xC6E3,/* 0x68-0x6F */ 0xC6E4,0xC6E5,0xC6E6,0xC6E7,0xC6EA,0xC6EB,0xC6ED,0xC6EE,/* 0x70-0x77 */ 0xC6EF,0xC6F1,0xC6F2,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC6F3,0xC6F4,0xC6F5,0xC6F6,0xC6F7,0xC6FA,0xC6FB,/* 0x80-0x87 */ 0xC6FC,0xC6FE,0xC6FF,0xC700,0xC701,0xC702,0xC703,0xC706,/* 0x88-0x8F */ 0xC707,0xC709,0xC70A,0xC70B,0xC70D,0xC70E,0xC70F,0xC710,/* 0x90-0x97 */ @@ -1146,7 +1146,7 @@ static wchar_t c2u_A0[256] = { 0xC7E6,0xC7E7,0xC7E9,0xC7EA,0xC7EB,0xC7ED,0xC7EE,0xC7EF,/* 0x68-0x6F */ 0xC7F0,0xC7F1,0xC7F2,0xC7F3,0xC7F4,0xC7F5,0xC7F6,0xC7F7,/* 0x70-0x77 */ 0xC7F8,0xC7F9,0xC7FA,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC7FB,0xC7FC,0xC7FD,0xC7FE,0xC7FF,0xC802,0xC803,/* 0x80-0x87 */ 0xC805,0xC806,0xC807,0xC809,0xC80B,0xC80C,0xC80D,0xC80E,/* 0x88-0x8F */ 0xC80F,0xC812,0xC814,0xC817,0xC818,0xC819,0xC81A,0xC81B,/* 0x90-0x97 */ @@ -1182,7 +1182,7 @@ static wchar_t c2u_A1[256] = { 0xC8CB,0xC8CD,0xC8CE,0xC8CF,0xC8D0,0xC8D1,0xC8D2,0xC8D3,/* 0x68-0x6F */ 0xC8D6,0xC8D8,0xC8DA,0xC8DB,0xC8DC,0xC8DD,0xC8DE,0xC8DF,/* 0x70-0x77 */ 0xC8E2,0xC8E3,0xC8E5,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC8E6,0xC8E7,0xC8E8,0xC8E9,0xC8EA,0xC8EB,0xC8EC,/* 0x80-0x87 */ 0xC8ED,0xC8EE,0xC8EF,0xC8F0,0xC8F1,0xC8F2,0xC8F3,0xC8F4,/* 0x88-0x8F */ 0xC8F6,0xC8F7,0xC8F8,0xC8F9,0xC8FA,0xC8FB,0xC8FE,0xC8FF,/* 0x90-0x97 */ @@ -1218,7 +1218,7 @@ static wchar_t c2u_A2[256] = { 0xC935,0xC936,0xC937,0xC938,0xC939,0xC93A,0xC93B,0xC93C,/* 0x68-0x6F */ 0xC93D,0xC93E,0xC93F,0xC940,0xC941,0xC942,0xC943,0xC944,/* 0x70-0x77 */ 0xC945,0xC946,0xC947,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC948,0xC949,0xC94A,0xC94B,0xC94C,0xC94D,0xC94E,/* 0x80-0x87 */ 0xC94F,0xC952,0xC953,0xC955,0xC956,0xC957,0xC959,0xC95A,/* 0x88-0x8F */ 0xC95B,0xC95C,0xC95D,0xC95E,0xC95F,0xC962,0xC964,0xC965,/* 0x90-0x97 */ @@ -1251,7 +1251,7 @@ static wchar_t c2u_A3[256] = { 0xC99A,0xC99C,0xC99E,0xC99F,0xC9A0,0xC9A1,0xC9A2,0xC9A3,/* 0x68-0x6F */ 0xC9A4,0xC9A5,0xC9A6,0xC9A7,0xC9A8,0xC9A9,0xC9AA,0xC9AB,/* 0x70-0x77 */ 0xC9AC,0xC9AD,0xC9AE,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xC9AF,0xC9B0,0xC9B1,0xC9B2,0xC9B3,0xC9B4,0xC9B5,/* 0x80-0x87 */ 0xC9B6,0xC9B7,0xC9B8,0xC9B9,0xC9BA,0xC9BB,0xC9BC,0xC9BD,/* 0x88-0x8F */ 0xC9BE,0xC9BF,0xC9C2,0xC9C3,0xC9C5,0xC9C6,0xC9C9,0xC9CB,/* 0x90-0x97 */ @@ -1287,7 +1287,7 @@ static wchar_t c2u_A4[256] = { 0xCA11,0xCA12,0xCA13,0xCA15,0xCA16,0xCA17,0xCA19,0xCA1A,/* 0x68-0x6F */ 0xCA1B,0xCA1C,0xCA1D,0xCA1E,0xCA1F,0xCA20,0xCA21,0xCA22,/* 0x70-0x77 */ 0xCA23,0xCA24,0xCA25,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCA26,0xCA27,0xCA28,0xCA2A,0xCA2B,0xCA2C,0xCA2D,/* 0x80-0x87 */ 0xCA2E,0xCA2F,0xCA30,0xCA31,0xCA32,0xCA33,0xCA34,0xCA35,/* 0x88-0x8F */ 0xCA36,0xCA37,0xCA38,0xCA39,0xCA3A,0xCA3B,0xCA3C,0xCA3D,/* 0x90-0x97 */ @@ -1323,7 +1323,7 @@ static wchar_t c2u_A5[256] = { 0xCA72,0xCA73,0xCA74,0xCA75,0xCA76,0xCA77,0xCA78,0xCA79,/* 0x68-0x6F */ 0xCA7A,0xCA7B,0xCA7C,0xCA7E,0xCA7F,0xCA80,0xCA81,0xCA82,/* 0x70-0x77 */ 0xCA83,0xCA85,0xCA86,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCA87,0xCA88,0xCA89,0xCA8A,0xCA8B,0xCA8C,0xCA8D,/* 0x80-0x87 */ 0xCA8E,0xCA8F,0xCA90,0xCA91,0xCA92,0xCA93,0xCA94,0xCA95,/* 0x88-0x8F */ 0xCA96,0xCA97,0xCA99,0xCA9A,0xCA9B,0xCA9C,0xCA9D,0xCA9E,/* 0x90-0x97 */ @@ -1359,7 +1359,7 @@ static wchar_t c2u_A6[256] = { 0xCAD0,0xCAD2,0xCAD4,0xCAD5,0xCAD6,0xCAD7,0xCADA,0xCADB,/* 0x68-0x6F */ 0xCADC,0xCADD,0xCADE,0xCADF,0xCAE1,0xCAE2,0xCAE3,0xCAE4,/* 0x70-0x77 */ 0xCAE5,0xCAE6,0xCAE7,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCAE8,0xCAE9,0xCAEA,0xCAEB,0xCAED,0xCAEE,0xCAEF,/* 0x80-0x87 */ 0xCAF0,0xCAF1,0xCAF2,0xCAF3,0xCAF5,0xCAF6,0xCAF7,0xCAF8,/* 0x88-0x8F */ 0xCAF9,0xCAFA,0xCAFB,0xCAFC,0xCAFD,0xCAFE,0xCAFF,0xCB00,/* 0x90-0x97 */ @@ -1392,7 +1392,7 @@ static wchar_t c2u_A7[256] = { 0xCB31,0xCB32,0xCB33,0xCB34,0xCB35,0xCB36,0xCB37,0xCB38,/* 0x68-0x6F */ 0xCB39,0xCB3A,0xCB3B,0xCB3C,0xCB3D,0xCB3E,0xCB3F,0xCB40,/* 0x70-0x77 */ 0xCB42,0xCB43,0xCB44,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCB45,0xCB46,0xCB47,0xCB4A,0xCB4B,0xCB4D,0xCB4E,/* 0x80-0x87 */ 0xCB4F,0xCB51,0xCB52,0xCB53,0xCB54,0xCB55,0xCB56,0xCB57,/* 0x88-0x8F */ 0xCB5A,0xCB5B,0xCB5C,0xCB5E,0xCB5F,0xCB60,0xCB61,0xCB62,/* 0x90-0x97 */ @@ -1426,7 +1426,7 @@ static wchar_t c2u_A8[256] = { 0xCB90,0xCB91,0xCB92,0xCB93,0xCB94,0xCB95,0xCB96,0xCB97,/* 0x68-0x6F */ 0xCB98,0xCB99,0xCB9A,0xCB9B,0xCB9D,0xCB9E,0xCB9F,0xCBA0,/* 0x70-0x77 */ 0xCBA1,0xCBA2,0xCBA3,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCBA4,0xCBA5,0xCBA6,0xCBA7,0xCBA8,0xCBA9,0xCBAA,/* 0x80-0x87 */ 0xCBAB,0xCBAC,0xCBAD,0xCBAE,0xCBAF,0xCBB0,0xCBB1,0xCBB2,/* 0x88-0x8F */ 0xCBB3,0xCBB4,0xCBB5,0xCBB6,0xCBB7,0xCBB9,0xCBBA,0xCBBB,/* 0x90-0x97 */ @@ -1462,7 +1462,7 @@ static wchar_t c2u_A9[256] = { 0xCBEA,0xCBEB,0xCBEC,0xCBED,0xCBEE,0xCBEF,0xCBF0,0xCBF1,/* 0x68-0x6F */ 0xCBF2,0xCBF3,0xCBF4,0xCBF5,0xCBF6,0xCBF7,0xCBF8,0xCBF9,/* 0x70-0x77 */ 0xCBFA,0xCBFB,0xCBFC,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCBFD,0xCBFE,0xCBFF,0xCC00,0xCC01,0xCC02,0xCC03,/* 0x80-0x87 */ 0xCC04,0xCC05,0xCC06,0xCC07,0xCC08,0xCC09,0xCC0A,0xCC0B,/* 0x88-0x8F */ 0xCC0E,0xCC0F,0xCC11,0xCC12,0xCC13,0xCC15,0xCC16,0xCC17,/* 0x90-0x97 */ @@ -1498,7 +1498,7 @@ static wchar_t c2u_AA[256] = { 0xCC5B,0xCC5C,0xCC5D,0xCC5E,0xCC5F,0xCC61,0xCC62,0xCC63,/* 0x68-0x6F */ 0xCC65,0xCC67,0xCC69,0xCC6A,0xCC6B,0xCC6C,0xCC6D,0xCC6E,/* 0x70-0x77 */ 0xCC6F,0xCC71,0xCC72,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCC73,0xCC74,0xCC76,0xCC77,0xCC78,0xCC79,0xCC7A,/* 0x80-0x87 */ 0xCC7B,0xCC7C,0xCC7D,0xCC7E,0xCC7F,0xCC80,0xCC81,0xCC82,/* 0x88-0x8F */ 0xCC83,0xCC84,0xCC85,0xCC86,0xCC87,0xCC88,0xCC89,0xCC8A,/* 0x90-0x97 */ @@ -1533,7 +1533,7 @@ static wchar_t c2u_AB[256] = { 0xCCC2,0xCCC3,0xCCC6,0xCCC8,0xCCCA,0xCCCB,0xCCCC,0xCCCD,/* 0x68-0x6F */ 0xCCCE,0xCCCF,0xCCD1,0xCCD2,0xCCD3,0xCCD5,0xCCD6,0xCCD7,/* 0x70-0x77 */ 0xCCD8,0xCCD9,0xCCDA,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCCDB,0xCCDC,0xCCDD,0xCCDE,0xCCDF,0xCCE0,0xCCE1,/* 0x80-0x87 */ 0xCCE2,0xCCE3,0xCCE5,0xCCE6,0xCCE7,0xCCE8,0xCCE9,0xCCEA,/* 0x88-0x8F */ 0xCCEB,0xCCED,0xCCEE,0xCCEF,0xCCF1,0xCCF2,0xCCF3,0xCCF4,/* 0x90-0x97 */ @@ -1568,7 +1568,7 @@ static wchar_t c2u_AC[256] = { 0xCD2A,0xCD2B,0xCD2D,0xCD2E,0xCD2F,0xCD30,0xCD31,0xCD32,/* 0x68-0x6F */ 0xCD33,0xCD34,0xCD35,0xCD36,0xCD37,0xCD38,0xCD3A,0xCD3B,/* 0x70-0x77 */ 0xCD3C,0xCD3D,0xCD3E,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCD3F,0xCD40,0xCD41,0xCD42,0xCD43,0xCD44,0xCD45,/* 0x80-0x87 */ 0xCD46,0xCD47,0xCD48,0xCD49,0xCD4A,0xCD4B,0xCD4C,0xCD4D,/* 0x88-0x8F */ 0xCD4E,0xCD4F,0xCD50,0xCD51,0xCD52,0xCD53,0xCD54,0xCD55,/* 0x90-0x97 */ @@ -1603,7 +1603,7 @@ static wchar_t c2u_AD[256] = { 0xCD89,0xCD8A,0xCD8B,0xCD8C,0xCD8D,0xCD8E,0xCD8F,0xCD90,/* 0x68-0x6F */ 0xCD91,0xCD92,0xCD93,0xCD96,0xCD97,0xCD99,0xCD9A,0xCD9B,/* 0x70-0x77 */ 0xCD9D,0xCD9E,0xCD9F,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCDA0,0xCDA1,0xCDA2,0xCDA3,0xCDA6,0xCDA8,0xCDAA,/* 0x80-0x87 */ 0xCDAB,0xCDAC,0xCDAD,0xCDAE,0xCDAF,0xCDB1,0xCDB2,0xCDB3,/* 0x88-0x8F */ 0xCDB4,0xCDB5,0xCDB6,0xCDB7,0xCDB8,0xCDB9,0xCDBA,0xCDBB,/* 0x90-0x97 */ @@ -1628,7 +1628,7 @@ static wchar_t c2u_AE[256] = { 0xCDEA,0xCDEB,0xCDED,0xCDEE,0xCDEF,0xCDF1,0xCDF2,0xCDF3,/* 0x68-0x6F */ 0xCDF4,0xCDF5,0xCDF6,0xCDF7,0xCDFA,0xCDFC,0xCDFE,0xCDFF,/* 0x70-0x77 */ 0xCE00,0xCE01,0xCE02,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCE03,0xCE05,0xCE06,0xCE07,0xCE09,0xCE0A,0xCE0B,/* 0x80-0x87 */ 0xCE0D,0xCE0E,0xCE0F,0xCE10,0xCE11,0xCE12,0xCE13,0xCE15,/* 0x88-0x8F */ 0xCE16,0xCE17,0xCE18,0xCE1A,0xCE1B,0xCE1C,0xCE1D,0xCE1E,/* 0x90-0x97 */ @@ -1653,7 +1653,7 @@ static wchar_t c2u_AF[256] = { 0xCE51,0xCE52,0xCE53,0xCE54,0xCE55,0xCE56,0xCE57,0xCE5A,/* 0x68-0x6F */ 0xCE5B,0xCE5D,0xCE5E,0xCE62,0xCE63,0xCE64,0xCE65,0xCE66,/* 0x70-0x77 */ 0xCE67,0xCE6A,0xCE6C,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCE6E,0xCE6F,0xCE70,0xCE71,0xCE72,0xCE73,0xCE76,/* 0x80-0x87 */ 0xCE77,0xCE79,0xCE7A,0xCE7B,0xCE7D,0xCE7E,0xCE7F,0xCE80,/* 0x88-0x8F */ 0xCE81,0xCE82,0xCE83,0xCE86,0xCE88,0xCE8A,0xCE8B,0xCE8C,/* 0x90-0x97 */ @@ -1678,7 +1678,7 @@ static wchar_t c2u_B0[256] = { 0xCEC3,0xCEC4,0xCEC5,0xCEC6,0xCEC7,0xCEC8,0xCEC9,0xCECA,/* 0x68-0x6F */ 0xCECB,0xCECC,0xCECD,0xCECE,0xCECF,0xCED0,0xCED1,0xCED2,/* 0x70-0x77 */ 0xCED3,0xCED4,0xCED5,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCED6,0xCED7,0xCED8,0xCED9,0xCEDA,0xCEDB,0xCEDC,/* 0x80-0x87 */ 0xCEDD,0xCEDE,0xCEDF,0xCEE0,0xCEE1,0xCEE2,0xCEE3,0xCEE6,/* 0x88-0x8F */ 0xCEE7,0xCEE9,0xCEEA,0xCEED,0xCEEE,0xCEEF,0xCEF0,0xCEF1,/* 0x90-0x97 */ @@ -1714,7 +1714,7 @@ static wchar_t c2u_B1[256] = { 0xCF2E,0xCF32,0xCF33,0xCF34,0xCF35,0xCF36,0xCF37,0xCF39,/* 0x68-0x6F */ 0xCF3A,0xCF3B,0xCF3C,0xCF3D,0xCF3E,0xCF3F,0xCF40,0xCF41,/* 0x70-0x77 */ 0xCF42,0xCF43,0xCF44,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCF45,0xCF46,0xCF47,0xCF48,0xCF49,0xCF4A,0xCF4B,/* 0x80-0x87 */ 0xCF4C,0xCF4D,0xCF4E,0xCF4F,0xCF50,0xCF51,0xCF52,0xCF53,/* 0x88-0x8F */ 0xCF56,0xCF57,0xCF59,0xCF5A,0xCF5B,0xCF5D,0xCF5E,0xCF5F,/* 0x90-0x97 */ @@ -1750,7 +1750,7 @@ static wchar_t c2u_B2[256] = { 0xCF95,0xCF96,0xCF97,0xCF98,0xCF99,0xCF9A,0xCF9B,0xCF9C,/* 0x68-0x6F */ 0xCF9D,0xCF9E,0xCF9F,0xCFA0,0xCFA2,0xCFA3,0xCFA4,0xCFA5,/* 0x70-0x77 */ 0xCFA6,0xCFA7,0xCFA9,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xCFAA,0xCFAB,0xCFAC,0xCFAD,0xCFAE,0xCFAF,0xCFB1,/* 0x80-0x87 */ 0xCFB2,0xCFB3,0xCFB4,0xCFB5,0xCFB6,0xCFB7,0xCFB8,0xCFB9,/* 0x88-0x8F */ 0xCFBA,0xCFBB,0xCFBC,0xCFBD,0xCFBE,0xCFBF,0xCFC0,0xCFC1,/* 0x90-0x97 */ @@ -1786,7 +1786,7 @@ static wchar_t c2u_B3[256] = { 0xCFF4,0xCFF6,0xCFF7,0xCFF8,0xCFF9,0xCFFA,0xCFFB,0xCFFD,/* 0x68-0x6F */ 0xCFFE,0xCFFF,0xD001,0xD002,0xD003,0xD005,0xD006,0xD007,/* 0x70-0x77 */ 0xD008,0xD009,0xD00A,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD00B,0xD00C,0xD00D,0xD00E,0xD00F,0xD010,0xD012,/* 0x80-0x87 */ 0xD013,0xD014,0xD015,0xD016,0xD017,0xD019,0xD01A,0xD01B,/* 0x88-0x8F */ 0xD01C,0xD01D,0xD01E,0xD01F,0xD020,0xD021,0xD022,0xD023,/* 0x90-0x97 */ @@ -1822,7 +1822,7 @@ static wchar_t c2u_B4[256] = { 0xD05A,0xD05B,0xD05C,0xD05D,0xD05E,0xD05F,0xD061,0xD062,/* 0x68-0x6F */ 0xD063,0xD064,0xD065,0xD066,0xD067,0xD068,0xD069,0xD06A,/* 0x70-0x77 */ 0xD06B,0xD06E,0xD06F,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD071,0xD072,0xD073,0xD075,0xD076,0xD077,0xD078,/* 0x80-0x87 */ 0xD079,0xD07A,0xD07B,0xD07E,0xD07F,0xD080,0xD082,0xD083,/* 0x88-0x8F */ 0xD084,0xD085,0xD086,0xD087,0xD088,0xD089,0xD08A,0xD08B,/* 0x90-0x97 */ @@ -1858,7 +1858,7 @@ static wchar_t c2u_B5[256] = { 0xD0BE,0xD0BF,0xD0C2,0xD0C3,0xD0C5,0xD0C6,0xD0C7,0xD0CA,/* 0x68-0x6F */ 0xD0CB,0xD0CC,0xD0CD,0xD0CE,0xD0CF,0xD0D2,0xD0D6,0xD0D7,/* 0x70-0x77 */ 0xD0D8,0xD0D9,0xD0DA,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD0DB,0xD0DE,0xD0DF,0xD0E1,0xD0E2,0xD0E3,0xD0E5,/* 0x80-0x87 */ 0xD0E6,0xD0E7,0xD0E8,0xD0E9,0xD0EA,0xD0EB,0xD0EE,0xD0F2,/* 0x88-0x8F */ 0xD0F3,0xD0F4,0xD0F5,0xD0F6,0xD0F7,0xD0F9,0xD0FA,0xD0FB,/* 0x90-0x97 */ @@ -1894,7 +1894,7 @@ static wchar_t c2u_B6[256] = { 0xD127,0xD128,0xD129,0xD12A,0xD12B,0xD12C,0xD12D,0xD12E,/* 0x68-0x6F */ 0xD12F,0xD132,0xD133,0xD135,0xD136,0xD137,0xD139,0xD13B,/* 0x70-0x77 */ 0xD13C,0xD13D,0xD13E,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD13F,0xD142,0xD146,0xD147,0xD148,0xD149,0xD14A,/* 0x80-0x87 */ 0xD14B,0xD14E,0xD14F,0xD151,0xD152,0xD153,0xD155,0xD156,/* 0x88-0x8F */ 0xD157,0xD158,0xD159,0xD15A,0xD15B,0xD15E,0xD160,0xD162,/* 0x90-0x97 */ @@ -1930,7 +1930,7 @@ static wchar_t c2u_B7[256] = { 0xD192,0xD193,0xD194,0xD195,0xD196,0xD197,0xD198,0xD199,/* 0x68-0x6F */ 0xD19A,0xD19B,0xD19C,0xD19D,0xD19E,0xD19F,0xD1A2,0xD1A3,/* 0x70-0x77 */ 0xD1A5,0xD1A6,0xD1A7,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD1A9,0xD1AA,0xD1AB,0xD1AC,0xD1AD,0xD1AE,0xD1AF,/* 0x80-0x87 */ 0xD1B2,0xD1B4,0xD1B6,0xD1B7,0xD1B8,0xD1B9,0xD1BB,0xD1BD,/* 0x88-0x8F */ 0xD1BE,0xD1BF,0xD1C1,0xD1C2,0xD1C3,0xD1C4,0xD1C5,0xD1C6,/* 0x90-0x97 */ @@ -1966,7 +1966,7 @@ static wchar_t c2u_B8[256] = { 0xD1F2,0xD1F3,0xD1F5,0xD1F6,0xD1F7,0xD1F9,0xD1FA,0xD1FB,/* 0x68-0x6F */ 0xD1FC,0xD1FD,0xD1FE,0xD1FF,0xD200,0xD201,0xD202,0xD203,/* 0x70-0x77 */ 0xD204,0xD205,0xD206,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD208,0xD20A,0xD20B,0xD20C,0xD20D,0xD20E,0xD20F,/* 0x80-0x87 */ 0xD211,0xD212,0xD213,0xD214,0xD215,0xD216,0xD217,0xD218,/* 0x88-0x8F */ 0xD219,0xD21A,0xD21B,0xD21C,0xD21D,0xD21E,0xD21F,0xD220,/* 0x90-0x97 */ @@ -2002,7 +2002,7 @@ static wchar_t c2u_B9[256] = { 0xD254,0xD255,0xD256,0xD257,0xD258,0xD259,0xD25A,0xD25B,/* 0x68-0x6F */ 0xD25D,0xD25E,0xD25F,0xD260,0xD261,0xD262,0xD263,0xD265,/* 0x70-0x77 */ 0xD266,0xD267,0xD268,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD269,0xD26A,0xD26B,0xD26C,0xD26D,0xD26E,0xD26F,/* 0x80-0x87 */ 0xD270,0xD271,0xD272,0xD273,0xD274,0xD275,0xD276,0xD277,/* 0x88-0x8F */ 0xD278,0xD279,0xD27A,0xD27B,0xD27C,0xD27D,0xD27E,0xD27F,/* 0x90-0x97 */ @@ -2038,7 +2038,7 @@ static wchar_t c2u_BA[256] = { 0xD2B6,0xD2B7,0xD2BA,0xD2BB,0xD2BD,0xD2BE,0xD2C1,0xD2C3,/* 0x68-0x6F */ 0xD2C4,0xD2C5,0xD2C6,0xD2C7,0xD2CA,0xD2CC,0xD2CD,0xD2CE,/* 0x70-0x77 */ 0xD2CF,0xD2D0,0xD2D1,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD2D2,0xD2D3,0xD2D5,0xD2D6,0xD2D7,0xD2D9,0xD2DA,/* 0x80-0x87 */ 0xD2DB,0xD2DD,0xD2DE,0xD2DF,0xD2E0,0xD2E1,0xD2E2,0xD2E3,/* 0x88-0x8F */ 0xD2E6,0xD2E7,0xD2E8,0xD2E9,0xD2EA,0xD2EB,0xD2EC,0xD2ED,/* 0x90-0x97 */ @@ -2074,7 +2074,7 @@ static wchar_t c2u_BB[256] = { 0xD32F,0xD331,0xD332,0xD333,0xD334,0xD335,0xD336,0xD337,/* 0x68-0x6F */ 0xD33A,0xD33E,0xD33F,0xD340,0xD341,0xD342,0xD343,0xD346,/* 0x70-0x77 */ 0xD347,0xD348,0xD349,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD34A,0xD34B,0xD34C,0xD34D,0xD34E,0xD34F,0xD350,/* 0x80-0x87 */ 0xD351,0xD352,0xD353,0xD354,0xD355,0xD356,0xD357,0xD358,/* 0x88-0x8F */ 0xD359,0xD35A,0xD35B,0xD35C,0xD35D,0xD35E,0xD35F,0xD360,/* 0x90-0x97 */ @@ -2110,7 +2110,7 @@ static wchar_t c2u_BC[256] = { 0xD394,0xD395,0xD396,0xD397,0xD39A,0xD39B,0xD39D,0xD39E,/* 0x68-0x6F */ 0xD39F,0xD3A1,0xD3A2,0xD3A3,0xD3A4,0xD3A5,0xD3A6,0xD3A7,/* 0x70-0x77 */ 0xD3AA,0xD3AC,0xD3AE,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD3AF,0xD3B0,0xD3B1,0xD3B2,0xD3B3,0xD3B5,0xD3B6,/* 0x80-0x87 */ 0xD3B7,0xD3B9,0xD3BA,0xD3BB,0xD3BD,0xD3BE,0xD3BF,0xD3C0,/* 0x88-0x8F */ 0xD3C1,0xD3C2,0xD3C3,0xD3C6,0xD3C7,0xD3CA,0xD3CB,0xD3CC,/* 0x90-0x97 */ @@ -2146,7 +2146,7 @@ static wchar_t c2u_BD[256] = { 0xD403,0xD404,0xD405,0xD406,0xD407,0xD409,0xD40A,0xD40B,/* 0x68-0x6F */ 0xD40C,0xD40D,0xD40E,0xD40F,0xD410,0xD411,0xD412,0xD413,/* 0x70-0x77 */ 0xD414,0xD415,0xD416,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD417,0xD418,0xD419,0xD41A,0xD41B,0xD41C,0xD41E,/* 0x80-0x87 */ 0xD41F,0xD420,0xD421,0xD422,0xD423,0xD424,0xD425,0xD426,/* 0x88-0x8F */ 0xD427,0xD428,0xD429,0xD42A,0xD42B,0xD42C,0xD42D,0xD42E,/* 0x90-0x97 */ @@ -2182,7 +2182,7 @@ static wchar_t c2u_BE[256] = { 0xD45B,0xD45D,0xD45E,0xD45F,0xD461,0xD462,0xD463,0xD465,/* 0x68-0x6F */ 0xD466,0xD467,0xD468,0xD469,0xD46A,0xD46B,0xD46C,0xD46E,/* 0x70-0x77 */ 0xD470,0xD471,0xD472,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD473,0xD474,0xD475,0xD476,0xD477,0xD47A,0xD47B,/* 0x80-0x87 */ 0xD47D,0xD47E,0xD481,0xD483,0xD484,0xD485,0xD486,0xD487,/* 0x88-0x8F */ 0xD48A,0xD48C,0xD48E,0xD48F,0xD490,0xD491,0xD492,0xD493,/* 0x90-0x97 */ @@ -2218,7 +2218,7 @@ static wchar_t c2u_BF[256] = { 0xD4C0,0xD4C1,0xD4C2,0xD4C3,0xD4C4,0xD4C5,0xD4C6,0xD4C7,/* 0x68-0x6F */ 0xD4C8,0xD4C9,0xD4CA,0xD4CB,0xD4CD,0xD4CE,0xD4CF,0xD4D1,/* 0x70-0x77 */ 0xD4D2,0xD4D3,0xD4D5,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD4D6,0xD4D7,0xD4D8,0xD4D9,0xD4DA,0xD4DB,0xD4DD,/* 0x80-0x87 */ 0xD4DE,0xD4E0,0xD4E1,0xD4E2,0xD4E3,0xD4E4,0xD4E5,0xD4E6,/* 0x88-0x8F */ 0xD4E7,0xD4E9,0xD4EA,0xD4EB,0xD4ED,0xD4EE,0xD4EF,0xD4F1,/* 0x90-0x97 */ @@ -2254,7 +2254,7 @@ static wchar_t c2u_C0[256] = { 0xD525,0xD526,0xD527,0xD528,0xD529,0xD52A,0xD52B,0xD52C,/* 0x68-0x6F */ 0xD52D,0xD52E,0xD52F,0xD530,0xD531,0xD532,0xD533,0xD534,/* 0x70-0x77 */ 0xD535,0xD536,0xD537,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD538,0xD539,0xD53A,0xD53B,0xD53E,0xD53F,0xD541,/* 0x80-0x87 */ 0xD542,0xD543,0xD545,0xD546,0xD547,0xD548,0xD549,0xD54A,/* 0x88-0x8F */ 0xD54B,0xD54E,0xD550,0xD552,0xD553,0xD554,0xD555,0xD556,/* 0x90-0x97 */ @@ -2290,7 +2290,7 @@ static wchar_t c2u_C1[256] = { 0xD594,0xD595,0xD596,0xD597,0xD598,0xD599,0xD59A,0xD59B,/* 0x68-0x6F */ 0xD59C,0xD59D,0xD59E,0xD59F,0xD5A0,0xD5A1,0xD5A2,0xD5A3,/* 0x70-0x77 */ 0xD5A4,0xD5A6,0xD5A7,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD5A8,0xD5A9,0xD5AA,0xD5AB,0xD5AC,0xD5AD,0xD5AE,/* 0x80-0x87 */ 0xD5AF,0xD5B0,0xD5B1,0xD5B2,0xD5B3,0xD5B4,0xD5B5,0xD5B6,/* 0x88-0x8F */ 0xD5B7,0xD5B8,0xD5B9,0xD5BA,0xD5BB,0xD5BC,0xD5BD,0xD5BE,/* 0x90-0x97 */ @@ -2326,7 +2326,7 @@ static wchar_t c2u_C2[256] = { 0xD5FA,0xD5FB,0xD5FC,0xD5FD,0xD5FE,0xD5FF,0xD602,0xD603,/* 0x68-0x6F */ 0xD605,0xD606,0xD607,0xD609,0xD60A,0xD60B,0xD60C,0xD60D,/* 0x70-0x77 */ 0xD60E,0xD60F,0xD612,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD616,0xD617,0xD618,0xD619,0xD61A,0xD61B,0xD61D,/* 0x80-0x87 */ 0xD61E,0xD61F,0xD621,0xD622,0xD623,0xD625,0xD626,0xD627,/* 0x88-0x8F */ 0xD628,0xD629,0xD62A,0xD62B,0xD62C,0xD62E,0xD62F,0xD630,/* 0x90-0x97 */ @@ -2362,7 +2362,7 @@ static wchar_t c2u_C3[256] = { 0xD66B,0xD66C,0xD66D,0xD66E,0xD66F,0xD672,0xD673,0xD675,/* 0x68-0x6F */ 0xD676,0xD677,0xD678,0xD679,0xD67A,0xD67B,0xD67C,0xD67D,/* 0x70-0x77 */ 0xD67E,0xD67F,0xD680,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD681,0xD682,0xD684,0xD686,0xD687,0xD688,0xD689,/* 0x80-0x87 */ 0xD68A,0xD68B,0xD68E,0xD68F,0xD691,0xD692,0xD693,0xD695,/* 0x88-0x8F */ 0xD696,0xD697,0xD698,0xD699,0xD69A,0xD69B,0xD69C,0xD69E,/* 0x90-0x97 */ @@ -2398,7 +2398,7 @@ static wchar_t c2u_C4[256] = { 0xD6D6,0xD6D8,0xD6DA,0xD6DB,0xD6DC,0xD6DD,0xD6DE,0xD6DF,/* 0x68-0x6F */ 0xD6E1,0xD6E2,0xD6E3,0xD6E5,0xD6E6,0xD6E7,0xD6E9,0xD6EA,/* 0x70-0x77 */ 0xD6EB,0xD6EC,0xD6ED,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD6EE,0xD6EF,0xD6F1,0xD6F2,0xD6F3,0xD6F4,0xD6F6,/* 0x80-0x87 */ 0xD6F7,0xD6F8,0xD6F9,0xD6FA,0xD6FB,0xD6FE,0xD6FF,0xD701,/* 0x88-0x8F */ 0xD702,0xD703,0xD705,0xD706,0xD707,0xD708,0xD709,0xD70A,/* 0x90-0x97 */ @@ -2434,7 +2434,7 @@ static wchar_t c2u_C5[256] = { 0xD742,0xD743,0xD745,0xD746,0xD748,0xD74A,0xD74B,0xD74C,/* 0x68-0x6F */ 0xD74D,0xD74E,0xD74F,0xD752,0xD753,0xD755,0xD75A,0xD75B,/* 0x70-0x77 */ 0xD75C,0xD75D,0xD75E,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0xD75F,0xD762,0xD764,0xD766,0xD767,0xD768,0xD76A,/* 0x80-0x87 */ 0xD76B,0xD76D,0xD76E,0xD76F,0xD771,0xD772,0xD773,0xD775,/* 0x88-0x8F */ 0xD776,0xD777,0xD778,0xD779,0xD77A,0xD77B,0xD77E,0xD77F,/* 0x90-0x97 */ @@ -2470,7 +2470,7 @@ static wchar_t c2u_C6[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2506,7 +2506,7 @@ static wchar_t c2u_C7[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2542,7 +2542,7 @@ static wchar_t c2u_C8[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2578,7 +2578,7 @@ static wchar_t c2u_CA[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2614,7 +2614,7 @@ static wchar_t c2u_CB[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2650,7 +2650,7 @@ static wchar_t c2u_CC[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2686,7 +2686,7 @@ static wchar_t c2u_CD[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2722,7 +2722,7 @@ static wchar_t c2u_CE[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2758,7 +2758,7 @@ static wchar_t c2u_CF[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2794,7 +2794,7 @@ static wchar_t c2u_D0[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2830,7 +2830,7 @@ static wchar_t c2u_D1[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2866,7 +2866,7 @@ static wchar_t c2u_D2[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2902,7 +2902,7 @@ static wchar_t c2u_D3[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2938,7 +2938,7 @@ static wchar_t c2u_D4[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2974,7 +2974,7 @@ static wchar_t c2u_D5[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3010,7 +3010,7 @@ static wchar_t c2u_D6[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3046,7 +3046,7 @@ static wchar_t c2u_D7[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3082,7 +3082,7 @@ static wchar_t c2u_D8[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3118,7 +3118,7 @@ static wchar_t c2u_D9[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3154,7 +3154,7 @@ static wchar_t c2u_DA[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3190,7 +3190,7 @@ static wchar_t c2u_DB[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3226,7 +3226,7 @@ static wchar_t c2u_DC[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3262,7 +3262,7 @@ static wchar_t c2u_DD[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3298,7 +3298,7 @@ static wchar_t c2u_DE[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3334,7 +3334,7 @@ static wchar_t c2u_DF[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3370,7 +3370,7 @@ static wchar_t c2u_E0[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3406,7 +3406,7 @@ static wchar_t c2u_E1[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3442,7 +3442,7 @@ static wchar_t c2u_E2[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3478,7 +3478,7 @@ static wchar_t c2u_E3[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3514,7 +3514,7 @@ static wchar_t c2u_E4[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3550,7 +3550,7 @@ static wchar_t c2u_E5[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3586,7 +3586,7 @@ static wchar_t c2u_E6[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3622,7 +3622,7 @@ static wchar_t c2u_E7[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3658,7 +3658,7 @@ static wchar_t c2u_E8[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3694,7 +3694,7 @@ static wchar_t c2u_E9[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3730,7 +3730,7 @@ static wchar_t c2u_EA[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3766,7 +3766,7 @@ static wchar_t c2u_EB[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3802,7 +3802,7 @@ static wchar_t c2u_EC[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3838,7 +3838,7 @@ static wchar_t c2u_ED[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3874,7 +3874,7 @@ static wchar_t c2u_EE[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3910,7 +3910,7 @@ static wchar_t c2u_EF[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3946,7 +3946,7 @@ static wchar_t c2u_F0[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3982,7 +3982,7 @@ static wchar_t c2u_F1[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4018,7 +4018,7 @@ static wchar_t c2u_F2[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4054,7 +4054,7 @@ static wchar_t c2u_F3[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4090,7 +4090,7 @@ static wchar_t c2u_F4[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4126,7 +4126,7 @@ static wchar_t c2u_F5[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4162,7 +4162,7 @@ static wchar_t c2u_F6[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4198,7 +4198,7 @@ static wchar_t c2u_F7[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4234,7 +4234,7 @@ static wchar_t c2u_F8[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4270,7 +4270,7 @@ static wchar_t c2u_F9[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4306,7 +4306,7 @@ static wchar_t c2u_FA[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4342,7 +4342,7 @@ static wchar_t c2u_FB[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4378,7 +4378,7 @@ static wchar_t c2u_FC[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4414,7 +4414,7 @@ static wchar_t c2u_FD[256] = { 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x68-0x6F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x70-0x77 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -4434,38 +4434,38 @@ static wchar_t c2u_FD[256] = { }; static wchar_t *page_charset2uni[256] = { - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, c2u_81, c2u_82, c2u_83, c2u_84, c2u_85, c2u_86, c2u_87, - c2u_88, c2u_89, c2u_8A, c2u_8B, c2u_8C, c2u_8D, c2u_8E, c2u_8F, - c2u_90, c2u_91, c2u_92, c2u_93, c2u_94, c2u_95, c2u_96, c2u_97, - c2u_98, c2u_99, c2u_9A, c2u_9B, c2u_9C, c2u_9D, c2u_9E, c2u_9F, - c2u_A0, c2u_A1, c2u_A2, c2u_A3, c2u_A4, c2u_A5, c2u_A6, c2u_A7, - c2u_A8, c2u_A9, c2u_AA, c2u_AB, c2u_AC, c2u_AD, c2u_AE, c2u_AF, - c2u_B0, c2u_B1, c2u_B2, c2u_B3, c2u_B4, c2u_B5, c2u_B6, c2u_B7, - c2u_B8, c2u_B9, c2u_BA, c2u_BB, c2u_BC, c2u_BD, c2u_BE, c2u_BF, - c2u_C0, c2u_C1, c2u_C2, c2u_C3, c2u_C4, c2u_C5, c2u_C6, c2u_C7, - c2u_C8, NULL, c2u_CA, c2u_CB, c2u_CC, c2u_CD, c2u_CE, c2u_CF, - c2u_D0, c2u_D1, c2u_D2, c2u_D3, c2u_D4, c2u_D5, c2u_D6, c2u_D7, - c2u_D8, c2u_D9, c2u_DA, c2u_DB, c2u_DC, c2u_DD, c2u_DE, c2u_DF, - c2u_E0, c2u_E1, c2u_E2, c2u_E3, c2u_E4, c2u_E5, c2u_E6, c2u_E7, - c2u_E8, c2u_E9, c2u_EA, c2u_EB, c2u_EC, c2u_ED, c2u_EE, c2u_EF, - c2u_F0, c2u_F1, c2u_F2, c2u_F3, c2u_F4, c2u_F5, c2u_F6, c2u_F7, - c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, c2u_81, c2u_82, c2u_83, c2u_84, c2u_85, c2u_86, c2u_87, + c2u_88, c2u_89, c2u_8A, c2u_8B, c2u_8C, c2u_8D, c2u_8E, c2u_8F, + c2u_90, c2u_91, c2u_92, c2u_93, c2u_94, c2u_95, c2u_96, c2u_97, + c2u_98, c2u_99, c2u_9A, c2u_9B, c2u_9C, c2u_9D, c2u_9E, c2u_9F, + c2u_A0, c2u_A1, c2u_A2, c2u_A3, c2u_A4, c2u_A5, c2u_A6, c2u_A7, + c2u_A8, c2u_A9, c2u_AA, c2u_AB, c2u_AC, c2u_AD, c2u_AE, c2u_AF, + c2u_B0, c2u_B1, c2u_B2, c2u_B3, c2u_B4, c2u_B5, c2u_B6, c2u_B7, + c2u_B8, c2u_B9, c2u_BA, c2u_BB, c2u_BC, c2u_BD, c2u_BE, c2u_BF, + c2u_C0, c2u_C1, c2u_C2, c2u_C3, c2u_C4, c2u_C5, c2u_C6, c2u_C7, + c2u_C8, NULL, c2u_CA, c2u_CB, c2u_CC, c2u_CD, c2u_CE, c2u_CF, + c2u_D0, c2u_D1, c2u_D2, c2u_D3, c2u_D4, c2u_D5, c2u_D6, c2u_D7, + c2u_D8, c2u_D9, c2u_DA, c2u_DB, c2u_DC, c2u_DD, c2u_DE, c2u_DF, + c2u_E0, c2u_E1, c2u_E2, c2u_E3, c2u_E4, c2u_E5, c2u_E6, c2u_E7, + c2u_E8, c2u_E9, c2u_EA, c2u_EB, c2u_EC, c2u_ED, c2u_EE, c2u_EF, + c2u_F0, c2u_F1, c2u_F2, c2u_F3, c2u_F4, c2u_F5, c2u_F6, c2u_F7, + c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, NULL, NULL, }; static unsigned char u2c_01[512] = { @@ -4530,7 +4530,7 @@ static unsigned char u2c_02[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4590,7 +4590,7 @@ static unsigned char u2c_03[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4669,7 +4669,7 @@ static unsigned char u2c_11[512] = { 0xA4, 0xD2, 0xA4, 0xD3, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xA4, 0xF7, 0xA4, 0xF8, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xA4, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4736,7 +4736,7 @@ static unsigned char u2c_20[512] = { 0xA9, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xFA, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xA9, 0xFB, 0xA9, 0xFC, 0xA9, 0xFD, /* 0x80-0x83 */ 0xA9, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4783,7 +4783,7 @@ static unsigned char u2c_21[512] = { 0xA5, 0xA5, 0xA5, 0xA6, 0xA5, 0xA7, 0xA5, 0xA8, /* 0x74-0x77 */ 0xA5, 0xA9, 0xA5, 0xAA, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4841,7 +4841,7 @@ static unsigned char u2c_22[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xA1, 0xF8, 0xA1, 0xF9, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xF6, 0xA1, 0xF7, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4895,7 +4895,7 @@ static unsigned char u2c_24[512] = { 0xA9, 0xE7, 0xA9, 0xE8, 0xA9, 0xE9, 0xA9, 0xEA, /* 0x74-0x77 */ 0xA9, 0xEB, 0xA9, 0xEC, 0xA9, 0xED, 0xA9, 0xEE, /* 0x78-0x7B */ 0xA9, 0xEF, 0xA9, 0xF0, 0xA9, 0xF1, 0xA9, 0xF2, /* 0x7C-0x7F */ - + 0xA9, 0xF3, 0xA9, 0xF4, 0xA9, 0xF5, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4958,7 +4958,7 @@ static unsigned char u2c_25[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5046,7 +5046,7 @@ static unsigned char u2c_30[512] = { 0xAA, 0xD4, 0xAA, 0xD5, 0xAA, 0xD6, 0xAA, 0xD7, /* 0x74-0x77 */ 0xAA, 0xD8, 0xAA, 0xD9, 0xAA, 0xDA, 0xAA, 0xDB, /* 0x78-0x7B */ 0xAA, 0xDC, 0xAA, 0xDD, 0xAA, 0xDE, 0xAA, 0xDF, /* 0x7C-0x7F */ - + 0xAA, 0xE0, 0xAA, 0xE1, 0xAA, 0xE2, 0xAA, 0xE3, /* 0x80-0x83 */ 0xAA, 0xE4, 0xAA, 0xE5, 0xAA, 0xE6, 0xAA, 0xE7, /* 0x84-0x87 */ 0xAA, 0xE8, 0xAA, 0xE9, 0xAA, 0xEA, 0xAA, 0xEB, /* 0x88-0x8B */ @@ -5112,7 +5112,7 @@ static unsigned char u2c_31[512] = { 0xA4, 0xE4, 0xA4, 0xE5, 0xA4, 0xE6, 0xA4, 0xE7, /* 0x74-0x77 */ 0xA4, 0xE8, 0xA4, 0xE9, 0xA4, 0xEA, 0xA4, 0xEB, /* 0x78-0x7B */ 0xA4, 0xEC, 0xA4, 0xED, 0xA4, 0xEE, 0xA4, 0xEF, /* 0x7C-0x7F */ - + 0xA4, 0xF0, 0xA4, 0xF1, 0xA4, 0xF2, 0xA4, 0xF3, /* 0x80-0x83 */ 0xA4, 0xF4, 0xA4, 0xF5, 0xA4, 0xF6, 0xA4, 0xF7, /* 0x84-0x87 */ 0xA4, 0xF8, 0xA4, 0xF9, 0xA4, 0xFA, 0xA4, 0xFB, /* 0x88-0x8B */ @@ -5156,7 +5156,7 @@ static unsigned char u2c_32[512] = { 0xA8, 0xC5, 0xA8, 0xC6, 0xA8, 0xC7, 0xA8, 0xC8, /* 0x74-0x77 */ 0xA8, 0xC9, 0xA8, 0xCA, 0xA8, 0xCB, 0xA8, 0xCC, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xDE, /* 0x7C-0x7F */ - + 0xEC, 0xE9, 0xEC, 0xA3, 0xDF, 0xB2, 0xDE, 0xCC, /* 0x80-0x83 */ 0xE7, 0xE9, 0xD7, 0xBF, 0xF6, 0xD2, 0xF8, 0xA2, /* 0x84-0x87 */ 0xCE, 0xFA, 0xE4, 0xA8, 0xEA, 0xC5, 0xFB, 0xFD, /* 0x88-0x8B */ @@ -5205,7 +5205,7 @@ static unsigned char u2c_33[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xA7, 0xC9, 0xA7, 0xCA, 0xA7, 0xCB, 0xA7, 0xCC, /* 0x80-0x83 */ 0xA7, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xA7, 0xBA, 0xA7, 0xBB, 0xA7, 0xDC, 0xA7, 0xDD, /* 0x88-0x8B */ @@ -5265,7 +5265,7 @@ static unsigned char u2c_4E[512] = { 0x00, 0x00, 0x00, 0x00, 0xDC, 0xE3, 0xDF, 0xAD, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xCB, 0xEB, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xD5, 0xAF, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xD6, 0xF5, 0x00, 0x00, /* 0x84-0x87 */ 0xE5, 0xF8, 0x00, 0x00, 0x00, 0x00, 0xDE, 0xC0, /* 0x88-0x8B */ @@ -5332,7 +5332,7 @@ static unsigned char u2c_4F[512] = { 0x00, 0x00, 0x00, 0x00, 0xD1, 0xCD, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xEE, 0xED, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xEC, 0xEB, 0xDE, 0xC5, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE3, 0xE0, 0x00, 0x00, 0xCA, 0xC9, /* 0x80-0x83 */ 0xF2, 0xE9, 0x00, 0x00, 0xD5, 0xCE, 0x00, 0x00, /* 0x84-0x87 */ 0xF6, 0xB6, 0x00, 0x00, 0xCE, 0xC2, 0xD6, 0xC7, /* 0x88-0x8B */ @@ -5399,7 +5399,7 @@ static unsigned char u2c_50[512] = { 0xF6, 0xB0, 0xEF, 0xCF, 0xE9, 0xCF, 0x00, 0x00, /* 0x74-0x77 */ 0xF7, 0xDE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xCE, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xDC, 0xF7, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5467,7 +5467,7 @@ static unsigned char u2c_51[512] = { 0x00, 0x00, 0xDC, 0xB2, 0xD0, 0xEC, 0xCE, 0xFD, /* 0x74-0x77 */ 0xEE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xCC, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xD0, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xE5, 0xF7, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xF3, 0xFC, 0x00, 0x00, /* 0x88-0x8B */ @@ -5535,7 +5535,7 @@ static unsigned char u2c_52[512] = { 0x00, 0x00, 0xF3, 0xDC, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xF8, 0xF2, 0x00, 0x00, 0xF4, 0xF9, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xF1, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, 0xBC, /* 0x84-0x87 */ 0xDB, 0xF9, 0xD7, 0xB1, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5603,7 +5603,7 @@ static unsigned char u2c_53[512] = { 0xCA, 0xBF, 0xD5, 0xB0, 0x00, 0x00, 0xCF, 0xE9, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xF1, 0xED, 0x00, 0x00, 0xCC, 0xCF, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xE4, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5670,7 +5670,7 @@ static unsigned char u2c_54[512] = { 0x00, 0x00, 0xCA, 0xA7, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE3, 0xE2, /* 0x78-0x7B */ 0xFB, 0xBC, 0xD9, 0xA4, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xEE, 0xBA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xF8, 0xD3, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5737,7 +5737,7 @@ static unsigned char u2c_55[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xF0, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xCB, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xE0, 0xBC, 0x00, 0x00, 0xF4, 0xCA, 0xD4, 0xFA, /* 0x84-0x87 */ 0x00, 0x00, 0xFD, 0xAA, 0xF9, 0xE2, 0x00, 0x00, /* 0x88-0x8B */ @@ -5805,7 +5805,7 @@ static unsigned char u2c_56[512] = { 0xDD, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xFC, 0xF7, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5872,7 +5872,7 @@ static unsigned char u2c_57[512] = { 0x00, 0x00, 0xCF, 0xA6, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xF6, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE1, 0xF7, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xD3, 0xDC, 0x00, 0x00, 0x00, 0x00, 0xFA, 0xFE, /* 0x88-0x8B */ @@ -5940,7 +5940,7 @@ static unsigned char u2c_58[512] = { 0x00, 0x00, 0xF2, 0xC8, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xF3, 0xD2, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xEE, 0xF4, 0x00, 0x00, 0xE2, 0xD3, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, 0xD1, /* 0x80-0x83 */ 0x00, 0x00, 0xDF, 0xEA, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xE9, 0xBA, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6008,7 +6008,7 @@ static unsigned char u2c_59[512] = { 0xD2, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xCA, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xFB, 0xBF, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE5, 0xFD, 0xDD, 0xE5, /* 0x80-0x83 */ 0xD8, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xEC, 0xF4, 0x00, 0x00, /* 0x88-0x8B */ @@ -6076,7 +6076,7 @@ static unsigned char u2c_5A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6139,7 +6139,7 @@ static unsigned char u2c_5B[512] = { 0x00, 0x00, 0xDD, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xF9, 0xCA, 0x00, 0x00, 0xEA, 0xE8, 0x00, 0x00, /* 0x78-0x7B */ 0xE5, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xD3, 0xEB, 0x00, 0x00, 0xE9, 0xD4, /* 0x84-0x87 */ 0xE1, 0xFA, 0xE4, 0xCC, 0x00, 0x00, 0xE1, 0xE4, /* 0x88-0x8B */ @@ -6206,7 +6206,7 @@ static unsigned char u2c_5C[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xFD, 0xDF, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6274,7 +6274,7 @@ static unsigned char u2c_5D[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCF, 0xA9, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD3, 0xF7, /* 0x88-0x8B */ @@ -6342,7 +6342,7 @@ static unsigned char u2c_5E[512] = { 0xD2, 0xB4, 0x00, 0x00, 0x00, 0x00, 0xDC, 0xB4, /* 0x74-0x77 */ 0xFA, 0xB9, 0xCA, 0xCF, 0x00, 0x00, 0xFC, 0xB3, /* 0x78-0x7B */ 0xEA, 0xEA, 0xEA, 0xEB, 0xD0, 0xFA, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xED, 0xE4, 0x00, 0x00, 0x00, 0x00, 0xDD, 0xE7, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xDF, 0xC9, 0x00, 0x00, /* 0x88-0x8B */ @@ -6409,7 +6409,7 @@ static unsigned char u2c_5F[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDB, 0xAD, /* 0x74-0x77 */ 0x00, 0x00, 0xE6, 0xB5, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xF9, 0xA8, 0x00, 0x00, 0x00, 0x00, 0xDD, 0xD8, /* 0x7C-0x7F */ - + 0xE8, 0xD9, 0xEF, 0xD6, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xD3, 0xE2, 0x00, 0x00, 0xE2, 0xDF, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xFC, 0xE0, 0xD7, 0xC8, /* 0x88-0x8B */ @@ -6477,7 +6477,7 @@ static unsigned char u2c_60[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xE6, 0xED, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xE3, 0xFA, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6544,7 +6544,7 @@ static unsigned char u2c_61[512] = { 0x00, 0x00, 0x00, 0x00, 0xCC, 0xD4, 0xCB, 0xAF, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xF4, 0xAA, 0xE9, 0xAF, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xF5, 0xC3, 0xE9, 0xD8, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xDD, 0xE9, 0x00, 0x00, /* 0x88-0x8B */ @@ -6612,7 +6612,7 @@ static unsigned char u2c_62[512] = { 0x00, 0x00, 0x00, 0x00, 0xDD, 0xA6, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xDD, 0xEB, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xE4, 0xF9, 0x00, 0x00, 0x00, 0x00, 0xE3, 0xAF, /* 0x7C-0x7F */ - + 0xD0, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xF4, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xCC, 0xBC, 0xF7, 0xEA, 0x00, 0x00, /* 0x88-0x8B */ @@ -6680,7 +6680,7 @@ static unsigned char u2c_63[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xDF, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xD1, 0xF4, 0xD2, 0xBA, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF, 0xF2, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xB7, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xE2, 0xA3, 0xD3, 0xFC, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6746,7 +6746,7 @@ static unsigned char u2c_64[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xD9, 0xB8, 0xD9, 0xB9, 0xEF, 0xC9, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xD6, 0xCE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6814,7 +6814,7 @@ static unsigned char u2c_65[512] = { 0xEF, 0xDA, 0xEE, 0xD8, 0x00, 0x00, 0xDD, 0xA7, /* 0x74-0x77 */ 0xE2, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xE0, 0xC0, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xD6, 0xB0, 0xF8, 0xCA, /* 0x80-0x83 */ 0x00, 0x00, 0xFC, 0xFA, 0x00, 0x00, 0xD9, 0xFE, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6882,7 +6882,7 @@ static unsigned char u2c_66[512] = { 0xF4, 0xE7, 0x00, 0x00, 0xEF, 0xDC, 0xCF, 0xFC, /* 0x74-0x77 */ 0xEF, 0xDD, 0x00, 0x00, 0xF2, 0xAA, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xFD, 0xBE, 0x00, 0x00, 0x00, 0x00, 0xCA, 0xAC, /* 0x84-0x87 */ 0xFD, 0xBB, 0xFD, 0xC7, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6950,7 +6950,7 @@ static unsigned char u2c_67[512] = { 0x00, 0x00, 0xEE, 0xBE, 0x00, 0x00, 0xF7, 0xED, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD2, 0xEE, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xE1, 0xE6, 0xF7, 0xF9, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0xED, /* 0x84-0x87 */ 0x00, 0x00, 0xE8, 0xDB, 0x00, 0x00, 0xDB, 0xB3, /* 0x88-0x8B */ @@ -7018,7 +7018,7 @@ static unsigned char u2c_68[512] = { 0x00, 0x00, 0x00, 0x00, 0xF7, 0xD2, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCA, 0xD4, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xD5, 0xD9, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xD8, 0xDE, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7085,7 +7085,7 @@ static unsigned char u2c_69[512] = { 0x00, 0x00, 0xD0, 0xBF, 0x00, 0x00, 0xFA, 0xAC, /* 0x74-0x77 */ 0xF5, 0xD1, 0xE7, 0xB3, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7153,7 +7153,7 @@ static unsigned char u2c_6A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xD3, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xCC, 0xAC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xEF, 0xE0, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7220,7 +7220,7 @@ static unsigned char u2c_6B[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0xF6, /* 0x74-0x77 */ 0xCF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0xDE, 0xDD, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9, 0xD1, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE4, 0xEA, /* 0x80-0x83 */ 0xF2, 0xCF, 0x00, 0x00, 0xF7, 0xBF, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xE2, 0xE6, 0xE2, 0xA8, 0x00, 0x00, /* 0x88-0x8B */ @@ -7284,7 +7284,7 @@ static unsigned char u2c_6C[512] = { 0x00, 0x00, 0x00, 0x00, 0xDA, 0xA1, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xCC, 0xBD, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xD1, 0xA9, 0xDD, 0xCC, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE3, 0xFE, 0xD1, 0xAA, 0xE8, 0xAA, /* 0x80-0x83 */ 0x00, 0x00, 0xEA, 0xB6, 0xF9, 0xFA, 0xE6, 0xCC, /* 0x84-0x87 */ 0xF6, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7349,7 +7349,7 @@ static unsigned char u2c_6D[512] = { 0xE9, 0xB1, 0x00, 0x00, 0x00, 0x00, 0xFA, 0xAD, /* 0x74-0x77 */ 0xF6, 0xD9, 0xFA, 0xF4, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xAA, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xE6, 0xEE, 0x00, 0x00, 0xCC, 0xDC, /* 0x84-0x87 */ 0xE1, 0xBC, 0xE0, 0xEF, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7416,7 +7416,7 @@ static unsigned char u2c_6E[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xDC, 0xC8, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7484,7 +7484,7 @@ static unsigned char u2c_6F[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xED, 0xD2, 0x00, 0x00, /* 0x78-0x7B */ 0xD4, 0xD8, 0xDC, 0xC9, 0xD7, 0xF1, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xDF, 0xBB, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xF3, 0xA5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xF4, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7552,7 +7552,7 @@ static unsigned char u2c_70[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xCF, 0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xED, 0xC7, 0xEE, 0xAC, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xCC, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xF6, 0xA7, 0x00, 0x00, /* 0x88-0x8B */ @@ -7620,7 +7620,7 @@ static unsigned char u2c_71[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE0, 0xC3, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xE3, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xE9, 0xFB, 0xEA, 0xA8, 0x00, 0x00, /* 0x88-0x8B */ @@ -7688,7 +7688,7 @@ static unsigned char u2c_72[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xF7, 0xE5, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xCC, 0xB2, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xDF, 0xF9, 0xD7, 0xE0, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7756,7 +7756,7 @@ static unsigned char u2c_73[512] = { 0x00, 0x00, 0xD6, 0xB4, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xE2, 0xAE, 0x00, 0x00, 0xD3, 0xB7, 0xFA, 0xCC, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xFA, 0xDC, 0x00, 0x00, 0xED, 0xB5, 0xE1, 0xE3, /* 0x84-0x87 */ 0x00, 0x00, 0xE8, 0xAC, 0x00, 0x00, 0xE8, 0xDD, /* 0x88-0x8B */ @@ -7824,7 +7824,7 @@ static unsigned char u2c_74[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xD0, 0xC8, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xD1, 0xAF, 0xD7, 0xE3, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xC6, /* 0x84-0x87 */ 0x00, 0x00, 0xD6, 0xA2, 0x00, 0x00, 0xED, 0xF0, /* 0x88-0x8B */ @@ -7890,7 +7890,7 @@ static unsigned char u2c_75[512] = { 0x00, 0x00, 0xFB, 0xFE, 0xD3, 0xD7, 0x00, 0x00, /* 0x74-0x77 */ 0xD1, 0xB1, 0x00, 0x00, 0xCB, 0xB1, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD1, 0xB2, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xCB, 0xB2, 0xF1, 0xC2, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xF4, 0xE1, 0xF9, 0xB5, /* 0x88-0x8B */ @@ -7958,7 +7958,7 @@ static unsigned char u2c_76[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xCD, 0xA4, 0x00, 0x00, 0x00, 0x00, 0xD4, 0xF4, /* 0x78-0x7B */ 0xDB, 0xA1, 0xDB, 0xDC, 0xDB, 0xDD, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xEE, 0xDC, 0x00, 0x00, 0xCB, 0xCB, 0xFC, 0xD5, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8026,7 +8026,7 @@ static unsigned char u2c_77[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xD4, 0xA9, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xCD, 0xC2, 0xE7, 0xDA, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0xD9, /* 0x88-0x8B */ @@ -8091,7 +8091,7 @@ static unsigned char u2c_78[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xDD, 0xDD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xD1, 0xB3, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEF, 0xED, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8158,7 +8158,7 @@ static unsigned char u2c_79[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xD1, 0xB8, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD6, 0xDF, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xD0, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8225,7 +8225,7 @@ static unsigned char u2c_7A[512] = { 0xFA, 0xEB, 0x00, 0x00, 0xCF, 0xBC, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xCF, 0xE2, 0xCD, 0xF6, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xEF, 0xF0, 0x00, 0x00, 0xF4, 0xBE, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xD4, 0xCD, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xF3, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xE9, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8293,7 +8293,7 @@ static unsigned char u2c_7B[512] = { 0x00, 0x00, 0xE6, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE8, 0xA4, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCB, 0xCD, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEF, 0xA8, /* 0x88-0x8B */ @@ -8356,7 +8356,7 @@ static unsigned char u2c_7C[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0xFB, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xDD, 0xCF, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8424,7 +8424,7 @@ static unsigned char u2c_7D[512] = { 0x00, 0x00, 0x00, 0x00, 0xEF, 0xBE, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xCC, 0xB5, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCF, 0xBD, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8491,7 +8491,7 @@ static unsigned char u2c_7E[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xE6, 0xBA, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xCD, 0xA9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xF3, 0xC3, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8535,7 +8535,7 @@ static unsigned char u2c_7F[512] = { 0x00, 0x00, 0xD8, 0xE1, 0x00, 0x00, 0xF7, 0xF3, /* 0x74-0x77 */ 0x00, 0x00, 0xD7, 0xE7, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xD4, 0xFE, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xD1, 0xBC, 0x00, 0x00, 0xE5, 0xCF, 0x00, 0x00, /* 0x88-0x8B */ @@ -8603,7 +8603,7 @@ static unsigned char u2c_80[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0xC5, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xF4, 0xE9, 0xD6, 0xEC, 0xEB, 0xD3, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xEC, 0xBD, 0xE2, 0xDC, 0xDE, 0xEB, 0xF0, 0xDC, /* 0x84-0x87 */ 0x00, 0x00, 0xEB, 0xBF, 0x00, 0x00, 0xD7, 0xCE, /* 0x88-0x8B */ @@ -8671,7 +8671,7 @@ static unsigned char u2c_81[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xED, 0xF3, 0xDC, 0xD9, 0xE0, 0xCD, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xDA, /* 0x7C-0x7F */ - + 0xDB, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xCC, 0xAE, 0x00, 0x00, 0xDA, 0xDB, 0x00, 0x00, /* 0x88-0x8B */ @@ -8739,7 +8739,7 @@ static unsigned char u2c_82[512] = { 0x00, 0x00, 0x00, 0x00, 0xE6, 0xFD, 0x00, 0x00, /* 0x74-0x77 */ 0xF5, 0xAC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xE4, 0xF5, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE9, 0xE3, /* 0x88-0x8B */ @@ -8807,7 +8807,7 @@ static unsigned char u2c_83[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xC3, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEE, 0xE2, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xD7, 0xE9, 0xED, 0xF6, 0x00, 0x00, /* 0x88-0x8B */ @@ -8875,7 +8875,7 @@ static unsigned char u2c_84[512] = { 0x00, 0x00, 0xD0, 0xAD, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xF1, 0xF1, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8943,7 +8943,7 @@ static unsigned char u2c_85[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xDA, 0xDD, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xB9, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -9011,7 +9011,7 @@ static unsigned char u2c_86[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xFB, 0xF6, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xDA, 0xA5, 0x00, 0x00, /* 0x88-0x8B */ @@ -9079,7 +9079,7 @@ static unsigned char u2c_87[512] = { 0xFB, 0xDD, 0x00, 0x00, 0xEF, 0xCA, 0x00, 0x00, /* 0x74-0x77 */ 0xE8, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xD5, 0xCC, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -9147,7 +9147,7 @@ static unsigned char u2c_88[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF5, 0xFB, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xD0, 0xDA, 0xD0, 0xDB, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xEA, 0xBE, 0xD9, 0xB1, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xCA, 0xB7, 0x00, 0x00, 0x00, 0x00, 0xD3, 0xE7, /* 0x88-0x8B */ @@ -9215,7 +9215,7 @@ static unsigned char u2c_89[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xA4, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE9, 0xA9, 0x00, 0x00, 0xD3, 0xC7, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xDC, 0xDD, 0xF8, 0xAE, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, 0xB8, /* 0x88-0x8B */ @@ -9282,7 +9282,7 @@ static unsigned char u2c_8A[512] = { 0x00, 0x00, 0xE0, 0xD2, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xF4, 0xDA, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xF1, 0xCA, 0x00, 0x00, 0xCE, 0xA3, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -9350,7 +9350,7 @@ static unsigned char u2c_8B[512] = { 0xCC, 0xB9, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xDE, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE7, 0xE2, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xD4, 0xC1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xDC, 0xA8, 0x00, 0x00, /* 0x88-0x8B */ @@ -9393,7 +9393,7 @@ static unsigned char u2c_8C[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xF8, 0xFB, 0xE3, 0xCF, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xF5, 0xB0, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xD8, 0xE7, 0x00, 0x00, /* 0x88-0x8B */ @@ -9461,7 +9461,7 @@ static unsigned char u2c_8D[512] = { 0xDD, 0xB9, 0x00, 0x00, 0x00, 0x00, 0xD1, 0xC3, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xF5, 0xB1, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xEA, 0xC6, 0x00, 0x00, /* 0x88-0x8B */ @@ -9526,7 +9526,7 @@ static unsigned char u2c_8E[512] = { 0xF5, 0xED, 0x00, 0x00, 0xCF, 0xF3, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xF0, 0xE2, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEE, 0xCE, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xF1, 0xCC, 0x00, 0x00, /* 0x88-0x8B */ @@ -9594,7 +9594,7 @@ static unsigned char u2c_8F[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -9662,7 +9662,7 @@ static unsigned char u2c_90[512] = { 0x00, 0x00, 0xF1, 0xE5, 0x00, 0x00, 0xF4, 0xC3, /* 0x74-0x77 */ 0xE0, 0xD4, 0x00, 0x00, 0xEB, 0xB6, 0x00, 0x00, /* 0x78-0x7B */ 0xD7, 0xA1, 0xCB, 0xE8, 0x00, 0x00, 0xF9, 0xAD, /* 0x7C-0x7F */ - + 0xE9, 0xAD, 0xD8, 0xE4, 0xFA, 0xB3, 0xE2, 0xC5, /* 0x80-0x83 */ 0xFC, 0xBD, 0x00, 0x00, 0x00, 0x00, 0xEC, 0xC4, /* 0x84-0x87 */ 0xD8, 0xB1, 0x00, 0x00, 0xDC, 0xAB, 0x00, 0x00, /* 0x88-0x8B */ @@ -9730,7 +9730,7 @@ static unsigned char u2c_91[512] = { 0x00, 0x00, 0xFD, 0xA3, 0x00, 0x00, 0xFB, 0xE5, /* 0x74-0x77 */ 0xDF, 0xAB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE2, 0xF5, /* 0x84-0x87 */ 0x00, 0x00, 0xF6, 0xAD, 0x00, 0x00, 0xF5, 0xB3, /* 0x88-0x8B */ @@ -9796,7 +9796,7 @@ static unsigned char u2c_92[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xEB, 0xDE, 0x00, 0x00, 0x00, 0x00, 0xF5, 0xC8, /* 0x80-0x83 */ 0x00, 0x00, 0xD4, 0xDE, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -9864,7 +9864,7 @@ static unsigned char u2c_93[512] = { 0x00, 0x00, 0xCB, 0xF5, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xF6, 0xDD, 0x00, 0x00, 0xF1, 0xA3, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -9965,7 +9965,7 @@ static unsigned char u2c_95[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xED, 0xFE, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xDA, 0xA6, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xEC, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xF8, 0xCD, 0x00, 0x00, 0xCB, 0xD2, /* 0x88-0x8B */ @@ -10026,7 +10026,7 @@ static unsigned char u2c_96[512] = { 0x00, 0x00, 0xD7, 0xD5, 0xD4, 0xB6, 0xF9, 0xE8, /* 0x74-0x77 */ 0xD7, 0xC1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE5, 0xD5, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xE9, 0xEA, 0xD7, 0xCC, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xD3, 0xE9, 0xE2, 0xC9, /* 0x88-0x8B */ @@ -10093,7 +10093,7 @@ static unsigned char u2c_97[512] = { 0xFC, 0xA8, 0x00, 0x00, 0x00, 0x00, 0xEC, 0xE6, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xD8, 0xCB, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xB9, /* 0x88-0x8B */ @@ -10161,7 +10161,7 @@ static unsigned char u2c_98[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10229,7 +10229,7 @@ static unsigned char u2c_99[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10297,7 +10297,7 @@ static unsigned char u2c_9A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10361,7 +10361,7 @@ static unsigned char u2c_9B[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10424,7 +10424,7 @@ static unsigned char u2c_9C[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10490,7 +10490,7 @@ static unsigned char u2c_9D[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10557,7 +10557,7 @@ static unsigned char u2c_9E[512] = { 0x00, 0x00, 0xD6, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xF9, 0xE9, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE7, 0xA4, 0x00, 0x00, 0xD6, 0xE3, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10623,7 +10623,7 @@ static unsigned char u2c_9F[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE4, 0xCB, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -10667,7 +10667,7 @@ static unsigned char u2c_AC[512] = { 0xB0, 0xC7, 0x81, 0x9B, 0x81, 0x9C, 0xB0, 0xC8, /* 0x74-0x77 */ 0xB0, 0xC9, 0x81, 0x9D, 0xB0, 0xCA, 0x81, 0x9E, /* 0x78-0x7B */ 0x81, 0x9F, 0x81, 0xA0, 0x81, 0xA1, 0x81, 0xA2, /* 0x7C-0x7F */ - + 0xB0, 0xCB, 0xB0, 0xCC, 0x81, 0xA3, 0xB0, 0xCD, /* 0x80-0x83 */ 0xB0, 0xCE, 0xB0, 0xCF, 0xB0, 0xD0, 0x81, 0xA4, /* 0x84-0x87 */ 0x81, 0xA5, 0xB0, 0xD1, 0xB0, 0xD2, 0xB0, 0xD3, /* 0x88-0x8B */ @@ -10735,7 +10735,7 @@ static unsigned char u2c_AD[512] = { 0xB1, 0xBC, 0xB1, 0xBD, 0xB1, 0xBE, 0x82, 0x96, /* 0x74-0x77 */ 0x82, 0x97, 0x82, 0x98, 0x82, 0x99, 0xB1, 0xBF, /* 0x78-0x7B */ 0xB1, 0xC0, 0xB1, 0xC1, 0x82, 0x9A, 0xB1, 0xC2, /* 0x7C-0x7F */ - + 0x82, 0x9B, 0xB1, 0xC3, 0xB1, 0xC4, 0x82, 0x9C, /* 0x80-0x83 */ 0x82, 0x9D, 0x82, 0x9E, 0x82, 0x9F, 0x82, 0xA0, /* 0x84-0x87 */ 0xB1, 0xC5, 0xB1, 0xC6, 0x82, 0xA1, 0x82, 0xA2, /* 0x88-0x8B */ @@ -10803,7 +10803,7 @@ static unsigned char u2c_AE[512] = { 0x83, 0xA2, 0x83, 0xA3, 0x83, 0xA4, 0x83, 0xA5, /* 0x74-0x77 */ 0xB1, 0xFE, 0xB2, 0xA1, 0x83, 0xA6, 0xB2, 0xA2, /* 0x78-0x7B */ 0xB2, 0xA3, 0xB2, 0xA4, 0x83, 0xA7, 0x83, 0xA8, /* 0x7C-0x7F */ - + 0x83, 0xA9, 0x83, 0xAA, 0x83, 0xAB, 0x83, 0xAC, /* 0x80-0x83 */ 0xB2, 0xA5, 0xB2, 0xA6, 0x83, 0xAD, 0x83, 0xAE, /* 0x84-0x87 */ 0x83, 0xAF, 0x83, 0xB0, 0x83, 0xB1, 0x83, 0xB2, /* 0x88-0x8B */ @@ -10871,7 +10871,7 @@ static unsigned char u2c_AF[512] = { 0x84, 0xBF, 0x84, 0xC0, 0x84, 0xC1, 0x84, 0xC2, /* 0x74-0x77 */ 0x84, 0xC3, 0xB2, 0xD1, 0x84, 0xC4, 0x84, 0xC5, /* 0x78-0x7B */ 0x84, 0xC6, 0x84, 0xC7, 0x84, 0xC8, 0x84, 0xC9, /* 0x7C-0x7F */ - + 0xB2, 0xD2, 0x84, 0xCA, 0x84, 0xCB, 0x84, 0xCC, /* 0x80-0x83 */ 0xB2, 0xD3, 0x84, 0xCD, 0x84, 0xCE, 0x84, 0xCF, /* 0x84-0x87 */ 0xB2, 0xD4, 0x84, 0xD0, 0x84, 0xD1, 0x84, 0xD2, /* 0x88-0x8B */ @@ -10939,7 +10939,7 @@ static unsigned char u2c_B0[512] = { 0x85, 0xDE, 0x85, 0xDF, 0x85, 0xE0, 0x85, 0xE1, /* 0x74-0x77 */ 0x85, 0xE2, 0x85, 0xE3, 0x85, 0xE4, 0x85, 0xE5, /* 0x78-0x7B */ 0xB3, 0xA2, 0xB3, 0xA3, 0x85, 0xE6, 0x85, 0xE7, /* 0x7C-0x7F */ - + 0xB3, 0xA4, 0x85, 0xE8, 0x85, 0xE9, 0x85, 0xEA, /* 0x80-0x83 */ 0xB3, 0xA5, 0x85, 0xEB, 0x85, 0xEC, 0x85, 0xED, /* 0x84-0x87 */ 0x85, 0xEE, 0x85, 0xEF, 0x85, 0xF0, 0x85, 0xF1, /* 0x88-0x8B */ @@ -11007,7 +11007,7 @@ static unsigned char u2c_B1[512] = { 0x86, 0xE3, 0x86, 0xE4, 0x86, 0xE5, 0x86, 0xE6, /* 0x74-0x77 */ 0xB3, 0xEB, 0xB3, 0xEC, 0x86, 0xE7, 0x86, 0xE8, /* 0x78-0x7B */ 0xB3, 0xED, 0x86, 0xE9, 0x86, 0xEA, 0x86, 0xEB, /* 0x7C-0x7F */ - + 0xB3, 0xEE, 0x86, 0xEC, 0xB3, 0xEF, 0x86, 0xED, /* 0x80-0x83 */ 0x86, 0xEE, 0x86, 0xEF, 0x86, 0xF0, 0x86, 0xF1, /* 0x84-0x87 */ 0xB3, 0xF0, 0xB3, 0xF1, 0x86, 0xF2, 0xB3, 0xF2, /* 0x88-0x8B */ @@ -11075,7 +11075,7 @@ static unsigned char u2c_B2[512] = { 0xB4, 0xBA, 0xB4, 0xBB, 0x88, 0x46, 0x88, 0x47, /* 0x74-0x77 */ 0x88, 0x48, 0x88, 0x49, 0x88, 0x4A, 0x88, 0x4B, /* 0x78-0x7B */ 0xB4, 0xBC, 0x88, 0x4C, 0x88, 0x4D, 0x88, 0x4E, /* 0x7C-0x7F */ - + 0x88, 0x4F, 0x88, 0x50, 0x88, 0x51, 0x88, 0x52, /* 0x80-0x83 */ 0xB4, 0xBD, 0xB4, 0xBE, 0x88, 0x53, 0x88, 0x54, /* 0x84-0x87 */ 0x88, 0x55, 0xB4, 0xBF, 0x88, 0x56, 0x88, 0x57, /* 0x88-0x8B */ @@ -11143,7 +11143,7 @@ static unsigned char u2c_B3[512] = { 0xB5, 0xA7, 0x89, 0x49, 0x89, 0x4A, 0x89, 0x4B, /* 0x74-0x77 */ 0xB5, 0xA8, 0x89, 0x4C, 0x89, 0x4D, 0x89, 0x4E, /* 0x78-0x7B */ 0x89, 0x4F, 0x89, 0x50, 0x89, 0x51, 0x89, 0x52, /* 0x7C-0x7F */ - + 0xB5, 0xA9, 0xB5, 0xAA, 0x89, 0x53, 0xB5, 0xAB, /* 0x80-0x83 */ 0xB5, 0xAC, 0xB5, 0xAD, 0x89, 0x54, 0x89, 0x55, /* 0x84-0x87 */ 0x89, 0x56, 0x89, 0x57, 0x89, 0x58, 0x89, 0x59, /* 0x88-0x8B */ @@ -11211,7 +11211,7 @@ static unsigned char u2c_B4[512] = { 0x8A, 0x6D, 0x8A, 0x6E, 0x8A, 0x6F, 0x8A, 0x70, /* 0x74-0x77 */ 0x8A, 0x71, 0x8A, 0x72, 0x8A, 0x73, 0x8A, 0x74, /* 0x78-0x7B */ 0x8A, 0x75, 0x8A, 0x76, 0x8A, 0x77, 0x8A, 0x78, /* 0x7C-0x7F */ - + 0xB5, 0xD7, 0x8A, 0x79, 0x8A, 0x7A, 0x8A, 0x81, /* 0x80-0x83 */ 0x8A, 0x82, 0x8A, 0x83, 0x8A, 0x84, 0x8A, 0x85, /* 0x84-0x87 */ 0xB5, 0xD8, 0x8A, 0x86, 0x8A, 0x87, 0x8A, 0x88, /* 0x88-0x8B */ @@ -11279,7 +11279,7 @@ static unsigned char u2c_B5[512] = { 0x8B, 0x8A, 0x8B, 0x8B, 0x8B, 0x8C, 0x8B, 0x8D, /* 0x74-0x77 */ 0x8B, 0x8E, 0x8B, 0x8F, 0x8B, 0x90, 0x8B, 0x91, /* 0x78-0x7B */ 0x8B, 0x92, 0x8B, 0x93, 0x8B, 0x94, 0x8B, 0x95, /* 0x7C-0x7F */ - + 0x8B, 0x96, 0x8B, 0x97, 0x8B, 0x98, 0x8B, 0x99, /* 0x80-0x83 */ 0x8B, 0x9A, 0x8B, 0x9B, 0x8B, 0x9C, 0x8B, 0x9D, /* 0x84-0x87 */ 0x8B, 0x9E, 0x8B, 0x9F, 0x8B, 0xA0, 0x8B, 0xA1, /* 0x88-0x8B */ @@ -11347,7 +11347,7 @@ static unsigned char u2c_B6[512] = { 0x8C, 0xB7, 0x8C, 0xB8, 0x8C, 0xB9, 0x8C, 0xBA, /* 0x74-0x77 */ 0x8C, 0xBB, 0x8C, 0xBC, 0x8C, 0xBD, 0x8C, 0xBE, /* 0x78-0x7B */ 0x8C, 0xBF, 0x8C, 0xC0, 0x8C, 0xC1, 0x8C, 0xC2, /* 0x7C-0x7F */ - + 0x8C, 0xC3, 0x8C, 0xC4, 0x8C, 0xC5, 0x8C, 0xC6, /* 0x80-0x83 */ 0x8C, 0xC7, 0x8C, 0xC8, 0x8C, 0xC9, 0x8C, 0xCA, /* 0x84-0x87 */ 0x8C, 0xCB, 0x8C, 0xCC, 0x8C, 0xCD, 0x8C, 0xCE, /* 0x88-0x8B */ @@ -11415,7 +11415,7 @@ static unsigned char u2c_B7[512] = { 0x8D, 0xE4, 0xB6, 0xF2, 0x8D, 0xE5, 0x8D, 0xE6, /* 0x74-0x77 */ 0x8D, 0xE7, 0x8D, 0xE8, 0x8D, 0xE9, 0x8D, 0xEA, /* 0x78-0x7B */ 0xB6, 0xF3, 0xB6, 0xF4, 0x8D, 0xEB, 0x8D, 0xEC, /* 0x7C-0x7F */ - + 0xB6, 0xF5, 0x8D, 0xED, 0x8D, 0xEE, 0x8D, 0xEF, /* 0x80-0x83 */ 0xB6, 0xF6, 0x8D, 0xF0, 0x8D, 0xF1, 0x8D, 0xF2, /* 0x84-0x87 */ 0x8D, 0xF3, 0x8D, 0xF4, 0x8D, 0xF5, 0x8D, 0xF6, /* 0x88-0x8B */ @@ -11483,7 +11483,7 @@ static unsigned char u2c_B8[512] = { 0x8E, 0xF0, 0x8E, 0xF1, 0x8E, 0xF2, 0x8E, 0xF3, /* 0x74-0x77 */ 0xB7, 0xD6, 0x8E, 0xF4, 0x8E, 0xF5, 0x8E, 0xF6, /* 0x78-0x7B */ 0xB7, 0xD7, 0x8E, 0xF7, 0x8E, 0xF8, 0x8E, 0xF9, /* 0x7C-0x7F */ - + 0x8E, 0xFA, 0x8E, 0xFB, 0x8E, 0xFC, 0x8E, 0xFD, /* 0x80-0x83 */ 0x8E, 0xFE, 0x8F, 0x41, 0x8F, 0x42, 0x8F, 0x43, /* 0x84-0x87 */ 0x8F, 0x44, 0x8F, 0x45, 0x8F, 0x46, 0x8F, 0x47, /* 0x88-0x8B */ @@ -11551,7 +11551,7 @@ static unsigned char u2c_B9[512] = { 0xB8, 0xA3, 0xB8, 0xA4, 0x90, 0x55, 0x90, 0x56, /* 0x74-0x77 */ 0xB8, 0xA5, 0x90, 0x57, 0x90, 0x58, 0x90, 0x59, /* 0x78-0x7B */ 0xB8, 0xA6, 0x90, 0x5A, 0x90, 0x61, 0x90, 0x62, /* 0x7C-0x7F */ - + 0x90, 0x63, 0x90, 0x64, 0x90, 0x65, 0x90, 0x66, /* 0x80-0x83 */ 0xB8, 0xA7, 0xB8, 0xA8, 0x90, 0x67, 0xB8, 0xA9, /* 0x84-0x87 */ 0x90, 0x68, 0xB8, 0xAA, 0xB8, 0xAB, 0x90, 0x69, /* 0x88-0x8B */ @@ -11619,7 +11619,7 @@ static unsigned char u2c_BA[512] = { 0xB8, 0xE9, 0x91, 0x63, 0x91, 0x64, 0x91, 0x65, /* 0x74-0x77 */ 0xB8, 0xEA, 0x91, 0x66, 0x91, 0x67, 0x91, 0x68, /* 0x78-0x7B */ 0x91, 0x69, 0x91, 0x6A, 0x91, 0x6B, 0x91, 0x6C, /* 0x7C-0x7F */ - + 0x91, 0x6D, 0x91, 0x6E, 0x91, 0x6F, 0xB8, 0xEB, /* 0x80-0x83 */ 0xB8, 0xEC, 0xB8, 0xED, 0x91, 0x70, 0xB8, 0xEE, /* 0x84-0x87 */ 0x91, 0x71, 0x91, 0x72, 0x91, 0x73, 0x91, 0x74, /* 0x88-0x8B */ @@ -11687,7 +11687,7 @@ static unsigned char u2c_BB[512] = { 0x92, 0x83, 0x92, 0x84, 0x92, 0x85, 0x92, 0x86, /* 0x74-0x77 */ 0x92, 0x87, 0x92, 0x88, 0x92, 0x89, 0x92, 0x8A, /* 0x78-0x7B */ 0x92, 0x8B, 0x92, 0x8C, 0x92, 0x8D, 0x92, 0x8E, /* 0x7C-0x7F */ - + 0x92, 0x8F, 0x92, 0x90, 0x92, 0x91, 0x92, 0x92, /* 0x80-0x83 */ 0x92, 0x93, 0x92, 0x94, 0x92, 0x95, 0x92, 0x96, /* 0x84-0x87 */ 0xB9, 0xBF, 0x92, 0x97, 0x92, 0x98, 0x92, 0x99, /* 0x88-0x8B */ @@ -11755,7 +11755,7 @@ static unsigned char u2c_BC[512] = { 0x93, 0x9A, 0x93, 0x9B, 0x93, 0x9C, 0x93, 0x9D, /* 0x74-0x77 */ 0x93, 0x9E, 0x93, 0x9F, 0x93, 0xA0, 0x93, 0xA1, /* 0x78-0x7B */ 0x93, 0xA2, 0x93, 0xA3, 0x93, 0xA4, 0x93, 0xA5, /* 0x7C-0x7F */ - + 0x93, 0xA6, 0x93, 0xA7, 0x93, 0xA8, 0x93, 0xA9, /* 0x80-0x83 */ 0xB9, 0xF6, 0xB9, 0xF7, 0x93, 0xAA, 0x93, 0xAB, /* 0x84-0x87 */ 0xB9, 0xF8, 0x93, 0xAC, 0x93, 0xAD, 0xB9, 0xF9, /* 0x88-0x8B */ @@ -11823,7 +11823,7 @@ static unsigned char u2c_BD[512] = { 0x94, 0xB2, 0x94, 0xB3, 0x94, 0xB4, 0x94, 0xB5, /* 0x74-0x77 */ 0x94, 0xB6, 0x94, 0xB7, 0x94, 0xB8, 0x94, 0xB9, /* 0x78-0x7B */ 0x94, 0xBA, 0x94, 0xBB, 0x94, 0xBC, 0x94, 0xBD, /* 0x7C-0x7F */ - + 0xBA, 0xCE, 0xBA, 0xCF, 0x94, 0xBE, 0x94, 0xBF, /* 0x80-0x83 */ 0xBA, 0xD0, 0x94, 0xC0, 0x94, 0xC1, 0xBA, 0xD1, /* 0x84-0x87 */ 0xBA, 0xD2, 0xBA, 0xD3, 0xBA, 0xD4, 0x94, 0xC2, /* 0x88-0x8B */ @@ -11891,7 +11891,7 @@ static unsigned char u2c_BE[512] = { 0xBB, 0xA6, 0xBB, 0xA7, 0x95, 0xCA, 0x95, 0xCB, /* 0x74-0x77 */ 0x95, 0xCC, 0x95, 0xCD, 0x95, 0xCE, 0xBB, 0xA8, /* 0x78-0x7B */ 0xBB, 0xA9, 0xBB, 0xAA, 0x95, 0xCF, 0x95, 0xD0, /* 0x7C-0x7F */ - + 0xBB, 0xAB, 0x95, 0xD1, 0x95, 0xD2, 0x95, 0xD3, /* 0x80-0x83 */ 0xBB, 0xAC, 0x95, 0xD4, 0x95, 0xD5, 0x95, 0xD6, /* 0x84-0x87 */ 0x95, 0xD7, 0x95, 0xD8, 0x95, 0xD9, 0x95, 0xDA, /* 0x88-0x8B */ @@ -11959,7 +11959,7 @@ static unsigned char u2c_BF[512] = { 0x96, 0xF0, 0x96, 0xF1, 0x96, 0xF2, 0x96, 0xF3, /* 0x74-0x77 */ 0x96, 0xF4, 0x96, 0xF5, 0x96, 0xF6, 0x96, 0xF7, /* 0x78-0x7B */ 0x96, 0xF8, 0x96, 0xF9, 0x96, 0xFA, 0x96, 0xFB, /* 0x7C-0x7F */ - + 0x96, 0xFC, 0x96, 0xFD, 0x96, 0xFE, 0x97, 0x41, /* 0x80-0x83 */ 0x97, 0x42, 0x97, 0x43, 0x97, 0x44, 0x97, 0x45, /* 0x84-0x87 */ 0x97, 0x46, 0x97, 0x47, 0x97, 0x48, 0x97, 0x49, /* 0x88-0x8B */ @@ -12027,7 +12027,7 @@ static unsigned char u2c_C0[512] = { 0x98, 0x75, 0x98, 0x76, 0x98, 0x77, 0x98, 0x78, /* 0x74-0x77 */ 0x98, 0x79, 0x98, 0x7A, 0x98, 0x81, 0x98, 0x82, /* 0x78-0x7B */ 0x98, 0x83, 0x98, 0x84, 0x98, 0x85, 0x98, 0x86, /* 0x7C-0x7F */ - + 0x98, 0x87, 0x98, 0x88, 0x98, 0x89, 0x98, 0x8A, /* 0x80-0x83 */ 0x98, 0x8B, 0x98, 0x8C, 0x98, 0x8D, 0x98, 0x8E, /* 0x84-0x87 */ 0x98, 0x8F, 0x98, 0x90, 0x98, 0x91, 0x98, 0x92, /* 0x88-0x8B */ @@ -12095,7 +12095,7 @@ static unsigned char u2c_C1[512] = { 0xBC, 0xCF, 0x99, 0x75, 0x99, 0x76, 0x99, 0x77, /* 0x74-0x77 */ 0xBC, 0xD0, 0x99, 0x78, 0x99, 0x79, 0x99, 0x7A, /* 0x78-0x7B */ 0x99, 0x81, 0x99, 0x82, 0x99, 0x83, 0x99, 0x84, /* 0x7C-0x7F */ - + 0x99, 0x85, 0x99, 0x86, 0x99, 0x87, 0x99, 0x88, /* 0x80-0x83 */ 0x99, 0x89, 0xBC, 0xD1, 0x99, 0x8A, 0x99, 0x8B, /* 0x84-0x87 */ 0x99, 0x8C, 0x99, 0x8D, 0x99, 0x8E, 0x99, 0x8F, /* 0x88-0x8B */ @@ -12163,7 +12163,7 @@ static unsigned char u2c_C2[512] = { 0xBD, 0xAF, 0x9A, 0x8B, 0x9A, 0x8C, 0x9A, 0x8D, /* 0x74-0x77 */ 0x9A, 0x8E, 0x9A, 0x8F, 0x9A, 0x90, 0x9A, 0x91, /* 0x78-0x7B */ 0xBD, 0xB0, 0xBD, 0xB1, 0x9A, 0x92, 0xBD, 0xB2, /* 0x7C-0x7F */ - + 0x9A, 0x93, 0xBD, 0xB3, 0x9A, 0x94, 0x9A, 0x95, /* 0x80-0x83 */ 0x9A, 0x96, 0x9A, 0x97, 0x9A, 0x98, 0x9A, 0x99, /* 0x84-0x87 */ 0xBD, 0xB4, 0xBD, 0xB5, 0x9A, 0x9A, 0x9A, 0x9B, /* 0x88-0x8B */ @@ -12231,7 +12231,7 @@ static unsigned char u2c_C3[512] = { 0x9B, 0xA2, 0x9B, 0xA3, 0x9B, 0xA4, 0x9B, 0xA5, /* 0x74-0x77 */ 0xBD, 0xE6, 0xBD, 0xE7, 0x9B, 0xA6, 0x9B, 0xA7, /* 0x78-0x7B */ 0xBD, 0xE8, 0xBD, 0xE9, 0x9B, 0xA8, 0x9B, 0xA9, /* 0x7C-0x7F */ - + 0x9B, 0xAA, 0x9B, 0xAB, 0x9B, 0xAC, 0x9B, 0xAD, /* 0x80-0x83 */ 0xBD, 0xEA, 0x9B, 0xAE, 0x9B, 0xAF, 0x9B, 0xB0, /* 0x84-0x87 */ 0xBD, 0xEB, 0x9B, 0xB1, 0x9B, 0xB2, 0x9B, 0xB3, /* 0x88-0x8B */ @@ -12299,7 +12299,7 @@ static unsigned char u2c_C4[512] = { 0xBE, 0xA9, 0xBE, 0xAA, 0x9C, 0xCF, 0x9C, 0xD0, /* 0x74-0x77 */ 0x9C, 0xD1, 0xBE, 0xAB, 0x9C, 0xD2, 0x9C, 0xD3, /* 0x78-0x7B */ 0x9C, 0xD4, 0x9C, 0xD5, 0x9C, 0xD6, 0x9C, 0xD7, /* 0x7C-0x7F */ - + 0xBE, 0xAC, 0x9C, 0xD8, 0x9C, 0xD9, 0x9C, 0xDA, /* 0x80-0x83 */ 0x9C, 0xDB, 0x9C, 0xDC, 0x9C, 0xDD, 0x9C, 0xDE, /* 0x84-0x87 */ 0x9C, 0xDF, 0x9C, 0xE0, 0x9C, 0xE1, 0x9C, 0xE2, /* 0x88-0x8B */ @@ -12367,7 +12367,7 @@ static unsigned char u2c_C5[512] = { 0xBE, 0xDD, 0xBE, 0xDE, 0x9D, 0xE9, 0x9D, 0xEA, /* 0x74-0x77 */ 0x9D, 0xEB, 0x9D, 0xEC, 0x9D, 0xED, 0x9D, 0xEE, /* 0x78-0x7B */ 0xBE, 0xDF, 0xBE, 0xE0, 0x9D, 0xEF, 0x9D, 0xF0, /* 0x7C-0x7F */ - + 0xBE, 0xE1, 0x9D, 0xF1, 0x9D, 0xF2, 0x9D, 0xF3, /* 0x80-0x83 */ 0xBE, 0xE2, 0x9D, 0xF4, 0x9D, 0xF5, 0xBE, 0xE3, /* 0x84-0x87 */ 0x9D, 0xF6, 0x9D, 0xF7, 0x9D, 0xF8, 0x9D, 0xF9, /* 0x88-0x8B */ @@ -12435,7 +12435,7 @@ static unsigned char u2c_C6[512] = { 0x9E, 0xDA, 0x9E, 0xDB, 0x9E, 0xDC, 0x9E, 0xDD, /* 0x74-0x77 */ 0xBF, 0xDC, 0xBF, 0xDD, 0x9E, 0xDE, 0x9E, 0xDF, /* 0x78-0x7B */ 0xBF, 0xDE, 0x9E, 0xE0, 0x9E, 0xE1, 0x9E, 0xE2, /* 0x7C-0x7F */ - + 0xBF, 0xDF, 0x9E, 0xE3, 0x9E, 0xE4, 0x9E, 0xE5, /* 0x80-0x83 */ 0x9E, 0xE6, 0x9E, 0xE7, 0x9E, 0xE8, 0x9E, 0xE9, /* 0x84-0x87 */ 0xBF, 0xE0, 0xBF, 0xE1, 0x9E, 0xEA, 0xBF, 0xE2, /* 0x88-0x8B */ @@ -12503,7 +12503,7 @@ static unsigned char u2c_C7[512] = { 0xC0, 0xCC, 0xC0, 0xCD, 0x9F, 0xDA, 0x9F, 0xDB, /* 0x74-0x77 */ 0xC0, 0xCE, 0x9F, 0xDC, 0x9F, 0xDD, 0x9F, 0xDE, /* 0x78-0x7B */ 0xC0, 0xCF, 0xC0, 0xD0, 0xC0, 0xD1, 0x9F, 0xDF, /* 0x7C-0x7F */ - + 0x9F, 0xE0, 0x9F, 0xE1, 0x9F, 0xE2, 0xC0, 0xD2, /* 0x80-0x83 */ 0xC0, 0xD3, 0xC0, 0xD4, 0x9F, 0xE3, 0xC0, 0xD5, /* 0x84-0x87 */ 0xC0, 0xD6, 0xC0, 0xD7, 0xC0, 0xD8, 0x9F, 0xE4, /* 0x88-0x8B */ @@ -12571,7 +12571,7 @@ static unsigned char u2c_C8[512] = { 0xC1, 0xB8, 0xA0, 0xDE, 0xA0, 0xDF, 0xA0, 0xE0, /* 0x74-0x77 */ 0xC1, 0xB9, 0xA0, 0xE1, 0xC1, 0xBA, 0xA0, 0xE2, /* 0x78-0x7B */ 0xA0, 0xE3, 0xA0, 0xE4, 0xA0, 0xE5, 0xA0, 0xE6, /* 0x7C-0x7F */ - + 0xC1, 0xBB, 0xC1, 0xBC, 0xA0, 0xE7, 0xC1, 0xBD, /* 0x80-0x83 */ 0xA0, 0xE8, 0xC1, 0xBE, 0xC1, 0xBF, 0xC1, 0xC0, /* 0x84-0x87 */ 0xA0, 0xE9, 0xA0, 0xEA, 0xA0, 0xEB, 0xC1, 0xC1, /* 0x88-0x8B */ @@ -12639,7 +12639,7 @@ static unsigned char u2c_C9[512] = { 0xC1, 0xEC, 0xA3, 0x44, 0xA3, 0x45, 0xA3, 0x46, /* 0x74-0x77 */ 0xA3, 0x47, 0xA3, 0x48, 0xA3, 0x49, 0xA3, 0x4A, /* 0x78-0x7B */ 0xC1, 0xED, 0xA3, 0x4B, 0xA3, 0x4C, 0xA3, 0x4D, /* 0x7C-0x7F */ - + 0xA3, 0x4E, 0xA3, 0x4F, 0xA3, 0x50, 0xA3, 0x51, /* 0x80-0x83 */ 0xA3, 0x52, 0xA3, 0x53, 0xA3, 0x54, 0xA3, 0x55, /* 0x84-0x87 */ 0xC1, 0xEE, 0xC1, 0xEF, 0xA3, 0x56, 0xA3, 0x57, /* 0x88-0x8B */ @@ -12707,7 +12707,7 @@ static unsigned char u2c_CA[512] = { 0xA5, 0x6A, 0xA5, 0x6B, 0xA5, 0x6C, 0xA5, 0x6D, /* 0x74-0x77 */ 0xA5, 0x6E, 0xA5, 0x6F, 0xA5, 0x70, 0xA5, 0x71, /* 0x78-0x7B */ 0xA5, 0x72, 0xC2, 0xC6, 0xA5, 0x73, 0xA5, 0x74, /* 0x7C-0x7F */ - + 0xA5, 0x75, 0xA5, 0x76, 0xA5, 0x77, 0xA5, 0x78, /* 0x80-0x83 */ 0xC2, 0xC7, 0xA5, 0x79, 0xA5, 0x7A, 0xA5, 0x81, /* 0x84-0x87 */ 0xA5, 0x82, 0xA5, 0x83, 0xA5, 0x84, 0xA5, 0x85, /* 0x88-0x8B */ @@ -12775,7 +12775,7 @@ static unsigned char u2c_CB[512] = { 0xA8, 0x48, 0xA8, 0x49, 0xA8, 0x4A, 0xA8, 0x4B, /* 0x74-0x77 */ 0xC2, 0xE6, 0xC2, 0xE7, 0xA8, 0x4C, 0xA8, 0x4D, /* 0x78-0x7B */ 0xA8, 0x4E, 0xA8, 0x4F, 0xA8, 0x50, 0xA8, 0x51, /* 0x7C-0x7F */ - + 0xA8, 0x52, 0xA8, 0x53, 0xA8, 0x54, 0xA8, 0x55, /* 0x80-0x83 */ 0xA8, 0x56, 0xA8, 0x57, 0xA8, 0x58, 0xA8, 0x59, /* 0x84-0x87 */ 0xA8, 0x5A, 0xA8, 0x61, 0xA8, 0x62, 0xA8, 0x63, /* 0x88-0x8B */ @@ -12843,7 +12843,7 @@ static unsigned char u2c_CC[512] = { 0xAA, 0x82, 0xC3, 0xB2, 0xAA, 0x83, 0xAA, 0x84, /* 0x74-0x77 */ 0xAA, 0x85, 0xAA, 0x86, 0xAA, 0x87, 0xAA, 0x88, /* 0x78-0x7B */ 0xAA, 0x89, 0xAA, 0x8A, 0xAA, 0x8B, 0xAA, 0x8C, /* 0x7C-0x7F */ - + 0xAA, 0x8D, 0xAA, 0x8E, 0xAA, 0x8F, 0xAA, 0x90, /* 0x80-0x83 */ 0xAA, 0x91, 0xAA, 0x92, 0xAA, 0x93, 0xAA, 0x94, /* 0x84-0x87 */ 0xAA, 0x95, 0xAA, 0x96, 0xAA, 0x97, 0xAA, 0x98, /* 0x88-0x8B */ @@ -12911,7 +12911,7 @@ static unsigned char u2c_CD[512] = { 0xAD, 0x4F, 0xAD, 0x50, 0xAD, 0x51, 0xAD, 0x52, /* 0x74-0x77 */ 0xC3, 0xDD, 0xAD, 0x53, 0xAD, 0x54, 0xAD, 0x55, /* 0x78-0x7B */ 0xAD, 0x56, 0xAD, 0x57, 0xAD, 0x58, 0xAD, 0x59, /* 0x7C-0x7F */ - + 0xAD, 0x5A, 0xAD, 0x61, 0xAD, 0x62, 0xAD, 0x63, /* 0x80-0x83 */ 0xAD, 0x64, 0xAD, 0x65, 0xAD, 0x66, 0xAD, 0x67, /* 0x84-0x87 */ 0xC3, 0xDE, 0xAD, 0x68, 0xAD, 0x69, 0xAD, 0x6A, /* 0x88-0x8B */ @@ -12979,7 +12979,7 @@ static unsigned char u2c_CE[512] = { 0xC4, 0xAB, 0xC4, 0xAC, 0xAF, 0x87, 0xAF, 0x88, /* 0x74-0x77 */ 0xC4, 0xAD, 0xAF, 0x89, 0xAF, 0x8A, 0xAF, 0x8B, /* 0x78-0x7B */ 0xC4, 0xAE, 0xAF, 0x8C, 0xAF, 0x8D, 0xAF, 0x8E, /* 0x7C-0x7F */ - + 0xAF, 0x8F, 0xAF, 0x90, 0xAF, 0x91, 0xAF, 0x92, /* 0x80-0x83 */ 0xC4, 0xAF, 0xC4, 0xB0, 0xAF, 0x93, 0xC4, 0xB1, /* 0x84-0x87 */ 0xAF, 0x94, 0xC4, 0xB2, 0xAF, 0x95, 0xAF, 0x96, /* 0x88-0x8B */ @@ -13047,7 +13047,7 @@ static unsigned char u2c_CF[512] = { 0xC4, 0xE4, 0xB2, 0x46, 0xB2, 0x47, 0xB2, 0x48, /* 0x74-0x77 */ 0xC4, 0xE5, 0xB2, 0x49, 0xB2, 0x4A, 0xB2, 0x4B, /* 0x78-0x7B */ 0xB2, 0x4C, 0xB2, 0x4D, 0xB2, 0x4E, 0xB2, 0x4F, /* 0x7C-0x7F */ - + 0xC4, 0xE6, 0xB2, 0x50, 0xB2, 0x51, 0xB2, 0x52, /* 0x80-0x83 */ 0xB2, 0x53, 0xC4, 0xE7, 0xB2, 0x54, 0xB2, 0x55, /* 0x84-0x87 */ 0xB2, 0x56, 0xB2, 0x57, 0xB2, 0x58, 0xB2, 0x59, /* 0x88-0x8B */ @@ -13115,7 +13115,7 @@ static unsigned char u2c_D0[512] = { 0xC5, 0xAC, 0xB4, 0x84, 0xB4, 0x85, 0xB4, 0x86, /* 0x74-0x77 */ 0xB4, 0x87, 0xB4, 0x88, 0xB4, 0x89, 0xB4, 0x8A, /* 0x78-0x7B */ 0xC5, 0xAD, 0xC5, 0xAE, 0xB4, 0x8B, 0xB4, 0x8C, /* 0x7C-0x7F */ - + 0xB4, 0x8D, 0xC5, 0xAF, 0xB4, 0x8E, 0xB4, 0x8F, /* 0x80-0x83 */ 0xB4, 0x90, 0xB4, 0x91, 0xB4, 0x92, 0xB4, 0x93, /* 0x84-0x87 */ 0xB4, 0x94, 0xB4, 0x95, 0xB4, 0x96, 0xB4, 0x97, /* 0x88-0x8B */ @@ -13183,7 +13183,7 @@ static unsigned char u2c_D1[512] = { 0xB7, 0x47, 0xB7, 0x48, 0xB7, 0x49, 0xB7, 0x4A, /* 0x74-0x77 */ 0xB7, 0x4B, 0xB7, 0x4C, 0xB7, 0x4D, 0xB7, 0x4E, /* 0x78-0x7B */ 0xC5, 0xE1, 0xB7, 0x4F, 0xB7, 0x50, 0xB7, 0x51, /* 0x7C-0x7F */ - + 0xB7, 0x52, 0xB7, 0x53, 0xB7, 0x54, 0xB7, 0x55, /* 0x80-0x83 */ 0xC5, 0xE2, 0xB7, 0x56, 0xB7, 0x57, 0xB7, 0x58, /* 0x84-0x87 */ 0xC5, 0xE3, 0xB7, 0x59, 0xB7, 0x5A, 0xB7, 0x61, /* 0x88-0x8B */ @@ -13251,7 +13251,7 @@ static unsigned char u2c_D2[512] = { 0xB9, 0x8C, 0xB9, 0x8D, 0xB9, 0x8E, 0xB9, 0x8F, /* 0x74-0x77 */ 0xB9, 0x90, 0xB9, 0x91, 0xB9, 0x92, 0xB9, 0x93, /* 0x78-0x7B */ 0xB9, 0x94, 0xB9, 0x95, 0xB9, 0x96, 0xB9, 0x97, /* 0x7C-0x7F */ - + 0xC6, 0xA2, 0xC6, 0xA3, 0xB9, 0x98, 0xB9, 0x99, /* 0x80-0x83 */ 0xC6, 0xA4, 0xB9, 0x9A, 0xB9, 0x9B, 0xB9, 0x9C, /* 0x84-0x87 */ 0xC6, 0xA5, 0xB9, 0x9D, 0xB9, 0x9E, 0xB9, 0x9F, /* 0x88-0x8B */ @@ -13319,7 +13319,7 @@ static unsigned char u2c_D3[512] = { 0xBC, 0x4B, 0xBC, 0x4C, 0xBC, 0x4D, 0xBC, 0x4E, /* 0x74-0x77 */ 0xBC, 0x4F, 0xBC, 0x50, 0xBC, 0x51, 0xBC, 0x52, /* 0x78-0x7B */ 0xC6, 0xDB, 0xC6, 0xDC, 0xBC, 0x53, 0xBC, 0x54, /* 0x7C-0x7F */ - + 0xC6, 0xDD, 0xBC, 0x55, 0xBC, 0x56, 0xBC, 0x57, /* 0x80-0x83 */ 0xC6, 0xDE, 0xBC, 0x58, 0xBC, 0x59, 0xBC, 0x5A, /* 0x84-0x87 */ 0xBC, 0x61, 0xBC, 0x62, 0xBC, 0x63, 0xBC, 0x64, /* 0x88-0x8B */ @@ -13387,7 +13387,7 @@ static unsigned char u2c_D4[512] = { 0xBE, 0x82, 0xBE, 0x83, 0xBE, 0x84, 0xBE, 0x85, /* 0x74-0x77 */ 0xC7, 0xAA, 0xC7, 0xAB, 0xBE, 0x86, 0xBE, 0x87, /* 0x78-0x7B */ 0xC7, 0xAC, 0xBE, 0x88, 0xBE, 0x89, 0xC7, 0xAD, /* 0x7C-0x7F */ - + 0xC7, 0xAE, 0xBE, 0x8A, 0xC7, 0xAF, 0xBE, 0x8B, /* 0x80-0x83 */ 0xBE, 0x8C, 0xBE, 0x8D, 0xBE, 0x8E, 0xBE, 0x8F, /* 0x84-0x87 */ 0xC7, 0xB0, 0xC7, 0xB1, 0xBE, 0x90, 0xC7, 0xB2, /* 0x88-0x8B */ @@ -13455,7 +13455,7 @@ static unsigned char u2c_D5[512] = { 0xC7, 0xD8, 0xC7, 0xD9, 0xC1, 0x4C, 0xC1, 0x4D, /* 0x74-0x77 */ 0xC7, 0xDA, 0xC1, 0x4E, 0xC1, 0x4F, 0xC1, 0x50, /* 0x78-0x7B */ 0xC7, 0xDB, 0xC1, 0x51, 0xC1, 0x52, 0xC1, 0x53, /* 0x7C-0x7F */ - + 0xC1, 0x54, 0xC1, 0x55, 0xC1, 0x56, 0xC1, 0x57, /* 0x80-0x83 */ 0xC7, 0xDC, 0xC7, 0xDD, 0xC1, 0x58, 0xC7, 0xDE, /* 0x84-0x87 */ 0xC7, 0xDF, 0xC7, 0xE0, 0xC1, 0x59, 0xC1, 0x5A, /* 0x88-0x8B */ @@ -13523,7 +13523,7 @@ static unsigned char u2c_D6[512] = { 0xC8, 0xB5, 0xC3, 0x6F, 0xC3, 0x70, 0xC3, 0x71, /* 0x74-0x77 */ 0xC3, 0x72, 0xC3, 0x73, 0xC3, 0x74, 0xC3, 0x75, /* 0x78-0x7B */ 0xC3, 0x76, 0xC3, 0x77, 0xC3, 0x78, 0xC3, 0x79, /* 0x7C-0x7F */ - + 0xC3, 0x7A, 0xC3, 0x81, 0xC3, 0x82, 0xC8, 0xB6, /* 0x80-0x83 */ 0xC3, 0x83, 0xC8, 0xB7, 0xC3, 0x84, 0xC3, 0x85, /* 0x84-0x87 */ 0xC3, 0x86, 0xC3, 0x87, 0xC3, 0x88, 0xC3, 0x89, /* 0x88-0x8B */ @@ -13591,7 +13591,7 @@ static unsigned char u2c_D7[512] = { 0xC8, 0xF3, 0xC5, 0x8F, 0xC5, 0x90, 0xC5, 0x91, /* 0x74-0x77 */ 0xC5, 0x92, 0xC5, 0x93, 0xC5, 0x94, 0xC5, 0x95, /* 0x78-0x7B */ 0xC8, 0xF4, 0xC8, 0xF5, 0xC5, 0x96, 0xC5, 0x97, /* 0x7C-0x7F */ - + 0xC5, 0x98, 0xC8, 0xF6, 0xC5, 0x99, 0xC5, 0x9A, /* 0x80-0x83 */ 0xC5, 0x9B, 0xC5, 0x9C, 0xC5, 0x9D, 0xC5, 0x9E, /* 0x84-0x87 */ 0xC8, 0xF7, 0xC8, 0xF8, 0xC5, 0x9F, 0xC5, 0xA0, /* 0x88-0x8B */ @@ -13640,7 +13640,7 @@ static unsigned char u2c_F9[512] = { 0xE5, 0xAE, 0xE5, 0xB1, 0xE5, 0xB2, 0xE5, 0xB9, /* 0x74-0x77 */ 0xE5, 0xBB, 0xE5, 0xBC, 0xE5, 0xC4, 0xE5, 0xCE, /* 0x78-0x7B */ 0xE5, 0xD0, 0xE5, 0xD2, 0xE5, 0xD6, 0xE5, 0xFA, /* 0x7C-0x7F */ - + 0xE5, 0xFB, 0xE5, 0xFC, 0xE5, 0xFE, 0xE6, 0xA1, /* 0x80-0x83 */ 0xE6, 0xA4, 0xE6, 0xA7, 0xE6, 0xAD, 0xE6, 0xAF, /* 0x84-0x87 */ 0xE6, 0xB0, 0xE6, 0xB1, 0xE6, 0xB3, 0xE6, 0xB7, /* 0x88-0x8B */ @@ -13723,7 +13723,7 @@ static unsigned char u2c_FF[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -13753,37 +13753,37 @@ static unsigned char u2c_FF[512] = { }; static unsigned char *page_uni2charset[256] = { - NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, u2c_11, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, u2c_4E, u2c_4F, - u2c_50, u2c_51, u2c_52, u2c_53, u2c_54, u2c_55, u2c_56, u2c_57, - u2c_58, u2c_59, u2c_5A, u2c_5B, u2c_5C, u2c_5D, u2c_5E, u2c_5F, - u2c_60, u2c_61, u2c_62, u2c_63, u2c_64, u2c_65, u2c_66, u2c_67, - u2c_68, u2c_69, u2c_6A, u2c_6B, u2c_6C, u2c_6D, u2c_6E, u2c_6F, - u2c_70, u2c_71, u2c_72, u2c_73, u2c_74, u2c_75, u2c_76, u2c_77, - u2c_78, u2c_79, u2c_7A, u2c_7B, u2c_7C, u2c_7D, u2c_7E, u2c_7F, - u2c_80, u2c_81, u2c_82, u2c_83, u2c_84, u2c_85, u2c_86, u2c_87, - u2c_88, u2c_89, u2c_8A, u2c_8B, u2c_8C, u2c_8D, u2c_8E, u2c_8F, - u2c_90, u2c_91, u2c_92, u2c_93, u2c_94, u2c_95, u2c_96, u2c_97, - u2c_98, u2c_99, u2c_9A, u2c_9B, u2c_9C, u2c_9D, u2c_9E, u2c_9F, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, u2c_AC, u2c_AD, u2c_AE, u2c_AF, - u2c_B0, u2c_B1, u2c_B2, u2c_B3, u2c_B4, u2c_B5, u2c_B6, u2c_B7, - u2c_B8, u2c_B9, u2c_BA, u2c_BB, u2c_BC, u2c_BD, u2c_BE, u2c_BF, - u2c_C0, u2c_C1, u2c_C2, u2c_C3, u2c_C4, u2c_C5, u2c_C6, u2c_C7, - u2c_C8, u2c_C9, u2c_CA, u2c_CB, u2c_CC, u2c_CD, u2c_CE, u2c_CF, - u2c_D0, u2c_D1, u2c_D2, u2c_D3, u2c_D4, u2c_D5, u2c_D6, u2c_D7, - NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, u2c_11, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, u2c_4E, u2c_4F, + u2c_50, u2c_51, u2c_52, u2c_53, u2c_54, u2c_55, u2c_56, u2c_57, + u2c_58, u2c_59, u2c_5A, u2c_5B, u2c_5C, u2c_5D, u2c_5E, u2c_5F, + u2c_60, u2c_61, u2c_62, u2c_63, u2c_64, u2c_65, u2c_66, u2c_67, + u2c_68, u2c_69, u2c_6A, u2c_6B, u2c_6C, u2c_6D, u2c_6E, u2c_6F, + u2c_70, u2c_71, u2c_72, u2c_73, u2c_74, u2c_75, u2c_76, u2c_77, + u2c_78, u2c_79, u2c_7A, u2c_7B, u2c_7C, u2c_7D, u2c_7E, u2c_7F, + u2c_80, u2c_81, u2c_82, u2c_83, u2c_84, u2c_85, u2c_86, u2c_87, + u2c_88, u2c_89, u2c_8A, u2c_8B, u2c_8C, u2c_8D, u2c_8E, u2c_8F, + u2c_90, u2c_91, u2c_92, u2c_93, u2c_94, u2c_95, u2c_96, u2c_97, + u2c_98, u2c_99, u2c_9A, u2c_9B, u2c_9C, u2c_9D, u2c_9E, u2c_9F, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, u2c_AC, u2c_AD, u2c_AE, u2c_AF, + u2c_B0, u2c_B1, u2c_B2, u2c_B3, u2c_B4, u2c_B5, u2c_B6, u2c_B7, + u2c_B8, u2c_B9, u2c_BA, u2c_BB, u2c_BC, u2c_BD, u2c_BE, u2c_BF, + u2c_C0, u2c_C1, u2c_C2, u2c_C3, u2c_C4, u2c_C5, u2c_C6, u2c_C7, + u2c_C8, u2c_C9, u2c_CA, u2c_CB, u2c_CC, u2c_CD, u2c_CE, u2c_CF, + u2c_D0, u2c_D1, u2c_D2, u2c_D3, u2c_D4, u2c_D5, u2c_D6, u2c_D7, + NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, NULL, u2c_FF, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_cp950.c b/drivers/filesystems/reiserfs/src/nls/nls_cp950.c index 5d8cecc0e50..e1dcd2d3170 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_cp950.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_cp950.c @@ -30,7 +30,7 @@ static wchar_t c2u_A1[256] = { 0xFE3A,0x3010,0x3011,0xFE3B,0xFE3C,0x300A,0x300B,0xFE3D,/* 0x68-0x6F */ 0xFE3E,0x3008,0x3009,0xFF3E,0xFE40,0x300C,0x300D,0xFE41,/* 0x70-0x77 */ 0xFE42,0x300E,0x300F,0xFE43,0xFE44,0xFE59,0xFE5A,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -66,7 +66,7 @@ static wchar_t c2u_A2[256] = { 0x2587,0x2588,0x258F,0x258E,0x258D,0x258C,0x258B,0x258A,/* 0x68-0x6F */ 0x2589,0x253C,0x2534,0x252C,0x2524,0x251C,0x2594,0x2500,/* 0x70-0x77 */ 0x2502,0x2595,0x250C,0x2510,0x2514,0x2518,0x256D,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -102,7 +102,7 @@ static wchar_t c2u_A3[256] = { 0x03BD,0x03BE,0x03BF,0x03C0,0x03C1,0x03C3,0x03C4,0x03C5,/* 0x68-0x6F */ 0x03C6,0x03C7,0x03C8,0x03C9,0x3105,0x3106,0x3107,0x3108,/* 0x70-0x77 */ 0x3109,0x310A,0x310B,0x310C,0x310D,0x310E,0x310F,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -138,7 +138,7 @@ static wchar_t c2u_A4[256] = { 0x58EB,0x5915,0x5927,0xF981,0x5B50,0x5B51,0x5B53,0x5BF8,/* 0x68-0x6F */ 0x5C0F,0x5C22,0x5C38,0x5C71,0x5DDD,0x5DE5,0x5DF1,0x5DF2,/* 0x70-0x77 */ 0x5DF3,0x5DFE,0x5E72,0x5EFE,0x5F0B,0x5F13,0x624D,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -174,7 +174,7 @@ static wchar_t c2u_A5[256] = { 0x53BB,0x53EF,0x53E4,0x53F3,0x53EC,0x53EE,0x53E9,0x53E8,/* 0x68-0x6F */ 0x53FC,0x53F8,0x53F5,0x53EB,0x53E6,0x53EA,0x53F2,0x53F1,/* 0x70-0x77 */ 0x53F0,0xF906,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -210,7 +210,7 @@ static wchar_t c2u_A6[256] = { 0x591A,0x5937,0x5938,0x5984,0x5978,0x5983,0x597D,0x5979,/* 0x68-0x6F */ 0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0xFA04,0x5B89,/* 0x70-0x77 */ 0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0xF98E,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -246,7 +246,7 @@ static wchar_t c2u_A7[256] = { 0x5429,0x544A,0x5439,0x543B,0x5438,0x542E,0x5435,0x5436,/* 0x68-0x6F */ 0x5420,0x543C,0x5440,0x5431,0x542B,0x541F,0x542C,0x56EA,/* 0x70-0x77 */ 0x56F0,0x56E4,0x56EB,0x574A,0x5751,0x5740,0x574D,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -282,7 +282,7 @@ static wchar_t c2u_A8[256] = { 0x7396,0x752C,0x752B,0x7537,0x7538,0x7682,0x76EF,0x77E3,/* 0x68-0x6F */ 0x79C1,0x79C0,0x79BF,0x7A76,0x7CFB,0x7F55,0x8096,0x8093,/* 0x70-0x77 */ 0x809D,0x8098,0x809B,0x809A,0x80B2,0xF97C,0x8292,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -318,7 +318,7 @@ static wchar_t c2u_A9[256] = { 0x59D1,0x59C6,0x59D0,0x59CD,0x59CB,0x59D3,0x59CA,0x59AF,/* 0x68-0x6F */ 0x59B3,0x59D2,0x59C5,0x5B5F,0x5B64,0x5B63,0x5B97,0x5B9A,/* 0x70-0x77 */ 0x5B98,0x5B9C,0x5B99,0x5B9B,0x5C1A,0x5C48,0x5C45,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -354,7 +354,7 @@ static wchar_t c2u_AA[256] = { 0x6CBC,0x6CE2,0x6CAB,0x6CD5,0x6CD3,0x6CB8,0x6CC4,0x6CB9,/* 0x68-0x6F */ 0x6CC1,0x6CAE,0x6CD7,0x6CC5,0x6CF1,0x6CBF,0x6CBB,0x6CE1,/* 0x70-0x77 */ 0x6CDB,0x6CCA,0x6CAC,0x6CEF,0x6CDC,0x6CD6,0x6CE0,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -390,7 +390,7 @@ static wchar_t c2u_AB[256] = { 0x5247,0x52C7,0x52C9,0x52C3,0x52C1,0x530D,0x5357,0x537B,/* 0x68-0x6F */ 0x539A,0x53DB,0x54AC,0x54C0,0x54A8,0x54CE,0x54C9,0x54B8,/* 0x70-0x77 */ 0x54A6,0x54B3,0x54C7,0x54C2,0xF99E,0x54AA,0x54C1,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -426,7 +426,7 @@ static wchar_t c2u_AC[256] = { 0xF9C9,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,/* 0x68-0x6F */ 0x6B86,0x6BB5,0x6BD2,0x6BD7,0x6C1F,0x6CC9,0x6D0B,0x6D32,/* 0x70-0x77 */ 0x6D2A,0xF9CA,0x6D25,0x6D0C,0x6D31,0xFA05,0x6D17,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -462,7 +462,7 @@ static wchar_t c2u_AD[256] = { 0x8650,0x8679,0x867B,0x867A,0x884D,0x886B,0x8981,0x89D4,/* 0x68-0x6F */ 0x8A08,0x8A02,0x8A03,0x8C9E,0x8CA0,0x8D74,0x8D73,0x8DB4,/* 0x70-0x77 */ 0x8ECD,0x8ECC,0x8FF0,0x8FE6,0x8FE2,0x8FEA,0x8FE5,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -498,7 +498,7 @@ static wchar_t c2u_AE[256] = { 0x5C51,0x5C55,0x5C50,0x5CED,0x5CFD,0x5CFB,0x5CEA,0x5CE8,/* 0x68-0x6F */ 0x5CF0,0x5CF6,0x5D01,0x5CF4,0x5DEE,0x5E2D,0x5E2B,0x5EAB,/* 0x70-0x77 */ 0x5EAD,0x5EA7,0x5F31,0x5F92,0x5F91,0x5F90,0x6059,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -534,7 +534,7 @@ static wchar_t c2u_AF[256] = { 0x75B2,0x75B3,0x75BD,0x75BC,0x75B9,0x75C2,0x75B8,0x768B,/* 0x68-0x6F */ 0x76B0,0xFA17,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,/* 0x70-0x77 */ 0x77E9,0x7830,0x7827,0x7838,0x781D,0x7834,0x7837,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -570,7 +570,7 @@ static wchar_t c2u_B0[256] = { 0x9000,0x8FFA,0x8FF4,0x9003,0x8FFD,0x9005,0x8FF8,0x9095,/* 0x68-0x6F */ 0x90E1,0x90DD,0x90E2,0x9152,0x914D,0x914C,0x91D8,0x91DD,/* 0x70-0x77 */ 0x91D7,0x91DC,0x91D9,0x9583,0x9662,0x9663,0x9661,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -606,7 +606,7 @@ static wchar_t c2u_B1[256] = { 0x5EBE,0x5F35,0x5F37,0x5F57,0x5F6C,0x5F69,0x5F6B,0x5F97,/* 0x68-0x6F */ 0x5F99,0x5F9E,0x5F98,0x5FA1,0x5FA0,0x5F9C,0x607F,0x60A3,/* 0x70-0x77 */ 0x6089,0x60A0,0x60A8,0x60CB,0x60B4,0x60E6,0x60BD,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -642,7 +642,7 @@ static wchar_t c2u_B2[256] = { 0x6DE6,0x70F9,0x7109,0x710A,0x70FD,0x70EF,0x723D,0x727D,/* 0x68-0x6F */ 0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0xF9DB,0x7405,/* 0x70-0x77 */ 0x740A,0x7403,0xF9E4,0x73FE,0x740D,0x74E0,0x74F6,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -678,7 +678,7 @@ static wchar_t c2u_B3[256] = { 0x8CA7,0x8D67,0x8D66,0x8DBE,0x8DBA,0x8EDB,0x8EDF,0x9019,/* 0x68-0x6F */ 0x900D,0x901A,0x9017,0xF99A,0x901F,0x901D,0x9010,0x9015,/* 0x70-0x77 */ 0x901E,0x9020,0x900F,0x9022,0x9016,0x901B,0x9014,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -714,7 +714,7 @@ static wchar_t c2u_B4[256] = { 0x6123,0x60FA,0x6115,0x60F0,0x60FB,0x60F4,0x6168,0x60F1,/* 0x68-0x6F */ 0x610E,0x60F6,0x6109,0x6100,0x6112,0x621F,0x6249,0x63A3,/* 0x70-0x77 */ 0x638C,0x63CF,0x63C0,0x63E9,0x63C9,0x63C6,0x63CD,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -750,7 +750,7 @@ static wchar_t c2u_B5[256] = { 0x75DB,0x75E3,0x75D9,0x75D8,0x75DE,0x75E0,0x767B,0x767C,/* 0x68-0x6F */ 0x7696,0x7693,0x76B4,0x76DC,0x774F,0x77ED,0x785D,0x786C,/* 0x70-0x77 */ 0x786F,0x7A0D,0x7A08,0x7A0B,0x7A05,0x7A00,0x7A98,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -786,7 +786,7 @@ static wchar_t c2u_B6[256] = { 0xFA25,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,/* 0x68-0x6F */ 0x9165,0xF97E,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,/* 0x70-0x77 */ 0x9210,0x9207,0x9211,0x9594,0x958F,0x958B,0x9591,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -822,7 +822,7 @@ static wchar_t c2u_B7[256] = { 0x642C,0x640F,0x641C,0x6414,0x640D,0x6436,0x6416,0x6417,/* 0x68-0x6F */ 0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0xF9C5,/* 0x70-0x77 */ 0x6696,0x6684,0x6698,0x668D,0x6703,0x6994,0x696D,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -858,7 +858,7 @@ static wchar_t c2u_B8[256] = { 0x7D79,0x7D91,0x7D81,0x7D8F,0x7D5B,0x7F6E,0x7F69,0x7F6A,/* 0x68-0x6F */ 0x7F72,0x7FA9,0x7FA8,0x7FA4,0x8056,0x8058,0x8086,0x8084,/* 0x70-0x77 */ 0x8171,0x8170,0x8178,0x8165,0x816E,0x8173,0x816B,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -894,7 +894,7 @@ static wchar_t c2u_B9[256] = { 0x9598,0x9698,0x9694,0x9695,0x96CD,0x96CB,0x96C9,0x96CA,/* 0x68-0x6F */ 0xF949,0x96FB,0x96F9,0xF9B2,0xFA1C,0x9774,0x9776,0x9810,/* 0x70-0x77 */ 0x9811,0x9813,0x980A,0x9812,0x980C,0xFA2B,0x98F4,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -930,7 +930,7 @@ static wchar_t c2u_BA[256] = { 0x69B4,0x69D0,0x69CD,0x69AD,0x69CC,0x69A6,0x69C3,0x69A3,/* 0x68-0x6F */ 0x6B49,0x6B4C,0x6C33,0x6F33,0x6F14,0x6EFE,0x6F13,0x6EF4,/* 0x70-0x77 */ 0x6F29,0x6F3E,0x6F20,0x6F2C,0xF94E,0x6F02,0x6F22,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -966,7 +966,7 @@ static wchar_t c2u_BB[256] = { 0x8725,0x8734,0x8718,0x8755,0x8737,0x8729,0x88F3,0x8902,/* 0x68-0x6F */ 0x88F4,0x88F9,0xF912,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,/* 0x70-0x77 */ 0x8A8C,0x8A9E,0x8AA3,0x8A8D,0x8AA1,0x8A93,0x8AA4,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1002,7 +1002,7 @@ static wchar_t c2u_BC[256] = { 0x5C64,0xF9DF,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,/* 0x68-0x6F */ 0x5EDA,0x5EDF,0x5EDD,0x5EE3,0x5EE0,0x5F48,0x5F71,0x5FB7,/* 0x70-0x77 */ 0x5FB5,0x6176,0x6167,0x616E,0x615D,0x6155,0x6182,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1038,7 +1038,7 @@ static wchar_t c2u_BD[256] = { 0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0xF996,0x7DEF,0x7DFB,/* 0x68-0x6F */ 0x7DD8,0x7DEC,0x7DDD,0x7DE8,0x7DE3,0x7DDA,0x7DDE,0x7DE9,/* 0x70-0x77 */ 0x7D9E,0x7DD9,0x7DF2,0x7DF9,0x7F75,0x7F77,0x7FAF,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1074,7 +1074,7 @@ static wchar_t c2u_BE[256] = { 0x98B3,0x990A,0x9913,0x9912,0x9918,0x99DD,0x99D0,0x99DF,/* 0x68-0x6F */ 0x99DB,0x99D1,0x99D5,0x99D2,0x99D9,0x9AB7,0x9AEE,0x9AEF,/* 0x70-0x77 */ 0x9B27,0x9B45,0x9B44,0x9B77,0xF939,0x9D06,0x9D09,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1110,7 +1110,7 @@ static wchar_t c2u_BF[256] = { 0x77A5,0x78E8,0x78DA,0x78EC,0x78E7,0x79A6,0x7A4D,0x7A4E,/* 0x68-0x6F */ 0x7A46,0x7A4C,0x7A4B,0x7ABA,0x7BD9,0x7C11,0x7BC9,0x7BE4,/* 0x70-0x77 */ 0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0xFA03,0x7E0A,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1146,7 +1146,7 @@ static wchar_t c2u_C0[256] = { 0x9AED,0x9B28,0x9B91,0x9D15,0x9D23,0x9D26,0x9D28,0x9D12,/* 0x68-0x6F */ 0x9D1B,0x9ED8,0x9ED4,0xF9C4,0xF908,0x512A,0x511F,0x5121,/* 0x70-0x77 */ 0x5132,0xF97F,0x568E,0x5680,0x5690,0x5685,0x5687,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1182,7 +1182,7 @@ static wchar_t c2u_C1[256] = { 0x7E3F,0x7E2F,0x7F44,0x7FF3,0x7FFC,0x8071,0x8072,0x8070,/* 0x68-0x6F */ 0xF997,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,/* 0x70-0x77 */ 0x81BD,0x81C9,0x81BE,0xF9F6,0x8209,0x8271,0x85AA,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1218,7 +1218,7 @@ static wchar_t c2u_C2[256] = { 0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0xF984,/* 0x68-0x6F */ 0x7006,0x6FFA,0x7011,0x700F,0x71FB,0x71FC,0x71FE,0x71F8,/* 0x70-0x77 */ 0x7377,0xF9A7,0x74A7,0x74BF,0x7515,0x7656,0x7658,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1254,7 +1254,7 @@ static wchar_t c2u_C3[256] = { 0x61F7,0xF90D,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,/* 0x68-0x6F */ 0x6ADD,0x6ADA,0xF931,0x701B,0x701F,0x7028,0x701A,0x701D,/* 0x70-0x77 */ 0x7015,0x7018,0x7206,0x720D,0x7258,0x72A2,0x7378,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1290,7 +1290,7 @@ static wchar_t c2u_C4[256] = { 0x6AEC,0x703E,0x7030,0x7032,0xF932,0x737B,0x74CF,0x7662,/* 0x68-0x6F */ 0x7665,0x7926,0xF985,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,/* 0x70-0x77 */ 0x7C43,0x7C4D,0x7CEF,0x7CF0,0x8FAE,0x7E7D,0x7E7C,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1326,7 +1326,7 @@ static wchar_t c2u_C5[256] = { 0x9F5C,0x9F66,0x9F67,0x513C,0x513B,0x56C8,0x56CA,0x56C9,/* 0x68-0x6F */ 0x5B7F,0x5DD4,0x5DD2,0x5F4E,0x61FF,0x6524,0x6B0A,0x6B61,/* 0x70-0x77 */ 0x7051,0x7058,0x7380,0x74E4,0x758A,0x766E,0x766C,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1381,7 +1381,7 @@ static wchar_t c2u_C9[256] = { 0x4EE1,0x4EDD,0x4EDA,0x520C,0x531C,0x534C,0x5722,0x5723,/* 0x68-0x6F */ 0x5917,0x592F,0x5B81,0x5B84,0x5C12,0x5C3B,0x5C74,0x5C73,/* 0x70-0x77 */ 0x5E04,0x5E80,0x5E82,0x5FC9,0x6209,0x6250,0x6C15,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1417,7 +1417,7 @@ static wchar_t c2u_CA[256] = { 0x4F3F,0x4F61,0x518F,0x51B9,0x521C,0x521E,0x5221,0x52AD,/* 0x68-0x6F */ 0x52AE,0x5309,0x5363,0x5372,0x538E,0x538F,0x5430,0x5437,/* 0x70-0x77 */ 0x542A,0x5454,0x5445,0x5419,0x541C,0x5425,0x5418,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1453,7 +1453,7 @@ static wchar_t c2u_CB[256] = { 0x7395,0x7397,0x7393,0x7394,0x7392,0x753A,0x7539,0x7594,/* 0x68-0x6F */ 0x7595,0x7681,0x793D,0x8034,0x8095,0x8099,0x8090,0x8092,/* 0x70-0x77 */ 0x809C,0x8290,0x828F,0x8285,0x828E,0x8291,0x8293,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1489,7 +1489,7 @@ static wchar_t c2u_CC[256] = { 0x5C9D,0x5CA5,0x5CB6,0x5CB0,0x5CA6,0x5E17,0x5E14,0x5E19,/* 0x68-0x6F */ 0x5F28,0x5F22,0x5F23,0x5F24,0x5F54,0x5F82,0x5F7E,0x5F7D,/* 0x70-0x77 */ 0x5FDE,0x5FE5,0x602D,0x6026,0x6019,0x6032,0x600B,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1525,7 +1525,7 @@ static wchar_t c2u_CD[256] = { 0x73AD,0x73A6,0x73A2,0x73A0,0x73AC,0x739D,0x74DD,0x74E8,/* 0x68-0x6F */ 0x753F,0x7540,0x753E,0x758C,0x7598,0x76AF,0x76F3,0x76F1,/* 0x70-0x77 */ 0x76F0,0x76F5,0x77F8,0x77FC,0x77F9,0x77FB,0x77FA,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1561,7 +1561,7 @@ static wchar_t c2u_CE[256] = { 0x59FA,0x59FD,0x59FC,0x59F6,0x59E4,0x59F2,0x59F7,0x59DB,/* 0x68-0x6F */ 0x59E9,0x59F3,0x59F5,0x59E0,0x59FE,0x59F4,0x59ED,0x5BA8,/* 0x70-0x77 */ 0x5C4C,0x5CD0,0x5CD8,0x5CCC,0x5CD7,0x5CCB,0x5CDB,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1597,7 +1597,7 @@ static wchar_t c2u_CF[256] = { 0x6BD6,0x6BD8,0x6BE0,0x6C20,0x6C21,0x6D28,0x6D34,0x6D2D,/* 0x68-0x6F */ 0x6D1F,0x6D3C,0x6D3F,0x6D12,0x6D0A,0x6CDA,0x6D33,0x6D04,/* 0x70-0x77 */ 0x6D19,0x6D3A,0x6D1A,0x6D11,0x6D00,0x6D1D,0x6D42,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1633,7 +1633,7 @@ static wchar_t c2u_D0[256] = { 0x81FF,0x8221,0x8294,0x82D9,0x82FE,0x82F9,0x8307,0x82E8,/* 0x68-0x6F */ 0x8300,0x82D5,0x833A,0x82EB,0x82D6,0x82F4,0x82EC,0x82E1,/* 0x70-0x77 */ 0x82F2,0x82F5,0x830C,0x82FB,0x82F6,0x82F0,0x82EA,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1669,7 +1669,7 @@ static wchar_t c2u_D1[256] = { 0x5BAC,0x5C03,0x5C56,0x5C54,0x5CEC,0x5CFF,0x5CEE,0x5CF1,/* 0x68-0x6F */ 0x5CF7,0x5D00,0x5CF9,0x5E29,0x5E28,0x5EA8,0x5EAE,0x5EAA,/* 0x70-0x77 */ 0x5EAC,0x5F33,0x5F30,0x5F67,0x605D,0x605A,0x6067,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1705,7 +1705,7 @@ static wchar_t c2u_D2[256] = { 0x6D75,0x6D90,0x70DC,0x70D3,0x70D1,0x70DD,0x70CB,0x7F39,/* 0x68-0x6F */ 0x70E2,0x70D7,0x70D2,0x70DE,0x70E0,0x70D4,0x70CD,0x70C5,/* 0x70-0x77 */ 0x70C6,0x70C7,0x70DA,0x70CE,0x70E1,0x7242,0x7278,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1741,7 +1741,7 @@ static wchar_t c2u_D3[256] = { 0x8039,0x80FA,0x80F2,0x80F9,0x80F5,0x8101,0x80FB,0x8100,/* 0x68-0x6F */ 0x8201,0x822F,0x8225,0x8333,0x832D,0x8344,0x8319,0x8351,/* 0x70-0x77 */ 0x8325,0x8356,0x833F,0x8341,0x8326,0x831C,0x8322,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1777,7 +1777,7 @@ static wchar_t c2u_D4[256] = { 0x51D0,0x526B,0x526D,0x526C,0x526E,0x52D6,0x52D3,0x532D,/* 0x68-0x6F */ 0x539C,0x5575,0x5576,0x553C,0x554D,0x5550,0x5534,0x552A,/* 0x70-0x77 */ 0x5551,0x5562,0x5536,0x5535,0x5530,0x5552,0x5545,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1813,7 +1813,7 @@ static wchar_t c2u_D5[256] = { 0x638A,0x6382,0x637D,0x63BD,0x639E,0x63AD,0x639D,0x6397,/* 0x68-0x6F */ 0x63AB,0x638E,0x636F,0x6387,0x6390,0x636E,0x63AF,0x6375,/* 0x70-0x77 */ 0x639C,0x636D,0x63AE,0x637C,0x63A4,0x633B,0x639F,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1849,7 +1849,7 @@ static wchar_t c2u_D6[256] = { 0x730F,0x731E,0x7388,0x73F6,0x73F8,0x73F5,0x7404,0x7401,/* 0x68-0x6F */ 0x73FD,0x7407,0x7400,0x73FA,0x73FC,0x73FF,0x740C,0x740B,/* 0x70-0x77 */ 0x73F4,0x7408,0x7564,0x7563,0x75CE,0x75D2,0x75CF,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1885,7 +1885,7 @@ static wchar_t c2u_D7[256] = { 0x837D,0x8383,0x838C,0x839D,0x839B,0x83AA,0x838B,0x837E,/* 0x68-0x6F */ 0x83A5,0x83AF,0x8388,0x8397,0x83B0,0x837F,0x83A6,0x8387,/* 0x70-0x77 */ 0x83AE,0x8376,0x839A,0x8659,0x8656,0x86BF,0x86B7,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1921,7 +1921,7 @@ static wchar_t c2u_D8[256] = { 0x55A5,0x55AD,0x5577,0x5645,0x55A2,0x5593,0x5588,0x558F,/* 0x68-0x6F */ 0x55B5,0x5581,0x55A3,0x5592,0x55A4,0x557D,0x558C,0x55A6,/* 0x70-0x77 */ 0x557F,0x5595,0x55A1,0x558E,0x570C,0x5829,0x5837,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1957,7 +1957,7 @@ static wchar_t c2u_D9[256] = { 0x63D8,0x63D3,0x63C2,0x63C7,0x63CC,0x63CB,0x63C8,0x63F0,/* 0x68-0x6F */ 0x63D7,0x63D9,0x6532,0x6567,0x656A,0x6564,0x655C,0x6568,/* 0x70-0x77 */ 0x6565,0x658C,0x659D,0x659E,0x65AE,0x65D0,0x65D2,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -1993,7 +1993,7 @@ static wchar_t c2u_DA[256] = { 0x7288,0x7289,0x7286,0x7285,0x728B,0x7312,0x730B,0x7330,/* 0x68-0x6F */ 0x7322,0x7331,0x7333,0x7327,0x7332,0x732D,0x7326,0x7323,/* 0x70-0x77 */ 0x7335,0x730C,0x742E,0x742C,0x7430,0x742B,0x7416,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2029,7 +2029,7 @@ static wchar_t c2u_DB[256] = { 0x83C6,0x83C8,0x83EB,0x83E3,0x83BF,0x8401,0x83DD,0x83E5,/* 0x68-0x6F */ 0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0xF93E,/* 0x70-0x77 */ 0x8409,0x840F,0x83DE,0x8411,0x8406,0x83C2,0x83F3,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2065,7 +2065,7 @@ static wchar_t c2u_DC[256] = { 0x920F,0x920C,0x9200,0x9212,0x91FF,0x91FD,0x9206,0x9204,/* 0x68-0x6F */ 0x9227,0x9202,0x921C,0x9224,0x9219,0x9217,0x9205,0x9216,/* 0x70-0x77 */ 0x957B,0x958D,0x958C,0x9590,0x9687,0x967E,0x9688,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2101,7 +2101,7 @@ static wchar_t c2u_DD[256] = { 0x612B,0x6145,0x6136,0x6132,0x612E,0x6146,0x612F,0x614F,/* 0x68-0x6F */ 0x6129,0x6140,0x6220,0x9168,0x6223,0x6225,0x6224,0x63C5,/* 0x70-0x77 */ 0x63F1,0x63EB,0x6410,0x6412,0x6409,0x6420,0x6424,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2137,7 +2137,7 @@ static wchar_t c2u_DE[256] = { 0x6E97,0x6EAE,0x6EA3,0x7147,0x7154,0x7152,0x7163,0x7160,/* 0x68-0x6F */ 0x7141,0x715D,0x7162,0x7172,0x7178,0x716A,0x7161,0x7142,/* 0x70-0x77 */ 0x7158,0x7143,0x714B,0x7170,0x715F,0x7150,0x7153,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2173,7 +2173,7 @@ static wchar_t c2u_DF[256] = { 0x7F6B,0x7F67,0x7F68,0x7F6C,0x7FA6,0x7FA5,0x7FA7,0x7FDB,/* 0x68-0x6F */ 0x7FDC,0x8021,0x8164,0x8160,0x8177,0x815C,0x8169,0x815B,/* 0x70-0x77 */ 0x8162,0x8172,0x6721,0x815E,0x8176,0x8167,0x816F,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2209,7 +2209,7 @@ static wchar_t c2u_E0[256] = { 0x8DE0,0x8DEC,0x8DF1,0x8DEE,0x8DD0,0x8DE9,0x8DE3,0x8DE2,/* 0x68-0x6F */ 0x8DE7,0x8DF2,0x8DEB,0x8DF4,0x8F06,0x8EFF,0x8F01,0x8F00,/* 0x70-0x77 */ 0x8F05,0x8F07,0x8F08,0x8F02,0x8F0B,0x9052,0x903F,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2245,7 +2245,7 @@ static wchar_t c2u_E1[256] = { 0x588F,0x58FE,0x596B,0x5ADC,0x5AEE,0x5AE5,0x5AD5,0x5AEA,/* 0x68-0x6F */ 0x5ADA,0x5AED,0x5AEB,0x5AF3,0x5AE2,0x5AE0,0x5ADB,0x5AEC,/* 0x70-0x77 */ 0x5ADE,0x5ADD,0x5AD9,0x5AE8,0x5ADF,0x5B77,0x5BE0,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2281,7 +2281,7 @@ static wchar_t c2u_E2[256] = { 0x6BA0,0x6BC3,0x6BC4,0x6BFE,0x6ECE,0x6EF5,0x6EF1,0x6F03,/* 0x68-0x6F */ 0x6F25,0x6EF8,0x6F37,0x6EFB,0x6F2E,0x6F09,0x6F4E,0x6F19,/* 0x70-0x77 */ 0x6F1A,0x6F27,0x6F18,0x6F3B,0x6F12,0x6EED,0x6F0A,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2317,7 +2317,7 @@ static wchar_t c2u_E3[256] = { 0x7DC0,0x7DC5,0x7D9D,0x7DCE,0x7DC4,0x7DC6,0x7DCB,0x7DCC,/* 0x68-0x6F */ 0x7DAF,0x7DB9,0x7D96,0x7DBC,0x7D9F,0x7DA6,0x7DAE,0x7DA9,/* 0x70-0x77 */ 0x7DA1,0x7DC9,0x7F73,0x7FE2,0x7FE3,0x7FE5,0x7FDE,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2353,7 +2353,7 @@ static wchar_t c2u_E4[256] = { 0x9123,0x911C,0x9120,0x9122,0x911F,0x911D,0x911A,0x9124,/* 0x68-0x6F */ 0x9121,0x911B,0x917A,0x9172,0x9179,0x9173,0x92A5,0x92A4,/* 0x70-0x77 */ 0x9276,0x929B,0x927A,0x92A0,0x9294,0x92AA,0x928D,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2389,7 +2389,7 @@ static wchar_t c2u_E5[256] = { 0x5D95,0x5DA0,0x5D9C,0x5DA1,0x5D9A,0x5D9E,0x5E69,0x5E5D,/* 0x68-0x6F */ 0x5E60,0x5E5C,0x7DF3,0x5EDB,0x5EDE,0x5EE1,0x5F49,0x5FB2,/* 0x70-0x77 */ 0x618B,0x6183,0x6179,0x61B1,0x61B0,0x61A2,0x6189,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2425,7 +2425,7 @@ static wchar_t c2u_E6[256] = { 0x71A9,0x71B5,0x719D,0x71A5,0x719E,0x71A4,0x71A1,0x71AA,/* 0x68-0x6F */ 0x719C,0x71A7,0x71B3,0x7298,0x729A,0x7358,0x7352,0x735E,/* 0x70-0x77 */ 0x735F,0x7360,0x735D,0x735B,0x7361,0x735A,0x7359,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2461,7 +2461,7 @@ static wchar_t c2u_E7[256] = { 0x8516,0x84FE,0x8528,0x851D,0x852E,0x8502,0x84FD,0x851E,/* 0x68-0x6F */ 0x84F6,0x8531,0x8526,0x84E7,0x84E8,0x84F0,0x84EF,0x84F9,/* 0x70-0x77 */ 0x8518,0x8520,0x8530,0x850B,0x8519,0x852F,0x8662,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2497,7 +2497,7 @@ static wchar_t c2u_E8[256] = { 0x92CF,0x92F1,0x92DF,0x92D8,0x92E9,0x92D7,0x92DD,0x92CC,/* 0x68-0x6F */ 0x92EF,0x92C2,0x92E8,0x92CA,0x92C8,0x92CE,0x92E6,0x92CD,/* 0x70-0x77 */ 0x92D5,0x92C9,0x92E0,0x92DE,0x92E7,0x92D1,0x92D3,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2533,7 +2533,7 @@ static wchar_t c2u_E9[256] = { 0x5DAD,0x5DAF,0x5DB4,0x5E67,0x5E68,0x5E66,0x5E6F,0x5EE9,/* 0x68-0x6F */ 0x5EE7,0x5EE6,0x5EE8,0x5EE5,0x5F4B,0x5FBC,0x619D,0x61A8,/* 0x70-0x77 */ 0x6196,0x61C5,0x61B4,0x61C6,0x61C1,0x61CC,0x61BA,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2569,7 +2569,7 @@ static wchar_t c2u_EA[256] = { 0x74A1,0x750B,0x7580,0x762F,0x762D,0x7631,0x763D,0x7633,/* 0x68-0x6F */ 0x763C,0x7635,0x7632,0x7630,0x76BB,0x76E6,0x779A,0x779D,/* 0x70-0x77 */ 0x77A1,0x779C,0x779B,0x77A2,0x77A3,0x7795,0x7799,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2605,7 +2605,7 @@ static wchar_t c2u_EB[256] = { 0x8790,0x8791,0x879D,0x8784,0x8794,0x879C,0x879A,0x8789,/* 0x68-0x6F */ 0x891E,0x8926,0x8930,0x892D,0x892E,0x8927,0x8931,0x8922,/* 0x70-0x77 */ 0x8929,0x8923,0x892F,0x892C,0x891F,0x89F1,0x8AE0,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2641,7 +2641,7 @@ static wchar_t c2u_EC[256] = { 0x99E9,0x99E7,0x9AB9,0x9ABF,0x9AB4,0x9ABB,0x9AF6,0x9AFA,/* 0x68-0x6F */ 0x9AF9,0x9AF7,0x9B33,0x9B80,0x9B85,0x9B87,0x9B7C,0x9B7E,/* 0x70-0x77 */ 0x9B7B,0x9B82,0x9B93,0x9B92,0x9B90,0x9B7A,0x9B95,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2677,7 +2677,7 @@ static wchar_t c2u_ED[256] = { 0x74AB,0x7490,0x74AA,0x74AD,0x74B1,0x74A5,0x74AF,0x7510,/* 0x68-0x6F */ 0x7511,0x7512,0x750F,0x7584,0x7643,0x7648,0x7649,0x7647,/* 0x70-0x77 */ 0x76A4,0x76E9,0x77B5,0x77AB,0x77B2,0x77B7,0x77B6,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2713,7 +2713,7 @@ static wchar_t c2u_EE[256] = { 0x87C4,0x87CA,0x87B4,0x87B6,0x87BF,0x87B8,0x87BD,0x87DE,/* 0x68-0x6F */ 0x87B2,0x8935,0x8933,0x893C,0x893E,0x8941,0x8952,0x8937,/* 0x70-0x77 */ 0x8942,0x89AD,0x89AF,0x89AE,0x89F2,0x89F3,0x8B1E,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2749,7 +2749,7 @@ static wchar_t c2u_EF[256] = { 0x9AFC,0x9B48,0x9B9A,0x9BA8,0x9B9E,0x9B9B,0x9BA6,0x9BA1,/* 0x68-0x6F */ 0x9BA5,0x9BA4,0x9B86,0x9BA2,0x9BA0,0x9BAF,0x9D33,0x9D41,/* 0x70-0x77 */ 0x9D67,0x9D36,0x9D2E,0x9D2F,0x9D31,0x9D38,0x9D30,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2785,7 +2785,7 @@ static wchar_t c2u_F0[256] = { 0x7C26,0x7C28,0x7C22,0x7C25,0x7C30,0x7E5C,0x7E50,0x7E56,/* 0x68-0x6F */ 0x7E63,0x7E58,0x7E62,0x7E5F,0x7E51,0x7E60,0x7E57,0x7E53,/* 0x70-0x77 */ 0x7FB5,0x7FB3,0x7FF7,0x7FF8,0x8075,0x81D1,0x81D2,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2821,7 +2821,7 @@ static wchar_t c2u_F1[256] = { 0x93A8,0x93B4,0x93A3,0x93A5,0x95D2,0x95D3,0x95D1,0x96B3,/* 0x68-0x6F */ 0x96D7,0x96DA,0x5DC2,0x96DF,0x96D8,0x96DD,0x9723,0x9722,/* 0x70-0x77 */ 0x9725,0x97AC,0x97AE,0x97A8,0x97AB,0x97A4,0x97AA,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2857,7 +2857,7 @@ static wchar_t c2u_F2[256] = { 0x702A,0x720C,0x720A,0x7207,0x7202,0x7205,0x72A5,0x72A6,/* 0x68-0x6F */ 0x72A4,0x72A3,0x72A1,0x74CB,0x74C5,0x74B7,0x74C3,0x7516,/* 0x70-0x77 */ 0x7660,0x77C9,0x77CA,0x77C4,0x77F1,0x791D,0x791B,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2893,7 +2893,7 @@ static wchar_t c2u_F3[256] = { 0x93CC,0x93D9,0x93A9,0x93E6,0x93CA,0x93D4,0x93EE,0x93E3,/* 0x68-0x6F */ 0x93D5,0x93C4,0x93CE,0x93C0,0x93D2,0x93E7,0x957D,0x95DA,/* 0x70-0x77 */ 0x95DB,0x96E1,0x9729,0x972B,0x972C,0x9728,0x9726,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2929,7 +2929,7 @@ static wchar_t c2u_F4[256] = { 0x7033,0x7041,0x7213,0x7214,0x72A8,0x737D,0x737C,0x74BA,/* 0x68-0x6F */ 0x76AB,0x76AA,0x76BE,0x76ED,0x77CC,0x77CE,0x77CF,0x77CD,/* 0x70-0x77 */ 0x77F2,0x7925,0x7923,0x7927,0x7928,0x7924,0x7929,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -2965,7 +2965,7 @@ static wchar_t c2u_F5[256] = { 0x9B12,0x9B11,0x9C0B,0x9C08,0x9BF7,0x9C05,0x9C12,0x9BF8,/* 0x68-0x6F */ 0x9C40,0x9C07,0x9C0E,0x9C06,0x9C17,0x9C14,0x9C09,0x9D9F,/* 0x70-0x77 */ 0x9D99,0x9DA4,0x9D9D,0x9D92,0x9D98,0x9D90,0x9D9B,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3001,7 +3001,7 @@ static wchar_t c2u_F6[256] = { 0x942C,0x9440,0x9431,0x95E5,0x95E4,0x95E3,0x9735,0x973A,/* 0x68-0x6F */ 0x97BF,0x97E1,0x9864,0x98C9,0x98C6,0x98C0,0x9958,0x9956,/* 0x70-0x77 */ 0x9A39,0x9A3D,0x9A46,0x9A44,0x9A42,0x9A41,0x9A3A,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3037,7 +3037,7 @@ static wchar_t c2u_F7[256] = { 0x9450,0x944A,0x944B,0x944F,0x9447,0x9445,0x9448,0x9449,/* 0x68-0x6F */ 0x9446,0x973F,0x97E3,0x986A,0x9869,0x98CB,0x9954,0x995B,/* 0x70-0x77 */ 0x9A4E,0x9A53,0x9A54,0x9A4C,0x9A4F,0x9A48,0x9A4A,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3073,7 +3073,7 @@ static wchar_t c2u_F8[256] = { 0x9DF6,0x9DE1,0x9DEE,0x9DE6,0x9DF2,0x9DF0,0x9DE2,0x9DEC,/* 0x68-0x6F */ 0x9DF4,0x9DF3,0x9DE8,0x9DED,0x9EC2,0x9ED0,0x9EF2,0x9EF3,/* 0x70-0x77 */ 0x9F06,0x9F1C,0x9F38,0x9F37,0x9F36,0x9F43,0x9F4F,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3109,7 +3109,7 @@ static wchar_t c2u_F9[256] = { 0x9F7B,0x9F7A,0x9F79,0x571E,0x7066,0x7C6F,0x883C,0x8DB2,/* 0x68-0x6F */ 0x8EA6,0x91C3,0x9474,0x9478,0x9476,0x9475,0x9A60,0x9C74,/* 0x70-0x77 */ 0x9C73,0x9C71,0x9C75,0x9E14,0x9E13,0x9EF6,0x9F0A,0x0000,/* 0x78-0x7F */ - + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ @@ -3129,38 +3129,38 @@ static wchar_t c2u_F9[256] = { }; static wchar_t *page_charset2uni[256] = { - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, c2u_A1, c2u_A2, c2u_A3, c2u_A4, c2u_A5, c2u_A6, c2u_A7, - c2u_A8, c2u_A9, c2u_AA, c2u_AB, c2u_AC, c2u_AD, c2u_AE, c2u_AF, - c2u_B0, c2u_B1, c2u_B2, c2u_B3, c2u_B4, c2u_B5, c2u_B6, c2u_B7, - c2u_B8, c2u_B9, c2u_BA, c2u_BB, c2u_BC, c2u_BD, c2u_BE, c2u_BF, - c2u_C0, c2u_C1, c2u_C2, c2u_C3, c2u_C4, c2u_C5, c2u_C6, NULL, - NULL, c2u_C9, c2u_CA, c2u_CB, c2u_CC, c2u_CD, c2u_CE, c2u_CF, - c2u_D0, c2u_D1, c2u_D2, c2u_D3, c2u_D4, c2u_D5, c2u_D6, c2u_D7, - c2u_D8, c2u_D9, c2u_DA, c2u_DB, c2u_DC, c2u_DD, c2u_DE, c2u_DF, - c2u_E0, c2u_E1, c2u_E2, c2u_E3, c2u_E4, c2u_E5, c2u_E6, c2u_E7, - c2u_E8, c2u_E9, c2u_EA, c2u_EB, c2u_EC, c2u_ED, c2u_EE, c2u_EF, - c2u_F0, c2u_F1, c2u_F2, c2u_F3, c2u_F4, c2u_F5, c2u_F6, c2u_F7, - c2u_F8, c2u_F9, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, c2u_A1, c2u_A2, c2u_A3, c2u_A4, c2u_A5, c2u_A6, c2u_A7, + c2u_A8, c2u_A9, c2u_AA, c2u_AB, c2u_AC, c2u_AD, c2u_AE, c2u_AF, + c2u_B0, c2u_B1, c2u_B2, c2u_B3, c2u_B4, c2u_B5, c2u_B6, c2u_B7, + c2u_B8, c2u_B9, c2u_BA, c2u_BB, c2u_BC, c2u_BD, c2u_BE, c2u_BF, + c2u_C0, c2u_C1, c2u_C2, c2u_C3, c2u_C4, c2u_C5, c2u_C6, NULL, + NULL, c2u_C9, c2u_CA, c2u_CB, c2u_CC, c2u_CD, c2u_CE, c2u_CF, + c2u_D0, c2u_D1, c2u_D2, c2u_D3, c2u_D4, c2u_D5, c2u_D6, c2u_D7, + c2u_D8, c2u_D9, c2u_DA, c2u_DB, c2u_DC, c2u_DD, c2u_DE, c2u_DF, + c2u_E0, c2u_E1, c2u_E2, c2u_E3, c2u_E4, c2u_E5, c2u_E6, c2u_E7, + c2u_E8, c2u_E9, c2u_EA, c2u_EB, c2u_EC, c2u_ED, c2u_EE, c2u_EF, + c2u_F0, c2u_F1, c2u_F2, c2u_F3, c2u_F4, c2u_F5, c2u_F6, c2u_F7, + c2u_F8, c2u_F9, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char u2c_02[512] = { @@ -3196,7 +3196,7 @@ static unsigned char u2c_02[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3255,7 +3255,7 @@ static unsigned char u2c_03[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3329,7 +3329,7 @@ static unsigned char u2c_21[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3372,7 +3372,7 @@ static unsigned char u2c_22[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3429,7 +3429,7 @@ static unsigned char u2c_25[512] = { 0xA1, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xA2, 0x62, 0xA2, 0x63, 0xA2, 0x64, /* 0x80-0x83 */ 0xA2, 0x65, 0xA2, 0x66, 0xA2, 0x67, 0xA2, 0x68, /* 0x84-0x87 */ 0xA2, 0x69, 0xA2, 0x70, 0xA2, 0x6F, 0xA2, 0x6E, /* 0x88-0x8B */ @@ -3527,7 +3527,7 @@ static unsigned char u2c_31[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3571,7 +3571,7 @@ static unsigned char u2c_32[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xA4, 0x40, 0xA4, 0x47, 0xA4, 0x54, 0xA5, 0x7C, /* 0x80-0x83 */ 0xA4, 0xAD, 0xA4, 0xBB, 0xA4, 0x43, 0xA4, 0x4B, /* 0x84-0x87 */ 0xA4, 0x45, 0xA4, 0x51, 0xA4, 0xEB, 0xA4, 0xF5, /* 0x88-0x8B */ @@ -3620,7 +3620,7 @@ static unsigned char u2c_33[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -3678,7 +3678,7 @@ static unsigned char u2c_4E[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xB0, 0xAE, 0xD4, 0x4B, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xB6, 0xC3, 0xDC, 0xB1, /* 0x80-0x83 */ 0xDC, 0xB2, 0x00, 0x00, 0xA4, 0x46, 0x00, 0x00, /* 0x84-0x87 */ 0xA4, 0xA9, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xC6, /* 0x88-0x8B */ @@ -3746,7 +3746,7 @@ static unsigned char u2c_4F[512] = { 0xCB, 0xB9, 0xA8, 0xD6, 0xCB, 0xB8, 0xCB, 0xBC, /* 0x74-0x77 */ 0xCB, 0xC3, 0xCB, 0xC1, 0xA8, 0xDE, 0xA8, 0xD9, /* 0x78-0x7B */ 0xCB, 0xB3, 0xCB, 0xB5, 0xA8, 0xDB, 0xA8, 0xCF, /* 0x7C-0x7F */ - + 0xCB, 0xB6, 0xCB, 0xC2, 0xCB, 0xC9, 0xA8, 0xD4, /* 0x80-0x83 */ 0xCB, 0xBB, 0xCB, 0xB4, 0xA8, 0xD3, 0xCB, 0xB7, /* 0x84-0x87 */ 0xA8, 0xD7, 0xCB, 0xBA, 0x00, 0x00, 0xA8, 0xD2, /* 0x88-0x8B */ @@ -3814,7 +3814,7 @@ static unsigned char u2c_50[512] = { 0xB0, 0xBC, 0xB0, 0xBB, 0xB0, 0xB8, 0xB0, 0xBD, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xB0, 0xAF, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xB0, 0xB0, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xB3, 0xC8, 0x00, 0x00, 0xD8, 0x5E, 0xD8, 0x57, /* 0x80-0x83 */ 0x00, 0x00, 0xB3, 0xC5, 0x00, 0x00, 0xD8, 0x5F, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0x55, /* 0x88-0x8B */ @@ -3882,7 +3882,7 @@ static unsigned char u2c_51[512] = { 0x00, 0x00, 0xA7, 0x4C, 0xA8, 0xE4, 0xA8, 0xE3, /* 0x74-0x77 */ 0xA8, 0xE5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xAD, 0xDD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xBE, 0xAC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC9, 0x4E, /* 0x84-0x87 */ 0x00, 0x00, 0xA5, 0x54, 0xA5, 0x55, 0x00, 0x00, /* 0x88-0x8B */ @@ -3950,7 +3950,7 @@ static unsigned char u2c_52[512] = { 0xB3, 0xCF, 0xB3, 0xD0, 0x00, 0x00, 0xB6, 0xD0, /* 0x74-0x77 */ 0xDC, 0xC7, 0x00, 0x00, 0xDC, 0xC6, 0xDC, 0xC8, /* 0x78-0x7B */ 0xDC, 0xC9, 0xB6, 0xD1, 0x00, 0x00, 0xB6, 0xCF, /* 0x7C-0x7F */ - + 0xE1, 0x41, 0xE1, 0x42, 0xB9, 0xBB, 0xB9, 0xBA, /* 0x80-0x83 */ 0xE3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0xBC, 0x40, /* 0x84-0x87 */ 0xBC, 0x41, 0xBC, 0x42, 0xBC, 0x44, 0xE4, 0xF2, /* 0x88-0x8B */ @@ -4018,7 +4018,7 @@ static unsigned char u2c_53[512] = { 0x00, 0x00, 0xA7, 0x5A, 0x00, 0x00, 0xA8, 0xF7, /* 0x74-0x77 */ 0xA8, 0xF8, 0xA8, 0xF9, 0x00, 0x00, 0xAB, 0x6F, /* 0x78-0x7B */ 0xCD, 0xF5, 0x00, 0x00, 0x00, 0x00, 0xAD, 0xEB, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xC9, 0x44, 0x00, 0x00, /* 0x80-0x83 */ 0xA4, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xC9, 0xC4, 0x00, 0x00, /* 0x88-0x8B */ @@ -4086,7 +4086,7 @@ static unsigned char u2c_54[512] = { 0xCB, 0xE6, 0xA8, 0xFE, 0xA9, 0x4C, 0xA9, 0x45, /* 0x74-0x77 */ 0xA9, 0x41, 0x00, 0x00, 0xCB, 0xE2, 0xA9, 0x44, /* 0x78-0x7B */ 0xA9, 0x49, 0xA9, 0x52, 0xCB, 0xE3, 0xCB, 0xDC, /* 0x7C-0x7F */ - + 0xA9, 0x43, 0xCB, 0xDD, 0xCB, 0xDF, 0x00, 0x00, /* 0x80-0x83 */ 0xA9, 0x46, 0x00, 0x00, 0xA9, 0x48, 0xCB, 0xDB, /* 0x84-0x87 */ 0xCB, 0xE0, 0x00, 0x00, 0x00, 0x00, 0xA9, 0x51, /* 0x88-0x8B */ @@ -4154,7 +4154,7 @@ static unsigned char u2c_55[512] = { 0x00, 0x00, 0xD4, 0x71, 0xD4, 0x72, 0xD8, 0x6A, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB3, 0xD7, /* 0x78-0x7B */ 0xB3, 0xDA, 0xD8, 0x75, 0xB3, 0xEE, 0xD8, 0x78, /* 0x7C-0x7F */ - + 0xB3, 0xD8, 0xD8, 0x71, 0xB3, 0xDE, 0xB3, 0xE4, /* 0x80-0x83 */ 0xB5, 0xBD, 0x00, 0x00, 0x00, 0x00, 0xB3, 0xE2, /* 0x84-0x87 */ 0xD8, 0x6E, 0xB3, 0xEF, 0xB3, 0xDB, 0xB3, 0xE3, /* 0x88-0x8B */ @@ -4222,7 +4222,7 @@ static unsigned char u2c_56[512] = { 0xBC, 0x51, 0x00, 0x00, 0xBE, 0xBF, 0xE9, 0x46, /* 0x74-0x77 */ 0xBE, 0xB7, 0xBE, 0xB4, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xEC, 0xC6, 0xEC, 0xC8, /* 0x7C-0x7F */ - + 0xC0, 0x7B, 0xEC, 0xC9, 0xEC, 0xC7, 0xEC, 0xC5, /* 0x80-0x83 */ 0xEC, 0xC4, 0xC0, 0x7D, 0xEC, 0xC3, 0xC0, 0x7E, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -4290,7 +4290,7 @@ static unsigned char u2c_57[512] = { 0xCB, 0xFD, 0xCB, 0xFA, 0xCB, 0xF8, 0xA9, 0x56, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCB, 0xFB, /* 0x78-0x7B */ 0xA9, 0x5C, 0xCC, 0x41, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xCB, 0xF9, 0x00, 0x00, 0xAB, 0xAB, 0xA9, 0x55, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAB, 0xAC, /* 0x88-0x8B */ @@ -4358,7 +4358,7 @@ static unsigned char u2c_58[512] = { 0xE1, 0x5D, 0xB9, 0xD0, 0xE1, 0x63, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xB9, 0xD5, 0xE1, 0x5F, 0xE1, 0x66, /* 0x78-0x7B */ 0xE1, 0x57, 0xB9, 0xD7, 0xB9, 0xD1, 0xE1, 0x5C, /* 0x7C-0x7F */ - + 0xBC, 0x55, 0xE1, 0x5B, 0xE1, 0x64, 0xB9, 0xD2, /* 0x80-0x83 */ 0x00, 0x00, 0xB9, 0xD6, 0xE1, 0x5A, 0xE1, 0x60, /* 0x84-0x87 */ 0xE1, 0x65, 0xE1, 0x56, 0xB9, 0xD4, 0xE1, 0x5E, /* 0x88-0x8B */ @@ -4426,7 +4426,7 @@ static unsigned char u2c_59[512] = { 0xA5, 0xA3, 0x00, 0x00, 0xA5, 0xA4, 0xC9, 0xD1, /* 0x74-0x77 */ 0xA6, 0x6C, 0xA6, 0x6F, 0x00, 0x00, 0xC9, 0xCF, /* 0x78-0x7B */ 0xC9, 0xCD, 0xA6, 0x6E, 0xC9, 0xD0, 0xC9, 0xD2, /* 0x7C-0x7F */ - + 0xC9, 0xCC, 0xA6, 0x71, 0xA6, 0x70, 0xA6, 0x6D, /* 0x80-0x83 */ 0xA6, 0x6B, 0xC9, 0xCE, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xA7, 0xB3, 0x00, 0x00, /* 0x88-0x8B */ @@ -4494,7 +4494,7 @@ static unsigned char u2c_5A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x40, /* 0x74-0x77 */ 0xD8, 0xBB, 0x00, 0x00, 0xD8, 0xB8, 0xD8, 0xC9, /* 0x78-0x7B */ 0xD8, 0xBD, 0xD8, 0xCA, 0x00, 0x00, 0xB4, 0x42, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0xC6, /* 0x80-0x83 */ 0xD8, 0xC3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xD8, 0xC4, 0xD8, 0xC7, /* 0x88-0x8B */ @@ -4562,7 +4562,7 @@ static unsigned char u2c_5B[512] = { 0x00, 0x00, 0xB9, 0xE5, 0x00, 0x00, 0xE1, 0x7D, /* 0x74-0x77 */ 0xBE, 0xC7, 0x00, 0x00, 0xC0, 0xA9, 0xEC, 0xD7, /* 0x78-0x7B */ 0x00, 0x00, 0xC4, 0x5E, 0x00, 0x00, 0xC5, 0x70, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xC9, 0x72, 0x00, 0x00, 0xA5, 0xA6, /* 0x80-0x83 */ 0xC9, 0x73, 0xA6, 0x76, 0x00, 0x00, 0xA6, 0x74, /* 0x84-0x87 */ 0xA6, 0x75, 0xA6, 0x77, 0x00, 0x00, 0xA7, 0xBA, /* 0x88-0x8B */ @@ -4630,7 +4630,7 @@ static unsigned char u2c_5C[512] = { 0xC9, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xA6, 0x7A, 0xC9, 0xD7, 0xC9, 0xD8, /* 0x78-0x7B */ 0xC9, 0xD6, 0x00, 0x00, 0xC9, 0xD9, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xCA, 0xC7, 0x00, 0x00, /* 0x84-0x87 */ 0xCA, 0xC2, 0xCA, 0xC4, 0xCA, 0xC6, 0xCA, 0xC3, /* 0x88-0x8B */ @@ -4698,7 +4698,7 @@ static unsigned char u2c_5D[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xA9, /* 0x74-0x77 */ 0x00, 0x00, 0xE1, 0xB0, 0xE1, 0xA7, 0x00, 0x00, /* 0x78-0x7B */ 0xE1, 0xAE, 0xE1, 0xA5, 0xE1, 0xAD, 0xE1, 0xB1, /* 0x7C-0x7F */ - + 0xE1, 0xA4, 0xE1, 0xA8, 0xE1, 0xA3, 0x00, 0x00, /* 0x80-0x83 */ 0xB9, 0xF1, 0x00, 0x00, 0xE1, 0xA6, 0xB9, 0xF2, /* 0x84-0x87 */ 0xE1, 0xAC, 0xE1, 0xAB, 0xE1, 0xAA, 0x00, 0x00, /* 0x88-0x8B */ @@ -4766,7 +4766,7 @@ static unsigned char u2c_5E[512] = { 0xA6, 0x7E, 0xC9, 0xDB, 0xA6, 0x7D, 0x00, 0x00, /* 0x74-0x77 */ 0xA9, 0xAF, 0xB7, 0x46, 0x00, 0x00, 0xA4, 0xDB, /* 0x78-0x7B */ 0xA5, 0xAE, 0xAB, 0xD5, 0xB4, 0x58, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xC9, 0x79, 0x00, 0x00, 0xC9, 0x7A, 0x00, 0x00, /* 0x80-0x83 */ 0xC9, 0xDC, 0x00, 0x00, 0x00, 0x00, 0xA7, 0xC8, /* 0x84-0x87 */ 0xCA, 0xD0, 0xCA, 0xCE, 0xA7, 0xC9, 0xCA, 0xCD, /* 0x88-0x8B */ @@ -4834,7 +4834,7 @@ static unsigned char u2c_5F[512] = { 0xC9, 0xDF, 0x00, 0x00, 0xCA, 0xD5, 0xA7, 0xCF, /* 0x74-0x77 */ 0xCA, 0xD4, 0xA7, 0xD0, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xA9, 0xBC, 0xCC, 0x77, 0xCC, 0x76, 0xA9, 0xBB, /* 0x7C-0x7F */ - + 0xA9, 0xB9, 0xA9, 0xBA, 0xCC, 0x75, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xAB, 0xDD, 0xCE, 0xBE, 0xAB, 0xE0, /* 0x84-0x87 */ 0xAB, 0xDC, 0xAB, 0xE2, 0xAB, 0xDE, 0xAB, 0xDF, /* 0x88-0x8B */ @@ -4902,7 +4902,7 @@ static unsigned char u2c_60[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1, 0x76, /* 0x7C-0x7F */ - + 0xD1, 0xA4, 0xD1, 0xA6, 0x00, 0x00, 0xD1, 0xA8, /* 0x80-0x83 */ 0xAE, 0xA8, 0xAE, 0xAE, 0xD5, 0x53, 0xD1, 0xAC, /* 0x84-0x87 */ 0xD1, 0xA3, 0xB1, 0x78, 0xD5, 0x51, 0x00, 0x00, /* 0x88-0x8B */ @@ -4970,7 +4970,7 @@ static unsigned char u2c_61[512] = { 0xE1, 0xCD, 0xBA, 0x48, 0xBC, 0x79, 0xBA, 0x42, /* 0x74-0x77 */ 0x00, 0x00, 0xE5, 0x7A, 0xE1, 0xCF, 0x00, 0x00, /* 0x78-0x7B */ 0xBC, 0xA1, 0x00, 0x00, 0xBC, 0xA4, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xE1, 0xCC, 0x00, 0x00, 0xBC, 0x7E, 0xE5, 0x79, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xE5, 0x7E, 0xBE, 0xCE, 0xE5, 0x78, /* 0x88-0x8B */ @@ -5038,7 +5038,7 @@ static unsigned char u2c_62[512] = { 0xCA, 0xF6, 0x00, 0x00, 0xA7, 0xDF, 0xCA, 0xF3, /* 0x74-0x77 */ 0x00, 0x00, 0xA7, 0xE5, 0xCA, 0xEF, 0xCA, 0xEE, /* 0x78-0x7B */ 0xA7, 0xE3, 0xCA, 0xF4, 0xA7, 0xE4, 0xA9, 0xD3, /* 0x7C-0x7F */ - + 0xA7, 0xDE, 0xCA, 0xF1, 0x00, 0x00, 0xCA, 0xE7, /* 0x80-0x83 */ 0xA7, 0xDB, 0x00, 0x00, 0xA7, 0xEE, 0xCA, 0xEC, /* 0x84-0x87 */ 0xCA, 0xF2, 0xA7, 0xE0, 0xA7, 0xE2, 0x00, 0x00, /* 0x88-0x8B */ @@ -5106,7 +5106,7 @@ static unsigned char u2c_63[512] = { 0x00, 0x00, 0xD5, 0x77, 0xB4, 0xA8, 0xB1, 0xB6, /* 0x74-0x77 */ 0xD5, 0xA1, 0x00, 0x00, 0xB1, 0xCC, 0xB1, 0xC9, /* 0x78-0x7B */ 0xD5, 0x7B, 0xD5, 0x6A, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xB1, 0xC8, 0xD5, 0xA3, 0xD5, 0x69, 0xB1, 0xBD, /* 0x80-0x83 */ 0xB1, 0xC1, 0xD5, 0xA2, 0x00, 0x00, 0xD5, 0x73, /* 0x84-0x87 */ 0xB1, 0xC2, 0xB1, 0xBC, 0xD5, 0x68, 0x00, 0x00, /* 0x88-0x8B */ @@ -5174,7 +5174,7 @@ static unsigned char u2c_64[512] = { 0xE1, 0xDD, 0xE1, 0xE2, 0xE1, 0xDE, 0xE1, 0xF3, /* 0x74-0x77 */ 0xBA, 0x4E, 0xBC, 0xB1, 0xBA, 0x50, 0xBA, 0x55, /* 0x78-0x7B */ 0x00, 0x00, 0xE1, 0xE1, 0x00, 0x00, 0xE1, 0xED, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE1, 0xE6, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xE5, 0xB1, 0x00, 0x00, 0xBA, 0x4A, /* 0x84-0x87 */ 0xBC, 0xB4, 0xE9, 0xAA, 0xE5, 0xB6, 0xE5, 0xB5, /* 0x88-0x8B */ @@ -5242,7 +5242,7 @@ static unsigned char u2c_65[512] = { 0xBE, 0xE3, 0xBC, 0xC4, 0xE5, 0xBD, 0xBC, 0xC5, /* 0x74-0x77 */ 0xBC, 0xC6, 0xE5, 0xBF, 0xE5, 0xBE, 0xE5, 0xC0, /* 0x78-0x7B */ 0xE9, 0xB1, 0x00, 0x00, 0x00, 0x00, 0xE9, 0xB0, /* 0x7C-0x7F */ - + 0xEC, 0xEF, 0xEC, 0xEE, 0xC0, 0xC4, 0xC0, 0xC5, /* 0x80-0x83 */ 0xF2, 0x48, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE5, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5310,7 +5310,7 @@ static unsigned char u2c_66[512] = { 0xB4, 0xB8, 0x00, 0x00, 0xB4, 0xB9, 0xB4, 0xBE, /* 0x74-0x77 */ 0xDD, 0xC7, 0xD9, 0xA6, 0xB4, 0xBC, 0xD9, 0xA3, /* 0x78-0x7B */ 0xD9, 0xA1, 0x00, 0x00, 0xB4, 0xBD, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xD9, 0xA4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xB7, 0x79, 0x00, 0x00, 0xDD, 0xBF, 0xB7, 0x76, /* 0x84-0x87 */ 0xB7, 0x77, 0xB7, 0x75, 0xDD, 0xC4, 0xDD, 0xC3, /* 0x88-0x8B */ @@ -5378,7 +5378,7 @@ static unsigned char u2c_67[512] = { 0xCC, 0xDC, 0xAA, 0x53, 0xCC, 0xD7, 0xAA, 0x49, /* 0x74-0x77 */ 0xCC, 0xE6, 0xCC, 0xE7, 0xCC, 0xDF, 0xCC, 0xD8, /* 0x78-0x7B */ 0xAA, 0x56, 0xCC, 0xE4, 0xAA, 0x51, 0xAA, 0x4F, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xCC, 0xE5, 0x00, 0x00, 0xCC, 0xE3, /* 0x80-0x83 */ 0xCC, 0xDB, 0xCC, 0xD3, 0xCC, 0xDA, 0xAA, 0x4A, /* 0x84-0x87 */ 0x00, 0x00, 0xAA, 0x50, 0x00, 0x00, 0xAA, 0x44, /* 0x88-0x8B */ @@ -5446,7 +5446,7 @@ static unsigned char u2c_68[512] = { 0xD5, 0xBE, 0xD5, 0xBD, 0xB1, 0xED, 0xD5, 0xC1, /* 0x74-0x77 */ 0xD5, 0xD0, 0xD5, 0xB0, 0x00, 0x00, 0xD5, 0xD1, /* 0x78-0x7B */ 0xD5, 0xC3, 0xD5, 0xD5, 0xD5, 0xC9, 0xB1, 0xEC, /* 0x7C-0x7F */ - + 0xD5, 0xC7, 0xB1, 0xE7, 0xB1, 0xFC, 0xB1, 0xF2, /* 0x80-0x83 */ 0x00, 0x00, 0xB1, 0xF6, 0xB1, 0xF5, 0xD5, 0xB1, /* 0x84-0x87 */ 0x00, 0x00, 0xD5, 0xCE, 0xD5, 0xD4, 0xD5, 0xCC, /* 0x88-0x8B */ @@ -5514,7 +5514,7 @@ static unsigned char u2c_69[512] = { 0xDD, 0xE8, 0xB7, 0xA5, 0xDD, 0xE5, 0xB7, 0xA2, /* 0x74-0x77 */ 0xDD, 0xDF, 0xB7, 0xAD, 0xDD, 0xD6, 0xDD, 0xF3, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xB7, 0xA7, 0xDE, 0xC6, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xB7, 0xAE, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5582,7 +5582,7 @@ static unsigned char u2c_6A[512] = { 0x00, 0x00, 0x00, 0x00, 0xE9, 0xC7, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xC0, 0xCF, 0xED, 0x45, /* 0x7C-0x7F */ - + 0xC0, 0xC8, 0xEC, 0xF5, 0x00, 0x00, 0xED, 0x41, /* 0x80-0x83 */ 0xC0, 0xCA, 0xED, 0x48, 0x00, 0x00, 0xEC, 0xFC, /* 0x84-0x87 */ 0x00, 0x00, 0xEC, 0xF7, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5650,7 +5650,7 @@ static unsigned char u2c_6B[512] = { 0x00, 0x00, 0x00, 0x00, 0xE6, 0xD1, 0xBE, 0xFA, /* 0x74-0x77 */ 0xC2, 0x6B, 0xA4, 0xEF, 0x00, 0x00, 0xA6, 0xBA, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xCC, 0xEB, 0xAA, 0x5C, /* 0x7C-0x7F */ - + 0xCC, 0xEA, 0x00, 0x00, 0xCF, 0x65, 0xAC, 0x6F, /* 0x80-0x83 */ 0xCF, 0x66, 0x00, 0x00, 0xAC, 0x70, 0x00, 0x00, /* 0x84-0x87 */ 0xD1, 0xFC, 0xAE, 0xEE, 0xAE, 0xED, 0x00, 0x00, /* 0x88-0x8B */ @@ -5718,7 +5718,7 @@ static unsigned char u2c_6C[512] = { 0xA8, 0x58, 0x00, 0x00, 0xA8, 0x5A, 0x00, 0x00, /* 0x74-0x77 */ 0xCB, 0x4B, 0x00, 0x00, 0xA8, 0x4D, 0xCB, 0x5C, /* 0x78-0x7B */ 0x00, 0x00, 0xA8, 0x54, 0xA8, 0x57, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xCD, 0x45, 0xA8, 0x47, 0xA8, 0x5E, 0xA8, 0x55, /* 0x80-0x83 */ 0xCB, 0x4E, 0xA8, 0x4A, 0xA8, 0x59, 0xCB, 0x56, /* 0x84-0x87 */ 0xA8, 0x48, 0xA8, 0x49, 0xCD, 0x43, 0xCB, 0x4F, /* 0x88-0x8B */ @@ -5785,7 +5785,7 @@ static unsigned char u2c_6D[512] = { 0xAF, 0x44, 0xD2, 0x68, 0xD2, 0x48, 0xAE, 0xFC, /* 0x74-0x77 */ 0xAE, 0xFB, 0xAF, 0x48, 0xD2, 0x45, 0xD2, 0x66, /* 0x78-0x7B */ 0xD2, 0x5A, 0xD2, 0x67, 0xD2, 0x61, 0xD2, 0x53, /* 0x7C-0x7F */ - + 0xD2, 0x62, 0x00, 0x00, 0xD2, 0x5C, 0xD2, 0x65, /* 0x80-0x83 */ 0xD2, 0x63, 0xAF, 0x49, 0xD2, 0x54, 0xAE, 0xF9, /* 0x84-0x87 */ 0xAE, 0xF8, 0xAF, 0x41, 0xAF, 0x47, 0xD2, 0x60, /* 0x88-0x8B */ @@ -5853,7 +5853,7 @@ static unsigned char u2c_6E[512] = { 0xD5, 0xE4, 0x00, 0x00, 0x00, 0x00, 0xDA, 0x50, /* 0x74-0x77 */ 0xDA, 0x4E, 0xDA, 0x52, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xD9, 0xEC, 0xB5, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -5921,7 +5921,7 @@ static unsigned char u2c_6F[512] = { 0x00, 0x00, 0x00, 0x00, 0xE6, 0x48, 0xE6, 0x5F, /* 0x74-0x77 */ 0xBC, 0xE8, 0x00, 0x00, 0xBC, 0xEB, 0xE6, 0x61, /* 0x78-0x7B */ 0xBC, 0xE0, 0xE6, 0x56, 0xE5, 0xFB, 0xE6, 0x5C, /* 0x7C-0x7F */ - + 0xC0, 0xDF, 0x00, 0x00, 0xE6, 0x4A, 0x00, 0x00, /* 0x80-0x83 */ 0xBC, 0xE1, 0xE6, 0x45, 0xBC, 0xE5, 0xE5, 0xFC, /* 0x84-0x87 */ 0xBA, 0xAB, 0xE6, 0x41, 0x00, 0x00, 0xE6, 0x5A, /* 0x88-0x8B */ @@ -5989,7 +5989,7 @@ static unsigned char u2c_70[512] = { 0xCB, 0x5E, 0x00, 0x00, 0xA8, 0x5F, 0x00, 0x00, /* 0x74-0x77 */ 0xA8, 0x62, 0x00, 0x00, 0xCB, 0x5F, 0x00, 0x00, /* 0x78-0x7B */ 0xA8, 0x60, 0xA8, 0x61, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xCD, 0x58, 0xCD, 0x5A, /* 0x80-0x83 */ 0xCD, 0x55, 0xCD, 0x52, 0xCD, 0x54, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA4, 0x00, 0x00, /* 0x88-0x8B */ @@ -6057,7 +6057,7 @@ static unsigned char u2c_71[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xDE, 0x74, 0x00, 0x00, 0x00, 0x00, 0xE2, 0xC1, /* 0x78-0x7B */ 0x00, 0x00, 0xBA, 0xB4, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xE2, 0xBD, 0xE2, 0xC3, 0xE2, 0xBF, 0x00, 0x00, /* 0x80-0x83 */ 0xBA, 0xB6, 0xE2, 0xBE, 0xE2, 0xC2, 0xE2, 0xBA, /* 0x84-0x87 */ 0x00, 0x00, 0xE2, 0xBC, 0xBA, 0xB5, 0x00, 0x00, /* 0x88-0x8B */ @@ -6125,7 +6125,7 @@ static unsigned char u2c_72[512] = { 0xAC, 0xBB, 0x00, 0x00, 0xD2, 0xA2, 0xD2, 0xA1, /* 0x74-0x77 */ 0xD2, 0x7E, 0xAF, 0x53, 0x00, 0x00, 0xD6, 0x5D, /* 0x78-0x7B */ 0xD6, 0x5E, 0xB2, 0x6F, 0xD6, 0x5C, 0xD6, 0x5F, /* 0x7C-0x7F */ - + 0xB5, 0x52, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xB5, 0x51, 0xDA, 0x6B, 0xDA, 0x6A, 0x00, 0x00, /* 0x84-0x87 */ 0xDA, 0x68, 0xDA, 0x69, 0x00, 0x00, 0xDA, 0x6C, /* 0x88-0x8B */ @@ -6193,7 +6193,7 @@ static unsigned char u2c_73[512] = { 0x00, 0x00, 0xC2, 0x79, 0xEF, 0xFE, 0xC2, 0x78, /* 0x74-0x77 */ 0xC3, 0x7E, 0x00, 0x00, 0xC3, 0xA1, 0xC4, 0x6D, /* 0x78-0x7B */ 0xF4, 0x6E, 0xF4, 0x6D, 0xF5, 0xDD, 0xF6, 0xEF, /* 0x7C-0x7F */ - + 0xC5, 0x7A, 0xF7, 0xE8, 0xF7, 0xE7, 0xF7, 0xE9, /* 0x80-0x83 */ 0xA5, 0xC8, 0xCF, 0xC6, 0xAF, 0x59, 0xB2, 0x76, /* 0x84-0x87 */ 0xD6, 0x6A, 0xA5, 0xC9, 0xC9, 0xA7, 0xA4, 0xFD, /* 0x88-0x8B */ @@ -6261,7 +6261,7 @@ static unsigned char u2c_74[512] = { 0x00, 0x00, 0xE2, 0xD1, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xE6, 0xAB, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xE6, 0xAA, 0xE6, 0xA7, 0xBD, 0x40, 0xEA, 0x62, /* 0x7C-0x7F */ - + 0xBD, 0x41, 0xE6, 0xA6, 0x00, 0x00, 0xBC, 0xFE, /* 0x80-0x83 */ 0x00, 0x00, 0xE6, 0xA8, 0xE6, 0xA5, 0xE6, 0xA2, /* 0x84-0x87 */ 0xE6, 0xA9, 0xE6, 0xA3, 0xE6, 0xA4, 0xBC, 0xFD, /* 0x88-0x8B */ @@ -6329,7 +6329,7 @@ static unsigned char u2c_75[512] = { 0x00, 0x00, 0x00, 0x00, 0xB7, 0xED, 0xDE, 0xC5, /* 0x74-0x77 */ 0xB7, 0xEE, 0xDE, 0xC4, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xE2, 0xD8, 0xE6, 0xAE, 0xBD, 0x42, /* 0x7C-0x7F */ - + 0xEA, 0x6A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xED, 0x73, 0x00, 0x00, 0xC3, 0xA6, 0xC3, 0xA5, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xC5, 0x7C, 0xA5, 0xD4, /* 0x88-0x8B */ @@ -6397,7 +6397,7 @@ static unsigned char u2c_76[512] = { 0x00, 0x00, 0xF9, 0xCC, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xAC, 0xD1, 0xCF, 0xDE, 0x00, 0x00, 0xB5, 0x6E, /* 0x78-0x7B */ 0xB5, 0x6F, 0xA5, 0xD5, 0xA6, 0xCA, 0xCA, 0x47, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xCB, 0x71, 0xA8, 0x6D, 0x00, 0x00, /* 0x80-0x83 */ 0xAA, 0xBA, 0x00, 0x00, 0xAC, 0xD2, 0xAC, 0xD3, /* 0x84-0x87 */ 0xAC, 0xD4, 0xD6, 0xA6, 0xD2, 0xCB, 0xAF, 0x6F, /* 0x88-0x8B */ @@ -6465,7 +6465,7 @@ static unsigned char u2c_77[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xB8, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xE2, 0xE3, 0xBA, 0xCC, 0xE2, 0xE9, 0xBA, 0xCD, /* 0x7C-0x7F */ - + 0xE2, 0xE7, 0xE2, 0xE2, 0xE2, 0xE5, 0xE2, 0xEA, /* 0x80-0x83 */ 0xBA, 0xCB, 0xE2, 0xE4, 0x00, 0x00, 0xBD, 0x4E, /* 0x84-0x87 */ 0xE6, 0xBF, 0xE6, 0xBE, 0x00, 0x00, 0xBD, 0x51, /* 0x88-0x8B */ @@ -6533,7 +6533,7 @@ static unsigned char u2c_78[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xDE, 0xEE, 0x00, 0x00, 0xDE, 0xF2, /* 0x78-0x7B */ 0xB8, 0x4E, 0x00, 0x00, 0xE2, 0xF0, 0xB8, 0x51, /* 0x7C-0x7F */ - + 0xDE, 0xF0, 0xF9, 0xD6, 0x00, 0x00, 0xDE, 0xED, /* 0x80-0x83 */ 0xDE, 0xE8, 0xDE, 0xEA, 0xDE, 0xEB, 0xDE, 0xE4, /* 0x84-0x87 */ 0x00, 0x00, 0xB8, 0x4D, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6601,7 +6601,7 @@ static unsigned char u2c_79[512] = { 0xDA, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xDE, 0xF6, 0xB8, 0x52, 0x00, 0x00, /* 0x78-0x7B */ 0xDE, 0xF3, 0xDE, 0xF5, 0x00, 0x00, 0xB8, 0x53, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xB8, 0x54, 0xDE, 0xF4, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xE3, 0x41, 0x00, 0x00, 0xE2, 0xF9, 0xE2, 0xFA, /* 0x88-0x8B */ @@ -6669,7 +6669,7 @@ static unsigned char u2c_7A[512] = { 0xA5, 0xDE, 0xCA, 0x48, 0xA8, 0x73, 0x00, 0x00, /* 0x74-0x77 */ 0xCD, 0xA5, 0xAA, 0xC6, 0xAA, 0xC5, 0xCD, 0xA6, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xD0, 0x40, 0xAC, 0xEF, /* 0x7C-0x7F */ - + 0xCF, 0xFE, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xAF, 0xB6, 0xD2, 0xF8, 0xD2, 0xF6, 0xD2, 0xFC, /* 0x84-0x87 */ 0xAF, 0xB7, 0xD2, 0xF7, 0xD2, 0xFB, 0xD2, 0xF9, /* 0x88-0x8B */ @@ -6737,7 +6737,7 @@ static unsigned char u2c_7B[512] = { 0xDF, 0x49, 0xBA, 0xE1, 0xDF, 0x52, 0xB8, 0x5F, /* 0x74-0x77 */ 0xDF, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xE3, 0x5D, 0x00, 0x00, /* 0x80-0x83 */ 0xBA, 0xE8, 0xE3, 0x58, 0x00, 0x00, 0xBA, 0xE7, /* 0x84-0x87 */ 0xE3, 0x4E, 0x00, 0x00, 0xE3, 0x50, 0xBA, 0xE0, /* 0x88-0x8B */ @@ -6805,7 +6805,7 @@ static unsigned char u2c_7C[512] = { 0x00, 0x00, 0xCD, 0xA8, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0xD0, 0x45, 0xD0, 0x46, 0xD0, 0x44, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xAC, 0xF3, 0x00, 0x00, 0xD0, 0x47, /* 0x7C-0x7F */ - + 0xD0, 0x48, 0xD0, 0x49, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xD3, 0x49, 0xD3, 0x4F, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xD3, 0x4D, 0xAF, 0xBB, 0xD3, 0x4B, 0x00, 0x00, /* 0x88-0x8B */ @@ -6873,7 +6873,7 @@ static unsigned char u2c_7D[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xB8, 0x68, 0xDF, 0x5D, 0xDF, 0x5F, /* 0x78-0x7B */ 0xDF, 0x61, 0xDF, 0x65, 0x00, 0x00, 0xDF, 0x5B, /* 0x7C-0x7F */ - + 0xDF, 0x59, 0xB8, 0x6A, 0x00, 0x00, 0xDF, 0x60, /* 0x80-0x83 */ 0xDF, 0x64, 0xDF, 0x5C, 0xDF, 0x58, 0x00, 0x00, /* 0x84-0x87 */ 0xDF, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -6940,7 +6940,7 @@ static unsigned char u2c_7E[512] = { 0xF2, 0xB7, 0xF2, 0xB0, 0xF2, 0xAF, 0xF2, 0xB3, /* 0x74-0x77 */ 0xF2, 0xB1, 0xC3, 0xB6, 0xF2, 0xB5, 0xF4, 0xAC, /* 0x78-0x7B */ 0xC4, 0x7E, 0xC4, 0x7D, 0xF4, 0xAD, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xF4, 0xAF, 0xF4, 0xAE, 0xC4, 0xA1, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xF5, 0xEB, 0xF5, 0xE8, /* 0x84-0x87 */ 0xF5, 0xE9, 0x00, 0x00, 0xF5, 0xE7, 0xF5, 0xEA, /* 0x88-0x8B */ @@ -6984,7 +6984,7 @@ static unsigned char u2c_7F[512] = { 0x00, 0x00, 0xBD, 0x7C, 0xE6, 0xF1, 0xBD, 0x7D, /* 0x74-0x77 */ 0x00, 0x00, 0xBF, 0xA9, 0xEA, 0xE2, 0xEA, 0xE0, /* 0x78-0x7B */ 0xEA, 0xE1, 0xED, 0xE4, 0xED, 0xE3, 0xED, 0xE2, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0xBB, /* 0x80-0x83 */ 0x00, 0x00, 0xC3, 0xB9, 0xF2, 0xBC, 0xF7, 0x44, /* 0x84-0x87 */ 0xC5, 0xF9, 0xF8, 0xBA, 0xA6, 0xCF, 0xAA, 0xCB, /* 0x88-0x8B */ @@ -7052,7 +7052,7 @@ static unsigned char u2c_80[512] = { 0x00, 0x00, 0xF0, 0x7C, 0xC2, 0xBF, 0xC2, 0xBE, /* 0x74-0x77 */ 0xF2, 0xC0, 0xF4, 0xB2, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xC5, 0xA5, 0xC5, 0xA4, 0xA6, 0xD6, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xD1, 0xFB, 0x00, 0x00, /* 0x80-0x83 */ 0xB8, 0x77, 0xB5, 0xC2, 0xB8, 0x76, 0xBB, 0x46, /* 0x84-0x87 */ 0x00, 0x00, 0xA6, 0xD7, 0xC9, 0xA9, 0xA6, 0xD8, /* 0x88-0x8B */ @@ -7120,7 +7120,7 @@ static unsigned char u2c_81[512] = { 0xB5, 0xCD, 0x00, 0x00, 0xDF, 0x7C, 0xDF, 0x74, /* 0x74-0x77 */ 0xB8, 0x7A, 0xB8, 0xA1, 0xB8, 0xA2, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBB, 0x4C, /* 0x7C-0x7F */ - + 0xBB, 0x48, 0x00, 0x00, 0xBB, 0x4D, 0xE3, 0xA6, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xE3, 0xA5, 0xE3, 0xA7, /* 0x84-0x87 */ 0xBB, 0x4A, 0xE3, 0xA4, 0xBB, 0x4B, 0xE3, 0xAA, /* 0x88-0x8B */ @@ -7188,7 +7188,7 @@ static unsigned char u2c_82[512] = { 0xD7, 0x58, 0xDB, 0x5B, 0x00, 0x00, 0xC6, 0x41, /* 0x74-0x77 */ 0xCA, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xCA, 0x4B, 0xCA, 0x4D, 0xA6, 0xE3, 0xCA, 0x4E, /* 0x7C-0x7F */ - + 0xCA, 0x4C, 0x00, 0x00, 0x00, 0x00, 0xCB, 0xA2, /* 0x80-0x83 */ 0xCB, 0xA3, 0xCB, 0x7B, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xCB, 0xA1, 0xA8, 0xA1, /* 0x88-0x8B */ @@ -7256,7 +7256,7 @@ static unsigned char u2c_83[512] = { 0xD7, 0x60, 0xD7, 0x65, 0xD7, 0x79, 0xB2, 0xFC, /* 0x74-0x77 */ 0xB2, 0xF2, 0x00, 0x00, 0xD7, 0x5D, 0xB2, 0xFD, /* 0x78-0x7B */ 0xB2, 0xFE, 0xD7, 0x68, 0xD7, 0x6F, 0xD7, 0x75, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xD7, 0x62, 0x00, 0x00, 0xD7, 0x69, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xB3, 0x40, 0xD7, 0x77, /* 0x84-0x87 */ 0xD7, 0x72, 0xB2, 0xFA, 0xB2, 0xF8, 0xD7, 0x6E, /* 0x88-0x8B */ @@ -7324,7 +7324,7 @@ static unsigned char u2c_84[512] = { 0xDF, 0xBA, 0xB8, 0xAA, 0xDF, 0xAC, 0xB8, 0xA7, /* 0x74-0x77 */ 0xDF, 0xC4, 0xDF, 0xAD, 0xDF, 0xC2, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0xDF, 0xB7, 0xDF, 0xDB, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0xB8, 0xA6, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xDF, 0xB3, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7392,7 +7392,7 @@ static unsigned char u2c_85[512] = { 0x00, 0x00, 0xEB, 0x4E, 0xEE, 0x53, 0xEE, 0x40, /* 0x74-0x77 */ 0xEE, 0x45, 0xEE, 0x52, 0xEE, 0x44, 0xED, 0xFB, /* 0x78-0x7B */ 0xEE, 0x41, 0x00, 0x00, 0xC1, 0xA2, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xED, 0xF4, 0xEE, 0x4D, 0xEE, 0x4F, 0xED, 0xF3, /* 0x80-0x83 */ 0xC1, 0xA1, 0xEE, 0x51, 0xEE, 0x49, 0xC1, 0xA8, /* 0x84-0x87 */ 0xEE, 0x50, 0xEE, 0x42, 0xC1, 0xAA, 0xED, 0xF9, /* 0x88-0x8B */ @@ -7460,7 +7460,7 @@ static unsigned char u2c_86[512] = { 0xD0, 0xA7, 0x00, 0x00, 0x00, 0x00, 0xD0, 0xA6, /* 0x74-0x77 */ 0x00, 0x00, 0xAD, 0x69, 0xAD, 0x6B, 0xAD, 0x6A, /* 0x78-0x7B */ 0xD0, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xD3, 0xC4, 0xD3, 0xC1, 0xD3, 0xBF, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0xB0, 0x41, 0xD3, 0xC2, /* 0x88-0x8B */ @@ -7528,7 +7528,7 @@ static unsigned char u2c_87[512] = { 0xBD, 0xB9, 0xE7, 0xBD, 0xBD, 0xBA, 0xE7, 0xA4, /* 0x74-0x77 */ 0xBD, 0xBD, 0xEB, 0x64, 0xE7, 0xB7, 0xE7, 0xBC, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xEB, 0x61, 0xBD, 0xB8, 0xBF, 0xC0, /* 0x80-0x83 */ 0xEB, 0x6B, 0xEB, 0x67, 0x00, 0x00, 0xEB, 0x65, /* 0x84-0x87 */ 0xEB, 0x60, 0xEB, 0x6F, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -7596,7 +7596,7 @@ static unsigned char u2c_88[512] = { 0xD3, 0xDB, 0xD3, 0xD2, 0xD3, 0xD3, 0xB0, 0x4A, /* 0x74-0x77 */ 0x00, 0x00, 0xB0, 0x4E, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xD3, 0xDC, 0xB0, 0x4D, 0xD3, 0xDA, 0xD3, 0xD7, /* 0x7C-0x7F */ - + 0xD3, 0xD5, 0xB0, 0x4B, 0xB0, 0x4C, 0xD3, 0xD9, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xB3, 0x50, 0xD7, 0xB2, 0x00, 0x00, 0xB3, 0x55, /* 0x88-0x8B */ @@ -7664,7 +7664,7 @@ static unsigned char u2c_89[512] = { 0xF7, 0xFC, 0x00, 0x00, 0xF7, 0xFB, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xF9, 0x48, 0xF9, 0x49, 0xF9, 0x4B, /* 0x78-0x7B */ 0xF9, 0x4A, 0x00, 0x00, 0xCA, 0x50, 0xA6, 0xE8, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xAD, 0x6E, 0xD7, 0xC5, 0xB5, 0xF7, /* 0x80-0x83 */ 0x00, 0x00, 0xDF, 0xFA, 0xC2, 0xD0, 0x00, 0x00, /* 0x84-0x87 */ 0xF2, 0xF2, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA3, /* 0x88-0x8B */ @@ -7732,7 +7732,7 @@ static unsigned char u2c_8A[512] = { 0xE0, 0x50, 0xE0, 0x4D, 0xE0, 0x45, 0xE0, 0x4A, /* 0x74-0x77 */ 0x00, 0x00, 0xB8, 0xE2, 0xE0, 0x51, 0xB8, 0xE3, /* 0x78-0x7B */ 0xB8, 0xD9, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x47, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xE0, 0x4F, 0xE0, 0x4B, 0xE0, 0x4E, /* 0x80-0x83 */ 0xE0, 0x4C, 0xB8, 0xDD, 0xE0, 0x46, 0xB8, 0xD8, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE4, 0x4C, /* 0x88-0x8B */ @@ -7800,7 +7800,7 @@ static unsigned char u2c_8B[512] = { 0xC4, 0xFE, 0x00, 0x00, 0x00, 0x00, 0xC5, 0x40, /* 0x74-0x77 */ 0xF6, 0x4E, 0xF6, 0x4D, 0xF6, 0x50, 0xF6, 0x51, /* 0x78-0x7B */ 0x00, 0x00, 0xC5, 0x41, 0xF7, 0x56, 0xF7, 0x5B, /* 0x7C-0x7F */ - + 0xC5, 0xAA, 0x00, 0x00, 0xF7, 0x58, 0x00, 0x00, /* 0x80-0x83 */ 0xF7, 0x57, 0xF7, 0x5A, 0xF7, 0x59, 0x00, 0x00, /* 0x84-0x87 */ 0xF8, 0x43, 0x00, 0x00, 0xC5, 0xDC, 0xF8, 0x42, /* 0x88-0x8B */ @@ -7844,7 +7844,7 @@ static unsigned char u2c_8C[512] = { 0x00, 0x00, 0xF0, 0xEF, 0xF3, 0x46, 0xF3, 0x45, /* 0x74-0x77 */ 0xCB, 0xA4, 0xB0, 0x5C, 0xB0, 0x5B, 0xD3, 0xE0, /* 0x78-0x7B */ 0x00, 0x00, 0xD7, 0xD1, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xDB, 0xE7, 0xDB, 0xE6, 0xB6, 0x49, 0x00, 0x00, /* 0x80-0x83 */ 0xE0, 0x59, 0xE0, 0x5A, 0xE0, 0x58, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xB8, 0xE8, 0xB8, 0xE7, 0x00, 0x00, /* 0x88-0x8B */ @@ -7912,7 +7912,7 @@ static unsigned char u2c_8D[512] = { 0xAD, 0x75, 0x00, 0x00, 0xD3, 0xE3, 0xB0, 0x5F, /* 0x74-0x77 */ 0xD3, 0xE4, 0xD7, 0xD5, 0x00, 0x00, 0xD7, 0xD4, /* 0x78-0x7B */ 0x00, 0x00, 0xD7, 0xD3, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xDB, 0xEE, 0xB6, 0x58, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0xDB, 0xED, 0xB6, 0x57, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0xDB, 0xEF, 0xB6, 0x56, 0x00, 0x00, /* 0x88-0x8B */ @@ -7980,7 +7980,7 @@ static unsigned char u2c_8E[512] = { 0xC3, 0xE0, 0x00, 0x00, 0xC3, 0xDD, 0x00, 0x00, /* 0x74-0x77 */ 0xF3, 0x50, 0x00, 0x00, 0xC3, 0xDF, 0xF3, 0x54, /* 0x78-0x7B */ 0xC3, 0xDA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0xC4, 0xBC, 0xC4, 0xBE, 0x00, 0x00, /* 0x80-0x83 */ 0xF4, 0xD9, 0xC4, 0xBD, 0xF4, 0xD7, 0xC3, 0xDC, /* 0x84-0x87 */ 0xF4, 0xD8, 0xC4, 0xBB, 0xC5, 0x43, 0xC5, 0x45, /* 0x88-0x8B */ @@ -8048,7 +8048,7 @@ static unsigned char u2c_8F[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8116,7 +8116,7 @@ static unsigned char u2c_90[512] = { 0xBF, 0xEE, 0xBF, 0xED, 0xEB, 0xD0, 0xBE, 0x45, /* 0x74-0x77 */ 0xBF, 0xEF, 0xEB, 0xD1, 0xBF, 0xF2, 0xEB, 0xD2, /* 0x78-0x7B */ 0xBF, 0xF1, 0xC1, 0xD8, 0xEE, 0xC3, 0xC1, 0xD7, /* 0x7C-0x7F */ - + 0xC1, 0xDC, 0xC1, 0xDA, 0xC1, 0xDB, 0xC2, 0xE3, /* 0x80-0x83 */ 0xC1, 0xD9, 0xEE, 0xC2, 0xEB, 0xD3, 0xC2, 0xE2, /* 0x84-0x87 */ 0xC2, 0xE4, 0x00, 0x00, 0xC3, 0xE4, 0xC3, 0xE5, /* 0x88-0x8B */ @@ -8184,7 +8184,7 @@ static unsigned char u2c_91[512] = { 0xBB, 0xC6, 0xBB, 0xC3, 0x00, 0x00, 0xBB, 0xC5, /* 0x74-0x77 */ 0xBB, 0xC4, 0xE4, 0x74, 0xE4, 0x72, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xE8, 0x61, 0xE8, 0x5E, 0xE8, 0x5F, 0xBE, 0x4D, /* 0x80-0x83 */ 0xE8, 0x60, 0xE8, 0x5B, 0xE8, 0x5C, 0xBE, 0x4A, /* 0x84-0x87 */ 0x00, 0x00, 0xBE, 0x4B, 0xE8, 0x5D, 0xBE, 0x4C, /* 0x88-0x8B */ @@ -8252,7 +8252,7 @@ static unsigned char u2c_92[512] = { 0x00, 0x00, 0x00, 0x00, 0xE4, 0x78, 0x00, 0x00, /* 0x74-0x77 */ 0xBB, 0xC7, 0xE4, 0xA4, 0xE4, 0x7A, 0xBB, 0xCC, /* 0x78-0x7B */ 0xBB, 0xD0, 0xE4, 0xAD, 0xE4, 0xB5, 0xE4, 0xA6, /* 0x7C-0x7F */ - + 0xBB, 0xC8, 0x00, 0x00, 0xE4, 0xAA, 0xE0, 0xB6, /* 0x80-0x83 */ 0x00, 0x00, 0xBB, 0xC9, 0xE4, 0xB1, 0xE4, 0xB6, /* 0x84-0x87 */ 0xE4, 0xAE, 0x00, 0x00, 0xE4, 0xB0, 0xE4, 0xB9, /* 0x88-0x8B */ @@ -8320,7 +8320,7 @@ static unsigned char u2c_93[512] = { 0x00, 0x00, 0xC1, 0xE4, 0xEE, 0xD6, 0xEE, 0xE5, /* 0x74-0x77 */ 0x00, 0x00, 0xEE, 0xDF, 0xEB, 0xE3, 0xEE, 0xE6, /* 0x78-0x7B */ 0xEE, 0xD3, 0x00, 0x00, 0xC1, 0xE9, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xEE, 0xEB, 0x00, 0x00, 0xC1, 0xE2, 0xEE, 0xCE, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xF1, 0x60, 0xF1, 0x59, 0xC2, 0xE9, 0x00, 0x00, /* 0x88-0x8B */ @@ -8388,7 +8388,7 @@ static unsigned char u2c_94[512] = { 0xF9, 0x72, 0xF9, 0x75, 0xF9, 0x74, 0xC6, 0x68, /* 0x74-0x77 */ 0xF9, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xC6, 0x72, 0xC6, 0x70, 0xC6, 0x71, 0xC6, 0x77, /* 0x7C-0x7F */ - + 0xF9, 0xC0, 0xF9, 0xC1, 0xF9, 0xBF, 0xF9, 0xC9, /* 0x80-0x83 */ }; @@ -8425,7 +8425,7 @@ static unsigned char u2c_95[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xF8, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xD8, 0x44, 0xDC, 0x78, /* 0x78-0x7B */ 0xE8, 0xA5, 0xF3, 0x76, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xAA, 0xF9, 0x00, 0x00, 0xAD, 0xAC, 0xB0, 0x7B, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xD8, 0x45, 0x00, 0x00, /* 0x84-0x87 */ 0xD8, 0x46, 0xB3, 0xAC, 0x00, 0x00, 0xB6, 0x7D, /* 0x88-0x8B */ @@ -8487,7 +8487,7 @@ static unsigned char u2c_96[512] = { 0xB3, 0xB2, 0xB3, 0xAE, 0xB3, 0xB3, 0xB3, 0xB4, /* 0x74-0x77 */ 0xB3, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0xD8, 0x47, 0xB6, 0xA7, 0xDC, 0x7D, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xDC, 0xA3, 0x00, 0x00, 0x00, 0x00, 0xDC, 0xA2, /* 0x80-0x83 */ 0xB6, 0xAC, 0xB6, 0xA8, 0xB6, 0xA9, 0xDC, 0x7C, /* 0x84-0x87 */ 0xDC, 0x7E, 0xDC, 0xA1, 0xB6, 0xA4, 0xB6, 0xA6, /* 0x88-0x8B */ @@ -8555,7 +8555,7 @@ static unsigned char u2c_97[512] = { 0xB9, 0x75, 0x00, 0x00, 0xB9, 0x76, 0xE0, 0xDB, /* 0x74-0x77 */ 0xE0, 0xDC, 0x00, 0x00, 0xE4, 0xC0, 0xE4, 0xC5, /* 0x78-0x7B */ 0xBB, 0xDE, 0xE4, 0xBF, 0xE4, 0xC1, 0xE4, 0xC8, /* 0x7C-0x7F */ - + 0xE4, 0xC3, 0xE4, 0xC7, 0xE4, 0xC4, 0xE4, 0xC2, /* 0x80-0x83 */ 0xE4, 0xC6, 0xBB, 0xDF, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0xE8, 0xB3, 0x00, 0x00, 0xE8, 0xB1, 0xBE, 0x63, /* 0x88-0x8B */ @@ -8623,7 +8623,7 @@ static unsigned char u2c_98[512] = { 0xF9, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8691,7 +8691,7 @@ static unsigned char u2c_99[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8759,7 +8759,7 @@ static unsigned char u2c_9A[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8827,7 +8827,7 @@ static unsigned char u2c_9B[512] = { 0xE8, 0xDB, 0xE8, 0xDF, 0xE8, 0xDE, 0xBE, 0x7B, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0xEC, 0x7D, 0xEC, 0x78, /* 0x78-0x7B */ 0xEC, 0x76, 0xEC, 0xA1, 0xEC, 0x77, 0x00, 0x00, /* 0x7C-0x7F */ - + 0xEC, 0x73, 0x00, 0x00, 0xEC, 0x79, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0xEC, 0x74, 0xEF, 0x72, 0xEC, 0x75, /* 0x84-0x87 */ 0xEC, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8895,7 +8895,7 @@ static unsigned char u2c_9C[512] = { 0xF9, 0x77, 0xF9, 0x7A, 0x00, 0x00, 0xC6, 0x73, /* 0x74-0x77 */ 0xC6, 0x74, 0xF9, 0xCA, 0xF9, 0xCE, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -8963,7 +8963,7 @@ static unsigned char u2c_9D[512] = { 0xF3, 0xE5, 0xF3, 0xE6, 0x00, 0x00, 0xF3, 0xD8, /* 0x74-0x77 */ 0xF3, 0xDF, 0xF3, 0xEE, 0x00, 0x00, 0xF3, 0xEB, /* 0x78-0x7B */ 0x00, 0x00, 0xF3, 0xE3, 0x00, 0x00, 0xF3, 0xEF, /* 0x7C-0x7F */ - + 0xF3, 0xDE, 0xF3, 0xD9, 0xF3, 0xEC, 0x00, 0x00, /* 0x80-0x83 */ 0xF3, 0xDB, 0xF3, 0xE9, 0xF3, 0xE0, 0xF3, 0xF0, /* 0x84-0x87 */ 0xF3, 0xDC, 0xC4, 0x4C, 0xF3, 0xDA, 0xF3, 0xE1, /* 0x88-0x8B */ @@ -9031,7 +9031,7 @@ static unsigned char u2c_9E[512] = { 0x00, 0x00, 0xB3, 0xBF, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0xC4, 0xD0, 0xF6, 0xC9, 0x00, 0x00, /* 0x78-0x7B */ 0xC6, 0x50, 0xC6, 0x51, 0x00, 0x00, 0xB3, 0xC0, /* 0x7C-0x7F */ - + 0xE0, 0xEE, 0x00, 0x00, 0xB9, 0xA8, 0xE8, 0xF0, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0xEC, 0xB0, 0xEC, 0xB1, /* 0x84-0x87 */ 0xEC, 0xAF, 0xEF, 0xAB, 0xEF, 0xAA, 0xC2, 0x47, /* 0x88-0x8B */ @@ -9099,7 +9099,7 @@ static unsigned char u2c_9F[512] = { 0xF8, 0xEB, 0xF8, 0xEC, 0xF8, 0xED, 0xC6, 0x53, /* 0x74-0x77 */ 0xF9, 0x67, 0xF9, 0x6A, 0xF9, 0x69, 0xF9, 0x68, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD3, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -9149,7 +9149,7 @@ static unsigned char u2c_F9[512] = { 0xAD, 0x59, 0xB1, 0xB0, 0xB2, 0xA4, 0xAB, 0x47, /* 0x74-0x77 */ 0xA8, 0xE2, 0x00, 0x00, 0xB1, 0xE7, 0xC2, 0xB3, /* 0x78-0x7B */ 0xA8, 0x7D, 0xBD, 0xCC, 0xB6, 0x71, 0xC0, 0x79, /* 0x7C-0x7F */ - + 0xA7, 0x66, 0xA4, 0x6B, 0xC3, 0x66, 0xAE, 0xC8, /* 0x80-0x83 */ 0xC2, 0x6F, 0xC4, 0x72, 0xBE, 0x5B, 0xC6, 0x7A, /* 0x84-0x87 */ 0xC4, 0x52, 0xBE, 0xA4, 0xA4, 0x4F, 0xBE, 0xE4, /* 0x88-0x8B */ @@ -9262,7 +9262,7 @@ static unsigned char u2c_FF[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ @@ -9292,37 +9292,37 @@ static unsigned char u2c_FF[512] = { }; static unsigned char *page_uni2charset[256] = { - NULL, NULL, u2c_02, u2c_03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_20, u2c_21, u2c_22, u2c_23, NULL, u2c_25, u2c_26, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, u2c_4E, u2c_4F, - u2c_50, u2c_51, u2c_52, u2c_53, u2c_54, u2c_55, u2c_56, u2c_57, - u2c_58, u2c_59, u2c_5A, u2c_5B, u2c_5C, u2c_5D, u2c_5E, u2c_5F, - u2c_60, u2c_61, u2c_62, u2c_63, u2c_64, u2c_65, u2c_66, u2c_67, - u2c_68, u2c_69, u2c_6A, u2c_6B, u2c_6C, u2c_6D, u2c_6E, u2c_6F, - u2c_70, u2c_71, u2c_72, u2c_73, u2c_74, u2c_75, u2c_76, u2c_77, - u2c_78, u2c_79, u2c_7A, u2c_7B, u2c_7C, u2c_7D, u2c_7E, u2c_7F, - u2c_80, u2c_81, u2c_82, u2c_83, u2c_84, u2c_85, u2c_86, u2c_87, - u2c_88, u2c_89, u2c_8A, u2c_8B, u2c_8C, u2c_8D, u2c_8E, u2c_8F, - u2c_90, u2c_91, u2c_92, u2c_93, u2c_94, u2c_95, u2c_96, u2c_97, - u2c_98, u2c_99, u2c_9A, u2c_9B, u2c_9C, u2c_9D, u2c_9E, u2c_9F, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, u2c_02, u2c_03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_20, u2c_21, u2c_22, u2c_23, NULL, u2c_25, u2c_26, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, u2c_4E, u2c_4F, + u2c_50, u2c_51, u2c_52, u2c_53, u2c_54, u2c_55, u2c_56, u2c_57, + u2c_58, u2c_59, u2c_5A, u2c_5B, u2c_5C, u2c_5D, u2c_5E, u2c_5F, + u2c_60, u2c_61, u2c_62, u2c_63, u2c_64, u2c_65, u2c_66, u2c_67, + u2c_68, u2c_69, u2c_6A, u2c_6B, u2c_6C, u2c_6D, u2c_6E, u2c_6F, + u2c_70, u2c_71, u2c_72, u2c_73, u2c_74, u2c_75, u2c_76, u2c_77, + u2c_78, u2c_79, u2c_7A, u2c_7B, u2c_7C, u2c_7D, u2c_7E, u2c_7F, + u2c_80, u2c_81, u2c_82, u2c_83, u2c_84, u2c_85, u2c_86, u2c_87, + u2c_88, u2c_89, u2c_8A, u2c_8B, u2c_8C, u2c_8D, u2c_8E, u2c_8F, + u2c_90, u2c_91, u2c_92, u2c_93, u2c_94, u2c_95, u2c_96, u2c_97, + u2c_98, u2c_99, u2c_9A, u2c_9B, u2c_9C, u2c_9D, u2c_9E, u2c_9F, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-1.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-1.c index 828ab9ac4a2..33989890880 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-1.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-1.c @@ -133,7 +133,7 @@ static unsigned char page00[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page00, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-13.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-13.c index 999b1e4ad8d..02ffb54fc39 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-13.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-13.c @@ -157,11 +157,11 @@ static unsigned char page20[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-14.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-14.c index 5a14dbfeb59..19d04eb58ac 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-14.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-14.c @@ -20,85 +20,85 @@ static wchar_t charset2uni[256] = { /* 0x00*/ - 0x0000, 0x0001, 0x0002, 0x0003, - 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000a, 0x000b, - 0x000c, 0x000d, 0x000e, 0x000f, + 0x0000, 0x0001, 0x0002, 0x0003, + 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000a, 0x000b, + 0x000c, 0x000d, 0x000e, 0x000f, /* 0x10*/ - 0x0010, 0x0011, 0x0012, 0x0013, - 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001a, 0x001b, - 0x001c, 0x001d, 0x001e, 0x001f, + 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001a, 0x001b, + 0x001c, 0x001d, 0x001e, 0x001f, /* 0x20*/ - 0x0020, 0x0021, 0x0022, 0x0023, - 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002a, 0x002b, - 0x002c, 0x002d, 0x002e, 0x002f, + 0x0020, 0x0021, 0x0022, 0x0023, + 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002a, 0x002b, + 0x002c, 0x002d, 0x002e, 0x002f, /* 0x30*/ - 0x0030, 0x0031, 0x0032, 0x0033, - 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003a, 0x003b, - 0x003c, 0x003d, 0x003e, 0x003f, + 0x0030, 0x0031, 0x0032, 0x0033, + 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003a, 0x003b, + 0x003c, 0x003d, 0x003e, 0x003f, /* 0x40*/ - 0x0040, 0x0041, 0x0042, 0x0043, - 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004a, 0x004b, - 0x004c, 0x004d, 0x004e, 0x004f, + 0x0040, 0x0041, 0x0042, 0x0043, + 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004a, 0x004b, + 0x004c, 0x004d, 0x004e, 0x004f, /* 0x50*/ - 0x0050, 0x0051, 0x0052, 0x0053, - 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005a, 0x005b, - 0x005c, 0x005d, 0x005e, 0x005f, + 0x0050, 0x0051, 0x0052, 0x0053, + 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005a, 0x005b, + 0x005c, 0x005d, 0x005e, 0x005f, /* 0x60*/ - 0x0060, 0x0061, 0x0062, 0x0063, - 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006a, 0x006b, - 0x006c, 0x006d, 0x006e, 0x006f, + 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006a, 0x006b, + 0x006c, 0x006d, 0x006e, 0x006f, /* 0x70*/ - 0x0070, 0x0071, 0x0072, 0x0073, - 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007a, 0x007b, - 0x007c, 0x007d, 0x007e, 0x007f, + 0x0070, 0x0071, 0x0072, 0x0073, + 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007a, 0x007b, + 0x007c, 0x007d, 0x007e, 0x007f, /* 0x80*/ - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, /* 0x90*/ - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, /* 0xa0*/ - 0x00a0, 0x1e02, 0x1e03, 0x00a3, - 0x010a, 0x010b, 0x1e0a, 0x00a7, - 0x1e80, 0x00a9, 0x1e82, 0x1e0b, - 0x1ef2, 0x00ad, 0x00ae, 0x0178, + 0x00a0, 0x1e02, 0x1e03, 0x00a3, + 0x010a, 0x010b, 0x1e0a, 0x00a7, + 0x1e80, 0x00a9, 0x1e82, 0x1e0b, + 0x1ef2, 0x00ad, 0x00ae, 0x0178, /* 0xb0*/ - 0x1e1e, 0x1e1f, 0x0120, 0x0121, - 0x1e40, 0x1e41, 0x00b6, 0x1e56, - 0x1e81, 0x1e57, 0x1e83, 0x1e60, - 0x1ef3, 0x1e84, 0x1e85, 0x1e61, + 0x1e1e, 0x1e1f, 0x0120, 0x0121, + 0x1e40, 0x1e41, 0x00b6, 0x1e56, + 0x1e81, 0x1e57, 0x1e83, 0x1e60, + 0x1ef3, 0x1e84, 0x1e85, 0x1e61, /* 0xc0*/ - 0x00c0, 0x00c1, 0x00c2, 0x00c3, - 0x00c4, 0x00c5, 0x00c6, 0x00c7, - 0x00c8, 0x00c9, 0x00ca, 0x00cb, - 0x00cc, 0x00cd, 0x00ce, 0x00cf, + 0x00c0, 0x00c1, 0x00c2, 0x00c3, + 0x00c4, 0x00c5, 0x00c6, 0x00c7, + 0x00c8, 0x00c9, 0x00ca, 0x00cb, + 0x00cc, 0x00cd, 0x00ce, 0x00cf, /* 0xd0*/ - 0x0174, 0x00d1, 0x00d2, 0x00d3, - 0x00d4, 0x00d5, 0x00d6, 0x1e6a, - 0x00d8, 0x00d9, 0x00da, 0x00db, - 0x00dc, 0x00dd, 0x0176, 0x00df, + 0x0174, 0x00d1, 0x00d2, 0x00d3, + 0x00d4, 0x00d5, 0x00d6, 0x1e6a, + 0x00d8, 0x00d9, 0x00da, 0x00db, + 0x00dc, 0x00dd, 0x0176, 0x00df, /* 0xe0*/ - 0x00e0, 0x00e1, 0x00e2, 0x00e3, - 0x00e4, 0x00e5, 0x00e6, 0x00e7, - 0x00e8, 0x00e9, 0x00ea, 0x00eb, - 0x00ec, 0x00ed, 0x00ee, 0x00ef, + 0x00e0, 0x00e1, 0x00e2, 0x00e3, + 0x00e4, 0x00e5, 0x00e6, 0x00e7, + 0x00e8, 0x00e9, 0x00ea, 0x00eb, + 0x00ec, 0x00ed, 0x00ee, 0x00ef, /* 0xf0*/ - 0x0175, 0x00f1, 0x00f2, 0x00f3, - 0x00f4, 0x00f5, 0x00f6, 0x1e6b, - 0x00f8, 0x00f9, 0x00fa, 0x00fb, - 0x00fc, 0x00fd, 0x0177, 0x00ff, + 0x0175, 0x00f1, 0x00f2, 0x00f3, + 0x00f4, 0x00f5, 0x00f6, 0x1e6b, + 0x00f8, 0x00f9, 0x00fa, 0x00fb, + 0x00fc, 0x00fd, 0x0177, 0x00ff, }; static unsigned char page00[256] = { @@ -154,7 +154,7 @@ static unsigned char page01[256] = { 0x00, 0x00, 0xd7, 0xf7, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */ 0x00, 0x00, 0x00, 0x00, 0xd0, 0xf0, 0xde, 0xfe, /* 0x70-0x77 */ 0xaf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */ - + 0xa8, 0xb8, 0xaa, 0xba, 0xbd, 0xbe, 0x00, 0x00, /* 0x80-0x87 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */ @@ -210,7 +210,7 @@ static unsigned char page1e[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, + page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-15.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-15.c index a2297d3e824..9f73e190015 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-15.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-15.c @@ -176,7 +176,7 @@ static unsigned char page20[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, + page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-2.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-2.c index 6ad040a3e9d..eaf96bc0396 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-2.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-2.c @@ -184,7 +184,7 @@ static unsigned char page02[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, page02, NULL, NULL, NULL, NULL, NULL, + page00, page01, page02, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-3.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-3.c index f035000e01b..98ee71bbf22 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-3.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-3.c @@ -184,7 +184,7 @@ static unsigned char page02[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, page02, NULL, NULL, NULL, NULL, NULL, + page00, page01, page02, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-4.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-4.c index 1bd6ef2bfe5..374f46cf519 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-4.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-4.c @@ -184,7 +184,7 @@ static unsigned char page02[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, page02, NULL, NULL, NULL, NULL, NULL, + page00, page01, page02, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-5.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-5.c index 052df9354a3..2e09bf2f948 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-5.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-5.c @@ -144,11 +144,11 @@ static unsigned char page21[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, page21, NULL, NULL, NULL, NULL, NULL, NULL, + page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, page21, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-6.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-6.c index 785cbeec1cc..6f60330c744 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-6.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-6.c @@ -140,7 +140,7 @@ static unsigned char page06[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, NULL, NULL, page06, NULL, + page00, NULL, NULL, NULL, NULL, NULL, page06, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-7.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-7.c index 23b834b10c4..3b74f2a32f3 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-7.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-7.c @@ -189,11 +189,11 @@ static unsigned char page20[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, page02, page03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page00, NULL, page02, page03, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + page20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-9.c b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-9.c index 47e18e6bb8c..54748fb630d 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_iso8859-9.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_iso8859-9.c @@ -148,7 +148,7 @@ static unsigned char page01[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, + page00, page01, NULL, NULL, NULL, NULL, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_koi8-r.c b/drivers/filesystems/reiserfs/src/nls/nls_koi8-r.c index e4cf807afa0..57123d81cd2 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_koi8-r.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_koi8-r.c @@ -195,11 +195,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, page22, page23, NULL, page25, NULL, NULL, + page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, page22, page23, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/nls/nls_koi8-u.c b/drivers/filesystems/reiserfs/src/nls/nls_koi8-u.c index f7f629fb0c2..15e41a9ed88 100644 --- a/drivers/filesystems/reiserfs/src/nls/nls_koi8-u.c +++ b/drivers/filesystems/reiserfs/src/nls/nls_koi8-u.c @@ -202,11 +202,11 @@ static unsigned char page25[256] = { }; static unsigned char *page_uni2charset[256] = { - page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, page22, page23, NULL, page25, NULL, NULL, + page00, NULL, NULL, NULL, page04, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, page22, page23, NULL, page25, NULL, NULL, }; static unsigned char charset2lower[256] = { diff --git a/drivers/filesystems/reiserfs/src/pnp.c b/drivers/filesystems/reiserfs/src/pnp.c index 110d50701ff..e0f4b164e0d 100644 --- a/drivers/filesystems/reiserfs/src/pnp.c +++ b/drivers/filesystems/reiserfs/src/pnp.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: pnp.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -74,26 +74,26 @@ RfsdPnp (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); DeviceObject = IrpContext->DeviceObject; - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); if ( !((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB)))) { _SEH2_LEAVE; // Status = STATUS_INVALID_PARAMETER } - + Irp = IrpContext->Irp; IrpSp = IoGetCurrentIrpStackLocation(Irp); SetFlag(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT); - + switch ( IrpSp->MinorFunction ) { case IRP_MN_QUERY_REMOVE_DEVICE: @@ -102,7 +102,7 @@ RfsdPnp (IN PRFSD_IRP_CONTEXT IrpContext) Status = RfsdPnpQueryRemove(IrpContext, Vcb); break; - + case IRP_MN_REMOVE_DEVICE: RfsdPrint((DBG_PNP, "RfsdPnp: RfsdPnpRemove...\n")); @@ -110,13 +110,13 @@ RfsdPnp (IN PRFSD_IRP_CONTEXT IrpContext) break; case IRP_MN_CANCEL_REMOVE_DEVICE: - + RfsdPrint((DBG_PNP, "RfsdPnp: RfsdPnpCancelRemove...\n")); Status = RfsdPnpCancelRemove(IrpContext, Vcb); break; case IRP_MN_SURPRISE_REMOVAL: - + RfsdPrint((DBG_PNP, "RfsdPnp: RfsdPnpSupriseRemove...\n")); Status = RfsdPnpSurpriseRemove(IrpContext, Vcb); break; @@ -137,7 +137,7 @@ RfsdPnp (IN PRFSD_IRP_CONTEXT IrpContext) // IoSkipCurrentIrpStackLocation( Irp ); - + Status = IoCallDriver(Vcb->TargetDeviceObject, Irp); IrpContext->Irp = NULL; @@ -146,7 +146,7 @@ RfsdPnp (IN PRFSD_IRP_CONTEXT IrpContext) RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -210,7 +210,7 @@ RfsdPnpQueryRemove ( TRUE ); RfsdPrint((DBG_PNP, "RfsdPnpQueryRemove: Call lower level driver...\n")); - Status = IoCallDriver( Vcb->TargetDeviceObject, + Status = IoCallDriver( Vcb->TargetDeviceObject, IrpContext->Irp); if (Status == STATUS_PENDING) { @@ -246,7 +246,7 @@ RfsdPnpQueryRemove ( IrpContext->Irp = NULL; } _SEH2_END; - + return Status; } @@ -291,7 +291,7 @@ RfsdPnpRemove ( TRUE, TRUE ); - Status = IoCallDriver( Vcb->TargetDeviceObject, + Status = IoCallDriver( Vcb->TargetDeviceObject, IrpContext->Irp); if (Status == STATUS_PENDING) { @@ -368,7 +368,7 @@ RfsdPnpSurpriseRemove ( TRUE, TRUE ); - Status = IoCallDriver( Vcb->TargetDeviceObject, + Status = IoCallDriver( Vcb->TargetDeviceObject, IrpContext->Irp); if (Status == STATUS_PENDING) { diff --git a/drivers/filesystems/reiserfs/src/read.c b/drivers/filesystems/reiserfs/src/read.c index b2580e096e1..e3891f15c2c 100644 --- a/drivers/filesystems/reiserfs/src/read.c +++ b/drivers/filesystems/reiserfs/src/read.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: read.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -40,7 +40,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext); /* FUNCTIONS *************************************************************/ /** Proxy to CcCopyRead, which simply asserts the success of the IoStatus. */ -BOOLEAN +BOOLEAN RfsdCopyRead( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -122,25 +122,25 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); - + FileObject = IrpContext->FileObject; FcbOrVcb = (PRFSD_FCBVCB) FileObject->FsContext; - + ASSERT(FcbOrVcb); - + if (!(FcbOrVcb->Identifier.Type == RFSDVCB && (PVOID)FcbOrVcb == (PVOID)Vcb)) { Status = STATUS_INVALID_DEVICE_REQUEST; @@ -150,18 +150,18 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) Ccb = (PRFSD_CCB) FileObject->FsContext2; Irp = IrpContext->Irp; - + Irp->IoStatus.Information = 0; IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + Length = IoStackLocation->Parameters.Read.Length; ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; - + PagingIo = (Irp->Flags & IRP_PAGING_IO ? TRUE : FALSE); Nocache = (Irp->Flags & IRP_NOCACHE ? TRUE : FALSE); SynchronousIo = (FileObject->Flags & FO_SYNCHRONOUS_IO ? TRUE : FALSE); - + if (Length == 0) { Irp->IoStatus.Information = 0; @@ -190,7 +190,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoReadAccess ); - + if (!NT_SUCCESS(Status)) { _SEH2_LEAVE; } @@ -211,7 +211,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_LEAVE; } } - + if (Nocache && ( (ByteOffset.LowPart & (SECTOR_SIZE - 1)) || (Length & (SECTOR_SIZE - 1)) )) { @@ -226,7 +226,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + if (!PagingIo) { if (!ExAcquireResourceSharedLite( &Vcb->MainResource, @@ -234,7 +234,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + MainResourceAcquired = TRUE; } else { @@ -246,11 +246,11 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + PagingIoResourceAcquired = TRUE; } - - + + if (ByteOffset.QuadPart >= Vcb->PartitionInformation.PartitionLength.QuadPart ) { Irp->IoStatus.Information = 0; @@ -276,13 +276,13 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) Length, &Irp->MdlAddress, &Irp->IoStatus ); - + Status = Irp->IoStatus.Status; } else { Buffer = RfsdGetUserBuffer(Irp); - + if (Buffer == NULL) { DbgBreak(); Status = STATUS_INVALID_USER_BUFFER; @@ -299,7 +299,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + Status = Irp->IoStatus.Status; } @@ -318,7 +318,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoWriteAccess ); - + if (!NT_SUCCESS(Status)) { _SEH2_LEAVE; } @@ -359,7 +359,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) &Vcb->PagingIoResource, ExGetCurrentResourceThread()); } - + if (MainResourceAcquired) { ExReleaseResourceForThreadLite( &Vcb->MainResource, @@ -380,7 +380,7 @@ RfsdReadVolume (IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoWriteAccess ); - + if (NT_SUCCESS(Status)) { Status = RfsdQueueRequest(IrpContext); } else { @@ -470,14 +470,14 @@ RfsdReadInode ( } -//----------------------------- - +//----------------------------- + // // Build the scatterred block ranges to be read // Status = RfsdBuildBDL2( - Vcb, Key, Inode, + Vcb, Key, Inode, &(blocks), &(Bdl) ); @@ -490,7 +490,7 @@ RfsdReadInode ( goto errorout; } - + { ULONGLONG bufferPos = 0; @@ -501,7 +501,7 @@ RfsdReadInode ( ( (Bdl[i].Offset >= Offset) && (Bdl[i].Offset < (Offset + Size)) ) // The block's offset is within the user's range ) { - ULONGLONG offsetFromDisk = Bdl[i].Lba; + ULONGLONG offsetFromDisk = Bdl[i].Lba; ULONGLONG lengthToRead = min(Size - bufferPos, Bdl[i].Length); j++; @@ -510,13 +510,13 @@ RfsdReadInode ( //KdPrint(("Rfsd: offsetFromDisk = %I64u, lengthToRead = %I64u\n", offsetFromDisk, lengthToRead)); //KdPrint(("Rfsd: Buffer = %p, bufferPos = %I64u\n", Buffer, bufferPos)); - IoStatus.Information = 0; + IoStatus.Information = 0; RfsdCopyRead( - Vcb->StreamObj, + Vcb->StreamObj, (PLARGE_INTEGER) (&offsetFromDisk), // offset (relative to partition) (ULONG) lengthToRead, // length to read - PIN_WAIT, // + PIN_WAIT, // (PVOID)((PUCHAR)Buffer + bufferPos), // buffer to read into &IoStatus ); @@ -574,39 +574,39 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); - + FileObject = IrpContext->FileObject; - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && - (Fcb->Identifier.Size == sizeof(RFSD_FCB))); + (Fcb->Identifier.Size == sizeof(RFSD_FCB))); Ccb = (PRFSD_CCB) FileObject->FsContext2; Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + Length = IoStackLocation->Parameters.Read.Length; ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; - + #if defined(_MSC_VER) && !defined(__clang__) - KdPrint(("$$$ " __FUNCTION__ " on key: %x,%xh to read %i bytes at the offset %xh in the file\n", + KdPrint(("$$$ " __FUNCTION__ " on key: %x,%xh to read %i bytes at the offset %xh in the file\n", Fcb->RfsdMcb->Key.k_dir_id, Fcb->RfsdMcb->Key.k_objectid, Length, ByteOffset.QuadPart)); #endif @@ -647,7 +647,7 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) DbgBreak(); _SEH2_LEAVE; } - + if (!PagingIo) { if (!ExAcquireResourceSharedLite( &Fcb->MainResource, @@ -655,7 +655,7 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + MainResourceAcquired = TRUE; if (!FsRtlCheckLockForReadAccess( @@ -671,10 +671,10 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + PagingIoResourceAcquired = TRUE; } - + if (!Nocache) { // Attempt cached access... @@ -717,18 +717,18 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) Length, &Irp->MdlAddress, &Irp->IoStatus ); - + Status = Irp->IoStatus.Status; } else { Buffer = RfsdGetUserBuffer(Irp); - + if (Buffer == NULL) { Status = STATUS_INVALID_USER_BUFFER; DbgBreak(); _SEH2_LEAVE; } - + if (!CcCopyRead( CacheObject, // the file object (representing the open operation performed by the thread) (PLARGE_INTEGER)&ByteOffset, // starting offset IN THE FILE, from where the read should be performed @@ -740,7 +740,7 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) DbgBreak(); _SEH2_LEAVE; } - + Status = Irp->IoStatus.Status; } @@ -767,7 +767,7 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoWriteAccess ); - + if (NT_SUCCESS(Status)) { /* Zero the total buffer */ @@ -787,7 +787,7 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length; - + Status = RfsdReadInode( IrpContext, Vcb, @@ -809,13 +809,13 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) &Fcb->PagingIoResource, ExGetCurrentResourceThread()); } - + if (MainResourceAcquired) { ExReleaseResourceForThreadLite( &Fcb->MainResource, ExGetCurrentResourceThread()); } - + if (!IrpContext->ExceptionInProgress) { if (IrpContext->Irp) { if (Status == STATUS_PENDING) { @@ -824,7 +824,7 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoWriteAccess ); - + if (NT_SUCCESS(Status)) { Status = RfsdQueueRequest(IrpContext); } else { @@ -849,7 +849,7 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } @@ -865,18 +865,18 @@ RfsdReadComplete (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + FileObject = IrpContext->FileObject; - + Irp = IrpContext->Irp; - + CcMdlReadComplete(FileObject, Irp->MdlAddress); - + Irp->MdlAddress = NULL; - + Status = STATUS_SUCCESS; } _SEH2_FINALLY { @@ -885,7 +885,7 @@ RfsdReadComplete (IN PRFSD_IRP_CONTEXT IrpContext) RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -903,7 +903,7 @@ RfsdRead (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); @@ -942,7 +942,7 @@ RfsdRead (IN PRFSD_IRP_CONTEXT IrpContext) } FileObject = IrpContext->FileObject; - + FcbOrVcb = (PRFSD_FCBVCB) FileObject->FsContext; if (FcbOrVcb->Identifier.Type == RFSDVCB) { @@ -965,6 +965,6 @@ RfsdRead (IN PRFSD_IRP_CONTEXT IrpContext) RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/rfsd.c b/drivers/filesystems/reiserfs/src/rfsd.c index 3e9fbb98784..faaef5f20d9 100644 --- a/drivers/filesystems/reiserfs/src/rfsd.c +++ b/drivers/filesystems/reiserfs/src/rfsd.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: rfsd.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -85,7 +85,7 @@ RfsdLoadSuper(IN PRFSD_VCB Vcb, PAGED_CODE(); - RfsdSb = (PRFSD_SUPER_BLOCK) ExAllocatePoolWithTag(PagedPool, + RfsdSb = (PRFSD_SUPER_BLOCK) ExAllocatePoolWithTag(PagedPool, SUPER_BLOCK_SIZE, RFSD_POOL_TAG); if (!RfsdSb) { return NULL; @@ -194,7 +194,7 @@ RfsdLoadGroup(IN PRFSD_VCB Vcb) /* bPinned = CcPinRead( Vcb->StreamObj, - Lba, + Lba, Size, PIN_WAIT, &(Vcb->GroupDescBcb), @@ -243,7 +243,7 @@ RfsdSaveGroup( IN PRFSD_IRP_CONTEXT IrpContext, } return bRet; -} +} #endif #endif // 0 @@ -255,11 +255,11 @@ RfsdLoadInode (IN PRFSD_VCB Vcb, IN OUT PRFSD_INODE Inode) { NTSTATUS Status; - + PRFSD_ITEM_HEAD pItemHeader = NULL; PUCHAR pItemBuffer = NULL; PUCHAR pBlockBuffer = NULL; - + // Crate the target key for the stat item (stat items always have an offset of 0) RFSD_KEY_IN_MEMORY TargetKey; @@ -267,7 +267,7 @@ RfsdLoadInode (IN PRFSD_VCB Vcb, TargetKey = *pKey; TargetKey.k_offset = 0x0; - TargetKey.k_type = RFSD_KEY_TYPE_v2_STAT_DATA; + TargetKey.k_type = RFSD_KEY_TYPE_v2_STAT_DATA; RfsdPrint((DBG_FUNC, /*__FUNCTION__*/ "on %i, %i\n", TargetKey.k_dir_id, TargetKey.k_objectid)); @@ -278,9 +278,9 @@ RfsdLoadInode (IN PRFSD_VCB Vcb, ); if (!NT_SUCCESS(Status)) { if (pBlockBuffer) {ExFreePool(pBlockBuffer);} return FALSE; } - + // Copy the item into the inode / stat data structure - RtlCopyMemory(Inode, pItemBuffer, sizeof(RFSD_INODE)); + RtlCopyMemory(Inode, pItemBuffer, sizeof(RFSD_INODE)); // Cleanup if (pBlockBuffer) @@ -304,7 +304,7 @@ DbgBreak(); BOOLEAN bRet; KeQuerySystemTime(&CurrentTime); - RfsdInode->i_mtime = RfsdInode->i_atime = + RfsdInode->i_mtime = RfsdInode->i_atime = (ULONG)(RfsdInodeTime(CurrentTime)); RfsdPrint((DBG_INFO, "RfsdSaveInode: Saving Inode %xh: Mode=%xh Size=%xh\n", @@ -476,7 +476,7 @@ DbgBreak(); } temp = 1 << ((BLOCK_BITS - 2) * (Layer - 1)); - + i = Index / temp; j = Index % temp; @@ -519,7 +519,7 @@ DbgBreak(); /* free the memory of pData */ ExFreePool(pData); - + goto errorout; } @@ -527,7 +527,7 @@ DbgBreak(); /* free the memory of pData */ ExFreePool(pData); - + goto errorout; } } @@ -646,7 +646,7 @@ RfsdBlockMap( Index, i, bAlloc, - &dwRet //< + &dwRet //< ); RfsdPrint((DBG_INFO, "RfsdBlockMap: i=%xh index=%xh dwBlk=%xh (%xh)\n", @@ -672,7 +672,7 @@ errorout: // NOTE: ReiserFS starts it byte offsets at 1, as opposed to 0 (which is used for the buffer -- and therefore, the BDL is also 0-based). NTSTATUS -RfsdBuildBDL2( +RfsdBuildBDL2( IN PRFSD_VCB Vcb, IN PRFSD_KEY_IN_MEMORY pKey, IN PRFSD_INODE pInode, @@ -684,7 +684,7 @@ RfsdBuildBDL2( RFSD_KEY_IN_MEMORY CurrentTargetKey = *pKey; ULONGLONG CurrentOffset = 0; - + PRFSD_ITEM_HEAD pItemHeader = NULL; // The temporary storage for retrieving items from disk PUCHAR pItemBuffer = NULL; PUCHAR pBlockBuffer = NULL; @@ -702,7 +702,7 @@ RfsdBuildBDL2( if (!pBdl) { Status = STATUS_INSUFFICIENT_RESOURCES; goto errorout; } //RtlZeroMemory(pBdl, sizeof(RFSD_BDL) * (pInode->sd_blocks + 1)); RtlZeroMemory(pBdl, sizeof(RFSD_BDL) * (SIZE_T) (pInode->i_size / Vcb->BlockSize + 3)); - + // Build descriptors for all of the indirect items associated with the file while (!done) @@ -715,11 +715,11 @@ RfsdBuildBDL2( // Perform the search Status = RfsdLoadItem( - Vcb, &CurrentTargetKey, + Vcb, &CurrentTargetKey, &(pItemHeader), &(pItemBuffer), &(pBlockBuffer), NULL, &CompareKeys ); - + // If there was no such indirect item... if (Status == STATUS_NO_SUCH_MEMBER) { Status = STATUS_SUCCESS; break; } if (!NT_SUCCESS(Status)) { goto errorout; } @@ -732,7 +732,7 @@ RfsdBuildBDL2( for (idxBlockRef = 0; idxBlockRef < countBlockRefs; idxBlockRef++) { PULONG BlockRef = (PULONG) ((PUCHAR) pItemBuffer + sizeof(ULONG) * idxBlockRef); - + // Build a block descriptor for this block reference pBdl[idxCurrentBD].Lba = (LONGLONG) *BlockRef * (LONGLONG) Vcb->BlockSize; pBdl[idxCurrentBD].Length = Vcb->BlockSize; @@ -747,13 +747,13 @@ RfsdBuildBDL2( CurrentOffset += Vcb->BlockSize; idxCurrentBD++; } - + if (countBlockRefs <= 0) { done = TRUE; } } - + if (pBlockBuffer) { ExFreePool(pBlockBuffer); pBlockBuffer = NULL; } } - + // Cleanup the last remaining block buffer, from the indirect items if (pBlockBuffer) { ExFreePool(pBlockBuffer); pBlockBuffer = NULL; } @@ -771,8 +771,8 @@ RfsdBuildBDL2( &(pItemHeader), &(pItemBuffer), &(pBlockBuffer), &(BlockNumber), &CompareKeys ); - - if (Status == STATUS_SUCCESS) + + if (Status == STATUS_SUCCESS) { // If there was a tail, then build a block descriptor for it pBdl[idxCurrentBD].Lba = (LONGLONG) BlockNumber * (LONGLONG) Vcb->BlockSize + pItemHeader->ih_item_location; @@ -782,12 +782,12 @@ RfsdBuildBDL2( // Advance to the next block reference CurrentOffset += pItemHeader->ih_item_len; idxCurrentBD++; - } + } else { if (Status == STATUS_NO_SUCH_MEMBER) { Status = STATUS_SUCCESS; goto errorout; } // If there wasn't a tail, it's fine else { goto errorout; } // But if there was some other problem, let's report it. - } + } } if (pBlockBuffer) { ExFreePool(pBlockBuffer); pBlockBuffer = NULL; } @@ -806,8 +806,8 @@ RfsdBuildBDL2( &(pItemHeader), &(pItemBuffer), &(pBlockBuffer), &(BlockNumber), &CompareKeys ); - - if (Status == STATUS_SUCCESS) + + if (Status == STATUS_SUCCESS) { // If there was a second part of the tail, then build a block descriptor for it pBdl[idxCurrentBD].Lba = (LONGLONG) BlockNumber * (LONGLONG) Vcb->BlockSize + pItemHeader->ih_item_location; @@ -815,15 +815,15 @@ RfsdBuildBDL2( pBdl[idxCurrentBD].Offset = CurrentOffset; idxCurrentBD++; - } + } else { if (Status == STATUS_NO_SUCH_MEMBER) { Status = STATUS_SUCCESS; } // If there wasn't a second part of the tail, it's fine else { goto errorout; } // But if there was some other problem, let's report it. - } + } } -errorout: +errorout: if (pBlockBuffer) { ExFreePool(pBlockBuffer); pBlockBuffer = NULL; } *out_ppBdl = pBdl; @@ -838,7 +838,7 @@ RfsdNewBlock( PRFSD_IRP_CONTEXT IrpContext, PRFSD_VCB Vcb, ULONG GroupHint, - ULONG BlockHint, + ULONG BlockHint, PULONG dwRet ) { DbgBreak(); @@ -862,14 +862,14 @@ DbgBreak(); GroupHint = (BlockHint - RFSD_FIRST_DATA_BLOCK) / BLOCKS_PER_GROUP; dwHint = (BlockHint - RFSD_FIRST_DATA_BLOCK) % BLOCKS_PER_GROUP; } - + ScanBitmap: - + // Perform Prefered Group if (Vcb->GroupDesc[GroupHint].bg_free_blocks_count) { Offset.QuadPart = (LONGLONG) Vcb->BlockSize; - Offset.QuadPart = Offset.QuadPart * + Offset.QuadPart = Offset.QuadPart * Vcb->GroupDesc[GroupHint].bg_block_bitmap; if (GroupHint == Vcb->NumOfGroups - 1) { @@ -973,7 +973,7 @@ ScanBitmap: } } } - + if (dwBlk < Length) { RtlSetBits(&BlockBitmap, dwBlk, 1); @@ -1035,7 +1035,7 @@ DbgBreak(); ULONG Group, dwBlk; BOOLEAN bModified = FALSE; - if ( Block < RFSD_FIRST_DATA_BLOCK || + if ( Block < RFSD_FIRST_DATA_BLOCK || (Block / BLOCKS_PER_GROUP) >= Vcb->NumOfGroups) { DbgBreak(); @@ -1047,7 +1047,7 @@ DbgBreak(); Group = (Block - RFSD_FIRST_DATA_BLOCK) / BLOCKS_PER_GROUP; dwBlk = (Block - RFSD_FIRST_DATA_BLOCK) % BLOCKS_PER_GROUP; - + { Offset.QuadPart = (LONGLONG) Vcb->BlockSize; Offset.QuadPart = Offset.QuadPart * Vcb->GroupDesc[Group].bg_block_bitmap; @@ -1081,7 +1081,7 @@ DbgBreak(); Length ); if (RtlCheckBit(&BlockBitmap, dwBlk) == 0) { - + } else { RtlClearBits(&BlockBitmap, dwBlk, 1); bModified = TRUE; @@ -1096,7 +1096,7 @@ DbgBreak(); RtlZeroMemory(&BlockBitmap, sizeof(RTL_BITMAP)); } } - + if (bModified) { CcSetDirtyPinnedData(BitmapBcb, NULL ); @@ -1172,7 +1172,7 @@ DbgBreak(); } else { LARGE_INTEGER Offset; - + Offset.QuadPart = (LONGLONG) dwContent; Offset.QuadPart = Offset.QuadPart * Vcb->BlockSize; @@ -1243,7 +1243,7 @@ DbgBreak(); RfsdPrint((DBG_ERROR, "RfsdExpandBlockk: ... error recuise...\n")); goto errorout; } - + if (bDirty) { RfsdSaveBlock( IrpContext, @@ -1330,7 +1330,7 @@ DbgBreak(); Vcb, Fcb, dwBlk, Index, i, bNewBlock, - &dwNewBlk ); + &dwNewBlk ); if (NT_SUCCESS(Status)) { Fcb->Header.AllocationSize.QuadPart += Vcb->BlockSize; @@ -1381,7 +1381,7 @@ DbgBreak(); ULONG Group, i, j; ULONG Average, Length; LARGE_INTEGER Offset; - + ULONG dwInode; *Inode = dwInode = 0XFFFFFFFF; @@ -1389,7 +1389,7 @@ DbgBreak(); repeat: Group = i = 0; - + if (Type == RFSD_FT_DIR) { Average = Vcb->SuperBlock->s_free_inodes_count / Vcb->NumOfGroups; @@ -1398,7 +1398,7 @@ repeat: i = (j + GroupHint) % (Vcb->NumOfGroups); - if ((Vcb->GroupDesc[i].bg_used_dirs_count << 8) < + if ((Vcb->GroupDesc[i].bg_used_dirs_count << 8) < Vcb->GroupDesc[i].bg_free_inodes_count ) { Group = i + 1; break; @@ -1439,7 +1439,7 @@ repeat: for (j = 1; j < Vcb->NumOfGroups; j <<= 1) { i += j; - if (i > Vcb->NumOfGroups) + if (i > Vcb->NumOfGroups) i -= Vcb->NumOfGroups; if (Vcb->GroupDesc[i].bg_free_inodes_count) { @@ -1490,7 +1490,7 @@ repeat: Length = INODES_PER_GROUP; } } - + if (!CcPinRead( Vcb->StreamObj, &Offset, Vcb->BlockSize, @@ -1553,8 +1553,8 @@ repeat: Vcb->SuperBlock->s_free_inodes_count--; RfsdSaveSuper(IrpContext, Vcb); - - return STATUS_SUCCESS; + + return STATUS_SUCCESS; } return STATUS_DISK_FULL; @@ -1582,14 +1582,14 @@ DbgBreak(); ULONG dwIno; BOOLEAN bModified = FALSE; - + Group = (Inode - 1) / INODES_PER_GROUP; dwIno = (Inode - 1) % INODES_PER_GROUP; RfsdPrint((DBG_INFO, "RfsdFreeInode: Inode: %xh (Group/Off = %xh/%xh)\n", Inode, Group, dwIno)); - + { Offset.QuadPart = (LONGLONG) Vcb->BlockSize; Offset.QuadPart = Offset.QuadPart * Vcb->GroupDesc[Group].bg_inode_bitmap; @@ -1634,7 +1634,7 @@ DbgBreak(); RtlZeroMemory(&InodeBitmap, sizeof(RTL_BITMAP)); } } - + if (bModified) { CcSetDirtyPinnedData(BitmapBcb, NULL ); @@ -1718,10 +1718,10 @@ DbgBreak(); } #if DISABLED // disabled in FFS too - if (IsFlagOn( SUPER_BLOCK->s_feature_incompat, + if (IsFlagOn( SUPER_BLOCK->s_feature_incompat, RFSD_FEATURE_INCOMPAT_FILETYPE)) { pDir->file_type = (UCHAR) FileType; - } else + } else #endif { pDir->file_type = 0; @@ -1769,7 +1769,7 @@ Repeat: _SEH2_LEAVE; } - if (((pTarget->inode == 0) && pTarget->rec_len >= pDir->rec_len) || + if (((pTarget->inode == 0) && pTarget->rec_len >= pDir->rec_len) || (pTarget->rec_len >= RFSD_DIR_REC_LEN(pTarget->name_len) + pDir->rec_len)) { if (pTarget->inode) { @@ -1793,7 +1793,7 @@ Repeat: } Length = RFSD_DIR_REC_LEN(pTarget->name_len); - + pNewDir = (PRFSD_DIR_ENTRY2) ((PUCHAR)pTarget + RFSD_DIR_REC_LEN(pTarget->name_len)); pNewDir->rec_len = pTarget->rec_len - RFSD_DIR_REC_LEN(pTarget->name_len); @@ -1815,7 +1815,7 @@ Repeat: bFound = TRUE; break; } - + dwBytes += pTarget->rec_len; } @@ -1844,7 +1844,7 @@ Repeat: &dwRet ); } else { - // We should expand the size of the dir inode + // We should expand the size of the dir inode if (!bAdding) { ULONG dwRet; @@ -1889,7 +1889,7 @@ Repeat: ExFreePool(pDir); } } _SEH2_END; - + return Status; #endif } @@ -1922,7 +1922,7 @@ DbgBreak(); return STATUS_NOT_A_DIRECTORY; } - MainResourceAcquired = + MainResourceAcquired = ExAcquireResourceExclusiveLite(&Dcb->MainResource, TRUE); _SEH2_TRY { @@ -1936,7 +1936,7 @@ DbgBreak(); Status = STATUS_INSUFFICIENT_RESOURCES; _SEH2_LEAVE; } - + pPrevDir = (PRFSD_DIR_ENTRY2) ExAllocatePoolWithTag(PagedPool, RFSD_DIR_REC_LEN(RFSD_NAME_LEN), RFSD_POOL_TAG); if (!pPrevDir) { @@ -2094,7 +2094,7 @@ DbgBreak(); ) ) { Status = STATUS_UNSUCCESSFUL; } - + break; } else { @@ -2123,7 +2123,7 @@ DbgBreak(); ExFreePool(pPrevDir); } } _SEH2_END; - + return Status; #endif } @@ -2153,7 +2153,7 @@ DbgBreak(); return STATUS_NOT_A_DIRECTORY; } - MainResourceAcquired = + MainResourceAcquired = ExAcquireResourceExclusiveLite(&Dcb->MainResource, TRUE); _SEH2_TRY { @@ -2200,7 +2200,7 @@ DbgBreak(); Status = RfsdWriteInode( IrpContext, - Vcb, + Vcb, Dcb->RfsdMcb->Inode, Dcb->Inode, Offset, @@ -2223,7 +2223,7 @@ DbgBreak(); ExFreePool(pSelf); } } _SEH2_END; - + return Status; #endif { return 1; } @@ -2266,7 +2266,7 @@ DbgBreak(); if (NT_SUCCESS(Status)) { ASSERT(Inode->i_blocks >= (Vcb->BlockSize / SECTOR_SIZE)); - Inode->i_blocks -= (Vcb->BlockSize / SECTOR_SIZE); + Inode->i_blocks -= (Vcb->BlockSize / SECTOR_SIZE); *bFreed = TRUE; } @@ -2404,13 +2404,13 @@ DbgBreak(); if (dwBlk) { - Status = RfsdTruncateBlock(IrpContext, Vcb, Fcb, dwBlk, Index , i, &bFreed); + Status = RfsdTruncateBlock(IrpContext, Vcb, Fcb, dwBlk, Index , i, &bFreed); } if (NT_SUCCESS(Status)) { Fcb->Header.AllocationSize.QuadPart -= Vcb->BlockSize; - + if (bFreed) { Inode->i_block[i==0 ? (Index):(i + RFSD_NDIR_BLOCKS - 1)] = 0; } @@ -2524,12 +2524,12 @@ DbgBreak(); DbgBreak(); - for ( Index = 0; + for ( Index = 0; FsRtlGetNextLargeMcbEntry( &(Vcb->DirtyMcbs), Index, &DirtyVba, &DirtyLba, - &DirtyLength); + &DirtyLength); Index++ ) { RfsdPrint((DBG_INFO, "Index = %xh\n", Index)); @@ -2692,13 +2692,13 @@ DbgBreak(); /////////////////////////////////////////////////// /////////////////////////////////////////////////// -/** +/** Invoked by FSCTL.c on mount volume */ BOOLEAN SuperblockContainsMagicKey(PRFSD_SUPER_BLOCK sb) -{ +{ #define MAGIC_KEY_LENGTH 9 - + UCHAR sz_MagicKey[] = REISER2FS_SUPER_MAGIC_STRING; #ifndef __REACTOS__ BOOLEAN b_KeyMatches = TRUE; @@ -2708,9 +2708,9 @@ BOOLEAN SuperblockContainsMagicKey(PRFSD_SUPER_BLOCK sb) PAGED_CODE(); - // If any characters read from disk don't match the expected magic key, we don't have a ReiserFS volume. - for (i = 0; i < MAGIC_KEY_LENGTH; i++) - { + // If any characters read from disk don't match the expected magic key, we don't have a ReiserFS volume. + for (i = 0; i < MAGIC_KEY_LENGTH; i++) + { currentChar = sb->s_magic[i]; if (currentChar != sz_MagicKey[i]) { return FALSE; } @@ -2723,20 +2723,20 @@ BOOLEAN SuperblockContainsMagicKey(PRFSD_SUPER_BLOCK sb) /* ______________________________________________________________________________ - _ __ _ _ _ _ _ -| |/ /___ _ _ | | | | |_(_) |___ + _ __ _ _ _ _ _ +| |/ /___ _ _ | | | | |_(_) |___ | ' // _ \ | | | | | | | __| | / __| | . \ __/ |_| | | |_| | |_| | \__ \ |_|\_\___|\__, | \___/ \__|_|_|___/ - |___/ + |___/ ______________________________________________________________________________ */ -/** +/** Guess whether a key is v1, or v2, by investigating its type field. NOTE: I based this off Florian Buchholz's code snippet, which is from reisefs lib. - + Old keys (on i386) have k_offset_v2.k_type == 15 (direct and indirect) or == 0 (dir items and stat data). */ @@ -2763,7 +2763,7 @@ ConvertKeyTypeUniqueness(__u32 k_uniqueness) case RFSD_KEY_TYPE_v1_INDIRECT: return RFSD_KEY_TYPE_v2_INDIRECT; case RFSD_KEY_TYPE_v1_DIRECT: return RFSD_KEY_TYPE_v2_DIRECT; case RFSD_KEY_TYPE_v1_DIRENTRY: return RFSD_KEY_TYPE_v2_DIRENTRY; - + default: RfsdPrint((DBG_ERROR, "Unexpected uniqueness value %i", k_uniqueness)); // NOTE: If above value is 555, it's the 'any' value, which I'd be surprised to see on disk. @@ -2775,8 +2775,8 @@ ConvertKeyTypeUniqueness(__u32 k_uniqueness) /** Fills an in-memory key structure with equivalent data as that given by an on-disk key, converting any older v1 information ito the new v2 formats. */ void FillInMemoryKey( - IN PRFSD_KEY_ON_DISK pKeyOnDisk, - IN RFSD_KEY_VERSION KeyVersion, + IN PRFSD_KEY_ON_DISK pKeyOnDisk, + IN RFSD_KEY_VERSION KeyVersion, IN OUT PRFSD_KEY_IN_MEMORY pKeyInMemory ) { PAGED_CODE(); @@ -2786,24 +2786,24 @@ FillInMemoryKey( // Copy over the fields that are compatible between keys pKeyInMemory->k_dir_id = pKeyOnDisk->k_dir_id; - pKeyInMemory->k_objectid = pKeyOnDisk->k_objectid; + pKeyInMemory->k_objectid = pKeyOnDisk->k_objectid; - if (KeyVersion == RFSD_KEY_VERSION_UNKNOWN) + if (KeyVersion == RFSD_KEY_VERSION_UNKNOWN) { KeyVersion = DetermineOnDiskKeyFormat(pKeyOnDisk); } - + // Copy over the fields that are incompatible between keys, converting older type fields to the v2 format switch (KeyVersion) { - case RFSD_KEY_VERSION_1: + case RFSD_KEY_VERSION_1: pKeyInMemory->k_offset = pKeyOnDisk->u.k_offset_v1.k_offset; pKeyInMemory->k_type = ConvertKeyTypeUniqueness( pKeyOnDisk->u.k_offset_v1.k_uniqueness ); break; - case RFSD_KEY_VERSION_2: + case RFSD_KEY_VERSION_2: pKeyInMemory->k_offset = pKeyOnDisk->u.k_offset_v2.k_offset; pKeyInMemory->k_type = (__u32) pKeyOnDisk->u.k_offset_v2.k_type; break; - } + } } /** Compares two in memory keys, returning KEY_SMALLER, KEY_LARGER, or KEYS_MATCH relative to the first key given. */ @@ -2814,10 +2814,10 @@ CompareShortKeys( { PAGED_CODE(); - // compare 1. integer + // compare 1. integer if( a->k_dir_id < b->k_dir_id ) return RFSD_KEY_SMALLER; if( a->k_dir_id > b->k_dir_id ) return RFSD_KEY_LARGER; - + // compare 2. integer if( a->k_objectid < b->k_objectid ) return RFSD_KEY_SMALLER; if( a->k_objectid > b->k_objectid ) return RFSD_KEY_LARGER; @@ -2834,14 +2834,14 @@ CompareKeysWithoutOffset( { PAGED_CODE(); - // compare 1. integer + // compare 1. integer if( a->k_dir_id < b->k_dir_id ) return RFSD_KEY_SMALLER; if( a->k_dir_id > b->k_dir_id ) return RFSD_KEY_LARGER; - + // compare 2. integer if( a->k_objectid < b->k_objectid ) return RFSD_KEY_SMALLER; if( a->k_objectid > b->k_objectid ) return RFSD_KEY_LARGER; - + // compare 4. integer // NOTE: Buchholz says that if we get to here in navigating the file tree, something has gone wrong... if( a->k_type < b->k_type ) return RFSD_KEY_SMALLER; @@ -2859,17 +2859,17 @@ CompareKeys( { PAGED_CODE(); - // compare 1. integer + // compare 1. integer if( a->k_dir_id < b->k_dir_id ) return RFSD_KEY_SMALLER; if( a->k_dir_id > b->k_dir_id ) return RFSD_KEY_LARGER; - + // compare 2. integer if( a->k_objectid < b->k_objectid ) return RFSD_KEY_SMALLER; if( a->k_objectid > b->k_objectid ) return RFSD_KEY_LARGER; - + // compare 3. integer if( a->k_offset < b->k_offset ) return RFSD_KEY_SMALLER; - if( a->k_offset > b->k_offset ) return RFSD_KEY_LARGER; + if( a->k_offset > b->k_offset ) return RFSD_KEY_LARGER; // compare 4. integer // NOTE: Buchholz says that if we get to here in navigating the file tree, something has gone wrong... @@ -2883,12 +2883,12 @@ CompareKeys( /* ______________________________________________________________________________ - _____ _ _ _ _ _ -|_ _| __ ___ ___ | \ | | __ ___ _(_) __ _ __ _| |_(_) ___ _ __ - | || '__/ _ \/ _ \ | \| |/ _` \ \ / / |/ _` |/ _` | __| |/ _ \| '_ \ + _____ _ _ _ _ _ +|_ _| __ ___ ___ | \ | | __ ___ _(_) __ _ __ _| |_(_) ___ _ __ + | || '__/ _ \/ _ \ | \| |/ _` \ \ / / |/ _` |/ _` | __| |/ _ \| '_ \ | || | | __/ __/ | |\ | (_| |\ V /| | (_| | (_| | |_| | (_) | | | | |_||_| \___|\___| |_| \_|\__,_| \_/ |_|\__, |\__,_|\__|_|\___/|_| |_| - |___/ + |___/ ______________________________________________________________________________ */ @@ -2909,7 +2909,7 @@ NTSTATUS RfsdParseFilesystemTree( IN PRFSD_VCB Vcb, IN PRFSD_KEY_IN_MEMORY Key, // Key to search for. - IN ULONG StartingBlockNumber, // Block number of an internal or leaf node, to start the search from + IN ULONG StartingBlockNumber, // Block number of an internal or leaf node, to start the search from IN RFSD_CALLBACK(fpDirectoryCallback), // A function ptr to trigger on hitting a matching leaf block IN PVOID pContext // This context item will simply be passed through to the callback when invoked ) @@ -2940,16 +2940,16 @@ _NavigateToLeafNode( IN RFSD_KEY_COMPARISON (*fpComparisonFunction)(PRFSD_KEY_IN_MEMORY, PRFSD_KEY_IN_MEMORY), RFSD_CALLBACK(fpDirectoryCallback), // A function ptr to trigger on hitting a matching leaf block IN PVOID pContext // This context item will simply be passed through to the callback when invoked - + ) -{ +{ NTSTATUS Status = STATUS_SUCCESS; ULONG leafNodeBlockNumber; // The result to be calculated - PRFSD_DISK_NODE_REF pTargetDiskNodeReference = NULL; // + PRFSD_DISK_NODE_REF pTargetDiskNodeReference = NULL; // // Read in this disk node's data - PUCHAR pBlockBuffer = RfsdAllocateAndLoadBlock(Vcb, StartingBlockNumber); + PUCHAR pBlockBuffer = RfsdAllocateAndLoadBlock(Vcb, StartingBlockNumber); // Read the block header PRFSD_BLOCK_HEAD pBlockHeader = (PRFSD_BLOCK_HEAD) pBlockBuffer; @@ -2959,17 +2959,17 @@ _NavigateToLeafNode( // Sanity check that we could read the block and the header is there if (!pBlockBuffer) { return STATUS_INVALID_HANDLE; } - // If this block is a leaf, just return it (or invoke the given callback on the leaf block) + // If this block is a leaf, just return it (or invoke the given callback on the leaf block) if (pBlockHeader->blk_level == RFSD_LEAF_BLOCK_LEVEL) { NTSTATUS CallbackStatus; ExFreePool(pBlockBuffer); - + *out_NextBlockNumber = StartingBlockNumber; // If a callback should be invoked on finding a matching leaf node, do so... - if (fpDirectoryCallback) return (*fpDirectoryCallback)(StartingBlockNumber, pContext); + if (fpDirectoryCallback) return (*fpDirectoryCallback)(StartingBlockNumber, pContext); else return STATUS_SUCCESS; } @@ -2987,12 +2987,12 @@ _NavigateToLeafNode( // Search (within the increasing list of target Keys), for the target key that Key is <= to. for (idxRightKey = 0; idxRightKey <= pBlockHeader->blk_nr_item; idxRightKey++) { - // Advance the left key to become what was the right key, and the right key to become the next key + // Advance the left key to become what was the right key, and the right key to become the next key pLeftKeyOnDisk = pRightKeyOnDisk; - pRightKeyOnDisk = (idxRightKey == pBlockHeader->blk_nr_item) ? + pRightKeyOnDisk = (idxRightKey == pBlockHeader->blk_nr_item) ? (PRFSD_KEY_ON_DISK) NULL : (PRFSD_KEY_ON_DISK) (pBlockBuffer + sizeof(RFSD_BLOCK_HEAD) + (idxRightKey * sizeof(RFSD_KEY_ON_DISK))); - + LeftKeyInMemory = RightKeyInMemory; if (pRightKeyOnDisk) FillInMemoryKey(pRightKeyOnDisk, RFSD_KEY_VERSION_UNKNOWN, &(RightKeyInMemory)); @@ -3004,7 +3004,7 @@ _NavigateToLeafNode( rightComparison = pRightKeyOnDisk ? ((*fpComparisonFunction)(Key, &RightKeyInMemory)) : RFSD_KEY_SMALLER; if (fpComparisonFunction == &CompareShortKeys) { if (rightComparison == RFSD_KEY_LARGER) continue; } - else + else { if (rightComparison != RFSD_KEY_SMALLER) continue; } // And larger than or equal to the left key. @@ -3015,10 +3015,10 @@ _NavigateToLeafNode( // This returns the pointer preceding the righthand key. pTargetDiskNodeReference = (PRFSD_DISK_NODE_REF) (pBlockBuffer + sizeof(RFSD_BLOCK_HEAD) + (pBlockHeader->blk_nr_item * sizeof(RFSD_KEY_ON_DISK)) + (idxRightKey * sizeof(RFSD_DISK_NODE_REF))); - + // Continue recursion downwards; eventually a leaf node will be returned. Status = _NavigateToLeafNode( - Vcb, Key, pTargetDiskNodeReference->dc_block_number, + Vcb, Key, pTargetDiskNodeReference->dc_block_number, &(leafNodeBlockNumber), ReturnOnFirstMatch, fpComparisonFunction, fpDirectoryCallback, pContext); // < diff --git a/drivers/filesystems/reiserfs/src/rfsdblock.c b/drivers/filesystems/reiserfs/src/rfsdblock.c index 1b271cd760c..e1138cc2518 100644 --- a/drivers/filesystems/reiserfs/src/rfsdblock.c +++ b/drivers/filesystems/reiserfs/src/rfsdblock.c @@ -4,8 +4,8 @@ * FILE: rfsdblock.c * PURPOSE: Disk block operations that are specific to ReiserFS. * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -26,7 +26,7 @@ extern PRFSD_GLOBAL RfsdGlobal; /* FUNCTIONS *************************************************************/ -/** +/** Returns the address of an allocated buffer (WHICH THE CALLER WILL BE RESPONSIBLE FOR FREEING!), filled with the contents of the given block number on disk. (This is really just an alternative interface to LoadBlock) */ @@ -40,12 +40,12 @@ RfsdAllocateAndLoadBlock( PAGED_CODE(); - if (!pReturnBuffer) + if (!pReturnBuffer) { DbgBreak(); return NULL; } // Read the block in from disk, or from cache. if (!RfsdLoadBlock(Vcb, BlockIndex, pReturnBuffer)) - { DbgBreak(); ExFreePool(pReturnBuffer); return NULL; } + { DbgBreak(); ExFreePool(pReturnBuffer); return NULL; } // Return the result to the caller. return pReturnBuffer; @@ -77,7 +77,7 @@ RfsdFindItemHeaderInBlock( // Sanity check that the block (and therefore its header) is there if (!pBlockHeader) { return STATUS_INVALID_HANDLE; } ASSERT(pBlockHeader->blk_level == 1); - + // Search through the item headers to find one with a key matching pTargetKey { ULONG idxCurrentItemHeader = 0; @@ -88,11 +88,11 @@ RfsdFindItemHeaderInBlock( { // Grab the item header, and its key pCurrentItemHeader = (PRFSD_ITEM_HEAD) (pItemHeaderListBuffer + idxCurrentItemHeader * sizeof(RFSD_ITEM_HEAD)); - + FillInMemoryKey( - &( pCurrentItemHeader->ih_key ), pCurrentItemHeader->ih_version, + &( pCurrentItemHeader->ih_key ), pCurrentItemHeader->ih_version, &( CurrentItemKey ) ); // < - + // Check if this item is the one being searched for if ( RFSD_KEYS_MATCH == (*fpComparisonFunction)( pTargetKey , &CurrentItemKey ) ) { @@ -103,11 +103,11 @@ RfsdFindItemHeaderInBlock( // If a matching key was never found, simply return return STATUS_NO_SUCH_MEMBER; - } + } } -/** -Given an item's key, load the block, the item header, and the item buffer associated with the key. +/** +Given an item's key, load the block, the item header, and the item buffer associated with the key. STATUS_INTERNAL_ERROR if leaf node could not be reached STATUS_NO_SUCH_MEMBER if the item header could not be located @@ -119,7 +119,7 @@ RfsdLoadItem( IN PRFSD_VCB Vcb, IN PRFSD_KEY_IN_MEMORY pItemKey, // The key of the item to find OUT PRFSD_ITEM_HEAD* ppMatchingItemHeader, - OUT PUCHAR* ppItemBuffer, + OUT PUCHAR* ppItemBuffer, OUT PUCHAR* ppBlockBuffer, // Block buffer, which backs the other output data structures. The caller must free this (even in the case of an error)! OPTIONAL OUT PULONG pBlockNumber, // The ordinal disk block number at which the item was found IN RFSD_KEY_COMPARISON (*fpComparisonFunction)(PRFSD_KEY_IN_MEMORY, PRFSD_KEY_IN_MEMORY) @@ -136,29 +136,29 @@ RfsdLoadItem( if (pBlockNumber) *pBlockNumber = 0; - // Find the block number of the leaf node bock (on disk), that should contain the item w/ pItemKey + // Find the block number of the leaf node bock (on disk), that should contain the item w/ pItemKey Status = NavigateToLeafNode( - Vcb, pItemKey, Vcb->SuperBlock->s_root_block, - &(LeafNodeBlockNumber) - ); + Vcb, pItemKey, Vcb->SuperBlock->s_root_block, + &(LeafNodeBlockNumber) + ); if (!NT_SUCCESS(Status)){ DbgBreak(); return STATUS_INTERNAL_ERROR; } if (pBlockNumber) *pBlockNumber = LeafNodeBlockNumber; // Load the block (which the caller must later free) *ppBlockBuffer = RfsdAllocateAndLoadBlock(Vcb, LeafNodeBlockNumber); - if (!*ppBlockBuffer) { return STATUS_INSUFFICIENT_RESOURCES; } + if (!*ppBlockBuffer) { return STATUS_INSUFFICIENT_RESOURCES; } // Get the item header and its information Status = RfsdFindItemHeaderInBlock( Vcb, pItemKey, *ppBlockBuffer, - ( ppMatchingItemHeader ), //< + ( ppMatchingItemHeader ), //< fpComparisonFunction - ); + ); if (Status == STATUS_NO_SUCH_MEMBER) { return STATUS_NO_SUCH_MEMBER; } if (!*ppMatchingItemHeader) { return STATUS_INTERNAL_ERROR; } - + // Setup the item buffer *ppItemBuffer = (PUCHAR) *ppBlockBuffer + (*ppMatchingItemHeader)->ih_item_location; diff --git a/drivers/filesystems/reiserfs/src/shutdown.c b/drivers/filesystems/reiserfs/src/shutdown.c index 8bacff60242..48c19670a92 100644 --- a/drivers/filesystems/reiserfs/src/shutdown.c +++ b/drivers/filesystems/reiserfs/src/shutdown.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: shutdown.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -41,14 +41,14 @@ RfsdShutDown (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); Status = STATUS_SUCCESS; Irp = IrpContext->Irp; - + IrpSp = IoGetCurrentIrpStackLocation(Irp); #ifdef _MSC_VER @@ -60,7 +60,7 @@ RfsdShutDown (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + GlobalResourceAcquired = TRUE; #ifndef __REACTOS__ diff --git a/drivers/filesystems/reiserfs/src/volinfo.c b/drivers/filesystems/reiserfs/src/volinfo.c index 9832ab61855..0ceba8611a3 100644 --- a/drivers/filesystems/reiserfs/src/volinfo.c +++ b/drivers/filesystems/reiserfs/src/volinfo.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: volinfo.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -44,12 +44,12 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + // // This request is not allowed on the main device object // @@ -57,11 +57,11 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); @@ -75,22 +75,22 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + VcbResourceAcquired = TRUE; - + Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + FsInformationClass = IoStackLocation->Parameters.QueryVolume.FsInformationClass; - + Length = IoStackLocation->Parameters.QueryVolume.Length; - + Buffer = Irp->AssociatedIrp.SystemBuffer; - + RtlZeroMemory(Buffer, Length); - + switch (FsInformationClass) { case FileFsVolumeInformation: @@ -98,28 +98,28 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) PFILE_FS_VOLUME_INFORMATION FsVolInfo; ULONG VolumeLabelLength; ULONG RequiredLength; - + if (Length < sizeof(FILE_FS_VOLUME_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FsVolInfo = (PFILE_FS_VOLUME_INFORMATION) Buffer; - + FsVolInfo->VolumeCreationTime.QuadPart = 0; - + FsVolInfo->VolumeSerialNumber = Vcb->Vpb->SerialNumber; VolumeLabelLength = Vcb->Vpb->VolumeLabelLength; - + FsVolInfo->VolumeLabelLength = VolumeLabelLength; - + // I don't know what this means FsVolInfo->SupportsObjects = FALSE; RequiredLength = sizeof(FILE_FS_VOLUME_INFORMATION) + VolumeLabelLength - sizeof(WCHAR); - + if (Length < RequiredLength) { Irp->IoStatus.Information = sizeof(FILE_FS_VOLUME_INFORMATION); @@ -133,46 +133,46 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + case FileFsSizeInformation: { PFILE_FS_SIZE_INFORMATION FsSizeInfo; - + if (Length < sizeof(FILE_FS_SIZE_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FsSizeInfo = (PFILE_FS_SIZE_INFORMATION) Buffer; - - FsSizeInfo->TotalAllocationUnits.QuadPart = + + FsSizeInfo->TotalAllocationUnits.QuadPart = Vcb->SuperBlock->s_blocks_count; - + FsSizeInfo->AvailableAllocationUnits.QuadPart = Vcb->SuperBlock->s_free_blocks_count; FsSizeInfo->SectorsPerAllocationUnit = Vcb->BlockSize / Vcb->DiskGeometry.BytesPerSector; - + FsSizeInfo->BytesPerSector = Vcb->DiskGeometry.BytesPerSector; - + Irp->IoStatus.Information = sizeof(FILE_FS_SIZE_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + case FileFsDeviceInformation: { PFILE_FS_DEVICE_INFORMATION FsDevInfo; - + if (Length < sizeof(FILE_FS_DEVICE_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FsDevInfo = (PFILE_FS_DEVICE_INFORMATION) Buffer; - + FsDevInfo->DeviceType = Vcb->TargetDeviceObject->DeviceType; @@ -182,52 +182,52 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) FsDevInfo->Characteristics = Vcb->TargetDeviceObject->Characteristics; - + if (FlagOn(Vcb->Flags, VCB_READ_ONLY)) { SetFlag( FsDevInfo->Characteristics, FILE_READ_ONLY_DEVICE ); } - + Irp->IoStatus.Information = sizeof(FILE_FS_DEVICE_INFORMATION); Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + case FileFsAttributeInformation: { PFILE_FS_ATTRIBUTE_INFORMATION FsAttrInfo; ULONG RequiredLength; - + if (Length < sizeof(FILE_FS_ATTRIBUTE_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; _SEH2_LEAVE; } - + FsAttrInfo = (PFILE_FS_ATTRIBUTE_INFORMATION) Buffer; - + FsAttrInfo->FileSystemAttributes = FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES; - + FsAttrInfo->MaximumComponentNameLength = RFSD_NAME_LEN; - + FsAttrInfo->FileSystemNameLength = 10; - + RequiredLength = sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 10 - sizeof(WCHAR); - + if (Length < RequiredLength) { Irp->IoStatus.Information = sizeof(FILE_FS_ATTRIBUTE_INFORMATION); Status = STATUS_BUFFER_OVERFLOW; _SEH2_LEAVE; } - + RtlCopyMemory( FsAttrInfo->FileSystemName, L"RFSD\0", 10); - + Irp->IoStatus.Information = RequiredLength; Status = STATUS_SUCCESS; _SEH2_LEAVE; @@ -257,7 +257,7 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) */ { - PFFFSI->TotalAllocationUnits.QuadPart = + PFFFSI->TotalAllocationUnits.QuadPart = Vcb->SuperBlock->s_blocks_count; PFFFSI->CallerAvailableAllocationUnits.QuadPart = @@ -292,7 +292,7 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) &Vcb->MainResource, ExGetCurrentResourceThread() ); } - + if (!IrpContext->ExceptionInProgress) { if (Status == STATUS_PENDING) { RfsdQueueRequest(IrpContext); @@ -301,7 +301,7 @@ RfsdQueryVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } @@ -323,12 +323,12 @@ RfsdSetVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext != NULL); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + // // This request is not allowed on the main device object // @@ -336,11 +336,11 @@ RfsdSetVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; } - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); @@ -350,16 +350,16 @@ RfsdSetVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_MEDIA_WRITE_PROTECTED; _SEH2_LEAVE; } - + Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + //Notes: SetVolume is not defined in ntddk.h of win2k ddk, // But it's same to QueryVolume .... FsInformationClass = IoStackLocation->Parameters./*SetVolume*/QueryVolume.FsInformationClass; - + switch (FsInformationClass) { #if 0 case FileFsLabelInformation: @@ -371,14 +371,14 @@ RfsdSetVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) OEM_STRING OemName; VolLabelInfo = (PFILE_FS_LABEL_INFORMATION) Irp->AssociatedIrp.SystemBuffer; - + VolLabelLen = VolLabelInfo->VolumeLabelLength; if(VolLabelLen > (16 * sizeof(WCHAR))) { Status = STATUS_INVALID_VOLUME_LABEL; _SEH2_LEAVE; } - + RtlCopyMemory( Vcb->Vpb->VolumeLabel, VolLabelInfo->VolumeLabel, VolLabelLen ); @@ -396,7 +396,7 @@ RfsdSetVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) RfsdUnicodeToOEM( &OemName, &LabelName); - Vcb->Vpb->VolumeLabelLength = + Vcb->Vpb->VolumeLabelLength = (USHORT) VolLabelLen; if (RfsdSaveSuper(IrpContext, Vcb)) { @@ -413,7 +413,7 @@ RfsdSetVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) } } _SEH2_FINALLY { - + if (!IrpContext->ExceptionInProgress) { if (Status == STATUS_PENDING) { RfsdQueueRequest(IrpContext); @@ -422,7 +422,7 @@ RfsdSetVolumeInformation (IN PRFSD_IRP_CONTEXT IrpContext) } } } _SEH2_END; - + return Status; } diff --git a/drivers/filesystems/reiserfs/src/write.c b/drivers/filesystems/reiserfs/src/write.c index 20975dd0eed..6ca2f30f173 100644 --- a/drivers/filesystems/reiserfs/src/write.c +++ b/drivers/filesystems/reiserfs/src/write.c @@ -2,10 +2,10 @@ * COPYRIGHT: GNU GENERAL PUBLIC LICENSE VERSION 2 * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: write.c - * PURPOSE: + * PURPOSE: * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. - * HOMEPAGE: - * UPDATE HISTORY: + * HOMEPAGE: + * UPDATE HISTORY: */ /* INCLUDES *****************************************************************/ @@ -271,25 +271,25 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); - + FileObject = IrpContext->FileObject; FcbOrVcb = (PRFSD_FCBVCB) FileObject->FsContext; - + ASSERT(FcbOrVcb); - + if (!(FcbOrVcb->Identifier.Type == RFSDVCB && (PVOID)FcbOrVcb == (PVOID)Vcb)) { Status = STATUS_INVALID_DEVICE_REQUEST; _SEH2_LEAVE; @@ -298,12 +298,12 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) Ccb = (PRFSD_CCB) FileObject->FsContext2; Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + Length = IoStackLocation->Parameters.Write.Length; ByteOffset = IoStackLocation->Parameters.Write.ByteOffset; - + PagingIo = (Irp->Flags & IRP_PAGING_IO ? TRUE : FALSE); Nocache = (Irp->Flags & IRP_NOCACHE ? TRUE : FALSE); SynchronousIo = (FileObject->Flags & FO_SYNCHRONOUS_IO ? TRUE : FALSE); @@ -316,10 +316,10 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_SUCCESS; _SEH2_LEAVE; } - + // For the case of "Direct Access Storage Device", we // need flush/purge the cache - + if (Ccb != NULL) { ExAcquireResourceExclusiveLite(&Vcb->MainResource, TRUE); @@ -349,7 +349,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoReadAccess ); - + if (!NT_SUCCESS(Status)) { _SEH2_LEAVE; } @@ -369,7 +369,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_LEAVE; } - } + } if (Nocache && (ByteOffset.LowPart & (SECTOR_SIZE - 1) || @@ -383,7 +383,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + if (ByteOffset.QuadPart >= Vcb->PartitionInformation.PartitionLength.QuadPart ) { Irp->IoStatus.Information = 0; @@ -399,7 +399,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) BOOLEAN bWait = IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT); BOOLEAN bQueue = IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_REQUEUED); - if ( !CcCanIWrite( + if ( !CcCanIWrite( FileObject, Length, (bWait && bQueue), @@ -465,13 +465,13 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + MainResourceAcquired = TRUE; } else { /* - ULONG ResShCnt, ResExCnt; + ULONG ResShCnt, ResExCnt; ResShCnt = ExIsResourceAcquiredSharedLite(&Vcb->PagingIoResource); ResExCnt = ExIsResourceAcquiredExclusiveLite(&Vcb->PagingIoResource); @@ -486,11 +486,11 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + PagingIoResourceAcquired = TRUE; } } - + if (!Nocache) { if ( (ByteOffset.QuadPart + Length) > @@ -510,13 +510,13 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) Length, &Irp->MdlAddress, &Irp->IoStatus ); - + Status = Irp->IoStatus.Status; } else { Buffer = RfsdGetUserBuffer(Irp); - + if (Buffer == NULL) { DbgBreak(); @@ -564,12 +564,12 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoReadAccess ); - + if (!NT_SUCCESS(Status)) { _SEH2_LEAVE; } - rfsd_bdl = ExAllocatePoolWithTag(PagedPool, + rfsd_bdl = ExAllocatePoolWithTag(PagedPool, (Length / Vcb->BlockSize) * sizeof(RFSD_BDL), RFSD_POOL_TAG); @@ -585,7 +585,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) DirtyStart = DirtyLba; - if (RfsdLookupMcbEntry( Vcb, + if (RfsdLookupMcbEntry( Vcb, DirtyStart, &DirtyLba, &DirtyLength, @@ -596,17 +596,17 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) if (DirtyLba == -1) { DirtyLba = DirtyStart + DirtyLength; - RemainLength = ByteOffset.QuadPart + + RemainLength = ByteOffset.QuadPart + (LONGLONG)Length - DirtyLba; continue; } - + rfsd_bdl[Blocks].Irp = NULL; rfsd_bdl[Blocks].Lba = DirtyLba; rfsd_bdl[Blocks].Offset = (ULONG)( (LONGLONG)Length + DirtyStart - - RemainLength - + RemainLength - DirtyLba ); if (DirtyLba + DirtyLength > DirtyStart + RemainLength) { @@ -631,7 +631,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) ExFreePool(rfsd_bdl); // - // Lookup fails at the first time, ie. + // Lookup fails at the first time, ie. // no dirty blocks in the run // @@ -682,7 +682,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) ExFreePool(rfsd_bdl); Irp->IoStatus.Information = Length; - + Status = STATUS_SUCCESS; _SEH2_LEAVE; } @@ -694,7 +694,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) &Vcb->PagingIoResource, ExGetCurrentResourceThread()); } - + if (MainResourceAcquired) { ExReleaseResourceForThreadLite( &Vcb->MainResource, @@ -709,7 +709,7 @@ RfsdWriteVolume (IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoReadAccess ); - + if (NT_SUCCESS(Status)) { Status = RfsdQueueRequest(IrpContext); } else { @@ -912,37 +912,37 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + DeviceObject = IrpContext->DeviceObject; - + Vcb = (PRFSD_VCB) DeviceObject->DeviceExtension; - + ASSERT(Vcb != NULL); - + ASSERT((Vcb->Identifier.Type == RFSDVCB) && (Vcb->Identifier.Size == sizeof(RFSD_VCB))); - + FileObject = IrpContext->FileObject; - + Fcb = (PRFSD_FCB) FileObject->FsContext; - + ASSERT(Fcb); - + ASSERT((Fcb->Identifier.Type == RFSDFCB) && (Fcb->Identifier.Size == sizeof(RFSD_FCB))); Ccb = (PRFSD_CCB) FileObject->FsContext2; Irp = IrpContext->Irp; - + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - + Length = IoStackLocation->Parameters.Write.Length; ByteOffset = IoStackLocation->Parameters.Write.ByteOffset; - + PagingIo = (Irp->Flags & IRP_PAGING_IO ? TRUE : FALSE); Nocache = (Irp->Flags & IRP_NOCACHE ? TRUE : FALSE); SynchronousIo = (FileObject->Flags & FO_SYNCHRONOUS_IO ? TRUE : FALSE); @@ -989,7 +989,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) BOOLEAN bWait = IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT); BOOLEAN bQueue = IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_REQUEUED); - if ( !CcCanIWrite( + if ( !CcCanIWrite( FileObject, Length, (bWait && bQueue), @@ -1029,7 +1029,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) // if (Nocache && !PagingIo && (Fcb->SectionObject.DataSectionObject != NULL)) { - ExAcquireResourceExclusiveLite( &Fcb->MainResource, + ExAcquireResourceExclusiveLite( &Fcb->MainResource, IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT)); MainResourceAcquired = TRUE; @@ -1043,7 +1043,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) &(Irp->IoStatus)); ClearFlag(Fcb->Flags, FCB_FILE_MODIFIED); - if (!NT_SUCCESS(Irp->IoStatus.Status)) + if (!NT_SUCCESS(Irp->IoStatus.Status)) { Status = Irp->IoStatus.Status; _SEH2_LEAVE; @@ -1060,7 +1060,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) ExReleaseResourceLite(&Fcb->MainResource); MainResourceAcquired = FALSE; } - + if (!PagingIo) { if (!ExAcquireResourceExclusiveLite( @@ -1069,13 +1069,13 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + MainResourceAcquired = TRUE; } else { /* - ULONG ResShCnt, ResExCnt; + ULONG ResShCnt, ResExCnt; ResShCnt = ExIsResourceAcquiredSharedLite(&Fcb->PagingIoResource); ResExCnt = ExIsResourceAcquiredExclusiveLite(&Fcb->PagingIoResource); @@ -1091,7 +1091,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) PagingIoResourceAcquired = TRUE; } - + if (!PagingIo) { if (!FsRtlCheckLockForWriteAccess( &Fcb->FileLockAnchor, @@ -1106,7 +1106,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) if ( (ByteOffset.QuadPart + Length) > Fcb->Header.AllocationSize.QuadPart) { - if ( ByteOffset.QuadPart >= + if ( ByteOffset.QuadPart >= Fcb->Header.AllocationSize.QuadPart) { Status = STATUS_SUCCESS; @@ -1144,7 +1144,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) READ_AHEAD_GRANULARITY ); CcSetFileSizes( - FileObject, + FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); } @@ -1181,12 +1181,12 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) CcSetFileSizes(FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); if (ByteOffset.QuadPart > FileSize.QuadPart) { - RfsdZeroHoles( IrpContext, Vcb, FileObject, FileSize.QuadPart, + RfsdZeroHoles( IrpContext, Vcb, FileObject, FileSize.QuadPart, ByteOffset.QuadPart - FileSize.QuadPart); } if (Fcb->Header.AllocationSize.QuadPart > ExtendSize.QuadPart) { - RfsdZeroHoles(IrpContext, Vcb, FileObject, ExtendSize.QuadPart, + RfsdZeroHoles(IrpContext, Vcb, FileObject, ExtendSize.QuadPart, Fcb->Header.AllocationSize.QuadPart - ExtendSize.QuadPart); } } @@ -1210,19 +1210,19 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) Length, &Irp->MdlAddress, &Irp->IoStatus ); - + Status = Irp->IoStatus.Status; } else { Buffer = RfsdGetUserBuffer(Irp); - + if (Buffer == NULL) { DbgBreak(); Status = STATUS_INVALID_USER_BUFFER; _SEH2_LEAVE; } - + if (!CcCopyWrite( CacheObject, (PLARGE_INTEGER)&ByteOffset, @@ -1232,7 +1232,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) Status = STATUS_PENDING; _SEH2_LEAVE; } - + Status = Irp->IoStatus.Status; } @@ -1254,14 +1254,14 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoReadAccess ); - + if (!NT_SUCCESS(Status)) { _SEH2_LEAVE; } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length; - + Status = RfsdWriteInode( IrpContext, Vcb, @@ -1285,13 +1285,13 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) &Fcb->PagingIoResource, ExGetCurrentResourceThread()); } - + if (MainResourceAcquired) { ExReleaseResourceForThreadLite( &Fcb->MainResource, ExGetCurrentResourceThread()); } - + if (!IrpContext->ExceptionInProgress) { if (Irp) { if (Status == STATUS_PENDING) { @@ -1300,7 +1300,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) IrpContext->Irp, Length, IoReadAccess ); - + if (NT_SUCCESS(Status)) { Status = RfsdQueueRequest(IrpContext); } else { @@ -1313,7 +1313,7 @@ RfsdWriteFile(IN PRFSD_IRP_CONTEXT IrpContext) FileObject->CurrentByteOffset.QuadPart = ByteOffset.QuadPart + Irp->IoStatus.Information; } - + if (!PagingIo) { SetFlag(FileObject->Flags, FO_FILE_MODIFIED); @@ -1345,19 +1345,19 @@ RfsdWriteComplete (IN PRFSD_IRP_CONTEXT IrpContext) _SEH2_TRY { ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); - + FileObject = IrpContext->FileObject; - + Irp = IrpContext->Irp; IrpSp = IoGetCurrentIrpStackLocation(Irp); - + CcMdlWriteComplete(FileObject, &(IrpSp->Parameters.Write.ByteOffset), Irp->MdlAddress); - + Irp->MdlAddress = NULL; - + Status = STATUS_SUCCESS; } _SEH2_FINALLY { @@ -1366,7 +1366,7 @@ RfsdWriteComplete (IN PRFSD_IRP_CONTEXT IrpContext) RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } @@ -1383,7 +1383,7 @@ RfsdWrite (IN PRFSD_IRP_CONTEXT IrpContext) PAGED_CODE(); ASSERT(IrpContext); - + ASSERT((IrpContext->Identifier.Type == RFSDICX) && (IrpContext->Identifier.Size == sizeof(RFSD_IRP_CONTEXT))); @@ -1424,7 +1424,7 @@ RfsdWrite (IN PRFSD_IRP_CONTEXT IrpContext) } FileObject = IrpContext->FileObject; - + FcbOrVcb = (PRFSD_FCBVCB) FileObject->FsContext; if (FcbOrVcb->Identifier.Type == RFSDVCB) { @@ -1455,7 +1455,7 @@ RfsdWrite (IN PRFSD_IRP_CONTEXT IrpContext) RfsdCompleteIrpContext(IrpContext, Status); } } _SEH2_END; - + return Status; } diff --git a/drivers/filesystems/udfs/CDRW/cdrw_hw.h b/drivers/filesystems/udfs/CDRW/cdrw_hw.h index 6c17961a92b..6cf2c9fe12c 100644 --- a/drivers/filesystems/udfs/CDRW/cdrw_hw.h +++ b/drivers/filesystems/udfs/CDRW/cdrw_hw.h @@ -159,7 +159,7 @@ typedef union _CDB { UCHAR Reserved : 4; } Fields; } Byte2; - + UCHAR Reserved2[3]; UCHAR Start_TrackSes; UCHAR AllocationLength[2]; @@ -582,7 +582,7 @@ typedef union _CDB { } Byte2; UCHAR Reserved1 [2]; UCHAR TrackNum; - UCHAR Reserved2 [6]; + UCHAR Reserved2 [6]; } CLOSE_TRACK_SESSION, *PCLOSE_TRACK_SESSION; @@ -1697,7 +1697,7 @@ typedef PREAD_TOC_FULL_TOC PREAD_TOC_PMA; typedef struct _READ_TOC_ATIP { UCHAR Length[2]; UCHAR Reserved[2]; - + #define ATIP_SpeedRef_Mask 0x07 #define ATIP_SpeedRef_2X 0x01 #define ATIP_WritingPower_Mask 0x07 @@ -2164,7 +2164,7 @@ typedef struct _EVENT_STAT_EXT_REQ_BLOCK { } Byte0; #define EventStat_ExtrnReqStatus_Mask 0x0f -#define EventStat_ExtrnReqStatus_Ready 0x00 +#define EventStat_ExtrnReqStatus_Ready 0x00 #define EventStat_ExtrnReqStatus_OtherPrevent 0x01 union { @@ -2264,8 +2264,8 @@ typedef struct _EVENT_STAT_DEV_BUSY_BLOCK { // Define mode disc info block. -typedef struct _DISC_INFO_BLOCK { // - UCHAR DataLength [2]; +typedef struct _DISC_INFO_BLOCK { // + UCHAR DataLength [2]; #define DiscInfo_Disk_Mask 0x03 #define DiscInfo_Disk_Empty 0x00 @@ -2338,8 +2338,8 @@ typedef struct _DISC_INFO_BLOCK { // } DISC_INFO_BLOCK, *PDISC_INFO_BLOCK; -typedef struct _DISC_INFO_TRACK_BLOCK { // - UCHAR DataLength [2]; +typedef struct _DISC_INFO_TRACK_BLOCK { // + UCHAR DataLength [2]; UCHAR Reserved: 5; UCHAR InfoType: 3; @@ -2349,11 +2349,11 @@ typedef struct _DISC_INFO_TRACK_BLOCK { // UCHAR NumOfTracks[2]; UCHAR MaxNumOfAppendableTracks[2]; UCHAR NumOfAppendableTracks[2]; - + } DISC_INFO_TRACK_BLOCK, *PDISC_INFO_TRACK_BLOCK; -typedef struct _DISC_INFO_POW_BLOCK { // - UCHAR DataLength [2]; +typedef struct _DISC_INFO_POW_BLOCK { // + UCHAR DataLength [2]; UCHAR Reserved: 5; UCHAR InfoType: 3; @@ -2362,7 +2362,7 @@ typedef struct _DISC_INFO_POW_BLOCK { // UCHAR RemainingPOWReplacements[4]; UCHAR RemainingPOWMapEntries[4]; UCHAR RemainingPOWUpdates[4]; - + } DISC_INFO_POW_BLOCK, *PDISC_INFO_POW_BLOCK; // Define track info block. @@ -2377,7 +2377,7 @@ typedef struct _DISC_INFO_POW_BLOCK { // #define Trk_QSubChan_Type_AllowCpy 0x02 typedef struct _TRACK_INFO_BLOCK { - UCHAR DataLength [2]; + UCHAR DataLength [2]; UCHAR TrackNum; UCHAR SesNum; UCHAR Reserved0; @@ -2685,7 +2685,7 @@ typedef struct _MODE_WRITE_PARAMS_PAGE { // 0x05 } Byte4; UCHAR LinkSize; - UCHAR Reserved3; + UCHAR Reserved3; union { UCHAR Flags; @@ -2795,7 +2795,7 @@ typedef struct _MODE_CD_PARAMS_PAGE { // 0x0D UCHAR PageCode : 6; UCHAR Reserved : 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x06 UCHAR Reserved1; @@ -2834,7 +2834,7 @@ typedef struct _MODE_CD_AUDIO_CONTROL_PAGE { // 0x0E UCHAR PageCode : 6; UCHAR Reserved1: 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x0E #define CdAudio_SOTC 0x02 @@ -2863,7 +2863,7 @@ typedef struct _MODE_POWER_CONDITION_PAGE { // 0x1A UCHAR PageCode : 6; UCHAR Reserved1: 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x0A UCHAR Reserved2; @@ -2890,7 +2890,7 @@ typedef struct _MODE_FAIL_REPORT_PAGE { // 0x1C UCHAR PageCode : 6; UCHAR Reserved1: 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x0A #define FailReport_LogErr 0x01 @@ -2929,7 +2929,7 @@ typedef struct _MODE_TIMEOUT_AND_PROTECT_PAGE { // 0x1D UCHAR PageCode : 6; UCHAR Reserved1: 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x08 UCHAR Reserved2[2]; @@ -2992,8 +2992,8 @@ typedef struct _MODE_CAPABILITIES_PAGE2 { // 0x2A UCHAR PageLength; -#define DevCap_read_cd_r 0x01 // reserved in 1.2 -#define DevCap_read_cd_rw 0x02 // reserved in 1.2 +#define DevCap_read_cd_r 0x01 // reserved in 1.2 +#define DevCap_read_cd_rw 0x02 // reserved in 1.2 #define DevCap_method2 0x04 #define DevCap_read_dvd_rom 0x08 #define DevCap_read_dvd_r 0x10 @@ -3002,23 +3002,23 @@ typedef struct _MODE_CAPABILITIES_PAGE2 { // 0x2A #define DevCap_read_dvd (DevCap_read_dvd_rom | DevCap_read_dvd_r | DevCap_read_dvd_ram) UCHAR ReadCap; // DevCap_*_read // 0x02 -/* UCHAR cd_r_read : 1; // reserved in 1.2 - UCHAR cd_rw_read : 1; // reserved in 1.2 +/* UCHAR cd_r_read : 1; // reserved in 1.2 + UCHAR cd_rw_read : 1; // reserved in 1.2 UCHAR method2 : 1; UCHAR dvd_rom : 1; UCHAR dvd_r_read : 1; UCHAR dvd_ram_read : 1; UCHAR Reserved2 : 2;*/ -#define DevCap_write_cd_r 0x01 // reserved in 1.2 -#define DevCap_write_cd_rw 0x02 // reserved in 1.2 +#define DevCap_write_cd_r 0x01 // reserved in 1.2 +#define DevCap_write_cd_rw 0x02 // reserved in 1.2 #define DevCap_test_write 0x04 #define DevCap_write_dvd_r 0x10 #define DevCap_write_dvd_ram 0x20 UCHAR WriteCap; // DevCap_*_write // 0x03 -/* UCHAR cd_r_write : 1; // reserved in 1.2 - UCHAR cd_rw_write : 1; // reserved in 1.2 +/* UCHAR cd_r_write : 1; // reserved in 1.2 + UCHAR cd_rw_write : 1; // reserved in 1.2 UCHAR test_write : 1; UCHAR reserved3a : 1; UCHAR dvd_r_write : 1; @@ -3083,16 +3083,16 @@ typedef struct _MODE_CAPABILITIES_PAGE2 { // 0x2A #define DevCap_separate_volume 0x01 #define DevCap_separate_mute 0x02 -#define DevCap_disc_present 0x04 // reserved in 1.2 -#define DevCap_sw_slot_select 0x08 // reserved in 1.2 -#define DevCap_change_side_cap 0x10 +#define DevCap_disc_present 0x04 // reserved in 1.2 +#define DevCap_sw_slot_select 0x08 // reserved in 1.2 +#define DevCap_change_side_cap 0x10 #define DevCap_rw_leadin_read 0x20 UCHAR Capabilities3; // 0x07 /* UCHAR separate_volume : 1; UCHAR separate_mute : 1; - UCHAR disc_present : 1; // reserved in 1.2 - UCHAR sss : 1; // reserved in 1.2 + UCHAR disc_present : 1; // reserved in 1.2 + UCHAR sss : 1; // reserved in 1.2 UCHAR Reserved7 : 4;*/ UCHAR MaximumSpeedSupported[2]; // 0x08 @@ -3221,7 +3221,7 @@ typedef struct _SET_STREAMING_PERFORMANCE_DESCRIPTOR { UCHAR ReadTime[4]; // ms UCHAR WriteSize[4]; // KBytes - UCHAR WriteTime[4]; // ms + UCHAR WriteTime[4]; // ms } SET_STREAMING_PERFORMANCE_DESCRIPTOR, *PSET_STREAMING_PERFORMANCE_DESCRIPTOR; @@ -3297,7 +3297,7 @@ typedef struct _FEATURE_LIST_HEADER { UCHAR CurrentProfile[2]; } FEATURE_LIST_HEADER, *PFEATURE_LIST_HEADER; -// Profile List Feature +// Profile List Feature // Profile list descriptor format diff --git a/drivers/filesystems/udfs/CDRW/cdrw_usr.h b/drivers/filesystems/udfs/CDRW/cdrw_usr.h index eb7016c511d..d80d0e2c9d9 100644 --- a/drivers/filesystems/udfs/CDRW/cdrw_usr.h +++ b/drivers/filesystems/udfs/CDRW/cdrw_usr.h @@ -141,7 +141,7 @@ Environment: #define IOCTL_CDRW_GET_VOLUME IOCTL_CDROM_GET_VOLUME #define IOCTL_CDRW_SET_VOLUME IOCTL_CDROM_SET_VOLUME #define IOCTL_CDRW_READ_Q_CHANNEL IOCTL_CDROM_READ_Q_CHANNEL -#define IOCTL_CDRW_GET_LAST_SESSION IOCTL_CDROM_GET_LAST_SESSION +#define IOCTL_CDRW_GET_LAST_SESSION IOCTL_CDROM_GET_LAST_SESSION #define IOCTL_CDRW_RAW_READ IOCTL_CDROM_RAW_READ #define IOCTL_CDRW_DISK_TYPE IOCTL_CDROM_DISK_TYPE @@ -316,7 +316,7 @@ typedef struct _SET_STREAMING_USER_IN { ULONG ReadTime; // ms ULONG WriteSize; // KBytes - ULONG WriteTime; // ms + ULONG WriteTime; // ms } SET_STREAMING_USER_IN, *PSET_STREAMING_USER_IN; //********************************************************************************************** @@ -368,7 +368,7 @@ typedef struct _TRACK_INFO_BLOCK_USER_OUT { UCHAR TrackMode : 4; UCHAR Copy : 1; UCHAR Damage : 1; - UCHAR Reserved1 : 2; + UCHAR Reserved1 : 2; } Fields; } TrackParam; @@ -625,7 +625,7 @@ typedef struct _DISC_STATUS_INFO_USER_OUT { #define DiscStatus_Formattable 0x01 -typedef struct _DISC_INFO_BLOCK_USER_OUT { // +typedef struct _DISC_INFO_BLOCK_USER_OUT { // DISC_STATUS_INFO_USER_OUT Status; @@ -739,7 +739,7 @@ typedef struct _GET_MEDIA_TYPE_EX_USER_OUT { UCHAR Layers; // Number of layers - 1 (e.g. 0 => 1 layer) UCHAR Reserved[8]; // for future implementation } GET_MEDIA_TYPE_EX_USER_OUT, *PGET_MEDIA_TYPE_EX_USER_OUT; - + #define CdMediaClass_CDROM 0x00 #define CdMediaClass_CDR 0x01 #define CdMediaClass_CDRW 0x02 @@ -926,7 +926,7 @@ typedef struct _MODE_WRITE_PARAMS_PAGE_USER { // 0x05 } Byte4; UCHAR LinkSize; - UCHAR Reserved3; + UCHAR Reserved3; union { UCHAR Flags; @@ -1043,8 +1043,8 @@ typedef struct _GET_CAPABILITIES_USER_OUT { /* #ifndef DevCap_read_cd_r -#define DevCap_read_cd_r 0x01 // reserved in 1.2 -#define DevCap_read_cd_rw 0x02 // reserved in 1.2 +#define DevCap_read_cd_r 0x01 // reserved in 1.2 +#define DevCap_read_cd_rw 0x02 // reserved in 1.2 #define DevCap_method2 0x04 #define DevCap_read_dvd_rom 0x08 #define DevCap_read_dvd_r 0x10 @@ -1053,8 +1053,8 @@ typedef struct _GET_CAPABILITIES_USER_OUT { */ UCHAR ReadCap; // DevCap_*_read -/* UCHAR cd_r_read : 1; // reserved in 1.2 - UCHAR cd_rw_read : 1; // reserved in 1.2 +/* UCHAR cd_r_read : 1; // reserved in 1.2 + UCHAR cd_rw_read : 1; // reserved in 1.2 UCHAR method2 : 1; UCHAR dvd_rom : 1; UCHAR dvd_r_read : 1; @@ -1063,8 +1063,8 @@ typedef struct _GET_CAPABILITIES_USER_OUT { /* #ifndef DevCap_write_cd_r -#define DevCap_write_cd_r 0x01 // reserved in 1.2 -#define DevCap_write_cd_rw 0x02 // reserved in 1.2 +#define DevCap_write_cd_r 0x01 // reserved in 1.2 +#define DevCap_write_cd_rw 0x02 // reserved in 1.2 #define DevCap_test_write 0x04 #define DevCap_write_dvd_r 0x10 #define DevCap_write_dvd_ram 0x20 @@ -1072,8 +1072,8 @@ typedef struct _GET_CAPABILITIES_USER_OUT { */ UCHAR WriteCap; // DevCap_*_write -/* UCHAR cd_r_write : 1; // reserved in 1.2 - UCHAR cd_rw_write : 1; // reserved in 1.2 +/* UCHAR cd_r_write : 1; // reserved in 1.2 + UCHAR cd_rw_write : 1; // reserved in 1.2 UCHAR dvd_ram_write : 1; UCHAR dvd_r_write : 1; UCHAR reserved3a : 1; @@ -1152,9 +1152,9 @@ typedef struct _GET_CAPABILITIES_USER_OUT { #ifndef DevCap_separate_volume #define DevCap_separate_volume 0x01 #define DevCap_separate_mute 0x02 -#define DevCap_disc_present 0x04 // reserved in 1.2 -#define DevCap_sw_slot_select 0x08 // reserved in 1.2 -#define DevCap_change_side_cap 0x10 +#define DevCap_disc_present 0x04 // reserved in 1.2 +#define DevCap_sw_slot_select 0x08 // reserved in 1.2 +#define DevCap_change_side_cap 0x10 #define DevCap_rw_leadin_read 0x20 #endif //DevCap_separate_volume */ @@ -1162,8 +1162,8 @@ typedef struct _GET_CAPABILITIES_USER_OUT { UCHAR Capabilities3; /* UCHAR separate_volume : 1; UCHAR separate_mute : 1; - UCHAR disc_present : 1; // reserved in 1.2 - UCHAR sss : 1; // reserved in 1.2 + UCHAR disc_present : 1; // reserved in 1.2 + UCHAR sss : 1; // reserved in 1.2 UCHAR Reserved7 : 4;*/ USHORT MaximumSpeedSupported; @@ -1664,7 +1664,7 @@ typedef struct _GET_DISK_LAYOUT_USER_OUT { ULONG NWA; // sector type map struct _MediaTrackMap* TrackMap; - // + // ULONG BlockSize; ULONG WriteBlockSize; // disk state diff --git a/drivers/filesystems/udfs/Include/CrossNt/CrossNt.h b/drivers/filesystems/udfs/Include/CrossNt/CrossNt.h index 5619834aa10..661accc8b6e 100644 --- a/drivers/filesystems/udfs/Include/CrossNt/CrossNt.h +++ b/drivers/filesystems/udfs/Include/CrossNt/CrossNt.h @@ -7,7 +7,7 @@ extern "C" { #if !defined(NT_INCLUDED) #include // various NT definitions -#endif +#endif #include #include diff --git a/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp b/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp index 540c3db0336..321a4c625bf 100644 --- a/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp +++ b/drivers/filesystems/udfs/Include/Sys_spec_lib.cpp @@ -7,7 +7,7 @@ * * File: Sys_Spec.cpp * -* Module: UDF File System Driver +* Module: UDF File System Driver * (both User and Kernel mode execution) * * Description: @@ -177,7 +177,7 @@ UDFAttributesToUDF( FCharact = &(FileDirNdx->FileCharacteristics); if((*FCharact & FILE_DIRECTORY) || - (*Type == UDF_FILE_TYPE_STREAMDIR) || + (*Type == UDF_FILE_TYPE_STREAMDIR) || (*Type == UDF_FILE_TYPE_DIRECTORY)) { *FCharact |= FILE_DIRECTORY; if(*Type != UDF_FILE_TYPE_STREAMDIR) @@ -247,7 +247,7 @@ UDFFileDirInfoToNT( ASSERT((ULONG_PTR)NTFileInfo > 0x1000); RtlZeroMemory(NTFileInfo, sizeof(FILE_BOTH_DIR_INFORMATION)); - + DosName.Buffer = (PWCHAR)&(NTFileInfo->ShortName); DosName.MaximumLength = sizeof(NTFileInfo->ShortName); // 12*sizeof(WCHAR) @@ -532,7 +532,7 @@ UDFGetFileXTime( } if(CrtTime) { - if(!(*CrtTime)) + if(!(*CrtTime)) KeQuerySystemTime((PLARGE_INTEGER)CrtTime); if(AccTime && !(*AccTime)) (*AccTime) = *CrtTime; if(AttrTime && !(*AttrTime)) (*AttrTime) = *CrtTime; @@ -576,7 +576,7 @@ UDFNormalizeFileName( #ifndef _CONSOLE -void +void __fastcall UDFDOSNameOsNative( IN OUT PUNICODE_STRING DosName, @@ -599,7 +599,7 @@ UDFDOSNameOsNative( } RtlZeroMemory(&Ctx, sizeof(GENERATE_NAME_CONTEXT)); RtlGenerate8dot3Name(UdfName, FALSE, &Ctx, DosName); - + } // UDFDOSNameOsNative() #endif //_CONSOLE @@ -671,7 +671,7 @@ UDFNormalizeFileName( int localExtIndex = 0; if (hasExt) { int maxFilenameLen; - // Translate extension, and store it in ext. + // Translate extension, and store it in ext. for(index = 0; index> 12]; newName[newIndex++] = hexChar[(valueCRC & 0x0f00) >> 8]; newName[newIndex++] = hexChar[(valueCRC & 0x00f0) >> 4]; newName[newIndex++] = hexChar[(valueCRC & 0x000f)]; - // Place a translated extension at end, if found. + // Place a translated extension at end, if found. if (hasExt) { newName[newIndex++] = UNICODE_PERIOD; for (index = 0;index < localExtIndex ;index++ ) { @@ -744,7 +744,7 @@ MyAppendUnicodeStringToString_( IN PUNICODE_STRING Str2 #ifdef UDF_TRACK_UNICODE_STR ,IN PCHAR Tag -#endif +#endif ) { PWCHAR tmp; @@ -754,7 +754,7 @@ MyAppendUnicodeStringToString_( #define UDF_UNC_STR_TAG Tag #else #define UDF_UNC_STR_TAG "AppUStr" -#endif +#endif tmp = Str1->Buffer; i = Str1->Length + Str2->Length + sizeof(WCHAR); @@ -794,7 +794,7 @@ MyAppendUnicodeToString_( IN PCWSTR Str2 #ifdef UDF_TRACK_UNICODE_STR ,IN PCHAR Tag -#endif +#endif ) { PWCHAR tmp; @@ -804,7 +804,7 @@ MyAppendUnicodeToString_( #define UDF_UNC_STR_TAG Tag #else #define UDF_UNC_STR_TAG "AppStr" -#endif +#endif #if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) diff --git a/drivers/filesystems/udfs/Include/Sys_spec_lib.h b/drivers/filesystems/udfs/Include/Sys_spec_lib.h index 371c320508f..ed00e1af79f 100644 --- a/drivers/filesystems/udfs/Include/Sys_spec_lib.h +++ b/drivers/filesystems/udfs/Include/Sys_spec_lib.h @@ -89,7 +89,7 @@ if(Vcb->CompatFlags & UDF_VCB_IC_UPDATE_ATTR_TIME) { \ UDFSetFileXTime(FileInfo, &NtTime, &NtTime, &NtTime, &NtTime); \ } -void +void __fastcall UDFDOSNameOsNative( IN OUT PUNICODE_STRING DosName, @@ -104,14 +104,14 @@ NTSTATUS MyAppendUnicodeStringToString_(IN PUNICODE_STRING Str1, IN PUNICODE_STRING Str2 #ifdef UDF_TRACK_UNICODE_STR ,IN PCHAR Tag -#endif +#endif ); NTSTATUS MyAppendUnicodeToString_(IN PUNICODE_STRING Str1, IN PCWSTR Str2 #ifdef UDF_TRACK_UNICODE_STR ,IN PCHAR Tag -#endif +#endif ); #ifdef UDF_TRACK_UNICODE_STR diff --git a/drivers/filesystems/udfs/Include/check_env.h b/drivers/filesystems/udfs/Include/check_env.h index 800912c27d7..6eecb034edc 100644 --- a/drivers/filesystems/udfs/Include/check_env.h +++ b/drivers/filesystems/udfs/Include/check_env.h @@ -27,7 +27,7 @@ // include appropriate header(s) #ifdef NT_KERNEL_MODE - + #ifdef NT_DEV_DRV_ENV #include #endif //NT_DEV_DRV_ENV @@ -44,7 +44,7 @@ #endif //NT_KERNEL_MODE #ifdef NT_NATIVE_MODE - + #include "Include/nt_native.h" #ifdef NT_DEV_DRV_ENV #include "LibCdrw/env_spec_cdrw_w32.h" @@ -90,7 +90,7 @@ //#warning !!!! Execution mode defaulted to WIN_32 !!!! //#define USER_MODE #define WIN_32_MODE -#endif +#endif // check mode #ifdef NT_KERNEL_MODE diff --git a/drivers/filesystems/udfs/Include/env_spec_nt.cpp b/drivers/filesystems/udfs/Include/env_spec_nt.cpp index c4cf8f99c46..06c7867d2ea 100644 --- a/drivers/filesystems/udfs/Include/env_spec_nt.cpp +++ b/drivers/filesystems/udfs/Include/env_spec_nt.cpp @@ -38,7 +38,7 @@ KernelGetProcAddress( return RC; RtlInitAnsiString(&aname, ProcName); - + // RC = LdrGetProcedureAddress(h, &aname, 0, ProcAddr); return RC; } */ @@ -573,8 +573,8 @@ NTSTATUS EnvFileDeleteW(PWCHAR Name) { FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT ); - - + + if ( !NT_SUCCESS(Status) ) { return Status; } diff --git a/drivers/filesystems/udfs/Include/env_spec_nt.h b/drivers/filesystems/udfs/Include/env_spec_nt.h index 7c9d98f6309..3fda8076dc1 100644 --- a/drivers/filesystems/udfs/Include/env_spec_nt.h +++ b/drivers/filesystems/udfs/Include/env_spec_nt.h @@ -41,7 +41,7 @@ InterlockedExchangeAdd(PLONG addr, LONG i) { return Old; } -#define DeviceIoControl(h, ctlc, ib, is, ob, os, r, ov) MyDeviceIoControl(h, ctlc, ib, is, ob, os, r, ov) +#define DeviceIoControl(h, ctlc, ib, is, ob, os, r, ov) MyDeviceIoControl(h, ctlc, ib, is, ob, os, r, ov) BOOLEAN MyDeviceIoControl( @@ -162,7 +162,7 @@ EnvFileSetPointer( ); extern "C" -NTSTATUS +NTSTATUS EnvFileDeleteW( PWCHAR fName ); diff --git a/drivers/filesystems/udfs/Include/env_spec_w32.cpp b/drivers/filesystems/udfs/Include/env_spec_w32.cpp index 9df62baf0b0..10a9794b9c2 100644 --- a/drivers/filesystems/udfs/Include/env_spec_w32.cpp +++ b/drivers/filesystems/udfs/Include/env_spec_w32.cpp @@ -319,7 +319,7 @@ write( BOOL Privilege( - LPTSTR pszPrivilege, + LPTSTR pszPrivilege, BOOL bEnable ) { @@ -502,7 +502,7 @@ my_open( swprintf(deviceNameBuffer, L"%ws\\", fn); UDFPrint(("my_open: %S\n", fn)); i = sizeof(FSNameBuffer)/sizeof(FSNameBuffer[0]); - if(GetVolumeInformationW(deviceNameBuffer, NULL, 0, + if(GetVolumeInformationW(deviceNameBuffer, NULL, 0, &returned, &returned, &returned, FSNameBuffer, i)) { UDFPrint(("my_open: FS: %S\n", FSNameBuffer)); if(!wcscmp(FSNameBuffer, L"Unknown")) { @@ -788,7 +788,7 @@ udf_get_sizes( return(OS_SUCCESS(RC)); } #endif //LIBUDFFMT - + #include "string_lib.cpp" #ifdef _BROWSE_UDF_ @@ -991,7 +991,7 @@ ExAllocatePool( LastThreadPool = i; ReleaseMutex(MemLock); - + return HeapAlloc(ThreadPoolList[i].HeapHandle, HEAP_NO_SERIALIZE, Size); } // end ExAllocatePool() diff --git a/drivers/filesystems/udfs/Include/env_spec_w32.h b/drivers/filesystems/udfs/Include/env_spec_w32.h index a2b9856219b..f57d6c9ee87 100644 --- a/drivers/filesystems/udfs/Include/env_spec_w32.h +++ b/drivers/filesystems/udfs/Include/env_spec_w32.h @@ -10,7 +10,7 @@ * Module: User-mode applications (User mode execution only) * * Description: -* +* * * Author: Alter * @@ -61,7 +61,7 @@ #ifndef CDRW_W32 #define UDF_DBG #endif //CDRW_W32 -#endif +#endif #define ERESEOURCE ULONG #define PERESEOURCE PULONG @@ -268,7 +268,7 @@ SkinPrintf( #ifdef USE_AD_PRINT #define AdPrint(_x_) {DbgPrint("Thrd:%x:",PsGetCurrentThread());DbgPrint _x_;} - #else + #else #define AdPrint(_x_) {NOTHING;} #endif @@ -411,9 +411,9 @@ typedef ANSI_STRING *PANSI_STRING; #endif //NT_NATIVE_MODE typedef struct _DEVICE_OBJECT { - + #ifndef LIBUDF - + HANDLE h; PVOID DeviceExtension; ULONG Flags; @@ -445,7 +445,7 @@ typedef ULONG PDEVICE_OBJECT; typedef struct _PACKET { // Node Identifier -// UDFIdentifier NodeIdentifier; +// UDFIdentifier NodeIdentifier; // Pointer to the buffer (in non-paged pool) PCHAR buffer; // Offset, from which this data was read @@ -486,7 +486,7 @@ MyRtlCompareMemory( /*#define RtlCompareUnicodeString(s1,s2,cs) \ (((s1)->Length == (s2)->Length) && \ - (RtlCompareMemory(s1,s2,(s1)->Length))) + (RtlCompareMemory(s1,s2,(s1)->Length))) */ #ifndef CDRW_W32 #ifdef _X86_ @@ -654,9 +654,9 @@ NTSTATUS inline ExInitializeResourceLite(PULONG res) #ifndef CDRW_W32 #define UDFAcquireResourceExclusive(Resource,CanWait) \ - ExAcquireResourceExclusiveLite((Resource),(CanWait)) + ExAcquireResourceExclusiveLite((Resource),(CanWait)) #define UDFAcquireResourceShared(Resource,CanWait) \ - ExAcquireResourceSharedLite((Resource),(CanWait)) + ExAcquireResourceSharedLite((Resource),(CanWait)) // a convenient macro (must be invoked in the context of the thread that acquired the resource) #define UDFReleaseResource(Resource) \ ExReleaseResourceForThreadLite((Resource), ExGetCurrentResourceThread()) diff --git a/drivers/filesystems/udfs/Include/format_common.cpp b/drivers/filesystems/udfs/Include/format_common.cpp index b7205bf1be1..c0c862bc941 100644 --- a/drivers/filesystems/udfs/Include/format_common.cpp +++ b/drivers/filesystems/udfs/Include/format_common.cpp @@ -34,11 +34,11 @@ CheckCDType( // Open device volume hDevice = OpenOurVolume(szDeviceName); - if (hDevice == ((HANDLE)-1)) { + if (hDevice == ((HANDLE)-1)) { strcpy(VendorId,""); return BUSY; - } else { - + } else { + // Get our cdrw.sys signature RC = UDFPhSendIOCTL(IOCTL_CDRW_GET_SIGNATURE,hDevice, &ioBuf,sizeof(GET_SIGNATURE_USER_OUT), @@ -76,7 +76,7 @@ CheckCDType( // Check capabilities if(((PGET_CAPABILITIES_USER_OUT)&ioBuf)->WriteCap & (DevCap_write_cd_r | DevCap_write_cd_rw | DevCap_write_dvd_ram | DevCap_write_dvd_r) || DvdRW || DvdpRW || DvdRAM) { - + if (DvdRAM || ((PGET_CAPABILITIES_USER_OUT)&ioBuf)->WriteCap & DevCap_write_dvd_ram) { CloseHandle(hDevice); return DVDRAM; @@ -119,7 +119,7 @@ CheckCDType( } CloseHandle(hDevice); } - + return OTHER; } // end CheckCDType() @@ -164,11 +164,11 @@ InitDeviceList( add_drive = false; switch (GetDriveType(token)) { /* - case DRIVE_FIXED: + case DRIVE_FIXED: add_drive = true; break; */ - case DRIVE_CDROM: + case DRIVE_CDROM: // Determine CD/DVD-ROM type (R,RW,RAM,other) drive_type = CheckCDType(token,&VendorId[0]); add_drive = true; @@ -184,9 +184,9 @@ InitDeviceList( BOOL bSelect = !strcmp(strupr(szDisc),strupr(token)); if (drive_type != OTHER) { - CallBack(hwndControl,token,info,MediaTypeStrings[drive_type],bSelect); + CallBack(hwndControl,token,info,MediaTypeStrings[drive_type],bSelect); } else { - CallBack(hwndControl,token,info,"[Unsupported]",FALSE); + CallBack(hwndControl,token,info,"[Unsupported]",FALSE); } } diff --git a/drivers/filesystems/udfs/Include/mem_tools.cpp b/drivers/filesystems/udfs/Include/mem_tools.cpp index 1d253e0f82a..9e8d62e00b2 100644 --- a/drivers/filesystems/udfs/Include/mem_tools.cpp +++ b/drivers/filesystems/udfs/Include/mem_tools.cpp @@ -33,7 +33,7 @@ KSPIN_LOCK FrameLock; KIRQL oldIrql; #define LockMemoryManager() KeAcquireSpinLock(&FrameLock, &oldIrql) #define UnlockMemoryManager() KeReleaseSpinLock(&FrameLock, oldIrql) -__inline +__inline NTSTATUS InitLockMemoryManager() { KeInitializeSpinLock(&FrameLock); @@ -474,7 +474,7 @@ MyResizePoolInFrame( } } #endif //MY_HEAP_CHECK_BOUNDS - + if(new_len > len ) { if(Allocs[i+1].Len & MY_HEAP_FLAG_USED) return FALSE; @@ -489,7 +489,7 @@ MyResizePoolInFrame( *((PULONG)(addr+new_len+(j*sizeof(ULONG))-MY_HEAP_CHECK_BOUNDS_BSZ)) = 0xBAADF00D; } #endif //MY_HEAP_CHECK_BOUNDS - + if(!Allocs[i+1].Len) { i++; RtlMoveMemory(&(Allocs[i]), &(Allocs[i+1]), (MY_HEAP_MAX_BLOCKS-1-i)*sizeof(MEM_ALLOC_DESC) ); diff --git a/drivers/filesystems/udfs/Include/mem_tools.h b/drivers/filesystems/udfs/Include/mem_tools.h index ff64d7a3b4d..fdc29f2a1a7 100644 --- a/drivers/filesystems/udfs/Include/mem_tools.h +++ b/drivers/filesystems/udfs/Include/mem_tools.h @@ -29,7 +29,7 @@ typedef struct _MEM_ALLOC_DESC { #ifdef MY_HEAP_TRACK_REF // PCHAR Ref; PCHAR Tag; -#endif +#endif } MEM_ALLOC_DESC, *PMEM_ALLOC_DESC; typedef struct _MEM_FRAME_ALLOC_DESC { @@ -172,7 +172,7 @@ PVOID inline MyAllocatePool__(ULONG type, ULONG len) { #ifdef TRACK_SYS_ALLOC_CALLERS newaddr = (PCHAR)DebugAllocatePool(type,len+MY_HEAP_ALIGN+1, 0x202, __LINE__); #else //TRACK_SYS_ALLOC_CALLERS - newaddr = (PCHAR)MyAllocatePool_(type,len+MY_HEAP_ALIGN+1); + newaddr = (PCHAR)MyAllocatePool_(type,len+MY_HEAP_ALIGN+1); #endif //TRACK_SYS_ALLOC_CALLERS if(!newaddr) return NULL; @@ -190,7 +190,7 @@ PVOID inline MyAllocatePoolTag__(ULONG type, ULONG len, /*PCHAR*/ULONG tag) { #ifdef TRACK_SYS_ALLOC_CALLERS newaddr = (PCHAR)DebugAllocatePool(type,len+MY_HEAP_ALIGN+1, 0x202, __LINE__); #else //TRACK_SYS_ALLOC_CALLERS - newaddr = (PCHAR)MyAllocatePoolTag_(type,len+MY_HEAP_ALIGN+1, tag); + newaddr = (PCHAR)MyAllocatePoolTag_(type,len+MY_HEAP_ALIGN+1, tag); #endif //TRACK_SYS_ALLOC_CALLERS if(!newaddr) return NULL; @@ -245,16 +245,16 @@ ULONG inline MyReallocPool__(PCHAR addr, ULONG len, PCHAR *pnewaddr, ULONG newle } } #endif //MY_MEM_BOUNDS_CHECK - + if ((_newlen != _len) #ifdef MY_MEM_BOUNDS_CHECK || TRUE #endif //MY_MEM_BOUNDS_CHECK - ) { + ) { #ifdef TRACK_SYS_ALLOC_CALLERS newaddr = (PCHAR)DebugAllocatePool(NonPagedPool,_newlen, 0x202, __LINE__); #else //TRACK_SYS_ALLOC_CALLERS - newaddr = (PCHAR)MyAllocatePool__(NonPagedPool,_newlen); + newaddr = (PCHAR)MyAllocatePool__(NonPagedPool,_newlen); #endif //TRACK_SYS_ALLOC_CALLERS if (!newaddr) { __debugbreak(); @@ -282,7 +282,7 @@ ULONG inline MyReallocPool__(PCHAR addr, ULONG len, PCHAR *pnewaddr, ULONG newle } #endif //MY_MEM_BOUNDS_CHECK - MyFreePool__(addr); + MyFreePool__(addr); } else { *pnewaddr = addr; } diff --git a/drivers/filesystems/udfs/Include/nt_native.h b/drivers/filesystems/udfs/Include/nt_native.h index 15d05d988cb..839fe06f688 100644 --- a/drivers/filesystems/udfs/Include/nt_native.h +++ b/drivers/filesystems/udfs/Include/nt_native.h @@ -170,14 +170,14 @@ typedef struct _RTL_QUERY_REGISTRY_TABLE { -NTSYSAPI -NTSTATUS -NTAPI -RtlCharToInteger ( - PCSZ String, - ULONG Base, - PULONG Value - ); +NTSYSAPI +NTSTATUS +NTAPI +RtlCharToInteger ( + PCSZ String, + ULONG Base, + PULONG Value + ); NTSYSAPI NTSTATUS @@ -197,7 +197,7 @@ RtlUnicodeStringToInteger ( PULONG Value ); - + // // String manipulation routines // @@ -935,48 +935,48 @@ typedef enum _FILE_INFORMATION_CLASS { // Define the various structures which are returned on query operations // -typedef struct _FILE_BASIC_INFORMATION { - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - ULONG FileAttributes; -} FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; - -typedef struct _FILE_STANDARD_INFORMATION { - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - ULONG NumberOfLinks; - BOOLEAN DeletePending; - BOOLEAN Directory; -} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; - -typedef struct _FILE_POSITION_INFORMATION { - LARGE_INTEGER CurrentByteOffset; -} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION; - -typedef struct _FILE_ALIGNMENT_INFORMATION { - ULONG AlignmentRequirement; -} FILE_ALIGNMENT_INFORMATION, *PFILE_ALIGNMENT_INFORMATION; - -typedef struct _FILE_NETWORK_OPEN_INFORMATION { - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - ULONG FileAttributes; -} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; - -typedef struct _FILE_DISPOSITION_INFORMATION { - BOOLEAN DeleteFile; -} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; - -typedef struct _FILE_END_OF_FILE_INFORMATION { - LARGE_INTEGER EndOfFile; -} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; - +typedef struct _FILE_BASIC_INFORMATION { + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + ULONG FileAttributes; +} FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; + +typedef struct _FILE_STANDARD_INFORMATION { + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + ULONG NumberOfLinks; + BOOLEAN DeletePending; + BOOLEAN Directory; +} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; + +typedef struct _FILE_POSITION_INFORMATION { + LARGE_INTEGER CurrentByteOffset; +} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION; + +typedef struct _FILE_ALIGNMENT_INFORMATION { + ULONG AlignmentRequirement; +} FILE_ALIGNMENT_INFORMATION, *PFILE_ALIGNMENT_INFORMATION; + +typedef struct _FILE_NETWORK_OPEN_INFORMATION { + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + ULONG FileAttributes; +} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; + +typedef struct _FILE_DISPOSITION_INFORMATION { + BOOLEAN DeleteFile; +} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; + +typedef struct _FILE_END_OF_FILE_INFORMATION { + LARGE_INTEGER EndOfFile; +} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; + typedef struct _FILE_FULL_EA_INFORMATION { ULONG NextEntryOffset; @@ -1004,10 +1004,10 @@ typedef enum _FSINFOCLASS { FileFsMaximumInformation } FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; -typedef struct _FILE_FS_DEVICE_INFORMATION { - DEVICE_TYPE DeviceType; - ULONG Characteristics; -} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; +typedef struct _FILE_FS_DEVICE_INFORMATION { + DEVICE_TYPE DeviceType; + ULONG Characteristics; +} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; // // Registry Specific Access Rights. @@ -1266,9 +1266,9 @@ NtDeleteValueKey( #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) -typedef struct _OBJECT_NAME_INFORMATION { - UNICODE_STRING Name; -} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; +typedef struct _OBJECT_NAME_INFORMATION { + UNICODE_STRING Name; +} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; // // Section Information Structures. @@ -1310,17 +1310,17 @@ typedef enum _SECTION_INHERIT { #define PAGE_GUARD 0x100 // winnt #define PAGE_NOCACHE 0x200 // winnt -#define MEM_COMMIT 0x1000 -#define MEM_RESERVE 0x2000 -#define MEM_DECOMMIT 0x4000 -#define MEM_RELEASE 0x8000 -#define MEM_FREE 0x10000 -#define MEM_PRIVATE 0x20000 -#define MEM_MAPPED 0x40000 -#define MEM_RESET 0x80000 -#define MEM_TOP_DOWN 0x100000 -#define MEM_LARGE_PAGES 0x20000000 -#define SEC_RESERVE 0x4000000 +#define MEM_COMMIT 0x1000 +#define MEM_RESERVE 0x2000 +#define MEM_DECOMMIT 0x4000 +#define MEM_RELEASE 0x8000 +#define MEM_FREE 0x10000 +#define MEM_PRIVATE 0x20000 +#define MEM_MAPPED 0x40000 +#define MEM_RESET 0x80000 +#define MEM_TOP_DOWN 0x100000 +#define MEM_LARGE_PAGES 0x20000000 +#define SEC_RESERVE 0x4000000 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | \ 0xFFF) @@ -1543,7 +1543,7 @@ InterlockedCompareExchange( // image file name // typedef struct { - ULONG Unknown[21]; + ULONG Unknown[21]; UNICODE_STRING CommandLine; UNICODE_STRING ImageFile; } ENVIRONMENT_INFORMATION, *PENVIRONMENT_INFORMATION; @@ -1570,21 +1570,21 @@ typedef struct { // Native NT api function to write something to the boot-time // blue screen // -NTSTATUS -NTAPI +NTSTATUS +NTAPI NtDisplayString( - PUNICODE_STRING String + PUNICODE_STRING String ); // // Native applications must kill themselves when done - the job // of this native API // -NTSTATUS -NTAPI +NTSTATUS +NTAPI NtTerminateProcess( - HANDLE ProcessHandle, - LONG ExitStatus + HANDLE ProcessHandle, + LONG ExitStatus ); // @@ -1747,23 +1747,23 @@ RtlDestroyHeap( // // Heap allocation function (ala "malloc") // -PVOID -NTAPI +PVOID +NTAPI RtlAllocateHeap( - HANDLE Heap, - ULONG Flags, - ULONG Size + HANDLE Heap, + ULONG Flags, + ULONG Size ); // // Heap free function (ala "free") // -BOOLEAN -NTAPI +BOOLEAN +NTAPI RtlFreeHeap( - HANDLE Heap, - ULONG Flags, - PVOID Address + HANDLE Heap, + ULONG Flags, + PVOID Address ); diff --git a/drivers/filesystems/udfs/Include/phys_lib.cpp b/drivers/filesystems/udfs/Include/phys_lib.cpp index 5ee90d384ff..af4106c4ec1 100644 --- a/drivers/filesystems/udfs/Include/phys_lib.cpp +++ b/drivers/filesystems/udfs/Include/phys_lib.cpp @@ -600,7 +600,7 @@ UDFTRead( IN uint32 LBA, OUT PSIZE_T ReadBytes, IN uint32 Flags - ) + ) { uint32 rLba; OSSTATUS RC = STATUS_SUCCESS; @@ -734,7 +734,7 @@ UDFTReadAsync( IN SIZE_T Length, IN uint32 LBA, OUT PSIZE_T ReadBytes - ) + ) { PEXTENT_MAP RelocExtent; PEXTENT_MAP RelocExtent_saved; @@ -899,7 +899,7 @@ UDFPrepareForWriteOperation( #ifndef UDF_READ_ONLY_BUILD #ifdef UDF_FORMAT_MEDIA PUDFFmtState fms = Vcb->fms; -#else +#else #define fms FALSE #endif //UDF_FORMAT_MEDIA @@ -919,7 +919,7 @@ UDFPrepareForWriteOperation( Vcb->VCBFlags |= UDF_VCB_LAST_WRITE; - if( + if( #ifdef _BROWSE_UDF_ (((Vcb->FsDeviceType != FILE_DEVICE_CD_ROM_FILE_SYSTEM) || !(Vcb->VCBFlags & UDF_VCB_FLAGS_VOLUME_MOUNTED) || @@ -1024,7 +1024,7 @@ UDFPrepareForWriteOperation( // set packet type (VP/FP) // if(opt_partition == PT_VAT15 || -// opt_blank_vat15) +// opt_blank_vat15) if(WParams->Byte2.Flags & WParam_LS_V) { WParams->LinkSize = 7; } @@ -1081,7 +1081,7 @@ UDFPrepareForWriteOperation( // set additional flags for VP if(Vcb->CDR_Mode) { -// if(opt_partition == PT_VAT15) +// if(opt_partition == PT_VAT15) WParams->SubHeader.Params.Params1.SubMode = WParam_SubHdr_SubMode1; } WParams->PageLength = sizeof(GET_WRITE_MODE_USER_OUT)-2; @@ -1122,7 +1122,7 @@ UDFPrepareForWriteOperation( } } #endif //UDF_FORMAT_MEDIA - + // switch to random access mode ((PSET_RANDOM_ACCESS_USER_IN)WParams)->RandomAccessMode = Vcb->CDR_Mode ? FALSE : TRUE; // ((PSET_RANDOM_ACCESS_USER_IN)WParams)->RandomAccessMode = (opt_partition != PT_VAT15) ? TRUE : FALSE; @@ -1155,7 +1155,7 @@ check_dvd_bg_format: Vcb->MediaClassEx == CdMediaClass_DVDRAM || Vcb->MRWStatus == DiscInfo_BGF_Interrupted ) && (Lba > Vcb->LastLBA)) { - + ULONG fLba; SIZE_T WrittenBytes; ULONG PSz = BCount << Vcb->BlockSizeBits; @@ -1265,7 +1265,7 @@ retry_1: } else { UDFPrint((" no special processing\n")); } - + return RC; } #endif //UDF_READ_ONLY_BUILD @@ -1473,7 +1473,7 @@ bad_rw_seek_recovery: /* if(Vcb->TrackMap[i].Flags & TrackMap_Use_variation) break;*/ Vcb->TrackMap[i].Flags |= TrackMap_Try_variation; - // Try variation. + // Try variation. if(!(Vcb->TrackMap[i].Flags ^= TrackMap_AllowCopyBit_variated)) Vcb->TrackMap[i].Flags ^= TrackMap_CopyBit_variated; if(Vcb->TrackMap[i].Flags & (TrackMap_AllowCopyBit_variated | @@ -1651,7 +1651,7 @@ UDFReadDiscTrackInfo( #ifdef UDF_FORMAT_MEDIA PUDFFmtState fms = Vcb->fms; #endif - + _SEH2_TRY { if(!DiscInfo || !TrackInfoOut) try_return(RC = STATUS_INSUFFICIENT_RESOURCES); @@ -1659,7 +1659,7 @@ UDFReadDiscTrackInfo( MRWRetry_label: RC = UDFPhSendIOCTL(IOCTL_CDRW_READ_DISC_INFO, DeviceObject, - NULL, 0, + NULL, 0, DiscInfo,sizeof(DISC_INFO_BLOCK_USER_OUT), TRUE, NULL); if(!OS_SUCCESS(RC)) { UDFPrint(("ReadDiskInfo failed. Use default.\n")); @@ -1682,7 +1682,7 @@ MRWRetry_label: #endif //UDF_FORMAT_MEDIA RC = UDFPhSendIOCTL(IOCTL_CDRW_READ_CAPACITY, DeviceObject, - NULL, 0, + NULL, 0, &CapacityBuffer,sizeof(READ_CAPACITY_USER_OUT), TRUE, NULL); if(!OS_SUCCESS(RC)) { UDFPrint(("ReadCapacity failed.\n")); @@ -1843,7 +1843,7 @@ MRWRetry_label: Vcb->LastSession = DiscInfo->Status.NumOfSes; Vcb->LastTrackNum = DiscInfo->Status.LastTrackNumLastSes; - Vcb->FirstTrackNum = DiscInfo->FirstTrackNum; + Vcb->FirstTrackNum = DiscInfo->FirstTrackNum; // some devices report LastTrackNum=0 for full disks Vcb->LastTrackNum = max(Vcb->LastTrackNum, Vcb->FirstTrackNum); if(!Vcb->LastTrackNum) { @@ -1967,14 +1967,14 @@ MRWRetry_label: Vcb->LastPossibleLBA - Vcb->TrackMap[TrackNumber].FirstLba + 1)); TrackInfoOut->TrackLength = Vcb->LastPossibleLBA - Vcb->TrackMap[TrackNumber].FirstLba + 1; } - Vcb->TrackMap[TrackNumber].LastLba = TrackInfoOut->TrackStartLBA + - TrackInfoOut->TrackLength - + Vcb->TrackMap[TrackNumber].LastLba = TrackInfoOut->TrackStartLBA + + TrackInfoOut->TrackLength - (TrackInfoOut->TrackLength ? 1 : 0); Vcb->TrackMap[TrackNumber].TrackParam = TrackInfoOut->TrackParam.Flags; Vcb->TrackMap[TrackNumber].DataParam = TrackInfoOut->DataParam.Flags; Vcb->TrackMap[TrackNumber].NWA_V = TrackInfoOut->NWA_V; - if((TrackInfoOut->NextWriteLBA & 0x80000000) || + if((TrackInfoOut->NextWriteLBA & 0x80000000) || (TrackInfoOut->NextWriteLBA < TrackInfoOut->TrackStartLBA)) { if(!(Vcb->TrackMap[TrackNumber].LastLba & 0x8000000)) { UDFPrint(("TrkInfo: set NWA to LastLba (%x)\n", Vcb->TrackMap[TrackNumber].LastLba)); @@ -2116,7 +2116,7 @@ MRWRetry_label: if(Vcb->MediaClassEx != CdMediaClass_DVDpRW) { Vcb->NWA = TrackInfoOut->NextWriteLBA; } else { - Vcb->NWA = + Vcb->NWA = TrackInfoOut->TrackStartLBA + TrackInfoOut->TrackLength - (TrackInfoOut->TrackLength ? 1 : 0); } } @@ -2143,7 +2143,7 @@ MRWRetry_label: UDFPrint((" complete MRW state\n")); #ifdef _BROWSE_UDF_ Vcb->LastPossibleLBA = - Vcb->NWA = + Vcb->NWA = Vcb->LastLBA = Vcb->TrackMap[TrackNumber].LastLba; goto valid_track_length; @@ -2178,7 +2178,7 @@ MRWRetry_label: } } UDFPrint((" set track LastLBA %x\n", Vcb->LastPossibleLBA)); - Vcb->NWA = + Vcb->NWA = Vcb->LastLBA = Vcb->TrackMap[TrackNumber].LastLba = Vcb->LastPossibleLBA; @@ -2189,7 +2189,7 @@ valid_track_length: Vcb->TrackMap[TrackNumber-1].Session) && (Vcb->LastSession > 1)) { // Note: some devices return negative track length - if((Vcb->TrackMap[TrackNumber].LastLba <= + if((Vcb->TrackMap[TrackNumber].LastLba <= Vcb->TrackMap[TrackNumber].FirstLba) || (Vcb->TrackMap[TrackNumber].FirstLba == Vcb->TrackMap[TrackNumber].NWA)) { @@ -2429,7 +2429,7 @@ UDFUseStandard( try_return(RC = STATUS_NO_MEDIA_IN_DEVICE); } #endif //UDF_FORMAT_MEDIA - + // If even standard read toc does not work, then use default values if(!OS_SUCCESS(RC)) { @@ -2477,16 +2477,16 @@ UDFUseStandard( #ifdef _CONSOLE Vcb->PhDeviceType = FILE_DEVICE_CD_ROM; #endif //_CONSOLE - + LocalTrackCount = toc->Tracks.Last_TrackSes - toc->Tracks.First_TrackSes + 1; // LocalTocLength = PtrOffset( toc, &(toc->TrackData[LocalTrackCount + 1]) ); /* FIXME ReactOS Assume PtrOffset is not changing it's arguments? */ - + // Get out if there is an immediate problem with the TOC. if(toc->Tracks.First_TrackSes > toc->Tracks.Last_TrackSes) { try_return(RC = STATUS_DISK_CORRUPT_ERROR); } -#ifdef _BROWSE_UDF_ +#ifdef _BROWSE_UDF_ Vcb->LastTrackNum=toc->Tracks.Last_TrackSes; Vcb->FirstTrackNum=toc->Tracks.First_TrackSes; // some devices report LastTrackNum=0 for full disks @@ -2524,7 +2524,7 @@ UDFUseStandard( } } } - + OldTrkNum = 0; // Scan toc for first & last LBA for(TocEntry=0;TocEntryFirstTrackNum=toc->Tracks.Last_TrackSes; Vcb->LastTrackNum=toc->Tracks.First_TrackSes; - + // Scan toc for first & last LBA for(TocEntry=0;TocEntryTrackData[TocEntry].LBA @@ -2667,7 +2667,7 @@ UDFUseStandard( } #undef TempMSF } - + // Vcb->LastLBA=PacketVariable2Fixed(Vcb->LastLBA)-2; Vcb->LastPossibleLBA = DEFAULT_LAST_LBA_FP_CD; #endif //_BROWSE_UDF_ @@ -3019,7 +3019,7 @@ UDFFixFPAddress( IN uint32 Lba ) { - uint32 i = Vcb->LastReadTrack; + uint32 i = Vcb->LastReadTrack; uint32 pk; uint32 rel; @@ -3074,16 +3074,16 @@ UDFGetDiskInfo( _SEH2_TRY { RC = UDFGetBlockSize(DeviceObject, Vcb); if(!OS_SUCCESS(RC)) try_return(RC); - - + + // Get lower driver signature RC = UDFPhSendIOCTL(IOCTL_CDRW_GET_SIGNATURE,DeviceObject, ioBuf,sizeof(GET_SIGNATURE_USER_OUT), ioBuf,sizeof(GET_SIGNATURE_USER_OUT), TRUE,NULL); - + if(!OS_SUCCESS(RC)) { - + RC = UDFUseStandard(DeviceObject, Vcb); #ifdef _BROWSE_UDF_ if(!NT_SUCCESS(RC) || fms) @@ -3096,13 +3096,13 @@ UDFGetDiskInfo( UDFPrint(("UDF: Signature of low driver is : %s \n", ((PGET_SIGNATURE_USER_OUT)(ioBuf))->VendorId)); - + if(!strncmp( (const char *)(&( ((PGET_SIGNATURE_USER_OUT)(ioBuf))->VendorId[0]) ), Signature,strlen(Signature) )) { UDFPrint(("UDF: *****************************************\n")); UDFPrint(("UDF: ********* Our Device Driver Found ******\n")); UDFPrint(("UDF: *****************************************\n")); - + (Vcb->VCBFlags) |= UDF_VCB_FLAGS_OUR_DEVICE_DRIVER; #ifndef _BROWSE_UDF_ // reset driver @@ -3537,12 +3537,12 @@ Try_FullToc: #endif RC = UDFReadAndProcessFullToc(DeviceObject, Vcb); - + if(!OS_SUCCESS(RC)) { RC = UDFUseStandard(DeviceObject,Vcb); if(!OS_SUCCESS(RC)) try_return(RC); } - + } } else { #ifdef _BROWSE_UDF_ @@ -3551,7 +3551,7 @@ GetSignatureFailed: RC = UDFUseStandard(DeviceObject, Vcb); if(!OS_SUCCESS(RC)) try_return(RC); } - + try_exit: NOTHING; } _SEH2_FINALLY { @@ -3574,7 +3574,7 @@ try_exit: NOTHING; Vcb->LastPossibleLBA = DEFAULT_LAST_LBA_DVD; Vcb->LastLBA = 0; } - + if((Vcb->LastPossibleLBA & 0x80000000) || (Vcb->LastPossibleLBA < Vcb->LastLBA)) { UDFPrint(("UDF: bad LastPossibleLBA %x -> %x\n", Vcb->LastPossibleLBA, Vcb->LastLBA)); Vcb->LastPossibleLBA = Vcb->LastLBA; diff --git a/drivers/filesystems/udfs/Include/regtools.cpp b/drivers/filesystems/udfs/Include/regtools.cpp index 60da19715c0..41113a117e2 100644 --- a/drivers/filesystems/udfs/Include/regtools.cpp +++ b/drivers/filesystems/udfs/Include/regtools.cpp @@ -169,12 +169,12 @@ RegTGetDwordValue( #else //WIN_32_MODE len = sizeof(ULONG); if (ERROR_SUCCESS == RegQueryValueExW( - hKey, // handle of key to query - Name, // address of name of value to query - 0, // reserved - NULL, // address of buffer for value type - (BYTE *)pUlong, // address of data buffer - &len // address of data buffer size + hKey, // handle of key to query + Name, // address of name of value to query + 0, // reserved + NULL, // address of buffer for value type + (BYTE *)pUlong, // address of data buffer + &len // address of data buffer size ) && len == sizeof(ULONG)) { retval = TRUE; } @@ -257,12 +257,12 @@ RegTGetStringValue( #else //WIN_32_MODE len = MaxLen; if (ERROR_SUCCESS == RegQueryValueExW( - hKey, // handle of key to query - Name, // address of name of value to query - 0, // reserved - NULL, // address of buffer for value type - (BYTE *)pStr, // address of data buffer - &len // address of data buffer size + hKey, // handle of key to query + Name, // address of name of value to query + 0, // reserved + NULL, // address of buffer for value type + (BYTE *)pStr, // address of data buffer + &len // address of data buffer size ) && len) { if(pStr[len-1]) { pStr[len-1] = 0; diff --git a/drivers/filesystems/udfs/Include/string_lib.cpp b/drivers/filesystems/udfs/Include/string_lib.cpp index c194404620c..51c99ca1044 100644 --- a/drivers/filesystems/udfs/Include/string_lib.cpp +++ b/drivers/filesystems/udfs/Include/string_lib.cpp @@ -16,7 +16,7 @@ MyRtlCompareMemory( for(i=0; iBlockCount) { return STATUS_SUCCESS; } @@ -1753,7 +1753,7 @@ Try_Another_Frame: } // end WCacheCheckLimitsRAM() /* - WCachePurgeAllRAM() + WCachePurgeAllRAM() Internal routine */ OSSTATUS @@ -1893,7 +1893,7 @@ WCachePreReadPacket__( n=0; while((n < BCount) && (n < Cache->BlocksPerFrame)) { - + addr = (PCHAR)WCacheSectorAddr(block_array, i+n); block_type = Cache->CheckUsedProc(Context, Lba+n); if(/*WCacheGetBadFlag(block_array,i+n)*/ @@ -2009,8 +2009,8 @@ WCachePreReadPacket__( */ OSSTATUS WCacheReadBlocks__( - IN PW_CACHE Cache, // pointer to the Cache Control structure - IN PVOID Context, // user-supplied context for IO callbacks + IN PW_CACHE Cache, // pointer to the Cache Control structure + IN PVOID Context, // user-supplied context for IO callbacks IN PCHAR Buffer, // user-supplied buffer for read blocks IN lba_t Lba, // LBA to start read from IN ULONG BCount, // number of blocks to be read @@ -2232,7 +2232,7 @@ WCacheReadBlocks__( store_read_data_1: // and now we'll copy them to cache - // + // Buffer -= (to_read - saved_to_read); i = saved_i; while(to_read - saved_to_read) { @@ -2280,7 +2280,7 @@ OSSTATUS WCacheWriteBlocks__( IN PW_CACHE Cache, // pointer to the Cache Control structure IN PVOID Context, // user-supplied context for IO callbacks - IN PCHAR Buffer, // user-supplied buffer containing data to be written + IN PCHAR Buffer, // user-supplied buffer containing data to be written IN lba_t Lba, // LBA to start write from IN ULONG BCount, // number of blocks to be written OUT PSIZE_T WrittenBytes, // user-supplied pointer to ULONG that will @@ -2349,7 +2349,7 @@ WCacheWriteBlocks__( // assume successful operation block_array = Cache->FrameList[frame].Frame; if(!block_array) { - + if(BCount && !(BCount & (PS-1)) && !(Lba & (PS-1)) && (Cache->Mode != WCACHE_MODE_R) && (i+BCount <= Cache->BlocksPerFrame) && @@ -2557,8 +2557,8 @@ EO_WCache_W2: */ VOID WCacheFlushAll__( - IN PW_CACHE Cache, // pointer to the Cache Control structure - IN PVOID Context) // user-supplied context for IO callbacks + IN PW_CACHE Cache, // pointer to the Cache Control structure + IN PVOID Context) // user-supplied context for IO callbacks { if(!(Cache->ReadProc)) return; ExAcquireResourceExclusiveLite(&(Cache->WCacheLock), TRUE); @@ -2587,8 +2587,8 @@ WCacheFlushAll__( */ VOID WCachePurgeAll__( - IN PW_CACHE Cache, // pointer to the Cache Control structure - IN PVOID Context) // user-supplied context for IO callbacks + IN PW_CACHE Cache, // pointer to the Cache Control structure + IN PVOID Context) // user-supplied context for IO callbacks { if(!(Cache->ReadProc)) return; ExAcquireResourceExclusiveLite(&(Cache->WCacheLock), TRUE); @@ -2649,7 +2649,7 @@ WCachePurgeAllRW( // lastPos = WCacheGetSortedListIndex(Cache->BlockCount, List, Lba+PSs); block_array = Cache->FrameList[frame].Frame; if(!block_array) { - BrutePoint(); + BrutePoint(); return; } @@ -2658,7 +2658,7 @@ WCachePurgeAllRW( // free memory WCacheFreePacket(Cache, frame, block_array, Lba-firstLba, PSs); - + WCacheRemoveRangeFromList(List, &(Cache->BlockCount), Lba, PSs); WCacheRemoveRangeFromList(Cache->CachedModifiedBlocksList, &(Cache->WriteCount), Lba, PSs); // check if frame is empty @@ -2719,7 +2719,7 @@ WCacheFlushAllRW( // lastPos = WCacheGetSortedListIndex(Cache->WriteCount, List, Lba+PSs); block_array = Cache->FrameList[frame].Frame; if(!block_array) { - BrutePoint(); + BrutePoint(); continue;; } // queue modify request @@ -2824,7 +2824,7 @@ OSSTATUS WCacheFlushBlocksRW( IN PW_CACHE Cache, // pointer to the Cache Control structure IN PVOID Context, // user-supplied context for IO callbacks - IN lba_t _Lba, // LBA to start flush from + IN lba_t _Lba, // LBA to start flush from IN ULONG BCount // number of blocks to be flushed ) { @@ -2885,7 +2885,7 @@ WCacheFlushBlocksRW( if(Cache->Mode != WCACHE_MODE_RAM) return STATUS_SUCCESS; */ - + return STATUS_SUCCESS; } // end WCacheFlushBlocksRW() @@ -2898,7 +2898,7 @@ OSSTATUS WCacheFlushBlocks__( IN PW_CACHE Cache, // pointer to the Cache Control structure IN PVOID Context, // user-supplied context for IO callbacks - IN lba_t Lba, // LBA to start flush from + IN lba_t Lba, // LBA to start flush from IN ULONG BCount // number of blocks to be flushed ) { @@ -2932,7 +2932,7 @@ EO_WCache_F: ExReleaseResourceForThreadLite(&(Cache->WCacheLock), ExGetCurrentResourceThread()); return status; } // end WCacheFlushBlocks__() - + /* WCacheDirect__() returns pointer to memory block where requested block is stored in. @@ -3188,8 +3188,8 @@ __fastcall WCacheCheckLimitsR( IN PW_CACHE Cache, // pointer to the Cache Control structure IN PVOID Context, // user-supplied context for IO callbacks - IN lba_t ReqLba, // first LBA to access/cache - IN ULONG BCount // number of Blocks to access/cache + IN lba_t ReqLba, // first LBA to access/cache + IN ULONG BCount // number of Blocks to access/cache ) { ULONG frame; @@ -3542,7 +3542,7 @@ WCacheDiscardBlocks__( } i = WCacheGetSortedListIndex(Cache->BlockCount, List, ReqLba); - // enumerate requested blocks + // enumerate requested blocks while((List[i] < (ReqLba+BCount)) && (i < Cache->BlockCount)) { Lba = List[i]; diff --git a/drivers/filesystems/udfs/Include/wcache_lib.h b/drivers/filesystems/udfs/Include/wcache_lib.h index cc5a2a3c885..291a157913a 100644 --- a/drivers/filesystems/udfs/Include/wcache_lib.h +++ b/drivers/filesystems/udfs/Include/wcache_lib.h @@ -15,7 +15,7 @@ extern "C" { #include "env_spec_w32.h" #else //#include "env_spec.h" -#endif +#endif #define WCACHE_BOUND_CHECKS diff --git a/drivers/filesystems/udfs/cleanup.cpp b/drivers/filesystems/udfs/cleanup.cpp index 2dbe5879ad3..4f47efed57a 100644 --- a/drivers/filesystems/udfs/cleanup.cpp +++ b/drivers/filesystems/udfs/cleanup.cpp @@ -514,13 +514,13 @@ DiscardDelete: #ifndef UDF_READ_ONLY_BUILD LONGLONG OldFileSize, NewFileSize; - if( (OldFileSize = NtReqFcb->CommonFCBHeader.ValidDataLength.QuadPart) < + if( (OldFileSize = NtReqFcb->CommonFCBHeader.ValidDataLength.QuadPart) < (NewFileSize = NtReqFcb->CommonFCBHeader.FileSize.QuadPart)) { /* UDFZeroDataEx(NtReqFcb, OldFileSize, NewFileSize - OldFileSize, TRUE, Vcb, FileObject);*/ - + NtReqFcb->CommonFCBHeader.ValidDataLength.QuadPart = NewFileSize; } #endif //UDF_READ_ONLY_BUILD @@ -569,7 +569,7 @@ DiscardDelete: UDFAttributesToUDF(DirNdx, NextFileInfo->Dloc->FileEntry, Attr | FILE_ATTRIBUTE_ARCHIVE); } // WriteTime - if(!(Ccb->CCBFlags & UDF_CCB_WRITE_TIME_SET) && + if(!(Ccb->CCBFlags & UDF_CCB_WRITE_TIME_SET) && (Vcb->CompatFlags & UDF_VCB_IC_UPDATE_MODIFY_TIME)) { UDFSetFileXTime(NextFileInfo, NULL, &NtTime, NULL, &NtTime); NtReqFcb->LastWriteTime.QuadPart = diff --git a/drivers/filesystems/udfs/close.cpp b/drivers/filesystems/udfs/close.cpp index e8e0b620b77..62f98188380 100644 --- a/drivers/filesystems/udfs/close.cpp +++ b/drivers/filesystems/udfs/close.cpp @@ -169,10 +169,10 @@ UDFCommonClose( // First, get a pointer to the current I/O stack location IrpSp = IoGetCurrentIrpStackLocation(Irp); ASSERT(IrpSp); - + FileObject = IrpSp->FileObject; ASSERT(FileObject); - + // Get the FCB and CCB pointers Ccb = (PtrUDFCCB)(FileObject->FsContext2); ASSERT(Ccb); @@ -205,7 +205,7 @@ UDFCommonClose( // Therefore, be extremely careful in implementing this close dispatch entry point. // Also note that we do not have the option of returning a failure code from the // close dispatch entry point; the system expects that the close will always succeed. - + UDFAcquireResourceShared(&(Vcb->VCBResource), TRUE); AcquiredVcb = TRUE; @@ -278,7 +278,7 @@ UDFCommonClose( try_return(RC = STATUS_SUCCESS); } - + UDFInterlockedIncrement((PLONG)&(Vcb->VCBOpenCount)); if(AcquiredVcb) { @@ -380,7 +380,7 @@ try_exit: NOTHING; Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_DISK_INCREMENT); - } + } // Free up the Irp Context if(!PostRequest) UDFReleaseIrpContext(PtrIrpContext); @@ -967,7 +967,7 @@ UDFCloseAllXXXDelayedInDir( for(i=0;iListPtr) { CurFileInfo->ListPtr = (PFE_LIST_ENTRY)(MyAllocatePool__(NonPagedPool, sizeof(FE_LIST_ENTRY))); @@ -1084,7 +1084,7 @@ try_exit: NOTHING; // Release DelayedCloseResource if(ResAcq) UDFReleaseResource(&(UDFGlobalData.DelayedCloseResource)); - + if(ListPtrArray) MyFreePool__(ListPtrArray); if(PassedList) @@ -1095,7 +1095,7 @@ try_exit: NOTHING; return RC; } // end UDFCloseAllXXXDelayedInDir( - + /* This routine adds request to Delayed Close queue. diff --git a/drivers/filesystems/udfs/create.cpp b/drivers/filesystems/udfs/create.cpp index 8b05350881a..50d7f39d32c 100644 --- a/drivers/filesystems/udfs/create.cpp +++ b/drivers/filesystems/udfs/create.cpp @@ -275,7 +275,7 @@ UDFCommonCreate( ReturnedInformation = FILE_OPENED; try_return(RC = STATUS_SUCCESS); } - + AbsolutePathName.Length = AbsolutePathName.MaximumLength = LocalPath.Length = LocalPath.MaximumLength = 0; // First, get a pointer to the current I/O stack location @@ -406,7 +406,7 @@ UDFCommonCreate( // (maintaining consistency then becomes a little bit more // of a headache - see read/write file descriptions) #define NoBufferingSpecified (RequestedOptions & FILE_NO_INTERMEDIATE_BUFFERING) - + // Write-through simply means that the FSD must *not* return from // a user write request until the data has been flushed to secondary // storage (either to disks directly connected to the node or across @@ -414,7 +414,7 @@ UDFCommonCreate( WriteThroughRequested = (RequestedOptions & FILE_WRITE_THROUGH) ? TRUE : FALSE; #define SequentialIoRequested (RequestedOptions & FILE_SEQUENTIAL_ONLY ? TRUE : FALSE) - + // Not all of the native file system implementations support // the delete-on-close option. All this means is that after the // last close on the FCB has been performed, the FSD should @@ -485,7 +485,7 @@ UDFCommonCreate( UDFFlushTryBreak(Vcb); - if (Vcb->SoftEjectReq) { + if (Vcb->SoftEjectReq) { AdPrint((" Eject requested\n")); ReturnedInformation = FILE_DOES_NOT_EXIST; try_return(RC = STATUS_FILE_INVALID); @@ -518,9 +518,9 @@ UDFCommonCreate( if( ( ((Vcb->origIntegrityType == INTEGRITY_TYPE_OPEN) && - (Vcb->CompatFlags & UDF_VCB_IC_DIRTY_RO)) + (Vcb->CompatFlags & UDF_VCB_IC_DIRTY_RO)) #ifndef UDF_READ_ONLY_BUILD - || (Vcb->VCBFlags & UDF_VCB_FLAGS_VOLUME_READ_ONLY) + || (Vcb->VCBFlags & UDF_VCB_FLAGS_VOLUME_READ_ONLY) #endif //UDF_READ_ONLY_BUILD ) && (DeleteOnCloseSpecified || @@ -548,7 +548,7 @@ UDFCommonCreate( (PtrRelatedFCB->NodeIdentifier.NodeType == UDF_NODE_TYPE_VCB))) { BOOLEAN UndoLock = FALSE; - + AdPrint((" Opening Volume\n")); // If the supplied file name is NULL *and* either there exists // no related file object *or* if a related file object was supplied @@ -651,7 +651,7 @@ UDFCommonCreate( UDFPrint((" perform flush\n")); PtrIrpContext->IrpContextFlags &= ~UDF_IRP_CONTEXT_FLUSH2_REQUIRED; - + UDFInterlockedIncrement((PLONG)&(Vcb->VCBOpenCount)); UDFReleaseResource(&(Vcb->VCBResource)); AcquiredVcb = FALSE; @@ -684,7 +684,7 @@ UDFCommonCreate( Vcb->VCBFlags |= UDF_VCB_FLAGS_VOLUME_LOCKED; Vcb->VolumeLockFileObject = PtrNewFileObject; UndoLock = TRUE; - } else + } else if(DesiredAccess & ((GENERIC_WRITE | FILE_GENERIC_WRITE) & ~(SYNCHRONIZE | READ_CONTROL))) { UDFPrint((" set UDF_IRP_CONTEXT_FLUSH_REQUIRED\n")); PtrIrpContext->IrpContextFlags |= UDF_IRP_CONTEXT_FLUSH_REQUIRED; @@ -993,14 +993,14 @@ op_vol_accs_dnd: /* if(!NT_SUCCESS(RC = MyInitUnicodeString(&LocalPath, L"")) || !NT_SUCCESS(RC = MyAppendUnicodeStringToStringTag(&LocalPath, &TargetObjectName, MEM_USLOC_TAG)))*/ ASSERT(TargetObjectName.Buffer); - if(!NT_SUCCESS(RC = MyCloneUnicodeString(&LocalPath, &TargetObjectName))) + if(!NT_SUCCESS(RC = MyCloneUnicodeString(&LocalPath, &TargetObjectName))) try_return(RC); ASSERT(PtrRelatedFCB); RelatedFileInfo = PtrRelatedFCB->FileInfo; RC = STATUS_SUCCESS; - NewFileInfo = + NewFileInfo = LastGoodFileInfo = RelatedFileInfo; RelatedFileInfo = @@ -1216,7 +1216,7 @@ SuccessOpen_SDir: StreamName.Length-=sizeof(WCHAR); // update TailName TailName = StreamName; - } else + } else if(RC == STATUS_NOT_FOUND) { #ifndef UDF_READ_ONLY_BUILD // Stream Dir doesn't exist, but caller wants it to be @@ -1252,7 +1252,7 @@ Skip_open_attempt: RC = UDFFirstOpenFile(Vcb, NULL, &PtrNewFcb, RelatedFileInfo, NewFileInfo, &LocalPath, &CurName); - + if(!NT_SUCCESS(RC)) { BrutePoint(); AdPrint((" Can't perform FirstOpen\n")); @@ -1434,7 +1434,7 @@ Skip_open_attempt: // file exists, set this information in the Information field ReturnedInformation = FILE_EXISTS; AdPrint((" Open Target: FILE_EXISTS\n")); - } else + } else if(RC == STATUS_OBJECT_NAME_NOT_FOUND) { #ifdef UDF_DBG // check name. If there are '\\'s in TailName, some @@ -1479,7 +1479,7 @@ Skip_open_attempt: if(!NT_SUCCESS(RC)) { AdPrint((" Access/Share access check failed (Open Target)\n")); } - + try_return(RC); } @@ -2457,7 +2457,7 @@ UDFOpenFile( if (!(Ccb = UDFAllocateCCB())) { AdPrint(("Can't allocate CCB\n")); PtrNewFileObject->FsContext2 = NULL; - // + // UDFInterlockedIncrement((PLONG)&(PtrNewFcb->ReferenceCount)); UDFInterlockedIncrement((PLONG)&(PtrNewFcb->NTRequiredFCB->CommonRefCount)); RC = STATUS_INSUFFICIENT_RESOURCES; diff --git a/drivers/filesystems/udfs/devcntrl.cpp b/drivers/filesystems/udfs/devcntrl.cpp index 004c1e83978..be6b5709188 100644 --- a/drivers/filesystems/udfs/devcntrl.cpp +++ b/drivers/filesystems/udfs/devcntrl.cpp @@ -340,7 +340,7 @@ UDFCommonDeviceControl( } else { Cdb = (PCDB)&(((PSCSI_PASS_THROUGH)(Irp->AssociatedIrp.SystemBuffer))->Cdb); if(((PSCSI_PASS_THROUGH)(Irp->AssociatedIrp.SystemBuffer))->DataBufferOffset) { - CdbData = ((PCHAR)Cdb) + + CdbData = ((PCHAR)Cdb) + ((PSCSI_PASS_THROUGH)(Irp->AssociatedIrp.SystemBuffer))->DataBufferOffset; } else { CdbData = NULL; @@ -544,7 +544,7 @@ notify_media_change: UserMode, (PVOID *) &UDFGlobalData.MountEvent, NULL); - + if (!NT_SUCCESS(RC)) { UDFGlobalData.MountEvent = NULL; @@ -585,7 +585,7 @@ notify_media_change: *(PBOOLEAN)Irp->AssociatedIrp.SystemBuffer = Vcb->IsVolumeJustMounted; Vcb->IsVolumeJustMounted = FALSE; } - + CompleteIrp = TRUE; Irp->IoStatus.Information = 0; break; @@ -682,7 +682,7 @@ notify_media_change: udf_ver->FSVersionMn = Vcb->CurrentUDFRev & 0xff; udf_ver->FSFlags = Vcb->UserFSFlags; if( ((Vcb->origIntegrityType == INTEGRITY_TYPE_OPEN) && - (Vcb->CompatFlags & UDF_VCB_IC_DIRTY_RO)) + (Vcb->CompatFlags & UDF_VCB_IC_DIRTY_RO)) || (Vcb->VCBFlags & UDF_VCB_FLAGS_VOLUME_READ_ONLY) ) { UDFPrint((" UDF_USER_FS_FLAGS_RO\n")); @@ -1046,7 +1046,7 @@ try_exit: NOTHING; * * Description: * Completion routine. -* +* * Expected Interrupt Level (for execution) : * * IRQL_PASSIVE_LEVEL @@ -1093,7 +1093,7 @@ UDFDevIoctlCompletion( * * Description: * Handle the MUP request. -* +* * Expected Interrupt Level (for execution) : * * IRQL_PASSIVE_LEVEL diff --git a/drivers/filesystems/udfs/dircntrl.cpp b/drivers/filesystems/udfs/dircntrl.cpp index e99d22ad866..26099e326a7 100644 --- a/drivers/filesystems/udfs/dircntrl.cpp +++ b/drivers/filesystems/udfs/dircntrl.cpp @@ -144,21 +144,21 @@ UDFCommonDirControl( // First, get a pointer to the current I/O stack location IrpSp = IoGetCurrentIrpStackLocation(Irp); ASSERT(IrpSp); - + FileObject = IrpSp->FileObject; ASSERT(FileObject); - + // Get the FCB and CCB pointers Ccb = (PtrUDFCCB)(FileObject->FsContext2); ASSERT(Ccb); Fcb = Ccb->Fcb; ASSERT(Fcb); - + Vcb = (PVCB)(PtrIrpContext->TargetDeviceObject->DeviceExtension); ASSERT(Vcb); ASSERT(Vcb->NodeIdentifier.NodeType == UDF_NODE_TYPE_VCB); // Vcb->VCBFlags |= UDF_VCB_SKIP_EJECT_CHECK; - + UDFFlushTryBreak(Vcb); UDFAcquireResourceShared(&(Vcb->VCBResource), TRUE); AcquiredVcb = TRUE; @@ -175,10 +175,10 @@ UDFCommonDirControl( RC = STATUS_INVALID_DEVICE_REQUEST; Irp->IoStatus.Status = RC; Irp->IoStatus.Information = 0; - + // Free up the Irp Context UDFReleaseIrpContext(PtrIrpContext); - + // complete the IRP IoCompleteRequest(Irp, IO_NO_INCREMENT); break; @@ -299,7 +299,7 @@ UDFQueryDirectory( // Calculate baselength (without name) for each InfoClass switch (FileInformationClass) { - + case FileDirectoryInformation: BaseLength = FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[0] ); break; @@ -307,7 +307,7 @@ UDFQueryDirectory( BaseLength = FIELD_OFFSET( FILE_FULL_DIR_INFORMATION, FileName[0] ); break; case FileNamesInformation: - BaseLength = FIELD_OFFSET( FILE_NAMES_INFORMATION, FileName[0] ); + BaseLength = FIELD_OFFSET( FILE_NAMES_INFORMATION, FileName[0] ); break; case FileBothDirectoryInformation: BaseLength = FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[0] ); @@ -315,7 +315,7 @@ UDFQueryDirectory( default: try_return(RC = STATUS_INVALID_INFO_CLASS); } - + // Some additional arguments that affect the FSD behavior ReturnSingleEntry = (IrpSp->Flags & SL_RETURN_SINGLE_ENTRY) ? TRUE : FALSE; @@ -532,7 +532,7 @@ UDFQueryDirectory( case FileBothDirectoryInformation: case FileFullDirectoryInformation: case FileDirectoryInformation: - + BothDirInformation = (PFILE_BOTH_DIR_INFORMATION)(Buffer + CurrentOffset); RtlCopyMemory(BothDirInformation,DirInformation,BaseLength); BothDirInformation->FileIndex = NextMatch; @@ -647,7 +647,7 @@ UDFFindNextMatch( (!CanBe8dot3 || ((DirNdx->hashes.hDos != hashes->hLfn) && (DirNdx->hashes.hDos != hashes->hPosix))) ) continue; if(UDFIsNameInExpression(Vcb, &(DirNdx->FName),PtrSearchPattern, NULL,IgnoreCase, - ContainsWC, CanBe8dot3 && !(DirNdx->FI_Flags & UDF_FI_FLAG_DOS), + ContainsWC, CanBe8dot3 && !(DirNdx->FI_Flags & UDF_FI_FLAG_DOS), EntryNumber < 2) && !(DirNdx->FI_Flags & UDF_FI_FLAG_FI_INTERNAL)) break; diff --git a/drivers/filesystems/udfs/dldetect.cpp b/drivers/filesystems/udfs/dldetect.cpp index abd299a355a..ca8e8a4d329 100644 --- a/drivers/filesystems/udfs/dldetect.cpp +++ b/drivers/filesystems/udfs/dldetect.cpp @@ -25,12 +25,12 @@ #define UDF_BUG_CHECK_ID UDF_FILE_DLD -/// Resource event (ExclusiveWaiters) -#define RESOURCE_EVENT_TAG 'vEeR' +/// Resource event (ExclusiveWaiters) +#define RESOURCE_EVENT_TAG 'vEeR' /// Resource semaphore (SharedWaiters) -#define RESOURCE_SEMAFORE_TAG 'eSeR' +#define RESOURCE_SEMAFORE_TAG 'eSeR' /// Resource owner table (OwnerTable) -#define RESOURCE_TABLE_TAG 'aTeR' +#define RESOURCE_TABLE_TAG 'aTeR' /// Maxmum recurse level while exploring thread-resource aquisition graf #define DLD_MAX_REC_LEVEL 40 @@ -39,11 +39,11 @@ ULONG MaxThreadCount = 0; /// Waiters table -PTHREAD_STRUCT DLDThreadTable; +PTHREAD_STRUCT DLDThreadTable; /// 4 sec -LARGE_INTEGER DLDpTimeout; +LARGE_INTEGER DLDpTimeout; /// 8 sec -ULONG DLDpResourceTimeoutCount = 0x2; +ULONG DLDpResourceTimeoutCount = 0x2; THREAD_REC_BLOCK DLDThreadAcquireChain[DLD_MAX_REC_LEVEL]; @@ -102,11 +102,11 @@ PTHREAD_STRUCT DLDFindThread(ULONG ThreadId) { PTHREAD_STRUCT Temp = DLDThreadTable; ULONG FirstEmpty = -1; - + while (iThreadId == ThreadId) { return Temp; - } + } Temp++; i++; } @@ -114,7 +114,7 @@ PTHREAD_STRUCT DLDFindThread(ULONG ThreadId) { return NULL; } -BOOLEAN DLDProcessResource(PERESOURCE Resource, +BOOLEAN DLDProcessResource(PERESOURCE Resource, PTHREAD_STRUCT ThrdStruct, ULONG RecLevel); @@ -140,7 +140,7 @@ BOOLEAN DLDProcessThread(PTHREAD_STRUCT ThrdOwner, for (int j=RecLevel+1;j<=i;j++) { UDFPrint((" awaited by thread %x at (BugCheckId:%x:Line:%d) holding resource %x\n", DLDThreadAcquireChain[i].Thread->ThreadId, - DLDThreadAcquireChain[i].Thread->BugCheckId, + DLDThreadAcquireChain[i].Thread->BugCheckId, DLDThreadAcquireChain[i].Thread->Line, Resource)); } @@ -155,9 +155,9 @@ BOOLEAN DLDProcessThread(PTHREAD_STRUCT ThrdOwner, if (ThrdOwner->WaitingResource) { if (DLDProcessResource(ThrdOwner->WaitingResource, ThrdStruct,RecLevel)) { UDFPrint((" awaited by thread %x at (BugCheckId:%x:Line:%d) holding resource %x\n", - ThrdOwner->ThreadId, - ThrdOwner->BugCheckId, - ThrdOwner->Line, + ThrdOwner->ThreadId, + ThrdOwner->BugCheckId, + ThrdOwner->Line, Resource)); return TRUE; } @@ -190,7 +190,7 @@ BOOLEAN DLDProcessResource( PERESOURCE Resource, // resource to process // If only one owner - // Find thread owning this resource + // Find thread owning this resource if (Resource->Flag & ResourceOwnedExclusive) { ThreadOwner = DLDFindThread(Resource->OwnerThreads[0].OwnerThread); } else { @@ -198,7 +198,7 @@ BOOLEAN DLDProcessResource( PERESOURCE Resource, // resource to process } BOOLEAN Result = FALSE; - if (ThreadOwner) { + if (ThreadOwner) { Result = DLDProcessThread(ThreadOwner, ThrdStruct, Resource,RecLevel-1); } return Result; @@ -223,7 +223,7 @@ BOOLEAN DLDProcessResource( PERESOURCE Resource, // resource to process VOID DLDpWaitForResource( - IN PERESOURCE Resource, + IN PERESOURCE Resource, IN DISPATCHER_HEADER *DispatcherObject, IN PTHREAD_STRUCT ThrdStruct ) { @@ -242,24 +242,24 @@ VOID DLDpWaitForResource( UDFPrint((" which thread %x has tried to acquire at (BugCheckId:%x:Line:%d)\n", ThrdStruct->ThreadId, ThrdStruct->BugCheckId, - ThrdStruct->Line + ThrdStruct->Line )); BrutePoint(); } - } + } // Priority boosts // ..... // End of priority boosts KeReleaseSpinLock(&Resource->SpinLock, oldIrql); } -} +} VOID DLDpAcquireResourceExclusiveLite( - IN PERESOURCE Resource, + IN PERESOURCE Resource, IN ERESOURCE_THREAD Thread, IN KIRQL oldIrql, IN ULONG BugCheckId, @@ -268,7 +268,7 @@ VOID DLDpAcquireResourceExclusiveLite( KIRQL oldIrql2; if (!(Resource->ExclusiveWaiters)) { - + KeReleaseSpinLock(&Resource->SpinLock, oldIrql); KeAcquireSpinLock(&Resource->SpinLock, &oldIrql2); @@ -276,7 +276,7 @@ VOID DLDpAcquireResourceExclusiveLite( if (!(Resource->ExclusiveWaiters)) { Resource->ExclusiveWaiters = (PKEVENT)ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT),RESOURCE_EVENT_TAG); KeInitializeEvent(Resource->ExclusiveWaiters,SynchronizationEvent,FALSE); - } + } KeReleaseSpinLock(&Resource->SpinLock, oldIrql2); DLDAcquireExclusive(Resource,BugCheckId,Line); @@ -285,7 +285,7 @@ VOID DLDpAcquireResourceExclusiveLite( PTHREAD_STRUCT ThrdStruct = DLDAllocFindThread(Thread); - + // Set WaitingResource for current thread ThrdStruct->WaitingResource = Resource; ThrdStruct->BugCheckId = BugCheckId; @@ -310,7 +310,7 @@ VOID DLDpAcquireResourceExclusiveLite( -VOID DLDAcquireExclusive(PERESOURCE Resource, +VOID DLDAcquireExclusive(PERESOURCE Resource, ULONG BugCheckId, ULONG Line ) { @@ -318,7 +318,7 @@ VOID DLDAcquireExclusive(PERESOURCE Resource, KIRQL oldIrql; KeAcquireSpinLock(&Resource->SpinLock, &oldIrql); - + ERESOURCE_THREAD Thread = (ERESOURCE_THREAD)PsGetCurrentThread(); if (!Resource->ActiveCount) goto SimpleAcquire; @@ -328,7 +328,7 @@ VOID DLDAcquireExclusive(PERESOURCE Resource, return; } - DLDpAcquireResourceExclusiveLite(Resource, Thread, oldIrql,BugCheckId,Line); + DLDpAcquireResourceExclusiveLite(Resource, Thread, oldIrql,BugCheckId,Line); return; SimpleAcquire: @@ -346,7 +346,7 @@ POWNER_ENTRY DLDpFindCurrentThread( IN PERESOURCE Resource, IN ERESOURCE_THREAD Thread ) { - + if (Resource->OwnerThreads[0].OwnerThread == Thread) return &(Resource->OwnerThreads[0]); if (Resource->OwnerThreads[1].OwnerThread == Thread) return &(Resource->OwnerThreads[1]); @@ -374,7 +374,7 @@ POWNER_ENTRY DLDpFindCurrentThread( } else { // Grow OwnerTable - + USHORT OldSize = Resource->OwnerThreads[0].TableSize; USHORT NewSize = 3; if (OldSize) NewSize = OldSize + 4; @@ -395,7 +395,7 @@ POWNER_ENTRY DLDpFindCurrentThread( } -VOID DLDAcquireShared(PERESOURCE Resource, +VOID DLDAcquireShared(PERESOURCE Resource, ULONG BugCheckId, ULONG Line, BOOLEAN WaitForExclusive) @@ -415,7 +415,7 @@ VOID DLDAcquireShared(PERESOURCE Resource, Resource->OwnerThreads[1].OwnerCount = 1; KeReleaseSpinLock(&Resource->SpinLock, oldIrql); return; - } + } if (Resource->Flag & ResourceOwnedExclusive ) { if (Resource->OwnerThreads[0].OwnerThread == Thread) { @@ -441,7 +441,7 @@ VOID DLDAcquireShared(PERESOURCE Resource, pOwnerEntry->OwnerThread = Thread; pOwnerEntry->OwnerCount = 1; - Resource->ActiveCount++; + Resource->ActiveCount++; KeReleaseSpinLock(&Resource->SpinLock, oldIrql); return; @@ -462,7 +462,7 @@ VOID DLDAcquireShared(PERESOURCE Resource, ThrdStruct->WaitingResource = Resource; ThrdStruct->BugCheckId = BugCheckId; ThrdStruct->Line = Line; - + KeReleaseSpinLock(&Resource->SpinLock, oldIrql); DLDpWaitForResource(Resource,&(Resource->SharedWaiters->Header),ThrdStruct); diff --git a/drivers/filesystems/udfs/dldetect.h b/drivers/filesystems/udfs/dldetect.h index f95ea4d52b4..8de195d2f5d 100644 --- a/drivers/filesystems/udfs/dldetect.h +++ b/drivers/filesystems/udfs/dldetect.h @@ -37,16 +37,16 @@ Environment: VOID DLDInit(ULONG MaxThrdCount); -VOID DLDAcquireExclusive(PERESOURCE Resource, +VOID DLDAcquireExclusive(PERESOURCE Resource, ULONG BugCheckId, ULONG Line); -VOID DLDAcquireShared(PERESOURCE Resource, +VOID DLDAcquireShared(PERESOURCE Resource, ULONG BugCheckId, ULONG Line, BOOLEAN WaitForExclusive); -VOID DLDAcquireSharedStarveExclusive(PERESOURCE Resource, +VOID DLDAcquireSharedStarveExclusive(PERESOURCE Resource, ULONG BugCheckId, ULONG Line); diff --git a/drivers/filesystems/udfs/env_spec.cpp b/drivers/filesystems/udfs/env_spec.cpp index 9201815aeab..32dc56181c0 100644 --- a/drivers/filesystems/udfs/env_spec.cpp +++ b/drivers/filesystems/udfs/env_spec.cpp @@ -252,7 +252,7 @@ try_exit: NOTHING; #else UDFPrint(("UDFPhReadSynchronous() exit: %08X\n", RC)); #endif //MEASURE_IO_PERFORMANCE - + return(RC); } // end UDFPhReadSynchronous() @@ -413,7 +413,7 @@ try_exit: NOTHING; #else UDFPrint(("nUDFPhWriteSynchronous() exit: %08X\n", RC)); #endif //MEASURE_IO_PERFORMANCE - + return(RC); } // end UDFPhWriteSynchronous() @@ -500,7 +500,7 @@ UDFTSendIOCTL( Function: UDFPhSendIOCTL() Description: - UDF FSD will invoke this rotine to send IOCTL's to physical + UDF FSD will invoke this rotine to send IOCTL's to physical device Return Value: STATUS_SUCCESS/Error diff --git a/drivers/filesystems/udfs/fastio.cpp b/drivers/filesystems/udfs/fastio.cpp index f7f53b301a5..c80d93a4985 100644 --- a/drivers/filesystems/udfs/fastio.cpp +++ b/drivers/filesystems/udfs/fastio.cpp @@ -60,7 +60,7 @@ UDFFastIoCheckIfPossible( ASSERT(Ccb); Fcb = Ccb->Fcb; ASSERT(Fcb); - + // Validate that this is a fast-IO request to a regular file. // The UDF FSD for example, will not allow fast-IO requests // to volume objects, or to directories. @@ -79,13 +79,13 @@ UDFFastIoCheckIfPossible( } */ IoLength.QuadPart = Length; - + // The FSD can determine the checks that it needs to perform. // Typically, a FSD will check whether there exist any byte-range // locks that would prevent a fast-IO operation from proceeding. - + // ... (FSD specific checks go here). - + if (CheckForReadOperation) { // The following routine is exported by the FSRTL // package and it returns TRUE if the read operation should be @@ -104,7 +104,7 @@ UDFFastIoCheckIfPossible( FileOffset, &IoLength, LockKey, FileObject, PsGetCurrentProcess()); } - + MmPrint((" UDFFastIoCheckIfPossible() %s\n", ReturnedStatus ? "TRUE" : "FALSE")); return(ReturnedStatus); // return FALSE; @@ -223,7 +223,7 @@ try_exit: NOTHING; IoStatus->Information = 0; } } _SEH2_END; - + FsRtlExitFileSystem(); return(ReturnedStatus); @@ -280,7 +280,7 @@ UDFFastIoQueryStdInfo( // NtReqFcb = Fcb->NTRequiredFCB; //Fcb->Vcb->VCBFlags |= UDF_VCB_SKIP_EJECT_CHECK; -/* +/* if (!(Fcb->FCBFlags & UDF_FCB_PAGE_FILE)) { // Acquire the MainResource shared. UDF_CHECK_PAGING_IO_RESOURCE(NtReqFcb); @@ -302,7 +302,7 @@ UDFFastIoQueryStdInfo( } _SEH2_END; //try_exit: NOTHING; } _SEH2_FINALLY { -/* +/* if (MainResourceAcquired) { UDFReleaseResource(&(NtReqFcb->MainResource)); MainResourceAcquired = FALSE; @@ -315,7 +315,7 @@ UDFFastIoQueryStdInfo( IoStatus->Information = 0; } } _SEH2_END; - + FsRtlExitFileSystem(); return(ReturnedStatus); @@ -344,7 +344,7 @@ UDFFastIoAcqCreateSec( ) { PtrUDFNTRequiredFCB NtReqFcb = (PtrUDFNTRequiredFCB)(FileObject->FsContext); - + MmPrint((" AcqForCreateSection()\n")); // Acquire the MainResource exclusively for the file stream if(!ExIsResourceAcquiredExclusiveLite(&(NtReqFcb->MainResource)) || @@ -388,7 +388,7 @@ UDFFastIoRelCreateSec( IN PFILE_OBJECT FileObject) { PtrUDFNTRequiredFCB NtReqFcb = (PtrUDFNTRequiredFCB)(FileObject->FsContext); - + MmPrint((" RelFromCreateSection()\n")); NtReqFcb->AcqSectionCount--; @@ -664,7 +664,7 @@ try_exit: NOTHING; IoStatus->Information = 0; } } _SEH2_END; - + FsRtlExitFileSystem(); return(ReturnedStatus); @@ -704,16 +704,16 @@ IN PDEVICE_OBJECT DeviceObject) _SEH2_TRY { _SEH2_TRY { - + // See description in UDFFastIoRead() before filling-in the // stub here. NOTHING; - - + + } __except (UDFExceptionFilter(PtrIrpContext, GetExceptionInformation())) { - + RC = UDFExceptionHandler(PtrIrpContext, NULL); - + UDFLogEvent(UDF_ERROR_INTERNAL_ERROR, RC); } @@ -723,7 +723,7 @@ IN PDEVICE_OBJECT DeviceObject) } _SEH2_FINALLY { } - + FsRtlExitFileSystem(); return(ReturnedStatus); @@ -760,15 +760,15 @@ IN PDEVICE_OBJECT DeviceObject) _SEH2_TRY { _SEH2_TRY { - + // See description in UDFFastIoRead() before filling-in the // stub here. NOTHING; - + } __except (UDFExceptionFilter(PtrIrpContext, GetExceptionInformation())) { - + RC = UDFExceptionHandler(PtrIrpContext, NULL); - + UDFLogEvent(UDF_ERROR_INTERNAL_ERROR, RC); } @@ -778,7 +778,7 @@ IN PDEVICE_OBJECT DeviceObject) } _SEH2_FINALLY { } - + FsRtlExitFileSystem(); return(ReturnedStatus); @@ -819,15 +819,15 @@ UDFFastIoPrepareMdlWrite( _SEH2_TRY { _SEH2_TRY { - + // See description in UDFFastIoRead() before filling-in the // stub here. NOTHING; - + } __except (UDFExceptionFilter(PtrIrpContext, GetExceptionInformation())) { - + RC = UDFExceptionHandler(PtrIrpContext, NULL); - + UDFLogEvent(UDF_ERROR_INTERNAL_ERROR, RC); } @@ -837,7 +837,7 @@ UDFFastIoPrepareMdlWrite( } _SEH2_FINALLY { } - + FsRtlExitFileSystem(); return(ReturnedStatus); @@ -875,15 +875,15 @@ IN PDEVICE_OBJECT DeviceObject) _SEH2_TRY { _SEH2_TRY { - + // See description in UDFFastIoRead() before filling-in the // stub here. NOTHING; - + } __except (UDFExceptionFilter(PtrIrpContext, GetExceptionInformation())) { - + RC = UDFExceptionHandler(PtrIrpContext, NULL); - + UDFLogEvent(UDF_ERROR_INTERNAL_ERROR, RC); } @@ -893,7 +893,7 @@ IN PDEVICE_OBJECT DeviceObject) } _SEH2_FINALLY { } - + FsRtlExitFileSystem(); return(ReturnedStatus); @@ -1048,7 +1048,7 @@ UDFFastIoAcqCcFlush( // Acquire appropriate resources that will allow correct synchronization // with a flush call (and avoid deadlock). - + #define NtReqFcb ((PtrUDFNTRequiredFCB)(FileObject->FsContext)) // UDFAcquireResourceExclusive(&(NtReqFcb->MainResource), TRUE); diff --git a/drivers/filesystems/udfs/fileinfo.cpp b/drivers/filesystems/udfs/fileinfo.cpp index 46fadac3983..68131502232 100644 --- a/drivers/filesystems/udfs/fileinfo.cpp +++ b/drivers/filesystems/udfs/fileinfo.cpp @@ -204,7 +204,7 @@ UDFCommonFileInfo( // buffer for query and set file information calls. // Copying information to/from the user buffer and the system // buffer is performed by the I/O Manager and the FSD need not worry about it. - PtrSystemBuffer = Irp->AssociatedIrp.SystemBuffer; + PtrSystemBuffer = Irp->AssociatedIrp.SystemBuffer; UDFFlushTryBreak(Vcb); if(!UDFAcquireResourceShared(&(Vcb->VCBResource), CanWait)) { @@ -292,7 +292,7 @@ UDFCommonFileInfo( !NT_SUCCESS(RC = UDFGetStandardInformation(Fcb, &(PtrAllInfo->StandardInformation), &BufferLength)) || !NT_SUCCESS(RC = UDFGetInternalInformation(PtrIrpContext, Fcb, Ccb, &(PtrAllInfo->InternalInformation), &BufferLength)) || !NT_SUCCESS(RC = UDFGetEaInformation(PtrIrpContext, Fcb, &(PtrAllInfo->EaInformation), &BufferLength)) || - !NT_SUCCESS(RC = UDFGetPositionInformation(FileObject, &(PtrAllInfo->PositionInformation), &BufferLength)) || + !NT_SUCCESS(RC = UDFGetPositionInformation(FileObject, &(PtrAllInfo->PositionInformation), &BufferLength)) || !NT_SUCCESS(RC = UDFGetFullNameInformation(FileObject, &(PtrAllInfo->NameInformation), &BufferLength)) ) try_return(RC); @@ -559,7 +559,7 @@ UDFGetBasicInformation( AdPrint(("!!!! GetBasicInfo to unopened file !!!!\n")); try_return(RC = STATUS_INVALID_PARAMETER); } - + DirNdx = UDFDirIndex(UDFGetDirIndexByFileInfo(FileInfo), FileInfo->Index); PtrBuffer->CreationTime = Fcb->NTRequiredFCB->CreationTime; @@ -1018,7 +1018,7 @@ UDFSetBasicInformation( { NTSTATUS RC = STATUS_SUCCESS; ULONG NotifyFilter = 0; - + AdPrint(("UDFSetBasicInformation\n")); _SEH2_TRY { @@ -1159,7 +1159,7 @@ UDFMarkStreamsForDeletion( UDFIsSDirDeleted(Fcb->FileInfo->Dloc->SDirInfo) || (UDFGetFileLinkCount(Fcb->FileInfo) > 1) ) try_return (RC /*=STATUS_SUCCESS*/); - + // We shall mark Streams for deletion if there is no // Links to the file. Otherwise we'll delete only the file. // If we are asked to unmark Streams, we'll precess the whole Tree @@ -1185,7 +1185,7 @@ UDFMarkStreamsForDeletion( // scan DirIndex UDFDirIndexInitScan(SDirInfo, &ScanContext, 2)) { - // Check if we can delete Streams + // Check if we can delete Streams while((DirNdx = UDFDirIndexScan(&ScanContext, &FileInfo))) { if(!FileInfo) continue; @@ -1701,7 +1701,7 @@ UDFSetEOF( NtReqFcb->CommonFCBHeader.FileSize.QuadPart); // Only advance the file size, never reduce it with this call RC = STATUS_SUCCESS; - if(UDFGetFileSizeFromDirNdx(Vcb, Fcb->FileInfo) >= + if(UDFGetFileSizeFromDirNdx(Vcb, Fcb->FileInfo) >= PtrBuffer->EndOfFile.QuadPart) try_return(RC); @@ -1770,7 +1770,7 @@ UDFSetEOF( UDFCloseFile__(Vcb, Fcb->FileInfo); UDFInterlockedDecrement((PLONG)&(Fcb->ReferenceCount)); UDFInterlockedDecrement((PLONG)&(NtReqFcb->CommonRefCount)); - + ModifiedAllocSize = TRUE; TruncatedFile = TRUE; } @@ -2000,7 +2000,7 @@ UDFRename( PDIR_INDEX_ITEM DirNdx; AdPrint(("UDFRename %8.8x\n", DirObject2)); - + LocalPath.Buffer = NULL; _SEH2_TRY { @@ -2093,9 +2093,9 @@ post_rename: // This name is by definition legal. NewName = *((PUNICODE_STRING)&DirObject2->FileName); } - + ic = (Ccb1->CCBFlags & UDF_CCB_CASE_SENSETIVE) ? FALSE : TRUE; - + AdPrint((" %ws ->\n %ws\n", Fcb1->FCBName->ObjectName.Buffer, NewName.Buffer)); @@ -2130,8 +2130,8 @@ post_rename: ASSERT(UDFDirIndex(File1->ParentFile->Dloc->DirIndex, File1->Index)->FileInfo == File1); - RC = MyCloneUnicodeString(&LocalPath, (Dir2->Fcb->FCBFlags & UDF_FCB_ROOT_DIRECTORY) ? - &UDFGlobalData.UnicodeStrRoot : + RC = MyCloneUnicodeString(&LocalPath, (Dir2->Fcb->FCBFlags & UDF_FCB_ROOT_DIRECTORY) ? + &UDFGlobalData.UnicodeStrRoot : &(Dir2->Fcb->FCBName->ObjectName) ); if(!NT_SUCCESS(RC)) try_return (RC); // RC = MyAppendUnicodeStringToString(&LocalPath, (Dir2->Fcb->FCBFlags & UDF_FCB_ROOT_DIRECTORY) ? &(UDFGlobalData.UnicodeStrRoot) : &(Dir2->Fcb->FCBName->ObjectName)); @@ -2595,7 +2595,7 @@ UDFHardLink( // This name is by definition legal. NewName = *((PUNICODE_STRING)&DirObject2->FileName); } - + ic = (Ccb1->CCBFlags & UDF_CCB_CASE_SENSETIVE) ? FALSE : TRUE; AdPrint((" %ws ->\n %ws\n", diff --git a/drivers/filesystems/udfs/filter.cpp b/drivers/filesystems/udfs/filter.cpp index 85b755cb891..856351ac7f6 100644 --- a/drivers/filesystems/udfs/filter.cpp +++ b/drivers/filesystems/udfs/filter.cpp @@ -94,10 +94,10 @@ UDFCheckOtherFSByName(PCWSTR DeviceObjectName) { &fileObject, &deviceObject ); - + if (!NT_SUCCESS(RC)) { UDFPrint(("UDFCheckOtherFSByName: error %x while calling IoGetDeviceObjectPointer \n",RC)); - return; + return; } UDFCheckOtherFS(deviceObject); diff --git a/drivers/filesystems/udfs/fscntrl.cpp b/drivers/filesystems/udfs/fscntrl.cpp index d18ae74e9b0..de0d89d9048 100644 --- a/drivers/filesystems/udfs/fscntrl.cpp +++ b/drivers/filesystems/udfs/fscntrl.cpp @@ -30,7 +30,7 @@ PDIR_INDEX_HDR UDFDirIndexAlloc(IN uint_di i); Function: UDFFSControl() Description: - The I/O Manager will invoke this routine to handle a File System + The I/O Manager will invoke this routine to handle a File System Control request (this is IRP_MJ_FILE_SYSTEM_CONTROL dispatch point) */ @@ -96,7 +96,7 @@ UDFFSControl( to be deferred to a worker thread context) Return Value: STATUS_SUCCESS/Error -*/ +*/ NTSTATUS NTAPI @@ -117,24 +117,24 @@ UDFCommonFSControl( IrpSp = IoGetCurrentIrpStackLocation(Irp); ASSERT(IrpSp); - switch ((IrpSp)->MinorFunction) + switch ((IrpSp)->MinorFunction) { case IRP_MN_USER_FS_REQUEST: UDFPrint((" UDFFSControl: UserFsReq request ....\n")); - + RC = UDFUserFsCtrlRequest(PtrIrpContext,Irp); break; case IRP_MN_MOUNT_VOLUME: UDFPrint((" UDFFSControl: MOUNT_VOLUME request ....\n")); - + RC = UDFMountVolume(PtrIrpContext,Irp); break; case IRP_MN_VERIFY_VOLUME: UDFPrint((" UDFFSControl: VERIFY_VOLUME request ....\n")); - RC = UDFVerifyVolume(Irp); + RC = UDFVerifyVolume(Irp); break; default: UDFPrintErr((" UDFFSControl: STATUS_INVALID_DEVICE_REQUEST MinorFunction %x\n", (IrpSp)->MinorFunction)); @@ -146,7 +146,7 @@ UDFCommonFSControl( IoCompleteRequest(Irp, IO_DISK_INCREMENT); break; } - + //try_exit: NOTHING; } _SEH2_FINALLY { if (!_SEH2_AbnormalTermination()) { @@ -295,7 +295,7 @@ UDFUserFsCtrlRequest( IoCompleteRequest(Irp,IO_DISK_INCREMENT); return RC; - + } // end UDFUserFsCtrlRequest() @@ -401,7 +401,7 @@ UDFMountVolume( _SEH2_TRY { UDFScanForDismountedVcb(PtrIrpContext); - + if(WrongMedia) try_return(RC = STATUS_UNRECOGNIZED_VOLUME); if(RemovableMedia) { @@ -450,7 +450,7 @@ UDFMountVolume( KeDelayExecutionThread(KernelMode, FALSE, &delay); } } - + // Now we can get device state via GET_EVENT (if supported) // or still one TEST_UNIT_READY command RC = UDFPhSendIOCTL( IOCTL_STORAGE_CHECK_VERIFY, @@ -458,7 +458,7 @@ UDFMountVolume( NULL,0, &MediaChangeCount,sizeof(ULONG), FALSE,&Iosb ); - + if(RC == STATUS_IO_DEVICE_ERROR) { UDFPrint(("UDFMountVolume: retry check verify\n")); RC = UDFPhSendIOCTL( IOCTL_STORAGE_CHECK_VERIFY, @@ -750,7 +750,7 @@ try_raw_mount: Vcb->IsVolumeJustMounted = TRUE; KeSetEvent(UDFGlobalData.MountEvent, 0, FALSE); } - + // The new mount is complete. UDFReleaseResource( &(Vcb->VCBResource) ); VcbAcquired = FALSE; @@ -1182,7 +1182,7 @@ unwind_3: /* Vcb->CDBurnerVolumeValid = true; - len = + len = Vcb->CDBurnerVolume.Length = 256; Vcb->CDBurnerVolume.MaximumLength = 256; Vcb->CDBurnerVolume.Buffer = (PWCHAR)ExAllocatePool(NonPagedPool, 256); @@ -1468,7 +1468,7 @@ UDFCleanupVCB( DbgFreePool(Vcb->FSBM_OldBitmap); Vcb->FSBM_OldBitmap = NULL; } - + MyFreeMemoryAndPointer(Vcb->Statistics); MyFreeMemoryAndPointer(Vcb->NTRequiredFCB); MyFreeMemoryAndPointer(Vcb->VolIdent.Buffer); @@ -1488,7 +1488,7 @@ UDFCleanupVCB( MyFreeMemoryAndPointer(Vcb->WParams); MyFreeMemoryAndPointer(Vcb->Error); MyFreeMemoryAndPointer(Vcb->TrackMap); - + } // end UDFCleanupVCB() /* @@ -1517,7 +1517,7 @@ UDFScanForDismountedVcb( // Walk through all of the Vcb's attached to the global data. Link = UDFGlobalData.VCBQueue.Flink; - + while (Link != &(UDFGlobalData.VCBQueue)) { Vcb = CONTAINING_RECORD( Link, VCB, NextVCB ); @@ -1690,7 +1690,7 @@ UDFIsPathnameValid( CurName.Buffer = PathName.Buffer - CurName.Length; CurName.Length *= sizeof(WCHAR); CurName.MaximumLength -= CurName.Length; - + if (CurName.Length) { // check path fragment size if (CurName.Length > UDF_NAME_LEN*sizeof(WCHAR)) { @@ -1702,7 +1702,7 @@ UDFIsPathnameValid( } else { try_return(RC = STATUS_SUCCESS); } - } + } try_exit: NOTHING; } _SEH2_FINALLY { Irp->IoStatus.Information = 0; @@ -1840,7 +1840,7 @@ UDFLockVolume( if(!NT_SUCCESS(RC)) { UDFNotifyVolumeEvent(IrpSp->FileObject, FSRTL_VOLUME_LOCK_FAILED); } - + // Complete the request if there haven't been any exceptions. Irp->IoStatus.Information = 0; Irp->IoStatus.Status = RC; diff --git a/drivers/filesystems/udfs/misc.cpp b/drivers/filesystems/udfs/misc.cpp index 8aad9e79a82..c9285c5edc7 100644 --- a/drivers/filesystems/udfs/misc.cpp +++ b/drivers/filesystems/udfs/misc.cpp @@ -474,7 +474,7 @@ UDFExceptionHandler( // if (FlagOn( PtrIrpContext->IrpContextFlags, UDF_IRP_CONTEXT_FLAG_DISABLE_POPUPS )) { - + UDFPrint((" DISABLE_POPUPS, complete Irp and return\n")); Irp->IoStatus.Status = ExceptionCode; Irp->IoStatus.Information = 0; @@ -544,7 +544,7 @@ UDFExceptionHandler( // set the error code in the IRP Irp->IoStatus.Status = ExceptionCode; Irp->IoStatus.Information = 0; - + // complete the IRP IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -666,7 +666,7 @@ UDFAllocateObjectName(VOID) * *************************************************************************/ VOID -__fastcall +__fastcall UDFReleaseObjectName( PtrUDFObjectName PtrObjectName) { @@ -764,7 +764,7 @@ UDFAllocateCCB(VOID) * *************************************************************************/ VOID -__fastcall +__fastcall UDFReleaseCCB( PtrUDFCCB Ccb ) @@ -788,20 +788,20 @@ UDFReleaseCCB( } // end UDFReleaseCCB() /* - Function: UDFCleanupCCB() - - Description: - Cleanup and deallocate a previously allocated structure. - - Expected Interrupt Level (for execution) : - - IRQL_PASSIVE_LEVEL - - Return Value: None + Function: UDFCleanupCCB() + + Description: + Cleanup and deallocate a previously allocated structure. + + Expected Interrupt Level (for execution) : + + IRQL_PASSIVE_LEVEL + + Return Value: None */ VOID -__fastcall +__fastcall UDFCleanUpCCB( PtrUDFCCB Ccb) { @@ -904,7 +904,7 @@ UDFReleaseFCB( * *************************************************************************/ VOID -__fastcall +__fastcall UDFCleanUpFCB( PtrUDFFCB Fcb ) @@ -997,7 +997,7 @@ UDFAllocateIrpContext( if (!ExIsFullZone(&(UDFGlobalData.IrpContextZoneHeader))) { // we have enough memory PtrIrpContext = (PtrUDFIrpContext)ExAllocateFromZone(&(UDFGlobalData.IrpContextZoneHeader)); - + // release the spinlock KeReleaseSpinLock(&(UDFGlobalData.ZoneAllocationSpinLock), CurrentIrql); } else { @@ -1337,7 +1337,7 @@ UDFCommonDispatch( // This is the case where we have an invalid major function Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; Irp->IoStatus.Information = 0; - + IoCompleteRequest(Irp, IO_NO_INCREMENT); // Free up the Irp Context UDFReleaseIrpContext(PtrIrpContext); @@ -1577,7 +1577,7 @@ UDFInitializeVCB( //ASSERT(Vcb->PtrStreamFileObject); // Initialize some important fields in the newly created file object. - //Vcb->PtrStreamFileObject->FsContext = (PVOID)Vcb; + //Vcb->PtrStreamFileObject->FsContext = (PVOID)Vcb; //Vcb->PtrStreamFileObject->FsContext2 = NULL; //Vcb->PtrStreamFileObject->SectionObjectPointer = &(Vcb->SectionObject); @@ -1657,7 +1657,7 @@ read_reg: try_exit: NOTHING; } _SEH2_FINALLY { - + if(!NT_SUCCESS(RC)) { if(Vcb->TargetDevName.Buffer) MyFreePool__(Vcb->TargetDevName.Buffer); @@ -1730,7 +1730,7 @@ UDFGetMediaClass( Vcb->MediaClassEx == CdMediaClass_BDRE) { return MediaDvdrw; } - // + // if(Vcb->MediaClassEx == CdMediaClass_CDROM || Vcb->MediaClassEx == CdMediaClass_DVDROM || Vcb->MediaClassEx == CdMediaClass_HD_DVDROM || @@ -1752,7 +1752,7 @@ UDFGetMediaClass( typedef ULONG (*ptrUDFGetParameter)( - IN PVCB Vcb, + IN PVCB Vcb, IN PCWSTR Name, IN ULONG DefValue ); @@ -1785,7 +1785,7 @@ UDFReadRegKeys( { ULONG mult = 1; ptrUDFGetParameter UDFGetParameter = UseCfg ? UDFGetCfgParameter : UDFGetRegParameter; - + Vcb->DefaultRegName = UDFMediaClassName[(ULONG)UDFGetMediaClass(Vcb)].ClassName; // Should we use Extended FE by default ? @@ -1898,7 +1898,7 @@ UDFReadRegKeys( UDFUpdateCompatOption(Vcb, Update, UseCfg, UDF_OS_NATIVE_DOS_NAME, UDF_VCB_IC_OS_NATIVE_DOS_NAME, FALSE); #ifndef UDF_READ_ONLY_BUILD // should we force FO_WRITE_THROUGH on removable media - UDFUpdateCompatOption(Vcb, Update, UseCfg, UDF_FORCE_WRITE_THROUGH_NAME, UDF_VCB_IC_FORCE_WRITE_THROUGH, + UDFUpdateCompatOption(Vcb, Update, UseCfg, UDF_FORCE_WRITE_THROUGH_NAME, UDF_VCB_IC_FORCE_WRITE_THROUGH, (Vcb->TargetDeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) ? TRUE : FALSE ); #endif //UDF_READ_ONLY_BUILD @@ -1984,7 +1984,7 @@ UDFReadRegKeys( ULONG UDFGetRegParameter( - IN PVCB Vcb, + IN PVCB Vcb, IN PCWSTR Name, IN ULONG DefValue ) @@ -1998,7 +1998,7 @@ UDFGetRegParameter( ULONG UDFGetCfgParameter( - IN PVCB Vcb, + IN PVCB Vcb, IN PCWSTR Name, IN ULONG DefValue ) @@ -2077,7 +2077,7 @@ UDFGetCfgParameter( wait_nl = FALSE; wait_val = TRUE; i+=len; - + } else { wait_nl = TRUE; } @@ -2258,7 +2258,7 @@ UDFRegCheckParameterValue( RtlInitUnicodeString(¶mPathUnknownStr, REG_DEFAULT_UNKNOWN); RtlInitUnicodeString(¶mPathUnknown, NULL); - + paramPathUnknown.MaximumLength = RegistryPath->Length + paramPathUnknownStr.Length + paramStr.Length + sizeof(WCHAR); paramPath.MaximumLength = RegistryPath->Length + paramStr.Length + sizeof(WCHAR); diff --git a/drivers/filesystems/udfs/ntifs_ex.h b/drivers/filesystems/udfs/ntifs_ex.h index bc6832a844d..4f97a2b421c 100644 --- a/drivers/filesystems/udfs/ntifs_ex.h +++ b/drivers/filesystems/udfs/ntifs_ex.h @@ -229,18 +229,18 @@ RtlInitializeSid ( #if 0 -typedef struct _TOKEN_OWNER { // to - PSID Owner; -} TOKEN_OWNER; - -typedef struct _TOKEN_PRIMARY_GROUP { // tpg - PSID PrimaryGroup; -} TOKEN_PRIMARY_GROUP; +typedef struct _TOKEN_OWNER { // to + PSID Owner; +} TOKEN_OWNER; + +typedef struct _TOKEN_PRIMARY_GROUP { // tpg + PSID PrimaryGroup; +} TOKEN_PRIMARY_GROUP; #endif #endif //WIN64 - + // The following macro is used to detemine if the file object is opened // for read only access (i.e., it is not also opened for write access or // delete access). @@ -252,7 +252,7 @@ typedef struct _TOKEN_PRIMARY_GROUP { // tpg #define IsFileObjectReadOnly(FO) (!((FO)->WriteAccess | (FO)->DeleteAccess)) -// +// #ifndef FSCTL_GET_COMPRESSION #define FSCTL_GET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -335,12 +335,12 @@ NTSTATUS NTAPI ZwFsControlFile( IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG IoControlCode, - IN PVOID InputBuffer, + IN PVOID InputBuffer, IN ULONG InputBufferSize, OUT PVOID OutputBuffer, IN ULONG OutputBufferSize @@ -351,12 +351,12 @@ NTSTATUS NTAPI ZwDeviceIoControlFile( IN HANDLE DeviceHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, - IN PVOID UserApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE UserApcRoutine OPTIONAL, + IN PVOID UserApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG IoControlCode, - IN PVOID InputBuffer, + IN PVOID InputBuffer, IN ULONG InputBufferSize, OUT PVOID OutputBuffer, IN ULONG OutputBufferSize @@ -377,12 +377,12 @@ ZwQueryVolumeInformationFile( #ifndef FILE_ATTRIBUTE_SPARSE_FILE -#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200 -#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400 -#define FILE_ATTRIBUTE_COMPRESSED 0x00000800 -#define FILE_ATTRIBUTE_OFFLINE 0x00001000 -#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000 -#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000 +#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200 +#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400 +#define FILE_ATTRIBUTE_COMPRESSED 0x00000800 +#define FILE_ATTRIBUTE_OFFLINE 0x00001000 +#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000 +#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000 #endif //FILE_ATTRIBUTE_SPARSE_FILE diff --git a/drivers/filesystems/udfs/pnp.cpp b/drivers/filesystems/udfs/pnp.cpp index fa24c84a3e3..fd22d04da66 100644 --- a/drivers/filesystems/udfs/pnp.cpp +++ b/drivers/filesystems/udfs/pnp.cpp @@ -101,7 +101,7 @@ UDFPnp ( // We expect there to never be a fileobject, in which case we will always // wait. Since at the moment we don't have any concept of pending Pnp // operations, this is a bit nitpicky. - + // get an IRP context structure and issue the request PtrIrpContext = UDFAllocateIrpContext(Irp, DeviceObject); if(PtrIrpContext) { @@ -174,14 +174,14 @@ UDFCommonPnp ( // Force everything to wait. PtrIrpContext->IrpContextFlags |= UDF_IRP_CONTEXT_CAN_BLOCK; - + // Case on the minor code. switch ( IrpSp->MinorFunction ) { case IRP_MN_QUERY_REMOVE_DEVICE: RC = UDFPnpQueryRemove( PtrIrpContext, Irp, Vcb ); break; - + case IRP_MN_SURPRISE_REMOVAL: RC = UDFPnpSurpriseRemove( PtrIrpContext, Irp, Vcb ); break; @@ -201,7 +201,7 @@ UDFCommonPnp ( IoSkipCurrentIrpStackLocation( Irp ); RC = IoCallDriver(Vcb->TargetDeviceObject, Irp); ASSERT(RC != STATUS_PENDING); - + break; } @@ -221,7 +221,7 @@ Routine Description: is responsible for answering whether there are any reasons it sees that the volume can not go away (and the device removed). Initiation of the dismount begins when we answer yes to this question. - + Query will be followed by a Cancel or Remove. Arguments: @@ -339,7 +339,7 @@ UDFPnpQueryRemove( ASSERT( !(NT_SUCCESS( RC ) && !VcbDeleted )); } _SEH2_FINALLY { - + if (!VcbDeleted && VcbAcquired) { UDFReleaseResource( &(Vcb->VCBResource) ); } @@ -367,7 +367,7 @@ Routine Description: that the underlying storage device for the volume we have is gone, and an excellent indication that the volume will never reappear. The filesystem is responsible for initiation or completion of the dismount. - + Arguments: Irp - Supplies the Irp to process Vcb - Supplies the volume being removed. @@ -388,7 +388,7 @@ UDFPnpRemove ( BOOLEAN VcbDeleted; BOOLEAN VcbAcquired; PPREVENT_MEDIA_REMOVAL_USER_IN Buf = NULL; - + // REMOVE - a storage device is now gone. We either got // QUERY'd and said yes OR got a SURPRISE OR a storage // stack failed to spin back up from a sleep/stop state @@ -407,7 +407,7 @@ UDFPnpRemove ( #ifdef UDF_DELAYED_CLOSE UDFCloseAllDelayed(Vcb); #endif //UDF_DELAYED_CLOSE - + UDFAcquireResourceExclusive(&(Vcb->VCBResource),TRUE); VcbAcquired = TRUE; @@ -424,7 +424,7 @@ UDFPnpRemove ( // We need to pass this down before starting the dismount, which // could disconnect us immediately from the stack. - + // Get the next stack location, and copy over the stack location IoCopyCurrentIrpStackLocationToNext( Irp ); @@ -452,7 +452,7 @@ UDFPnpRemove ( } _SEH2_TRY { - + // Knock as many files down for this volume as we can. // Now make our dismount happen. This may not vaporize the @@ -499,7 +499,7 @@ try_exit: NOTHING; return RC; } - + NTSTATUS UDFPnpSurpriseRemove ( PtrUDFIrpContext PtrIrpContext, @@ -515,17 +515,17 @@ Routine Description: type of notification that the underlying storage device for the volume we have is gone, and is excellent indication that the volume will never reappear. The filesystem is responsible for initiation or completion the dismount. - + For the most part, only "real" drivers care about the distinction of a surprise remove, which is a result of our noticing that a user (usually) physically reached into the machine and pulled something out. - + Surprise will be followed by a Remove when all references have been shut down. Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being removed. Return Value: @@ -540,10 +540,10 @@ Return Value: BOOLEAN VcbDeleted; BOOLEAN VcbAcquired; PPREVENT_MEDIA_REMOVAL_USER_IN Buf = NULL; - + // SURPRISE - a device was physically yanked away without // any warning. This means external forces. - + UDFAcquireResourceExclusive(&(UDFGlobalData.GlobalDataResource), TRUE); if(!(Vcb->VCBFlags & UDF_VCB_FLAGS_RAW_DISK)) @@ -551,13 +551,13 @@ Return Value: #ifdef UDF_DELAYED_CLOSE UDFCloseAllDelayed(Vcb); #endif //UDF_DELAYED_CLOSE - + UDFAcquireResourceExclusive(&(Vcb->VCBResource),TRUE); VcbAcquired = TRUE; - + // We need to pass this down before starting the dismount, which // could disconnect us immediately from the stack. - + // Get the next stack location, and copy over the stack location IoCopyCurrentIrpStackLocationToNext( Irp ); @@ -583,7 +583,7 @@ Return Value: RC = Irp->IoStatus.Status; } - + _SEH2_TRY { // Knock as many files down for this volume as we can. Vcb->Vpb->RealDevice->Flags |= DO_VERIFY_VOLUME; @@ -593,7 +593,7 @@ Return Value: VcbDeleted = FALSE; try_return(RC = STATUS_INSUFFICIENT_RESOURCES); } - + UDFDoDismountSequence(Vcb, Buf, FALSE); Vcb->VCBFlags &= ~UDF_VCB_FLAGS_VOLUME_MOUNTED; Vcb->WriteSecurity = FALSE; @@ -611,7 +611,7 @@ Return Value: try_exit: NOTHING; } _SEH2_FINALLY { - + // Release the Vcb if it could still remain. if (!VcbDeleted && VcbAcquired) { UDFReleaseResource(&(Vcb->VCBResource)); @@ -650,11 +650,11 @@ Routine Description: notification that a previously proposed remove (query) was eventually vetoed by a component. The filesystem is responsible for cleaning up and getting ready for more IO. - + Arguments: Irp - Supplies the Irp to process - + Vcb - Supplies the volume being removed. Return Value: @@ -679,9 +679,9 @@ Return Value: // after the disconnect we'd be thoroughly unsynchronized // with respect to the Vcb getting torn apart - merely referencing // the volume device object is insufficient to keep us intact. - + UDFAcquireResourceExclusive(&(Vcb->VCBResource),TRUE); - + // Unlock the volume. This is benign if we never had seen // a QUERY. if(Vcb->Vpb->Flags & VPB_LOCKED) { @@ -694,14 +694,14 @@ Return Value: } try { - + // We must re-enable allocation support if we got through // the first stages of a QUERY_REMOVE; i.e., we decided we // could place a lock on the volume. if (NT_SUCCESS( RC )) { FatSetupAllocationSupport( PtrIrpContext, Vcb ); } - + } finally { UDFReleaseResource(&(Vcb->VCBResource)); } @@ -724,7 +724,7 @@ Return Value: return RC; } */ - + // Local support routine NTSTATUS NTAPI diff --git a/drivers/filesystems/udfs/protos.h b/drivers/filesystems/udfs/protos.h index 401b8645fd8..02224b12851 100644 --- a/drivers/filesystems/udfs/protos.h +++ b/drivers/filesystems/udfs/protos.h @@ -468,7 +468,7 @@ IN PVCB Vcb); *************************************************************************/ extern NTSTATUS NTAPI UDFFSControl( -PDEVICE_OBJECT DeviceObject, +PDEVICE_OBJECT DeviceObject, PIRP Irp); extern NTSTATUS NTAPI UDFCommonFSControl( @@ -657,13 +657,13 @@ UDFReadRegKeys( BOOLEAN UseCfg); extern ULONG UDFGetRegParameter( - IN PVCB Vcb, + IN PVCB Vcb, IN PCWSTR Name, IN ULONG DefValue = 0); extern ULONG UDFGetCfgParameter( - IN PVCB Vcb, + IN PVCB Vcb, IN PCWSTR Name, IN ULONG DefValue ); @@ -983,7 +983,7 @@ UDFDebugAcquireResourceExclusiveLite( ULONG BugCheckId, ULONG Line); -extern VOID +extern VOID UDFDebugReleaseResourceForThreadLite( IN PERESOURCE Resource, IN ERESOURCE_THREAD ResourceThreadId, diff --git a/drivers/filesystems/udfs/read.cpp b/drivers/filesystems/udfs/read.cpp index 088f9f6b629..27dff60e467 100644 --- a/drivers/filesystems/udfs/read.cpp +++ b/drivers/filesystems/udfs/read.cpp @@ -572,7 +572,7 @@ UDFCommonRead( } } } - + // Acquire the appropriate FCB resource shared if (PagingIo) { // Try to acquire the FCB PagingIoResource shared @@ -946,7 +946,7 @@ UDFLockCallersBuffer( UDFPrint(("UDFLockCallersBuffer: \n")); ASSERT(Irp); - + _SEH2_TRY { // Is a MDL already present in the IRP if (!(Irp->MdlAddress)) { diff --git a/drivers/filesystems/udfs/secursup.cpp b/drivers/filesystems/udfs/secursup.cpp index 8e4a5e0548e..a69e5f44567 100644 --- a/drivers/filesystems/udfs/secursup.cpp +++ b/drivers/filesystems/udfs/secursup.cpp @@ -354,7 +354,7 @@ UDFCommonSetSecurity( //DACL_SECURITY_INFORMATION if(IrpSp->Parameters.SetSecurity.SecurityInformation & DACL_SECURITY_INFORMATION) DesiredAccess |= WRITE_DAC; -//SACL_SECURITY_INFORMATION +//SACL_SECURITY_INFORMATION if(IrpSp->Parameters.SetSecurity.SecurityInformation & SACL_SECURITY_INFORMATION) DesiredAccess |= ACCESS_SYSTEM_SECURITY; @@ -963,7 +963,7 @@ UDFCheckAccessRights( treat_as_ro: #endif //UDF_READ_ONLY_BUILD ACCESS_MASK DesiredAccessMask = 0; - + if(Fcb->Vcb->CompatFlags & UDF_VCB_IC_WRITE_IN_RO_DIR) { if(Fcb->FCBFlags & UDF_FCB_DIRECTORY) { DesiredAccessMask = (FILE_WRITE_EA | diff --git a/drivers/filesystems/udfs/struct.h b/drivers/filesystems/udfs/struct.h index 837ff02c2f0..6a3b83ce114 100644 --- a/drivers/filesystems/udfs/struct.h +++ b/drivers/filesystems/udfs/struct.h @@ -445,7 +445,7 @@ typedef struct _UDFEjectWaitContext { KEVENT StopReq; PKEVENT WaiterStopped; WORK_QUEUE_ITEM EjectReqWorkQueueItem; - + GET_EVENT_USER_OUT EjectReqBuffer; UCHAR PaddingEvt[(0x40 - sizeof(GET_EVENT_USER_OUT)) & 0x0f]; diff --git a/drivers/filesystems/udfs/sys_spec.cpp b/drivers/filesystems/udfs/sys_spec.cpp index 633eebba678..e9a11ab1528 100644 --- a/drivers/filesystems/udfs/sys_spec.cpp +++ b/drivers/filesystems/udfs/sys_spec.cpp @@ -7,11 +7,11 @@ * * File: Sys_Spec.cpp * -* Module: UDF File System Driver +* Module: UDF File System Driver * (both User and Kernel mode execution) * * Description: -* Contains system-secific code +* Contains system-secific code * *************************************************************************/ diff --git a/drivers/filesystems/udfs/udf_dbg.cpp b/drivers/filesystems/udfs/udf_dbg.cpp index 9e474012948..29c26ce0d84 100644 --- a/drivers/filesystems/udfs/udf_dbg.cpp +++ b/drivers/filesystems/udfs/udf_dbg.cpp @@ -134,8 +134,8 @@ UDFDebugAcquireResourceExclusiveLite( #endif // USE_DLD - - + + if(Success) { #ifdef TRACK_RESOURCES UDFPrint(("Res:Exc:OK:Resource:%x:BugCheckId:%x:Line:%d:ThId:%x\n",Resource, @@ -150,10 +150,10 @@ UDFDebugAcquireResourceExclusiveLite( #endif // BrutePoint(); return FALSE; - + } -VOID +VOID UDFDebugReleaseResourceForThreadLite( IN PERESOURCE Resource, IN ERESOURCE_THREAD ResourceThreadId, @@ -174,7 +174,7 @@ UDFDebugReleaseResourceForThreadLite( AcqCounter--; } -VOID +VOID UDFDebugDeleteResource( IN PERESOURCE Resource, IN ERESOURCE_THREAD ResourceThreadId, @@ -293,7 +293,7 @@ UDFDebugAcquireSharedWaitForExclusive( #endif // BrutePoint(); return FALSE; - + } @@ -420,8 +420,8 @@ DebugAllocatePool( AllocCountNPaged += (size+7) & ~7; } } - - MemDesc[i].Length = (size); + + MemDesc[i].Length = (size); #ifdef TRACK_SYS_ALLOC_CALLERS MemDesc[i].SrcId = SrcId; MemDesc[i].SrcLine = SrcLine; @@ -437,7 +437,7 @@ VOID DebugFreePool(PVOID addr) { ASSERT(addr); - for (i=0;i>=1; @@ -673,7 +673,7 @@ UDFCheckSpaceAllocation_( )); #endif //UDF_TRACK_ONDISK_ALLOCATION while(Map[i].extLength & UDF_EXTENT_LENGTH_MASK) { - + #ifdef UDF_TRACK_ONDISK_ALLOCATION AdPrint(("ChkAlloc:%x:%s:%x:@:%x:(%x):File:%x:Line:%d\n", FE_lba, @@ -690,7 +690,7 @@ UDFCheckSpaceAllocation_( } else { UDFCheckFreeBitOwner(Vcb, (Map[i].extLength & UDF_EXTENT_LENGTH_MASK) >> BSh); } - + if((Map[i].extLength >> 30) == EXTENT_NOT_RECORDED_NOT_ALLOCATED) { // skip unallocated frags // ASSERT(!(Map[i].extLength & UDF_EXTENT_LENGTH_MASK)); @@ -814,7 +814,7 @@ UDFMarkSpaceAsXXXNoProtect_( continue; } ASSERT(Map[i].extLocation); - + #ifdef UDF_TRACK_ONDISK_ALLOCATION AdPrint(("Alloc:%x:%s:%x:@:%x:File:%x:Line:%d\n", FE_lba, @@ -915,7 +915,7 @@ UDFMarkSpaceAsXXXNoProtect_( ASSERT(bit_before == UDFGetBit(Vcb->FSBM_Bitmap, lba-1)); ASSERT(bit_after == UDFGetBit(Vcb->FSBM_Bitmap, lba+len)); #endif //UDF_TRACK_ONDISK_ALLOCATION - + i++; } } // end UDFMarkSpaceAsXXXNoProtect_() @@ -1288,7 +1288,7 @@ UDFSetBits__( push edx push esi - mov edx,bc + mov edx,bc or edx,edx jz short EO_sb_loop @@ -1396,7 +1396,7 @@ UDFClrBits__( push edx push esi - mov edx,bc + mov edx,bc or edx,edx jz short EO_cp_loop diff --git a/drivers/filesystems/udfs/udf_info/dirtree.cpp b/drivers/filesystems/udfs/udf_info/dirtree.cpp index 8f4b3ee26c6..572b1ad9a94 100644 --- a/drivers/filesystems/udfs/udf_info/dirtree.cpp +++ b/drivers/filesystems/udfs/udf_info/dirtree.cpp @@ -226,7 +226,7 @@ UDFDirIndexTrunc( // someone tries to trunc. residual entries... return STATUS_INVALID_PARAMETER; } - + if(!MyReallocPool__((int8*)(FrameList[k]), AlignDirIndex(hDirNdx->LastFrameCount)*sizeof(DIR_INDEX_ITEM), (int8**)(&(FrameList[k])), AlignDirIndex(j)*sizeof(DIR_INDEX_ITEM) ) ) return STATUS_INSUFFICIENT_RESOURCES; @@ -358,7 +358,7 @@ UDFDirIndexInitScan( } if( (Context->j = Index & (UDF_DIR_INDEX_FRAME-1)) >= ((Context->frame < (Context->hDirNdx->FrameCount-1)) - ? + ? UDF_DIR_INDEX_FRAME : Context->hDirNdx->LastFrameCount) ) { return FALSE; } @@ -390,7 +390,7 @@ UDFDirIndexScan( if(Context->j >= Context->d) { Context->j=0; Context->frame++; - Context->DirNdx = UDFDirIndexGetFrame(Context->hDirNdx, + Context->DirNdx = UDFDirIndexGetFrame(Context->hDirNdx, Context->frame, &(Context->d), &(Context->i), @@ -405,7 +405,7 @@ UDFDirIndexScan( if(_FileInfo) { if((FileInfo = Context->DirNdx->FileInfo)) { if(FileInfo->ParentFile != Context->DirInfo) { - ParFileInfo = UDFLocateParallelFI(Context->DirInfo, + ParFileInfo = UDFLocateParallelFI(Context->DirInfo, Context->i, FileInfo); #ifdef UDF_DBG @@ -481,7 +481,7 @@ UDFFindNextFI( while(prevOffset+sizeof(FILE_IDENT_DESC) < Length) { prevOffset++; FileId = (PFILE_IDENT_DESC)(buff+prevOffset); - if(FileId->descTag.tagIdent != TID_FILE_IDENT_DESC) + if(FileId->descTag.tagIdent != TID_FILE_IDENT_DESC) continue; if(FileId->descTag.descVersion != 2 && FileId->descTag.descVersion != 3) continue; @@ -1054,7 +1054,7 @@ UDFFindFile( (!RtlCompareUnicodeString(&(DirNdx->FName), Name, FALSE)) ) { (*Index) = ScanContext.i; return STATUS_SUCCESS; - } else + } else if( (DirNdx->hashes.hLfn == hashes.hLfn) && (j == (uint_di)(-1)) && (!RtlCompareUnicodeString(&(DirNdx->FName), Name, IgnoreCase)) ) { diff --git a/drivers/filesystems/udfs/udf_info/ecma_167.h b/drivers/filesystems/udfs/udf_info/ecma_167.h index 5b8f9184d2b..6ca06a7c47f 100644 --- a/drivers/filesystems/udfs/udf_info/ecma_167.h +++ b/drivers/filesystems/udfs/udf_info/ecma_167.h @@ -182,7 +182,7 @@ struct NSRDesc { uint8 reserved; uint8 structData[2040]; }; - + /* Primary Volume Descriptor (ECMA 167 3/10.1) */ struct PrimaryVolDesc { tag descTag; @@ -312,7 +312,7 @@ struct GenericPartitionMap1 { /* Type 2 Partition Map (ECMA 167 3/10.7.3) */ struct GenericPartitionMap2 { uint8 partitionMapType; /* 2 */ - uint8 partitionMapLength; + uint8 partitionMapLength; uint8 partitionIdent[62]; }; @@ -424,7 +424,7 @@ typedef struct _PARTITION_HEADER_DESC { typedef struct _FILE_IDENT_DESC { tag descTag; - uint16 fileVersionNum; + uint16 fileVersionNum; uint8 fileCharacteristics; uint8 lengthFileIdent; long_ad icb; @@ -732,7 +732,7 @@ struct PathComponent { }; #define COMPONENT_TYPE_ROOT_X 0x01 /* originator & recipient know its value */ -#define COMPONENT_TYPE_ROOT 0x02 /* root of the volume */ +#define COMPONENT_TYPE_ROOT 0x02 /* root of the volume */ #define COMPONENT_TYPE_PARENT 0x03 /* predecessor's parent dir */ #define COMPONENT_TYPE_CURENT 0x04 /* same as predecessor's dir */ #define COMPONENT_TYPE_OBJECT 0x05 /* terminal entry */ diff --git a/drivers/filesystems/udfs/udf_info/extent.cpp b/drivers/filesystems/udfs/udf_info/extent.cpp index 5e507d35591..ddd127c65a1 100644 --- a/drivers/filesystems/udfs/udf_info/extent.cpp +++ b/drivers/filesystems/udfs/udf_info/extent.cpp @@ -60,7 +60,7 @@ UDFExtentOffsetToLba( } BOffset -= i; Offs = (*((uint32*)&Offset)) - (i << BSh); // offset in frag - + if(SectorOffset) (*SectorOffset) = Offs & (Vcb->BlockSize-1);// offset in 1st Lba if(AvailLength) @@ -1062,7 +1062,7 @@ UDFBuildLongAllocDescs( Alloc[i-1].extLength & UDF_EXTENT_LENGTH_MASK)); } RtlZeroMemory(&(Alloc[i]), sizeof(LONG_AD)); - j = len*sizeof(LONG_AD); // required space + j = len*sizeof(LONG_AD); // required space len = (InitSz & ~(sizeof(LONG_AD)-1)); // space available in 1st block ASSERT(len == InitSz); @@ -1609,7 +1609,7 @@ UDFAllocateFESpace( ULONG p_end; ULONG fe_loc; ULONG l1, l2; - + p_start = UDFPartStart(Vcb, PartNum); p_end = UDFPartEnd(Vcb, PartNum); fe_loc = DirInfo->Dloc->FELoc.Mapping[0].extLocation; @@ -1790,7 +1790,7 @@ UDFFlushFESpace( if(!Discard) { // cache it! - if(OS_SUCCESS(UDFStoreCachedAllocation(Vcb, + if(OS_SUCCESS(UDFStoreCachedAllocation(Vcb, Dloc->FELoc.Mapping[0].extLocation, &Dloc->DirIndex->FECharge, lim, UDF_PREALLOC_CLASS_FE))) { Dloc->DirIndex->FECharge.Mapping = NULL; @@ -1846,7 +1846,7 @@ UDFMarkAllocatedAsRecorded( Extent[i].extLength &= UDF_EXTENT_LENGTH_MASK; // Extent[i].extLength |= (EXTENT_RECORDED_ALLOCATED << 30); // = 0; ExtInfo->Modified = TRUE; - if(i && + if(i && ((Extent[i-1].extLength >> 30) == EXTENT_RECORDED_ALLOCATED) && (lba == (Extent[i-1].extLocation + ((len = Extent[i-1].extLength & UDF_EXTENT_LENGTH_MASK) >> BSh))) && ((len + (Extent[i].extLength & UDF_EXTENT_LENGTH_MASK)) <= UDF_MAX_EXTENT_LENGTH) && @@ -2214,7 +2214,7 @@ UDFMarkAllocatedAsNotXXX( ExtInfo->Modified = TRUE; ExtInfo->Mapping = NewExtent; - + AdPrint(("Alloc->Not: ExtInfo %x, Extent %x\n", ExtInfo, ExtInfo->Mapping)); if(Extent) { @@ -2382,7 +2382,7 @@ UDFResizeExtent( lim = req_s; } UDFAcquireResourceExclusive(&(Vcb->BitMapResource1),TRUE); -/* if((ExtInfo->Flags & EXTENT_FLAG_SEQUENTIAL) && +/* if((ExtInfo->Flags & EXTENT_FLAG_SEQUENTIAL) && ((Length & ~(PS-1)) > (l & ~(PS-1))) && TRUE) { status = UDFResizeExtent(Vcb, PartNum, l+MaxGrow, AlwaysInIcb, ExtInfo); @@ -2519,7 +2519,7 @@ UDFResizeExtent( } UDFPackMapping(Vcb, ExtInfo); } - } else + } else if(Length) { // decrease extent AdPrint(("Resize cut (8)\n")); @@ -2540,7 +2540,7 @@ UDFResizeExtent( if(TmpExtInf.Mapping) { RtlCopyMemory(TmpExtInf.Mapping, &(ExtInfo->Mapping[i]), s); AdPrint(("Resize save cutted (8)\n")); - if(OS_SUCCESS(UDFStoreCachedAllocation(Vcb, ExtInfo->Mapping[0].extLocation, + if(OS_SUCCESS(UDFStoreCachedAllocation(Vcb, ExtInfo->Mapping[0].extLocation, &TmpExtInf, 0, UDF_PREALLOC_CLASS_DIR))) { ExtInfo->Mapping[i].extLength = 0; ExtInfo->Mapping[i].extLocation = 0; @@ -2614,7 +2614,7 @@ tail_cached:; ExtPrint(("Resized Ext: type %x, loc %x, len %x\n", ExtInfo->Mapping[i].extLength >> 30, ExtInfo->Mapping[i].extLocation, ExtInfo->Mapping[i].extLength & UDF_EXTENT_LENGTH_MASK)); } - + return STATUS_SUCCESS; } // end UDFResizeExtent() @@ -2844,7 +2844,7 @@ UDFPackMapping( #endif AdPrint(("Pack ExtInfo %x, NewMap %x, OldMap %x\n", ExtInfo, NewMap, OldMap)); - + ExtInfo->Mapping = NewMap; MyFreePool__(OldMap); @@ -3155,7 +3155,7 @@ UDFReadExtentLocation( } // end UDFReadExtentLocation() #ifdef _MSC_VER -#pragma warning(push) +#pragma warning(push) #pragma warning(disable:4035) // re-enable below #endif @@ -3293,7 +3293,7 @@ UDFWriteExtent( && !Vcb->CDR_Mode) { status = UDFWriteData(Vcb, TRUE, - ( ((uint64)Lba) << Vcb->BlockSizeBits), + ( ((uint64)Lba) << Vcb->BlockSizeBits), Vcb->LBlockSize, Direct, Vcb->ZBuffer, &_WrittenBytes); if(!OS_SUCCESS(status)) return status; diff --git a/drivers/filesystems/udfs/udf_info/mount.cpp b/drivers/filesystems/udfs/udf_info/mount.cpp index 72c33290936..3d6520e1f69 100644 --- a/drivers/filesystems/udfs/udf_info/mount.cpp +++ b/drivers/filesystems/udfs/udf_info/mount.cpp @@ -295,7 +295,7 @@ UDFUpdateXSpaceBitmaps( /* This routine updates Partition Desc & associated data structures */ -OSSTATUS +OSSTATUS UDFUpdatePartDesc( PVCB Vcb, int8* Buf @@ -313,7 +313,7 @@ UDFUpdatePartDesc( !strcmp((int8*)&(p->partitionContents.ident), PARTITION_CONTENTS_NSR03))) { PPARTITION_HEADER_DESC phd; - + phd = (PPARTITION_HEADER_DESC)(p->partitionContentsUse); #ifdef UDF_DBG if(phd->unallocatedSpaceTable.extLength) { @@ -505,7 +505,7 @@ swp_loc: } while(sorted); for(i=0;iSparingCount;i++) { - UDFPrint((" @%x -> %x \n", + UDFPrint((" @%x -> %x \n", RelocMap[i].origLocation, RelocMap[i].mappedLocation)); } @@ -524,32 +524,32 @@ swp_loc: // tag should be set to TID_UNUSED_DESC if(OS_SUCCESS(status) && (SparTable->descTag.tagIdent == TID_UNUSED_DESC)) { - BC2 = ((sizeof(SPARING_TABLE) + + BC2 = ((sizeof(SPARING_TABLE) + SparTable->reallocationTableLen*sizeof(SparingEntry) + - Vcb->BlockSize-1) + Vcb->BlockSize-1) >> Vcb->BlockSizeBits); if(BC2 > BC) { - UDFPrint((" sizeSparingTable @%x too long: %x > %x\n", + UDFPrint((" sizeSparingTable @%x too long: %x > %x\n", Vcb->SparingTableLoc[i], BC2, BC )); continue; } status = UDFReadSectors(Vcb, FALSE, Vcb->SparingTableLoc[i], BC2, FALSE, (int8*)SparTable, &ReadBytes); - + if(!OS_SUCCESS(status)) { - UDFPrint((" Error reading sizeSparingTable @%x (%x)\n", + UDFPrint((" Error reading sizeSparingTable @%x (%x)\n", Vcb->SparingTableLoc[i], BC2 )); continue; } - BC2 = ((sizeof(SPARING_TABLE) + + BC2 = ((sizeof(SPARING_TABLE) + Vcb->SparingCount*sizeof(SparingEntry) + - Vcb->BlockSize-1) + Vcb->BlockSize-1) >> Vcb->BlockSizeBits); if(BC2 > BC) { - UDFPrint((" new sizeSparingTable @%x too long: %x > %x\n", + UDFPrint((" new sizeSparingTable @%x too long: %x > %x\n", Vcb->SparingTableLoc[i], BC2, BC )); continue; @@ -564,7 +564,7 @@ swp_loc: for(m=0; mSparingCount; m++) { if(RelocMap[m].mappedLocation == NewRelocMap[n].mappedLocation) { if(RelocMap[m].origLocation != NewRelocMap[n].origLocation) { - UDFPrint((" update @%x (%x) -> @%x (%x)\n", + UDFPrint((" update @%x (%x) -> @%x (%x)\n", NewRelocMap[m].origLocation, NewRelocMap[m].mappedLocation, RelocMap[m].origLocation, RelocMap[m].mappedLocation)); merged = TRUE; @@ -2104,7 +2104,7 @@ UDFLoadPartDesc( WCacheSetMode__(&(Vcb->FastCache), WCACHE_MODE_R); Vcb->LastModifiedTrack = 0; } - } + } } } #ifdef UDF_DBG @@ -2217,7 +2217,7 @@ UDFVerifyPartDesc( WCacheSetMode__(&(Vcb->FastCache), WCACHE_MODE_R); Vcb->LastModifiedTrack = 0;*/ } - } + } } } #ifdef UDF_DBG @@ -2443,9 +2443,9 @@ UDFProcessSequence( } } } - + try_exit: NOTHING; - + } _SEH2_FINALLY { if(Buf) MyFreePool__(Buf); if(Buf2) MyFreePool__(Buf2); @@ -2488,7 +2488,7 @@ UDFVerifySequence( if(!OS_SUCCESS(RC = UDFReadTagged(Vcb, Buf, vds[i].block, vds[i].block, &ident))) try_return(RC); UDFRegisterFsStructure(Vcb, vds[i].block, Vcb->BlockSize); - + /* if(i == VDS_POS_PRIMARY_VOL_DESC) UDFLoadPVolDesc(Vcb,Buf); else if(i == VDS_POS_LOGICAL_VOL_DESC) { @@ -2834,7 +2834,7 @@ UDFLoadSparingTable( SparTableLoc = ((uint32*)(PartMap+1))[i]; for(n=0; nSparingTableCount; n++) { if(Vcb->SparingTableLoc[i] == SparTableLoc) { - UDFPrint((" already processed @%x\n", + UDFPrint((" already processed @%x\n", SparTableLoc )); continue; @@ -2845,12 +2845,12 @@ UDFLoadSparingTable( if(OS_SUCCESS(status) && (SparTable->descTag.tagIdent == TID_UNUSED_DESC)) { UDFRegisterFsStructure(Vcb, SparTableLoc, Vcb->BlockSize); - BC2 = ((sizeof(SPARING_TABLE) + + BC2 = ((sizeof(SPARING_TABLE) + SparTable->reallocationTableLen*sizeof(SparingEntry) + - Vcb->BlockSize-1) + Vcb->BlockSize-1) >> Vcb->BlockSizeBits); if(BC2 > BC) { - UDFPrint((" sizeSparingTable @%x too long: %x > %x\n", + UDFPrint((" sizeSparingTable @%x too long: %x > %x\n", SparTableLoc, BC2, BC )); continue; @@ -2858,9 +2858,9 @@ UDFLoadSparingTable( status = UDFReadSectors(Vcb, FALSE, SparTableLoc, BC2, FALSE, (int8*)SparTable, &ReadBytes); UDFRegisterFsStructure(Vcb, SparTableLoc, BC2<BlockSizeBits); - + if(!OS_SUCCESS(status)) { - UDFPrint((" Error reading sizeSparingTable @%x (%x)\n", + UDFPrint((" Error reading sizeSparingTable @%x (%x)\n", SparTableLoc, BC2 )); continue; @@ -2887,7 +2887,7 @@ UDFLoadSparingTable( merged = TRUE; for(m=0; mSparingCount; m++) { if(RelocMap[m].mappedLocation == NewRelocMap[n].mappedLocation) { - UDFPrint((" dup @%x (%x) vs @%x (%x)\n", + UDFPrint((" dup @%x (%x) vs @%x (%x)\n", RelocMap[m].origLocation, RelocMap[m].mappedLocation, NewRelocMap[m].origLocation, NewRelocMap[m].mappedLocation)); merged = FALSE; @@ -2896,7 +2896,7 @@ UDFLoadSparingTable( (RelocMap[m].mappedLocation != NewRelocMap[n].mappedLocation) && (RelocMap[m].origLocation != SPARING_LOC_AVAILABLE) && (RelocMap[m].origLocation != SPARING_LOC_CORRUPTED)) { - UDFPrint((" conflict @%x (%x) vs @%x (%x)\n", + UDFPrint((" conflict @%x (%x) vs @%x (%x)\n", RelocMap[m].origLocation, RelocMap[m].mappedLocation, NewRelocMap[n].origLocation, NewRelocMap[n].mappedLocation)); merged = FALSE; @@ -2904,7 +2904,7 @@ UDFLoadSparingTable( } if(merged) { RelocMap[Vcb->SparingCount] = NewRelocMap[n]; - UDFPrint((" reloc %x -> %x\n", + UDFPrint((" reloc %x -> %x\n", RelocMap[Vcb->SparingCount].origLocation, RelocMap[Vcb->SparingCount].mappedLocation)); Vcb->SparingCount++; if(RelocMap[Vcb->SparingCount].origLocation == SPARING_LOC_AVAILABLE) { diff --git a/drivers/filesystems/udfs/udf_info/osta_misc.h b/drivers/filesystems/udfs/udf_info/osta_misc.h index 5599c3f3634..f9813bfb321 100644 --- a/drivers/filesystems/udfs/udf_info/osta_misc.h +++ b/drivers/filesystems/udfs/udf_info/osta_misc.h @@ -20,7 +20,7 @@ #define UDF_ID_DEVELOPER ("*WINNT " VER_STR_PRODUCT_NAME " UDF") #define UDF_ID_DEVELOPER_ADAPTEC "*Adaptec DirectCD" - + /* UDF 1.02 2.2.6.4 */ struct LogicalVolIntegrityDescImpUse { @@ -98,7 +98,7 @@ typedef struct _SPARABLE_PARTITION_MAP #ifndef PACKETSIZE_UDF #define PACKETSIZE_UDF 32 #endif //PACKETSIZE_UDF - + /* UDF 2.5 */ typedef struct _METADATA_PARTITION_MAP { @@ -149,8 +149,8 @@ struct FidADImpUse #define UDF_EXTENT_FLAG_MASK 0xc0000000 #define UDF_EXTENT_FLAG_ERASED 0x40000000 -/* - * Important! VirtualAllocationTables are +/* + * Important! VirtualAllocationTables are * very different between 1.5 and 2.0! */ @@ -163,7 +163,7 @@ struct VirtualAllocationTable15 { /* uint32 VirtualSector[0];*/ EntityID ident; uint32 previousVATICB; - }; + }; /* where number of VirtualSector's is (VATSize-36)/4 */ /* ----------- 2.0 ------------- */ diff --git a/drivers/filesystems/udfs/udf_info/phys_eject.cpp b/drivers/filesystems/udfs/udf_info/phys_eject.cpp index ac4ca0a99cb..cd863a669bd 100644 --- a/drivers/filesystems/udfs/udf_info/phys_eject.cpp +++ b/drivers/filesystems/udfs/udf_info/phys_eject.cpp @@ -84,7 +84,7 @@ UDFEjectReqWaiter( continue; ((PGET_EVENT_USER_IN)(&(WC->EjectReqBuffer)))->Immed = TRUE; ((PGET_EVENT_USER_IN)(&(WC->EjectReqBuffer)))->EventClass = evt_type; - + RC = UDFPhSendIOCTL( IOCTL_CDRW_GET_EVENT, TargetDevObj, &(WC->EjectReqBuffer),sizeof(GET_EVENT_USER_IN), @@ -222,7 +222,7 @@ wait_eject: (Error->AdditionalSenseCodeQualifier == SCSI_SENSEQ_LONG_WRITE_IN_PROGRESS || Error->AdditionalSenseCodeQualifier == SCSI_SENSEQ_FORMAT_IN_PROGRESS)) ) { if((!Vcb->Modified && - !(Vcb->VCBFlags & UDF_VCB_LAST_WRITE)) + !(Vcb->VCBFlags & UDF_VCB_LAST_WRITE)) || (Vcb->VCBFlags & UDF_VCB_FLAGS_UNSAFE_IOCTL)) { // we should forget about this disk... @@ -481,14 +481,14 @@ skip_BM_flush2: if( !(supported_evt_classes & evt_type) ) continue; /* - if( evt_type == EventStat_Class_Media ) + if( evt_type == EventStat_Class_Media ) continue; if( evt_type == EventStat_Class_ExternalReq ) continue; */ ((PGET_EVENT_USER_IN)(&(WC->EjectReqBuffer)))->Immed = TRUE; ((PGET_EVENT_USER_IN)(&(WC->EjectReqBuffer)))->EventClass = evt_type; - + RC = UDFTSendIOCTL( IOCTL_CDRW_GET_EVENT, Vcb, &(WC->EjectReqBuffer),sizeof(GET_EVENT_USER_IN), @@ -575,7 +575,7 @@ media_loss: UDFPrint((" Reading Media Event...\n")); ((PGET_EVENT_USER_IN)(&(WC->EjectReqBuffer)))->Immed = TRUE; ((PGET_EVENT_USER_IN)(&(WC->EjectReqBuffer)))->EventClass = EventStat_Class_Media; - + RC = UDFTSendIOCTL( IOCTL_CDRW_GET_EVENT, Vcb, &(WC->EjectReqBuffer),sizeof(GET_EVENT_USER_IN), @@ -587,7 +587,7 @@ media_loss: goto device_failure; ((PGET_EVENT_USER_IN)(&(WC->EjectReqBuffer)))->Immed = TRUE; ((PGET_EVENT_USER_IN)(&(WC->EjectReqBuffer)))->EventClass = EventStat_Class_ExternalReq; - + RC = UDFTSendIOCTL( IOCTL_CDRW_GET_EVENT, Vcb, &(WC->EjectReqBuffer),sizeof(GET_EVENT_USER_IN), @@ -647,15 +647,15 @@ device_failure: UDFPrint((" UDFEjectReqWaiter: exit 1\n")); return; - + try_exit: NOTHING; } _SEH2_FINALLY { - + if(VcbAcquired) { VcbAcquired = FALSE; UDFReleaseResource(&(Vcb->VCBResource)); } - + /* if(WC) { delay.QuadPart = -10000000; // 1.0 sec WRC = KeWaitForSingleObject(&(Vcb->WaiterStopped), Executive, KernelMode, FALSE, &delay); diff --git a/drivers/filesystems/udfs/udf_info/remap.cpp b/drivers/filesystems/udfs/udf_info/remap.cpp index d86953aa0b8..8799db227f5 100644 --- a/drivers/filesystems/udfs/udf_info/remap.cpp +++ b/drivers/filesystems/udfs/udf_info/remap.cpp @@ -64,7 +64,7 @@ UDFVInit( UDFPrint(("Already inited\n")); return STATUS_SUCCESS; } - + _SEH2_TRY { RtlZeroMemory(VerifyCtx, sizeof(UDF_VERIFY_CTX)); if(!Vcb->VerifyOnWrite) { @@ -147,7 +147,7 @@ UDFVRelease( UDFAcquireResourceExclusive(&(VerifyCtx->VerifyLock), TRUE); Link = VerifyCtx->vrfList.Flink; - + while(Link != &(VerifyCtx->vrfList)) { vItem = CONTAINING_RECORD( Link, UDF_VERIFY_ITEM, vrfList ); Link = Link->Flink; @@ -648,7 +648,7 @@ UDFVVerify( Link = VerifyCtx->vrfList.Flink; prev_lba = -2; len = 0; - + while(i) { ASSERT(Link != &(VerifyCtx->vrfList)); /* diff --git a/drivers/filesystems/udfs/udf_info/udf_info.cpp b/drivers/filesystems/udfs/udf_info/udf_info.cpp index 6778cf78fb2..4d5cd201e85 100644 --- a/drivers/filesystems/udfs/udf_info/udf_info.cpp +++ b/drivers/filesystems/udfs/udf_info/udf_info.cpp @@ -336,7 +336,7 @@ BOOLEAN UDFUnicodeInString( IN uint8* string, // String to search through. IN WCHAR ch // Unicode char to search for. - ) + ) { BOOLEAN found = FALSE; @@ -356,7 +356,7 @@ UDFUnicodeInString( DOS file name. */ #ifdef _MSC_VER -#pragma warning(push) +#pragma warning(push) #pragma warning(disable:4035) // re-enable below #endif @@ -422,7 +422,7 @@ ERR_IIC2: UDFDOSName(Vcb, DosName, UdfName, KeepIntact); }*/ -void +void __fastcall UDFDOSName( IN PVCB Vcb, @@ -460,7 +460,7 @@ UDFDOSName( } } -void +void __fastcall UDFDOSName100( IN OUT PUNICODE_STRING DosName, @@ -497,7 +497,7 @@ UDFDOSName100( (udfName[lastPeriodIndex] == UNICODE_PERIOD || udfName[lastPeriodIndex] == UNICODE_SPACE)) lastPeriodIndex--; - // Now search for last remaining period. + // Now search for last remaining period. while(lastPeriodIndex >= 0 && udfName[lastPeriodIndex] != UNICODE_PERIOD) lastPeriodIndex--; @@ -577,7 +577,7 @@ UDFDOSName100( RtlUpcaseUnicodeString(DosName, DosName, FALSE); } // end UDFDOSName100() -void +void __fastcall UDFDOSName200( IN OUT PUNICODE_STRING DosName, @@ -615,7 +615,7 @@ UDFDOSName200( (udfName[lastPeriodIndex] == UNICODE_PERIOD || udfName[lastPeriodIndex] == UNICODE_SPACE)) lastPeriodIndex--; - // Now search for last remaining period. + // Now search for last remaining period. while(lastPeriodIndex >= 0 && udfName[lastPeriodIndex] != UNICODE_PERIOD) lastPeriodIndex--; @@ -695,7 +695,7 @@ UDFDOSName200( } // end UDFDOSName200() -void +void __fastcall UDFDOSName201( IN OUT PUNICODE_STRING DosName, @@ -820,7 +820,7 @@ UDFDOSName201( /* calculate its corresponding BCS character byte */ /* length (zero if the char is not legal or */ /* undisplayable on this system). */ - + charLen = (UDFIsIllegalChar(current) /*|| !UnicodeIsPrint(current)*/) ? 0 : 1; @@ -887,7 +887,7 @@ UDFDOSName201( /* if (needsCRC == FALSE && extLen == 0) { */ /* If this is the name of a DOS device, a CRC code should */ - /* be appended to the file name. + /* be appended to the file name. if (IsDeviceName(udfName, udfLen)) needsCRC = TRUE; }*/ @@ -1739,8 +1739,8 @@ UDFWriteFile__( if(!OS_SUCCESS(status)) return status; } - // ufff... - // & now we'll write out data to well prepared extent... + // ufff... + // & now we'll write out data to well prepared extent... // ... like all normal people do... ExtPrint((" write user data\n")); if(!OS_SUCCESS(status = UDFWriteExtent(Vcb, &(Dloc->DataLoc), Offset, Length, FALSE, Buffer, WrittenBytes))) @@ -2231,7 +2231,7 @@ UDFOpenRootFile__( FileInfo->Dloc->AllocLoc.Mapping = UDFExtentToMapping(&FEExt); if(!(FileInfo->Dloc->AllocLoc.Mapping)) return STATUS_INSUFFICIENT_RESOURCES; } - if(!OS_SUCCESS(status = UDFLoadExtInfo(Vcb, (PFILE_ENTRY)(FileInfo->Dloc->FileEntry), &FELoc, + if(!OS_SUCCESS(status = UDFLoadExtInfo(Vcb, (PFILE_ENTRY)(FileInfo->Dloc->FileEntry), &FELoc, &(FileInfo->Dloc->DataLoc), &(FileInfo->Dloc->AllocLoc) ) )) return status; FileInfo->Dloc->FileEntryLen = (uint32) @@ -2411,7 +2411,7 @@ UDFCleanUpFile__( Dloc->SDirInfo->Dloc) { DirNdx2 = UDFDirIndex(Dloc->SDirInfo->Dloc->DirIndex, 1); if(DirNdx2 && (DirNdx2->FileInfo == FileInfo)) { - DirNdx2->FileInfo = + DirNdx2->FileInfo = Parallel ? ParFileInfo : NULL; ASSERT(!DirNdx2->FileInfo->RefCount); } @@ -3218,12 +3218,12 @@ UDFRenameMoveFile__( #if 0 l = (sizeof(FILE_IDENT_DESC) + Nlen + IUl + 3) & ~((uint32)3); #endif - + RtlCopyMemory( ((uint8*)(DirNdx2->FileInfo->FileIdent+1))+IUl, CS0, Nlen); RtlCopyMemory(DirNdx2->FName.Buffer, fn->Buffer, fn->Length); - + if(CS0) MyFreePool__(CS0); - + DirNdx2->FI_Flags |= UDF_FI_FLAG_FI_MODIFIED; UDFBuildHashEntry(Vcb, &(DirNdx2->FName), &(DirNdx2->hashes), HASH_ALL); return STATUS_SUCCESS; @@ -3740,7 +3740,7 @@ err_vat_15: // initialize VAT // !!! NOTE !!! // Both VAT copies - in-memory & on-disc - // contain _relative_ addresses + // contain _relative_ addresses len = Vcb->NWA - root; for(i=0; i<=len; i++) { Vcb->Vat[i] = i; @@ -3985,7 +3985,7 @@ relocate_FE: EXTENT_INFO _FEExtInfo; // calculate the length required - + // allocate block for FE if(OS_SUCCESS(UDFAllocateFESpace(Vcb, FileInfo->ParentFile, PartNum, &_FEExtInfo, (uint32)(FileInfo->Dloc->FELoc.Length)) )) { UDFPrint((" relocate %x -> %x\n", @@ -4022,7 +4022,7 @@ relocate_FE: DirNdx->FI_Flags |= UDF_FI_FLAG_FI_MODIFIED; } } - // this will update + // this will update UDFPrint((" retry flush...\n")); goto retry_flush_FE; } @@ -4278,14 +4278,14 @@ UDFCompareFileInfo( */ #ifdef _MSC_VER -#pragma warning(push) +#pragma warning(push) #pragma warning(disable:4035) // re-enable below #endif #if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif // _X86_ -uint32 +uint32 __fastcall crc32( IN uint8* s, // ECX @@ -4331,7 +4331,7 @@ EO_CRC: #else // NO X86 optimization , use generic C/C++ uint32 i; uint32 crc32val = 0; - + for(i=0; i> 8); @@ -4351,7 +4351,7 @@ EO_CRC: #if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif // _X86_ -uint16 +uint16 __fastcall UDFUnicodeCksum( PWCHAR s, // ECX @@ -4380,7 +4380,7 @@ uCRC_loop: mov dl,ah // dl = (Crc >> 8) xor dl,[esi+1] // dl = ((Crc >> 8) ^ (*s >> 8)) & 0xff - mov ah,al + mov ah,al mov al,dh // ax = (Crc << 8) xor ax,[word ptr ebx+edx*2] // ax = ........... @@ -4400,7 +4400,7 @@ EO_uCRC: pop edx pop ecx pop ebx - + ret } #else // NO X86 optimization , use generic C/C++ @@ -4417,7 +4417,7 @@ EO_uCRC: #if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif // _X86_ -uint16 +uint16 __fastcall UDFUnicodeCksum150( PWCHAR s, // ECX @@ -4450,7 +4450,7 @@ uCRC_loop: mov dl,ah // dl = (Crc >> 8) or edi,edx // if(*s & 0xff00) Use16 = TRUE; xor dl,[esi+1] // dl = ((Crc >> 8) ^ (*s >> 8)) & 0xff - mov ah,al + mov ah,al mov al,0 // ax = (Crc << 8) xor ax,[word ptr CrcTable+edx*2] // ax = ........... @@ -4467,7 +4467,7 @@ uCRC_loop: mov bl,ah // dl = (Crc >> 8) xor bl,[esi] // dl = ((Crc >> 8) ^ (*s >> 8)) & 0xff - mov ah,al + mov ah,al mov al,0 // ax = (Crc << 8) xor ax,[word ptr CrcTable+ebx*2] // ax = ........... @@ -4491,7 +4491,7 @@ use16_2: pop edx pop ecx pop ebx - + ret } #else // NO X86 optimization , use generic C/C++ @@ -4522,7 +4522,7 @@ use16_2: #if defined(_X86_) && defined(_MSC_VER) && !defined(__clang__) __declspec (naked) #endif // _X86_ -uint16 +uint16 __fastcall UDFCrc( IN uint8* Data, // ECX @@ -4563,7 +4563,7 @@ EO_CRC: pop edx pop ecx pop ebx - + ret } #else // NO X86 optimization , use generic C/C++ @@ -4586,8 +4586,8 @@ OSSTATUS UDFReadTagged( PVCB Vcb, int8* Buf, - uint32 Block, - uint32 Location, + uint32 Block, + uint32 Location, uint16 *Ident ) { @@ -4617,7 +4617,7 @@ UDFReadTagged( Block, PTag->tagLocation, Location)); try_return(RC = STATUS_FILE_CORRUPT_ERROR); } - + /* Verify the tag checksum */ checksum = 0; tb = Buf; @@ -4949,7 +4949,7 @@ UDFCreateStreamDir__( ((PEXTENDED_FILE_ENTRY)(FileInfo->Dloc->FileEntry))->streamDirectoryICB.extLocation.partitionReferenceNum = (uint16)PartNum; ((PEXTENDED_FILE_ENTRY)(FileInfo->Dloc->FileEntry))->streamDirectoryICB.extLocation.logicalBlockNum = UDFPhysLbaToPart(Vcb, PartNum, SDirInfo->Dloc->FELoc.Mapping[0].extLocation); - ((PEXTENDED_FILE_ENTRY)(SDirInfo->Dloc->FileEntry))->uniqueID = + ((PEXTENDED_FILE_ENTRY)(SDirInfo->Dloc->FileEntry))->uniqueID = ((PEXTENDED_FILE_ENTRY)(FileInfo->Dloc->FileEntry))->uniqueID; FileInfo->Dloc->FE_Flags |= (UDF_FE_FLAG_FE_MODIFIED | UDF_FE_FLAG_HAS_SDIR); // open & finalize linkage @@ -4982,7 +4982,7 @@ UDFOpenStreamDir__( } if((SDirInfo = FileInfo->Dloc->SDirInfo)) { // it is already opened. Good... - + // check if we have Deleted SDir if(FileInfo->Dloc->SDirInfo && UDFIsSDirDeleted(FileInfo->Dloc->SDirInfo)) @@ -5187,7 +5187,7 @@ UDFRecordVAT( VatFileInfo->Dloc->FELoc.Mapping[0].extLocation = VatFileInfo->Dloc->DataLoc.Mapping[0].extLocation = Vcb->NWA+PacketOffset; - VatFileInfo->Dloc->FELoc.Modified = TRUE; + VatFileInfo->Dloc->FELoc.Modified = TRUE; // setup descTag ((PFILE_ENTRY)(VatFileInfo->Dloc->FileEntry))->descTag.tagLocation = UDFPhysLbaToPart(Vcb, PartNum, VatFileInfo->Dloc->DataLoc.Mapping[0].extLocation); diff --git a/drivers/filesystems/udfs/udf_info/udf_info.h b/drivers/filesystems/udfs/udf_info/udf_info.h index 2c971928bb9..eccf4180f0c 100644 --- a/drivers/filesystems/udfs/udf_info/udf_info.h +++ b/drivers/filesystems/udfs/udf_info/udf_info.h @@ -61,7 +61,7 @@ UDFReadExtentLocation(IN PVCB Vcb, // calculate total length of extent int64 UDFGetExtentLength(IN PEXTENT_MAP Extent); // Extent array // convert compressed Unicode to standard -void +void __fastcall UDFDecompressUnicode(IN OUT PUNICODE_STRING UName, IN uint8* CS0, IN SIZE_T Length, @@ -176,7 +176,7 @@ __fastcall UDFExtentToMapping_(IN PEXTENT_AD Extent ); #ifdef UDF_TRACK_EXTENT_TO_MAPPING - #define UDFExtentToMapping(e) UDFExtentToMapping_(e, UDF_BUG_CHECK_ID, __LINE__) + #define UDFExtentToMapping(e) UDFExtentToMapping_(e, UDF_BUG_CHECK_ID, __LINE__) #else //UDF_TRACK_EXTENT_TO_MAPPING #define UDFExtentToMapping(e) UDFExtentToMapping_(e) #endif //UDF_TRACK_EXTENT_TO_MAPPING @@ -211,30 +211,30 @@ __fastcall UDFRelocateSectors(IN PVCB Vcb, BOOLEAN UDFUnicodeInString(IN uint8* string, IN WCHAR ch); // Unicode char to search for. // validate char -BOOLEAN +BOOLEAN __fastcall UDFIsIllegalChar(IN WCHAR ch); // translate udfName to dosName using OSTA compliant. #define UDFDOSName__(Vcb, DosName, UdfName, FileInfo) \ UDFDOSName(Vcb, DosName, UdfName, (FileInfo) && ((FileInfo)->Index < 2)); -void +void __fastcall UDFDOSName(IN PVCB Vcb, IN OUT PUNICODE_STRING DosName, IN PUNICODE_STRING UdfName, IN BOOLEAN KeepIntact); -void +void __fastcall UDFDOSName201(IN OUT PUNICODE_STRING DosName, IN PUNICODE_STRING UdfName, IN BOOLEAN KeepIntact); -void +void __fastcall UDFDOSName200(IN OUT PUNICODE_STRING DosName, IN PUNICODE_STRING UdfName, IN BOOLEAN KeepIntact, IN BOOLEAN Mode150); -void +void __fastcall UDFDOSName100(IN OUT PUNICODE_STRING DosName, IN PUNICODE_STRING UdfName, IN BOOLEAN KeepIntact); @@ -465,7 +465,7 @@ OSSTATUS UDFLoadExtInfo(IN PVCB Vcb, IN OUT PEXTENT_INFO FExtInfo, IN OUT PEXTENT_INFO AExtInfo); // convert standard Unicode to compressed -void +void __fastcall UDFCompressUnicode(IN PUNICODE_STRING UName, IN OUT uint8** _CS0, IN OUT PSIZE_T Length); @@ -542,7 +542,7 @@ OSSTATUS UDFZeroExtent(IN PVCB Vcb, #define UDFSparseExtent__(Vcb, Ext, Off, Len, Dir, WB) \ UDFZeroExtent(Vcb, Ext, Off, Len, TRUE, Dir, WB) -uint32 +uint32 __fastcall UDFPartStart(PVCB Vcb, uint32 PartNum); uint32 @@ -846,28 +846,28 @@ OSSTATUS UDFUpdateVolIdent(IN PVCB Vcb, IN UDF_VDS_RECORD Lba, IN PUNICODE_STRING VolIdent); // calculate checksum for unicode string (for DOS-names) -uint16 +uint16 __fastcall UDFUnicodeCksum(PWCHAR s, uint32 n); //#define UDFUnicodeCksum(s,n) UDFCrc((uint8*)(s), (n)*sizeof(WCHAR)) // -uint16 +uint16 __fastcall UDFUnicodeCksum150(PWCHAR s, uint32 n); -uint32 +uint32 __fastcall crc32(IN uint8* s, IN uint32 len); // calculate a 16-bit CRC checksum using ITU-T V.41 polynomial -uint16 +uint16 __fastcall UDFCrc(IN uint8* Data, IN SIZE_T Size); // read the first block of a tagged descriptor & check it OSSTATUS UDFReadTagged(IN PVCB Vcb, IN int8* Buf, - IN uint32 Block, - IN uint32 Location, + IN uint32 Block, + IN uint32 Location, OUT uint16 *Ident); // get physycal Lba for partition-relative addr uint32 diff --git a/drivers/filesystems/udfs/udf_info/udf_rel.h b/drivers/filesystems/udfs/udf_info/udf_rel.h index c8000ad3bc0..534a129a4e3 100644 --- a/drivers/filesystems/udfs/udf_info/udf_rel.h +++ b/drivers/filesystems/udfs/udf_info/udf_rel.h @@ -329,11 +329,11 @@ typedef struct _UDF_DATALOC_INFO { #define UDF_FE_FLAG_DIR_MODIFIED (0x08) /// File contains pointer to Deleted Stream Dir #define UDF_FE_FLAG_HAS_DEL_SDIR (0x10) -/// File is Deleted Stream Dir +/// File is Deleted Stream Dir #define UDF_FE_FLAG_IS_DEL_SDIR (0x20) /// Dloc is being initialized, don't touch it now #define UDF_FE_FLAG_UNDER_INIT (0x40) - + #define UDF_FILE_INFO_MT PagedPool diff --git a/drivers/filesystems/udfs/udffs.h b/drivers/filesystems/udfs/udffs.h index 67c6ba363ce..fd310f25fb5 100644 --- a/drivers/filesystems/udfs/udffs.h +++ b/drivers/filesystems/udfs/udffs.h @@ -228,14 +228,14 @@ extern CCHAR DefLetter[]; #endif #define UDFPrintErr(Args) KdPrint(Args) -// +// #if !defined(UDF_DBG) && !defined(PRINT_ALWAYS) #ifndef _CONSOLE #define UDFAcquireResourceExclusive(Resource,CanWait) \ - (ExAcquireResourceExclusiveLite((Resource),(CanWait))) + (ExAcquireResourceExclusiveLite((Resource),(CanWait))) #define UDFAcquireResourceShared(Resource,CanWait) \ - (ExAcquireResourceSharedLite((Resource),(CanWait))) + (ExAcquireResourceSharedLite((Resource),(CanWait))) // a convenient macro (must be invoked in the context of the thread that acquired the resource) #define UDFReleaseResource(Resource) \ (ExReleaseResourceForThreadLite((Resource), ExGetCurrentResourceThread())) @@ -259,9 +259,9 @@ extern CCHAR DefLetter[]; #endif //_CONSOLE -#define UDF_CHECK_PAGING_IO_RESOURCE(NTReqFCB) -#define UDF_CHECK_EXVCB_RESOURCE(Vcb) -#define UDF_CHECK_BITMAP_RESOURCE(Vcb) +#define UDF_CHECK_PAGING_IO_RESOURCE(NTReqFCB) +#define UDF_CHECK_EXVCB_RESOURCE(Vcb) +#define UDF_CHECK_BITMAP_RESOURCE(Vcb) #else //UDF_DBG @@ -298,7 +298,7 @@ extern CCHAR DefLetter[]; #define UDF_CHECK_PAGING_IO_RESOURCE(NTReqFCB) \ ASSERT(!ExIsResourceAcquiredExclusiveLite(&(NTReqFCB->PagingIoResource))); \ - ASSERT(!ExIsResourceAcquiredSharedLite(&(NTReqFCB->PagingIoResource))); + ASSERT(!ExIsResourceAcquiredSharedLite(&(NTReqFCB->PagingIoResource))); #define UDF_CHECK_EXVCB_RESOURCE(Vcb) \ ASSERT( ExIsResourceAcquiredExclusiveLite(&(Vcb->VCBResource)) ); @@ -371,7 +371,7 @@ extern CCHAR DefLetter[]; #define UDF_FILE_PROTECT (0x00000300) //#define UDF_FILE_PROTECT_ (0x0000030x) - + #define SystemAllocatePool(hernya,size) ExAllocatePoolWithTag(hernya, size, 'Snwd') #define SystemFreePool(addr) ExFreePool((PVOID)(addr)) diff --git a/drivers/filesystems/udfs/udfinit.cpp b/drivers/filesystems/udfs/udfinit.cpp index c5f664fc385..4eaa1c96455 100644 --- a/drivers/filesystems/udfs/udfinit.cpp +++ b/drivers/filesystems/udfs/udfinit.cpp @@ -153,7 +153,7 @@ DriverEntry( InternalMMInitialized = TRUE; #ifdef USE_DLD - // Initialize Deadlock Detector + // Initialize Deadlock Detector DLDInit(1280); DLDetectInitialized = TRUE; #endif @@ -162,7 +162,7 @@ DriverEntry( // Save RegistryPath RtlCopyMemory(&(UDFGlobalData.SavedRegPath), RegistryPath, sizeof(UNICODE_STRING)); - + UDFGlobalData.SavedRegPath.Buffer = (PWSTR)MyAllocatePool__(NonPagedPool, RegistryPath->Length + 2); if(!UDFGlobalData.SavedRegPath.Buffer) try_return (RC = STATUS_INSUFFICIENT_RESOURCES); RtlCopyMemory(UDFGlobalData.SavedRegPath.Buffer, RegistryPath->Buffer, RegistryPath->Length + 2); @@ -339,7 +339,7 @@ DriverEntry( RC = UDFDismountDevice(&unicodeCdRomDeviceName); RtlFreeUnicodeString(&unicodeCdRomDeviceName); - + if (!NT_SUCCESS(RC)) break; } @@ -446,24 +446,24 @@ UDFInitializeFunctionPointers( ) { PFAST_IO_DISPATCH PtrFastIoDispatch = NULL; - + // initialize the function pointers for the IRP major // functions that this FSD is prepared to handle ... // NT Version 4.0 has 28 possible functions that a // kernel mode driver can handle. // NT Version 3.51 and before has only 22 such functions, // of which 18 are typically interesting to most FSD's. - + // The only interesting new functions that a FSD might // want to respond to beginning with Version 4.0 are the // IRP_MJ_QUERY_QUOTA and the IRP_MJ_SET_QUOTA requests. - + // The code below does not handle quota manipulation, neither // does the NT Version 4.0 operating system (or I/O Manager). // However, you should be on the lookout for any such new // functionality that the FSD might have to implement in // the near future. - + DriverObject->MajorFunction[IRP_MJ_CREATE] = UDFCreate; DriverObject->MajorFunction[IRP_MJ_CLOSE] = UDFClose; DriverObject->MajorFunction[IRP_MJ_READ] = UDFRead; @@ -646,7 +646,7 @@ UDFDismountDevice( Buffer = (PFILE_FS_ATTRIBUTE_INFORMATION)MyAllocatePool__(NonPagedPool,sizeof(FILE_FS_ATTRIBUTE_INFORMATION)+2*sizeof(UDF_FS_TITLE_DVDRAM)); if (!Buffer) try_return(RC = STATUS_INSUFFICIENT_RESOURCES); - + InitializeObjectAttributes ( &ObjectAttributes, unicodeCdRomDeviceName, OBJ_CASE_INSENSITIVE, @@ -658,17 +658,17 @@ UDFDismountDevice( GENERIC_READ, &ObjectAttributes, &IoStatus, - NULL, + NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, + NULL, 0 ); if (!NT_SUCCESS(RC)) try_return(RC); - + UDFPrint(("\n*** UDFDismountDevice: QueryVolInfo\n")); RC = ZwQueryVolumeInformationFile( NtFileHandle, &IoStatus, @@ -679,7 +679,7 @@ UDFDismountDevice( #define UDF_CHECK_FS_NAME(name) \ (Buffer->FileSystemNameLength+sizeof(WCHAR) == sizeof(name) && \ DbgCompareMemory(&Buffer->FileSystemName[0],name , sizeof(name)) == sizeof(name)) - + if (NT_SUCCESS(RC) && (UDF_CHECK_FS_NAME((PVOID)UDF_FS_TITLE_CDR) || UDF_CHECK_FS_NAME((PVOID)UDF_FS_TITLE_CDRW) || @@ -688,7 +688,7 @@ UDFDismountDevice( UDF_CHECK_FS_NAME((PVOID)UDF_FS_TITLE_DVDpR) || UDF_CHECK_FS_NAME((PVOID)UDF_FS_TITLE_DVDpRW) || UDF_CHECK_FS_NAME((PVOID)UDF_FS_TITLE_DVDRAM) )) try_return(STATUS_SUCCESS); - + UDFPrint(("\n*** UDFDismountDevice: LockVolume\n")); RC = ZwFsControlFile(NtFileHandle, NULL, @@ -730,8 +730,8 @@ UDFDismountDevice( sizeof(buffer)); if (!NT_SUCCESS(RC)) try_return(RC); - - + + UDFPrint(("\n*** UDFDismountDevice: UnlockVolume\n")); RC = ZwFsControlFile(NtFileHandle, NULL, @@ -746,7 +746,7 @@ UDFDismountDevice( UDFPrint(("\n*** UDFDismountDevice: Close\n")); ZwClose( NtFileHandle ); - + NtFileHandle = (HANDLE)-1; UDFPrint(("\n*** UDFDismountDevice: Create 2\n")); @@ -759,7 +759,7 @@ UDFDismountDevice( FILE_SHARE_READ, FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, + NULL, 0 ); try_exit: NOTHING; @@ -851,7 +851,7 @@ Return Value: // Release the global resource. UDFReleaseResource( &(UDFGlobalData.GlobalDataResource) ); - + } } /*VOID @@ -869,7 +869,7 @@ UDFRemountAll( */ /* delay.QuadPart = -80*10000000; KeDelayExecutionThread(KernelMode, FALSE, &delay); //10 seconds*/ - + /* for(CdRomNumber = 0;true;CdRomNumber++) { sprintf(deviceNameBuffer, "\\Device\\CdRom%d", CdRomNumber); UDFPrint(( "UDF: UDFRemountAll : dismount %s\n", deviceNameBuffer)); @@ -883,7 +883,7 @@ UDFRemountAll( RC = UDFDismountDevice(&unicodeCdRomDeviceName); RtlFreeUnicodeString(&unicodeCdRomDeviceName); - + if (!NT_SUCCESS(RC)) break; } }*/ diff --git a/drivers/filesystems/udfs/unload.cpp b/drivers/filesystems/udfs/unload.cpp index a9c15bf4fe3..b98bccec959 100644 --- a/drivers/filesystems/udfs/unload.cpp +++ b/drivers/filesystems/udfs/unload.cpp @@ -42,7 +42,7 @@ UDFDriverUnload( // Delete the link from our device name to a name in the Win32 namespace. - + // IoDeleteSymbolicLink( &uniWin32NameString ); diff --git a/drivers/filesystems/udfs/verfysup.cpp b/drivers/filesystems/udfs/verfysup.cpp index 3662fcad15c..f5c882afd81 100644 --- a/drivers/filesystems/udfs/verfysup.cpp +++ b/drivers/filesystems/udfs/verfysup.cpp @@ -48,7 +48,7 @@ UDFVerifyVcb( UDFPrint(("UDFVerifyVCB: Modified=%d\n", Vcb->Modified)); // Fail immediately if the volume is in the progress of being dismounted // or has been marked invalid. - if (Vcb->VCBFlags & UDF_VCB_FLAGS_BEING_DISMOUNTED) { + if (Vcb->VCBFlags & UDF_VCB_FLAGS_BEING_DISMOUNTED) { return STATUS_FILE_INVALID; } @@ -65,7 +65,7 @@ UDFVerifyVcb( NULL,0, &MediaChangeCount,sizeof(ULONG), FALSE,&Iosb ); - + // Be safe about the count in case the driver didn't fill it in if (Iosb.Information != sizeof(ULONG)) MediaChangeCount = 0; UDFPrint((" MediaChangeCount %d -> %d\n", Vcb->MediaChangeCount, MediaChangeCount)); @@ -602,7 +602,7 @@ UDFPerformVerify( UDFPrint(("UDFPerformVerify: RC = %x\n", RC)); return RC; - + } // end UDFPerformVerify() /* @@ -933,11 +933,11 @@ UDFCompareVcb( UDFPrint((" VolCreationTime %I64x != %I64x \n", OldVcb->VolCreationTime, NewVcb->VolCreationTime)); return STATUS_WRONG_VOLUME; } - // Compare serial numbers + // Compare serial numbers if(OldVcb->SerialNumber != NewVcb->SerialNumber) { UDFPrint((" SerialNumber %x != %x \n", OldVcb->SerialNumber, NewVcb->SerialNumber)); return STATUS_WRONG_VOLUME; - } + } // Compare volume idents if(!SimpleLogicalCheck && RtlCompareUnicodeString(&(OldVcb->VolIdent),&(NewVcb->VolIdent),FALSE)) { diff --git a/drivers/filesystems/udfs/volinfo.cpp b/drivers/filesystems/udfs/volinfo.cpp index 470e9113516..7d7d98e4157 100644 --- a/drivers/filesystems/udfs/volinfo.cpp +++ b/drivers/filesystems/udfs/volinfo.cpp @@ -168,9 +168,9 @@ UDFCommonQueryVolInfo( ASSERT(PtrIrpContext); ASSERT(Irp); - + PAGED_CODE(); - + FileObject = IrpSp->FileObject; ASSERT(FileObject); @@ -201,9 +201,9 @@ UDFCommonQueryVolInfo( RtlZeroMemory(Irp->AssociatedIrp.SystemBuffer, Length); switch (IrpSp->Parameters.QueryVolume.FsInformationClass) { - + case FileFsVolumeInformation: - + // This is the only routine we need the Vcb shared because of // copying the volume label. All other routines copy fields that // cannot change or are just manifest constants. @@ -216,19 +216,19 @@ UDFCommonQueryVolInfo( RC = UDFQueryFsVolumeInfo( PtrIrpContext, Vcb, (PFILE_FS_VOLUME_INFORMATION)(Irp->AssociatedIrp.SystemBuffer), &Length ); break; - + case FileFsSizeInformation: - + RC = UDFQueryFsSizeInfo( PtrIrpContext, Vcb, (PFILE_FS_SIZE_INFORMATION)(Irp->AssociatedIrp.SystemBuffer), &Length ); break; - + case FileFsDeviceInformation: - + RC = UDFQueryFsDeviceInfo( PtrIrpContext, Vcb, (PFILE_FS_DEVICE_INFORMATION)(Irp->AssociatedIrp.SystemBuffer), &Length ); break; - + case FileFsAttributeInformation: - + RC = UDFQueryFsAttributeInfo( PtrIrpContext, Vcb, (PFILE_FS_ATTRIBUTE_INFORMATION)(Irp->AssociatedIrp.SystemBuffer), &Length ); break; @@ -251,7 +251,7 @@ UDFCommonQueryVolInfo( try_exit: NOTHING; } _SEH2_FINALLY { - + if (AcquiredVCB) { UDFReleaseResource(&(Vcb->VCBResource)); AcquiredVCB = FALSE; @@ -684,9 +684,9 @@ UDFCommonSetVolInfo( UDFPrint(("UDFCommonSetVolInfo: \n")); ASSERT(PtrIrpContext); ASSERT(Irp); - + PAGED_CODE(); - + FileObject = IrpSp->FileObject; ASSERT(FileObject); @@ -730,13 +730,13 @@ UDFCommonSetVolInfo( } #endif //UDF_ENABLE_SECURITY switch (IrpSp->Parameters.SetVolume.FsInformationClass) { - + case FileFsLabelInformation: - + RC = UDFSetLabelInfo( PtrIrpContext, Vcb, (PFILE_FS_LABEL_INFORMATION)(Irp->AssociatedIrp.SystemBuffer), &Length ); Irp->IoStatus.Information = 0; break; - + default: RC = STATUS_INVALID_DEVICE_REQUEST; @@ -751,7 +751,7 @@ UDFCommonSetVolInfo( try_exit: NOTHING; } _SEH2_FINALLY { - + if (AcquiredVCB) { UDFReleaseResource(&(Vcb->VCBResource)); AcquiredVCB = FALSE; @@ -808,7 +808,7 @@ UDFSetLabelInfo ( if(Vcb->VolIdent.Buffer) MyFreePool__(Vcb->VolIdent.Buffer); Vcb->VolIdent.Buffer = (PWCHAR)MyAllocatePool__(NonPagedPool, Buffer->VolumeLabelLength+sizeof(WCHAR)); if(!Vcb->VolIdent.Buffer) return STATUS_INSUFFICIENT_RESOURCES; - + Vcb->VolIdent.Length = (USHORT)Buffer->VolumeLabelLength; Vcb->VolIdent.MaximumLength = (USHORT)Buffer->VolumeLabelLength+sizeof(WCHAR); RtlCopyMemory(Vcb->VolIdent.Buffer, &(Buffer->VolumeLabel), Buffer->VolumeLabelLength); diff --git a/drivers/filesystems/udfs/write.cpp b/drivers/filesystems/udfs/write.cpp index 60854a77240..2314d2682c7 100644 --- a/drivers/filesystems/udfs/write.cpp +++ b/drivers/filesystems/udfs/write.cpp @@ -464,7 +464,7 @@ UDFCommonWrite( // WARNING !!! we should not flush data beyond valid data length if ( NonBufferedIo && !PagingIo && - NtReqFcb->SectionObject.DataSectionObject && + NtReqFcb->SectionObject.DataSectionObject && TruncatedLength && (ByteOffset.QuadPart < NtReqFcb->CommonFCBHeader.FileSize.QuadPart)) { @@ -1048,7 +1048,7 @@ NTAPI UDFDeferredWriteCallBack( IN PVOID Context1, // Should be PtrIrpContext IN PVOID Context2 // Should be Irp - ) + ) { UDFPrint(("UDFDeferredWriteCallBack\n")); // We should typically simply post the request to our internal @@ -1109,19 +1109,19 @@ UDFPurgeCacheEx_( #ifndef USE_CcCopyWrite_TO_ZERO *((PULONG)&Offset0) &= ~(PAGE_SIZE-1); MmPrint((" CcFlushCache(s) Offs %I64x, Len %x\n", Offset0, Off_l)); - CcFlushCache( SectionObject, (PLARGE_INTEGER)&Offset0, Off_l, NULL ); + CcFlushCache( SectionObject, (PLARGE_INTEGER)&Offset0, Off_l, NULL ); #else //USE_CcCopyWrite_TO_ZERO // ...|ddddd000000000000|.... // |<- PgLen ->| PgLen = PAGE_SIZE - Off_l; /*(*((PULONG)&Offset) & (PAGE_SIZE-1))*/ - // + // if(PgLen > Length) PgLen = (ULONG)Length; MmPrint((" ZeroCache (CcWrite) Offs %I64x, Len %x\n", Offset, PgLen)); #ifdef DBG if(FileObject && Vcb) { - + ASSERT(CanWait); #endif //DBG if (PgLen) { @@ -1135,7 +1135,7 @@ UDFPurgeCacheEx_( } else { MmPrint((" Can't use CcWrite to zero cache\n")); } -#endif //DBG +#endif //DBG #endif //USE_CcCopyWrite_TO_ZERO } VDL = NtReqFcb->CommonFCBHeader.ValidDataLength.QuadPart; @@ -1199,7 +1199,7 @@ UDFPurgeCacheEx_( } else { CcPurgeCacheSection(SectionObject, (PLARGE_INTEGER)&Offset, PURGE_BLOCK_SZ, FALSE); - /* + /* NtReqFcb->CommonFCBHeader.ValidDataLength.QuadPart += PURGE_BLOCK_SZ; ASSERT(NtReqFcb->CommonFCBHeader.ValidDataLength.QuadPart <= NtReqFcb->CommonFCBHeader.FileSize.QuadPart); diff --git a/drivers/hid/hidclass/hidclass.c b/drivers/hid/hidclass/hidclass.c index 40c31ed609f..447cf7d41ab 100644 --- a/drivers/hid/hidclass/hidclass.c +++ b/drivers/hid/hidclass/hidclass.c @@ -1123,7 +1123,7 @@ HidClass_Power( { PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; CommonDeviceExtension = DeviceObject->DeviceExtension; - + if (CommonDeviceExtension->IsFDO) { IoCopyCurrentIrpStackLocationToNext(Irp); diff --git a/drivers/hid/mouhid/mouhid.c b/drivers/hid/mouhid/mouhid.c index 073b22c303c..faccaf8fa38 100644 --- a/drivers/hid/mouhid/mouhid.c +++ b/drivers/hid/mouhid/mouhid.c @@ -44,7 +44,7 @@ MouHid_GetButtonMove( *LastX = 0; *LastY = 0; - if (!DeviceExtension->MouseAbsolute) + if (!DeviceExtension->MouseAbsolute) { /* get scaled usage value x */ Status = HidP_GetScaledUsageValue(HidP_Input, diff --git a/drivers/input/i8042prt/misc.c b/drivers/input/i8042prt/misc.c index fd0a0d0e2a1..36927d50f05 100644 --- a/drivers/input/i8042prt/misc.c +++ b/drivers/input/i8042prt/misc.c @@ -84,7 +84,7 @@ DuplicateUnicodeString( if ((SourceString->Length == 0) - && (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + && (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) { DestinationString->Length = 0; diff --git a/drivers/input/kbdclass/kbdclass.c b/drivers/input/kbdclass/kbdclass.c index 1ba29a2bbdb..8ed1b68f5c8 100644 --- a/drivers/input/kbdclass/kbdclass.c +++ b/drivers/input/kbdclass/kbdclass.c @@ -832,7 +832,7 @@ ClassPnp( OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK Iosb; NTSTATUS Status; - + switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE: @@ -859,7 +859,7 @@ ClassPnp( Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; - + case IRP_MN_STOP_DEVICE: if (DeviceExtension->FileHandle) { @@ -868,7 +868,7 @@ ClassPnp( } Status = STATUS_SUCCESS; break; - + case IRP_MN_REMOVE_DEVICE: if (DeviceExtension->FileHandle) { diff --git a/drivers/input/mouclass/mouclass.c b/drivers/input/mouclass/mouclass.c index 3f0f56b1b40..c12ecd5dd65 100644 --- a/drivers/input/mouclass/mouclass.c +++ b/drivers/input/mouclass/mouclass.c @@ -808,7 +808,7 @@ ClassPnp( OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK Iosb; NTSTATUS Status; - + switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE: @@ -835,7 +835,7 @@ ClassPnp( Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; - + case IRP_MN_STOP_DEVICE: if (DeviceExtension->FileHandle) { @@ -844,7 +844,7 @@ ClassPnp( } Status = STATUS_SUCCESS; break; - + case IRP_MN_REMOVE_DEVICE: if (DeviceExtension->FileHandle) { diff --git a/drivers/ksfilter/ks/allocators.c b/drivers/ksfilter/ks/allocators.c index 2f8ee11908f..a265f048372 100644 --- a/drivers/ksfilter/ks/allocators.c +++ b/drivers/ksfilter/ks/allocators.c @@ -415,7 +415,7 @@ KsValidateAllocatorCreateRequest( /* allowed supported flags */ SupportedFlags = (KSALLOCATOR_OPTIONF_COMPATIBLE | KSALLOCATOR_OPTIONF_SYSTEM_MEMORY | - KSALLOCATOR_REQUIREMENTF_INPLACE_MODIFIER | KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_FRAME_INTEGRITY | + KSALLOCATOR_REQUIREMENTF_INPLACE_MODIFIER | KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_FRAME_INTEGRITY | KSALLOCATOR_REQUIREMENTF_MUST_ALLOCATE); @@ -607,7 +607,7 @@ KsCreateDefaultAllocatorEx( } /* allocate object header */ - + Status = KsAllocateObjectHeader((KSOBJECT_HEADER*)&Allocator->Header, 0, NULL, Irp, &DispatchTable); if (!NT_SUCCESS(Status)) { diff --git a/drivers/ksfilter/ks/clocks.c b/drivers/ksfilter/ks/clocks.c index 2a37138ab6b..730748b2343 100644 --- a/drivers/ksfilter/ks/clocks.c +++ b/drivers/ksfilter/ks/clocks.c @@ -288,7 +288,7 @@ KsValidateClockCreateRequest( Size = sizeof(KSCLOCK_CREATE); /* copy create request */ - Status = KspCopyCreateRequest(Irp, + Status = KspCopyCreateRequest(Irp, KSSTRING_Clock, &Size, (PVOID*)&ClockCreate); diff --git a/drivers/ksfilter/ks/connectivity.c b/drivers/ksfilter/ks/connectivity.c index a27151ddef8..b5d348106b6 100644 --- a/drivers/ksfilter/ks/connectivity.c +++ b/drivers/ksfilter/ks/connectivity.c @@ -11,7 +11,7 @@ #define NDEBUG #include -KSPIN_INTERFACE StandardPinInterface = +KSPIN_INTERFACE StandardPinInterface = { {STATIC_KSINTERFACESETID_Standard}, KSINTERFACE_STANDARD_STREAMING, diff --git a/drivers/ksfilter/ks/deviceinterface.c b/drivers/ksfilter/ks/deviceinterface.c index 36fe9437fc9..efd2be6258d 100644 --- a/drivers/ksfilter/ks/deviceinterface.c +++ b/drivers/ksfilter/ks/deviceinterface.c @@ -78,7 +78,7 @@ KspRegisterDeviceInterfaces( return STATUS_INSUFFICIENT_RESOURCES; /* now register device interface */ - Status = IoRegisterDeviceInterface(PhysicalDeviceObject, + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &Categories[Index], ReferenceString, &SymEntry->SymbolicLink); diff --git a/drivers/ksfilter/ks/ksiface.h b/drivers/ksfilter/ks/ksiface.h index a7c3f01b9c8..d3a456a5350 100644 --- a/drivers/ksfilter/ks/ksiface.h +++ b/drivers/ksfilter/ks/ksiface.h @@ -105,7 +105,7 @@ DECLARE_INTERFACE_(IKsPin, IUnknown) IN KSSTATE NewState, IN IKsTransport * *OutTransport) PURE; - STDMETHOD_(VOID, SetResetState)(THIS_ + STDMETHOD_(VOID, SetResetState)(THIS_ IN KSRESET ResetState, OUT IKsTransport * * OutTransportOut) PURE; diff --git a/drivers/ksfilter/ks/kstypes.h b/drivers/ksfilter/ks/kstypes.h index cd4aaca3707..2c185ec6f07 100644 --- a/drivers/ksfilter/ks/kstypes.h +++ b/drivers/ksfilter/ks/kstypes.h @@ -184,7 +184,7 @@ typedef enum Stopped, // Device has received the STOP_DEVICE IRP RemovePending, // Device has received the QUERY_REMOVE IRP SurpriseRemovePending, // Device has received the SURPRISE_REMOVE IRP - Deleted + Deleted }DEVICE_STATE; diff --git a/drivers/ksfilter/ks/swenum.c b/drivers/ksfilter/ks/swenum.c index 04b473d6a02..79fb61ab972 100644 --- a/drivers/ksfilter/ks/swenum.c +++ b/drivers/ksfilter/ks/swenum.c @@ -1968,7 +1968,7 @@ KsServiceBusEnumCreateRequest( Status = KspDoReparseForIrp(Irp, DeviceEntry); DPRINT("REPARSE Irp %p '%wZ'\n", Irp, &IoStack->FileObject->FileName); - Irp->IoStatus.Status = Status; + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = IO_REPARSE; return Status; } diff --git a/drivers/ksfilter/ks/worker.c b/drivers/ksfilter/ks/worker.c index 1fd84efcdb6..d225b5a332a 100644 --- a/drivers/ksfilter/ks/worker.c +++ b/drivers/ksfilter/ks/worker.c @@ -92,7 +92,7 @@ KsRegisterWorker( PKSIWORKER KsWorker; - if (WorkQueueType != CriticalWorkQueue && + if (WorkQueueType != CriticalWorkQueue && WorkQueueType != DelayedWorkQueue && WorkQueueType != HyperCriticalWorkQueue) { @@ -278,6 +278,6 @@ KsQueueWorkItem( } /* release lock */ KeReleaseSpinLock(&KsWorker->Lock, OldIrql); - + return STATUS_SUCCESS; } diff --git a/drivers/network/afd/afd/read.c b/drivers/network/afd/afd/read.c index e786faa2515..eb9b3019325 100644 --- a/drivers/network/afd/afd/read.c +++ b/drivers/network/afd/afd/read.c @@ -492,7 +492,7 @@ AfdConnectedSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp, return UnlockAndMaybeComplete(FCB, Status, Irp, Irp->IoStatus.Information); } - else if (!(RecvReq->AfdFlags & AFD_OVERLAPPED) && + else if (!(RecvReq->AfdFlags & AFD_OVERLAPPED) && ((RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); @@ -519,7 +519,7 @@ AfdConnectedSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp, Status = ReceiveActivity( FCB, Irp ); if( Status == STATUS_PENDING && - !(RecvReq->AfdFlags & AFD_OVERLAPPED) && + !(RecvReq->AfdFlags & AFD_OVERLAPPED) && ((RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; @@ -772,7 +772,7 @@ AfdPacketSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp, return UnlockAndMaybeComplete(FCB, Status, Irp, Irp->IoStatus.Information); } - else if (!(RecvReq->AfdFlags & AFD_OVERLAPPED) && + else if (!(RecvReq->AfdFlags & AFD_OVERLAPPED) && ((RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); diff --git a/drivers/network/dd/e1000/info.c b/drivers/network/dd/e1000/info.c index e35e3d1b7e0..42b7fe8f2c8 100644 --- a/drivers/network/dd/e1000/info.c +++ b/drivers/network/dd/e1000/info.c @@ -256,7 +256,7 @@ MiniportSetInformation( NdisMoveMemory(&genericUlong, InformationBuffer, sizeof(ULONG)); - if (genericUlong & + if (genericUlong & (NDIS_PACKET_TYPE_SOURCE_ROUTING | NDIS_PACKET_TYPE_SMT | NDIS_PACKET_TYPE_ALL_LOCAL | @@ -311,7 +311,7 @@ MiniportSetInformation( status = NDIS_STATUS_INVALID_LENGTH; break; } - + if (InformationBufferLength / 6 > MAXIMUM_MULTICAST_ADDRESSES) { *BytesNeeded = MAXIMUM_MULTICAST_ADDRESSES * IEEE_802_ADDR_LENGTH; diff --git a/drivers/network/dd/netkvm/Common/ParaNdis-Common.c b/drivers/network/dd/netkvm/Common/ParaNdis-Common.c index ebb0c04b981..71fa0de46a4 100644 --- a/drivers/network/dd/netkvm/Common/ParaNdis-Common.c +++ b/drivers/network/dd/netkvm/Common/ParaNdis-Common.c @@ -891,7 +891,7 @@ NDIS_STATUS ParaNdis_InitializeContext( status = FinalizeFeatures(pContext); pContext->ReuseBufferProc = (tReuseReceiveBufferProc)ReuseReceiveBufferRegular; - + NdisInitializeEvent(&pContext->ResetEvent); DEBUG_EXIT_STATUS(0, status); return status; @@ -1532,7 +1532,7 @@ void ReuseReceiveBufferRegular(PARANDIS_ADAPTER *pContext, pIONetDescriptor pBuf /********************************************************** It is called from Rx processing routines between power off and power on in non-paused mode (Win8). -Returns received buffer to NetReceiveBuffers. +Returns received buffer to NetReceiveBuffers. All the buffers will be placed into Virtio queue during power-on procedure Must be called with &pContext->ReceiveLock acquired @@ -2754,12 +2754,12 @@ NDIS_STATUS ParaNdis_PowerOn(PARANDIS_ADAPTER *pContext) ParaNdis_UpdateDeviceFilters(pContext); InitializeListHead(&TempList); - + /* submit all the receive buffers */ NdisAcquireSpinLock(&pContext->ReceiveLock); - + pContext->ReuseBufferProc = (tReuseReceiveBufferProc)ReuseReceiveBufferRegular; - + while (!IsListEmpty(&pContext->NetReceiveBuffers)) { pIONetDescriptor pBufferDescriptor = @@ -2787,7 +2787,7 @@ NDIS_STATUS ParaNdis_PowerOn(PARANDIS_ADAPTER *pContext) ParaNdis_SetPowerState(pContext, NdisDeviceStateD0); pContext->bEnableInterruptHandlingDPC = TRUE; virtio_device_ready(&pContext->IODevice); - + NdisReleaseSpinLock(&pContext->ReceiveLock); // if bFastSuspendInProcess is set by Win8 power-off procedure, @@ -2795,7 +2795,7 @@ NDIS_STATUS ParaNdis_PowerOn(PARANDIS_ADAPTER *pContext) // otherwise it does not do anything in Vista+ (Tx and RX are enabled after power-on by Restart) ParaNdis_Resume(pContext); pContext->bFastSuspendInProcess = FALSE; - + ParaNdis_ReportLinkStatus(pContext, TRUE); ParaNdis_DebugHistory(pContext, hopPowerOn, NULL, 0, 0, 0); @@ -2818,14 +2818,14 @@ VOID ParaNdis_PowerOff(PARANDIS_ADAPTER *pContext) /* back compat - remove the OK flag only in legacy mode */ VirtIODeviceRemoveStatus(&pContext->IODevice, VIRTIO_CONFIG_S_DRIVER_OK); } - + if (pContext->bFastSuspendInProcess) { NdisAcquireSpinLock(&pContext->ReceiveLock); pContext->ReuseBufferProc = (tReuseReceiveBufferProc)ReuseReceiveBufferPowerOff; NdisReleaseSpinLock(&pContext->ReceiveLock); } - + ParaNdis_SetPowerState(pContext, NdisDeviceStateD3); PreventDPCServicing(pContext); diff --git a/drivers/network/dd/netkvm/Common/ParaNdis-VirtIO.c b/drivers/network/dd/netkvm/Common/ParaNdis-VirtIO.c index a1525502696..10abd4cd954 100644 --- a/drivers/network/dd/netkvm/Common/ParaNdis-VirtIO.c +++ b/drivers/network/dd/netkvm/Common/ParaNdis-VirtIO.c @@ -209,7 +209,7 @@ static ULONGLONG mem_get_physical_address(void *context, void *virt) ULONG_PTR uBase = (ULONG_PTR)pContext->SharedMemoryRanges[i].pBase; if (uAddr >= uBase && uAddr < (uBase + pContext->SharedMemoryRanges[i].uLength)) { ULONGLONG retVal = pContext->SharedMemoryRanges[i].BasePA.QuadPart + (uAddr - uBase); - + DPrintf(6, ("[%s] translated %p to %I64X\n", __FUNCTION__, virt, retVal)); return retVal; } diff --git a/drivers/network/dd/netkvm/Common/sw-offload.c b/drivers/network/dd/netkvm/Common/sw-offload.c index c41a1b9122a..7c727d18753 100644 --- a/drivers/network/dd/netkvm/Common/sw-offload.c +++ b/drivers/network/dd/netkvm/Common/sw-offload.c @@ -46,8 +46,8 @@ typedef struct _tagIPv6Header { USHORT ip6_payload_len; // length of following headers and payload UCHAR ip6_next_header; // next header type UCHAR ip6_hoplimit; // hop limit - IPV6_ADDRESS ip6_src_address; // - IPV6_ADDRESS ip6_dst_address; // + IPV6_ADDRESS ip6_src_address; // + IPV6_ADDRESS ip6_dst_address; // } IPv6Header; typedef union @@ -60,7 +60,7 @@ typedef union typedef struct _tagIPv6ExtHeader { UCHAR ip6ext_next_header; // next header type UCHAR ip6ext_hdr_len; // length of this header in 8 bytes unit, not including first 8 bytes - USHORT options; // + USHORT options; // } IPv6ExtHeader; // IP Pseudo Header RFC 768 @@ -164,7 +164,7 @@ QualifyIpPacket(IPHeader *pIpHeader, ULONG len) USHORT ipHeaderSize = 0; USHORT fullLength = 0; res.value = 0; - + if (ip_version == 4) { ipHeaderSize = (ver_len & 0xF) << 2; @@ -256,7 +256,7 @@ QualifyIpPacket(IPHeader *pIpHeader, ULONG len) res.ipStatus = ppresNotIP; } } - + if (res.ipStatus == ppresIPV4) { res.ipHeaderSize = ipHeaderSize; @@ -289,7 +289,7 @@ static __inline USHORT GetXxpHeaderAndPayloadLen(IPHeader *pIpHeader, tTcpIpPack { USHORT headerLength = IP_HEADER_LENGTH(&pIpHeader->v4); USHORT len = swap_short(pIpHeader->v4.ip_length); - return len - headerLength; + return len - headerLength; } if (res.ipStatus == ppresIPV6) { @@ -529,8 +529,8 @@ VerifyUdpChecksum( IPHeader *pIpHeader, ULONG len, tTcpIpPacketParsingResult kno static LPCSTR __inline GetPacketCase(tTcpIpPacketParsingResult res) { static const char *const IPCaseName[4] = { "not tested", "Non-IP", "IPv4", "IPv6" }; - if (res.xxpStatus == ppresXxpKnown) return res.TcpUdp == ppresIsTCP ? - (res.ipStatus == ppresIPV4 ? "TCPv4" : "TCPv6") : + if (res.xxpStatus == ppresXxpKnown) return res.TcpUdp == ppresIsTCP ? + (res.ipStatus == ppresIPV4 ? "TCPv4" : "TCPv6") : (res.ipStatus == ppresIPV4 ? "UDPv4" : "UDPv6"); if (res.xxpStatus == ppresXxpIncomplete) return res.TcpUdp == ppresIsTCP ? "Incomplete TCP" : "Incomplete UDP"; if (res.xxpStatus == ppresXxpOther) return "IP"; diff --git a/drivers/network/dd/pcnet/pcnet.c b/drivers/network/dd/pcnet/pcnet.c index 0a78530765e..456f41f5f3a 100644 --- a/drivers/network/dd/pcnet/pcnet.c +++ b/drivers/network/dd/pcnet/pcnet.c @@ -811,7 +811,7 @@ MiTestCard( NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR3); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); DPRINT("CSR3: 0x%x\n", Data); - + /* Read status flags from CSR4 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR4); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); @@ -826,11 +826,11 @@ MiTestCard( NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR6); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); DPRINT("CSR6: 0x%x\n", Data); - + /* Read status flags from BCR4 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4); NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data); - DPRINT("BCR4: 0x%x\n", Data); + DPRINT("BCR4: 0x%x\n", Data); return TRUE; } diff --git a/drivers/network/dd/pcnet/requests.c b/drivers/network/dd/pcnet/requests.c index 86092e9603f..e9c78eec72b 100644 --- a/drivers/network/dd/pcnet/requests.c +++ b/drivers/network/dd/pcnet/requests.c @@ -79,7 +79,7 @@ static ULONG MiniportOIDList[] = OID_802_3_XMIT_MORE_COLLISIONS }; - + NDIS_STATUS NTAPI MiniportQueryInformation( diff --git a/drivers/network/dd/rtl8139/hardware.c b/drivers/network/dd/rtl8139/hardware.c index e8b10647523..3d5105a7519 100644 --- a/drivers/network/dd/rtl8139/hardware.c +++ b/drivers/network/dd/rtl8139/hardware.c @@ -54,19 +54,19 @@ NICSoftReset ( // If the RST bit is high (1), then the reset is still in operation. // -- OSDev Wiki NdisRawWritePortUchar(Adapter->IoBase + R_CMD, B_CMD_RST); - + for (resetAttempts = 0; resetAttempts < MAX_RESET_ATTEMPTS; resetAttempts++) { NdisRawReadPortUchar(Adapter->IoBase + R_CMD, &commandReg); - + if (!(commandReg & B_CMD_RST)) { return NDIS_STATUS_SUCCESS; } - + NdisMSleep(100); } - + return NDIS_STATUS_FAILURE; } @@ -79,7 +79,7 @@ NICRegisterReceiveBuffer ( ASSERT(NdisGetPhysicalAddressHigh(Adapter->ReceiveBufferPa) == 0); NdisRawWritePortUlong(Adapter->IoBase + R_RXSA, Adapter->ReceiveBufferPa.LowPart); - + return NDIS_STATUS_SUCCESS; } @@ -100,7 +100,7 @@ NICEnableTxRx ( ) { NdisRawWritePortUchar(Adapter->IoBase + R_CMD, B_CMD_TXE | B_CMD_RXE); - + // // TX and RX must be enabled before setting these // @@ -117,7 +117,7 @@ NICGetPermanentMacAddress ( ) { UINT i; - + for (i = 0; i < IEEE_802_ADDR_LENGTH; i++) { NdisRawReadPortUchar(Adapter->IoBase + R_MAC + i, &MacAddress[i]); @@ -154,11 +154,11 @@ NICInterruptRecognized ( ) { USHORT interruptStatus; - + NdisRawReadPortUshort(Adapter->IoBase + R_IS, &interruptStatus); - + *InterruptRecognized = (interruptStatus & Adapter->InterruptMask) != 0; - + return (interruptStatus & Adapter->InterruptMask); } @@ -194,29 +194,29 @@ NICApplyPacketFilter ( ULONG filterMask; filterMask = RC_VAL; - + if (Adapter->PacketFilter & NDIS_PACKET_TYPE_DIRECTED) { filterMask |= B_RC_APM; } - + if (Adapter->PacketFilter & NDIS_PACKET_TYPE_MULTICAST) { filterMask |= B_RC_AM; } - + if (Adapter->PacketFilter & NDIS_PACKET_TYPE_BROADCAST) { filterMask |= B_RC_AB; } - + if (Adapter->PacketFilter & NDIS_PACKET_TYPE_PROMISCUOUS) { filterMask |= B_RC_AAP; } - + NdisRawWritePortUlong(Adapter->IoBase + R_RC, filterMask); - + return NDIS_STATUS_SUCCESS; } diff --git a/drivers/network/dd/rtl8139/info.c b/drivers/network/dd/rtl8139/info.c index 1bbdaf55615..18dd9c417bf 100644 --- a/drivers/network/dd/rtl8139/info.c +++ b/drivers/network/dd/rtl8139/info.c @@ -80,28 +80,28 @@ MiniportQueryInformation ( ULONG copyLength; PVOID copySource; NDIS_STATUS status; - + status = NDIS_STATUS_SUCCESS; copySource = &genericUlong; copyLength = sizeof(ULONG); NdisAcquireSpinLock(&adapter->Lock); - + switch (Oid) { case OID_GEN_SUPPORTED_LIST: copySource = (PVOID)&SupportedOidList; copyLength = sizeof(SupportedOidList); break; - + case OID_GEN_CURRENT_PACKET_FILTER: genericUlong = adapter->PacketFilter; break; - + case OID_GEN_HARDWARE_STATUS: genericUlong = (ULONG)NdisHardwareStatusReady; //FIXME break; - + case OID_GEN_MEDIA_SUPPORTED: case OID_GEN_MEDIA_IN_USE: { @@ -130,7 +130,7 @@ MiniportQueryInformation ( case OID_GEN_RECEIVE_BUFFER_SPACE: genericUlong = RECEIVE_BUFFER_SIZE; break; - + case OID_GEN_VENDOR_ID: // // The 3 bytes of the MAC address is the vendor ID @@ -140,7 +140,7 @@ MiniportQueryInformation ( genericUlong |= (adapter->PermanentMacAddress[1] << 8); genericUlong |= (adapter->PermanentMacAddress[2] & 0xFF); break; - + case OID_GEN_VENDOR_DESCRIPTION: { static UCHAR vendorDesc[] = "ReactOS Team"; @@ -148,11 +148,11 @@ MiniportQueryInformation ( copyLength = sizeof(vendorDesc); break; } - + case OID_GEN_VENDOR_DRIVER_VERSION: genericUlong = DRIVER_VERSION; break; - + case OID_GEN_DRIVER_VERSION: { static const USHORT driverVersion = @@ -161,45 +161,45 @@ MiniportQueryInformation ( copyLength = sizeof(driverVersion); break; } - + case OID_GEN_MAXIMUM_TOTAL_SIZE: genericUlong = MAXIMUM_FRAME_SIZE; break; - + case OID_GEN_PROTOCOL_OPTIONS: NDIS_DbgPrint(MIN_TRACE, ("OID_GEN_PROTOCOL_OPTIONS is unimplemented\n")); status = NDIS_STATUS_NOT_SUPPORTED; break; - + case OID_GEN_MAC_OPTIONS: genericUlong = NDIS_MAC_OPTION_RECEIVE_SERIALIZED | NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA | NDIS_MAC_OPTION_TRANSFERS_NOT_PEND | NDIS_MAC_OPTION_NO_LOOPBACK; break; - + case OID_GEN_MEDIA_CONNECT_STATUS: genericUlong = adapter->MediaState; break; - + case OID_GEN_MAXIMUM_SEND_PACKETS: genericUlong = 1; break; - + case OID_802_3_CURRENT_ADDRESS: copySource = adapter->CurrentMacAddress; copyLength = IEEE_802_ADDR_LENGTH; break; - + case OID_802_3_PERMANENT_ADDRESS: copySource = adapter->PermanentMacAddress; copyLength = IEEE_802_ADDR_LENGTH; break; - + case OID_802_3_MAXIMUM_LIST_SIZE: genericUlong = MAXIMUM_MULTICAST_ADDRESSES; break; - + case OID_GEN_XMIT_OK: genericUlong = adapter->TransmitOk; break; @@ -235,13 +235,13 @@ MiniportQueryInformation ( case OID_802_3_XMIT_MORE_COLLISIONS: genericUlong = adapter->TransmitMoreCollisions; break; - + default: NDIS_DbgPrint(MIN_TRACE, ("Unknown OID\n")); status = NDIS_STATUS_NOT_SUPPORTED; break; } - + if (status == NDIS_STATUS_SUCCESS) { if (copyLength > InformationBufferLength) @@ -262,7 +262,7 @@ MiniportQueryInformation ( *BytesWritten = 0; *BytesNeeded = 0; } - + NdisReleaseSpinLock(&adapter->Lock); NDIS_DbgPrint(MAX_TRACE, ("Query OID 0x%x: Completed with status 0x%x (%d, %d)\n", @@ -285,9 +285,9 @@ MiniportSetInformation ( PRTL_ADAPTER adapter = (PRTL_ADAPTER)MiniportAdapterContext; ULONG genericUlong; NDIS_STATUS status; - + status = NDIS_STATUS_SUCCESS; - + NdisAcquireSpinLock(&adapter->Lock); switch (Oid) @@ -300,10 +300,10 @@ MiniportSetInformation ( status = NDIS_STATUS_INVALID_LENGTH; break; } - + NdisMoveMemory(&genericUlong, InformationBuffer, sizeof(ULONG)); - - if (genericUlong & + + if (genericUlong & (NDIS_PACKET_TYPE_ALL_FUNCTIONAL | NDIS_PACKET_TYPE_FUNCTIONAL | NDIS_PACKET_TYPE_GROUP | @@ -316,18 +316,18 @@ MiniportSetInformation ( status = NDIS_STATUS_NOT_SUPPORTED; break; } - + adapter->PacketFilter = genericUlong; - + status = NICApplyPacketFilter(adapter); if (status != NDIS_STATUS_SUCCESS) { NDIS_DbgPrint(MIN_TRACE, ("Failed to apply new packet filter\n")); break; } - + break; - + case OID_GEN_CURRENT_LOOKAHEAD: if (InformationBufferLength < sizeof(ULONG)) { @@ -336,7 +336,7 @@ MiniportSetInformation ( status = NDIS_STATUS_INVALID_LENGTH; break; } - + NdisMoveMemory(&genericUlong, InformationBuffer, sizeof(ULONG)); if (genericUlong > MAXIMUM_FRAME_SIZE - sizeof(ETH_HEADER)) @@ -347,9 +347,9 @@ MiniportSetInformation ( { // Ignore this... } - + break; - + case OID_802_3_MULTICAST_LIST: if (InformationBufferLength % IEEE_802_ADDR_LENGTH) { @@ -358,7 +358,7 @@ MiniportSetInformation ( status = NDIS_STATUS_INVALID_LENGTH; break; } - + if (InformationBufferLength / 6 > MAXIMUM_MULTICAST_ADDRESSES) { *BytesNeeded = MAXIMUM_MULTICAST_ADDRESSES * IEEE_802_ADDR_LENGTH; @@ -366,13 +366,13 @@ MiniportSetInformation ( status = NDIS_STATUS_INVALID_LENGTH; break; } - + NdisMoveMemory(adapter->MulticastList, InformationBuffer, InformationBufferLength); - + // FIXME: Write to device - + break; - + default: NDIS_DbgPrint(MIN_TRACE, ("Unknown OID\n")); status = NDIS_STATUS_NOT_SUPPORTED; @@ -380,13 +380,13 @@ MiniportSetInformation ( *BytesNeeded = 0; break; } - + if (status == NDIS_STATUS_SUCCESS) { *BytesRead = InformationBufferLength; *BytesNeeded = 0; } - + NdisReleaseSpinLock(&adapter->Lock); return status; diff --git a/drivers/network/dd/rtl8139/interrupt.c b/drivers/network/dd/rtl8139/interrupt.c index 38da621e262..e16232a9b15 100644 --- a/drivers/network/dd/rtl8139/interrupt.c +++ b/drivers/network/dd/rtl8139/interrupt.c @@ -34,13 +34,13 @@ MiniportISR ( { PRTL_ADAPTER adapter = (PRTL_ADAPTER)MiniportAdapterContext; ULONG csConfig; - + // // FIXME: We need to synchronize with this ISR for changes to InterruptPending, // LinkChange, MediaState, and LinkSpeedMbps. We can get away with IRQL // synchronization on non-SMP machines because we run a DIRQL here. // - + adapter->InterruptPending |= NICInterruptRecognized(adapter, InterruptRecognized); if (!(*InterruptRecognized)) { @@ -50,7 +50,7 @@ MiniportISR ( *QueueMiniportHandleInterrupt = FALSE; return; } - + // // We have to check for a special link change interrupt before acknowledging // @@ -63,7 +63,7 @@ MiniportISR ( NICUpdateLinkStatus(adapter); } } - + // // Acknowledge the interrupt and mark the events pending service // @@ -82,11 +82,11 @@ MiniportHandleInterrupt ( UCHAR command; PPACKET_HEADER nicHeader; PETH_HEADER ethHeader; - + NdisDprAcquireSpinLock(&adapter->Lock); - + NDIS_DbgPrint(MAX_TRACE, ("Interrupts pending: 0x%x\n", adapter->InterruptPending)); - + // // Handle a link change // @@ -101,8 +101,8 @@ MiniportHandleInterrupt ( NdisMIndicateStatusComplete(adapter->MiniportAdapterHandle); NdisDprAcquireSpinLock(&adapter->Lock); adapter->LinkChange = FALSE; - } - + } + // // Handle a TX interrupt // @@ -112,7 +112,7 @@ MiniportHandleInterrupt ( { NdisRawReadPortUlong(adapter->IoBase + R_TXSTS0 + (adapter->DirtyTxDesc * sizeof(ULONG)), &txStatus); - + if (!(txStatus & (R_TXS_STATOK | R_TXS_UNDERRUN | R_TXS_ABORTED))) { // @@ -120,10 +120,10 @@ MiniportHandleInterrupt ( // break; } - + NDIS_DbgPrint(MAX_TRACE, ("Transmission for desc %d complete: 0x%x\n", adapter->DirtyTxDesc, txStatus)); - + if (txStatus & R_TXS_STATOK) { adapter->TransmitOk++; @@ -139,7 +139,7 @@ MiniportHandleInterrupt ( adapter->TxFull = FALSE; } } - + // // Handle a good RX interrupt // @@ -156,9 +156,9 @@ MiniportHandleInterrupt ( adapter->InterruptPending &= ~(R_I_RXOK | R_I_RXERR); break; } - + adapter->ReceiveOffset %= RECEIVE_BUFFER_SIZE; - + NDIS_DbgPrint(MAX_TRACE, ("Looking for a packet at offset 0x%x\n", adapter->ReceiveOffset)); nicHeader = (PPACKET_HEADER)(adapter->ReceiveBuffer + adapter->ReceiveOffset); @@ -168,7 +168,7 @@ MiniportHandleInterrupt ( // Receive failed // NDIS_DbgPrint(MIN_TRACE, ("Receive failed: 0x%x\n", nicHeader->Status)); - + if (nicHeader->Status & RSR_FAE) { adapter->ReceiveAlignmentError++; @@ -178,13 +178,13 @@ MiniportHandleInterrupt ( adapter->ReceiveCrcError++; } adapter->ReceiveError++; - + goto NextPacket; } - + NDIS_DbgPrint(MAX_TRACE, ("Indicating %d byte packet to NDIS\n", nicHeader->PacketLength - RECV_CRC_LENGTH)); - + ethHeader = (PETH_HEADER)(nicHeader + 1); NdisMEthIndicateReceive(adapter->MiniportAdapterHandle, NULL, @@ -194,12 +194,12 @@ MiniportHandleInterrupt ( nicHeader->PacketLength - sizeof(ETH_HEADER) - RECV_CRC_LENGTH, nicHeader->PacketLength - sizeof(ETH_HEADER) - RECV_CRC_LENGTH); adapter->ReceiveOk++; - + NextPacket: adapter->ReceiveOffset += nicHeader->PacketLength + sizeof(PACKET_HEADER); adapter->ReceiveOffset = (adapter->ReceiveOffset + 3) & ~3; NdisRawWritePortUshort(adapter->IoBase + R_CAPR, adapter->ReceiveOffset - 0x10); - + if (adapter->InterruptPending & (R_I_RXOVRFLW | R_I_FIFOOVR)) { // @@ -209,9 +209,9 @@ MiniportHandleInterrupt ( adapter->InterruptPending &= ~(R_I_RXOVRFLW | R_I_FIFOOVR); } } - + NdisMEthIndicateReceiveComplete(adapter->MiniportAdapterHandle); } - + NdisDprReleaseSpinLock(&adapter->Lock); } diff --git a/drivers/network/dd/rtl8139/ndis.c b/drivers/network/dd/rtl8139/ndis.c index 80b3252e9e5..93a6a1f8fda 100644 --- a/drivers/network/dd/rtl8139/ndis.c +++ b/drivers/network/dd/rtl8139/ndis.c @@ -57,25 +57,25 @@ MiniportSend ( PUCHAR runtBuffer; ASSERT(sgList != NULL); - + ASSERT(sgList->NumberOfElements == 1); ASSERT(sgList->Elements[0].Address.HighPart == 0); ASSERT((sgList->Elements[0].Address.LowPart & 3) == 0); ASSERT(sgList->Elements[0].Length <= MAXIMUM_FRAME_SIZE); - + NDIS_DbgPrint(MAX_TRACE, ("Sending %d byte packet\n", sgList->Elements[0].Length)); - + NdisAcquireSpinLock(&adapter->Lock); - + if (adapter->TxFull) { NDIS_DbgPrint(MIN_TRACE, ("All TX descriptors are full\n")); NdisReleaseSpinLock(&adapter->Lock); return NDIS_STATUS_RESOURCES; } - + NDIS_DbgPrint(MAX_TRACE, ("Sending packet on TX desc %d\n", adapter->CurrentTxDesc)); - + // // If this is a runt, we need to pad it manually for the RTL8139 // @@ -84,7 +84,7 @@ MiniportSend ( transmitLength = MINIMUM_FRAME_SIZE; transmitBuffer = adapter->RuntTxBuffersPa.LowPart + (MINIMUM_FRAME_SIZE * adapter->CurrentTxDesc); - + NdisGetFirstBufferFromPacketSafe(Packet, &firstBuffer, &firstBufferVa, @@ -97,9 +97,9 @@ MiniportSend ( NdisReleaseSpinLock(&adapter->Lock); return NDIS_STATUS_RESOURCES; } - + ASSERT(firstBufferLength == totalBufferLength); - + runtBuffer = adapter->RuntTxBuffers + (MINIMUM_FRAME_SIZE * adapter->CurrentTxDesc); RtlCopyMemory(runtBuffer, firstBufferVa, firstBufferLength); RtlFillMemory(runtBuffer + firstBufferLength, MINIMUM_FRAME_SIZE - firstBufferLength, 0x00); @@ -117,16 +117,16 @@ MiniportSend ( NdisReleaseSpinLock(&adapter->Lock); return status; } - + adapter->CurrentTxDesc++; adapter->CurrentTxDesc %= TX_DESC_COUNT; - + if (adapter->CurrentTxDesc == adapter->DirtyTxDesc) { NDIS_DbgPrint(MID_TRACE, ("All TX descriptors are full now\n")); adapter->TxFull = TRUE; } - + NdisReleaseSpinLock(&adapter->Lock); return NDIS_STATUS_SUCCESS; @@ -141,7 +141,7 @@ MiniportHalt ( PRTL_ADAPTER adapter = (PRTL_ADAPTER)MiniportAdapterContext; ASSERT(adapter != NULL); - + // // Interrupts need to stop first // @@ -154,7 +154,7 @@ MiniportHalt ( // If we have a mapped IO port range, we can talk to the NIC // if (adapter->IoBase != NULL) - { + { if (adapter->ReceiveBuffer != NULL) { // @@ -169,7 +169,7 @@ MiniportHalt ( adapter->ReceiveBuffer, adapter->ReceiveBufferPa); } - + if (adapter->RuntTxBuffers != NULL) { NdisMFreeSharedMemory(adapter->MiniportAdapterHandle, @@ -178,7 +178,7 @@ MiniportHalt ( adapter->RuntTxBuffers, adapter->RuntTxBuffersPa); } - + // // Unregister the IO range // @@ -187,7 +187,7 @@ MiniportHalt ( adapter->IoRangeLength, adapter->IoBase); } - + // // Destroy the adapter context // @@ -210,7 +210,7 @@ MiniportInitialize ( UINT i; PNDIS_RESOURCE_LIST resourceList; UINT resourceListSize; - + // // Make sure the medium is supported // @@ -222,13 +222,13 @@ MiniportInitialize ( break; } } - + if (i == MediumArraySize) { NDIS_DbgPrint(MIN_TRACE, ("802.3 medium was not found in the medium array\n")); return NDIS_STATUS_UNSUPPORTED_MEDIA; } - + // // Allocate our adapter context // @@ -240,7 +240,7 @@ MiniportInitialize ( NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate adapter context\n")); return NDIS_STATUS_RESOURCES; } - + RtlZeroMemory(adapter, sizeof(*adapter)); adapter->MiniportAdapterHandle = MiniportAdapterHandle; NdisAllocateSpinLock(&adapter->Lock); @@ -269,7 +269,7 @@ MiniportInitialize ( status = NDIS_STATUS_FAILURE; goto Cleanup; } - + status = NdisAllocateMemoryWithTag((PVOID*)&resourceList, resourceListSize, RESOURCE_LIST_TAG); @@ -278,7 +278,7 @@ MiniportInitialize ( NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate resource list\n")); goto Cleanup; } - + NdisMQueryAdapterResources(&status, WrapperConfigurationContext, resourceList, @@ -288,35 +288,35 @@ MiniportInitialize ( NDIS_DbgPrint(MIN_TRACE, ("Unexpected failure of NdisMQueryAdapterResources #2\n")); goto Cleanup; } - + ASSERT(resourceList->Version == 1); ASSERT(resourceList->Revision == 1); - + for (i = 0; i < resourceList->Count; i++) { switch (resourceList->PartialDescriptors[i].Type) { case CmResourceTypePort: ASSERT(adapter->IoRangeStart == 0); - + ASSERT(resourceList->PartialDescriptors[i].u.Port.Start.HighPart == 0); - + adapter->IoRangeStart = resourceList->PartialDescriptors[i].u.Port.Start.LowPart; adapter->IoRangeLength = resourceList->PartialDescriptors[i].u.Port.Length; - + NDIS_DbgPrint(MID_TRACE, ("I/O port range is %p to %p\n", adapter->IoRangeStart, adapter->IoRangeStart + adapter->IoRangeLength)); break; - + case CmResourceTypeInterrupt: ASSERT(adapter->InterruptVector == 0); ASSERT(adapter->InterruptLevel == 0); - + adapter->InterruptVector = resourceList->PartialDescriptors[i].u.Interrupt.Vector; adapter->InterruptLevel = resourceList->PartialDescriptors[i].u.Interrupt.Level; adapter->InterruptShared = (resourceList->PartialDescriptors[i].ShareDisposition == CmResourceShareShared); adapter->InterruptFlags = resourceList->PartialDescriptors[i].Flags; - + NDIS_DbgPrint(MID_TRACE, ("IRQ vector is %d\n", adapter->InterruptVector)); break; @@ -325,16 +325,16 @@ MiniportInitialize ( break; } } - + NdisFreeMemory(resourceList, resourceListSize, 0); resourceList = NULL; - + if (adapter->IoRangeStart == 0 || adapter->InterruptVector == 0) { NDIS_DbgPrint(MIN_TRACE, ("Adapter didn't receive enough resources\n")); goto Cleanup; } - + // // Allocate the DMA resources // @@ -359,7 +359,7 @@ MiniportInitialize ( status = NDIS_STATUS_RESOURCES; goto Cleanup; } - + NdisMAllocateSharedMemory(MiniportAdapterHandle, MINIMUM_FRAME_SIZE * TX_DESC_COUNT, FALSE, @@ -371,7 +371,7 @@ MiniportInitialize ( status = NDIS_STATUS_RESOURCES; goto Cleanup; } - + // // Register the I/O port range and configure the NIC // @@ -384,7 +384,7 @@ MiniportInitialize ( NDIS_DbgPrint(MIN_TRACE, ("Unable to register IO port range (0x%x)\n", status)); goto Cleanup; } - + // // Adapter setup // @@ -394,28 +394,28 @@ MiniportInitialize ( NDIS_DbgPrint(MIN_TRACE, ("Unable to power on NIC (0x%x)\n", status)); goto Cleanup; } - + status = NICSoftReset(adapter); if (status != NDIS_STATUS_SUCCESS) { NDIS_DbgPrint(MIN_TRACE, ("Unable to reset the NIC (0x%x)\n", status)); goto Cleanup; } - + status = NICGetPermanentMacAddress(adapter, adapter->PermanentMacAddress); if (status != NDIS_STATUS_SUCCESS) { NDIS_DbgPrint(MIN_TRACE, ("Unable to get the fixed MAC address (0x%x)\n", status)); goto Cleanup; } - + RtlCopyMemory(adapter->CurrentMacAddress, adapter->PermanentMacAddress, IEEE_802_ADDR_LENGTH); - + // // Update link state and speed // NICUpdateLinkStatus(adapter); - + status = NICRegisterReceiveBuffer(adapter); if (status != NDIS_STATUS_SUCCESS) { @@ -439,9 +439,9 @@ MiniportInitialize ( NDIS_DbgPrint(MIN_TRACE, ("Unable to register interrupt (0x%x)\n", status)); goto Cleanup; } - + adapter->InterruptRegistered = TRUE; - + // // Enable interrupts on the NIC // @@ -452,7 +452,7 @@ MiniportInitialize ( NDIS_DbgPrint(MIN_TRACE, ("Unable to apply interrupt mask (0x%x)\n", status)); goto Cleanup; } - + // // Turn on TX and RX now // @@ -464,7 +464,7 @@ MiniportInitialize ( } return NDIS_STATUS_SUCCESS; - + Cleanup: if (resourceList != NULL) { @@ -474,7 +474,7 @@ Cleanup: { MiniportHalt(adapter); } - + return status; } diff --git a/drivers/network/dd/rtl8139/nic.h b/drivers/network/dd/rtl8139/nic.h index ecadc4d8372..f44641703de 100644 --- a/drivers/network/dd/rtl8139/nic.h +++ b/drivers/network/dd/rtl8139/nic.h @@ -36,19 +36,19 @@ typedef struct _RTL_ADAPTER { NDIS_HANDLE MiniportAdapterHandle; NDIS_SPIN_LOCK Lock; - + ULONG IoRangeStart; ULONG IoRangeLength; - + ULONG InterruptVector; ULONG InterruptLevel; BOOLEAN InterruptShared; ULONG InterruptFlags; - + PUCHAR IoBase; NDIS_MINIPORT_INTERRUPT Interrupt; BOOLEAN InterruptRegistered; - + UCHAR PermanentMacAddress[IEEE_802_ADDR_LENGTH]; UCHAR CurrentMacAddress[IEEE_802_ADDR_LENGTH]; struct { @@ -59,22 +59,22 @@ typedef struct _RTL_ADAPTER { PUCHAR ReceiveBuffer; NDIS_PHYSICAL_ADDRESS ReceiveBufferPa; USHORT ReceiveOffset; - + ULONG LinkSpeedMbps; ULONG MediaState; BOOLEAN LinkChange; - + ULONG PacketFilter; - + USHORT InterruptMask; USHORT InterruptPending; - + UCHAR DirtyTxDesc; UCHAR CurrentTxDesc; BOOLEAN TxFull; PUCHAR RuntTxBuffers; NDIS_PHYSICAL_ADDRESS RuntTxBuffersPa; - + ULONG ReceiveOk; ULONG TransmitOk; ULONG ReceiveError; @@ -84,7 +84,7 @@ typedef struct _RTL_ADAPTER { ULONG ReceiveAlignmentError; ULONG TransmitOneCollision; ULONG TransmitMoreCollisions; - + } RTL_ADAPTER, *PRTL_ADAPTER; NDIS_STATUS @@ -98,38 +98,38 @@ NTAPI NICSoftReset ( IN PRTL_ADAPTER Adapter ); - + NDIS_STATUS NTAPI NICRegisterReceiveBuffer ( IN PRTL_ADAPTER Adapter ); - + NDIS_STATUS NTAPI NICRemoveReceiveBuffer ( IN PRTL_ADAPTER Adapter ); - + NDIS_STATUS NTAPI NICEnableTxRx ( IN PRTL_ADAPTER Adapter ); - + NDIS_STATUS NTAPI NICGetPermanentMacAddress ( IN PRTL_ADAPTER Adapter, OUT PUCHAR MacAddress ); - + NDIS_STATUS NTAPI NICApplyPacketFilter ( IN PRTL_ADAPTER Adapter ); - + NDIS_STATUS NTAPI NICApplyInterruptMask ( @@ -141,14 +141,14 @@ NTAPI NICDisableInterrupts ( IN PRTL_ADAPTER Adapter ); - + USHORT NTAPI NICInterruptRecognized ( IN PRTL_ADAPTER Adapter, OUT PBOOLEAN InterruptRecognized ); - + VOID NTAPI NICAcknowledgeInterrupts ( @@ -169,7 +169,7 @@ NICTransmitPacket ( IN ULONG PhysicalAddress, IN ULONG Length ); - + NDIS_STATUS NTAPI MiniportSetInformation ( @@ -180,7 +180,7 @@ MiniportSetInformation ( OUT PULONG BytesRead, OUT PULONG BytesNeeded ); - + NDIS_STATUS NTAPI MiniportQueryInformation ( @@ -191,7 +191,7 @@ MiniportQueryInformation ( OUT PULONG BytesWritten, OUT PULONG BytesNeeded ); - + VOID NTAPI MiniportISR ( @@ -199,7 +199,7 @@ MiniportISR ( OUT PBOOLEAN QueueMiniportHandleInterrupt, IN NDIS_HANDLE MiniportAdapterContext ); - + VOID NTAPI MiniportHandleInterrupt ( diff --git a/drivers/network/ndis/ndis/config.c b/drivers/network/ndis/ndis/config.c index ad36292c71f..288a1ce7504 100644 --- a/drivers/network/ndis/ndis/config.c +++ b/drivers/network/ndis/ndis/config.c @@ -70,7 +70,7 @@ NdisWriteConfiguration( WCHAR Buff[11]; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - + NDIS_DbgPrint(MID_TRACE, ("Parameter type: %d\n", ParameterValue->ParameterType)); /* reset parameter type to standard reg types */ @@ -661,7 +661,7 @@ NdisReadConfiguration( { UNICODE_STRING str; ULONG Base; - + if (ParameterType == NdisParameterInteger) Base = 10; else if (ParameterType == NdisParameterHexInteger) @@ -802,7 +802,7 @@ NdisReadNetworkAddress( } while (j < str.Length && str.Buffer[j] != '\0') j++; - + *NetworkAddressLength = (j+1) >> 1; if ((*NetworkAddressLength) == 0) diff --git a/drivers/network/ndis/ndis/io.c b/drivers/network/ndis/ndis/io.c index 1775716fe59..489d8db21ea 100644 --- a/drivers/network/ndis/ndis/io.c +++ b/drivers/network/ndis/ndis/io.c @@ -200,15 +200,15 @@ IO_ALLOCATION_ACTION NTAPI NdisSubordinateMapRegisterCallback ( */ { PNDIS_DMA_BLOCK DmaBlock = Context; - + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - + DmaBlock->MapRegisterBase = MapRegisterBase; - + NDIS_DbgPrint(MAX_TRACE, ("setting event and leaving.\n")); - + KeSetEvent(&DmaBlock->AllocationEvent, 0, FALSE); - + /* We have to hold the object open to keep our lock on the system DMA controller */ return KeepObject; } @@ -336,7 +336,7 @@ NdisMAllocateMapRegisters( Description.InterfaceType = Adapter->NdisMiniportBlock.BusType; Description.DmaChannel = DmaChannel; Description.MaximumLength = MaximumBufferSize; - + if(DmaSize == NDIS_DMA_64BITS) Description.Dma64BitAddresses = TRUE; else if(DmaSize == NDIS_DMA_32BITS) @@ -442,15 +442,15 @@ NdisMSetupDmaTransfer(OUT PNDIS_STATUS Status, KIRQL OldIrql; PDMA_ADAPTER AdapterObject; ULONG MapRegistersNeeded; - + NDIS_DbgPrint(MAX_TRACE, ("called: Handle 0x%x, Buffer 0x%x, Offset 0x%x, Length 0x%x, WriteToDevice 0x%x\n", MiniportDmaHandle, Buffer, Offset, Length, WriteToDevice)); - + Adapter = (PLOGICAL_ADAPTER)DmaBlock->Miniport; AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; - + MapRegistersNeeded = (Length + (PAGE_SIZE - 1)) / PAGE_SIZE; - + KeFlushIoBuffers(Buffer, !WriteToDevice, TRUE); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); @@ -461,7 +461,7 @@ NdisMSetupDmaTransfer(OUT PNDIS_STATUS Status, NdisSubordinateMapRegisterCallback, Adapter); } KeLowerIrql(OldIrql); - + if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("AllocateAdapterChannel failed: 0x%x\n", NtStatus)); @@ -469,9 +469,9 @@ NdisMSetupDmaTransfer(OUT PNDIS_STATUS Status, *Status = NDIS_STATUS_RESOURCES; return; } - + NtStatus = KeWaitForSingleObject(&DmaBlock->AllocationEvent, Executive, KernelMode, FALSE, 0); - + if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("KeWaitForSingleObject failed: 0x%x\n", NtStatus)); @@ -479,12 +479,12 @@ NdisMSetupDmaTransfer(OUT PNDIS_STATUS Status, *Status = NDIS_STATUS_RESOURCES; return; } - + /* We must throw away the return value of MapTransfer for a system DMA device */ AdapterObject->DmaOperations->MapTransfer(AdapterObject, Buffer, DmaBlock->MapRegisterBase, (PUCHAR)MmGetMdlVirtualAddress(Buffer) + Offset, &Length, WriteToDevice); - + NDIS_DbgPrint(MAX_TRACE, ("returning success\n")); *Status = NDIS_STATUS_SUCCESS; } @@ -529,10 +529,10 @@ NdisMCompleteDmaTransfer(OUT PNDIS_STATUS Status, { PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; - + NDIS_DbgPrint(MAX_TRACE, ("called: Handle 0x%x, Buffer 0x%x, Offset 0x%x, Length 0x%x, WriteToDevice 0x%x\n", MiniportDmaHandle, Buffer, Offset, Length, WriteToDevice)); - + if (!AdapterObject->DmaOperations->FlushAdapterBuffers(AdapterObject, Buffer, DmaBlock->MapRegisterBase, @@ -546,7 +546,7 @@ NdisMCompleteDmaTransfer(OUT PNDIS_STATUS Status, } AdapterObject->DmaOperations->FreeAdapterChannel(AdapterObject); - + NDIS_DbgPrint(MAX_TRACE, ("returning success\n")); *Status = NDIS_STATUS_SUCCESS; } @@ -904,7 +904,7 @@ NdisMRegisterDmaChannel( } Adapter->NdisMiniportBlock.SystemAdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; - + KeInitializeEvent(&DmaBlock->AllocationEvent, NotificationEvent, FALSE); DmaBlock->Miniport = Adapter; @@ -1199,7 +1199,7 @@ NdisMInitializeScatterGatherDma( DeviceDesc.InterfaceType = Adapter->NdisMiniportBlock.BusType; DeviceDesc.MaximumLength = MaximumPhysicalMapping; - Adapter->NdisMiniportBlock.SystemAdapterObject = + Adapter->NdisMiniportBlock.SystemAdapterObject = IoGetDmaAdapter(Adapter->NdisMiniportBlock.PhysicalDeviceObject, &DeviceDesc, &MapRegisters); if (!Adapter->NdisMiniportBlock.SystemAdapterObject) diff --git a/drivers/network/ndis/ndis/memory.c b/drivers/network/ndis/ndis/memory.c index 7a65ae932e4..6aa05e4fb48 100644 --- a/drivers/network/ndis/ndis/memory.c +++ b/drivers/network/ndis/ndis/memory.c @@ -238,7 +238,7 @@ NdisMFreeSharedMemory( NDIS_DbgPrint(MAX_TRACE,("Called.\n")); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - + /* Call FreeCommonBuffer synchronously if we are at PASSIVE_LEVEL */ if (KeGetCurrentIrql() == PASSIVE_LEVEL) { @@ -314,7 +314,7 @@ NdisMAllocateSharedMemoryPassive( if (Memory->Adapter->DriverHandle->MiniportCharacteristics.AllocateCompleteHandler) Memory->Adapter->DriverHandle->MiniportCharacteristics.AllocateCompleteHandler( - Memory->Adapter->MiniportAdapterContext, Memory->VirtualAddress, + Memory->Adapter->MiniportAdapterContext, Memory->VirtualAddress, &Memory->PhysicalAddress, Memory->Length, Memory->Context); IoFreeWorkItem(Memory->WorkItem); diff --git a/drivers/network/ndis/ndis/time.c b/drivers/network/ndis/ndis/time.c index 8337fad478d..a35ea90107a 100644 --- a/drivers/network/ndis/ndis/time.c +++ b/drivers/network/ndis/ndis/time.c @@ -350,7 +350,7 @@ NdisSetTimerEx( IN UINT MillisecondsToDelay, IN PVOID FunctionContext) { - NDIS_DbgPrint(MAX_TRACE, ("Called. Timer is: 0x%x, Timeout is: %ld, FunctionContext is: 0x%x\n", + NDIS_DbgPrint(MAX_TRACE, ("Called. Timer is: 0x%x, Timeout is: %ld, FunctionContext is: 0x%x\n", Timer, MillisecondsToDelay, FunctionContext)); Timer->Dpc.DeferredContext = FunctionContext; diff --git a/drivers/network/ndisuio/createclose.c b/drivers/network/ndisuio/createclose.c index 00ea79c79fb..4df226c33ef 100644 --- a/drivers/network/ndisuio/createclose.c +++ b/drivers/network/ndisuio/createclose.c @@ -19,7 +19,7 @@ NduDispatchCreate(PDEVICE_OBJECT DeviceObject, PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); ASSERT(DeviceObject == GlobalDeviceObject); - + DPRINT("Created file object 0x%x\n", IrpSp->FileObject); /* This is associated with an adapter during IOCTL_NDISUIO_OPEN_(WRITE_)DEVICE */ @@ -43,16 +43,16 @@ NduDispatchClose(PDEVICE_OBJECT DeviceObject, PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; PNDISUIO_OPEN_ENTRY OpenEntry = IrpSp->FileObject->FsContext2; - + ASSERT(DeviceObject == GlobalDeviceObject); - + DPRINT("Closing file object 0x%x\n", IrpSp->FileObject); /* Check if this handle was ever associated with an adapter */ if (AdapterContext != NULL) { ASSERT(OpenEntry != NULL); - + DPRINT("Removing binding to adapter %wZ\n", &AdapterContext->DeviceName); /* Call the our helper */ diff --git a/drivers/network/ndisuio/ioctl.c b/drivers/network/ndisuio/ioctl.c index b3f5631c98f..195e80265a2 100644 --- a/drivers/network/ndisuio/ioctl.c +++ b/drivers/network/ndisuio/ioctl.c @@ -20,12 +20,12 @@ WaitForBind(PIRP Irp, PIO_STACK_LOCATION IrpSp) * right now because I don't see any reason we need it. We handle an open * and bind just fine with IRP_MJ_CREATE and IOCTL_NDISUIO_OPEN_DEVICE */ DPRINT("Wait for bind complete\n"); - + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; - + IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return STATUS_SUCCESS; } @@ -74,7 +74,7 @@ QueryBinding(PIRP Irp, PIO_STACK_LOCATION IrpSp) /* FIXME: Copy description too */ QueryBinding->DeviceDescrOffset = BytesCopied; QueryBinding->DeviceDescrLength = 0; - + /* Successful */ Status = STATUS_SUCCESS; } @@ -95,12 +95,12 @@ QueryBinding(PIRP Irp, PIO_STACK_LOCATION IrpSp) /* Invalid parameters */ Status = STATUS_INVALID_PARAMETER; } - + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = BytesCopied; - + IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return Status; } @@ -112,31 +112,31 @@ CancelPacketRead(PIRP Irp, PIO_STACK_LOCATION IrpSp) PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; PNDISUIO_PACKET_ENTRY PacketEntry; NTSTATUS Status; - + /* Indicate a 0-byte packet on the queue so one read returns 0 */ PacketEntry = ExAllocatePool(PagedPool, sizeof(NDISUIO_PACKET_ENTRY)); if (PacketEntry) { PacketEntry->PacketLength = 0; - + ExInterlockedInsertHeadList(&AdapterContext->PacketList, &PacketEntry->ListEntry, &AdapterContext->Spinlock); - + KeSetEvent(&AdapterContext->PacketReadEvent, IO_NO_INCREMENT, FALSE); - + Status = STATUS_SUCCESS; } else { Status = STATUS_NO_MEMORY; } - + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - + IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return Status; } #endif @@ -150,9 +150,9 @@ SetAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) NDIS_REQUEST Request; ULONG RequestLength; NDIS_STATUS Status; - + Irp->IoStatus.Information = 0; - + SetOidRequest = Irp->AssociatedIrp.SystemBuffer; RequestLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (SetOidRequest && RequestLength >= sizeof(NDIS_OID)) @@ -246,12 +246,12 @@ QueryAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) Request.DATA.QUERY_INFORMATION.BytesWritten = 0; DPRINT("Querying OID 0x%x on adapter %wZ\n", QueryOidRequest->Oid, &AdapterContext->DeviceName); - + /* Dispatch the request */ NdisRequest(&Status, AdapterContext->BindingHandle, &Request); - + /* Wait for the request */ if (Status == NDIS_STATUS_PENDING) { @@ -281,11 +281,11 @@ QueryAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) /* Bad parameters */ Status = STATUS_INVALID_PARAMETER; } - + Irp->IoStatus.Status = Status; - + IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return Status; } @@ -343,7 +343,7 @@ OpenDeviceReadWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) { /* Set the file object pointer */ OpenEntry->FileObject = FileObject; - + /* Set the permissions */ OpenEntry->WriteOnly = FALSE; @@ -373,12 +373,12 @@ OpenDeviceReadWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) /* Invalid device name */ Status = STATUS_INVALID_PARAMETER; } - + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - + IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return Status; } @@ -394,13 +394,13 @@ OpenDeviceWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) PNDISUIO_ADAPTER_CONTEXT AdapterContext; PNDISUIO_OPEN_ENTRY OpenEntry; KIRQL OldIrql; - + NameLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (NameLength != 0) { DeviceName.MaximumLength = DeviceName.Length = NameLength; DeviceName.Buffer = Irp->AssociatedIrp.SystemBuffer; - + /* Check if this already has a context */ AdapterContext = FindAdapterContextByName(&DeviceName); if (AdapterContext != NULL) @@ -415,7 +415,7 @@ OpenDeviceWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) /* Invalid device name */ Status = STATUS_INVALID_PARAMETER; } - + /* Check that the bind succeeded */ if (NT_SUCCESS(Status)) { @@ -424,18 +424,18 @@ OpenDeviceWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) { /* Set the file object pointer */ OpenEntry->FileObject = FileObject; - + /* Associate this FO with the adapter */ FileObject->FsContext = AdapterContext; FileObject->FsContext2 = OpenEntry; - + /* Set permissions */ OpenEntry->WriteOnly = TRUE; - + /* Add it to the adapter's list */ InsertTailList(&AdapterContext->OpenEntryList, &OpenEntry->ListEntry); - + /* Success */ KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); Status = STATUS_SUCCESS; @@ -454,12 +454,12 @@ OpenDeviceWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) /* Invalid device name */ Status = STATUS_INVALID_PARAMETER; } - + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - + IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return Status; } #endif @@ -471,7 +471,7 @@ NduDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PNDISUIO_OPEN_ENTRY OpenEntry; - + ASSERT(DeviceObject == GlobalDeviceObject); /* Handle open IOCTLs first */ @@ -485,7 +485,7 @@ NduDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, #endif case IOCTL_NDISUIO_BIND_WAIT: return WaitForBind(Irp, IrpSp); - + case IOCTL_NDISUIO_QUERY_BINDING: return QueryBinding(Irp, IrpSp); @@ -496,7 +496,7 @@ NduDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return STATUS_INVALID_PARAMETER; } @@ -514,7 +514,7 @@ NduDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return STATUS_INVALID_PARAMETER; } @@ -524,10 +524,10 @@ NduDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, case IOCTL_CANCEL_READ: return CancelPacketRead(Irp, IrpSp); #endif - + case IOCTL_NDISUIO_QUERY_OID_VALUE: return QueryAdapterOid(Irp, IrpSp); - + default: DPRINT1("Unimplemented\n"); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; diff --git a/drivers/network/ndisuio/main.c b/drivers/network/ndisuio/main.c index 5da8d026fbf..573c8f1bae5 100644 --- a/drivers/network/ndisuio/main.c +++ b/drivers/network/ndisuio/main.c @@ -19,7 +19,7 @@ LIST_ENTRY GlobalAdapterList; NDIS_STRING ProtocolName = RTL_CONSTANT_STRING(L"NDISUIO"); VOID NTAPI NduUnload(PDRIVER_OBJECT DriverObject) -{ +{ DPRINT("NDISUIO: Unloaded\n"); } @@ -40,7 +40,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, DriverObject->MajorFunction[IRP_MJ_READ] = NduDispatchRead; DriverObject->MajorFunction[IRP_MJ_WRITE] = NduDispatchWrite; DriverObject->DriverUnload = NduUnload; - + /* Setup global state */ InitializeListHead(&GlobalAdapterList); KeInitializeSpinLock(&GlobalAdapterListLock); @@ -58,7 +58,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, DPRINT1("Failed to create device object with status 0x%x\n", Status); return Status; } - + /* Create a symbolic link into the DOS devices namespace */ Status = IoCreateSymbolicLink(&DosDeviceName, &NtDeviceName); if (!NT_SUCCESS(Status)) @@ -86,7 +86,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, Chars.Name = ProtocolName; Chars.BindAdapterHandler = NduBindAdapter; Chars.UnbindAdapterHandler = NduUnbindAdapter; - + NdisRegisterProtocol(&Status, &GlobalProtocolHandle, &Chars, diff --git a/drivers/network/ndisuio/misc.c b/drivers/network/ndisuio/misc.c index 43552cb9fa0..29bcc2fc71c 100644 --- a/drivers/network/ndisuio/misc.c +++ b/drivers/network/ndisuio/misc.c @@ -93,10 +93,10 @@ CleanupAndFreePacket(PNDIS_PACKET Packet, BOOLEAN FreePool) NdisUnchainBufferAtFront(Packet, &Buffer); if (!Buffer) break; - + /* Get the backing memory */ NdisQueryBuffer(Buffer, &Data, &Length); - + /* Free the buffer */ NdisFreeBuffer(Buffer); @@ -106,7 +106,7 @@ CleanupAndFreePacket(PNDIS_PACKET Packet, BOOLEAN FreePool) ExFreePool(Data); } } - + /* Free the packet descriptor */ NdisFreePacket(Packet); } @@ -123,18 +123,18 @@ FindAdapterContextByName(PNDIS_STRING DeviceName) while (CurrentEntry != &GlobalAdapterList) { AdapterContext = CONTAINING_RECORD(CurrentEntry, NDISUIO_ADAPTER_CONTEXT, ListEntry); - + /* Check if the device name matches */ if (RtlEqualUnicodeString(&AdapterContext->DeviceName, DeviceName, TRUE)) { KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); return AdapterContext; } - + CurrentEntry = CurrentEntry->Flink; } KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); - + return NULL; } @@ -153,7 +153,7 @@ DereferenceAdapterContextWithOpenEntry(PNDISUIO_ADAPTER_CONTEXT AdapterContext, /* Lock the adapter context */ KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); - + /* Decrement the open count */ AdapterContext->OpenCount--; diff --git a/drivers/network/ndisuio/ndisuio.h b/drivers/network/ndisuio/ndisuio.h index e4f3b2d5262..d30aa54ed69 100644 --- a/drivers/network/ndisuio/ndisuio.h +++ b/drivers/network/ndisuio/ndisuio.h @@ -24,11 +24,11 @@ typedef struct _NDISUIO_ADAPTER_CONTEXT /* NDIS binding information */ NDIS_HANDLE BindingHandle; - + /* Reference count information */ ULONG OpenCount; LIST_ENTRY OpenEntryList; - + /* NDIS pools */ NDIS_HANDLE PacketPoolHandle; NDIS_HANDLE BufferPoolHandle; @@ -36,7 +36,7 @@ typedef struct _NDISUIO_ADAPTER_CONTEXT /* Receive packet list */ LIST_ENTRY PacketList; KEVENT PacketReadEvent; - + /* Mac options */ ULONG MacOptions; @@ -54,10 +54,10 @@ typedef struct _NDISUIO_OPEN_ENTRY { /* File object */ PFILE_OBJECT FileObject; - + /* Tracks how this adapter was opened (write-only or read-write) */ BOOLEAN WriteOnly; - + /* List entry */ LIST_ENTRY ListEntry; } NDISUIO_OPEN_ENTRY, *PNDISUIO_OPEN_ENTRY; @@ -66,7 +66,7 @@ typedef struct _NDISUIO_PACKET_ENTRY { /* Length of data at the end of the struct */ ULONG PacketLength; - + /* Entry on the packet list */ LIST_ENTRY ListEntry; diff --git a/drivers/network/ndisuio/protocol.c b/drivers/network/ndisuio/protocol.c index 764ff694ae2..c724884c9ec 100644 --- a/drivers/network/ndisuio/protocol.c +++ b/drivers/network/ndisuio/protocol.c @@ -108,9 +108,9 @@ NduSendComplete(NDIS_HANDLE ProtocolBindingContext, NDIS_STATUS Status) { PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; - + DPRINT("Asynchronous adapter send completed\n"); - + /* Store the final status and signal the event */ AdapterContext->AsyncStatus = Status; KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); @@ -177,13 +177,13 @@ NduReceive(NDIS_HANDLE ProtocolBindingContext, PNDIS_PACKET Packet; NDIS_STATUS Status; UINT BytesTransferred; - + DPRINT("Received a %d byte packet\n", PacketSize); /* Discard if nobody is waiting for it */ if (AdapterContext->OpenCount == 0) return NDIS_STATUS_NOT_ACCEPTED; - + /* Allocate a buffer to hold the packet data and header */ PacketBuffer = ExAllocatePool(NonPagedPool, PacketSize + HeaderBufferSize); if (!PacketBuffer) @@ -234,11 +234,11 @@ NduReceive(NDIS_HANDLE ProtocolBindingContext, return NDIS_STATUS_NOT_ACCEPTED; } } - + /* Copy the header data */ RtlCopyMemory(PacketBuffer, HeaderBuffer, HeaderBufferSize); - - /* Free the packet descriptor and buffers + + /* Free the packet descriptor and buffers but not the pool because we still need it */ CleanupAndFreePacket(Packet, FALSE); @@ -253,7 +253,7 @@ NduReceive(NDIS_HANDLE ProtocolBindingContext, /* Initialize the packet entry and copy in packet data */ PacketEntry->PacketLength = BytesTransferred + HeaderBufferSize; RtlCopyMemory(PacketEntry->PacketData, PacketBuffer, PacketEntry->PacketLength); - + /* Free the old buffer */ ExFreePool(PacketBuffer); @@ -261,7 +261,7 @@ NduReceive(NDIS_HANDLE ProtocolBindingContext, ExInterlockedInsertTailList(&AdapterContext->PacketList, &PacketEntry->ListEntry, &AdapterContext->Spinlock); - + /* Signal the read event */ KeSetEvent(&AdapterContext->PacketReadEvent, IO_NETWORK_INCREMENT, @@ -303,16 +303,16 @@ UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) PNDISUIO_OPEN_ENTRY OpenEntry; PNDISUIO_PACKET_ENTRY PacketEntry; NDIS_STATUS Status; - + DPRINT("Unbinding adapter %wZ\n", &AdapterContext->DeviceName); - + /* FIXME: We don't do anything with outstanding reads */ /* Remove the adapter context from the global list */ KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); RemoveEntryList(&AdapterContext->ListEntry); KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); - + /* Free the device name string */ RtlFreeUnicodeString(&AdapterContext->DeviceName); @@ -333,7 +333,7 @@ UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) /* Remove the open entry pointer */ ASSERT(OpenEntry == OpenEntry->FileObject->FsContext2); OpenEntry->FileObject->FsContext2 = NULL; - + /* Move to the next entry */ CurrentEntry = CurrentEntry->Flink; @@ -343,7 +343,7 @@ UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) /* If this fails, we have a refcount mismatch somewhere */ ASSERT(AdapterContext->OpenCount == 0); - + /* Free all pending packet entries */ CurrentEntry = AdapterContext->PacketList.Flink; while (CurrentEntry != &AdapterContext->PacketList) @@ -356,11 +356,11 @@ UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) /* Free the packet entry */ ExFreePool(PacketEntry); } - + /* Send the close request */ NdisCloseAdapter(&Status, AdapterContext->BindingHandle); - + /* Wait for a pending close */ if (Status == NDIS_STATUS_PENDING) { @@ -371,10 +371,10 @@ UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) NULL); Status = AdapterContext->AsyncStatus; } - + /* Free the context */ ExFreePool(AdapterContext); - + return Status; } @@ -416,7 +416,7 @@ BindAdapterByName(PNDIS_STRING DeviceName) /* Copy the device name into the adapter context */ RtlCopyMemory(AdapterContext->DeviceName.Buffer, DeviceName->Buffer, DeviceName->Length); - + DPRINT("Binding adapter %wZ\n", &AdapterContext->DeviceName); /* Create the buffer pool */ @@ -457,7 +457,7 @@ BindAdapterByName(PNDIS_STRING DeviceName) DeviceName, 0, NULL); - + /* Wait for a pending open */ if (Status == NDIS_STATUS_PENDING) { @@ -468,7 +468,7 @@ BindAdapterByName(PNDIS_STRING DeviceName) NULL); Status = AdapterContext->AsyncStatus; } - + /* Check the final status */ if (Status != NDIS_STATUS_SUCCESS) { @@ -479,7 +479,7 @@ BindAdapterByName(PNDIS_STRING DeviceName) ExFreePool(AdapterContext); return Status; } - + /* Get the MAC options */ Request.RequestType = NdisRequestQueryInformation; Request.DATA.QUERY_INFORMATION.Oid = OID_GEN_MAC_OPTIONS; @@ -499,7 +499,7 @@ BindAdapterByName(PNDIS_STRING DeviceName) NULL); Status = AdapterContext->AsyncStatus; } - + /* Check the final status */ if (Status != NDIS_STATUS_SUCCESS) { @@ -524,7 +524,7 @@ BindAdapterByName(PNDIS_STRING DeviceName) ExFreePool(AdapterContext); return Status; } - + /* Add the adapter context to the global list */ ExInterlockedInsertTailList(&GlobalAdapterList, &AdapterContext->ListEntry, @@ -551,7 +551,7 @@ NduUnbindAdapter(PNDIS_STATUS Status, NDIS_HANDLE ProtocolBindingContext, NDIS_HANDLE UnbindContext) { - /* This is forced unbind. UnbindAdapterByContext() will take care of + /* This is forced unbind. UnbindAdapterByContext() will take care of * invalidating file handles pointer to this adapter for us */ *Status = UnbindAdapterByContext(ProtocolBindingContext); } diff --git a/drivers/network/ndisuio/readwrite.c b/drivers/network/ndisuio/readwrite.c index 5294c14bf25..62cf9af42a6 100644 --- a/drivers/network/ndisuio/readwrite.c +++ b/drivers/network/ndisuio/readwrite.c @@ -19,7 +19,7 @@ ReadIrpCancel(PDEVICE_OBJECT DeviceObject, PIRP Irp) PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; PNDISUIO_PACKET_ENTRY PacketEntry; - + /* Release the cancel spin lock */ IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -28,11 +28,11 @@ ReadIrpCancel(PDEVICE_OBJECT DeviceObject, PIRP Irp) if (PacketEntry) { PacketEntry->PacketLength = 0; - + ExInterlockedInsertHeadList(&AdapterContext->PacketList, &PacketEntry->ListEntry, &AdapterContext->Spinlock); - + KeSetEvent(&AdapterContext->PacketReadEvent, IO_NO_INCREMENT, FALSE); } } @@ -58,7 +58,7 @@ NduDispatchRead(PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return STATUS_INVALID_PARAMETER; } @@ -73,7 +73,7 @@ NduDispatchRead(PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - + return STATUS_SUCCESS; } IoReleaseCancelSpinLock(OldCancelIrql); @@ -109,20 +109,20 @@ NduDispatchRead(PDEVICE_OBJECT DeviceObject, IoAcquireCancelSpinLock(&OldCancelIrql); IoSetCancelRoutine(Irp, NULL); IoReleaseCancelSpinLock(OldCancelIrql); - + /* Remove the first packet in the list */ ListEntry = RemoveHeadList(&AdapterContext->PacketList); PacketEntry = CONTAINING_RECORD(ListEntry, NDISUIO_PACKET_ENTRY, ListEntry); /* Release the adapter lock */ KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); - + /* And we're done with this loop */ Status = STATUS_SUCCESS; break; } } - + /* Check if we got a packet */ if (PacketEntry != NULL) { @@ -135,7 +135,7 @@ NduDispatchRead(PDEVICE_OBJECT DeviceObject, RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &PacketEntry->PacketData[0], BytesCopied); - + /* Free the packet entry */ ExFreePool(PacketEntry); } @@ -149,7 +149,7 @@ NduDispatchRead(PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = Status; Irp->IoStatus.Information = BytesCopied; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - + return Status; } @@ -165,7 +165,7 @@ NduDispatchWrite(PDEVICE_OBJECT DeviceObject, ULONG BytesCopied = 0; ASSERT(DeviceObject == GlobalDeviceObject); - + /* Create a packet and buffer descriptor for this user buffer */ Packet = CreatePacketFromPoolBuffer(AdapterContext, Irp->AssociatedIrp.SystemBuffer, diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c index 35fe5bef579..0440c098f49 100644 --- a/drivers/network/tcpip/datalink/lan.c +++ b/drivers/network/tcpip/datalink/lan.c @@ -122,9 +122,9 @@ GetPacketTypeFromHeaderBuffer(PLAN_ADAPTER Adapter, /* FIXME: Support other medias */ return NDIS_STATUS_NOT_ACCEPTED; } - + TI_DbgPrint(DEBUG_DATALINK, ("EtherType (0x%X).\n", *PacketType)); - + return NDIS_STATUS_SUCCESS; } @@ -137,13 +137,13 @@ GetPacketTypeFromNdisPacket(PLAN_ADAPTER Adapter, PVOID HeaderBuffer; ULONG BytesCopied; NDIS_STATUS Status; - + HeaderBuffer = ExAllocatePoolWithTag(NonPagedPool, Adapter->HeaderSize, HEADER_TAG); if (!HeaderBuffer) return NDIS_STATUS_RESOURCES; - + /* Copy the media header */ BytesCopied = CopyPacketToBuffer(HeaderBuffer, NdisPacket, @@ -161,9 +161,9 @@ GetPacketTypeFromNdisPacket(PLAN_ADAPTER Adapter, HeaderBuffer, BytesCopied, PacketType); - + ExFreePoolWithTag(HeaderBuffer, HEADER_TAG); - + return Status; } @@ -583,26 +583,26 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) ULONG Unused; NTSTATUS Status; IP_ADDRESS DefaultMask, Router; - + AddrInitIPv4(&DefaultMask, 0); TcpipRegistryPath.MaximumLength = sizeof(WCHAR) * 150; TcpipRegistryPath.Length = 0; TcpipRegistryPath.Buffer = Buffer; - + /* Build the registry path */ RtlAppendUnicodeStringToString(&TcpipRegistryPath, &Prefix); RtlAppendUnicodeStringToString(&TcpipRegistryPath, &Interface->Name); - + InitializeObjectAttributes(&ObjectAttributes, &TcpipRegistryPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); - + /* Open a handle to the adapter parameters */ Status = ZwOpenKey(&ParameterHandle, KEY_READ, &ObjectAttributes); - + if (!NT_SUCCESS(Status)) { return FALSE; @@ -680,7 +680,7 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) if (!AddrIsUnspecified(&Interface->Unicast) && !AddrIsUnspecified(&Interface->Netmask)) IPAddInterfaceRoute(Interface); - + /* Read default gateway info */ Status = ZwQueryValueKey(ParameterHandle, &Gateway, @@ -740,14 +740,14 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) Interface->Unicast = DefaultMask; Interface->Netmask = DefaultMask; Interface->Broadcast = DefaultMask; - + /* Remove all interface routes */ RouterRemoveRoutesForInterface(Interface); - + /* Destroy all cached neighbors */ NBDestroyNeighborsForInterface(Interface); } - + Context->Adapter->CompletingReset = FALSE; /* Update the IP and link status information cached in TCP */ @@ -760,7 +760,7 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) Adapter->State = Context->State; return TRUE; } - + /* NDIS Bug! */ #if 0 /* Get maximum link speed */ @@ -769,12 +769,12 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) OID_GEN_LINK_SPEED, &Interface->Speed, sizeof(UINT)); - + if (!NT_SUCCESS(NdisStatus)) Interface->Speed = IP_DEFAULT_LINK_SPEED; Adapter->Speed = Interface->Speed * 100L; - + /* Get maximum frame size */ NdisStatus = NDISCall(Adapter, NdisRequestQueryInformation, @@ -783,9 +783,9 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) sizeof(UINT)); if (NdisStatus != NDIS_STATUS_SUCCESS) return FALSE; - + Interface->MTU = Adapter->MTU; - + /* Get maximum packet size */ NdisStatus = NDISCall(Adapter, NdisRequestQueryInformation, @@ -797,17 +797,17 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) #endif Adapter->State = Context->State; - + return TRUE; } VOID ReconfigureAdapterWorker(PVOID Context) { PRECONFIGURE_CONTEXT ReconfigureContext = Context; - + /* Complete the reconfiguration asynchronously */ ReconfigureAdapter(ReconfigureContext); - + /* Free the context */ ExFreePool(ReconfigureContext); } @@ -834,11 +834,11 @@ VOID NTAPI ProtocolStatus( /* Ignore the status indication if we have no context yet. We'll get another later */ if (!Adapter->Context) return; - + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(RECONFIGURE_CONTEXT), CONTEXT_TAG); if (!Context) return; - + Context->Adapter = Adapter; switch(GeneralStatus) @@ -854,16 +854,16 @@ VOID NTAPI ProtocolStatus( Context->State = LAN_STATE_STARTED; break; - + case NDIS_STATUS_MEDIA_DISCONNECT: DbgPrint("NDIS_STATUS_MEDIA_DISCONNECT\n"); - + if (Adapter->State == LAN_STATE_STOPPED) { ExFreePoolWithTag(Context, CONTEXT_TAG); return; } - + Context->State = LAN_STATE_STOPPED; break; @@ -945,7 +945,7 @@ VOID NTAPI ProtocolBindAdapter( * SystemSpecific1: Pointer to a registry path with protocol-specific configuration information * SystemSpecific2: Unused & must not be touched */ -{ +{ TI_DbgPrint(DEBUG_DATALINK, ("Called with registry path %wZ for %wZ\n", SystemSpecific1, DeviceName)); *Status = LANRegisterAdapter(DeviceName, SystemSpecific1); } @@ -1377,19 +1377,19 @@ BOOLEAN BindAdapter( TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", &IF->Description)); - + /* Get maximum link speed */ NdisStatus = NDISCall(Adapter, NdisRequestQueryInformation, OID_GEN_LINK_SPEED, &IF->Speed, sizeof(UINT)); - + if (!NT_SUCCESS(NdisStatus)) IF->Speed = IP_DEFAULT_LINK_SPEED; - + Adapter->Speed = IF->Speed * 100L; - + /* Get maximum frame size */ NdisStatus = NDISCall(Adapter, NdisRequestQueryInformation, @@ -1398,9 +1398,9 @@ BOOLEAN BindAdapter( sizeof(UINT)); if (NdisStatus != NDIS_STATUS_SUCCESS) return FALSE; - + IF->MTU = Adapter->MTU; - + /* Get maximum packet size */ NdisStatus = NDISCall(Adapter, NdisRequestQueryInformation, @@ -1646,7 +1646,7 @@ NDIS_STATUS LANUnregisterAdapter( return NdisStatus; } -VOID +VOID NTAPI LANUnregisterProtocol(VOID) /* diff --git a/drivers/network/tcpip/include/titypes.h b/drivers/network/tcpip/include/titypes.h index 3f75976b4ea..14541a24a65 100644 --- a/drivers/network/tcpip/include/titypes.h +++ b/drivers/network/tcpip/include/titypes.h @@ -275,7 +275,7 @@ typedef struct _CONNECTION_ENDPOINT { LIST_ENTRY ShutdownRequest;/* Queued shutdown requests */ LIST_ENTRY PacketQueue; /* Queued received packets waiting to be processed */ - + /* Disconnect Timer */ KTIMER DisconnectTimer; KDPC DisconnectDpc; diff --git a/drivers/network/tcpip/tcpip/fileobjs.c b/drivers/network/tcpip/tcpip/fileobjs.c index 614f1e11479..6854acc7da7 100644 --- a/drivers/network/tcpip/tcpip/fileobjs.c +++ b/drivers/network/tcpip/tcpip/fileobjs.c @@ -42,7 +42,7 @@ PADDRESS_FILE AddrSearchFirst( PAF_SEARCH SearchContext) { KIRQL OldIrql; - + SearchContext->Address = Address; SearchContext->Port = Port; SearchContext->Protocol = Protocol; @@ -115,7 +115,7 @@ LogActiveObjects(VOID) PCONNECTION_ENDPOINT Conn; DbgPrint("----------- TCP/IP Active Object Dump -------------\n"); - + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); CurrentEntry = AddressFileListHead.Flink; @@ -144,19 +144,19 @@ LogActiveObjects(VOID) } DbgPrint("\n"); } - + CurrentEntry = CurrentEntry->Flink; } - + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); - + TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); - + CurrentEntry = ConnectionEndpointListHead.Flink; while (CurrentEntry != &ConnectionEndpointListHead) { Conn = CONTAINING_RECORD(CurrentEntry, CONNECTION_ENDPOINT, ListEntry); - + DbgPrint("Connection @ 0x%p | Ref count: %d\n", Conn, Conn->RefCount); DbgPrint("\tPCB: "); if (Conn->SocketContext == NULL) @@ -177,10 +177,10 @@ LogActiveObjects(VOID) DbgPrint("\tReceive shutdown: %s\n", Conn->ReceiveShutdown ? "Yes" : "No"); if (Conn->ReceiveShutdown) DbgPrint("\tReceive shutdown status: 0x%x\n", Conn->ReceiveShutdownStatus); DbgPrint("\tClosing: %s\n", Conn->Closing ? "Yes" : "No"); - + CurrentEntry = CurrentEntry->Flink; } - + TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); DbgPrint("---------------------------------------------------\n"); @@ -237,7 +237,7 @@ PADDRESS_FILE AddrSearchNext( PADDRESS_FILE Current = NULL; BOOLEAN Found = FALSE; PADDRESS_FILE StartingAddrFile; - + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); if (SearchContext->Next == &AddressFileListHead) @@ -465,14 +465,14 @@ NTSTATUS FileOpenAddress( { /* The client specified an explicit port so we force a bind to this */ AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); - + /* Check for bind success */ if (AddrFile->Port == 0xffff) { ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); return STATUS_ADDRESS_ALREADY_EXISTS; } - + /* Sanity check */ ASSERT(Address->Address[0].Address[0].sin_port == AddrFile->Port); } @@ -480,7 +480,7 @@ NTSTATUS FileOpenAddress( { /* The client is trying to bind to a local address so allocate a port now too */ AddrFile->Port = TCPAllocatePort(0); - + /* Check for bind success */ if (AddrFile->Port == 0xffff) { diff --git a/drivers/network/tcpip/tcpip/iinfo.c b/drivers/network/tcpip/tcpip/iinfo.c index 9ee74aca1c3..cf5e3e7cc4b 100644 --- a/drivers/network/tcpip/tcpip/iinfo.c +++ b/drivers/network/tcpip/tcpip/iinfo.c @@ -143,7 +143,7 @@ TDI_STATUS InfoTdiSetArptableMIB(PIP_INTERFACE IF, PVOID Buffer, UINT BufferSize if ((NCE = NBLocateNeighbor(&Address, IF))) NBRemoveNeighbor(NCE); - + if (NBAddNeighbor(IF, &Address, ArpEntry->PhysAddr, diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 30a59480a26..765bb47f9c9 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -25,7 +25,7 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PIP_INTERFACE IF, PNDIS_BUFFER Buffer, PUI TI_DbgPrint(DEBUG_INFO, ("Called, routes = %d\n", RtCount)); - + if (RtCount == 0) return InfoCopyOut(NULL, 0, NULL, BufferSize); diff --git a/drivers/sac/driver/concmd.c b/drivers/sac/driver/concmd.c index 1428a91ec34..8828849ac00 100644 --- a/drivers/sac/driver/concmd.c +++ b/drivers/sac/driver/concmd.c @@ -342,7 +342,7 @@ CallQueryIPIOCTL( IN PVOID InputBuffer, IN ULONG InputBufferLength, IN PVOID OutputBuffer, - IN ULONG OutputBufferLength, + IN ULONG OutputBufferLength, IN BOOLEAN PrintMessage, OUT PBOOLEAN MessagePrinted ) diff --git a/drivers/sac/driver/util.c b/drivers/sac/driver/util.c index 06446c93e85..3eef9025377 100644 --- a/drivers/sac/driver/util.c +++ b/drivers/sac/driver/util.c @@ -403,7 +403,7 @@ GetRegistryValueBuffer(IN PCWSTR KeyName, CHECK_PARAMETER2(ValueName); /* Open the specified key */ - RtlInitUnicodeString(&DestinationString, KeyName); + RtlInitUnicodeString(&DestinationString, KeyName); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE, @@ -475,7 +475,7 @@ SetRegistryValue(IN PCWSTR KeyName, CHECK_PARAMETER4(Data); /* Open the specified key */ - RtlInitUnicodeString(&DestinationString, KeyName); + RtlInitUnicodeString(&DestinationString, KeyName); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE, @@ -1083,7 +1083,7 @@ InitializeCmdEventInfo(VOID) } } - /* Claer everything */ + /* Claer everything */ RequestSacCmdEventObjectBody = NULL; RequestSacCmdEventWaitObjectBody = NULL; RequestSacCmdSuccessEventObjectBody = NULL; diff --git a/drivers/sac/driver/vtutf8chan.c b/drivers/sac/driver/vtutf8chan.c index 27cd3396f98..3ac4a328613 100644 --- a/drivers/sac/driver/vtutf8chan.c +++ b/drivers/sac/driver/vtutf8chan.c @@ -209,7 +209,7 @@ VTUTF8ChannelProcessAttributes(IN PSAC_CHANNEL Channel, NULL, 0); if (!NT_SUCCESS(Status)) return Status; - + /* Set blink if needed */ Status = VTUTF8ChannelAnsiDispatch(Channel, Attribute & SAC_CELL_FLAG_BLINK ? diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index 69b3651c49d..57342c86235 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -163,7 +163,7 @@ ExtractFont( NULL, FILE_ATTRIBUTE_NORMAL, 0, - FILE_OPEN, + FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); diff --git a/drivers/storage/class/cdrom/findscsi.c b/drivers/storage/class/cdrom/findscsi.c index a4129579a78..f683f62eaea 100644 --- a/drivers/storage/class/cdrom/findscsi.c +++ b/drivers/storage/class/cdrom/findscsi.c @@ -34,7 +34,7 @@ FindScsiAdapter ( &objectAttributes \ ); - + NTSTATUS NTAPI FindScsiAdapter ( diff --git a/drivers/storage/class/cdrom_new/ioctl.h b/drivers/storage/class/cdrom_new/ioctl.h index 951561a9c02..b2c1804ad93 100644 --- a/drivers/storage/class/cdrom_new/ioctl.h +++ b/drivers/storage/class/cdrom_new/ioctl.h @@ -14,7 +14,7 @@ Author: Environment: - kernel mode only + kernel mode only Notes: @@ -28,36 +28,36 @@ Revision History: BOOLEAN RequestDispatchProcessDirectly( - _In_ WDFDEVICE Device, - _In_ WDFREQUEST Request, + _In_ WDFDEVICE Device, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters ); BOOLEAN RequestDispatchToSequentialQueue( - _In_ WDFDEVICE Device, - _In_ WDFREQUEST Request, + _In_ WDFDEVICE Device, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters ); BOOLEAN RequestDispatchSyncWithSequentialQueue( - _In_ WDFDEVICE Device, - _In_ WDFREQUEST Request, + _In_ WDFDEVICE Device, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters ); BOOLEAN RequestDispatchSpecialIoctls( - _In_ WDFDEVICE Device, - _In_ WDFREQUEST Request, + _In_ WDFDEVICE Device, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters ); BOOLEAN RequestDispatchUnknownRequests( - _In_ WDFDEVICE Device, - _In_ WDFREQUEST Request, + _In_ WDFDEVICE Device, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters ); @@ -69,63 +69,63 @@ RequestDispatchUnknownRequests( NTSTATUS RequestHandleGetInquiryData( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestHandleGetMediaTypeEx( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _Out_ size_t * DataLength ); NTSTATUS RequestHandleMountQueryUniqueId( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestHandleMountQueryDeviceName( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestHandleMountQuerySuggestedLinkName( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestHandleGetDeviceNumber( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestHandleGetHotPlugInfo( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestHandleSetHotPlugInfo( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -133,8 +133,8 @@ RequestHandleSetHotPlugInfo( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleEventNotification( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_opt_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_opt_ WDFREQUEST Request, _In_opt_ PWDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -144,24 +144,24 @@ RequestHandleEventNotification( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleGetDvdRegion( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _Out_ size_t * DataLength ); NTSTATUS RequestHandleQueryPropertyRetrieveCachedData( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); - + _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleReadTOC( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -169,17 +169,17 @@ RequestHandleReadTOC( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleReadTocEx( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); - + _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleGetConfiguration( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -187,8 +187,8 @@ RequestHandleGetConfiguration( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS RequestHandleGetDriveGeometry( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -196,8 +196,8 @@ RequestHandleGetDriveGeometry( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleDiskVerify( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -205,8 +205,8 @@ RequestHandleDiskVerify( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleCheckVerify( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -214,8 +214,8 @@ RequestHandleCheckVerify( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleFakePartitionInfo( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -223,8 +223,8 @@ RequestHandleFakePartitionInfo( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS RequestHandleEjectionControl( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -232,8 +232,8 @@ RequestHandleEjectionControl( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS RequestHandleLoadEjectMedia( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -241,16 +241,16 @@ RequestHandleLoadEjectMedia( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleMcnControl( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _Out_ size_t * DataLength ); _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS RequestHandleReserveRelease( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -258,8 +258,8 @@ RequestHandleReserveRelease( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS RequestHandlePersistentReserve( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -268,8 +268,8 @@ RequestHandlePersistentReserve( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleAreVolumesReady( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -277,8 +277,8 @@ RequestHandleAreVolumesReady( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleVolumeOnline( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -287,8 +287,8 @@ RequestHandleVolumeOnline( _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS DeviceHandleRawRead( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -296,8 +296,8 @@ DeviceHandleRawRead( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandlePlayAudioMsf( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -305,8 +305,8 @@ DeviceHandlePlayAudioMsf( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleReadQChannel( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -314,24 +314,24 @@ DeviceHandleReadQChannel( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandlePauseAudio( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _Out_ size_t * DataLength ); _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleResumeAudio( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _Out_ size_t * DataLength ); _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleSeekAudioMsf( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -339,16 +339,16 @@ DeviceHandleSeekAudioMsf( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleStopAudio( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _Out_ size_t * DataLength ); _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleGetSetVolume( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -356,8 +356,8 @@ DeviceHandleGetSetVolume( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleReadDvdStructure( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -365,8 +365,8 @@ DeviceHandleReadDvdStructure( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleDvdEndSession( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -374,8 +374,8 @@ DeviceHandleDvdEndSession( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleDvdStartSessionReadKey( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -383,8 +383,8 @@ DeviceHandleDvdStartSessionReadKey( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleDvdSendKey( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -392,8 +392,8 @@ DeviceHandleDvdSendKey( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleSetReadAhead( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -401,8 +401,8 @@ DeviceHandleSetReadAhead( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleSetSpeed( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -410,8 +410,8 @@ DeviceHandleSetSpeed( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsReadMediaKeyBlock( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -419,8 +419,8 @@ DeviceHandleAacsReadMediaKeyBlock( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsStartSession( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -428,8 +428,8 @@ DeviceHandleAacsStartSession( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsEndSession( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -437,8 +437,8 @@ DeviceHandleAacsEndSession( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsSendCertificate( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -446,8 +446,8 @@ DeviceHandleAacsSendCertificate( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsGetCertificate( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -455,8 +455,8 @@ DeviceHandleAacsGetCertificate( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsGetChallengeKey( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -464,8 +464,8 @@ DeviceHandleAacsGetChallengeKey( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleSendChallengeKey( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -473,8 +473,8 @@ DeviceHandleSendChallengeKey( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleReadVolumeId( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -482,8 +482,8 @@ DeviceHandleReadVolumeId( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsReadSerialNumber( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -491,8 +491,8 @@ DeviceHandleAacsReadSerialNumber( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsReadMediaId( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -500,8 +500,8 @@ DeviceHandleAacsReadMediaId( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsReadBindingNonce( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -509,8 +509,8 @@ DeviceHandleAacsReadBindingNonce( _IRQL_requires_max_(APC_LEVEL) NTSTATUS DeviceHandleAacsGenerateBindingNonce( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -518,24 +518,24 @@ DeviceHandleAacsGenerateBindingNonce( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleEnableStreaming( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _Out_ size_t * DataLength ); _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleSendOpcInformation( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _Out_ size_t * DataLength ); _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleGetPerformance( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -543,7 +543,7 @@ RequestHandleGetPerformance( _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleMcnSyncFakeIoctl( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, _Out_ size_t * DataLength ); @@ -579,20 +579,20 @@ RequestHandleExclusiveAccessUnlockDevice( NTSTATUS RequestHandleQueryPropertyDeviceUniqueId( - _In_ WDFDEVICE Device, + _In_ WDFDEVICE Device, _In_ WDFREQUEST Request ); NTSTATUS RequestHandleQueryPropertyWriteCache( - _In_ WDFDEVICE Device, + _In_ WDFDEVICE Device, _In_ WDFREQUEST Request ); _IRQL_requires_max_(APC_LEVEL) NTSTATUS RequestHandleScsiPassThrough( - _In_ WDFDEVICE Device, + _In_ WDFDEVICE Device, _In_ WDFREQUEST Request ); @@ -600,8 +600,8 @@ RequestHandleScsiPassThrough( NTSTATUS RequestHandleReadWrite( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters ); @@ -611,190 +611,190 @@ RequestHandleReadWrite( NTSTATUS RequestValidateRawRead( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateReadTocEx( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateReadToc( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateGetLastSession( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateReadQChannel( - _In_ WDFREQUEST Request, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateDvdReadStructure( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateDvdStartSession( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateDvdSendKey( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateDvdReadKey( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateGetConfiguration( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateSetSpeed( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsReadMediaKeyBlock( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsStartSession( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsSendCertificate( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsGetCertificate( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsGetChallengeKey( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsSendChallengeKey( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsReadVolumeId( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsReadSerialNumber( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsReadMediaId( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsBindingNonce( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateExclusiveAccess( - _In_ WDFREQUEST Request, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateEnableStreaming( - _In_ WDFREQUEST Request, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateSendOpcInformation( - _In_ WDFREQUEST Request, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateGetPerformance( - _In_ WDFREQUEST Request, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); @@ -807,31 +807,31 @@ RequestIsRealtimeStreaming( NTSTATUS RequestValidateReadWrite( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters ); NTSTATUS RequestValidatePersistentReserve( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateDvdEndSession( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); NTSTATUS RequestValidateAacsEndSession( - _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, + _In_ WDFREQUEST Request, _In_ WDF_REQUEST_PARAMETERS RequestParameters, _Out_ size_t * DataLength ); diff --git a/drivers/storage/class/cdrom_new/mmc.c b/drivers/storage/class/cdrom_new/mmc.c index 3887cc2f884..352b29553bf 100644 --- a/drivers/storage/class/cdrom_new/mmc.c +++ b/drivers/storage/class/cdrom_new/mmc.c @@ -8,11 +8,11 @@ Module Name: Abstract: - Include all funtions relate to MMC + Include all funtions relate to MMC Environment: - kernel mode only + kernel mode only Notes: @@ -80,22 +80,22 @@ Return Value: PAGED_CODE(); - if (mmcData->CapabilitiesIrp) + if (mmcData->CapabilitiesIrp) { IoFreeIrp(mmcData->CapabilitiesIrp); mmcData->CapabilitiesIrp = NULL; } - if (mmcData->CapabilitiesMdl) + if (mmcData->CapabilitiesMdl) { IoFreeMdl(mmcData->CapabilitiesMdl); mmcData->CapabilitiesMdl = NULL; } - if (mmcData->CapabilitiesBuffer) + if (mmcData->CapabilitiesBuffer) { ExFreePool(mmcData->CapabilitiesBuffer); mmcData->CapabilitiesBuffer = NULL; } - if (mmcData->CapabilitiesRequest) + if (mmcData->CapabilitiesRequest) { WdfObjectDelete(mmcData->CapabilitiesRequest); mmcData->CapabilitiesRequest = NULL; @@ -140,14 +140,14 @@ Return Value: NT_ASSERT(mmcData->CapabilitiesBuffer == NULL); NT_ASSERT(mmcData->CapabilitiesBufferSize == 0); - // allocate the buffer and set the buffer size. + // allocate the buffer and set the buffer size. // retrieve drive configuration information. status = DeviceGetConfigurationWithAlloc(Device, &mmcData->CapabilitiesBuffer, &mmcData->CapabilitiesBufferSize, FeatureProfileList, SCSI_GET_CONFIGURATION_REQUEST_TYPE_ALL); - if (!NT_SUCCESS(status)) + if (!NT_SUCCESS(status)) { NT_ASSERT(mmcData->CapabilitiesBuffer == NULL); NT_ASSERT(mmcData->CapabilitiesBufferSize == 0); @@ -156,12 +156,12 @@ Return Value: NT_ASSERT(mmcData->CapabilitiesBuffer != NULL); NT_ASSERT(mmcData->CapabilitiesBufferSize != 0); - + // Create an MDL over the new Buffer (allocated by DeviceGetConfiguration) mmcData->CapabilitiesMdl = IoAllocateMdl(mmcData->CapabilitiesBuffer, mmcData->CapabilitiesBufferSize, FALSE, FALSE, NULL); - if (mmcData->CapabilitiesMdl == NULL) + if (mmcData->CapabilitiesMdl == NULL) { ExFreePool(mmcData->CapabilitiesBuffer); mmcData->CapabilitiesBuffer = NULL; @@ -171,7 +171,7 @@ Return Value: // Create an IRP from which we will create a WDFREQUEST mmcData->CapabilitiesIrp = IoAllocateIrp(deviceExtension->DeviceObject->StackSize + 1, FALSE); - if (mmcData->CapabilitiesIrp == NULL) + if (mmcData->CapabilitiesIrp == NULL) { IoFreeMdl(mmcData->CapabilitiesMdl); mmcData->CapabilitiesMdl = NULL; @@ -182,7 +182,7 @@ Return Value: } // create WDF request object - WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&attributes, + WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&attributes, CDROM_REQUEST_CONTEXT); status = WdfRequestCreateFromIrp(&attributes, mmcData->CapabilitiesIrp, @@ -238,7 +238,7 @@ Return Value: } // default to read-only, no Streaming, non-blank - mmcData->WriteAllowed = FALSE; + mmcData->WriteAllowed = FALSE; mmcData->StreamingReadSupported = FALSE; mmcData->StreamingWriteSupported = FALSE; @@ -287,7 +287,7 @@ Return Value: returnedBytes, FeatureRealTimeStreaming); - if ((header != NULL) && + if ((header != NULL) && (header->Current) && (header->AdditionalLength >= minAdditionalLength)) { @@ -306,7 +306,7 @@ Return Value: PFEATURE_HEADER header; header = DeviceFindFeaturePage(mmcData->CapabilitiesBuffer, - returnedBytes, + returnedBytes, FeatureDvdCSS); mmcData->IsCssDvd = (header != NULL) && (header->Current); @@ -393,7 +393,7 @@ _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS DeviceGetConfigurationWithAlloc( _In_ WDFDEVICE Device, - _Outptr_result_bytebuffer_all_(*BytesReturned) + _Outptr_result_bytebuffer_all_(*BytesReturned) PGET_CONFIGURATION_HEADER* Buffer, // this routine allocates this memory _Out_ PULONG BytesReturned, FEATURE_NUMBER const StartingFeature, @@ -411,7 +411,7 @@ Arguments: Buffer - to be allocated by this function BytesReturned - size of the buffer StartingFeature - the starting point of the feature list - RequestedType - + RequestedType - Return Value: @@ -436,15 +436,15 @@ NOTE: does not handle case where more than 65000 bytes are returned, *BytesReturned = 0; // send the first request down to just get the header - status = DeviceGetConfiguration(Device, - &header, + status = DeviceGetConfiguration(Device, + &header, sizeof(header), - &returned, - StartingFeature, + &returned, + StartingFeature, RequestedType); // now send command again, using information returned to allocate just enough memory - if (NT_SUCCESS(status)) + if (NT_SUCCESS(status)) { size = header.DataLength[0] << 24 | header.DataLength[1] << 16 | @@ -452,13 +452,13 @@ NOTE: does not handle case where more than 65000 bytes are returned, header.DataLength[3] << 0 ; // the loop is in case that the retrieved data length is bigger than last time reported. - for (i = 0; (i < 4) && NT_SUCCESS(status); i++) + for (i = 0; (i < 4) && NT_SUCCESS(status); i++) { // the datalength field is the size *following* itself, so adjust accordingly size += 4*sizeof(UCHAR); // make sure the size is reasonable - if (size <= sizeof(FEATURE_HEADER)) + if (size <= sizeof(FEATURE_HEADER)) { TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_IOCTL, "DeviceGetConfigurationWithAlloc: drive reports only %x bytes?\n", @@ -473,7 +473,7 @@ NOTE: does not handle case where more than 65000 bytes are returned, size, CDROM_TAG_FEATURE); - if (buffer == NULL) + if (buffer == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; } @@ -482,11 +482,11 @@ NOTE: does not handle case where more than 65000 bytes are returned, if (NT_SUCCESS(status)) { // send the first request down to just get the header - status = DeviceGetConfiguration(Device, - buffer, - size, + status = DeviceGetConfiguration(Device, + buffer, + size, &returned, - StartingFeature, + StartingFeature, RequestedType); if (!NT_SUCCESS(status)) @@ -509,13 +509,13 @@ NOTE: does not handle case where more than 65000 bytes are returned, buffer->DataLength[3] << 0 ; returned += 4*sizeof(UCHAR); - if (returned <= size) + if (returned <= size) { *Buffer = buffer; *BytesReturned = returned; // amount of 'safe' memory // succes, get out of loop. status = STATUS_SUCCESS; - break; + break; } else { @@ -563,7 +563,7 @@ Arguments: BufferSize - size of the buffer ValidBytes - valid data size in buffer StartingFeature - the starting point of the feature list - RequestedType - + RequestedType - Return Value: @@ -595,7 +595,7 @@ NOTE: does not handle case where more than 64k bytes are returned, RtlZeroMemory(&srb, sizeof(SCSI_REQUEST_BLOCK)); RtlZeroMemory(Buffer, BufferSize); - if (TEST_FLAG(deviceExtension->DeviceAdditionalData.HackFlags, CDROM_HACK_BAD_GET_CONFIG_SUPPORT)) + if (TEST_FLAG(deviceExtension->DeviceAdditionalData.HackFlags, CDROM_HACK_BAD_GET_CONFIG_SUPPORT)) { return STATUS_INVALID_DEVICE_REQUEST; } @@ -609,11 +609,11 @@ NOTE: does not handle case where more than 64k bytes are returned, // cannot request more than 0xFFFC bytes in one request // Eventually will "stitch" together multiple requests if needed // Today, no drive has anywhere close to 4k..... - return DeviceGetConfiguration(Device, - Buffer, - 0xFFFC, - ValidBytes, - StartingFeature, + return DeviceGetConfiguration(Device, + Buffer, + 0xFFFC, + ValidBytes, + StartingFeature, RequestedType); } #pragma warning(pop) @@ -629,8 +629,8 @@ NOTE: does not handle case where more than 64k bytes are returned, cdb->GET_CONFIGURATION.AllocationLength[0] = (UCHAR)(BufferSize >> 8); cdb->GET_CONFIGURATION.AllocationLength[1] = (UCHAR)(BufferSize & 0xff); - status = DeviceSendSrbSynchronously(Device, - &srb, + status = DeviceSendSrbSynchronously(Device, + &srb, Buffer, BufferSize, FALSE, @@ -639,9 +639,9 @@ NOTE: does not handle case where more than 64k bytes are returned, TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_IOCTL, "DeviceGetConfiguration: Status was %x\n", status)); - if (NT_SUCCESS(status) || - (status == STATUS_BUFFER_OVERFLOW) || - (status == STATUS_DATA_OVERRUN)) + if (NT_SUCCESS(status) || + (status == STATUS_BUFFER_OVERFLOW) || + (status == STATUS_DATA_OVERRUN)) { ULONG returned = srb.DataTransferLength; PGET_CONFIGURATION_HEADER header = (PGET_CONFIGURATION_HEADER)Buffer; @@ -683,7 +683,7 @@ NOTE: does not handle case where more than 64k bytes are returned, _IRQL_requires_max_(APC_LEVEL) VOID DeviceUpdateMmcWriteCapability( - _In_reads_bytes_(BufferSize) + _In_reads_bytes_(BufferSize) PGET_CONFIGURATION_HEADER Buffer, ULONG const BufferSize, BOOLEAN const CurrentOnly, // TRUE == can drive write now, FALSE == can drive ever write @@ -699,12 +699,12 @@ Routine Description: Arguments: - Buffer - + Buffer - BufferSize - size of the buffer CurrentOnly - valid data size in buffer Writable - the buffer is allocationed in non-paged pool. validationSchema - the starting point of the feature list - BlockingFactor - + BlockingFactor - Return Value: @@ -783,7 +783,7 @@ NOTE: does not handle case where more than 64k bytes are returned, BufferSize, FeatureRandomReadable); - if ((header != NULL) && + if ((header != NULL) && (header->Current) && (header->AdditionalLength >= additionalLength)) { @@ -982,7 +982,7 @@ NOTE: does not handle case where more than 64k bytes are returned, _IRQL_requires_max_(APC_LEVEL) PVOID MmcDataFindFeaturePage( - _In_reads_bytes_(Length) + _In_reads_bytes_(Length) PGET_CONFIGURATION_HEADER FeatureBuffer, ULONG const Length, FEATURE_NUMBER const Feature @@ -1031,7 +1031,7 @@ Return Value: // loop through each page until we find the requested one, or // until it's not safe to access the entire feature header // (if equal, have exactly enough for the feature header) - while (buffer + sizeof(FEATURE_HEADER) <= limit) + while (buffer + sizeof(FEATURE_HEADER) <= limit) { PFEATURE_HEADER header = (PFEATURE_HEADER)buffer; FEATURE_NUMBER thisFeature; @@ -1039,7 +1039,7 @@ Return Value: thisFeature = (header->FeatureCode[0] << 8) | (header->FeatureCode[1]); - if (thisFeature == Feature) + if (thisFeature == Feature) { PUCHAR temp; @@ -1049,7 +1049,7 @@ Return Value: temp += sizeof(FEATURE_HEADER); temp += header->AdditionalLength; - if (temp > limit) + if (temp > limit) { // this means the transfer was cut-off, an insufficiently // small buffer was given, or other arbitrary error. since @@ -1060,8 +1060,8 @@ Return Value: "Feature %x exists, but not safe to access all its " "data. returning NULL\n", Feature)); return NULL; - } - else + } + else { return buffer; } @@ -1098,7 +1098,7 @@ Arguments: ProfileHeader - buffer of profile list ProfileToFind - profile to be found - CurrentOnly - + CurrentOnly - Return Value: @@ -1116,7 +1116,7 @@ Return Value: *Found = FALSE; // sanity check - if (ProfileHeader->Header.AdditionalLength % 2 != 0) + if (ProfileHeader->Header.AdditionalLength % 2 != 0) { TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "Profile total length %x is not integral multiple of 4\n", @@ -1130,7 +1130,7 @@ Return Value: profile = ProfileHeader->Profiles; // zero-sized array // loop through profiles - for (i = 0; i < numberOfProfiles; i++) + for (i = 0; i < numberOfProfiles; i++) { FEATURE_PROFILE_TYPE currentProfile; @@ -1165,7 +1165,7 @@ Routine Description: Arguments: - Profile - + Profile - Return Value: @@ -1433,7 +1433,7 @@ Routine Description: Arguments: DeviceExtension - device context - UseLegacyNominalPerformance - + UseLegacyNominalPerformance - Return Value: @@ -1622,7 +1622,7 @@ Return Value: } ScratchBuffer_EndUse(DeviceExtension); - + return result; } diff --git a/drivers/storage/class/cdrom_new/mmc.h b/drivers/storage/class/cdrom_new/mmc.h index 51c03309153..048bc198426 100644 --- a/drivers/storage/class/cdrom_new/mmc.h +++ b/drivers/storage/class/cdrom_new/mmc.h @@ -48,7 +48,7 @@ _IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS DeviceGetConfigurationWithAlloc( _In_ WDFDEVICE Device, - _Outptr_result_bytebuffer_all_(*BytesReturned) + _Outptr_result_bytebuffer_all_(*BytesReturned) PGET_CONFIGURATION_HEADER * Buffer, _Out_ PULONG BytesReturned, FEATURE_NUMBER const StartingFeature, @@ -70,7 +70,7 @@ DeviceGetConfiguration( _IRQL_requires_max_(APC_LEVEL) VOID DeviceUpdateMmcWriteCapability( - _In_reads_bytes_(BufferSize) + _In_reads_bytes_(BufferSize) PGET_CONFIGURATION_HEADER Buffer, ULONG const BufferSize, BOOLEAN const CurrentOnly, // TRUE == can drive write now, FALSE == can drive ever write @@ -82,7 +82,7 @@ DeviceUpdateMmcWriteCapability( _IRQL_requires_max_(APC_LEVEL) PVOID MmcDataFindFeaturePage( - _In_reads_bytes_(Length) + _In_reads_bytes_(Length) PGET_CONFIGURATION_HEADER FeatureBuffer, ULONG const Length, FEATURE_NUMBER const Feature diff --git a/drivers/storage/class/cdrom_new/sense.c b/drivers/storage/class/cdrom_new/sense.c index 7033c6ce6c1..cc88e978e8d 100644 --- a/drivers/storage/class/cdrom_new/sense.c +++ b/drivers/storage/class/cdrom_new/sense.c @@ -110,15 +110,15 @@ Arguments: Return Value: NTSTATUS - Status - - Retry - + Status - + Retry - --*/ { BOOLEAN mediaChange = FALSE; PCDB cdb = (PCDB)Srb->Cdb; - if (TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) + if (TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) { PSENSE_DATA senseBuffer = Srb->SenseInfoBuffer; @@ -128,14 +128,14 @@ Return Value: // own routine. we now allow some requests to continue during our // processing of the capabilities update in order to allow // IoReadPartitionTable() to succeed. - switch (senseBuffer->SenseKey & 0xf) + switch (senseBuffer->SenseKey & 0xf) { - case SCSI_SENSE_NOT_READY: + case SCSI_SENSE_NOT_READY: { - if (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_NO_MEDIA_IN_DEVICE) + if (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_NO_MEDIA_IN_DEVICE) { - if (DeviceExtension->DeviceAdditionalData.Mmc.WriteAllowed) + if (DeviceExtension->DeviceAdditionalData.Mmc.WriteAllowed) { TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "DeviceErrorHandlerForMmc: media removed, writes will be " @@ -144,16 +144,16 @@ Return Value: // NOTE - REF #0002 DeviceExtension->DeviceAdditionalData.Mmc.WriteAllowed = FALSE; - } - else if (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_LUN_NOT_READY) + } + else if (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_LUN_NOT_READY) { - if (senseBuffer->AdditionalSenseCodeQualifier == SCSI_SENSEQ_BECOMING_READY) + if (senseBuffer->AdditionalSenseCodeQualifier == SCSI_SENSEQ_BECOMING_READY) { TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "DeviceErrorHandlerForMmc: media becoming ready, " "SHOULD notify shell of change time by sending " "GESN request immediately!\n")); - } + } else if (((senseBuffer->AdditionalSenseCodeQualifier == SCSI_SENSEQ_OPERATION_IN_PROGRESS) || (senseBuffer->AdditionalSenseCodeQualifier == SCSI_SENSEQ_LONG_WRITE_IN_PROGRESS) ) && @@ -168,7 +168,7 @@ Return Value: (Srb->Cdb[0] == SCSIOP_READ_TRACK_INFORMATION) || (Srb->Cdb[0] == SCSIOP_READ_DISK_INFORMATION) ) - ) + ) { TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "DeviceErrorHandlerForMmc: LONG_WRITE or " @@ -181,11 +181,11 @@ Return Value: break; } // end SCSI_SENSE_NOT_READY - case SCSI_SENSE_UNIT_ATTENTION: + case SCSI_SENSE_UNIT_ATTENTION: { - switch (senseBuffer->AdditionalSenseCode) + switch (senseBuffer->AdditionalSenseCode) { - case SCSI_ADSENSE_MEDIUM_CHANGED: + case SCSI_ADSENSE_MEDIUM_CHANGED: { // always update if the medium may have changed @@ -214,14 +214,14 @@ Return Value: } // end SCSI_ADSENSE_BUS_RESET - case SCSI_ADSENSE_OPERATOR_REQUEST: + case SCSI_ADSENSE_OPERATOR_REQUEST: { BOOLEAN b = FALSE; switch (senseBuffer->AdditionalSenseCodeQualifier) { - case SCSI_SENSEQ_MEDIUM_REMOVAL: + case SCSI_SENSEQ_MEDIUM_REMOVAL: { // eject notification currently handled by classpnp TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, @@ -233,7 +233,7 @@ Return Value: case SCSI_SENSEQ_WRITE_PROTECT_DISABLE: b = TRUE; - case SCSI_SENSEQ_WRITE_PROTECT_ENABLE: + case SCSI_SENSEQ_WRITE_PROTECT_ENABLE: { TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "DeviceErrorHandlerForMmc: Write protect %s requested " @@ -255,7 +255,7 @@ Return Value: } // end SCSI_ADSENSE_OPERATOR_REQUEST - default: + default: { TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "DeviceErrorHandlerForMmc: Unit attention %02x/%02x\n", @@ -269,9 +269,9 @@ Return Value: } // end SCSI_SENSE_UNIT_ATTENTION - case SCSI_SENSE_ILLEGAL_REQUEST: + case SCSI_SENSE_ILLEGAL_REQUEST: { - if (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_WRITE_PROTECT) + if (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_WRITE_PROTECT) { if (DeviceExtension->DeviceAdditionalData.Mmc.WriteAllowed) { @@ -290,27 +290,27 @@ Return Value: } // end of SenseKey switch // Check if we failed to set the DVD region key and send appropriate error - if (cdb->CDB16.OperationCode == SCSIOP_SEND_KEY) + if (cdb->CDB16.OperationCode == SCSIOP_SEND_KEY) { - if (cdb->SEND_KEY.KeyFormat == DvdSetRpcKey) + if (cdb->SEND_KEY.KeyFormat == DvdSetRpcKey) { - if (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_NO_MEDIA_IN_DEVICE) + if (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_NO_MEDIA_IN_DEVICE) { // media of appropriate region required *Status = STATUS_NO_MEDIA_IN_DEVICE; *Retry = FALSE; - } + } else if ((senseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST) && (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_COPY_PROTECTION_FAILURE) && - (senseBuffer->AdditionalSenseCodeQualifier == SCSI_SENSEQ_MEDIA_CODE_MISMATCHED_TO_LOGICAL_UNIT)) + (senseBuffer->AdditionalSenseCodeQualifier == SCSI_SENSEQ_MEDIA_CODE_MISMATCHED_TO_LOGICAL_UNIT)) { // media of appropriate region required *Status = STATUS_CSS_REGION_MISMATCH; *Retry = FALSE; - } + } else if ((senseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST) && (senseBuffer->AdditionalSenseCode == SCSI_ADSENSE_INVALID_MEDIA) && - (senseBuffer->AdditionalSenseCodeQualifier == SCSI_SENSEQ_INCOMPATIBLE_FORMAT)) + (senseBuffer->AdditionalSenseCodeQualifier == SCSI_SENSEQ_INCOMPATIBLE_FORMAT)) { // media of appropriate region required *Status = STATUS_CSS_REGION_MISMATCH; @@ -324,9 +324,9 @@ Return Value: // queue a workitem to send the commands to the device. Do this on // media arrival as some device will fail this command if no media // is present. Ignore the fake media change from classpnp driver. - if ((mediaChange == TRUE) && (*Status != STATUS_MEDIA_CHANGED)) + if ((mediaChange == TRUE) && (*Status != STATUS_MEDIA_CHANGED)) { - if (DeviceExtension->DeviceAdditionalData.RestoreDefaults == TRUE) + if (DeviceExtension->DeviceAdditionalData.RestoreDefaults == TRUE) { NTSTATUS status = STATUS_SUCCESS; WDF_OBJECT_ATTRIBUTES attributes; @@ -349,7 +349,7 @@ Return Value: WdfWorkItemEnqueue(workItem); - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "DeviceErrorHandlerForMmc: Restore device default speed for %p\n", DeviceExtension->DeviceObject)); } @@ -394,13 +394,13 @@ Return Value: { PSENSE_DATA senseBuffer = Srb->SenseInfoBuffer; - if (!TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) + if (!TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) { return STATUS_SUCCESS; //nobody cares about this return value yet. } if (((senseBuffer->SenseKey & 0xf) == SCSI_SENSE_HARDWARE_ERROR) && - (senseBuffer->AdditionalSenseCode == 0x44)) + (senseBuffer->AdditionalSenseCode == 0x44)) { TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, "DeviceErrorHandlerForHitachiGD2000 (%p) => Internal Target " @@ -441,7 +441,7 @@ SenseInfoRequestGetInformation( if (requestContext->OriginalRequest != NULL) { PIO_STACK_LOCATION originalIrpStack = NULL; - + PIRP originalIrp = WdfRequestWdmGetIrp(requestContext->OriginalRequest); if (originalIrp != NULL) @@ -488,13 +488,13 @@ SenseInfoInterpretByAdditionalSenseCode( _In_ UCHAR AdditionalSenseCodeQual, _Inout_ NTSTATUS* Status, _Inout_ BOOLEAN* Retry, - _Out_ _Deref_out_range_(0,100) ULONG* RetryIntervalInSeconds, + _Out_ _Deref_out_range_(0,100) ULONG* RetryIntervalInSeconds, _Inout_ PERROR_LOG_CONTEXT LogContext ) /* - This function will interpret error based on ASC/ASCQ. + This function will interpret error based on ASC/ASCQ. - If the error code is not processed in this function, e.g. return value is TRUE, + If the error code is not processed in this function, e.g. return value is TRUE, caller needs to call SenseInfoInterpretBySenseKey() for further interpret. */ { @@ -506,11 +506,11 @@ SenseInfoInterpretByAdditionalSenseCode( *Retry = TRUE; *RetryIntervalInSeconds = 0; - switch (AdditionalSenseCode) + switch (AdditionalSenseCode) { - case SCSI_ADSENSE_LUN_NOT_READY: + case SCSI_ADSENSE_LUN_NOT_READY: { - TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Lun not ready\n")); // @@ -521,7 +521,7 @@ SenseInfoInterpretByAdditionalSenseCode( // // These drives should not pass WHQL certification due to this discrepency. // - // However, we have to retry on 2/4/0 (Not ready, LUN not ready, no info) + // However, we have to retry on 2/4/0 (Not ready, LUN not ready, no info) // and also 3/2/0 (no seek complete). // // These conditions occur when the shell tries to examine an @@ -533,18 +533,18 @@ SenseInfoInterpretByAdditionalSenseCode( // The default retry timeout of one second is acceptable to balance // these discrepencies. don't modify the status, though.... // - - switch (AdditionalSenseCodeQual) + + switch (AdditionalSenseCodeQual) { - case SCSI_SENSEQ_OPERATION_IN_PROGRESS: + case SCSI_SENSEQ_OPERATION_IN_PROGRESS: { DEVICE_EVENT_BECOMING_READY notReady = {0}; - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Operation In Progress\n")); needFurtherInterpret = FALSE; - + *Retry = TRUE; *RetryIntervalInSeconds = NOT_READY_RETRY_INTERVAL; *Status = STATUS_DEVICE_NOT_READY; @@ -560,7 +560,7 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_SENSEQ_BECOMING_READY: + case SCSI_SENSEQ_BECOMING_READY: { DEVICE_EVENT_BECOMING_READY notReady = {0}; @@ -568,7 +568,7 @@ SenseInfoInterpretByAdditionalSenseCode( "SenseInfoInterpretByAdditionalSenseCode: In process of becoming ready\n")); needFurtherInterpret = FALSE; - + *Retry = TRUE; *RetryIntervalInSeconds = NOT_READY_RETRY_INTERVAL; *Status = STATUS_DEVICE_NOT_READY; @@ -584,13 +584,13 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_SENSEQ_LONG_WRITE_IN_PROGRESS: + case SCSI_SENSEQ_LONG_WRITE_IN_PROGRESS: { - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Long write in progress\n")); needFurtherInterpret = FALSE; - + // This has been seen as a transcient failure on some drives *Status = STATUS_DEVICE_NOT_READY; *Retry = TRUE; @@ -600,9 +600,9 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_SENSEQ_MANUAL_INTERVENTION_REQUIRED: + case SCSI_SENSEQ_MANUAL_INTERVENTION_REQUIRED: { - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Manual intervention required\n")); needFurtherInterpret = FALSE; @@ -614,11 +614,11 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_SENSEQ_FORMAT_IN_PROGRESS: + case SCSI_SENSEQ_FORMAT_IN_PROGRESS: { TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Format in progress\n")); - + needFurtherInterpret = FALSE; *Status = STATUS_DEVICE_NOT_READY; @@ -628,11 +628,11 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_SENSEQ_CAUSE_NOT_REPORTABLE: + case SCSI_SENSEQ_CAUSE_NOT_REPORTABLE: case SCSI_SENSEQ_INIT_COMMAND_REQUIRED: default: { - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Initializing command required\n")); needFurtherInterpret = FALSE; @@ -641,8 +641,8 @@ SenseInfoInterpretByAdditionalSenseCode( *Retry = TRUE; *RetryIntervalInSeconds = 0; - // This sense code/additional sense code combination may indicate - // that the device needs to be started. + // This sense code/additional sense code combination may indicate + // that the device needs to be started. if (TEST_FLAG(DeviceExtension->DeviceFlags, DEV_SAFE_START_UNIT) && !TEST_FLAG(Srb->SrbFlags, SRB_CLASS_FLAGS_LOW_PRIORITY)) { @@ -656,9 +656,9 @@ SenseInfoInterpretByAdditionalSenseCode( } // end case (SCSI_ADSENSE_LUN_NOT_READY) - case SCSI_ADSENSE_NO_MEDIA_IN_DEVICE: + case SCSI_ADSENSE_NO_MEDIA_IN_DEVICE: { - TracePrint((TRACE_LEVEL_VERBOSE, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_VERBOSE, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: No Media in device.\n")); needFurtherInterpret = FALSE; @@ -674,7 +674,7 @@ SenseInfoInterpretByAdditionalSenseCode( // but RSM has to know that the media is still in the drive (i.e. the drive is not free). DeviceSetMediaChangeStateEx(DeviceExtension, MediaUnavailable, NULL); } - else + else { DeviceSetMediaChangeStateEx(DeviceExtension, MediaNotPresent, NULL); } @@ -682,15 +682,15 @@ SenseInfoInterpretByAdditionalSenseCode( break; } // end case SCSI_ADSENSE_NO_MEDIA_IN_DEVICE - case SCSI_ADSENSE_INVALID_MEDIA: + case SCSI_ADSENSE_INVALID_MEDIA: { - switch (AdditionalSenseCodeQual) + switch (AdditionalSenseCodeQual) { - case SCSI_SENSEQ_UNKNOWN_FORMAT: + case SCSI_SENSEQ_UNKNOWN_FORMAT: { needFurtherInterpret = FALSE; - + // Log error only if this is a paging request *Status = STATUS_UNRECOGNIZED_MEDIA; *Retry = FALSE; @@ -702,22 +702,22 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_SENSEQ_INCOMPATIBLE_FORMAT: + case SCSI_SENSEQ_INCOMPATIBLE_FORMAT: { needFurtherInterpret = FALSE; - + *Status = STATUS_UNRECOGNIZED_MEDIA; *Retry = FALSE; LogContext->LogError = FALSE; break; - } + } case SCSI_SENSEQ_CLEANING_CARTRIDGE_INSTALLED: { needFurtherInterpret = FALSE; - + *Status = STATUS_CLEANER_CARTRIDGE_INSTALLED; *Retry = FALSE; @@ -737,15 +737,15 @@ SenseInfoInterpretByAdditionalSenseCode( break; } // end case SCSI_ADSENSE_NO_MEDIA_IN_DEVICE - case SCSI_ADSENSE_NO_SEEK_COMPLETE: + case SCSI_ADSENSE_NO_SEEK_COMPLETE: { - switch (AdditionalSenseCodeQual) + switch (AdditionalSenseCodeQual) { - case 0x00: + case 0x00: { needFurtherInterpret = FALSE; - + *Status = STATUS_DEVICE_DATA_ERROR; *Retry = TRUE; *RetryIntervalInSeconds = 0; @@ -765,15 +765,15 @@ SenseInfoInterpretByAdditionalSenseCode( break; } // end case SCSI_ADSENSE_NO_SEEK_COMPLETE - case SCSI_ADSENSE_LUN_COMMUNICATION: + case SCSI_ADSENSE_LUN_COMMUNICATION: { - switch (AdditionalSenseCodeQual) + switch (AdditionalSenseCodeQual) { - case SCSI_SESNEQ_COMM_CRC_ERROR: + case SCSI_SESNEQ_COMM_CRC_ERROR: { needFurtherInterpret = FALSE; - + *Status = STATUS_IO_DEVICE_ERROR; *Retry = TRUE; *RetryIntervalInSeconds = 1; @@ -793,38 +793,38 @@ SenseInfoInterpretByAdditionalSenseCode( break; } // end case SCSI_ADSENSE_LUN_COMMUNICATION - case SCSI_ADSENSE_ILLEGAL_BLOCK: + case SCSI_ADSENSE_ILLEGAL_BLOCK: { needFurtherInterpret = FALSE; - TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Illegal block address\n")); *Status = STATUS_NONEXISTENT_SECTOR; *Retry = FALSE; break; } - case SCSI_ADSENSE_INVALID_LUN: + case SCSI_ADSENSE_INVALID_LUN: { needFurtherInterpret = FALSE; - TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Invalid LUN\n")); *Status = STATUS_NO_SUCH_DEVICE; *Retry = FALSE; break; } - case SCSI_ADSENSE_COPY_PROTECTION_FAILURE: + case SCSI_ADSENSE_COPY_PROTECTION_FAILURE: { needFurtherInterpret = FALSE; *Retry = FALSE; - TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Key - Copy protection failure\n")); - switch (AdditionalSenseCodeQual) + switch (AdditionalSenseCodeQual) { case SCSI_SENSEQ_AUTHENTICATION_FAILURE: TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, @@ -865,11 +865,11 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_ADSENSE_INVALID_CDB: + case SCSI_ADSENSE_INVALID_CDB: { needFurtherInterpret = FALSE; - TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_ERROR, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Key - Invalid CDB\n")); *Status = STATUS_INVALID_DEVICE_REQUEST; @@ -888,12 +888,12 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_ADSENSE_MEDIUM_CHANGED: + case SCSI_ADSENSE_MEDIUM_CHANGED: { needFurtherInterpret = FALSE; *RetryIntervalInSeconds = 0; - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_MCN, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_MCN, "SenseInfoInterpretByAdditionalSenseCode: Media changed\n")); DeviceSetMediaChangeStateEx(DeviceExtension, MediaPresent, NULL); @@ -907,7 +907,7 @@ SenseInfoInterpretByAdditionalSenseCode( *Status = STATUS_VERIFY_REQUIRED; *Retry = FALSE; } - else + else { *Status = STATUS_IO_DEVICE_ERROR; *Retry = TRUE; @@ -915,18 +915,18 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_ADSENSE_OPERATOR_REQUEST: + case SCSI_ADSENSE_OPERATOR_REQUEST: { - switch (AdditionalSenseCodeQual) + switch (AdditionalSenseCodeQual) { - case SCSI_SENSEQ_MEDIUM_REMOVAL: + case SCSI_SENSEQ_MEDIUM_REMOVAL: { needFurtherInterpret = FALSE; *RetryIntervalInSeconds = 0; - + InterlockedIncrement((PLONG)&DeviceExtension->MediaChangeCount); - - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Ejection request received!\n")); //Send eject notification. DeviceSendNotification(DeviceExtension, @@ -942,7 +942,7 @@ SenseInfoInterpretByAdditionalSenseCode( *Status = STATUS_VERIFY_REQUIRED; *Retry = FALSE; } - else + else { *Status = STATUS_IO_DEVICE_ERROR; *Retry = TRUE; @@ -958,16 +958,16 @@ SenseInfoInterpretByAdditionalSenseCode( break; } - case SCSI_ADSENSE_OPERATING_CONDITIONS_CHANGED: + case SCSI_ADSENSE_OPERATING_CONDITIONS_CHANGED: { needFurtherInterpret = FALSE; *RetryIntervalInSeconds = 5; InterlockedIncrement((PLONG)&DeviceExtension->MediaChangeCount); - + // Device information has changed, we need to rescan the // bus for changed information such as the capacity. - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Device information changed. Invalidate the bus\n")); IoInvalidateDeviceRelations(DeviceExtension->LowerPdo, BusRelations); @@ -981,7 +981,7 @@ SenseInfoInterpretByAdditionalSenseCode( *Status = STATUS_VERIFY_REQUIRED; *Retry = FALSE; } - else + else { *Status = STATUS_IO_DEVICE_ERROR; *Retry = TRUE; @@ -991,7 +991,7 @@ SenseInfoInterpretByAdditionalSenseCode( case SCSI_ADSENSE_REC_DATA_NOECC: - case SCSI_ADSENSE_REC_DATA_ECC: + case SCSI_ADSENSE_REC_DATA_ECC: { needFurtherInterpret = FALSE; @@ -1001,16 +1001,16 @@ SenseInfoInterpretByAdditionalSenseCode( LogContext->UniqueErrorValue = 258; LogContext->ErrorCode = IO_RECOVERED_VIA_ECC; - if (senseBuffer->IncorrectLength) + if (senseBuffer->IncorrectLength) { - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Incorrect length detected.\n")); *Status = STATUS_INVALID_BLOCK_LENGTH ; } break; } - case SCSI_ADSENSE_FAILURE_PREDICTION_THRESHOLD_EXCEEDED: + case SCSI_ADSENSE_FAILURE_PREDICTION_THRESHOLD_EXCEEDED: { UCHAR wmiEventData[sizeof(ULONG)+sizeof(UCHAR)] = {0}; @@ -1032,24 +1032,24 @@ SenseInfoInterpretByAdditionalSenseCode( LogContext->LogError = TRUE; LogContext->ErrorCode = IO_WRN_FAILURE_PREDICTED; - if (senseBuffer->IncorrectLength) + if (senseBuffer->IncorrectLength) { - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "SenseInfoInterpretByAdditionalSenseCode: Incorrect length detected.\n")); *Status = STATUS_INVALID_BLOCK_LENGTH ; } break; } - case 0x57: + case 0x57: { // UNABLE_TO_RECOVER_TABLE_OF_CONTENTS // the Matshita CR-585 returns this for all read commands // on blank CD-R and CD-RW media, and we need to handle // this for READ_CD detection ability. - switch (AdditionalSenseCodeQual) + switch (AdditionalSenseCodeQual) { - case 0x00: + case 0x00: { needFurtherInterpret = FALSE; @@ -1114,7 +1114,7 @@ SenseInfoInterpretBySenseKey( *Status = STATUS_MEDIA_WRITE_PROTECTED; *Retry = FALSE; break; - } + } case SCSI_SENSE_MEDIUM_ERROR: { @@ -1276,13 +1276,13 @@ SenseInfoInterpretBySrbStatus( *Retry = TRUE; *RetryIntervalInSeconds = 0; - switch (SRB_STATUS(Srb->SrbStatus)) + switch (SRB_STATUS(Srb->SrbStatus)) { case SRB_STATUS_INVALID_LUN: case SRB_STATUS_INVALID_TARGET_ID: case SRB_STATUS_NO_DEVICE: case SRB_STATUS_NO_HBA: - case SRB_STATUS_INVALID_PATH_ID: + case SRB_STATUS_INVALID_PATH_ID: { *Status = STATUS_NO_SUCH_DEVICE; *Retry = FALSE; @@ -1290,7 +1290,7 @@ SenseInfoInterpretBySrbStatus( } case SRB_STATUS_COMMAND_TIMEOUT: - case SRB_STATUS_TIMEOUT: + case SRB_STATUS_TIMEOUT: { // Update the error count for the device. *Status = STATUS_IO_TIMEOUT; @@ -1310,7 +1310,7 @@ SenseInfoInterpretBySrbStatus( break; } - case SRB_STATUS_SELECTION_TIMEOUT: + case SRB_STATUS_SELECTION_TIMEOUT: { *Status = STATUS_DEVICE_NOT_CONNECTED; *Retry = FALSE; @@ -1328,7 +1328,7 @@ SenseInfoInterpretBySrbStatus( break; } - case SRB_STATUS_PHASE_SEQUENCE_FAILURE: + case SRB_STATUS_PHASE_SEQUENCE_FAILURE: { // Update the error count for the device. incrementErrorCount = TRUE; @@ -1340,17 +1340,17 @@ SenseInfoInterpretBySrbStatus( break; } - case SRB_STATUS_REQUEST_FLUSHED: + case SRB_STATUS_REQUEST_FLUSHED: { // If the status needs verification bit is set. Then set // the status to need verification and no retry; otherwise, // just retry the request. - if (TEST_FLAG(DeviceExtension->DeviceObject->Flags, DO_VERIFY_VOLUME)) + if (TEST_FLAG(DeviceExtension->DeviceObject->Flags, DO_VERIFY_VOLUME)) { *Status = STATUS_VERIFY_REQUIRED; *Retry = FALSE; - } - else + } + else { *Status = STATUS_IO_DEVICE_ERROR; *Retry = TRUE; @@ -1359,7 +1359,7 @@ SenseInfoInterpretBySrbStatus( break; } - case SRB_STATUS_INVALID_REQUEST: + case SRB_STATUS_INVALID_REQUEST: { *Status = STATUS_INVALID_DEVICE_REQUEST; *Retry = FALSE; @@ -1378,19 +1378,19 @@ SenseInfoInterpretBySrbStatus( break; } - case SRB_STATUS_ERROR: + case SRB_STATUS_ERROR: { *Status = STATUS_IO_DEVICE_ERROR; *Retry = TRUE; - if (Srb->ScsiStatus == 0) + if (Srb->ScsiStatus == 0) { // This is some strange return code. Update the error // count for the device. incrementErrorCount = TRUE; - } + } - if (Srb->ScsiStatus == SCSISTAT_BUSY) + if (Srb->ScsiStatus == SCSISTAT_BUSY) { *Status = STATUS_DEVICE_NOT_READY; } @@ -1398,7 +1398,7 @@ SenseInfoInterpretBySrbStatus( break; } - default: + default: { *Status = STATUS_IO_DEVICE_ERROR; *Retry = TRUE; @@ -1409,20 +1409,20 @@ SenseInfoInterpretBySrbStatus( break; } - } //end of (SRB_STATUS(Srb->SrbStatus)) - - if (incrementErrorCount) + } //end of (SRB_STATUS(Srb->SrbStatus)) + + if (incrementErrorCount) { // if any error count occurred, delay the retry of this io by // at least one second, if caller supports it. - if (*RetryIntervalInSeconds == 0) + if (*RetryIntervalInSeconds == 0) { *RetryIntervalInSeconds = 1; } DevicePerfIncrementErrorCount(DeviceExtension); } - + return; } @@ -1466,7 +1466,7 @@ SenseInfoLogError( validSense = RTL_CONTAINS_FIELD(senseBuffer, Srb->SenseInfoBufferLength, AdditionalSenseLength); - if (validSense) + if (validSense) { // if extra info exists, copy the maximum amount of available // sense data that is safe into the the errlog. @@ -1482,7 +1482,7 @@ SenseInfoLogError( senseBufferSize = max(validSenseBytes, sizeof(SENSE_DATA)); senseBufferSize = min(senseBufferSize, Srb->SenseInfoBufferLength); } - else + else { // it's smaller than required to read the total number of // valid bytes, so just use the SenseInfoBufferLength field. @@ -1515,8 +1515,8 @@ SenseInfoLogError( { staticErrLogEntry.FinalStatus = STATUS_SUCCESS; staticErrLogData.ErrorRetried = TRUE; - } - else + } + else { staticErrLogEntry.FinalStatus = *Status; } @@ -1524,12 +1524,12 @@ SenseInfoLogError( // Don't log generic IO_WARNING_PAGING_FAILURE message if either the // I/O is retried, or it completed successfully. if ((LogContext->ErrorCode == IO_WARNING_PAGING_FAILURE) && - (*Retry || NT_SUCCESS(*Status)) ) + (*Retry || NT_SUCCESS(*Status)) ) { LogContext->LogError = FALSE; } - if (TEST_FLAG(Srb->SrbFlags, SRB_CLASS_FLAGS_PAGING)) + if (TEST_FLAG(Srb->SrbFlags, SRB_CLASS_FLAGS_PAGING)) { staticErrLogData.ErrorPaging = TRUE; } @@ -1544,7 +1544,7 @@ SenseInfoLogError( { staticErrLogEntry.ErrorCode = STATUS_IO_DEVICE_ERROR; } - else + else { staticErrLogEntry.ErrorCode = LogContext->ErrorCode; } @@ -1646,7 +1646,7 @@ SenseInfoLogError( *errlogData = staticErrLogData; // For the system log, copy as much of the sense buffer as possible. - if (senseBufferSize != 0) + if (senseBufferSize != 0) { RtlCopyMemory(&errlogData->SenseData, senseBuffer, senseBufferSize); } @@ -1791,15 +1791,15 @@ Return Value: } else if ((opCode == SCSIOP_RESERVE_UNIT) || (opCode == SCSIOP_RELEASE_UNIT)) { - // The RESERVE(6) / RELEASE(6) commands are optional. + // The RESERVE(6) / RELEASE(6) commands are optional. // So if they aren't supported, try the 10-byte equivalents if (*Status == STATUS_INVALID_DEVICE_REQUEST) { PCDB tempCdb = (PCDB)Srb->Cdb; Srb->CdbLength = 10; - tempCdb->CDB10.OperationCode = (tempCdb->CDB6GENERIC.OperationCode == SCSIOP_RESERVE_UNIT) - ? SCSIOP_RESERVE_UNIT10 + tempCdb->CDB10.OperationCode = (tempCdb->CDB6GENERIC.OperationCode == SCSIOP_RESERVE_UNIT) + ? SCSIOP_RESERVE_UNIT10 : SCSIOP_RELEASE_UNIT10; SET_FLAG(DeviceExtension->PrivateFdoData->HackFlags, FDO_HACK_NO_RESERVE6); @@ -1830,7 +1830,7 @@ Return Value: BOOLEAN disableStreaming = FALSE; - if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_TIMEOUT || + if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_TIMEOUT || SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_COMMAND_TIMEOUT || SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SELECTION_TIMEOUT || SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_BUS_RESET) @@ -1847,7 +1847,7 @@ Return Value: } else if ((senseBuffer->SenseKey &0xf) == SCSI_SENSE_ILLEGAL_REQUEST) { - // LBA Out of Range is an exception, as it's more likely to be caused by + // LBA Out of Range is an exception, as it's more likely to be caused by // upper layers attempting to read/write a wrong LBA. if (senseBuffer->AdditionalSenseCode != SCSI_ADSENSE_ILLEGAL_BLOCK) { @@ -1871,11 +1871,11 @@ Return Value: } } - // Special-case handling of READ/WRITE commands. These commands now have a 120 second timeout, - // but the preferred behavior (and that taken by many drives) is to immediately report 2/4/x - // on OPC and similar commands. Thus, retries must occur for at least 160 seconds + // Special-case handling of READ/WRITE commands. These commands now have a 120 second timeout, + // but the preferred behavior (and that taken by many drives) is to immediately report 2/4/x + // on OPC and similar commands. Thus, retries must occur for at least 160 seconds // (120 seconds + four 10 second retries) as a conservative guess. - // Note: 160s retry time is also a result of discussion with OEMs for case of 2/4/7 and 2/4/8. + // Note: 160s retry time is also a result of discussion with OEMs for case of 2/4/7 and 2/4/8. if (*Retry) { if ((Total100nsSinceFirstSend < 0) || @@ -1890,7 +1890,7 @@ Return Value: *Retry = FALSE; } - // How long should we request a delay for during writing? This depends entirely on + // How long should we request a delay for during writing? This depends entirely on // the current write speed of the drive. If we request retries too quickly, // we can overload the processor on the drive (resulting in garbage being written), // but too slowly results in lesser performance. @@ -1914,14 +1914,14 @@ Return Value: } if ((Srb->SenseInfoBufferLength < RTL_SIZEOF_THROUGH_FIELD(SENSE_DATA,AdditionalSenseCodeQualifier)) || - !TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) + !TEST_FLAG(Srb->SrbStatus, SRB_STATUS_AUTOSENSE_VALID)) { // If get configuration command is failing and if the request type is TYPE ONE // then most likely the device does not support this request type. Set the // flag so that the TYPE ONE requests will be tried as TYPE ALL requets. if ((SRB_STATUS(Srb->SrbStatus) != SRB_STATUS_SUCCESS) && (SRB_STATUS(Srb->SrbStatus) != SRB_STATUS_DATA_OVERRUN) && - (((PCDB)Srb->Cdb)->GET_CONFIGURATION.RequestType == SCSI_GET_CONFIGURATION_REQUEST_TYPE_ONE)) + (((PCDB)Srb->Cdb)->GET_CONFIGURATION.RequestType == SCSI_GET_CONFIGURATION_REQUEST_TYPE_ONE)) { TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, @@ -1989,23 +1989,23 @@ Return Value: (IoControlCode == IOCTL_CDROM_READ_TOC) || (IoControlCode == IOCTL_CDROM_READ_TOC_EX) || (IoControlCode == IOCTL_CDROM_GET_CONFIGURATION)|| - (IoControlCode == IOCTL_CDROM_GET_VOLUME)) + (IoControlCode == IOCTL_CDROM_GET_VOLUME)) { - if (*Status == STATUS_DATA_OVERRUN) + if (*Status == STATUS_DATA_OVERRUN) { *Status = STATUS_SUCCESS; *Retry = FALSE; } } - if (IoControlCode == IOCTL_CDROM_READ_Q_CHANNEL) + if (IoControlCode == IOCTL_CDROM_READ_Q_CHANNEL) { PLAY_ACTIVE(DeviceExtension) = FALSE; } // If the status is verified required and the this request // should bypass verify required then retry the request. - if (OverrideVerifyVolume && (*Status == STATUS_VERIFY_REQUIRED)) + if (OverrideVerifyVolume && (*Status == STATUS_VERIFY_REQUIRED)) { // note: status gets overwritten here *Status = STATUS_IO_DEVICE_ERROR; @@ -2015,7 +2015,7 @@ Return Value: (IoControlCode == IOCTL_STORAGE_CHECK_VERIFY) || (IoControlCode == IOCTL_STORAGE_CHECK_VERIFY2) || (IoControlCode == IOCTL_DISK_CHECK_VERIFY) - ) + ) { // Update the geometry information, as the media could have changed. (VOID) MediaReadCapacity(DeviceExtension->Device); @@ -2037,7 +2037,7 @@ Return Value: BOOLEAN SenseInfoInterpret( _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ WDFREQUEST Request, _In_ PSCSI_REQUEST_BLOCK Srb, _In_ ULONG RetriedCount, _Out_ NTSTATUS* Status, @@ -2050,8 +2050,8 @@ SenseInfoInterpret() Routine Description: - This routine interprets the data returned from the SCSI request sense. - It determines the status to return in the IRP + This routine interprets the data returned from the SCSI request sense. + It determines the status to return in the IRP and whether this request can be retried. Arguments: @@ -2096,7 +2096,7 @@ Return Value: &overrideVerifyVolume, &total100nsSinceFirstSend); - if(TEST_FLAG(Srb->SrbFlags, SRB_CLASS_FLAGS_PAGING)) + if(TEST_FLAG(Srb->SrbFlags, SRB_CLASS_FLAGS_PAGING)) { // Log anything remotely incorrect about paging i/o logContext.LogError = TRUE; @@ -2114,15 +2114,15 @@ Return Value: retry = FALSE; *Status = Srb->InternalStatus; - } - else if (Srb->ScsiStatus == SCSISTAT_RESERVATION_CONFLICT) + } + else if (Srb->ScsiStatus == SCSISTAT_RESERVATION_CONFLICT) { retry = FALSE; *Status = STATUS_DEVICE_BUSY; logContext.LogError = FALSE; - } + } else if ((Srb->SrbStatus & SRB_STATUS_AUTOSENSE_VALID) && - (Srb->SenseInfoBufferLength >= RTL_SIZEOF_THROUGH_FIELD(SENSE_DATA, AdditionalSenseLength))) + (Srb->SenseInfoBufferLength >= RTL_SIZEOF_THROUGH_FIELD(SENSE_DATA, AdditionalSenseLength))) { UCHAR senseKey = (UCHAR)(senseBuffer->SenseKey & 0x0f); UCHAR additionalSenseCode = 0; @@ -2131,7 +2131,7 @@ Return Value: // Zero the additional sense code and additional sense code qualifier // if they were not returned by the device. readSector = senseBuffer->AdditionalSenseLength + offsetof(SENSE_DATA, AdditionalSenseLength); - if (readSector > Srb->SenseInfoBufferLength) + if (readSector > Srb->SenseInfoBufferLength) { readSector = Srb->SenseInfoBufferLength; } @@ -2141,16 +2141,16 @@ Return Value: additionalSenseCodeQual = (readSector >= RTL_SIZEOF_THROUGH_FIELD(SENSE_DATA, AdditionalSenseCodeQualifier)) ? senseBuffer->AdditionalSenseCodeQualifier : 0; - TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "SCSI Error - \n" "\tcdb: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n" "\tsrb status: %X; sense: %02X/%02X/%02X; Retried count: %d\n\n", - Srb->Cdb[0], Srb->Cdb[1], Srb->Cdb[2], Srb->Cdb[3], Srb->Cdb[4], Srb->Cdb[5], - Srb->Cdb[6], Srb->Cdb[7], Srb->Cdb[8], Srb->Cdb[9], Srb->Cdb[10], Srb->Cdb[11], - Srb->Cdb[12], Srb->Cdb[13], Srb->Cdb[14], Srb->Cdb[15], - SRB_STATUS(Srb->SrbStatus), - senseKey, - additionalSenseCode, + Srb->Cdb[0], Srb->Cdb[1], Srb->Cdb[2], Srb->Cdb[3], Srb->Cdb[4], Srb->Cdb[5], + Srb->Cdb[6], Srb->Cdb[7], Srb->Cdb[8], Srb->Cdb[9], Srb->Cdb[10], Srb->Cdb[11], + Srb->Cdb[12], Srb->Cdb[13], Srb->Cdb[14], Srb->Cdb[15], + SRB_STATUS(Srb->SrbStatus), + senseKey, + additionalSenseCode, additionalSenseCodeQual, RetriedCount)); @@ -2160,7 +2160,7 @@ Return Value: // A media change may have occured so increment the change count for the physical device mediaChangeCount = InterlockedIncrement((PLONG)&DeviceExtension->MediaChangeCount); - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_MCN, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_MCN, "SenseInfoInterpret: Media change count for device %d incremented to %#lx\n", DeviceExtension->DeviceNumber, mediaChangeCount)); } @@ -2181,13 +2181,13 @@ Return Value: BOOLEAN notHandled = FALSE; notHandled = SenseInfoInterpretByAdditionalSenseCode(DeviceExtension, Srb, - additionalSenseCode, + additionalSenseCode, additionalSenseCodeQual, Status, &retry, &retryIntervalInSeconds, &logContext); - + if (notHandled) { SenseInfoInterpretBySenseKey(DeviceExtension, @@ -2203,17 +2203,17 @@ Return Value: // Try to determine the bad sector from the inquiry data. if ((IS_SCSIOP_READWRITE(((PCDB)Srb->Cdb)->CDB10.OperationCode)) || (((PCDB)Srb->Cdb)->CDB10.OperationCode == SCSIOP_VERIFY) || - (((PCDB)Srb->Cdb)->CDB10.OperationCode == SCSIOP_VERIFY16)) + (((PCDB)Srb->Cdb)->CDB10.OperationCode == SCSIOP_VERIFY16)) { ULONG index; readSector = 0; - for (index = 0; index < 4; index++) + for (index = 0; index < 4; index++) { logContext.BadSector = (logContext.BadSector << 8) | senseBuffer->Information[index]; } - for (index = 0; index < 4; index++) + for (index = 0; index < 4; index++) { readSector = (readSector << 8) | Srb->Cdb[index+2]; } @@ -2227,23 +2227,23 @@ Return Value: logContext.BadSector = readSector; } } - } - else + } + else { // Request sense buffer not valid. No sense information // to pinpoint the error. Return general request fail. - TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "SCSI Error - \n" "\tcdb: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n" "\tsrb status: %X; sense info not valid; Retried count: %d\n\n", - Srb->Cdb[0], Srb->Cdb[1], Srb->Cdb[2], Srb->Cdb[3], Srb->Cdb[4], Srb->Cdb[5], - Srb->Cdb[6], Srb->Cdb[7], Srb->Cdb[8], Srb->Cdb[9], Srb->Cdb[10], Srb->Cdb[11], - Srb->Cdb[12], Srb->Cdb[13], Srb->Cdb[14], Srb->Cdb[15], + Srb->Cdb[0], Srb->Cdb[1], Srb->Cdb[2], Srb->Cdb[3], Srb->Cdb[4], Srb->Cdb[5], + Srb->Cdb[6], Srb->Cdb[7], Srb->Cdb[8], Srb->Cdb[9], Srb->Cdb[10], Srb->Cdb[11], + Srb->Cdb[12], Srb->Cdb[13], Srb->Cdb[14], Srb->Cdb[15], SRB_STATUS(Srb->SrbStatus), RetriedCount)); SenseInfoInterpretBySrbStatus(DeviceExtension, - Srb, + Srb, RetriedCount, Status, &retry, @@ -2257,7 +2257,7 @@ Return Value: // call the device specific error handler if it has one. // DeviceErrorHandlerForMmmc() for all MMC devices // or DeviceErrorHandlerForHitachiGD2000() for HITACHI GD-2000, HITACHI DVD-ROM GD-2000 - if (DeviceExtension->DeviceAdditionalData.ErrorHandler) + if (DeviceExtension->DeviceAdditionalData.ErrorHandler) { DeviceExtension->DeviceAdditionalData.ErrorHandler(DeviceExtension, Srb, Status, &retry); } @@ -2272,16 +2272,16 @@ Return Value: Status, RetryIntervalIn100ns); - // Refine retry based on IOCTL code. + // Refine retry based on IOCTL code. if (majorFunctionCode == IRP_MJ_DEVICE_CONTROL) { SenseInfoInterpretRefineByIoControl(DeviceExtension, - ioControlCode, + ioControlCode, overrideVerifyVolume, &retry, Status); } - + // LOG the error: // Always log the error in our internal log. // If logError is set, also log the error in the system log. @@ -2303,10 +2303,10 @@ Return Value: WdfRequestIsCanceled(requestContext->OriginalRequest) ) { - TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "Request %p was cancelled when it would have been retried\n", requestContext->OriginalRequest)); - + *Status = STATUS_CANCELLED; retry = FALSE; *RetryIntervalIn100ns = 0; @@ -2316,7 +2316,7 @@ Return Value: // now, all decisions are made. display trace information. if (retry) { - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "Command shall be retried in %2I64d.%03I64d seconds\n", (*RetryIntervalIn100ns / UNIT_100NS_PER_SECOND), (*RetryIntervalIn100ns / 10000) % 1000 @@ -2324,7 +2324,7 @@ Return Value: } else { - TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "Will not retry; Sense/ASC/ASCQ of %02x/%02x/%02x\n", senseBuffer->SenseKey, senseBuffer->AdditionalSenseCode, @@ -2351,8 +2351,8 @@ SenseInfoInterpretForZPODD() Routine Description: - This routine interprets the data returned from the SCSI request sense. - It determines the status to return in the IRP + This routine interprets the data returned from the SCSI request sense. + It determines the status to return in the IRP and whether this request can be retried. Arguments: @@ -2390,7 +2390,7 @@ Return Value: retry = TRUE; } else if ((Srb->SrbStatus & SRB_STATUS_AUTOSENSE_VALID) && - (Srb->SenseInfoBufferLength >= RTL_SIZEOF_THROUGH_FIELD(SENSE_DATA, AdditionalSenseLength))) + (Srb->SenseInfoBufferLength >= RTL_SIZEOF_THROUGH_FIELD(SENSE_DATA, AdditionalSenseLength))) { UCHAR senseKey = (UCHAR)(senseBuffer->SenseKey & 0x0f); UCHAR additionalSenseCode = 0; @@ -2399,7 +2399,7 @@ Return Value: // Zero the additional sense code and additional sense code qualifier // if they were not returned by the device. readSector = senseBuffer->AdditionalSenseLength + offsetof(SENSE_DATA, AdditionalSenseLength); - if (readSector > Srb->SenseInfoBufferLength) + if (readSector > Srb->SenseInfoBufferLength) { readSector = Srb->SenseInfoBufferLength; } @@ -2442,7 +2442,7 @@ Return Value: // now, all decisions are made. display trace information. if (retry) { - TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_INFORMATION, TRACE_FLAG_GENERAL, "Command shall be retried in %2I64d.%03I64d seconds\n", (*RetryIntervalIn100ns / UNIT_100NS_PER_SECOND), (*RetryIntervalIn100ns / 10000) % 1000 @@ -2450,7 +2450,7 @@ Return Value: } else { - TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, + TracePrint((TRACE_LEVEL_WARNING, TRACE_FLAG_GENERAL, "Will not retry; Sense/ASC/ASCQ of %02x/%02x/%02x\n", senseBuffer->SenseKey, senseBuffer->AdditionalSenseCode, @@ -2466,7 +2466,7 @@ Return Value: BOOLEAN RequestSenseInfoInterpret( _In_ PCDROM_DEVICE_EXTENSION DeviceExtension, - _In_ WDFREQUEST Request, + _In_ WDFREQUEST Request, _In_ PSCSI_REQUEST_BLOCK Srb, _In_ ULONG RetriedCount, _Out_ NTSTATUS* Status, @@ -2504,7 +2504,7 @@ Return Value: if (SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS) { - // request succeeded. + // request succeeded. if ((zpoddInfo != NULL) && (zpoddInfo->BecomingReadyRetryCount > 0)) { @@ -2517,9 +2517,9 @@ Return Value: else { // request failed. We need to process the error. - + // 1. Release the queue if it is frozen. - if (Srb->SrbStatus & SRB_STATUS_QUEUE_FROZEN) + if (Srb->SrbStatus & SRB_STATUS_QUEUE_FROZEN) { DeviceReleaseQueue(DeviceExtension->Device); } diff --git a/drivers/storage/class/class2/class2.c b/drivers/storage/class/class2/class2.c index f3ca8b5045f..c3265c38ec8 100644 --- a/drivers/storage/class/class2/class2.c +++ b/drivers/storage/class/class2/class2.c @@ -154,7 +154,7 @@ ScsiClassPlugPlay( } - + ULONG NTAPI ScsiClassInitialize( @@ -291,7 +291,7 @@ Return Value: return deviceFound ? STATUS_SUCCESS : STATUS_NO_SUCH_DEVICE; } - + NTSTATUS NTAPI ScsiClassCreateClose( @@ -341,7 +341,7 @@ Return Value: } - + NTSTATUS NTAPI ScsiClassReadWrite( @@ -525,7 +525,7 @@ Return Value: } // end ScsiClassReadWrite() - + NTSTATUS NTAPI ScsiClassGetCapabilities( @@ -606,7 +606,7 @@ Notes: } // end ScsiClassGetCapabilities() - + NTSTATUS NTAPI ScsiClassGetInquiryData( @@ -708,7 +708,7 @@ Notes: } // end ScsiClassGetInquiryData() - + NTSTATUS NTAPI ScsiClassReadDriveCapacity( @@ -933,7 +933,7 @@ Retry: } // end ScsiClassReadDriveCapacity() - + VOID NTAPI ScsiClassReleaseQueue( @@ -1076,7 +1076,7 @@ Return Value: } // end ScsiClassReleaseQueue() - + VOID NTAPI StartUnit( @@ -1211,7 +1211,7 @@ Return Value: } // end StartUnit() - + NTSTATUS NTAPI ScsiClassAsynchronousCompletion( @@ -1292,7 +1292,7 @@ Return Value: } // ScsiClassAsynchronousCompletion() - + VOID NTAPI ScsiClassSplitRequest( @@ -1486,7 +1486,7 @@ Return Value: } // end ScsiClassSplitRequest() - + NTSTATUS NTAPI ScsiClassIoComplete( @@ -1635,7 +1635,7 @@ Return Value: } // end ScsiClassIoComplete() - + NTSTATUS NTAPI ScsiClassIoCompleteAssociated( @@ -1850,7 +1850,7 @@ Return Value: } // end ScsiClassIoCompleteAssociated() - + NTSTATUS NTAPI ScsiClassSendSrbSynchronous( @@ -2142,7 +2142,7 @@ retry: } // end ScsiClassSendSrbSynchronous() - + BOOLEAN NTAPI ScsiClassInterpretSenseInfo( @@ -2839,7 +2839,7 @@ Return Value: } // end ScsiClassInterpretSenseInfo() - + VOID NTAPI RetryRequest( @@ -2964,7 +2964,7 @@ Return Value: (VOID)IoCallDriver(deviceExtension->PortDeviceObject, Irp); } // end RetryRequest() - + VOID NTAPI ScsiClassBuildRequest( @@ -3193,7 +3193,7 @@ Return Value: return; } // end ScsiClassBuildRequest() - + ULONG NTAPI ScsiClassModeSense( @@ -3290,7 +3290,7 @@ Retry: } // end ScsiClassModeSense() - + PVOID NTAPI ScsiClassFindModePage( @@ -3364,7 +3364,7 @@ Return Value: return(NULL); } - + NTSTATUS NTAPI ScsiClassSendSrbAsynchronous( @@ -3553,7 +3553,7 @@ Return Value: } - + NTSTATUS NTAPI ScsiClassDeviceControlDispatch( @@ -3597,7 +3597,7 @@ Return Value: return deviceExtension->ClassDeviceControl(DeviceObject,Irp); } - + NTSTATUS NTAPI ScsiClassDeviceControl( @@ -4258,7 +4258,7 @@ SetStatusAndReturn: return status; } - + NTSTATUS NTAPI ScsiClassShutdownFlush( @@ -4311,7 +4311,7 @@ Return Value: return STATUS_INVALID_DEVICE_REQUEST; } - + ULONG NTAPI ScsiClassFindUnclaimedDevices( @@ -4359,7 +4359,7 @@ ScsiClassFindUnclaimedDevices( } - + NTSTATUS NTAPI ScsiClassCreateDeviceObject( @@ -4483,7 +4483,7 @@ Return Value: return status; } - + NTSTATUS NTAPI ScsiClassClaimDevice( @@ -4650,7 +4650,7 @@ Return Value: return status; } - + NTSTATUS NTAPI ScsiClassInternalIoControl ( @@ -4725,7 +4725,7 @@ Return Value: IoSetCompletionRoutine(Irp, ClassIoCompletion, NULL, TRUE, TRUE, TRUE); return IoCallDriver(deviceExtension->PortDeviceObject, Irp); } - + NTSTATUS NTAPI ClassIoCompletion( @@ -4773,7 +4773,7 @@ Return Value: return Irp->IoStatus.Status; } - + VOID NTAPI ScsiClassInitializeSrbLookasideList( @@ -4811,7 +4811,7 @@ Return Value: } - + ULONG NTAPI ScsiClassQueryTimeOutRegistryValue( @@ -4904,7 +4904,7 @@ Return Value: return timeOut; } - + NTSTATUS NTAPI ScsiClassCheckVerifyComplete( diff --git a/drivers/storage/class/classpnp/autorun.c b/drivers/storage/class/classpnp/autorun.c index 6500b4c998f..1a26be908b6 100644 --- a/drivers/storage/class/classpnp/autorun.c +++ b/drivers/storage/class/classpnp/autorun.c @@ -184,7 +184,7 @@ ClassSendEjectionNotification( return; } - + _IRQL_requires_max_(DISPATCH_LEVEL) VOID NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ @@ -766,7 +766,7 @@ Notes: } // end switch on notification class return status; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspInternalSetMediaChangeState() @@ -911,7 +911,7 @@ ClasspInternalSetMediaChangeState( return; } // end ClasspInternalSetMediaChangeState() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSetMediaChangeState() @@ -1021,7 +1021,7 @@ ClassSetMediaChangeState( ClasspSetMediaChangeStateEx(FdoExtension, NewState, Wait, FALSE); return; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspMediaChangeDetectionCompletion() @@ -1288,7 +1288,7 @@ ClasspMediaChangeDetectionCompletion( return STATUS_MORE_PROCESSING_REQUIRED; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspSendTestUnitIrp() - ISSUE-2000/02/20-henrygab - not documented @@ -1538,7 +1538,7 @@ ClasspPrepareMcnIrp( return irp; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspSendMediaStateIrp() - ISSUE-2000/02/20-henrygab - not documented @@ -1727,7 +1727,7 @@ ClasspSendMediaStateIrp( return; } // end ClasspSendMediaStateIrp() - + /*++//////////////////////////////////////////////////////////////////////////// ClassCheckMediaState() @@ -1781,7 +1781,7 @@ ClassCheckMediaState( return; } // end ClassCheckMediaState() - + /*++//////////////////////////////////////////////////////////////////////////// ClassResetMediaChangeTimer() @@ -1813,7 +1813,7 @@ ClassResetMediaChangeTimer( } return; } // end ClassResetMediaChangeTimer() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspInitializePolling() - ISSUE-2000/02/20-henrygab - not documented @@ -1985,7 +1985,7 @@ ClasspInitializePolling( return STATUS_INSUFFICIENT_RESOURCES; } // end ClasspInitializePolling() - + NTSTATUS ClasspInitializeGesn( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, @@ -2425,7 +2425,7 @@ ClassInitializeTestUnitPolling( { return ClasspInitializePolling(FdoExtension, AllowDriveToSleep); } // end ClassInitializeTestUnitPolling() - + /*++//////////////////////////////////////////////////////////////////////////// ClassInitializeMediaChangeDetection() @@ -2536,7 +2536,7 @@ ClassInitializeMediaChangeDetection( return; } // end ClassInitializeMediaChangeDetection() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspMediaChangeDeviceInstanceOverride() @@ -2698,7 +2698,7 @@ ClasspMediaChangeDeviceInstanceOverride( return status; } // end ClasspMediaChangeDeviceInstanceOverride() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspIsMediaChangeDisabledDueToHardwareLimitation() @@ -2926,7 +2926,7 @@ ClasspIsMediaChangeDisabledDueToHardwareLimitation( return FALSE; } // end ClasspIsMediaChangeDisabledDueToHardwareLimitation() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspIsMediaChangeDisabledForClass() @@ -3078,7 +3078,7 @@ ClasspIsMediaChangeDisabledForClass( return (BOOLEAN)(!mcnRegistryValue); } // end ClasspIsMediaChangeDisabledForClass() - + /*++//////////////////////////////////////////////////////////////////////////// ClassEnableMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public? @@ -3162,7 +3162,7 @@ ClassEnableMediaChangeDetection( return; } // end ClassEnableMediaChangeDetection() - + /*++//////////////////////////////////////////////////////////////////////////// ClassDisableMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public? @@ -3213,7 +3213,7 @@ ClassDisableMediaChangeDetection( return; } // end ClassDisableMediaChangeDetection() - + /*++//////////////////////////////////////////////////////////////////////////// ClassCleanupMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public?! @@ -3255,7 +3255,7 @@ ClassCleanupMediaChangeDetection( FREE_POOL(info); return; } // end ClassCleanupMediaChangeDetection() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspMcnControl() - ISSUE-2000/02/20-henrygab - not documented @@ -3350,7 +3350,7 @@ ClasspMcnControl( } return status; } // end ClasspMcnControl( - + /*++//////////////////////////////////////////////////////////////////////////// ClasspMediaChangeRegistryCallBack() @@ -3456,7 +3456,7 @@ ClasspMediaChangeRegistryCallBack( return STATUS_SUCCESS; } // end ClasspMediaChangeRegistryCallBack() - + #if (NTDDI_VERSION >= NTDDI_WINBLUE) VOID ClasspTimerTickEx( @@ -3936,7 +3936,7 @@ ClasspEnableTimer( } } // end ClasspEnableTimer() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspDisableTimer() - ISSUE-2000/02/20-henrygab - not documented @@ -3993,7 +3993,7 @@ ClasspDisableTimer( return; } // end ClasspDisableTimer() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspFailurePredict() - ISSUE-2000/02/20-henrygab - not documented @@ -4156,7 +4156,7 @@ ClasspFailurePredict( IoFreeWorkItem(workItem); return; } // end ClasspFailurePredict() - + /*++//////////////////////////////////////////////////////////////////////////// ClassNotifyFailurePredicted() ISSUE-alanwar-2000/02/20 - not documented @@ -4263,7 +4263,7 @@ ClassNotifyFailurePredicted( } } // end ClassNotifyFailurePredicted() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSetFailurePredictionPoll() diff --git a/drivers/storage/class/classpnp/class.c b/drivers/storage/class/classpnp/class.c index e2a0d40c59b..27f84afd30a 100644 --- a/drivers/storage/class/classpnp/class.c +++ b/drivers/storage/class/classpnp/class.c @@ -182,8 +182,8 @@ DriverEntry( return STATUS_SUCCESS; } - - + + /*++//////////////////////////////////////////////////////////////////////////// ClassInitialize() @@ -467,7 +467,7 @@ ClassInitialize( status = STATUS_SUCCESS; return status; } // end ClassInitialize() - + /*++//////////////////////////////////////////////////////////////////////////// ClassInitializeEx() @@ -742,7 +742,7 @@ ClassInitializeEx( return status; } // end ClassInitializeEx() - + /*++//////////////////////////////////////////////////////////////////////////// ClassUnload() @@ -819,7 +819,7 @@ ClassUnload( return; } // end ClassUnload() - + /*++//////////////////////////////////////////////////////////////////////////// ClassAddDevice() @@ -868,7 +868,7 @@ ClassAddDevice( return status; } // end ClassAddDevice() - + /*++//////////////////////////////////////////////////////////////////////////// ClassDispatchPnp() @@ -1795,7 +1795,7 @@ ClassDispatchPnp( return status; } // end ClassDispatchPnp() - + /*++//////////////////////////////////////////////////////////////////////////// ClassPnpStartDevice() @@ -3215,7 +3215,7 @@ ClassSendStartUnit( return; } // end StartUnit() - + /*++//////////////////////////////////////////////////////////////////////////// ClassAsynchronousCompletion() ISSUE-2000/02/18-henrygab - why public?! @@ -6607,7 +6607,7 @@ __ClassInterpretSenseInfo_ProcessingInvalidSenseBuffer: } // end ClassInterpretSenseInfo() - + /*++//////////////////////////////////////////////////////////////////////////// ClassModeSense() @@ -6977,7 +6977,7 @@ ClasspModeSelect( return status; } - + /*++//////////////////////////////////////////////////////////////////////////// ClassSendSrbAsynchronous() @@ -7231,7 +7231,7 @@ ClassSendSrbAsynchronous( return STATUS_PENDING; } // end ClassSendSrbAsynchronous() - + /*++//////////////////////////////////////////////////////////////////////////// ClassDeviceControlDispatch() @@ -7285,7 +7285,7 @@ ClassDeviceControlDispatch( return commonExtension->DevInfo->ClassDeviceControl(DeviceObject,Irp); } // end ClassDeviceControlDispatch() - + /*++//////////////////////////////////////////////////////////////////////////// ClassDeviceControl() @@ -8745,7 +8745,7 @@ SetStatusAndReturn: return status; } // end ClassDeviceControl() - + /*++//////////////////////////////////////////////////////////////////////////// ClassShutdownFlush() @@ -8812,7 +8812,7 @@ ClassShutdownFlush( return STATUS_INVALID_DEVICE_REQUEST; } // end ClassShutdownFlush() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspIsPortable() @@ -8899,7 +8899,7 @@ cleanup: return status; } - + /*++//////////////////////////////////////////////////////////////////////////// ClassCreateDeviceObject() @@ -9240,7 +9240,7 @@ ClassCreateDeviceObject( return status; } // end ClassCreateDeviceObject() - + /*++//////////////////////////////////////////////////////////////////////////// ClassClaimDevice() @@ -9359,7 +9359,7 @@ ClassClaimDevice( return status; } // end ClassClaimDevice() - + /*++//////////////////////////////////////////////////////////////////////////// ClassInternalIoControl() @@ -9442,7 +9442,7 @@ ClassInternalIoControl( return IoCallDriver(commonExtension->LowerDeviceObject, Irp); } // end ClassInternalIoControl() - + /*++//////////////////////////////////////////////////////////////////////////// ClassQueryTimeOutRegistryValue() @@ -9549,7 +9549,7 @@ ClassQueryTimeOutRegistryValue( } // end ClassQueryTimeOutRegistryValue() - + /*++//////////////////////////////////////////////////////////////////////////// ClassCheckVerifyComplete() ISSUE-2000/02/18-henrygab - why public?! @@ -9816,7 +9816,7 @@ ClassSignalCompletion( return STATUS_MORE_PROCESSING_REQUIRED; } // end ClassSignalCompletion() - + /*++//////////////////////////////////////////////////////////////////////////// ClassPnpQueryFdoRelations() @@ -9872,7 +9872,7 @@ ClassPnpQueryFdoRelations( return Irp->IoStatus.Status; } // end ClassPnpQueryFdoRelations() - + /*++//////////////////////////////////////////////////////////////////////////// ClassMarkChildrenMissing() @@ -9920,7 +9920,7 @@ ClassMarkChildrenMissing( ClassReleaseChildLock(Fdo); return; } // end ClassMarkChildrenMissing() - + /*++//////////////////////////////////////////////////////////////////////////// ClassMarkChildMissing() @@ -9977,7 +9977,7 @@ ClassMarkChildMissing( return returnValue; } // end ClassMarkChildMissing() - + /*++//////////////////////////////////////////////////////////////////////////// ClassRetrieveDeviceRelations() @@ -10123,7 +10123,7 @@ ClassRetrieveDeviceRelations( ClassReleaseChildLock(fdoExtension); return STATUS_SUCCESS; } // end ClassRetrieveDeviceRelations() - + /*++//////////////////////////////////////////////////////////////////////////// ClassGetPdoId() @@ -10168,7 +10168,7 @@ ClassGetPdoId( return driverExtension->InitData.ClassQueryId( Pdo, IdType, IdString); } // end ClassGetPdoId() - + /*++//////////////////////////////////////////////////////////////////////////// ClassQueryPnpCapabilities() @@ -10218,7 +10218,7 @@ ClassQueryPnpCapabilities( return STATUS_NOT_IMPLEMENTED; } } // end ClassQueryPnpCapabilities() - + /*++//////////////////////////////////////////////////////////////////////////// ClassInvalidateBusRelations() @@ -10276,7 +10276,7 @@ ClassInvalidateBusRelations( return; } // end ClassInvalidateBusRelations() - + /*++//////////////////////////////////////////////////////////////////////////// ClassRemoveDevice() ISSUE-2000/02/18-henrygab - why public?! @@ -10609,7 +10609,7 @@ ClassRemoveDevice( return STATUS_SUCCESS; } // end ClassRemoveDevice() - + /*++//////////////////////////////////////////////////////////////////////////// ClassGetDriverExtension() @@ -10640,7 +10640,7 @@ ClassGetDriverExtension( #endif return IoGetDriverObjectExtension(DriverObject, CLASS_DRIVER_EXTENSION_KEY); } // end ClassGetDriverExtension() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspStartIo() @@ -10699,7 +10699,7 @@ ClasspStartIo( return; } // ClasspStartIo() - + /*++//////////////////////////////////////////////////////////////////////////// ClassUpdateInformationInRegistry() @@ -10897,7 +10897,7 @@ ClassUpdateInformationInRegistry( } _SEH2_END; } // end ClassUpdateInformationInRegistry() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspSendSynchronousCompletion() @@ -10960,7 +10960,7 @@ ClasspSendSynchronousCompletion( return STATUS_MORE_PROCESSING_REQUIRED; } // end ClasspSendSynchronousCompletion() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspRegisterMountedDeviceInterface @@ -11023,7 +11023,7 @@ ClasspRegisterMountedDeviceInterface( } return; } // end ClasspRegisterMountedDeviceInterface() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSendDeviceIoControlSynchronous() @@ -11320,7 +11320,7 @@ ClassSendDeviceIoControlSynchronous( return; } // end ClassSendDeviceIoControlSynchronous() - + /*++//////////////////////////////////////////////////////////////////////////// ClassForwardIrpSynchronous() @@ -11348,7 +11348,7 @@ ClassForwardIrpSynchronous( IoCopyCurrentIrpStackLocationToNext(Irp); return ClassSendIrpSynchronous(CommonExtension->LowerDeviceObject, Irp); } // end ClassForwardIrpSynchronous() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSendIrpSynchronous() @@ -11447,7 +11447,7 @@ ClassSendIrpSynchronous( return status; } // end ClassSendIrpSynchronous() - + /*++//////////////////////////////////////////////////////////////////////////// ClassGetVpb() @@ -11479,7 +11479,7 @@ ClassGetVpb( #endif return DeviceObject->Vpb; } // end ClassGetVpb() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspAllocateReleaseRequest @@ -11515,7 +11515,7 @@ ClasspAllocateReleaseRequest( return STATUS_SUCCESS; } // end ClasspAllocateReleaseRequest() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspFreeReleaseRequest @@ -11560,7 +11560,7 @@ ClasspFreeReleaseRequest( return; } // end ClasspFreeReleaseRequest() - + /*++//////////////////////////////////////////////////////////////////////////// ClassReleaseQueue() @@ -11593,7 +11593,7 @@ ClassReleaseQueue( ClasspReleaseQueue(Fdo, NULL); return; } // end ClassReleaseQueue() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspAllocateReleaseQueueIrp() @@ -11867,7 +11867,7 @@ ClasspReleaseQueue( return; } // end ClassReleaseQueue() - + /*++//////////////////////////////////////////////////////////////////////////// ClassReleaseQueueCompletion() @@ -11949,8 +11949,8 @@ ClassReleaseQueueCompletion( return STATUS_MORE_PROCESSING_REQUIRED; } // ClassAsynchronousCompletion() - - + + /*++//////////////////////////////////////////////////////////////////////////// ClassAcquireChildLock() @@ -11995,7 +11995,7 @@ ClassAcquireChildLock( FdoExtension->ChildLockAcquisitionCount++; return; } - + /*++//////////////////////////////////////////////////////////////////////////// ClassReleaseChildLock() ISSUE-2000/02/18-henrygab - not documented @@ -12032,7 +12032,7 @@ ClassReleaseChildLock( return; } // end ClassReleaseChildLock( - + /*++//////////////////////////////////////////////////////////////////////////// ClassAddChild() @@ -12089,7 +12089,7 @@ ClassAddChild( } return; } // end ClassAddChild() - + /*++//////////////////////////////////////////////////////////////////////////// ClassRemoveChild() @@ -12183,7 +12183,7 @@ ClassRemoveChild( return Child; } // end ClassRemoveChild() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspRetryRequestDpc @@ -12307,7 +12307,7 @@ ClasspRetryRequestDpc( return; } // end ClasspRetryRequestDpc() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClassRetryRequest @@ -12447,7 +12447,7 @@ ClassRetryRequest( } // end ClassRetryRequest() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspRetryDpcTimer @@ -12502,7 +12502,7 @@ ClasspRetryDpcTimer( return; } // end ClasspRetryDpcTimer() - + NTSTATUS ClasspInitializeHotplugInfo( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension @@ -12628,7 +12628,7 @@ ClasspInitializeHotplugInfo( return STATUS_SUCCESS; } - + VOID NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ ClasspScanForClassHacks( @@ -12646,7 +12646,7 @@ ClasspScanForClassHacks( SET_FLAG(FdoExtension->PrivateFdoData->HackFlags, Data); return; } - + VOID ClasspScanForSpecialInRegistry( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension @@ -12756,7 +12756,7 @@ cleanupScanForSpecial: return; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspUpdateDiskProperties() diff --git a/drivers/storage/class/classpnp/classwmi.c b/drivers/storage/class/classpnp/classwmi.c index ee3b64f6296..3befc88d760 100644 --- a/drivers/storage/class/classpnp/classwmi.c +++ b/drivers/storage/class/classpnp/classwmi.c @@ -104,7 +104,7 @@ GUIDREGINFO wmiClassGuids[] = #define MSStorageDriver_ClassErrorLogGuid_Index 0 #define NUM_CLASS_WMI_GUIDS (sizeof(wmiClassGuids) / sizeof(GUIDREGINFO)) - + /*++//////////////////////////////////////////////////////////////////////////// ClassFindGuid() @@ -193,7 +193,7 @@ ClassFindInternalGuid( return(FALSE); } // end ClassFindGuid() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSystemControl() @@ -776,7 +776,7 @@ ClassSystemControl( return(status); } // end ClassSystemControl() - + NTSTATUS ClassQueryInternalDataBlock( @@ -1135,7 +1135,7 @@ ClassWmiCompleteRequest( ClassCompleteRequest(DeviceObject, Irp, PriorityBoost); return(Status); } // end ClassWmiCompleteRequest() - + /*++//////////////////////////////////////////////////////////////////////////// ClassWmiFireEvent() diff --git a/drivers/storage/class/classpnp/create.c b/drivers/storage/class/classpnp/create.c index 5baad9102f9..50ff3b209df 100644 --- a/drivers/storage/class/classpnp/create.c +++ b/drivers/storage/class/classpnp/create.c @@ -42,7 +42,7 @@ VOID ClasspCleanupDisableMcn( IN PFILE_OBJECT_EXTENSION FsContext ); - + #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ClassCreateClose) #pragma alloc_text(PAGE, ClasspCreateClose) @@ -118,7 +118,7 @@ Return Value: return status; } - + NTSTATUS ClasspCreateClose( IN PDEVICE_OBJECT DeviceObject, @@ -291,7 +291,7 @@ Return Value: return status; } - + VOID ClasspCleanupProtectedLocks( IN PFILE_OBJECT_EXTENSION FsContext @@ -429,7 +429,7 @@ ClasspCleanupProtectedLocks( return; } - + VOID ClasspCleanupDisableMcn( IN PFILE_OBJECT_EXTENSION FsContext diff --git a/drivers/storage/class/classpnp/dictlib.c b/drivers/storage/class/classpnp/dictlib.c index b5bfb1f8e93..8a04f028183 100644 --- a/drivers/storage/class/classpnp/dictlib.c +++ b/drivers/storage/class/classpnp/dictlib.c @@ -53,7 +53,7 @@ struct _DICTIONARY_HEADER { struct _DICTIONARY_HEADER; typedef struct _DICTIONARY_HEADER DICTIONARY_HEADER, *PDICTIONARY_HEADER; - + VOID InitializeDictionary( IN PDICTIONARY Dictionary @@ -65,7 +65,7 @@ InitializeDictionary( return; } - + BOOLEAN TestDictionarySignature( IN PDICTIONARY Dictionary @@ -152,7 +152,7 @@ AllocateDictionaryEntry( return status; } - + PVOID GetDictionaryEntry( IN PDICTIONARY Dictionary, @@ -184,7 +184,7 @@ GetDictionaryEntry( return data; } - + VOID FreeDictionaryEntry( IN PDICTIONARY Dictionary, diff --git a/drivers/storage/class/classpnp/dispatch.c b/drivers/storage/class/classpnp/dispatch.c index 607dd0a5958..b3797e85443 100644 --- a/drivers/storage/class/classpnp/dispatch.c +++ b/drivers/storage/class/classpnp/dispatch.c @@ -33,7 +33,7 @@ DRIVER_DISPATCH ClassDispatchUnimplemented; // Routines start // - + VOID ClassInitializeDispatchTables( PCLASS_DRIVER_EXTENSION DriverExtension @@ -67,7 +67,7 @@ ClassInitializeDispatchTables( return; } - + NTSTATUS NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */ ClassGlobalDispatch( diff --git a/drivers/storage/class/classpnp/lock.c b/drivers/storage/class/classpnp/lock.c index 3013443d781..c9914701eb3 100644 --- a/drivers/storage/class/classpnp/lock.c +++ b/drivers/storage/class/classpnp/lock.c @@ -218,7 +218,7 @@ ClassAcquireRemoveLockEx( return (commonExtension->IsRemoved); } - + /*++//////////////////////////////////////////////////////////////////////////// ClassReleaseRemoveLock() @@ -371,7 +371,7 @@ ClassReleaseRemoveLock( return; } - + /*++//////////////////////////////////////////////////////////////////////////// ClassCompleteRequest() diff --git a/drivers/storage/class/classpnp/obsolete.c b/drivers/storage/class/classpnp/obsolete.c index d906429ed7e..8580892a9b4 100644 --- a/drivers/storage/class/classpnp/obsolete.c +++ b/drivers/storage/class/classpnp/obsolete.c @@ -467,7 +467,7 @@ RetryRequest( return; } // end RetryRequest() - + /*++ ClassBuildRequest() diff --git a/drivers/storage/class/classpnp/power.c b/drivers/storage/class/classpnp/power.c index 5481cfab8fb..decd5a0bf51 100644 --- a/drivers/storage/class/classpnp/power.c +++ b/drivers/storage/class/classpnp/power.c @@ -82,7 +82,7 @@ RetryPowerRequest( #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ClasspPowerSettingCallback) #endif - + /*++//////////////////////////////////////////////////////////////////////////// ClassDispatchPower() @@ -141,7 +141,7 @@ ClassDispatchPower( return commonExtension->DevInfo->ClassPowerDevice(DeviceObject, Irp); } // end ClassDispatchPower() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspPowerUpCompletion() @@ -718,7 +718,7 @@ ClasspPowerUpCompletionFailure: return STATUS_MORE_PROCESSING_REQUIRED; } // end ClasspPowerUpCompletion() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspPowerDownCompletion() @@ -1527,7 +1527,7 @@ ClasspPowerDownCompletion( return STATUS_MORE_PROCESSING_REQUIRED; } // end ClasspPowerDownCompletion() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspPowerHandler() @@ -1874,7 +1874,7 @@ ClasspPowerHandlerCleanup: TRUE); return PoCallDriver(lowerDevice, Irp); } // end ClasspPowerHandler() - + /*++//////////////////////////////////////////////////////////////////////////// ClassMinimalPowerHandler() @@ -1953,7 +1953,7 @@ ClassMinimalPowerHandler( return status; } // end ClassMinimalPowerHandler() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSpinDownPowerHandler() @@ -2028,7 +2028,7 @@ ClassSpinDownPowerHandler( return ClasspPowerHandler(DeviceObject, Irp, options); } // end ClassSpinDownPowerHandler() - + /*++//////////////////////////////////////////////////////////////////////////// ClassStopUnitPowerHandler() @@ -2070,7 +2070,7 @@ ClassStopUnitPowerHandler( return ClassSpinDownPowerHandler(DeviceObject, Irp); } // end ClassStopUnitPowerHandler() - + /*++//////////////////////////////////////////////////////////////////////////// RetryPowerRequest() @@ -2191,7 +2191,7 @@ RetryPowerRequest( return; } // end RetryRequest() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspStartNextPowerIrpCompletion() diff --git a/drivers/storage/class/classpnp/utils.c b/drivers/storage/class/classpnp/utils.c index 37aeddaf41d..6a808b8b205 100644 --- a/drivers/storage/class/classpnp/utils.c +++ b/drivers/storage/class/classpnp/utils.c @@ -666,7 +666,7 @@ VOID FreeDeviceInputMdl(PMDL Mdl) } #endif - + /*++ ClasspDuidGetDeviceIdProperty @@ -759,7 +759,7 @@ FnExit: } - + /*++ ClasspDuidGetDeviceProperty @@ -851,7 +851,7 @@ FnExit: return status; } - + /*++ ClasspDuidGetDriveLayout @@ -973,7 +973,7 @@ FnExit: return status; } - + /*++ ClasspDuidQueryProperty @@ -6187,7 +6187,7 @@ ValidPersistentReserveType( return FALSE; } - + /*++ ClasspPersistentReserve diff --git a/drivers/storage/class/disk/disk.c b/drivers/storage/class/disk/disk.c index 535de1fcd5d..36df2d5e220 100644 --- a/drivers/storage/class/disk/disk.c +++ b/drivers/storage/class/disk/disk.c @@ -166,7 +166,7 @@ BAD_CONTROLLER_INFORMATION const ScsiDiskBadControllers[] = { #define SCSI_DISK_TIMEOUT 10 #define PARTITION0_LIST_SIZE 4 - + NTSTATUS NTAPI DriverEntry( @@ -336,7 +336,7 @@ ScsiDiskFileSystemControl(PDEVICE_OBJECT DeviceObject, #pragma alloc_text(PAGE, ScsiDiskModeSelect) #endif - + NTSTATUS NTAPI DriverEntry( @@ -402,7 +402,7 @@ Return Value: } // end DriverEntry() - + BOOLEAN NTAPI ScsiDiskDeviceVerification( @@ -437,7 +437,7 @@ Return Value: } } - + BOOLEAN NTAPI FindScsiDisks( @@ -615,7 +615,7 @@ Return Value: } // end FindScsiDisks() - + NTSTATUS NTAPI CreateDiskDeviceObject( @@ -1067,7 +1067,7 @@ CreateDiskDeviceObjectsExit: } // end CreateDiskDeviceObjects() - + VOID NTAPI ReportToMountMgr( @@ -1190,7 +1190,7 @@ Return Value: return; } - + NTSTATUS NTAPI CreatePartitionDeviceObjects( @@ -1632,7 +1632,7 @@ CreatePartitionDeviceObjectsExit: } // end CreatePartitionDeviceObjects() - + NTSTATUS NTAPI ScsiDiskReadWriteVerification( @@ -1727,7 +1727,7 @@ Return Value: } // end ScsiDiskReadWrite() - + NTSTATUS NTAPI ScsiDiskDeviceControl( @@ -3092,7 +3092,7 @@ Return Value: return(status); } // end ScsiDiskDeviceControl() - + NTSTATUS NTAPI ScsiDiskShutdownFlush ( @@ -3270,7 +3270,7 @@ Return Value: } // end ScsiDiskShutdown() - + BOOLEAN NTAPI IsFloppyDevice( @@ -3410,7 +3410,7 @@ Return Value: } // end IsFloppyDevice() - + BOOLEAN NTAPI ScsiDiskModeSelect( @@ -3546,7 +3546,7 @@ Retry: } // end SciDiskModeSelect() - + VOID NTAPI DisableWriteCache( @@ -3753,7 +3753,7 @@ DisableWriteCache( return; } - + BOOLEAN NTAPI CalculateMbrCheckSum( @@ -3875,7 +3875,7 @@ Return Value: return TRUE; } - + BOOLEAN NTAPI EnumerateBusKey( @@ -4203,7 +4203,7 @@ Return Value: } // end EnumerateBusKey() - + VOID NTAPI UpdateGeometry( @@ -4543,7 +4543,7 @@ diskMatched: } // end UpdateGeometry() - + NTSTATUS NTAPI UpdateRemovableGeometry ( @@ -4700,7 +4700,7 @@ Return Value: return(STATUS_SUCCESS); } - + VOID NTAPI ScsiDiskProcessError( @@ -4764,7 +4764,7 @@ Return Value: deviceExtension->ErrorCount++; } } - + VOID NTAPI ScanForSpecial( @@ -4866,7 +4866,7 @@ Return Value: return; } - + VOID NTAPI ResetScsiBus( @@ -4972,7 +4972,7 @@ Return Value: } // end ResetScsiBus() - + VOID NTAPI UpdateDeviceObjects( diff --git a/drivers/storage/floppy_new/floppy.c b/drivers/storage/floppy_new/floppy.c index 16c30dcb9ec..62b90c2c109 100644 --- a/drivers/storage/floppy_new/floppy.c +++ b/drivers/storage/floppy_new/floppy.c @@ -493,7 +493,7 @@ USBFlopFormatTracks( #endif - + NTSTATUS #ifdef __REACTOS__ NTAPI @@ -566,7 +566,7 @@ Return Value: } // end DriverEntry() - + VOID #ifdef __REACTOS__ NTAPI @@ -595,7 +595,7 @@ ScsiFlopUnload( #pragma warning(push) #pragma warning(disable:28152) #endif - + NTSTATUS #ifdef __REACTOS__ NTAPI @@ -1079,7 +1079,7 @@ NTSTATUS ScsiFlopStartDevice( return STATUS_SUCCESS; } - + NTSTATUS #ifdef __REACTOS__ NTAPI @@ -1623,7 +1623,7 @@ Return Value: } // end ScsiFlopDeviceControl() #if 0 - + BOOLEAN IsFloppyDevice( PDEVICE_OBJECT DeviceObject @@ -1734,7 +1734,7 @@ Return Value: } #endif - + NTSTATUS DetermineMediaType( PDEVICE_OBJECT DeviceObject @@ -1894,7 +1894,7 @@ Return Value: } return status; } - + ULONG DetermineDriveType( PDEVICE_OBJECT DeviceObject @@ -2051,7 +2051,7 @@ Return Value: return(DRIVE_TYPE_NONE); } - + BOOLEAN FlCheckFormatParameters( IN PDEVICE_OBJECT DeviceObject, @@ -2162,7 +2162,7 @@ Return Value: #pragma warning(pop) #endif } - + NTSTATUS FormatMedia( PDEVICE_OBJECT DeviceObject, @@ -2389,7 +2389,7 @@ Return Value: return(status); } - + VOID #ifdef __REACTOS__ NTAPI @@ -2677,7 +2677,7 @@ Return Value: return; } - + NTSTATUS FlopticalFormatMedia( PDEVICE_OBJECT DeviceObject, @@ -2788,7 +2788,7 @@ Return Value: } - + NTSTATUS #ifdef __REACTOS__ NTAPI @@ -2854,7 +2854,7 @@ Return Value: } if(diskData->FloppyInterfaceString.Buffer != NULL) { - + status = IoSetDeviceInterfaceState( &(diskData->FloppyInterfaceString), FALSE); @@ -2878,7 +2878,7 @@ Return Value: return STATUS_SUCCESS; } - + NTSTATUS #ifdef __REACTOS__ NTAPI @@ -2894,7 +2894,7 @@ ScsiFlopStopDevice( return STATUS_SUCCESS; } - + NTSTATUS USBFlopGetMediaTypes( IN PDEVICE_OBJECT DeviceObject, @@ -3264,7 +3264,7 @@ Return Value: return status; } - + NTSTATUS USBFlopFormatTracks( IN PDEVICE_OBJECT DeviceObject, diff --git a/drivers/storage/ide/atapi/atapi.c b/drivers/storage/ide/atapi/atapi.c index 94807c66ca9..19b8a0ee447 100644 --- a/drivers/storage/ide/atapi/atapi.c +++ b/drivers/storage/ide/atapi/atapi.c @@ -245,7 +245,7 @@ IdeMediaStatus( ); - + BOOLEAN NTAPI IssueIdentify( @@ -630,7 +630,7 @@ Return Value: } // end IssueIdentify() - + BOOLEAN NTAPI SetDriveParameters( @@ -727,7 +727,7 @@ Return Value: } // end SetDriveParameters() - + BOOLEAN NTAPI AtapiResetController( @@ -899,7 +899,7 @@ Return Value: } // end AtapiResetController() - + ULONG NTAPI MapError( @@ -1483,7 +1483,7 @@ AtapiHwInitializeChanger ( } - + BOOLEAN NTAPI FindDevices( @@ -1846,7 +1846,7 @@ atapiIssueId: } // end FindDevices() - + ULONG NTAPI AtapiParseArgumentString( @@ -2099,7 +2099,7 @@ ContinueSearch: - + ULONG NTAPI @@ -2569,7 +2569,7 @@ retryIdentifier: - + BOOLEAN NTAPI FindBrokenController( @@ -2706,7 +2706,7 @@ Return Value: return FALSE; } // end FindBrokenController - + ULONG NTAPI AtapiFindNativeModeController( @@ -3008,7 +3008,7 @@ setStatusAndExit: } // end AtapiFindNativeModeController() - + ULONG NTAPI AtapiFindPCIController( @@ -3354,7 +3354,7 @@ setStatusAndExit: } // end AtapiFindPCIController() - + ULONG NTAPI Atapi2Scsi( @@ -3405,7 +3405,7 @@ Atapi2Scsi( return bytesAdjust >> 1; } - + VOID NTAPI AtapiCallBack( @@ -3478,7 +3478,7 @@ AtapiCallBack( AtapiInterrupt(HwDeviceExtension); } - + BOOLEAN NTAPI AtapiInterrupt( @@ -4337,7 +4337,7 @@ CompleteRequest: } // end AtapiInterrupt() - + ULONG NTAPI IdeSendSmartCommand( @@ -4493,7 +4493,7 @@ Return Value: } // end IdeSendSmartCommand() - + ULONG NTAPI IdeReadWrite( @@ -4737,7 +4737,7 @@ Return Value: } // end IdeReadWrite() - + ULONG NTAPI IdeVerify( @@ -4907,7 +4907,7 @@ Return Value: } // end IdeVerify() - + VOID NTAPI Scsi2Atapi( @@ -4975,7 +4975,7 @@ Return Value: } - + ULONG NTAPI AtapiSendCommand( @@ -5805,7 +5805,7 @@ Return Value: - + BOOLEAN NTAPI AtapiStartIo( @@ -6171,7 +6171,7 @@ Return Value: } // end AtapiStartIo() - + ULONG NTAPI DriverEntry( @@ -6327,7 +6327,7 @@ Return Value: } // end DriverEntry() - + LONG NTAPI AtapiStringCmp ( @@ -6375,7 +6375,7 @@ AtapiStringCmp ( return 0; } - + VOID NTAPI AtapiZeroMemory( @@ -6390,7 +6390,7 @@ AtapiZeroMemory( } } - + VOID NTAPI AtapiHexToString ( @@ -6441,7 +6441,7 @@ AtapiHexToString ( } - + PSCSI_REQUEST_BLOCK NTAPI BuildMechanismStatusSrb ( @@ -6487,7 +6487,7 @@ BuildMechanismStatusSrb ( return srb; } - + PSCSI_REQUEST_BLOCK NTAPI BuildRequestSenseSrb ( diff --git a/drivers/storage/ide/pciide/pciide.c b/drivers/storage/ide/pciide/pciide.c index a30a327ef7d..fc1bb902978 100644 --- a/drivers/storage/ide/pciide/pciide.c +++ b/drivers/storage/ide/pciide/pciide.c @@ -100,7 +100,7 @@ PciIdeGetControllerProperties( ControllerProperties->AlignmentRequirement = 1; ControllerProperties->DefaultPIO = 0; /* FIXME */ ControllerProperties->PciIdeUdmaModesSupported = NULL; /* optional */ - + ControllerProperties->SupportedTransferMode[0][0] = ControllerProperties->SupportedTransferMode[0][1] = ControllerProperties->SupportedTransferMode[1][0] = diff --git a/drivers/storage/ide/uniata/atapi.h b/drivers/storage/ide/uniata/atapi.h index a190e340136..3939d1ce46f 100644 --- a/drivers/storage/ide/uniata/atapi.h +++ b/drivers/storage/ide/uniata/atapi.h @@ -248,13 +248,13 @@ typedef union _IDE_REGISTERS_2 { #define DFLAGS_DWORDIO_ENABLED 0x0400 // Indicates that we should use 32-bit IO #define DFLAGS_WCACHE_ENABLED 0x0800 // Indicates that we use write cache #define DFLAGS_RCACHE_ENABLED 0x1000 // Indicates that we use read cache -#define DFLAGS_ORIG_GEOMETRY 0x2000 // -#define DFLAGS_REINIT_DMA 0x4000 // +#define DFLAGS_ORIG_GEOMETRY 0x2000 // +#define DFLAGS_REINIT_DMA 0x4000 // #define DFLAGS_HIDDEN 0x8000 // Hidden device, available only with special IOCTLs // via communication virtual device #define DFLAGS_MANUAL_CHS 0x10000 // For devices those have no IDENTIFY commands #define DFLAGS_LBA32plus 0x20000 // Device is larger than LBA32 -//#define DFLAGS_ 0x10000 // +//#define DFLAGS_ 0x10000 // // // Used to disable 'advanced' features. // @@ -404,12 +404,12 @@ typedef struct _MODE_PARAMETER_HEADER_10 { #define IDE_COMMAND_MEDIA_EJECT 0xED #define IDE_COMMAND_FLUSH_CACHE48 0xEA #define IDE_COMMAND_ENABLE_MEDIA_STATUS 0xEF -#define IDE_COMMAND_SET_FEATURES 0xEF /* features command, +#define IDE_COMMAND_SET_FEATURES 0xEF /* features command, IDE_COMMAND_ENABLE_MEDIA_STATUS */ #define IDE_COMMAND_READ_NATIVE_SIZE 0xF8 #define IDE_COMMAND_SET_NATIVE_SIZE 0xF9 -#define SCSIOP_ATA_PASSTHROUGH 0xCC // +#define SCSIOP_ATA_PASSTHROUGH 0xCC // // // IDE status definitions @@ -653,7 +653,7 @@ typedef struct _IDENTIFY_DATA { USHORT DoubleWordIo; // 60 48 USHORT Reserved62_0:8; // 62 49 - USHORT SupportDma:1; + USHORT SupportDma:1; USHORT SupportLba:1; USHORT DisableIordy:1; USHORT SupportIordy:1; @@ -672,11 +672,11 @@ typedef struct _IDENTIFY_DATA { #define IDENTIFY_CAPABILITIES_SUPPORT_QTAG 0x4000 #define IDENTIFY_CAPABILITIES_SUPPORT_IDMA 0x8000*/ - USHORT DeviceStandbyMin:1; // 64 50 + USHORT DeviceStandbyMin:1; // 64 50 USHORT Reserved50_1:13; USHORT DeviceCapability1:1; USHORT DeviceCapability0:1; -// USHORT Reserved2; +// USHORT Reserved2; UCHAR Vendor51; // 66 51 UCHAR PioCycleTimingMode; // 67 @@ -712,9 +712,9 @@ typedef struct _IDENTIFY_DATA { struct { USHORT UDMASupport : 7; // 62 ATAPI USHORT MultiWordDMASupport : 3; - USHORT DMASupport : 1; - USHORT Reseved62_11_14 : 4; - USHORT DMADirRequired : 1; + USHORT DMASupport : 1; + USHORT Reseved62_11_14 : 4; + USHORT DMADirRequired : 1; } AtapiDMA; }; @@ -801,12 +801,12 @@ typedef struct _IDENTIFY_DATA { USHORT Reserved_82_15:1; USHORT Microcode:1; // 83/86 - USHORT Queued:1; // - USHORT CFA:1; // - USHORT APM:1; // - USHORT Notify:1; // - USHORT Standby:1; // - USHORT Spinup:1; // + USHORT Queued:1; // + USHORT CFA:1; // + USHORT APM:1; // + USHORT Notify:1; // + USHORT Standby:1; // + USHORT Spinup:1; // USHORT Reserver_83_7:1; USHORT MaxSecurity:1; // USHORT AutoAcoustic:1; // @@ -830,7 +830,7 @@ typedef struct _IDENTIFY_DATA { USHORT UltraDMASupport : 8; // 88 USHORT UltraDMAActive : 8; - + USHORT EraseTime; // 89 USHORT EnhancedEraseTime; // 90 USHORT CurentAPMLevel; // 91 @@ -871,14 +871,14 @@ typedef struct _IDENTIFY_DATA { USHORT Reserved112[5]; // 112-116 ULONG LargeSectorSize; // 117-118 - + struct { USHORT Reserved; } CommandFeatureSetSupport, CommandFeatureSetEnabled; // 119-120 USHORT Reserved121[4]; // 121-124 USHORT AtapiByteCount0; // 125 USHORT Reserved126; // 126 - + USHORT RemovableStatus; // 127 union { USHORT SecurityStatus; // 128 @@ -1000,7 +1000,7 @@ typedef struct _IDENTIFY_DATA { UCHAR :1; UCHAR CmdProtocol:2; // 00 00 // USHORT GeneralConfiguration; // 00 - + USHORT NumberOfCylinders; // 02 USHORT Reserved1; // 04 USHORT NumberOfHeads; // 06 @@ -1423,7 +1423,7 @@ AtaCommand( IN UCHAR command, IN USHORT cylinder, IN UCHAR head, - IN UCHAR sector, + IN UCHAR sector, IN UCHAR count, IN UCHAR feature, IN ULONG flags @@ -1450,7 +1450,7 @@ AtapiDpcDispatch( IN PVOID SystemArgument2 ); -//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) +//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) extern LONG NTAPI @@ -1706,7 +1706,7 @@ ata_cur_mode_from_ident( return ATA_PIO0+5; if (mode & AdvancedPIOModes_4) return ATA_PIO0+4; - if (mode & AdvancedPIOModes_3) + if (mode & AdvancedPIOModes_3) return ATA_PIO0+3; } mode = ident->PioCycleTimingMode; diff --git a/drivers/storage/ide/uniata/bm_devs.h b/drivers/storage/ide/uniata/bm_devs.h index dc1ddeddc91..f9cbc921937 100644 --- a/drivers/storage/ide/uniata/bm_devs.h +++ b/drivers/storage/ide/uniata/bm_devs.h @@ -44,7 +44,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 0007, 1191, 0x00, ATA_UDMA4, "Acard ATP860R" , UNIATA_NO80CHK ), PCI_DEV_HW_SPEC_BM( 0008, 1191, 0x00, ATA_UDMA6, "Acard ATP865A" , UNIATA_NO80CHK ), PCI_DEV_HW_SPEC_BM( 0009, 1191, 0x00, ATA_UDMA6, "Acard ATP865R" , UNIATA_NO80CHK ), - + PCI_DEV_HW_SPEC_BM( 5289, 10b9, 0x00, ATA_SA150, "ALI M5289" , UNIATA_SATA | UNIATA_NO_SLAVE ), PCI_DEV_HW_SPEC_BM( 5288, 10b9, 0x00, ATA_SA300, "ALI M5288" , UNIATA_SATA | UNIATA_NO_SLAVE ), PCI_DEV_HW_SPEC_BM( 5287, 10b9, 0x00, ATA_SA150, "ALI M5287" , UNIATA_SATA | UNIATA_NO_SLAVE ), @@ -140,14 +140,14 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 0641, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 640L" , UNIATA_SATA | UNIATA_AHCI), PCI_DEV_HW_SPEC_BM( 0642, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 642L" , UNIATA_SATA | UNIATA_AHCI), PCI_DEV_HW_SPEC_BM( 0645, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 644L" , UNIATA_SATA | UNIATA_AHCI), - + PCI_DEV_HW_SPEC_BM( 1230, 8086, 0x00, ATA_WDMA2, "Intel PIIX" , UNIATA_CHAN_TIMINGS ), PCI_DEV_HW_SPEC_BM( 7010, 8086, 0x00, ATA_WDMA2, "Intel PIIX3" , 0 ), PCI_DEV_HW_SPEC_BM( 7111, 8086, 0x00, ATA_UDMA2, "Intel PIIX3" , 0 ), PCI_DEV_HW_SPEC_BM( 7199, 8086, 0x00, ATA_UDMA2, "Intel PIIX4" , 0 ), PCI_DEV_HW_SPEC_BM( 84ca, 8086, 0x00, ATA_UDMA2, "Intel PIIX4" , 0 ), PCI_DEV_HW_SPEC_BM( 7601, 8086, 0x00, ATA_UDMA2, "Intel ICH0" , 0 ), - + PCI_DEV_HW_SPEC_BM( 2421, 8086, 0x00, ATA_UDMA4, "Intel ICH" , 0 ), PCI_DEV_HW_SPEC_BM( 2411, 8086, 0x00, ATA_UDMA4, "Intel ICH" , 0 ), @@ -208,7 +208,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 2929, 8086, 0x00, ATA_SA300, "Intel ICH9M" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 292a, 8086, 0x00, ATA_SA300, "Intel ICH9M" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 292d, 8086, 0x00, ATA_SA300, "Intel ICH9M" , I6CH2 | UNIATA_SATA ), - + PCI_DEV_HW_SPEC_BM( 3a20, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3a26, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3a22, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), @@ -306,7 +306,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 1f3f, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 23a3, 8086, 0x00, ATA_SA300, "Intel Coleto Creek" , UNIATA_SATA | UNIATA_AHCI ), - + PCI_DEV_HW_SPEC_BM( 8c00, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 8c01, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 8c02, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), @@ -375,7 +375,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( a282, 8086, 0x00, ATA_SA300, "Intel Union Point" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( a286, 8086, 0x00, ATA_SA300, "Intel Union Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( a28e, 8086, 0x00, ATA_SA300, "Intel Union Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), - + // PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_SA150, "Intel 31244" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 811a, 8086, 0x00, ATA_UDMA5, "Intel SCH" , 0 ), PCI_DEV_HW_SPEC_BM( 2323, 8086, 0x00, ATA_SA300, "Intel DH98xxCC" , UNIATA_SATA | UNIATA_AHCI ), @@ -383,7 +383,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 23a3, 8086, 0x00, ATA_SA300, "COLETOCRK" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 23a1, 8086, 0x00, ATA_SA300, "COLETOCRK" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 23a6, 8086, 0x00, ATA_SA300, "COLETOCRK" , UNIATA_SATA | UNIATA_AHCI ), - + PCI_DEV_HW_SPEC_BM( 2360, 197b, 0x00, ATA_SA300, "JMB360" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2361, 197b, 0x00, ATA_SA300, "JMB361" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2362, 197b, 0x00, ATA_SA300, "JMB362" , UNIATA_SATA | UNIATA_AHCI ), @@ -391,7 +391,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 2365, 197b, 0x00, ATA_SA300, "JMB365" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2366, 197b, 0x00, ATA_SA300, "JMB366" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2368, 197b, 0x00, ATA_SA300, "JMB368" , UNIATA_SATA ), -/* +/* PCI_DEV_HW_SPEC_BM( 5040, 11ab, 0x00, ATA_SA150, "Marvell 88SX5040" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 5041, 11ab, 0x00, ATA_SA150, "Marvell 88SX5041" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 5080, 11ab, 0x00, ATA_SA150, "Marvell 88SX5080" , UNIATA_SATA ), @@ -672,7 +672,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( c693, 1080, 0x00, ATA_WDMA2, "Cypress 82C693" ,0 ), -/* +/* PCI_DEV_HW_SPEC_BM( 4d68, 105a, 0, 0, "Promise TX2 ATA-100 controller", UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 6268, 105a, 0, 0, "Promise TX2 ATA-100 controller", UNIATA_RAID_CONTROLLER), diff --git a/drivers/storage/ide/uniata/bsmaster.h b/drivers/storage/ide/uniata/bsmaster.h index 4b748b4981b..4e97f4b24a5 100644 --- a/drivers/storage/ide/uniata/bsmaster.h +++ b/drivers/storage/ide/uniata/bsmaster.h @@ -1098,7 +1098,7 @@ typedef struct _HW_CHANNEL { PUCHAR DmaBuffer; - // + // PIDE_AHCI_CHANNEL_CTL_BLOCK AhciCtlBlock0; // unaligned PIDE_AHCI_CHANNEL_CTL_BLOCK AhciCtlBlock; // 128-byte aligned ULONGLONG AHCI_CTL_PhAddr; @@ -1109,7 +1109,7 @@ typedef struct _HW_CHANNEL { ULONG AhciLastSError; //PVOID AHCI_FIS; // is not actually used by UniATA now, but is required by AHCI controller //ULONGLONG AHCI_FIS_PhAddr; - // Note: in contrast to FBSD, we keep PRD and CMD item in AtaReq structure + // Note: in contrast to FBSD, we keep PRD and CMD item in AtaReq structure PATA_REQ AhciInternalAtaReq; PSCSI_REQUEST_BLOCK AhciInternalSrb; @@ -1212,7 +1212,7 @@ typedef struct _HW_LU_EXTENSION { mainly for mapping SATA ports to compatible PATA registers Treated as PHYSICAL port number, regardless of logical mapping. */ - ULONG SATA_lun_map; + ULONG SATA_lun_map; }; struct _HW_DEVICE_EXTENSION* DeviceExtension; diff --git a/drivers/storage/ide/uniata/config.h b/drivers/storage/ide/uniata/config.h index 0f21a9337ea..76a4d4aa86b 100644 --- a/drivers/storage/ide/uniata/config.h +++ b/drivers/storage/ide/uniata/config.h @@ -94,10 +94,10 @@ #ifdef USE_REACTOS_DDK #define ULONGIO_PTR ULONG_PTR - #define CRNT_ILK_TYPE + #define CRNT_ILK_TYPE #define CRNT_ILK_PTYPE - #define REGRTL_STR_PTYPE -#else + #define REGRTL_STR_PTYPE +#else #define ULONG_PTR ULONG #define ULONGIO_PTR ULONG #define CRNT_ILK_TYPE (PVOID) diff --git a/drivers/storage/ide/uniata/id_ata.cpp b/drivers/storage/ide/uniata/id_ata.cpp index 141cd87f39c..7068beda353 100644 --- a/drivers/storage/ide/uniata/id_ata.cpp +++ b/drivers/storage/ide/uniata/id_ata.cpp @@ -202,7 +202,7 @@ AtapiRegGetStringParameterValue( IN ULONG MaxLen ) { -#define ITEMS_TO_QUERY 2 // always 1 greater than what is searched +#define ITEMS_TO_QUERY 2 // always 1 greater than what is searched NTSTATUS status; RTL_QUERY_REGISTRY_TABLE parameters[ITEMS_TO_QUERY]; UNICODE_STRING ustr; @@ -1013,7 +1013,7 @@ AtaCommand48( plba = (PUCHAR)&lba; //ktp chan->ChannelCtrlFlags &= ~CTRFLAGS_LBA48; - + //if(feature || // (chan->lun[DeviceNumber]->DeviceFlags & (DFLAGS_ATAPI_DEVICE | DFLAGS_TAPE_DEVICE | DFLAGS_LBA_ENABLED))) { AtapiWritePort1(chan, IDX_IO1_o_Feature, (UCHAR)feature); @@ -1229,7 +1229,7 @@ AtaUmode(PIDENTIFY_DATA2 ident) LONG NTAPI AtaSAmode(PIDENTIFY_DATA2 ident) { - if(!ident->SataCapabilities || + if(!ident->SataCapabilities || ident->SataCapabilities == 0xffff) { return IOMODE_NOT_SPECIFIED; } @@ -1649,7 +1649,7 @@ IssueIdentify( // Send IDENTIFY command. // Load CylinderHigh and CylinderLow with number bytes to transfer for old devices, use 0 for newer. - + statusByte = AtaCommand(deviceExtension, DeviceNumber, lChannel, Command, (j < 4) ? DEV_BSIZE : 0 /* cyl */, 0, 0, 0, 0, ATA_WAIT_INTR); // Clear interrupt @@ -1867,13 +1867,13 @@ IssueIdentify( ULONGLONG cylinders=0; ULONGLONG tmp_cylinders=0; - KdPrint2((PRINT_PREFIX "PhysLogSectorSize %#x, %#x, offset %#x\n", + KdPrint2((PRINT_PREFIX "PhysLogSectorSize %#x, %#x, offset %#x\n", deviceExtension->FullIdentifyData.PhysLogSectorSize, deviceExtension->FullIdentifyData.LargeSectorSize, deviceExtension->FullIdentifyData.LogicalSectorOffset )); - KdPrint2((PRINT_PREFIX "NV PM_Sup %d, PM_En %d, En %d, PM ver %#x ver %#x\n", + KdPrint2((PRINT_PREFIX "NV PM_Sup %d, PM_En %d, En %d, PM ver %#x ver %#x\n", deviceExtension->FullIdentifyData.NVCache_PM_Supported, deviceExtension->FullIdentifyData.NVCache_PM_Enabled, deviceExtension->FullIdentifyData.NVCache_Enabled, @@ -1905,7 +1905,7 @@ IssueIdentify( )); // Read very-old-style drive geometry - KdPrint2((PRINT_PREFIX "CHS %#x:%#x:%#x\n", + KdPrint2((PRINT_PREFIX "CHS %#x:%#x:%#x\n", deviceExtension->FullIdentifyData.NumberOfCylinders, deviceExtension->FullIdentifyData.NumberOfHeads, deviceExtension->FullIdentifyData.SectorsPerTrack @@ -1921,7 +1921,7 @@ IssueIdentify( deviceExtension->FullIdentifyData.SectorsPerTrack && (NumOfSectors < deviceExtension->FullIdentifyData.UserAddressableSectors)) { KdPrint2((PRINT_PREFIX "NumberOfCylinders == 0x3fff\n")); - cylinders = + cylinders = (deviceExtension->FullIdentifyData.UserAddressableSectors / (deviceExtension->FullIdentifyData.NumberOfHeads * deviceExtension->FullIdentifyData.SectorsPerTrack)); @@ -1967,13 +1967,13 @@ IssueIdentify( (deviceExtension->FullIdentifyData.UserAddressableSectors48 > NumOfSectors) ) { KdPrint2((PRINT_PREFIX "LBA48\n")); - cylinders = + cylinders = (deviceExtension->FullIdentifyData.UserAddressableSectors48 / (deviceExtension->FullIdentifyData.NumberOfHeads * deviceExtension->FullIdentifyData.SectorsPerTrack)); KdPrint2((PRINT_PREFIX "cylinders %#I64x\n", cylinders)); - + NativeNumOfSectors = cylinders * deviceExtension->FullIdentifyData.NumberOfHeads * deviceExtension->FullIdentifyData.SectorsPerTrack; @@ -2008,7 +2008,7 @@ IssueIdentify( KdPrint2((PRINT_PREFIX "Read high order bytes\n")); NativeNumOfSectors |= (ULONG)((ULONG)AtapiReadPort1(chan, IDX_IO1_i_BlockNumber) << 24 ); - hNativeNumOfSectors= + hNativeNumOfSectors= (ULONG)AtapiReadPort1(chan, IDX_IO1_i_CylinderLow) | ((ULONG)AtapiReadPort1(chan, IDX_IO1_i_CylinderHigh) << 8) ; ((PULONG)&NativeNumOfSectors)[1] = hNativeNumOfSectors; @@ -2034,7 +2034,7 @@ IssueIdentify( ((ULONGLONG)AtapiReadPort1(chan, IDX_IO1_i_CylinderLow) << 8 ) | ((ULONGLONG)AtapiReadPort1(chan, IDX_IO1_i_CylinderLow) << 32) | ((ULONGLONG)AtapiReadPort1(chan, IDX_IO1_i_CylinderHigh) << 16) | - ((ULONGLONG)AtapiReadPort1(chan, IDX_IO1_i_CylinderHigh) << 40) + ((ULONGLONG)AtapiReadPort1(chan, IDX_IO1_i_CylinderHigh) << 40) ; } } @@ -2059,7 +2059,7 @@ IssueIdentify( } } // !error } - + if(NumOfSectors < 0x2100000 /*&& NumOfSectors > 31*1000*1000*/) { // check for native LBA size // some drives report ~32Gb in Identify Block @@ -2535,7 +2535,7 @@ AtapiResetController__( // Indicate ready for next request. ScsiPortNotification(NextLuRequest, - deviceExtension, + deviceExtension, CurPathId, TargetId, Lun); @@ -2552,7 +2552,7 @@ AtapiResetController__( chan->ChannelCtrlFlags = ChannelCtrlFlags & CTRFLAGS_PERMANENT; InterlockedExchange(&(chan->CheckIntr), CHECK_INTR_IDLE); - + for (i = 0; i < MaxLuns; i++) { chan->lun[i]->PowerState = 0; } @@ -2652,10 +2652,10 @@ AtapiResetController__( /* disable device and PHY state change interrupts */ if(ChipFlags & NVQ) { KdPrint2((PRINT_PREFIX " NVQ, 32bits reg\n")); - AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+4, + AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+4, AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+4) & ((~(ULONG)0x0000000d) << (!Channel*16)) ); } else { - AtapiWritePortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+1, + AtapiWritePortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+1, AtapiReadPortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+1) & ((~(UCHAR)0x0d) << (!Channel*4)) ); } tmp16 = UniataSataPhyEnable(HwDeviceExtension, j, 0/* dev0*/, UNIATA_SATA_RESET_ENABLE); @@ -2663,10 +2663,10 @@ AtapiResetController__( KdPrint2((PRINT_PREFIX " enable Phy intr, offs %#x\n", offs)); /* enable device and PHY state change interrupts */ if(ChipFlags & NVQ) { - AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+4, + AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+4, AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+4) | (((ULONG)0x0000000d) << (!Channel*16)) ); } else { - AtapiWritePortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+1, + AtapiWritePortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+1, AtapiReadPortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),offs+1) | (((UCHAR)0x0d) << (!Channel*4)) ); } @@ -2796,7 +2796,7 @@ default_reset: statusByte = WaitOnBusyLong(chan); statusByte = UniataIsIdle(deviceExtension, statusByte); if(statusByte == IDE_STATUS_WRONG) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "no drive, status %#x\n", statusByte)); UniataForgetDevice(chan->lun[i]); @@ -2837,7 +2837,7 @@ default_reset: IDE_COMMAND_ATAPI_IDENTIFY, FALSE); } else { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiResetController: Status after soft reset %#x\n", statusByte)); } @@ -2928,7 +2928,7 @@ MapError( } else { errorByte = AtapiReadPort1(chan, IDX_IO1_i_Error); } - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "MapError: Error register is %#x\n", errorByte)); @@ -2937,7 +2937,7 @@ MapError( switch (errorByte >> 4) { case SCSI_SENSE_NO_SENSE: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: No sense information\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -2945,7 +2945,7 @@ MapError( case SCSI_SENSE_RECOVERED_ERROR: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Recovered error\n")); scsiStatus = 0; srbStatus = SRB_STATUS_SUCCESS; @@ -2953,7 +2953,7 @@ MapError( case SCSI_SENSE_NOT_READY: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Device not ready\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -2961,7 +2961,7 @@ MapError( case SCSI_SENSE_MEDIUM_ERROR: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Media error\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -2969,7 +2969,7 @@ MapError( case SCSI_SENSE_HARDWARE_ERROR: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Hardware error\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -2977,7 +2977,7 @@ MapError( case SCSI_SENSE_ILLEGAL_REQUEST: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Illegal request\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -2985,7 +2985,7 @@ MapError( case SCSI_SENSE_UNIT_ATTENTION: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Unit attention\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -2993,7 +2993,7 @@ MapError( case SCSI_SENSE_DATA_PROTECT: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Data protect\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -3001,14 +3001,14 @@ MapError( case SCSI_SENSE_BLANK_CHECK: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Blank check\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; break; case SCSI_SENSE_ABORTED_COMMAND: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "Atapi: Command Aborted\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -3016,7 +3016,7 @@ MapError( default: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ATAPI: Invalid sense information\n")); scsiStatus = 0; srbStatus = SRB_STATUS_ERROR; @@ -3031,7 +3031,7 @@ MapError( chan->ReturningMediaStatus = errorByte; if (errorByte & IDE_ERROR_MEDIA_CHANGE_REQ) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IDE: Media change\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -3051,7 +3051,7 @@ MapError( } } else if (errorByte & IDE_ERROR_COMMAND_ABORTED) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IDE: Command abort\n")); srbStatus = SRB_STATUS_ABORTED; scsiStatus = SCSISTAT_CHECK_CONDITION; @@ -3074,7 +3074,7 @@ MapError( } else if (errorByte & IDE_ERROR_END_OF_MEDIA) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IDE: End of media\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -3100,7 +3100,7 @@ MapError( } else if (errorByte & IDE_ERROR_ILLEGAL_LENGTH) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IDE: Illegal length\n")); srbStatus = SRB_STATUS_INVALID_REQUEST; @@ -3121,7 +3121,7 @@ MapError( } else if (errorByte & IDE_ERROR_BAD_BLOCK) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IDE: Bad block\n")); srbStatus = SRB_STATUS_ERROR; scsiStatus = SCSISTAT_CHECK_CONDITION; @@ -3141,7 +3141,7 @@ MapError( } else if (errorByte & IDE_ERROR_ID_NOT_FOUND) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IDE: Id not found\n")); srbStatus = SRB_STATUS_ERROR; scsiStatus = SCSISTAT_CHECK_CONDITION; @@ -3164,7 +3164,7 @@ MapError( } else if (errorByte & IDE_ERROR_MEDIA_CHANGE) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IDE: Media change\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -3185,7 +3185,7 @@ MapError( } else if (errorByte & IDE_ERROR_DATA_ERROR) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IDE: Data error\n")); scsiStatus = SCSISTAT_CHECK_CONDITION; srbStatus = SRB_STATUS_ERROR; @@ -3213,18 +3213,18 @@ MapError( if (LunExt->ErrorCount >= MAX_ERRORS) { // deviceExtension->DWordIO = FALSE; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "MapError: ErrorCount >= MAX_ERRORS\n")); LunExt->DeviceFlags &= ~DFLAGS_DWORDIO_ENABLED; LunExt->MaximumBlockXfer = 0; BrutePoint(); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "MapError: Disabling 32-bit PIO and Multi-sector IOs\n")); // Log the error. - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "ScsiPortLogError: devExt %#x, Srb %#x, P:T:D=%d:%d:%d, MsgId %#x (%d)\n", HwDeviceExtension, Srb, @@ -3400,14 +3400,14 @@ AtapiHwInitialize__( LunExt->MaximumBlockXfer = 0; } else { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiHwInitialize: Using Multiblock on Device %d. Blocks / int - %d\n", i, LunExt->MaximumBlockXfer)); } if(LunExt->IdentifyData.MajorRevision) { - + if(LunExt->opt_ReadCacheEnable) { KdPrint2((PRINT_PREFIX " Try Enable Read Cache\n")); // If supported, setup read/write cacheing @@ -3417,7 +3417,7 @@ AtapiHwInitialize__( // Check for errors. if (statusByte & IDE_STATUS_ERROR) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiHwInitialize: Enable read/write cacheing on Device %d failed\n", i)); LunExt->DeviceFlags &= ~DFLAGS_RCACHE_ENABLED; @@ -3440,7 +3440,7 @@ AtapiHwInitialize__( 0, ATA_C_F_ENAB_WCACHE, ATA_WAIT_BASE_READY); // Check for errors. if (statusByte & IDE_STATUS_ERROR) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiHwInitialize: Enable write cacheing on Device %d failed\n", i)); LunExt->DeviceFlags &= ~DFLAGS_WCACHE_ENABLED; @@ -3467,7 +3467,7 @@ AtapiHwInitialize__( LunExt->opt_AdvPowerMode, ATA_C_F_ENAB_APM, ATA_WAIT_BASE_READY); // Check for errors. if (statusByte & IDE_STATUS_ERROR) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiHwInitialize: Enable APM on Device %d failed\n", i)); } @@ -3487,7 +3487,7 @@ AtapiHwInitialize__( LunExt->opt_AcousticMode, ATA_C_F_ENAB_ACOUSTIC, ATA_WAIT_BASE_READY); // Check for errors. if (statusByte & IDE_STATUS_ERROR) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiHwInitialize: Enable Acoustic Mgmt on Device %d failed\n", i)); } @@ -3506,7 +3506,7 @@ AtapiHwInitialize__( LunExt->opt_StandbyTimer, 0, ATA_WAIT_BASE_READY); // Check for errors. if (statusByte & IDE_STATUS_ERROR) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiHwInitialize: standby timer on Device %d failed\n", i)); } @@ -3882,7 +3882,7 @@ AtapiCallBack__( // Ask for next request. ScsiPortNotification(NextLuRequest, - deviceExtension, + deviceExtension, PathId, TargetId, Lun); @@ -4032,7 +4032,7 @@ AtapiInterrupt( // checked[_c] = (UCHAR)((hIS >> _c) & 0x01); // } -// fc = +// fc = for(pass=0; pass<2; pass++) { //KdPrint2((PRINT_PREFIX "AtapiInterrupt(base): pass %d\n", pass)); if(status && pass) { @@ -4175,7 +4175,7 @@ AtapiInterrupt2( return FALSE; } // assume all non-interrupted ports to be already checked - checked = ~hIS; + checked = ~hIS; // assume all not implemented ports to be already checked checked |= ~deviceExtension->AHCI_PI; @@ -4241,7 +4241,7 @@ AtapiInterrupt2( } KdPrint2((PRINT_PREFIX "AtapiInterrupt2: return %d\n", status)); return status; - + } // end AtapiInterrupt2() RETTYPE_XXableInterrupts @@ -4264,7 +4264,7 @@ AtapiInterruptDpc( { continue; } - + } else { deviceExtension->chan[c].ChannelCtrlFlags &= ~CTRFLAGS_DPC_REQ; } @@ -4356,7 +4356,7 @@ AtapiEnableInterrupts( PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PHW_CHANNEL chan; //UCHAR statusByte; - + if(c >= deviceExtension->NumberChannels) { KdPrint2((PRINT_PREFIX "AtapiEnableInterrupts_%d: WRONG CHANNEL\n",c)); return; @@ -4375,7 +4375,7 @@ AtapiEnableInterrupts( (ATA_AHCI_P_IX_CPD | ATA_AHCI_P_IX_TFE | ATA_AHCI_P_IX_HBF | ATA_AHCI_P_IX_HBD | ATA_AHCI_P_IX_INF | ATA_AHCI_P_IX_IF | ATA_AHCI_P_IX_OF | ((/*ch->pm_level == */0) ? ATA_AHCI_P_IX_PRC | ATA_AHCI_P_IX_PC : 0) | - ATA_AHCI_P_IX_PRC | ATA_AHCI_P_IX_PC | /* DEBUG */ + ATA_AHCI_P_IX_PRC | ATA_AHCI_P_IX_PC | /* DEBUG */ ATA_AHCI_P_IX_DI | ATA_AHCI_P_IX_DP | ATA_AHCI_P_IX_UF | ATA_AHCI_P_IX_SDB | ATA_AHCI_P_IX_DS | ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DHR) @@ -4566,7 +4566,7 @@ AtapiCheckInterrupt__( status = AtapiReadPortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x1c); if (!DmaTransfer) break; - if (!(status & + if (!(status & ((Channel) ? 0x00004000 : 0x00000400))) { KdPrint2((PRINT_PREFIX " Promise old/new unexpected\n")); return INTERRUPT_REASON_IGNORE; @@ -4823,7 +4823,7 @@ skip_dma_stat_check: } if (statusByte == IDE_STATUS_WRONG) { // interrupt from empty controller ? - } else + } else if (statusByte & IDE_STATUS_BUSY) { if(!chan->ExpectingInterrupt) { KdPrint3((PRINT_PREFIX " unexpected intr + BUSY\n")); @@ -4880,7 +4880,7 @@ skip_dma_stat_check: KdPrint2((PRINT_PREFIX " base status %#x\n", statusByte)); if (statusByte == IDE_STATUS_WRONG) { // interrupt from empty controller ? - } else + } else if(!(statusByte & (IDE_STATUS_DRQ | IDE_STATUS_DRDY))) { KdPrint2((PRINT_PREFIX " no DRQ/DRDY set\n")); return OurInterrupt; @@ -5001,9 +5001,9 @@ AtapiInterrupt__( } if (srb) { - PathId = srb->PathId; + PathId = srb->PathId; TargetId = srb->TargetId; - Lun = srb->Lun; + Lun = srb->Lun; } else { PathId = (UCHAR)c; TargetId = @@ -5235,7 +5235,7 @@ ServiceInterrupt: KdPrint2((PRINT_PREFIX " operate like in DPC\n")); InDpc = TRUE; } - + if (!atapiDev) { // IDE if(deviceExtension->HwFlags & UNIATA_AHCI) { @@ -5275,10 +5275,10 @@ try_dpc_wait: AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE - } else + } else if (InDpc && i == k) { // reset the controller. - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX " Resetting due to BUSY on entry - %#x.\n", statusByte)); goto IntrPrepareResetController; @@ -5676,7 +5676,7 @@ IntrPrepareResetController: // Write the packet. KdPrint3((PRINT_PREFIX "AtapiInterrupt: Writing Atapi packet.\n")); // Send CDB to device. - WriteBuffer(chan, (PUSHORT)srb->Cdb, + WriteBuffer(chan, (PUSHORT)srb->Cdb, LunExt->IdentifyData.AtapiCmdSize ? 8 : 6, /*0*/ PIO0_TIMING); AtaReq->ReqState = REQ_STATE_ATAPI_EXPECTING_DATA_INTR; @@ -5705,7 +5705,7 @@ IntrPrepareResetController: KdPrint2((PRINT_PREFIX "AtapiInterrupt: get W wordCount %#x\n", wordCount)); if (wordCount != AtaReq->WordsLeft) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiInterrupt: %d words requested; %d words xferred\n", AtaReq->WordsLeft, wordCount)); @@ -5714,7 +5714,7 @@ IntrPrepareResetController: // Verify this makes sense. if (wordCount > AtaReq->WordsLeft) { wordCount = AtaReq->WordsLeft; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiInterrupt: Write underrun\n")); DataOverrun = TRUE; } @@ -5735,7 +5735,7 @@ IntrPrepareResetController: (chan->ChannelCtrlFlags & CTRFLAGS_DMA_OPERATION)) { //ASSERT(AtaReq->WordsLeft == wordCount); if(AtaReq->ReqState == REQ_STATE_ATAPI_EXPECTING_DATA_INTR2) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeIntr: DMA tmp INTR %#x vs %#x\n", AtaReq->WordsLeft, wordCount)); if(AtaReq->WordsLeft > wordCount) { AtaReq->WordsLeft -= wordCount; @@ -5755,7 +5755,7 @@ IntrPrepareResetController: // Ensure that this is a write command. if (srb->SrbFlags & SRB_FLAGS_DATA_OUT) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiInterrupt: Write interrupt\n")); statusByte = WaitOnBusy(chan); @@ -5776,7 +5776,7 @@ IntrPrepareResetController: } } else { - KdPrint3((PRINT_PREFIX + KdPrint3((PRINT_PREFIX "AtapiInterrupt: Int reason %#x, but srb is for a read %#x.\n", interruptReason, srb)); @@ -5785,7 +5785,7 @@ IntrPrepareResetController: status = SRB_STATUS_ERROR; if(!wordCount && atapiDev && (srb->Cdb[0] != SCSIOP_REQUEST_SENSE)) { // some devices feel bad after incorrect commands and may need reset - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiInterrupt: Try ATAPI reset\n")); AtapiDisableInterrupts(deviceExtension, lChannel); @@ -5822,15 +5822,15 @@ continue_read_drq: // Convert bytes to words. KdPrint2((PRINT_PREFIX "AtapiInterrupt: get R byteCount %#x\n", wordCount)); - wordCount >>= 1; + wordCount >>= 1; /* - When ATAPI 64k PIO read is requested we may have 0xfffe byte + When ATAPI 64k PIO read is requested we may have 0xfffe byte count reported for 0x10000 bytes in single interrupt. - It is not allowed to read entire 64k block with DwordIo intead of + It is not allowed to read entire 64k block with DwordIo intead of wait for last word. */ if (wordCount != AtaReq->WordsLeft) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiInterrupt: %d words requested; %d words xferred\n", AtaReq->WordsLeft, wordCount)); @@ -5857,7 +5857,7 @@ continue_read_drq: if(DmaTransfer && (chan->ChannelCtrlFlags & CTRFLAGS_DMA_OPERATION)) { if(AtaReq->ReqState == REQ_STATE_ATAPI_EXPECTING_DATA_INTR2) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeIntr: DMA tmp INTR %#x vs %#x\n", AtaReq->WordsLeft, wordCount)); if(AtaReq->WordsLeft > wordCount) { AtaReq->WordsLeft -= wordCount; @@ -5883,11 +5883,11 @@ continue_read_drq: statusByte = WaitOnBusy(chan); if(wordCount&1 && atapiDev && (g_opt_VirtualMachine == VM_BOCHS)) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeIntr: unaligned ATAPI %#x Words\n", wordCount)); } else if(LunExt->DeviceFlags & DFLAGS_DWORDIO_ENABLED) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeIntr: pre-Read %#x Dwords\n", wordCount/2)); ReadBuffer2(chan, @@ -5901,7 +5901,7 @@ continue_read_drq: wordCount &= 1; } if (wordCount) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeIntr: Read %#x words\n", wordCount)); ReadBuffer(chan, @@ -5937,7 +5937,7 @@ continue_read_drq: } else { - KdPrint3((PRINT_PREFIX + KdPrint3((PRINT_PREFIX "AtapiInterrupt: Int reason %#x, but srb is for a read %#x.\n", interruptReason, srb)); @@ -6174,7 +6174,7 @@ CompleteRequest: AtapiDisableInterrupts(HwDeviceExtension, c); } */ -#else +#else KdPrint((PRINT_PREFIX "AtapiInterrupt: ERROR: internal SCSIOP_MECHANISM_STATUS !!!!\n")); ASSERT(FALSE); #endif // UNIATA_INIT_CHANGERS @@ -6299,7 +6299,7 @@ PIO_wait_busy: if (i == 5*30) { // reset the controller. - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiInterrupt: Resetting due to BSY still up - %#x.\n", statusByte)); goto IntrPrepareResetController; @@ -6502,7 +6502,7 @@ IntrCompleteReq: KdPrint2((PRINT_PREFIX "AtapiInterrupt: Clear RDP\n")); chan->RDP = FALSE; goto CompleteRDP; - } + } AtapiStallExecution(50); } } @@ -6534,7 +6534,7 @@ reenqueue_req: NULL); } else { ScsiPortNotification(NextLuRequest, - deviceExtension, + deviceExtension, PathId, TargetId, Lun); @@ -6666,7 +6666,7 @@ IdeSendSmartCommand( ULONG DeviceNumber; if (regs->bCommandReg != SMART_CMD) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendSmartCommand: bCommandReg != SMART_CMD\n")); return SRB_STATUS_INVALID_REQUEST; } @@ -6687,7 +6687,7 @@ IdeSendSmartCommand( case WRITE_LOG_SECTOR: if(Srb->DataTransferLength < sizeof(SRB_IO_CONTROL)+sizeof(SENDCMDOUTPARAMS) + READ_ATTRIBUTE_BUFFER_SIZE - 1) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendSmartCommand: wrong buffer size\n")); return SRB_STATUS_DATA_OVERRUN; } @@ -6695,7 +6695,7 @@ IdeSendSmartCommand( statusByte = WaitOnBusy(chan); if (statusByte & IDE_STATUS_BUSY) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendSmartCommand: Returning BUSY status\n")); return SRB_STATUS_BUSY; } @@ -6733,7 +6733,7 @@ IdeSendSmartCommand( statusByte = WaitOnBusy(chan); if (statusByte & IDE_STATUS_BUSY) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendSmartCommand: Returning BUSY status\n")); return SRB_STATUS_BUSY; } @@ -6799,7 +6799,7 @@ UniAtaCalculateLBARegs( (*max_bcount) = LunExt->IdentifyData.SectorsPerTrack; } else { cylinder = (USHORT)(startingSector / tmp); - drvSelect = (UCHAR)((startingSector % tmp) / LunExt->IdentifyData.SectorsPerTrack); + drvSelect = (UCHAR)((startingSector % tmp) / LunExt->IdentifyData.SectorsPerTrack); sectorNumber = (UCHAR)(startingSector % LunExt->IdentifyData.SectorsPerTrack) + 1; (*max_bcount) = LunExt->IdentifyData.SectorsPerTrack - sectorNumber + 1; KdPrint2((PRINT_PREFIX "UniAtaCalculateLBARegs: C:H:S=%#x:%#x:%#x, max_bc %#x\n", @@ -6884,7 +6884,7 @@ IdeReadWrite( if((CmdAction & CMD_ACTION_PREPARE) && (AtaReq->ReqState != REQ_STATE_READY_TO_TRANSFER)) { - if(LunExt->opt_ReadOnly && + if(LunExt->opt_ReadOnly && (Srb->SrbFlags & SRB_FLAGS_DATA_OUT)) { if(LunExt->opt_ReadOnly == 1) { KdPrint2((PRINT_PREFIX "Abort WRITE (Soft R/O)\n")); @@ -7138,11 +7138,11 @@ IdeReadWrite( statusByte == IDE_STATUS_WRONG) { if(statusByte == IDE_STATUS_WRONG) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeReadWrite: error sending command (%#x)\n", statusByte)); } else { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeReadWrite: DRQ never asserted (%#x)\n", statusByte)); } @@ -7166,7 +7166,7 @@ IdeReadWrite( // Write next DEV_BSIZE/2*N words. if (!(LunExt->DeviceFlags & DFLAGS_DWORDIO_ENABLED) || (wordCount & 1)) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeReadWrite: Write %#x words\n", wordCount)); WriteBuffer(chan, @@ -7176,7 +7176,7 @@ IdeReadWrite( } else { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeReadWrite: Write %#x Dwords\n", wordCount/2)); WriteBuffer2(chan, @@ -7240,7 +7240,7 @@ IdeVerify( LunExt->IdentifyData.NumberOfCylinders; } - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeVerify: Total sectors %#I64x\n", sectors)); @@ -7260,21 +7260,21 @@ IdeVerify( break; } - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeVerify: Starting sector %#I64x. Number of blocks %#x\n", startingSector, sectorCount)); endSector = startingSector + sectorCount; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeVerify: Ending sector %#I64x\n", endSector)); if (endSector > sectors) { // Too big, round down. - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeVerify: Truncating request to %#x blocks\n", sectors - startingSector - 1)); @@ -7714,7 +7714,7 @@ setup_dma: KdPrint2((PRINT_PREFIX "AtapiSendCommand: setup AHCI FIS\n")); // this is done in UniataAhciSetupFIS_H2D() - //RtlZeroMemory(&(AtaReq->ahci.ahci_cmd_ptr->cfis), sizeof(AtaReq->ahci_cmd0.cfis)); + //RtlZeroMemory(&(AtaReq->ahci.ahci_cmd_ptr->cfis), sizeof(AtaReq->ahci_cmd0.cfis)); RtlCopyMemory(&(AtaReq->ahci.ahci_cmd_ptr->acmd), Srb->Cdb, Srb->CdbLength); fis_size = UniataAhciSetupFIS_H2D(deviceExtension, DeviceNumber, lChannel, @@ -7737,7 +7737,7 @@ setup_dma: KdPrint2((PRINT_PREFIX "AtapiSendCommand ahci io flags %x: \n", AtaReq->ahci.io_cmd_flags)); } - + } else { if(AtaReq->Flags & REQ_FLAG_DMA_OPERATION) { // if this is queued request, reinit DMA and check @@ -7796,12 +7796,12 @@ setup_dma: if(AtaReq->Flags & REQ_FLAG_DMA_OPERATION) { KdPrint2((PRINT_PREFIX " REQ_FLAG_DMA_OPERATION\n")); } - + KdPrint2((PRINT_PREFIX "AtapiSendCommand: CMD_ACTION_EXEC\n")); KdPrint3((PRINT_PREFIX "AtapiSendCommand: Cdb %x Command %#x to TargetId %d lun %d\n", &(Srb->Cdb), Srb->Cdb[0], Srb->TargetId, Srb->Lun)); - + // Make sure command is to ATAPI device. flags = LunExt->DeviceFlags; if(flags & (DFLAGS_SANYO_ATAPI_CHANGER | DFLAGS_ATAPI_CHANGER)) { @@ -8008,7 +8008,7 @@ make_reset: if(g_opt_AtapiSendDisableIntr) { AtapiDisableInterrupts(deviceExtension, lChannel); } - // remember status. Later we may check if error appeared after cmd packet + // remember status. Later we may check if error appeared after cmd packet statusByte0 = statusByte; } @@ -8289,7 +8289,7 @@ default_no_prep: switch (Srb->Cdb[0]) { case SCSIOP_INQUIRY: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_INQUIRY PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); // Filter out wrong TIDs. @@ -8297,7 +8297,7 @@ default_no_prep: (Srb->PathId >= deviceExtension->NumberChannels) || (Srb->TargetId >= deviceExtension->NumberLuns)) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_INQUIRY rejected\n")); // Indicate no device found at this address. status = SRB_STATUS_SELECTION_TIMEOUT; @@ -8305,15 +8305,15 @@ default_no_prep: } else { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_INQUIRY ok\n")); PINQUIRYDATA inquiryData = (PINQUIRYDATA)(Srb->DataBuffer); PIDENTIFY_DATA2 identifyData = &(LunExt->IdentifyData); if (!(chan->lun[DeviceNumber]->DeviceFlags & DFLAGS_DEVICE_PRESENT)) { - + if(!CheckDevice(HwDeviceExtension, lChannel, DeviceNumber, FALSE)) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_INQUIRY rejected (2)\n")); // Indicate no device found at this address. #ifndef NAVO_TEST @@ -8322,7 +8322,7 @@ default_no_prep: } } else { if(!UniataAnybodyHome(HwDeviceExtension, lChannel, DeviceNumber)) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_INQUIRY device have gone\n")); // Indicate no device found at this address. UniataForgetDevice(chan->lun[DeviceNumber]); @@ -8340,14 +8340,14 @@ default_no_prep: // Set the removable bit, if applicable. if (LunExt->DeviceFlags & DFLAGS_REMOVABLE_DRIVE) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "RemovableMedia\n")); inquiryData->RemovableMedia = 1; } // Set the Relative Addressing (LBA) bit, if applicable. if (LunExt->DeviceFlags & DFLAGS_LBA_ENABLED) { inquiryData->RelativeAddressing = 1; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "RelativeAddressing\n")); } // Set the CommandQueue bit @@ -8378,8 +8378,8 @@ default_no_prep: ULONG alen; PREPORT_LUNS_INFO_HDR LunInfo; - - KdPrint2((PRINT_PREFIX + + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_REPORT_LUNS PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); @@ -8401,10 +8401,10 @@ default_no_prep: case SCSIOP_MODE_SENSE: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_MODE_SENSE PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); - + if(cdb->MODE_SENSE.PageCode == MODE_PAGE_POWER_CONDITION) { PMODE_POWER_CONDITION_PAGE modeData; @@ -8490,7 +8490,7 @@ default_no_prep: case SCSIOP_TEST_UNIT_READY: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_TEST_UNIT_READY PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); if (chan->lun[DeviceNumber]->DeviceFlags & DFLAGS_MEDIA_STATUS_ENABLED) { @@ -8537,7 +8537,7 @@ default_no_prep: case SCSIOP_READ_CAPACITY: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "** IdeSendCommand: SCSIOP_READ_CAPACITY PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); // Claim 512 byte blocks (big-endian). @@ -8560,7 +8560,7 @@ default_no_prep: MOV_DD_SWP( ((PREAD_CAPACITY_DATA)Srb->DataBuffer)->LogicalBlockAddress, i ); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "** IDE disk %#x - #sectors %#x, #heads %#x, #cylinders %#x\n", Srb->TargetId, LunExt->IdentifyData.SectorsPerTrack, @@ -8574,7 +8574,7 @@ default_no_prep: case SCSIOP_SERVICE_ACTION16: if( cdb->SERVICE_ACTION16.ServiceAction==SCSIOP_SA_READ_CAPACITY16 ) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "** IdeSendCommand: SCSIOP_READ_CAPACITY PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); // Claim 512 byte blocks (big-endian). @@ -8592,7 +8592,7 @@ default_no_prep: lba--; MOV_QD_SWP( ((PREAD_CAPACITY16_DATA)Srb->DataBuffer)->LogicalBlockAddress, lba ); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "** IDE disk %#x - #sectors %#x, #heads %#x, #cylinders %#x (16)\n", Srb->TargetId, LunExt->IdentifyData.SectorsPerTrack, @@ -8609,7 +8609,7 @@ default_no_prep: case SCSIOP_VERIFY12: case SCSIOP_VERIFY16: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_VERIFY PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); status = IdeVerify(HwDeviceExtension,Srb); @@ -8623,7 +8623,7 @@ default_no_prep: case SCSIOP_READ16: case SCSIOP_WRITE16: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_%s PATH:LUN:TID = %#x:%#x:%#x\n", (Srb->Cdb[0] == SCSIOP_WRITE) ? "WRITE" : "READ", Srb->PathId, Srb->Lun, Srb->TargetId)); @@ -8637,7 +8637,7 @@ default_no_prep: case SCSIOP_START_STOP_UNIT: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_START_STOP_UNIT immed %d PATH:LUN:TID = %#x:%#x:%#x\n", cdb->START_STOP.Immediate, Srb->PathId, Srb->Lun, Srb->TargetId)); //Determine what type of operation we should perform @@ -8706,7 +8706,7 @@ default_no_prep: } if(command) { statusByte = WaitOnBaseBusy(chan); - statusByte = AtaCommand(deviceExtension, DeviceNumber, lChannel, command, 0, 0, 0, 0, 0, + statusByte = AtaCommand(deviceExtension, DeviceNumber, lChannel, command, 0, 0, 0, 0, 0, cdb->START_STOP.Immediate ? ATA_IMMEDIATE : ATA_WAIT_READY); status = (statusByte & IDE_STATUS_ERROR) ? SRB_STATUS_ERROR : SRB_STATUS_SUCCESS; //UniataExpectChannelInterrupt(chan, TRUE); // device may interrupt @@ -8772,7 +8772,7 @@ invalid_cdb: // this function makes sense buffers to report the results // of the original GET_MEDIA_STATUS command - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_REQUEST_SENSE PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); if (LunExt->DeviceFlags & DFLAGS_MEDIA_STATUS_ENABLED) { @@ -8788,7 +8788,7 @@ invalid_cdb: PIDEREGS_EX regs; BOOLEAN use_dma = FALSE; ULONG to_lim; - + regs = (PIDEREGS_EX) &(Srb->Cdb[2]); if(chan->DeviceExtension->HwFlags & UNIATA_SATA) { @@ -8801,7 +8801,7 @@ invalid_cdb: if((regs->bOpFlags & 1) == 0) { // execute ATA command - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_ATA_PASSTHROUGH (exec) PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); @@ -8876,7 +8876,7 @@ invalid_cdb: AtapiWritePort1(chan, IDX_IO1_o_CylinderHigh, regs->bCylHighReg); } AtapiWritePort1(chan, IDX_IO1_o_Command, regs->bCommandReg); - + if(use_dma) { GetBaseStatus(chan, statusByte); if(statusByte & IDE_STATUS_ERROR) { @@ -8955,7 +8955,7 @@ passthrough_done:; BOOLEAN use48; regs = (PIDEREGS_EX) Srb->DataBuffer; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_ATA_PASSTHROUGH (snap) PATH:LUN:TID = %#x:%#x:%#x\n", Srb->PathId, Srb->Lun, Srb->TargetId)); @@ -8981,7 +8981,7 @@ passthrough_done:; default: default_abort: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeSendCommand: Unsupported command %#x\n", Srb->Cdb[0])); @@ -9044,7 +9044,7 @@ IdeMediaStatus( // Read the error register. errorByte = AtapiReadPort1(chan, IDX_IO1_i_Error); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "IdeMediaStatus: Error enabling media status. Status %#x, error byte %#x\n", statusByte, errorByte)); @@ -9266,7 +9266,7 @@ AtapiStartIo__( /* KeBugCheckEx(0xc000000e, (Srb->PathId<<16) | (Srb->TargetId<<8) | (Srb->Lun), - Srb->Function, + Srb->Function, TopLevel, 0x80000001); */ if(TopLevel && Srb && Srb->SrbExtension) { @@ -9287,7 +9287,7 @@ AtapiStartIo__( //ASSERT(deviceExtension); //ASSERT(chan); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "** AtapiStartIo: Function %#x, PATH:LUN:TID = %#x:%#x:%#x\n", Srb->Function, Srb->PathId, Srb->Lun, Srb->TargetId)); KdPrint2((PRINT_PREFIX " DeviceID+VendorID/Rev %#x/%#x\n", deviceExtension->DevID, deviceExtension->RevID)); @@ -9298,7 +9298,7 @@ AtapiStartIo__( (Srb->Function == SRB_FUNCTION_EXECUTE_SCSI && Srb->Cdb[0] == SCSIOP_INQUIRY)) ) { // This is our virtual device - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiStartIo: Communication port\n")); if(Srb->Function == SRB_FUNCTION_EXECUTE_SCSI) { @@ -9312,7 +9312,7 @@ wrong_buffer_size: PINQUIRYDATA inquiryData = (PINQUIRYDATA)(Srb->DataBuffer); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX " INQUIRY\n")); // Zero INQUIRY data structure. RtlZeroMemory((PCHAR)(Srb->DataBuffer), Srb->DataTransferLength); @@ -9338,7 +9338,7 @@ wrong_buffer_size: reject_srb: //if(!CheckDevice(HwDeviceExtension, lChannel, DeviceNumber, FALSE)) { - KdPrint3((PRINT_PREFIX + KdPrint3((PRINT_PREFIX "AtapiStartIo: SRB rejected\n")); // Indicate no device found at this address. KdPrint2((PRINT_PREFIX "SRB_STATUS_SELECTION_TIMEOUT\n")); @@ -9398,7 +9398,7 @@ reject_srb: } else { //if(!CheckDevice(HwDeviceExtension, lChannel, DeviceNumber, FALSE)) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiStartIo: EXECUTE_SCSI rejected (2)\n")); // Indicate no device found at this address. KdPrint2((PRINT_PREFIX "SRB_STATUS_SELECTION_TIMEOUT\n")); @@ -9407,7 +9407,7 @@ reject_srb: //} } } else { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX " SRB %#x, CDB %#x, AtaReq %#x, SCmd %#x\n", Srb, &(Srb->Cdb), Srb->SrbExtension, Srb->Cdb[0])); } /* @@ -9418,7 +9418,7 @@ reject_srb: g_foo += a; } } __except(EXCEPTION_EXECUTE_HANDLER) { - KdPrint3((PRINT_PREFIX + KdPrint3((PRINT_PREFIX "AtapiStartIo: Bad data buffer -> EXECUTE_SCSI rejected\n")); // Indicate no device found at this address. KdPrint3((PRINT_PREFIX "SRB_STATUS_ERROR\n")); @@ -9444,7 +9444,7 @@ reject_srb: } /*KeBugCheckEx(0xc000000e, (Srb->PathId<<16) | (Srb->TargetId<<8) | (Srb->Lun), - Srb->Function, + Srb->Function, status, 0x80000001);*/ if(status == SRB_STATUS_BUSY) status = SRB_STATUS_PENDING; @@ -9546,14 +9546,14 @@ reject_srb: // Set the removable bit, if applicable. if (LunExt->DeviceFlags & DFLAGS_REMOVABLE_DRIVE) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "RemovableMedia\n")); inquiryData->RemovableMedia = 1; } // Set the Relative Addressing (LBA) bit, if applicable. if (LunExt->DeviceFlags & DFLAGS_LBA_ENABLED) { inquiryData->RelativeAddressing = 1; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "RelativeAddressing\n")); } // Set the CommandQueue bit @@ -9596,7 +9596,7 @@ reject_srb: } /* KeBugCheckEx(0xc000000e, (Srb->PathId<<16) | (Srb->TargetId<<8) | (Srb->Lun), - Srb->Function, + Srb->Function, status, 0x80000002);*/ } @@ -9625,7 +9625,7 @@ reject_srb: if (!AtapiResetController__(deviceExtension, lChannel, RESET_COMPLETE_CURRENT)) { KdPrint2((PRINT_PREFIX "AtapiStartIo: Abort command failed\n")); // Log reset failure. - KdPrint3((PRINT_PREFIX + KdPrint3((PRINT_PREFIX "ScsiPortLogError: devExt %#x, Srb %#x, P:T:D=%d:%d:%d, MsgId %#x (%d)\n", HwDeviceExtension, NULL, 0, 0, 0, SP_INTERNAL_ADAPTER_ERROR, 5 << 8 )); @@ -9689,7 +9689,7 @@ do_bus_reset: if (!AtapiResetController__(deviceExtension, lChannel, RESET_COMPLETE_ALL)) { KdPrint2((PRINT_PREFIX "AtapiStartIo: Reset bus failed\n")); // Log reset failure. - KdPrint3((PRINT_PREFIX + KdPrint3((PRINT_PREFIX "ScsiPortLogError: devExt %#x, Srb %#x, P:T:D=%d:%d:%d, MsgId %#x (%d) - (2)\n", HwDeviceExtension, NULL, 0, 0, 0, SP_INTERNAL_ADAPTER_ERROR, 5 << 8 )); @@ -9726,7 +9726,7 @@ do_bus_reset: 0, ATA_C_F_DIS_WCACHE, ATA_WAIT_BASE_READY); // Check for errors. if (status & IDE_STATUS_ERROR) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiHwInitialize: Disable write cacheing on Device %d failed\n", DeviceNumber)); } @@ -9738,7 +9738,7 @@ do_bus_reset: 0, ATA_C_F_ENAB_WCACHE, ATA_WAIT_BASE_READY); // Check for errors. if (status & IDE_STATUS_ERROR) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiHwInitialize: Enable write cacheing on Device %d failed\n", DeviceNumber)); LunExt->DeviceFlags &= ~DFLAGS_WCACHE_ENABLED; @@ -9847,7 +9847,7 @@ invalid_request: } if(lChannel >= deviceExtension->NumberChannels || DeviceNumber >= deviceExtension->NumberLuns) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiStartIo: SCSIDISK IOCTL for non-exestent drive %d -> EXECUTE_SCSI rejected (2)\n", targetId)); // Indicate no device found at this address. @@ -9993,7 +9993,7 @@ invalid_request: default: // *all* IOCTLs here are SMART if(commPort) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiStartIo: SCSIDISK Smart IOCTL for commPort -> EXECUTE_SCSI rejected (3)\n")); } if (atapiDev) { @@ -10046,7 +10046,7 @@ invalid_request: } if(AtaCtl->addr.Lun || - AtaCtl->addr.TargetId >= deviceExtension->NumberLuns || + AtaCtl->addr.TargetId >= deviceExtension->NumberLuns || AtaCtl->addr.PathId >= deviceExtension->NumberChannels) { chan = NULL; @@ -10093,7 +10093,7 @@ invalid_request: // case IOCTL_SCSI_MINIPORT_UNIATA_REG_IO: if(bad_ldev) { handle_bad_ldev: - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiStartIo: bad_ldev -> IOCTL SRB rejected\n")); // Indicate no device found at this address. goto reject_srb; @@ -10134,7 +10134,7 @@ uata_ctl_queue: KdPrint2((PRINT_PREFIX "AtapiStartIo: Already have %d request(s)!\n", chan->queue_depth)); goto complete_req; - } + } } // end switch (AtaCtl->hdr.ControlCode) /* process request */ @@ -10205,7 +10205,7 @@ uata_ctl_queue: } if(AtaCtl->SetMode.MaxMode != IOMODE_NOT_SPECIFIED) { LunExt->LimitedTransferMode = (UCHAR)(AtaCtl->SetMode.MaxMode); - if(LunExt->LimitedTransferMode > + if(LunExt->LimitedTransferMode > LunExt->OrigTransferMode) { // check for incorrect value LunExt->LimitedTransferMode = @@ -10328,7 +10328,7 @@ uata_ctl_queue: break; } case IOCTL_SCSI_MINIPORT_UNIATA_RESETBB: { - + KdPrint2((PRINT_PREFIX "AtapiStartIo: Forget BB list\n")); ForgetBadBlocks(LunExt); @@ -10385,7 +10385,7 @@ complete_req: if (status != SRB_STATUS_PENDING) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiStartIo: Srb %#x complete with status %#x\n", Srb, status)); @@ -10431,7 +10431,7 @@ complete_req: NULL); ScsiPortNotification(NextLuRequest, - deviceExtension, + deviceExtension, PathId, TargetId, Lun); @@ -10881,7 +10881,7 @@ DriverEntry( if(!WinVer_WDM_Model && !PrimaryClaimed && !SecondaryClaimed && !g_Dump && !(BMList[i].ChanInitOk & 0x80)) { - + // We just want to claim our PCI device in compatible mode, since we shall not // tell system that we use it inside HwInitialize // Even more, we shall cheat system, that work with ISA @@ -10968,7 +10968,7 @@ DriverEntry( } if (newStatus == STATUS_SUCCESS) { if(WinVer_Id() < WinVer_2k) { - // This should be done in HwInitialize under w2k+ to ensure that + // This should be done in HwInitialize under w2k+ to ensure that // channel is actually initialized BMList[i].ChanInitOk |= 0x01 << c; } else { @@ -11018,7 +11018,7 @@ DriverEntry( /* KeBugCheckEx(0xc000000e, (i << 16) | BMList[0].ChanInitOk, - c, + c, newStatus, statusToReturn);*/ // Look for PCI IDE controller @@ -11087,7 +11087,7 @@ DriverEntry( /* KeBugCheckEx(0xc000000e, i, - c, + c, newStatus, statusToReturn);*/ // -------------- @@ -11459,7 +11459,7 @@ AtapiRegCheckParameterValue( IN ULONG Default ) { -#define ITEMS_TO_QUERY 2 // always 1 greater than what is searched +#define ITEMS_TO_QUERY 2 // always 1 greater than what is searched // PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; NTSTATUS status; diff --git a/drivers/storage/ide/uniata/id_badblock.cpp b/drivers/storage/ide/uniata/id_badblock.cpp index 1af3e575d06..f98f20b4720 100644 --- a/drivers/storage/ide/uniata/id_badblock.cpp +++ b/drivers/storage/ide/uniata/id_badblock.cpp @@ -149,10 +149,10 @@ InitBadBlocks( QueryTable[0].QueryRoutine = BadBlockQueryRoutine; QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].Name = NULL; // If Name is NULL, the QueryRoutine function - // specified for this table entry is called - // for all values associated with the current - // registry key. + QueryTable[0].Name = NULL; // If Name is NULL, the QueryRoutine function + // specified for this table entry is called + // for all values associated with the current + // registry key. QueryTable[0].EntryContext = NULL; QueryTable[0].DefaultType = REG_NONE; QueryTable[0].DefaultData = 0; @@ -270,7 +270,7 @@ CheckIfBadBlock( for (ULONG i = 0; i < nBadBlocks; i++) { - if (lba + count > arrBadBlocks->m_lbaStart && + if (lba + count > arrBadBlocks->m_lbaStart && lba < arrBadBlocks->m_lbaEnd) { KdPrint(( "listed BB @ %I64x\n", lba)); return true; diff --git a/drivers/storage/ide/uniata/id_dma.cpp b/drivers/storage/ide/uniata/id_dma.cpp index db6689088df..0a2570d0888 100644 --- a/drivers/storage/ide/uniata/id_dma.cpp +++ b/drivers/storage/ide/uniata/id_dma.cpp @@ -380,7 +380,7 @@ retry_DB_IO: } dma_count0 = dma_count; dma_base0 = dma_base; - i++; + i++; if (i >= max_entries) { KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); //AtaReq->dma_base = NULL; @@ -806,7 +806,7 @@ limit_pio: if(/*LunExt->TransferMode >= ATA_DMA*/ (LunExt->TransferMode > ATA_PIO5) && (LunExt->TransferMode != ATA_PIO0+apiomode) ) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiDmaReinit: set PIO mode on Device %d (%x -> %x)\n", LunExt->Lun, LunExt->TransferMode, ATA_PIO0+apiomode)); AtapiDmaInit(deviceExtension, LunExt->Lun, LunExt->chan->lChannel, apiomode, @@ -814,10 +814,10 @@ limit_pio: -1 ); } else if(LunExt->LimitedTransferMode < LunExt->TransferMode) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiDmaReinit: set PIO mode on Device %d (%x -> %x) (2)\n", LunExt->Lun, LunExt->TransferMode, LunExt->LimitedTransferMode)); AtapiDmaInit(deviceExtension, LunExt->Lun, LunExt->chan->lChannel, - LunExt->LimitedTransferMode-ATA_PIO0, + LunExt->LimitedTransferMode-ATA_PIO0, -1, -1 ); } @@ -897,7 +897,7 @@ AtaSetTransferMode( IN ULONG mode ) { - KdPrint3((PRINT_PREFIX + KdPrint3((PRINT_PREFIX "AtaSetTransferMode: Set %#x on Device %d/%d\n", mode, lChannel, DeviceNumber)); LONG statusByte = 0; CHAR apiomode; @@ -955,7 +955,7 @@ AtaSetTransferMode( // On the other hand, we may turn SATA device in PIO mode LunExt->TransferMode = (UCHAR)mode; if(deviceExtension->HwFlags & UNIATA_SATA) { - if(mode < ATA_SA150) { + if(mode < ATA_SA150) { LunExt->PhyTransferMode = max(LunExt->PhyTransferMode, LunExt->TransferMode); } else { LunExt->PhyTransferMode = LunExt->TransferMode; @@ -2219,7 +2219,7 @@ setup_drive_ite: break; } } - + for(i=wdmamode; !ok && i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { @@ -2503,7 +2503,7 @@ promise_timing( i = mode - ATA_WDMA0; r_bp |= mdma_timing[i][0]; r_cp |= mdma_timing[i][1]; - } + } SetPciConfig1(port+1, r_bp); SetPciConfig1(port+2, r_cp); } else diff --git a/drivers/storage/ide/uniata/id_init.cpp b/drivers/storage/ide/uniata/id_init.cpp index b9beb1bef0a..0ca074d0cc8 100644 --- a/drivers/storage/ide/uniata/id_init.cpp +++ b/drivers/storage/ide/uniata/id_init.cpp @@ -104,7 +104,7 @@ UniataChipDetectChannels( } } KdPrint2((PRINT_PREFIX "PortMask %#x\n", deviceExtension->AHCI_PI_mask)); - deviceExtension->AHCI_PI_mask = + deviceExtension->AHCI_PI_mask = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortMask", (ULONG)0xffffffff >> (32-deviceExtension->NumberChannels) ); KdPrint2((PRINT_PREFIX "Force PortMask %#x\n", deviceExtension->AHCI_PI_mask)); @@ -141,7 +141,7 @@ UniataChipDetectChannels( KdPrint2((PRINT_PREFIX "Marvell\n")); /* AHCI part has own DevID-based workaround */ switch(deviceExtension->DevID) { - case 0x610111ab: + case 0x610111ab: /* 88SX6101 only have 1 PATA channel */ if(BMList[deviceExtension->DevIndex].channel) { KdPrint2((PRINT_PREFIX "88SX6101/11 has no 2nd PATA chan\n")); @@ -155,7 +155,7 @@ UniataChipDetectChannels( case ATA_ATI_ID: KdPrint2((PRINT_PREFIX "ATI\n")); switch(deviceExtension->DevID) { - case ATA_ATI_IXP600: + case ATA_ATI_IXP600: KdPrint2((PRINT_PREFIX " IXP600\n")); /* IXP600 only have 1 PATA channel */ if(BMList[deviceExtension->DevIndex].channel) { @@ -170,7 +170,7 @@ UniataChipDetectChannels( UCHAR satacfg = 0; PCI_SLOT_NUMBER slotData; ULONG j, slotNumber; - + KdPrint2((PRINT_PREFIX " IXP700\n")); /* * When "combined mode" is enabled, an additional PATA channel is @@ -253,7 +253,7 @@ UniataChipDetectChannels( break; case ATA_ITE_ID: /* ITE ATA133 controller */ - if(deviceExtension->DevID == 0x82131283) { + if(deviceExtension->DevID == 0x82131283) { if(BMList[deviceExtension->DevIndex].channel) { KdPrint2((PRINT_PREFIX "New ITE has no 2nd PATA chan\n")); return FALSE; @@ -269,7 +269,7 @@ UniataChipDetectChannels( /*deviceExtension->DevID == 0x27df8086 || deviceExtension->DevID == 0x269e8086 || deviceExtension->DevID == ATA_I82801HBM*/ - ChipFlags & I1CH) { + ChipFlags & I1CH) { if(BMList[deviceExtension->DevIndex].channel) { KdPrint2((PRINT_PREFIX "New Intel PATA has no 2nd chan\n")); return FALSE; @@ -286,7 +286,7 @@ UniataChipDetectChannels( deviceExtension->DevID == ATA_JMB363 || deviceExtension->DevID == ATA_JMB365 || deviceExtension->DevID == ATA_JMB366 || - deviceExtension->DevID == ATA_JMB368) { + deviceExtension->DevID == ATA_JMB368) { ULONG tmp32, port_mask; @@ -506,7 +506,7 @@ unknown_dev: } goto for_ugly_chips; - case ATA_VIA_ID: + case ATA_VIA_ID: KdPrint2((PRINT_PREFIX "ATA_VIA_ID\n")); // New chips have own DeviceId if(deviceExtension->DevID != ATA_VIA82C571 && @@ -568,7 +568,7 @@ unknown_dev: case 0x06401039: /* CMD 640 known bad, no DMA */ case 0x06011039: - *simplexOnly = TRUE; + *simplexOnly = TRUE; /* FALLTHROUGH */ @@ -586,7 +586,7 @@ unknown_dev: case 0x81721283: /* IT8172 IDE controller */ deviceExtension->MaxTransferMode = ATA_UDMA2; - *simplexOnly = TRUE; + *simplexOnly = TRUE; break; default: @@ -643,13 +643,13 @@ for_ugly_chips: /* for even more ugly AHCI-capable chips */ if(ChipFlags & UNIATA_AHCI) { - /* + /* Seems, some chips may have inoperable/alternative BAR5 in SATA mode This can be detected via PCI SubClass */ switch(VendorID) { - case ATA_NVIDIA_ID: - case ATA_ATI_ID: + case ATA_NVIDIA_ID: + case ATA_ATI_ID: KdPrint2((PRINT_PREFIX "ATA_xxx_ID check AHCI subclass\n")); if((pciData)->SubClass == PCI_DEV_SUBCLASS_IDE) { KdPrint2((PRINT_PREFIX "Non-AHCI mode\n")); @@ -983,7 +983,7 @@ for_ugly_chips: if(tmp32 == ATA_SIS5513 || tmp32 == ATA_SIS5517) { i = AtapiFindListedDev((BUSMASTER_CONTROLLER_INFORMATION_BASE*)&SiSSouthAdapters[0], - -1, HwDeviceExtension, SystemIoBusNumber, PCISLOTNUM_NOT_SPECIFIED, NULL); + -1, HwDeviceExtension, SystemIoBusNumber, PCISLOTNUM_NOT_SPECIFIED, NULL); if(i != BMLIST_TERMINATOR) { KdPrint2((PRINT_PREFIX "SIS South\n")); deviceExtension->HwFlags = (deviceExtension->HwFlags & ~CHIPTYPE_MASK) | SIS133OLD; @@ -1325,7 +1325,7 @@ for_ugly_chips: break; } case ATA_CYRIX_ID: /* Cyrix 5530 ATA33 controller */ - if(deviceExtension->DevID == 0x01021078) { + if(deviceExtension->DevID == 0x01021078) { ConfigInfo->AlignmentMask = 0x0f; deviceExtension->MaximumDmaTransferLength = 63*1024; } @@ -1745,7 +1745,7 @@ UniAtaReadLunConfig( LunExt->IdentifyData.NumberOfCurrentCylinders = LunExt->IdentifyData.NumberOfCylinders = (USHORT)tmp32; tmp32 = AtapiRegCheckDevValue(deviceExtension, channel, DeviceNumber, L"H", 0); - LunExt->IdentifyData.NumberOfCurrentHeads = + LunExt->IdentifyData.NumberOfCurrentHeads = LunExt->IdentifyData.NumberOfHeads = (USHORT)tmp32; tmp32 = AtapiRegCheckDevValue(deviceExtension, channel, DeviceNumber, L"S", 0); LunExt->IdentifyData.CurrentSectorsPerTrack = @@ -1808,7 +1808,7 @@ AtapiReadChipConfig( } deviceExtension->opt_AtapiDmaZeroTransfer = FALSE; deviceExtension->opt_AtapiDmaControlCmd = FALSE; - deviceExtension->opt_AtapiDmaRawRead = g_opt_AtapiDmaRawRead; + deviceExtension->opt_AtapiDmaRawRead = g_opt_AtapiDmaRawRead; deviceExtension->opt_AtapiDmaReadWrite = TRUE; } @@ -2217,7 +2217,7 @@ AtapiChipInit( tmp32 = AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x0400); KdPrint2((PRINT_PREFIX "MODE=%#x\n", tmp32)); if(tmp32 & ~0xfffffff9) { - AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x0400, + AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x0400, tmp32 & 0xfffffff9); } ChipFlags &= ~NVQ; @@ -2229,7 +2229,7 @@ AtapiChipInit( KdPrint2((PRINT_PREFIX "Enable NCQ\n")); /* enable NCQ support */ - AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x0400, + AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x0400, tmp32 | ~0x00000006); /* clear interrupt status */ @@ -2249,7 +2249,7 @@ AtapiChipInit( } } else { //UCHAR reg52; - + if(c == CHAN_NOT_SPECIFIED) { /* set prefetch, postwrite */ ChangePciConfig1(0x51, (a & 0x0f)); @@ -2271,7 +2271,7 @@ AtapiChipInit( /* setup clocks */ if(c == CHAN_NOT_SPECIFIED) { // ATA_OUTB(ctlr->r_res1, 0x11, ATA_INB(ctlr->r_res1, 0x11) | 0x0a); - AtapiWritePortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiWritePortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, AtapiReadPortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) | 0x0a ); } /* FALLTHROUGH */ @@ -2279,7 +2279,7 @@ AtapiChipInit( /* enable burst mode */ // ATA_OUTB(ctlr->r_res1, 0x1f, ATA_INB(ctlr->r_res1, 0x1f) | 0x01); if(c == CHAN_NOT_SPECIFIED) { - AtapiWritePortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x1f, + AtapiWritePortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x1f, AtapiReadPortEx1(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x1f) | 0x01 ); } else { // check 80-pin cable @@ -2309,12 +2309,12 @@ AtapiChipInit( (ChipFlags & PRG2) ? 0x60 : 0x6c, 0x000000ff); if(ChipFlags & UNIATA_SATA) { /* enable "long burst length" on gen2 chips */ - AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0), 0x44, + AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0), 0x44, AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0), 0x44) | 0x2000); } } else { chan = &deviceExtension->chan[c]; - AtapiWritePort4(chan, IDX_BM_Command, + AtapiWritePort4(chan, IDX_BM_Command, (AtapiReadPort4(chan, IDX_BM_Command) & ~0x00000f8f) | channel ); AtapiWritePort4(chan, IDX_BM_DeviceSpecific0, 0x00000001); // check 80-pin cable @@ -2654,7 +2654,7 @@ AtapiChipInit( deviceExtension->DevID == ATA_JMB363 || deviceExtension->DevID == ATA_JMB365 || deviceExtension->DevID == ATA_JMB366 || - deviceExtension->DevID == ATA_JMB368) { + deviceExtension->DevID == ATA_JMB368) { KdPrint2((PRINT_PREFIX "JMicron\n")); ULONG c_swp = 0; @@ -2940,7 +2940,7 @@ UniataAllocateLunExt( return FALSE; } RtlZeroMemory(deviceExtension->lun, sizeof(HW_LU_EXTENSION) * (deviceExtension->NumberChannels+1) * deviceExtension->NumberLuns); - + deviceExtension->chan = (PHW_CHANNEL)ExAllocatePool(NonPagedPool, sizeof(HW_CHANNEL) * (deviceExtension->NumberChannels+1)); if (!deviceExtension->chan) { UniataFreeLunExt(deviceExtension); @@ -2973,7 +2973,7 @@ UniataFreeLunExt( ExFreePool(deviceExtension->AhciInternalSrb0); deviceExtension->AhciInternalSrb0 = NULL; } - + return; } // end UniataFreeLunExt() diff --git a/drivers/storage/ide/uniata/id_probe.cpp b/drivers/storage/ide/uniata/id_probe.cpp index dcb4225f00f..1ca49d248ec 100644 --- a/drivers/storage/ide/uniata/id_probe.cpp +++ b/drivers/storage/ide/uniata/id_probe.cpp @@ -68,7 +68,7 @@ ULONG maxPciBus = 16; PDRIVER_OBJECT SavedDriverObject = NULL; -// local routines +// local routines ULONG NTAPI @@ -830,7 +830,7 @@ AtapiFindListedDev( busDataRead = HalGetBusData( //ScsiPortGetBusData(HwDeviceExtension, - PCIConfiguration, busNumber, slotData.u.AsULONG, + PCIConfiguration, busNumber, slotData.u.AsULONG, &pciData, PCI_COMMON_HDR_LENGTH); // no more buses (this should not happen) if(!busDataRead) { @@ -1546,7 +1546,7 @@ UniataFindBusMasterController( if(AltInit) { // I'm sorry, I have to do this - // when Win doesn't + // when Win doesn't if(ConfigInfo->AdapterInterfaceType == Isa /*&& // InDriverEntry*/) { @@ -1922,7 +1922,7 @@ exit_findbm: exit_error: UniataFreeLunExt(deviceExtension); return SP_RETURN_ERROR; - + exit_notfound: UniataFreeLunExt(deviceExtension); return SP_RETURN_NOT_FOUND; @@ -2002,7 +2002,7 @@ del_do: if (!NT_SUCCESS(status)) { KdPrint2((PRINT_PREFIX "HalAssignSlotResources failed %#x\n", status)); // this is always deallocated inside HalAssignSlotResources() implementation - //ExFreePool(resourceList); + //ExFreePool(resourceList); goto del_do; } @@ -2046,11 +2046,11 @@ UniataConnectIntr2( /* We MUST register 2nd ISR for multichannel controllers even for UP systems. - This is needed for cases when - multichannel controller generate interrupt while we are still in its ISR for - other channle's interrupt. New interrupt must be detected and queued for - further processing. If we do not do this, system will not route this - interrupt to main ISR (since it is busy) and we shall get to infinite loop + This is needed for cases when + multichannel controller generate interrupt while we are still in its ISR for + other channle's interrupt. New interrupt must be detected and queued for + further processing. If we do not do this, system will not route this + interrupt to main ISR (since it is busy) and we shall get to infinite loop looking for interrupt handler. */ @@ -2081,7 +2081,7 @@ UniataConnectIntr2( KdPrint2((PRINT_PREFIX "Create DO\n")); - devname.Length = + devname.Length = _snwprintf(devname_str, sizeof(devname_str)/sizeof(WCHAR)-1, L"\\Device\\uniata%d_2ch", i); devname_str[devname.Length] = 0; @@ -2347,7 +2347,7 @@ AtapiFindIsaController( retryCount = 4; deviceExtension->DevIndex = (*adapterCount); // this is used inside AtapiRegCheckDevValue() KdPrint2((PRINT_PREFIX "AtapiFindIsaController: adapterCount=%d\n", *adapterCount)); - + for (i = 0; i < deviceExtension->NumberLuns; i++) { // Zero device fields to ensure that if earlier devices were found, // but not claimed, the fields are cleared. @@ -2410,7 +2410,7 @@ next_adapter: // Get the system physical address for the second IO range. if (BaseIoAddress1) { - if(preConfig && + if(preConfig && !ScsiPortConvertPhysicalAddressToUlong((*ConfigInfo->AccessRanges)[1].RangeStart)) { KdPrint2((PRINT_PREFIX "AtapiFindIsaController: PCMCIA ?\n")); ioSpace = (PUCHAR)ScsiPortGetDeviceBase(HwDeviceExtension, @@ -2680,7 +2680,7 @@ retryIdentifier: } ConfigInfo->NumberOfBuses++; // add virtual channel for communication port - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiFindIsaController: return SP_RETURN_FOUND\n")); return(SP_RETURN_FOUND); } else { @@ -2697,7 +2697,7 @@ not_found: BaseIoAddress2 = NULL; } for(i=0; i<2; i++) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "AtapiFindIsaController: cleanup AccessRanges %d\n", i)); (*ConfigInfo->AccessRanges)[i].RangeStart = ScsiPortConvertUlongToPhysicalAddress(0); (*ConfigInfo->AccessRanges)[i].RangeLength = 0; @@ -2726,7 +2726,7 @@ not_found: exit_error: UniataFreeLunExt(deviceExtension); return SP_RETURN_ERROR; - + } // end AtapiFindIsaController() /* @@ -2773,7 +2773,7 @@ UniataAnybodyHome( SATA_SSTATUS_REG SStatus; UCHAR signatureLow; UCHAR signatureHigh; - + if(LunExt->DeviceFlags & DFLAGS_HIDDEN) { KdPrint2((PRINT_PREFIX " hidden\n")); UniataForgetDevice(LunExt); @@ -2979,7 +2979,7 @@ CheckDevice( } if((statusByte | IDE_STATUS_BUSY) == IDE_STATUS_WRONG) { - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "CheckDevice: no dev ?\n")); UniataForgetDevice(LunExt); return 0; @@ -3202,7 +3202,7 @@ FindDevices( if(Flags & UNIATA_FIND_DEV_UNHIDE) { chan->lun[i]->DeviceFlags &= ~DFLAGS_HIDDEN; } - deviceResponded |= + deviceResponded |= (CheckDevice(HwDeviceExtension, Channel, i, TRUE) != 0); //AtapiEnableInterrupts(deviceExtension, Channel); } @@ -3341,11 +3341,11 @@ FindDevices( for (i = 0; i < max_ldev; i++) { LunExt = chan->lun[i]; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "FindDevices: select %d dev to clear INTR\n", i)); SelectDrive(chan, i); GetBaseStatus(chan, statusByte); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "FindDevices: statusByte=%#x\n", statusByte)); } for (i = 0; i < max_ldev; i++) { @@ -3353,7 +3353,7 @@ FindDevices( if(LunExt->DeviceFlags & DFLAGS_DEVICE_PRESENT) { // Make sure some device (master is preferred) is selected on exit. - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX "FindDevices: select %d dev on exit\n", i)); SelectDrive(chan, i); break; diff --git a/drivers/storage/ide/uniata/id_sata.cpp b/drivers/storage/ide/uniata/id_sata.cpp index edd7289e3ed..a3033a09eee 100644 --- a/drivers/storage/ide/uniata/id_sata.cpp +++ b/drivers/storage/ide/uniata/id_sata.cpp @@ -200,7 +200,7 @@ UniataSataClearErr( //if(ChipFlags & UNIATA_SATA) { SStatus.Reg = UniataSataReadPort4(chan, IDX_SATA_SStatus, pm_port); - SError.Reg = UniataSataReadPort4(chan, IDX_SATA_SError, pm_port); + SError.Reg = UniataSataReadPort4(chan, IDX_SATA_SError, pm_port); if(SStatus.Reg) { KdPrint2((PRINT_PREFIX " SStatus %#x\n", SStatus.Reg)); @@ -308,7 +308,7 @@ UniataSataReadPort4( SetPciConfig4(0xa0, offs); GetPciConfig4(0xa4, offs); return offs; - } else + } else if(deviceExtension->HwFlags & ICH7) { offs = 0x100+chan->lun[p]->SATA_lun_map*0x80; KdPrint3((PRINT_PREFIX " ICH7 way, offs %#x\n", offs)); @@ -396,7 +396,7 @@ UniataSataWritePort4( SetPciConfig4(0xa0, offs); SetPciConfig4(0xa4, data); return; - } else + } else if(deviceExtension->HwFlags & ICH7) { offs = 0x100+chan->lun[p]->SATA_lun_map*0x80; KdPrint3((PRINT_PREFIX " ICH7 way, offs %#x\n", offs)); @@ -592,7 +592,7 @@ UniataDumpAhciRegs( ULONG j; ULONG xReg; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX " AHCI Base: %#x MemIo %d Proc %d\n", deviceExtension->BaseIoAHCI_0.Addr, deviceExtension->BaseIoAHCI_0.MemIo, @@ -600,7 +600,7 @@ UniataDumpAhciRegs( for(j=0; j<=IDX_AHCI_VS; j+=sizeof(ULONG)) { xReg = AtapiReadPortEx4(NULL, (ULONGIO_PTR)&deviceExtension->BaseIoAHCI_0, j); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX " AHCI_%#x (%#x) = %#x\n", j, (deviceExtension->BaseIoAHCI_0.Addr+j), @@ -619,7 +619,7 @@ UniataDumpAhciPortRegs( ULONG j; ULONG xReg; - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX " AHCI port %d Base: %#x MemIo %d Proc %d\n", chan->lChannel, chan->BaseIoAHCI_Port.Addr, @@ -628,7 +628,7 @@ UniataDumpAhciPortRegs( for(j=0; j<=IDX_AHCI_P_SNTF; j+=sizeof(ULONG)) { xReg = AtapiReadPortEx4(NULL, (ULONGIO_PTR)&chan->BaseIoAHCI_Port, j); - KdPrint2((PRINT_PREFIX + KdPrint2((PRINT_PREFIX " AHCI%d_%#x (%#x) = %#x\n", chan->lChannel, j, @@ -949,7 +949,7 @@ UniataAhciDetect( } /* check AHCI mode. Save state and try enable */ - GHC0 = + GHC0 = GHC = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_GHC); KdPrint2((PRINT_PREFIX " check AHCI mode, GHC %#x\n", GHC)); @@ -998,7 +998,7 @@ UniataAhciDetect( KdPrint2((PRINT_PREFIX "\n")); /* get the number of HW channels */ - + /* CAP.NOP sometimes indicate the index of the last enabled * port, at other times, that of the last possible port, so * determining the maximum port number requires looking at @@ -1016,7 +1016,7 @@ UniataAhciDetect( //PI_ex_mask |= ((ULONG)1 << n); } } - deviceExtension->AHCI_PI_mask = + deviceExtension->AHCI_PI_mask = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortMask", deviceExtension->AHCI_PI_mask); KdPrint2((PRINT_PREFIX "Force PortMask %#x\n", deviceExtension->AHCI_PI_mask)); @@ -1025,7 +1025,7 @@ UniataAhciDetect( max((CAP & AHCI_CAP_NOP_MASK)+1, n); if(!PI && ((CAP & AHCI_CAP_NOP_MASK)+1)) { - /* Enable ports. + /* Enable ports. * The spec says that BIOS sets up bits corresponding to * available ports. On platforms where this information * is missing, the driver can define available ports on its own. @@ -1157,7 +1157,7 @@ UniataAhciStatus( CI = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CI); ACT = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_ACT); SStatus.Reg = AtapiReadPort4(chan, IDX_SATA_SStatus); - SError.Reg = AtapiReadPort4(chan, IDX_SATA_SError); + SError.Reg = AtapiReadPort4(chan, IDX_SATA_SError); /* clear interrupt(s) */ UniataAhciWriteHostPort4(deviceExtension, IDX_AHCI_IS, hIS); @@ -1268,9 +1268,9 @@ UniataAhciSetupFIS_H2D( // IDE_COMMAND_ATAPI_IDENTIFY should be processed as regular ATA command, // the rest of ATAPI requests are processed via IDE_COMMAND_ATAPI_PACKET - if(/*(chan->lun[DeviceNumber]->DeviceFlags & DFLAGS_ATAPI_DEVICE) && + if(/*(chan->lun[DeviceNumber]->DeviceFlags & DFLAGS_ATAPI_DEVICE) && */ - command == IDE_COMMAND_ATAPI_PACKET) { + command == IDE_COMMAND_ATAPI_PACKET) { fis[IDX_AHCI_o_Command] = IDE_COMMAND_ATAPI_PACKET; if(feature & ATA_F_DMA) { fis[IDX_AHCI_o_Feature] = (UCHAR)(feature & 0xff); @@ -1315,7 +1315,7 @@ UniataAhciSetupFIS_H2D( fis[IDX_AHCI_o_BlockNumberExp] = plba[3]; fis[IDX_AHCI_o_CylinderLowExp] = plba[4]; - fis[IDX_AHCI_o_CylinderHighExp] = plba[5]; + fis[IDX_AHCI_o_CylinderHighExp] = plba[5]; fis[IDX_AHCI_o_BlockCountExp] = (UCHAR)(count>>8) & 0xff; @@ -1368,9 +1368,9 @@ UniataAhciSetupFIS_H2D_Direct( // IDE_COMMAND_ATAPI_IDENTIFY should be processed as regular ATA command, // the rest of ATAPI requests are processed via IDE_COMMAND_ATAPI_PACKET - if(/*(chan->lun[DeviceNumber]->DeviceFlags & DFLAGS_ATAPI_DEVICE) && + if(/*(chan->lun[DeviceNumber]->DeviceFlags & DFLAGS_ATAPI_DEVICE) && */ - command == IDE_COMMAND_ATAPI_PACKET) { + command == IDE_COMMAND_ATAPI_PACKET) { /* fis[IDX_AHCI_o_Command] = IDE_COMMAND_ATAPI_PACKET; if(feature & ATA_F_DMA) { fis[IDX_AHCI_o_Feature] = (UCHAR)(feature & 0xff); @@ -1467,7 +1467,7 @@ UniataAhciWaitCommandReady( KdPrint((" CI %#x\n", CI)); //SStatus.Reg = AtapiReadPort4(chan, IDX_SATA_SStatus); - //SError.Reg = AtapiReadPort4(chan, IDX_SATA_SError); + //SError.Reg = AtapiReadPort4(chan, IDX_SATA_SError); /* clear interrupt(s) */ IS.Reg = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_IS); @@ -1484,7 +1484,7 @@ UniataAhciWaitCommandReady( TFD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_TFD); KdPrint2((" TFD %#x\n", TFD)); #endif //_DEBUG - + return IDE_STATUS_WRONG; } @@ -2078,7 +2078,7 @@ UniataAhciStart( KdPrint2(("UniataAhciStart: lChan %d\n", chan->lChannel)); /* clear SATA error register */ - SError.Reg = AtapiReadPort4(chan, IDX_SATA_SError); + SError.Reg = AtapiReadPort4(chan, IDX_SATA_SError); /* clear any interrupts pending on this channel */ IS = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_IS); @@ -2111,9 +2111,9 @@ UniataAhciCLO( KdPrint2(("UniataAhciCLO: lChan %d\n", chan->lChannel)); - /* issue Command List Override if supported */ + /* issue Command List Override if supported */ //CAP = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP); - CAP = chan->DeviceExtension->AHCI_CAP; + CAP = chan->DeviceExtension->AHCI_CAP; if(!(CAP & AHCI_CAP_SCLO)) { return TRUE; } @@ -2147,7 +2147,7 @@ UniataAhciStop( KdPrint2(("UniataAhciStop: lChan %d\n", chan->lChannel)); - /* issue Command List Override if supported */ + /* issue Command List Override if supported */ CMD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); CMD &= ~ATA_AHCI_P_CMD_ST; UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_CMD, CMD); @@ -2209,7 +2209,7 @@ UniataAhciBeginTransaction( KdPrint2((PRINT_PREFIX " AHCI AtaReq->Chan CMD %#x (ph %#x) -> %#x (ph %#x)\n", AtaReq->ahci.ahci_cmd_ptr, (ULONG)(AtaReq->ahci.ahci_base64), &(chan->AhciCtlBlock->cmd), chan->AHCI_CTL_PhAddr + FIELD_OFFSET(IDE_AHCI_CHANNEL_CTL_BLOCK, cmd) )); - RtlCopyMemory(&(chan->AhciCtlBlock->cmd), AtaReq->ahci.ahci_cmd_ptr, + RtlCopyMemory(&(chan->AhciCtlBlock->cmd), AtaReq->ahci.ahci_cmd_ptr, FIELD_OFFSET(IDE_AHCI_CMD, prd_tab)+AHCI_CL->prd_length*sizeof(IDE_AHCI_PRD_ENTRY)); AHCI_CL->cmd_table_phys = chan->AHCI_CTL_PhAddr + FIELD_OFFSET(IDE_AHCI_CHANNEL_CTL_BLOCK, cmd); } else { @@ -2223,7 +2223,7 @@ UniataAhciBeginTransaction( } #ifdef _DEBUG - KdPrint2((" prd_length %#x, flags %#x, base %I64x\n", AHCI_CL->prd_length, AHCI_CL->cmd_flags, + KdPrint2((" prd_length %#x, flags %#x, base %I64x\n", AHCI_CL->prd_length, AHCI_CL->cmd_flags, AHCI_CL->cmd_table_phys)); #endif // _DEBUG diff --git a/drivers/storage/ide/uniata/inc/CrossNt.h b/drivers/storage/ide/uniata/inc/CrossNt.h index a0c074f2caa..1946be81c58 100644 --- a/drivers/storage/ide/uniata/inc/CrossNt.h +++ b/drivers/storage/ide/uniata/inc/CrossNt.h @@ -7,7 +7,7 @@ extern "C" { #if !defined(NT_INCLUDED) #include // various NT definitions -#endif +#endif #include #include diff --git a/drivers/storage/ide/uniata/inc/misc.h b/drivers/storage/ide/uniata/inc/misc.h index 94f406b3660..e49c3e1a41a 100644 --- a/drivers/storage/ide/uniata/inc/misc.h +++ b/drivers/storage/ide/uniata/inc/misc.h @@ -3,7 +3,7 @@ #ifdef USE_REACTOS_DDK -/* The definitions look so crappy, because the code doesn't care +/* The definitions look so crappy, because the code doesn't care whether the source is an array or an integer */ #define MOV_DD_SWP(a,b) ( ((PULONG)&(a))[0] = RtlUlongByteSwap(*(PULONG)&(b))) #define MOV_DW_SWP(a,b) ( ((PUSHORT)&(a))[0] = RtlUshortByteSwap(*(PUSHORT)&(b))) diff --git a/drivers/storage/ide/uniata/ntddk_ex.h b/drivers/storage/ide/uniata/ntddk_ex.h index 1c74fca7f21..5e46f017fbd 100644 --- a/drivers/storage/ide/uniata/ntddk_ex.h +++ b/drivers/storage/ide/uniata/ntddk_ex.h @@ -13,7 +13,7 @@ #ifndef FILE_CHARACTERISTIC_PNP_DEVICE #define FILE_CHARACTERISTIC_PNP_DEVICE 0x00000800 -#endif +#endif typedef enum _SYSTEM_INFORMATION_CLASS { SystemBasicInformation, diff --git a/drivers/storage/ide/uniata/scsi.h b/drivers/storage/ide/uniata/scsi.h index 16e8540882a..9d85cf14d59 100644 --- a/drivers/storage/ide/uniata/scsi.h +++ b/drivers/storage/ide/uniata/scsi.h @@ -191,7 +191,7 @@ typedef union _CDB { UCHAR Reserved : 4; } Fields; } Byte2; - + UCHAR Reserved2[3]; UCHAR Start_TrackSes;; UCHAR AllocationLength[2]; @@ -561,7 +561,7 @@ typedef union _CDB { } Byte2; UCHAR Reserved1 [2]; UCHAR TrackNum; - UCHAR Reserved2 [6]; + UCHAR Reserved2 [6]; } CLOSE_TRACK_SESSION, *PCLOSE_TRACK_SESSION; @@ -1603,7 +1603,7 @@ typedef PREAD_TOC_FULL_TOC PREAD_TOC_PMA; typedef struct _READ_TOC_ATIP { UCHAR Length[2]; UCHAR Reserved[2]; - + #define ATIP_SpeedRef_Mask 0x07 #define ATIP_SpeedRef_2X 0x01 #define ATIP_WritingPower_Mask 0x07 @@ -2014,8 +2014,8 @@ typedef struct _EVENT_STAT_DEV_BUSY_BLOCK { // Define mode disc info block. -typedef struct _DISC_INFO_BLOCK { // - UCHAR DataLength [2]; +typedef struct _DISC_INFO_BLOCK { // + UCHAR DataLength [2]; #define DiscInfo_Disk_Mask 0x03 #define DiscInfo_Disk_Empty 0x00 @@ -2078,7 +2078,7 @@ typedef struct _DISC_INFO_BLOCK { // // Define track info block. typedef struct _TRACK_INFO_BLOCK { - UCHAR DataLength [2]; + UCHAR DataLength [2]; UCHAR TrackNum; UCHAR SesNum; UCHAR Reserved0; @@ -2348,7 +2348,7 @@ typedef struct _MODE_WRITE_PARAMS_PAGE { // 0x05 } Byte4; UCHAR LinkSize; - UCHAR Reserved3; + UCHAR Reserved3; union { UCHAR Flags; @@ -2454,7 +2454,7 @@ typedef struct _MODE_CD_PARAMS_PAGE { // 0x0D UCHAR PageCode : 6; UCHAR Reserved : 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x06 UCHAR Reserved1; @@ -2493,7 +2493,7 @@ typedef struct _MODE_CD_AUDIO_CONTROL_PAGE { // 0x0E UCHAR PageCode : 6; UCHAR Reserved1: 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x0E #define CdAudio_SOTC 0x02 @@ -2522,7 +2522,7 @@ typedef struct _MODE_POWER_CONDITION_PAGE { // 0x1A UCHAR PageCode : 6; UCHAR Reserved1: 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x0A UCHAR Reserved2; @@ -2549,7 +2549,7 @@ typedef struct _MODE_FAIL_REPORT_PAGE { // 0x1C UCHAR PageCode : 6; UCHAR Reserved1: 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x0A #define FailReport_LogErr 0x01 @@ -2588,7 +2588,7 @@ typedef struct _MODE_TIMEOUT_AND_PROTECT_PAGE { // 0x1D UCHAR PageCode : 6; UCHAR Reserved1: 1; UCHAR PageSavable : 1; - + UCHAR PageLength; // 0x08 UCHAR Reserved2[2]; @@ -2651,31 +2651,31 @@ typedef struct _MODE_CAPABILITIES_PAGE2 { // 0x2A UCHAR PageLength; -#define DevCap_read_cd_r 0x01 // reserved in 1.2 -#define DevCap_read_cd_rw 0x02 // reserved in 1.2 +#define DevCap_read_cd_r 0x01 // reserved in 1.2 +#define DevCap_read_cd_rw 0x02 // reserved in 1.2 #define DevCap_method2 0x04 #define DevCap_read_dvd_rom 0x08 #define DevCap_read_dvd_r 0x10 #define DevCap_read_dvd_ram 0x20 UCHAR ReadCap; // DevCap_*_read -/* UCHAR cd_r_read : 1; // reserved in 1.2 - UCHAR cd_rw_read : 1; // reserved in 1.2 +/* UCHAR cd_r_read : 1; // reserved in 1.2 + UCHAR cd_rw_read : 1; // reserved in 1.2 UCHAR method2 : 1; UCHAR dvd_rom : 1; UCHAR dvd_r_read : 1; UCHAR dvd_ram_read : 1; UCHAR Reserved2 : 2;*/ -#define DevCap_write_cd_r 0x01 // reserved in 1.2 -#define DevCap_write_cd_rw 0x02 // reserved in 1.2 +#define DevCap_write_cd_r 0x01 // reserved in 1.2 +#define DevCap_write_cd_rw 0x02 // reserved in 1.2 #define DevCap_test_write 0x04 #define DevCap_write_dvd_r 0x10 #define DevCap_write_dvd_ram 0x20 UCHAR WriteCap; // DevCap_*_write -/* UCHAR cd_r_write : 1; // reserved in 1.2 - UCHAR cd_rw_write : 1; // reserved in 1.2 +/* UCHAR cd_r_write : 1; // reserved in 1.2 + UCHAR cd_rw_write : 1; // reserved in 1.2 UCHAR test_write : 1; UCHAR reserved3a : 1; UCHAR dvd_r_write : 1; @@ -2740,16 +2740,16 @@ typedef struct _MODE_CAPABILITIES_PAGE2 { // 0x2A #define DevCap_separate_volume 0x01 #define DevCap_separate_mute 0x02 -#define DevCap_disc_present 0x04 // reserved in 1.2 -#define DevCap_sw_slot_select 0x08 // reserved in 1.2 -#define DevCap_change_side_cap 0x10 +#define DevCap_disc_present 0x04 // reserved in 1.2 +#define DevCap_sw_slot_select 0x08 // reserved in 1.2 +#define DevCap_change_side_cap 0x10 #define DevCap_rw_leadin_read 0x20 UCHAR Capabilities3; /* UCHAR separate_volume : 1; UCHAR separate_mute : 1; - UCHAR disc_present : 1; // reserved in 1.2 - UCHAR sss : 1; // reserved in 1.2 + UCHAR disc_present : 1; // reserved in 1.2 + UCHAR sss : 1; // reserved in 1.2 UCHAR Reserved7 : 4;*/ UCHAR MaximumSpeedSupported[2]; diff --git a/drivers/storage/ide/uniata/srb.h b/drivers/storage/ide/uniata/srb.h index d79c02727d3..af1bde9f332 100644 --- a/drivers/storage/ide/uniata/srb.h +++ b/drivers/storage/ide/uniata/srb.h @@ -58,7 +58,7 @@ typedef struct _PORT_CONFIGURATION_INFORMATION { // well as level, such as internal buses. ULONG BusInterruptVector; KINTERRUPT_MODE InterruptMode; // Interrupt mode (level-sensitive or edge-triggered) - + ULONG MaximumTransferLength; // Max bytes that can be transferred in a single SRB ULONG NumberOfPhysicalBreaks; // Number of contiguous blocks of physical memory ULONG DmaChannel; // DMA channel for devices using system DMA @@ -86,8 +86,8 @@ typedef struct _PORT_CONFIGURATION_INFORMATION { BOOLEAN MultipleRequestPerLu; // Supports multiple requests per logical unit. BOOLEAN ReceiveEvent; // Support receive event function. BOOLEAN RealModeInitialized; // Indicates the real-mode driver has initialized the card. - - BOOLEAN BufferAccessScsiPortControlled; // Indicate that the miniport will not touch + + BOOLEAN BufferAccessScsiPortControlled; // Indicate that the miniport will not touch // the data buffers directly. UCHAR MaximumNumberOfTargets; // Indicator for wide scsi. UCHAR ReservedUchars[2]; // Ensure quadword alignment. @@ -112,7 +112,7 @@ typedef struct _PORT_CONFIGURATION_INFORMATION_NT { } PORT_CONFIGURATION_INFORMATION_NT, *PPORT_CONFIGURATION_INFORMATION_NT; typedef struct _PORT_CONFIGURATION_INFORMATION_2K { - // Used to determine whether the system and/or the miniport support + // Used to determine whether the system and/or the miniport support // 64-bit physical addresses. See SCSI_DMA64_* flags below. UCHAR Dma64BitAddresses; // Indicates that the miniport can accept a SRB_FUNCTION_RESET_DEVICE @@ -143,9 +143,9 @@ typedef struct _PORT_CONFIGURATION_INFORMATION_COMMON { // // -// Set by scsiport on entering HwFindAdapter if the system can support 64-bit -// physical addresses. The miniport can use this information before calling -// ScsiPortGetUncachedExtension to modify the DeviceExtensionSize, +// Set by scsiport on entering HwFindAdapter if the system can support 64-bit +// physical addresses. The miniport can use this information before calling +// ScsiPortGetUncachedExtension to modify the DeviceExtensionSize, // SpecificLuExtensionSize & SrbExtensionSize fields to account for the extra // size of the scatter gather list. // @@ -154,7 +154,7 @@ typedef struct _PORT_CONFIGURATION_INFORMATION_COMMON { // // Set by the miniport before calling ScsiPortGetUncachedExtension to indicate -// that scsiport should provide it with 64-bit physical addresses. If the +// that scsiport should provide it with 64-bit physical addresses. If the // system does not support 64-bit PA's then this bit will be ignored. // @@ -365,9 +365,9 @@ typedef struct _SCSI_WMI_REQUEST_BLOCK { #define SRB_STATUS_INTERNAL_ERROR 0x30 // -// Srb status values 0x38 through 0x3f are reserved for internal port driver +// Srb status values 0x38 through 0x3f are reserved for internal port driver // use. -// +// @@ -568,7 +568,7 @@ typedef struct _HW_INITIALIZATION_DATA { ULONG SrbExtensionSize; ULONG NumberOfAccessRanges; PVOID Reserved; - + BOOLEAN MapBuffers; // Data buffers must be mapped into virtual address space. BOOLEAN NeedPhysicalAddresses; // We need to tranlate virtual to physical addresses. BOOLEAN TaggedQueuing; // Supports tagged queuing diff --git a/drivers/storage/inc/class.h b/drivers/storage/inc/class.h index f983d4ce3c0..eaf4045b468 100644 --- a/drivers/storage/inc/class.h +++ b/drivers/storage/inc/class.h @@ -233,7 +233,7 @@ typedef struct _COMPLETION_CONTEXT { SCSI_REQUEST_BLOCK Srb; }COMPLETION_CONTEXT, *PCOMPLETION_CONTEXT; - + NTSTATUS ScsiClassGetCapabilities( IN PDEVICE_OBJECT PortDeviceObject, diff --git a/drivers/storage/inc/ide.h b/drivers/storage/inc/ide.h index 53f40d0447c..b8688d17299 100644 --- a/drivers/storage/inc/ide.h +++ b/drivers/storage/inc/ide.h @@ -29,7 +29,7 @@ Revision History: // Some miniports need this structure. // IdentifyData is passed to the miniport in // the XfermodeSelect structure -// +// // // IDENTIFY data @@ -175,18 +175,18 @@ typedef struct _PCIIDE_TRANSFER_MODE_SELECT { // // Input Parameters - // - + // + // // IDE Channel Number. 0 or 1 - // + // ULONG Channel; // // Indicate whether devices are present - // + // BOOLEAN DevicePresent[MAX_IDE_DEVICE * MAX_IDE_LINE]; - + // // Indicate whether devices are ATA harddisk // @@ -194,12 +194,12 @@ typedef struct _PCIIDE_TRANSFER_MODE_SELECT { // // Indicate whether devices support IO Ready Line - // + // BOOLEAN IoReadySupported[MAX_IDE_DEVICE * MAX_IDE_LINE]; // // Indicate the data transfer modes devices support - // + // ULONG DeviceTransferModeSupported[MAX_IDE_DEVICE * MAX_IDE_LINE]; // @@ -236,8 +236,8 @@ typedef struct _PCIIDE_TRANSFER_MODE_SELECT { // // Output Parameters - // - + // + // // Indicate devices' data transfer modes chosen by // the pcii ide mini drive @@ -254,26 +254,26 @@ typedef struct _PCIIDE_TRANSFER_MODE_SELECT { // // possible ide channel state -// - +// + typedef enum { ChannelDisabled = 0, ChannelEnabled, ChannelStateUnknown } IDE_CHANNEL_STATE; - - + + // // Prototype for different PCI IDE mini driver // callbacks -// +// typedef IDE_CHANNEL_STATE (*PCIIDE_CHANNEL_ENABLED) ( IN PVOID DeviceExtension, IN ULONG Channel ); -typedef BOOLEAN +typedef BOOLEAN (*PCIIDE_SYNC_ACCESS_REQUIRED) ( IN PVOID DeviceExtension ); @@ -284,12 +284,12 @@ typedef NTSTATUS IN OUT PPCIIDE_TRANSFER_MODE_SELECT TransferModeSelect ); -typedef ULONG +typedef ULONG (*PCIIDE_USEDMA_FUNC)( - IN PVOID deviceExtension, + IN PVOID deviceExtension, IN PVOID cdbCmd, IN UCHAR targetID - ); + ); typedef NTSTATUS (*PCIIDE_UDMA_MODES_SUPPORTED) ( @@ -297,17 +297,17 @@ typedef NTSTATUS PULONG BestXferMode, PULONG CurrentMode ); -// -// This structure is for the PCI IDE mini driver to +// +// This structure is for the PCI IDE mini driver to // return its properties -// +// typedef struct _IDE_CONTROLLER_PROPERTIES { // // sizeof (IDE_CONTROLLER_PROPERTIES) // - ULONG Size; - + ULONG Size; + // // Indicate the amount of memory PCI IDE mini driver // needs for its private data @@ -317,20 +317,20 @@ typedef struct _IDE_CONTROLLER_PROPERTIES { // // Indicate all the data transfer modes the PCI IDE // controller supports - // + // ULONG SupportedTransferMode[MAX_IDE_CHANNEL][MAX_IDE_DEVICE]; // // callback to query whether a IDE channel is enabled - // + // PCIIDE_CHANNEL_ENABLED PciIdeChannelEnabled; - + // // callback to query whether both IDE channels requires // synchronized access. (one channel at a time) - // + // PCIIDE_SYNC_ACCESS_REQUIRED PciIdeSyncAccessRequired; - + // // callback to select proper transfer modes for the // given devices @@ -338,9 +338,9 @@ typedef struct _IDE_CONTROLLER_PROPERTIES { PCIIDE_TRANSFER_MODE_SELECT_FUNC PciIdeTransferModeSelect; // - // at the end of a ATA data transfer, ignores busmaster + // at the end of a ATA data transfer, ignores busmaster // status active bit. Normally, it should be FALSE - // + // BOOLEAN IgnoreActiveBitForAtaDevice; // @@ -372,17 +372,17 @@ typedef struct _IDE_CONTROLLER_PROPERTIES { // // callback to query PCI IDE controller properties -// +// typedef NTSTATUS (*PCONTROLLER_PROPERTIES) ( IN PVOID DeviceExtension, IN PIDE_CONTROLLER_PROPERTIES ControllerProperties ); - + // // To initialize PCI IDE mini driver -// +// NTSTATUS PciIdeXInitialize( IN PDRIVER_OBJECT DriverObject, @@ -393,7 +393,7 @@ PciIdeXInitialize( // // To query PCI IDE config space data -// +// NTSTATUS PciIdeXGetBusData( IN PVOID DeviceExtension, @@ -404,7 +404,7 @@ PciIdeXGetBusData( // // To save PCI IDE config space data -// +// NTSTATUS PciIdeXSetBusData( IN PVOID DeviceExtension, @@ -414,7 +414,7 @@ PciIdeXSetBusData( IN ULONG BufferLength ); - + #pragma pack(1) typedef struct _PCIIDE_CONFIG_HEADER { @@ -470,10 +470,10 @@ typedef struct _PCIIDE_CONFIG_HEADER { } PCIIDE_CONFIG_HEADER, *PPCIIDE_CONFIG_HEADER; #pragma pack() - + // // Debug Print -// +// #if DBG VOID @@ -484,12 +484,12 @@ PciIdeXDebugPrint( ); #define PciIdeXDebugPrint(x) PciIdeXDebugPrint x - + #else - -#define PciIdeXDebugPrint(x) + +#define PciIdeXDebugPrint(x) #endif // DBG - + #endif // ___ide_h___ diff --git a/drivers/storage/inc/ideuser.h b/drivers/storage/inc/ideuser.h index babde7162f2..622cdb89ed9 100644 --- a/drivers/storage/inc/ideuser.h +++ b/drivers/storage/inc/ideuser.h @@ -18,7 +18,7 @@ Revision History: #if !defined (___ideuser_h___) #define ___ideuser_h___ - + #define PIO_MODE0 (1 << 0) #define PIO_MODE1 (1 << 1) #define PIO_MODE2 (1 << 2) diff --git a/drivers/storage/inc/physlogi.h b/drivers/storage/inc/physlogi.h index 57e71e0c7c8..cc366c867b2 100644 --- a/drivers/storage/inc/physlogi.h +++ b/drivers/storage/inc/physlogi.h @@ -13,11 +13,11 @@ Abstract: function protypes, etc. for use in calling functions in physlogi.c that do physical to pseudo-logical and pseudo- logical to physical tape block address/position translation. - + Author: Mike Colandreo (Maynard) - + Revision History: --*/ diff --git a/drivers/storage/inc/rbc.h b/drivers/storage/inc/rbc.h index 11f0ae6c2f5..fc867ebebd4 100644 --- a/drivers/storage/inc/rbc.h +++ b/drivers/storage/inc/rbc.h @@ -33,7 +33,7 @@ typedef union _CDB_RBC { // // format unit // - + struct _FORMAT_RBC { UCHAR OperationCode; UCHAR VendorSpecific; @@ -44,7 +44,7 @@ typedef union _CDB_RBC { UCHAR Reserved2[2]; UCHAR Control; } FORMAT_RBC, *PFORMAT_RBC; - + // // prevent/allow medium removal // diff --git a/drivers/storage/inc/tape.h b/drivers/storage/inc/tape.h index 2f11917a24c..9a39dbe8611 100644 --- a/drivers/storage/inc/tape.h +++ b/drivers/storage/inc/tape.h @@ -180,7 +180,7 @@ typedef struct _MODE_DATA_COMPRESS_PAGE { } MODE_DATA_COMPRESS_PAGE, *PMODE_DATA_COMPRESS_PAGE; - + // // The following routines are the exported entry points for // all tape class drivers. Note all these routines name start @@ -217,7 +217,7 @@ ScsiTapeDeviceControl( ); - + // // The following routines are provided by the tape // device-specific module. Each routine name is diff --git a/drivers/storage/mountmgr/mntmgr.h b/drivers/storage/mountmgr/mntmgr.h index 943568ff213..66d2225d0e0 100644 --- a/drivers/storage/mountmgr/mntmgr.h +++ b/drivers/storage/mountmgr/mntmgr.h @@ -302,7 +302,7 @@ OpenRemoteDatabase( PDATABASE_ENTRY GetRemoteDatabaseEntry( IN HANDLE Database, - IN LONG StartingOffset + IN LONG StartingOffset ); NTSTATUS @@ -408,13 +408,13 @@ HasNoDriveLetterEntry( VOID UpdateReplicatedUniqueIds( IN PDEVICE_INFORMATION DeviceInformation, - IN PDATABASE_ENTRY DatabaseEntry + IN PDATABASE_ENTRY DatabaseEntry ); BOOLEAN IsUniqueIdPresent( IN PDEVICE_EXTENSION DeviceExtension, - IN PDATABASE_ENTRY DatabaseEntry + IN PDATABASE_ENTRY DatabaseEntry ); /* point.c */ diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index e1aedcbfa52..48fd9890b2f 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -224,7 +224,7 @@ AssignResourcesToConfiguration( } /* Advance to next CM_FULL_RESOURCE_DESCRIPTOR block in memory. */ - FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptor->PartialResourceList.PartialDescriptors + + FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptor->PartialResourceList.PartialDescriptors + FullDescriptor->PartialResourceList.Count); } } diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c index 200682708e1..f524ef6f62d 100644 --- a/drivers/storage/port/storport/misc.c +++ b/drivers/storage/port/storport/misc.c @@ -244,7 +244,7 @@ TranslateResourceListAddress( IoAddress.QuadPart >= PartialDescriptorA->u.Port.Start.QuadPart && IoAddress.QuadPart + NumberOfBytes <= PartialDescriptorA->u.Port.Start.QuadPart + PartialDescriptorA->u.Port.Length) { - TranslatedAddress->QuadPart = PartialDescriptorT->u.Port.Start.QuadPart + + TranslatedAddress->QuadPart = PartialDescriptorT->u.Port.Start.QuadPart + (IoAddress.QuadPart - PartialDescriptorA->u.Port.Start.QuadPart); return TRUE; } @@ -258,7 +258,7 @@ TranslateResourceListAddress( IoAddress.QuadPart >= PartialDescriptorA->u.Memory.Start.QuadPart && IoAddress.QuadPart + NumberOfBytes <= PartialDescriptorA->u.Memory.Start.QuadPart + PartialDescriptorA->u.Memory.Length) { - TranslatedAddress->QuadPart = PartialDescriptorT->u.Memory.Start.QuadPart + + TranslatedAddress->QuadPart = PartialDescriptorT->u.Memory.Start.QuadPart + (IoAddress.QuadPart - PartialDescriptorA->u.Memory.Start.QuadPart); return TRUE; } @@ -267,10 +267,10 @@ TranslateResourceListAddress( } /* Advance to next CM_FULL_RESOURCE_DESCRIPTOR block in memory. */ - FullDescriptorA = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptorA->PartialResourceList.PartialDescriptors + + FullDescriptorA = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptorA->PartialResourceList.PartialDescriptors + FullDescriptorA->PartialResourceList.Count); - FullDescriptorT = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptorT->PartialResourceList.PartialDescriptors + + FullDescriptorT = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptorT->PartialResourceList.PartialDescriptors + FullDescriptorT->PartialResourceList.Count); } @@ -319,7 +319,7 @@ GetResourceListInterrupt( } /* Advance to next CM_FULL_RESOURCE_DESCRIPTOR block in memory. */ - FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptor->PartialResourceList.PartialDescriptors + + FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptor->PartialResourceList.PartialDescriptors + FullDescriptor->PartialResourceList.Count); } diff --git a/drivers/storage/port/storport/storport.c b/drivers/storage/port/storport/storport.c index 14cd6c736b8..02aa88a015e 100644 --- a/drivers/storage/port/storport/storport.c +++ b/drivers/storage/port/storport/storport.c @@ -1245,7 +1245,7 @@ StorPortPauseDevice( /* * @implemented */ -/* KeQuerySystemTime is an inline function, +/* KeQuerySystemTime is an inline function, so we cannot forward the export to ntoskrnl */ STORPORT_API VOID diff --git a/drivers/usb/usbaudio/filter.c b/drivers/usb/usbaudio/filter.c index 69e61e77af7..aecac355093 100644 --- a/drivers/usb/usbaudio/filter.c +++ b/drivers/usb/usbaudio/filter.c @@ -68,7 +68,7 @@ USBAudioFilterCreate( PKSFILTER Filter, PIRP Irp); -static KSFILTER_DISPATCH USBAudioFilterDispatch = +static KSFILTER_DISPATCH USBAudioFilterDispatch = { USBAudioFilterCreate, NULL, @@ -579,7 +579,7 @@ BuildUSBAudioFilterTopology( Value |= FeatureUnitDescriptor->bmaControls[Index]; } - + if (Value & 0x01) /* MUTE*/ { NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Type = &KSNODETYPE_MUTE; @@ -1440,7 +1440,7 @@ USBAudioGetStringDescriptor( NTSTATUS USBAudioRegCreateMediaCategoriesKey( - IN PUNICODE_STRING Name, + IN PUNICODE_STRING Name, OUT PHANDLE OutHandle) { NTSTATUS Status; diff --git a/drivers/usb/usbaudio/pin.c b/drivers/usb/usbaudio/pin.c index 350b61375bc..29f3f8d825f 100644 --- a/drivers/usb/usbaudio/pin.c +++ b/drivers/usb/usbaudio/pin.c @@ -198,7 +198,7 @@ USBAudioSelectAudioStreamingInterface( /* selects the interface which has an audio streaming interface descriptor associated to the input / output terminal at the given format index */ while (InterfaceDescriptor != NULL) { - if (InterfaceDescriptor->bInterfaceSubClass == 0x02 /* AUDIO_STREAMING */ && InterfaceDescriptor->bNumEndpoints > 0) + if (InterfaceDescriptor->bInterfaceSubClass == 0x02 /* AUDIO_STREAMING */ && InterfaceDescriptor->bNumEndpoints > 0) { StreamingInterfaceDescriptor = (PUSB_AUDIO_STREAMING_INTERFACE_DESCRIPTOR)USBD_ParseDescriptors(ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, InterfaceDescriptor, USB_AUDIO_CONTROL_TERMINAL_DESCRIPTOR_TYPE); if (StreamingInterfaceDescriptor != NULL) @@ -572,12 +572,12 @@ InitCapturePin( /* initialize irp */ IoInitializeIrp(Irp, IoSizeOfIrp(PinContext->DeviceExtension->LowerDevice->StackSize), PinContext->DeviceExtension->LowerDevice->StackSize); - + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; Irp->Flags = 0; Irp->UserBuffer = NULL; - + IoStack = IoGetNextIrpStackLocation(Irp); IoStack->DeviceObject = PinContext->DeviceExtension->LowerDevice; IoStack->Parameters.Others.Argument2 = NULL; @@ -593,7 +593,7 @@ InitCapturePin( KsAddItemToObjectBag(Pin->Bag, Irp, ExFreePool); /* FIXME select correct pipe handle */ - Status = UsbAudioAllocCaptureUrbIso(PinContext->DeviceExtension->InterfaceInfo->Pipes[0].PipeHandle, + Status = UsbAudioAllocCaptureUrbIso(PinContext->DeviceExtension->InterfaceInfo->Pipes[0].PipeHandle, MaximumPacketSize, &PinContext->Buffer[MaximumPacketSize * PACKET_COUNT * Index], MaximumPacketSize * PACKET_COUNT, diff --git a/drivers/usb/usbaudio/usbaudio.c b/drivers/usb/usbaudio/usbaudio.c index 6118266dacf..ce1e6b83b1a 100644 --- a/drivers/usb/usbaudio/usbaudio.c +++ b/drivers/usb/usbaudio/usbaudio.c @@ -411,8 +411,8 @@ USBAudioPnPSurpriseRemoval( { /* TODO: stop streams */ UNIMPLEMENTED; -} - +} + NTSTATUS NTAPI USBAudioPnPQueryPower( diff --git a/drivers/usb/usbccgp/descriptor.c b/drivers/usb/usbccgp/descriptor.c index 44d1b509b7f..9499a0f2c17 100644 --- a/drivers/usb/usbccgp/descriptor.c +++ b/drivers/usb/usbccgp/descriptor.c @@ -291,7 +291,7 @@ DumpFullConfigurationDescriptor( DbgPrint("Descriptor Type %x Length %lu Offset %lu\n", Descriptor->bDescriptorType, Descriptor->bLength, ((ULONG_PTR)Descriptor - (ULONG_PTR)ConfigurationDescriptor)); // check for invalid descriptors - if (!Descriptor->bLength) + if (!Descriptor->bLength) { DbgPrint("Bogus Descriptor!!!\n"); break; diff --git a/drivers/usb/usbccgp/usbccgp.c b/drivers/usb/usbccgp/usbccgp.c index 387bb7f2efe..235d6f85b70 100644 --- a/drivers/usb/usbccgp/usbccgp.c +++ b/drivers/usb/usbccgp/usbccgp.c @@ -77,7 +77,7 @@ USBCCGP_AddDevice( NTSTATUS NTAPI USBCCGP_CreateClose( - PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT DeviceObject, PIRP Irp) { PCOMMON_DEVICE_EXTENSION DeviceExtension; @@ -110,7 +110,7 @@ USBCCGP_CreateClose( NTSTATUS NTAPI USBCCGP_Dispatch( - PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT DeviceObject, PIRP Irp) { PCOMMON_DEVICE_EXTENSION DeviceExtension; diff --git a/drivers/usb/usbccgp/usbccgp.h b/drivers/usb/usbccgp/usbccgp.h index 640760f7f71..7b50992822b 100644 --- a/drivers/usb/usbccgp/usbccgp.h +++ b/drivers/usb/usbccgp/usbccgp.h @@ -127,14 +127,14 @@ DumpFunctionDescriptor( NTSTATUS FDO_Dispatch( - PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT DeviceObject, PIRP Irp); /* pdo.c */ NTSTATUS PDO_Dispatch( - PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT DeviceObject, PIRP Irp); /* function.c */ diff --git a/drivers/usb/usbehci/hardware.h b/drivers/usb/usbehci/hardware.h index b0dde536e3c..51c6da7e626 100644 --- a/drivers/usb/usbehci/hardware.h +++ b/drivers/usb/usbehci/hardware.h @@ -117,7 +117,7 @@ typedef union _EHCI_USB_STATUS { C_ASSERT(sizeof(EHCI_USB_STATUS) == sizeof(ULONG)); -#define EHCI_INTERRUPT_MASK 0x3F +#define EHCI_INTERRUPT_MASK 0x3F typedef union _EHCI_INTERRUPT_ENABLE { struct { @@ -165,8 +165,8 @@ typedef union _EHCI_PORT_STATUS_CONTROL { C_ASSERT(sizeof(EHCI_PORT_STATUS_CONTROL) == sizeof(ULONG)); /* FRINDEX Frame Index Register */ -#define EHCI_FRINDEX_FRAME_MASK 0x7FF -#define EHCI_FRINDEX_INDEX_MASK 0x3FF +#define EHCI_FRINDEX_FRAME_MASK 0x7FF +#define EHCI_FRINDEX_INDEX_MASK 0x3FF #define EHCI_CONFIG_FLAG_CONFIGURED 1 @@ -177,10 +177,10 @@ typedef struct _EHCI_HW_REGISTERS { ULONG FrameIndex; // R/W (Writes must be DWord Writes) ULONG SegmentSelector; // R/W (Writes must be DWord Writes) ULONG PeriodicListBase; // R/W (Writes must be DWord Writes) - ULONG AsyncListBase; // Read/Write (Writes must be DWord Writes) + ULONG AsyncListBase; // Read/Write (Writes must be DWord Writes) ULONG Reserved[9]; ULONG ConfigFlag; // R/W - EHCI_PORT_STATUS_CONTROL PortControl[15]; // (1-15) RO, R/W, R/WC (field dependent) + EHCI_PORT_STATUS_CONTROL PortControl[15]; // (1-15) RO, R/W, R/WC (field dependent) } EHCI_HW_REGISTERS, *PEHCI_HW_REGISTERS; /* Link Pointer */ diff --git a/drivers/usb/usbhub/debug.c b/drivers/usb/usbhub/debug.c index 7801bd70e2f..5eefd98a7b2 100644 --- a/drivers/usb/usbhub/debug.c +++ b/drivers/usb/usbhub/debug.c @@ -52,7 +52,7 @@ USBHUB_DumpingConfiguration(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDescriptor) Descriptor = (PUSB_COMMON_DESCRIPTOR)ConfigDescriptor; - while ((ULONG_PTR)Descriptor < + while ((ULONG_PTR)Descriptor < ((ULONG_PTR)ConfigDescriptor + ConfigDescriptor->wTotalLength) && Descriptor->bLength) { diff --git a/drivers/usb/usbhub/ioctl.c b/drivers/usb/usbhub/ioctl.c index a9da1f80f26..64ea72b8537 100644 --- a/drivers/usb/usbhub/ioctl.c +++ b/drivers/usb/usbhub/ioctl.c @@ -84,7 +84,7 @@ USBH_SelectConfigOrInterfaceComplete(IN PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI -USBH_PdoUrbFilter(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, +USBH_PdoUrbFilter(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, IN PIRP Irp) { PUSB_CONFIGURATION_DESCRIPTOR ConfigDescriptor; @@ -463,7 +463,7 @@ USBH_PortIdleNotificationCancelRoutine(IN PDEVICE_OBJECT Device, } Status = USBH_AllocateWorkItem(HubExtension, - &HubIoWorkItem, + &HubIoWorkItem, USBH_IdleCancelPowerHubWorker, sizeof(USBHUB_IDLE_PORT_CANCEL_CONTEXT), (PVOID *)&HubWorkItemBuffer, @@ -892,7 +892,7 @@ USBH_IoctlGetNodeConnectionInformation(IN PUSBHUB_FDO_EXTENSION HubExtension, Info->ConnectionStatus = PortData->ConnectionStatus; Info->DeviceIsHub = (PortExtension->PortPdoFlags & - USBHUB_PDO_FLAG_HUB_DEVICE) == + USBHUB_PDO_FLAG_HUB_DEVICE) == USBHUB_PDO_FLAG_HUB_DEVICE; RtlCopyMemory(&Info->DeviceDescriptor, @@ -1139,7 +1139,7 @@ USBH_DeviceControl(IN PUSBHUB_FDO_EXTENSION HubExtension, NTSTATUS Status = STATUS_DEVICE_BUSY; PIO_STACK_LOCATION IoStack; ULONG ControlCode; - BOOLEAN IsCheckHubIdle = FALSE; + BOOLEAN IsCheckHubIdle = FALSE; DPRINT("USBH_DeviceControl: HubExtension - %p, Irp - %p\n", HubExtension, diff --git a/drivers/usb/usbhub/pnp.c b/drivers/usb/usbhub/pnp.c index c16fc287c69..f4d5951f6eb 100644 --- a/drivers/usb/usbhub/pnp.c +++ b/drivers/usb/usbhub/pnp.c @@ -233,7 +233,7 @@ USBH_QueryCapabilities(IN PDEVICE_OBJECT DeviceObject, TRUE); IoStack = IoGetNextIrpStackLocation(Irp); - + IoStack->MajorFunction = IRP_MJ_PNP; IoStack->MinorFunction = IRP_MN_QUERY_CAPABILITIES; @@ -266,7 +266,7 @@ USBH_OpenConfiguration(IN PUSBHUB_FDO_EXTENSION HubExtension) DPRINT("USBH_OpenConfiguration ... \n"); - if (HubExtension->HubFlags & USBHUB_FDO_FLAG_USB20_HUB && + if (HubExtension->HubFlags & USBHUB_FDO_FLAG_USB20_HUB && HubExtension->LowerPDO != HubExtension->RootHubPdo) { Pid = USBD_ParseConfigurationDescriptorEx(HubExtension->HubConfigDescriptor, @@ -1900,7 +1900,7 @@ USBH_PdoQueryDeviceText(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, RtlZeroMemory(Descriptor, MAXIMUM_USB_STRING_LENGTH); for (Status = USBH_CheckDeviceLanguage(DeviceObject, LanguageId); - ; + ; Status = USBH_CheckDeviceLanguage(DeviceObject, DefaultId)) { if (NT_SUCCESS(Status)) @@ -2651,7 +2651,7 @@ USBH_PdoPnP(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, { return Irp->IoStatus.Status; } - + DeviceRelation = ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), USB_HUB_TAG); @@ -2671,7 +2671,7 @@ USBH_PdoPnP(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, { Status = STATUS_INSUFFICIENT_RESOURCES; } - + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelation; break; diff --git a/drivers/usb/usbhub/usbhub.h b/drivers/usb/usbhub/usbhub.h index 5aada11883d..461a193ebf2 100644 --- a/drivers/usb/usbhub/usbhub.h +++ b/drivers/usb/usbhub/usbhub.h @@ -606,7 +606,7 @@ USBD_UnRegisterRootHubCallBack( VOID NTAPI USBH_HubCancelIdleIrp( - IN PUSBHUB_FDO_EXTENSION HubExtension, + IN PUSBHUB_FDO_EXTENSION HubExtension, IN PIRP IdleIrp); BOOLEAN diff --git a/drivers/usb/usbohci/roothub.c b/drivers/usb/usbohci/roothub.c index 3c25dfffe11..63dba314d7b 100644 --- a/drivers/usb/usbohci/roothub.c +++ b/drivers/usb/usbohci/roothub.c @@ -11,7 +11,7 @@ #include OHCI_REG_RH_DESCRIPTORA -NTAPI +NTAPI OHCI_ReadRhDescriptorA(IN POHCI_EXTENSION OhciExtension) { POHCI_OPERATIONAL_REGISTERS OperationalRegs; diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index dbabb3113b0..8ecd23cfc27 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -908,7 +908,7 @@ USBPORT_AbortTransfers(IN PDEVICE_OBJECT FdoDevice, } PUSB2_TT_EXTENSION -NTAPI +NTAPI USBPORT_GetTt(IN PDEVICE_OBJECT FdoDevice, IN PUSBPORT_DEVICE_HANDLE HubDeviceHandle, OUT PUSHORT OutPort, diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index a31443421c6..1a8d77e362c 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -86,7 +86,7 @@ USBPORT_AllocateBandwidth(IN PDEVICE_OBJECT FdoDevice, EndpointProperties = &Endpoint->EndpointProperties; TransferType = EndpointProperties->TransferType; - if (TransferType == USBPORT_TRANSFER_TYPE_BULK || + if (TransferType == USBPORT_TRANSFER_TYPE_BULK || TransferType == USBPORT_TRANSFER_TYPE_CONTROL || Endpoint->Flags & ENDPOINT_FLAG_ROOTHUB_EP0) { @@ -108,7 +108,7 @@ USBPORT_AllocateBandwidth(IN PDEVICE_OBJECT FdoDevice, for (ix = 1; *Bandwidth >= EndpointBandwidth; ix++) { - MinBandwidth = min(MinBandwidth, *Bandwidth); + MinBandwidth = min(MinBandwidth, *Bandwidth); Bandwidth++; @@ -327,7 +327,7 @@ USBPORT_NukeAllEndpoints(IN PDEVICE_OBJECT FdoDevice) KeReleaseSpinLock(&FdoExtension->EndpointListSpinLock, OldIrql); } -ULONG +ULONG NTAPI USBPORT_GetEndpointState(IN PUSBPORT_ENDPOINT Endpoint) { @@ -483,9 +483,9 @@ USBPORT_ValidatePipeHandle(IN PUSBPORT_DEVICE_HANDLE DeviceHandle, CurrentHandle = CONTAINING_RECORD(HandleList, USBPORT_PIPE_HANDLE, PipeLink); - + HandleList = HandleList->Flink; - + if (CurrentHandle == PipeHandle) return TRUE; } diff --git a/drivers/usb/usbport/iface.c b/drivers/usb/usbport/iface.c index 1061915797c..89e07f69ff8 100644 --- a/drivers/usb/usbport/iface.c +++ b/drivers/usb/usbport/iface.c @@ -211,7 +211,7 @@ USBHI_QueryDeviceInformation(IN PVOID BusContext, } } - ActualLength = FIELD_OFFSET(USB_DEVICE_INFORMATION_0, PipeList) + + ActualLength = FIELD_OFFSET(USB_DEVICE_INFORMATION_0, PipeList) + NumberOfOpenPipes * sizeof(USB_PIPE_INFORMATION_0); if (DeviceInfoBufferLen < ActualLength) @@ -254,7 +254,7 @@ USBHI_QueryDeviceInformation(IN PVOID BusContext, return STATUS_SUCCESS; } - DeviceInfo->CurrentConfigurationValue = + DeviceInfo->CurrentConfigurationValue = ConfigHandle->ConfigurationDescriptor->bConfigurationValue; InterfaceEntry = ConfigHandle->InterfaceHandleList.Flink; @@ -281,7 +281,7 @@ USBHI_QueryDeviceInformation(IN PVOID BusContext, } else { - PipeInfo->ScheduleOffset = + PipeInfo->ScheduleOffset = PipeHandle->Endpoint->EndpointProperties.ScheduleOffset; } @@ -346,8 +346,8 @@ USBHI_GetControllerInformation(IN PVOID BusContext, if (ControllerInfoBufferLen >= sizeof(USB_CONTROLLER_INFORMATION_0)) { - InfoBuffer->SelectiveSuspendEnabled = - (FdoExtension->Flags & USBPORT_FLAG_SELECTIVE_SUSPEND) == + InfoBuffer->SelectiveSuspendEnabled = + (FdoExtension->Flags & USBPORT_FLAG_SELECTIVE_SUSPEND) == USBPORT_FLAG_SELECTIVE_SUSPEND; } @@ -403,7 +403,7 @@ USBHI_ControllerSelectiveSuspend(IN PVOID BusContext, if (NT_SUCCESS(Status)) { - if (Enable) + if (Enable) FdoExtension->Flags |= USBPORT_FLAG_SELECTIVE_SUSPEND; else FdoExtension->Flags &= ~USBPORT_FLAG_SELECTIVE_SUSPEND; @@ -715,7 +715,7 @@ USBDI_QueryBusInformation(IN PVOID BusContext, if (Level == 1) { - Length = sizeof(USB_BUS_INFORMATION_LEVEL_1) + + Length = sizeof(USB_BUS_INFORMATION_LEVEL_1) + FdoExtension->CommonExtension.SymbolicLinkName.Length; if (BusInfoActualLen) @@ -899,7 +899,7 @@ USBPORT_PdoQueryInterface(IN PDEVICE_OBJECT FdoDevice, DPRINT1("HandleQueryInterface UNKNOWN INTERFACE GUID: %wZ Version %x\n", &GuidBuffer, IoStack->Parameters.QueryInterface.Version); - + RtlFreeUnicodeString(&GuidBuffer); // Free GUID buffer } } diff --git a/drivers/usb/usbport/pnp.c b/drivers/usb/usbport/pnp.c index b744857c94b..3034de3324b 100644 --- a/drivers/usb/usbport/pnp.c +++ b/drivers/usb/usbport/pnp.c @@ -1011,7 +1011,7 @@ USBPORT_ParseResources(IN PDEVICE_OBJECT FdoDevice, UsbPortResources->ShareVector = InterruptDescriptor->ShareDisposition == CmResourceShareShared; - UsbPortResources->InterruptMode = InterruptDescriptor->Flags == + UsbPortResources->InterruptMode = InterruptDescriptor->Flags == CM_RESOURCE_INTERRUPT_LATCHED; } } diff --git a/drivers/usb/usbport/power.c b/drivers/usb/usbport/power.c index 9fcb2aa5e61..57baa947ebd 100644 --- a/drivers/usb/usbport/power.c +++ b/drivers/usb/usbport/power.c @@ -519,7 +519,7 @@ USBPORT_FdoPower(IN PDEVICE_OBJECT FdoDevice, { Status = USBPORT_SystemPowerState(FdoDevice, Irp); } - + if (Status != STATUS_PENDING) break; diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index e41a7c0620c..1d609addaa7 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -11,7 +11,7 @@ #include static const UCHAR CMASKS[USB2_MICROFRAMES] = { - 0x1C, 0x38, 0x70, 0xE0, 0xC1, 0x83, 0x07, 0x0E + 0x1C, 0x38, 0x70, 0xE0, 0xC1, 0x83, 0x07, 0x0E }; BOOLEAN @@ -389,7 +389,7 @@ USB2_AllocateHS(IN PUSB2_TT_ENDPOINT TtEndpoint, Result = FALSE; } - if (Tt->NumStartSplits[frame][uframe] > + if (Tt->NumStartSplits[frame][uframe] > (USB2_MAX_FS_LS_TRANSACTIONS_IN_UFRAME - 1)) { DPRINT1("USB2_AllocateHS: Num Start Splits - %X\n", @@ -994,7 +994,7 @@ USB2_Rebalance(IN PDEVICE_OBJECT FdoDevice, case USBPORT_TRANSFER_TYPE_INTERRUPT: if (SMask != EndpointProperties->InterruptScheduleMask || - CMask != EndpointProperties->SplitCompletionMask || + CMask != EndpointProperties->SplitCompletionMask || ScheduleOffset != EndpointProperties->ScheduleOffset || ActualPeriod != EndpointProperties->Period) { diff --git a/drivers/usb/usbport/usbport.c b/drivers/usb/usbport/usbport.c index 6fc6d6f155e..cb33998a762 100644 --- a/drivers/usb/usbport/usbport.c +++ b/drivers/usb/usbport/usbport.c @@ -139,7 +139,7 @@ USBPORT_FindCompanionControllers(IN PDEVICE_OBJECT USB2FdoDevice, { PLIST_ENTRY USB1FdoList; PUSBPORT_DEVICE_EXTENSION USB1FdoExtension; - ULONG NumControllers = 0; + ULONG NumControllers = 0; PDEVICE_OBJECT * Entry; PDEVICE_RELATIONS ControllersList = NULL; KIRQL OldIrql; @@ -1476,7 +1476,7 @@ USBPORT_SynchronizeControllersStart(IN PDEVICE_OBJECT FdoDevice) PUSBPORT_RHDEVICE_EXTENSION PdoExtension; PDEVICE_OBJECT USB2FdoDevice = NULL; PUSBPORT_DEVICE_EXTENSION USB2FdoExtension; - BOOLEAN IsOn; + BOOLEAN IsOn; DPRINT_TIMER("USBPORT_SynchronizeControllersStart: FdoDevice - %p\n", FdoDevice); @@ -1825,7 +1825,7 @@ USBPORT_FindMiniPort(IN PDRIVER_OBJECT DriverObject) return MiniPortInterface; else return NULL; - + } NTSTATUS diff --git a/drivers/usb/usbport/usbport.h b/drivers/usb/usbport/usbport.h index 9240c64545c..286ea9d5c82 100644 --- a/drivers/usb/usbport/usbport.h +++ b/drivers/usb/usbport/usbport.h @@ -962,7 +962,7 @@ USBPORT_SetEndpointState( IN PUSBPORT_ENDPOINT Endpoint, IN ULONG State); -ULONG +ULONG NTAPI USBPORT_GetEndpointState( IN PUSBPORT_ENDPOINT Endpoint); diff --git a/drivers/usb/usbstor/queue.c b/drivers/usb/usbstor/queue.c index ba36022f4ba..0c429ef32c7 100644 --- a/drivers/usb/usbstor/queue.c +++ b/drivers/usb/usbstor/queue.c @@ -60,7 +60,7 @@ USBSTOR_Cancel( KeAcquireSpinLockAtDpcLevel(&FDODeviceExtension->IrpListLock); RemoveEntryList(&Irp->Tail.Overlay.ListEntry); - KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); + KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); IoReleaseCancelSpinLock(Irp->CancelIrql); Irp->IoStatus.Status = STATUS_CANCELLED; @@ -291,7 +291,7 @@ USBSTOR_QueueRelease( IoStartPacket(DeviceObject, Irp, - &Request->QueueSortKey, + &Request->QueueSortKey, USBSTOR_CancelIo); } diff --git a/drivers/usb/usbstor_new/disk.c b/drivers/usb/usbstor_new/disk.c index 7dc4438cdc4..87741059118 100644 --- a/drivers/usb/usbstor_new/disk.c +++ b/drivers/usb/usbstor_new/disk.c @@ -607,7 +607,7 @@ USBSTOR_HandleDeviceControl( { Status = STATUS_INSUFFICIENT_RESOURCES; } - } + } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_INQUIRY_DATA) { // @@ -623,7 +623,7 @@ USBSTOR_HandleDeviceControl( BusInfo = Irp->AssociatedIrp.SystemBuffer; InquiryData = (PSCSI_INQUIRY_DATA)(BusInfo + 1); ScsiInquiryData = (PINQUIRYDATA)InquiryData->InquiryData; - + // // get inquiry data diff --git a/drivers/usb/usbstor_new/queue.c b/drivers/usb/usbstor_new/queue.c index a945ab97c95..22c20d4ff63 100644 --- a/drivers/usb/usbstor_new/queue.c +++ b/drivers/usb/usbstor_new/queue.c @@ -60,7 +60,7 @@ USBSTOR_CancelIo( // // this IRP isn't in our list here - // + // // // now release the cancel lock @@ -116,7 +116,7 @@ USBSTOR_Cancel( // // release irp list lock // - KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); + KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); // // now release the cancel lock @@ -532,7 +532,7 @@ USBSTOR_QueueRelease( // IoStartPacket(DeviceObject, Irp, - &Request->QueueSortKey, + &Request->QueueSortKey, USBSTOR_CancelIo); } diff --git a/drivers/usb/usbuhci/hardware.h b/drivers/usb/usbuhci/hardware.h index db253eac0cf..d54e2f0a2e5 100644 --- a/drivers/usb/usbuhci/hardware.h +++ b/drivers/usb/usbuhci/hardware.h @@ -26,22 +26,22 @@ /* LEGSUP Legacy support register (PCI Configuration - Function 2) */ typedef union _UHCI_PCI_LEGSUP { struct { - USHORT Smi60Read : 1; // (60REN) Trap/SMI On 60h Read Enable. R/W. - USHORT Smi60Write : 1; // (60WEN) Trap/SMI On 60h Write Enable. R/W. - USHORT Smi64Read : 1; // (64REN) Trap/SMI On 64h Read Enable. R/W. - USHORT Smi64Write : 1; // (64WEN) Trap/SMI On 64h Write Enable. R/W. + USHORT Smi60Read : 1; // (60REN) Trap/SMI On 60h Read Enable. R/W. + USHORT Smi60Write : 1; // (60WEN) Trap/SMI On 60h Write Enable. R/W. + USHORT Smi64Read : 1; // (64REN) Trap/SMI On 64h Read Enable. R/W. + USHORT Smi64Write : 1; // (64WEN) Trap/SMI On 64h Write Enable. R/W. USHORT SmiIrq : 1; // (USBSMIEN) Trap/SMI ON IRQ Enable. R/W. - USHORT A20Gate : 1; // (A20PTEN) A20Gate Pass Through Enable. R/W. + USHORT A20Gate : 1; // (A20PTEN) A20Gate Pass Through Enable. R/W. USHORT PassThroughStatus : 1; // (PSS) Pass Through Status. RO. USHORT SmiEndPassThrough : 1; // (SMIEPTE) SMI At End Of Pass Through Enable. R/W. - USHORT TrapBy60ReadStatus : 1; // (TBY60R) Trap By 60h Read Status. R/WC. + USHORT TrapBy60ReadStatus : 1; // (TBY60R) Trap By 60h Read Status. R/WC. USHORT TrapBy60WriteStatus : 1; // (TBY60W) Trap By 60h Write Status. R/WC. - USHORT TrapBy64ReadStatus : 1; // (TBY64R) Trap By 64h Read Status. R/WC. + USHORT TrapBy64ReadStatus : 1; // (TBY64R) Trap By 64h Read Status. R/WC. USHORT TrapBy64WriteStatus : 1; // (TBY64W) Trap By 64h Write Status. R/WC. USHORT UsbIrqStatus : 1; // (USBIRQS) USB IRQ Status. RO. USHORT UsbPIRQ : 1; // (USBPIRQDEN) USB PIRQ Enable. R/W. USHORT Reserved : 1; - USHORT EndA20GateStatus : 1; // (A20PTS) End OF A20GATE Pass Through Status. R/WC. + USHORT EndA20GateStatus : 1; // (A20PTS) End OF A20GATE Pass Through Status. R/WC. }; USHORT AsUSHORT; } UHCI_PCI_LEGSUP; @@ -99,9 +99,9 @@ typedef union _UHCI_INTERRUPT_ENABLE { C_ASSERT(sizeof(UHCI_INTERRUPT_ENABLE) == sizeof(USHORT)); /* FRNUM Frame Number register */ -#define UHCI_FRNUM_FRAME_MASK 0x7FF -#define UHCI_FRNUM_INDEX_MASK 0x3FF -#define UHCI_FRNUM_OVERFLOW_LIST 0x400 +#define UHCI_FRNUM_FRAME_MASK 0x7FF +#define UHCI_FRNUM_INDEX_MASK 0x3FF +#define UHCI_FRNUM_OVERFLOW_LIST 0x400 /* PORTSC(1|2) USB port status and control registers */ typedef union _UHCI_PORT_STATUS_CONTROL { diff --git a/drivers/usb/usbuhci/usbuhci.h b/drivers/usb/usbuhci/usbuhci.h index e5d6ab584aa..fec3cf3ef16 100644 --- a/drivers/usb/usbuhci/usbuhci.h +++ b/drivers/usb/usbuhci/usbuhci.h @@ -56,7 +56,7 @@ typedef struct _UHCI_HCD_TD { struct { ULONG Frame; ULONG Pad2; - }; + }; #endif } DUMMYUNIONNAME; LIST_ENTRY TdLink; @@ -129,10 +129,10 @@ typedef struct _UHCI_TRANSFER { SIZE_T TransferLen; } UHCI_TRANSFER, *PUHCI_TRANSFER; -#define UHCI_FRAME_LIST_POINTER_VALID (0 << 0) -#define UHCI_FRAME_LIST_POINTER_TERMINATE (1 << 0) -#define UHCI_FRAME_LIST_POINTER_TD (0 << 1) -#define UHCI_FRAME_LIST_POINTER_QH (1 << 1) +#define UHCI_FRAME_LIST_POINTER_VALID (0 << 0) +#define UHCI_FRAME_LIST_POINTER_TERMINATE (1 << 0) +#define UHCI_FRAME_LIST_POINTER_TD (0 << 1) +#define UHCI_FRAME_LIST_POINTER_QH (1 << 1) #define UHCI_FRAME_LIST_INDEX_MASK 0x3FF #define UHCI_MAX_STATIC_SOF_TDS 8 diff --git a/drivers/wdm/audio/backpln/audio_test/audio_test.c b/drivers/wdm/audio/backpln/audio_test/audio_test.c index cd2fc11a8d8..cdc4cdd1b76 100644 --- a/drivers/wdm/audio/backpln/audio_test/audio_test.c +++ b/drivers/wdm/audio/backpln/audio_test/audio_test.c @@ -39,7 +39,7 @@ TestKs() PKSPROPERTY Property; KSSTATE State; DWORD Length; - HANDLE FilterHandle; + HANDLE FilterHandle; HANDLE PinHandle; PSHORT SoundBuffer; UINT i = 0; @@ -364,7 +364,7 @@ main(int argc, char* argv[]) return -1; } } - + // // Play our 1-second buffer // diff --git a/drivers/wdm/audio/backpln/portcls/adapter.cpp b/drivers/wdm/audio/backpln/portcls/adapter.cpp index ba9d911cc94..0b5e87d7795 100644 --- a/drivers/wdm/audio/backpln/portcls/adapter.cpp +++ b/drivers/wdm/audio/backpln/portcls/adapter.cpp @@ -96,7 +96,7 @@ PcAddAdapterDevice( // check if the DeviceExtensionSize is provided if ( DeviceExtensionSize < PORT_CLASS_DEVICE_EXTENSION_SIZE ) { - // driver does not need a device extension + // driver does not need a device extension if ( DeviceExtensionSize != 0 ) { // DeviceExtensionSize must be zero @@ -278,7 +278,7 @@ PcRegisterSubdevice( { // FIXME // check if reference string with that name already exists - + Status = IoRegisterDeviceInterface(DeviceExt->PhysicalDeviceObject, &SubDeviceDescriptor->Interfaces[Index], &RefName, diff --git a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp index df1b52ae3de..3d86166c82f 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp @@ -145,7 +145,7 @@ CPortFilterDMus::DeviceIoControl( if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); - + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -339,7 +339,7 @@ CPortFilterDMus::NotifyPins() } -NTSTATUS +NTSTATUS NewPortFilterDMus( OUT PPORTFILTERDMUS * OutFilter) { diff --git a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp index 6855faff01a..8acf5fed4dd 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_topology.cpp @@ -102,7 +102,7 @@ CPortFilterTopology::DeviceIoControl( if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); - + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -273,7 +273,7 @@ CPortFilterTopology::Init( return STATUS_SUCCESS; } -NTSTATUS +NTSTATUS NewPortFilterTopology( OUT IPortFilterTopology ** OutFilter) { diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp index 86ab93fc7c8..29c9512a734 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp @@ -100,7 +100,7 @@ CPortFilterWaveCyclic::NewIrpTarget( return STATUS_UNSUCCESSFUL; } - if (m_Pins[ConnectDetails->PinId] && + if (m_Pins[ConnectDetails->PinId] && (m_Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount == m_Descriptor->Factory.Instances[ConnectDetails->PinId].MaxFilterInstanceCount)) { // release existing instance @@ -148,7 +148,7 @@ CPortFilterWaveCyclic::DeviceIoControl( if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); - + Irp->IoStatus.Status = STATUS_NOT_FOUND; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -350,7 +350,7 @@ CPortFilterWaveCyclic::FreePin( } -NTSTATUS +NTSTATUS NewPortFilterWaveCyclic( OUT IPortFilterWaveCyclic ** OutFilter) { diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp index cdc4be6887a..5c5d262956f 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp @@ -102,7 +102,7 @@ CPortFilterWavePci::NewIrpTarget( return STATUS_UNSUCCESSFUL; } - if (m_Pins[ConnectDetails->PinId] && + if (m_Pins[ConnectDetails->PinId] && (m_Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount == m_Descriptor->Factory.Instances[ConnectDetails->PinId].MaxFilterInstanceCount)) { // no available instance @@ -151,7 +151,7 @@ CPortFilterWavePci::DeviceIoControl( if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); - + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -332,7 +332,7 @@ CPortFilterWavePci::FreePin( } -NTSTATUS +NTSTATUS NewPortFilterWavePci( OUT IPortFilterWavePci ** OutFilter) { diff --git a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp index f38a8960b56..f421c2876e3 100644 --- a/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp @@ -154,7 +154,7 @@ CPortFilterWaveRT::DeviceIoControl( if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); - + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -316,7 +316,7 @@ CPortFilterWaveRT::Init( return STATUS_SUCCESS; } -NTSTATUS +NTSTATUS NewPortFilterWaveRT( OUT IPortFilterWaveRT ** OutFilter) { diff --git a/drivers/wdm/audio/backpln/portcls/interrupt.cpp b/drivers/wdm/audio/backpln/portcls/interrupt.cpp index d0705a0ceaa..05f66253baf 100644 --- a/drivers/wdm/audio/backpln/portcls/interrupt.cpp +++ b/drivers/wdm/audio/backpln/portcls/interrupt.cpp @@ -126,7 +126,7 @@ CInterruptSync::CallSynchronizedRoutine( KIRQL OldIrql; DPRINT("CInterruptSync::CallSynchronizedRoutine this %p Routine %p DynamicContext %p Irql %x Interrupt %p\n", this, Routine, DynamicContext, KeGetCurrentIrql(), m_Interrupt); - + if (!m_Interrupt) { DPRINT("CInterruptSync_CallSynchronizedRoutine %p no interrupt connected\n", this); @@ -330,7 +330,7 @@ PcNewInterruptSync( CInterruptSync * This; NTSTATUS Status; - DPRINT("PcNewInterruptSync entered OutInterruptSync %p OuterUnknown %p ResourceList %p ResourceIndex %u Mode %d\n", + DPRINT("PcNewInterruptSync entered OutInterruptSync %p OuterUnknown %p ResourceList %p ResourceIndex %u Mode %d\n", OutInterruptSync, OuterUnknown, ResourceList, ResourceIndex, Mode); if (!OutInterruptSync || !ResourceList || Mode < InterruptSyncModeNormal || Mode > InterruptSyncModeRepeat) diff --git a/drivers/wdm/audio/backpln/portcls/irpstream.cpp b/drivers/wdm/audio/backpln/portcls/irpstream.cpp index b435bf56c17..572117e27d3 100644 --- a/drivers/wdm/audio/backpln/portcls/irpstream.cpp +++ b/drivers/wdm/audio/backpln/portcls/irpstream.cpp @@ -640,7 +640,7 @@ CIrpQueue::ReleaseMappingWithTag( for(Index = 0; Index < StreamData->StreamHeaderIndex; Index++) { // check if it is the same tag - if ((StreamData->Tags[Index].Tag == Tag) && + if ((StreamData->Tags[Index].Tag == Tag) && (StreamData->Tags[Index].Used != FALSE)) { // mark mapping as released diff --git a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp index 957c84cf7ba..1f28043738b 100644 --- a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp @@ -61,7 +61,7 @@ const ULONG kMPUInputBufferSize = 128; /***************************************************************************** * CMiniportDMusUART ***************************************************************************** - * MPU-401 miniport. This object is associated with the device and is + * MPU-401 miniport. This object is associated with the device and is * created when the device is started. The class inherits IMiniportDMus * so it can expose this interface and CUnknown so it automatically gets * reference counting and aggregation support. @@ -128,11 +128,11 @@ public: /************************************************************************* * IMiniport methods */ - STDMETHODIMP_(NTSTATUS) + STDMETHODIMP_(NTSTATUS) GetDescription ( OUT PPCFILTER_DESCRIPTOR * OutFilterDescriptor ); - STDMETHODIMP_(NTSTATUS) + STDMETHODIMP_(NTSTATUS) DataRangeIntersection ( IN ULONG PinId , IN PKSDATARANGE DataRange @@ -183,14 +183,14 @@ public: IMP_IPowerNotify; /************************************************************************* - * Friends + * Friends */ friend class CMiniportDMusUARTStream; friend NTSTATUS NTAPI DMusMPUInterruptServiceRoutine(PINTERRUPTSYNC InterruptSync,PVOID DynamicContext); friend NTSTATUS NTAPI SynchronizedDMusMPUWrite(PINTERRUPTSYNC InterruptSync,PVOID syncWriteContext); - friend VOID NTAPI + friend VOID NTAPI DMusUARTTimerDPC(PKDPC Dpc,PVOID DeferredContext,PVOID SystemArgument1,PVOID SystemArgument2); friend NTSTATUS NTAPI PropertyHandler_Synth(IN PPCPROPERTY_REQUEST PropertyRequest); friend STDMETHODIMP_(NTSTATUS) SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream); @@ -219,7 +219,7 @@ private: ULONG m_NumberOfRetries; // Number of consecutive times the h/w was busy/full ULONG m_DMKEvtOffset; // offset into the event KDPC m_Dpc; // DPC for timer - KTIMER m_TimerEvent; // timer + KTIMER m_TimerEvent; // timer BOOL m_TimerQueued; // whether a timer has been set KSPIN_LOCK m_DpcSpinLock; // protects the ConsumeEvents DPC @@ -709,20 +709,20 @@ InitMPU { return STATUS_INVALID_PARAMETER_2; } - + PUCHAR portBase = PUCHAR(DynamicContext); UCHAR status; ULONGLONG startTime; BOOLEAN success; NTSTATUS ntStatus = STATUS_SUCCESS; - + // // Reset the card (puts it into "smart mode") // ntStatus = WriteMPU(portBase,COMMAND,MPU401_CMD_RESET); // wait for the acknowledgement - // NOTE: When the Ack arrives, it will trigger an interrupt. + // NOTE: When the Ack arrives, it will trigger an interrupt. // Normally the DPC routine would read in the ack byte and we // would never see it, however since we have the hardware locked (HwEnter), // we can read the port before the DPC can and thus we receive the Ack. @@ -731,11 +731,11 @@ InitMPU while(PcGetTimeInterval(startTime) < GTI_MILLISECONDS(50)) { status = READ_PORT_UCHAR(portBase + MPU401_REG_STATUS); - + if (UartFifoOkForRead(status)) // Is data waiting? { - READ_PORT_UCHAR(portBase + MPU401_REG_DATA); // yep.. read ACK - success = TRUE; // don't need to do more + READ_PORT_UCHAR(portBase + MPU401_REG_DATA); // yep.. read ACK + success = TRUE; // don't need to do more break; } KeStallExecutionProcessor(25); // microseconds @@ -769,14 +769,14 @@ InitMPU KeStallExecutionProcessor(25); } - if ((0xFE != dataByte) || !success) // Did we succeed? If no second ACK, something is hosed - { + if ((0xFE != dataByte) || !success) // Did we succeed? If no second ACK, something is hosed + { DPRINT("Second attempt to reset the MPU didn't get ACKed.\n"); DPRINT("Init Reset failure error. Ack = %X", ULONG(dataByte)); ntStatus = STATUS_IO_DEVICE_ERROR; } - + return ntStatus; } @@ -891,7 +891,7 @@ SynchronizedDMusMPUWrite // (we never wait on a byte. Better to come back later) /*readStatus = */ DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport)); while ( (*(context->BytesRead) < context->Length) - && ( TryMPU(context->PortBase) + && ( TryMPU(context->PortBase) || (*(context->BytesRead)%3) ) ) { @@ -939,7 +939,7 @@ TryMPU while (numPolls < kMPUPollTimeout) { status = READ_PORT_UCHAR(PortBase + MPU401_REG_STATUS); - + if (UartFifoOkForWrite(status)) // Is this a good time to write data? { break; @@ -992,7 +992,7 @@ WriteMPU } ULONGLONG startTime = PcGetTimeInterval(0); - + while (PcGetTimeInterval(startTime) < GTI_MILLISECONDS(50)) { UCHAR status @@ -1017,11 +1017,11 @@ WriteMPU * SnapTimeStamp() ***************************************************************************** * - * At synchronized execution to ISR, copy miniport's volatile m_InputTimeStamp + * At synchronized execution to ISR, copy miniport's volatile m_InputTimeStamp * to stream's m_SnapshotTimeStamp and zero m_InputTimeStamp. * */ -STDMETHODIMP_(NTSTATUS) +STDMETHODIMP_(NTSTATUS) SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream) { CMiniportDMusUARTStream *pMPStream = (CMiniportDMusUARTStream *)pStream; @@ -1030,7 +1030,7 @@ SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream) pMPStream->m_SnapshotTimeStamp = pMPStream->m_pMiniport->m_InputTimeStamp; // if the window is closed, zero the timestamp - if (pMPStream->m_pMiniport->m_MPUInputBufferHead == + if (pMPStream->m_pMiniport->m_MPUInputBufferHead == pMPStream->m_pMiniport->m_MPUInputBufferTail) { pMPStream->m_pMiniport->m_InputTimeStamp = 0; @@ -1177,11 +1177,11 @@ DMusMPUInterruptServiceRoutine if (UartFifoOkForRead(portStatus) && that->m_pPort) { startTime = PcGetTimeInterval(0); - while ( (PcGetTimeInterval(startTime) < GTI_MILLISECONDS(50)) + while ( (PcGetTimeInterval(startTime) < GTI_MILLISECONDS(50)) && (UartFifoOkForRead(portStatus)) ) { UCHAR uDest = READ_PORT_UCHAR(that->m_pPortBase + MPU401_REG_DATA); - if ( (that->m_KSStateInput == KSSTATE_RUN) + if ( (that->m_KSStateInput == KSSTATE_RUN) && (that->m_NumCaptureStreams) ) { @@ -1205,13 +1205,13 @@ DMusMPUInterruptServiceRoutine // ...place the data in our FIFO... that->m_MPUInputBuffer[that->m_MPUInputBufferTail] = uDest; ASSERT(that->m_MPUInputBufferTail < kMPUInputBufferSize); - + that->m_MPUInputBufferTail++; if (that->m_MPUInputBufferTail >= kMPUInputBufferSize) { that->m_MPUInputBufferTail = 0; } - } + } } // // Look for more MIDI data. diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index 31d787d08b0..56eba19a438 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -177,7 +177,7 @@ KSPROPERTY_SET PinWaveCyclicPropertySet[] = } }; -KSEVENT_SET PinWaveCyclicEventSet[] = +KSEVENT_SET PinWaveCyclicEventSet[] = { { &KSEVENTSETID_LoopedStreaming, @@ -202,7 +202,7 @@ CPortPinWaveCyclic::QueryInterface( { DPRINT("IServiceSink_fnQueryInterface entered\n"); - if (IsEqualGUIDAligned(refiid, IID_IIrpTarget) || + if (IsEqualGUIDAligned(refiid, IID_IIrpTarget) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNKNOWN((IIrpTarget*)this)); @@ -244,10 +244,10 @@ PinWaveCyclicAddEndOfStreamEvent( PSUBDEVICE_DESCRIPTOR Descriptor; CPortPinWaveCyclic *Pin; - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); PC_ASSERT_IRQL(DISPATCH_LEVEL); @@ -280,10 +280,10 @@ PinWaveCyclicAddLoopedStreamEvent( PSUBDEVICE_DESCRIPTOR Descriptor; CPortPinWaveCyclic *Pin; - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); PC_ASSERT_IRQL(DISPATCH_LEVEL); @@ -319,10 +319,10 @@ PinWaveCyclicAllocatorFraming( CPortPinWaveCyclic *Pin; PSUBDEVICE_DESCRIPTOR Descriptor; - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); PC_ASSERT_IRQL(DISPATCH_LEVEL); @@ -355,10 +355,10 @@ PinWaveCyclicAudioPosition( PSUBDEVICE_DESCRIPTOR Descriptor; PKSAUDIO_POSITION Position; - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); PC_ASSERT_IRQL(DISPATCH_LEVEL); @@ -460,10 +460,10 @@ PinWaveCyclicState( PSUBDEVICE_DESCRIPTOR Descriptor; PKSSTATE State = (PKSSTATE)Data; - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); PC_ASSERT_IRQL(DISPATCH_LEVEL); @@ -535,10 +535,10 @@ PinWaveCyclicDataFormat( // get current irp stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp index 263df56088e..3ad941270f7 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp @@ -124,10 +124,10 @@ PinWavePciAllocatorFraming( CPortPinWavePci *Pin; PSUBDEVICE_DESCRIPTOR Descriptor; - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); PC_ASSERT_IRQL(DISPATCH_LEVEL); @@ -159,10 +159,10 @@ PinWavePciAudioPosition( CPortPinWavePci *Pin; PSUBDEVICE_DESCRIPTOR Descriptor; - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); PC_ASSERT_IRQL(DISPATCH_LEVEL); @@ -203,10 +203,10 @@ PinWavePciState( ULONG MappingsRevoked; PKSSTATE State = (PKSSTATE)Data; - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); PC_ASSERT_IRQL(DISPATCH_LEVEL); @@ -290,10 +290,10 @@ PinWavePciDataFormat( // get current irp stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - // get sub device descriptor + // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - // sanity check + // sanity check PC_ASSERT(Descriptor); PC_ASSERT(Descriptor->PortPin); @@ -401,7 +401,7 @@ CPortPinWavePci::QueryInterface( { //DPRINT("CPortPinWavePci::QueryInterface entered\n"); - if (IsEqualGUIDAligned(refiid, IID_IIrpTarget) || + if (IsEqualGUIDAligned(refiid, IID_IIrpTarget) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNKNOWN((IIrpTarget*)this)); @@ -514,7 +514,7 @@ CPortPinWavePci::HandleKsProperty( if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { //DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); - + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp index 11ff57ab330..fcdfd1ce812 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp @@ -96,7 +96,7 @@ CPortPinWaveRT::QueryInterface( { DPRINT("IServiceSink_fnQueryInterface entered\n"); - if (IsEqualGUIDAligned(refiid, IID_IIrpTarget) || + if (IsEqualGUIDAligned(refiid, IID_IIrpTarget) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNKNOWN((IIrpTarget*)this)); @@ -309,7 +309,7 @@ CPortPinWaveRT::DeviceIoControl( { case IOCTL_KS_PROPERTY: return HandleKsProperty(Irp); - + case IOCTL_KS_ENABLE_EVENT: /* FIXME UNIMPLEMENTED */ UNIMPLEMENTED_ONCE; @@ -334,11 +334,11 @@ CPortPinWaveRT::DeviceIoControl( /* FIXME UNIMPLEMENTED */ UNIMPLEMENTED_ONCE; break; - + case IOCTL_KS_WRITE_STREAM: case IOCTL_KS_READ_STREAM: return HandleKsStream(Irp); - + default: return KsDefaultDeviceIoCompletion(DeviceObject, Irp); } diff --git a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp index 85ad4227855..7eb94d2d6ec 100644 --- a/drivers/wdm/audio/backpln/portcls/port_dmus.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_dmus.cpp @@ -61,7 +61,7 @@ protected: }; -static GUID InterfaceGuids[3] = +static GUID InterfaceGuids[3] = { { /// KS_CATEGORY_AUDIO @@ -268,12 +268,12 @@ CPortDMus::Init( } // create the subdevice descriptor - Status = PcCreateSubdeviceDescriptor(&m_SubDeviceDescriptor, + Status = PcCreateSubdeviceDescriptor(&m_SubDeviceDescriptor, 3, - InterfaceGuids, - 0, + InterfaceGuids, + 0, NULL, - 2, + 2, PortDMusPropertySet, 0, 0, @@ -398,7 +398,7 @@ CPortDMus::NewIrpTarget( IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, + IN PIRP Irp, IN KSOBJECT_CREATE *CreateObject) { NTSTATUS Status; @@ -499,8 +499,8 @@ CPortDMus::PinCount( } // FIXME - // scan filter descriptor - + // scan filter descriptor + return STATUS_UNSUCCESSFUL; } @@ -531,7 +531,7 @@ NewPortDMus( VOID GetDMusMiniport( - IN IPortDMus * iface, + IN IPortDMus * iface, IN PMINIPORTDMUS * Miniport, IN PMINIPORTMIDI * MidiMiniport) { diff --git a/drivers/wdm/audio/backpln/portcls/port_topology.cpp b/drivers/wdm/audio/backpln/portcls/port_topology.cpp index 6758554bd6a..2c5cf4333fa 100644 --- a/drivers/wdm/audio/backpln/portcls/port_topology.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_topology.cpp @@ -61,7 +61,7 @@ protected: }; -static GUID InterfaceGuids[2] = +static GUID InterfaceGuids[2] = { { /// KS_CATEGORY_AUDIO @@ -263,9 +263,9 @@ CPortTopology::Init( Status = PcCreateSubdeviceDescriptor(&m_SubDeviceDescriptor, 2, InterfaceGuids, - 0, + 0, NULL, - 2, + 2, TopologyPropertySet, 0, 0, @@ -305,7 +305,7 @@ CPortTopology::NewRegistryKey( DPRINT("IPortTopology_fnNewRegistryKey called w/o initialized\n"); return STATUS_UNSUCCESSFUL; } - return PcNewRegistryKey(OutRegistryKey, + return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, @@ -328,7 +328,7 @@ CPortTopology::NewIrpTarget( IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, + IN PIRP Irp, IN KSOBJECT_CREATE *CreateObject) { NTSTATUS Status; @@ -446,8 +446,8 @@ CPortTopology::PinCount( } // FIXME - // scan filter descriptor - + // scan filter descriptor + return STATUS_UNSUCCESSFUL; } @@ -549,7 +549,7 @@ PcCreateItemDispatch( } #endif - // get filter object + // get filter object Status = SubDevice->NewIrpTarget(&Filter, NULL, NULL, diff --git a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp index 9a3178b97e5..f7c0afcb30c 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp @@ -61,7 +61,7 @@ protected: GUID KSPROPERTY_SETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -static GUID InterfaceGuids[4] = +static GUID InterfaceGuids[4] = { { //KS_CATEGORY_AUDIO @@ -544,8 +544,8 @@ CPortWaveCyclic::PinCount( } // FIXME - // scan filter descriptor - + // scan filter descriptor + return STATUS_UNSUCCESSFUL; } diff --git a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp index 5073642a8dc..0186258c328 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp @@ -66,7 +66,7 @@ protected: }; -static GUID InterfaceGuids[3] = +static GUID InterfaceGuids[3] = { { /// KS_CATEGORY_AUDIO @@ -233,7 +233,7 @@ CPortWavePci::Init( PPINCOUNT PinCount; PPOWERNOTIFY PowerNotify; - DPRINT("IPortWavePci_fnInit entered with This %p, DeviceObject %p Irp %p UnknownMiniport %p, UnknownAdapter %p ResourceList %p\n", + DPRINT("IPortWavePci_fnInit entered with This %p, DeviceObject %p Irp %p UnknownMiniport %p, UnknownAdapter %p ResourceList %p\n", this, DeviceObject, Irp, UnknownMiniport, UnknownAdapter, ResourceList); PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -274,12 +274,12 @@ CPortWavePci::Init( } // create the subdevice descriptor - Status = PcCreateSubdeviceDescriptor(&m_SubDeviceDescriptor, + Status = PcCreateSubdeviceDescriptor(&m_SubDeviceDescriptor, 3, InterfaceGuids, - 0, + 0, NULL, - 2, + 2, WavePciPropertySet, 0, 0, @@ -347,7 +347,7 @@ CPortWavePci::NewRegistryKey( DPRINT("IPortWavePci_fnNewRegistryKey entered\n"); PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - return PcNewRegistryKey(OutRegistryKey, + return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, @@ -428,7 +428,7 @@ CPortWavePci::NewIrpTarget( IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, + IN PIRP Irp, IN KSOBJECT_CREATE *CreateObject) { NTSTATUS Status; @@ -528,8 +528,8 @@ CPortWavePci::PinCount( } // FIXME - // scan filter descriptor - + // scan filter descriptor + return STATUS_UNSUCCESSFUL; } diff --git a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp index 43cd72ada13..06e97c95b9c 100644 --- a/drivers/wdm/audio/backpln/portcls/port_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/port_wavert.cpp @@ -61,7 +61,7 @@ protected: LONG m_Ref; }; -static GUID InterfaceGuids[3] = +static GUID InterfaceGuids[3] = { { /// KS_CATEGORY_AUDIO @@ -269,12 +269,12 @@ CPortWaveRT::Init( } // create the subdevice descriptor - Status = PcCreateSubdeviceDescriptor(&m_SubDeviceDescriptor, + Status = PcCreateSubdeviceDescriptor(&m_SubDeviceDescriptor, 3, InterfaceGuids, - 0, + 0, NULL, - 2, + 2, WaveRTPropertySet, 0, 0, @@ -454,7 +454,7 @@ CPortWaveRT::PinCount( // FIXME // scan filter descriptor - + return STATUS_UNSUCCESSFUL; } diff --git a/drivers/wdm/audio/backpln/portcls/power.cpp b/drivers/wdm/audio/backpln/portcls/power.cpp index 24862211b8d..17bfceca966 100644 --- a/drivers/wdm/audio/backpln/portcls/power.cpp +++ b/drivers/wdm/audio/backpln/portcls/power.cpp @@ -54,7 +54,7 @@ PcUnregisterAdapterPowerManagement( IN PDEVICE_OBJECT DeviceObject) { PPCLASS_DEVICE_EXTENSION DeviceExt; - + DPRINT("PcUnregisterAdapterPowerManagement pUnknown %p pvContext %p\n", DeviceObject); PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); diff --git a/drivers/wdm/audio/backpln/portcls/purecall.cpp b/drivers/wdm/audio/backpln/portcls/purecall.cpp index d09cd6891bc..6f078cc9191 100644 --- a/drivers/wdm/audio/backpln/portcls/purecall.cpp +++ b/drivers/wdm/audio/backpln/portcls/purecall.cpp @@ -15,7 +15,7 @@ #include extern "C" { - void + void __cxa_pure_virtual() { // put error handling here diff --git a/drivers/wdm/audio/backpln/portcls/resource.cpp b/drivers/wdm/audio/backpln/portcls/resource.cpp index e2b326dd80c..dfa4e7b7d83 100644 --- a/drivers/wdm/audio/backpln/portcls/resource.cpp +++ b/drivers/wdm/audio/backpln/portcls/resource.cpp @@ -54,7 +54,7 @@ public: LONG m_Ref; }; -CResourceList::~CResourceList() +CResourceList::~CResourceList() { if (m_TranslatedResourceList) { @@ -397,9 +397,9 @@ PcNewResourceList( NewList->m_TranslatedResourceList= NewTranslatedResources; NewList->m_UntranslatedResourceList = NewUntranslatedResources; NewList->m_NumberOfEntries = ResourceCount; - NewList->m_MaxEntries = ResourceCount; + NewList->m_MaxEntries = ResourceCount; NewList->m_PoolType = PoolType; - + /* Done */ return STATUS_SUCCESS; } diff --git a/drivers/wdm/audio/backpln/portcls/undoc.cpp b/drivers/wdm/audio/backpln/portcls/undoc.cpp index 434a8d494b3..d6a42baa1ab 100644 --- a/drivers/wdm/audio/backpln/portcls/undoc.cpp +++ b/drivers/wdm/audio/backpln/portcls/undoc.cpp @@ -99,7 +99,7 @@ PcHandlePropertyWithTable( KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; - // then try KsPropertyHandler + // then try KsPropertyHandler return KsPropertyHandler(Irp, PropertySetCount, PropertySet); } @@ -377,7 +377,7 @@ ASSERT(PropertyItem->Set); // store new property set descriptors SubDeviceDescriptor->FilterPropertySet = NewPropertySet; - // store index + // store index PropertySetIndex = SubDeviceDescriptor->FilterPropertySetCount; // increment property set count @@ -386,7 +386,7 @@ ASSERT(PropertyItem->Set); // copy property guid RtlMoveMemory(Guid, PropertyItem->Set, sizeof(GUID)); - // initialize property set + // initialize property set SubDeviceDescriptor->FilterPropertySet[PropertySetIndex].Set = Guid; SubDeviceDescriptor->FilterPropertySet[PropertySetIndex].PropertiesCount = 0; } @@ -450,7 +450,7 @@ ASSERT(PropertyItem->Set); // are any set operations supported if (PropertyItem->Flags & PCPROPERTY_ITEM_FLAG_SET) { - // setup handler + // setup handler FilterPropertyItem->SetPropertyHandler = PropertyItemDispatch; } @@ -464,14 +464,14 @@ ASSERT(PropertyItem->Set); // are get operations supported if (PropertyItem->Flags & PCPROPERTY_ITEM_FLAG_GET) { - // setup handler + // setup handler FilterPropertyItem->GetPropertyHandler = PropertyItemDispatch; } // are basic support operations supported if (PropertyItem->Flags & PCPROPERTY_ITEM_FLAG_BASICSUPPORT) { - // setup handler + // setup handler FilterPropertyItem->SupportHandler = PropertyItemDispatch; } @@ -481,7 +481,7 @@ ASSERT(PropertyItem->Set); // only store property item of filter properties / pin properties // because filter & pin properties do not require a specific context // on the other hand node properties are specifically bound to a node - + FilterPropertyItem->Relations = (const KSPROPERTY*)PropertyItem; } } @@ -548,7 +548,7 @@ DumpAutomationTable( { if (AutomationTable->PropertyItemSize >= sizeof(PCPROPERTY_ITEM)) { - // get property item + // get property item PropertyItem = (PPCPROPERTY_ITEM)AutomationTable->Properties; // sanity check @@ -755,7 +755,7 @@ PcCreateSubdeviceDescriptor( if (!Descriptor) return STATUS_INSUFFICIENT_RESOURCES; - // initialize physical / symbolic link connection list + // initialize physical / symbolic link connection list InitializeListHead(&Descriptor->SymbolicLinkList); InitializeListHead(&Descriptor->PhysicalConnectionList); diff --git a/drivers/wdm/audio/backpln/portcls/unregister.cpp b/drivers/wdm/audio/backpln/portcls/unregister.cpp index 80e1b3903c2..9a3bc8cec66 100644 --- a/drivers/wdm/audio/backpln/portcls/unregister.cpp +++ b/drivers/wdm/audio/backpln/portcls/unregister.cpp @@ -55,7 +55,7 @@ CUnregisterSubdevice::QueryInterface( { UNICODE_STRING GuidString; - if (IsEqualGUIDAligned(refiid, IID_IUnregisterSubdevice) || + if (IsEqualGUIDAligned(refiid, IID_IUnregisterSubdevice) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNREGISTERSUBDEVICE(this)); diff --git a/drivers/wdm/audio/filters/splitter/filter.c b/drivers/wdm/audio/filters/splitter/filter.c index 2613b972163..62417dc98fb 100644 --- a/drivers/wdm/audio/filters/splitter/filter.c +++ b/drivers/wdm/audio/filters/splitter/filter.c @@ -28,7 +28,7 @@ FilterProcess( if (CurPin->BytesAvailable && CurPin->Pin->DeviceState == KSSTATE_RUN) { - /* pin has pending frames + /* pin has pending frames * to keep all pins synchronized, every pin has to wait untill each chained pin has send its frames downwards */ PendingFrames = TRUE; diff --git a/drivers/wdm/audio/filters/splitter/pin.c b/drivers/wdm/audio/filters/splitter/pin.c index 6286812ba1c..554199410a1 100644 --- a/drivers/wdm/audio/filters/splitter/pin.c +++ b/drivers/wdm/audio/filters/splitter/pin.c @@ -49,7 +49,7 @@ PinCreate( RtlZeroMemory(PinContext, sizeof(PIN_CONTEXT)); /* FIXME - * check allocator framing and apply to all pins + * check allocator framing and apply to all pins */ return STATUS_SUCCESS; diff --git a/drivers/wdm/audio/filters/splitter/splitter.c b/drivers/wdm/audio/filters/splitter/splitter.c index 0aed799b15e..90eae6d00de 100644 --- a/drivers/wdm/audio/filters/splitter/splitter.c +++ b/drivers/wdm/audio/filters/splitter/splitter.c @@ -112,7 +112,7 @@ PinDataFormatRanges[] = #if 0 const KSALLOCATOR_FRAMING_EX -AllocatorFraming = +AllocatorFraming = { 1, 0, @@ -214,7 +214,7 @@ Categories[] = const KSNODE_DESCRIPTOR -NodeDescriptor[] = +NodeDescriptor[] = { { NULL, //automation table diff --git a/drivers/wdm/audio/hdaudbus/businterface.cpp b/drivers/wdm/audio/hdaudbus/businterface.cpp index 940db612128..287340290a2 100644 --- a/drivers/wdm/audio/hdaudbus/businterface.cpp +++ b/drivers/wdm/audio/hdaudbus/businterface.cpp @@ -61,7 +61,7 @@ HDA_TransferCodecVerbs( } NTSTATUS -NTAPI +NTAPI HDA_AllocateCaptureDmaEngine( IN PVOID _context, IN UCHAR CodecAddress, diff --git a/drivers/wdm/audio/legacy/wdmaud/entry.c b/drivers/wdm/audio/legacy/wdmaud/entry.c index eede79172d3..158fe92a5a1 100644 --- a/drivers/wdm/audio/legacy/wdmaud/entry.c +++ b/drivers/wdm/audio/legacy/wdmaud/entry.c @@ -362,7 +362,7 @@ DriverEntry( Driver->MajorFunction[IRP_MJ_CREATE] = WdmAudCreate; Driver->MajorFunction[IRP_MJ_CLOSE] = WdmAudClose; Driver->MajorFunction[IRP_MJ_PNP] = WdmAudPnp; - Driver->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; + Driver->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; Driver->MajorFunction[IRP_MJ_CLEANUP] = WdmAudCleanup; Driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = WdmAudDeviceControl; Driver->MajorFunction[IRP_MJ_WRITE] = WdmAudReadWrite; diff --git a/drivers/wdm/audio/legacy/wdmaud/mmixer.c b/drivers/wdm/audio/legacy/wdmaud/mmixer.c index 3016d24c673..12536830be1 100644 --- a/drivers/wdm/audio/legacy/wdmaud/mmixer.c +++ b/drivers/wdm/audio/legacy/wdmaud/mmixer.c @@ -516,7 +516,7 @@ WdmAudCloseAllMixers( DPRINT1("Failed to close mixer for device %lu\n", DeviceIndex); } } - + /* Dereference event */ if (ClientInfo->hPins[Index].NotifyEvent) { diff --git a/drivers/wdm/audio/legacy/wdmaud/wdmaud.h b/drivers/wdm/audio/legacy/wdmaud/wdmaud.h index 49f01f2fbd1..4c56a87e21e 100644 --- a/drivers/wdm/audio/legacy/wdmaud/wdmaud.h +++ b/drivers/wdm/audio/legacy/wdmaud/wdmaud.h @@ -307,8 +307,8 @@ WdmAudGetMidiOutDeviceCount(VOID); NTSTATUS WdmAudGetPnpNameByIndexAndType( - IN ULONG DeviceIndex, - IN SOUND_DEVICE_TYPE DeviceType, + IN ULONG DeviceIndex, + IN SOUND_DEVICE_TYPE DeviceType, OUT LPWSTR *Device); diff --git a/drivers/wmi/wmilib.c b/drivers/wmi/wmilib.c index 492be356aa2..1f977573b86 100644 --- a/drivers/wmi/wmilib.c +++ b/drivers/wmi/wmilib.c @@ -4,7 +4,7 @@ * FILE: drivers/wmi/wmilib.c * PURPOSE: Windows Management Instrumentation * PROGRAMMERS: Aleksey Bragin (aleksey@reactos.org) - * + * */ /* INCLUDES *****************************************************************/ diff --git a/hal/halarm/generic/bus.c b/hal/halarm/generic/bus.c index aeae3cbacb1..420bb8f083b 100644 --- a/hal/halarm/generic/bus.c +++ b/hal/halarm/generic/bus.c @@ -5,7 +5,7 @@ * PURPOSE: Bus Support Routines * PROGRAMMERS: ReactOS Portable Systems Group */ - + /* INCLUDES *******************************************************************/ #include diff --git a/hal/halarm/generic/cache.S b/hal/halarm/generic/cache.S index 9c266aa8ead..1c315c292e5 100644 --- a/hal/halarm/generic/cache.S +++ b/hal/halarm/generic/cache.S @@ -12,7 +12,7 @@ NESTED_ENTRY v7_flush_dcache_all PROLOG_END v7_flush_dcache_all - + mrc p15, 1, r0, c0, c0, 1 // read clidr ands r3, r0, #0x7000000 // extract loc from clidr mov r3, r3, lsr #23 // left align loc bit field @@ -53,5 +53,5 @@ finished: mcr p15, 2, r10, c0, c0, 0 // select current cache level in cssr isb mov pc, lr - + ENTRY_END v7_flush_dcache_all diff --git a/hal/halarm/generic/display.c b/hal/halarm/generic/display.c index f21ca6dccfd..872f20c851a 100644 --- a/hal/halarm/generic/display.c +++ b/hal/halarm/generic/display.c @@ -5,7 +5,7 @@ * PURPOSE: Screen Display Routines, now useless since NT 5.1+ * PROGRAMMERS: ReactOS Portable Systems Group */ - + #include #define NDEBUG #include diff --git a/hal/halarm/generic/dma.c b/hal/halarm/generic/dma.c index 3070f25e7fb..0ab42cdc71f 100644 --- a/hal/halarm/generic/dma.c +++ b/hal/halarm/generic/dma.c @@ -152,7 +152,7 @@ IoMapTransfer(IN PADAPTER_OBJECT AdapterObject, UNIMPLEMENTED; while (TRUE); - + Address.QuadPart = 0; return Address; } diff --git a/hal/halarm/generic/halinit.c b/hal/halarm/generic/halinit.c index 6f63dc9f938..532110bd809 100644 --- a/hal/halarm/generic/halinit.c +++ b/hal/halarm/generic/halinit.c @@ -82,7 +82,7 @@ HalInitSystem(IN ULONG BootPhase, /* Validation failed, bugcheck */ KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); } - + /* Initialize interrupts */ HalpInitializeInterrupts(); @@ -164,7 +164,7 @@ DbgPrintEarly(const char *fmt, ...) va_start(args, fmt); i = vsprintf(Buffer, fmt, args); va_end(args); - + /* Output the message */ while (*String != 0) { @@ -175,7 +175,7 @@ DbgPrintEarly(const char *fmt, ...) KdPortPutByteEx(NULL, *String); String++; } - + return STATUS_SUCCESS; } diff --git a/hal/halarm/generic/pic.c b/hal/halarm/generic/pic.c index 09ce08ad99c..a8c68cd6f67 100644 --- a/hal/halarm/generic/pic.c +++ b/hal/halarm/generic/pic.c @@ -98,7 +98,7 @@ HalpInitializeInterrupts(VOID) RtlCopyMemory(Pcr->IrqlTable, HalpIrqlTable, sizeof(Pcr->IrqlTable)); RtlCopyMemory(Pcr->IrqlMask, HalpMaskTable, sizeof(Pcr->IrqlMask)); } - + /* IRQL MANAGEMENT ************************************************************/ /* @@ -108,7 +108,7 @@ ULONG HalGetInterruptSource(VOID) { ULONG InterruptStatus; - + /* Get the interrupt status, and return the highest bit set */ InterruptStatus = READ_REGISTER_ULONG(VIC_INT_STATUS); return 31 - _clz(InterruptStatus); @@ -134,11 +134,11 @@ KeRaiseIrqlToDpcLevel(VOID) { PKPCR Pcr = KeGetPcr(); KIRQL CurrentIrql; - + /* Save and update IRQL */ CurrentIrql = Pcr->Irql; Pcr->Irql = DISPATCH_LEVEL; - + #ifdef IRQL_DEBUG /* Validate correct raise */ if (CurrentIrql > DISPATCH_LEVEL) KeBugCheck(IRQL_NOT_GREATER_OR_EQUAL); @@ -157,11 +157,11 @@ KeRaiseIrqlToSynchLevel(VOID) { PKPCR Pcr = KeGetPcr(); KIRQL CurrentIrql; - + /* Save and update IRQL */ CurrentIrql = Pcr->Irql; Pcr->Irql = SYNCH_LEVEL; - + #ifdef IRQL_DEBUG /* Validate correct raise */ if (CurrentIrql > SYNCH_LEVEL) @@ -190,14 +190,14 @@ KfRaiseIrql(IN KIRQL NewIrql) PKIPCR Pcr = (PKIPCR)KeGetPcr(); KIRQL CurrentIrql; ULONG InterruptMask; - + /* Disable interrupts */ Flags = KeArmStatusRegisterGet(); _disable(); /* Read current IRQL */ CurrentIrql = Pcr->Irql; - + #ifdef IRQL_DEBUG /* Validate correct raise */ if (CurrentIrql > NewIrql) @@ -209,17 +209,17 @@ KfRaiseIrql(IN KIRQL NewIrql) #endif /* Clear interrupts associated to the old IRQL */ WRITE_REGISTER_ULONG(VIC_INT_CLEAR, 0xFFFFFFFF); - + /* Set the new interrupt mask */ InterruptMask = Pcr->IrqlTable[NewIrql]; WRITE_REGISTER_ULONG(VIC_INT_ENABLE, InterruptMask); /* Set new IRQL */ Pcr->Irql = NewIrql; - + /* Restore interrupt state */ if (!Flags.IrqDisable) _enable(); - + /* Return old IRQL */ return CurrentIrql; } @@ -238,7 +238,7 @@ KfLowerIrql(IN KIRQL NewIrql) /* Disableinterrupts */ Flags = KeArmStatusRegisterGet(); _disable(); - + #ifdef IRQL_DEBUG /* Validate correct lower */ if (OldIrql > Pcr->Irql) @@ -251,11 +251,11 @@ KfLowerIrql(IN KIRQL NewIrql) /* Clear interrupts associated to the old IRQL */ WRITE_REGISTER_ULONG(VIC_INT_CLEAR, 0xFFFFFFFF); - + /* Set the new interrupt mask */ InterruptMask = Pcr->IrqlTable[NewIrql]; WRITE_REGISTER_ULONG(VIC_INT_ENABLE, InterruptMask); - + /* Save the new IRQL and restore interrupt state */ Pcr->Irql = NewIrql; if (!Flags.IrqDisable) _enable(); diff --git a/hal/halarm/generic/processor.c b/hal/halarm/generic/processor.c index b52ef5cfff4..81fb5145b3a 100644 --- a/hal/halarm/generic/processor.c +++ b/hal/halarm/generic/processor.c @@ -28,12 +28,12 @@ HalpIdentifyProcessor(VOID) /* Don't do it again */ HalpProcessorIdentified = TRUE; - + // fixfix: Use Pcr->ProcessorId - + /* Read the ID Code */ IdRegister = KeArmIdCodeRegisterGet(); - + /* Architecture "6" CPUs support test-and-clean (926EJ-S and 1026EJ-S) */ HalpTestCleanSupported = (IdRegister.Architecture == 6); } @@ -111,7 +111,7 @@ HalSweepDcache(VOID) * processor routines, so we need to figure out what CPU we're on. */ if (!HalpProcessorIdentified) HalpIdentifyProcessor(); - + /* * Check if we can do it the ARMv5TE-J way */ diff --git a/hal/halarm/generic/rtc.c b/hal/halarm/generic/rtc.c index e2fe11e9a4a..f8475e75501 100644 --- a/hal/halarm/generic/rtc.c +++ b/hal/halarm/generic/rtc.c @@ -25,13 +25,13 @@ HalQueryRealTimeClock(IN PTIME_FIELDS Time) { LARGE_INTEGER LargeTime; ULONG Seconds; - + /* Query the RTC value */ Seconds = READ_REGISTER_ULONG(RTC_DATA); - + /* Convert to time */ RtlSecondsSince1970ToTime(Seconds, &LargeTime); - + /* Convert to time-fields */ RtlTimeToTimeFields(&LargeTime, Time); return TRUE; diff --git a/hal/halarm/generic/spinlock.c b/hal/halarm/generic/spinlock.c index ff53749329e..01fc27809e0 100644 --- a/hal/halarm/generic/spinlock.c +++ b/hal/halarm/generic/spinlock.c @@ -5,7 +5,7 @@ * PURPOSE: SpinLock Routines * PROGRAMMERS: ReactOS Portable Systems Group */ - + /* INCLUDES ******************************************************************/ #include diff --git a/hal/halarm/generic/timer.c b/hal/halarm/generic/timer.c index 9ed2a2a4d01..0a84b7446ad 100644 --- a/hal/halarm/generic/timer.c +++ b/hal/halarm/generic/timer.c @@ -28,15 +28,15 @@ ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; VOID HalpClockInterrupt(VOID) -{ +{ /* Clear the interrupt */ ASSERT(KeGetCurrentIrql() == CLOCK2_LEVEL); WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); - + /* FIXME: Update HAL Perf counters */ - + /* FIXME: Check if someone changed the clockrate */ - + /* Call the kernel */ KeUpdateSystemTime(KeGetCurrentThread()->TrapFrame, HalpCurrentTimeIncrement, @@ -45,7 +45,7 @@ HalpClockInterrupt(VOID) VOID HalpStallInterrupt(VOID) -{ +{ /* Clear the interrupt */ WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); } @@ -56,10 +56,10 @@ HalpInitializeClock(VOID) PKIPCR Pcr = (PKIPCR)KeGetPcr(); ULONG ClockInterval; SP804_CONTROL_REGISTER ControlRegister; - + /* Setup the clock and profile interrupt */ Pcr->InterruptRoutine[CLOCK2_LEVEL] = HalpStallInterrupt; - + /* * Configure the interval to 10ms * (INTERVAL (10ms) * TIMCLKfreq (1MHz)) @@ -67,14 +67,14 @@ HalpInitializeClock(VOID) * (TIMCLKENXdiv (1) * PRESCALEdiv (1)) */ ClockInterval = 0x2710; - + /* Configure the timer */ ControlRegister.AsUlong = 0; ControlRegister.Wide = TRUE; ControlRegister.Periodic = TRUE; ControlRegister.Interrupt = TRUE; ControlRegister.Enabled = TRUE; - + /* Enable the timer */ WRITE_REGISTER_ULONG(TIMER0_LOAD, ClockInterval); WRITE_REGISTER_ULONG(TIMER0_CONTROL, ControlRegister.AsUlong); @@ -114,10 +114,10 @@ NTAPI KeStallExecutionProcessor(IN ULONG Microseconds) { SP804_CONTROL_REGISTER ControlRegister; - + /* Enable the timer */ WRITE_REGISTER_ULONG(TIMER1_LOAD, Microseconds); - + /* Configure the timer */ ControlRegister.AsUlong = 0; ControlRegister.OneShot = TRUE; @@ -125,7 +125,7 @@ KeStallExecutionProcessor(IN ULONG Microseconds) ControlRegister.Periodic = TRUE; ControlRegister.Enabled = TRUE; WRITE_REGISTER_ULONG(TIMER1_CONTROL, ControlRegister.AsUlong); - + /* Now we will loop until the timer reached 0 */ while (READ_REGISTER_ULONG(TIMER1_VALUE)); } diff --git a/hal/halarm/generic/usage.c b/hal/halarm/generic/usage.c index 248f383dedb..3f44107181e 100644 --- a/hal/halarm/generic/usage.c +++ b/hal/halarm/generic/usage.c @@ -5,7 +5,7 @@ * PURPOSE: Resource Usage Management Routines * PROGRAMMERS: ReactOS Portable Systems Group */ - + /* INCLUDES *******************************************************************/ #include diff --git a/hal/halppc/include/mps.h b/hal/halppc/include/mps.h index ba766958280..c70ef314c06 100644 --- a/hal/halppc/include/mps.h +++ b/hal/halppc/include/mps.h @@ -1,8 +1,8 @@ #pragma once -/* - * FIXME: This does not work if we have more than 24 IRQs (ie. more than one - * I/O APIC) +/* + * FIXME: This does not work if we have more than 24 IRQs (ie. more than one + * I/O APIC) */ #define IRQL2VECTOR(irql) (IRQ2VECTOR(PROFILE_LEVEL - (irql))) @@ -183,7 +183,7 @@ typedef struct _MP_CONFIGURATION_INTLOCAL #include #define MP_APIC_ALL 0xFF - + #define CPU_FLAG_ENABLED 1 /* Processor is available */ #define CPU_FLAG_BSP 2 /* Processor is the bootstrap processor */ diff --git a/hal/halx86/amd64/x86bios.c b/hal/halx86/amd64/x86bios.c index a361196c6a4..cbcc75de6cc 100644 --- a/hal/halx86/amd64/x86bios.c +++ b/hal/halx86/amd64/x86bios.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS HAL * LICENSE: GPL, See COPYING in the top level directory * FILE: hal/halx86/amd64/x86bios.c - * PURPOSE: + * PURPOSE: * PROGRAMMERS: Timo Kreuzer (timo.kreuzer@reactos.org) */ @@ -256,7 +256,7 @@ x86BiosWriteMemory( static VOID -FASTCALL +FASTCALL x86MemRead( PFAST486_STATE State, ULONG Address, diff --git a/hal/halx86/include/apic.h b/hal/halx86/include/apic.h index fe82a1425d8..ee8eec3d665 100644 --- a/hal/halx86/include/apic.h +++ b/hal/halx86/include/apic.h @@ -11,7 +11,7 @@ #ifdef _M_AMD64 #define LOCAL_APIC_BASE 0xFFFFFFFFFFFE0000ULL #define IOAPIC_BASE 0xFFFFFFFFFFFE1000ULL - #define APIC_SPURIOUS_VECTOR 0x3f + #define APIC_SPURIOUS_VECTOR 0x3f #define IrqlToTpr(Irql) (Irql << 4) #define IrqlToSoftVector(Irql) ((Irql << 4)|0xf) #define TprToIrql(Tpr) ((KIRQL)(Tpr >> 4)) @@ -304,6 +304,6 @@ HalInitializeProfiling(VOID); VOID NTAPI -HalpInitApicInfo(IN PLOADER_PARAMETER_BLOCK KeLoaderBlock); +HalpInitApicInfo(IN PLOADER_PARAMETER_BLOCK KeLoaderBlock); VOID __cdecl ApicSpuriousService(VOID); diff --git a/hal/halx86/include/mps.h b/hal/halx86/include/mps.h index ba766958280..c70ef314c06 100644 --- a/hal/halx86/include/mps.h +++ b/hal/halx86/include/mps.h @@ -1,8 +1,8 @@ #pragma once -/* - * FIXME: This does not work if we have more than 24 IRQs (ie. more than one - * I/O APIC) +/* + * FIXME: This does not work if we have more than 24 IRQs (ie. more than one + * I/O APIC) */ #define IRQL2VECTOR(irql) (IRQ2VECTOR(PROFILE_LEVEL - (irql))) @@ -183,7 +183,7 @@ typedef struct _MP_CONFIGURATION_INTLOCAL #include #define MP_APIC_ALL 0xFF - + #define CPU_FLAG_ENABLED 1 /* Processor is available */ #define CPU_FLAG_BSP 2 /* Processor is the bootstrap processor */ diff --git a/hal/halx86/legacy/bus/bushndlr.c b/hal/halx86/legacy/bus/bushndlr.c index 5ebe24b0d91..ba571f588aa 100644 --- a/hal/halx86/legacy/bus/bushndlr.c +++ b/hal/halx86/legacy/bus/bushndlr.c @@ -28,17 +28,17 @@ HalpAllocateArray(IN ULONG ArraySize) { PARRAY Array; ULONG Size; - + /* Compute array size */ if (ArraySize == MAXULONG) ArraySize = 0; Size = ArraySize * sizeof(PARRAY) + sizeof(ARRAY); - + /* Allocate the array */ Array = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_BUS_HANDLER); if (!Array) KeBugCheckEx(HAL_MEMORY_ALLOCATION, Size, 0, (ULONG_PTR)__FILE__, __LINE__); - + /* Initialize it */ Array->ArraySize = ArraySize; RtlZeroMemory(Array->Element, sizeof(PVOID) * (ArraySize + 1)); @@ -51,7 +51,7 @@ HalpGrowArray(IN PARRAY *CurrentArray, IN PARRAY *NewArray) { PVOID Tmp; - + /* Check if the current array doesn't exist yet, or if it's smaller than the new one */ if (!(*CurrentArray) || ((*NewArray)->ArraySize > (*CurrentArray)->ArraySize)) { @@ -63,7 +63,7 @@ HalpGrowArray(IN PARRAY *CurrentArray, &(*CurrentArray)->Element, sizeof(PVOID) * ((*CurrentArray)->ArraySize + 1)); } - + /* Swap the pointers (XOR swap would be more l33t) */ Tmp = *CurrentArray; *CurrentArray = *NewArray; @@ -80,25 +80,25 @@ HalpLookupHandler(IN PARRAY Array, { PHAL_BUS_HANDLER Bus; PBUS_HANDLER Handler = NULL; - + /* Make sure the entry exists */ if (Array->ArraySize >= Type) { /* Retrieve it */ Array = Array->Element[Type]; - + /* Make sure the entry array exists */ if ((Array) && (Array->ArraySize >= Number)) { /* Retrieve the bus and its handler */ Bus = Array->Element[Number]; Handler = &Bus->Handler; - + /* Reference the handler if needed */ if (AddReference) Bus->ReferenceCount++; } } - + /* Return the handler */ return Handler; } @@ -116,7 +116,7 @@ HalpNoBusData(IN PBUS_HANDLER BusHandler, DPRINT1("STUB GetSetBusData\n"); return 0; } - + NTSTATUS NTAPI HalpNoAdjustResourceList(IN PBUS_HANDLER BusHandler, @@ -147,7 +147,7 @@ FASTCALL HaliReferenceBusHandler(IN PBUS_HANDLER Handler) { PHAL_BUS_HANDLER Bus; - + /* Find and reference the bus handler */ Bus = CONTAINING_RECORD(Handler, HAL_BUS_HANDLER, Handler); Bus->ReferenceCount++; @@ -158,7 +158,7 @@ FASTCALL HaliDereferenceBusHandler(IN PBUS_HANDLER Handler) { PHAL_BUS_HANDLER Bus; - + /* Find and dereference the bus handler */ Bus = CONTAINING_RECORD(Handler, HAL_BUS_HANDLER, Handler); Bus->ReferenceCount--; @@ -207,7 +207,7 @@ HalpContextToBusHandler(IN ULONG_PTR ContextValue) { PLIST_ENTRY NextEntry; PHAL_BUS_HANDLER BusHandler, ThisHandler; - + /* Start lookup */ NextEntry = HalpAllBusHandlers.Flink; ThisHandler = CONTAINING_RECORD(NextEntry, HAL_BUS_HANDLER, AllHandlers); @@ -223,15 +223,15 @@ HalpContextToBusHandler(IN ULONG_PTR ContextValue) /* Check if we've reached the right one */ ThisHandler = CONTAINING_RECORD(NextEntry, HAL_BUS_HANDLER, AllHandlers); if (ThisHandler == BusHandler) break; - + /* Try the next one */ NextEntry = NextEntry->Flink; } while (NextEntry != &HalpAllBusHandlers); } - + /* If we looped back to the end, we didn't find anything */ if (NextEntry == &HalpAllBusHandlers) return NULL; - + /* Otherwise return the handler */ return &ThisHandler->Handler; } @@ -255,20 +255,20 @@ HaliRegisterBusHandler(IN INTERFACE_TYPE InterfaceType, PBUS_HANDLER ParentHandler; KIRQL OldIrql; NTSTATUS Status; - + /* Make sure we have a valid handler */ ASSERT((InterfaceType != InterfaceTypeUndefined) || (ConfigType != ConfigurationSpaceUndefined)); - + /* Allocate the bus handler */ Bus = ExAllocatePoolWithTag(NonPagedPool, sizeof(HAL_BUS_HANDLER) + ExtraData, TAG_BUS_HANDLER); if (!Bus) return STATUS_INSUFFICIENT_RESOURCES; - + /* Return the handler */ *ReturnedBusHandler = &Bus->Handler; - + /* FIXME: Fix the kernel first. Don't page us out */ //CodeHandle = MmLockPagableDataSection(&HaliRegisterBusHandler); @@ -278,34 +278,34 @@ HaliRegisterBusHandler(IN INTERFACE_TYPE InterfaceType, KernelMode, FALSE, NULL); - + /* Check for unknown/root bus */ if (BusNumber == -1) { /* We must have an interface */ ASSERT(InterfaceType != InterfaceTypeUndefined); - + /* Find the right bus */ BusNumber = 0; while (HaliHandlerForBus(InterfaceType, BusNumber)) BusNumber++; } - + /* Allocate arrays for the handler */ InterfaceArray = HalpAllocateArray(InterfaceType); InterfaceBusNumberArray = HalpAllocateArray(BusNumber); ConfigArray = HalpAllocateArray(ConfigType); ConfigBusNumberArray = HalpAllocateArray(BusNumber); - + /* Only proceed if all allocations succeeded */ if ((InterfaceArray) && (InterfaceBusNumberArray) && (ConfigArray) && (ConfigBusNumberArray)) { /* Find the parent handler if any */ ParentHandler = HaliReferenceHandlerForBus(ParentBusType, ParentBusNumber); - + /* Initialize the handler */ RtlZeroMemory(Bus, sizeof(HAL_BUS_HANDLER) + ExtraData); Bus->ReferenceCount = 1; - + /* Fill out bus data */ Bus->Handler.BusNumber = BusNumber; Bus->Handler.InterfaceType = InterfaceType; @@ -317,7 +317,7 @@ HaliRegisterBusHandler(IN INTERFACE_TYPE InterfaceType, Bus->Handler.SetBusData = HalpNoBusData; Bus->Handler.AdjustResourceList = HalpNoAdjustResourceList; Bus->Handler.AssignSlotResources = HalpNoAssignSlotResources; - + /* Make space for extra data */ if (ExtraData) Bus->Handler.BusData = Bus + 1; @@ -332,41 +332,41 @@ HaliRegisterBusHandler(IN INTERFACE_TYPE InterfaceType, Bus->Handler.TranslateBusAddress = ParentHandler->TranslateBusAddress; Bus->Handler.GetInterruptVector = ParentHandler->GetInterruptVector; } - + /* We don't support this yet */ ASSERT(!InstallCallback); - + /* Lock the buses */ KeAcquireSpinLock(&HalpBusDatabaseSpinLock, &OldIrql); /* Make space for the interface */ HalpGrowArray(&HalpBusTable, &InterfaceArray); - + /* Check if we really have an interface */ if (InterfaceType != InterfaceTypeUndefined) { /* Make space for the association */ HalpGrowArray((PARRAY*)&HalpBusTable->Element[InterfaceType], &InterfaceBusNumberArray); - + /* Get the bus handler pointer */ BusEntry = (PHAL_BUS_HANDLER*)&((PARRAY)HalpBusTable->Element[InterfaceType])->Element[BusNumber]; - + /* Check if there was already a handler there, and set the new one */ if (*BusEntry) OldHandler = *BusEntry; *BusEntry = Bus; } - + /* Now add a space for the configuration space */ HalpGrowArray(&HalpConfigTable, &ConfigArray); - + /* Check if we really have one */ if (ConfigType != ConfigurationSpaceUndefined) { /* Make space for this association */ HalpGrowArray((PARRAY*)&HalpConfigTable->Element[ConfigType], &ConfigBusNumberArray); - + /* Get the bus handler pointer */ BusEntry = (PHAL_BUS_HANDLER*)&((PARRAY)HalpConfigTable->Element[ConfigType])->Element[BusNumber]; if (*BusEntry) @@ -375,14 +375,14 @@ HaliRegisterBusHandler(IN INTERFACE_TYPE InterfaceType, ASSERT((OldHandler == NULL) || (OldHandler == *BusEntry)); OldHandler = *BusEntry; } - + /* Set the new entry */ *BusEntry = Bus; } /* Link the adapter */ InsertTailList(&HalpAllBusHandlers, &Bus->AllHandlers); - + /* Remove the old linkage */ Bus = OldHandler; if (Bus) RemoveEntryList(&Bus->AllHandlers); @@ -399,7 +399,7 @@ HaliRegisterBusHandler(IN INTERFACE_TYPE InterfaceType, /* Signal the event */ KeSetEvent(&HalpBusDatabaseEvent, 0, FALSE); - + /* FIXME: Fix the kernel first. Re-page the function */ //MmUnlockPagableImageSection(CodeHandle); @@ -421,14 +421,14 @@ HalpInitBusHandler(VOID) { /* Setup the bus lock */ KeInitializeSpinLock(&HalpBusDatabaseSpinLock); - + /* Setup the bus event */ KeInitializeEvent(&HalpBusDatabaseEvent, SynchronizationEvent, TRUE); - + /* Setup the bus configuration and bus table */ HalpBusTable = HalpAllocateArray(0); HalpConfigTable = HalpAllocateArray(0); - + /* Setup the bus list */ InitializeListHead(&HalpAllBusHandlers); diff --git a/hal/halx86/legacy/bus/isabus.c b/hal/halx86/legacy/bus/isabus.c index dac5af8c8c7..38e2e54cc5e 100644 --- a/hal/halx86/legacy/bus/isabus.c +++ b/hal/halx86/legacy/bus/isabus.c @@ -19,21 +19,21 @@ BOOLEAN NTAPI HalpTranslateIsaBusAddress(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, + IN PBUS_HANDLER RootHandler, IN PHYSICAL_ADDRESS BusAddress, IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress) { BOOLEAN Status; - + /* Use system translation */ Status = HalpTranslateSystemBusAddress(BusHandler, RootHandler, BusAddress, AddressSpace, TranslatedAddress); - - /* If it didn't work and it was memory address space... */ + + /* If it didn't work and it was memory address space... */ if (!(Status) && (*AddressSpace == 0)) { /* Try EISA translation instead */ @@ -43,7 +43,7 @@ HalpTranslateIsaBusAddress(IN PBUS_HANDLER BusHandler, AddressSpace, TranslatedAddress); } - + /* Return the result */ return Status; } diff --git a/hal/halx86/legacy/bus/sysbus.c b/hal/halx86/legacy/bus/sysbus.c index fccb8233982..baaecee51e8 100644 --- a/hal/halx86/legacy/bus/sysbus.c +++ b/hal/halx86/legacy/bus/sysbus.c @@ -19,19 +19,19 @@ BOOLEAN NTAPI HalpTranslateSystemBusAddress(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, + IN PBUS_HANDLER RootHandler, IN PHYSICAL_ADDRESS BusAddress, IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress) { PSUPPORTED_RANGE Range = NULL; - + /* Check what kind of address space this is */ switch (*AddressSpace) { /* Memory address */ case 0: - + /* Loop all prefetch memory */ for (Range = &BusHandler->BusAddresses->PrefetchMemory; Range; @@ -45,7 +45,7 @@ HalpTranslateSystemBusAddress(IN PBUS_HANDLER BusHandler, break; } } - + /* Check if we haven't found anything yet */ if (!Range) { @@ -63,10 +63,10 @@ HalpTranslateSystemBusAddress(IN PBUS_HANDLER BusHandler, } } } - + /* Done */ break; - + /* I/O Space */ case 1: @@ -83,11 +83,11 @@ HalpTranslateSystemBusAddress(IN PBUS_HANDLER BusHandler, break; } } - + /* Done */ break; } - + /* Check if we found a range */ if (Range) { @@ -104,7 +104,7 @@ HalpTranslateSystemBusAddress(IN PBUS_HANDLER BusHandler, *AddressSpace = Range->SystemAddressSpace; return TRUE; } - + /* Nothing found */ DPRINT1("Translation of %I64x failed!\n", BusAddress.QuadPart); return FALSE; @@ -134,7 +134,7 @@ HalpGetRootInterruptVector(IN ULONG BusInterruptLevel, *Irql = HalpVectorToIrql(SystemVector); *Affinity = HalpDefaultInterruptAffinity; ASSERT(HalpDefaultInterruptAffinity); - + /* Return the vector */ return SystemVector; } @@ -149,13 +149,13 @@ HalpGetSystemInterruptVector(IN PBUS_HANDLER BusHandler, OUT PKAFFINITY Affinity) { ULONG Vector; - + /* Get the root vector */ Vector = HalpGetRootInterruptVector(BusInterruptLevel, BusInterruptVector, Irql, Affinity); - + /* Check if the vector is owned by the HAL and fail if it is */ if (HalpIDTUsageFlags[Vector].Flags & IDT_REGISTERED) DPRINT1("Vector %lx is ALREADY IN USE!\n", Vector); return (HalpIDTUsageFlags[Vector].Flags & IDT_REGISTERED) ? 0 : Vector; diff --git a/hal/halx86/mp/apic.c b/hal/halx86/mp/apic.c index 88248e429c3..63770acf692 100644 --- a/hal/halx86/mp/apic.c +++ b/hal/halx86/mp/apic.c @@ -20,8 +20,8 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: hal/halx86/mp/apic.c - * PURPOSE: - * PROGRAMMER: + * PURPOSE: + * PROGRAMMER: */ /* INCLUDE ***********************************************************************/ @@ -119,7 +119,7 @@ VOID APICClear(VOID) * any level-triggered sources. */ - if (maxlvt >= 3) + if (maxlvt >= 3) { tmp = ERROR_VECTOR; APICWrite(APIC_LVT3, tmp | APIC_LVT3_MASKED); @@ -134,7 +134,7 @@ VOID APICClear(VOID) tmp = APICRead(APIC_LINT1); APICWrite(APIC_LINT1, tmp | APIC_LVT_MASKED); - if (maxlvt >= 4) + if (maxlvt >= 4) { tmp = APICRead(APIC_LVTPC); APICWrite(APIC_LVTPC, tmp | APIC_LVT_MASKED); @@ -153,17 +153,17 @@ VOID APICClear(VOID) APICWrite(APIC_LINT0, APIC_LVT_MASKED); APICWrite(APIC_LINT1, APIC_LVT_MASKED); - if (maxlvt >= 3) + if (maxlvt >= 3) { APICWrite(APIC_LVT3, APIC_LVT3_MASKED); } - if (maxlvt >= 4) + if (maxlvt >= 4) { APICWrite(APIC_LVTPC, APIC_LVT_MASKED); } #if 0 - if (maxlvt >= 5) + if (maxlvt >= 5) { APICWrite(APIC_LVTTHMR, APIC_LVT_MASKED); } @@ -227,10 +227,10 @@ static VOID APICDumpBit(ULONG base) ULONG v, i, j; DbgPrint("0123456789abcdef0123456789abcdef\n"); - for (i = 0; i < 8; i++) + for (i = 0; i < 8; i++) { v = APICRead(base + i*0x10); - for (j = 0; j < 32; j++) + for (j = 0; j < 32; j++) { if (v & (1< 3) + if (maxlvt > 3) { /* Due to the Pentium erratum 3AP. */ APICWrite(APIC_ESR, 0); @@ -307,7 +307,7 @@ VOID APICDump(VOID) v = APICRead(APIC_ESR); DbgPrint("... ESR : %08x\n", v); } - + v = APICRead(APIC_ICR0); DbgPrint("... ICR0 : %08x ! ", v); v = APICRead(APIC_ICR1); @@ -316,7 +316,7 @@ VOID APICDump(VOID) v = APICRead(APIC_LVTT); DbgPrint("... LVTT : %08x\n", v); - if (maxlvt > 3) + if (maxlvt > 3) { /* PC is LVT#4. */ v = APICRead(APIC_LVTPC); @@ -327,7 +327,7 @@ VOID APICDump(VOID) v = APICRead(APIC_LINT1); DbgPrint("... LINT1 : %08x\n", v); - if (maxlvt > 2) + if (maxlvt > 2) { v = APICRead(APIC_LVT3); DbgPrint("... LVT3 : %08x\n", v); @@ -400,7 +400,7 @@ BOOLEAN VerifyLocalAPIC(VOID) MsrValue.QuadPart = __readmsr(0x1B /*MSR_IA32_APICBASE*/); - if (!(MsrValue.LowPart & /*MSR_IA32_APICBASE_ENABLE*/(1<<11))) + if (!(MsrValue.LowPart & /*MSR_IA32_APICBASE_ENABLE*/(1<<11))) { DPRINT1("Local APIC disabled by BIOS -- reenabling.\n"); MsrValue.LowPart &= ~/*MSR_IA32_APICBASE_BASE*/(1<<11); @@ -408,7 +408,7 @@ BOOLEAN VerifyLocalAPIC(VOID) __writemsr(0x1B /*MSR_IA32_APICBASE*/, MsrValue.HighPart); } - + return TRUE; } @@ -423,7 +423,7 @@ VOID APICSendIPI(ULONG Target, ULONG Mode) _disable(); /* Wait up to 100ms for the APIC to become ready */ - for (i = 0; i < 10000; i++) + for (i = 0; i < 10000; i++) { tmp = APICRead(APIC_ICR0); /* Check Delivery Status */ @@ -432,7 +432,7 @@ VOID APICSendIPI(ULONG Target, ULONG Mode) KeStallExecutionProcessor(10); } - if (i == 10000) + if (i == 10000) { DPRINT1("CPU(%d) Previous IPI was not delivered after 100ms.\n", ThisCPU()); } @@ -441,19 +441,19 @@ VOID APICSendIPI(ULONG Target, ULONG Mode) DPRINT("%08x %x\n", SET_APIC_DEST_FIELD(Target), Target); APICWrite(APIC_ICR1, SET_APIC_DEST_FIELD(Target)); - if (Target == APIC_TARGET_SELF) + if (Target == APIC_TARGET_SELF) { Mode |= APIC_ICR0_DESTS_SELF; - } - else if (Target == APIC_TARGET_ALL) + } + else if (Target == APIC_TARGET_ALL) { Mode |= APIC_ICR0_DESTS_ALL; - } - else if (Target == APIC_TARGET_ALL_BUT_SELF) + } + else if (Target == APIC_TARGET_ALL_BUT_SELF) { Mode |= APIC_ICR0_DESTS_ALL_BUT_SELF; - } - else + } + else { Mode |= APIC_ICR0_DESTS_FIELD; } @@ -462,7 +462,7 @@ VOID APICSendIPI(ULONG Target, ULONG Mode) APICWrite(APIC_ICR0, Mode); /* Wait up to 100ms for the APIC to become ready */ - for (i = 0; i < 10000; i++) + for (i = 0; i < 10000; i++) { tmp = APICRead(APIC_ICR0); /* Check Delivery Status */ @@ -471,7 +471,7 @@ VOID APICSendIPI(ULONG Target, ULONG Mode) KeStallExecutionProcessor(10); } - if (i == 10000) + if (i == 10000) { DPRINT1("CPU(%d) Current IPI was not delivered after 100ms.\n", ThisCPU()); } @@ -486,7 +486,7 @@ VOID APICSetup(VOID) CPU = ThisCPU(); // APICDump(); - + DPRINT1("CPU%d:\n", CPU); DPRINT1(" Physical APIC id: %d\n", GET_APIC_ID(APICRead(APIC_ID))); DPRINT1(" Logical APIC id: %d\n", GET_APIC_LOGICAL_ID(APICRead(APIC_LDR))); @@ -509,7 +509,7 @@ VOID APICSetup(VOID) */ tmp = APICRead(APIC_LDR); tmp &= ~APIC_LDR_MASK; - /* + /* * FIXME: * This works only up to 8 CPU's */ @@ -549,12 +549,12 @@ VOID APICSetup(VOID) * we delegate interrupts to the 8259A. */ tmp = APICRead(APIC_LINT0) & APIC_LVT_MASKED; - if (CPU == BootCPU && (APICMode == amPIC || !tmp)) + if (CPU == BootCPU && (APICMode == amPIC || !tmp)) { tmp = APIC_DM_EXTINT; DPRINT1("enabled ExtINT on CPU#%d\n", CPU); - } - else + } + else { tmp = APIC_DM_EXTINT | APIC_LVT_MASKED; DPRINT1("masked ExtINT on CPU#%d\n", CPU); @@ -572,17 +572,17 @@ VOID APICSetup(VOID) { tmp = APIC_DM_NMI | APIC_LVT_MASKED; } - if (!APIC_INTEGRATED(CPUMap[CPU].APICVersion)) + if (!APIC_INTEGRATED(CPUMap[CPU].APICVersion)) { /* 82489DX */ tmp |= APIC_LVT_LEVEL_TRIGGER; } APICWrite(APIC_LINT1, tmp); - if (APIC_INTEGRATED(CPUMap[CPU].APICVersion)) - { + if (APIC_INTEGRATED(CPUMap[CPU].APICVersion)) + { /* !82489DX */ - if (APICGetMaxLVT() > 3) + if (APICGetMaxLVT() > 3) { /* Due to the Pentium erratum 3AP */ APICWrite(APIC_ESR, 0); @@ -612,7 +612,7 @@ VOID APICSyncArbIDs(VOID) ULONG i, tmp; /* Wait up to 100ms for the APIC to become ready */ - for (i = 0; i < 10000; i++) + for (i = 0; i < 10000; i++) { tmp = APICRead(APIC_ICR0); /* Check Delivery Status */ @@ -621,7 +621,7 @@ VOID APICSyncArbIDs(VOID) KeStallExecutionProcessor(10); } - if (i == 10000) + if (i == 10000) { DPRINT("CPU(%d) APIC busy for 100ms.\n", ThisCPU()); } @@ -666,7 +666,7 @@ VOID MpsSpuriousHandler(VOID) ULONG tmp; DPRINT("Spurious interrupt on CPU(%d)\n", ThisCPU()); - + tmp = APICRead(APIC_ISR + ((SPURIOUS_VECTOR & ~0x1f) >> 1)); if (tmp & (1 << (SPURIOUS_VECTOR & 0x1f))) { @@ -685,13 +685,13 @@ VOID MpsIpiHandler(VOID) KIRQL oldIrql; HalBeginSystemInterrupt(IPI_LEVEL, - IPI_VECTOR, + IPI_VECTOR, &oldIrql); _enable(); #if 0 - DbgPrint("(%s:%d) MpsIpiHandler on CPU%d, current irql is %d\n", + DbgPrint("(%s:%d) MpsIpiHandler on CPU%d, current irql is %d\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber(), KeGetCurrentIrql()); -#endif +#endif KiIpiServiceRoutine(NULL, NULL); @@ -738,8 +738,8 @@ MpsTimerHandler(ULONG Vector, PKIRQ_TRAPFRAME Trapframe) ULONG CPU; static ULONG Count[MAX_CPU] = {0,}; #endif - HalBeginSystemInterrupt(LOCAL_TIMER_VECTOR, - PROFILE_LEVEL, + HalBeginSystemInterrupt(LOCAL_TIMER_VECTOR, + PROFILE_LEVEL, &oldIrql); _enable(); @@ -790,7 +790,7 @@ VOID APICSetupLVTT(ULONG ClockTicks) APICWrite(APIC_ICRT, ClockTicks / APIC_DIVISOR); } -VOID +VOID APICCalibrateTimer(ULONG CPU) { ULARGE_INTEGER t1, t2; @@ -845,7 +845,7 @@ APICCalibrateTimer(ULONG CPU) CPUMap[CPU].BusSpeed%1000000); } -VOID +VOID SetInterruptGate(ULONG index, ULONG_PTR address) { #ifdef _M_AMD64 @@ -874,7 +874,7 @@ SetInterruptGate(ULONG index, ULONG_PTR address) Access.Dpl = 0; /* Kernel-Mode */ Access.SystemSegmentFlag = 0; Access.SegmentType = I386_INTERRUPT_GATE; - + idt = (KIDTENTRY*)((ULONG)KeGetPcr()->IDT + index * sizeof(KIDTENTRY)); idt->Offset = (USHORT)(address & 0xffff); idt->Selector = KGDT_R0_CODE; @@ -909,17 +909,17 @@ VOID HaliInitBSP(VOID) #endif DPRINT("APIC is mapped at 0x%X\n", APICBase); - if (VerifyLocalAPIC()) + if (VerifyLocalAPIC()) { DPRINT("APIC found\n"); - } - else + } + else { DPRINT("No APIC found\n"); ASSERT(FALSE); } - if (APICMode == amPIC) + if (APICMode == amPIC) { EnableApicMode(); } @@ -929,10 +929,10 @@ VOID HaliInitBSP(VOID) #ifdef CONFIG_SMP /* BIOS data segment */ BIOSBase = (PULONG)BIOS_AREA; - + /* Area for communicating with the APs */ CommonBase = (PULONG)COMMON_AREA; - + /* Copy bootstrap code to common area */ memcpy((PVOID)((ULONG_PTR)CommonBase + PAGE_SIZE), &APstart, @@ -944,7 +944,7 @@ VOID HaliInitBSP(VOID) /* Set warm reset vector */ ps = (PUSHORT)((ULONG_PTR)BIOSBase + 0x467); *ps = (COMMON_AREA + PAGE_SIZE) & 0xF; - + ps = (PUSHORT)((ULONG_PTR)BIOSBase + 0x469); *ps = (COMMON_AREA + PAGE_SIZE) >> 4; #endif @@ -975,14 +975,14 @@ HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack) /* Send INIT IPI */ APICSendIPI(Cpu, APIC_DM_INIT|APIC_ICR0_LEVEL_ASSERT); - + KeStallExecutionProcessor(200); /* Deassert INIT */ APICSendIPI(Cpu, APIC_DM_INIT|APIC_ICR0_LEVEL_DEASSERT); - if (APIC_INTEGRATED(CPUMap[Cpu].APICVersion)) + if (APIC_INTEGRATED(CPUMap[Cpu].APICVersion)) { /* Clear APIC errors */ APICWrite(APIC_ESR, 0); @@ -1004,7 +1004,7 @@ HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack) DPRINT("Cpu %d got stack at 0x%X\n", Cpu, Common->Stack); #if 0 - for (j = 0; j < 16; j++) + for (j = 0; j < 16; j++) { Common->Debug[j] = 0; } @@ -1027,7 +1027,7 @@ HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack) /* Wait up to 10ms for IPI to be delivered */ j = 0; - do + do { KeStallExecutionProcessor(10); @@ -1042,7 +1042,7 @@ HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack) /* * Due to the Pentium erratum 3AP. */ - if (maxlvt > 3) + if (maxlvt > 3) { APICRead(APIC_SIVR); APICWrite(APIC_ESR, 0); @@ -1050,30 +1050,30 @@ HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack) AcceptStatus = APICRead(APIC_ESR) & APIC_ESR_MASK; - if (DeliveryStatus || AcceptStatus) + if (DeliveryStatus || AcceptStatus) { break; } } - if (DeliveryStatus) + if (DeliveryStatus) { DPRINT("STARTUP IPI for CPU %d was never delivered.\n", Cpu); } - if (AcceptStatus) + if (AcceptStatus) { DPRINT("STARTUP IPI for CPU %d was never accepted.\n", Cpu); } - if (!(DeliveryStatus || AcceptStatus)) + if (!(DeliveryStatus || AcceptStatus)) { /* Wait no more than 5 seconds for processor to boot */ DPRINT("Waiting for 5 seconds for CPU %d to boot\n", Cpu); /* Wait no more than 5 seconds */ - for (j = 0; j < 50000; j++) + for (j = 0; j < 50000; j++) { if (CPUMap[Cpu].Flags & CPU_ENABLED) { @@ -1083,11 +1083,11 @@ HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack) } } - if (CPUMap[Cpu].Flags & CPU_ENABLED) + if (CPUMap[Cpu].Flags & CPU_ENABLED) { DbgPrint("CPU %d is now running\n", Cpu); - } - else + } + else { DbgPrint("Initialization of CPU %d failed\n", Cpu); } @@ -1095,7 +1095,7 @@ HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack) #if 0 DPRINT("Debug bytes are:\n"); - for (j = 0; j < 4; j++) + for (j = 0; j < 4; j++) { DPRINT("0x%08X 0x%08X 0x%08X 0x%08X.\n", Common->Debug[j*4+0], @@ -1118,15 +1118,15 @@ HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) TrapFrame->EFlags = __readeflags(); TrapFrame->SegCs = KGDT_R0_CODE; TrapFrame->Eip = TrapFrame->Eax; - + /* Build the trap frame */ KiEnterInterruptTrap(TrapFrame); - + /* unimplemented */ UNIMPLEMENTED; - + /* Exit the interrupt */ - KiEoiHelper(TrapFrame); + KiEoiHelper(TrapFrame); } diff --git a/hal/halx86/mp/ioapic.c b/hal/halx86/mp/ioapic.c index bc99c7626a1..d07248013d5 100644 --- a/hal/halx86/mp/ioapic.c +++ b/hal/halx86/mp/ioapic.c @@ -2,8 +2,8 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: hal/halx86/mp/ioapic.c - * PURPOSE: - * PROGRAMMER: + * PURPOSE: + * PROGRAMMER: */ /* INCLUDES *****************************************************************/ @@ -65,7 +65,7 @@ VOID IOAPICWrite(ULONG Apic, ULONG Offset, ULONG Value); */ static ULONG EISA_ELCR_Read(ULONG irq) { - if (irq < 16) + if (irq < 16) { PUCHAR port = (PUCHAR)(0x4d0 + (irq >> 3)); return (READ_PORT_UCHAR(port) >> (irq & 7)) & 1; @@ -74,7 +74,7 @@ static ULONG EISA_ELCR_Read(ULONG irq) return 0; } -static ULONG +static ULONG IRQPolarity(ULONG idx) { ULONG bus = IRQMap[idx].SrcBusId; @@ -92,11 +92,11 @@ IRQPolarity(ULONG idx) case MP_BUS_ISA: /* ISA pin */ polarity = default_ISA_polarity(idx); break; - + case MP_BUS_EISA: /* EISA pin */ polarity = default_EISA_polarity(idx); break; - + case MP_BUS_PCI: /* PCI pin */ polarity = default_PCI_polarity(idx); break; @@ -104,7 +104,7 @@ IRQPolarity(ULONG idx) case MP_BUS_MCA: /* MCA pin */ polarity = default_MCA_polarity(idx); break; - + default: DPRINT("Broken BIOS!!\n"); polarity = 1; @@ -132,7 +132,7 @@ IRQPolarity(ULONG idx) return polarity; } -static ULONG +static ULONG IRQTrigger(ULONG idx) { ULONG bus = IRQMap[idx].SrcBusId; @@ -154,7 +154,7 @@ IRQTrigger(ULONG idx) case MP_BUS_EISA: /* EISA pin */ trigger = default_EISA_trigger(idx); break; - + case MP_BUS_PCI: /* PCI pin */ trigger = default_PCI_trigger(idx); break; @@ -162,7 +162,7 @@ IRQTrigger(ULONG idx) case MP_BUS_MCA: /* MCA pin */ trigger = default_MCA_trigger(idx); break; - + default: DPRINT("Broken BIOS!!\n"); trigger = 1; @@ -182,15 +182,15 @@ IRQTrigger(ULONG idx) case 3: /* level */ trigger = 1; break; - + default: /* invalid */ DPRINT("Broken BIOS!!\n"); - trigger = 0; + trigger = 0; } return trigger; } -static ULONG +static ULONG Pin2Irq(ULONG idx, ULONG apic, ULONG pin) @@ -201,7 +201,7 @@ Pin2Irq(ULONG idx, /* * Debugging check, we are in big trouble if this message pops up! */ - if (IRQMap[idx].DstApicInt != pin) + if (IRQMap[idx].DstApicInt != pin) { DPRINT("broken BIOS or MPTABLE parser, ayiee!!\n"); } @@ -225,7 +225,7 @@ Pin2Irq(ULONG idx, } irq += pin; break; - + default: DPRINT("Unknown bus type %d.\n",bus); irq = 0; @@ -233,7 +233,7 @@ Pin2Irq(ULONG idx, return irq; } -static ULONG +static ULONG AssignIrqVector(ULONG irq) { #if 0 @@ -247,12 +247,12 @@ AssignIrqVector(ULONG irq) return vector; } #if 0 - if (current_vector > FIRST_SYSTEM_VECTOR) + if (current_vector > FIRST_SYSTEM_VECTOR) { vector_offset++; current_vector = FIRST_DEVICE_VECTOR + vector_offset; - } - else if (current_vector == FIRST_SYSTEM_VECTOR) + } + else if (current_vector == FIRST_SYSTEM_VECTOR) { DPRINT1("Ran out of interrupt sources!"); ASSERT(FALSE); @@ -272,7 +272,7 @@ AssignIrqVector(ULONG irq) /* * Find the IRQ entry number of a certain pin. */ -static ULONG +static ULONG IOAPICGetIrqEntry(ULONG apic, ULONG pin, ULONG type) @@ -292,7 +292,7 @@ IOAPICGetIrqEntry(ULONG apic, } -VOID +VOID IOAPICSetupIrqs(VOID) { IOAPIC_ROUTE_ENTRY entry; @@ -303,9 +303,9 @@ IOAPICSetupIrqs(VOID) /* Setup IRQ to vector translation map */ memset(&IRQVectorMap, 0, sizeof(IRQVectorMap)); - for (apic = 0; apic < IOAPICCount; apic++) + for (apic = 0; apic < IOAPICCount; apic++) { - for (pin = 0; pin < IOAPICMap[apic].EntryCount; pin++) + for (pin = 0; pin < IOAPICMap[apic].EntryCount; pin++) { /* * add it to the IO-APIC irq-routing table @@ -320,12 +320,12 @@ IOAPICSetupIrqs(VOID) idx = IOAPICGetIrqEntry(apic,pin,INT_VECTORED); if (idx == (ULONG)-1) { - if (first_notcon) + if (first_notcon) { DPRINT(" IO-APIC (apicid-pin) %d-%d\n", IOAPICMap[apic].ApicId, pin); first_notcon = 0; - } - else + } + else { DPRINT(", %d-%d\n", IOAPICMap[apic].ApicId, pin); } @@ -335,7 +335,7 @@ IOAPICSetupIrqs(VOID) trigger = IRQTrigger(idx); entry.polarity = IRQPolarity(idx); - if (trigger) + if (trigger) { entry.trigger = 1; } @@ -367,7 +367,7 @@ IOAPICSetupIrqs(VOID) } } -static VOID +static VOID IOAPICClearPin(ULONG Apic, ULONG Pin) { IOAPIC_ROUTE_ENTRY Entry; @@ -383,7 +383,7 @@ IOAPICClearPin(ULONG Apic, ULONG Pin) IOAPICWrite(Apic, IOAPIC_REDTBL + 1 + 2 * Pin, *(((PULONG)&Entry) + 1)); } -static VOID +static VOID IOAPICClear(ULONG Apic) { ULONG Pin; @@ -394,7 +394,7 @@ IOAPICClear(ULONG Apic) } } -static VOID +static VOID IOAPICClearAll(VOID) { ULONG Apic; @@ -405,7 +405,7 @@ IOAPICClearAll(VOID) } } -VOID +VOID IOAPICEnable(VOID) { ULONG i, tmp; @@ -416,7 +416,7 @@ IOAPICEnable(VOID) /* * The number of IO-APIC IRQ registers (== #pins): */ - for (i = 0; i < IOAPICCount; i++) + for (i = 0; i < IOAPICCount; i++) { tmp = IOAPICRead(i, IOAPIC_VER); IOAPICMap[i].EntryCount = GET_IOAPIC_MRE(tmp) + 1; @@ -428,32 +428,32 @@ IOAPICEnable(VOID) IOAPICClearAll(); } -VOID +VOID IOAPICSetupIds(VOID) { ULONG tmp, apic, i; UCHAR old_id; - + /* * Set the IOAPIC ID to the value stored in the MPC table. */ - for (apic = 0; apic < IOAPICCount; apic++) + for (apic = 0; apic < IOAPICCount; apic++) { - + /* Read the register 0 value */ tmp = IOAPICRead(apic, IOAPIC_ID); - + old_id = IOAPICMap[apic].ApicId; - - if (IOAPICMap[apic].ApicId >= 0xf) + + if (IOAPICMap[apic].ApicId >= 0xf) { DPRINT1("BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n", apic, IOAPICMap[apic].ApicId); - DPRINT1("... fixing up to %d. (tell your hw vendor)\n", + DPRINT1("... fixing up to %d. (tell your hw vendor)\n", GET_IOAPIC_ID(tmp)); IOAPICMap[apic].ApicId = GET_IOAPIC_ID(tmp); } - + /* * We need to adjust the IRQ routing table * if the ID changed. @@ -468,24 +468,24 @@ IOAPICSetupIds(VOID) } } } - + /* * Read the right value from the MPC table and * write it into the ID register. */ DPRINT("Changing IO-APIC physical APIC ID to %d\n", IOAPICMap[apic].ApicId); - + tmp &= ~IOAPIC_ID_MASK; tmp |= SET_IOAPIC_ID(IOAPICMap[apic].ApicId); IOAPICWrite(apic, IOAPIC_ID, tmp); - + /* * Sanity check */ tmp = IOAPICRead(apic, 0); - if (GET_IOAPIC_ID(tmp) != IOAPICMap[apic].ApicId) + if (GET_IOAPIC_ID(tmp) != IOAPICMap[apic].ApicId) { DPRINT1("Could not set I/O APIC ID!\n"); ASSERT(FALSE); @@ -530,7 +530,7 @@ VOID IOAPICDump(VOID) ULONG reg0, reg1, reg2=0; DbgPrint("Number of MP IRQ sources: %d.\n", IRQCount); - for (i = 0; i < IOAPICCount; i++) + for (i = 0; i < IOAPICCount; i++) { DbgPrint("Number of IO-APIC #%d registers: %d.\n", IOAPICMap[i].ApicId, @@ -543,11 +543,11 @@ VOID IOAPICDump(VOID) */ DbgPrint("Testing the IO APIC.......................\n"); - for (apic = 0; apic < IOAPICCount; apic++) + for (apic = 0; apic < IOAPICCount; apic++) { reg0 = IOAPICRead(apic, IOAPIC_ID); reg1 = IOAPICRead(apic, IOAPIC_VER); - if (GET_IOAPIC_VERSION(reg1) >= 0x10) + if (GET_IOAPIC_VERSION(reg1) >= 0x10) { reg2 = IOAPICRead(apic, IOAPIC_ARB); } @@ -556,7 +556,7 @@ VOID IOAPICDump(VOID) DbgPrint("IO APIC #%d......\n", IOAPICMap[apic].ApicId); DbgPrint(".... register #00: %08X\n", reg0); DbgPrint("....... : physical APIC id: %02X\n", GET_IOAPIC_ID(reg0)); - if (reg0 & 0xF0FFFFFF) + if (reg0 & 0xF0FFFFFF) { DbgPrint(" WARNING: Unexpected IO-APIC\n"); } @@ -571,7 +571,7 @@ VOID IOAPICDump(VOID) (i != 0x1f) && /* dual Xeon boards */ (i != 0x22) && /* bigger Xeon boards */ (i != 0x2E) && - (i != 0x3F)) + (i != 0x3F)) { DbgPrint(" WARNING: Unexpected IO-APIC\n"); } @@ -586,17 +586,17 @@ VOID IOAPICDump(VOID) DbgPrint(" WARNING: Unexpected IO-APIC\n"); } - if (reg1 & 0xFF00FF00) + if (reg1 & 0xFF00FF00) { DbgPrint(" WARNING: Unexpected IO-APIC\n"); } - if (GET_IOAPIC_VERSION(reg1) >= 0x10) + if (GET_IOAPIC_VERSION(reg1) >= 0x10) { DbgPrint(".... register #02: %08X\n", reg2); DbgPrint("....... : arbitration: %02X\n", GET_IOAPIC_ARB(reg2)); - if (reg2 & 0xF0FFFFFF) + if (reg2 & 0xF0FFFFFF) { DbgPrint(" WARNING: Unexpected IO-APIC\n"); } @@ -606,7 +606,7 @@ VOID IOAPICDump(VOID) DbgPrint(" NR Log Phy Mask Trig IRR Pol" " Stat Dest Deli Vect: \n"); - for (i = 0; i <= GET_IOAPIC_MRE(reg1); i++) + for (i = 0; i <= GET_IOAPIC_MRE(reg1); i++) { IOAPIC_ROUTE_ENTRY entry; @@ -644,14 +644,14 @@ HaliReconfigurePciInterrupts(VOID) { DPRINT("%02x: IrqType %02x, IrqFlag %02x, SrcBusId %02x, SrcBusIrq %02x" ", DstApicId %02x, DstApicInt %02x\n", - i, IRQMap[i].IrqType, IRQMap[i].IrqFlag, IRQMap[i].SrcBusId, + i, IRQMap[i].IrqType, IRQMap[i].IrqFlag, IRQMap[i].SrcBusId, IRQMap[i].SrcBusIrq, IRQMap[i].DstApicId, IRQMap[i].DstApicInt); - HalSetBusDataByOffset(PCIConfiguration, - IRQMap[i].SrcBusId, - (IRQMap[i].SrcBusIrq >> 2) & 0x1f, - &IRQMap[i].DstApicInt, - 0x3c /*PCI_INTERRUPT_LINE*/, + HalSetBusDataByOffset(PCIConfiguration, + IRQMap[i].SrcBusId, + (IRQMap[i].SrcBusIrq >> 2) & 0x1f, + &IRQMap[i].DstApicInt, + 0x3c /*PCI_INTERRUPT_LINE*/, 1); } @@ -662,13 +662,13 @@ VOID Disable8259AIrq(ULONG irq) { UCHAR tmp; - if (irq >= 8) + if (irq >= 8) { tmp = READ_PORT_UCHAR((PUCHAR)0xA1); tmp |= (1 << (irq - 8)); WRITE_PORT_UCHAR((PUCHAR)0xA1, tmp); - } - else + } + else { tmp = READ_PORT_UCHAR((PUCHAR)0x21); tmp |= (1 << irq); diff --git a/hal/halx86/mp/mpconfig.c b/hal/halx86/mp/mpconfig.c index 6f3c5dff590..e229d936699 100644 --- a/hal/halx86/mp/mpconfig.c +++ b/hal/halx86/mp/mpconfig.c @@ -2,8 +2,8 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: hal/halx86/mp/mpconfig.c - * PURPOSE: - * PROGRAMMER: + * PURPOSE: + * PROGRAMMER: */ /* INCLUDES *****************************************************************/ @@ -18,7 +18,7 @@ MP_FLOATING_POINTER* Mpf = NULL; /* FUNCTIONS ****************************************************************/ -static UCHAR +static UCHAR MPChecksum(PUCHAR Base, ULONG Size) /* @@ -33,7 +33,7 @@ MPChecksum(PUCHAR Base, return Sum; } -static VOID +static VOID HaliMPIntSrcInfo(PMP_CONFIGURATION_INTSRC m) { DPRINT("Int: type %d, pol %d, trig %d, bus %d," @@ -41,7 +41,7 @@ HaliMPIntSrcInfo(PMP_CONFIGURATION_INTSRC m) m->IrqType, m->IrqFlag & 3, (m->IrqFlag >> 2) & 3, m->SrcBusId, m->SrcBusIrq, m->DstApicId, m->DstApicInt); - if (IRQCount > MAX_IRQ_SOURCE) + if (IRQCount > MAX_IRQ_SOURCE) { DPRINT1("Max # of irq sources exceeded!!\n"); ASSERT(FALSE); @@ -51,7 +51,7 @@ HaliMPIntSrcInfo(PMP_CONFIGURATION_INTSRC m) IRQCount++; } -PCHAR +PCHAR HaliMPFamily(ULONG Family, ULONG Model) { @@ -79,7 +79,7 @@ HaliMPFamily(ULONG Family, } -static VOID +static VOID HaliMPProcessorInfo(PMP_CONFIGURATION_PROCESSOR m) { UCHAR ver; @@ -143,14 +143,14 @@ HaliMPProcessorInfo(PMP_CONFIGURATION_PROCESSOR m) CPUMap[CPUCount].Flags = CPU_USABLE; - if (m->CpuFlags & CPU_FLAG_BSP) + if (m->CpuFlags & CPU_FLAG_BSP) { DPRINT(" Bootup CPU\n"); CPUMap[CPUCount].Flags |= CPU_BSP; BootCPU = m->ApicId; } - if (m->ApicId > MAX_CPU) + if (m->ApicId > MAX_CPU) { DPRINT("Processor #%d INVALID. (Max ID: %d).\n", m->ApicId, MAX_CPU); return; @@ -160,7 +160,7 @@ HaliMPProcessorInfo(PMP_CONFIGURATION_PROCESSOR m) /* * Validate version */ - if (ver == 0x0) + if (ver == 0x0) { DPRINT("BIOS bug, APIC version is 0 for CPU#%d! fixing up to 0x10. (tell your hw vendor)\n", m->ApicId); ver = 0x10; @@ -168,42 +168,42 @@ HaliMPProcessorInfo(PMP_CONFIGURATION_PROCESSOR m) // ApicVersion[m->ApicId] = Ver; // BiosCpuApicId[CPUCount] = m->ApicId; CPUMap[CPUCount].APICVersion = ver; - + CPUCount++; } -static VOID +static VOID HaliMPBusInfo(PMP_CONFIGURATION_BUS m) { static UCHAR CurrentPCIBusId = 0; DPRINT("Bus #%d is %.*s\n", m->BusId, 6, m->BusType); - if (strncmp(m->BusType, BUSTYPE_ISA, sizeof(BUSTYPE_ISA)-1) == 0) + if (strncmp(m->BusType, BUSTYPE_ISA, sizeof(BUSTYPE_ISA)-1) == 0) { BUSMap[m->BusId] = MP_BUS_ISA; - } - else if (strncmp(m->BusType, BUSTYPE_EISA, sizeof(BUSTYPE_EISA)-1) == 0) + } + else if (strncmp(m->BusType, BUSTYPE_EISA, sizeof(BUSTYPE_EISA)-1) == 0) { BUSMap[m->BusId] = MP_BUS_EISA; - } - else if (strncmp(m->BusType, BUSTYPE_PCI, sizeof(BUSTYPE_PCI)-1) == 0) + } + else if (strncmp(m->BusType, BUSTYPE_PCI, sizeof(BUSTYPE_PCI)-1) == 0) { BUSMap[m->BusId] = MP_BUS_PCI; PCIBUSMap[m->BusId] = CurrentPCIBusId; CurrentPCIBusId++; - } - else if (strncmp(m->BusType, BUSTYPE_MCA, sizeof(BUSTYPE_MCA)-1) == 0) + } + else if (strncmp(m->BusType, BUSTYPE_MCA, sizeof(BUSTYPE_MCA)-1) == 0) { BUSMap[m->BusId] = MP_BUS_MCA; - } - else + } + else { DPRINT("Unknown bustype %.*s - ignoring\n", 6, m->BusType); } } -static VOID +static VOID HaliMPIOApicInfo(PMP_CONFIGURATION_IOAPIC m) { if (!(m->ApicFlags & CPU_FLAG_ENABLED)) @@ -211,7 +211,7 @@ HaliMPIOApicInfo(PMP_CONFIGURATION_IOAPIC m) DPRINT("I/O APIC #%d Version %d at 0x%lX.\n", m->ApicId, m->ApicVersion, m->ApicAddress); - if (IOAPICCount > MAX_IOAPIC) + if (IOAPICCount > MAX_IOAPIC) { DPRINT("Max # of I/O APICs (%d) exceeded (found %d).\n", MAX_IOAPIC, IOAPICCount); @@ -226,7 +226,7 @@ HaliMPIOApicInfo(PMP_CONFIGURATION_IOAPIC m) } -static VOID +static VOID HaliMPIntLocalInfo(PMP_CONFIGURATION_INTLOCAL m) { DPRINT("Lint: type %d, pol %d, trig %d, bus %d," @@ -241,12 +241,12 @@ HaliMPIntLocalInfo(PMP_CONFIGURATION_INTLOCAL m) * will show us if this assumptions is false. * Until then we do not have to add baggage. */ - if ((m->IrqType == INT_EXTINT) && (m->DstApicLInt != 0)) + if ((m->IrqType == INT_EXTINT) && (m->DstApicLInt != 0)) { DPRINT1("Invalid MP table!\n"); ASSERT(FALSE); } - if ((m->IrqType == INT_NMI) && (m->DstApicLInt != 1)) + if ((m->IrqType == INT_NMI) && (m->DstApicLInt != 1)) { DPRINT1("Invalid MP table!\n"); ASSERT(FALSE); @@ -267,7 +267,7 @@ HaliReadMPConfigTable(PMP_CONFIGURATION_TABLE Table) if (Table->Signature != MPC_SIGNATURE) { PUCHAR pc = (PUCHAR)&Table->Signature; - + DPRINT1("Bad MP configuration block signature: %c%c%c%c\n", pc[0], pc[1], pc[2], pc[3]); KeBugCheckEx(HAL_INITIALIZATION_FAILED, pc[0], pc[1], pc[2], pc[3]); @@ -291,7 +291,7 @@ HaliReadMPConfigTable(PMP_CONFIGURATION_TABLE Table) if (Table->LocalAPICAddress != APIC_DEFAULT_BASE) { - DPRINT1("APIC base address is at 0x%X. I cannot handle non-standard adresses\n", + DPRINT1("APIC base address is at 0x%X. I cannot handle non-standard adresses\n", Table->LocalAPICAddress); ASSERT(FALSE); return FALSE; @@ -352,7 +352,7 @@ HaliReadMPConfigTable(PMP_CONFIGURATION_TABLE Table) return TRUE; } -static VOID +static VOID HaliConstructDefaultIOIrqMPTable(ULONG Type) { MP_CONFIGURATION_INTSRC intsrc; @@ -386,7 +386,7 @@ HaliConstructDefaultIOIrqMPTable(ULONG Type) HaliMPIntSrcInfo(&intsrc); } -static VOID +static VOID HaliConstructDefaultISAMPTable(ULONG Type) { MP_CONFIGURATION_PROCESSOR processor; @@ -408,7 +408,7 @@ HaliConstructDefaultISAMPTable(ULONG Type) processor.FeatureFlags = 0; processor.Reserved[0] = 0; processor.Reserved[1] = 0; - for (i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { processor.ApicId = i; HaliMPProcessorInfo(&processor); @@ -417,7 +417,7 @@ HaliConstructDefaultISAMPTable(ULONG Type) bus.Type = MPCTE_BUS; bus.BusId = 0; - switch (Type) + switch (Type) { default: DPRINT("Unknown standard configuration %d\n", Type); @@ -436,7 +436,7 @@ HaliConstructDefaultISAMPTable(ULONG Type) memcpy(bus.BusType, "MCA ", 6); } HaliMPBusInfo(&bus); - if (Type > 4) + if (Type > 4) { bus.Type = MPCTE_BUS; bus.BusId = 1; @@ -462,7 +462,7 @@ HaliConstructDefaultISAMPTable(ULONG Type) lintsrc.SrcBusId = 0; lintsrc.SrcBusIrq = 0; lintsrc.DstApicId = MP_APIC_ALL; - for (i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { lintsrc.IrqType = linttypes[i]; lintsrc.DstApicLInt = i; @@ -500,15 +500,15 @@ HaliScanForMPConfigTable(ULONG Base, DPRINT("Intel MultiProcessor Specification v1.%d compliant system.\n", mpf->Specification); - if (mpf->Feature2 & FEATURE2_IMCRP) + if (mpf->Feature2 & FEATURE2_IMCRP) { DPRINT("Running in IMCR and PIC compatibility mode.\n"); - } - else + } + else { DPRINT("Running in Virtual Wire compatibility mode.\n"); } - + switch (mpf->Feature1) { @@ -540,7 +540,7 @@ HaliScanForMPConfigTable(ULONG Base, DPRINT("Unknown standard configuration %d\n", mpf->Feature1); return FALSE; } - Mpf = mpf; + Mpf = mpf; return TRUE; } } @@ -589,7 +589,7 @@ HaliGetSmpConfig(VOID) HaliConstructDefaultIOIrqMPTable(bus.BusId); } - } + } else if(Mpf->Feature1 != 0) { HaliConstructDefaultISAMPTable(Mpf->Feature1); @@ -599,9 +599,9 @@ HaliGetSmpConfig(VOID) ASSERT(FALSE); } return TRUE; -} +} -BOOLEAN +BOOLEAN HaliFindSmpConfig(VOID) { /* @@ -612,13 +612,13 @@ HaliFindSmpConfig(VOID) 4) Scan the first KB from the Extended BIOS Data Area */ - if (!HaliScanForMPConfigTable(0x0, 0x400)) + if (!HaliScanForMPConfigTable(0x0, 0x400)) { - if (!HaliScanForMPConfigTable(0x9FC00, 0x400)) + if (!HaliScanForMPConfigTable(0x9FC00, 0x400)) { - if (!HaliScanForMPConfigTable(0xF0000, 0x10000)) + if (!HaliScanForMPConfigTable(0xF0000, 0x10000)) { - if (!HaliScanForMPConfigTable(*((PUSHORT)0x040E) << 4, 0x400)) + if (!HaliScanForMPConfigTable(*((PUSHORT)0x040E) << 4, 0x400)) { DPRINT("No multiprocessor compliant system found.\n"); return FALSE; diff --git a/hal/halx86/mp/mps.S b/hal/halx86/mp/mps.S index 8e187320fdb..68b40de18e5 100644 --- a/hal/halx86/mp/mps.S +++ b/hal/halx86/mp/mps.S @@ -27,7 +27,7 @@ movl %eax, %gs; \ movl $(KGDT_R0_PCR), %eax; \ movl %eax, %fs; - + #define AFTER \ popl %gs; \ popl %fs; \ @@ -37,7 +37,7 @@ .global _MpsIpiInterrupt _MpsIpiInterrupt: - /* Save registers */ + /* Save registers */ BEFORE /* Call the C handler */ @@ -46,11 +46,11 @@ _MpsIpiInterrupt: /* Return to the caller */ AFTER iret - - + + .globl _MpsErrorInterrupt _MpsErrorInterrupt: - /* Save registers */ + /* Save registers */ BEFORE /* Call the C handler */ @@ -63,7 +63,7 @@ _MpsErrorInterrupt: .globl _MpsSpuriousInterrupt _MpsSpuriousInterrupt: - /* Save registers */ + /* Save registers */ BEFORE /* Call the C handler */ @@ -76,8 +76,8 @@ _MpsSpuriousInterrupt: .global _MpsTimerInterrupt _MpsTimerInterrupt: cld - pusha - movl $0xef,%ebx + pusha + movl $0xef,%ebx pushl %ds pushl %es pushl %fs @@ -102,7 +102,7 @@ _MpsTimerInterrupt: popl %ds popa iret - - - + + + /* EOF */ diff --git a/hal/halx86/mp/processor_mp.c b/hal/halx86/mp/processor_mp.c index 51607b126ee..bb65c707b9e 100644 --- a/hal/halx86/mp/processor_mp.c +++ b/hal/halx86/mp/processor_mp.c @@ -18,7 +18,7 @@ #include KAFFINITY HalpActiveProcessors, HalpDefaultInterruptAffinity; - + /* PRIVATE FUNCTIONS *********************************************************/ VOID @@ -55,7 +55,7 @@ HalInitializeProcessor(ULONG ProcessorNumber, APICSetup(); DPRINT("CPU %d says it is now booted.\n", CPU); - + APICCalibrateTimer(CPU); } diff --git a/ntoskrnl/cc/lazywrite.c b/ntoskrnl/cc/lazywrite.c index 56f8d922df4..607a469d20d 100644 --- a/ntoskrnl/cc/lazywrite.c +++ b/ntoskrnl/cc/lazywrite.c @@ -29,7 +29,7 @@ ULONG CcLazyWriteIos = 0; * - Queue for stuff to be queued after lazy writer is done * - Marker for throttling queues * - Number of ongoing workers - * - Three seconds delay for lazy writer + * - Three seconds delay for lazy writer * - One second delay for lazy writer * - Zero delay for lazy writer * - Number of worker threads diff --git a/ntoskrnl/config/cmboot.c b/ntoskrnl/config/cmboot.c index fc7cbf56fde..2a2a74a534e 100644 --- a/ntoskrnl/config/cmboot.c +++ b/ntoskrnl/config/cmboot.c @@ -144,7 +144,7 @@ CmpFindTagIndex(IN PHHIVE Hive, PCM_KEY_NODE Node; BOOLEAN BufferAllocated; ASSERT(Hive->ReleaseCellRoutine == NULL); - + /* Get the tag */ Value = HvGetCell(Hive, TagCell); ASSERT(Value); @@ -156,12 +156,12 @@ CmpFindTagIndex(IN PHHIVE Hive, ASSERT(Node); OrderCell = CmpFindValueByName(Hive, Node, GroupName); if (OrderCell == HCELL_NIL) return -2; - + /* And read it */ TagValue = HvGetCell(Hive, OrderCell); CmpGetValueData(Hive, TagValue, &Length, (PVOID*)&TagOrder, &BufferAllocated, &OrderCell); ASSERT(TagOrder); - + /* Parse each tag */ for (CurrentTag = 1; CurrentTag <= TagOrder[0]; CurrentTag++) { @@ -173,7 +173,7 @@ CmpFindTagIndex(IN PHHIVE Hive, return CurrentTag; } } - + /* No matches, so assume next to last ordering */ if (BufferAllocated) ExFreePool(TagOrder); return -2; @@ -199,25 +199,25 @@ CmpAddDriverToList(IN PHHIVE Hive, PULONG ErrorControl; PWCHAR Buffer; ASSERT(Hive->ReleaseCellRoutine == NULL); - + /* Allocate a driver node and initialize it */ DriverNode = CmpAllocate(sizeof(BOOT_DRIVER_NODE), FALSE, TAG_CM); if (!DriverNode) return FALSE; DriverEntry = &DriverNode->ListEntry; DriverEntry->RegistryPath.Buffer = NULL; DriverEntry->FilePath.Buffer = NULL; - + /* Get the driver cell */ Node = HvGetCell(Hive, DriverCell); ASSERT(Node); - + /* Get the name from the cell */ DriverNode->Name.Length = Node->Flags & KEY_COMP_NAME ? CmpCompressedNameSize(Node->Name, Node->NameLength) : Node->NameLength; DriverNode->Name.MaximumLength = DriverNode->Name.Length; NameLength = DriverNode->Name.Length; - + /* Now allocate the buffer for it and copy the name */ DriverNode->Name.Buffer = CmpAllocate(NameLength, FALSE, TAG_CM); if (!DriverNode->Name.Buffer) return FALSE; @@ -234,7 +234,7 @@ CmpAddDriverToList(IN PHHIVE Hive, /* Normal name */ RtlCopyMemory(DriverNode->Name.Buffer, Node->Name, Node->NameLength); } - + /* Now find the image path */ RtlInitUnicodeString(&UnicodeString, L"ImagePath"); ValueCell = CmpFindValueByName(Hive, Node, &UnicodeString); @@ -242,7 +242,7 @@ CmpAddDriverToList(IN PHHIVE Hive, { /* Couldn't find it, so assume the drivers path */ Length = sizeof(L"System32\\Drivers\\") + NameLength + sizeof(L".sys"); - + /* Allocate the path name */ FileName = &DriverEntry->FilePath; FileName->Length = 0; @@ -266,26 +266,26 @@ CmpAddDriverToList(IN PHHIVE Hive, Buffer = (PWCHAR)CmpValueToData(Hive, Value, &Length); FileName->MaximumLength = FileName->Length = (USHORT)Length; FileName->Buffer = CmpAllocate(Length, FALSE, TAG_CM); - + /* Transfer the data */ if (!(FileName->Buffer) || !(Buffer)) return FALSE; RtlCopyMemory(FileName->Buffer, Buffer, Length); } - + /* Now build the registry path */ RegistryString = &DriverEntry->RegistryPath; RegistryString->Length = 0; RegistryString->MaximumLength = RegistryPath->Length + NameLength; RegistryString->Buffer = CmpAllocate(RegistryString->MaximumLength, FALSE, TAG_CM); if (!RegistryString->Buffer) return FALSE; - + /* Add the driver name to it */ RtlAppendUnicodeStringToString(RegistryString, RegistryPath); RtlAppendUnicodeStringToString(RegistryString, &DriverNode->Name); - + /* The entry is done, add it */ InsertHeadList(BootDriverListHead, &DriverEntry->Link); - + /* Now find error control settings */ RtlInitUnicodeString(&UnicodeString, L"ErrorControl"); ValueCell = CmpFindValueByName(Hive, Node, &UnicodeString); @@ -303,7 +303,7 @@ CmpAddDriverToList(IN PHHIVE Hive, ASSERT(ErrorControl); DriverNode->ErrorControl = *ErrorControl; } - + /* Next, get the group cell */ RtlInitUnicodeString(&UnicodeString, L"group"); ValueCell = CmpFindValueByName(Hive, Node, &UnicodeString); @@ -317,14 +317,14 @@ CmpAddDriverToList(IN PHHIVE Hive, /* Found it, read the group value */ Value = HvGetCell(Hive, ValueCell); ASSERT(Value); - + /* Copy it into the node */ DriverNode->Group.Buffer = (PWCHAR)CmpValueToData(Hive, Value, &Length); if (!DriverNode->Group.Buffer) return FALSE; DriverNode->Group.Length = (USHORT)Length - sizeof(UNICODE_NULL); DriverNode->Group.MaximumLength = DriverNode->Group.Length; } - + /* Finally, find the tag */ RtlInitUnicodeString(&UnicodeString, L"Tag"); TagCell = CmpFindValueByName(Hive, Node, &UnicodeString); @@ -341,7 +341,7 @@ CmpAddDriverToList(IN PHHIVE Hive, GroupOrderCell, &DriverNode->Group); } - + /* All done! */ return TRUE; } @@ -366,13 +366,13 @@ CmpIsLoadType(IN PHHIVE Hive, ASSERT(Node); ValueCell = CmpFindValueByName(Hive, Node, &ValueString); if (ValueCell == HCELL_NIL) return FALSE; - + /* Read the start value */ Value = HvGetCell(Hive, ValueCell); ASSERT(Value); Data = (PLONG)CmpValueToData(Hive, Value, &Length); ASSERT(Data); - + /* Return if the type matches */ return (*Data == LoadType); } @@ -395,11 +395,11 @@ CmpFindDrivers(IN PHHIVE Hive, PBOOT_DRIVER_NODE FsNode; PCM_KEY_NODE ControlNode, ServicesNode, Node; ASSERT(Hive->ReleaseCellRoutine == NULL); - + /* Open the control set key */ ControlNode = HvGetCell(Hive, ControlSet); ASSERT(ControlNode); - + /* Get services cell */ RtlInitUnicodeString(&Name, L"Services"); ServicesCell = CmpFindSubKeyByName(Hive, ControlNode, &Name); @@ -408,12 +408,12 @@ CmpFindDrivers(IN PHHIVE Hive, /* Open services key */ ServicesNode = HvGetCell(Hive, ServicesCell); ASSERT(ServicesNode); - + /* Get control cell */ RtlInitUnicodeString(&Name, L"Control"); ControlCell = CmpFindSubKeyByName(Hive, ControlNode, &Name); if (ControlCell == HCELL_NIL) return FALSE; - + /* Get the group order cell and read it */ RtlInitUnicodeString(&Name, L"GroupOrderList"); Node = HvGetCell(Hive, ControlCell); @@ -449,7 +449,7 @@ CmpFindDrivers(IN PHHIVE Hive, /* Build the root registry path */ RtlInitEmptyUnicodeString(&KeyPath, Buffer, sizeof(Buffer)); RtlAppendUnicodeToString(&KeyPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); - + /* Find the first subkey (ie: the first driver or service) */ i = 0; DriverCell = CmpFindSubKeyByNumber(Hive, ServicesNode, i); @@ -465,13 +465,13 @@ CmpFindDrivers(IN PHHIVE Hive, GroupOrderCell, &KeyPath, DriverListHead); - + } - + /* Try the next subkey */ DriverCell = CmpFindSubKeyByNumber(Hive, ServicesNode, ++i); } - + /* Check if we have a boot file system */ if (BootFileSystem) { @@ -486,7 +486,7 @@ CmpFindDrivers(IN PHHIVE Hive, GroupOrderCell, &KeyPath, DriverListHead); - + /* Mark it as critical so it always loads */ FsNode = CONTAINING_RECORD(DriverListHead->Flink, BOOT_DRIVER_NODE, @@ -494,7 +494,7 @@ CmpFindDrivers(IN PHHIVE Hive, FsNode->ErrorControl = SERVICE_ERROR_CRITICAL; } } - + /* We're done! */ return TRUE; } @@ -509,7 +509,7 @@ CmpDoSort(IN PLIST_ENTRY DriverListHead, PLIST_ENTRY NextEntry; UNICODE_STRING GroupName; PBOOT_DRIVER_NODE CurrentNode; - + /* We're going from end to start, so get to the last group and keep going */ Current = &OrderList->Buffer[OrderList->Length / sizeof(WCHAR)]; while (Current > OrderList->Buffer) @@ -534,10 +534,10 @@ CmpDoSort(IN PLIST_ENTRY DriverListHead, CurrentNode = CONTAINING_RECORD(NextEntry, BOOT_DRIVER_NODE, ListEntry.Link); - + /* Get the next entry now since we'll do a relink */ NextEntry = CurrentNode->ListEntry.Link.Flink; - + /* Is there a group name and does it match the current group? */ if ((CurrentNode->Group.Buffer) && (RtlEqualUnicodeString(&GroupName, &CurrentNode->Group, TRUE))) @@ -547,11 +547,11 @@ CmpDoSort(IN PLIST_ENTRY DriverListHead, InsertHeadList(DriverListHead, &CurrentNode->ListEntry.Link); } } - + /* Move on */ Current--; } - + /* All done */ return TRUE; } @@ -590,17 +590,17 @@ CmpSortDriverList(IN PHHIVE Hive, RtlInitUnicodeString(&Name, L"list"); ListCell = CmpFindValueByName(Hive, Node, &Name); if (ListCell == HCELL_NIL) return FALSE; - + /* Now read the actual list */ ListNode = HvGetCell(Hive, ListCell); ASSERT(ListNode); if (ListNode->Type != REG_MULTI_SZ) return FALSE; - + /* Copy it into a buffer */ DependList.Buffer = (PWCHAR)CmpValueToData(Hive, ListNode, &Length); if (!DependList.Buffer) return FALSE; DependList.Length = DependList.MaximumLength = (USHORT)Length - sizeof(UNICODE_NULL); - + /* And start the recurive sort algorithm */ return CmpDoSort(DriverListHead, &DependList); } @@ -613,23 +613,23 @@ CmpOrderGroup(IN PBOOT_DRIVER_NODE StartNode, { PBOOT_DRIVER_NODE CurrentNode, PreviousNode; PLIST_ENTRY ListEntry; - + /* Base case, nothing to do */ if (StartNode == EndNode) return TRUE; - + /* Loop the nodes */ CurrentNode = StartNode; do { /* Save this as the previous node */ PreviousNode = CurrentNode; - + /* And move to the next one */ ListEntry = CurrentNode->ListEntry.Link.Flink; CurrentNode = CONTAINING_RECORD(ListEntry, BOOT_DRIVER_NODE, ListEntry.Link); - + /* Check if the previous driver had a bigger tag */ if (PreviousNode->Tag > CurrentNode->Tag) { @@ -642,10 +642,10 @@ CmpOrderGroup(IN PBOOT_DRIVER_NODE StartNode, BOOT_DRIVER_NODE, ListEntry.Link); } - + /* Remove this driver since we need to move it */ RemoveEntryList(&CurrentNode->ListEntry.Link); - + /* Keep looping until we find a driver with a lower tag than ours */ while ((PreviousNode->Tag > CurrentNode->Tag) && (PreviousNode != StartNode)) { @@ -655,15 +655,15 @@ CmpOrderGroup(IN PBOOT_DRIVER_NODE StartNode, BOOT_DRIVER_NODE, ListEntry.Link); } - + /* Do the insert in the new location */ InsertTailList(&PreviousNode->ListEntry.Link, &CurrentNode->ListEntry.Link); - + /* Update the head, if needed */ if (PreviousNode == StartNode) StartNode = CurrentNode; } } while (CurrentNode != EndNode); - + /* All done */ return TRUE; } @@ -675,7 +675,7 @@ CmpResolveDriverDependencies(IN PLIST_ENTRY DriverListHead) { PLIST_ENTRY NextEntry; PBOOT_DRIVER_NODE StartNode, EndNode, CurrentNode; - + /* Loop the list */ NextEntry = DriverListHead->Flink; while (NextEntry != DriverListHead) @@ -690,16 +690,16 @@ CmpResolveDriverDependencies(IN PLIST_ENTRY DriverListHead) EndNode = CONTAINING_RECORD(NextEntry, BOOT_DRIVER_NODE, ListEntry.Link); - + /* Get the next entry */ NextEntry = NextEntry->Flink; CurrentNode = CONTAINING_RECORD(NextEntry, BOOT_DRIVER_NODE, ListEntry.Link); - + /* If the next entry is back to the top, break out */ if (NextEntry == DriverListHead) break; - + /* Otherwise, check if this entry is equal */ if (!RtlEqualUnicodeString(&StartNode->Group, &CurrentNode->Group, @@ -709,11 +709,11 @@ CmpResolveDriverDependencies(IN PLIST_ENTRY DriverListHead) break; } } while (NextEntry != DriverListHead); - + /* Now we have the correct start and end pointers, so do the sort */ CmpOrderGroup(StartNode, EndNode); } - + /* We're done */ return TRUE; } diff --git a/ntoskrnl/config/cmhvlist.c b/ntoskrnl/config/cmhvlist.c index 1925bc580fe..7ff6b6bfbcf 100644 --- a/ntoskrnl/config/cmhvlist.c +++ b/ntoskrnl/config/cmhvlist.c @@ -193,7 +193,7 @@ CmpAddToHiveFileList(IN PCMHIVE Hive) Status = STATUS_INSUFFICIENT_RESOURCES; goto Quickie; } - + /* Try to get the value */ Status = ZwQueryObject(Hive->FileHandles[HFILE_TYPE_PRIMARY], ObjectNameInformation, diff --git a/ntoskrnl/config/cmnotify.c b/ntoskrnl/config/cmnotify.c index c401c72ab8e..000154f09d6 100644 --- a/ntoskrnl/config/cmnotify.c +++ b/ntoskrnl/config/cmnotify.c @@ -33,4 +33,4 @@ CmpFlushNotify(IN PCM_KEY_BODY KeyBody, /* FIXME: TODO */ return; } - + diff --git a/ntoskrnl/config/cmparse.c b/ntoskrnl/config/cmparse.c index c5376cf083d..2fb6a997f71 100644 --- a/ntoskrnl/config/cmparse.c +++ b/ntoskrnl/config/cmparse.c @@ -128,7 +128,7 @@ CmpGetSymbolicLink(IN PHHIVE Hive, /* Add the remaining name if needed */ if (RemainingName) Length += RemainingName->Length + sizeof(WCHAR); - + /* Check for overflow */ if (Length > 0xFFFF) goto Exit; @@ -138,7 +138,7 @@ CmpGetSymbolicLink(IN PHHIVE Hive, /* We do -- allocate one */ NewBuffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); if (!NewBuffer) goto Exit; - + /* Setup the new string and copy the symbolic target */ NewObjectName.Buffer = NewBuffer; NewObjectName.MaximumLength = (USHORT)Length; @@ -279,7 +279,7 @@ CmpDoCreateChild(IN PHHIVE Hive, 0, Object); if (!NT_SUCCESS(Status)) goto Quickie; - + /* Setup the key body */ KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->Type = CM_KEY_BODY_TYPE; @@ -693,12 +693,12 @@ CmpDoOpen(IN PHHIVE Hive, if (NT_SUCCESS(Status)) { /* Get the key body and fill it out */ - KeyBody = (PCM_KEY_BODY)(*Object); + KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->KeyControlBlock = Kcb; KeyBody->Type = CM_KEY_BODY_TYPE; KeyBody->ProcessID = PsGetCurrentProcessId(); KeyBody->NotifyBlock = NULL; - + /* Link to the KCB */ EnlistKeyBodyWithKCB(KeyBody, 0); @@ -901,7 +901,7 @@ CmpCreateLinkNode(IN PHHIVE Hive, /* Fail */ ASSERT(FALSE); Status = STATUS_INSUFFICIENT_RESOURCES; - goto Exit; + goto Exit; } /* Now add the subkey */ @@ -1066,7 +1066,7 @@ CmpParseKey(IN PVOID ParseObject, /* Copy the remaining name */ Current = *RemainingName; - + /* Check if this is a create */ if (!(ParseContext) || !(ParseContext->CreateOperation)) { diff --git a/ntoskrnl/config/cmquota.c b/ntoskrnl/config/cmquota.c index 786bef9c81a..5acf88ffcd4 100644 --- a/ntoskrnl/config/cmquota.c +++ b/ntoskrnl/config/cmquota.c @@ -14,7 +14,7 @@ BOOLEAN CmpGlobalQuota; BOOLEAN CmpGlobalQuotaAllowed; - + /* FUNCTIONS *****************************************************************/ VOID diff --git a/ntoskrnl/config/cmvalche.c b/ntoskrnl/config/cmvalche.c index 07190266e92..fe82bea8163 100644 --- a/ntoskrnl/config/cmvalche.c +++ b/ntoskrnl/config/cmvalche.c @@ -80,7 +80,7 @@ CmpGetValueListFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, CellToRelease = ChildList->ValueList; *CellData = (PCELL_DATA)HvGetCell(Hive, CellToRelease); if (!(*CellData)) return SearchFail; - + /* FIXME: Here we would cache the value */ /* Return the cell to be released */ @@ -725,26 +725,26 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, /* We need the exclusive lock */ return SearchNeedExclusiveLock; } - + /* Otherwise, get the key node */ KeyNode = (PCM_KEY_NODE)HvGetCell(Kcb->KeyHive, Kcb->KeyCell); if (!KeyNode) return SearchFail; - + /* Cleanup the KCB cache */ CmpCleanUpKcbValueCache(Kcb); - + /* Sanity checks */ ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); - + /* Set the value cache */ Kcb->ValueCache.Count = KeyNode->ValueList.Count; Kcb->ValueCache.ValueList = KeyNode->ValueList.List; - + /* Release the cell */ HvReleaseCell(Kcb->KeyHive, Kcb->KeyCell); } - + /* Do the search */ SearchResult = CmpFindValueByNameFromCache(Kcb, ValueName, @@ -765,7 +765,7 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, { /* Sanity check */ ASSERT(Value); - + /* First of all, check if the key size and type matches */ if ((Type == Value->Type) && (DataSize == (Value->DataLength & ~CM_KEY_VALUE_SPECIAL_SIZE))) @@ -795,7 +795,7 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, goto Quickie; } } - + /* Now check the data size */ if (DataSize) { @@ -810,7 +810,7 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, /* It's equal */ CompareResult = 0; } - + /* Now check if the compare wasn't equal */ if (CompareResult != DataSize) SearchResult = SearchFail; } @@ -824,10 +824,10 @@ CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, Quickie: /* Release the value cell */ if (ValueCellToRelease) HvReleaseCell(Kcb->KeyHive, ValueCellToRelease); - + /* Free the buffer */ if (BufferAllocated) CmpFree(Buffer, 0); - + /* Free the cell */ if (CellToRelease) HvReleaseCell(Kcb->KeyHive, CellToRelease); diff --git a/ntoskrnl/dbgk/dbgkobj.c b/ntoskrnl/dbgk/dbgkobj.c index b7ae8cfd93a..2175db14594 100644 --- a/ntoskrnl/dbgk/dbgkobj.c +++ b/ntoskrnl/dbgk/dbgkobj.c @@ -1424,7 +1424,7 @@ DbgkClearProcessDebugObject(IN PEPROCESS Process, /* Get the Process Debug Object */ DebugObject = Process->DebugPort; - /* + /* * Check if the process had an object and it matches, * or if the process had an object but none was specified * (in which we are called from NtTerminateProcess) diff --git a/ntoskrnl/ex/exintrin.c b/ntoskrnl/ex/exintrin.c index 6408df9aa29..2666c890231 100644 --- a/ntoskrnl/ex/exintrin.c +++ b/ntoskrnl/ex/exintrin.c @@ -35,7 +35,7 @@ InterlockedIncrement(IN LONG volatile *Addend) // // Call the intrinsic // - return _InterlockedIncrement(Addend); + return _InterlockedIncrement(Addend); } /* @@ -122,7 +122,7 @@ ProbeForRead(IN CONST VOID *Address, /* Incorrect alignment */ ExRaiseDatatypeMisalignment(); } - + /* Get the end address */ Last = Current + Length - 1; if ((Last < Current) || (Last >= (ULONG_PTR)MmUserProbeAddress)) diff --git a/ntoskrnl/ex/hdlsterm.c b/ntoskrnl/ex/hdlsterm.c index b6b68425ebf..b4fd7b949f6 100644 --- a/ntoskrnl/ex/hdlsterm.c +++ b/ntoskrnl/ex/hdlsterm.c @@ -132,7 +132,7 @@ HdlspPutString(IN PUCHAR String) /* Add the modified char to the temporary buffer */ *Dest++ = Char; } - + /* Check the next char */ String++; } @@ -598,7 +598,7 @@ HeadlessDispatch(IN HEADLESS_CMD Command, } /* Do the real work */ - return HdlspDispatch(Command, + return HdlspDispatch(Command, InputBuffer, InputBufferSize, OutputBuffer, diff --git a/ntoskrnl/ex/resource.c b/ntoskrnl/ex/resource.c index d64de3b28d4..bf6fd82d58d 100644 --- a/ntoskrnl/ex/resource.c +++ b/ntoskrnl/ex/resource.c @@ -433,11 +433,11 @@ ExpFindFreeEntry(IN PERESOURCE Resource, { /* Move to the next one */ Owner++; - + /* Check if the entry is free */ if (Owner == Limit) goto Expand; } - + /* Update the resource entry */ KeGetCurrentThread()->ResourceIndex = (UCHAR)(Owner - Resource->OwnerTable); } @@ -521,21 +521,21 @@ ExpFindEntryForThread(IN PERESOURCE Resource, /* Move to the next one */ Owner++; - + /* Check if the entry is free */ if (Owner == Limit) goto Expand; } - + /* Update the resource entry */ KeGetCurrentThread()->ResourceIndex = (UCHAR)(Owner - Resource->OwnerTable); return Owner; - } + } else { Expand: /* Check if it's OK to do an expansion */ if (!LockHandle) return NULL; - + /* If we found a free entry by now, return it */ if (FreeEntry) { @@ -543,7 +543,7 @@ Expand: KeGetCurrentThread()->ResourceIndex = (UCHAR)(FreeEntry - Resource->OwnerTable); return FreeEntry; } - + /* No free entry, expand the table */ ExpExpandResourceOwnerTable(Resource, LockHandle); return NULL; @@ -792,7 +792,7 @@ ExAcquireResourceExclusiveLite(IN PERESOURCE Resource, TryAcquire: if (Resource->ActiveEntries) { - /* Check if it's exclusively owned, and we own it */ + /* Check if it's exclusively owned, and we own it */ if ((IsOwnedExclusive(Resource)) && (Resource->OwnerEntry.OwnerThread == Thread)) { @@ -912,12 +912,12 @@ ExAcquireResourceSharedLite(IN PERESOURCE Resource, { /* Increase the owning count */ Resource->OwnerEntry.OwnerCount++; - + /* Release the lock and return */ ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } - + /* Find a free entry */ Owner = ExpFindFreeEntry(Resource, &LockHandle); if (!Owner) continue; @@ -931,26 +931,26 @@ ExAcquireResourceSharedLite(IN PERESOURCE Resource, &LockHandle, FirstEntryBusy); if (!Owner) continue; - + /* Is it us? */ if (Owner->OwnerThread == Thread) { /* Increase acquire count and return */ Owner->OwnerCount++; ASSERT(Owner->OwnerCount != 0); - + /* Release the lock and return */ ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } - + /* Try to find if there are exclusive waiters */ if (!FirstEntryBusy) { /* There are none, so acquire it */ Owner->OwnerThread = Thread; Owner->OwnerCount = 1; - + /* Check how many active entries we had */ if (Resource->ActiveEntries == 0) { @@ -963,15 +963,15 @@ ExAcquireResourceSharedLite(IN PERESOURCE Resource, { /* Increase active entries */ ASSERT(Resource->ActiveCount == 1); - Resource->ActiveEntries++; + Resource->ActiveEntries++; } - + /* Release the lock and return */ ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } } - + /* If we got here, then we need to wait. Are we allowed? */ if (!Wait) { @@ -979,7 +979,7 @@ ExAcquireResourceSharedLite(IN PERESOURCE Resource, ExReleaseResourceLock(Resource, &LockHandle); return FALSE; } - + /* Check if we have a shared waiters semaphore */ if (!Resource->SharedWaiters) { @@ -992,7 +992,7 @@ ExAcquireResourceSharedLite(IN PERESOURCE Resource, break; } } - + /* Did we get here because we don't have active entries? */ if (Resource->ActiveEntries == 0) { @@ -1003,7 +1003,7 @@ ExAcquireResourceSharedLite(IN PERESOURCE Resource, Resource->ActiveCount = 1; Resource->OwnerEntry.OwnerThread = Thread; Resource->OwnerEntry.OwnerCount = 1; - + /* Release the lock and return */ ExReleaseResourceLock(Resource, &LockHandle); return TRUE; @@ -1088,7 +1088,7 @@ TryAcquire: Resource->ActiveEntries = 1; Resource->OwnerEntry.OwnerThread = Thread; Resource->OwnerEntry.OwnerCount = 1; - + /* Release the lock and return */ ExReleaseResourceLock(Resource, &LockHandle); return TRUE; @@ -1146,7 +1146,7 @@ TryAcquire: { /* Increase active entries */ ASSERT(Resource->ActiveCount == 1); - Resource->ActiveEntries++; + Resource->ActiveEntries++; } /* Release the lock and return */ @@ -1345,9 +1345,9 @@ TryAcquire: { /* Increase active entries */ ASSERT(Resource->ActiveCount == 1); - Resource->ActiveEntries++; + Resource->ActiveEntries++; } - + /* Release the lock and return */ ExReleaseResourceLock(Resource, &LockHandle); return TRUE; @@ -1409,7 +1409,7 @@ ExConvertExclusiveToSharedLite(IN PERESOURCE Resource) ExpVerifyResource(Resource); ASSERT(IsOwnedExclusive(Resource)); ASSERT(Resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread()); - + /* Lock the resource */ ExAcquireResourceLock(Resource, &LockHandle); @@ -1685,7 +1685,7 @@ ExIsResourceAcquiredSharedLite(IN PERESOURCE Resource) /* Lock the resource */ ExAcquireResourceLock(Resource, &LockHandle); - + /* Not in the list, do a full table look up */ Owner = Resource->OwnerTable; if (Owner) @@ -1693,7 +1693,7 @@ ExIsResourceAcquiredSharedLite(IN PERESOURCE Resource) /* Get the resource index */ i = ((PKTHREAD)Thread)->ResourceIndex; Size = Owner->TableSize; - + /* Check if the index is valid and check if we don't match */ if ((i >= Size) || (Owner[i].OwnerThread != Thread)) { @@ -1702,7 +1702,7 @@ ExIsResourceAcquiredSharedLite(IN PERESOURCE Resource) { /* Move to next owner */ Owner++; - + /* Try to find a match */ if (Owner->OwnerThread == Thread) { @@ -1718,7 +1718,7 @@ ExIsResourceAcquiredSharedLite(IN PERESOURCE Resource) Count = Owner[i].OwnerCount; } } - + /* Release the lock */ ExReleaseResourceLock(Resource, &LockHandle); } @@ -1875,18 +1875,18 @@ ExReleaseResourceForThreadLite(IN PERESOURCE Resource, /* Decrement the number of active entries */ ASSERT(Resource->ActiveEntries == 1); Resource->ActiveEntries--; - + /* Check if there are shared waiters */ if (IsSharedWaiting(Resource)) { /* Remove the exclusive flag */ Resource->Flag &= ~ResourceOwnedExclusive; - + /* Give ownage to another thread */ Count = Resource->NumberOfSharedWaiters; Resource->ActiveEntries = Count; Resource->NumberOfSharedWaiters = 0; - + /* Release lock and let someone else have it */ ASSERT(Resource->ActiveCount == 1); ExReleaseResourceLock(Resource, &LockHandle); @@ -1900,7 +1900,7 @@ ExReleaseResourceForThreadLite(IN PERESOURCE Resource, Resource->OwnerEntry.OwnerCount = 1; Resource->ActiveEntries = 1; Resource->NumberOfExclusiveWaiters--; - + /* Release the lock and give it away */ ASSERT(Resource->ActiveCount == 1); ExReleaseResourceLock(Resource, &LockHandle); @@ -1908,7 +1908,7 @@ ExReleaseResourceForThreadLite(IN PERESOURCE Resource, (PKTHREAD*)&Resource->OwnerEntry.OwnerThread); return; } - + /* Remove the exclusive flag */ Resource->Flag &= ~ResourceOwnedExclusive; Resource->ActiveCount = 0; @@ -2001,7 +2001,7 @@ ExReleaseResourceForThreadLite(IN PERESOURCE Resource, (PKTHREAD*)&Resource->OwnerEntry.OwnerThread); return; } - + /* Clear the active count */ Resource->ActiveCount = 0; } diff --git a/ntoskrnl/ex/xipdisp.c b/ntoskrnl/ex/xipdisp.c index fec7600c654..c93abeb2c1d 100644 --- a/ntoskrnl/ex/xipdisp.c +++ b/ntoskrnl/ex/xipdisp.c @@ -82,7 +82,7 @@ XIPInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Find the XIP memory descriptor */ XipDescriptor = XIPpFindMemoryDescriptor(LoaderBlock); if (!XipDescriptor) return; - + // // Make sure this is really XIP, and not RAM Disk -- also validate XIP // Basically, either this is a ROM boot or a RAM boot, but not both nor none diff --git a/ntoskrnl/fsrtl/dbcsname.c b/ntoskrnl/fsrtl/dbcsname.c index 362549e30b7..1a30c6209f3 100644 --- a/ntoskrnl/fsrtl/dbcsname.c +++ b/ntoskrnl/fsrtl/dbcsname.c @@ -101,7 +101,7 @@ FsRtlDissectDbcs(IN ANSI_STRING Name, * @name FsRtlDoesDbcsContainWildCards * @implemented * - * Returns TRUE if the given DbcsName contains wildcards such as *, ?, + * Returns TRUE if the given DbcsName contains wildcards such as *, ?, * ANSI_DOS_STAR, ANSI_DOS_DOT, and ANSI_DOS_QM * * @param Name @@ -445,7 +445,7 @@ Exit: * The filename to check. It can also contains pathname. * * @param WildCardsPermissible - * If this is set to FALSE and if filename contains wildcard, the function + * If this is set to FALSE and if filename contains wildcard, the function * will fail * * @param PathNamePermissible @@ -617,7 +617,7 @@ FsRtlIsFatDbcsLegal(IN ANSI_STRING DbcsName, * The filename to check. It can also contains pathname. * * @param WildCardsPermissible - * If this is set to FALSE and if filename contains wildcard, the function + * If this is set to FALSE and if filename contains wildcard, the function * will fail * * @param PathNamePermissible diff --git a/ntoskrnl/fsrtl/filelock.c b/ntoskrnl/fsrtl/filelock.c index 9cb46e0d301..f92f9397c96 100644 --- a/ntoskrnl/fsrtl/filelock.c +++ b/ntoskrnl/fsrtl/filelock.c @@ -16,7 +16,7 @@ PAGED_LOOKASIDE_LIST FsRtlFileLockLookasideList; -/* Note: this aligns the two types of lock entry structs so we can access the +/* Note: this aligns the two types of lock entry structs so we can access the FILE_LOCK_INFO part in common. Add elements after Shared if new stuff is needed. */ typedef union _COMBINED_LOCK_ELEMENT @@ -102,17 +102,17 @@ static RTL_GENERIC_COMPARE_RESULTS NTAPI LockCompare return GenericEqual; /* Otherwise, key on the starting byte */ Result = - (A->Exclusive.FileLock.StartingByte.QuadPart < + (A->Exclusive.FileLock.StartingByte.QuadPart < B->Exclusive.FileLock.StartingByte.QuadPart) ? GenericLessThan : - (A->Exclusive.FileLock.StartingByte.QuadPart > + (A->Exclusive.FileLock.StartingByte.QuadPart > B->Exclusive.FileLock.StartingByte.QuadPart) ? GenericGreaterThan : GenericEqual; #if 0 DPRINT("Compare(%x:%x) %x-%x to %x-%x => %d\n", A,B, - A->Exclusive.FileLock.StartingByte.LowPart, + A->Exclusive.FileLock.StartingByte.LowPart, A->Exclusive.FileLock.EndingByte.LowPart, - B->Exclusive.FileLock.StartingByte.LowPart, + B->Exclusive.FileLock.StartingByte.LowPart, B->Exclusive.FileLock.EndingByte.LowPart, Result); #endif @@ -138,7 +138,7 @@ static VOID NTAPI LockRemoveIrp(PIO_CSQ Csq, PIRP Irp) static PIRP NTAPI LockPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) { - // Context will be a COMBINED_LOCK_ELEMENT. We're looking for a + // Context will be a COMBINED_LOCK_ELEMENT. We're looking for a // lock that can be acquired, now that the lock matching PeekContext // has been removed. COMBINED_LOCK_ELEMENT LockElement; @@ -152,7 +152,7 @@ static PIRP NTAPI LockPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) } else Following = Irp->Tail.Overlay.ListEntry.Flink; - + DPRINT("ListEntry %p Head %p\n", Following, &LockInfo->CsqList); for (; Following != &LockInfo->CsqList; @@ -163,10 +163,10 @@ static PIRP NTAPI LockPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) Irp = CONTAINING_RECORD(Following, IRP, Tail.Overlay.ListEntry); DPRINT("Irp %p\n", Irp); IoStack = IoGetCurrentIrpStackLocation(Irp); - LockElement.Exclusive.FileLock.StartingByte = + LockElement.Exclusive.FileLock.StartingByte = IoStack->Parameters.LockControl.ByteOffset; - LockElement.Exclusive.FileLock.EndingByte.QuadPart = - LockElement.Exclusive.FileLock.StartingByte.QuadPart + + LockElement.Exclusive.FileLock.EndingByte.QuadPart = + LockElement.Exclusive.FileLock.StartingByte.QuadPart + IoStack->Parameters.LockControl.Length->QuadPart; /* If a context was specified, it's a range to check to unlock */ if (WhereUnlock) @@ -234,7 +234,7 @@ FsRtlCompleteLockIrpReal(IN PCOMPLETE_LOCK_IRP_ROUTINE CompleteRoutine, { /* Check if we have a file object */ if (FileObject) FileObject->LastLock = NULL; - + /* Set the I/O Status and do completion */ Irp->IoStatus.Status = Status; DPRINT("Calling completion routine %p Status %x\n", Irp, Status); @@ -275,7 +275,7 @@ FsRtlpExpandLockElement if (ToExpand->Exclusive.FileLock.StartingByte.QuadPart > Conflict->Exclusive.FileLock.StartingByte.QuadPart) { - ToExpand->Exclusive.FileLock.StartingByte = + ToExpand->Exclusive.FileLock.StartingByte = Conflict->Exclusive.FileLock.StartingByte; } if (ToExpand->Exclusive.FileLock.EndingByte.QuadPart < @@ -346,19 +346,19 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, BOOLEAN InsertedNew; ULARGE_INTEGER UnsignedStart; ULARGE_INTEGER UnsignedEnd; - - DPRINT("FsRtlPrivateLock(%wZ, Offset %08x%08x (%d), Length %08x%08x (%d), Key %x, FailImmediately %u, Exclusive %u)\n", - &FileObject->FileName, + + DPRINT("FsRtlPrivateLock(%wZ, Offset %08x%08x (%d), Length %08x%08x (%d), Key %x, FailImmediately %u, Exclusive %u)\n", + &FileObject->FileName, FileOffset->HighPart, - FileOffset->LowPart, + FileOffset->LowPart, (int)FileOffset->QuadPart, Length->HighPart, - Length->LowPart, + Length->LowPart, (int)Length->QuadPart, Key, - FailImmediately, + FailImmediately, ExclusiveLock); - + UnsignedStart.QuadPart = FileOffset->QuadPart; UnsignedEnd.QuadPart = FileOffset->QuadPart + Length->QuadPart; @@ -379,7 +379,7 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, } return FALSE; } - + /* Initialize the lock, if necessary */ if (!FileLock->LockInformation) { @@ -393,19 +393,19 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, LockInfo->BelongsTo = FileLock; InitializeListHead(&LockInfo->SharedLocks); - + RtlInitializeGenericTable (&LockInfo->RangeTable, LockCompare, LockAllocate, LockFree, NULL); - + KeInitializeSpinLock(&LockInfo->CsqLock); InitializeListHead(&LockInfo->CsqList); - + IoCsqInitializeEx - (&LockInfo->Csq, + (&LockInfo->Csq, LockInsertIrpEx, LockRemoveIrp, LockPeekNextIrp, @@ -413,7 +413,7 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, LockReleaseQueueLock, LockCompleteCanceledIrp); } - + LockInfo = FileLock->LockInformation; ToInsert.Exclusive.FileLock.FileObject = FileObject; ToInsert.Exclusive.FileLock.StartingByte = *FileOffset; @@ -520,7 +520,7 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, } } } - + DPRINT("Overlapping shared lock %wZ %08x%08x %08x%08x\n", &FileObject->FileName, Conflict->Exclusive.FileLock.StartingByte.HighPart, @@ -548,9 +548,9 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, /* We got here because there were only overlapping shared locks */ /* A shared lock is both a range *and* a list entry. Insert the entry here. */ - + DPRINT("Adding shared lock %wZ\n", &FileObject->FileName); - NewSharedRange = + NewSharedRange = ExAllocatePoolWithTag(NonPagedPool, sizeof(*NewSharedRange), TAG_RANGE); if (!NewSharedRange) { @@ -622,7 +622,7 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, Conflict->Exclusive.FileLock.ExclusiveLock); if (!ExclusiveLock) { - NewSharedRange = + NewSharedRange = ExAllocatePoolWithTag(NonPagedPool, sizeof(*NewSharedRange), TAG_RANGE); if (!NewSharedRange) { @@ -646,10 +646,10 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, NewSharedRange->ProcessId = Process; InsertTailList(&LockInfo->SharedLocks, &NewSharedRange->Entry); } - + /* Assume all is cool, and lock is set */ IoStatus->Status = STATUS_SUCCESS; - + if (Irp) { /* Complete the request */ @@ -659,12 +659,12 @@ FsRtlPrivateLock(IN PFILE_LOCK FileLock, IoStatus->Status, &Status, FileObject); - + /* Update the status */ IoStatus->Status = Status; } } - + return TRUE; } @@ -680,7 +680,7 @@ FsRtlCheckLockForReadAccess(IN PFILE_LOCK FileLock, PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); COMBINED_LOCK_ELEMENT ToFind; PCOMBINED_LOCK_ELEMENT Found; - DPRINT("CheckLockForReadAccess(%wZ, Offset %08x%08x, Length %x)\n", + DPRINT("CheckLockForReadAccess(%wZ, Offset %08x%08x, Length %x)\n", &IoStack->FileObject->FileName, IoStack->Parameters.Read.ByteOffset.HighPart, IoStack->Parameters.Read.ByteOffset.LowPart, @@ -690,8 +690,8 @@ FsRtlCheckLockForReadAccess(IN PFILE_LOCK FileLock, return TRUE; } ToFind.Exclusive.FileLock.StartingByte = IoStack->Parameters.Read.ByteOffset; - ToFind.Exclusive.FileLock.EndingByte.QuadPart = - ToFind.Exclusive.FileLock.StartingByte.QuadPart + + ToFind.Exclusive.FileLock.EndingByte.QuadPart = + ToFind.Exclusive.FileLock.StartingByte.QuadPart + IoStack->Parameters.Read.Length; Found = RtlLookupElementGenericTable (FileLock->LockInformation, @@ -700,7 +700,7 @@ FsRtlCheckLockForReadAccess(IN PFILE_LOCK FileLock, DPRINT("CheckLockForReadAccess(%wZ) => TRUE\n", &IoStack->FileObject->FileName); return TRUE; } - Result = !Found->Exclusive.FileLock.ExclusiveLock || + Result = !Found->Exclusive.FileLock.ExclusiveLock || IoStack->Parameters.Read.Key == Found->Exclusive.FileLock.Key; DPRINT("CheckLockForReadAccess(%wZ) => %s\n", &IoStack->FileObject->FileName, Result ? "TRUE" : "FALSE"); return Result; @@ -719,7 +719,7 @@ FsRtlCheckLockForWriteAccess(IN PFILE_LOCK FileLock, COMBINED_LOCK_ELEMENT ToFind; PCOMBINED_LOCK_ELEMENT Found; PEPROCESS Process = Irp->Tail.Overlay.Thread->ThreadsProcess; - DPRINT("CheckLockForWriteAccess(%wZ, Offset %08x%08x, Length %x)\n", + DPRINT("CheckLockForWriteAccess(%wZ, Offset %08x%08x, Length %x)\n", &IoStack->FileObject->FileName, IoStack->Parameters.Write.ByteOffset.HighPart, IoStack->Parameters.Write.ByteOffset.LowPart, @@ -729,8 +729,8 @@ FsRtlCheckLockForWriteAccess(IN PFILE_LOCK FileLock, return TRUE; } ToFind.Exclusive.FileLock.StartingByte = IoStack->Parameters.Write.ByteOffset; - ToFind.Exclusive.FileLock.EndingByte.QuadPart = - ToFind.Exclusive.FileLock.StartingByte.QuadPart + + ToFind.Exclusive.FileLock.EndingByte.QuadPart = + ToFind.Exclusive.FileLock.StartingByte.QuadPart + IoStack->Parameters.Write.Length; Found = RtlLookupElementGenericTable (FileLock->LockInformation, @@ -759,22 +759,22 @@ FsRtlFastCheckLockForRead(IN PFILE_LOCK FileLock, PEPROCESS EProcess = Process; COMBINED_LOCK_ELEMENT ToFind; PCOMBINED_LOCK_ELEMENT Found; - DPRINT("FsRtlFastCheckLockForRead(%wZ, Offset %08x%08x, Length %08x%08x, Key %x)\n", - &FileObject->FileName, + DPRINT("FsRtlFastCheckLockForRead(%wZ, Offset %08x%08x, Length %08x%08x, Key %x)\n", + &FileObject->FileName, FileOffset->HighPart, - FileOffset->LowPart, + FileOffset->LowPart, Length->HighPart, Length->LowPart, Key); ToFind.Exclusive.FileLock.StartingByte = *FileOffset; - ToFind.Exclusive.FileLock.EndingByte.QuadPart = + ToFind.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart; if (!FileLock->LockInformation) return TRUE; Found = RtlLookupElementGenericTable (FileLock->LockInformation, &ToFind); if (!Found || !Found->Exclusive.FileLock.ExclusiveLock) return TRUE; - return Found->Exclusive.FileLock.Key == Key && + return Found->Exclusive.FileLock.Key == Key && Found->Exclusive.FileLock.ProcessId == EProcess; } @@ -794,15 +794,15 @@ FsRtlFastCheckLockForWrite(IN PFILE_LOCK FileLock, PEPROCESS EProcess = Process; COMBINED_LOCK_ELEMENT ToFind; PCOMBINED_LOCK_ELEMENT Found; - DPRINT("FsRtlFastCheckLockForWrite(%wZ, Offset %08x%08x, Length %08x%08x, Key %x)\n", - &FileObject->FileName, + DPRINT("FsRtlFastCheckLockForWrite(%wZ, Offset %08x%08x, Length %08x%08x, Key %x)\n", + &FileObject->FileName, FileOffset->HighPart, - FileOffset->LowPart, + FileOffset->LowPart, Length->HighPart, Length->LowPart, Key); ToFind.Exclusive.FileLock.StartingByte = *FileOffset; - ToFind.Exclusive.FileLock.EndingByte.QuadPart = + ToFind.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart; if (!FileLock->LockInformation) { DPRINT("CheckForWrite(%wZ) => TRUE\n", &FileObject->FileName); @@ -815,7 +815,7 @@ FsRtlFastCheckLockForWrite(IN PFILE_LOCK FileLock, DPRINT("CheckForWrite(%wZ) => TRUE\n", &FileObject->FileName); return TRUE; } - Result = Found->Exclusive.FileLock.Key == Key && + Result = Found->Exclusive.FileLock.Key == Key && Found->Exclusive.FileLock.ProcessId == EProcess; DPRINT("CheckForWrite(%wZ) => %s\n", &FileObject->FileName, Result ? "TRUE" : "FALSE"); return Result; @@ -842,10 +842,10 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, PCOMBINED_LOCK_ELEMENT Entry; PIRP NextMatchingLockIrp; PLOCK_INFORMATION InternalInfo = FileLock->LockInformation; - DPRINT("FsRtlFastUnlockSingle(%wZ, Offset %08x%08x (%d), Length %08x%08x (%d), Key %x)\n", - &FileObject->FileName, + DPRINT("FsRtlFastUnlockSingle(%wZ, Offset %08x%08x (%d), Length %08x%08x (%d), Key %x)\n", + &FileObject->FileName, FileOffset->HighPart, - FileOffset->LowPart, + FileOffset->LowPart, (int)FileOffset->QuadPart, Length->HighPart, Length->LowPart, @@ -856,7 +856,7 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, // But Windows 2003 doesn't assert on it and simply ignores that parameter // ASSERT(AlreadySynchronized); Find.Exclusive.FileLock.StartingByte = *FileOffset; - Find.Exclusive.FileLock.EndingByte.QuadPart = + Find.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart; if (!InternalInfo) { DPRINT("File not previously locked (ever)\n"); @@ -875,13 +875,13 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, Entry->Exclusive.FileLock.EndingByte.HighPart, Entry->Exclusive.FileLock.EndingByte.LowPart, &FileObject->FileName); - + if (Entry->Exclusive.FileLock.ExclusiveLock) { if (Entry->Exclusive.FileLock.Key != Key || Entry->Exclusive.FileLock.ProcessId != Process || Entry->Exclusive.FileLock.StartingByte.QuadPart != FileOffset->QuadPart || - Entry->Exclusive.FileLock.EndingByte.QuadPart != + Entry->Exclusive.FileLock.EndingByte.QuadPart != FileOffset->QuadPart + Length->QuadPart) { DPRINT("Range not locked %wZ\n", &FileObject->FileName); @@ -893,7 +893,7 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, } else { - DPRINT("Shared lock %wZ Start %08x%08x End %08x%08x\n", + DPRINT("Shared lock %wZ Start %08x%08x End %08x%08x\n", &FileObject->FileName, Entry->Exclusive.FileLock.StartingByte.HighPart, Entry->Exclusive.FileLock.StartingByte.LowPart, @@ -926,13 +926,13 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, RemoveEntryList(&SharedRange->Entry); ExFreePoolWithTag(SharedRange, TAG_RANGE); /* We need to rebuild the list of shared ranges. */ - DPRINT("Removing the lock entry %wZ (%08x%08x:%08x%08x)\n", - &FileObject->FileName, - Entry->Exclusive.FileLock.StartingByte.HighPart, + DPRINT("Removing the lock entry %wZ (%08x%08x:%08x%08x)\n", + &FileObject->FileName, + Entry->Exclusive.FileLock.StartingByte.HighPart, Entry->Exclusive.FileLock.StartingByte.LowPart, - Entry->Exclusive.FileLock.EndingByte.HighPart, + Entry->Exclusive.FileLock.EndingByte.HighPart, Entry->Exclusive.FileLock.EndingByte.LowPart); - + /* Remember what was in there and remove it from the table */ Find = *Entry; RtlDeleteElementGenericTable(&InternalInfo->RangeTable, &Find); @@ -949,7 +949,7 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, LockElement.Exclusive.FileLock.ProcessId = SharedRange->ProcessId; LockElement.Exclusive.FileLock.Key = SharedRange->Key; LockElement.Exclusive.FileLock.ExclusiveLock = FALSE; - + if (LockCompare(&InternalInfo->RangeTable, &Find, &LockElement) != GenericEqual) { DPRINT("Skipping range %08x%08x:%08x%08x\n", @@ -973,7 +973,7 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, } } -#ifndef NDEBUG +#ifndef NDEBUG DPRINT("Lock still has:\n"); for (SharedEntry = InternalInfo->SharedLocks.Flink; SharedEntry != &InternalInfo->SharedLocks; @@ -989,14 +989,14 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, SharedRange->Key); } #endif - + // this is definitely the thing we want InternalInfo->Generation++; while ((NextMatchingLockIrp = IoCsqRemoveNextIrp(&InternalInfo->Csq, &Find))) { if (NextMatchingLockIrp->IoStatus.Information == InternalInfo->Generation) { - // We've already looked at this one, meaning that we looped. + // We've already looked at this one, meaning that we looped. // Put it back and exit. IoCsqInsertIrpEx (&InternalInfo->Csq, @@ -1009,11 +1009,11 @@ FsRtlFastUnlockSingle(IN PFILE_LOCK FileLock, // Note that we pick an operation that would succeed at the time // we looked, but can't guarantee that it won't just be re-queued // because somebody else snatched part of the range in a new thread. - DPRINT("Locking another IRP %p for %p %wZ\n", + DPRINT("Locking another IRP %p for %p %wZ\n", NextMatchingLockIrp, FileLock, &FileObject->FileName); FsRtlProcessFileLock(InternalInfo->BelongsTo, NextMatchingLockIrp, NULL); } - + DPRINT("Success %wZ\n", &FileObject->FileName); return STATUS_SUCCESS; } @@ -1062,11 +1062,11 @@ FsRtlFastUnlockAll(IN PFILE_LOCK FileLock, { LARGE_INTEGER Length; // We'll take the first one to be the list head, and free the others first... - Length.QuadPart = - Entry->Exclusive.FileLock.EndingByte.QuadPart - + Length.QuadPart = + Entry->Exclusive.FileLock.EndingByte.QuadPart - Entry->Exclusive.FileLock.StartingByte.QuadPart; FsRtlFastUnlockSingle - (FileLock, + (FileLock, Entry->Exclusive.FileLock.FileObject, &Entry->Exclusive.FileLock.StartingByte, &Length, @@ -1093,9 +1093,9 @@ FsRtlFastUnlockAllByKey(IN PFILE_LOCK FileLock, PLIST_ENTRY ListEntry; PCOMBINED_LOCK_ELEMENT Entry; PLOCK_INFORMATION InternalInfo = FileLock->LockInformation; - + DPRINT("FsRtlFastUnlockAllByKey(%wZ,Key %x)\n", &FileObject->FileName, Key); - + // XXX Synchronize somehow if (!FileLock->LockInformation) return STATUS_RANGE_NOT_LOCKED; // no locks for (ListEntry = InternalInfo->SharedLocks.Flink; @@ -1124,14 +1124,14 @@ FsRtlFastUnlockAllByKey(IN PFILE_LOCK FileLock, { LARGE_INTEGER Length; // We'll take the first one to be the list head, and free the others first... - Length.QuadPart = - Entry->Exclusive.FileLock.EndingByte.QuadPart - + Length.QuadPart = + Entry->Exclusive.FileLock.EndingByte.QuadPart - Entry->Exclusive.FileLock.StartingByte.QuadPart; - if (Entry->Exclusive.FileLock.Key == Key && + if (Entry->Exclusive.FileLock.Key == Key && Entry->Exclusive.FileLock.ProcessId == Process) { FsRtlFastUnlockSingle - (FileLock, + (FileLock, Entry->Exclusive.FileLock.FileObject, &Entry->Exclusive.FileLock.StartingByte, &Length, @@ -1141,7 +1141,7 @@ FsRtlFastUnlockAllByKey(IN PFILE_LOCK FileLock, TRUE); } } - + return STATUS_SUCCESS; } @@ -1157,23 +1157,23 @@ FsRtlProcessFileLock(IN PFILE_LOCK FileLock, PIO_STACK_LOCATION IoStackLocation; NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; - + /* Get the I/O Stack location */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStackLocation->MajorFunction == IRP_MJ_LOCK_CONTROL); - + /* Clear the I/O status block and check what function this is */ IoStatusBlock.Information = 0; - - DPRINT("FsRtlProcessFileLock(%wZ, MinorFunction %x)\n", + + DPRINT("FsRtlProcessFileLock(%wZ, MinorFunction %x)\n", &IoStackLocation->FileObject->FileName, IoStackLocation->MinorFunction); - + switch(IoStackLocation->MinorFunction) { /* A lock */ case IRP_MN_LOCK: - + /* Call the private lock routine */ FsRtlPrivateLock(FileLock, IoStackLocation->FileObject, @@ -1189,10 +1189,10 @@ FsRtlProcessFileLock(IN PFILE_LOCK FileLock, Context, FALSE); return IoStatusBlock.Status; - + /* A single unlock */ case IRP_MN_UNLOCK_SINGLE: - + /* Call fast unlock */ IoStatusBlock.Status = FsRtlFastUnlockSingle(FileLock, @@ -1207,10 +1207,10 @@ FsRtlProcessFileLock(IN PFILE_LOCK FileLock, Context, FALSE); break; - + /* Total unlock */ case IRP_MN_UNLOCK_ALL: - + /* Do a fast unlock */ IoStatusBlock.Status = FsRtlFastUnlockAll(FileLock, IoStackLocation-> @@ -1218,10 +1218,10 @@ FsRtlProcessFileLock(IN PFILE_LOCK FileLock, IoGetRequestorProcess(Irp), Context); break; - + /* Unlock by key */ case IRP_MN_UNLOCK_ALL_BY_KEY: - + /* Do it */ IoStatusBlock.Status = FsRtlFastUnlockAllByKey(FileLock, @@ -1231,16 +1231,16 @@ FsRtlProcessFileLock(IN PFILE_LOCK FileLock, LockControl.Key, Context); break; - + /* Invalid request */ default: - + /* Complete it */ FsRtlCompleteRequest(Irp, STATUS_INVALID_DEVICE_REQUEST); IoStatusBlock.Status = STATUS_INVALID_DEVICE_REQUEST; return STATUS_INVALID_DEVICE_REQUEST; } - + /* Return the status */ DPRINT("Lock IRP %p %x\n", Irp, IoStatusBlock.Status); FsRtlCompleteLockIrpReal @@ -1315,7 +1315,7 @@ FsRtlAllocateFileLock(IN PCOMPLETE_LOCK_IRP_ROUTINE CompleteLockIrpRoutine OPTIO IN PUNLOCK_ROUTINE UnlockRoutine OPTIONAL) { PFILE_LOCK FileLock; - + /* Try to allocate it */ FileLock = ExAllocateFromPagedLookasideList(&FsRtlFileLockLookasideList); if (FileLock) @@ -1325,7 +1325,7 @@ FsRtlAllocateFileLock(IN PCOMPLETE_LOCK_IRP_ROUTINE CompleteLockIrpRoutine OPTIO CompleteLockIrpRoutine, UnlockRoutine); } - + /* Return the lock */ return FileLock; } diff --git a/ntoskrnl/fsrtl/stackovf.c b/ntoskrnl/fsrtl/stackovf.c index 5975628c2b5..60e8b417b66 100644 --- a/ntoskrnl/fsrtl/stackovf.c +++ b/ntoskrnl/fsrtl/stackovf.c @@ -23,10 +23,10 @@ #define FSRTLP_MAX_QUEUES 2 typedef struct _STACK_OVERFLOW_WORK_ITEM -{ - +{ + WORK_QUEUE_ITEM WorkItem; - PFSRTL_STACK_OVERFLOW_ROUTINE Routine; + PFSRTL_STACK_OVERFLOW_ROUTINE Routine; PVOID Context; PKEVENT Event; } STACK_OVERFLOW_WORK_ITEM, *PSTACK_OVERFLOW_WORK_ITEM; @@ -134,7 +134,7 @@ FsRtlWorkerThread(IN PVOID StartContext) Irql = KeGetCurrentIrql(); if (Irql != PASSIVE_LEVEL) { - KeBugCheckEx(IRQL_NOT_LESS_OR_EQUAL, (ULONG_PTR)WorkItem->WorkerRoutine, + KeBugCheckEx(IRQL_NOT_LESS_OR_EQUAL, (ULONG_PTR)WorkItem->WorkerRoutine, (ULONG_PTR)Irql, (ULONG_PTR)WorkItem->WorkerRoutine, (ULONG_PTR)WorkItem); } diff --git a/ntoskrnl/io/debug.c b/ntoskrnl/io/debug.c index 9e0afab1bb5..ced566bdcad 100644 --- a/ntoskrnl/io/debug.c +++ b/ntoskrnl/io/debug.c @@ -20,7 +20,7 @@ extern PDEVICE_NODE IopRootDeviceNode; /* CmResource */ -/* PipDumpCmResourceDescriptor() displays information about a Cm Descriptor +/* PipDumpCmResourceDescriptor() displays information about a Cm Descriptor DebugLevel: 0 - always dump 1 - dump if not defined NDEBUG @@ -106,7 +106,7 @@ PipGetNextCmPartialDescriptor( return NextDescriptor; } -/* PipDumpCmResourceList() displays information about a Cm List +/* PipDumpCmResourceList() displays information about a Cm List DebugLevel: 0 - always dump 1 - dump if not defined NDEBUG @@ -173,7 +173,7 @@ PipDumpCmResourceList( /* IoResource */ -/* PipDumpIoResourceDescriptor() displays information about a Io Descriptor +/* PipDumpIoResourceDescriptor() displays information about a Io Descriptor DebugLevel: 0 - always dump 1 - dump if not defined NDEBUG @@ -239,7 +239,7 @@ PipDumpIoResourceDescriptor( } } -/* PipDumpResourceRequirementsList() displays information about a Io List +/* PipDumpResourceRequirementsList() displays information about a Io List DebugLevel: 0 - always dump 1 - dump if not defined NDEBUG diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 638dccb8dcd..b98c2145723 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -427,7 +427,7 @@ PiAttachFilterDriversCallback( (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), sizeof(startType)); } - + ExFreePool(kvInfo); } @@ -674,7 +674,7 @@ PiCallDriverAddDevice( } } } - + ExFreePool(kvInfo); } @@ -2542,7 +2542,7 @@ PipDeviceActionWorker( { case PiActionAddBootDevices: { - if (deviceNode->State == DeviceNodeInitialized && + if (deviceNode->State == DeviceNodeInitialized && !(deviceNode->Flags & DNF_HAS_PROBLEM)) { status = PiCallDriverAddDevice(deviceNode, PnPBootDriversInitialized); @@ -2564,7 +2564,7 @@ PipDeviceActionWorker( case PiActionStartDevice: // This action is triggered from usermode, when a driver is installed // for a non-critical PDO - if (deviceNode->State == DeviceNodeInitialized && + if (deviceNode->State == DeviceNodeInitialized && !(deviceNode->Flags & DNF_HAS_PROBLEM)) { PiDevNodeStateMachine(deviceNode); diff --git a/ntoskrnl/io/pnpmgr/pnproot.c b/ntoskrnl/io/pnpmgr/pnproot.c index 02e580e9e71..9d28a3f1244 100644 --- a/ntoskrnl/io/pnpmgr/pnproot.c +++ b/ntoskrnl/io/pnpmgr/pnproot.c @@ -721,7 +721,7 @@ EnumerateDevices( Status = STATUS_NO_MEMORY; goto cleanup; } - + RtlAppendUnicodeToString(&DevicePath, REGSTR_KEY_ROOTENUM L"\\"); RtlAppendUnicodeStringToString(&DevicePath, &SubKeyName); DPRINT("Found device %wZ\\%S!\n", &DevicePath, SubKeyInfo->Name); diff --git a/ntoskrnl/kdbg/i386/dis-asm.h b/ntoskrnl/kdbg/i386/dis-asm.h index 9d16c79d8a1..0a94d0cadd6 100644 --- a/ntoskrnl/kdbg/i386/dis-asm.h +++ b/ntoskrnl/kdbg/i386/dis-asm.h @@ -176,7 +176,7 @@ typedef struct disassemble_info { } disassemble_info; - + /* Standard disassemblers. Disassemble one instruction at the given target address. Return number of octets processed. */ typedef int (*disassembler_ftype) @@ -261,7 +261,7 @@ extern disassembler_ftype disassembler PARAMS ((bfd *)); /* Document any target specific options available from the disassembler. */ extern void disassembler_usage PARAMS ((FILE *)); - + /* This block of definitions is for particular callers who read instructions into a buffer before calling the instruction decoder. */ diff --git a/ntoskrnl/kdbg/i386/i386-dis.c b/ntoskrnl/kdbg/i386/i386-dis.c index cf3c75f899f..f129d61e9b0 100644 --- a/ntoskrnl/kdbg/i386/i386-dis.c +++ b/ntoskrnl/kdbg/i386/i386-dis.c @@ -2032,7 +2032,7 @@ static int two_source_ops; static bfd_vma op_address[3]; static bfd_vma op_riprel[3]; static bfd_vma start_pc; - + /* * On the 386's of 1988, the maximum length of an instruction is 15 bytes. * (see topic "Redundant prefixes" in the "Differences from 8086" diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index ea2afc00c16..299c93bd213 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -167,7 +167,7 @@ KdbSymPrintAddress( if (!KdbpSymbolsInitialized || !KdbpSymFindModule(Address, NULL, -1, &LdrEntry)) return FALSE; - + KdbpSymUnicodeToAnsi(&LdrEntry->BaseDllName, ModuleNameAnsi, sizeof(ModuleNameAnsi)); @@ -415,7 +415,7 @@ KdbpSymLoadModuleSymbols( Result = RosSymCreateFromFile(&FileHandle, RosSymInfo); ZwClose(FileHandle); - + if (!Result) { DPRINT("Failed to load symbols from %wZ\n", FileName); diff --git a/ntoskrnl/ke/amd64/context.c b/ntoskrnl/ke/amd64/context.c index 1ce8e8dfe91..0decbde88f9 100644 --- a/ntoskrnl/ke/amd64/context.c +++ b/ntoskrnl/ke/amd64/context.c @@ -207,7 +207,7 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, } /* Handle floating point registers */ - if ((ContextFlags & CONTEXT_FLOATING_POINT) && + if ((ContextFlags & CONTEXT_FLOATING_POINT) && ((TrapFrame->SegCs & MODE_MASK) != KernelMode)) { Context->Xmm0 = TrapFrame->Xmm0; diff --git a/ntoskrnl/ke/amd64/except.c b/ntoskrnl/ke/amd64/except.c index c095bb0dc5d..dfaee9ed3cc 100644 --- a/ntoskrnl/ke/amd64/except.c +++ b/ntoskrnl/ke/amd64/except.c @@ -349,7 +349,7 @@ KiDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, /* Forward exception to user mode debugger */ if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) return; - + /* Forward exception to user mode (does not return) */ KiDispatchExceptionToUser(TrapFrame, &Context, ExceptionRecord); NT_ASSERT(FALSE); diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 56f13192620..2f7c2c5ef2c 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -344,7 +344,7 @@ KiSystemCallHandler( return (PVOID)NtSyscallFailure; } - /* Convert us to a GUI thread + /* Convert us to a GUI thread To be entirely correct. we return KiConvertToGuiThread, which allocates a new stack, switches to it, calls PsConvertToGuiThread and resumes in the middle of diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index b7a267a7256..1598cef290c 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -1081,7 +1081,7 @@ EXTERN KiSetTrapContextInternal:PROC */ PUBLIC KiSetTrapContext .PROC KiSetTrapContext - + /* Generate a KEXCEPTION_FRAME on the stack */ GENERATE_EXCEPTION_FRAME diff --git a/ntoskrnl/ke/apc.c b/ntoskrnl/ke/apc.c index 65169ca3c56..a9b4dc596a8 100644 --- a/ntoskrnl/ke/apc.c +++ b/ntoskrnl/ke/apc.c @@ -214,7 +214,7 @@ KiInsertQueueApc(IN PKAPC Apc, { /* Lock the thread */ KiAcquireThreadLock(Thread); - + /* Essentially do the same check as above */ if ((Thread->State == GateWait) && (Thread->WaitIrql == PASSIVE_LEVEL) && @@ -225,27 +225,27 @@ KiInsertQueueApc(IN PKAPC Apc, { /* We were in a gate wait. Handle this. */ DPRINT1("A thread was in a gate wait\n"); - + /* Get the gate */ Gate = Thread->GateObject; /* Lock the gate */ KiAcquireDispatcherObject(&Gate->Header); - + /* Remove it from the waiters list */ RemoveEntryList(&Thread->WaitBlock[0].WaitListEntry); - + /* Unlock the gate */ KiReleaseDispatcherObject(&Gate->Header); - + /* Increase the queue counter if needed */ if (Thread->Queue) Thread->Queue->CurrentCount++; - + /* Put into deferred ready list with this status */ Thread->WaitStatus = STATUS_KERNEL_APC; KiInsertDeferredReadyList(Thread); } - + /* Release the thread lock */ KiReleaseThreadLock(Thread); } diff --git a/ntoskrnl/ke/arm/ke_i.h b/ntoskrnl/ke/arm/ke_i.h index 03c97ca9314..b0113e1d8b7 100644 --- a/ntoskrnl/ke/arm/ke_i.h +++ b/ntoskrnl/ke/arm/ke_i.h @@ -9,19 +9,19 @@ // // First, cleanup after any previous invocation // -#undef _1 -#undef _2 -#undef _3 -#undef _4 -#undef _5 -#undef _6 -#undef _7 -#undef _8 -#undef _9 -#undef a -#undef b -#undef c -#undef d +#undef _1 +#undef _2 +#undef _3 +#undef _4 +#undef _5 +#undef _6 +#undef _7 +#undef _8 +#undef _9 +#undef a +#undef b +#undef c +#undef d #undef e #undef f #undef _10 diff --git a/ntoskrnl/ke/arm/thrdini.c b/ntoskrnl/ke/arm/thrdini.c index e2833c6f808..89f1664608b 100644 --- a/ntoskrnl/ke/arm/thrdini.c +++ b/ntoskrnl/ke/arm/thrdini.c @@ -163,7 +163,7 @@ KiIdleLoop(VOID) YieldProcessor(); YieldProcessor(); _disable(); - + /* Check for pending timers, pending DPCs, or pending ready threads */ if ((Prcb->DpcData[0].DpcQueueDepth) || (Prcb->TimerRequest) || diff --git a/ntoskrnl/ke/dpc.c b/ntoskrnl/ke/dpc.c index 2b63229d1f5..07c64303fe5 100644 --- a/ntoskrnl/ke/dpc.c +++ b/ntoskrnl/ke/dpc.c @@ -186,7 +186,7 @@ KiTimerExpiration(IN PKDPC Dpc, if (TimerDpc) { #ifdef CONFIG_SMP - /* + /* * If the DPC is targeted to another processor, * then insert it into that processor's DPC queue * instead of delivering it now. @@ -350,26 +350,26 @@ KiTimerListExpire(IN PLIST_ENTRY ExpiredListHead, /* Query system */ KeQuerySystemTime((PLARGE_INTEGER)&SystemTime); - + /* Loop expired list */ while (ExpiredListHead->Flink != ExpiredListHead) { /* Get the current timer */ Timer = CONTAINING_RECORD(ExpiredListHead->Flink, KTIMER, TimerListEntry); - + /* Remove it */ RemoveEntryList(&Timer->TimerListEntry); - + /* Not inserted */ Timer->Header.Inserted = FALSE; - + /* Signal it */ Timer->Header.SignalState = 1; - + /* Get the DPC and period */ TimerDpc = Timer->Dpc; Period = Timer->Period; - + /* Check if there's any waiters */ if (!IsListEmpty(&Timer->Header.WaitListHead)) { @@ -385,7 +385,7 @@ KiTimerListExpire(IN PLIST_ENTRY ExpiredListHead, KxUnwaitThreadForEvent((PKEVENT)Timer, IO_NO_INCREMENT); } } - + /* Check if we have a period */ if (Period) { @@ -398,7 +398,7 @@ KiTimerListExpire(IN PLIST_ENTRY ExpiredListHead, if (TimerDpc) { #ifdef CONFIG_SMP - /* + /* * If the DPC is targeted to another processor, * then insert it into that processor's DPC queue * instead of delivering it now. @@ -428,13 +428,13 @@ KiTimerListExpire(IN PLIST_ENTRY ExpiredListHead, } } } - + /* Check if we still have DPC entries */ if (DpcCalls) { /* Release the dispatcher while doing DPCs */ KiReleaseDispatcherLock(DISPATCH_LEVEL); - + /* Start looping all DPC Entries */ for (i = 0; DpcCalls; DpcCalls--, i++) { @@ -449,7 +449,7 @@ KiTimerListExpire(IN PLIST_ENTRY ExpiredListHead, UlongToPtr(SystemTime.LowPart), UlongToPtr(SystemTime.HighPart)); } - + /* Lower IRQL */ KeLowerIrql(OldIrql); } diff --git a/ntoskrnl/ke/except.c b/ntoskrnl/ke/except.c index e789ffc81b2..3b945633ca5 100644 --- a/ntoskrnl/ke/except.c +++ b/ntoskrnl/ke/except.c @@ -121,7 +121,7 @@ KiRaiseException(IN PEXCEPTION_RECORD ExceptionRecord, } /* Probe the entire parameters now*/ - Size = (sizeof(EXCEPTION_RECORD) - + Size = (sizeof(EXCEPTION_RECORD) - ((EXCEPTION_MAXIMUM_PARAMETERS - ParameterCount) * sizeof(ULONG))); ProbeForRead(ExceptionRecord, Size, sizeof(ULONG)); @@ -180,12 +180,12 @@ NtRaiseException(IN PEXCEPTION_RECORD ExceptionRecord, Thread = KeGetCurrentThread(); TrapFrame = Thread->TrapFrame; Thread->TrapFrame = KiGetLinkedTrapFrame(TrapFrame); - + /* Set exception list */ #ifdef _M_IX86 KeGetPcr()->NtTib.ExceptionList = TrapFrame->ExceptionList; #endif - + /* Raise the exception */ Status = KiRaiseException(ExceptionRecord, Context, @@ -202,7 +202,7 @@ NtRaiseException(IN PEXCEPTION_RECORD ExceptionRecord, /* Exit with error */ KiServiceExit(TrapFrame, Status); } - + /* We don't actually make it here */ return Status; } @@ -215,19 +215,19 @@ NtContinue(IN PCONTEXT Context, PKTHREAD Thread; NTSTATUS Status; PKTRAP_FRAME TrapFrame; - + /* Get trap frame and link previous one*/ Thread = KeGetCurrentThread(); TrapFrame = Thread->TrapFrame; Thread->TrapFrame = KiGetLinkedTrapFrame(TrapFrame); - + /* Continue from this point on */ Status = KiContinue(Context, NULL, TrapFrame); if (NT_SUCCESS(Status)) { /* Check if alert was requested */ if (TestAlert) KeTestAlertThread(Thread->PreviousMode); - + /* Exit to new trap frame */ KiServiceExit2(TrapFrame); } @@ -236,7 +236,7 @@ NtContinue(IN PCONTEXT Context, /* Exit with an error */ KiServiceExit(TrapFrame, Status); } - + /* We don't actually make it here */ return Status; } diff --git a/ntoskrnl/ke/i386/ctxswitch.S b/ntoskrnl/ke/i386/ctxswitch.S index b680195d19d..d787898c46d 100644 --- a/ntoskrnl/ke/i386/ctxswitch.S +++ b/ntoskrnl/ke/i386/ctxswitch.S @@ -63,7 +63,7 @@ PUBLIC @KiSwapContextInternal@0 * * \param CurrentThread@ * Pointer to the KTHREAD of the current thread. - * + * * \returns * The WaitStatus of the Target Thread. * @@ -72,7 +72,7 @@ PUBLIC @KiSwapContextInternal@0 * non-volatile registers so that the Internal function can use all of * them. It will also save the old current thread and set the new one. * - * The calling thread does not return after KiSwapContextInternal until + * The calling thread does not return after KiSwapContextInternal until * another thread switches to IT. * *--*/ diff --git a/ntoskrnl/ke/powerpc/ctxhelp.S b/ntoskrnl/ke/powerpc/ctxhelp.S index bffe2cae22b..390516bcd60 100644 --- a/ntoskrnl/ke/powerpc/ctxhelp.S +++ b/ntoskrnl/ke/powerpc/ctxhelp.S @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/powerpc/ctxhelp.S * PURPOSE: Thread Context Switching - * + * * PROGRAMMERS: arty (i386 implementation by Alex Ionescu) */ @@ -112,7 +112,7 @@ KiSystemService1: mtsrr1 0 addi 1,1,0x100 - 16 rfi - + .globl KiDecrementerTrapHandler .globl KiDecrementerTrapHandlerEnd .globl KiDecrementerTrap @@ -138,7 +138,7 @@ KiDecrementerTrapHandler: rfi KiDecrementerTrapHandlerEnd: .long 0 - + /* Decrementer needs to restore the full CPU state */ .globl KiDecrementerTrapUpper .align 8 diff --git a/ntoskrnl/ke/powerpc/ctxswitch.c b/ntoskrnl/ke/powerpc/ctxswitch.c index 5cc96ce22ab..9c581b53b61 100644 --- a/ntoskrnl/ke/powerpc/ctxswitch.c +++ b/ntoskrnl/ke/powerpc/ctxswitch.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/powerpc/ctxswitch.c * PURPOSE: Thread Context Switching - * + * * PROGRAMMERS: arty (i386 implementation by Alex Ionescu) */ @@ -21,7 +21,7 @@ * The KiThreadStartup routine is the beginning of any thread. * * Params: - * SystemRoutine - Pointer to the System Startup Routine. Either + * SystemRoutine - Pointer to the System Startup Routine. Either * PspUserThreadStartup or PspSystemThreadStartup * * StartRoutine - For Kernel Threads only, specifies the starting execution @@ -59,7 +59,7 @@ KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, "mr 4,%2\n\t" "mr 5,%3\n\t" "mr 6,%4\n\t" - "sc" : : + "sc" : : "r" (0xf0000), /* Thread start function */ "r" (SystemRoutine), "r" (StartRoutine), @@ -68,7 +68,7 @@ KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, PspTerminateThreadByPointer(PsGetCurrentThread(), STATUS_THREAD_IS_TERMINATING, TRUE); } -/* Take a decrementer trap, and prepare the given trap frame, swapping +/* Take a decrementer trap, and prepare the given trap frame, swapping * process and thread context as appropriate. */ VOID KiDecrementerTrapFinish(PKTRAP_FRAME TrapFrame); diff --git a/ntoskrnl/ke/powerpc/main_asm.S b/ntoskrnl/ke/powerpc/main_asm.S index 8476be64c77..d8377d90722 100644 --- a/ntoskrnl/ke/powerpc/main_asm.S +++ b/ntoskrnl/ke/powerpc/main_asm.S @@ -18,7 +18,7 @@ _kernel_stack: .fill 3*4096, 1, 0 -P0BootStack: +P0BootStack: _kernel_stack_top: /* guard page for the trap stack */ @@ -29,18 +29,18 @@ _kernel_trap_stack: _kernel_trap_stack_top: .fill 3*4096, 1, 0 -KiDoubleFaultStack: - +KiDoubleFaultStack: + .text .globl KiSystemStartup .globl KiRosPrepareForSystemStartup .globl DrawNumber - + KiSystemStartup: /* * Set a normal MSR value */ - xor 0,0,0 + xor 0,0,0 ori 30,0,0x3030 mtmsr 30 @@ -51,23 +51,23 @@ KiSystemStartup: /* Bye bye asm land! */ mr 4,3 - + /* Load the initial kernel stack */ lis 1,_kernel_stack_top@ha ori 1,1,_kernel_stack_top@l addi 1,1,-SIZEOF_FX_SAVE_AREA - + /* Call the main kernel initialization */ bl KiRosPrepareForSystemStartup .global NtCurrentTeb NtCurrentTeb: mr 3,12 - blr + blr .globl KeSynchronizeExecution -KeSynchronizeExecution: +KeSynchronizeExecution: blr .globl PearPCDebug diff --git a/ntoskrnl/ke/powerpc/ppc_irq.c b/ntoskrnl/ke/powerpc/ppc_irq.c index baa933b4f2c..34948a9bf66 100644 --- a/ntoskrnl/ke/powerpc/ppc_irq.c +++ b/ntoskrnl/ke/powerpc/ppc_irq.c @@ -778,13 +778,13 @@ KiSystemService(ppc_trap_frame_t *trap_frame) case 0xf0000: /* Thread startup */ /* XXX how to use UserThread (gpr[6]) */ SystemRoutine = (PKSYSTEM_ROUTINE)trap_frame->gpr[3]; - SystemRoutine((PKSTART_ROUTINE)trap_frame->gpr[4], + SystemRoutine((PKSTART_ROUTINE)trap_frame->gpr[4], (PVOID)trap_frame->gpr[5]); break; /* Handle a normal system call */ default: - SyscallFunction = + SyscallFunction = ((PSYSCALL_FUN*)KeServiceDescriptorTable [trap_frame->gpr[0] >> 12].Base)[trap_frame->gpr[0] & 0xfff]; trap_frame->gpr[3] = SyscallFunction diff --git a/ntoskrnl/ke/powerpc/thrdini.c b/ntoskrnl/ke/powerpc/thrdini.c index ea2c74ea26a..2443b4064c2 100644 --- a/ntoskrnl/ke/powerpc/thrdini.c +++ b/ntoskrnl/ke/powerpc/thrdini.c @@ -66,7 +66,7 @@ KiInitializeContextThread(IN PKTHREAD Thread, PETHREAD EThread = (PETHREAD)Thread; PEPROCESS Process = EThread->ThreadsProcess; ULONG ContextFlags, i, pmsize = sizeof(pagemap) / sizeof(pagemap[0]); - + DPRINT("Thread: %08x ContextPointer: %08x SystemRoutine: %08x StartRoutine: %08x StartContext: %08x\n", Thread, ContextPointer, @@ -192,15 +192,15 @@ KiInitializeContextThread(IN PKTHREAD Thread, { DPRINT("First Thread in Process %x\n", Process); MmuAllocVsid((ULONG)Process->UniqueProcessId, 0xff); - + for (i = 0; i < pmsize; i++) { pagemap[i].proc = 0; pagemap[i].addr = 0x7fff0000 + (i * PAGE_SIZE); } - + MmuInqPage(pagemap, pmsize); - + for (i = 0; i < pmsize; i++) { if (pagemap[i].phys) @@ -212,7 +212,7 @@ KiInitializeContextThread(IN PKTHREAD Thread, pagemap[i].proc, pagemap[i].addr); } } - + DPRINT("Did additional aspace setup in the new process\n"); } } diff --git a/ntoskrnl/ke/procobj.c b/ntoskrnl/ke/procobj.c index abf5a4f3fc4..f2095545a13 100644 --- a/ntoskrnl/ke/procobj.c +++ b/ntoskrnl/ke/procobj.c @@ -265,7 +265,7 @@ NTAPI KeSetAffinityProcess(IN PKPROCESS Process, IN KAFFINITY Affinity) { - + KLOCK_QUEUE_HANDLE ProcessLock; PLIST_ENTRY NextEntry, ListHead; KAFFINITY OldAffinity; @@ -273,10 +273,10 @@ KeSetAffinityProcess(IN PKPROCESS Process, ASSERT_PROCESS(Process); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT((Affinity & KeActiveProcessors) != 0); - + /* Lock the process */ KiAcquireProcessLockRaiseToSynch(Process, &ProcessLock); - + /* Acquire the dispatcher lock */ KiAcquireDispatcherLockAtSynchLevel(); @@ -291,19 +291,19 @@ KeSetAffinityProcess(IN PKPROCESS Process, { /* Get the thread */ Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); - + /* Set affinity on it */ KiSetAffinityThread(Thread, Affinity); NextEntry = NextEntry->Flink; } - + /* Release Dispatcher Database */ KiReleaseDispatcherLockFromSynchLevel(); - + /* Release the process lock */ KiReleaseProcessLockFromSynchLevel(&ProcessLock); KiExitDispatcher(ProcessLock.OldIrql); - + /* Return previous affinity */ return OldAffinity; } diff --git a/ntoskrnl/ke/queue.c b/ntoskrnl/ke/queue.c index 1b02a88aeed..178e8c754bc 100644 --- a/ntoskrnl/ke/queue.c +++ b/ntoskrnl/ke/queue.c @@ -446,7 +446,7 @@ KeRundownQueue(IN PKQUEUE Queue) /* Get the Dispatcher Lock */ OldIrql = KiAcquireDispatcherLock(); - + /* Check if the list is empty */ FirstEntry = Queue->EntryListHead.Flink; if (FirstEntry == &Queue->EntryListHead) @@ -459,13 +459,13 @@ KeRundownQueue(IN PKQUEUE Queue) /* Remove this entry */ RemoveEntryList(&Queue->EntryListHead); } - + /* Loop the list */ while (!IsListEmpty(&Queue->ThreadListHead)) { /* Get the next entry */ NextEntry = Queue->ThreadListHead.Flink; - + /* Get the associated thread */ Thread = CONTAINING_RECORD(NextEntry, KTHREAD, QueueListEntry); @@ -478,7 +478,7 @@ KeRundownQueue(IN PKQUEUE Queue) /* Release the dispatcher lock */ KiReleaseDispatcherLockFromSynchLevel(); - + /* Exit the dispatcher and return the first entry (if any) */ KiExitDispatcher(OldIrql); return FirstEntry; diff --git a/ntoskrnl/ke/timerobj.c b/ntoskrnl/ke/timerobj.c index 26f12720dda..35892c8875c 100644 --- a/ntoskrnl/ke/timerobj.c +++ b/ntoskrnl/ke/timerobj.c @@ -49,7 +49,7 @@ KiInsertTreeTimer(IN PKTIMER Timer, /* Otherwise, we're now inserted */ Inserted = TRUE; } - + /* Release the lock */ KiReleaseTimerLock(LockQueue); } @@ -319,20 +319,20 @@ KeSetTimerEx(IN OUT PKTIMER Timer, { /* Signal the timer */ RequestInterrupt = KiSignalTimer(Timer); - + /* Release the dispatcher lock */ KiReleaseDispatcherLockFromSynchLevel(); - + /* Check if we need to do an interrupt */ - if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } else { /* Insert the timer */ Timer->Header.SignalState = FALSE; - KxInsertTimer(Timer, Hand); + KxInsertTimer(Timer, Hand); } - + /* Exit the dispatcher */ KiExitDispatcher(OldIrql); diff --git a/ntoskrnl/mm/ARM3/mmsup.c b/ntoskrnl/mm/ARM3/mmsup.c index 59e13bd4ef4..eec58272785 100644 --- a/ntoskrnl/mm/ARM3/mmsup.c +++ b/ntoskrnl/mm/ARM3/mmsup.c @@ -265,7 +265,7 @@ NTAPI MmCreateMirror(VOID) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* EOF */ diff --git a/ntoskrnl/mm/ARM3/vadnode.c b/ntoskrnl/mm/ARM3/vadnode.c index 1dab4ef1e48..050e1c92235 100644 --- a/ntoskrnl/mm/ARM3/vadnode.c +++ b/ntoskrnl/mm/ARM3/vadnode.c @@ -675,7 +675,7 @@ MiFindEmptyAddressRangeDownTree(IN SIZE_T Length, with, thus we already have an OldNode! */ ASSERT(OldNode != NULL); - /* The node we had before is the most left grandchild of + /* The node we had before is the most left grandchild of that right child, use it as parent. */ ASSERT(RtlLeftChildAvl(OldNode) == NULL); *Parent = OldNode; diff --git a/ntoskrnl/ob/oblink.c b/ntoskrnl/ob/oblink.c index 67cb36385dd..7d03ba1bf96 100644 --- a/ntoskrnl/ob/oblink.c +++ b/ntoskrnl/ob/oblink.c @@ -36,7 +36,7 @@ ObpProcessDosDeviceSymbolicLink(IN POBJECT_SYMBOLIC_LINK SymbolicLink, PVOID Object; /* - * To prevent endless reparsing, setting an upper limit on the + * To prevent endless reparsing, setting an upper limit on the * number of reparses. */ MaxReparse = 32; diff --git a/ntoskrnl/ob/obsdcach.c b/ntoskrnl/ob/obsdcach.c index f130d379444..cb31dc6d47e 100644 --- a/ntoskrnl/ob/obsdcach.c +++ b/ntoskrnl/ob/obsdcach.c @@ -129,19 +129,19 @@ ObpCreateCacheEntry(IN PSECURITY_DESCRIPTOR SecurityDescriptor, ULONG CacheSize; PSECURITY_DESCRIPTOR_HEADER SdHeader; ASSERT(Length == RtlLengthSecurityDescriptor(SecurityDescriptor)); - + /* Calculate the memory we'll need to allocate and allocate it */ CacheSize = Length + (sizeof(SECURITY_DESCRIPTOR_HEADER) - sizeof(QUAD)); SdHeader = ExAllocatePoolWithTag(PagedPool, CacheSize, TAG_OB_SD_CACHE); if (!SdHeader) return NULL; - + /* Setup the header */ SdHeader->RefCount = RefCount; SdHeader->FullHash = FullHash; - + /* Copy the descriptor */ RtlCopyMemory(&SdHeader->SecurityDescriptor, SecurityDescriptor, Length); - + /* Return it */ return SdHeader; } @@ -154,13 +154,13 @@ ObpCompareSecurityDescriptors(IN PSECURITY_DESCRIPTOR Sd1, { ULONG Length2; ASSERT(Length1 == RtlLengthSecurityDescriptor(Sd1)); - + /* Get the length of the second SD */ Length2 = RtlLengthSecurityDescriptor(Sd2); - + /* Compare lengths */ if (Length1 != Length2) return FALSE; - + /* Compare contents */ return RtlEqualMemory(Sd1, Sd2, Length1); } @@ -260,7 +260,7 @@ ObReferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, /* Get the header */ SdHeader = ObpGetHeaderForSd(SecurityDescriptor); - + /* Do the references */ InterlockedExchangeAdd((PLONG)&SdHeader->RefCount, Count); } @@ -291,13 +291,13 @@ ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, LONG OldValue, NewValue; ULONG Index; POB_SD_CACHE_LIST CacheEntry; - + /* Get the header */ SdHeader = ObpGetHeaderForSd(SecurityDescriptor); - + /* Get the current reference count */ OldValue = SdHeader->RefCount; - + /* Check if the caller is destroying this SD -- we need the lock for that */ while (OldValue != Count) { @@ -306,28 +306,28 @@ ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, OldValue - Count, OldValue); if (NewValue == OldValue) return; - + /* Try again */ OldValue = NewValue; } - + /* At this point, we need the lock, so choose an entry */ Index = SdHeader->FullHash % SD_CACHE_ENTRIES; CacheEntry = &ObsSecurityDescriptorCache[Index]; - + /* Acquire the lock for it */ ObpSdAcquireLock(CacheEntry); ASSERT(SdHeader->RefCount != 0); - + /* Now do the dereference */ if (InterlockedExchangeAdd((PLONG)&SdHeader->RefCount, -(LONG)Count) == Count) { /* We're down to zero -- destroy the header */ SdHeader = ObpDestroySecurityDescriptorHeader(SdHeader); - + /* Release the lock */ ObpSdReleaseLock(CacheEntry); - + /* Free the header */ ExFreePool(SdHeader); } @@ -336,7 +336,7 @@ ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, /* Just release the lock */ ObpSdReleaseLock(CacheEntry); } - + } /*++ @@ -373,33 +373,33 @@ ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, /* Get the length */ Length = RtlLengthSecurityDescriptor(InputSecurityDescriptor); - + /* Get the hash */ Hash = ObpHashSecurityDescriptor(InputSecurityDescriptor, Length); - + /* Now select the appropriate cache entry */ Index = Hash % SD_CACHE_ENTRIES; CacheEntry = &ObsSecurityDescriptorCache[Index]; - + /* Lock it shared */ ObpSdAcquireLockShared(CacheEntry); - + /* Start our search */ while (TRUE) { /* Reset result found */ Result = FALSE; - + /* Loop the hash list */ NextEntry = CacheEntry->Head.Flink; while (NextEntry != &CacheEntry->Head) { /* Get the header */ SdHeader = ObpGetHeaderForEntry(NextEntry); - + /* Our hashes are ordered, so quickly check if we should stop now */ if (SdHeader->FullHash > Hash) break; - + /* We survived the quick hash check, now check for equalness */ if (SdHeader->FullHash == Hash) { @@ -409,41 +409,41 @@ ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, &SdHeader->SecurityDescriptor); if (Result) break; } - + /* Go to the next entry */ NextEntry = NextEntry->Flink; } - + /* Check if we found anything */ if (Result) { /* Increment its reference count */ InterlockedExchangeAdd((PLONG)&SdHeader->RefCount, RefBias); - + /* Release the lock */ ObpSdReleaseLockShared(CacheEntry); - + /* Return the descriptor */ *OutputSecurityDescriptor = &SdHeader->SecurityDescriptor; - + /* Free anything that we may have had to create */ if (NewHeader) ExFreePoolWithTag(NewHeader, TAG_OB_SD_CACHE); return STATUS_SUCCESS; } - + /* Check if we got here, and didn't create a descriptor yet */ if (!NewHeader) { /* Release the lock */ ObpSdReleaseLockShared(CacheEntry); - + /* This should be our first time in the loop, create it */ NewHeader = ObpCreateCacheEntry(InputSecurityDescriptor, Length, Hash, RefBias); if (!NewHeader) return STATUS_INSUFFICIENT_RESOURCES; - + /* Now acquire the exclusive lock and we should hit the right path */ ObpSdAcquireLock(CacheEntry); } @@ -453,13 +453,13 @@ ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, break; } } - + /* Okay, now let's do the insert, we should have the exclusive lock */ InsertTailList(NextEntry, &NewHeader->Link); - + /* Release the lock */ ObpSdReleaseLock(CacheEntry); - + /* Return the SD*/ *OutputSecurityDescriptor = &NewHeader->SecurityDescriptor; return STATUS_SUCCESS; diff --git a/ntoskrnl/ob/obwait.c b/ntoskrnl/ob/obwait.c index ff9cb2107f9..7c7cabfa27b 100644 --- a/ntoskrnl/ob/obwait.c +++ b/ntoskrnl/ob/obwait.c @@ -140,7 +140,7 @@ NtWaitForMultipleObjects(IN ULONG ObjectCount, else { /* No need for the array */ - WaitBlockArray = NULL; + WaitBlockArray = NULL; } /* Enter a critical region since we'll play with handles */ diff --git a/ntoskrnl/po/events.c b/ntoskrnl/po/events.c index b6392bd9318..0db341a6ffa 100644 --- a/ntoskrnl/po/events.c +++ b/ntoskrnl/po/events.c @@ -76,12 +76,12 @@ PopGetSysButtonCompletion( if (SysButton & SYS_BUTTON_LID) DbgPrint(" LID"); if (SysButton == 0) DbgPrint(" WAKE"); DbgPrint(" )\n"); - + if (SysButton & SYS_BUTTON_POWER) { /* FIXME: Read registry for the action we should perform here */ DPRINT1("Initiating shutdown after power button event\n"); - + ZwShutdownSystem(ShutdownNoReboot); } } diff --git a/ntoskrnl/ps/amd64/psctx.c b/ntoskrnl/ps/amd64/psctx.c index c0b0f26d576..c58ca65c3b7 100644 --- a/ntoskrnl/ps/amd64/psctx.c +++ b/ntoskrnl/ps/amd64/psctx.c @@ -36,13 +36,13 @@ PspGetOrSetContextKernelRoutine( GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); Thread = Apc->SystemArgument2; NT_ASSERT(KeGetCurrentThread() == Thread); - + /* If this is a kernel-mode request, grab the saved trap frame */ if (GetSetContext->Mode == KernelMode) { TrapFrame = Thread->TrapFrame; } - + /* If we don't have one, grab it from the stack */ if (TrapFrame == NULL) { diff --git a/ntoskrnl/ps/arm/psctx.c b/ntoskrnl/ps/arm/psctx.c index 5afc1c427cc..83fa2381fbf 100644 --- a/ntoskrnl/ps/arm/psctx.c +++ b/ntoskrnl/ps/arm/psctx.c @@ -19,7 +19,7 @@ NTAPI PspGetContext(IN PKTRAP_FRAME TrapFrame, IN PVOID NonVolatileContext, IN OUT PCONTEXT Context) -{ +{ PAGED_CODE(); } @@ -29,7 +29,7 @@ PspSetContext(OUT PKTRAP_FRAME TrapFrame, OUT PVOID NonVolatileContext, IN PCONTEXT Context, IN KPROCESSOR_MODE Mode) -{ +{ PAGED_CODE(); } diff --git a/ntoskrnl/ps/i386/psctx.c b/ntoskrnl/ps/i386/psctx.c index 51c77e3df3e..571dbc2a0e7 100644 --- a/ntoskrnl/ps/i386/psctx.c +++ b/ntoskrnl/ps/i386/psctx.c @@ -19,9 +19,9 @@ NTAPI PspGetContext(IN PKTRAP_FRAME TrapFrame, IN PVOID NonVolatileContext, IN OUT PCONTEXT Context) -{ +{ PAGED_CODE(); - + /* Convert the trap frame to a context */ KeTrapFrameToContext(TrapFrame, NULL, Context); } @@ -32,9 +32,9 @@ PspSetContext(OUT PKTRAP_FRAME TrapFrame, OUT PVOID NonVolatileContext, IN PCONTEXT Context, IN KPROCESSOR_MODE Mode) -{ +{ PAGED_CODE(); - + /* Convert the context to a trap frame structure */ KeContextToTrapFrame(Context, NULL, TrapFrame, Context->ContextFlags, Mode); } @@ -61,10 +61,10 @@ PspGetOrSetContextKernelRoutine(IN PKAPC Apc, Event = &GetSetContext->Event; Mode = GetSetContext->Mode; Thread = Apc->SystemArgument2; - + /* If this is a kernel-mode request, grab the saved trap frame */ if (Mode == KernelMode) TrapFrame = Thread->Tcb.TrapFrame; - + /* If we don't have one, grab it from the stack */ if (!TrapFrame) { diff --git a/ntoskrnl/ps/job.c b/ntoskrnl/ps/job.c index 68762c86c5d..8b130010bfd 100644 --- a/ntoskrnl/ps/job.c +++ b/ntoskrnl/ps/job.c @@ -41,12 +41,12 @@ CHAR PspJobSchedulingClasses[PSP_JOB_SCHEDULING_CLASSES] = GENERIC_MAPPING PspJobMapping = { STANDARD_RIGHTS_READ | JOB_OBJECT_QUERY, - + STANDARD_RIGHTS_WRITE | JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_TERMINATE, - + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, - + STANDARD_RIGHTS_ALL | THREAD_ALL_ACCESS // bug fixed only in vista }; diff --git a/ntoskrnl/ps/state.c b/ntoskrnl/ps/state.c index 4511c1ff625..efeb0fb9d6a 100644 --- a/ntoskrnl/ps/state.c +++ b/ntoskrnl/ps/state.c @@ -479,7 +479,7 @@ NtTestAlert(VOID) * @param ThreadHandle * Handle to the Thread. * This handle must have THREAD_SET_CONTEXT privileges. - * + * * @param UserApcReserveHandle * Optional handle to reserve object (introduced in Windows 7), providing ability to * reserve memory before performing stability-critical parts of code. diff --git a/ntoskrnl/ps/thread.c b/ntoskrnl/ps/thread.c index 8045dfba70b..25b449505c5 100644 --- a/ntoskrnl/ps/thread.c +++ b/ntoskrnl/ps/thread.c @@ -934,7 +934,7 @@ PsWrapApcWow64Thread(IN OUT PVOID *ApcContext, { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; -} +} NTSTATUS NTAPI diff --git a/ntoskrnl/rtl/misc.c b/ntoskrnl/rtl/misc.c index 5cb930e2fb8..4bb5f21794b 100644 --- a/ntoskrnl/rtl/misc.c +++ b/ntoskrnl/rtl/misc.c @@ -36,7 +36,7 @@ RtlGetNtGlobalFlags(VOID) /* * @implemented */ -NTSTATUS +NTSTATUS NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { @@ -80,7 +80,7 @@ RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) * The call expects to be called at PASSIVE_LEVEL. The function firstly checks if the product type is * actually valid by checking the "ProductTypeIsValid" member of _KUSER_SHARED_DATA structure. * Currently we do not implement code that is responsible for the management of this member, yet. - * + * */ BOOLEAN NTAPI diff --git a/ntoskrnl/se/srm.c b/ntoskrnl/se/srm.c index 6033e07d631..70b7c19470a 100644 --- a/ntoskrnl/se/srm.c +++ b/ntoskrnl/se/srm.c @@ -384,17 +384,17 @@ Leave: /** * @brief * Deletes a logon session from the logon sessions database. - * + * * @param[in] LogonLuid * A logon ID represented as a LUID. This LUID is used to point * the exact logon session saved within the database. - * + * * @return * STATUS_SUCCESS is returned if the logon session has been deleted successfully. * STATUS_NO_SUCH_LOGON_SESSION is returned if the logon session with the submitted * LUID doesn't exist. STATUS_BAD_LOGON_SESSION_STATE is returned if the logon session * is still in use and we're not allowed to delete it, or if a system or anonymous session - * is submitted and we're not allowed to delete them as they're internal parts of the system. + * is submitted and we're not allowed to delete them as they're internal parts of the system. * Otherwise a failure NTSTATUS code is returned. */ static @@ -461,7 +461,7 @@ SepRmDeleteLogonSession( goto Leave; } - /* If we have a LUID device map, clean it */ + /* If we have a LUID device map, clean it */ if (SessionToDelete->pDeviceMap != NULL) { Status = SepCleanupLUIDDeviceMapDirectory(LogonLuid); diff --git a/ntoskrnl/vdm/vdmmain.c b/ntoskrnl/vdm/vdmmain.c index c2ae92faa83..8a8a5bae0b9 100644 --- a/ntoskrnl/vdm/vdmmain.c +++ b/ntoskrnl/vdm/vdmmain.c @@ -23,15 +23,15 @@ NTAPI Ki386VdmEnablePentiumExtentions(IN BOOLEAN Enable) { ULONG EFlags, Cr4; - + /* Save interrupt state and disable them */ EFlags = __readeflags(); _disable(); - + /* Enable or disable VME as required */ Cr4 = __readcr4(); __writecr4(Enable ? Cr4 | CR4_VME : Cr4 & ~CR4_VME); - + /* Restore interrupt state */ __writeeflags(EFlags); } diff --git a/sdk/include/GL/gl.h b/sdk/include/GL/gl.h index 1d0d7c38c64..15f75d18f25 100644 --- a/sdk/include/GL/gl.h +++ b/sdk/include/GL/gl.h @@ -35,7 +35,7 @@ /********************************************************************** * Begin system-specific stuff. Do not do any of this when building * for SciTech SNAP, as this is all done before this header file is - * included. + * included. */ #if !defined(__SCITECH_SNAP__) @@ -60,7 +60,7 @@ # define GLAPI extern # endif /* _STATIC_MESA support */ # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */ -# define GLAPIENTRY +# define GLAPIENTRY # else # define GLAPIENTRY __stdcall # endif diff --git a/sdk/include/GL/glext.h b/sdk/include/GL/glext.h index 90e01342127..20db67b0820 100644 --- a/sdk/include/GL/glext.h +++ b/sdk/include/GL/glext.h @@ -7,7 +7,7 @@ extern "C" { /* ** Copyright (c) 2007-2012 The Khronos Group Inc. -** +** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the ** "Materials"), to deal in the Materials without restriction, including @@ -15,10 +15,10 @@ extern "C" { ** distribute, sublicense, and/or sell copies of the Materials, and to ** permit persons to whom the Materials are furnished to do so, subject to ** the following conditions: -** +** ** The above copyright notice and this permission notice shall be included ** in all copies or substantial portions of the Materials. -** +** ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. diff --git a/sdk/include/c++/stlport/stl/_fstream.c b/sdk/include/c++/stlport/stl/_fstream.c index 7306f9eda4e..284a9276ae2 100644 --- a/sdk/include/c++/stlport/stl/_fstream.c +++ b/sdk/include/c++/stlport/stl/_fstream.c @@ -521,7 +521,7 @@ basic_filebuf<_CharT, _Traits>::_M_underflow_aux() { _M_ext_buf_end += __n; - // If external buffer is empty there is nothing to do. + // If external buffer is empty there is nothing to do. if (_M_ext_buf == _M_ext_buf_end) { this->setg(0, 0, 0); return traits_type::eof(); diff --git a/sdk/include/c++/stlport/stl/_hashtable.c b/sdk/include/c++/stlport/stl/_hashtable.c index b743156e460..8eb7e8ea34a 100644 --- a/sdk/include/c++/stlport/stl/_hashtable.c +++ b/sdk/include/c++/stlport/stl/_hashtable.c @@ -70,7 +70,7 @@ _Stl_prime<_Dummy>::_S_next_size(size_t __n) { size_t __size; const size_t* __first = _S_primes(__size); const size_t* __last = __first + __size; - const size_t* pos = __lower_bound(__first, __last, __n, + const size_t* pos = __lower_bound(__first, __last, __n, __less((size_t*)0), __less((size_t*)0), (ptrdiff_t*)0); return (pos == __last ? *(__last - 1) : *pos); } @@ -81,7 +81,7 @@ _Stl_prime<_Dummy>::_S_prev_sizes(size_t __n, size_t const*&__begin, size_t cons size_t __size; __begin = _S_primes(__size); const size_t* __last = __begin + __size; - __pos = __lower_bound(__begin, __last, __n, + __pos = __lower_bound(__begin, __last, __n, __less((size_t*)0), __less((size_t*)0), (ptrdiff_t*)0); if (__pos== __last) diff --git a/sdk/include/c++/stlport/stl/_iomanip.h b/sdk/include/c++/stlport/stl/_iomanip.h index a27d95164ca..29e267766d1 100644 --- a/sdk/include/c++/stlport/stl/_iomanip.h +++ b/sdk/include/c++/stlport/stl/_iomanip.h @@ -123,7 +123,7 @@ setprecision(int __n) { inline _STLP_PRIV _Ios_Manip_1 _STLP_CALL setw(int __n) { - _STLP_PRIV _Ios_Manip_1::__f_ptr_type __f = &ios_base::width; + _STLP_PRIV _Ios_Manip_1::__f_ptr_type __f = &ios_base::width; return _STLP_PRIV _Ios_Manip_1(__f, __n); } diff --git a/sdk/include/c++/stlport/stl/_limits.c b/sdk/include/c++/stlport/stl/_limits.c index 39380249ebb..7fbadcb1c89 100644 --- a/sdk/include/c++/stlport/stl/_limits.c +++ b/sdk/include/c++/stlport/stl/_limits.c @@ -160,7 +160,7 @@ struct float_helper { static _Number get_word_higher() _STLP_NOTHROW { _WordsNumber __tmp = { _STLP_ADDITIONAL_OPEN_BRACKET _Word, 0, 0, 0, 0, 0, 0, 0 _STLP_ADDITIONAL_CLOSE_BRACKET }; return __tmp._num; - } + } static _Number get_word_lower() _STLP_NOTHROW { _WordsNumber __tmp = { _STLP_ADDITIONAL_OPEN_BRACKET 0, 0, 0, 0, 0, 0, 0, 0 _STLP_ADDITIONAL_CLOSE_BRACKET }; __tmp._Words[(sizeof(_Number) >= 12 ? 10 : sizeof(_Number)) / sizeof(unsigned short) - 1] = _Word; @@ -192,7 +192,7 @@ struct float_helper2 { //static _Number get_word_higher() _STLP_NOTHROW { // _WordsNumber __tmp = { _STLP_ADDITIONAL_OPEN_BRACKET _Word1, _Word2, 0, 0, 0, 0, 0, 0 _STLP_ADDITIONAL_CLOSE_BRACKET }; // return __tmp._num; - //} + //} static _Number get_word_lower() _STLP_NOTHROW { _WordsNumber __tmp = { _STLP_ADDITIONAL_OPEN_BRACKET 0, 0, 0, 0, 0, 0, 0, 0 _STLP_ADDITIONAL_CLOSE_BRACKET }; __tmp._Words[(sizeof(_Number) >= 12 ? 10 : sizeof(_Number)) / sizeof(unsigned short) - 2] = _Word1; diff --git a/sdk/include/c++/stlport/stl/_locale.h b/sdk/include/c++/stlport/stl/_locale.h index fd6d537dda3..2d7c7303cb4 100644 --- a/sdk/include/c++/stlport/stl/_locale.h +++ b/sdk/include/c++/stlport/stl/_locale.h @@ -224,7 +224,7 @@ public: : _Locale(__loc, __str, __cat) {} template - locale(const locale& __loc, _Facet* __f) + locale(const locale& __loc, _Facet* __f) : _Locale(__f != 0 ? _copy_Nameless_Locale_impl(__loc._M_impl) : __loc._M_impl) { if ( __f != 0 ) { _STLP_PRIV _InsertFacet(*this, __f); diff --git a/sdk/include/c++/stlport/stl/_rope.h b/sdk/include/c++/stlport/stl/_rope.h index f100f673c88..da7c42b15bf 100644 --- a/sdk/include/c++/stlport/stl/_rope.h +++ b/sdk/include/c++/stlport/stl/_rope.h @@ -834,7 +834,7 @@ private: } public: - _Rope_iterator_base(const _Self& __x) : + _Rope_iterator_base(const _Self& __x) : _M_current_pos(__x._M_current_pos), _M_root(__x._M_root), _M_leaf_pos( __x._M_leaf_pos ), diff --git a/sdk/include/c++/stlport/stl/_sparc_atomic.h b/sdk/include/c++/stlport/stl/_sparc_atomic.h index 21cc0ad030a..444744e552d 100644 --- a/sdk/include/c++/stlport/stl/_sparc_atomic.h +++ b/sdk/include/c++/stlport/stl/_sparc_atomic.h @@ -7,7 +7,7 @@ ** int _STLP_atomic_exchange (__stl_atomic_t *pvalue, __stl_atomic_t value) */ -# if defined(__sparc_v9__) || defined (__sparcv9) +# if defined(__sparc_v9__) || defined (__sparcv9) # ifdef __arch64__ diff --git a/sdk/include/c++/stlport/stl/_sstream.c b/sdk/include/c++/stlport/stl/_sstream.c index 9f585351e14..c26b7667b90 100644 --- a/sdk/include/c++/stlport/stl/_sstream.c +++ b/sdk/include/c++/stlport/stl/_sstream.c @@ -84,7 +84,7 @@ basic_stringbuf<_CharT, _Traits, _Alloc>::_M_set_ptrs() this->setp( __data_end, __data_end ); } else { this->setp( __data_ptr, __data_end ); - this->pbump((int)_M_str.size()); // initial write position, if we initialized with string + this->pbump((int)_M_str.size()); // initial write position, if we initialized with string } // this->setp((_M_mode & (ios_base::app | ios_base::ate))? __data_end : __data_ptr, __data_end); } diff --git a/sdk/include/c++/stlport/stl/_threads.c b/sdk/include/c++/stlport/stl/_threads.c index ea3c0b9c615..916b895043d 100644 --- a/sdk/include/c++/stlport/stl/_threads.c +++ b/sdk/include/c++/stlport/stl/_threads.c @@ -77,12 +77,12 @@ _STLP_mutex_spin<__inst>::_S_nsec_sleep(int __log_nsec, unsigned int& __iteratio # if defined (_STLP_WIN32THREADS) # if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) if (__iteration <= 4000) { - // Use SwitchToThread because + // Use SwitchToThread because // 1) Sleep(1) often takes ~15 ms // 2) SwitchToThread yields to lower-priority threads // 4000 is enough to avoid Sleep and is used just to prevent infinite looping // This number is advised spin count for Heap management by Microsoft - SwitchToThread(); + SwitchToThread(); } else { # endif if (__log_nsec <= 21) { diff --git a/sdk/include/c++/stlport/stl/config/_bc.h b/sdk/include/c++/stlport/stl/config/_bc.h index e3802dc090a..6f5092581c5 100644 --- a/sdk/include/c++/stlport/stl/config/_bc.h +++ b/sdk/include/c++/stlport/stl/config/_bc.h @@ -45,7 +45,7 @@ # pragma defineonoption _CPPUNWIND -xd # define _STLP_NO_EXCEPTION_HEADER # define _STLP_DONT_USE_EXCEPTIONS -#endif +#endif #if (__BORLANDC__ >= 0x560) && (__BORLANDC__ < 0x570) # define _USE_OLD_RW_STL @@ -53,7 +53,7 @@ #if (__BORLANDC__ >= 0x560) # if !defined (__BUILDING_STLPORT) -# define NOWINBASEINTERLOCK +# define NOWINBASEINTERLOCK # endif # define _STLP_LANG_INVARIANT_DEFINED #endif diff --git a/sdk/include/c++/stlport/stl/config/_gcc.h b/sdk/include/c++/stlport/stl/config/_gcc.h index 0d41863ee29..270556b157a 100644 --- a/sdk/include/c++/stlport/stl/config/_gcc.h +++ b/sdk/include/c++/stlport/stl/config/_gcc.h @@ -182,7 +182,7 @@ typedef unsigned int wint_t; /* strict ANSI prohibits "long long" ( gcc) */ #if defined ( __STRICT_ANSI__ ) -# undef _STLP_LONG_LONG +# undef _STLP_LONG_LONG #endif #ifndef __EXCEPTIONS diff --git a/sdk/include/c++/stlport/stl/config/_hpacc.h b/sdk/include/c++/stlport/stl/config/_hpacc.h index 920b8b41713..427e1b67f44 100644 --- a/sdk/include/c++/stlport/stl/config/_hpacc.h +++ b/sdk/include/c++/stlport/stl/config/_hpacc.h @@ -35,7 +35,7 @@ #if ((__HP_aCC > 60000) && (__HP_aCC < 61200)) # define __EDG__ # define __EDG_VERSION__ 306 -#endif +#endif #if (__HP_aCC >= 32500 ) # define _STLP_USE_NEW_C_HEADERS diff --git a/sdk/include/c++/stlport/stl/config/_solaris.h b/sdk/include/c++/stlport/stl/config/_solaris.h index 8756a060f7e..33bb38e1cf0 100644 --- a/sdk/include/c++/stlport/stl/config/_solaris.h +++ b/sdk/include/c++/stlport/stl/config/_solaris.h @@ -10,7 +10,7 @@ #define _STLP_USE_UNIX_IO #ifdef __GNUC__ -/* +/* * See comments (and configuration defines) in the host.h */ # if !(defined(__SunOS_5_5_1) || defined(__SunOS_5_6) || defined(__SunOS_5_7) || \ @@ -59,7 +59,7 @@ # endif #endif -/* +/* * Attention! See comments (and configuration defines) in the host.h * (you host may has MATH_F and MATH_L functions) * diff --git a/sdk/include/c++/stlport/stl/config/host.h b/sdk/include/c++/stlport/stl/config/host.h index 8cd442c76cb..13e91d977a9 100644 --- a/sdk/include/c++/stlport/stl/config/host.h +++ b/sdk/include/c++/stlport/stl/config/host.h @@ -258,7 +258,7 @@ * _STLP_USE_STDIO_IO, _STLP_USE_UNIX_IO: force selection of stdio calls * (fopen/flose/fread/fwrite) under fstream buffers or unistd calls * (open/close/read/write + mmap). On systems that have both (i.e. most Unixes) - * _STLP_USE_UNIX_IO is used. + * _STLP_USE_UNIX_IO is used. * * There is a third variant for Windows: _STLP_USE_WIN32_IO, that based * on Windows calls (CreateFile/CloseHandle/ReadFile/WriteFile + CreateFileMapping, diff --git a/sdk/include/c++/stlport/stl/type_manips.h b/sdk/include/c++/stlport/stl/type_manips.h index 410b59d2569..c3322e26aa6 100644 --- a/sdk/include/c++/stlport/stl/type_manips.h +++ b/sdk/include/c++/stlport/stl/type_manips.h @@ -100,7 +100,7 @@ struct _Lor3<__false_type, __false_type, __false_type> { typedef __false_type _R //the second template type!! #if defined (_STLP_CLASS_PARTIAL_SPECIALIZATION) -# if defined (__BORLANDC__) +# if defined (__BORLANDC__) template struct __selectT { typedef _Tp1 _Ret; }; @@ -116,7 +116,7 @@ template struct __select { typedef _Tp2 _Ret; }; # else template -struct __select +struct __select { typedef __selectT::_Ret, _Tp1, _Tp2>::_Ret _Ret; }; # endif diff --git a/sdk/include/crt/complex.h b/sdk/include/crt/complex.h index 7989a49dc27..c15887d0bd8 100644 --- a/sdk/include/crt/complex.h +++ b/sdk/include/crt/complex.h @@ -29,7 +29,7 @@ #include #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ - || !defined __STRICT_ANSI__ + || !defined __STRICT_ANSI__ /* These macros are specified by C99 standard */ @@ -46,7 +46,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #ifndef RC_INVOKED @@ -201,7 +201,7 @@ __CRT_INLINE long double cargl (long double _Complex _Z) #ifdef __cplusplus } -#endif +#endif #endif /* __STDC_VERSION__ >= 199901L */ diff --git a/sdk/include/crt/crtdbg.h b/sdk/include/crt/crtdbg.h index 1db6992b8a1..9117025b6e2 100644 --- a/sdk/include/crt/crtdbg.h +++ b/sdk/include/crt/crtdbg.h @@ -133,7 +133,7 @@ extern "C" { #define _RPTF0(rptno,msg) #define _RPTFN(rptno,msg,...) - + #define _RPTFW0(rptno,msg) #define _RPTFWN(rptno,msg,...) @@ -170,7 +170,7 @@ extern "C" { #define _RPTF0(rptno,msg) _RPT_BASE(rptno, __FILE__, __LINE__, NULL, "%s", msg) #define _RPTFN(rptno,msg,...) _RPT_BASE(rptno, __FILE__, __LINE__, NULL, msg, __VA_ARGS__) - + #define _RPTFW0(rptno,msg) _RPT_BASEW(rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, L"%s", msg) #define _RPTFWN(rptno,msg,...) _RPT_BASEW(rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, msg, __VA_ARGS__) diff --git a/sdk/include/crt/fenv.h b/sdk/include/crt/fenv.h index 6a7d123615d..b01aff79fdd 100644 --- a/sdk/include/crt/fenv.h +++ b/sdk/include/crt/fenv.h @@ -49,12 +49,12 @@ typedef struct unsigned short __status_word; unsigned short __unused1; unsigned short __tag_word; - unsigned short __unused2; + unsigned short __unused2; unsigned int __ip_offset; /* instruction pointer offset */ - unsigned short __ip_selector; + unsigned short __ip_selector; unsigned short __opcode; unsigned int __data_offset; - unsigned short __data_selector; + unsigned short __data_selector; unsigned short __unused3; unsigned int __mxcsr; /* contents of the MXCSR register */ } fenv_t; @@ -62,7 +62,7 @@ typedef struct /*The C99 standard (7.6.9) allows us to define implementation-specific macros for different fp environments */ - + /* The default Intel x87 floating point environment (64-bit mantissa) */ #define FE_PC64_ENV ((const fenv_t *)-1) diff --git a/sdk/include/crt/inttypes.h b/sdk/include/crt/inttypes.h index 2bb3cdea13d..a47e2fe2877 100644 --- a/sdk/include/crt/inttypes.h +++ b/sdk/include/crt/inttypes.h @@ -25,7 +25,7 @@ typedef struct { #if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) /* 7.8.1 Macros for format specifiers - * + * * MS runtime does not yet understand C9x standard "ll" * length specifier. It appears to treat "ll" as "l". * The non-standard I64 length specifier causes warning in GCC, @@ -245,7 +245,7 @@ typedef struct { #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* * no length modifier for char types prior to C9x - * MS runtime scanf appears to treat "hh" as "h" + * MS runtime scanf appears to treat "hh" as "h" */ /* signed char */ diff --git a/sdk/include/crt/libgen.h b/sdk/include/crt/libgen.h index c335d75d165..8e5b95d3521 100644 --- a/sdk/include/crt/libgen.h +++ b/sdk/include/crt/libgen.h @@ -1,5 +1,5 @@ #ifndef _LIBGEN_H_ -/* +/* * libgen.h * * $Id: libgen.h,v 1.2 2007/06/23 07:34:15 dannysmith Exp $ diff --git a/sdk/include/crt/mingw32/intrin_ppc.h b/sdk/include/crt/mingw32/intrin_ppc.h index 233d8b2b02f..f66bfd49d63 100644 --- a/sdk/include/crt/mingw32/intrin_ppc.h +++ b/sdk/include/crt/mingw32/intrin_ppc.h @@ -149,7 +149,7 @@ PPC_QUAL char _InterlockedCompareExchange8(volatile char * const Destination, co volatile long retval __asm__("r8") = 0; __asm__ __volatile__ ( "sync\n" - "1: lbarx %0,0,%1\n" + "1: lbarx %0,0,%1\n" : "=r" (retval) : "r" (Destination)); __asm__ __volatile__ ( " cmpw %3,%1\n" @@ -157,7 +157,7 @@ PPC_QUAL char _InterlockedCompareExchange8(volatile char * const Destination, co " stbcx. %2,0,%0\n" " bne- 1b\n" "2: isync" - : + : : "r" (Destination), "r" (Comperand), "r" (Exchange), "r" (retval)); return retval; } @@ -167,7 +167,7 @@ PPC_QUAL short _InterlockedCompareExchange16(volatile short * const Destination, volatile long retval __asm__("r8") = 0; __asm__ __volatile__ ( "sync\n" - "1: lharx %0,0,%1\n" + "1: lharx %0,0,%1\n" : "=&r" (retval) : "r" (Destination)); __asm__ __volatile__ ( " cmpw %3,%1\n" @@ -175,7 +175,7 @@ PPC_QUAL short _InterlockedCompareExchange16(volatile short * const Destination, " sthcx. %2,0,%0\n" " bne- 1b\n" "2: isync" - : + : : "r" (Destination), "r" (Comperand), "r" (Exchange), "r" (retval)); return retval; } @@ -185,7 +185,7 @@ PPC_QUAL long _InterlockedCompareExchange(volatile long * const Destination, con volatile long retval __asm__("r8") = 0; __asm__ __volatile__ ( "sync\n" - "1: lwarx %0,0,%1\n" + "1: lwarx %0,0,%1\n" : "=&r" (retval) : "r" (Destination)); __asm__ __volatile__ ( " cmpw %3,%1\n" @@ -193,7 +193,7 @@ PPC_QUAL long _InterlockedCompareExchange(volatile long * const Destination, con " stwcx. %2,0,%0\n" " bne- 1b\n" "2: isync" - : + : : "r" (Destination), "r" (Comperand), "r" (Exchange), "r" (retval)); return retval; } diff --git a/sdk/include/crt/mingw_math.h b/sdk/include/crt/mingw_math.h index 26a30f80552..6713a4fc7e4 100644 --- a/sdk/include/crt/mingw_math.h +++ b/sdk/include/crt/mingw_math.h @@ -6,7 +6,7 @@ #ifndef __NO_ISOCEXT #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ || !defined __STRICT_ANSI__ || defined __cplusplus - + #if __MINGW_GNUC_PREREQ(3, 3) #define HUGE_VALF __builtin_huge_valf() #define HUGE_VALL __builtin_huge_vall() @@ -24,7 +24,7 @@ extern const double __QNAN; /* Use the compiler's builtin define for FLT_EVAL_METHOD to set float_t and double_t. */ -#if defined(__FLT_EVAL_METHOD__) +#if defined(__FLT_EVAL_METHOD__) # if ( __FLT_EVAL_METHOD__== 0) typedef float float_t; typedef double double_t; @@ -56,8 +56,8 @@ typedef long double double_t; /* We can't inline float or double, because we want to ensure truncation - to semantic type before classification. - (A normal long double value might become subnormal when + to semantic type before classification. + (A normal long double value might become subnormal when converted to double, and zero when converted to float.) */ @@ -171,7 +171,7 @@ typedef long double double_t; /* 7.12.5 Hyperbolic functions: Double in C89 */ // Already in math.h -/* Inverse hyperbolic trig functions */ +/* Inverse hyperbolic trig functions */ /* 7.12.5.1 */ extern double __cdecl acosh (double); extern float __cdecl acoshf (float); @@ -230,7 +230,7 @@ typedef long double double_t; extern double __cdecl log2 (double); extern float __cdecl log2f (float); extern long double __cdecl log2l (long double); - + /* 7.12.6.11 */ extern double __cdecl logb (double); extern float __cdecl logbf (float); @@ -279,7 +279,7 @@ typedef long double double_t; extern long double __cdecl scalblnl (long double, long); /* 7.12.7.1 */ -/* Implementations adapted from Cephes versions */ +/* Implementations adapted from Cephes versions */ extern double __cdecl cbrt (double); extern float __cdecl cbrtf (float); extern long double __cdecl cbrtl (long double); @@ -342,7 +342,7 @@ __MINGW_EXTENSION long long __cdecl llrint (double); __MINGW_EXTENSION long long __cdecl llrintf (float); __MINGW_EXTENSION long long __cdecl llrintl (long double); -/* Inline versions of above. +/* Inline versions of above. GCC 4.0+ can do a better fast-math job with __builtins. */ #ifndef __CRT__NO_INLINE @@ -368,7 +368,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); return retval; } - __CRT_INLINE long __cdecl lrint (double x) + __CRT_INLINE long __cdecl lrint (double x) { long retval = 0; __asm__ __volatile__ \ @@ -376,7 +376,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); return retval; } - __CRT_INLINE long __cdecl lrintf (float x) + __CRT_INLINE long __cdecl lrintf (float x) { long retval = 0; __asm__ __volatile__ \ @@ -384,7 +384,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); return retval; } - __CRT_INLINE long __cdecl lrintl (long double x) + __CRT_INLINE long __cdecl lrintl (long double x) { long retval = 0; __asm__ __volatile__ \ @@ -392,7 +392,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); return retval; } - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x) + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x) { __MINGW_EXTENSION long long retval = 0ll; __asm__ __volatile__ \ @@ -400,7 +400,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); return retval; } - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x) + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x) { __MINGW_EXTENSION long long retval = 0ll; __asm__ __volatile__ \ @@ -408,7 +408,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); return retval; } - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x) + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x) { __MINGW_EXTENSION long long retval = 0ll; __asm__ __volatile__ \ @@ -423,7 +423,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); extern double __cdecl round (double); extern float __cdecl roundf (float); extern long double __cdecl roundl (long double); - + /* 7.12.9.7 */ extern long __cdecl lround (double); extern long __cdecl lroundf (float); @@ -431,7 +431,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); __MINGW_EXTENSION long long __cdecl llround (double); __MINGW_EXTENSION long long __cdecl llroundf (float); __MINGW_EXTENSION long long __cdecl llroundl (long double); - + /* 7.12.9.8 */ /* round towards zero, regardless of fpu control word settings */ extern double __cdecl trunc (double); @@ -441,7 +441,7 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); /* 7.12.10.1 Double in C89 */ // fmod functions. Already in math.h -/* 7.12.10.2 */ +/* 7.12.10.2 */ extern double __cdecl remainder (double, double); extern float __cdecl remainderf (float, float); extern long double __cdecl remainderl (long double, long double); @@ -499,17 +499,17 @@ __MINGW_EXTENSION long long __cdecl llrintl (long double); extern long double __cdecl fminl (long double, long double); /* 7.12.13.1 */ -/* return x * y + z as a ternary op */ +/* return x * y + z as a ternary op */ extern double __cdecl fma (double, double, double); extern float __cdecl fmaf (float, float, float); extern long double __cdecl fmal (long double, long double, long double); /* 7.12.14 */ -/* +/* * With these functions, comparisons involving quiet NaNs set the FP * condition code to "unordered". The IEEE floating-point spec * dictates that the result of floating-point comparisons should be - * false whenever a NaN is involved, with the exception of the != op, + * false whenever a NaN is involved, with the exception of the != op, * which always returns true: yes, (NaN != NaN) is true). */ diff --git a/sdk/include/crt/strings.h b/sdk/include/crt/strings.h index 1d801e739ab..4c7812397e0 100644 --- a/sdk/include/crt/strings.h +++ b/sdk/include/crt/strings.h @@ -7,7 +7,7 @@ File: strings.h Copyright: Public Domain - This file is provided because non ANSI fuctions are described in string.h + This file is provided because non ANSI fuctions are described in string.h that belong in strings.h. These functions are provided for in the OLDNAME libraries. */ diff --git a/sdk/include/crt/sys/param.h b/sdk/include/crt/sys/param.h index 56e1a3222e8..49f6c632888 100644 --- a/sdk/include/crt/sys/param.h +++ b/sdk/include/crt/sys/param.h @@ -34,7 +34,7 @@ #include #ifndef __STRICT_ANSI__ -/* These are useful for cross-compiling */ +/* These are useful for cross-compiling */ #define BIG_ENDIAN 4321 #define LITTLE_ENDIAN 1234 #define BYTE_ORDER LITTLE_ENDIAN diff --git a/sdk/include/crt/unistd.h b/sdk/include/crt/unistd.h index 6065a918db5..6b66da395cd 100644 --- a/sdk/include/crt/unistd.h +++ b/sdk/include/crt/unistd.h @@ -37,4 +37,4 @@ __CRT_INLINE int ftruncate(int __fd, off_t __length) } #endif -#endif +#endif diff --git a/sdk/include/ddk/acpiioct.h b/sdk/include/ddk/acpiioct.h index 9468d5a3aa1..c5bb6d6294e 100644 --- a/sdk/include/ddk/acpiioct.h +++ b/sdk/include/ddk/acpiioct.h @@ -138,7 +138,7 @@ typedef struct _ACPI_ENUM_CHILDREN_OUTPUT_BUFFER { ULONG Signature; ULONG NumberOfChildren; ACPI_ENUM_CHILD Children[ANYSIZE_ARRAY]; -} ACPI_ENUM_CHILDREN_OUTPUT_BUFFER; +} ACPI_ENUM_CHILDREN_OUTPUT_BUFFER; typedef ACPI_ENUM_CHILDREN_OUTPUT_BUFFER UNALIGNED *PACPI_ENUM_CHILDREN_OUTPUT_BUFFER; #define ACPI_METHOD_ARGUMENT_LENGTH( DataLength ) \ diff --git a/sdk/include/ddk/buffring.h b/sdk/include/ddk/buffring.h index 63897795c43..54bed281455 100644 --- a/sdk/include/ddk/buffring.h +++ b/sdk/include/ddk/buffring.h @@ -4,11 +4,11 @@ #define RX_REQUEST_PREPARED_FOR_HANDLING 0x10000000 typedef struct _CHANGE_BUFFERING_STATE_REQUEST_ -{ +{ LIST_ENTRY ListEntry; ULONG Flags; #if (_WIN32_WINNT < 0x0600) - PSRV_CALL pSrvCall; + PSRV_CALL pSrvCall; #endif PSRV_OPEN SrvOpen; PVOID SrvOpenKey; @@ -45,7 +45,7 @@ typedef struct _RX_BUFFERING_MANAGER_ { \ ExAcquireFastMutex(&(BufMan)->Mutex); \ } \ - } + } #endif #define RxReleaseBufferingManagerMutex(BufMan) ExReleaseFastMutex(&(BufMan)->Mutex) diff --git a/sdk/include/ddk/drmk.h b/sdk/include/ddk/drmk.h index 99f99157b11..d9317549487 100644 --- a/sdk/include/ddk/drmk.h +++ b/sdk/include/ddk/drmk.h @@ -61,7 +61,7 @@ DrmForwardContentToDeviceObject( _In_opt_ PVOID Reserved, _In_ PCDRMFORWARD DrmForward); -_IRQL_requires_max_(PASSIVE_LEVEL) +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI DrmForwardContentToFileObject( diff --git a/sdk/include/ddk/hdaudio.h b/sdk/include/ddk/hdaudio.h index 534dde735a0..78c7c4c892f 100644 --- a/sdk/include/ddk/hdaudio.h +++ b/sdk/include/ddk/hdaudio.h @@ -311,7 +311,7 @@ _Must_inspect_result_ NTSTATUS (NTAPI *PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION)( _In_ PVOID _context, - _In_ HANDLE Handle, + _In_ HANDLE Handle, _In_ ULONG NotificationCount, _In_ SIZE_T RequestedBufferSize, _Out_ PMDL *BufferMdl, diff --git a/sdk/include/ddk/hidpddi.h b/sdk/include/ddk/hidpddi.h index 3f142308530..31e664317a3 100644 --- a/sdk/include/ddk/hidpddi.h +++ b/sdk/include/ddk/hidpddi.h @@ -77,7 +77,7 @@ HidP_SysPowerCaps ( #define HIDP_GETCOLDESC_RESOURCES 0x01 #define HIDP_GETCOLDESC_BUFFER 0x02 #define HIDP_GETCOLDESC_LINK_RESOURCES 0x03 -#define HIDP_GETCOLDESC_UNEXP_END_COL 0x04 +#define HIDP_GETCOLDESC_UNEXP_END_COL 0x04 #define HIDP_GETCOLDESC_PREPARSE_RESOURCES 0x05 #define HIDP_GETCOLDESC_ONE_BYTE 0x06 #define HIDP_GETCOLDESC_TWO_BYTE 0x07 diff --git a/sdk/include/ddk/hidport.h b/sdk/include/ddk/hidport.h index e6819e9b52d..20a70af9a93 100644 --- a/sdk/include/ddk/hidport.h +++ b/sdk/include/ddk/hidport.h @@ -53,7 +53,7 @@ typedef struct _HID_DESCRIPTOR -typedef +typedef VOID (NTAPI *HID_SEND_IDLE_CALLBACK)( IN PVOID Context diff --git a/sdk/include/ddk/hubbusif.h b/sdk/include/ddk/hubbusif.h index bc089d8e2c4..5d43d1f49c6 100644 --- a/sdk/include/ddk/hubbusif.h +++ b/sdk/include/ddk/hubbusif.h @@ -483,7 +483,7 @@ typedef struct _USB_BUS_INTERFACE_HUB_V2 { PUSB_BUSIFFN_CONTROLLER_SELECTIVE_SUSPEND ControllerSelectiveSuspend; PUSB_BUSIFFN_GET_EXTENDED_HUB_INFO GetExtendedHubInformation; PUSB_BUSIFFN_GET_ROOTHUB_SYM_NAME GetRootHubSymbolicName; - PUSB_BUSIFFN_GET_DEVICE_BUSCONTEXT GetDeviceBusContext; + PUSB_BUSIFFN_GET_DEVICE_BUSCONTEXT GetDeviceBusContext; PUSB_BUSIFFN_INITIALIZE_20HUB Initialize20Hub; } USB_BUS_INTERFACE_HUB_V2, *PUSB_BUS_INTERFACE_HUB_V2; @@ -651,7 +651,7 @@ typedef struct _USB_BUS_INTERFACE_HUB_MINIDUMP { PUSB_BUSIFFN_SET_MINIDUMP_FLAGS SetUsbPortMiniDumpFlags; } USB_BUS_INTERFACE_HUB_MINIDUMP, *PUSB_BUS_INTERFACE_HUB_MINIDUMP; -DEFINE_GUID(USB_BUS_INTERFACE_HUB_SS_GUID, +DEFINE_GUID(USB_BUS_INTERFACE_HUB_SS_GUID, 0xbfc3f363, 0x8ba1, 0x4c7b, 0x97, 0xba, 0x9b, 0x12, 0xb1, 0xca, 0x13, 0x2f); typedef NTSTATUS diff --git a/sdk/include/ddk/ntimage.h b/sdk/include/ddk/ntimage.h index 0c619fb2cd3..675e3b9d76a 100644 --- a/sdk/include/ddk/ntimage.h +++ b/sdk/include/ddk/ntimage.h @@ -432,7 +432,7 @@ typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; // // Subsystems // -#define IMAGE_SUBSYSTEM_UNKNOWN 0 +#define IMAGE_SUBSYSTEM_UNKNOWN 0 #define IMAGE_SUBSYSTEM_NATIVE 1 #define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 #define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 diff --git a/sdk/include/ddk/ntstrsafe.h b/sdk/include/ddk/ntstrsafe.h index 2780efe76e7..1992778974d 100644 --- a/sdk/include/ddk/ntstrsafe.h +++ b/sdk/include/ddk/ntstrsafe.h @@ -46,7 +46,7 @@ #endif #define STRSAFE_FILL_BEHIND STRSAFE_FILL_BEHIND_NULL -#define STRSAFE_ZERO_LENGTH_ON_FAILURE STRSAFE_NULL_ON_FAILURE +#define STRSAFE_ZERO_LENGTH_ON_FAILURE STRSAFE_NULL_ON_FAILURE typedef char *STRSAFE_LPSTR; typedef const char *STRSAFE_LPCSTR; diff --git a/sdk/include/ddk/rxstruc.h b/sdk/include/ddk/rxstruc.h index 136c733acb0..e4afc605091 100644 --- a/sdk/include/ddk/rxstruc.h +++ b/sdk/include/ddk/rxstruc.h @@ -34,7 +34,7 @@ typedef struct _RDBSS_DATA PEPROCESS OurProcess; CACHE_MANAGER_CALLBACKS CacheManagerCallbacks; #if (_WIN32_WINNT < 0x0600) - CACHE_MANAGER_CALLBACKS CacheManagerNoOpCallbacks; + CACHE_MANAGER_CALLBACKS CacheManagerNoOpCallbacks; #endif ERESOURCE Resource; } RDBSS_DATA; diff --git a/sdk/include/ddk/rxtimer.h b/sdk/include/ddk/rxtimer.h index ca97245afc0..a81a087a843 100644 --- a/sdk/include/ddk/rxtimer.h +++ b/sdk/include/ddk/rxtimer.h @@ -8,14 +8,14 @@ typedef struct _RX_WORK_ITEM_ ULONG Options; } RX_WORK_ITEM, *PRX_WORK_ITEM; -NTSTATUS -NTAPI -RxPostOneShotTimerRequest( - _In_ PRDBSS_DEVICE_OBJECT pDeviceObject, - _In_ PRX_WORK_ITEM pWorkItem, - _In_ PRX_WORKERTHREAD_ROUTINE Routine, - _In_ PVOID pContext, - _In_ LARGE_INTEGER TimeInterval); +NTSTATUS +NTAPI +RxPostOneShotTimerRequest( + _In_ PRDBSS_DEVICE_OBJECT pDeviceObject, + _In_ PRX_WORK_ITEM pWorkItem, + _In_ PRX_WORKERTHREAD_ROUTINE Routine, + _In_ PVOID pContext, + _In_ LARGE_INTEGER TimeInterval); NTSTATUS NTAPI diff --git a/sdk/include/ddk/storport.h b/sdk/include/ddk/storport.h index 7b7416ff24d..7941ee9fab0 100644 --- a/sdk/include/ddk/storport.h +++ b/sdk/include/ddk/storport.h @@ -815,7 +815,7 @@ typedef union _CDB UCHAR Reserved2; UCHAR Control; } CDB12, *PCDB12; - struct _CDB16 + struct _CDB16 { UCHAR OperationCode; UCHAR Reserved1:3; diff --git a/sdk/include/ddk/strmini.h b/sdk/include/ddk/strmini.h index ece0af3ccba..9dd7b1f0fc3 100644 --- a/sdk/include/ddk/strmini.h +++ b/sdk/include/ddk/strmini.h @@ -170,7 +170,7 @@ typedef struct _STREAM_METHOD_DESCRIPTOR { typedef enum _SRB_COMMAND { SRB_READ_DATA, - SRB_WRITE_DATA, + SRB_WRITE_DATA, SRB_GET_STREAM_STATE, SRB_SET_STREAM_STATE, SRB_SET_STREAM_PROPERTY, diff --git a/sdk/include/ddk/usbprotocoldefs.h b/sdk/include/ddk/usbprotocoldefs.h index bd750cb2f8b..541d0bbcf82 100644 --- a/sdk/include/ddk/usbprotocoldefs.h +++ b/sdk/include/ddk/usbprotocoldefs.h @@ -507,7 +507,7 @@ typedef struct _USBHUBPORTDATA { #define USB_MAKE_LANGID(lang, sublang) \ ((((USHORT)(sublang)) << 10) | (USHORT)(lang)) -#define USB_LANG_RESERVED 0x00 +#define USB_LANG_RESERVED 0x00 #define USB_LANG_ARABIC 0x01 #define USB_LANG_BULGARIAN 0x02 #define USB_LANG_CATALAN 0x03 diff --git a/sdk/include/dxsdk/dmplugin.h b/sdk/include/dxsdk/dmplugin.h index 6cf3114aebb..96a23549032 100644 --- a/sdk/include/dxsdk/dmplugin.h +++ b/sdk/include/dxsdk/dmplugin.h @@ -40,11 +40,11 @@ extern "C" { */ #define DMUS_REGSTR_PATH_TOOLS "Software\\Microsoft\\DirectMusic\\Tools" - + /***************************************************************************** * Predeclare the interfaces */ -/* CLSIDs */ +/* CLSIDs */ DEFINE_GUID(CLSID_DirectMusicBandTrack, 0xd2ac2894,0xb39b,0x11d1,0x87,0x04,0x00,0x60,0x08,0x93,0xb1,0xbd); DEFINE_GUID(CLSID_DirectMusicChordTrack, 0xd2ac288b,0xb39b,0x11d1,0x87,0x04,0x00,0x60,0x08,0x93,0xb1,0xbd); DEFINE_GUID(CLSID_DirectMusicChordMapTrack, 0xd2ac2896,0xb39b,0x11d1,0x87,0x04,0x00,0x60,0x08,0x93,0xb1,0xbd); diff --git a/sdk/include/dxsdk/dmusicc.h b/sdk/include/dxsdk/dmusicc.h index 731b750e7e8..3f1ff88aa8b 100644 --- a/sdk/include/dxsdk/dmusicc.h +++ b/sdk/include/dxsdk/dmusicc.h @@ -48,7 +48,7 @@ extern "C" { DEFINE_GUID(CLSID_DirectMusic, 0x636b9f10,0x0c7d,0x11d1,0x95,0xb2,0x00,0x20,0xaf,0xdc,0x74,0x21); DEFINE_GUID(CLSID_DirectMusicCollection, 0x480ff4b0,0x28b2,0x11d1,0xbe,0xf7,0x00,0xc0,0x4f,0xbf,0x8f,0xef); DEFINE_GUID(CLSID_DirectMusicSynth, 0x58c2b4d0,0x46e7,0x11d1,0x89,0xac,0x00,0xa0,0xc9,0x05,0x41,0x29); - + /* IIDs */ DEFINE_GUID(IID_IDirectMusic, 0x6536115a,0x7b2d,0x11d2,0xba,0x18,0x00,0x00,0xf8,0x75,0xac,0x12); DEFINE_GUID(IID_IDirectMusic2, 0x6fc2cae1,0xbc78,0x11d2,0xaf,0xa6,0x00,0xaa,0x00,0x24,0xd8,0xb6); @@ -89,7 +89,7 @@ DEFINE_GUID(GUID_DMUS_PROP_WavesReverb, 0x04cb5622,0x32e5,0x11d2,0xaf, DEFINE_GUID(GUID_DMUS_PROP_WriteLatency, 0x268a0fa0,0x60f2,0x11d2,0xaf,0xa6,0x00,0xaa,0x00,0x24,0xd8,0xb6); DEFINE_GUID(GUID_DMUS_PROP_WritePeriod, 0x268a0fa1,0x60f2,0x11d2,0xaf,0xa6,0x00,0xaa,0x00,0x24,0xd8,0xb6); DEFINE_GUID(GUID_DMUS_PROP_XG_Capable, 0x6496aba1,0x61b0,0x11d2,0xaf,0xa6,0x00,0xaa,0x00,0x24,0xd8,0xb6); -DEFINE_GUID(GUID_DMUS_PROP_XG_Hardware, 0x178f2f26,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12); +DEFINE_GUID(GUID_DMUS_PROP_XG_Hardware, 0x178f2f26,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12); /* typedef definitions */ typedef struct IDirectMusic *LPDIRECTMUSIC; @@ -117,7 +117,7 @@ typedef struct IReferenceClock *LPREFERENCECLOCK; * Typedef definitions */ typedef ULONGLONG SAMPLE_TIME, *LPSAMPLE_TIME; -typedef ULONGLONG SAMPLE_POSITION, *LPSAMPLE_POSITION; +typedef ULONGLONG SAMPLE_POSITION, *LPSAMPLE_POSITION; /***************************************************************************** @@ -173,7 +173,7 @@ typedef ULONGLONG SAMPLE_POSITION, *LPSAMPLE_POSITION; #define DMUS_EFFECT_REVERB 0x1 #define DMUS_EFFECT_CHORUS 0x2 #define DMUS_EFFECT_DELAY 0x4 - + #define DMUS_MAX_DESCRIPTION 0x80 #define DMUS_MAX_DRIVER 0x80 @@ -229,7 +229,7 @@ typedef ULONGLONG SAMPLE_POSITION, *LPSAMPLE_POSITION; #define DSBUSID_LOW_FREQUENCY 0x00000003 #define DSBUSID_BACK_LEFT 0x00000004 #define DSBUSID_BACK_RIGHT 0x00000005 -#define DSBUSID_FRONT_LEFT_OF_CENTER 0x00000006 +#define DSBUSID_FRONT_LEFT_OF_CENTER 0x00000006 #define DSBUSID_FRONT_RIGHT_OF_CENTER 0x00000007 #define DSBUSID_BACK_CENTER 0x00000008 #define DSBUSID_SIDE_LEFT 0x00000009 @@ -247,7 +247,7 @@ typedef ULONGLONG SAMPLE_POSITION, *LPSAMPLE_POSITION; #define DSBUSID_REVERB_SEND 0x00000040 #define DSBUSID_CHORUS_SEND 0x00000041 -#define DSBUSID_DYNAMIC_0 0x00000200 +#define DSBUSID_DYNAMIC_0 0x00000200 #define DSBUSID_NULL 0xFFFFFFFF @@ -293,7 +293,7 @@ struct _DMUS_PORTCAPS { DWORD dwType; DWORD dwMemorySize; DWORD dwMaxChannelGroups; - DWORD dwMaxVoices; + DWORD dwMaxVoices; DWORD dwMaxAudioChannels; DWORD dwEffectFlags; WCHAR wszDescription[DMUS_MAX_DESCRIPTION]; @@ -364,7 +364,7 @@ struct _DMUS_CLOCKINFO8 { DMUS_CLOCKTYPE ctType; GUID guidClock; WCHAR wszDescription[DMUS_MAX_DESCRIPTION]; - DWORD dwFlags; + DWORD dwFlags; }; diff --git a/sdk/include/dxsdk/dmusicf.h b/sdk/include/dxsdk/dmusicf.h index 6906ecc2675..2828fc9174c 100644 --- a/sdk/include/dxsdk/dmusicf.h +++ b/sdk/include/dxsdk/dmusicf.h @@ -278,7 +278,7 @@ extern "C" { #define DMUS_SONG_NOSEG 0xFFFFFFFF #define DMUS_SONG_NOFROMSEG 0x80000001 -#define DMUS_SIGNPOSTF_A 0x0001 +#define DMUS_SIGNPOSTF_A 0x0001 #define DMUS_SIGNPOSTF_B 0x0002 #define DMUS_SIGNPOSTF_C 0x0004 #define DMUS_SIGNPOSTF_D 0x0008 @@ -397,7 +397,7 @@ typedef struct _DMUS_IO_WAVE_PART_HEADER DMUS_IO_WAVE_PART_HEADER, typedef struct _DMUS_IO_WAVE_ITEM_HEADER DMUS_IO_WAVE_ITEM_HEADER, *LPDMUS_IO_WAVE_ITEM_HEADER; typedef struct _DMUS_IO_CONTAINER_HEADER DMUS_IO_CONTAINER_HEADER, *LPDMUS_IO_CONTAINER_HEADER; typedef struct _DMUS_IO_CONTAINED_OBJECT_HEADER DMUS_IO_CONTAINED_OBJECT_HEADER, *LPDMUS_IO_CONTAINED_OBJECT_HEADER; -typedef struct _DMUS_IO_SEGMENT_HEADER DMUS_IO_SEGMENT_HEADER, *LPDMUS_IO_SEGMENT_HEADER; +typedef struct _DMUS_IO_SEGMENT_HEADER DMUS_IO_SEGMENT_HEADER, *LPDMUS_IO_SEGMENT_HEADER; typedef struct _DMUS_IO_TRACK_HEADER DMUS_IO_TRACK_HEADER, *LPDMUS_IO_TRACK_HEADER; typedef struct _DMUS_IO_TRACK_EXTRAS_HEADER DMUS_IO_TRACK_EXTRAS_HEADER, *LPDMUS_IO_TRACK_EXTRAS_HEADER; typedef struct _DMUS_IO_REFERENCE DMUS_IO_REFERENCE, *LPDMUS_IO_REFERENCE; @@ -432,7 +432,7 @@ struct _DMUS_IO_SEQ_ITEM { MUSIC_TIME mtTime; MUSIC_TIME mtDuration; DWORD dwPChannel; - short nOffset; + short nOffset; BYTE bStatus; BYTE bByte1; BYTE bByte2; @@ -492,7 +492,7 @@ struct _DMUS_IO_TIMESIG { struct _DMUS_IO_STYLE { DMUS_IO_TIMESIG timeSig; - double dblTempo; + double dblTempo; }; struct _DMUS_IO_VERSION { diff --git a/sdk/include/dxsdk/dmusici.h b/sdk/include/dxsdk/dmusici.h index 82a137b1fed..d9c3ceacc33 100644 --- a/sdk/include/dxsdk/dmusici.h +++ b/sdk/include/dxsdk/dmusici.h @@ -296,9 +296,9 @@ typedef WORD TRANSITION_TYPE, *LPTRANSITION_TYPE; #define DMUS_PCHANNEL_BROADCAST_AUDIOPATH 0xFFFFFFFE #define DMUS_PCHANNEL_BROADCAST_SEGMENT 0xFFFFFFFD #define DMUS_PCHANNEL_BROADCAST_GROUPS 0xFFFFFFFC -#define DMUS_PCHANNEL_ALL 0xFFFFFFFB +#define DMUS_PCHANNEL_ALL 0xFFFFFFFB -#define DMUS_PLAYMODE_FIXED 0x0 +#define DMUS_PLAYMODE_FIXED 0x0 #define DMUS_PLAYMODE_FIXEDTOKEY DMUS_PLAYMODE_KEY_ROOT #define DMUS_PLAYMODE_FIXEDTOCHORD DMUS_PLAYMODE_CHORD_ROOT #define DMUS_PLAYMODE_PEDALPOINT (DMUS_PLAYMODE_KEY_ROOT | DMUS_PLAYMODE_SCALE_INTERVALS) @@ -414,7 +414,7 @@ enum enumDMUS_SHAPET_TYPES { DMUS_SHAPET_SONG = 0x8 }; -enum enumDMUS_COMPOSEF_FLAGS { +enum enumDMUS_COMPOSEF_FLAGS { DMUS_COMPOSEF_NONE = 0x000000, DMUS_COMPOSEF_ALIGN = 0x000001, DMUS_COMPOSEF_OVERLAP = 0x000002, @@ -472,7 +472,7 @@ enum enumDMUS_PMSGT_TYPES { }; enum enumDMUS_SEGF_FLAGS { - DMUS_SEGF_REFTIME = 0x000040, + DMUS_SEGF_REFTIME = 0x000040, DMUS_SEGF_SECONDARY = 0x000080, DMUS_SEGF_QUEUE = 0x000100, DMUS_SEGF_CONTROL = 0x000200, @@ -534,7 +534,7 @@ enum enumDMUS_CURVE_FLAGS { DMUS_CURVE_START_FROM_CURRENT = 0x2 }; -enum { +enum { DMUS_CURVES_LINEAR = 0x0, DMUS_CURVES_INSTANT = 0x1, DMUS_CURVES_EXP = 0x2, @@ -704,7 +704,7 @@ struct _DMUS_NOTIFICATION_PMSG { }; struct _DMUS_WAVE_PMSG { - DMUS_PMSG_PART + DMUS_PMSG_PART REFERENCE_TIME rtStartOffset; REFERENCE_TIME rtDuration; LONG lOffset; @@ -714,7 +714,7 @@ struct _DMUS_WAVE_PMSG { }; struct _DMUS_LYRIC_PMSG { - DMUS_PMSG_PART + DMUS_PMSG_PART WCHAR wszString[1]; }; diff --git a/sdk/include/dxsdk/dmusics.h b/sdk/include/dxsdk/dmusics.h index 7d48e93dd01..ad9501ec1a9 100644 --- a/sdk/include/dxsdk/dmusics.h +++ b/sdk/include/dxsdk/dmusics.h @@ -66,7 +66,7 @@ typedef struct _DMUS_VOICE_STATE DMUS_VOICE_STATE, *LPDMUS_VOICE_STATE; struct _DMUS_VOICE_STATE { BOOL bExists; SAMPLE_POSITION spPosition; -}; +}; #endif /* _DMUS_VOICE_STATE_DEFINED */ diff --git a/sdk/include/dxsdk/mpegtype.h b/sdk/include/dxsdk/mpegtype.h index 6760054c504..efd8f8f39d2 100644 --- a/sdk/include/dxsdk/mpegtype.h +++ b/sdk/include/dxsdk/mpegtype.h @@ -4,7 +4,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif diff --git a/sdk/include/psdk/cvconst.h b/sdk/include/psdk/cvconst.h index 80b8e440edc..73ba1db057e 100644 --- a/sdk/include/psdk/cvconst.h +++ b/sdk/include/psdk/cvconst.h @@ -41,13 +41,13 @@ enum SymTagEnum SymTagPointerType, SymTagArrayType, SymTagBaseType, - SymTagTypedef, + SymTagTypedef, SymTagBaseClass, SymTagFriend, - SymTagFunctionArgType, - SymTagFuncDebugStart, + SymTagFunctionArgType, + SymTagFuncDebugStart, SymTagFuncDebugEnd, - SymTagUsingNamespace, + SymTagUsingNamespace, SymTagVTableShape, SymTagVTable, SymTagCustom, @@ -693,7 +693,7 @@ typedef enum THUNK_ORDINAL_ADJUSTOR, THUNK_ORDINAL_VCALL, THUNK_ORDINAL_PCODE, - THUNK_ORDINAL_LOAD + THUNK_ORDINAL_LOAD } THUNK_ORDINAL; typedef enum CV_call_e diff --git a/sdk/include/psdk/d3d8types.h b/sdk/include/psdk/d3d8types.h index fec33c3f11c..d48a8b01a28 100644 --- a/sdk/include/psdk/d3d8types.h +++ b/sdk/include/psdk/d3d8types.h @@ -157,7 +157,7 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) #endif -/**************************** +/**************************** * Vertex Shaders Declaration */ diff --git a/sdk/include/psdk/d3d9types.h b/sdk/include/psdk/d3d9types.h index b2c384437ce..c1f1f2910a3 100644 --- a/sdk/include/psdk/d3d9types.h +++ b/sdk/include/psdk/d3d9types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2003 Jason Edmeades + * Copyright (C) 2002-2003 Jason Edmeades * Copyright (C) 2002-2003 Raphael Junqueira * Copyright (C) 2005 Oliver Stieber * @@ -212,7 +212,7 @@ #define D3DPRESENT_RATE_DEFAULT 0x00000000 -/**************************** +/**************************** * Vertex Shaders Declaration */ @@ -220,17 +220,17 @@ typedef enum _D3DDECLUSAGE { D3DDECLUSAGE_POSITION = 0, D3DDECLUSAGE_BLENDWEIGHT = 1, D3DDECLUSAGE_BLENDINDICES = 2, - D3DDECLUSAGE_NORMAL = 3, - D3DDECLUSAGE_PSIZE = 4, - D3DDECLUSAGE_TEXCOORD = 5, - D3DDECLUSAGE_TANGENT = 6, - D3DDECLUSAGE_BINORMAL = 7, - D3DDECLUSAGE_TESSFACTOR = 8, - D3DDECLUSAGE_POSITIONT = 9, - D3DDECLUSAGE_COLOR = 10, - D3DDECLUSAGE_FOG = 11, - D3DDECLUSAGE_DEPTH = 12, - D3DDECLUSAGE_SAMPLE = 13 + D3DDECLUSAGE_NORMAL = 3, + D3DDECLUSAGE_PSIZE = 4, + D3DDECLUSAGE_TEXCOORD = 5, + D3DDECLUSAGE_TANGENT = 6, + D3DDECLUSAGE_BINORMAL = 7, + D3DDECLUSAGE_TESSFACTOR = 8, + D3DDECLUSAGE_POSITIONT = 9, + D3DDECLUSAGE_COLOR = 10, + D3DDECLUSAGE_FOG = 11, + D3DDECLUSAGE_DEPTH = 12, + D3DDECLUSAGE_SAMPLE = 13 } D3DDECLUSAGE; #define D3DMAXDECLUSAGE D3DDECLUSAGE_SAMPLE @@ -438,7 +438,7 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { D3DSIO_SETP = 94, D3DSIO_TEXLDL = 95, D3DSIO_BREAKP = 96, - + D3DSIO_PHASE = 0xFFFD, D3DSIO_COMMENT = 0xFFFE, D3DSIO_END = 0XFFFF, @@ -508,7 +508,7 @@ typedef enum _D3DSHADER_PARAM_DSTMOD_TYPE { #define D3DSP_REGTYPE_MASK2 0x00001800 typedef enum _D3DSHADER_PARAM_REGISTER_TYPE { - D3DSPR_TEMP = 0, + D3DSPR_TEMP = 0, D3DSPR_INPUT = 1, D3DSPR_CONST = 2, D3DSPR_ADDR = 3, @@ -728,7 +728,7 @@ typedef enum _D3DDEGREETYPE { D3DDEGREE_QUADRATIC = 2, D3DDEGREE_CUBIC = 3, D3DDEGREE_QUINTIC = 5, - + D3DDEGREE_FORCE_DWORD = 0x7fffffff } D3DDEGREETYPE; @@ -778,7 +778,7 @@ typedef enum _D3DFORMAT { D3DFMT_G16R16 = 34, D3DFMT_A2R10G10B10 = 35, D3DFMT_A16B16G16R16 = 36, - + D3DFMT_A8P8 = 40, D3DFMT_P8 = 41, @@ -829,12 +829,12 @@ typedef enum _D3DFORMAT { D3DFMT_R16F = 111, D3DFMT_G16R16F = 112, D3DFMT_A16B16G16R16F = 113, - + /* IEEE formats */ D3DFMT_R32F = 114, D3DFMT_G32R32F = 115, D3DFMT_A32B32G32R32F = 116, - + D3DFMT_CxV8U8 = 117, @@ -1209,7 +1209,7 @@ typedef enum _D3DSAMPLERSTATETYPE { D3DSAMP_SRGBTEXTURE = 11, D3DSAMP_ELEMENTINDEX = 12, D3DSAMP_DMAPOFFSET = 13, - + D3DSAMP_FORCE_DWORD = 0x7fffffff, } D3DSAMPLERSTATETYPE; @@ -1229,7 +1229,7 @@ typedef struct _D3DADAPTER_IDENTIFIER9 { char Driver[MAX_DEVICE_IDENTIFIER_STRING]; char Description[MAX_DEVICE_IDENTIFIER_STRING]; char DeviceName[32]; - LARGE_INTEGER DriverVersion; + LARGE_INTEGER DriverVersion; DWORD VendorId; DWORD DeviceId; @@ -1309,13 +1309,13 @@ typedef struct _D3DDEVINFO_D3D9STAGETIMINGS { /* Vertex cache optimization hints. */ typedef struct D3DDEVINFO_VCACHE { /* Must be a 4 char code FOURCC (e.g. CACH) */ - DWORD Pattern; + DWORD Pattern; /* 0 to get the longest strips, 1 vertex cache */ - DWORD OptMethod; + DWORD OptMethod; /* Cache size to use (only valid if OptMethod==1) */ DWORD CacheSize; /* internal for deciding when to restart strips, non user modifiable (only valid if OptMethod==1) */ - DWORD MagicNumber; + DWORD MagicNumber; } D3DDEVINFO_VCACHE; typedef struct D3DRESOURCESTATS { diff --git a/sdk/include/psdk/d3dnthal.h b/sdk/include/psdk/d3dnthal.h index 63335f53726..05833053401 100644 --- a/sdk/include/psdk/d3dnthal.h +++ b/sdk/include/psdk/d3dnthal.h @@ -236,7 +236,7 @@ typedef DWORD (APIENTRY *LPD3DNTHAL_VALIDATETEXTURESTAGESTATECB)(LPD3DNTHAL_VALI typedef DWORD (APIENTRY *LPD3DNTHAL_DRAWPRIMITIVES2CB)(LPD3DNTHAL_DRAWPRIMITIVES2DATA); typedef struct _D3DNTHAL_CALLBACKS3 { - DWORD dwSize; + DWORD dwSize; DWORD dwFlags; LPD3DNTHAL_CLEAR2CB Clear2; LPVOID lpvReserved; diff --git a/sdk/include/psdk/dinput.h b/sdk/include/psdk/dinput.h index cde2f234cb9..d12a19f2649 100644 --- a/sdk/include/psdk/dinput.h +++ b/sdk/include/psdk/dinput.h @@ -218,7 +218,7 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DI8DEVTYPE_SCREENPOINTER 0x1A #define DI8DEVTYPE_REMOTE 0x1B #define DI8DEVTYPE_SUPPLEMENTAL 0x1C - + #define DIDEVTYPEMOUSE_UNKNOWN 1 #define DIDEVTYPEMOUSE_TRADITIONAL 2 #define DIDEVTYPEMOUSE_FINGERSTICK 3 @@ -316,7 +316,7 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DI8DEVTYPESUPPLEMENTAL_DUALPEDALS 11 #define DI8DEVTYPESUPPLEMENTAL_THREEPEDALS 12 #define DI8DEVTYPESUPPLEMENTAL_RUDDERPEDALS 13 - + #define GET_DIDEVICE_TYPE(dwDevType) LOBYTE(dwDevType) #define GET_DIDEVICE_SUBTYPE(dwDevType) HIBYTE(dwDevType) @@ -973,7 +973,7 @@ typedef struct DIDEVCAPS { #define DISFFC_CONTINUE 0x00000008 #define DISFFC_SETACTUATORSON 0x00000010 #define DISFFC_SETACTUATORSOFF 0x00000020 - + #define DIGFFS_EMPTY 0x00000001 #define DIGFFS_STOPPED 0x00000002 #define DIGFFS_PAUSED 0x00000004 @@ -989,7 +989,7 @@ typedef struct DIDEVCAPS { /* Effect flags */ #define DIEFT_ALL 0x00000000 - + #define DIEFT_CONSTANTFORCE 0x00000001 #define DIEFT_RAMPFORCE 0x00000002 #define DIEFT_PERIODIC 0x00000003 @@ -1004,7 +1004,7 @@ typedef struct DIDEVCAPS { #define DIEFT_DEADBAND 0x00004000 #define DIEFT_STARTDELAY 0x00008000 #define DIEFT_GETTYPE(n) LOBYTE(n) - + #define DIEFF_OBJECTIDS 0x00000001 #define DIEFF_OBJECTOFFSETS 0x00000002 #define DIEFF_CARTESIAN 0x00000010 diff --git a/sdk/include/psdk/evntprov.h b/sdk/include/psdk/evntprov.h index 13c1ed0b44b..7e183d1e770 100644 --- a/sdk/include/psdk/evntprov.h +++ b/sdk/include/psdk/evntprov.h @@ -173,7 +173,7 @@ EventWriteEx( _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData); #endif -#endif // _ETW_KM_ +#endif // _ETW_KM_ FORCEINLINE VOID diff --git a/sdk/include/psdk/ksmedia.h b/sdk/include/psdk/ksmedia.h index adfeef662e8..84f24abf4db 100644 --- a/sdk/include/psdk/ksmedia.h +++ b/sdk/include/psdk/ksmedia.h @@ -549,7 +549,7 @@ typedef struct { #if !defined(WAVE_FORMAT_EXTENSIBLE) #define WAVE_FORMAT_EXTENSIBLE 0xFFFE -#endif +#endif typedef struct { ULONG Flags; @@ -806,7 +806,7 @@ typedef struct tagKS_DATARANGE_VIDEO2 { typedef struct tagKS_VBIINFOHEADER { ULONG StartLine; - ULONG EndLine; + ULONG EndLine; ULONG SamplingFrequency; ULONG MinLineStartTime; ULONG MaxLineStartTime; @@ -993,8 +993,8 @@ typedef enum { , KSPROPERTY_AUDIO_ALGORITHM_INSTANCE , KSPROPERTY_AUDIO_FILTER_STATE , KSPROPERTY_AUDIO_PREFERRED_STATUS - -#endif + +#endif #if (NTDDI_VERSION >= NTDDI_LONGHORN) , KSPROPERTY_AUDIO_PEQ_MAX_BANDS , KSPROPERTY_AUDIO_PEQ_NUM_BANDS @@ -1126,7 +1126,7 @@ typedef enum { SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) #define KSAUDIO_SPEAKER_5POINT1_BACK KSAUDIO_SPEAKER_5POINT1 #define KSAUDIO_SPEAKER_7POINT1_WIDE KSAUDIO_SPEAKER_7POINT1 -#endif +#endif typedef struct { @@ -1169,7 +1169,7 @@ typedef struct { #define KSNODEPIN_STANDARD_IN 1 #define KSNODEPIN_STANDARD_OUT 0 -#define KSNODEPIN_SUM_MUX_IN 1 +#define KSNODEPIN_SUM_MUX_IN 1 #define KSNODEPIN_SUM_MUX_OUT 0 #define KSNODEPIN_DEMUX_IN 0 @@ -1205,7 +1205,7 @@ DEFINE_GUIDSTRUCT("185FEDF8-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIDI); DEFINE_GUIDSTRUCT("DFF220F3-F70F-11D0-B917-00A0C9223196", KSNODETYPE_SYNTHESIZER); #define KSNODETYPE_SYNTHESIZER DEFINE_GUIDNAMED(KSNODETYPE_SYNTHESIZER) -typedef struct +typedef struct { KSDATARANGE DataRange; GUID Technology; diff --git a/sdk/include/psdk/ksproxy.h b/sdk/include/psdk/ksproxy.h index 32e09549df6..66c8b4a1426 100644 --- a/sdk/include/psdk/ksproxy.h +++ b/sdk/include/psdk/ksproxy.h @@ -20,7 +20,7 @@ extern "C" { #define STATIC_IID_IKsPin\ 0xb61178d1L, 0xa2d9, 0x11cf, {0x9e, 0x53, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1} - + #define STATIC_IID_IKsPinPipe\ 0xe539cd90L, 0xa8b4, 0x11d1, {0x81, 0x89, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02} @@ -38,10 +38,10 @@ extern "C" { #define STATIC_IID_IKsAllocator\ 0x8da64899L, 0xc0d9, 0x11d0, {0x84, 0x13, 0x00, 0x00, 0xf8, 0x22, 0xfe, 0x8a} - + #define STATIC_IID_IKsAllocatorEx\ 0x091bb63aL, 0x603f, 0x11d1, {0xb0, 0x67, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02} - + #ifndef STATIC_IID_IKsPropertySet #define STATIC_IID_IKsPropertySet\ @@ -111,7 +111,7 @@ typedef enum typedef struct { - LONGLONG MinTotalNominator; + LONGLONG MinTotalNominator; LONGLONG MaxTotalNominator; LONGLONG TotalDenominator; }OPTIMAL_WEIGHT_TOTALS; @@ -121,12 +121,12 @@ typedef struct IKsPin IKsPin; typedef struct IKsAllocator IKsAllocator; typedef struct IKsAllocatorEx IKsAllocatorEx; - + #define AllocatorStrategy_DontCare 0 #define AllocatorStrategy_MinimizeNumberOfFrames 1 #define AllocatorStrategy_MinimizeFrameSize 2 #define AllocatorStrategy_MinimizeNumberOfAllocators 4 -#define AllocatorStrategy_MaximizeSpeed 8 +#define AllocatorStrategy_MaximizeSpeed 8 #define PipeFactor_None 0x0 #define PipeFactor_UserModeUpstream 0x1 @@ -299,7 +299,7 @@ DECLARE_INTERFACE_(IKsAllocatorEx, IKsAllocator) ) PURE; STDMETHOD_(VOID, KsSetProperties)( THIS_ - PALLOCATOR_PROPERTIES_EX + PALLOCATOR_PROPERTIES_EX ) PURE; STDMETHOD_(VOID, KsSetAllocatorHandle)( THIS_ @@ -309,7 +309,7 @@ DECLARE_INTERFACE_(IKsAllocatorEx, IKsAllocator) THIS_ IKsPin* KsPin ) PURE; -}; +}; typedef enum { KsPeekOperation_PeekOnly, @@ -388,9 +388,9 @@ DECLARE_INTERFACE_(IKsPinEx, IKsPin) THIS_ IMediaSample* Sample, HRESULT hr - ) PURE; + ) PURE; }; - + interface DECLSPEC_UUID("e539cd90-a8b4-11d1-8189-00a0c9062802") IKsPinPipe; #undef INTERFACE #define INTERFACE IKsPinPipe @@ -534,7 +534,7 @@ typedef struct _KSSTREAM_SEGMENT IKsDataTypeHandler *KsDataTypeHandler; KSIOOPERATION IoOperation; HANDLE CompletionEvent; - + }KSSTREAM_SEGMENT; interface DECLSPEC_UUID("423c13a2-2070-11d0-9ef7-00aa00a216a1") IKsObject; @@ -677,7 +677,7 @@ DECLSPEC_UUID("17CCA71B-ECD7-11D0-B908-00A0C9223196") CLSID_Proxy; #define KSPROPERTY_SUPPORT_GET 1 #define KSPROPERTY_SUPPORT_SET 2 -interface DECLSPEC_UUID("31EFAC30-515C-11d0-A9AA-00aa0061be93") +interface DECLSPEC_UUID("31EFAC30-515C-11d0-A9AA-00aa0061be93") #undef INTERFACE #define INTERFACE IKsPropertySet DECLARE_INTERFACE_(IKsPropertySet, IUnknown) diff --git a/sdk/include/psdk/mapiutil.h b/sdk/include/psdk/mapiutil.h index 8c53a1ca88b..4f31bd4a05d 100644 --- a/sdk/include/psdk/mapiutil.h +++ b/sdk/include/psdk/mapiutil.h @@ -175,7 +175,7 @@ LPSPropValue WINAPI LpValFindProp(ULONG,ULONG,LPSPropValue); static inline FILETIME FtAddFt(FILETIME ftLeft, FILETIME ftRight) { LONG64 *pl = (LONG64*)&ftLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = *pl + *pr; return ftmap.ft; } @@ -183,7 +183,7 @@ static inline FILETIME FtAddFt(FILETIME ftLeft, FILETIME ftRight) static inline FILETIME FtSubFt(FILETIME ftLeft, FILETIME ftRight) { LONG64 *pl = (LONG64*)&ftLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = *pl - *pr; return ftmap.ft; } @@ -191,7 +191,7 @@ static inline FILETIME FtSubFt(FILETIME ftLeft, FILETIME ftRight) static inline FILETIME FtNegFt(FILETIME ftLeft) { LONG64 *p = (LONG64*)&ftLeft; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = -*p; return ftmap.ft; } @@ -199,7 +199,7 @@ static inline FILETIME FtNegFt(FILETIME ftLeft) static inline FILETIME FtMulDw(DWORD dwLeft, FILETIME ftRight) { LONG64 l = (LONG64)dwLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = l * (*pr); return ftmap.ft; } @@ -207,7 +207,7 @@ static inline FILETIME FtMulDw(DWORD dwLeft, FILETIME ftRight) static inline FILETIME FtMulDwDw(DWORD dwLeft, DWORD dwRight) { LONG64 l = (LONG64)dwLeft, r = (LONG64)dwRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = l * r; return ftmap.ft; } @@ -253,17 +253,17 @@ DECLARE_INTERFACE_(IPropData,IMAPIProp) #define IPropData_AddRef(p) (p)->lpVtbl->AddRef(p) #define IPropData_Release(p) (p)->lpVtbl->Release(p) /*** IMAPIProp methods ***/ -#define IPropData_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) -#define IPropData_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) -#define IPropData_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) -#define IPropData_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) -#define IPropData_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) -#define IPropData_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) -#define IPropData_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) -#define IPropData_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) -#define IPropData_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) -#define IPropData_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) -#define IPropData_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) +#define IPropData_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) +#define IPropData_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) +#define IPropData_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) +#define IPropData_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) +#define IPropData_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) +#define IPropData_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) +#define IPropData_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) +#define IPropData_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) +#define IPropData_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) +#define IPropData_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) +#define IPropData_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) #define IPropData_HrSetObjAccess(p,a) (p)->lpVtbl->HrSetObjAccess(p,a) #define IPropData_HrSetPropAccess(p,a,b) (p)->lpVtbl->HrSetPropAccess(p,a,b) #define IPropData_HrGetPropAccess(p,a,b) (p)->lpVtbl->HrGetPropAccess(p,a,b) diff --git a/sdk/include/psdk/mshtmcid.h b/sdk/include/psdk/mshtmcid.h index 3213169d405..6ebb87469fb 100644 --- a/sdk/include/psdk/mshtmcid.h +++ b/sdk/include/psdk/mshtmcid.h @@ -288,7 +288,7 @@ #define IDM_CREATELINK 2290 #define IDM_COPYCONTENT 2291 #define IDM_LANGUAGE 2292 - + #define IDM_GETPRINTTEMPLATE 2295 #define IDM_SETPRINTTEMPLATE 2296 #define IDM_TEMPLATE_PAGESETUP 2298 diff --git a/sdk/include/psdk/msiquery.h b/sdk/include/psdk/msiquery.h index a1f3c6c9fd6..7b4f04fccb2 100644 --- a/sdk/include/psdk/msiquery.h +++ b/sdk/include/psdk/msiquery.h @@ -136,7 +136,7 @@ typedef enum tagMSIDBERROR MSIDBERROR_BADSHORTCUT= 27, MSIDBERROR_STRINGOVERFLOW = 28, MSIDBERROR_BADLOCALIZEATTRIB = 29 -} MSIDBERROR; +} MSIDBERROR; typedef enum tagMSIDBSTATE { diff --git a/sdk/include/psdk/ndrtypes.h b/sdk/include/psdk/ndrtypes.h index 938dc654cc8..8c2ac4dd402 100644 --- a/sdk/include/psdk/ndrtypes.h +++ b/sdk/include/psdk/ndrtypes.h @@ -81,7 +81,7 @@ typedef struct * check. */ unsigned char HasNotify : 1; /* 0x08 - should call MIDL [notify] * routine @ NotifyIndex. */ - unsigned char HasNotify2 : 1; /* 0x10 - should call MIDL [notify_flag] routine @ + unsigned char HasNotify2 : 1; /* 0x10 - should call MIDL [notify_flag] routine @ * NotifyIndex. */ /* The following bits are in fact used by midl but haven't yet been diff --git a/sdk/include/psdk/netcfgx.h b/sdk/include/psdk/netcfgx.h index e66397756bf..90ef3ae6d25 100644 --- a/sdk/include/psdk/netcfgx.h +++ b/sdk/include/psdk/netcfgx.h @@ -26,7 +26,7 @@ EXTERN_C const IID IID_INetCfgLock; #define INetCfgLock_IsWriteLocked(p,a) (p)->lpVtbl->IsWriteLocked(p,a) #endif -typedef enum +typedef enum { NCRP_QUERY_PROPERTY_UI = 1, NCRP_SHOW_PROPERTY_UI = 2 diff --git a/sdk/include/psdk/netioapi.h b/sdk/include/psdk/netioapi.h index 68c1f5255d3..1c215cf0102 100644 --- a/sdk/include/psdk/netioapi.h +++ b/sdk/include/psdk/netioapi.h @@ -31,8 +31,8 @@ typedef struct _MIB_IF_ROW2 { ULONG Mtu; IFTYPE Type; TUNNEL_TYPE TunnelType; - NDIS_MEDIUM MediaType; - NDIS_PHYSICAL_MEDIUM PhysicalMediumType; + NDIS_MEDIUM MediaType; + NDIS_PHYSICAL_MEDIUM PhysicalMediumType; NET_IF_ACCESS_TYPE AccessType; NET_IF_DIRECTION_TYPE DirectionType; struct { diff --git a/sdk/include/psdk/no_sal2.h b/sdk/include/psdk/no_sal2.h index a652717bdcf..fb841db5f79 100644 --- a/sdk/include/psdk/no_sal2.h +++ b/sdk/include/psdk/no_sal2.h @@ -7,10 +7,10 @@ */ // // Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. // - + /*** * no_sal2.h - renders the SAL annotations for documenting APIs harmless. * diff --git a/sdk/include/psdk/powrprof.h b/sdk/include/psdk/powrprof.h index 124876e77cd..50e54cd6ad9 100644 --- a/sdk/include/psdk/powrprof.h +++ b/sdk/include/psdk/powrprof.h @@ -2,7 +2,7 @@ #define _POWRPROF_H #ifndef __WINE_WINTERNL_H -/* FIXME: Include this, so NTSTATUS gets defined. +/* FIXME: Include this, so NTSTATUS gets defined. Not very clean, but I can't get the hacH^H^H^override used by official PSDK to work. */ #include diff --git a/sdk/include/psdk/qos.h b/sdk/include/psdk/qos.h index 49593624c8a..c4f1141a31d 100644 --- a/sdk/include/psdk/qos.h +++ b/sdk/include/psdk/qos.h @@ -32,8 +32,8 @@ typedef ULONG SERVICETYPE; #define QOS_GENERAL_ID_BASE 2000 -#define QOS_OBJECT_END_OF_LIST (0x00000001 + QOS_GENERAL_ID_BASE) -#define QOS_OBJECT_SD_MODE (0x00000002 + QOS_GENERAL_ID_BASE) +#define QOS_OBJECT_END_OF_LIST (0x00000001 + QOS_GENERAL_ID_BASE) +#define QOS_OBJECT_SD_MODE (0x00000002 + QOS_GENERAL_ID_BASE) #define QOS_OBJECT_SHAPING_RATE (0x00000003 + QOS_GENERAL_ID_BASE) #define QOS_OBJECT_DESTADDR (0x00000004 + QOS_GENERAL_ID_BASE) diff --git a/sdk/include/psdk/richedit.h b/sdk/include/psdk/richedit.h index 82c633eb607..8babb458fe7 100644 --- a/sdk/include/psdk/richedit.h +++ b/sdk/include/psdk/richedit.h @@ -1067,7 +1067,7 @@ typedef struct _settextex { } SETTEXTEX; /* Flags of the EM_SETTEXTEX message */ -#define ST_DEFAULT 0x00000000 +#define ST_DEFAULT 0x00000000 #define ST_KEEPUNDO 0x00000001 #define ST_SELECTION 0x00000002 #define ST_NEWCHARS 0x00000004 diff --git a/sdk/include/psdk/rpcdce.h b/sdk/include/psdk/rpcdce.h index ee01d889997..e2812f0fc21 100644 --- a/sdk/include/psdk/rpcdce.h +++ b/sdk/include/psdk/rpcdce.h @@ -324,7 +324,7 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer); RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); - + RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingCopy( RPC_BINDING_HANDLE SourceBinding, RPC_BINDING_HANDLE* DestinationBinding ); diff --git a/sdk/include/psdk/setupapi.h b/sdk/include/psdk/setupapi.h index 00fd1b9dd4f..d11e36a464a 100644 --- a/sdk/include/psdk/setupapi.h +++ b/sdk/include/psdk/setupapi.h @@ -1561,7 +1561,7 @@ SetupDiGetClassRegistryPropertyW( _Out_writes_bytes_to_(PropertyBufferSize, *RequiredSize) PBYTE PropertyBuffer, _In_ DWORD PropertyBufferSize, _Out_opt_ PDWORD RequiredSize, - _In_opt_ PCWSTR MachineName, + _In_opt_ PCWSTR MachineName, _Reserved_ PVOID Reserved); WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListClass(_In_ HDEVINFO, _Out_ LPGUID); @@ -1600,7 +1600,7 @@ WINAPI SetupDiGetDeviceInterfaceDetailA( _In_ HDEVINFO DeviceInfoSet, _In_ PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - _Inout_updates_bytes_to_opt_(DeviceInterfaceDetailDataSize, *RequiredSize) PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData, + _Inout_updates_bytes_to_opt_(DeviceInterfaceDetailDataSize, *RequiredSize) PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData, _In_ DWORD DeviceInterfaceDetailDataSize, _Out_opt_ _Out_range_(>=, sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A)) PDWORD RequiredSize, _Out_opt_ PSP_DEVINFO_DATA DeviceInfoData); @@ -1628,7 +1628,7 @@ SetupDiGetDeviceRegistryPropertyA( _In_ HDEVINFO DeviceInfoSet, _In_ PSP_DEVINFO_DATA DeviceInfoData, _In_ DWORD Property, - _Out_opt_ PDWORD PropertyRegDataType, + _Out_opt_ PDWORD PropertyRegDataType, _Out_writes_bytes_to_opt_(PropertyBufferSize, *RequiredSize) PBYTE PropertyBuffer, _In_ DWORD PropertyBufferSize, _Out_opt_ PDWORD RequiredSize); @@ -1655,7 +1655,7 @@ SetupDiGetDriverInfoDetailA( _In_ HDEVINFO DeviceInfoSet, _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, _In_ PSP_DRVINFO_DATA_A DriverInfoData, - _Inout_updates_bytes_opt_(DriverInfoDetailDataSize) PSP_DRVINFO_DETAIL_DATA_A DriverInfoDetailData, + _Inout_updates_bytes_opt_(DriverInfoDetailDataSize) PSP_DRVINFO_DETAIL_DATA_A DriverInfoDetailData, _In_ DWORD DriverInfoDetailDataSize, _Out_opt_ PDWORD RequiredSize); @@ -1824,7 +1824,7 @@ WINAPI SetupDiSetClassRegistryPropertyA( _In_ CONST GUID *ClassGuid, _In_ DWORD Property, - _In_reads_bytes_opt_(PropertyBufferSize) CONST BYTE *PropertyBuffer, + _In_reads_bytes_opt_(PropertyBufferSize) CONST BYTE *PropertyBuffer, _In_ DWORD PropertyBufferSize, _In_opt_ PCSTR MachineName, _Reserved_ PVOID Reserved); @@ -1903,7 +1903,7 @@ SetupGetFileCompressionInfoExA( _In_ PCSTR SourceFileName, _In_reads_opt_(ActualSourceFileNameBufferLen) PSTR ActualSourceFileNameBuffer, _In_ DWORD ActualSourceFileNameBufferLen, - _Out_opt_ PDWORD RequiredBufferLen, + _Out_opt_ PDWORD RequiredBufferLen, _Out_ PDWORD SourceFileSize, _Out_ PDWORD TargetFileSize, _Out_ PUINT CompressionType); @@ -1926,7 +1926,7 @@ WINAPI SetupGetInfFileListA( _In_opt_ PCSTR DirectoryPath, _In_ DWORD InfStyle, - _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, _In_ DWORD ReturnBufferSize, _Out_opt_ PDWORD RequiredSize); @@ -1947,7 +1947,7 @@ WINAPI SetupGetInfInformationA( _In_ LPCVOID InfSpec, _In_ DWORD SearchControl, - _Out_writes_bytes_to_opt_(ReturnBufferSize, *RequiredSize) PSP_INF_INFORMATION ReturnBuffer, + _Out_writes_bytes_to_opt_(ReturnBufferSize, *RequiredSize) PSP_INF_INFORMATION ReturnBuffer, _In_ DWORD ReturnBufferSize, _Out_opt_ PDWORD RequiredSize); diff --git a/sdk/include/psdk/shlwapi.h b/sdk/include/psdk/shlwapi.h index 14083c5ad23..0532387388a 100644 --- a/sdk/include/psdk/shlwapi.h +++ b/sdk/include/psdk/shlwapi.h @@ -2090,7 +2090,7 @@ QISearch( #define OFFSETOFCLASS(base, derived) \ ((DWORD)(DWORD_PTR)(static_cast((derived*)8))-8) -#include +#include #ifdef __cplusplus } /* extern "C" */ diff --git a/sdk/include/psdk/specstrings_strict.h b/sdk/include/psdk/specstrings_strict.h index a458a0d98fd..9cb71c70041 100644 --- a/sdk/include/psdk/specstrings_strict.h +++ b/sdk/include/psdk/specstrings_strict.h @@ -7,10 +7,10 @@ */ // // Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. // -/************************************************************************* +/************************************************************************* * This file documents all the macros approved for use in windows source * code. It includes some experimental macros which should only be used by * experts. @@ -25,12 +25,12 @@ * There are several levels of strictness, each level includes the behavior of * all previous levels. * -* 0 - Disable strict checking -* 1 - Break on unapproved macros and misuse of statement +* 0 - Disable strict checking +* 1 - Break on unapproved macros and misuse of statement * macros such as __fallthrough (default) * 2 - Deprecated some old macros that should not be used -* 3 - Use VS 2005 Source Annotation to make sure every macro -* is used in the right context. For example placing __in on a return +* 3 - Use VS 2005 Source Annotation to make sure every macro +* is used in the right context. For example placing __in on a return * parameter will result in an error. * @@ -45,32 +45,32 @@ * specstrings.h provides a set of annotations to describe how a function uses * its parameters - the assumptions it makes about them, and the guarantees it * makes upon finishing. -* +* * Annotations must be placed before a function parameter's type or its return * type. There are two basic classes of common annotations buffer annotations * and advanced annotations. Buffer annotations describe how functions use * their pointer parameters, and advanced annotations either describe * complex/unusual buffer behavior, or provide additional information about a * parameter that is not otherwise expressible. -* +* * Buffer Annotations -* +* * The most important annotations in SpecStrings.h provide a consistent way to * annotate buffer parameters or return values for a function. Each of these * annotations describes a single buffer (which could be a string, a * fixed-length or variable-length array, or just a pointer) that the function * interacts with: where it is, how large it is, how much is initialized, and * what the function does with it. -* +* * The appropriate macro for a given buffer can be constructed using the table * below. Just pick the appropriate values from each category, and combine * them together with a leading underscore. Some combinations of values do not * make sense as buffer annotations. Only meaningful annotations can be added * to your code; for a list of these, see the buffer annotation definitions * section. -* +* * Only a single buffer annotation should be used for each parameter. -* +* * |------------|------------|---------|--------|----------|---------------| * | Level | Usage | Size | Output | Optional | Parameters | * |------------|------------|---------|--------|----------|---------------| @@ -82,17 +82,17 @@ * |------------|------------|---------|--------|----------|---------------| * * Note: "<>" represents the empty string. -* +* * Level: Describes the buffer pointer's level of indirection from the * parameter or return value 'p'. -* +* * <> : p is the buffer pointer. * _deref : *p is the buffer pointer. p must not be NULL. -* _deref_opt : *p may be the buffer pointer. p may be NULL, in which case the +* _deref_opt : *p may be the buffer pointer. p may be NULL, in which case the * rest of the annotation is ignored. -* +* * Usage: Describes how the function uses the buffer. -* +* * <> : The buffer is not accessed. If used on the return value or with * _deref, the function will provide the buffer, and it will be uninitialized * at exit. Otherwise, the caller must provide the buffer. This should only @@ -113,7 +113,7 @@ * Size: Describes the total size of the buffer. This may be less than the * space actually allocated for the buffer, in which case it describes the * accessible amount. -* +* * <> : No buffer size is given. If the type specifies the buffer size (such * as with LPSTR and LPWSTR), that amount is used. Otherwise, the buffer is * one element long. Must be used with _in, _out, or _inout. @@ -121,12 +121,12 @@ * _ecount : The buffer size is an explicit element count. * * _bcount : The buffer size is an explicit byte count. -* +* * Output: Describes how much of the buffer will be initialized by the * function. For _inout buffers, this also describes how much is initialized * at entry. Omit this category for _in buffers; they must be fully * initialized by the caller. -* +* * <> : The type specifies how much is initialized. For instance, a function * initializing an LPWSTR must NULL-terminate the string. * @@ -134,16 +134,16 @@ * * _part : The function initializes part of the buffer, and explicitly * indicates how much. -* +* * Optional: Describes if the buffer itself is optional. -* +* * <> : The pointer to the buffer must not be NULL. * * _opt : The pointer to the buffer might be NULL. It will be checked before * being dereferenced. -* +* * Parameters: Gives explicit counts for the size and length of the buffer. -* +* * <> : There is no explicit count. Use when neither _ecount nor _bcount is * used. * @@ -152,47 +152,47 @@ * * (size,length) : The buffer's total size and initialized length are * given. Use with _ecount_part and _bcount_part. -* +* * ---------------------------------------------------------------------------- * Buffer Annotation Examples -* +* * LWSTDAPI_(BOOL) StrToIntExA( * LPCSTR pszString, // No annotation required, const implies __in. * DWORD dwFlags, * __out int *piRet // A pointer whose dereference will be filled in. * ); -* +* * void MyPaintingFunction( * __in HWND hwndControl, // An initialized read-only parameter. -* __in_opt HDC hdcOptional, // An initialized read-only parameter that +* __in_opt HDC hdcOptional, // An initialized read-only parameter that * // might be NULL. -* __inout IPropertyStore *ppsStore // An initialized parameter that +* __inout IPropertyStore *ppsStore // An initialized parameter that * // may be freely used and modified. * ); -* +* * LWSTDAPI_(BOOL) PathCompactPathExA( * __out_ecount(cchMax) LPSTR pszOut, // A string buffer with cch elements -* // that will be '\0' terminated +* // that will be '\0' terminated * // on exit. -* LPCSTR pszSrc, // No annotation required, +* LPCSTR pszSrc, // No annotation required, * // const implies __in. -* UINT cchMax, +* UINT cchMax, * DWORD dwFlags * ); -* +* * HRESULT SHLocalAllocBytes( * size_t cb, * __deref_bcount(cb) T **ppv // A pointer whose dereference will be set * // to an uninitialized buffer with cb bytes. * ); -* +* * __inout_bcount_full(cb) : A buffer with cb elements that is fully * initialized at entry and exit, and may be written to by this function. -* +* * __out_ecount_part(count, *countOut) : A buffer with count elements that * will be partially initialized by this function. The function indicates how * much it initialized by setting *countOut. -* +* ************************************************************************/ #if (_MSC_VER >= 1400) && !defined(__midl) && !defined(_PREFAST_) && (__SPECSTRINGS_STRICT_LEVEL > 0) @@ -383,7 +383,7 @@ #define __deref_opt_out_xcount_part_opt(size,len) __allowed(on_parameter) #define __deref_opt_out_ecount_full_opt(size) __allowed(on_parameter) #define __deref_opt_out_bcount_full_opt(size) __allowed(on_parameter) -#define __deref_opt_out_xcount_full_opt(size) __allowed(on_parameter) +#define __deref_opt_out_xcount_full_opt(size) __allowed(on_parameter) #define __deref_opt_out_z_opt __allowed(on_parameter) #define __deref_opt_out_ecount_z_opt(size) __allowed(on_parameter) #define __deref_opt_out_bcount_z_opt(size) __allowed(on_parameter) @@ -391,7 +391,7 @@ #define __deref_opt_inout_ecount_opt(size) __allowed(on_parameter) #define __deref_opt_inout_bcount_opt(size) __allowed(on_parameter) #define __deref_opt_inout_xcount_opt(size) __allowed(on_parameter) -#define __deref_opt_inout_ecount_part_opt(size,len) __allowed(on_parameter) +#define __deref_opt_inout_ecount_part_opt(size,len) __allowed(on_parameter) #define __deref_opt_inout_bcount_part_opt(size,len) __allowed(on_parameter) #define __deref_opt_inout_xcount_part_opt(size,len) __allowed(on_parameter) #define __deref_opt_inout_ecount_full_opt(size) __allowed(on_parameter) @@ -474,12 +474,12 @@ /************************************************************************ * Advanced Annotations -* +* * Advanced annotations describe behavior that is not expressible with the * regular buffer macros. These may be used either to annotate buffer * parameters that involve complex or conditional behavior, or to enrich * existing annotations with additional information. -* +* * _At_(expr, annotes) : annotation list annotes applies to target 'expr' * * _When_(expr, annotes) : annotation list annotes applies when 'expr' is true @@ -491,57 +491,57 @@ * the function must always satisfy its guarantees. Added automatically to * functions that indicate success in standard ways, such as by returning an * HRESULT. -* +* * __out_awcount(expr, size) T *p : Pointer p is a buffer whose size may be * given in either bytes or elements. If is true, this acts like * __out_bcount. If is false, this acts like __out_ecount. This * should only be used to annotate old APIs. -* +* * __in_awcount(expr, size) T* p : Pointer p is a buffer whose size may be given * in either bytes or elements. If is true, this acts like * __in_bcount. If is false, this acts like __in_ecount. This should * only be used to annotate old APIs. -* +* * __nullterminated T* p : Pointer p is a buffer that may be read or written * up to and including the first '\0' character or pointer. May be used on * typedefs, which marks valid (properly initialized) instances of that type * as being null-terminated. -* +* * __nullnullterminated T* p : Pointer p is a buffer that may be read or * written up to and including the first sequence of two '\0' characters or * pointers. May be used on typedefs, which marks valid instances of that * type as being double-null terminated. -* +* * __reserved T v : Value v must be 0/NULL, reserved for future use. -* +* * __checkReturn T f(); : Return value of f must not be ignored by callers * of this function. -* +* * __typefix(ctype) T v : Value v should be treated as an instance of ctype, * rather than its declared type when considering validity. -* +* * __override T f(); : Specify C#-style 'override' behaviour for overriding * virtual methods. -* +* * __callback T f(); : Function f can be used as a function pointer. -* +* * __format_string T p : Pointer p is a string that contains % markers in * the style of printf. -* +* * __blocksOn(resource) f(); : Function f blocks on the resource 'resource'. -* +* * __fallthrough : Annotates switch statement labels where fall-through is * desired, to distinguish from forgotten break statements. -* +* * __range(low_bnd, up_bnd) int f(): The return from the function "f" must * be in the inclusive numeric range [low_bnd, up_bnd]. * * __in_range(low_bnd, up_bnd) int i : Precondition that integer i must be * in the inclusive numeric range [low_bnd, up_bnd]. -* +* * __out_range(low_bnd, up_bnd) int i : Postcondition that integer i must be * in the inclusive numeric range [low_bnd, up_bnd]. -* +* * __deref_in_range(low_bnd, up_bnd) int* pi : Precondition that integer *pi * must be in the inclusive numeric range [low_bnd, up_bnd]. * @@ -553,16 +553,16 @@ * * The first argument of a range macro may also be a C relational operator * (<,>,!=, ==, <=, >=). -* +* * __range(rel_op, j) int f(): Postcondition that "f() rel_op j" must be * true. Note that j may be a expression known only at runtime. * * __in_range(rel_op, j) int i : Precondition that "i rel_op j" must be * true. Note that j may be a expression known only at runtime. -* +* * __out_range(rel_op, j) int i : Postcondition that integer "i rel_op j" * must be true. Note that j may be a expression known only at runtime. -* +* * __deref_in_range(rel_op, j) int *pi : Precondition that "*pi rel_op j" * must be true. Note that j may be a expression known only at runtime. * @@ -585,11 +585,11 @@ * __out_bound int i : Postcondition that integer i must be bound, but the * exact range can't be specified at compile time. __out_range should be * used if the range can be explicitly stated. -* +* * __deref_out_bound int pi : Postcondition that integer *pi must be bound, * but the exact range can't be specified at compile time. * __deref_out_range should be used if the range can be explicitly stated. -* +* * __assume_bound(expr); : Assume that the expression is bound to some known * range. This can be used to suppress integer overflow warnings on integral * expressions that are known to be bound due to reasons not explicit in the @@ -598,8 +598,8 @@ * __analysis_assume_nulltermianted(expr); : Assume that the expression is * a null terminated buffer. Use this to suppress tool noise specific to * nulltermination warnings, and capture deeper invariants tools can not -* discover. -* +* discover. +* * __allocator void f(): Function allocates memory using an integral size * argument * @@ -609,69 +609,69 @@ * void myfree(__deallocate_opt(Mem) void *p) : Memory is freed, no longer * usable upon return, and p may be null. * -* void free(__post_invalid void* x): Mark memory as untouchable when +* void free(__post_invalid void* x): Mark memory as untouchable when * function returns. * * ---------------------------------------------------------------------------- * Advanced Annotation Examples -* -* __success(return == TRUE) LWSTDAPI_(BOOL) +* +* __success(return == TRUE) LWSTDAPI_(BOOL) * PathCanonicalizeA(__out_ecount(MAX_PATH) LPSTR pszBuf, LPCSTR pszPath); * // pszBuf is only guaranteed to be null-terminated when TRUE is returned. -* +* * // Initialized LPWSTRs are null-terminated strings. * typedef __nullterminated WCHAR* LPWSTR; -* +* * __out_ecount(cch) __typefix(LPWSTR) void *psz; -* // psz is a buffer parameter which will be a null-terminated WCHAR string +* // psz is a buffer parameter which will be a null-terminated WCHAR string * // at exit, and which initially contains cch WCHARs. -* +* ************************************************************************/ #define _At_(expr, annotes) __allowed(on_parameter_or_return) #define _When_(expr, annotes) __allowed(on_parameter_or_return) #define __success(expr) _SAL_VERSION_CHECK(__success) -#define __out_awcount(expr,size) __allowed(on_parameter) -#define __in_awcount(expr,size) __allowed(on_parameter) +#define __out_awcount(expr,size) __allowed(on_parameter) +#define __in_awcount(expr,size) __allowed(on_parameter) #define __nullterminated _SAL_VERSION_CHECK(__nullterminated) #define __nullnullterminated _SAL_VERSION_CHECK(__nullnullterminated) #define __reserved _SAL_VERSION_CHECK(__reserved) #define __checkReturn _SAL_VERSION_CHECK(__checkReturn) -#define __typefix(ctype) __allowed(on_parameter_or_return) -#define __override __allowed(on_function) -#define __callback __allowed(on_function) -#define __format_string __allowed(on_parameter_or_return) -#define __blocksOn(resource) __allowed(on_function) +#define __typefix(ctype) __allowed(on_parameter_or_return) +#define __override __allowed(on_function) +#define __callback __allowed(on_function) +#define __format_string __allowed(on_parameter_or_return) +#define __blocksOn(resource) __allowed(on_function) #define __fallthrough __allowed(as_statement) -#define __range(lb,ub) __allowed(on_return) +#define __range(lb,ub) __allowed(on_return) #define __in_range(lb,ub) _SAL_VERSION_CHECK(__in_range) #define __out_range(lb,ub) _SAL_VERSION_CHECK(__out_range) -#define __deref_in_range(lb,ub) __allowed(on_parameter) +#define __deref_in_range(lb,ub) __allowed(on_parameter) #define __deref_out_range(lb,ub) _SAL_VERSION_CHECK(__deref_out_range) -#define __deref_inout_range(lb,ub) __allowed(on_parameter) +#define __deref_inout_range(lb,ub) __allowed(on_parameter) #define __field_range(lb,ub) _SAL_VERSION_CHECK(__field_range) -#define __range_max(a,b) __allowed(on_return) -#define __range_min(a,b) __allowed(on_return) -#define __bound __allowed(on_return) -#define __in_bound __allowed(on_parameter) -#define __out_bound __allowed(on_parameter) -#define __deref_out_bound __allowed(on_parameter) +#define __range_max(a,b) __allowed(on_return) +#define __range_min(a,b) __allowed(on_return) +#define __bound __allowed(on_return) +#define __in_bound __allowed(on_parameter) +#define __out_bound __allowed(on_parameter) +#define __deref_out_bound __allowed(on_parameter) #define __assume_bound(i) __allowed(as_statement_with_arg(i)) #define __analysis_assume_nullterminated(x) \ __allowed(as_statement_with_arg(x)) -#define __allocator __allowed(on_function) -#define __deallocate(kind) __allowed(on_parameter) -#define __deallocate_opt(kind) __allowed(on_parameter) -#define __post_invalid __allowed(on_parameter_or_return) +#define __allocator __allowed(on_function) +#define __deallocate(kind) __allowed(on_parameter) +#define __deallocate_opt(kind) __allowed(on_parameter) +#define __post_invalid __allowed(on_parameter_or_return) #define __post_nullnullterminated \ __allowed(on_parameter_or_return) -/*************************************************************************** +/*************************************************************************** * Expert Macros ***************************************************************************/ #define __null __allowed(on_typedecl) #define __notnull __allowed(on_typedecl) #define __maybenull __allowed(on_typedecl) #define __exceptthat __allowed(on_typedecl) -/*************************************************************************** +/*************************************************************************** * Macros to classify fields of structures. * Structure Annotations * @@ -772,54 +772,54 @@ * The pointer to the block of memory is may be * NULL * -* -* // Basic Usage of Struct Annotations -* #include -* #include -* struct buf_s { -* int sz; -* __field_bcount_full(sz) -* char *buf; -* }; -* void InitBuf(__out struct *buf_s b,int sz) { -* b->buf = calloc(sz,sizeof(char)); -* b->sz = sz; -* } -* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { -* fwrite(b->buf,b->sz,sizeof(char),fp); -* } -* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { -* fread(b->buf,b->sz,sizeof(char),fp); -* } -* -* -* -* // Inline Allocated Buffer -* struct buf_s { -* int sz; -* __field_bcount(sz) -* char buf[1]; -* }; -* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { -* fwrite(&(b->buf),b->sz,sizeof(char),fp); -* } -* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { -* fread(&(b->buf),b->sz,sizeof(char),fp); -* } -* -* -* -* // Embedded Header Structure -* __struct_bcount(sz) -* struct buf_s { -* int sz; -* }; -* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { -* fwrite(&b,b->sz,sizeof(char),fp); -* } -* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { -* fread(&b,b->sz,sizeof(char),fp); -* } +* +* // Basic Usage of Struct Annotations +* #include +* #include +* struct buf_s { +* int sz; +* __field_bcount_full(sz) +* char *buf; +* }; +* void InitBuf(__out struct *buf_s b,int sz) { +* b->buf = calloc(sz,sizeof(char)); +* b->sz = sz; +* } +* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { +* fwrite(b->buf,b->sz,sizeof(char),fp); +* } +* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { +* fread(b->buf,b->sz,sizeof(char),fp); +* } +* +* +* +* // Inline Allocated Buffer +* struct buf_s { +* int sz; +* __field_bcount(sz) +* char buf[1]; +* }; +* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { +* fwrite(&(b->buf),b->sz,sizeof(char),fp); +* } +* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { +* fread(&(b->buf),b->sz,sizeof(char),fp); +* } +* +* +* +* // Embedded Header Structure +* __struct_bcount(sz) +* struct buf_s { +* int sz; +* }; +* void WriteBuf(__in FILE *fp,__in struct *buf_s b) { +* fwrite(&b,b->sz,sizeof(char),fp); +* } +* void ReadBuf(__in FILE *fp,__inout struct *buf_s b) { +* fread(&b,b->sz,sizeof(char),fp); +* } * * ****************************************************************************/ @@ -839,13 +839,13 @@ #define __field_bcount_full(size) __allowed(on_field) #define __field_xcount_full(size) __allowed(on_field) #define __field_ecount_full_opt(size) __allowed(on_field) -#define __field_bcount_full_opt(size) __allowed(on_field) +#define __field_bcount_full_opt(size) __allowed(on_field) #define __field_xcount_full_opt(size) __allowed(on_field) #define __field_nullterminated __allowed(on_field) -#define __struct_bcount(size) __allowed(on_struct) -#define __struct_xcount(size) __allowed(on_struct) +#define __struct_bcount(size) __allowed(on_struct) +#define __struct_xcount(size) __allowed(on_struct) -/*************************************************************************** +/*************************************************************************** * Macros to classify the entrypoints and indicate their category. * * Pre-defined control point categories include: RPC, KERNEL, GDI. @@ -853,12 +853,12 @@ * Pre-defined control point macros include: * __rpc_entry, __kernel_entry, __gdi_entry. ***************************************************************************/ -#define __control_entrypoint(category) __allowed(on_function) -#define __rpc_entry __allowed(on_function) -#define __kernel_entry __allowed(on_function) -#define __gdi_entry __allowed(on_function) +#define __control_entrypoint(category) __allowed(on_function) +#define __rpc_entry __allowed(on_function) +#define __kernel_entry __allowed(on_function) +#define __gdi_entry __allowed(on_function) -/*************************************************************************** +/*************************************************************************** * Macros to track untrusted data and their validation. The list of untrusted * sources include: * @@ -867,15 +867,15 @@ * INTERNET - WinInet and WinHttp readers * USER_REGISTRY - HKCU portions of the registry * USER_MODE - Parameters to kernel entry points -* RPC - Parameters to RPC entry points -* DRIVER - Device driver +* RPC - Parameters to RPC entry points +* DRIVER - Device driver ***************************************************************************/ -#define __in_data_source(src_sym) __allowed(on_parameter) -#define __out_data_source(src_sym) __allowed(on_parameter) +#define __in_data_source(src_sym) __allowed(on_parameter) +#define __out_data_source(src_sym) __allowed(on_parameter) #define __field_data_source(src_sym) __allowed(on_field) #define __this_out_data_source(src_syn) __allowed(on_function) -/************************************************************************** +/************************************************************************** * Macros to tag file parsing code. Predefined formats include: * PNG - Portable Network Graphics * JPEG - Joint Photographic Experts Group @@ -895,40 +895,40 @@ * AVI - Audio Visual Interchange * ACM - Audio Compression Manager **************************************************************************/ -#define __out_validated(filetype_sym) __allowed(on_parameter) -#define __this_out_validated(filetype_sym) __allowed(on_function) -#define __file_parser(filetype_sym) __allowed(on_function) -#define __file_parser_class(filetype_sym) __allowed(on_struct) -#define __file_parser_library(filetype_sym) __allowed(as_global_decl) +#define __out_validated(filetype_sym) __allowed(on_parameter) +#define __this_out_validated(filetype_sym) __allowed(on_function) +#define __file_parser(filetype_sym) __allowed(on_function) +#define __file_parser_class(filetype_sym) __allowed(on_struct) +#define __file_parser_library(filetype_sym) __allowed(as_global_decl) -/*************************************************************************** +/*************************************************************************** * Macros to track the code content in the file. The type of code * contents currently tracked: * -* NDIS_DRIVER - NDIS Device driver +* NDIS_DRIVER - NDIS Device driver ***************************************************************************/ -#define __source_code_content(codetype_sym) __allowed(as_global_decl) +#define __source_code_content(codetype_sym) __allowed(as_global_decl) -/*************************************************************************** +/*************************************************************************** * Macros to track the code content in the class. The type of code * contents currently tracked: * * DCOM - Class implementing DCOM ***************************************************************************/ -#define __class_code_content(codetype_sym) __allowed(on_struct) +#define __class_code_content(codetype_sym) __allowed(on_struct) /************************************************************************* * Macros to tag encoded function pointers **************************************************************************/ -#define __encoded_pointer -#define __encoded_array +#define __encoded_pointer +#define __encoded_array #define __field_encoded_pointer __allowed(on_field) #define __field_encoded_array __allowed(on_field) -#define __transfer(formal) __allowed(on_parameter_or_return) +#define __transfer(formal) __allowed(on_parameter_or_return) #define __assume_validated(exp) __allowed(as_statement_with_arg(exp)) -/************************************************************************* +/************************************************************************* * __analysis_assume(expr) : Expert macro use only when directed. Use this to * tell static analysis tools like PREfix and PREfast about a non-coded * assumption that you wish the tools to assume. The assumption will be @@ -945,7 +945,7 @@ #define __analysis_assume(expr) __allowed(as_statement_with_arg(expr)) #define __analysis_assert(expr) __allowed(as_statement_with_arg(expr)) -/************************************************************************* +/************************************************************************* * __analysis_hint(hint_sym) : Expert macro use only when * directed. Use this to influence certain analysis heuristics * used by the tools. These hints do not describe the semantics @@ -955,13 +955,13 @@ * Current hints that are supported are: * * INLINE - inline this function during analysis overrides any -* default heuristics -* NOINLINE - do not inline this function during analysis overrides +* default heuristics +* NOINLINE - do not inline this function during analysis overrides * and default heuristics *************************************************************************/ #define __analysis_hint(hint) __allowed(on_function) -/************************************************************************* +/************************************************************************* * Macros to encode abstract properties of values. Used by SALadt.h *************************************************************************/ #define __type_has_adt_prop(adt,prop) __allowed(on_typdecl) @@ -970,9 +970,9 @@ #define __out_transfer_adt_prop(arg) __allowed(on_parameter) #define __out_has_type_adt_props(typ) __allowed(on_parameter) -/************************************************************************* -* Macros used by Prefast for Drivers -* +/************************************************************************* +* Macros used by Prefast for Drivers +* * __possibly_notnullterminated : * * Used for return values of parameters or functions that do not @@ -981,18 +981,18 @@ *************************************************************************/ #define __possibly_notnullterminated __allowed(on_parameter_or_return) -/************************************************************************* +/************************************************************************* * Advanced macros -* -* __volatile +* +* __volatile * The __volatile annotation identifies a global variable or -* structure field that: -* 1) is not declared volatile; +* structure field that: +* 1) is not declared volatile; * 2) is accessed concurrently by multiple threads. * * The __deref_volatile annotation identifies a global variable * or structure field that stores a pointer to some data that: -* 1) is not declared volatile; +* 1) is not declared volatile; * 2) is accessed concurrently by multiple threads. * * Prefast uses these annotations to find patterns of code that @@ -1012,7 +1012,7 @@ #define __nonvolatile __allowed(on_global_or_field) #define __deref_nonvolatile __allowed(on_global_or_field) -/************************************************************************* +/************************************************************************* * Macros deprecated with strict level greater then 1. **************************************************************************/ #if (__SPECSTRINGS_STRICT_LEVEL > 1) @@ -1027,33 +1027,33 @@ #pragma deprecated(__inout_nz) #pragma deprecated(__inout_ecount_nz) #pragma deprecated(__inout_bcount_nz) -#pragma deprecated(__in_nz_opt) +#pragma deprecated(__in_nz_opt) #pragma deprecated(__in_ecount_nz_opt) #pragma deprecated(__in_bcount_nz_opt) #pragma deprecated(__out_ecount_nz_opt) #pragma deprecated(__out_bcount_nz_opt) -#pragma deprecated(__inout_nz_opt) +#pragma deprecated(__inout_nz_opt) #pragma deprecated(__inout_ecount_nz_opt) #pragma deprecated(__inout_bcount_nz_opt) -#pragma deprecated(__deref_out_nz) +#pragma deprecated(__deref_out_nz) #pragma deprecated(__deref_out_ecount_nz) #pragma deprecated(__deref_out_bcount_nz) -#pragma deprecated(__deref_inout_nz) +#pragma deprecated(__deref_inout_nz) #pragma deprecated(__deref_inout_ecount_nz) #pragma deprecated(__deref_inout_bcount_nz) -#pragma deprecated(__deref_out_nz_opt) +#pragma deprecated(__deref_out_nz_opt) #pragma deprecated(__deref_out_ecount_nz_opt) #pragma deprecated(__deref_out_bcount_nz_opt) -#pragma deprecated(__deref_inout_nz_opt) +#pragma deprecated(__deref_inout_nz_opt) #pragma deprecated(__deref_inout_ecount_nz_opt) #pragma deprecated(__deref_inout_bcount_nz_opt) -#pragma deprecated(__deref_opt_inout_nz) +#pragma deprecated(__deref_opt_inout_nz) #pragma deprecated(__deref_opt_inout_ecount_nz) #pragma deprecated(__deref_opt_inout_bcount_nz) -#pragma deprecated(__deref_opt_out_nz_opt) +#pragma deprecated(__deref_opt_out_nz_opt) #pragma deprecated(__deref_opt_out_ecount_nz_opt) #pragma deprecated(__deref_opt_out_bcount_nz_opt) -#pragma deprecated(__deref_opt_inout_nz_opt) +#pragma deprecated(__deref_opt_inout_nz_opt) #pragma deprecated(__deref_opt_inout_ecount_nz_opt) #pragma deprecated(__deref_opt_inout_bcount_nz_opt) #pragma deprecated(__deref) @@ -1075,52 +1075,52 @@ #pragma deprecated(__precond) #endif /* Define soon to be deprecated macros to nops. */ -#define __in_nz -#define __in_ecount_nz(size) -#define __in_bcount_nz(size) -#define __out_nz -#define __out_nz_opt -#define __out_ecount_nz(size) -#define __out_bcount_nz(size) -#define __inout_nz -#define __inout_ecount_nz(size) -#define __inout_bcount_nz(size) -#define __in_nz_opt -#define __in_ecount_nz_opt(size) -#define __in_bcount_nz_opt(size) -#define __out_ecount_nz_opt(size) -#define __out_bcount_nz_opt(size) -#define __inout_nz_opt -#define __inout_ecount_nz_opt(size) -#define __inout_bcount_nz_opt(size) -#define __deref_out_nz -#define __deref_out_ecount_nz(size) -#define __deref_out_bcount_nz(size) -#define __deref_inout_nz -#define __deref_inout_ecount_nz(size) -#define __deref_inout_bcount_nz(size) -#define __deref_out_nz_opt -#define __deref_out_ecount_nz_opt(size) -#define __deref_out_bcount_nz_opt(size) -#define __deref_inout_nz_opt -#define __deref_inout_ecount_nz_opt(size) -#define __deref_inout_bcount_nz_opt(size) -#define __deref_opt_inout_nz -#define __deref_opt_inout_ecount_nz(size) -#define __deref_opt_inout_bcount_nz(size) -#define __deref_opt_out_nz_opt -#define __deref_opt_out_ecount_nz_opt(size) -#define __deref_opt_out_bcount_nz_opt(size) -#define __deref_opt_inout_nz_opt -#define __deref_opt_inout_ecount_nz_opt(size) -#define __deref_opt_inout_bcount_nz_opt(size) -#define __deref -#define __pre -#define __post -#define __readableTo(count) -#define __writableTo(count) -#define __maybevalid -#define __inexpressible_readableTo(string) +#define __in_nz +#define __in_ecount_nz(size) +#define __in_bcount_nz(size) +#define __out_nz +#define __out_nz_opt +#define __out_ecount_nz(size) +#define __out_bcount_nz(size) +#define __inout_nz +#define __inout_ecount_nz(size) +#define __inout_bcount_nz(size) +#define __in_nz_opt +#define __in_ecount_nz_opt(size) +#define __in_bcount_nz_opt(size) +#define __out_ecount_nz_opt(size) +#define __out_bcount_nz_opt(size) +#define __inout_nz_opt +#define __inout_ecount_nz_opt(size) +#define __inout_bcount_nz_opt(size) +#define __deref_out_nz +#define __deref_out_ecount_nz(size) +#define __deref_out_bcount_nz(size) +#define __deref_inout_nz +#define __deref_inout_ecount_nz(size) +#define __deref_inout_bcount_nz(size) +#define __deref_out_nz_opt +#define __deref_out_ecount_nz_opt(size) +#define __deref_out_bcount_nz_opt(size) +#define __deref_inout_nz_opt +#define __deref_inout_ecount_nz_opt(size) +#define __deref_inout_bcount_nz_opt(size) +#define __deref_opt_inout_nz +#define __deref_opt_inout_ecount_nz(size) +#define __deref_opt_inout_bcount_nz(size) +#define __deref_opt_out_nz_opt +#define __deref_opt_out_ecount_nz_opt(size) +#define __deref_opt_out_bcount_nz_opt(size) +#define __deref_opt_inout_nz_opt +#define __deref_opt_inout_ecount_nz_opt(size) +#define __deref_opt_inout_bcount_nz_opt(size) +#define __deref +#define __pre +#define __post +#define __readableTo(count) +#define __writableTo(count) +#define __maybevalid +#define __inexpressible_readableTo(string) #define __data_entrypoint(category) #define __readonly #define __byte_writableTo(count) @@ -1132,7 +1132,7 @@ #define __refparam #define __precond(condition) -/************************************************************************* +/************************************************************************* * Definitions to force a compile error when macros are used improperly. * Relies on VS 2005 source annotations. *************************************************************************/ @@ -1168,7 +1168,7 @@ #define __$allowed_on_function [method: OnFunctionOnly] #define __$allowed_on_struct [OnStructOnly] #define __$allowed_on_field [OnFieldOnly] -#define __$allowed_on_parameter_or_return [OnParameterOrReturnOnly] +#define __$allowed_on_parameter_or_return [OnParameterOrReturnOnly] #define __$allowed_on_global_or_field /* empty */ #pragma push_macro( "DECL_SA" ) #pragma push_macro( "SA" ) @@ -1177,7 +1177,7 @@ #define DECL_SA(name,loc) \ [repeatable] \ [source_annotation_attribute( loc )] \ - struct name##Attribute { name##Attribute(); const char* ignored; }; + struct name##Attribute { name##Attribute(); const char* ignored; }; #else #define SA(x) SA_##x #define DECL_SA(name,loc) \ @@ -1193,6 +1193,6 @@ DECL_SA(OnFieldOnly,SA(Field)); DECL_SA(OnParameterOrReturnOnly,SA(Parameter) | SA(ReturnValue)); #pragma pop_macro( "SA" ) #pragma pop_macro( "DECL_SA" ) -#endif -#endif +#endif +#endif #endif diff --git a/sdk/include/psdk/specstrings_undef.h b/sdk/include/psdk/specstrings_undef.h index 9477d555801..a54ebb06782 100644 --- a/sdk/include/psdk/specstrings_undef.h +++ b/sdk/include/psdk/specstrings_undef.h @@ -27,7 +27,7 @@ #undef __out_ecount_full #undef __out_bcount_full #undef __out_xcount_full -#undef __out_z +#undef __out_z #undef __out_ecount_z #undef __out_bcount_z #undef __inout @@ -319,14 +319,14 @@ #undef __deallocate_opt #undef __post_invalid #undef __post_nullnullterminated -/*************************************************************************** +/*************************************************************************** * Expert Macros ***************************************************************************/ #undef __null #undef __notnull #undef __maybenull #undef __exceptthat -/*************************************************************************** +/*************************************************************************** * Macros to classify fields of structures. ****************************************************************************/ #undef __field_ecount @@ -351,7 +351,7 @@ #undef __struct_bcount #undef __struct_xcount -/*************************************************************************** +/*************************************************************************** * Macros to classify the entrypoints and indicate their category. ***************************************************************************/ #undef __control_entrypoint @@ -359,7 +359,7 @@ #undef __kernel_entry #undef __gdi_entry -/*************************************************************************** +/*************************************************************************** * Macros to track untrusted data and their validation. ***************************************************************************/ #undef __in_data_source @@ -367,7 +367,7 @@ #undef __field_data_source #undef __this_out_data_source -/************************************************************************** +/************************************************************************** * Macros to tag file parsing code. **************************************************************************/ #undef __out_validated @@ -376,12 +376,12 @@ #undef __file_parser_class #undef __file_parser_library -/*************************************************************************** +/*************************************************************************** * Macros to track the code content in the file. ***************************************************************************/ #undef __source_code_content -/*************************************************************************** +/*************************************************************************** * Macros to track the code content in the class. ***************************************************************************/ #undef __class_code_content @@ -389,26 +389,26 @@ /************************************************************************* * Macros to tag encoded function pointers **************************************************************************/ -#undef __encoded_pointer -#undef __encoded_array +#undef __encoded_pointer +#undef __encoded_array #undef __field_encoded_pointer #undef __field_encoded_array #undef __transfer #undef __assume_validated -/************************************************************************* +/************************************************************************* * __analysis_assume *************************************************************************/ #undef __analysis_assume #undef __analysis_assert -/************************************************************************* +/************************************************************************* * __analysis_hint *************************************************************************/ #undef __analysis_hint -/************************************************************************* +/************************************************************************* * Macros to encode abstract properties of values. Used by SALadt.h *************************************************************************/ #undef __type_has_adt_prop @@ -417,12 +417,12 @@ #undef __out_transfer_adt_prop #undef __out_has_type_adt_props -/************************************************************************* +/************************************************************************* * Macros used by Prefast for Drivers *************************************************************************/ #undef __possibly_notnullterminated -/************************************************************************* +/************************************************************************* * Advanced macros *************************************************************************/ #undef __volatile @@ -430,55 +430,55 @@ #undef __nonvolatile #undef __deref_nonvolatile -/************************************************************************* +/************************************************************************* * Macros deprecated with strict level greater then 1. **************************************************************************/ -#undef __in_nz -#undef __in_ecount_nz -#undef __in_bcount_nz -#undef __out_nz -#undef __out_nz_opt -#undef __out_ecount_nz -#undef __out_bcount_nz -#undef __inout_nz -#undef __inout_ecount_nz -#undef __inout_bcount_nz -#undef __in_nz_opt -#undef __in_ecount_nz_opt -#undef __in_bcount_nz_opt -#undef __out_ecount_nz_opt -#undef __out_bcount_nz_opt -#undef __inout_nz_opt -#undef __inout_ecount_nz_opt -#undef __inout_bcount_nz_opt -#undef __deref_out_nz -#undef __deref_out_ecount_nz -#undef __deref_out_bcount_nz -#undef __deref_inout_nz -#undef __deref_inout_ecount_nz -#undef __deref_inout_bcount_nz -#undef __deref_out_nz_opt -#undef __deref_out_ecount_nz_opt -#undef __deref_out_bcount_nz_opt -#undef __deref_inout_nz_opt -#undef __deref_inout_ecount_nz_opt -#undef __deref_inout_bcount_nz_opt -#undef __deref_opt_inout_nz -#undef __deref_opt_inout_ecount_nz -#undef __deref_opt_inout_bcount_nz -#undef __deref_opt_out_nz_opt -#undef __deref_opt_out_ecount_nz_opt -#undef __deref_opt_out_bcount_nz_opt -#undef __deref_opt_inout_nz_opt -#undef __deref_opt_inout_ecount_nz_opt -#undef __deref_opt_inout_bcount_nz_opt -#undef __deref -#undef __pre -#undef __post -#undef __readableTo -#undef __writableTo -#undef __maybevalid -#undef __inexpressible_readableTo +#undef __in_nz +#undef __in_ecount_nz +#undef __in_bcount_nz +#undef __out_nz +#undef __out_nz_opt +#undef __out_ecount_nz +#undef __out_bcount_nz +#undef __inout_nz +#undef __inout_ecount_nz +#undef __inout_bcount_nz +#undef __in_nz_opt +#undef __in_ecount_nz_opt +#undef __in_bcount_nz_opt +#undef __out_ecount_nz_opt +#undef __out_bcount_nz_opt +#undef __inout_nz_opt +#undef __inout_ecount_nz_opt +#undef __inout_bcount_nz_opt +#undef __deref_out_nz +#undef __deref_out_ecount_nz +#undef __deref_out_bcount_nz +#undef __deref_inout_nz +#undef __deref_inout_ecount_nz +#undef __deref_inout_bcount_nz +#undef __deref_out_nz_opt +#undef __deref_out_ecount_nz_opt +#undef __deref_out_bcount_nz_opt +#undef __deref_inout_nz_opt +#undef __deref_inout_ecount_nz_opt +#undef __deref_inout_bcount_nz_opt +#undef __deref_opt_inout_nz +#undef __deref_opt_inout_ecount_nz +#undef __deref_opt_inout_bcount_nz +#undef __deref_opt_out_nz_opt +#undef __deref_opt_out_ecount_nz_opt +#undef __deref_opt_out_bcount_nz_opt +#undef __deref_opt_inout_nz_opt +#undef __deref_opt_inout_ecount_nz_opt +#undef __deref_opt_inout_bcount_nz_opt +#undef __deref +#undef __pre +#undef __post +#undef __readableTo +#undef __writableTo +#undef __maybevalid +#undef __inexpressible_readableTo #undef __data_entrypoint #undef __readonly #undef __byte_writableTo diff --git a/sdk/include/psdk/t2embapi.h b/sdk/include/psdk/t2embapi.h index 7d6512667e5..9816092a77f 100644 --- a/sdk/include/psdk/t2embapi.h +++ b/sdk/include/psdk/t2embapi.h @@ -113,7 +113,7 @@ extern "C" { typedef unsigned long(WINAPIV *WRITEEMBEDPROC) ( void* lpvWriteStream, - const void* lpvBuffer, + const void* lpvBuffer, const unsigned long cbBuffer ); @@ -126,7 +126,7 @@ typedef unsigned long(WINAPIV *READEMBEDPROC) typedef struct -{ +{ unsigned long ulStructSize; long lTestFromSize; long lTestToSize; @@ -137,7 +137,7 @@ typedef struct } TTVALIDATIONTESTPARAMS; typedef struct -{ +{ unsigned long ulStructSize; long lTestFromSize; long lTestToSize; @@ -148,14 +148,14 @@ typedef struct } TTVALIDATIONTESTPARAMSEX; typedef struct -{ +{ unsigned short usStructSize; unsigned short usRootStrSize; unsigned short *pusRootStr; } TTEMBEDINFO; typedef struct -{ +{ unsigned short usStructSize; unsigned short usRefStrSize; unsigned short *pusRefStr; diff --git a/sdk/include/psdk/usbrpmif.h b/sdk/include/psdk/usbrpmif.h index 9695cc7eb21..0b29d2c4a78 100644 --- a/sdk/include/psdk/usbrpmif.h +++ b/sdk/include/psdk/usbrpmif.h @@ -50,7 +50,7 @@ NTSTATUS NTAPI RPMRegisterAlternateDriver( IN PDRIVER_OBJECT DriverObject, - IN LPCWSTR CompatibleId, + IN LPCWSTR CompatibleId, OUT PHANDLE RegisteredDriver); USBRPMAPI diff --git a/sdk/include/psdk/usp10.h b/sdk/include/psdk/usp10.h index 94cfad1ccb2..4ee60fead8e 100644 --- a/sdk/include/psdk/usp10.h +++ b/sdk/include/psdk/usp10.h @@ -49,8 +49,8 @@ extern "C" { #define SSA_LPKANSIFALLBACK 0x08000000 #define SSA_PIDX 0x10000000 #define SSA_LAYOUTRTL 0x20000000 -#define SSA_DONTGLYPH 0x40000000 -#define SSA_NOKASHIDA 0x80000000 +#define SSA_DONTGLYPH 0x40000000 +#define SSA_NOKASHIDA 0x80000000 /** StringIsComplex */ #define SIC_COMPLEX 1 @@ -106,8 +106,8 @@ typedef struct tag_SCRIPT_CONTROL { typedef struct { DWORD langid :16; DWORD fNumeric :1; - DWORD fComplex :1; - DWORD fNeedsWordBreaking :1; + DWORD fComplex :1; + DWORD fNeedsWordBreaking :1; DWORD fNeedsCaretInfo :1; DWORD bCharSet :8; DWORD fControl :1; @@ -193,7 +193,7 @@ typedef struct tag_SCRIPT_LOGATTR { } SCRIPT_LOGATTR; typedef void *SCRIPT_CACHE; -typedef void *SCRIPT_STRING_ANALYSIS; +typedef void *SCRIPT_STRING_ANALYSIS; #ifndef LSDEFS_DEFINED typedef struct tagGOFFSET { diff --git a/sdk/include/psdk/vfw.h b/sdk/include/psdk/vfw.h index a80b293ab13..fbb239e6175 100644 --- a/sdk/include/psdk/vfw.h +++ b/sdk/include/psdk/vfw.h @@ -2004,15 +2004,15 @@ MCIWndCreateW( */ typedef struct -{ - LONG timeCount; - LONG timeDraw; - LONG timeDecompress; - LONG timeDither; - LONG timeStretch; - LONG timeBlt; - LONG timeSetDIBits; -} DRAWDIBTIME, *LPDRAWDIBTIME; +{ + LONG timeCount; + LONG timeDraw; + LONG timeDecompress; + LONG timeDither; + LONG timeStretch; + LONG timeBlt; + LONG timeSetDIBits; +} DRAWDIBTIME, *LPDRAWDIBTIME; HDRAWDIB VFWAPI DrawDibOpen( void ); diff --git a/sdk/include/psdk/wincrypt.h b/sdk/include/psdk/wincrypt.h index 930a07de1dc..c66061cba5e 100644 --- a/sdk/include/psdk/wincrypt.h +++ b/sdk/include/psdk/wincrypt.h @@ -97,7 +97,7 @@ typedef struct _HMAC_INFO { BYTE* pbOuterString; DWORD cbOuterString; } HMAC_INFO, *PHMAC_INFO; - + typedef struct _CRYPTOAPI_BLOB { DWORD cbData; BYTE* pbData; @@ -2192,7 +2192,7 @@ static const WCHAR MS_ENH_RSA_AES_PROV_XP_W[] = { 'M','i','c','r','o','s','o','f #define CRYPT_MODE_OFB 3 #define CRYPT_MODE_CFB 4 -#define CRYPT_ENCRYPT 0x0001 +#define CRYPT_ENCRYPT 0x0001 #define CRYPT_DECRYPT 0x0002 #define CRYPT_EXPORT 0x0004 #define CRYPT_READ 0x0008 @@ -2353,10 +2353,10 @@ static const WCHAR MS_ENH_RSA_AES_PROV_XP_W[] = { 'M','i','c','r','o','s','o','f #define CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH \ L"Software\\Policies\\Microsoft\\SystemCertificates" #else -static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] = +static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0 }; -static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] = +static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] = {'S','o','f','t','w','a','r','e','\\','P','o','l','i','c','i','e','s','\\', 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r', 't','i','f','i','c','a','t','e','s',0 }; @@ -2618,7 +2618,7 @@ static const WCHAR CRYPT_OID_REG_FLAGS_VALUE_NAME[] = # define CERT_PHYSICAL_STORE_AUTH_ROOT_NAME \ L".AuthRoot" #else -static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] = +static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] = {'.','D','e','f','a','u','l','t','0'}; static const WCHAR CERT_PHYSICAL_STORE_GROUP_POLICY_NAME[] = {'.','G','r','o','u','p','P','o','l','i','c','y',0}; diff --git a/sdk/include/psdk/windns.h b/sdk/include/psdk/windns.h index 0c7433de660..66c2878cbc0 100644 --- a/sdk/include/psdk/windns.h +++ b/sdk/include/psdk/windns.h @@ -489,7 +489,7 @@ typedef struct { } DNS_DS_DATA; typedef struct { - LPWSTR pNextDomainName; + LPWSTR pNextDomainName; WORD wTypeBitMapsLength; WORD wPad; BYTE TypeBitMaps[1]; diff --git a/sdk/include/psdk/windot11.h b/sdk/include/psdk/windot11.h index 3aaa6511c04..f509e650f56 100644 --- a/sdk/include/psdk/windot11.h +++ b/sdk/include/psdk/windot11.h @@ -23,7 +23,7 @@ typedef enum _DOT11_PHY_TYPE { dot11_phy_type_erp, dot11_phy_type_ht, dot11_phy_type_IHV_start, - dot11_phy_type_IHV_end + dot11_phy_type_IHV_end } DOT11_PHY_TYPE; typedef enum _DOT11_AUTH_ALGORITHM { @@ -35,7 +35,7 @@ typedef enum _DOT11_AUTH_ALGORITHM { DOT11_AUTH_ALGO_RSNA, DOT11_AUTH_ALGO_RSNA_PSK, DOT11_AUTH_ALGO_IHV_START = 0x80000000, - DOT11_AUTH_ALGO_IHV_END = 0xffffffff + DOT11_AUTH_ALGO_IHV_END = 0xffffffff } DOT11_AUTH_ALGORITHM; typedef enum _DOT11_CIPHER_ALGORITHM { diff --git a/sdk/include/psdk/winerror.h b/sdk/include/psdk/winerror.h index 776c48b01f5..c3815c27e36 100644 --- a/sdk/include/psdk/winerror.h +++ b/sdk/include/psdk/winerror.h @@ -2926,7 +2926,7 @@ #define SEC_E_NO_AUTHENTICATING_AUTHORITY _HRESULT_TYPEDEF_(0x80090311L) #define SEC_I_CONTINUE_NEEDED _HRESULT_TYPEDEF_(0x00090312L) #define SEC_I_COMPLETE_NEEDED _HRESULT_TYPEDEF_(0x00090313L) -#define SEC_I_COMPLETE_AND_CONTINUE _HRESULT_TYPEDEF_(0x00090314L) +#define SEC_I_COMPLETE_AND_CONTINUE _HRESULT_TYPEDEF_(0x00090314L) #define SEC_I_LOCAL_LOGON _HRESULT_TYPEDEF_(0x00090315L) #define SEC_E_BAD_PKGID _HRESULT_TYPEDEF_(0x80090316L) #define SEC_E_CONTEXT_EXPIRED _HRESULT_TYPEDEF_(0x80090317L) diff --git a/sdk/include/psdk/winsock2.h b/sdk/include/psdk/winsock2.h index 3a58a3f1964..aa296a2311d 100644 --- a/sdk/include/psdk/winsock2.h +++ b/sdk/include/psdk/winsock2.h @@ -2738,7 +2738,7 @@ typedef struct timeval FAR *LPTIMEVAL; #include #endif -/* FIXME : +/* FIXME : #if(_WIN32_WINNT >= 0x0501) #ifdef IPV6STRICT #include diff --git a/sdk/include/psdk/winspool.h b/sdk/include/psdk/winspool.h index 5bbbd26f804..7d615730405 100644 --- a/sdk/include/psdk/winspool.h +++ b/sdk/include/psdk/winspool.h @@ -1452,12 +1452,12 @@ WINBOOL WINAPI EnumPrintersW(DWORD Flags,LPWSTR Name,DWORD Level,LPBYTE pPrinter typedef enum tagPRINTER_OPTION_FLAGS { PRINTER_OPTION_NO_CACHE, PRINTER_OPTION_CACHE, - PRINTER_OPTION_CLIENT_CHANGE + PRINTER_OPTION_CLIENT_CHANGE } PRINTER_OPTION_FLAGS; typedef enum tagEPrintXPSJobOperation { kJobProduction, - kJobConsumption + kJobConsumption } EPrintXPSJobOperation; typedef enum tagEPrintXPSJobProgress { @@ -1470,7 +1470,7 @@ typedef enum tagEPrintXPSJobProgress { kResourceAdded, kFontAdded, kImageAdded, - kXpsDocumentCommitted + kXpsDocumentCommitted } EPrintXPSJobProgress; typedef struct _PRINTER_CONNECTION_INFO_1 { diff --git a/sdk/include/psdk/wlanapi.h b/sdk/include/psdk/wlanapi.h index 256a3144520..e3f36c205e3 100644 --- a/sdk/include/psdk/wlanapi.h +++ b/sdk/include/psdk/wlanapi.h @@ -120,7 +120,7 @@ typedef enum _WLAN_INTERFACE_TYPE { /* Types */ typedef DWORD WLAN_REASON_CODE, *PWLAN_REASON_CODE; -typedef ULONG WLAN_SIGNAL_QUALITY, *PWLAN_SIGNAL_QUALITY; +typedef ULONG WLAN_SIGNAL_QUALITY, *PWLAN_SIGNAL_QUALITY; typedef struct _DOT11_NETWORK { DOT11_SSID dot11Ssid; diff --git a/sdk/include/psdk/ws2def.h b/sdk/include/psdk/ws2def.h index 5691dfa7194..c252539d9eb 100644 --- a/sdk/include/psdk/ws2def.h +++ b/sdk/include/psdk/ws2def.h @@ -565,11 +565,11 @@ typedef WSACMSGHDR CMSGHDR, *PCMSGHDR; /* * WSA_CMSG_FIRSTHDR * - * Returns a pointer to the first ancillary data object, - * or a null pointer if there is no ancillary data in the + * Returns a pointer to the first ancillary data object, + * or a null pointer if there is no ancillary data in the * control buffer of the WSAMSG structure. * - * LPCMSGHDR + * LPCMSGHDR * WSA_CMSG_FIRSTHDR ( * LPWSAMSG msg * ); @@ -582,13 +582,13 @@ typedef WSACMSGHDR CMSGHDR, *PCMSGHDR; #define CMSG_FIRSTHDR WSA_CMSG_FIRSTHDR #endif -/* +/* * WSA_CMSG_NXTHDR * * Returns a pointer to the next ancillary data object, * or a null if there are no more data objects. * - * LPCMSGHDR + * LPCMSGHDR * WSA_CMSG_NEXTHDR ( * LPWSAMSG msg, * LPWSACMSGHDR cmsg @@ -610,11 +610,11 @@ typedef WSACMSGHDR CMSGHDR, *PCMSGHDR; #define CMSG_NXTHDR WSA_CMSG_NXTHDR #endif -/* +/* * WSA_CMSG_DATA * - * Returns a pointer to the first byte of data (what is referred - * to as the cmsg_data member though it is not defined in + * Returns a pointer to the first byte of data (what is referred + * to as the cmsg_data member though it is not defined in * the structure). * * Note that RFC 2292 defines this as CMSG_DATA, but that name @@ -630,8 +630,8 @@ typedef WSACMSGHDR CMSGHDR, *PCMSGHDR; /* * WSA_CMSG_SPACE * - * Returns total size of an ancillary data object given - * the amount of data. Used to allocate the correct amount + * Returns total size of an ancillary data object given + * the amount of data. Used to allocate the correct amount * of space. * * SIZE_T diff --git a/sdk/include/psdk/ws2spi.h b/sdk/include/psdk/ws2spi.h index 99276e0106f..756494fa6c1 100644 --- a/sdk/include/psdk/ws2spi.h +++ b/sdk/include/psdk/ws2spi.h @@ -678,9 +678,9 @@ typedef struct _NSPV2_ROUTINE { DWORD dwMinorVersion; LPNSPV2STARTUP NSPv2Startup; LPNSPV2CLEANUP NSPv2Cleanup; - LPNSPV2LOOKUPSERVICEBEGIN NSPv2LookupServiceBegin; + LPNSPV2LOOKUPSERVICEBEGIN NSPv2LookupServiceBegin; LPNSPV2LOOKUPSERVICENEXTEX NSPv2LookupServiceNextEx; - LPNSPV2LOOKUPSERVICEEND NSPv2LookupServiceEnd; + LPNSPV2LOOKUPSERVICEEND NSPv2LookupServiceEnd; LPNSPV2SETSERVICEEX NSPv2SetServiceEx; LPNSPV2CLIENTSESSIONRUNDOWN NSPv2ClientSessionRundown; } NSPV2_ROUTINE, *PNSPV2_ROUTINE, *LPNSPV2_ROUTINE; diff --git a/sdk/include/psdk/wspiapi.h b/sdk/include/psdk/wspiapi.h index bbb01e10ee9..1048c1b214c 100644 --- a/sdk/include/psdk/wspiapi.h +++ b/sdk/include/psdk/wspiapi.h @@ -322,7 +322,7 @@ WspiapiLegacyGetAddrInfo( if (wPort == 0) return (iSocketType ? EAI_SERVICE : EAI_NONAME); if (iSocketType == 0) { iSocketType = (wTcpPort) ? SOCK_STREAM : SOCK_DGRAM; - bClone = (wTcpPort && wUdpPort); + bClone = (wTcpPort && wUdpPort); } } } diff --git a/sdk/include/reactos/drivers/directx/directxint.h b/sdk/include/reactos/drivers/directx/directxint.h index e031f52cbe7..ec4b17a82ad 100644 --- a/sdk/include/reactos/drivers/directx/directxint.h +++ b/sdk/include/reactos/drivers/directx/directxint.h @@ -117,7 +117,7 @@ typedef struct _EDD_SURFACE typedef struct _EDD_DIRECTDRAW_GLOBAL { -/* 0x000 */ PVOID dhpdev; // 0x000 <-- verified to match Windows XP, dhpdev, the drv hPDev --> +/* 0x000 */ PVOID dhpdev; // 0x000 <-- verified to match Windows XP, dhpdev, the drv hPDev --> /* 0x004 */ DWORD dwReserved1; /* 0x008 */ DWORD dwReserved2; /* 0x00C */ LPDDVIDEOPORTCAPS lpDDVideoPortCaps; // 0x00C <-- verified to match Win2k3 @@ -139,7 +139,7 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL /* 0x024 */ ULONG unk_024; /* 0x028 */ LARGE_INTEGER llAssertModeTimeout; /* 0x028 <-- verified to match Windows XP, llAssertModeTimeout, it - using regkey + using regkey HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI Specifies how long a DirectDraw application can keep a graphics-device frame-buffer locked in second, if this value are set to 0 it disable directdraw acclatrions. @@ -152,7 +152,7 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL /* 0x03C */ PDWORD pdwFourCC; // 0x03C <-- verified to match Windows XP, pdwFourCC /* 0x040 */ DD_HALINFO ddHalInfo; // 0x040 <-- verified to match Windows XP, ddHalInfo /* 0x1E0 */ ULONG unk_1e0[17]; // DxApi interface (size 0x44) -/* 0x224 */ ULONG unk_224; // +/* 0x224 */ ULONG unk_224; // /* 0x228 */ ULONG unk_228[14]; // AGP interface (size 0x38) /* 0x260 */ DDKERNELCAPS ddKernelCaps; // 0x260 <-- verified to match Windows Server 2003 /* 0x26C */ DD_MORECAPS ddMoreCaps; // 0x26C <-- verified to match Windows Server 2003 @@ -180,7 +180,7 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL /* 0x5B8 */ PKEVENT pAssertModeEvent; /* 0x5BC */ EDD_SURFACE *peSurfaceCurrent; /* 0x5C0 */ EDD_SURFACE *peSurfacePrimary; -/* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verified to match Windows XP, tells dxg to use driver's own api or return error code instead +/* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verified to match Windows XP, tells dxg to use driver's own api or return error code instead /* 0x5C8 */ ULONG unk_5c8[12]; /* 0x5F8 */ RECTL rcbounds; /* 0x608 */ ULONG unk_608; diff --git a/sdk/include/reactos/drivers/ndisuio/nuiouser.h b/sdk/include/reactos/drivers/ndisuio/nuiouser.h index 36c1a9bdca7..de72a2d767d 100644 --- a/sdk/include/reactos/drivers/ndisuio/nuiouser.h +++ b/sdk/include/reactos/drivers/ndisuio/nuiouser.h @@ -54,6 +54,6 @@ typedef struct _NDISUIO_QUERY_BINDING ULONG DeviceDescrOffset; ULONG DeviceDescrLength; } NDISUIO_QUERY_BINDING, *PNDISUIO_QUERY_BINDING; - + #endif diff --git a/sdk/include/reactos/drivers/pci/pci.h b/sdk/include/reactos/drivers/pci/pci.h index 3f76d1d23f1..79c5b9826ed 100644 --- a/sdk/include/reactos/drivers/pci/pci.h +++ b/sdk/include/reactos/drivers/pci/pci.h @@ -52,7 +52,7 @@ #define PCI_HACK_DISABLE_PM_DOWNSTREAM_PCI_BRIDGE 0x0000040000000000LL #define PCI_HACK_DISABLE_HOT_PLUG 0x0000080000000000LL #define PCI_HACK_IGNORE_AER_CAPABILITY 0x0000100000000000LL - + // // Bit encodes for PCI_COMMON_CONFIG.u.type1.BridgeControl // @@ -73,7 +73,7 @@ typedef struct _PIN_INFO UCHAR Link; USHORT InterruptMap; } PIN_INFO, *PPIN_INFO; - + typedef struct _SLOT_INFO { UCHAR BusNumber; diff --git a/sdk/include/reactos/libs/fullfat/ff_config.h b/sdk/include/reactos/libs/fullfat/ff_config.h index 09383e336af..21acabd624a 100644 --- a/sdk/include/reactos/libs/fullfat/ff_config.h +++ b/sdk/include/reactos/libs/fullfat/ff_config.h @@ -35,7 +35,7 @@ platform. */ //---------- ENDIANESS -#define FF_LITTLE_ENDIAN // Choosing the Byte-order of your system is important. +#define FF_LITTLE_ENDIAN // Choosing the Byte-order of your system is important. //#define FF_BIG_ENDIAN // You may be able to provide better Byte-order swapping routines to FullFAT. // See ff_memory.c for more information. @@ -109,7 +109,7 @@ //---------- HASH CACHE // Speed up File-creation with a HASH table. Provides up to 20x performance boost. //#define FF_HASH_CACHE // Enable HASH to speed up file creation. #define FF_HASH_CACHE_DEPTH 10 // Number of Directories to be Hashed. (For CRC16 memory is 8KB * DEPTH) -#define FF_HASH_FUNCTION CRC16 // Choose a 16-bit hash. +#define FF_HASH_FUNCTION CRC16 // Choose a 16-bit hash. //#define FF_HASH_FUNCTION CRC8 // Choose an 8-bit hash. @@ -214,7 +214,7 @@ #elif FF_HASH_FUNCTION == CRC8 #define FF_HASH_TABLE_SIZE 32 #else -#error FullFAT Invalid ff_config.h file: Invalid Hashing function selected. CRC16 or CRC8! +#error FullFAT Invalid ff_config.h file: Invalid Hashing function selected. CRC16 or CRC8! #endif #endif diff --git a/sdk/include/reactos/libs/fullfat/ff_dir.h b/sdk/include/reactos/libs/fullfat/ff_dir.h index 6c99b7279c5..1660df83162 100644 --- a/sdk/include/reactos/libs/fullfat/ff_dir.h +++ b/sdk/include/reactos/libs/fullfat/ff_dir.h @@ -63,15 +63,15 @@ typedef struct { typedef struct { FF_T_UINT32 Filesize; FF_T_UINT32 ObjectCluster; - + // Book Keeping FF_T_UINT32 CurrentCluster; FF_T_UINT32 AddrCurrentCluster; FF_T_UINT32 DirCluster; FF_T_UINT16 CurrentItem; // End Book Keeping - -#ifdef FF_TIME_SUPPORT + +#ifdef FF_TIME_SUPPORT FF_SYSTEMTIME CreateTime; ///< Date and Time Created. FF_SYSTEMTIME ModifiedTime; ///< Date and Time Modified. FF_SYSTEMTIME AccessedTime; ///< Date of Last Access. @@ -119,12 +119,12 @@ FF_T_SINT8 FF_FindEntry (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_INT8 *N void FF_PopulateShortDirent (FF_IOMAN *pIoman, FF_DIRENT *pDirent, FF_T_UINT8 *EntryBuffer); FF_ERROR FF_PopulateLongDirent (FF_IOMAN *pIoman, FF_DIRENT *pDirent, FF_T_UINT16 nEntry, FF_FETCH_CONTEXT *pFetchContext); - + FF_ERROR FF_InitEntryFetch (FF_IOMAN *pIoman, FF_T_UINT32 ulDirCluster, FF_FETCH_CONTEXT *pContext); FF_ERROR FF_FetchEntryWithContext (FF_IOMAN *pIoman, FF_T_UINT32 ulEntry, FF_FETCH_CONTEXT *pContext, FF_T_UINT8 *pEntryBuffer); FF_ERROR FF_PushEntryWithContext (FF_IOMAN *pIoman, FF_T_UINT32 ulEntry, FF_FETCH_CONTEXT *pContext, FF_T_UINT8 *pEntryBuffer); void FF_CleanupEntryFetch (FF_IOMAN *pIoman, FF_FETCH_CONTEXT *pContext); - + FF_T_SINT8 FF_PushEntry (FF_IOMAN *pIoman, FF_T_UINT32 DirCluster, FF_T_UINT16 nEntry, FF_T_UINT8 *buffer, void *pParam); FF_T_BOOL FF_isEndOfDir (FF_T_UINT8 *EntryBuffer); FF_ERROR FF_FindNextInDir (FF_IOMAN *pIoman, FF_DIRENT *pDirent, FF_FETCH_CONTEXT *pFetchContext); diff --git a/sdk/include/reactos/libs/fullfat/ff_error.h b/sdk/include/reactos/libs/fullfat/ff_error.h index c6b39dcd018..1d28d462744 100644 --- a/sdk/include/reactos/libs/fullfat/ff_error.h +++ b/sdk/include/reactos/libs/fullfat/ff_error.h @@ -101,7 +101,7 @@ #define FF_ERR_IOMAN_BAD_MEMSIZE 12 ///< The memory size was not a multiple of the blocksize. #define FF_ERR_IOMAN_DEV_ALREADY_REGD 13 ///< Device was already registered. Use FF_UnRegister() to re-use this IOMAN with another device. #define FF_ERR_IOMAN_NO_MOUNTABLE_PARTITION 14 ///< A mountable partition could not be found on the device. -#define FF_ERR_IOMAN_INVALID_FORMAT 15 ///< The +#define FF_ERR_IOMAN_INVALID_FORMAT 15 ///< The #define FF_ERR_IOMAN_INVALID_PARTITION_NUM 16 ///< The partition number provided was out of range. #define FF_ERR_IOMAN_NOT_FAT_FORMATTED 17 ///< The partition did not look like a FAT partition. #define FF_ERR_IOMAN_DEV_INVALID_BLKSIZE 18 ///< IOMAN object BlkSize is not compatible with the blocksize of this device driver. diff --git a/sdk/include/reactos/libs/fullfat/ff_format.h b/sdk/include/reactos/libs/fullfat/ff_format.h index d7c53e58a9f..198d7b938ee 100644 --- a/sdk/include/reactos/libs/fullfat/ff_format.h +++ b/sdk/include/reactos/libs/fullfat/ff_format.h @@ -33,7 +33,7 @@ * @file ff_format.c * @author James Walmsley * @ingroup FORMAT - * + * **/ diff --git a/sdk/include/reactos/libs/fullfat/ff_ioman.h b/sdk/include/reactos/libs/fullfat/ff_ioman.h index 92d62ebd85d..81a560d128e 100644 --- a/sdk/include/reactos/libs/fullfat/ff_ioman.h +++ b/sdk/include/reactos/libs/fullfat/ff_ioman.h @@ -177,7 +177,7 @@ typedef struct { /** * @public * @brief FF_IOMAN Object. A developer should not touch these values. - * + * * In the commercial version these values are encapsulated. In the open-source * version they are left completely open, in case someone really "needs" :P to * do something stupid and access their members themselves. Also to help the diff --git a/sdk/include/reactos/libs/fullfat/ff_types.h b/sdk/include/reactos/libs/fullfat/ff_types.h index 0a3d5c280f1..a9af8c3a3be 100644 --- a/sdk/include/reactos/libs/fullfat/ff_types.h +++ b/sdk/include/reactos/libs/fullfat/ff_types.h @@ -62,7 +62,7 @@ typedef unsigned long FF_T_UINT32; ///< 32 bit unsigned integer. typedef signed long FF_T_SINT32; ///< 32 bit signed integer. //---------------- Platform Integer Sizes -typedef int FF_T_INT; +typedef int FF_T_INT; typedef unsigned int FF_T_UINT; typedef signed int FF_T_SINT; diff --git a/sdk/include/reactos/libs/libjpeg/jdct.h b/sdk/include/reactos/libs/libjpeg/jdct.h index c8ec6cd90e9..73ececd537f 100644 --- a/sdk/include/reactos/libs/libjpeg/jdct.h +++ b/sdk/include/reactos/libs/libjpeg/jdct.h @@ -9,7 +9,7 @@ * This include file contains common declarations for the forward and * inverse DCT modules. These declarations are private to the DCT managers * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms. - * The individual DCT algorithms are kept in separate files to ease + * The individual DCT algorithms are kept in separate files to ease * machine-dependent tuning (e.g., assembly coding). */ diff --git a/sdk/include/reactos/libs/libjpeg/jpeglib.h b/sdk/include/reactos/libs/libjpeg/jpeglib.h index 591a2cb6054..968ae8d3d87 100644 --- a/sdk/include/reactos/libs/libjpeg/jpeglib.h +++ b/sdk/include/reactos/libs/libjpeg/jpeglib.h @@ -883,7 +883,7 @@ typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo)); /* Short forms of external names for systems with brain-damaged linkers. * We shorten external names to be unique in the first six letters, which * is good enough for all known systems. - * (If your compiler itself needs names to be unique in less than 15 + * (If your compiler itself needs names to be unique in less than 15 * characters, you are out of luck. Get a better compiler.) */ diff --git a/sdk/include/reactos/libs/libmpg123/compat.h b/sdk/include/reactos/libs/libmpg123/compat.h index 7f37c461bac..66c1c64b2e8 100644 --- a/sdk/include/reactos/libs/libmpg123/compat.h +++ b/sdk/include/reactos/libs/libmpg123/compat.h @@ -61,7 +61,7 @@ #ifdef HAVE_LIMITS_H #include #endif - + #ifndef SIZE_MAX #define SIZE_MAX ((size_t)-1) #endif diff --git a/sdk/include/reactos/libs/libmpg123/debug.h b/sdk/include/reactos/libs/libmpg123/debug.h index e203c982bdc..fd8218402bf 100644 --- a/sdk/include/reactos/libs/libmpg123/debug.h +++ b/sdk/include/reactos/libs/libmpg123/debug.h @@ -1,10 +1,10 @@ /* - debug.h: + debug.h: if DEBUG defined: debugging macro fprintf wrappers else: macros defined to do nothing That saves typing #ifdef DEBUG all the time and still preserves lean code without debugging. - + public domain (or LGPL / GPL, if you like that more;-) generated by debugdef.pl, what was trivially written by Thomas Orgis @@ -55,24 +55,24 @@ #define debug15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] debug: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) #else -#define mdebug(s, ...) +#define mdebug(s, ...) -#define debug(s) -#define debug1(s, a) -#define debug2(s, a, b) -#define debug3(s, a, b, c) -#define debug4(s, a, b, c, d) -#define debug5(s, a, b, c, d, e) -#define debug6(s, a, b, c, d, e, f) -#define debug7(s, a, b, c, d, e, f, g) -#define debug8(s, a, b, c, d, e, f, g, h) -#define debug9(s, a, b, c, d, e, f, g, h, i) -#define debug10(s, a, b, c, d, e, f, g, h, i, j) -#define debug11(s, a, b, c, d, e, f, g, h, i, j, k) -#define debug12(s, a, b, c, d, e, f, g, h, i, j, k, l) -#define debug13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) -#define debug14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) -#define debug15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) +#define debug(s) +#define debug1(s, a) +#define debug2(s, a, b) +#define debug3(s, a, b, c) +#define debug4(s, a, b, c, d) +#define debug5(s, a, b, c, d, e) +#define debug6(s, a, b, c, d, e, f) +#define debug7(s, a, b, c, d, e, f, g) +#define debug8(s, a, b, c, d, e, f, g, h) +#define debug9(s, a, b, c, d, e, f, g, h, i) +#define debug10(s, a, b, c, d, e, f, g, h, i, j) +#define debug11(s, a, b, c, d, e, f, g, h, i, j, k) +#define debug12(s, a, b, c, d, e, f, g, h, i, j, k, l) +#define debug13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) +#define debug14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) +#define debug15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) #endif /* warning macros also here... */ @@ -97,23 +97,23 @@ #define warning14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n) #define warning15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] warning: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) #else -#define mwarning(s, ...) -#define warning(s) -#define warning1(s, a) -#define warning2(s, a, b) -#define warning3(s, a, b, c) -#define warning4(s, a, b, c, d) -#define warning5(s, a, b, c, d, e) -#define warning6(s, a, b, c, d, e, f) -#define warning7(s, a, b, c, d, e, f, g) -#define warning8(s, a, b, c, d, e, f, g, h) -#define warning9(s, a, b, c, d, e, f, g, h, i) -#define warning10(s, a, b, c, d, e, f, g, h, i, j) -#define warning11(s, a, b, c, d, e, f, g, h, i, j, k) -#define warning12(s, a, b, c, d, e, f, g, h, i, j, k, l) -#define warning13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) -#define warning14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) -#define warning15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) +#define mwarning(s, ...) +#define warning(s) +#define warning1(s, a) +#define warning2(s, a, b) +#define warning3(s, a, b, c) +#define warning4(s, a, b, c, d) +#define warning5(s, a, b, c, d, e) +#define warning6(s, a, b, c, d, e, f) +#define warning7(s, a, b, c, d, e, f, g) +#define warning8(s, a, b, c, d, e, f, g, h) +#define warning9(s, a, b, c, d, e, f, g, h, i) +#define warning10(s, a, b, c, d, e, f, g, h, i, j) +#define warning11(s, a, b, c, d, e, f, g, h, i, j, k) +#define warning12(s, a, b, c, d, e, f, g, h, i, j, k, l) +#define warning13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) +#define warning14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) +#define warning15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) #endif /* error macros also here... */ @@ -138,23 +138,23 @@ #define error14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n) #define error15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) fprintf(stderr, DBGPRFX"[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) #else -#define merror(s, ...) -#define error(s) -#define error1(s, a) -#define error2(s, a, b) -#define error3(s, a, b, c) -#define error4(s, a, b, c, d) -#define error5(s, a, b, c, d, e) -#define error6(s, a, b, c, d, e, f) -#define error7(s, a, b, c, d, e, f, g) -#define error8(s, a, b, c, d, e, f, g, h) -#define error9(s, a, b, c, d, e, f, g, h, i) -#define error10(s, a, b, c, d, e, f, g, h, i, j) -#define error11(s, a, b, c, d, e, f, g, h, i, j, k) -#define error12(s, a, b, c, d, e, f, g, h, i, j, k, l) -#define error13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) -#define error14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) -#define error15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) +#define merror(s, ...) +#define error(s) +#define error1(s, a) +#define error2(s, a, b) +#define error3(s, a, b, c) +#define error4(s, a, b, c, d) +#define error5(s, a, b, c, d, e) +#define error6(s, a, b, c, d, e, f) +#define error7(s, a, b, c, d, e, f, g) +#define error8(s, a, b, c, d, e, f, g, h) +#define error9(s, a, b, c, d, e, f, g, h, i) +#define error10(s, a, b, c, d, e, f, g, h, i, j) +#define error11(s, a, b, c, d, e, f, g, h, i, j, k) +#define error12(s, a, b, c, d, e, f, g, h, i, j, k, l) +#define error13(s, a, b, c, d, e, f, g, h, i, j, k, l, m) +#define error14(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n) +#define error15(s, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) #endif /* ereturn macros also here... */ diff --git a/sdk/include/reactos/libs/libmpg123/dither_impl.h b/sdk/include/reactos/libs/libmpg123/dither_impl.h index 30dbdd135a5..eee14891a52 100644 --- a/sdk/include/reactos/libs/libmpg123/dither_impl.h +++ b/sdk/include/reactos/libs/libmpg123/dither_impl.h @@ -26,13 +26,13 @@ static float rand_xorshift32(uint32_t *seed) uint32_t i; float f; } fi; - + fi.i = *seed; fi.i ^= (fi.i<<13); fi.i ^= (fi.i>>17); fi.i ^= (fi.i<<5); *seed = fi.i; - + /* scale the number to [-0.5, 0.5] */ #ifdef IEEE_FLOAT fi.i = (fi.i>>9)|0x3f800000; @@ -48,7 +48,7 @@ static void white_noise(float *table, size_t count) { size_t i; uint32_t seed = init_seed; - + for(i=0; i 0: index allowed to grow on need with these steps, instead of lowering resolution */ }; -/* The condition for a framenum to be appended to the index. +/* The condition for a framenum to be appended to the index. if(FI_NEXT(fr->index, fr->num)) fi_add(offset); */ #define FI_NEXT(fi, framenum) ((fi).size && framenum == (fi).next) diff --git a/sdk/include/reactos/libs/libmpg123/l3_integer_tables.h b/sdk/include/reactos/libs/libmpg123/l3_integer_tables.h index f600c31151e..e3727729771 100644 --- a/sdk/include/reactos/libs/libmpg123/l3_integer_tables.h +++ b/sdk/include/reactos/libs/libmpg123/l3_integer_tables.h @@ -983,7 +983,7 @@ static real pow1_1[2][16],pow2_1[2][16],pow1_2[2][16],pow2_2[2][16]; static real win1[4][36]; -static const char gainpow2_scale[256+118+4+1] = +static const char gainpow2_scale[256+118+4+1] = { 19,19,19,20,20,20,20,21,21,21,21,22,22,22,22,23,23,23,23,24,24,24,24,25,25,25,25,26,26,26,26,27, 27,27,27,28,28,28,28,29,29,29,29,30,30,30,30,31,31,31,31,32,32,32,32,33,33,33,33,34,34,34,34,34, diff --git a/sdk/include/reactos/libs/libmpg123/mpg123.h b/sdk/include/reactos/libs/libmpg123/mpg123.h index 34b8a2f0db7..cf4bbf3d943 100644 --- a/sdk/include/reactos/libs/libmpg123/mpg123.h +++ b/sdk/include/reactos/libs/libmpg123/mpg123.h @@ -21,11 +21,11 @@ #ifndef MPG123_EXPORT /** Defines needed for MS Visual Studio(tm) DLL builds. - * Every public function must be prefixed with MPG123_EXPORT. When building + * Every public function must be prefixed with MPG123_EXPORT. When building * the DLL ensure to define BUILD_MPG123_DLL. This makes the function accessible * for clients and includes it in the import library which is created together * with the DLL. When consuming the DLL ensure to define LINK_MPG123_DLL which - * imports the functions from the DLL. + * imports the functions from the DLL. */ #ifdef BUILD_MPG123_DLL /* The dll exports. */ @@ -139,7 +139,7 @@ struct mpg123_handle_struct; */ typedef struct mpg123_handle_struct mpg123_handle; -/** Function to initialise the mpg123 library. +/** Function to initialise the mpg123 library. * This should be called once in a non-parallel context. It is not explicitly * thread-safe, but repeated/concurrent calls still _should_ be safe as static * tables are filled with the same values anyway. @@ -188,7 +188,7 @@ enum mpg123_parms MPG123_RVA, /**< one of the RVA choices above (integer) */ MPG123_DOWNSPEED, /**< play a frame N times (integer) */ MPG123_UPSPEED, /**< play every Nth frame (integer) */ - MPG123_START_FRAME, /**< start with this frame (skip frames before that, integer) */ + MPG123_START_FRAME, /**< start with this frame (skip frames before that, integer) */ MPG123_DECODE_FRAMES, /**< decode only this number of frames (integer) */ MPG123_ICY_INTERVAL, /**< Stream contains ICY metadata with this interval (integer). Make sure to set this _before_ opening a stream.*/ @@ -277,7 +277,7 @@ enum mpg123_param_rva ,MPG123_RVA_MAX = MPG123_RVA_ALBUM /**< The maximum RVA code, may increase in future. */ }; -/** Set a specific parameter, for a specific mpg123_handle, using a parameter +/** Set a specific parameter, for a specific mpg123_handle, using a parameter * type key chosen from the mpg123_parms enumeration, to the specified value. * \param mh handle * \param type parameter choice @@ -288,7 +288,7 @@ enum mpg123_param_rva MPG123_EXPORT int mpg123_param( mpg123_handle *mh , enum mpg123_parms type, long value, double fvalue ); -/** Get a specific parameter, for a specific mpg123_handle. +/** Get a specific parameter, for a specific mpg123_handle. * See the mpg123_parms enumeration for a list of available parameters. * \param mh handle * \param type parameter choice @@ -489,7 +489,7 @@ MPG123_EXPORT const char* mpg123_current_decoder(mpg123_handle *mh); /*@}*/ -/** \defgroup mpg123_output mpg123 output audio format +/** \defgroup mpg123_output mpg123 output audio format * * Functions to get and select the format of the decoded audio. * @@ -538,14 +538,14 @@ MPG123_EXPORT void mpg123_encodings(const int **list, size_t *number); * \return positive size of encoding in bytes, 0 on invalid encoding. */ MPG123_EXPORT int mpg123_encsize(int encoding); -/** Configure a mpg123 handle to accept no output format at all, +/** Configure a mpg123 handle to accept no output format at all, * use before specifying supported formats with mpg123_format * \param mh handle * \return MPG123_OK on success */ MPG123_EXPORT int mpg123_format_none(mpg123_handle *mh); -/** Configure mpg123 handle to accept all formats +/** Configure mpg123 handle to accept all formats * (also any custom rate you may set) -- this is default. * \param mh handle * \return MPG123_OK on success @@ -574,12 +574,12 @@ MPG123_EXPORT int mpg123_format( mpg123_handle *mh MPG123_EXPORT int mpg123_format2( mpg123_handle *mh , long rate, int channels, int encodings ); -/** Check to see if a specific format at a specific rate is supported +/** Check to see if a specific format at a specific rate is supported * by mpg123_handle. * \param mh handle * \param rate sampling rate * \param encoding encoding - * \return 0 for no support (that includes invalid parameters), MPG123_STEREO, + * \return 0 for no support (that includes invalid parameters), MPG123_STEREO, * MPG123_MONO or MPG123_STEREO|MPG123_MONO. */ MPG123_EXPORT int mpg123_format_support( mpg123_handle *mh , long rate, int encoding ); @@ -733,10 +733,10 @@ MPG123_EXPORT int mpg123_read(mpg123_handle *mh MPG123_EXPORT int mpg123_feed( mpg123_handle *mh , const unsigned char *in, size_t size ); -/** Decode MPEG Audio from inmemory to outmemory. +/** Decode MPEG Audio from inmemory to outmemory. * This is very close to a drop-in replacement for old mpglib. - * When you give zero-sized output buffer the input will be parsed until - * decoded data is available. This enables you to get MPG123_NEW_FORMAT (and query it) + * When you give zero-sized output buffer the input will be parsed until + * decoded data is available. This enables you to get MPG123_NEW_FORMAT (and query it) * without taking decoded data. * Think of this function being the union of mpg123_read() and mpg123_feed() (which it actually is, sort of;-). * You can actually always decide if you want those specialized functions in separate steps or one call this one here. @@ -823,7 +823,7 @@ MPG123_EXPORT off_t mpg123_framepos(mpg123_handle *mh); * The position is measured in decoded audio samples, or MPEG frame offset for the specific functions. * If gapless code is in effect, the positions are adjusted to compensate the skipped padding/delay - meaning, you should not care about that at all and just use the position defined for the samples you get out of the decoder;-) * The general usage is modelled after stdlib's ftell() and fseek(). - * Especially, the whence parameter for the seek functions has the same meaning as the one for fseek() and needs the same constants from stdlib.h: + * Especially, the whence parameter for the seek functions has the same meaning as the one for fseek() and needs the same constants from stdlib.h: * - SEEK_SET: set position to (or near to) specified offset * - SEEK_CUR: change position by offset from now * - SEEK_END: set position to offset from end @@ -866,12 +866,12 @@ MPG123_EXPORT off_t mpg123_tell_stream(mpg123_handle *mh); MPG123_EXPORT off_t mpg123_seek( mpg123_handle *mh , off_t sampleoff, int whence ); -/** Seek to a desired sample offset in data feeding mode. +/** Seek to a desired sample offset in data feeding mode. * This just prepares things to be right only if you ensure that the next chunk of input data will be from input_offset byte position. * \param mh handle * \param sampleoff offset in PCM samples * \param whence one of SEEK_SET, SEEK_CUR or SEEK_END - * \param input_offset The position it expects to be at the + * \param input_offset The position it expects to be at the * next time data is fed to mpg123_decode(). * \return The resulting offset >= 0 or error/message code */ MPG123_EXPORT off_t mpg123_feedseek( mpg123_handle *mh @@ -964,7 +964,7 @@ MPG123_EXPORT double mpg123_geteq(mpg123_handle *mh */ MPG123_EXPORT int mpg123_reset_eq(mpg123_handle *mh); -/** Set the absolute output volume including the RVA setting, +/** Set the absolute output volume including the RVA setting, * vol<0 just applies (a possibly changed) RVA setting. * \param mh handle * \param vol volume value (linear factor) @@ -979,9 +979,9 @@ MPG123_EXPORT int mpg123_volume(mpg123_handle *mh, double vol); */ MPG123_EXPORT int mpg123_volume_change(mpg123_handle *mh, double change); -/** Return current volume setting, the actual value due to RVA, and the RVA - * adjustment itself. It's all as double float value to abstract the sample - * format. The volume values are linear factors / amplitudes (not percent) +/** Return current volume setting, the actual value due to RVA, and the RVA + * adjustment itself. It's all as double float value to abstract the sample + * format. The volume values are linear factors / amplitudes (not percent) * and the RVA value is in decibels. * \param mh handle * \param base return address for base volume (linear factor) @@ -1188,7 +1188,7 @@ MPG123_EXPORT int mpg123_getstate( mpg123_handle *mh /** Data structure for storing strings in a safer way than a standard C-String. * Can also hold a number of null-terminated strings. */ -typedef struct +typedef struct { char* p; /**< pointer to the string data */ size_t size; /**< raw number of bytes allocated */ @@ -1523,10 +1523,10 @@ MPG123_EXPORT char* mpg123_icy2utf8(const char* icy_text); * - Influence behaviour of library _during_ initialization of handle (MPG123_VERBOSE). * - Use one set of parameters for multiple handles. * - * The functions for handling mpg123_pars (mpg123_par() and mpg123_fmt() - * family) directly return a fully qualified mpg123 error code, the ones - * operating on full handles normally MPG123_OK or MPG123_ERR, storing the - * specific error code itseld inside the handle. + * The functions for handling mpg123_pars (mpg123_par() and mpg123_fmt() + * family) directly return a fully qualified mpg123 error code, the ones + * operating on full handles normally MPG123_OK or MPG123_ERR, storing the + * specific error code itseld inside the handle. * * @{ */ @@ -1557,15 +1557,15 @@ MPG123_EXPORT mpg123_pars *mpg123_new_pars(int *error); */ MPG123_EXPORT void mpg123_delete_pars(mpg123_pars* mp); -/** Configure mpg123 parameters to accept no output format at all, +/** Configure mpg123 parameters to accept no output format at all, * use before specifying supported formats with mpg123_format * \param mp parameter handle * \return MPG123_OK on success */ MPG123_EXPORT int mpg123_fmt_none(mpg123_pars *mp); -/** Configure mpg123 parameters to accept all formats - * (also any custom rate you may set) -- this is default. +/** Configure mpg123 parameters to accept all formats + * (also any custom rate you may set) -- this is default. * \param mp parameter handle * \return MPG123_OK on success */ @@ -1601,11 +1601,11 @@ MPG123_EXPORT int mpg123_fmt2(mpg123_pars *mp * \param mp parameter handle * \param rate sampling rate * \param encoding encoding - * \return 0 for no support (that includes invalid parameters), MPG123_STEREO, + * \return 0 for no support (that includes invalid parameters), MPG123_STEREO, * MPG123_MONO or MPG123_STEREO|MPG123_MONO. */ MPG123_EXPORT int mpg123_fmt_support(mpg123_pars *mp, long rate, int encoding); -/** Set a specific parameter, for a specific mpg123_pars, using a parameter +/** Set a specific parameter, for a specific mpg123_pars, using a parameter * type key chosen from the mpg123_parms enumeration, to the specified value. * \param mp parameter handle * \param type parameter choice @@ -1616,7 +1616,7 @@ MPG123_EXPORT int mpg123_fmt_support(mpg123_pars *mp, long rate, int encoding); MPG123_EXPORT int mpg123_par( mpg123_pars *mp , enum mpg123_parms type, long value, double fvalue ); -/** Get a specific parameter, for a specific mpg123_pars. +/** Get a specific parameter, for a specific mpg123_pars. * See the mpg123_parms enumeration for a list of available parameters. * \param mp parameter handle * \param type parameter choice @@ -1660,10 +1660,10 @@ MPG123_EXPORT int mpg123_replace_buffer(mpg123_handle *mh MPG123_EXPORT size_t mpg123_outblock(mpg123_handle *mh); /** Replace low-level stream access functions; read and lseek as known in POSIX. - * You can use this to make any fancy file opening/closing yourself, + * You can use this to make any fancy file opening/closing yourself, * using mpg123_open_fd() to set the file descriptor for your read/lseek * (doesn't need to be a "real" file descriptor...). - * Setting a function to NULL means that the default internal read is + * Setting a function to NULL means that the default internal read is * used (active from next mpg123_open call on). * Note: As it would be troublesome to mess with this while having a file open, * this implies mpg123_close(). diff --git a/sdk/include/reactos/libs/libmpg123/newhuffman.h b/sdk/include/reactos/libs/libmpg123/newhuffman.h index 4d108a95db8..d8bc4257d08 100644 --- a/sdk/include/reactos/libs/libmpg123/newhuffman.h +++ b/sdk/include/reactos/libs/libmpg123/newhuffman.h @@ -10,7 +10,7 @@ #ifndef _MPG123_NEWHUFFMAN_H_ #define _MPG123_NEWHUFFMAN_H_ -struct newhuff +struct newhuff { unsigned int linbits; const short *table; @@ -30,738 +30,738 @@ static const short tab1_[] = static const short tab2_[] = { - -16, -32, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0222, 0x0222, 0x0222, 0x0222, 0x0202, 0x0202, 0x0202, 0x0202, - 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, - 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + -16, -32, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0222, 0x0222, 0x0222, 0x0222, 0x0202, 0x0202, 0x0202, 0x0202, + 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, }; static const short tab3_[] = { - -16, -32, 0x0310, 0x0310, 0x0211, 0x0211, 0x0211, 0x0211, - 0x0201, 0x0201, 0x0201, 0x0201, 0x0200, 0x0200, 0x0200, 0x0200, - 0x0222, 0x0222, 0x0222, 0x0222, 0x0202, 0x0202, 0x0202, 0x0202, - 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, - 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + -16, -32, 0x0310, 0x0310, 0x0211, 0x0211, 0x0211, 0x0211, + 0x0201, 0x0201, 0x0201, 0x0201, 0x0200, 0x0200, 0x0200, 0x0200, + 0x0222, 0x0222, 0x0222, 0x0222, 0x0202, 0x0202, 0x0202, 0x0202, + 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120 }; static const short tab5_[] = { - -16, -32, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0433, 0x0423, 0x0332, 0x0332, 0x0231, 0x0231, 0x0231, 0x0231, - 0x0313, 0x0313, 0x0303, 0x0303, 0x0330, 0x0330, 0x0322, 0x0322, - 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, + -16, -32, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0433, 0x0423, 0x0332, 0x0332, 0x0231, 0x0231, 0x0231, 0x0231, + 0x0313, 0x0313, 0x0303, 0x0303, 0x0330, 0x0330, 0x0322, 0x0322, + 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, }; static const short tab6_[] = { - -16, -32, -48, 0x0412, 0x0421, 0x0420, 0x0301, 0x0301, - 0x0211, 0x0211, 0x0211, 0x0211, 0x0310, 0x0310, 0x0300, 0x0300, - 0x0333, 0x0333, 0x0303, 0x0303, 0x0223, 0x0223, 0x0223, 0x0223, - 0x0232, 0x0232, 0x0232, 0x0232, 0x0230, 0x0230, 0x0230, 0x0230, - 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, - 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, - 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, + -16, -32, -48, 0x0412, 0x0421, 0x0420, 0x0301, 0x0301, + 0x0211, 0x0211, 0x0211, 0x0211, 0x0310, 0x0310, 0x0300, 0x0300, + 0x0333, 0x0333, 0x0303, 0x0303, 0x0223, 0x0223, 0x0223, 0x0223, + 0x0232, 0x0232, 0x0232, 0x0232, 0x0230, 0x0230, 0x0230, 0x0230, + 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, + 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, + 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, }; static const short tab7_[] = { - -16, -32, -48, 0x0411, 0x0301, 0x0301, 0x0310, 0x0310, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - -48, -64, -80, 0x0415, 0x0451, -96, 0x0450, -112, - 0x0424, 0x0442, 0x0314, 0x0314, 0x0341, 0x0341, 0x0340, 0x0340, - 0x0404, 0x0423, 0x0432, 0x0403, 0x0313, 0x0313, 0x0331, 0x0331, - 0x0330, 0x0330, 0x0322, 0x0322, 0x0212, 0x0212, 0x0212, 0x0212, - 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, - 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, - 0x0255, 0x0255, 0x0255, 0x0255, 0x0245, 0x0245, 0x0245, 0x0245, - 0x0254, 0x0254, 0x0254, 0x0254, 0x0253, 0x0253, 0x0253, 0x0253, - 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, - 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, - 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, - 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, - 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, - 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, - 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + -16, -32, -48, 0x0411, 0x0301, 0x0301, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + -48, -64, -80, 0x0415, 0x0451, -96, 0x0450, -112, + 0x0424, 0x0442, 0x0314, 0x0314, 0x0341, 0x0341, 0x0340, 0x0340, + 0x0404, 0x0423, 0x0432, 0x0403, 0x0313, 0x0313, 0x0331, 0x0331, + 0x0330, 0x0330, 0x0322, 0x0322, 0x0212, 0x0212, 0x0212, 0x0212, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x0255, 0x0255, 0x0255, 0x0255, 0x0245, 0x0245, 0x0245, 0x0245, + 0x0254, 0x0254, 0x0254, 0x0254, 0x0253, 0x0253, 0x0253, 0x0253, + 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, + 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, }; static const short tab8_[] = { - -16, -32, 0x0412, 0x0421, 0x0211, 0x0211, 0x0211, 0x0211, - 0x0301, 0x0301, 0x0310, 0x0310, 0x0200, 0x0200, 0x0200, 0x0200, - -32, -48, -64, 0x0415, 0x0451, -80, -96, 0x0424, - 0x0442, 0x0414, 0x0341, 0x0341, 0x0404, 0x0440, 0x0423, 0x0432, - 0x0413, 0x0431, 0x0403, 0x0430, 0x0222, 0x0222, 0x0222, 0x0222, - 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, - 0x0355, 0x0355, 0x0354, 0x0354, 0x0245, 0x0245, 0x0245, 0x0245, - 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, - 0x0235, 0x0235, 0x0235, 0x0235, 0x0244, 0x0244, 0x0244, 0x0244, - 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, - 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, - 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, - 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, - 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, - 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + -16, -32, 0x0412, 0x0421, 0x0211, 0x0211, 0x0211, 0x0211, + 0x0301, 0x0301, 0x0310, 0x0310, 0x0200, 0x0200, 0x0200, 0x0200, + -32, -48, -64, 0x0415, 0x0451, -80, -96, 0x0424, + 0x0442, 0x0414, 0x0341, 0x0341, 0x0404, 0x0440, 0x0423, 0x0432, + 0x0413, 0x0431, 0x0403, 0x0430, 0x0222, 0x0222, 0x0222, 0x0222, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x0355, 0x0355, 0x0354, 0x0354, 0x0245, 0x0245, 0x0245, 0x0245, + 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, + 0x0235, 0x0235, 0x0235, 0x0235, 0x0244, 0x0244, 0x0244, 0x0244, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, }; static const short tab9_[] = { - -16, -32, -48, -64, -80, 0x0412, 0x0421, 0x0420, - 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, 0x0300, 0x0300, - -80, 0x0435, 0x0453, -96, 0x0444, 0x0425, 0x0452, 0x0415, - 0x0351, 0x0351, 0x0334, 0x0334, 0x0343, 0x0343, 0x0450, 0x0404, - 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, 0x0340, 0x0340, - 0x0214, 0x0214, 0x0214, 0x0214, 0x0241, 0x0241, 0x0241, 0x0241, - 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, - 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, - 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, - 0x0203, 0x0203, 0x0203, 0x0203, 0x0230, 0x0230, 0x0230, 0x0230, - 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, - 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, - 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, - 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, - 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, + -16, -32, -48, -64, -80, 0x0412, 0x0421, 0x0420, + 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, 0x0300, 0x0300, + -80, 0x0435, 0x0453, -96, 0x0444, 0x0425, 0x0452, 0x0415, + 0x0351, 0x0351, 0x0334, 0x0334, 0x0343, 0x0343, 0x0450, 0x0404, + 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, 0x0340, 0x0340, + 0x0214, 0x0214, 0x0214, 0x0214, 0x0241, 0x0241, 0x0241, 0x0241, + 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, + 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, + 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, + 0x0203, 0x0203, 0x0203, 0x0203, 0x0230, 0x0230, 0x0230, 0x0230, + 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, + 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, + 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, }; static const short tab10_[] = { - -16, -32, -48, 0x0411, 0x0301, 0x0301, 0x0310, 0x0310, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - -48, -64, -80, -96, -112, -128, -144, 0x0417, - 0x0471, -160, -176, -192, 0x0416, 0x0461, 0x0460, -208, - -208, -224, 0x0414, 0x0441, 0x0440, 0x0423, 0x0432, 0x0403, - 0x0313, 0x0313, 0x0331, 0x0331, 0x0330, 0x0330, 0x0322, 0x0322, - 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, - 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, - 0x0377, 0x0377, 0x0367, 0x0367, 0x0376, 0x0376, 0x0357, 0x0357, - 0x0375, 0x0375, 0x0366, 0x0366, 0x0247, 0x0247, 0x0247, 0x0247, - 0x0274, 0x0274, 0x0274, 0x0274, 0x0256, 0x0256, 0x0256, 0x0256, - 0x0265, 0x0265, 0x0265, 0x0265, 0x0237, 0x0237, 0x0237, 0x0237, - 0x0273, 0x0273, 0x0273, 0x0273, 0x0246, 0x0246, 0x0246, 0x0246, - 0x0355, 0x0355, 0x0354, 0x0354, 0x0263, 0x0263, 0x0263, 0x0263, - 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, - 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, - 0x0264, 0x0264, 0x0264, 0x0264, 0x0207, 0x0207, 0x0207, 0x0207, - 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, - 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, - 0x0245, 0x0245, 0x0245, 0x0245, 0x0235, 0x0235, 0x0235, 0x0235, - 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, - 0x0253, 0x0253, 0x0253, 0x0253, 0x0244, 0x0244, 0x0244, 0x0244, - 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, - 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, - 0x0225, 0x0225, 0x0225, 0x0225, 0x0252, 0x0252, 0x0252, 0x0252, - 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, - 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, - 0x0234, 0x0234, 0x0234, 0x0234, 0x0243, 0x0243, 0x0243, 0x0243, - 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, - 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, - 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, - 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, - 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, + -16, -32, -48, 0x0411, 0x0301, 0x0301, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + -48, -64, -80, -96, -112, -128, -144, 0x0417, + 0x0471, -160, -176, -192, 0x0416, 0x0461, 0x0460, -208, + -208, -224, 0x0414, 0x0441, 0x0440, 0x0423, 0x0432, 0x0403, + 0x0313, 0x0313, 0x0331, 0x0331, 0x0330, 0x0330, 0x0322, 0x0322, + 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x0377, 0x0377, 0x0367, 0x0367, 0x0376, 0x0376, 0x0357, 0x0357, + 0x0375, 0x0375, 0x0366, 0x0366, 0x0247, 0x0247, 0x0247, 0x0247, + 0x0274, 0x0274, 0x0274, 0x0274, 0x0256, 0x0256, 0x0256, 0x0256, + 0x0265, 0x0265, 0x0265, 0x0265, 0x0237, 0x0237, 0x0237, 0x0237, + 0x0273, 0x0273, 0x0273, 0x0273, 0x0246, 0x0246, 0x0246, 0x0246, + 0x0355, 0x0355, 0x0354, 0x0354, 0x0263, 0x0263, 0x0263, 0x0263, + 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, + 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, + 0x0264, 0x0264, 0x0264, 0x0264, 0x0207, 0x0207, 0x0207, 0x0207, + 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, + 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, + 0x0245, 0x0245, 0x0245, 0x0245, 0x0235, 0x0235, 0x0235, 0x0235, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0253, 0x0253, 0x0253, 0x0253, 0x0244, 0x0244, 0x0244, 0x0244, + 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, + 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, + 0x0225, 0x0225, 0x0225, 0x0225, 0x0252, 0x0252, 0x0252, 0x0252, + 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, + 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, + 0x0234, 0x0234, 0x0234, 0x0234, 0x0243, 0x0243, 0x0243, 0x0243, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, + 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, }; static const short tab11_[] = { - -16, -32, -48, -64, 0x0412, -80, 0x0311, 0x0311, - 0x0301, 0x0301, 0x0310, 0x0310, 0x0200, 0x0200, 0x0200, 0x0200, - -80, -96, -112, -128, -144, 0x0427, 0x0472, -160, - 0x0371, 0x0371, 0x0417, 0x0470, 0x0436, 0x0463, 0x0460, -176, - -176, 0x0415, 0x0362, 0x0362, 0x0426, 0x0406, 0x0316, 0x0316, - 0x0361, 0x0361, 0x0451, 0x0434, 0x0450, -192, 0x0424, 0x0442, - 0x0414, 0x0441, 0x0404, 0x0440, 0x0323, 0x0323, 0x0332, 0x0332, - 0x0213, 0x0213, 0x0213, 0x0213, 0x0231, 0x0231, 0x0231, 0x0231, - 0x0303, 0x0303, 0x0330, 0x0330, 0x0222, 0x0222, 0x0222, 0x0222, - 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, - 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, - 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, - 0x0277, 0x0277, 0x0277, 0x0277, 0x0267, 0x0267, 0x0267, 0x0267, - 0x0276, 0x0276, 0x0276, 0x0276, 0x0275, 0x0275, 0x0275, 0x0275, - 0x0266, 0x0266, 0x0266, 0x0266, 0x0247, 0x0247, 0x0247, 0x0247, - 0x0274, 0x0274, 0x0274, 0x0274, 0x0357, 0x0357, 0x0355, 0x0355, - 0x0256, 0x0256, 0x0256, 0x0256, 0x0265, 0x0265, 0x0265, 0x0265, - 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, - 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, - 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, - 0x0245, 0x0245, 0x0245, 0x0245, 0x0254, 0x0254, 0x0254, 0x0254, - 0x0235, 0x0235, 0x0235, 0x0235, 0x0253, 0x0253, 0x0253, 0x0253, - 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, - 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, - 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, - 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, - 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, - 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, - 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + -16, -32, -48, -64, 0x0412, -80, 0x0311, 0x0311, + 0x0301, 0x0301, 0x0310, 0x0310, 0x0200, 0x0200, 0x0200, 0x0200, + -80, -96, -112, -128, -144, 0x0427, 0x0472, -160, + 0x0371, 0x0371, 0x0417, 0x0470, 0x0436, 0x0463, 0x0460, -176, + -176, 0x0415, 0x0362, 0x0362, 0x0426, 0x0406, 0x0316, 0x0316, + 0x0361, 0x0361, 0x0451, 0x0434, 0x0450, -192, 0x0424, 0x0442, + 0x0414, 0x0441, 0x0404, 0x0440, 0x0323, 0x0323, 0x0332, 0x0332, + 0x0213, 0x0213, 0x0213, 0x0213, 0x0231, 0x0231, 0x0231, 0x0231, + 0x0303, 0x0303, 0x0330, 0x0330, 0x0222, 0x0222, 0x0222, 0x0222, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0277, 0x0277, 0x0277, 0x0277, 0x0267, 0x0267, 0x0267, 0x0267, + 0x0276, 0x0276, 0x0276, 0x0276, 0x0275, 0x0275, 0x0275, 0x0275, + 0x0266, 0x0266, 0x0266, 0x0266, 0x0247, 0x0247, 0x0247, 0x0247, + 0x0274, 0x0274, 0x0274, 0x0274, 0x0357, 0x0357, 0x0355, 0x0355, + 0x0256, 0x0256, 0x0256, 0x0256, 0x0265, 0x0265, 0x0265, 0x0265, + 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, + 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, + 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, + 0x0245, 0x0245, 0x0245, 0x0245, 0x0254, 0x0254, 0x0254, 0x0254, + 0x0235, 0x0235, 0x0235, 0x0235, 0x0253, 0x0253, 0x0253, 0x0253, + 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, + 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, + 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, }; static const short tab12_[] = { - -16, -32, -48, -64, -80, -96, 0x0412, 0x0421, - -112, 0x0400, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, - -112, -128, -144, -160, 0x0456, 0x0437, -176, 0x0427, - 0x0472, 0x0446, 0x0464, 0x0417, 0x0471, -192, 0x0436, 0x0463, - 0x0445, 0x0454, 0x0444, -192, 0x0326, 0x0326, 0x0362, 0x0362, - 0x0361, 0x0361, 0x0416, 0x0460, 0x0435, 0x0453, 0x0425, 0x0452, - 0x0315, 0x0315, 0x0351, 0x0351, 0x0334, 0x0334, 0x0343, 0x0343, - 0x0450, 0x0404, 0x0324, 0x0324, 0x0342, 0x0342, 0x0314, 0x0314, - 0x0233, 0x0233, 0x0233, 0x0233, 0x0241, 0x0241, 0x0241, 0x0241, - 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, - 0x0340, 0x0340, 0x0303, 0x0303, 0x0230, 0x0230, 0x0230, 0x0230, - 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, - 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, - 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, - 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, - 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, - 0x0277, 0x0277, 0x0277, 0x0277, 0x0267, 0x0267, 0x0267, 0x0267, - 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, - 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, - 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, - 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, - 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, - 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, - 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, - 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, - 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, - 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, - 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, - 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + -16, -32, -48, -64, -80, -96, 0x0412, 0x0421, + -112, 0x0400, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, + -112, -128, -144, -160, 0x0456, 0x0437, -176, 0x0427, + 0x0472, 0x0446, 0x0464, 0x0417, 0x0471, -192, 0x0436, 0x0463, + 0x0445, 0x0454, 0x0444, -192, 0x0326, 0x0326, 0x0362, 0x0362, + 0x0361, 0x0361, 0x0416, 0x0460, 0x0435, 0x0453, 0x0425, 0x0452, + 0x0315, 0x0315, 0x0351, 0x0351, 0x0334, 0x0334, 0x0343, 0x0343, + 0x0450, 0x0404, 0x0324, 0x0324, 0x0342, 0x0342, 0x0314, 0x0314, + 0x0233, 0x0233, 0x0233, 0x0233, 0x0241, 0x0241, 0x0241, 0x0241, + 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, + 0x0340, 0x0340, 0x0303, 0x0303, 0x0230, 0x0230, 0x0230, 0x0230, + 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, + 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, + 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0277, 0x0277, 0x0277, 0x0277, 0x0267, 0x0267, 0x0267, 0x0267, + 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, + 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, + 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, + 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, + 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, + 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, + 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, + 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, + 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, + 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, + 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, }; static const short tab13_[] = { - -16, -32, -48, -64, 0x0411, 0x0401, 0x0310, 0x0310, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - -64, -80, -96, -112, -128, -144, -160, -176, - -192, -208, -224, -240, -256, -272, -288, -304, - -304, -320, -336, -352, 0x0481, -368, -384, -400, - -416, -432, 0x0415, 0x0451, -448, -464, -480, 0x0414, - 0x0341, 0x0341, 0x0404, 0x0440, 0x0423, 0x0432, 0x0313, 0x0313, - 0x0331, 0x0331, 0x0303, 0x0303, 0x0330, 0x0330, 0x0322, 0x0322, - 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, - 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, - -448, -464, -480, -496, -512, -528, -544, -560, - -576, -592, -608, -624, -640, -656, 0x041f, 0x04f1, - 0x04f0, -656, -672, -688, 0x04e2, -704, 0x041e, 0x04e1, - -720, -736, -752, -768, -784, -800, 0x04c6, 0x043d, - -800, 0x042d, 0x04d2, 0x041d, 0x04b7, -816, -832, 0x04c3, - -848, 0x044b, 0x03d1, 0x03d1, 0x040d, 0x04d0, 0x048a, 0x04a8, - 0x044c, 0x04c4, 0x046b, 0x04b6, 0x033c, 0x033c, 0x032c, 0x032c, - 0x03c2, 0x03c2, 0x035b, 0x035b, 0x04b5, 0x0489, 0x031c, 0x031c, - 0x03c1, 0x03c1, 0x0498, 0x040c, 0x03c0, 0x03c0, 0x04b4, 0x046a, - 0x04a6, 0x0479, 0x033b, 0x033b, 0x03b3, 0x03b3, 0x0488, 0x045a, - 0x032b, 0x032b, 0x04a5, 0x0469, 0x03a4, 0x03a4, 0x0478, 0x0487, - 0x0394, 0x0394, 0x0477, 0x0476, 0x02b2, 0x02b2, 0x02b2, 0x02b2, - 0x021b, 0x021b, 0x021b, 0x021b, 0x02b1, 0x02b1, 0x02b1, 0x02b1, - 0x030b, 0x030b, 0x03b0, 0x03b0, 0x0396, 0x0396, 0x034a, 0x034a, - 0x033a, 0x033a, 0x03a3, 0x03a3, 0x0359, 0x0359, 0x0395, 0x0395, - 0x022a, 0x022a, 0x022a, 0x022a, 0x02a2, 0x02a2, 0x02a2, 0x02a2, - 0x021a, 0x021a, 0x021a, 0x021a, 0x02a1, 0x02a1, 0x02a1, 0x02a1, - 0x030a, 0x030a, 0x0368, 0x0368, 0x02a0, 0x02a0, 0x02a0, 0x02a0, - 0x0386, 0x0386, 0x0349, 0x0349, 0x0293, 0x0293, 0x0293, 0x0293, - 0x0339, 0x0339, 0x0358, 0x0358, 0x0385, 0x0385, 0x0367, 0x0367, - 0x0229, 0x0229, 0x0229, 0x0229, 0x0292, 0x0292, 0x0292, 0x0292, - 0x0357, 0x0357, 0x0375, 0x0375, 0x0238, 0x0238, 0x0238, 0x0238, - 0x0283, 0x0283, 0x0283, 0x0283, 0x0366, 0x0366, 0x0347, 0x0347, - 0x0374, 0x0374, 0x0356, 0x0356, 0x0365, 0x0365, 0x0373, 0x0373, - 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, - 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, - 0x0209, 0x0209, 0x0209, 0x0209, 0x0290, 0x0290, 0x0290, 0x0290, - 0x0248, 0x0248, 0x0248, 0x0248, 0x0284, 0x0284, 0x0284, 0x0284, - 0x0272, 0x0272, 0x0272, 0x0272, 0x0346, 0x0346, 0x0364, 0x0364, - 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, - 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, - 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, - 0x0237, 0x0237, 0x0237, 0x0237, 0x0227, 0x0227, 0x0227, 0x0227, - 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, - 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, - 0x0255, 0x0255, 0x0255, 0x0255, 0x0207, 0x0207, 0x0207, 0x0207, - 0x0270, 0x0270, 0x0270, 0x0270, 0x0236, 0x0236, 0x0236, 0x0236, - 0x0263, 0x0263, 0x0263, 0x0263, 0x0245, 0x0245, 0x0245, 0x0245, - 0x0254, 0x0254, 0x0254, 0x0254, 0x0226, 0x0226, 0x0226, 0x0226, - 0x0262, 0x0262, 0x0262, 0x0262, 0x0235, 0x0235, 0x0235, 0x0235, - 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, - 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, - 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, - 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, - 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, - 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, - 0x0253, 0x0253, 0x0253, 0x0253, 0x0244, 0x0244, 0x0244, 0x0244, - 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, - 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, - 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, - 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, - 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, - 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, - 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, - 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, - 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, - -448, 0x04ff, 0x04ef, 0x04df, 0x04ee, 0x04cf, 0x04de, 0x04bf, - 0x04fb, 0x04ce, 0x04dc, -464, 0x03ec, 0x03ec, 0x03dd, 0x03dd, - 0x04fa, 0x04cd, 0x03be, 0x03be, 0x03eb, 0x03eb, 0x039f, 0x039f, - 0x03f9, 0x03f9, 0x03ea, 0x03ea, 0x03bd, 0x03bd, 0x03db, 0x03db, - 0x038f, 0x038f, 0x03f8, 0x03f8, 0x03cc, 0x03cc, 0x04ae, 0x049e, - 0x038e, 0x038e, 0x047f, 0x047e, 0x02f7, 0x02f7, 0x02f7, 0x02f7, - 0x02da, 0x02da, 0x02da, 0x02da, 0x03ad, 0x03ad, 0x03bc, 0x03bc, - 0x03cb, 0x03cb, 0x03f6, 0x03f6, 0x026f, 0x026f, 0x026f, 0x026f, - 0x02e8, 0x02e8, 0x02e8, 0x02e8, 0x025f, 0x025f, 0x025f, 0x025f, - 0x029d, 0x029d, 0x029d, 0x029d, 0x02d9, 0x02d9, 0x02d9, 0x02d9, - 0x02f5, 0x02f5, 0x02f5, 0x02f5, 0x02e7, 0x02e7, 0x02e7, 0x02e7, - 0x02ac, 0x02ac, 0x02ac, 0x02ac, 0x02bb, 0x02bb, 0x02bb, 0x02bb, - 0x024f, 0x024f, 0x024f, 0x024f, 0x02f4, 0x02f4, 0x02f4, 0x02f4, - 0x03ca, 0x03ca, 0x03e6, 0x03e6, 0x02f3, 0x02f3, 0x02f3, 0x02f3, - 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, - 0x028d, 0x028d, 0x028d, 0x028d, 0x02d8, 0x02d8, 0x02d8, 0x02d8, - 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, - 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, - 0x026e, 0x026e, 0x026e, 0x026e, 0x029c, 0x029c, 0x029c, 0x029c, - 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, - 0x02c9, 0x02c9, 0x02c9, 0x02c9, 0x025e, 0x025e, 0x025e, 0x025e, - 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, - 0x027d, 0x027d, 0x027d, 0x027d, 0x02d7, 0x02d7, 0x02d7, 0x02d7, - 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, - 0x02c8, 0x02c8, 0x02c8, 0x02c8, 0x02d6, 0x02d6, 0x02d6, 0x02d6, - 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, - 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, - 0x029b, 0x029b, 0x029b, 0x029b, 0x02aa, 0x02aa, 0x02aa, 0x02aa, - 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, - 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, - 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, - 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, - 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, - 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, - 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, - 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, - 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, - 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, - 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, - 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, - 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, - 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, - 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, - 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, - 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, - 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, - 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, - 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, - 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, - 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, - 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, - 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, - 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, - 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, - 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, - 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, - 0x03fe, 0x03fe, 0x03fc, 0x03fc, 0x02fd, 0x02fd, 0x02fd, 0x02fd, - 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, - 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, - 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, + -16, -32, -48, -64, 0x0411, 0x0401, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + -64, -80, -96, -112, -128, -144, -160, -176, + -192, -208, -224, -240, -256, -272, -288, -304, + -304, -320, -336, -352, 0x0481, -368, -384, -400, + -416, -432, 0x0415, 0x0451, -448, -464, -480, 0x0414, + 0x0341, 0x0341, 0x0404, 0x0440, 0x0423, 0x0432, 0x0313, 0x0313, + 0x0331, 0x0331, 0x0303, 0x0303, 0x0330, 0x0330, 0x0322, 0x0322, + 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + -448, -464, -480, -496, -512, -528, -544, -560, + -576, -592, -608, -624, -640, -656, 0x041f, 0x04f1, + 0x04f0, -656, -672, -688, 0x04e2, -704, 0x041e, 0x04e1, + -720, -736, -752, -768, -784, -800, 0x04c6, 0x043d, + -800, 0x042d, 0x04d2, 0x041d, 0x04b7, -816, -832, 0x04c3, + -848, 0x044b, 0x03d1, 0x03d1, 0x040d, 0x04d0, 0x048a, 0x04a8, + 0x044c, 0x04c4, 0x046b, 0x04b6, 0x033c, 0x033c, 0x032c, 0x032c, + 0x03c2, 0x03c2, 0x035b, 0x035b, 0x04b5, 0x0489, 0x031c, 0x031c, + 0x03c1, 0x03c1, 0x0498, 0x040c, 0x03c0, 0x03c0, 0x04b4, 0x046a, + 0x04a6, 0x0479, 0x033b, 0x033b, 0x03b3, 0x03b3, 0x0488, 0x045a, + 0x032b, 0x032b, 0x04a5, 0x0469, 0x03a4, 0x03a4, 0x0478, 0x0487, + 0x0394, 0x0394, 0x0477, 0x0476, 0x02b2, 0x02b2, 0x02b2, 0x02b2, + 0x021b, 0x021b, 0x021b, 0x021b, 0x02b1, 0x02b1, 0x02b1, 0x02b1, + 0x030b, 0x030b, 0x03b0, 0x03b0, 0x0396, 0x0396, 0x034a, 0x034a, + 0x033a, 0x033a, 0x03a3, 0x03a3, 0x0359, 0x0359, 0x0395, 0x0395, + 0x022a, 0x022a, 0x022a, 0x022a, 0x02a2, 0x02a2, 0x02a2, 0x02a2, + 0x021a, 0x021a, 0x021a, 0x021a, 0x02a1, 0x02a1, 0x02a1, 0x02a1, + 0x030a, 0x030a, 0x0368, 0x0368, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x0386, 0x0386, 0x0349, 0x0349, 0x0293, 0x0293, 0x0293, 0x0293, + 0x0339, 0x0339, 0x0358, 0x0358, 0x0385, 0x0385, 0x0367, 0x0367, + 0x0229, 0x0229, 0x0229, 0x0229, 0x0292, 0x0292, 0x0292, 0x0292, + 0x0357, 0x0357, 0x0375, 0x0375, 0x0238, 0x0238, 0x0238, 0x0238, + 0x0283, 0x0283, 0x0283, 0x0283, 0x0366, 0x0366, 0x0347, 0x0347, + 0x0374, 0x0374, 0x0356, 0x0356, 0x0365, 0x0365, 0x0373, 0x0373, + 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, + 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, + 0x0209, 0x0209, 0x0209, 0x0209, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0248, 0x0248, 0x0248, 0x0248, 0x0284, 0x0284, 0x0284, 0x0284, + 0x0272, 0x0272, 0x0272, 0x0272, 0x0346, 0x0346, 0x0364, 0x0364, + 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, + 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, + 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, + 0x0237, 0x0237, 0x0237, 0x0237, 0x0227, 0x0227, 0x0227, 0x0227, + 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, + 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, + 0x0255, 0x0255, 0x0255, 0x0255, 0x0207, 0x0207, 0x0207, 0x0207, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0236, 0x0236, 0x0236, 0x0236, + 0x0263, 0x0263, 0x0263, 0x0263, 0x0245, 0x0245, 0x0245, 0x0245, + 0x0254, 0x0254, 0x0254, 0x0254, 0x0226, 0x0226, 0x0226, 0x0226, + 0x0262, 0x0262, 0x0262, 0x0262, 0x0235, 0x0235, 0x0235, 0x0235, + 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, + 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, + 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, + 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, + 0x0253, 0x0253, 0x0253, 0x0253, 0x0244, 0x0244, 0x0244, 0x0244, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, + 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, + -448, 0x04ff, 0x04ef, 0x04df, 0x04ee, 0x04cf, 0x04de, 0x04bf, + 0x04fb, 0x04ce, 0x04dc, -464, 0x03ec, 0x03ec, 0x03dd, 0x03dd, + 0x04fa, 0x04cd, 0x03be, 0x03be, 0x03eb, 0x03eb, 0x039f, 0x039f, + 0x03f9, 0x03f9, 0x03ea, 0x03ea, 0x03bd, 0x03bd, 0x03db, 0x03db, + 0x038f, 0x038f, 0x03f8, 0x03f8, 0x03cc, 0x03cc, 0x04ae, 0x049e, + 0x038e, 0x038e, 0x047f, 0x047e, 0x02f7, 0x02f7, 0x02f7, 0x02f7, + 0x02da, 0x02da, 0x02da, 0x02da, 0x03ad, 0x03ad, 0x03bc, 0x03bc, + 0x03cb, 0x03cb, 0x03f6, 0x03f6, 0x026f, 0x026f, 0x026f, 0x026f, + 0x02e8, 0x02e8, 0x02e8, 0x02e8, 0x025f, 0x025f, 0x025f, 0x025f, + 0x029d, 0x029d, 0x029d, 0x029d, 0x02d9, 0x02d9, 0x02d9, 0x02d9, + 0x02f5, 0x02f5, 0x02f5, 0x02f5, 0x02e7, 0x02e7, 0x02e7, 0x02e7, + 0x02ac, 0x02ac, 0x02ac, 0x02ac, 0x02bb, 0x02bb, 0x02bb, 0x02bb, + 0x024f, 0x024f, 0x024f, 0x024f, 0x02f4, 0x02f4, 0x02f4, 0x02f4, + 0x03ca, 0x03ca, 0x03e6, 0x03e6, 0x02f3, 0x02f3, 0x02f3, 0x02f3, + 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, + 0x028d, 0x028d, 0x028d, 0x028d, 0x02d8, 0x02d8, 0x02d8, 0x02d8, + 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, + 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, + 0x026e, 0x026e, 0x026e, 0x026e, 0x029c, 0x029c, 0x029c, 0x029c, + 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, + 0x02c9, 0x02c9, 0x02c9, 0x02c9, 0x025e, 0x025e, 0x025e, 0x025e, + 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, + 0x027d, 0x027d, 0x027d, 0x027d, 0x02d7, 0x02d7, 0x02d7, 0x02d7, + 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, + 0x02c8, 0x02c8, 0x02c8, 0x02c8, 0x02d6, 0x02d6, 0x02d6, 0x02d6, + 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, + 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, + 0x029b, 0x029b, 0x029b, 0x029b, 0x02aa, 0x02aa, 0x02aa, 0x02aa, + 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, + 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, + 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, + 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, + 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, + 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, + 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, + 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, + 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, + 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, + 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, + 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, + 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, + 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, + 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, + 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, + 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, + 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, + 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, + 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, + 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, + 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, + 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, + 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, + 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, + 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, + 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, + 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, + 0x03fe, 0x03fe, 0x03fc, 0x03fc, 0x02fd, 0x02fd, 0x02fd, 0x02fd, + 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, + 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, + 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, }; static const short tab15_[] = { - -16, -32, -48, -64, -80, -96, -112, -128, - -144, -160, 0x0311, 0x0311, 0x0401, 0x0410, 0x0300, 0x0300, - -160, -176, -192, -208, -224, -240, -256, -272, - -288, -304, -320, -336, -352, -368, -384, -400, - -400, -416, -432, -448, -464, -480, -496, -512, - -528, -544, -560, -576, -592, -608, -624, -640, - -640, -656, 0x0491, -672, -688, -704, -720, -736, - 0x0428, 0x0482, 0x0418, 0x0481, -752, -768, -784, -800, - 0x0427, 0x0472, 0x0464, 0x0417, 0x0455, 0x0471, -800, 0x0436, - 0x0463, 0x0445, 0x0454, 0x0426, 0x0462, 0x0416, -816, 0x0435, - 0x0361, 0x0361, 0x0453, 0x0444, 0x0325, 0x0325, 0x0352, 0x0352, - 0x0315, 0x0315, 0x0351, 0x0351, 0x0405, 0x0450, 0x0334, 0x0334, - 0x0343, 0x0343, 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, - 0x0241, 0x0241, 0x0241, 0x0241, 0x0314, 0x0314, 0x0304, 0x0304, - 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, - 0x0340, 0x0340, 0x0303, 0x0303, 0x0213, 0x0213, 0x0213, 0x0213, - 0x0231, 0x0231, 0x0231, 0x0231, 0x0230, 0x0230, 0x0230, 0x0230, - 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, - 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, - 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, - 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, - 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, - -720, -736, 0x04ee, -752, -768, -784, 0x04fb, -800, - 0x04dd, 0x04af, 0x04fa, 0x04be, 0x04eb, 0x04cd, 0x04dc, 0x049f, - 0x04f9, 0x04ea, 0x04bd, 0x04db, 0x048f, 0x04f8, 0x04cc, 0x049e, - 0x04e9, 0x047f, 0x04f7, 0x04ad, 0x04da, 0x04bc, 0x046f, -800, - 0x03cb, 0x03cb, 0x03f6, 0x03f6, 0x048e, 0x04e8, 0x045f, 0x049d, - 0x03f5, 0x03f5, 0x037e, 0x037e, 0x03e7, 0x03e7, 0x03ac, 0x03ac, - 0x03ca, 0x03ca, 0x03bb, 0x03bb, 0x04d9, 0x048d, 0x034f, 0x034f, - 0x03f4, 0x03f4, 0x033f, 0x033f, 0x03f3, 0x03f3, 0x03d8, 0x03d8, - 0x03e6, 0x03e6, 0x032f, 0x032f, 0x03f2, 0x03f2, 0x046e, 0x04f0, - 0x031f, 0x031f, 0x03f1, 0x03f1, 0x039c, 0x039c, 0x03c9, 0x03c9, - 0x035e, 0x035e, 0x03ab, 0x03ab, 0x03ba, 0x03ba, 0x03e5, 0x03e5, - 0x037d, 0x037d, 0x03d7, 0x03d7, 0x034e, 0x034e, 0x03e4, 0x03e4, - 0x038c, 0x038c, 0x03c8, 0x03c8, 0x033e, 0x033e, 0x036d, 0x036d, - 0x03d6, 0x03d6, 0x03e3, 0x03e3, 0x039b, 0x039b, 0x03b9, 0x03b9, - 0x032e, 0x032e, 0x03aa, 0x03aa, 0x03e2, 0x03e2, 0x031e, 0x031e, - 0x03e1, 0x03e1, 0x040e, 0x04e0, 0x035d, 0x035d, 0x03d5, 0x03d5, - 0x037c, 0x037c, 0x03c7, 0x03c7, 0x034d, 0x034d, 0x038b, 0x038b, - 0x02d4, 0x02d4, 0x02d4, 0x02d4, 0x03b8, 0x03b8, 0x039a, 0x039a, - 0x03a9, 0x03a9, 0x036c, 0x036c, 0x03c6, 0x03c6, 0x033d, 0x033d, - 0x02d3, 0x02d3, 0x02d3, 0x02d3, 0x02d2, 0x02d2, 0x02d2, 0x02d2, - 0x032d, 0x032d, 0x030d, 0x030d, 0x021d, 0x021d, 0x021d, 0x021d, - 0x027b, 0x027b, 0x027b, 0x027b, 0x02b7, 0x02b7, 0x02b7, 0x02b7, - 0x02d1, 0x02d1, 0x02d1, 0x02d1, 0x035c, 0x035c, 0x03d0, 0x03d0, - 0x02c5, 0x02c5, 0x02c5, 0x02c5, 0x028a, 0x028a, 0x028a, 0x028a, - 0x02a8, 0x02a8, 0x02a8, 0x02a8, 0x024c, 0x024c, 0x024c, 0x024c, - 0x02c4, 0x02c4, 0x02c4, 0x02c4, 0x026b, 0x026b, 0x026b, 0x026b, - 0x02b6, 0x02b6, 0x02b6, 0x02b6, 0x0399, 0x0399, 0x030c, 0x030c, - 0x023c, 0x023c, 0x023c, 0x023c, 0x02c3, 0x02c3, 0x02c3, 0x02c3, - 0x027a, 0x027a, 0x027a, 0x027a, 0x02a7, 0x02a7, 0x02a7, 0x02a7, - 0x02a6, 0x02a6, 0x02a6, 0x02a6, 0x03c0, 0x03c0, 0x030b, 0x030b, - 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, - 0x022c, 0x022c, 0x022c, 0x022c, 0x025b, 0x025b, 0x025b, 0x025b, - 0x02b5, 0x02b5, 0x02b5, 0x02b5, 0x021c, 0x021c, 0x021c, 0x021c, - 0x0289, 0x0289, 0x0289, 0x0289, 0x0298, 0x0298, 0x0298, 0x0298, - 0x02c1, 0x02c1, 0x02c1, 0x02c1, 0x024b, 0x024b, 0x024b, 0x024b, - 0x02b4, 0x02b4, 0x02b4, 0x02b4, 0x026a, 0x026a, 0x026a, 0x026a, - 0x023b, 0x023b, 0x023b, 0x023b, 0x0279, 0x0279, 0x0279, 0x0279, - 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, - 0x0297, 0x0297, 0x0297, 0x0297, 0x0288, 0x0288, 0x0288, 0x0288, - 0x022b, 0x022b, 0x022b, 0x022b, 0x025a, 0x025a, 0x025a, 0x025a, - 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, - 0x02a5, 0x02a5, 0x02a5, 0x02a5, 0x021b, 0x021b, 0x021b, 0x021b, - 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, - 0x02b0, 0x02b0, 0x02b0, 0x02b0, 0x0269, 0x0269, 0x0269, 0x0269, - 0x0296, 0x0296, 0x0296, 0x0296, 0x024a, 0x024a, 0x024a, 0x024a, - 0x02a4, 0x02a4, 0x02a4, 0x02a4, 0x0278, 0x0278, 0x0278, 0x0278, - 0x0287, 0x0287, 0x0287, 0x0287, 0x023a, 0x023a, 0x023a, 0x023a, - 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, - 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, - 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, - 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, - 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, - 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, - 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, - 0x020a, 0x020a, 0x020a, 0x020a, 0x02a0, 0x02a0, 0x02a0, 0x02a0, - 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, - 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, - 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, - 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, - 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, - 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, - 0x0277, 0x0277, 0x0277, 0x0277, 0x0209, 0x0209, 0x0209, 0x0209, - 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, - 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, - 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, - 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, - 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, - 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, - 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, - 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, - 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, - 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, - 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, - 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, - 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, - 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, - 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, - 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, - 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, - 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, - 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, - 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, - 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, - 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, - 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, - 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, - 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, - 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, - 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, - 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, - 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, - 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, - 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, - 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, - 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, - 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, - 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, - 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, - 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, - 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, - 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, - 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, - 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, - 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, + -16, -32, -48, -64, -80, -96, -112, -128, + -144, -160, 0x0311, 0x0311, 0x0401, 0x0410, 0x0300, 0x0300, + -160, -176, -192, -208, -224, -240, -256, -272, + -288, -304, -320, -336, -352, -368, -384, -400, + -400, -416, -432, -448, -464, -480, -496, -512, + -528, -544, -560, -576, -592, -608, -624, -640, + -640, -656, 0x0491, -672, -688, -704, -720, -736, + 0x0428, 0x0482, 0x0418, 0x0481, -752, -768, -784, -800, + 0x0427, 0x0472, 0x0464, 0x0417, 0x0455, 0x0471, -800, 0x0436, + 0x0463, 0x0445, 0x0454, 0x0426, 0x0462, 0x0416, -816, 0x0435, + 0x0361, 0x0361, 0x0453, 0x0444, 0x0325, 0x0325, 0x0352, 0x0352, + 0x0315, 0x0315, 0x0351, 0x0351, 0x0405, 0x0450, 0x0334, 0x0334, + 0x0343, 0x0343, 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, + 0x0241, 0x0241, 0x0241, 0x0241, 0x0314, 0x0314, 0x0304, 0x0304, + 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, + 0x0340, 0x0340, 0x0303, 0x0303, 0x0213, 0x0213, 0x0213, 0x0213, + 0x0231, 0x0231, 0x0231, 0x0231, 0x0230, 0x0230, 0x0230, 0x0230, + 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, + 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + -720, -736, 0x04ee, -752, -768, -784, 0x04fb, -800, + 0x04dd, 0x04af, 0x04fa, 0x04be, 0x04eb, 0x04cd, 0x04dc, 0x049f, + 0x04f9, 0x04ea, 0x04bd, 0x04db, 0x048f, 0x04f8, 0x04cc, 0x049e, + 0x04e9, 0x047f, 0x04f7, 0x04ad, 0x04da, 0x04bc, 0x046f, -800, + 0x03cb, 0x03cb, 0x03f6, 0x03f6, 0x048e, 0x04e8, 0x045f, 0x049d, + 0x03f5, 0x03f5, 0x037e, 0x037e, 0x03e7, 0x03e7, 0x03ac, 0x03ac, + 0x03ca, 0x03ca, 0x03bb, 0x03bb, 0x04d9, 0x048d, 0x034f, 0x034f, + 0x03f4, 0x03f4, 0x033f, 0x033f, 0x03f3, 0x03f3, 0x03d8, 0x03d8, + 0x03e6, 0x03e6, 0x032f, 0x032f, 0x03f2, 0x03f2, 0x046e, 0x04f0, + 0x031f, 0x031f, 0x03f1, 0x03f1, 0x039c, 0x039c, 0x03c9, 0x03c9, + 0x035e, 0x035e, 0x03ab, 0x03ab, 0x03ba, 0x03ba, 0x03e5, 0x03e5, + 0x037d, 0x037d, 0x03d7, 0x03d7, 0x034e, 0x034e, 0x03e4, 0x03e4, + 0x038c, 0x038c, 0x03c8, 0x03c8, 0x033e, 0x033e, 0x036d, 0x036d, + 0x03d6, 0x03d6, 0x03e3, 0x03e3, 0x039b, 0x039b, 0x03b9, 0x03b9, + 0x032e, 0x032e, 0x03aa, 0x03aa, 0x03e2, 0x03e2, 0x031e, 0x031e, + 0x03e1, 0x03e1, 0x040e, 0x04e0, 0x035d, 0x035d, 0x03d5, 0x03d5, + 0x037c, 0x037c, 0x03c7, 0x03c7, 0x034d, 0x034d, 0x038b, 0x038b, + 0x02d4, 0x02d4, 0x02d4, 0x02d4, 0x03b8, 0x03b8, 0x039a, 0x039a, + 0x03a9, 0x03a9, 0x036c, 0x036c, 0x03c6, 0x03c6, 0x033d, 0x033d, + 0x02d3, 0x02d3, 0x02d3, 0x02d3, 0x02d2, 0x02d2, 0x02d2, 0x02d2, + 0x032d, 0x032d, 0x030d, 0x030d, 0x021d, 0x021d, 0x021d, 0x021d, + 0x027b, 0x027b, 0x027b, 0x027b, 0x02b7, 0x02b7, 0x02b7, 0x02b7, + 0x02d1, 0x02d1, 0x02d1, 0x02d1, 0x035c, 0x035c, 0x03d0, 0x03d0, + 0x02c5, 0x02c5, 0x02c5, 0x02c5, 0x028a, 0x028a, 0x028a, 0x028a, + 0x02a8, 0x02a8, 0x02a8, 0x02a8, 0x024c, 0x024c, 0x024c, 0x024c, + 0x02c4, 0x02c4, 0x02c4, 0x02c4, 0x026b, 0x026b, 0x026b, 0x026b, + 0x02b6, 0x02b6, 0x02b6, 0x02b6, 0x0399, 0x0399, 0x030c, 0x030c, + 0x023c, 0x023c, 0x023c, 0x023c, 0x02c3, 0x02c3, 0x02c3, 0x02c3, + 0x027a, 0x027a, 0x027a, 0x027a, 0x02a7, 0x02a7, 0x02a7, 0x02a7, + 0x02a6, 0x02a6, 0x02a6, 0x02a6, 0x03c0, 0x03c0, 0x030b, 0x030b, + 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, + 0x022c, 0x022c, 0x022c, 0x022c, 0x025b, 0x025b, 0x025b, 0x025b, + 0x02b5, 0x02b5, 0x02b5, 0x02b5, 0x021c, 0x021c, 0x021c, 0x021c, + 0x0289, 0x0289, 0x0289, 0x0289, 0x0298, 0x0298, 0x0298, 0x0298, + 0x02c1, 0x02c1, 0x02c1, 0x02c1, 0x024b, 0x024b, 0x024b, 0x024b, + 0x02b4, 0x02b4, 0x02b4, 0x02b4, 0x026a, 0x026a, 0x026a, 0x026a, + 0x023b, 0x023b, 0x023b, 0x023b, 0x0279, 0x0279, 0x0279, 0x0279, + 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, + 0x0297, 0x0297, 0x0297, 0x0297, 0x0288, 0x0288, 0x0288, 0x0288, + 0x022b, 0x022b, 0x022b, 0x022b, 0x025a, 0x025a, 0x025a, 0x025a, + 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, + 0x02a5, 0x02a5, 0x02a5, 0x02a5, 0x021b, 0x021b, 0x021b, 0x021b, + 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, + 0x02b0, 0x02b0, 0x02b0, 0x02b0, 0x0269, 0x0269, 0x0269, 0x0269, + 0x0296, 0x0296, 0x0296, 0x0296, 0x024a, 0x024a, 0x024a, 0x024a, + 0x02a4, 0x02a4, 0x02a4, 0x02a4, 0x0278, 0x0278, 0x0278, 0x0278, + 0x0287, 0x0287, 0x0287, 0x0287, 0x023a, 0x023a, 0x023a, 0x023a, + 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, + 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, + 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, + 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, + 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, + 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, + 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, + 0x020a, 0x020a, 0x020a, 0x020a, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, + 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, + 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, + 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, + 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, + 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, + 0x0277, 0x0277, 0x0277, 0x0277, 0x0209, 0x0209, 0x0209, 0x0209, + 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, + 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, + 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, + 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, + 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, + 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, + 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, + 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, + 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, + 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, + 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, + 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, + 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, + 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, + 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, + 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, + 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, + 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, + 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, + 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, + 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, + 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, + 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, + 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, + 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, + 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, + 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, + 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, + 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, + 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, + 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, + 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, + 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, + 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, + 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, + 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, + 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, + 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, + 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, + 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, }; static const short tab16_[] = { - -16, -32, -48, -64, 0x0411, 0x0401, 0x0310, 0x0310, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - -64, -80, -96, 0x04ff, -112, -128, -144, 0x04f2, - -160, 0x041f, 0x04f1, -176, -192, -208, -224, -240, - -240, -256, -272, -288, -304, -320, -336, -352, - -368, -384, -400, -416, -432, -448, 0x0451, -464, - -464, -480, -496, 0x0414, 0x0441, -512, 0x0423, 0x0432, - 0x0313, 0x0313, 0x0331, 0x0331, 0x0403, 0x0430, 0x0322, 0x0322, - 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, - 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, - 0x03ef, 0x03ef, 0x03fe, 0x03fe, 0x03df, 0x03df, 0x03fd, 0x03fd, - 0x03cf, 0x03cf, 0x03fc, 0x03fc, 0x03bf, 0x03bf, 0x03fb, 0x03fb, - 0x02af, 0x02af, 0x02af, 0x02af, 0x03fa, 0x03fa, 0x039f, 0x039f, - 0x03f9, 0x03f9, 0x03f8, 0x03f8, 0x028f, 0x028f, 0x028f, 0x028f, - 0x027f, 0x027f, 0x027f, 0x027f, 0x02f7, 0x02f7, 0x02f7, 0x02f7, - 0x026f, 0x026f, 0x026f, 0x026f, 0x02f6, 0x02f6, 0x02f6, 0x02f6, - 0x025f, 0x025f, 0x025f, 0x025f, 0x02f5, 0x02f5, 0x02f5, 0x02f5, - 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, - 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, - 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, - 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, - 0x023f, 0x023f, 0x023f, 0x023f, -416, -432, -448, -464, - 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, - 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, - -448, -464, -480, -496, -512, -528, -544, -560, - -576, -592, -608, 0x04e3, -624, -640, -656, -672, - -672, -688, -704, 0x040d, -720, -736, -752, 0x043c, - -768, 0x041c, 0x04c0, -784, 0x03e2, 0x03e2, 0x042e, 0x041e, - 0x04d3, 0x042d, 0x04d2, 0x04d1, 0x043b, -784, 0x031d, 0x031d, - 0x04c4, 0x046b, 0x04c3, 0x04a7, 0x032c, 0x032c, 0x04c2, 0x04b5, - 0x04c1, 0x040c, 0x044b, 0x04b4, 0x046a, 0x04a6, 0x03b3, 0x03b3, - 0x045a, 0x04a5, 0x032b, 0x032b, 0x03b2, 0x03b2, 0x031b, 0x031b, - 0x03b1, 0x03b1, 0x040b, 0x04b0, 0x0469, 0x0496, 0x044a, 0x04a4, - 0x0478, 0x0487, 0x03a3, 0x03a3, 0x043a, 0x0459, 0x032a, 0x032a, - 0x0495, 0x0468, 0x03a1, 0x03a1, 0x0486, 0x0477, 0x0394, 0x0394, - 0x0449, 0x0457, 0x0367, 0x0367, 0x02a2, 0x02a2, 0x02a2, 0x02a2, - 0x021a, 0x021a, 0x021a, 0x021a, 0x030a, 0x030a, 0x03a0, 0x03a0, - 0x0339, 0x0339, 0x0393, 0x0393, 0x0358, 0x0358, 0x0385, 0x0385, - 0x0229, 0x0229, 0x0229, 0x0229, 0x0292, 0x0292, 0x0292, 0x0292, - 0x0376, 0x0376, 0x0309, 0x0309, 0x0219, 0x0219, 0x0219, 0x0219, - 0x0291, 0x0291, 0x0291, 0x0291, 0x0390, 0x0390, 0x0348, 0x0348, - 0x0384, 0x0384, 0x0375, 0x0375, 0x0338, 0x0338, 0x0383, 0x0383, - 0x0366, 0x0366, 0x0328, 0x0328, 0x0282, 0x0282, 0x0282, 0x0282, - 0x0347, 0x0347, 0x0374, 0x0374, 0x0218, 0x0218, 0x0218, 0x0218, - 0x0281, 0x0281, 0x0281, 0x0281, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0308, 0x0308, 0x0356, 0x0356, 0x0237, 0x0237, 0x0237, 0x0237, - 0x0273, 0x0273, 0x0273, 0x0273, 0x0365, 0x0365, 0x0346, 0x0346, - 0x0227, 0x0227, 0x0227, 0x0227, 0x0272, 0x0272, 0x0272, 0x0272, - 0x0364, 0x0364, 0x0355, 0x0355, 0x0207, 0x0207, 0x0207, 0x0207, - 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, - 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, - 0x0270, 0x0270, 0x0270, 0x0270, 0x0236, 0x0236, 0x0236, 0x0236, - 0x0263, 0x0263, 0x0263, 0x0263, 0x0245, 0x0245, 0x0245, 0x0245, - 0x0254, 0x0254, 0x0254, 0x0254, 0x0226, 0x0226, 0x0226, 0x0226, - 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, - 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, - 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, - 0x0206, 0x0206, 0x0206, 0x0206, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, - 0x0235, 0x0235, 0x0235, 0x0235, 0x0244, 0x0244, 0x0244, 0x0244, - 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, - 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, - 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, - 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, - 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, - 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, - 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, - 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, - 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, - 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, - 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, - 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, - 0x04ce, -448, 0x03de, 0x03de, 0x03e9, 0x03e9, 0x04ea, 0x04d9, - 0x02ee, 0x02ee, 0x02ee, 0x02ee, 0x03ed, 0x03ed, 0x03eb, 0x03eb, - 0x02be, 0x02be, 0x02be, 0x02be, 0x02cd, 0x02cd, 0x02cd, 0x02cd, - 0x03dc, 0x03dc, 0x03db, 0x03db, 0x02ae, 0x02ae, 0x02ae, 0x02ae, - 0x02cc, 0x02cc, 0x02cc, 0x02cc, 0x03ad, 0x03ad, 0x03da, 0x03da, - 0x037e, 0x037e, 0x03ac, 0x03ac, 0x02ca, 0x02ca, 0x02ca, 0x02ca, - 0x03c9, 0x03c9, 0x037d, 0x037d, 0x025e, 0x025e, 0x025e, 0x025e, - 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, - 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, - 0x02bc, 0x02bc, 0x02bc, 0x02bc, 0x02cb, 0x02cb, 0x02cb, 0x02cb, - 0x028e, 0x028e, 0x028e, 0x028e, 0x02e8, 0x02e8, 0x02e8, 0x02e8, - 0x029d, 0x029d, 0x029d, 0x029d, 0x02e7, 0x02e7, 0x02e7, 0x02e7, - 0x02bb, 0x02bb, 0x02bb, 0x02bb, 0x028d, 0x028d, 0x028d, 0x028d, - 0x02d8, 0x02d8, 0x02d8, 0x02d8, 0x026e, 0x026e, 0x026e, 0x026e, - 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, - 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, - 0x02ab, 0x02ab, 0x02ab, 0x02ab, 0x02ba, 0x02ba, 0x02ba, 0x02ba, - 0x02e5, 0x02e5, 0x02e5, 0x02e5, 0x02d7, 0x02d7, 0x02d7, 0x02d7, - 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, - 0x02e4, 0x02e4, 0x02e4, 0x02e4, 0x028c, 0x028c, 0x028c, 0x028c, - 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, - 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, - 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, - 0x02d6, 0x02d6, 0x02d6, 0x02d6, 0x029b, 0x029b, 0x029b, 0x029b, - 0x02b9, 0x02b9, 0x02b9, 0x02b9, 0x02aa, 0x02aa, 0x02aa, 0x02aa, - 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, - 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, - 0x02b8, 0x02b8, 0x02b8, 0x02b8, 0x02a9, 0x02a9, 0x02a9, 0x02a9, - 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, - 0x02b7, 0x02b7, 0x02b7, 0x02b7, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, - 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, - 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, - 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, - 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, - 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, - 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, - 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, - 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, - 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, - 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, - 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, - 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, - 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, - 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, - 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, - 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, - 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, - 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, - 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, - 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, - 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, - 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, - 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, - 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, - 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, - 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, - 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, + -16, -32, -48, -64, 0x0411, 0x0401, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + -64, -80, -96, 0x04ff, -112, -128, -144, 0x04f2, + -160, 0x041f, 0x04f1, -176, -192, -208, -224, -240, + -240, -256, -272, -288, -304, -320, -336, -352, + -368, -384, -400, -416, -432, -448, 0x0451, -464, + -464, -480, -496, 0x0414, 0x0441, -512, 0x0423, 0x0432, + 0x0313, 0x0313, 0x0331, 0x0331, 0x0403, 0x0430, 0x0322, 0x0322, + 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x03ef, 0x03ef, 0x03fe, 0x03fe, 0x03df, 0x03df, 0x03fd, 0x03fd, + 0x03cf, 0x03cf, 0x03fc, 0x03fc, 0x03bf, 0x03bf, 0x03fb, 0x03fb, + 0x02af, 0x02af, 0x02af, 0x02af, 0x03fa, 0x03fa, 0x039f, 0x039f, + 0x03f9, 0x03f9, 0x03f8, 0x03f8, 0x028f, 0x028f, 0x028f, 0x028f, + 0x027f, 0x027f, 0x027f, 0x027f, 0x02f7, 0x02f7, 0x02f7, 0x02f7, + 0x026f, 0x026f, 0x026f, 0x026f, 0x02f6, 0x02f6, 0x02f6, 0x02f6, + 0x025f, 0x025f, 0x025f, 0x025f, 0x02f5, 0x02f5, 0x02f5, 0x02f5, + 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, + 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, + 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, + 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, + 0x023f, 0x023f, 0x023f, 0x023f, -416, -432, -448, -464, + 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, + 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, + -448, -464, -480, -496, -512, -528, -544, -560, + -576, -592, -608, 0x04e3, -624, -640, -656, -672, + -672, -688, -704, 0x040d, -720, -736, -752, 0x043c, + -768, 0x041c, 0x04c0, -784, 0x03e2, 0x03e2, 0x042e, 0x041e, + 0x04d3, 0x042d, 0x04d2, 0x04d1, 0x043b, -784, 0x031d, 0x031d, + 0x04c4, 0x046b, 0x04c3, 0x04a7, 0x032c, 0x032c, 0x04c2, 0x04b5, + 0x04c1, 0x040c, 0x044b, 0x04b4, 0x046a, 0x04a6, 0x03b3, 0x03b3, + 0x045a, 0x04a5, 0x032b, 0x032b, 0x03b2, 0x03b2, 0x031b, 0x031b, + 0x03b1, 0x03b1, 0x040b, 0x04b0, 0x0469, 0x0496, 0x044a, 0x04a4, + 0x0478, 0x0487, 0x03a3, 0x03a3, 0x043a, 0x0459, 0x032a, 0x032a, + 0x0495, 0x0468, 0x03a1, 0x03a1, 0x0486, 0x0477, 0x0394, 0x0394, + 0x0449, 0x0457, 0x0367, 0x0367, 0x02a2, 0x02a2, 0x02a2, 0x02a2, + 0x021a, 0x021a, 0x021a, 0x021a, 0x030a, 0x030a, 0x03a0, 0x03a0, + 0x0339, 0x0339, 0x0393, 0x0393, 0x0358, 0x0358, 0x0385, 0x0385, + 0x0229, 0x0229, 0x0229, 0x0229, 0x0292, 0x0292, 0x0292, 0x0292, + 0x0376, 0x0376, 0x0309, 0x0309, 0x0219, 0x0219, 0x0219, 0x0219, + 0x0291, 0x0291, 0x0291, 0x0291, 0x0390, 0x0390, 0x0348, 0x0348, + 0x0384, 0x0384, 0x0375, 0x0375, 0x0338, 0x0338, 0x0383, 0x0383, + 0x0366, 0x0366, 0x0328, 0x0328, 0x0282, 0x0282, 0x0282, 0x0282, + 0x0347, 0x0347, 0x0374, 0x0374, 0x0218, 0x0218, 0x0218, 0x0218, + 0x0281, 0x0281, 0x0281, 0x0281, 0x0280, 0x0280, 0x0280, 0x0280, + 0x0308, 0x0308, 0x0356, 0x0356, 0x0237, 0x0237, 0x0237, 0x0237, + 0x0273, 0x0273, 0x0273, 0x0273, 0x0365, 0x0365, 0x0346, 0x0346, + 0x0227, 0x0227, 0x0227, 0x0227, 0x0272, 0x0272, 0x0272, 0x0272, + 0x0364, 0x0364, 0x0355, 0x0355, 0x0207, 0x0207, 0x0207, 0x0207, + 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, + 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0236, 0x0236, 0x0236, 0x0236, + 0x0263, 0x0263, 0x0263, 0x0263, 0x0245, 0x0245, 0x0245, 0x0245, + 0x0254, 0x0254, 0x0254, 0x0254, 0x0226, 0x0226, 0x0226, 0x0226, + 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, + 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, + 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, + 0x0206, 0x0206, 0x0206, 0x0206, 0x0260, 0x0260, 0x0260, 0x0260, + 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, + 0x0235, 0x0235, 0x0235, 0x0235, 0x0244, 0x0244, 0x0244, 0x0244, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, + 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, + 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, + 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, + 0x04ce, -448, 0x03de, 0x03de, 0x03e9, 0x03e9, 0x04ea, 0x04d9, + 0x02ee, 0x02ee, 0x02ee, 0x02ee, 0x03ed, 0x03ed, 0x03eb, 0x03eb, + 0x02be, 0x02be, 0x02be, 0x02be, 0x02cd, 0x02cd, 0x02cd, 0x02cd, + 0x03dc, 0x03dc, 0x03db, 0x03db, 0x02ae, 0x02ae, 0x02ae, 0x02ae, + 0x02cc, 0x02cc, 0x02cc, 0x02cc, 0x03ad, 0x03ad, 0x03da, 0x03da, + 0x037e, 0x037e, 0x03ac, 0x03ac, 0x02ca, 0x02ca, 0x02ca, 0x02ca, + 0x03c9, 0x03c9, 0x037d, 0x037d, 0x025e, 0x025e, 0x025e, 0x025e, + 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, + 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, + 0x02bc, 0x02bc, 0x02bc, 0x02bc, 0x02cb, 0x02cb, 0x02cb, 0x02cb, + 0x028e, 0x028e, 0x028e, 0x028e, 0x02e8, 0x02e8, 0x02e8, 0x02e8, + 0x029d, 0x029d, 0x029d, 0x029d, 0x02e7, 0x02e7, 0x02e7, 0x02e7, + 0x02bb, 0x02bb, 0x02bb, 0x02bb, 0x028d, 0x028d, 0x028d, 0x028d, + 0x02d8, 0x02d8, 0x02d8, 0x02d8, 0x026e, 0x026e, 0x026e, 0x026e, + 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, + 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, + 0x02ab, 0x02ab, 0x02ab, 0x02ab, 0x02ba, 0x02ba, 0x02ba, 0x02ba, + 0x02e5, 0x02e5, 0x02e5, 0x02e5, 0x02d7, 0x02d7, 0x02d7, 0x02d7, + 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, + 0x02e4, 0x02e4, 0x02e4, 0x02e4, 0x028c, 0x028c, 0x028c, 0x028c, + 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, + 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, + 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, + 0x02d6, 0x02d6, 0x02d6, 0x02d6, 0x029b, 0x029b, 0x029b, 0x029b, + 0x02b9, 0x02b9, 0x02b9, 0x02b9, 0x02aa, 0x02aa, 0x02aa, 0x02aa, + 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, + 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, + 0x02b8, 0x02b8, 0x02b8, 0x02b8, 0x02a9, 0x02a9, 0x02a9, 0x02a9, + 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, + 0x02b7, 0x02b7, 0x02b7, 0x02b7, 0x02d0, 0x02d0, 0x02d0, 0x02d0, + 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, + 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, + 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, + 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, + 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, + 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, + 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, + 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, + 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, + 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, + 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, + 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, + 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, + 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, + 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, + 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, + 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, + 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, + 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, + 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, + 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, + 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, + 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, + 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, + 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, + 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, + 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, + 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, }; static const short tab24_[] = { - -16, -32, -48, 0x04ff, -64, -80, -96, -112, - -128, -144, -160, -176, 0x0411, 0x0401, 0x0410, 0x0400, - 0x04ef, 0x04fe, 0x04df, 0x04fd, 0x04cf, 0x04fc, 0x04bf, 0x04fb, - 0x03fa, 0x03fa, 0x04af, 0x049f, 0x03f9, 0x03f9, 0x03f8, 0x03f8, - 0x048f, 0x047f, 0x03f7, 0x03f7, 0x036f, 0x036f, 0x03f6, 0x03f6, - 0x035f, 0x035f, 0x03f5, 0x03f5, 0x034f, 0x034f, 0x03f4, 0x03f4, - 0x033f, 0x033f, 0x03f3, 0x03f3, 0x032f, 0x032f, 0x03f2, 0x03f2, - 0x03f1, 0x03f1, 0x041f, 0x04f0, -144, -160, -176, -192, - -192, -208, -224, -240, -256, -272, -288, -304, - -320, -336, -352, -368, -384, -400, -416, -432, - -432, -448, -464, -480, -496, -512, -528, -544, - -560, -576, -592, -608, -624, -640, -656, -672, - -672, -688, -704, -720, -736, -752, -768, -784, - -800, -816, -832, -848, -864, 0x0473, -880, 0x0472, - 0x0446, 0x0464, 0x0455, 0x0471, 0x0436, 0x0463, 0x0445, 0x0454, - 0x0426, 0x0462, 0x0416, 0x0461, -880, 0x0435, 0x0453, 0x0444, - 0x0425, 0x0452, 0x0415, -880, 0x0351, 0x0351, 0x0434, 0x0443, - 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, 0x0314, 0x0314, - 0x0341, 0x0341, 0x0404, 0x0440, 0x0323, 0x0323, 0x0332, 0x0332, - 0x0213, 0x0213, 0x0213, 0x0213, 0x0231, 0x0231, 0x0231, 0x0231, - 0x0303, 0x0303, 0x0330, 0x0330, 0x0222, 0x0222, 0x0222, 0x0222, - 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, - 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, - 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, - 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, - 0x03ee, 0x03ee, 0x03de, 0x03de, 0x03ed, 0x03ed, 0x03ce, 0x03ce, - 0x03ec, 0x03ec, 0x03dd, 0x03dd, 0x03be, 0x03be, 0x03eb, 0x03eb, - 0x03cd, 0x03cd, 0x03dc, 0x03dc, 0x03ae, 0x03ae, 0x03ea, 0x03ea, - 0x03bd, 0x03bd, 0x03db, 0x03db, 0x03cc, 0x03cc, 0x039e, 0x039e, - 0x03e9, 0x03e9, 0x03ad, 0x03ad, 0x03da, 0x03da, 0x03bc, 0x03bc, - 0x03cb, 0x03cb, 0x038e, 0x038e, 0x03e8, 0x03e8, 0x039d, 0x039d, - 0x03d9, 0x03d9, 0x037e, 0x037e, 0x03e7, 0x03e7, 0x03ac, 0x03ac, - 0x03ca, 0x03ca, 0x03bb, 0x03bb, 0x038d, 0x038d, 0x03d8, 0x03d8, - 0x040e, 0x04e0, 0x030d, 0x030d, 0x02e6, 0x02e6, 0x02e6, 0x02e6, - 0x036e, 0x036e, 0x039c, 0x039c, 0x02c9, 0x02c9, 0x02c9, 0x02c9, - 0x025e, 0x025e, 0x025e, 0x025e, 0x02ba, 0x02ba, 0x02ba, 0x02ba, - 0x02e5, 0x02e5, 0x02e5, 0x02e5, 0x03ab, 0x03ab, 0x037d, 0x037d, - 0x02d7, 0x02d7, 0x02d7, 0x02d7, 0x02e4, 0x02e4, 0x02e4, 0x02e4, - 0x028c, 0x028c, 0x028c, 0x028c, 0x02c8, 0x02c8, 0x02c8, 0x02c8, - 0x034e, 0x034e, 0x032e, 0x032e, 0x023e, 0x023e, 0x023e, 0x023e, - 0x026d, 0x026d, 0x026d, 0x026d, 0x02d6, 0x02d6, 0x02d6, 0x02d6, - 0x02e3, 0x02e3, 0x02e3, 0x02e3, 0x029b, 0x029b, 0x029b, 0x029b, - 0x02b9, 0x02b9, 0x02b9, 0x02b9, 0x02aa, 0x02aa, 0x02aa, 0x02aa, - 0x02e2, 0x02e2, 0x02e2, 0x02e2, 0x021e, 0x021e, 0x021e, 0x021e, - 0x02e1, 0x02e1, 0x02e1, 0x02e1, 0x025d, 0x025d, 0x025d, 0x025d, - 0x02d5, 0x02d5, 0x02d5, 0x02d5, 0x027c, 0x027c, 0x027c, 0x027c, - 0x02c7, 0x02c7, 0x02c7, 0x02c7, 0x024d, 0x024d, 0x024d, 0x024d, - 0x028b, 0x028b, 0x028b, 0x028b, 0x02b8, 0x02b8, 0x02b8, 0x02b8, - 0x02d4, 0x02d4, 0x02d4, 0x02d4, 0x029a, 0x029a, 0x029a, 0x029a, - 0x02a9, 0x02a9, 0x02a9, 0x02a9, 0x026c, 0x026c, 0x026c, 0x026c, - 0x02c6, 0x02c6, 0x02c6, 0x02c6, 0x023d, 0x023d, 0x023d, 0x023d, - 0x02d3, 0x02d3, 0x02d3, 0x02d3, 0x022d, 0x022d, 0x022d, 0x022d, - 0x02d2, 0x02d2, 0x02d2, 0x02d2, 0x021d, 0x021d, 0x021d, 0x021d, - 0x027b, 0x027b, 0x027b, 0x027b, 0x02b7, 0x02b7, 0x02b7, 0x02b7, - 0x02d1, 0x02d1, 0x02d1, 0x02d1, 0x025c, 0x025c, 0x025c, 0x025c, - 0x02c5, 0x02c5, 0x02c5, 0x02c5, 0x028a, 0x028a, 0x028a, 0x028a, - 0x02a8, 0x02a8, 0x02a8, 0x02a8, 0x0299, 0x0299, 0x0299, 0x0299, - 0x024c, 0x024c, 0x024c, 0x024c, 0x02c4, 0x02c4, 0x02c4, 0x02c4, - 0x026b, 0x026b, 0x026b, 0x026b, 0x02b6, 0x02b6, 0x02b6, 0x02b6, - 0x03d0, 0x03d0, 0x030c, 0x030c, 0x023c, 0x023c, 0x023c, 0x023c, - 0x02c3, 0x02c3, 0x02c3, 0x02c3, 0x027a, 0x027a, 0x027a, 0x027a, - 0x02a7, 0x02a7, 0x02a7, 0x02a7, 0x022c, 0x022c, 0x022c, 0x022c, - 0x02c2, 0x02c2, 0x02c2, 0x02c2, 0x025b, 0x025b, 0x025b, 0x025b, - 0x02b5, 0x02b5, 0x02b5, 0x02b5, 0x021c, 0x021c, 0x021c, 0x021c, - 0x0289, 0x0289, 0x0289, 0x0289, 0x0298, 0x0298, 0x0298, 0x0298, - 0x02c1, 0x02c1, 0x02c1, 0x02c1, 0x024b, 0x024b, 0x024b, 0x024b, - 0x03c0, 0x03c0, 0x030b, 0x030b, 0x023b, 0x023b, 0x023b, 0x023b, - 0x03b0, 0x03b0, 0x030a, 0x030a, 0x021a, 0x021a, 0x021a, 0x021a, - 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, - 0x026a, 0x026a, 0x026a, 0x026a, 0x02a6, 0x02a6, 0x02a6, 0x02a6, - 0x0279, 0x0279, 0x0279, 0x0279, 0x0297, 0x0297, 0x0297, 0x0297, - 0x03a0, 0x03a0, 0x0309, 0x0309, 0x0290, 0x0290, 0x0290, 0x0290, - 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, - 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, - 0x022b, 0x022b, 0x022b, 0x022b, 0x025a, 0x025a, 0x025a, 0x025a, - 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, - 0x02a5, 0x02a5, 0x02a5, 0x02a5, 0x021b, 0x021b, 0x021b, 0x021b, - 0x02b1, 0x02b1, 0x02b1, 0x02b1, 0x0269, 0x0269, 0x0269, 0x0269, - 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, - 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, - 0x024a, 0x024a, 0x024a, 0x024a, 0x0278, 0x0278, 0x0278, 0x0278, - 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, - 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, - 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, - 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, - 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, - 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, - 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, - 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, - 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, - 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, - 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, - 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, - 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, - 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, - 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, - 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, - 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, - 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, - 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, - 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, - 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, - 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, - 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, - 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, - 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, - 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, - 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, - 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, - 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, - 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, - 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, - 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, - 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, - 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, - 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, - 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, - 0x0208, 0x0208, 0x0208, 0x0208, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, - 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, - 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, - 0x0207, 0x0207, 0x0207, 0x0207, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, - 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, - 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, - 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, - 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, - 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + -16, -32, -48, 0x04ff, -64, -80, -96, -112, + -128, -144, -160, -176, 0x0411, 0x0401, 0x0410, 0x0400, + 0x04ef, 0x04fe, 0x04df, 0x04fd, 0x04cf, 0x04fc, 0x04bf, 0x04fb, + 0x03fa, 0x03fa, 0x04af, 0x049f, 0x03f9, 0x03f9, 0x03f8, 0x03f8, + 0x048f, 0x047f, 0x03f7, 0x03f7, 0x036f, 0x036f, 0x03f6, 0x03f6, + 0x035f, 0x035f, 0x03f5, 0x03f5, 0x034f, 0x034f, 0x03f4, 0x03f4, + 0x033f, 0x033f, 0x03f3, 0x03f3, 0x032f, 0x032f, 0x03f2, 0x03f2, + 0x03f1, 0x03f1, 0x041f, 0x04f0, -144, -160, -176, -192, + -192, -208, -224, -240, -256, -272, -288, -304, + -320, -336, -352, -368, -384, -400, -416, -432, + -432, -448, -464, -480, -496, -512, -528, -544, + -560, -576, -592, -608, -624, -640, -656, -672, + -672, -688, -704, -720, -736, -752, -768, -784, + -800, -816, -832, -848, -864, 0x0473, -880, 0x0472, + 0x0446, 0x0464, 0x0455, 0x0471, 0x0436, 0x0463, 0x0445, 0x0454, + 0x0426, 0x0462, 0x0416, 0x0461, -880, 0x0435, 0x0453, 0x0444, + 0x0425, 0x0452, 0x0415, -880, 0x0351, 0x0351, 0x0434, 0x0443, + 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, 0x0314, 0x0314, + 0x0341, 0x0341, 0x0404, 0x0440, 0x0323, 0x0323, 0x0332, 0x0332, + 0x0213, 0x0213, 0x0213, 0x0213, 0x0231, 0x0231, 0x0231, 0x0231, + 0x0303, 0x0303, 0x0330, 0x0330, 0x0222, 0x0222, 0x0222, 0x0222, + 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, + 0x03ee, 0x03ee, 0x03de, 0x03de, 0x03ed, 0x03ed, 0x03ce, 0x03ce, + 0x03ec, 0x03ec, 0x03dd, 0x03dd, 0x03be, 0x03be, 0x03eb, 0x03eb, + 0x03cd, 0x03cd, 0x03dc, 0x03dc, 0x03ae, 0x03ae, 0x03ea, 0x03ea, + 0x03bd, 0x03bd, 0x03db, 0x03db, 0x03cc, 0x03cc, 0x039e, 0x039e, + 0x03e9, 0x03e9, 0x03ad, 0x03ad, 0x03da, 0x03da, 0x03bc, 0x03bc, + 0x03cb, 0x03cb, 0x038e, 0x038e, 0x03e8, 0x03e8, 0x039d, 0x039d, + 0x03d9, 0x03d9, 0x037e, 0x037e, 0x03e7, 0x03e7, 0x03ac, 0x03ac, + 0x03ca, 0x03ca, 0x03bb, 0x03bb, 0x038d, 0x038d, 0x03d8, 0x03d8, + 0x040e, 0x04e0, 0x030d, 0x030d, 0x02e6, 0x02e6, 0x02e6, 0x02e6, + 0x036e, 0x036e, 0x039c, 0x039c, 0x02c9, 0x02c9, 0x02c9, 0x02c9, + 0x025e, 0x025e, 0x025e, 0x025e, 0x02ba, 0x02ba, 0x02ba, 0x02ba, + 0x02e5, 0x02e5, 0x02e5, 0x02e5, 0x03ab, 0x03ab, 0x037d, 0x037d, + 0x02d7, 0x02d7, 0x02d7, 0x02d7, 0x02e4, 0x02e4, 0x02e4, 0x02e4, + 0x028c, 0x028c, 0x028c, 0x028c, 0x02c8, 0x02c8, 0x02c8, 0x02c8, + 0x034e, 0x034e, 0x032e, 0x032e, 0x023e, 0x023e, 0x023e, 0x023e, + 0x026d, 0x026d, 0x026d, 0x026d, 0x02d6, 0x02d6, 0x02d6, 0x02d6, + 0x02e3, 0x02e3, 0x02e3, 0x02e3, 0x029b, 0x029b, 0x029b, 0x029b, + 0x02b9, 0x02b9, 0x02b9, 0x02b9, 0x02aa, 0x02aa, 0x02aa, 0x02aa, + 0x02e2, 0x02e2, 0x02e2, 0x02e2, 0x021e, 0x021e, 0x021e, 0x021e, + 0x02e1, 0x02e1, 0x02e1, 0x02e1, 0x025d, 0x025d, 0x025d, 0x025d, + 0x02d5, 0x02d5, 0x02d5, 0x02d5, 0x027c, 0x027c, 0x027c, 0x027c, + 0x02c7, 0x02c7, 0x02c7, 0x02c7, 0x024d, 0x024d, 0x024d, 0x024d, + 0x028b, 0x028b, 0x028b, 0x028b, 0x02b8, 0x02b8, 0x02b8, 0x02b8, + 0x02d4, 0x02d4, 0x02d4, 0x02d4, 0x029a, 0x029a, 0x029a, 0x029a, + 0x02a9, 0x02a9, 0x02a9, 0x02a9, 0x026c, 0x026c, 0x026c, 0x026c, + 0x02c6, 0x02c6, 0x02c6, 0x02c6, 0x023d, 0x023d, 0x023d, 0x023d, + 0x02d3, 0x02d3, 0x02d3, 0x02d3, 0x022d, 0x022d, 0x022d, 0x022d, + 0x02d2, 0x02d2, 0x02d2, 0x02d2, 0x021d, 0x021d, 0x021d, 0x021d, + 0x027b, 0x027b, 0x027b, 0x027b, 0x02b7, 0x02b7, 0x02b7, 0x02b7, + 0x02d1, 0x02d1, 0x02d1, 0x02d1, 0x025c, 0x025c, 0x025c, 0x025c, + 0x02c5, 0x02c5, 0x02c5, 0x02c5, 0x028a, 0x028a, 0x028a, 0x028a, + 0x02a8, 0x02a8, 0x02a8, 0x02a8, 0x0299, 0x0299, 0x0299, 0x0299, + 0x024c, 0x024c, 0x024c, 0x024c, 0x02c4, 0x02c4, 0x02c4, 0x02c4, + 0x026b, 0x026b, 0x026b, 0x026b, 0x02b6, 0x02b6, 0x02b6, 0x02b6, + 0x03d0, 0x03d0, 0x030c, 0x030c, 0x023c, 0x023c, 0x023c, 0x023c, + 0x02c3, 0x02c3, 0x02c3, 0x02c3, 0x027a, 0x027a, 0x027a, 0x027a, + 0x02a7, 0x02a7, 0x02a7, 0x02a7, 0x022c, 0x022c, 0x022c, 0x022c, + 0x02c2, 0x02c2, 0x02c2, 0x02c2, 0x025b, 0x025b, 0x025b, 0x025b, + 0x02b5, 0x02b5, 0x02b5, 0x02b5, 0x021c, 0x021c, 0x021c, 0x021c, + 0x0289, 0x0289, 0x0289, 0x0289, 0x0298, 0x0298, 0x0298, 0x0298, + 0x02c1, 0x02c1, 0x02c1, 0x02c1, 0x024b, 0x024b, 0x024b, 0x024b, + 0x03c0, 0x03c0, 0x030b, 0x030b, 0x023b, 0x023b, 0x023b, 0x023b, + 0x03b0, 0x03b0, 0x030a, 0x030a, 0x021a, 0x021a, 0x021a, 0x021a, + 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, + 0x026a, 0x026a, 0x026a, 0x026a, 0x02a6, 0x02a6, 0x02a6, 0x02a6, + 0x0279, 0x0279, 0x0279, 0x0279, 0x0297, 0x0297, 0x0297, 0x0297, + 0x03a0, 0x03a0, 0x0309, 0x0309, 0x0290, 0x0290, 0x0290, 0x0290, + 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, + 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, + 0x022b, 0x022b, 0x022b, 0x022b, 0x025a, 0x025a, 0x025a, 0x025a, + 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, + 0x02a5, 0x02a5, 0x02a5, 0x02a5, 0x021b, 0x021b, 0x021b, 0x021b, + 0x02b1, 0x02b1, 0x02b1, 0x02b1, 0x0269, 0x0269, 0x0269, 0x0269, + 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, + 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, + 0x024a, 0x024a, 0x024a, 0x024a, 0x0278, 0x0278, 0x0278, 0x0278, + 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, + 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, + 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, + 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, + 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, + 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, + 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, + 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, + 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, + 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, + 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, + 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, + 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, + 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, + 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, + 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, + 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, + 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, + 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, + 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, + 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, + 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, + 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, + 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, + 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, + 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, + 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, + 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, + 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, + 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, + 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, + 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, + 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, + 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, + 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, + 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, + 0x0208, 0x0208, 0x0208, 0x0208, 0x0280, 0x0280, 0x0280, 0x0280, + 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, + 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, + 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, + 0x0207, 0x0207, 0x0207, 0x0207, 0x0270, 0x0270, 0x0270, 0x0270, + 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, + 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, }; static const short tab_c0[] = @@ -778,7 +778,7 @@ static const short tab_c1[] = 0 }; -static const struct newhuff ht[] = +static const struct newhuff ht[] = { { /* 0 */ 0 , tab0_ } , { /* 2 */ 0 , tab1_ } , @@ -815,7 +815,7 @@ static const struct newhuff ht[] = { /* 16 */ 13, tab24_ } }; -static const struct newhuff htc[] = +static const struct newhuff htc[] = { { /* 1 , 1 , */ 0 , tab_c0 } , { /* 1 , 1 , */ 0 , tab_c1 } diff --git a/sdk/include/reactos/libs/libmpg123/sample.h b/sdk/include/reactos/libs/libmpg123/sample.h index 4d244fed7dd..358b13c2036 100644 --- a/sdk/include/reactos/libs/libmpg123/sample.h +++ b/sdk/include/reactos/libs/libmpg123/sample.h @@ -94,7 +94,7 @@ static inline int16_t ftoi16(float x) /* This is the old new mpg123 WRITE_SAMPLE, fixed for newer GCC by MPlayer folks. Makes a huge difference on old machines. */ -#if WORDS_BIGENDIAN +#if WORDS_BIGENDIAN #define MANTISSA_OFFSET 1 #else #define MANTISSA_OFFSET 0 @@ -124,10 +124,10 @@ static inline int16_t ftoi16(float x) else { *(samples) = REAL_TO_SHORT_ACCURATE(sum); } /* - 32bit signed + 32bit signed We do clipping with the same old borders... but different conversion. We see here that we need extra work for non-16bit output... we optimized for 16bit. - -0x7fffffff-1 is the minimum 32 bit signed integer value expressed so that MSVC + -0x7fffffff-1 is the minimum 32 bit signed integer value expressed so that MSVC does not give a compile time warning. */ #define WRITE_S32_SAMPLE(samples,sum,clip) \ diff --git a/sdk/include/reactos/libs/libmpg123/synth.h b/sdk/include/reactos/libs/libmpg123/synth.h index 87dd007595b..6e8a778187c 100644 --- a/sdk/include/reactos/libs/libmpg123/synth.h +++ b/sdk/include/reactos/libs/libmpg123/synth.h @@ -1,5 +1,5 @@ /* - synth.h: generic synth functions + synth.h: generic synth functions copyright 1995-2008 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org @@ -34,7 +34,7 @@ int SYNTH_NAME(real *bandPtr, int channel, mpg123_handle *fr, int final) SAMPLE_T *samples = (SAMPLE_T *) (fr->buffer.data + fr->buffer.fill); real *b0, **buf; /* (*buf)[0x110]; */ - int clip = 0; + int clip = 0; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); diff --git a/sdk/include/reactos/libs/libmpg123/synth_8bit.h b/sdk/include/reactos/libs/libmpg123/synth_8bit.h index e518d4f1d71..ffdcf49af48 100644 --- a/sdk/include/reactos/libs/libmpg123/synth_8bit.h +++ b/sdk/include/reactos/libs/libmpg123/synth_8bit.h @@ -40,7 +40,7 @@ int MONO_NAME(real *bandPtr, mpg123_handle *fr) short samples_tmp[BLOCK]; short *tmp1 = samples_tmp; int i,ret; - + unsigned char *samples = fr->buffer.data; int pnt = fr->buffer.fill; fr->buffer.data = (unsigned char*) samples_tmp; diff --git a/sdk/include/reactos/libs/libmpg123/synth_mono.h b/sdk/include/reactos/libs/libmpg123/synth_mono.h index 907aa254c92..d89f1be22a8 100644 --- a/sdk/include/reactos/libs/libmpg123/synth_mono.h +++ b/sdk/include/reactos/libs/libmpg123/synth_mono.h @@ -1,5 +1,5 @@ /* - monosynth.h: generic mono related synth functions + monosynth.h: generic mono related synth functions copyright 1995-2008 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org diff --git a/sdk/include/reactos/libs/libmpg123/synth_ntom.h b/sdk/include/reactos/libs/libmpg123/synth_ntom.h index 4554d218321..cfe7e27c5e1 100644 --- a/sdk/include/reactos/libs/libmpg123/synth_ntom.h +++ b/sdk/include/reactos/libs/libmpg123/synth_ntom.h @@ -69,7 +69,7 @@ int SYNTH_NAME(real *bandPtr,int channel, mpg123_handle *fr, int final) SAMPLE_T *samples = (SAMPLE_T *) (fr->buffer.data + fr->buffer.fill); real *b0, **buf; /* (*buf)[0x110]; */ - int clip = 0; + int clip = 0; int bo1; int ntom; #ifndef NO_EQUALIZER diff --git a/sdk/include/reactos/libs/libtiff/tif_dir.h b/sdk/include/reactos/libs/libtiff/tif_dir.h index e7f06673c2c..ab962298f0f 100644 --- a/sdk/include/reactos/libs/libtiff/tif_dir.h +++ b/sdk/include/reactos/libs/libtiff/tif_dir.h @@ -2,23 +2,23 @@ * Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. * - * Permission to use, copy, modify, distribute, and sell this software and + * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided * that (i) the above copyright notices and this permission notice appear in * all copies of the software and related documentation, and (ii) the names of * Sam Leffler and Silicon Graphics may not be used in any advertising or * publicity relating to the software without the specific, prior written * permission of Sam Leffler and Silicon Graphics. - * - * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ @@ -96,7 +96,7 @@ typedef struct { /* even though the name is misleading, td_stripsperimage is the number * of striles (=strips or tiles) per plane, and td_nstrips the total * number of striles */ - uint32 td_stripsperimage; + uint32 td_stripsperimage; uint32 td_nstrips; /* size of offset & bytecount arrays */ uint64* td_stripoffset_p; /* should be accessed with TIFFGetStrileOffset */ uint64* td_stripbytecount_p; /* should be accessed with TIFFGetStrileByteCount */ @@ -264,7 +264,7 @@ extern const TIFFFieldArray* _TIFFGetExifFields(void); extern void _TIFFSetupFields(TIFF* tif, const TIFFFieldArray* infoarray); extern void _TIFFPrintFieldInfo(TIFF*, FILE*); -extern int _TIFFFillStriles(TIFF*); +extern int _TIFFFillStriles(TIFF*); typedef enum { tfiatImage, diff --git a/sdk/include/reactos/libs/libtiff/tif_fax3.h b/sdk/include/reactos/libs/libtiff/tif_fax3.h index abadcd97a20..feec2a3b7e4 100644 --- a/sdk/include/reactos/libs/libtiff/tif_fax3.h +++ b/sdk/include/reactos/libs/libtiff/tif_fax3.h @@ -2,23 +2,23 @@ * Copyright (c) 1990-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. * - * Permission to use, copy, modify, distribute, and sell this software and + * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided * that (i) the above copyright notices and this permission notice appear in * all copies of the software and related documentation, and (ii) the names of * Sam Leffler and Silicon Graphics may not be used in any advertising or * publicity relating to the software without the specific, prior written * permission of Sam Leffler and Silicon Graphics. - * - * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ diff --git a/sdk/include/reactos/libs/libtiff/tif_predict.h b/sdk/include/reactos/libs/libtiff/tif_predict.h index a326b9b8f86..fafcd412d1b 100644 --- a/sdk/include/reactos/libs/libtiff/tif_predict.h +++ b/sdk/include/reactos/libs/libtiff/tif_predict.h @@ -46,12 +46,12 @@ typedef struct { TIFFCodeMethod encoderow; /* parent codec encode/decode row */ TIFFCodeMethod encodestrip; /* parent codec encode/decode strip */ - TIFFCodeMethod encodetile; /* parent codec encode/decode tile */ + TIFFCodeMethod encodetile; /* parent codec encode/decode tile */ TIFFEncodeDecodeMethod encodepfunc; /* horizontal differencer */ TIFFCodeMethod decoderow; /* parent codec encode/decode row */ TIFFCodeMethod decodestrip; /* parent codec encode/decode strip */ - TIFFCodeMethod decodetile; /* parent codec encode/decode tile */ + TIFFCodeMethod decodetile; /* parent codec encode/decode tile */ TIFFEncodeDecodeMethod decodepfunc; /* horizontal accumulator */ TIFFVGetMethod vgetparent; /* super-class method */ diff --git a/sdk/include/reactos/libs/libtiff/tiff.h b/sdk/include/reactos/libs/libtiff/tiff.h index 5b0a0c90f67..a8ff332ea70 100644 --- a/sdk/include/reactos/libs/libtiff/tiff.h +++ b/sdk/include/reactos/libs/libtiff/tiff.h @@ -2,23 +2,23 @@ * Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. * - * Permission to use, copy, modify, distribute, and sell this software and + * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided * that (i) the above copyright notices and this permission notice appear in * all copies of the software and related documentation, and (ii) the names of * Sam Leffler and Silicon Graphics may not be used in any advertising or * publicity relating to the software without the specific, prior written * permission of Sam Leffler and Silicon Graphics. - * - * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ @@ -388,7 +388,7 @@ typedef enum { /* tags 33300-33309 are private tags registered to Pixar */ /* * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH - * are set when an image has been cropped out of a larger image. + * are set when an image has been cropped out of a larger image. * They reflect the size of the original uncropped image. * The TIFFTAG_XPOSITION and TIFFTAG_YPOSITION can be used * to determine the position of the smaller image in the larger one. @@ -433,7 +433,7 @@ typedef enum { /* tags 34232-34236 are private tags registered to Texas Instruments */ #define TIFFTAG_FRAMECOUNT 34232 /* Sequence Frame Count */ /* tag 34377 is private tag registered to Adobe for PhotoShop */ -#define TIFFTAG_PHOTOSHOP 34377 +#define TIFFTAG_PHOTOSHOP 34377 /* tags 34665, 34853 and 40965 are documented in EXIF specification */ #define TIFFTAG_EXIFIFD 34665 /* Pointer to EXIF private directory */ /* tag 34750 is a private tag registered to Adobe? */ @@ -476,7 +476,7 @@ typedef enum { #define TIFFTAG_DEFAULTSCALE 50718 /* &default scale factors */ #define TIFFTAG_DEFAULTCROPORIGIN 50719 /* &origin of the final image area */ -#define TIFFTAG_DEFAULTCROPSIZE 50720 /* &size of the final image +#define TIFFTAG_DEFAULTCROPSIZE 50720 /* &size of the final image area */ #define TIFFTAG_COLORMATRIX1 50721 /* &XYZ->reference color space transformation matrix 1 */ diff --git a/sdk/include/reactos/libs/libtiff/tiffconf.wince.h b/sdk/include/reactos/libs/libtiff/tiffconf.wince.h index 013b0960dc0..32e090036cd 100644 --- a/sdk/include/reactos/libs/libtiff/tiffconf.wince.h +++ b/sdk/include/reactos/libs/libtiff/tiffconf.wince.h @@ -6,7 +6,7 @@ * It's an extension to C library on Windows CE platform. * For example, HAVE_STDIO_H definition indicates there are * following files available: - * stdio.h - from Windows CE / Windows Mobile SDK + * stdio.h - from Windows CE / Windows Mobile SDK * wce_stdio.h - from WCELIBCEX library */ diff --git a/sdk/include/reactos/libs/libtiff/tiffio.h b/sdk/include/reactos/libs/libtiff/tiffio.h index 198481d53f8..90a21ce61a9 100644 --- a/sdk/include/reactos/libs/libtiff/tiffio.h +++ b/sdk/include/reactos/libs/libtiff/tiffio.h @@ -118,7 +118,7 @@ typedef void* thandle_t; /* client data handle */ #define TIFFPRINT_JPEGACTABLES 0x200 /* JPEG AC tables */ #define TIFFPRINT_JPEGDCTABLES 0x200 /* JPEG DC tables */ -/* +/* * Colour conversion stuff */ @@ -178,7 +178,7 @@ typedef struct _TIFFRGBAImage TIFFRGBAImage; /* * The image reading and conversion routines invoke * ``put routines'' to copy/image/whatever tiles of - * raw image data. A default set of routines are + * raw image data. A default set of routines are * provided to convert/copy raw image data to 8-bit * packed ABGR format rasters. Applications can supply * alternate routines that unpack the data into a @@ -303,7 +303,7 @@ extern void _TIFFfree(void* p); */ extern int TIFFGetTagListCount( TIFF * ); extern uint32 TIFFGetTagListEntry( TIFF *, int tag_index ); - + #define TIFF_ANY TIFF_NOTYPE /* for field descriptor searching */ #define TIFF_VARIABLE -1 /* marker for variable length tags */ #define TIFF_SPP -2 /* marker for SamplesPerPixel tags */ @@ -381,7 +381,7 @@ extern int TIFFIsMSB2LSB(TIFF*); extern int TIFFIsBigEndian(TIFF*); extern TIFFReadWriteProc TIFFGetReadProc(TIFF*); extern TIFFReadWriteProc TIFFGetWriteProc(TIFF*); -extern TIFFSeekProc TIFFGetSeekProc(TIFF*); +extern TIFFSeekProc TIFFGetSeekProc(TIFF*); extern TIFFCloseProc TIFFGetCloseProc(TIFF*); extern TIFFSizeProc TIFFGetSizeProc(TIFF*); extern TIFFMapFileProc TIFFGetMapFileProc(TIFF*); @@ -393,7 +393,7 @@ extern uint64 TIFFCurrentDirOffset(TIFF*); extern uint32 TIFFCurrentStrip(TIFF*); extern uint32 TIFFCurrentTile(TIFF* tif); extern int TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size); -extern int TIFFWriteBufferSetup(TIFF* tif, void* bp, tmsize_t size); +extern int TIFFWriteBufferSetup(TIFF* tif, void* bp, tmsize_t size); extern int TIFFSetupStrips(TIFF *); extern int TIFFWriteCheck(TIFF*, int, const char *); extern void TIFFFreeDirectory(TIFF*); @@ -462,21 +462,21 @@ extern TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); extern uint32 TIFFComputeTile(TIFF* tif, uint32 x, uint32 y, uint32 z, uint16 s); extern int TIFFCheckTile(TIFF* tif, uint32 x, uint32 y, uint32 z, uint16 s); extern uint32 TIFFNumberOfTiles(TIFF*); -extern tmsize_t TIFFReadTile(TIFF* tif, void* buf, uint32 x, uint32 y, uint32 z, uint16 s); +extern tmsize_t TIFFReadTile(TIFF* tif, void* buf, uint32 x, uint32 y, uint32 z, uint16 s); extern tmsize_t TIFFWriteTile(TIFF* tif, void* buf, uint32 x, uint32 y, uint32 z, uint16 s); extern uint32 TIFFComputeStrip(TIFF*, uint32, uint16); extern uint32 TIFFNumberOfStrips(TIFF*); extern tmsize_t TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size); -extern tmsize_t TIFFReadRawStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size); -extern tmsize_t TIFFReadEncodedTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size); -extern tmsize_t TIFFReadRawTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size); +extern tmsize_t TIFFReadRawStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size); +extern tmsize_t TIFFReadEncodedTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size); +extern tmsize_t TIFFReadRawTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size); extern int TIFFReadFromUserBuffer(TIFF* tif, uint32 strile, void* inbuf, tmsize_t insize, void* outbuf, tmsize_t outsize); extern tmsize_t TIFFWriteEncodedStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc); -extern tmsize_t TIFFWriteRawStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc); -extern tmsize_t TIFFWriteEncodedTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc); -extern tmsize_t TIFFWriteRawTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc); +extern tmsize_t TIFFWriteRawStrip(TIFF* tif, uint32 strip, void* data, tmsize_t cc); +extern tmsize_t TIFFWriteEncodedTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc); +extern tmsize_t TIFFWriteRawTile(TIFF* tif, uint32 tile, void* data, tmsize_t cc); extern int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ extern void TIFFSetWriteOffset(TIFF* tif, toff_t off); extern void TIFFSwabShort(uint16*); @@ -551,7 +551,7 @@ typedef struct { } TIFFFieldInfo; extern int TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], uint32); - + #if defined(c_plusplus) || defined(__cplusplus) } #endif diff --git a/sdk/include/reactos/libs/libtiff/tiffiop.h b/sdk/include/reactos/libs/libtiff/tiffiop.h index 45a79323bfb..c2d7bf792fd 100644 --- a/sdk/include/reactos/libs/libtiff/tiffiop.h +++ b/sdk/include/reactos/libs/libtiff/tiffiop.h @@ -2,23 +2,23 @@ * Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. * - * Permission to use, copy, modify, distribute, and sell this software and + * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided * that (i) the above copyright notices and this permission notice appear in * all copies of the software and related documentation, and (ii) the names of * Sam Leffler and Silicon Graphics may not be used in any advertising or * publicity relating to the software without the specific, prior written * permission of Sam Leffler and Silicon Graphics. - * - * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ @@ -45,7 +45,7 @@ #ifdef HAVE_ASSERT_H # include #else -# define assert(x) +# define assert(x) #endif #ifdef HAVE_SEARCH_H diff --git a/sdk/include/reactos/libs/libxml/xmlversion.h b/sdk/include/reactos/libs/libxml/xmlversion.h index e235a5e584e..2ac15f54044 100644 --- a/sdk/include/reactos/libs/libxml/xmlversion.h +++ b/sdk/include/reactos/libs/libxml/xmlversion.h @@ -387,7 +387,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * the string suffix used by dynamic modules (usually shared libraries) */ -#define LIBXML_MODULE_EXTENSION ".dll" +#define LIBXML_MODULE_EXTENSION ".dll" #endif /** diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/rosctrls.h index 0f1d7f73e61..095e6efeee8 100644 --- a/sdk/include/reactos/rosctrls.h +++ b/sdk/include/reactos/rosctrls.h @@ -8,17 +8,17 @@ public: HWND Create(HWND hWndParent, _U_RECT rect, LPCTSTR szWindowName = NULL, DWORD dwStyle = 0, DWORD dwExStyle = 0, _U_MENUorID MenuOrID = 0U, LPVOID lpCreateParam = NULL) { - m_hWnd = ::CreateWindowEx(dwExStyle, - WC_LISTVIEW, - szWindowName, + m_hWnd = ::CreateWindowEx(dwExStyle, + WC_LISTVIEW, + szWindowName, dwStyle, - rect.m_lpRect->left, - rect.m_lpRect->top, - rect.m_lpRect->right - rect.m_lpRect->left, + rect.m_lpRect->left, + rect.m_lpRect->top, + rect.m_lpRect->right - rect.m_lpRect->left, rect.m_lpRect->bottom - rect.m_lpRect->top, - hWndParent, - MenuOrID.m_hMenu, - _AtlBaseModule.GetModuleInstance(), + hWndParent, + MenuOrID.m_hMenu, + _AtlBaseModule.GetModuleInstance(), lpCreateParam); return m_hWnd; @@ -82,7 +82,7 @@ public: } return InsertColumn(iCol, &column); } - + int GetColumnWidth(int iCol) { return (int)SendMessage(LVM_GETCOLUMNWIDTH, iCol); @@ -102,7 +102,7 @@ public: { return (BOOL)SendMessage(LVM_DELETEITEM, i, 0); } - + BOOL GetItem(LV_ITEM* pitem) { return (BOOL)SendMessage(LVM_GETITEM, 0, reinterpret_cast(pitem)); @@ -122,7 +122,7 @@ public: { return SendMessage(LVM_GETITEMCOUNT); } - + BOOL DeleteAllItems() { return (BOOL)SendMessage(LVM_DELETEALLITEMS); @@ -178,7 +178,7 @@ public: void SetItemState(int i, UINT state, UINT mask) { LV_ITEM item; - item.stateMask = mask; + item.stateMask = mask; item.state = state; SendMessage(LVM_SETITEMSTATE, i, reinterpret_cast(&item)); } diff --git a/sdk/include/reactos/rosdlgs.h b/sdk/include/reactos/rosdlgs.h index 900beeb6103..2faa52a11bb 100644 --- a/sdk/include/reactos/rosdlgs.h +++ b/sdk/include/reactos/rosdlgs.h @@ -14,7 +14,7 @@ namespace ATL { return &m_psp; } - + CPropertyPageImpl(LPCTSTR lpszTitle = NULL) { T* pT = static_cast(this); @@ -32,7 +32,7 @@ namespace ATL if (lpszTitle) m_psp.dwFlags |= PSP_USETITLE; } - + static UINT CALLBACK PropPageCallback(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp) { T* pT = reinterpret_cast(ppsp->lParam); @@ -53,7 +53,7 @@ namespace ATL return 0; } - + HPROPSHEETPAGE Create() { return ::CreatePropertySheetPage(&m_psp); @@ -107,14 +107,14 @@ namespace ATL } void OnHelp() - { + { } int OnWizardBack() { return 0; } - + int OnWizardNext() { return 0; @@ -134,12 +134,12 @@ namespace ATL { return FALSE; } - + int OnTranslateAccelerator(LPMSG lpMsg) { return 0; } - + HWND OnQueryInitialFocus(HWND hwnd) { return NULL; diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index 5e2074a2171..5d02b3a213b 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -199,7 +199,7 @@ BOOL WINAPI SetShellWindowEx(HWND, HWND); BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT); BOOL WINAPI DrawCaptionTempW(HWND,HDC,const RECT*,HFONT,HICON,LPCWSTR,UINT); -BOOL WINAPI PaintMenuBar(HWND hWnd, HDC hDC, ULONG left, ULONG right, ULONG top, BOOL bActive); +BOOL WINAPI PaintMenuBar(HWND hWnd, HDC hDC, ULONG left, ULONG right, ULONG top, BOOL bActive); #ifdef UNICODE #define DrawCaptionTemp DrawCaptionTempW diff --git a/sdk/include/reactos/uxundoc.h b/sdk/include/reactos/uxundoc.h index 75ed8ec408e..ed3ed4368ff 100644 --- a/sdk/include/reactos/uxundoc.h +++ b/sdk/include/reactos/uxundoc.h @@ -57,46 +57,46 @@ typedef struct tagTHEMENAMES /* Declarations for undocumented functions for use internally */ DWORD WINAPI QueryThemeServices(void); -HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, +HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, - LPCWSTR pszSizeName, + LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, DWORD unknown); HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile); -HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, - char *unknown, +HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, + char *unknown, HWND hWnd); -HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, +HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, - DWORD dwColorNameLen, + DWORD dwColorNameLen, LPWSTR pszSizeName, DWORD dwSizeNameLen); -HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, +HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, ENUMTHEMEPROC callback, LPVOID lpData); -HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, +HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName, - DWORD dwColorNum, + DWORD dwColorNum, PTHEMENAMES pszColorNames); -HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, +HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, - DWORD dwSizeNum, + DWORD dwSizeNum, PTHEMENAMES pszColorNames); -HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, +HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, - PARSETHEMEINIFILEPROC callback, + PARSETHEMEINIFILEPROC callback, LPVOID lpData); -HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, - HWND hwnd, - LPCWSTR pszClassList, +HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, + HWND hwnd, + LPCWSTR pszClassList, DWORD flags); /* The DNCP_* flags let the caller decide what should be painted */ @@ -105,10 +105,10 @@ HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, #define DNCP_DIALOGWINDOW 0x4 #define DNCP_DRAW_ALL DNCP_ACTIVEWINDOW | DNCP_INACTIVEWINDOW | DNCP_DIALOGWINDOW -HRESULT WINAPI DrawNCPreview(HDC hDC, +HRESULT WINAPI DrawNCPreview(HDC hDC, DWORD DNCP_Flag, - LPRECT prcPreview, - LPCWSTR pszThemeFileName, + LPRECT prcPreview, + LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, PNONCLIENTMETRICSW pncMetrics, diff --git a/sdk/include/reactos/windbgkd.h b/sdk/include/reactos/windbgkd.h index 1b6e59427ac..1f928b041a0 100644 --- a/sdk/include/reactos/windbgkd.h +++ b/sdk/include/reactos/windbgkd.h @@ -173,7 +173,7 @@ // Internal Breakpoint Flags // #define DBGKD_INTERNAL_BP_FLAG_COUNTONLY 0x01 -#define DBGKD_INTERNAL_BP_FLAG_INVALID 0x02 +#define DBGKD_INTERNAL_BP_FLAG_INVALID 0x02 #define DBGKD_INTERNAL_BP_FLAG_SUSPENDED 0x04 #define DBGKD_INTERNAL_BP_FLAG_DYING 0x08 diff --git a/sdk/include/reactos/wine/regex.h b/sdk/include/reactos/wine/regex.h index 52f8ec20518..38fc33ca1ee 100644 --- a/sdk/include/reactos/wine/regex.h +++ b/sdk/include/reactos/wine/regex.h @@ -166,7 +166,7 @@ typedef unsigned long int reg_syntax_t; stored in the pattern buffer, so changing this does not affect already-compiled regexps. */ extern reg_syntax_t re_syntax_options; - + /* Define combinations of the above bits for the standard possibilities. (The [[[ comments delimit what gets put into the Texinfo file, so don't delete them!) */ @@ -235,7 +235,7 @@ extern reg_syntax_t re_syntax_options; | RE_NO_BK_PARENS | RE_NO_BK_REFS \ | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) /* [[[end syntaxes]]] */ - + /* Maximum number of duplicates an interval can allow. Some systems (erroneously) define this in other header files, but we want our value, so remove any previous define. */ @@ -310,7 +310,7 @@ typedef enum REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ } reg_errcode_t; - + /* This data structure represents a compiled pattern. Before calling the pattern compiler, the fields `buffer', `allocated', `fastmap', `translate', and `no_sub' can be set. After the pattern has been @@ -390,7 +390,7 @@ struct re_pattern_buffer }; typedef struct re_pattern_buffer regex_t; - + /* Type for byte offsets within the string. POSIX mandates this. */ typedef int regoff_t; @@ -421,7 +421,7 @@ typedef struct regoff_t rm_so; /* Byte offset from string's start to substring's start. */ regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ } regmatch_t; - + /* Declarations for routines. */ /* To avoid duplicating every routine declaration -- once with a @@ -563,7 +563,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg)); #endif /* C++ */ #endif /* regex.h */ - + /* Local variables: make-backup-files: t diff --git a/sdk/include/reactos/wine/winternl.h b/sdk/include/reactos/wine/winternl.h index edd79e5a6f6..d011e65927e 100644 --- a/sdk/include/reactos/wine/winternl.h +++ b/sdk/include/reactos/wine/winternl.h @@ -1381,7 +1381,7 @@ typedef struct _SYSTEM_CPU_INFORMATION { #define CPU_FEATURE_VME 0x00000005 /* Virtual 86 Mode Extensions */ #define CPU_FEATURE_TSC 0x00000002 /* Time Stamp Counter available */ #define CPU_FEATURE_CMOV 0x00000008 /* Conditional Move instruction*/ -#define CPU_FEATURE_PGE 0x00000014 /* Page table Entry Global bit */ +#define CPU_FEATURE_PGE 0x00000014 /* Page table Entry Global bit */ #define CPU_FEATURE_PSE 0x00000024 /* Page Size Extension */ #define CPU_FEATURE_MTRR 0x00000040 /* Memory Type Range Registers */ #define CPU_FEATURE_CX8 0x00000080 /* Compare and eXchange 8 byte instr. */ diff --git a/sdk/include/reactos/winsock/msafdlib.h b/sdk/include/reactos/winsock/msafdlib.h index 3c5a53d2d5c..e369071648a 100644 --- a/sdk/include/reactos/winsock/msafdlib.h +++ b/sdk/include/reactos/winsock/msafdlib.h @@ -32,7 +32,7 @@ typedef enum _SOCKET_STATE SocketClosed } SOCKET_STATE, *PSOCKET_STATE; -/* +/* * Shared Socket Information. * It's called shared because we send it to Kernel-Mode for safekeeping */ @@ -318,20 +318,20 @@ SockCancelIo(IN SOCKET Handle); INT WSPAPI -SockGetInformation(IN PSOCKET_INFORMATION Socket, - IN ULONG AfdInformationClass, +SockGetInformation(IN PSOCKET_INFORMATION Socket, + IN ULONG AfdInformationClass, IN PVOID ExtraData OPTIONAL, IN ULONG ExtraDataSize, IN OUT PBOOLEAN Boolean OPTIONAL, - IN OUT PULONG Ulong OPTIONAL, + IN OUT PULONG Ulong OPTIONAL, IN OUT PLARGE_INTEGER LargeInteger OPTIONAL); INT WSPAPI -SockSetInformation(IN PSOCKET_INFORMATION Socket, - IN ULONG AfdInformationClass, +SockSetInformation(IN PSOCKET_INFORMATION Socket, + IN ULONG AfdInformationClass, IN PBOOLEAN Boolean OPTIONAL, - IN PULONG Ulong OPTIONAL, + IN PULONG Ulong OPTIONAL, IN PLARGE_INTEGER LargeInteger OPTIONAL); INT @@ -381,10 +381,10 @@ NtStatusToSocketError(IN NTSTATUS Status); INT WSPAPI -SockSocket(INT AddressFamily, - INT SocketType, - INT Protocol, - LPGUID ProviderId, +SockSocket(INT AddressFamily, + INT SocketType, + INT Protocol, + LPGUID ProviderId, GROUP g, DWORD dwFlags, DWORD ProviderFlags, @@ -445,15 +445,15 @@ typedef VOID INT WSPAPI SockLoadHelperDll( - PWSTR TransportName, - PWINSOCK_MAPPING Mapping, + PWSTR TransportName, + PWINSOCK_MAPPING Mapping, PHELPER_DATA *HelperDllData ); INT WSPAPI SockLoadTransportMapping( - PWSTR TransportName, + PWSTR TransportName, PWINSOCK_MAPPING *Mapping ); @@ -465,10 +465,10 @@ SockLoadTransportList( BOOL WSPAPI -SockIsTripleInMapping(IN PWINSOCK_MAPPING Mapping, +SockIsTripleInMapping(IN PWINSOCK_MAPPING Mapping, IN INT AddressFamily, OUT PBOOLEAN AfMatch, - IN INT SocketType, + IN INT SocketType, OUT PBOOLEAN SockMatch, IN INT Protocol, OUT PBOOLEAN ProtoMatch); @@ -486,25 +486,25 @@ SockEventSelectHelper(IN PSOCKET_INFORMATION Socket, IN WSAEVENT EventObject, IN LONG Events); -BOOLEAN +BOOLEAN WSPAPI SockCheckAndReferenceAsyncThread(VOID); -BOOLEAN +BOOLEAN WSPAPI SockCheckAndInitAsyncSelectHelper(VOID); -INT +INT WSPAPI -SockGetTdiName(PINT AddressFamily, - PINT SocketType, +SockGetTdiName(PINT AddressFamily, + PINT SocketType, PINT Protocol, LPGUID ProviderId, - GROUP Group, - DWORD Flags, - PUNICODE_STRING TransportName, - PVOID *HelperDllContext, - PHELPER_DATA *HelperDllData, + GROUP Group, + DWORD Flags, + PUNICODE_STRING TransportName, + PVOID *HelperDllContext, + PHELPER_DATA *HelperDllData, PDWORD Events); INT @@ -565,17 +565,17 @@ WSPAddressToString( INT WSPAPI WSPAsyncSelect( - IN SOCKET s, - IN HWND hWnd, - IN UINT wMsg, - IN LONG lEvent, + IN SOCKET s, + IN HWND hWnd, + IN UINT wMsg, + IN LONG lEvent, OUT LPINT lpErrno); INT WSPAPI WSPBind( IN SOCKET s, - IN CONST SOCKADDR *name, - IN INT namelen, + IN CONST SOCKADDR *name, + IN INT namelen, OUT LPINT lpErrno); INT @@ -617,9 +617,9 @@ WSPDuplicateSocket( INT WSPAPI WSPEnumNetworkEvents( - IN SOCKET s, - IN WSAEVENT hEventObject, - OUT LPWSANETWORKEVENTS lpNetworkEvents, + IN SOCKET s, + IN WSAEVENT hEventObject, + OUT LPWSANETWORKEVENTS lpNetworkEvents, OUT LPINT lpErrno); INT @@ -643,17 +643,17 @@ WSPGetOverlappedResult( INT WSPAPI WSPGetPeerName( - IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT LPINT namelen, + IN SOCKET s, + OUT LPSOCKADDR name, + IN OUT LPINT namelen, OUT LPINT lpErrno); BOOL WSPAPI WSPGetQOSByName( - IN SOCKET s, - IN OUT LPWSABUF lpQOSName, - OUT LPQOS lpQOS, + IN SOCKET s, + IN OUT LPWSABUF lpQOSName, + OUT LPQOS lpQOS, OUT LPINT lpErrno); INT diff --git a/sdk/include/reactos/winsock/rnr20lib.h b/sdk/include/reactos/winsock/rnr20lib.h index e80b44a9261..5cf96026ecc 100644 --- a/sdk/include/reactos/winsock/rnr20lib.h +++ b/sdk/include/reactos/winsock/rnr20lib.h @@ -225,7 +225,7 @@ Dns_NSPGetServiceClassInfo( IN OUT LPWSASERVICECLASSINFOW lpServiceClassInfo ); -INT +INT WINAPI Dns_NSPLookupServiceBegin( LPGUID lpProviderId, @@ -248,7 +248,7 @@ INT WINAPI Dns_NSPLookupServiceEnd(IN HANDLE hLookup); -INT +INT WINAPI Dns_NSPStartup( IN LPGUID lpProviderId, diff --git a/sdk/include/reactos/winsock/ws2help.h b/sdk/include/reactos/winsock/ws2help.h index 346076730ba..f47be28c0a8 100644 --- a/sdk/include/reactos/winsock/ws2help.h +++ b/sdk/include/reactos/winsock/ws2help.h @@ -32,7 +32,7 @@ typedef struct _WSH_SEARCH_TABLE CRITICAL_SECTION Lock; } WSH_SEARCH_TABLE, *PWAH_SEARCH_TABLE; -typedef struct _WSH_HANDLE_TABLE +typedef struct _WSH_HANDLE_TABLE { DWORD Mask; WSH_SEARCH_TABLE SearchTables[1]; @@ -113,7 +113,7 @@ WahCreateNotificationHandle( ); INT -WINAPI +WINAPI WahWaitForNotification( IN HANDLE NotificationHelperHandle, IN HANDLE lpNotificationHandle, diff --git a/sdk/include/reactos/winsock/wsmobile.h b/sdk/include/reactos/winsock/wsmobile.h index f56c1fb0a57..98fd9bd421e 100644 --- a/sdk/include/reactos/winsock/wsmobile.h +++ b/sdk/include/reactos/winsock/wsmobile.h @@ -50,7 +50,7 @@ WSM_NSPGetServiceClassInfo( IN OUT LPWSASERVICECLASSINFOW lpServiceClassInfo ); -INT +INT WINAPI WSM_NSPLookupServiceBegin( LPGUID lpProviderId, @@ -73,7 +73,7 @@ INT WINAPI WSM_NSPLookupServiceEnd(IN HANDLE hLookup); -INT +INT WINAPI WSM_NSPStartup( IN LPGUID lpProviderId, diff --git a/sdk/lib/3rdparty/adns/adns_win32/adns_unix_calls.c b/sdk/lib/3rdparty/adns/adns_win32/adns_unix_calls.c index 973d78b4a92..35b32143196 100644 --- a/sdk/lib/3rdparty/adns/adns_win32/adns_unix_calls.c +++ b/sdk/lib/3rdparty/adns/adns_win32/adns_unix_calls.c @@ -58,7 +58,7 @@ int adns_inet_aton(const char *cp, struct in_addr *inp) if (!cp || !*cp || !inp) { errno = EINVAL; - return -1; + return -1; } if (!strcmp(cp, "255.255.255.255")) @@ -98,7 +98,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz) now -= Adjustment; tv->tv_sec = (long)(now / 10000000); - tv->tv_usec = (long)((now % 10000000) / 10); + tv->tv_usec = (long)((now % 10000000) / 10); return 0; } diff --git a/sdk/lib/3rdparty/adns/src/check.c b/sdk/lib/3rdparty/adns/src/check.c index cbf0c7df1d0..6772f43ac06 100644 --- a/sdk/lib/3rdparty/adns/src/check.c +++ b/sdk/lib/3rdparty/adns/src/check.c @@ -101,7 +101,7 @@ static void checkc_notcpbuf(adns_state ads) { static void checkc_global(adns_state ads) { int i; - + assert(ads->udpsocket >= 0); for (i=0; insortlist; i++) diff --git a/sdk/lib/3rdparty/cardlib/card.h b/sdk/lib/3rdparty/cardlib/card.h index 95400396585..30d59f4c771 100644 --- a/sdk/lib/3rdparty/cardlib/card.h +++ b/sdk/lib/3rdparty/cardlib/card.h @@ -9,7 +9,7 @@ #define _CARD_INCLUDED enum eSuit { Clubs = 0, Diamonds = 1, Hearts = 2, Spades = 3 }; -enum eValue { Ace = 1, Two = 2, Three = 3, Four = 4, Five = 5, Six = 6, Seven = 7, +enum eValue { Ace = 1, Two = 2, Three = 3, Four = 4, Five = 5, Six = 6, Seven = 7, Eight = 8, Nine = 9, Ten = 10, Jack = 11, Queen = 12, King = 13 }; inline int MAKE_CARD(int Value, int Suit) @@ -30,40 +30,40 @@ class Card public: - Card() - { + Card() + { nValue = 0; //ace of spades by default - fFaceUp = true; + fFaceUp = true; } - + Card(int value, int suit) //specify a face value [1-13] and suit [0-3] - { + { nValue = MAKE_CARD(value, suit); - fFaceUp = true; + fFaceUp = true; } - + Card(int index) //specify a 0-51 index - { + { if(index < 0) index = 0; if(index > 51) index = 51; - nValue = index; + nValue = index; fFaceUp = true; } - + int Suit() const - { - return (nValue % 4); + { + return (nValue % 4); } int LoVal() const - { - return (nValue / 4) + 1; + { + return (nValue / 4) + 1; } int HiVal() const - { - return ((nValue < 4) ? 14 : (nValue / 4) + 1); + { + return ((nValue < 4) ? 14 : (nValue / 4) + 1); } int Idx() const //unique value (0-51 etc) @@ -75,7 +75,7 @@ public: { return fFaceUp; } - + bool FaceDown() const { return !fFaceUp; diff --git a/sdk/lib/3rdparty/cardlib/cardrgnmouse.cpp b/sdk/lib/3rdparty/cardlib/cardrgnmouse.cpp index 08d99e6a836..3a69ebd2ef5 100644 --- a/sdk/lib/3rdparty/cardlib/cardrgnmouse.cpp +++ b/sdk/lib/3rdparty/cardlib/cardrgnmouse.cpp @@ -281,7 +281,7 @@ void CardRegion::ClickRelease(int x, int y) iNumDragCards = GetNumDragCards(x, y); if (ClickReleaseCallback) - ClickReleaseCallback(*this, iNumDragCards); + ClickReleaseCallback(*this, iNumDragCards); } bool CardRegion::OnLButtonUp(int x, int y) diff --git a/sdk/lib/3rdparty/freetype/include/freetype/ftdriver.h b/sdk/lib/3rdparty/freetype/include/freetype/ftdriver.h index 02d104dc3ce..be4fe235d02 100644 --- a/sdk/lib/3rdparty/freetype/include/freetype/ftdriver.h +++ b/sdk/lib/3rdparty/freetype/include/freetype/ftdriver.h @@ -428,7 +428,7 @@ FT_BEGIN_HEADER * at smaller sizes. * * By default, the Adobe engines for CFF, Type~1, and CID fonts darken - * stems at smaller sizes, regardless of hinting, to enhance contrast. + * stems at smaller sizes, regardless of hinting, to enhance contrast. * Setting this property, stem darkening gets switched off. * * For the auto-hinter, stem-darkening is experimental currently and diff --git a/sdk/lib/3rdparty/libmpg123/dct64.c b/sdk/lib/3rdparty/libmpg123/dct64.c index a25047a3cce..364dd1504ef 100644 --- a/sdk/lib/3rdparty/libmpg123/dct64.c +++ b/sdk/lib/3rdparty/libmpg123/dct64.c @@ -14,7 +14,7 @@ * * * TODO: write an optimized version for the down-sampling modes - * (in these modes the bands 16-31 (2:1) or 8-31 (4:1) are zero + * (in these modes the bands 16-31 (2:1) or 8-31 (4:1) are zero */ #include "mpg123lib_intern.h" @@ -33,7 +33,7 @@ void dct64(real *out0,real *out1,real *samples) b2 = b1 + 32; for(i=15;i>=0;i--) - *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); for(i=15;i>=0;i--) *bs++ = REAL_MUL((*--b2 - *b1++), *--costab); @@ -43,13 +43,13 @@ void dct64(real *out0,real *out1,real *samples) { for(i=7;i>=0;i--) - *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); for(i=7;i>=0;i--) *bs++ = REAL_MUL((*--b2 - *b1++), *--costab); b2 += 32; costab += 8; for(i=7;i>=0;i--) - *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); for(i=7;i>=0;i--) *bs++ = REAL_MUL((*b1++ - *--b2), *--costab); b2 += 32; @@ -62,12 +62,12 @@ void dct64(real *out0,real *out1,real *samples) for(j=2;j;j--) { for(i=3;i>=0;i--) - *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); for(i=3;i>=0;i--) *bs++ = REAL_MUL((*--b2 - *b1++), costab[i]); b2 += 16; for(i=3;i>=0;i--) - *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); for(i=3;i>=0;i--) *bs++ = REAL_MUL((*b1++ - *--b2), costab[i]); b2 += 16; @@ -79,12 +79,12 @@ void dct64(real *out0,real *out1,real *samples) for(j=4;j;j--) { - *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); *bs++ = (*b1++ + *--b2); *bs++ = REAL_MUL((*--b2 - *b1++), costab[1]); *bs++ = REAL_MUL((*--b2 - *b1++), costab[0]); b2 += 8; - *bs++ = (*b1++ + *--b2); + *bs++ = (*b1++ + *--b2); *bs++ = (*b1++ + *--b2); *bs++ = REAL_MUL((*b1++ - *--b2), costab[1]); *bs++ = REAL_MUL((*b1++ - *--b2), costab[0]); diff --git a/sdk/lib/3rdparty/libmpg123/dct64_altivec.c b/sdk/lib/3rdparty/libmpg123/dct64_altivec.c index 3d6c7e1d1fd..8c71b7dd5cd 100644 --- a/sdk/lib/3rdparty/libmpg123/dct64_altivec.c +++ b/sdk/lib/3rdparty/libmpg123/dct64_altivec.c @@ -15,7 +15,7 @@ * * * TODO: write an optimized version for the down-sampling modes - * (in these modes the bands 16-31 (2:1) or 8-31 (4:1) are zero + * (in these modes the bands 16-31 (2:1) or 8-31 (4:1) are zero */ #include "mpg123lib_intern.h" @@ -30,7 +30,7 @@ void dct64_altivec(real *out0,real *out1,real *samples) { register real *b1,*costab; - + vector unsigned char vinvert,vperm1,vperm2,vperm3,vperm4; vector float v1,v2,v3,v4,v5,v6,v7,v8; vector float vbs1,vbs2,vbs3,vbs4,vbs5,vbs6,vbs7,vbs8; @@ -38,7 +38,7 @@ void dct64_altivec(real *out0,real *out1,real *samples) vector float vzero; b1 = samples; costab = pnts[0]; - + vzero = vec_xor(vzero,vzero); #ifdef __APPLE__ vinvert = (vector unsigned char)(12,13,14,15,8,9,10,11,4,5,6,7,0,1,2,3); @@ -47,40 +47,40 @@ void dct64_altivec(real *out0,real *out1,real *samples) #endif vperm1 = vec_lvsl(0,b1); vperm2 = vec_perm(vperm1,vperm1,vinvert); - + v1 = vec_ld(0,b1); v2 = vec_ld(16,b1); v3 = vec_ld(112,b1); v4 = vec_ld(127,b1); v5 = vec_perm(v1,v2,vperm1); /* b1[0,1,2,3] */ v6 = vec_perm(v3,v4,vperm2); /* b1[31,30,29,28] */ - + vbs1 = vec_add(v5,v6); vbs8 = vec_sub(v5,v6); - + v1 = vec_ld(32,b1); v4 = vec_ld(96,b1); v5 = vec_perm(v2,v1,vperm1); /* b1[4,5,6,7] */ v6 = vec_perm(v4,v3,vperm2); /* b1[27,26,25,24] */ - + vbs2 = vec_add(v5,v6); vbs7 = vec_sub(v5,v6); - + v2 = vec_ld(48,b1); v3 = vec_ld(80,b1); v5 = vec_perm(v1,v2,vperm1); /* b1[8,9,10,11] */ v6 = vec_perm(v3,v4,vperm2); /* b1[23,22,21,20] */ - + vbs3 = vec_add(v5,v6); vbs6 = vec_sub(v5,v6); - + v1 = vec_ld(64,b1); v5 = vec_perm(v2,v1,vperm1); /* b1[12,13,14,15] */ v6 = vec_perm(v1,v3,vperm2); /* b1[19,18,17,16] */ - + vbs4 = vec_add(v5,v6); vbs5 = vec_sub(v5,v6); - + v1 = vec_ld(0,costab); vbs8 = vec_madd(vbs8,v1,vzero); v2 = vec_ld(16,costab); @@ -91,10 +91,10 @@ void dct64_altivec(real *out0,real *out1,real *samples) vbs5 = vec_madd(vbs5,v4,vzero); vbs6 = vec_perm(vbs6,vbs6,vinvert); vbs5 = vec_perm(vbs5,vbs5,vinvert); - - + + costab = pnts[1]; - + v1 = vec_perm(vbs4,vbs4,vinvert); vbs9 = vec_add(vbs1,v1); v3 = vec_sub(vbs1,v1); @@ -105,17 +105,17 @@ void dct64_altivec(real *out0,real *out1,real *samples) v6 = vec_ld(16,costab); vbs12 = vec_madd(v3,v5,vzero); vbs11 = vec_madd(v4,v6,vzero); - + v7 = vec_sub(vbs7,vbs6); v8 = vec_sub(vbs8,vbs5); vbs13 = vec_add(vbs5,vbs8); vbs14 = vec_add(vbs6,vbs7); vbs15 = vec_madd(v7,v6,vzero); vbs16 = vec_madd(v8,v5,vzero); - - + + costab = pnts[2]; - + v1 = vec_perm(vbs10,vbs10,vinvert); v5 = vec_perm(vbs14,vbs14,vinvert); vbs1 = vec_add(v1,vbs9); @@ -133,15 +133,15 @@ void dct64_altivec(real *out0,real *out1,real *samples) vbs4 = vec_madd(v4,v3,vzero); vbs6 = vec_madd(v6,v3,vzero); vbs8 = vec_madd(v7,v3,vzero); - + vbs2 = vec_perm(vbs2,vbs2,vinvert); vbs4 = vec_perm(vbs4,vbs4,vinvert); vbs6 = vec_perm(vbs6,vbs6,vinvert); vbs8 = vec_perm(vbs8,vbs8,vinvert); - - + + costab = pnts[3]; - + #ifdef __APPLE__ vperm1 = (vector unsigned char)(0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23); vperm2 = (vector unsigned char)(12,13,14,15,8,9,10,11,28,29,30,31,24,25,26,27); @@ -152,12 +152,12 @@ void dct64_altivec(real *out0,real *out1,real *samples) vperm3 = (vector unsigned char){0,1,2,3,4,5,6,7,20,21,22,23,16,17,18,19}; #endif vperm4 = vec_add(vperm3,vec_splat_u8(8)); - + v1 = vec_ld(0,costab); v2 = vec_splat(v1,0); v3 = vec_splat(v1,1); v1 = vec_mergeh(v2,v3); - + v2 = vec_perm(vbs1,vbs3,vperm1); v3 = vec_perm(vbs2,vbs4,vperm1); v4 = vec_perm(vbs1,vbs3,vperm2); @@ -172,7 +172,7 @@ void dct64_altivec(real *out0,real *out1,real *samples) vbs11 = vec_perm(v2,v4,vperm4); vbs10 = vec_perm(v3,v5,vperm3); vbs12 = vec_perm(v3,v5,vperm4); - + v2 = vec_perm(vbs5,vbs7,vperm1); v3 = vec_perm(vbs6,vbs8,vperm1); v4 = vec_perm(vbs5,vbs7,vperm2); @@ -187,10 +187,10 @@ void dct64_altivec(real *out0,real *out1,real *samples) vbs15 = vec_perm(v2,v4,vperm4); vbs14 = vec_perm(v3,v5,vperm3); vbs16 = vec_perm(v3,v5,vperm4); - - + + costab = pnts[4]; - + v1 = vec_lde(0,costab); #ifdef __APPLE__ v2 = (vector float)(1.0f,-1.0f,1.0f,-1.0f); @@ -199,7 +199,7 @@ void dct64_altivec(real *out0,real *out1,real *samples) #endif v3 = vec_splat(v1,0); v1 = vec_madd(v2,v3,vzero); - + v2 = vec_mergeh(vbs9,vbs10); v3 = vec_mergel(vbs9,vbs10); v4 = vec_mergeh(vbs11,vbs12); @@ -207,7 +207,7 @@ void dct64_altivec(real *out0,real *out1,real *samples) v6 = vec_mergeh(v2,v3); v7 = vec_mergel(v2,v3); v2 = vec_mergeh(v4,v5); - v3 = vec_mergel(v4,v5); + v3 = vec_mergel(v4,v5); v4 = vec_sub(v6,v7); v5 = vec_sub(v2,v3); v6 = vec_add(v6,v7); @@ -218,7 +218,7 @@ void dct64_altivec(real *out0,real *out1,real *samples) vbs2 = vec_mergel(v6,v2); vbs3 = vec_mergeh(v7,v3); vbs4 = vec_mergel(v7,v3); - + v2 = vec_mergeh(vbs13,vbs14); v3 = vec_mergel(vbs13,vbs14); v4 = vec_mergeh(vbs15,vbs16); @@ -226,7 +226,7 @@ void dct64_altivec(real *out0,real *out1,real *samples) v6 = vec_mergeh(v2,v3); v7 = vec_mergel(v2,v3); v2 = vec_mergeh(v4,v5); - v3 = vec_mergel(v4,v5); + v3 = vec_mergel(v4,v5); v4 = vec_sub(v6,v7); v5 = vec_sub(v2,v3); v6 = vec_add(v6,v7); @@ -237,7 +237,7 @@ void dct64_altivec(real *out0,real *out1,real *samples) vbs6 = vec_mergel(v6,v2); vbs7 = vec_mergeh(v7,v3); vbs8 = vec_mergel(v7,v3); - + vec_st(vbs1,0,bufs); vec_st(vbs2,16,bufs); vec_st(vbs3,32,bufs); diff --git a/sdk/lib/3rdparty/libmpg123/dct64_i386.c b/sdk/lib/3rdparty/libmpg123/dct64_i386.c index abc05b97379..584d184316e 100644 --- a/sdk/lib/3rdparty/libmpg123/dct64_i386.c +++ b/sdk/lib/3rdparty/libmpg123/dct64_i386.c @@ -8,7 +8,7 @@ /* * Discrete Cosine Tansform (DCT) for subband synthesis - * optimized for machines with no auto-increment. + * optimized for machines with no auto-increment. * The performance is highly compiler dependend. Maybe * the dct64.c version for 'normal' processor may be faster * even for Intel processors. @@ -67,23 +67,23 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples) { register real *costab = pnts[1]; - b2[0x00] = b1[0x00] + b1[0x0F]; - b2[0x01] = b1[0x01] + b1[0x0E]; + b2[0x00] = b1[0x00] + b1[0x0F]; + b2[0x01] = b1[0x01] + b1[0x0E]; b2[0x0F] = REAL_MUL(b1[0x00] - b1[0x0F], costab[0]); b2[0x0E] = REAL_MUL(b1[0x01] - b1[0x0E], costab[1]); - b2[0x02] = b1[0x02] + b1[0x0D]; - b2[0x03] = b1[0x03] + b1[0x0C]; + b2[0x02] = b1[0x02] + b1[0x0D]; + b2[0x03] = b1[0x03] + b1[0x0C]; b2[0x0D] = REAL_MUL(b1[0x02] - b1[0x0D], costab[2]); b2[0x0C] = REAL_MUL(b1[0x03] - b1[0x0C], costab[3]); - b2[0x04] = b1[0x04] + b1[0x0B]; - b2[0x05] = b1[0x05] + b1[0x0A]; + b2[0x04] = b1[0x04] + b1[0x0B]; + b2[0x05] = b1[0x05] + b1[0x0A]; b2[0x0B] = REAL_MUL(b1[0x04] - b1[0x0B], costab[4]); b2[0x0A] = REAL_MUL(b1[0x05] - b1[0x0A], costab[5]); - b2[0x06] = b1[0x06] + b1[0x09]; - b2[0x07] = b1[0x07] + b1[0x08]; + b2[0x06] = b1[0x06] + b1[0x09]; + b2[0x07] = b1[0x07] + b1[0x08]; b2[0x09] = REAL_MUL(b1[0x06] - b1[0x09], costab[6]); b2[0x08] = REAL_MUL(b1[0x07] - b1[0x08], costab[7]); @@ -168,7 +168,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples) b2[0x0B] = REAL_MUL(b1[0x08] - b1[0x0B], cos0); b2[0x09] = b1[0x09] + b1[0x0A]; b2[0x0A] = REAL_MUL(b1[0x09] - b1[0x0A], cos1); - + b2[0x0C] = b1[0x0C] + b1[0x0F]; b2[0x0F] = REAL_MUL(b1[0x0F] - b1[0x0C], cos0); b2[0x0D] = b1[0x0D] + b1[0x0E]; @@ -296,7 +296,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples) out1[0x10*14] = REAL_SCALE_DCT64(b1[0x0F]); #endif - { + { real tmp; tmp = b1[0x18] + b1[0x1C]; out0[0x10*15] = REAL_SCALE_DCT64(tmp + b1[0x10]); @@ -312,7 +312,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples) out0[0x10* 1] = REAL_SCALE_DCT64(tmp + b1[0x11]); tmp = b1[0x19] + b1[0x1D]; out1[0x10* 1] = REAL_SCALE_DCT64(tmp + b1[0x11]); - out1[0x10* 3] = REAL_SCALE_DCT64(tmp + b1[0x15]); + out1[0x10* 3] = REAL_SCALE_DCT64(tmp + b1[0x15]); tmp = b1[0x1D] + b1[0x1B]; out1[0x10* 5] = REAL_SCALE_DCT64(tmp + b1[0x15]); out1[0x10* 7] = REAL_SCALE_DCT64(tmp + b1[0x13]); diff --git a/sdk/lib/3rdparty/libmpg123/dct64_i486.c b/sdk/lib/3rdparty/libmpg123/dct64_i486.c index b81d0607326..1fe81b2416c 100644 --- a/sdk/lib/3rdparty/libmpg123/dct64_i486.c +++ b/sdk/lib/3rdparty/libmpg123/dct64_i486.c @@ -14,7 +14,7 @@ * Note: This code does not give the necessary accuracy. Moreover, no * overflow test are done. * - * (c) 1998 Fabrice Bellard. + * (c) 1998 Fabrice Bellard. */ #include "mpg123lib_intern.h" @@ -49,7 +49,7 @@ #define COS_2_3 83981 #define COS_3_0 17733 #define COS_3_1 42813 -#define COS_4_0 23170 +#define COS_4_0 23170 #define SETOUT(out,n,expr) out[FIR_BUFFER_SIZE*(n)]=(expr) #define MULL(a,b) (((long long)(a)*(long long)(b)) >> 15) @@ -115,21 +115,21 @@ void dct64_1_486(int *out0,int *out1,int *b1,int *b2) b1[0x10] = MULL((b2[0x0F] - b2[0x10]),COS_0_15); - b2[0x00] = b1[0x00] + b1[0x0F]; + b2[0x00] = b1[0x00] + b1[0x0F]; b2[0x0F] = MUL((b1[0x00] - b1[0x0F]),COS_1_0); - b2[0x01] = b1[0x01] + b1[0x0E]; + b2[0x01] = b1[0x01] + b1[0x0E]; b2[0x0E] = MUL((b1[0x01] - b1[0x0E]),COS_1_1); - b2[0x02] = b1[0x02] + b1[0x0D]; + b2[0x02] = b1[0x02] + b1[0x0D]; b2[0x0D] = MUL((b1[0x02] - b1[0x0D]),COS_1_2); - b2[0x03] = b1[0x03] + b1[0x0C]; + b2[0x03] = b1[0x03] + b1[0x0C]; b2[0x0C] = MUL((b1[0x03] - b1[0x0C]),COS_1_3); - b2[0x04] = b1[0x04] + b1[0x0B]; + b2[0x04] = b1[0x04] + b1[0x0B]; b2[0x0B] = MUL((b1[0x04] - b1[0x0B]),COS_1_4); - b2[0x05] = b1[0x05] + b1[0x0A]; + b2[0x05] = b1[0x05] + b1[0x0A]; b2[0x0A] = MUL((b1[0x05] - b1[0x0A]),COS_1_5); - b2[0x06] = b1[0x06] + b1[0x09]; + b2[0x06] = b1[0x06] + b1[0x09]; b2[0x09] = MUL((b1[0x06] - b1[0x09]),COS_1_6); - b2[0x07] = b1[0x07] + b1[0x08]; + b2[0x07] = b1[0x07] + b1[0x08]; b2[0x08] = MULL((b1[0x07] - b1[0x08]),COS_1_7); b2[0x10] = b1[0x10] + b1[0x1F]; @@ -201,7 +201,7 @@ void dct64_1_486(int *out0,int *out1,int *b1,int *b2) b2[0x0B] = MUL((b1[0x08] - b1[0x0B]),COS_3_0); b2[0x09] = b1[0x09] + b1[0x0A]; b2[0x0A] = MUL((b1[0x09] - b1[0x0A]),COS_3_1); - + b2[0x0C] = b1[0x0C] + b1[0x0F]; b2[0x0F] = MUL((b1[0x0F] - b1[0x0C]),COS_3_0); b2[0x0D] = b1[0x0D] + b1[0x0E]; @@ -322,21 +322,21 @@ void dct64_i486(int *a,int *b,real *samples) int bufs[64]; int i; -#ifdef REAL_IS_FIXED +#ifdef REAL_IS_FIXED #define TOINT(a) ((a) * 32768 / (int)REAL_FACTOR) for(i=0;i<32;i++) { bufs[i]=TOINT(samples[i]); } -#else +#else int *p = bufs; register double const scale = ((65536.0 * 32) + 1) * 65536.0; - + for(i=0;i<32;i++) { *((double *) (p++)) = scale + *samples++; /* beware on bufs overrun: 8B store from x87 */ } #endif - + dct64_1_486(a,b,bufs+32,bufs); } diff --git a/sdk/lib/3rdparty/libmpg123/equalizer.c b/sdk/lib/3rdparty/libmpg123/equalizer.c index bc5d5d93538..f7a5f2b057b 100644 --- a/sdk/lib/3rdparty/libmpg123/equalizer.c +++ b/sdk/lib/3rdparty/libmpg123/equalizer.c @@ -9,7 +9,7 @@ #include "mpg123lib_intern.h" -void do_equalizer(real *bandPtr,int channel, real equalizer[2][32]) +void do_equalizer(real *bandPtr,int channel, real equalizer[2][32]) { int i; for(i=0;i<32;i++) diff --git a/sdk/lib/3rdparty/libmpg123/format.c b/sdk/lib/3rdparty/libmpg123/format.c index 0ae7750a9d0..88be0041d3b 100644 --- a/sdk/lib/3rdparty/libmpg123/format.c +++ b/sdk/lib/3rdparty/libmpg123/format.c @@ -32,7 +32,7 @@ /* static int chans[NUM_CHANNELS] = { 1 , 2 }; */ static const long my_rates[MPG123_RATES] = /* only the standard rates */ { - 8000, 11025, 12000, + 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, }; @@ -270,7 +270,7 @@ int frame_output_format(mpg123_handle *fr) if(enc_chan_fit(p, p->force_rate, &nf, f0, f2, try_float)) goto end; // Keep the order consistent if float is considered fallback only. - if(!try_float && + if(!try_float && enc_chan_fit(p, p->force_rate, &nf, f0, f2, TRUE)) goto end; @@ -503,7 +503,7 @@ int attribute_align_arg mpg123_fmt2(mpg123_pars *mp, long rate, int channels, in r1 = 0; r2 = MPG123_RATES+1; /* including forced rate */ } - + if(r1 < 0) return MPG123_BAD_RATE; /* now match the encodings */ diff --git a/sdk/lib/3rdparty/libmpg123/frame.c b/sdk/lib/3rdparty/libmpg123/frame.c index b842d27dd4b..b0e804bf244 100644 --- a/sdk/lib/3rdparty/libmpg123/frame.c +++ b/sdk/lib/3rdparty/libmpg123/frame.c @@ -61,7 +61,7 @@ static void frame_default_pars(mpg123_pars *mp) mpg123_fmt_all(mp); /* Default of keeping some 4K buffers at hand, should cover the "usual" use case (using 16K pipe buffers as role model). */ #ifndef NO_FEEDER - mp->feedpool = 5; + mp->feedpool = 5; mp->feedbuffer = 4096; #endif mp->freeformat_framesize = -1; @@ -350,7 +350,7 @@ int frame_buffers(mpg123_handle *fr) } #endif #endif -#if defined(OPT_ALTIVEC) || defined(OPT_ARM) +#if defined(OPT_ALTIVEC) || defined(OPT_ARM) /* sizeof(real) >= 4 ... yes, it could be 8, for example. We got it intialized to at least (512+32)*sizeof(real).*/ decwin_size += 512*sizeof(real); @@ -526,7 +526,7 @@ static void frame_fixed_reset(mpg123_handle *fr) fr->abr_rate = 0; fr->track_frames = 0; fr->track_samples = -1; - fr->framesize=0; + fr->framesize=0; fr->mean_frames = 0; fr->mean_framesize = 0; fr->freesize = 0; @@ -699,7 +699,7 @@ static off_t frame_fuzzy_find(mpg123_handle *fr, off_t want_frame, off_t* get_fr then step to just before wanted one with read_frame do not care tabout the stuff that was in buffer but not played back everything that left the decoder is counted as played - + Decide if you want low latency reaction and accurate timing info or stable long-time playback with buffer! */ @@ -749,7 +749,7 @@ off_t frame_index_find(mpg123_handle *fr, off_t want_frame, off_t* get_frame) } off_t frame_ins2outs(mpg123_handle *fr, off_t ins) -{ +{ off_t outs = 0; switch(fr->down_sample) { diff --git a/sdk/lib/3rdparty/libmpg123/id3.c b/sdk/lib/3rdparty/libmpg123/id3.c index 30730070411..c228f85879e 100644 --- a/sdk/lib/3rdparty/libmpg123/id3.c +++ b/sdk/lib/3rdparty/libmpg123/id3.c @@ -45,19 +45,19 @@ prepend/append combination. When deciding upon where an unembedded tag should be located, the following order of preference SHOULD be considered. - + 1. Prepend the tag. - 2. Prepend a tag with all vital information and add a second tag at + 2. Prepend a tag with all vital information and add a second tag at the end of the file, before tags from other tagging systems. The first tag is required to have a SEEK frame. - + 3. Add a tag at the end of the file, before tags from other tagging systems. - + In case 2 and 3 the tag can simply be appended if no other known tags are present. The suggested method to find ID3v2 tags are: - + 1. Look for a prepended tag using the pattern found in section 3.1. 2. If a SEEK frame was found, use its values to guide further diff --git a/sdk/lib/3rdparty/libmpg123/index.c b/sdk/lib/3rdparty/libmpg123/index.c index f8d94de509e..d44e76349a6 100644 --- a/sdk/lib/3rdparty/libmpg123/index.c +++ b/sdk/lib/3rdparty/libmpg123/index.c @@ -85,7 +85,7 @@ void fi_add(struct frame_index *fi, off_t pos) { /* Index is full, we need to shrink... or grow. */ /* Store the current frame number to check later if we still want it. */ off_t framenum = fi->fill*fi->step; - /* If we want not / cannot grow, we shrink. */ + /* If we want not / cannot grow, we shrink. */ if( !(fi->grow_size && fi_resize(fi, fi->size+fi->grow_size)==0) ) fi_shrink(fi); diff --git a/sdk/lib/3rdparty/libmpg123/layer1.c b/sdk/lib/3rdparty/libmpg123/layer1.c index c5bfc75d982..88df8d071c9 100644 --- a/sdk/lib/3rdparty/libmpg123/layer1.c +++ b/sdk/lib/3rdparty/libmpg123/layer1.c @@ -5,7 +5,7 @@ see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Michael Hipp - may have a few bugs after last optimization ... + may have a few bugs after last optimization ... */ #include "mpg123lib_intern.h" @@ -15,7 +15,7 @@ /* Allocation value is not allowed to be 15. Initially, libmad showed me the error that mpg123 used to ignore. Then, I found a quote on that in - Shlien, S. (1994): Guide to MPEG-1 Audio Standard. + Shlien, S. (1994): Guide to MPEG-1 Audio Standard. IEEE Transactions on Broadcasting 40, 4 "To avoid conflicts with the synchronization code, code '1111' is defined @@ -138,7 +138,7 @@ static int I_step_two(real fraction[2][SBLIMIT],unsigned int balloc[2*SBLIMIT], if((n=*ba++)) needbits += n+1; } - for(i=jsbound;ip.down_sample) + if(!fr->p.down_sample) { for(j=3,i=0;i<63;i++,j--) *table++ = DOUBLE_TO_REAL(16384 * mulmul[m] * pow(2.0,(double) j / 3.0)); @@ -201,17 +201,17 @@ static int II_step_one(unsigned int *bit_alloc,int *scale,mpg123_handle *fr) if(*bita++) switch(*scfsi++) { - case 0: + case 0: *scale++ = getbits_fast(fr, 6); *scale++ = getbits_fast(fr, 6); *scale++ = getbits_fast(fr, 6); break; - case 1 : + case 1 : *scale++ = sc = getbits_fast(fr, 6); *scale++ = sc; *scale++ = getbits_fast(fr, 6); break; - case 2: + case 2: *scale++ = sc = getbits_fast(fr, 6); *scale++ = sc; *scale++ = sc; @@ -242,17 +242,17 @@ static void II_step_two(unsigned int *bit_alloc,real fraction[2][4][SBLIMIT],int step = alloc1->bits; for(j=0;jbits; - if( (d1=alloc2->d) < 0) + if( (d1=alloc2->d) < 0) { real cm=fr->muls[k][scale[x1]]; fraction[j][0][i] = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1), cm); fraction[j][1][i] = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1), cm); fraction[j][2][i] = REAL_MUL_SCALE_LAYER12(DOUBLE_TO_REAL_15((int)getbits(fr, k) + d1), cm); - } - else + } + else { const int *table[] = { 0,0,0,grp_3tab,0,grp_5tab,0,0,0,grp_9tab }; unsigned int idx,*tab,m=scale[x1]; @@ -260,7 +260,7 @@ static void II_step_two(unsigned int *bit_alloc,real fraction[2][4][SBLIMIT],int tab = (unsigned int *) (table[d1] + idx + idx + idx); fraction[j][0][i] = REAL_SCALE_LAYER12(fr->muls[*tab++][m]); fraction[j][1][i] = REAL_SCALE_LAYER12(fr->muls[*tab++][m]); - fraction[j][2][i] = REAL_SCALE_LAYER12(fr->muls[*tab][m]); + fraction[j][2][i] = REAL_SCALE_LAYER12(fr->muls[*tab][m]); } scale+=3; } @@ -317,10 +317,10 @@ static void II_step_two(unsigned int *bit_alloc,real fraction[2][4][SBLIMIT],int Historic comment... should we use individual scalefac for channel 2 or is the current way the right one , where we just copy channel 1 to - channel 2 ?? + channel 2 ?? The current 'strange' thing is, that we throw away the scalefac values for the second channel ...!! - -> changed .. now we use the scalefac values of channel one !! + -> changed .. now we use the scalefac values of channel one !! */ } @@ -407,7 +407,7 @@ int do_layer2(mpg123_handle *fr) error("missing bits in layer II step two"); return clip; } - for(j=0;j<3;j++) + for(j=0;j<3;j++) { if(single != SINGLE_STEREO) clip += (fr->synth_mono)(fraction[single][j], fr); diff --git a/sdk/lib/3rdparty/libmpg123/layer3.c b/sdk/lib/3rdparty/libmpg123/layer3.c index eb41fe611e8..fd5ec7ad2f6 100644 --- a/sdk/lib/3rdparty/libmpg123/layer3.c +++ b/sdk/lib/3rdparty/libmpg123/layer3.c @@ -462,7 +462,7 @@ static int III_get_side_info(mpg123_handle *fr, struct III_sideinfo *si,int ster if (stereo == 1) si->private_bits = getbits(fr, tab[2]); - else + else si->private_bits = getbits(fr, tab[3]); if(!fr->lsf) for(ch=0; chlsf || (gr_info->block_type == 2)) && !fr->mpeg25) { gr_info->region1start = 36>>1; @@ -538,7 +538,7 @@ static int III_get_side_info(mpg123_handle *fr, struct III_sideinfo *si,int ster else { if(fr->mpeg25) - { + { int r0c,r1c; if((gr_info->block_type == 2) && (!gr_info->mixed_block_flag) ) r0c = 5; else r0c = 7; @@ -546,13 +546,13 @@ static int III_get_side_info(mpg123_handle *fr, struct III_sideinfo *si,int ster /* r0c+1+r1c+1 == 22, always. */ r1c = 20 - r0c; gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ; - gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1; + gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1; } else { gr_info->region1start = 54>>1; - gr_info->region2start = 576>>1; - } + gr_info->region2start = 576>>1; + } } } else @@ -653,7 +653,7 @@ static int III_get_scale_factors_1(mpg123_handle *fr, int *scf,struct gr_info_s { for (i=0;i<6;i++) *scf++ = getbits_fast(fr, num0); } - else scf += 6; + else scf += 6; if(!(scfsi & 0x4)) { @@ -701,7 +701,7 @@ static int III_get_scale_factors_2(mpg123_handle *fr, int *scf,struct gr_info_s { 6, 9, 9,9 } , { 6, 9,12,6 } , { 15,18,0,0}, { 6,15,12,0 } , { 6,12, 9,6 } , { 6,18,9,0} } - }; + }; if(i_stereo) /* i_stereo AND second channel -> do_layer3() checks this */ slen = i_slen2[gr_info->scalefac_compress>>1]; @@ -710,7 +710,7 @@ static int III_get_scale_factors_2(mpg123_handle *fr, int *scf,struct gr_info_s gr_info->preflag = (slen>>15) & 0x1; - n = 0; + n = 0; if( gr_info->block_type == 2 ) { n++; @@ -823,7 +823,7 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in int bv = gr_info->big_values; int region1 = gr_info->region1start; int region2 = gr_info->region2start; - l3 = ((576>>1)-bv)>>1; + l3 = ((576>>1)-bv)>>1; /* we may lose the 'odd' bit here !! check this later again */ if(bv <= region1) @@ -1287,7 +1287,7 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in gr_info->maxb = 1; } - while(xrpnt < &xr[SBLIMIT][0]) + while(xrpnt < &xr[SBLIMIT][0]) *xrpnt++ = DOUBLE_TO_REAL(0.0); while( part2remain > 16 ) @@ -1318,7 +1318,7 @@ static void III_i_stereo(real xr_buf[2][SBLIMIT][SSLIMIT],int *scalefac, struct int tab; /* TODO: optimize as static */ const real *tabs[3][2][2] = - { + { { { tan1_1,tan2_1 } , { tan1_2,tan2_2 } }, { { pow1_1[0],pow2_1[0] } , { pow1_2[0],pow2_2[0] } }, { { pow1_1[1],pow2_1[1] } , { pow1_2[1],pow2_2[1] } } @@ -1370,7 +1370,7 @@ static void III_i_stereo(real xr_buf[2][SBLIMIT][SSLIMIT],int *scalefac, struct for(;sfb<12;sfb++) { - is_p = scalefac[sfb*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */ + is_p = scalefac[sfb*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */ if(is_p != 7) { real t1,t2; @@ -1387,7 +1387,7 @@ static void III_i_stereo(real xr_buf[2][SBLIMIT][SSLIMIT],int *scalefac, struct } #if 1 -/* in the original: copy 10 to 11 , here: copy 11 to 12 +/* in the original: copy 10 to 11 , here: copy 11 to 12 maybe still wrong??? (copy 12 to 13?) */ is_p = scalefac[11*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */ sb = bi->shortDiff[12]; @@ -1402,7 +1402,7 @@ maybe still wrong??? (copy 12 to 13?) */ real t1,t2; t1 = tab1[is_p]; t2 = tab2[is_p]; for( ; sb > 0; sb--,idx+=3 ) - { + { real v = xr[0][idx]; xr[0][idx] = REAL_MUL_15(v, t1); xr[1][idx] = REAL_MUL_15(v, t2); @@ -1435,8 +1435,8 @@ maybe still wrong??? (copy 12 to 13?) */ } else idx += sb; } - } - } + } + } else { /* ((gr_info->block_type != 2)) */ int sfb = gr_info->maxbandl; @@ -1466,7 +1466,7 @@ maybe still wrong??? (copy 12 to 13?) */ if(is_p != 7) { /* copy l-band 20 to l-band 21 */ int sb; - real t1 = tab1[is_p],t2 = tab2[is_p]; + real t1 = tab1[is_p],t2 = tab2[is_p]; for( sb = bi->longDiff[21]; sb > 0; sb--,idx++ ) { @@ -1487,7 +1487,7 @@ static void III_antialias(real xr[SBLIMIT][SSLIMIT],struct gr_info_s *gr_info) { if(!gr_info->mixed_block_flag) return; - sblim = 1; + sblim = 1; } else sblim = gr_info->maxb-1; @@ -1514,7 +1514,7 @@ static void III_antialias(real xr[SBLIMIT][SSLIMIT],struct gr_info_s *gr_info) } } -/* +/* This is an optimized DCT from Jeff Tsay's maplay 1.2+ package. Saved one multiplication by doing the 'twiddle factor' stuff together with the window mul. (MH) @@ -1777,7 +1777,7 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf) tb33 = REAL_MUL(in[2*3+1], c[3]); tb66 = REAL_MUL(in[2*6+1], c[6]); - { + { real tmp1a,tmp2a,tmp1b,tmp2b; tmp1a = REAL_MUL(in[2*1+0], c[1]) + ta33 + REAL_MUL(in[2*5+0], c[5]) + REAL_MUL(in[2*7+0], c[7]); tmp1b = REAL_MUL(in[2*1+1], c[1]) + tb33 + REAL_MUL(in[2*5+1], c[5]) + REAL_MUL(in[2*7+1], c[7]); @@ -1872,7 +1872,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe register real *out1 = rawout1; ts[SBLIMIT*0] = out1[0]; ts[SBLIMIT*1] = out1[1]; ts[SBLIMIT*2] = out1[2]; ts[SBLIMIT*3] = out1[3]; ts[SBLIMIT*4] = out1[4]; ts[SBLIMIT*5] = out1[5]; - + DCT12_PART1 { @@ -1906,7 +1906,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe { real in0,in1,in2,in3,in4,in5; register real *out2 = rawout2; - + DCT12_PART1 { @@ -1935,7 +1935,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe ts[(17-2)*SBLIMIT] += REAL_MUL(in4, wi[5-2]); } - in++; + in++; { real in0,in1,in2,in3,in4,in5; @@ -1989,7 +1989,7 @@ static void III_hybrid(real fsIn[SBLIMIT][SSLIMIT], real tsOut[SSLIMIT][SBLIMIT] rawout2=block[b][ch]; blc[ch] = b; } - + if(gr_info->mixed_block_flag) { sb = 2; @@ -1997,7 +1997,7 @@ static void III_hybrid(real fsIn[SBLIMIT][SSLIMIT], real tsOut[SSLIMIT][SBLIMIT] opt_dct36(fr)(fsIn[1],rawout1+18,rawout2+18,win1[0],tspnt+1); rawout1 += 36; rawout2 += 36; tspnt += 2; } - + bt = gr_info->block_type; if(bt == 2) { @@ -2059,7 +2059,7 @@ static void fill_pinfo_side(mpg123_handle *fr, struct III_sideinfo *si, int gr, { int j = 3 * sb + i; /* - is_p = scalefac[sfb*3+lwin-gr_infos->mixed_block_flag]; + is_p = scalefac[sfb*3+lwin-gr_infos->mixed_block_flag]; */ /* scalefac was copied into pinfo->sfb_s[] before */ fr->pinfo->sfb_s[gr][ch][j] = -ifqstep * @@ -2200,7 +2200,7 @@ int do_layer3(mpg123_handle *fr) { struct gr_info_s *gr_info = &(sideinfo.ch[1].gr[gr]); long part2bits; - if(fr->lsf) + if(fr->lsf) part2bits = III_get_scale_factors_2(fr, scalefacs[1],gr_info,i_stereo); else part2bits = III_get_scale_factors_1(fr, scalefacs[1],gr_info,1,gr); @@ -2254,7 +2254,7 @@ int do_layer3(mpg123_handle *fr) if(ms_stereo || i_stereo || (single == SINGLE_MIX) ) { - if(gr_info->maxb > sideinfo.ch[0].gr[gr].maxb) + if(gr_info->maxb > sideinfo.ch[0].gr[gr].maxb) sideinfo.ch[0].gr[gr].maxb = gr_info->maxb; else gr_info->maxb = sideinfo.ch[0].gr[gr].maxb; @@ -2267,7 +2267,7 @@ int do_layer3(mpg123_handle *fr) register int i; register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1]; for(i=0;imaxb;i++,in0++) - *in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */ + *in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */ } break; case SINGLE_RIGHT: @@ -2325,6 +2325,6 @@ int do_layer3(mpg123_handle *fr) } #endif } - + return clip; } diff --git a/sdk/lib/3rdparty/libmpg123/lfs_alias.c b/sdk/lib/3rdparty/libmpg123/lfs_alias.c index 982d7ca9dc6..98ed7056b90 100644 --- a/sdk/lib/3rdparty/libmpg123/lfs_alias.c +++ b/sdk/lib/3rdparty/libmpg123/lfs_alias.c @@ -16,7 +16,7 @@ Depending on use case, the aliases map to 32 (small) or 64 bit (large) offset functions, to the ones from libmpg123 or the ones from lfs_wrap. - + So, two basic cases: 1. mpg123_bla_32 alias for mpg123_bla (native) 2. mpg123_bla alias for mpg123_bla_32 (wrapper) diff --git a/sdk/lib/3rdparty/libmpg123/lfs_wrap.c b/sdk/lib/3rdparty/libmpg123/lfs_wrap.c index a01f302b20d..69ef55a0d79 100644 --- a/sdk/lib/3rdparty/libmpg123/lfs_wrap.c +++ b/sdk/lib/3rdparty/libmpg123/lfs_wrap.c @@ -40,7 +40,7 @@ if(/^\s*MPG123_EXPORT\s+(\S+)\s+(mpg123_\S+)\((.*)\);\s*$/) $name = $2; $args = $3; next unless ($type =~ /off_t/ or $args =~ /off_t/); - print "$name\n" unless grep {$_ eq $name} + print "$name\n" unless grep {$_ eq $name} ("mpg123_open", "mpg123_open_fd", "mpg123_open_handle", "mpg123_replace_reader", "mpg123_replace_reader_handle"); }' < mpg123.h.in diff --git a/sdk/lib/3rdparty/libmpg123/libmpg123.c b/sdk/lib/3rdparty/libmpg123/libmpg123.c index e2a64f804de..1e31ad59efb 100644 --- a/sdk/lib/3rdparty/libmpg123/libmpg123.c +++ b/sdk/lib/3rdparty/libmpg123/libmpg123.c @@ -258,7 +258,7 @@ int attribute_align_arg mpg123_par(mpg123_pars *mp, enum mpg123_parms key, long break; case MPG123_FREEFORMAT_SIZE: mp->freeformat_framesize = val; - break; + break; default: ret = MPG123_BAD_PARAM; } @@ -290,7 +290,7 @@ int attribute_align_arg mpg123_getpar(mpg123_pars *mp, enum mpg123_parms key, lo if(val) *val = mp->flags; break; case MPG123_FORCE_RATE: - if(val) + if(val) #ifdef NO_NTOM *val = 0; #else @@ -350,7 +350,7 @@ int attribute_align_arg mpg123_getpar(mpg123_pars *mp, enum mpg123_parms key, lo break; case MPG123_FREEFORMAT_SIZE: *val = mp->freeformat_framesize; - break; + break; default: ret = MPG123_BAD_PARAM; } diff --git a/sdk/lib/3rdparty/libmpg123/ntom.c b/sdk/lib/3rdparty/libmpg123/ntom.c index 196a5690376..a6e442469de 100644 --- a/sdk/lib/3rdparty/libmpg123/ntom.c +++ b/sdk/lib/3rdparty/libmpg123/ntom.c @@ -68,7 +68,7 @@ void ntom_set_ntom(mpg123_handle *fr, off_t num) fr->ntom_val[1] = fr->ntom_val[0] = ntom_val(fr, num); } -/* Carry out the ntom sample count operation for this one frame. +/* Carry out the ntom sample count operation for this one frame. No fear of integer overflow here. */ off_t ntom_frame_outsamples(mpg123_handle *fr) { diff --git a/sdk/lib/3rdparty/libmpg123/parse.c b/sdk/lib/3rdparty/libmpg123/parse.c index d99f652dd00..c447b41b92d 100644 --- a/sdk/lib/3rdparty/libmpg123/parse.c +++ b/sdk/lib/3rdparty/libmpg123/parse.c @@ -190,7 +190,7 @@ static int check_lame_tag(mpg123_handle *fr) /* we have one of these headers... */ if(VERBOSE2) fprintf(stderr, "Note: Xing/Lame/Info header detected\n"); - lame_offset += 4; + lame_offset += 4; xing_flags = bit_read_long(fr->bsbuf, &lame_offset); debug1("Xing: flags 0x%08lx", xing_flags); @@ -231,7 +231,7 @@ static int check_lame_tag(mpg123_handle *fr) { /* The Xing bitstream length, at least as interpreted by the Lame encoder, encompasses all data from the Xing header frame on, - ignoring leading ID3v2 data. Trailing tags (ID3v1) seem to be + ignoring leading ID3v2 data. Trailing tags (ID3v1) seem to be included, though. */ if(fr->rdat.filelen < 1) fr->rdat.filelen = (off_t) long_tmp + fr->audio_start; /* Overflow? */ @@ -274,7 +274,7 @@ static int check_lame_tag(mpg123_handle *fr) 10: lowpass 11-18: ReplayGain 19: encoder flags - 20: ABR + 20: ABR 21-23: encoder delays */ check_bytes_left(24); /* I'm interested in 24 B of extra info. */ @@ -315,7 +315,7 @@ static int check_lame_tag(mpg123_handle *fr) else if(VERBOSE3) fprintf(stderr , "Note: Info: Cannot determine LAME version.\n"); } - lame_offset += 9; /* 9 in */ + lame_offset += 9; /* 9 in */ /* The 4 big bits are tag revision, the small bits vbr method. */ lame_vbr = fr->bsbuf[lame_offset] & 15; @@ -377,7 +377,7 @@ static int check_lame_tag(mpg123_handle *fr) /* Apply gain offset for automatic origin. */ if(origin == 3) replay_gain[gt] += gain_offset; } - if(VERBOSE3) + if(VERBOSE3) { fprintf(stderr, "Note: Info: Radio Gain = %03.1fdB\n" , replay_gain[0]); @@ -404,7 +404,7 @@ static int check_lame_tag(mpg123_handle *fr) , fr->abr_rate); } lame_offset += 1; /* 21 in */ - + /* Encoder delay and padding, two 12 bit values ... lame does write them from int. */ pad_in = ( (((int) fr->bsbuf[lame_offset]) << 4) @@ -460,7 +460,7 @@ static void halfspeed_prepare(mpg123_handle *fr) static int halfspeed_do(mpg123_handle *fr) { /* Speed-down hack: Play it again, Sam (the frame, I mean). */ - if (fr->p.halfspeed) + if (fr->p.halfspeed) { if(fr->halfphase) /* repeat last frame */ { @@ -480,9 +480,9 @@ static int halfspeed_do(mpg123_handle *fr) return 0; } -/* +/* Temporary macro until we got this worked out. - Idea is to filter out special return values that shall trigger direct jumps to end / resync / read again. + Idea is to filter out special return values that shall trigger direct jumps to end / resync / read again. Particularily, the generic ret==PARSE_BAD==0 and ret==PARSE_GOOD==1 are not affected. */ #define JUMP_CONCLUSION(ret) \ @@ -637,7 +637,7 @@ init_resync: fr->mean_framesize = ((fr->mean_frames-1)*fr->mean_framesize+compute_bpf(fr)) / fr->mean_frames ; } ++fr->num; /* 0 for first frame! */ - debug4("Frame %"OFF_P" %08lx %i, next filepos=%"OFF_P, + debug4("Frame %"OFF_P" %08lx %i, next filepos=%"OFF_P, (off_p)fr->num, newhead, fr->framesize, (off_p)fr->rd->tell(fr)); if(!(fr->state_flags & FRAME_FRANKENSTEIN) && ( (fr->track_frames > 0 && fr->num >= fr->track_frames) @@ -647,9 +647,9 @@ init_resync: )) { fr->state_flags |= FRAME_FRANKENSTEIN; - if(NOQUIET) fprintf(stderr, "\nWarning: Encountered more data after announced end of track (frame %"OFF_P"/%"OFF_P"). Frankenstein!\n", (off_p)fr->num, + if(NOQUIET) fprintf(stderr, "\nWarning: Encountered more data after announced end of track (frame %"OFF_P"/%"OFF_P"). Frankenstein!\n", (off_p)fr->num, #ifdef GAPLESS - fr->gapless_frames > 0 ? (off_p)fr->gapless_frames : + fr->gapless_frames > 0 ? (off_p)fr->gapless_frames : #endif (off_p)fr->track_frames); } @@ -914,9 +914,9 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeforma return PARSE_BAD; } break; -#endif +#endif default: - if(NOQUIET) error1("Layer type %i not supported in this build!", fr->lay); + if(NOQUIET) error1("Layer type %i not supported in this build!", fr->lay); return PARSE_BAD; } @@ -935,7 +935,7 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeforma This overwrites side info needed for stage 0. Continuing to read bits after layer 3 side info shall fail unless - set_pointer() is called to refresh things. + set_pointer() is called to refresh things. */ void set_pointer(mpg123_handle *fr, int part2, long backstep) { @@ -1053,10 +1053,10 @@ int attribute_align_arg mpg123_position(mpg123_handle *fr, off_t no, off_t buffs int get_songlen(mpg123_handle *fr,int no) { double tpf; - + if(!fr) return 0; - + if(no < 0) { if(!fr->rd || fr->rdat.filelen < 0) return 0; @@ -1153,7 +1153,7 @@ static int handle_apetag(mpg123_handle *fr, unsigned long newhead) back_bytes += ret; if(ret < 28) goto apetag_bad; - + debug1("trying to parse APE header at %"OFF_P, (off_p)fr->rd->tell(fr)); /* Apetags start with "APETAGEX", "APET" is already tested. */ if(strncmp((char *)apebuf,"AGEX",4) != 0) @@ -1185,7 +1185,7 @@ static int handle_apetag(mpg123_handle *fr, unsigned long newhead) return PARSE_AGAIN; -apetag_bad: +apetag_bad: debug("no proper APE tag found, seeking back"); if(fr->rd->back_bytes(fr,back_bytes) < 0 && NOQUIET) error1("Cannot seek %d bytes back!", back_bytes); @@ -1193,7 +1193,7 @@ apetag_bad: return PARSE_AGAIN; /* Give the resync code a chance to fix things */ } -/* Advance a byte in stream to get next possible header and forget +/* Advance a byte in stream to get next possible header and forget buffered data if possible (for feed reader). */ #define FORGET_INTERVAL 1024 /* Used by callers to set forget flag each bytes. */ static int forget_head_shift(mpg123_handle *fr, unsigned long *newheadp, int forget) @@ -1268,7 +1268,7 @@ static int skip_junk(mpg123_handle *fr, unsigned long *newheadp, long *headcount do { ++(*headcount); - if(limit >= 0 && *headcount >= limit) break; + if(limit >= 0 && *headcount >= limit) break; if(++forgetcount > FORGET_INTERVAL) forgetcount = 0; if((ret=forget_head_shift(fr, &newhead, !forgetcount))<=0) return ret; @@ -1348,7 +1348,7 @@ static int wetwork(mpg123_handle *fr, unsigned long *newheadp) do /* ... shift the header with additional single bytes until be found something that could be a header. */ { ++try; - if(limit >= 0 && try >= limit) break; + if(limit >= 0 && try >= limit) break; if(++forgetcount > FORGET_INTERVAL) forgetcount = 0; if((ret=forget_head_shift(fr,&newhead,!forgetcount)) <= 0) diff --git a/sdk/lib/3rdparty/libmpg123/readers.c b/sdk/lib/3rdparty/libmpg123/readers.c index a360c0dafda..2c009d5128a 100644 --- a/sdk/lib/3rdparty/libmpg123/readers.c +++ b/sdk/lib/3rdparty/libmpg123/readers.c @@ -141,7 +141,7 @@ static ssize_t icy_fullread(mpg123_handle *fr, unsigned char *buf, ssize_t count /* now off to read icy data */ /* one byte icy-meta size (must be multiplied by 16 to get icy-meta length) */ - + ret = fr->rdat.fdread(fr,&temp_buff,1); /* Getting one single byte hast to suceed. */ if(ret < 0){ if(NOQUIET) error("reading icy size"); return READER_ERROR; } if(ret == 0) break; diff --git a/sdk/lib/3rdparty/libmpg123/stringbuf.c b/sdk/lib/3rdparty/libmpg123/stringbuf.c index fb3b83066f7..3e344df8690 100644 --- a/sdk/lib/3rdparty/libmpg123/stringbuf.c +++ b/sdk/lib/3rdparty/libmpg123/stringbuf.c @@ -72,7 +72,7 @@ int attribute_align_arg mpg123_resize_string(mpg123_string* sb, size_t new) char* t; debug("really!"); t = (char*) safe_realloc(sb->p, new*sizeof(char)); - debug1("safe_realloc returned %p", (void*) t); + debug1("safe_realloc returned %p", (void*) t); if(t != NULL) { sb->p = t; diff --git a/sdk/lib/3rdparty/libmpg123/synth.c b/sdk/lib/3rdparty/libmpg123/synth.c index ed927d9344d..b0dc578903e 100644 --- a/sdk/lib/3rdparty/libmpg123/synth.c +++ b/sdk/lib/3rdparty/libmpg123/synth.c @@ -122,7 +122,7 @@ int synth_1to1_3dnow(real *bandPtr, int channel, mpg123_handle *fr, int final) if(fr->have_eq_settings) do_equalizer_3dnow(bandPtr,channel,fr->equalizer); #endif /* this is in asm, can be dither or not */ - /* uh, is this return from pointer correct? */ + /* uh, is this return from pointer correct? */ ret = (int) synth_1to1_3dnow_asm(bandPtr, channel, fr->buffer.data+fr->buffer.fill, fr->rawbuffs, &fr->bo, fr->decwin); if(final) fr->buffer.fill += 128; return ret; @@ -154,9 +154,9 @@ void dct64_real_sse(real *out0, real *out1, real *samples); /* This is just a hull to use the mpg123 handle. */ int synth_1to1_sse(real *bandPtr,int channel, mpg123_handle *fr, int final) { - short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); real *b0, **buf; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); @@ -173,7 +173,7 @@ int synth_1to1_sse(real *bandPtr,int channel, mpg123_handle *fr, int final) buf = fr->real_buffs[1]; } - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0 = buf[0]; bo1 = fr->bo; @@ -365,9 +365,9 @@ void dct64_x86_64(short *out0, short *out1, real *samples); /* This is just a hull to use the mpg123 handle. */ int synth_1to1_x86_64(real *bandPtr,int channel, mpg123_handle *fr, int final) { - short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); short *b0, **buf; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); @@ -384,7 +384,7 @@ int synth_1to1_x86_64(real *bandPtr,int channel, mpg123_handle *fr, int final) buf = fr->short_buffs[1]; } - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0 = buf[0]; bo1 = fr->bo; @@ -408,7 +408,7 @@ int synth_1to1_stereo_x86_64(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) { short *samples = (short *) (fr->buffer.data+fr->buffer.fill); short *b0l, *b0r, **bufl, **bufr; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) @@ -422,7 +422,7 @@ int synth_1to1_stereo_x86_64(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) bufl = fr->short_buffs[0]; bufr = fr->short_buffs[1]; - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0l = bufl[0]; b0r = bufr[0]; @@ -551,9 +551,9 @@ void dct64_avx(short *out0, short *out1, real *samples); /* This is just a hull to use the mpg123 handle. */ int synth_1to1_avx(real *bandPtr,int channel, mpg123_handle *fr, int final) { - short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); short *b0, **buf; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); @@ -570,7 +570,7 @@ int synth_1to1_avx(real *bandPtr,int channel, mpg123_handle *fr, int final) buf = fr->short_buffs[1]; } - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0 = buf[0]; bo1 = fr->bo; @@ -594,7 +594,7 @@ int synth_1to1_stereo_avx(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) { short *samples = (short *) (fr->buffer.data+fr->buffer.fill); short *b0l, *b0r, **bufl, **bufr; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) @@ -608,7 +608,7 @@ int synth_1to1_stereo_avx(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) bufl = fr->short_buffs[0]; bufr = fr->short_buffs[1]; - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0l = bufl[0]; b0r = bufr[0]; @@ -827,9 +827,9 @@ void dct64_neon(short *out0, short *out1, real *samples); /* Hull for C mpg123 API */ int synth_1to1_neon(real *bandPtr,int channel, mpg123_handle *fr, int final) { - short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); short *b0, **buf; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); @@ -846,7 +846,7 @@ int synth_1to1_neon(real *bandPtr,int channel, mpg123_handle *fr, int final) buf = fr->short_buffs[1]; } - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0 = buf[0]; bo1 = fr->bo; @@ -870,7 +870,7 @@ int synth_1to1_stereo_neon(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) { short *samples = (short *) (fr->buffer.data+fr->buffer.fill); short *b0l, *b0r, **bufl, **bufr; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) @@ -884,7 +884,7 @@ int synth_1to1_stereo_neon(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) bufl = fr->short_buffs[0]; bufr = fr->short_buffs[1]; - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0l = bufl[0]; b0r = bufr[0]; @@ -1009,9 +1009,9 @@ void dct64_neon64(short *out0, short *out1, real *samples); /* Hull for C mpg123 API */ int synth_1to1_neon64(real *bandPtr,int channel, mpg123_handle *fr, int final) { - short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); short *b0, **buf; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); @@ -1028,7 +1028,7 @@ int synth_1to1_neon64(real *bandPtr,int channel, mpg123_handle *fr, int final) buf = fr->short_buffs[1]; } - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0 = buf[0]; bo1 = fr->bo; @@ -1052,7 +1052,7 @@ int synth_1to1_stereo_neon64(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) { short *samples = (short *) (fr->buffer.data+fr->buffer.fill); short *b0l, *b0r, **bufl, **bufr; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) @@ -1066,7 +1066,7 @@ int synth_1to1_stereo_neon64(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) bufl = fr->short_buffs[0]; bufr = fr->short_buffs[1]; - if(fr->bo & 0x1) + if(fr->bo & 0x1) { b0l = bufl[0]; b0r = bufr[0]; diff --git a/sdk/lib/3rdparty/libmpg123/synth_8bit.c b/sdk/lib/3rdparty/libmpg123/synth_8bit.c index 8a9a55fc32b..934deb592e1 100644 --- a/sdk/lib/3rdparty/libmpg123/synth_8bit.c +++ b/sdk/lib/3rdparty/libmpg123/synth_8bit.c @@ -10,7 +10,7 @@ #include "sample.h" #include "debug.h" -/* +/* Part 2: All synth functions that produce 8bit output. What we need is just a special WRITE_SAMPLE. For the generic and i386 functions, that is. For the rather optimized synth_1to1, we will need the postprocessing 8bit converters from synth_8bit.h . diff --git a/sdk/lib/3rdparty/libmpg123/synth_altivec.c b/sdk/lib/3rdparty/libmpg123/synth_altivec.c index e1f3ea19fd3..b4e2d263b23 100644 --- a/sdk/lib/3rdparty/libmpg123/synth_altivec.c +++ b/sdk/lib/3rdparty/libmpg123/synth_altivec.c @@ -258,9 +258,9 @@ int synth_1to1_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) { short *samples = (short *) (fr->buffer.data+fr->buffer.fill); - + real *b0, **buf; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); @@ -276,7 +276,7 @@ int synth_1to1_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) samples++; buf = fr->real_buffs[1]; } - + if(fr->bo & 0x1) { b0 = buf[0]; @@ -289,12 +289,12 @@ int synth_1to1_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) bo1 = fr->bo+1; dct64_altivec(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr); } - - + + { register int j; real *window = fr->decwin + 16 - bo1; - + ALIGNED(16) int clip_tmp[4]; vector float v1,v2,v3,v4,v5,v6,v7,v8,v9; vector unsigned char vperm1,vperm2,vperm3,vperm4; @@ -314,18 +314,18 @@ int synth_1to1_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) vmin = (vector float){-32768.0f,-32768.0f,-32768.0f,-32768.0f}; vperm4 = (vector unsigned char){0,1,18,19,2,3,22,23,4,5,26,27,6,7,30,31}; #endif - + vperm1 = vec_lvsl(0,window); vperm2 = vec_lvsl(0,samples); vperm3 = vec_lvsr(0,samples); for (j=4;j;j--) { SYNTH_ALTIVEC(16); - + vsum = vec_sub(v5,v6); v9 = vec_sub(v7,v8); vsum = vec_add(vsum,v9); - + v3 = vec_round(vsum); v3 = (vector float)vec_cts(v3,0); v1 = (vector float)vec_cmpgt(vsum,vmax); @@ -341,21 +341,21 @@ int synth_1to1_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) vec_st((vector signed short)v7,15,samples); vec_st((vector signed short)v8,0,samples); samples += 8; - + v1 = (vector float)vec_sr((vector unsigned int)v1, vshift); v2 = (vector float)vec_sr((vector unsigned int)v2, vshift); v1 = (vector float)vec_add((vector unsigned int)v1,(vector unsigned int)v2); vclip = vec_sums((vector signed int)v1,vclip); } - + for (j=4;j;j--) { SYNTH_ALTIVEC(-16); - + vsum = vec_add(v5,v6); v9 = vec_add(v7,v8); vsum = vec_add(vsum,v9); - + v3 = vec_round(vsum); v3 = (vector float)vec_cts(v3,0); v1 = (vector float)vec_cmpgt(vsum,vmax); @@ -371,7 +371,7 @@ int synth_1to1_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) vec_st((vector signed short)v7,15,samples); vec_st((vector signed short)v8,0,samples); samples += 8; - + v1 = (vector float)vec_sr((vector unsigned int)v1, vshift); v2 = (vector float)vec_sr((vector unsigned int)v2, vshift); v1 = (vector float)vec_add((vector unsigned int)v1,(vector unsigned int)v2); @@ -382,16 +382,16 @@ int synth_1to1_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) clip = clip_tmp[3]; } if(final) fr->buffer.fill += 128; - + return clip; } int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr) { short *samples = (short *) (fr->buffer.data+fr->buffer.fill); - + real *b0l, *b0r, **bufl, **bufr; - int clip; + int clip; int bo1; #ifndef NO_EQUALIZER if(fr->have_eq_settings) @@ -404,7 +404,7 @@ int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *f fr->bo &= 0xf; bufl = fr->real_buffs[0]; bufr = fr->real_buffs[1]; - + if(fr->bo & 0x1) { b0l = bufl[0]; @@ -421,12 +421,12 @@ int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *f dct64_altivec(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l); dct64_altivec(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r); } - - + + { register int j; real *window = fr->decwin + 16 - bo1; - + ALIGNED(16) int clip_tmp[4]; vector float v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13; vector unsigned char vperm1,vperm2; @@ -444,21 +444,21 @@ int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *f vmax = (vector float){32767.0f,32767.0f,32767.0f,32767.0f}; vmin = (vector float){-32768.0f,-32768.0f,-32768.0f,-32768.0f}; #endif - + vperm1 = vec_lvsl(0,window); vperm2 = vec_lvsr(0,samples); vprev = vec_perm(vec_ld(0,samples),vec_ld(0,samples),vec_lvsl(0,samples)); for (j=4;j;j--) { SYNTH_STEREO_ALTIVEC(16); - + vsum = vec_sub(vsum,vsum2); vsum2 = vec_sub(vsum5,vsum6); vsum3 = vec_sub(vsum3,vsum4); vsum4 = vec_sub(vsum7,vsum8); vsum = vec_add(vsum,vsum3); vsum2 = vec_add(vsum2,vsum4); - + v1 = vec_round(vsum); v2 = vec_round(vsum2); v1 = (vector float)vec_cts(v1,0); @@ -474,7 +474,7 @@ int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *f v4 = (vector float)vec_cmplt(vsum2,vmin); vec_st((vector signed short)v6,0,samples); samples += 8; - + v1 = (vector float)vec_sr((vector unsigned int)v1, vshift); v2 = (vector float)vec_sr((vector unsigned int)v2, vshift); v3 = (vector float)vec_sr((vector unsigned int)v3, vshift); @@ -484,18 +484,18 @@ int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *f vclip = vec_sums((vector signed int)v1,vclip); vclip = vec_sums((vector signed int)v2,vclip); } - + for (j=4;j;j--) { SYNTH_STEREO_ALTIVEC(-16); - + vsum = vec_add(vsum,vsum2); vsum2 = vec_add(vsum5,vsum6); vsum3 = vec_add(vsum3,vsum4); vsum4 = vec_add(vsum7,vsum8); vsum = vec_add(vsum,vsum3); vsum2 = vec_add(vsum2,vsum4); - + v1 = vec_round(vsum); v2 = vec_round(vsum2); v1 = (vector float)vec_cts(v1,0); @@ -511,7 +511,7 @@ int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *f v4 = (vector float)vec_cmplt(vsum2,vmin); vec_st((vector signed short)v6,0,samples); samples += 8; - + v1 = (vector float)vec_sr((vector unsigned int)v1, vshift); v2 = (vector float)vec_sr((vector unsigned int)v2, vshift); v3 = (vector float)vec_sr((vector unsigned int)v3, vshift); @@ -521,7 +521,7 @@ int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *f vclip = vec_sums((vector signed int)v1,vclip); vclip = vec_sums((vector signed int)v2,vclip); } - + if((size_t)samples & 0xf) { v1 = (vector float)vec_perm(vec_ld(0,samples),vec_ld(0,samples),vec_lvsl(0,samples)); @@ -533,14 +533,14 @@ int synth_1to1_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *f clip = clip_tmp[3]; } fr->buffer.fill += 128; - + return clip; } int synth_1to1_real_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) { real *samples = (real *) (fr->buffer.data+fr->buffer.fill); - + real *b0, **buf; int bo1; #ifndef NO_EQUALIZER @@ -557,7 +557,7 @@ int synth_1to1_real_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fin samples++; buf = fr->real_buffs[1]; } - + if(fr->bo & 0x1) { b0 = buf[0]; @@ -570,12 +570,12 @@ int synth_1to1_real_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fin bo1 = fr->bo+1; dct64_altivec(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr); } - - + + { register int j; real *window = fr->decwin + 16 - bo1; - + vector float v1,v2,v3,v4,v5,v6,v7,v8,v9; vector unsigned char vperm1,vperm2,vperm3,vperm4, vperm5; vector float vsum,vsum2,vsum3,vsum4,vscale,vzero; @@ -590,19 +590,19 @@ int synth_1to1_real_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fin vperm4 = (vector unsigned char){0,1,2,3,20,21,22,23,4,5,6,7,28,29,30,31}; vperm5 = (vector unsigned char){8,9,10,11,20,21,22,23,12,13,14,15,28,29,30,31}; #endif - + vperm1 = vec_lvsl(0,window); vperm2 = vec_lvsl(0,samples); vperm3 = vec_lvsr(0,samples); for (j=4;j;j--) { SYNTH_ALTIVEC(16); - + vsum = vec_sub(v5,v6); v9 = vec_sub(v7,v8); vsum = vec_add(vsum,v9); vsum = vec_madd(vsum, vscale, vzero); - + vsample1 = vec_ld(0,samples); vsample2 = vec_ld(16,samples); vsample3 = vec_ld(31,samples); @@ -620,16 +620,16 @@ int synth_1to1_real_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fin vec_st(v7,0,samples); samples += 8; } - + for (j=4;j;j--) { SYNTH_ALTIVEC(-16); - + vsum = vec_add(v5,v6); v9 = vec_add(v7,v8); vsum = vec_add(vsum,v9); vsum = vec_madd(vsum, vscale, vzero); - + vsample1 = vec_ld(0,samples); vsample2 = vec_ld(16,samples); vsample3 = vec_ld(31,samples); @@ -649,14 +649,14 @@ int synth_1to1_real_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fin } } if(final) fr->buffer.fill += 256; - + return 0; } int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr) { real *samples = (real *) (fr->buffer.data+fr->buffer.fill); - + real *b0l, *b0r, **bufl, **bufr; int bo1; #ifndef NO_EQUALIZER @@ -670,7 +670,7 @@ int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr fr->bo &= 0xf; bufl = fr->real_buffs[0]; bufr = fr->real_buffs[1]; - + if(fr->bo & 0x1) { b0l = bufl[0]; @@ -687,12 +687,12 @@ int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr dct64_altivec(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l); dct64_altivec(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r); } - - + + { register int j; real *window = fr->decwin + 16 - bo1; - + vector float v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13; vector unsigned char vperm1,vperm2; vector float vsum,vsum2,vsum3,vsum4,vsum5,vsum6,vsum7,vsum8,vscale,vzero; @@ -703,14 +703,14 @@ int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr #else vscale = (vector float){1.0f/32768.0f,1.0f/32768.0f,1.0f/32768.0f,1.0f/32768.0f}; #endif - + vperm1 = vec_lvsl(0,window); vperm2 = vec_lvsr(0,samples); vprev = vec_perm(vec_ld(0,samples),vec_ld(0,samples),vec_lvsl(0,samples)); for (j=4;j;j--) { SYNTH_STEREO_ALTIVEC(16); - + vsum = vec_sub(vsum,vsum2); vsum2 = vec_sub(vsum5,vsum6); vsum3 = vec_sub(vsum3,vsum4); @@ -719,7 +719,7 @@ int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr vsum2 = vec_add(vsum2,vsum4); vsum = vec_madd(vsum, vscale, vzero); vsum2 = vec_madd(vsum2, vscale, vzero); - + v1 = vec_mergeh(vsum, vsum2); v2 = vec_mergel(vsum, vsum2); v3 = vec_perm(vprev,v1,vperm2); @@ -729,11 +729,11 @@ int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr vec_st(v4,16,samples); samples += 8; } - + for (j=4;j;j--) { SYNTH_STEREO_ALTIVEC(-16); - + vsum = vec_add(vsum,vsum2); vsum2 = vec_add(vsum5,vsum6); vsum3 = vec_add(vsum3,vsum4); @@ -742,7 +742,7 @@ int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr vsum2 = vec_add(vsum2,vsum4); vsum = vec_madd(vsum, vscale, vzero); vsum2 = vec_madd(vsum2, vscale, vzero); - + v1 = vec_mergeh(vsum, vsum2); v2 = vec_mergel(vsum, vsum2); v3 = vec_perm(vprev,v1,vperm2); @@ -752,7 +752,7 @@ int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr vec_st(v4,16,samples); samples += 8; } - + if((size_t)samples & 0xf) { v1 = (vector float)vec_perm(vec_ld(0,samples),vec_ld(0,samples),vec_lvsl(0,samples)); @@ -761,14 +761,14 @@ int synth_1to1_fltst_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr } } fr->buffer.fill += 256; - + return 0; } int synth_1to1_s32_altivec(real *bandPtr,int channel,mpg123_handle *fr, int final) { int32_t *samples = (int32_t *) (fr->buffer.data+fr->buffer.fill); - + real *b0, **buf; int clip; int bo1; @@ -786,7 +786,7 @@ int synth_1to1_s32_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fina samples++; buf = fr->real_buffs[1]; } - + if(fr->bo & 0x1) { b0 = buf[0]; @@ -799,12 +799,12 @@ int synth_1to1_s32_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fina bo1 = fr->bo+1; dct64_altivec(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr); } - - + + { register int j; real *window = fr->decwin + 16 - bo1; - + ALIGNED(16) int clip_tmp[4]; vector float v1,v2,v3,v4,v5,v6,v7,v8,v9; vector unsigned char vperm1,vperm2,vperm3,vperm4,vperm5; @@ -826,21 +826,21 @@ int synth_1to1_s32_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fina vperm4 = (vector unsigned char){0,1,2,3,20,21,22,23,4,5,6,7,28,29,30,31}; vperm5 = (vector unsigned char){8,9,10,11,20,21,22,23,12,13,14,15,28,29,30,31}; #endif - + vperm1 = vec_lvsl(0,window); vperm2 = vec_lvsl(0,samples); vperm3 = vec_lvsr(0,samples); for (j=4;j;j--) { SYNTH_ALTIVEC(16); - + vsum = vec_sub(v5,v6); v9 = vec_sub(v7,v8); v1 = vec_add(vsum,v9); vsum = (vector float)vec_cts(v1,16); v8 = (vector float)vec_cmpgt(v1,vmax); v9 = (vector float)vec_cmplt(v1,vmin); - + vsample1 = vec_ld(0,samples); vsample2 = vec_ld(16,samples); vsample3 = vec_ld(31,samples); @@ -857,24 +857,24 @@ int synth_1to1_s32_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fina vec_st((vector signed int)v6,16,samples); vec_st((vector signed int)v7,0,samples); samples += 8; - + v1 = (vector float)vec_sr((vector unsigned int)v8, vshift); v2 = (vector float)vec_sr((vector unsigned int)v9, vshift); v1 = (vector float)vec_add((vector unsigned int)v1,(vector unsigned int)v2); vclip = vec_sums((vector signed int)v1,vclip); } - + for (j=4;j;j--) { SYNTH_ALTIVEC(-16); - + vsum = vec_add(v5,v6); v9 = vec_add(v7,v8); v1 = vec_add(vsum,v9); vsum = (vector float)vec_cts(v1,16); v8 = (vector float)vec_cmpgt(v1,vmax); v9 = (vector float)vec_cmplt(v1,vmin); - + vsample1 = vec_ld(0,samples); vsample2 = vec_ld(16,samples); vsample3 = vec_ld(31,samples); @@ -891,18 +891,18 @@ int synth_1to1_s32_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fina vec_st((vector signed int)v6,16,samples); vec_st((vector signed int)v7,0,samples); samples += 8; - + v1 = (vector float)vec_sr((vector unsigned int)v8, vshift); v2 = (vector float)vec_sr((vector unsigned int)v9, vshift); v1 = (vector float)vec_add((vector unsigned int)v1,(vector unsigned int)v2); vclip = vec_sums((vector signed int)v1,vclip); } - + vec_st(vclip,0,clip_tmp); clip = clip_tmp[3]; } if(final) fr->buffer.fill += 256; - + return clip; } @@ -910,7 +910,7 @@ int synth_1to1_s32_altivec(real *bandPtr,int channel,mpg123_handle *fr, int fina int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr) { int32_t *samples = (int32_t *) (fr->buffer.data+fr->buffer.fill); - + real *b0l, *b0r, **bufl, **bufr; int clip; int bo1; @@ -925,7 +925,7 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl fr->bo &= 0xf; bufl = fr->real_buffs[0]; bufr = fr->real_buffs[1]; - + if(fr->bo & 0x1) { b0l = bufl[0]; @@ -942,12 +942,12 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl dct64_altivec(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l); dct64_altivec(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r); } - - + + { register int j; real *window = fr->decwin + 16 - bo1; - + ALIGNED(16) int clip_tmp[4]; vector float v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13; vector unsigned char vperm1,vperm2; @@ -965,14 +965,14 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl vmax = (vector float){32767.999f,32767.999f,32767.999f,32767.999f}; vmin = (vector float){-32768.0f,-32768.0f,-32768.0f,-32768.0f}; #endif - + vperm1 = vec_lvsl(0,window); vperm2 = vec_lvsr(0,samples); vprev = (vector float)vec_perm(vec_ld(0,samples),vec_ld(0,samples),vec_lvsl(0,samples)); for (j=4;j;j--) { SYNTH_STEREO_ALTIVEC(16); - + vsum = vec_sub(vsum,vsum2); vsum2 = vec_sub(vsum5,vsum6); vsum3 = vec_sub(vsum3,vsum4); @@ -985,7 +985,7 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl v6 = (vector float)vec_cmplt(v1,vmin); v7 = (vector float)vec_cmpgt(v2,vmax); v8 = (vector float)vec_cmplt(v2,vmin); - + v1 = vec_mergeh(vsum, vsum2); v2 = vec_mergel(vsum, vsum2); v3 = vec_perm(vprev,v1,vperm2); @@ -994,7 +994,7 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl vec_st((vector signed int)v3,0,samples); vec_st((vector signed int)v4,16,samples); samples += 8; - + v1 = (vector float)vec_sr((vector unsigned int)v5, vshift); v2 = (vector float)vec_sr((vector unsigned int)v6, vshift); v3 = (vector float)vec_sr((vector unsigned int)v7, vshift); @@ -1004,11 +1004,11 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl vclip = vec_sums((vector signed int)v1,vclip); vclip = vec_sums((vector signed int)v2,vclip); } - + for (j=4;j;j--) { SYNTH_STEREO_ALTIVEC(-16); - + vsum = vec_add(vsum,vsum2); vsum2 = vec_add(vsum5,vsum6); vsum3 = vec_add(vsum3,vsum4); @@ -1021,7 +1021,7 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl v6 = (vector float)vec_cmplt(v1,vmin); v7 = (vector float)vec_cmpgt(v2,vmax); v8 = (vector float)vec_cmplt(v2,vmin); - + v1 = vec_mergeh(vsum, vsum2); v2 = vec_mergel(vsum, vsum2); v3 = vec_perm(vprev,v1,vperm2); @@ -1030,7 +1030,7 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl vec_st((vector signed int)v3,0,samples); vec_st((vector signed int)v4,16,samples); samples += 8; - + v1 = (vector float)vec_sr((vector unsigned int)v5, vshift); v2 = (vector float)vec_sr((vector unsigned int)v6, vshift); v3 = (vector float)vec_sr((vector unsigned int)v7, vshift); @@ -1040,18 +1040,18 @@ int synth_1to1_s32_stereo_altivec(real *bandPtr_l, real *bandPtr_r, mpg123_handl vclip = vec_sums((vector signed int)v1,vclip); vclip = vec_sums((vector signed int)v2,vclip); } - + if((size_t)samples & 0xf) { v1 = (vector float)vec_perm(vec_ld(0,samples),vec_ld(0,samples),vec_lvsl(0,samples)); v2 = (vector float)vec_perm(vprev,v1,vperm2); vec_st((vector signed int)v2,0,samples); } - + vec_st(vclip,0,clip_tmp); clip = clip_tmp[3]; } fr->buffer.fill += 256; - + return clip; } diff --git a/sdk/lib/3rdparty/libmpg123/synth_i486.c b/sdk/lib/3rdparty/libmpg123/synth_i486.c index 01b0119d00a..de7d4718a25 100644 --- a/sdk/lib/3rdparty/libmpg123/synth_i486.c +++ b/sdk/lib/3rdparty/libmpg123/synth_i486.c @@ -8,8 +8,8 @@ One has to see if the modification for non-static memory kills this optimization (cache locality?). */ -/* - * Subband Synthesis for MPEG Audio. +/* + * Subband Synthesis for MPEG Audio. * * Version optimized for 80486 by using integer arithmetic, * multiplications by shift and add, and by increasing locality in @@ -19,7 +19,7 @@ * Note: this version does not guaranty a good accuracy. The filter * coefficients are quantified on 14 bits. * - * (c) 1998 Fabrice Bellard + * (c) 1998 Fabrice Bellard */ #include "mpg123lib_intern.h" @@ -109,7 +109,7 @@ int absynth_1to1_i486(real *bandPtr, int channel, mpg123_handle *fr, int nb_bloc { short *samples = (short *) (fr->buffer.data+fr->buffer.fill); int *b0,**buf; - int clip = 0; + int clip = 0; int block,b,bo_start; /* samples address */ @@ -126,7 +126,7 @@ int absynth_1to1_i486(real *bandPtr, int channel, mpg123_handle *fr, int nb_bloc if (b >= FIR_BUFFER_SIZE) { int *p,*q; int c,i,j; - + /* we shift the buffers */ for(c=0;c<2;c++) { p=&buf[c][0]+1; @@ -140,7 +140,7 @@ int absynth_1to1_i486(real *bandPtr, int channel, mpg123_handle *fr, int nb_bloc /* we update 'bo' accordingly */ b=fr->i486bo[channel]=FIR_SIZE; } - + if(b & 1) { dct64_i486(buf[1]+b,buf[0]+b,bandPtr); } else { @@ -167,11 +167,11 @@ int absynth_1to1_i486(real *bandPtr, int channel, mpg123_handle *fr, int nb_bloc FIR16_2(2,-6,50,-86,520,-1106,1910,-8447,18714,10294,1322,1469,488,145,55,8,0, 30,0,-8,55,-145,488,-1469,1322,-10294,18714,8447,1910,1106,520,86,50,6); FIR16_2(3,-5,49,-73,521,-1015,2023,-7986,18657,10751,1140,1559,473,161,56,9,0, - 29,0,-9,56,-161,473,-1559,1140,-10751,18657,7986,2023,1015,521,73,49,5); + 29,0,-9,56,-161,473,-1559,1140,-10751,18657,7986,2023,1015,521,73,49,5); samples+=64; } samples-=64*nb_blocks; - + /* filter bank: part 2 */ b=bo_start; @@ -191,7 +191,7 @@ int absynth_1to1_i486(real *bandPtr, int channel, mpg123_handle *fr, int nb_bloc FIR16_2(6,-4,44,-38,514,-751,2284,-6620,18353,12097,509,1817,411,212,57,12,0, 26,0,-12,57,-212,411,-1817,509,-12097,18353,6620,2284,751,514,38,44,4); FIR16_2(7,-3,42,-27,508,-665,2347,-6173,18208,12534,270,1899,383,229,56,13,0, - 25,0,-13,56,-229,383,-1899,270,-12534,18208,6173,2347,665,508,27,42,3); + 25,0,-13,56,-229,383,-1899,270,-12534,18208,6173,2347,665,508,27,42,3); samples+=64; } @@ -216,7 +216,7 @@ int absynth_1to1_i486(real *bandPtr, int channel, mpg123_handle *fr, int nb_bloc FIR16_2(10,-2,36,0,479,-423,2465,-4869,17647,13794,-530,2122,282,284,53,17,0, 22,0,-17,53,-284,282,-2122,-530,-13794,17647,4869,2465,423,479,0,36,2); FIR16_2(11,-2,34,7,467,-347,2483,-4449,17419,14194,-825,2188,242,302,52,18,0, - 21,0,-18,52,-302,242,-2188,-825,-14194,17419,4449,2483,347,467,-7,34,2); + 21,0,-18,52,-302,242,-2188,-825,-14194,17419,4449,2483,347,467,-7,34,2); samples+=64; } @@ -242,7 +242,7 @@ int absynth_1to1_i486(real *bandPtr, int channel, mpg123_handle *fr, int nb_bloc 18,-1,-22,44,-357,100,-2354,-1788,-15322,16623,3245,2479,136,424,-26,29,1); FIR16_2(15,-1,27,31,408,-72,2459,-2863,16322,15671,-2135,2396,46,374,40,24,-1, 17,-1,-24,40,-374,46,-2396,-2135,-15671,16322,2863,2459,72,408,-31,27,1); - FIR16_1(16,-1,0,36,0,-11,0,-2493,0,16004,0,2431,0,391,0,26,0); + FIR16_1(16,-1,0,36,0,-11,0,-2493,0,16004,0,2431,0,391,0,26,0); samples+=64; } diff --git a/sdk/lib/3rdparty/libmpg123/synth_real.c b/sdk/lib/3rdparty/libmpg123/synth_real.c index fe8cf8676ad..19d00e94166 100644 --- a/sdk/lib/3rdparty/libmpg123/synth_real.c +++ b/sdk/lib/3rdparty/libmpg123/synth_real.c @@ -13,7 +13,7 @@ #ifdef REAL_IS_FIXED #error "Do not build this file with fixed point math!" #else -/* +/* Part 3: All synth functions that produce float output. What we need is just a special WRITE_SAMPLE. For the generic and i386 functions, that is. The optimized synths would need to be changed internally to support float output. diff --git a/sdk/lib/3rdparty/libmpg123/synth_s32.c b/sdk/lib/3rdparty/libmpg123/synth_s32.c index b44d8e19653..21465fc1f93 100644 --- a/sdk/lib/3rdparty/libmpg123/synth_s32.c +++ b/sdk/lib/3rdparty/libmpg123/synth_s32.c @@ -13,7 +13,7 @@ #ifdef REAL_IS_FIXED #error "Do not build this file with fixed point math!" #else -/* +/* Part 4: All synth functions that produce signed 32 bit output. What we need is just a special WRITE_SAMPLE. */ diff --git a/sdk/lib/3rdparty/libmpg123/tabinit.c b/sdk/lib/3rdparty/libmpg123/tabinit.c index c21d2f3a3f1..666dee4ceab 100644 --- a/sdk/lib/3rdparty/libmpg123/tabinit.c +++ b/sdk/lib/3rdparty/libmpg123/tabinit.c @@ -17,7 +17,7 @@ static ALIGNED(16) real cos16[4]; static ALIGNED(16) real cos8[2]; static ALIGNED(16) real cos4[1]; #elif defined(REAL_IS_FIXED) && defined(PRECALC_TABLES) -static real cos64[16] = +static real cos64[16] = { 8398725,8480395,8647771,8909416,9279544,9780026,10443886,11321405, 12491246,14081950,16316987,19619946,24900150,34523836,57170182,170959967 @@ -120,24 +120,24 @@ void make_decode_tables_mmx(mpg123_handle *fr) { if(idx < 512+16) fr->decwin_mmx[idx+16] = fr->decwin_mmx[idx] = DOUBLE_TO_REAL((double) intwinbase[j] * scaleval); - + if(i % 32 == 31) idx -= 1023; if(i % 64 == 63) scaleval = - scaleval; } - + for( /* i=256 */ ;i<512;i++,j--,idx+=32) { if(idx < 512+16) fr->decwin_mmx[idx+16] = fr->decwin_mmx[idx] = DOUBLE_TO_REAL((double) intwinbase[j] * scaleval); - + if(i % 32 == 31) idx -= 1023; if(i % 64 == 63) scaleval = - scaleval; } - + for(i=0; i<512; i++) { if(i&1) val = rounded(fr->decwin_mmx[i]*0.5); else val = rounded(fr->decwin_mmx[i]*-0.5); diff --git a/sdk/lib/3rdparty/libxml2/include/win32config.h b/sdk/lib/3rdparty/libxml2/include/win32config.h index 54392f4961e..ffbd7051280 100644 --- a/sdk/lib/3rdparty/libxml2/include/win32config.h +++ b/sdk/lib/3rdparty/libxml2/include/win32config.h @@ -28,7 +28,7 @@ #endif /* - * Windows platforms may define except + * Windows platforms may define except */ #undef except @@ -37,9 +37,9 @@ #include #if defined(_MSC_VER) || defined(__BORLANDC__) /* MS C-runtime has functions which can be used in order to determine if - a given floating-point variable contains NaN, (+-)INF. These are + a given floating-point variable contains NaN, (+-)INF. These are preferred, because floating-point technology is considered proprietary - by MS and we can assume that their functions know more about their + by MS and we can assume that their functions know more about their oddities than we do. */ #include /* Bjorn Reese figured a quite nice construct for isinf() using the _fpclass diff --git a/sdk/lib/3rdparty/libxml2/parser.c b/sdk/lib/3rdparty/libxml2/parser.c index d1c319631fc..6025c0ed19e 100644 --- a/sdk/lib/3rdparty/libxml2/parser.c +++ b/sdk/lib/3rdparty/libxml2/parser.c @@ -7580,7 +7580,7 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) { * not contain a <. */ else if ((ctxt->instate == XML_PARSER_ATTRIBUTE_VALUE) && - (ent != NULL) && + (ent != NULL) && (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY)) { if (((ent->checked & 1) || (ent->checked == 0)) && (ent->content != NULL) && (xmlStrchr(ent->content, '<'))) { diff --git a/sdk/lib/3rdparty/stlport/src/_stdio_file.h b/sdk/lib/3rdparty/stlport/src/_stdio_file.h index d913fc4484a..57fc7018630 100644 --- a/sdk/lib/3rdparty/stlport/src/_stdio_file.h +++ b/sdk/lib/3rdparty/stlport/src/_stdio_file.h @@ -54,7 +54,7 @@ inline int _FILE_fd(const FILE *__f) { } /* Normal files. */ - return (int)::_fileno((FILE*)__f); + return (int)::_fileno((FILE*)__f); } # elif defined (_STLP_SCO_OPENSERVER) || defined (__NCR_SVR) diff --git a/sdk/lib/3rdparty/stlport/src/c_locale_dummy/c_locale_dummy.c b/sdk/lib/3rdparty/stlport/src/c_locale_dummy/c_locale_dummy.c index be48f230630..901a7ece22e 100644 --- a/sdk/lib/3rdparty/stlport/src/c_locale_dummy/c_locale_dummy.c +++ b/sdk/lib/3rdparty/stlport/src/c_locale_dummy/c_locale_dummy.c @@ -207,14 +207,14 @@ _Locale_mask_t _WLocale_ctype(struct _Locale_ctype *lctype, wint_t wc, _Locale_m _Locale_mask_t ret = 0; if ((mask & _Locale_ALPHA) != 0 && iswalpha(wc)) ret |= _Locale_ALPHA; - + if ((mask & _Locale_CNTRL) != 0 && iswcntrl(wc)) ret |= _Locale_CNTRL; if ((mask & _Locale_DIGIT) != 0 && iswdigit(wc)) ret |= _Locale_DIGIT; - if ((mask & _Locale_PRINT) != 0 && iswprint(wc)) + if ((mask & _Locale_PRINT) != 0 && iswprint(wc)) ret |= _Locale_PRINT; if ((mask & _Locale_PUNCT) != 0 && iswpunct(wc)) diff --git a/sdk/lib/3rdparty/stlport/src/c_locale_glibc/c_locale_glibc2.c b/sdk/lib/3rdparty/stlport/src/c_locale_glibc/c_locale_glibc2.c index 0cf8279d5b7..70b5d5a9276 100644 --- a/sdk/lib/3rdparty/stlport/src/c_locale_glibc/c_locale_glibc2.c +++ b/sdk/lib/3rdparty/stlport/src/c_locale_glibc/c_locale_glibc2.c @@ -75,7 +75,7 @@ struct _Locale_numeric *_Locale_numeric_create(const char *nm, struct _Locale_na *__err_code = _STLP_LOC_UNKNOWN_NAME; return (struct _Locale_numeric*)newlocale(LC_NUMERIC_MASK, nm, NULL); } - + struct _Locale_time *_Locale_time_create(const char *nm, struct _Locale_name_hint* hint, int *__err_code) { *__err_code = _STLP_LOC_UNKNOWN_NAME; @@ -296,14 +296,14 @@ _Locale_mask_t _WLocale_ctype( struct _Locale_ctype *__loc, wint_t wc, _Locale_m _Locale_mask_t ret = 0; if ((__mask & _Locale_ALPHA) != 0 && iswalpha_l(wc, (locale_t)__loc)) ret |= _Locale_ALPHA; - + if ((__mask & _Locale_CNTRL) != 0 && iswcntrl_l(wc, (locale_t)__loc)) ret |= _Locale_CNTRL; if ((__mask & _Locale_DIGIT) != 0 && iswdigit_l(wc, (locale_t)__loc)) ret |= _Locale_DIGIT; - if ((__mask & _Locale_PRINT) != 0 && iswprint_l(wc, (locale_t)__loc)) + if ((__mask & _Locale_PRINT) != 0 && iswprint_l(wc, (locale_t)__loc)) ret |= _Locale_PRINT; if ((__mask & _Locale_PUNCT) != 0 && iswpunct_l(wc, (locale_t)__loc)) diff --git a/sdk/lib/3rdparty/stlport/src/c_locale_win32/c_locale_win32.c b/sdk/lib/3rdparty/stlport/src/c_locale_win32/c_locale_win32.c index dab958d173f..513f581b1fe 100644 --- a/sdk/lib/3rdparty/stlport/src/c_locale_win32/c_locale_win32.c +++ b/sdk/lib/3rdparty/stlport/src/c_locale_win32/c_locale_win32.c @@ -717,7 +717,7 @@ _Locale_time_t* _Locale_time_create(const char * name, _Locale_lcid_t* lc_hint, wchar_t wbuf80[80]; _Locale_time_t *ltime = (_Locale_time_t*)malloc(sizeof(_Locale_time_t)); - + if (!ltime) { *__err_code = _STLP_LOC_NO_MEMORY; return ltime; } memset(ltime, 0, sizeof(_Locale_time_t)); diff --git a/sdk/lib/3rdparty/stlport/src/details/fstream_win32io.cpp b/sdk/lib/3rdparty/stlport/src/details/fstream_win32io.cpp index 673f3670c18..d92806dd4ad 100644 --- a/sdk/lib/3rdparty/stlport/src/details/fstream_win32io.cpp +++ b/sdk/lib/3rdparty/stlport/src/details/fstream_win32io.cpp @@ -73,7 +73,7 @@ static bool __is_regular_file(_STLP_fd fd) { BY_HANDLE_FILE_INFORMATION info; // Return true if the file handle isn't a directory. - return GetFileInformationByHandle(fd, &info) && + return GetFileInformationByHandle(fd, &info) && ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0); } diff --git a/sdk/lib/3rdparty/stlport/src/facets_byname.cpp b/sdk/lib/3rdparty/stlport/src/facets_byname.cpp index 07d1a3d67cc..48b7d6b5002 100644 --- a/sdk/lib/3rdparty/stlport/src/facets_byname.cpp +++ b/sdk/lib/3rdparty/stlport/src/facets_byname.cpp @@ -418,7 +418,7 @@ codecvt_byname::do_length(state_type& state, __count += chars_read; from += chars_read; } - return int(__count); + return int(__count); } int diff --git a/sdk/lib/3rdparty/stlport/src/locale_impl.cpp b/sdk/lib/3rdparty/stlport/src/locale_impl.cpp index 103b60336f2..3284bb5360d 100644 --- a/sdk/lib/3rdparty/stlport/src/locale_impl.cpp +++ b/sdk/lib/3rdparty/stlport/src/locale_impl.cpp @@ -197,7 +197,7 @@ _Locale_name_hint* _Locale_impl::insert_ctype_facets(const char* &name, char *bu wct = new ctype_byname(__lwct); } _STLP_UNWIND(_STLP_PRIV __release_ctype(__lwct)); - + _Locale_codecvt *__lwcvt = _STLP_PRIV __acquire_codecvt(name, buf, hint, &__err_code); if (__lwcvt) { _STLP_TRY { @@ -478,7 +478,7 @@ _Locale_name_hint* _Locale_impl::insert_monetary_facets(const char* &name, char wpunct = new moneypunct_byname(__wmon); } _STLP_UNWIND(_STLP_PRIV __release_monetary(__wmon)); - + _Locale_monetary *__wimon = _STLP_PRIV __acquire_monetary(name, buf, hint, &__err_code); if (!__wimon) { delete wpunct; diff --git a/sdk/lib/3rdparty/stlport/src/message_facets.h b/sdk/lib/3rdparty/stlport/src/message_facets.h index 946b5291b06..1763439d13d 100644 --- a/sdk/lib/3rdparty/stlport/src/message_facets.h +++ b/sdk/lib/3rdparty/stlport/src/message_facets.h @@ -40,7 +40,7 @@ struct _Catalog_locale_map { locale lookup(nl_catd_type key) const; void erase(nl_catd_type key); - typedef hash_map, equal_to, + typedef hash_map, equal_to, allocator > > map_type; map_type *M; @@ -128,8 +128,8 @@ public: wstring do_get(catalog __c, int __set, int __msgid, const wstring& __dfault) const; #endif - void do_close(catalog __c) const; - ~_Messages(); + void do_close(catalog __c) const; + ~_Messages(); private: _Locale_messages* _M_message_obj; diff --git a/sdk/lib/3rdparty/stlport/src/num_put_float.cpp b/sdk/lib/3rdparty/stlport/src/num_put_float.cpp index cb5c4468605..3de395033a4 100644 --- a/sdk/lib/3rdparty/stlport/src/num_put_float.cpp +++ b/sdk/lib/3rdparty/stlport/src/num_put_float.cpp @@ -401,7 +401,7 @@ static void __fill_fmtbuf(char* fmtbuf, ios_base::fmtflags flags, char long_modi static char* _Stl_ecvtR(long double x, int n, int* pt, int* sign, char* buf) { // If long double value can be safely converted to double without losing precision // we use the ecvt function for double: - double y = __STATIC_CAST(double, x); + double y = __STATIC_CAST(double, x); if (x == y) return _Stl_ecvtR(y, n, pt, sign, buf); @@ -796,7 +796,7 @@ static size_t __write_floatT(__iostring &buf, ios_base::fmtflags flags, int pre case ios_base::fixed: { /* Here, number of digits represents digits _after_ decimal point. - * In order to limit static buffer size we have to give 2 different values depending on x value. + * In order to limit static buffer size we have to give 2 different values depending on x value. * For small values (abs(x) < 1) we need as many digits as requested by precision limited by the maximum number of digits * which is min_exponent10 + digits10 + 2 * For bigger values we won't have more than limits::digits10 + 2 digits after decimal point. */ diff --git a/sdk/lib/3rdparty/stlport/test/eh/nc_alloc.cpp b/sdk/lib/3rdparty/stlport/test/eh/nc_alloc.cpp index f76a2d7e2cc..647d43329a7 100644 --- a/sdk/lib/3rdparty/stlport/test/eh/nc_alloc.cpp +++ b/sdk/lib/3rdparty/stlport/test/eh/nc_alloc.cpp @@ -194,7 +194,7 @@ static void* OperatorNew( size_t s ) { using_alloc_set = true; bool inserted = alloc_set().insert(p).second; // Suppress warning about unused variable. - inserted; + inserted; EH_ASSERT(inserted); using_alloc_set = false; } diff --git a/sdk/lib/3rdparty/stlport/test/unit/boost_check.cpp b/sdk/lib/3rdparty/stlport/test/unit/boost_check.cpp index 4bf7b95659a..35e94d9a8fa 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/boost_check.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/boost_check.cpp @@ -1,4 +1,4 @@ -#ifndef WITHOUT_STLPORT +#ifndef WITHOUT_STLPORT #include #ifdef _STLP_USE_BOOST_SUPPORT diff --git a/sdk/lib/3rdparty/stlport/test/unit/complete_digits.h b/sdk/lib/3rdparty/stlport/test/unit/complete_digits.h index 0a3d933a5e4..574924e1d62 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/complete_digits.h +++ b/sdk/lib/3rdparty/stlport/test/unit/complete_digits.h @@ -3,7 +3,7 @@ #include -inline void +inline void #if !defined (STLPORT) || defined (_STLP_USE_NAMESPACES) complete_digits(std::string &digits) #else diff --git a/sdk/lib/3rdparty/stlport/test/unit/copy_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/copy_test.cpp index 852e687764d..44d6b3b43c3 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/copy_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/copy_test.cpp @@ -50,7 +50,7 @@ void CopyTest::copy_volatile() { int a[] = {0, 1, 2, 3, 4, 5}; const size_t size = sizeof(a) / sizeof(a[0]); - volatile int va[size]; + volatile int va[size]; copy(a, a + size, va); for (size_t i = 0; i != size; ++i) { CPPUNIT_ASSERT( a[i] == va[i] ); @@ -60,7 +60,7 @@ void CopyTest::copy_volatile() { const int a[] = {0, 1, 2, 3, 4, 5}; const size_t size = sizeof(a) / sizeof(a[0]); - volatile int va[size]; + volatile int va[size]; copy(a, a + size, va); for (size_t i = 0; i != size; ++i) { CPPUNIT_ASSERT( a[i] == va[i] ); @@ -72,7 +72,7 @@ void CopyTest::copy_volatile() { int a[] = {0, 1, 2, 3, 4, 5}; const size_t size = sizeof(a) / sizeof(a[0]); - const volatile int va[size] = {5, 4, 3, 2, 1, 0}; + const volatile int va[size] = {5, 4, 3, 2, 1, 0}; copy(a, a + size, va); for (size_t i = 0; i != size; ++i) { CPPUNIT_ASSERT( a[i] == va[i] ); diff --git a/sdk/lib/3rdparty/stlport/test/unit/fstream_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/fstream_test.cpp index bba41a202ac..9e6c0b3ea7f 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/fstream_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/fstream_test.cpp @@ -305,15 +305,15 @@ void FstreamTest::tellp() */ { #ifdef WIN32 - //In Windows, stlport and fopen use kernel32.CreateFile for open. + //In Windows, stlport and fopen use kernel32.CreateFile for open. //File position is at BOF after open, unless we open with ios_base::ate - long expected_pos = 0; + long expected_pos = 0; #else //On UNIX flavours, stlport and fopen use unix's open //File position is at EOF after open // //3rd possible scenario, "other platforms" - _STLP_USE_STDIO_IO - //stlport uses fopen here. This case may fail this test, since the file position after + //stlport uses fopen here. This case may fail this test, since the file position after //fopen is implementation-dependent long expected_pos = 9; #endif @@ -332,8 +332,8 @@ void FstreamTest::tellp() fclose( f ); } { - //In append mode, file is positioned at EOF just before a write. - // After a write, file is at EOF. This is implementation-independent. + //In append mode, file is positioned at EOF just before a write. + // After a write, file is at EOF. This is implementation-independent. ofstream o( "test_file.txt", ios_base::app | ios_base::out ); o << "X"; CPPUNIT_CHECK( o.rdbuf()->pubseekoff( 0, ios_base::cur, ios_base::out ) == ofstream::pos_type(10) ); @@ -855,7 +855,7 @@ void FstreamTest::null_buf() testcase for bug #1830513: in _istream.c - + template < class _CharT, class _Traits, class _Is_Delim> streamsize _STLP_CALL __read_unbuffered(basic_istream<_CharT, _Traits>* __that, basic_streambuf<_CharT, _Traits>* __buf, diff --git a/sdk/lib/3rdparty/stlport/test/unit/locale_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/locale_test.cpp index 71d3da9990f..927a26fed01 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/locale_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/locale_test.cpp @@ -318,7 +318,7 @@ void LocaleTest::combine() } { - // Check auto combination do not result in weird reference counting behavior + // Check auto combination do not result in weird reference counting behavior // (might generate a crash). loc1.combine >(loc1); } diff --git a/sdk/lib/3rdparty/stlport/test/unit/num_put_get_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/num_put_get_test.cpp index 13b250f358f..4dbbc6b7849 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/num_put_get_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/num_put_get_test.cpp @@ -408,7 +408,7 @@ void NumPutGetTest::num_put_float() complete_digits(digits); CPPUNIT_CHECK(output == string("1.23457e+") + digits ); } - + { ostringstream ostr; ostr << setprecision(200) << 1.23457e+17f; @@ -416,7 +416,7 @@ void NumPutGetTest::num_put_float() output = reset_stream(ostr); CPPUNIT_CHECK( output.size() < 200 ); } - + { ostringstream ostr; ostr << setprecision(200) << numeric_limits::min(); @@ -424,7 +424,7 @@ void NumPutGetTest::num_put_float() output = reset_stream(ostr); CPPUNIT_CHECK( output.size() < 200 ); } - + { ostringstream ostr; ostr << fixed << 1.23457e+17f; @@ -1065,7 +1065,7 @@ void NumPutGetTest::pointer() void *p = (void *)0xff00; sprintf( buf, "%p", p ); // cerr << buf << endl; - // Hmmm, I see 0xff00 on box with 32-bits address; pointer like 'unsigned hex'? + // Hmmm, I see 0xff00 on box with 32-bits address; pointer like 'unsigned hex'? if ( sizeof( p ) == 2 ) { CPPUNIT_ASSERT( strcmp( buf, "0xff00" ) == 0 ); } else if ( sizeof( p ) == 4 ) { diff --git a/sdk/lib/3rdparty/stlport/test/unit/rope_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/rope_test.cpp index c12fec873d1..80452a6e77d 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/rope_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/rope_test.cpp @@ -56,7 +56,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(RopeTest); // void RopeTest::io() { -#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) && !defined (_STLP_USE_NO_IOSTREAMS) +#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) && !defined (_STLP_USE_NO_IOSTREAMS) char const* cstr = "rope test string"; crope rstr(cstr); @@ -72,7 +72,7 @@ void RopeTest::io() void RopeTest::find1() { -#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) +#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) crope r("Fuzzy Wuzzy was a bear"); crope::size_type n = r.find( "hair" ); CPPUNIT_ASSERT( n == crope::npos ); @@ -85,7 +85,7 @@ void RopeTest::find1() void RopeTest::find2() { -#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) +#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) crope r("Fuzzy Wuzzy was a bear"); crope::size_type n = r.find( 'e' ); CPPUNIT_ASSERT( n == (r.size() - 3) ); @@ -94,7 +94,7 @@ void RopeTest::find2() void RopeTest::construct_from_char() { -#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) +#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) crope r('1'); char const* s = r.c_str(); CPPUNIT_ASSERT( '1' == s[0] && '\0' == s[1] ); @@ -104,7 +104,7 @@ void RopeTest::construct_from_char() // Test used for a bug report from Peter Hercek void RopeTest::bug_report() { -#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) +#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS) //first create a rope bigger than crope::_S_copy_max = 23 // so that any string addition is added to a new leaf crope evilRope("12345678901234567890123_"); diff --git a/sdk/lib/3rdparty/stlport/test/unit/slist_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/slist_test.cpp index 383ece29a9f..3fb80d40bc0 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/slist_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/slist_test.cpp @@ -28,11 +28,11 @@ using namespace __gnu_cxx; class SlistTest : public CPPUNIT_NS::TestCase { CPPUNIT_TEST_SUITE(SlistTest); -#if !defined (STLPORT) || defined (_STLP_NO_EXTENSIONS) || defined (_STLP_USE_NO_IOSTREAMS) +#if !defined (STLPORT) || defined (_STLP_NO_EXTENSIONS) || defined (_STLP_USE_NO_IOSTREAMS) CPPUNIT_IGNORE; #endif CPPUNIT_TEST(slist1); -#if defined (STLPORT) && defined (_STLP_USE_NO_IOSTREAMS) +#if defined (STLPORT) && defined (_STLP_USE_NO_IOSTREAMS) CPPUNIT_STOP_IGNORE; #endif CPPUNIT_TEST(erase); diff --git a/sdk/lib/3rdparty/stlport/test/unit/sstream_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/sstream_test.cpp index c22066d1d39..a7327d151d7 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/sstream_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/sstream_test.cpp @@ -273,7 +273,7 @@ void SstreamTest::init_out() */ CPPUNIT_ASSERT( os.str() == "1234567" ); - + os.str( "89ab" ); CPPUNIT_ASSERT( os.str() == "89ab" ); @@ -430,7 +430,7 @@ void SstreamTest::seek_gp() ss.seekg( 0, ios::beg ); ss.seekp( 0, ios::end ); - + ss << "2"; string str; diff --git a/sdk/lib/3rdparty/stlport/test/unit/stldbg_include.cpp b/sdk/lib/3rdparty/stlport/test/unit/stldbg_include.cpp index ab2c9a8b215..eaee1fbd782 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/stldbg_include.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/stldbg_include.cpp @@ -18,14 +18,14 @@ * template * class __stl_debug_engine { * - * + * * This lead to compile-time error. * [This due to sys/types.h contains * * __BEGIN_DECLS * #include * - * + * * i.e. include other headers within extern "C" { scope. Bad, but this is fact.] * * Origin of problem: STLport provide proxy-headers as for C++ headers, as for C diff --git a/sdk/lib/3rdparty/stlport/test/unit/string_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/string_test.cpp index 987d68e6fc9..afe7d2e2065 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/string_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/string_test.cpp @@ -675,18 +675,18 @@ void StringTest::bogus_edge_find() * Notes: Uses traits::eq(). * * === - * So, from formal point of view + * So, from formal point of view * string s; string::size_type p = s.find( "", 0, 0 ); - * should return 0 in p, i.e. position out-of-bound of string, so + * should return 0 in p, i.e. position out-of-bound of string, so * code like following is bad: - * string s; - * - * string::size_type p = s.find( "", 0, 0 ); + * string s; * - * ... + * string::size_type p = s.find( "", 0, 0 ); * - * if ( p != string::npos ) { // normal - * char ch = s[p]; // Arghhhhhhhhhh + * ... + * + * if ( p != string::npos ) { // normal + * char ch = s[p]; // Arghhhhhhhhhh * } * * People near Standard commete has opinion opposite to my. Even if it looks @@ -1134,7 +1134,7 @@ class mypath const mypath& operator / ( const string& ); const string& str() const { return p; } - + private: string p; }; @@ -1299,7 +1299,7 @@ void StringTest::io() void StringTest::allocator_with_state() { -#if !(defined (STLPORT) && defined (_STLP_NO_CUSTOM_IO)) +#if !(defined (STLPORT) && defined (_STLP_NO_CUSTOM_IO)) char buf1[1024]; StackAllocator stack1(buf1, buf1 + sizeof(buf1)); diff --git a/sdk/lib/3rdparty/stlport/test/unit/strstream_buffer_read_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/strstream_buffer_read_test.cpp index 978ac0c8572..3bc9c5ec3a0 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/strstream_buffer_read_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/strstream_buffer_read_test.cpp @@ -1,6 +1,6 @@ /* - * Note: Strstreams are really broken in STLport. But strstreams are - * obsolete, and even if ones was mentioned in D7.1--D7.4 of + * Note: Strstreams are really broken in STLport. But strstreams are + * obsolete, and even if ones was mentioned in D7.1--D7.4 of * Standard, we have no wish to spent time with repair ones. */ #if !defined (_STLP_NO_IOSTREAMS) @@ -30,6 +30,6 @@ void StrstreamBufferTest::read_from_buffer() strstream stream(hello, sizeof(hello), ios_base::in); char cur; stream >> cur; - CPPUNIT_ASSERT(cur == 'H'); + CPPUNIT_ASSERT(cur == 'H'); } #endif diff --git a/sdk/lib/3rdparty/stlport/test/unit/swap_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/swap_test.cpp index 056cabf7d10..cc043a716c5 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/swap_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/swap_test.cpp @@ -96,7 +96,7 @@ void SwapTest::swap_container_non_spec() v1.back().v = -2; v2.push( Obj() ); - v2.back().v = 10; + v2.back().v = 10; v2.push( Obj() ); v2.back().v = 11; v2.push( Obj() ); diff --git a/sdk/lib/3rdparty/stlport/test/unit/unordered_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/unordered_test.cpp index 8d47ca71e03..8b566ca6017 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/unordered_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/unordered_test.cpp @@ -23,7 +23,7 @@ using namespace std::tr1; class UnorderedTest : public CPPUNIT_NS::TestCase { CPPUNIT_TEST_SUITE(UnorderedTest); -#if !defined (STLPORT) +#if !defined (STLPORT) CPPUNIT_IGNORE; #endif CPPUNIT_TEST(uset); @@ -320,7 +320,7 @@ void UnorderedTest::hash_policy() void UnorderedTest::buckets() { -#if defined (STLPORT) +#if defined (STLPORT) unordered_set int_uset; CPPUNIT_ASSERT( int_uset.bucket_count() < int_uset.max_bucket_count() ); diff --git a/sdk/lib/3rdparty/stlport/test/unit/vector_test.cpp b/sdk/lib/3rdparty/stlport/test/unit/vector_test.cpp index a23ba1d4b7b..63636f93ea8 100644 --- a/sdk/lib/3rdparty/stlport/test/unit/vector_test.cpp +++ b/sdk/lib/3rdparty/stlport/test/unit/vector_test.cpp @@ -447,7 +447,7 @@ void VectorTest::assign_check() #if !defined (STLPORT) || !defined (_STLP_NO_MEMBER_TEMPLATES) vector v(3,1); int array[] = { 1, 2, 3, 4, 5 }; - + v.assign( array, array + 5 ); CPPUNIT_CHECK( v[4] == 5 ); CPPUNIT_CHECK( v[0] == 1 ); diff --git a/sdk/lib/atl/atlcoll.h b/sdk/lib/atl/atlcoll.h index 8750def4c19..f41fee71bdf 100644 --- a/sdk/lib/atl/atlcoll.h +++ b/sdk/lib/atl/atlcoll.h @@ -865,7 +865,7 @@ typename CAtlList::CNode* CAtlList< E, ETraits>::GetFreeNode() { AtlThrowImp(E_OUTOFMEMORY); } - + CNode* Node = (CNode*)Block->GetData(); Node += (m_BlockSize - 1); for (int i = m_BlockSize - 1; i >= 0; i--) diff --git a/sdk/lib/atl/atlmem.h b/sdk/lib/atl/atlmem.h index 2beb13743bc..3b3a9986b96 100644 --- a/sdk/lib/atl/atlmem.h +++ b/sdk/lib/atl/atlmem.h @@ -8,7 +8,7 @@ namespace ATL { -//__interface __declspec(uuid("654F7EF5-CFDF-4df9-A450-6C6A13C622C0")) +//__interface __declspec(uuid("654F7EF5-CFDF-4df9-A450-6C6A13C622C0")) class IAtlMemMgr { public: diff --git a/sdk/lib/atl/cstringt.h b/sdk/lib/atl/cstringt.h index afd9f7971f2..f0dccbebeed 100644 --- a/sdk/lib/atl/cstringt.h +++ b/sdk/lib/atl/cstringt.h @@ -451,13 +451,13 @@ public: } CStringT(_In_reads_z_(nLength) const XCHAR* pch, - _In_ int nLength) : + _In_ int nLength) : CThisSimpleString(pch, nLength, StringTraits::GetDefaultManager()) { } CStringT(_In_reads_z_(nLength) const YCHAR* pch, - _In_ int nLength) : + _In_ int nLength) : CThisSimpleString(pch, nLength, StringTraits::GetDefaultManager()) { } diff --git a/sdk/lib/conutils/stream.c b/sdk/lib/conutils/stream.c index 244d97f07c0..462bc826cbc 100644 --- a/sdk/lib/conutils/stream.c +++ b/sdk/lib/conutils/stream.c @@ -280,7 +280,7 @@ ConStreamSetOSHandle( int fdOut = _open_osfhandle((intptr_t)Handle, _O_TEXT /* FIXME! */); FILE* fpOut = _fdopen(fdOut, "w"); *Stream->fStream = *fpOut; - /// setvbuf(Stream->fStream, NULL, _IONBF, 0); + /// setvbuf(Stream->fStream, NULL, _IONBF, 0); return TRUE; #else diff --git a/sdk/lib/crt/include/internal/safecrt.h b/sdk/lib/crt/include/internal/safecrt.h index ec5c93038a4..f05dc40c93e 100644 --- a/sdk/lib/crt/include/internal/safecrt.h +++ b/sdk/lib/crt/include/internal/safecrt.h @@ -5,8 +5,8 @@ extern void * __pInvalidArgHandler; void _invalid_parameter( const wchar_t * expression, - const wchar_t * function, - const wchar_t * file, + const wchar_t * function, + const wchar_t * file, unsigned int line, uintptr_t pReserved); diff --git a/sdk/lib/crt/include/internal/wine/msvcrt.h b/sdk/lib/crt/include/internal/wine/msvcrt.h index ab37a4aeda4..2148ee642a5 100644 --- a/sdk/lib/crt/include/internal/wine/msvcrt.h +++ b/sdk/lib/crt/include/internal/wine/msvcrt.h @@ -26,7 +26,7 @@ * Other conventions * - To avoid conflicts with the standard C library, * no msvcrt headers are included in the implementation. - * - Instead, symbols are duplicated here, prefixed with + * - Instead, symbols are duplicated here, prefixed with * MSVCRT_, as explained above. * - To avoid inconsistencies, a test for each symbol is * added into tests/headers.c. Please always add a diff --git a/sdk/lib/crt/math/i386/floorf.S b/sdk/lib/crt/math/i386/floorf.S index 99ef5522038..a5d77bdda73 100644 --- a/sdk/lib/crt/math/i386/floorf.S +++ b/sdk/lib/crt/math/i386/floorf.S @@ -3,7 +3,7 @@ * Public domain. * * Changes for long double by Ulrich Drepper - * + * * Removed header file dependency for use in libmingwex.a by * Danny Smith */ diff --git a/sdk/lib/crt/mbstring/ismbaln.c b/sdk/lib/crt/mbstring/ismbaln.c index afebd5ca2dd..03899c152c4 100644 --- a/sdk/lib/crt/mbstring/ismbaln.c +++ b/sdk/lib/crt/mbstring/ismbaln.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/mbstring/ismbaln.c * PURPOSE: - * PROGRAMER: + * PROGRAMER: * UPDATE HISTORY: * 05/30/08: Samuel Serapion adapted from PROJECT C Library * diff --git a/sdk/lib/crt/mbstring/ismbc.c b/sdk/lib/crt/mbstring/ismbc.c index 9fcb085d290..087700e3592 100644 --- a/sdk/lib/crt/mbstring/ismbc.c +++ b/sdk/lib/crt/mbstring/ismbc.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/mbstring/ismbc.c * PURPOSE: - * PROGRAMER: + * PROGRAMER: * UPDATE HISTORY: * 05/30/08: Samuel Serapion adapted from PROJECT C Library * diff --git a/sdk/lib/crt/mbstring/ismbpun.c b/sdk/lib/crt/mbstring/ismbpun.c index e756aa24312..13f95152985 100644 --- a/sdk/lib/crt/mbstring/ismbpun.c +++ b/sdk/lib/crt/mbstring/ismbpun.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/mbstring/ismbpun.c * PURPOSE: - * PROGRAMER: + * PROGRAMER: * UPDATE HISTORY: * 05/30/08: Samuel Serapion adapted from PROJECT C Library * diff --git a/sdk/lib/crt/mbstring/mbbtype.c b/sdk/lib/crt/mbstring/mbbtype.c index 14775ea8f0b..e76491332c7 100644 --- a/sdk/lib/crt/mbstring/mbbtype.c +++ b/sdk/lib/crt/mbstring/mbbtype.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/mbstring/mbbtype.c * PURPOSE: Determines the type of a multibyte character - * PROGRAMERS: + * PROGRAMERS: * Copyright 1999 Ariadne * Copyright 1999 Alexandre Julliard * Copyright 2000 Jon Griffths diff --git a/sdk/lib/crt/mbstring/mbscspn.c b/sdk/lib/crt/mbstring/mbscspn.c index bf7f0fdff8e..a6b5e9363bb 100644 --- a/sdk/lib/crt/mbstring/mbscspn.c +++ b/sdk/lib/crt/mbstring/mbscspn.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/mbstring/mbscspn.c * PURPOSE: - * PROGRAMER: + * PROGRAMER: * UPDATE HISTORY: * 05/30/08: Samuel Serapion adapted from PROJECT C Library * diff --git a/sdk/lib/crt/mbstring/mbslwr.c b/sdk/lib/crt/mbstring/mbslwr.c index 10d5e11296c..46e3a404822 100644 --- a/sdk/lib/crt/mbstring/mbslwr.c +++ b/sdk/lib/crt/mbstring/mbslwr.c @@ -38,13 +38,13 @@ unsigned char * _mbslwr(unsigned char *x) return NULL; } - while (*y) + while (*y) { - if (!_ismbblead(*y)) + if (!_ismbblead(*y)) { *y = tolower(*y); y++; - } + } else { *y = _mbctolower(*(unsigned short *)y); diff --git a/sdk/lib/crt/mbstring/mbsninc.c b/sdk/lib/crt/mbstring/mbsninc.c index b07634aea24..5b52834ef37 100644 --- a/sdk/lib/crt/mbstring/mbsninc.c +++ b/sdk/lib/crt/mbstring/mbsninc.c @@ -2,8 +2,8 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/mbstring/mbsninc.c - * PURPOSE: - * PROGRAMERS: + * PURPOSE: + * PROGRAMERS: * Copyright 1999 Alexandre Julliard * Copyright 2000 Jon Griffths * diff --git a/sdk/lib/crt/mbstring/mbsspn.c b/sdk/lib/crt/mbstring/mbsspn.c index d9bb1b40055..2a37cd1b7f7 100644 --- a/sdk/lib/crt/mbstring/mbsspn.c +++ b/sdk/lib/crt/mbstring/mbsspn.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/mbstring/mbsspn.c * PURPOSE: - * PROGRAMER: + * PROGRAMER: * UPDATE HISTORY: * 05/30/08: Samuel Serapion adapted from PROJECT C Library * diff --git a/sdk/lib/crt/misc/dbgrpt.cpp b/sdk/lib/crt/misc/dbgrpt.cpp index a349687d475..dbb1ebbc966 100644 --- a/sdk/lib/crt/misc/dbgrpt.cpp +++ b/sdk/lib/crt/misc/dbgrpt.cpp @@ -32,7 +32,7 @@ static int _CrtModeOutputFormat[_CRT_ERRCNT] = _CRTDBG_MODE_WNDW, }; // Caption per type -static const wchar_t* _CrtModeMessages[_CRT_ERRCNT] = +static const wchar_t* _CrtModeMessages[_CRT_ERRCNT] = { L"Warning", L"Error", diff --git a/sdk/lib/crt/misc/getargs.c b/sdk/lib/crt/misc/getargs.c index 86448347baa..da2a2b16907 100644 --- a/sdk/lib/crt/misc/getargs.c +++ b/sdk/lib/crt/misc/getargs.c @@ -215,7 +215,7 @@ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, i if (i >= len || ((_acmdln[i] == ' ' || _acmdln[i] == '\t') && !inQuotes)) { // Handle the case when empty spaces are in the end of the cmdline - if (anyLetter) + if (anyLetter) { aexpand(strndup(buffer, bufferIndex), doexpand); } diff --git a/sdk/lib/crt/process/_system.c b/sdk/lib/crt/process/_system.c index 54030c43292..6d879fce591 100644 --- a/sdk/lib/crt/process/_system.c +++ b/sdk/lib/crt/process/_system.c @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/process/_system.c diff --git a/sdk/lib/crt/startup/crt_handler.c b/sdk/lib/crt/startup/crt_handler.c index e1031ca53cc..a01ab8d7abf 100644 --- a/sdk/lib/crt/startup/crt_handler.c +++ b/sdk/lib/crt/startup/crt_handler.c @@ -56,7 +56,7 @@ __mingw_init_ehandler (void) size_t e = 0; PIMAGE_SECTION_HEADER pSec; PBYTE _ImageBase = _GetPEImageBase (); - + if (was_here || !_ImageBase) return was_here; was_here = 1; @@ -66,7 +66,7 @@ __mingw_init_ehandler (void) /* Allocate # of e tables and entries. */ memset (emu_pdata, 0, sizeof (RUNTIME_FUNCTION) * MAX_PDATA_ENTRIES); memset (emu_xdata, 0, sizeof (UNWIND_INFO) * MAX_PDATA_ENTRIES); - + e = 0; /* Fill tables and entries. */ while (e < MAX_PDATA_ENTRIES && (pSec = _FindPESectionExec (e)) != NULL) diff --git a/sdk/lib/crt/startup/merr.c b/sdk/lib/crt/startup/merr.c index d1fce73fc24..464c211fed9 100644 --- a/sdk/lib/crt/startup/merr.c +++ b/sdk/lib/crt/startup/merr.c @@ -69,7 +69,7 @@ _matherr (struct _exception *pexcept) break; } - __mingw_fprintf (stderr, "_matherr(): %s in %s(%g, %g) (retval=%g)\n", + __mingw_fprintf (stderr, "_matherr(): %s in %s(%g, %g) (retval=%g)\n", type, pexcept->name, pexcept->arg1, pexcept->arg2, pexcept->retval); return 0; } diff --git a/sdk/lib/crt/startup/pesect.c b/sdk/lib/crt/startup/pesect.c index 3d1582bbe8f..424bfce8036 100644 --- a/sdk/lib/crt/startup/pesect.c +++ b/sdk/lib/crt/startup/pesect.c @@ -205,7 +205,7 @@ __mingw_enum_import_library_names (int i) return NULL; pNTHeader = (PIMAGE_NT_HEADERS) (pImageBase + ((PIMAGE_DOS_HEADER) pImageBase)->e_lfanew); - + importsStartRVA = pNTHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress; if (!importsStartRVA) return NULL; @@ -217,7 +217,7 @@ __mingw_enum_import_library_names (int i) importDesc = (PIMAGE_IMPORT_DESCRIPTOR) (pImageBase + importsStartRVA); if (!importDesc) return NULL; - + for (;;) { if (importDesc->TimeDateStamp == 0 && importDesc->Name == 0) diff --git a/sdk/lib/crt/startup/txtmode.c b/sdk/lib/crt/startup/txtmode.c index 0c700ee1a19..1f50d168b89 100644 --- a/sdk/lib/crt/startup/txtmode.c +++ b/sdk/lib/crt/startup/txtmode.c @@ -10,4 +10,4 @@ /* Is this correct? Default value of _fmode in msvcrt.dll is 0. */ -int _fmode = _O_TEXT; +int _fmode = _O_TEXT; diff --git a/sdk/lib/crt/stdlib/_exit.c b/sdk/lib/crt/stdlib/_exit.c index e089f086533..bc25a85596d 100644 --- a/sdk/lib/crt/stdlib/_exit.c +++ b/sdk/lib/crt/stdlib/_exit.c @@ -39,7 +39,7 @@ void exit(int exitcode) #endif WARN("exit(%d) called\n",exitcode); _cexit(); -#if 0 +#if 0 hmscoree = GetModuleHandleW(mscoreeW); if (hmscoree) diff --git a/sdk/lib/crt/stdlib/ecvt.c b/sdk/lib/crt/stdlib/ecvt.c index eaba52c7e62..e55d8c7a2fa 100644 --- a/sdk/lib/crt/stdlib/ecvt.c +++ b/sdk/lib/crt/stdlib/ecvt.c @@ -19,7 +19,7 @@ _ecvt (double value, int ndigits, int *decpt, int *sign) char *cvtbuf, *s, *d; if (ndigits < 0) ndigits = 0; - s = cvtbuf = (char*)malloc(ndigits + NUMBER_EFMT); + s = cvtbuf = (char*)malloc(ndigits + NUMBER_EFMT); d = ecvtbuf; *sign = 0; @@ -40,7 +40,7 @@ _ecvt (double value, int ndigits, int *decpt, int *sign) { memcpy(ecvtbuf, s, 5); } - else + else { /* Set the sign */ if (*s && *s == '-') diff --git a/sdk/lib/crt/string/ctype.c b/sdk/lib/crt/string/ctype.c index 580f612f658..053bce17a03 100644 --- a/sdk/lib/crt/string/ctype.c +++ b/sdk/lib/crt/string/ctype.c @@ -611,7 +611,7 @@ int __cdecl _isctype_l(int c, int type, _locale_t locale) } int __cdecl _isctype (int c, int ctypeFlags) -{ +{ return _isctype_l(c, ctypeFlags, NULL); } diff --git a/sdk/lib/crt/string/string.c b/sdk/lib/crt/string/string.c index 3b4bdf07d54..cd1280ec382 100644 --- a/sdk/lib/crt/string/string.c +++ b/sdk/lib/crt/string/string.c @@ -29,7 +29,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - + #include diff --git a/sdk/lib/crt/string/wtoi64.c b/sdk/lib/crt/string/wtoi64.c index 94684fa0d3a..15a4bae0225 100644 --- a/sdk/lib/crt/string/wtoi64.c +++ b/sdk/lib/crt/string/wtoi64.c @@ -104,7 +104,7 @@ __int64 CDECL _wcstoi64_l(const wchar_t *nptr, ret = _I64_MIN; #ifndef _LIBCNT_ *_errno() = ERANGE; -#endif +#endif } else ret = ret*base + v; } diff --git a/sdk/lib/crt/time/asctime.c b/sdk/lib/crt/time/asctime.c index 48bdc0c17c8..92bc6da5a96 100644 --- a/sdk/lib/crt/time/asctime.c +++ b/sdk/lib/crt/time/asctime.c @@ -16,11 +16,11 @@ static const _TCHAR wday_name[DAYSPERWEEK][5] = { - _T("Sun "), _T("Mon "), _T("Tue "), _T("Wed "), + _T("Sun "), _T("Mon "), _T("Tue "), _T("Wed "), _T("Thu "), _T("Fri "), _T("Sat ") }; -static const _TCHAR mon_name[MONSPERYEAR][5] = +static const _TCHAR mon_name[MONSPERYEAR][5] = { _T("Jan "), _T("Feb "), _T("Mar "), _T("Apr "), _T("May "), _T("Jun "), _T("Jul "), _T("Aug "), _T("Sep "), _T("Oct "), _T("Nov "), _T("Dec ") @@ -77,7 +77,7 @@ static __inline void FillBuf(timebuf_t *buf, const struct tm *ptm) { - /* Format looks like this: + /* Format looks like this: * "Sun Mar 01 12:34:56 1902\n\0" */ buf->WeekDay = *(_TCHAR4*)wday_name[ptm->tm_wday]; buf->Month = *(_TCHAR4*)mon_name[ptm->tm_mon]; @@ -102,8 +102,8 @@ FillBuf(timebuf_t *buf, const struct tm *ptm) * \param numberOfElements Size of the buffer in characters. * \param time Pointer to the UTC time. */ -errno_t -_tasctime_s( +errno_t +_tasctime_s( _TCHAR* buffer, size_t numberOfElements, const struct tm *ptm) diff --git a/sdk/lib/crt/time/localtime.c b/sdk/lib/crt/time/localtime.c index 1d7c03360f7..eb511cadf07 100644 --- a/sdk/lib/crt/time/localtime.c +++ b/sdk/lib/crt/time/localtime.c @@ -23,9 +23,9 @@ localtime_s(struct tm* _tm, const time_t *ptime) { if(_tm) memset(_tm, 0xFF, sizeof(struct tm)); _invalid_parameter(NULL, - 0,//__FUNCTION__, - _CRT_WIDE(__FILE__), - __LINE__, + 0,//__FUNCTION__, + _CRT_WIDE(__FILE__), + __LINE__, 0); _set_errno(EINVAL); return EINVAL; diff --git a/sdk/lib/crt/time/strtime.c b/sdk/lib/crt/time/strtime.c index 1e86e539ba1..363c21cb067 100644 --- a/sdk/lib/crt/time/strtime.c +++ b/sdk/lib/crt/time/strtime.c @@ -16,7 +16,7 @@ char* _strtime(char* time) { static const char format[] = "HH':'mm':'ss"; - GetTimeFormatA(LOCALE_NEUTRAL, 0, NULL, format, time, 9); + GetTimeFormatA(LOCALE_NEUTRAL, 0, NULL, format, time, 9); return time; } diff --git a/sdk/lib/crt/time/time32.c b/sdk/lib/crt/time/time32.c index 7bdd2c71803..9f4211b6c05 100644 --- a/sdk/lib/crt/time/time32.c +++ b/sdk/lib/crt/time/time32.c @@ -2,8 +2,8 @@ * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/time32.c - * PURPOSE: - * PROGRAMER: + * PURPOSE: + * PROGRAMER: */ #define _USE_EXPLICIT_32BIT_TIME diff --git a/sdk/lib/crt/time/time64.c b/sdk/lib/crt/time/time64.c index ca03a1f0fbd..222f5b14a1d 100644 --- a/sdk/lib/crt/time/time64.c +++ b/sdk/lib/crt/time/time64.c @@ -2,8 +2,8 @@ * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/time64.c - * PURPOSE: - * PROGRAMER: + * PURPOSE: + * PROGRAMER: */ #define _USE_EXPLICIT_64BIT_TIME diff --git a/sdk/lib/crt/wine/msvcrt.h b/sdk/lib/crt/wine/msvcrt.h index d5dc4cd5366..7c71550acdf 100644 --- a/sdk/lib/crt/wine/msvcrt.h +++ b/sdk/lib/crt/wine/msvcrt.h @@ -26,7 +26,7 @@ * Other conventions * - To avoid conflicts with the standard C library, * no msvcrt headers are included in the implementation. - * - Instead, symbols are duplicated here, prefixed with + * - Instead, symbols are duplicated here, prefixed with * MSVCRT_, as explained above. * - To avoid inconsistencies, a test for each symbol is * added into tests/headers.c. Please always add a diff --git a/sdk/lib/crt/wine/undname.c b/sdk/lib/crt/wine/undname.c index c81dfcc273a..899a419d1af 100644 --- a/sdk/lib/crt/wine/undname.c +++ b/sdk/lib/crt/wine/undname.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); */ /* How data types modifiers are stored: - * M (in the following definitions) is defined for + * M (in the following definitions) is defined for * 'A', 'B', 'C' and 'D' as follows * {}: "" * {}: "const " @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); * in data fields: * same as for arguments and also the following * ?x {}x - * + * */ struct array @@ -110,7 +110,7 @@ static void* und_alloc(struct parsed_symbol* sym, unsigned int len) sym->avail_in_first = 0; ptr = (char*)sym->alloc_list + sizeof(void*); } - else + else { if (len > sym->avail_in_first) { @@ -188,7 +188,7 @@ static BOOL str_array_push(struct parsed_symbol* sym, const char* ptr, int len, a->elts[a->num] = und_alloc(sym, len + 1); assert(a->elts[a->num]); memcpy(a->elts[a->num], ptr, len); - a->elts[a->num][len] = '\0'; + a->elts[a->num][len] = '\0'; if (++a->num >= a->max) a->max = a->num; { int i; @@ -217,18 +217,18 @@ static char* str_array_get_ref(struct array* cref, unsigned idx) assert(cref); if (cref->start + idx >= cref->max) { - WARN("Out of bounds: %p %d + %d >= %d\n", + WARN("Out of bounds: %p %d + %d >= %d\n", cref, cref->start, idx, cref->max); return NULL; } - TRACE("Returning %p[%d] => %s\n", + TRACE("Returning %p[%d] => %s\n", cref, idx, debugstr_a(cref->elts[cref->start + idx])); return cref->elts[cref->start + idx]; } /****************************************************************** * str_printf - * Helper for printf type of command (only %s and %c are implemented) + * Helper for printf type of command (only %s and %c are implemented) * while dynamically allocating the buffer */ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) @@ -341,7 +341,7 @@ static const char* get_number(struct parsed_symbol* sym) * Parses a list of function/method arguments, creates a string corresponding * to the arguments' list. */ -static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_term, +static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_term, char open_char, char close_char) { @@ -376,8 +376,8 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t */ if (z_term && *sym->current++ != 'Z') return NULL; - if (arg_collect.num == 0 || - (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) + if (arg_collect.num == 0 || + (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) return str_printf(sym, "%cvoid%c", open_char, close_char); for (i = 1; i < arg_collect.num; i++) { @@ -386,12 +386,12 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t last = args_str ? args_str : arg_collect.elts[0]; if (close_char == '>' && last[strlen(last) - 1] == '>') - args_str = str_printf(sym, "%c%s%s %c", + args_str = str_printf(sym, "%c%s%s %c", open_char, arg_collect.elts[0], args_str, close_char); else - args_str = str_printf(sym, "%c%s%s%c", + args_str = str_printf(sym, "%c%s%s%c", open_char, arg_collect.elts[0], args_str, close_char); - + return args_str; } @@ -730,7 +730,7 @@ static BOOL get_calling_convention(char ch, const char** call_conv, static const char* get_simple_type(char c) { const char* type_string; - + switch (c) { case 'C': type_string = "signed char"; break; @@ -759,7 +759,7 @@ static const char* get_simple_type(char c) static const char* get_extended_type(char c) { const char* type_string; - + switch (c) { case 'D': type_string = "__int8"; break; @@ -794,7 +794,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, assert(ct); ct->left = ct->right = NULL; - + switch (dt = *sym->current++) { case '_': @@ -819,7 +819,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!(struct_name = get_class_name(sym))) goto done; - if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) + if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) { switch (dt) { @@ -908,7 +908,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, sym->current++; if (!get_calling_convention(*sym->current++, - &call_conv, &exported, + &call_conv, &exported, sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE) || !demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; @@ -917,7 +917,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!args) goto done; sym->stack.num = mark; - ct->left = str_printf(sym, "%s%s (%s*", + ct->left = str_printf(sym, "%s%s (%s*", sub_ct.left, sub_ct.right, call_conv); ct->right = str_printf(sym, ")%s", args); } @@ -1044,7 +1044,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, return FALSE; } done: - + return ct->left != NULL; } @@ -1081,7 +1081,7 @@ static BOOL handle_data(struct parsed_symbol* sym) case '0': access = "private: "; break; case '1': access = "protected: "; break; case '2': access = "public: "; break; - } + } } if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) @@ -1131,8 +1131,8 @@ static BOOL handle_data(struct parsed_symbol* sym) if (sym->flags & UNDNAME_NAME_ONLY) ct.left = ct.right = modifier = NULL; sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s", access, - member_type, ct.left, - modifier && ct.left ? " " : NULL, modifier, + member_type, ct.left, + modifier && ct.left ? " " : NULL, modifier, modifier || ct.left ? " " : NULL, name, ct.right); ret = TRUE; done: @@ -1604,7 +1604,7 @@ char* CDECL __unDNameEx(char* buffer, const char* mangled, int buflen, TRACE("(%p,%s,%d,%p,%p,%p,%x)\n", buffer, debugstr_a(mangled), buflen, memget, memfree, unknown, flags); - + /* The flags details is not documented by MS. However, it looks exactly * like the UNDNAME_ manifest constants from imagehlp.h and dbghelp.h * So, we copied those (on top of the file) diff --git a/sdk/lib/cryptlib/des.c b/sdk/lib/cryptlib/des.c index f94b6d8aa81..81009b6eaab 100644 --- a/sdk/lib/cryptlib/des.c +++ b/sdk/lib/cryptlib/des.c @@ -5,7 +5,7 @@ * Copyright 2004 Michael Jung * Based on public domain code by Tom St Denis (tomstdenis@iahu.ca) * and Dobes Vandermeer. - * + * * 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 @@ -22,21 +22,21 @@ */ /* - * This file contains code from the LibTomCrypt cryptographic + * This file contains code from the LibTomCrypt cryptographic * library written by Tom St Denis (tomstdenis@iahu.ca). LibTomCrypt * is in the public domain. The code in this file is tailored to * special requirements. Take a look at http://libtomcrypt.org for the - * original version. + * original version. */ #include "tomcrypt.h" -#define EN0 0 +#define EN0 0 #define DE1 1 static const ulong32 bytebit[8] = { - 0200, 0100, 040, 020, 010, 04, 02, 01 + 0200, 0100, 040, 020, 010, 04, 02, 01 }; static const ulong32 bigbyte[24] = @@ -46,22 +46,22 @@ static const ulong32 bigbyte[24] = 0x8000UL, 0x4000UL, 0x2000UL, 0x1000UL, 0x800UL, 0x400UL, 0x200UL, 0x100UL, 0x80UL, 0x40UL, 0x20UL, 0x10UL, - 0x8UL, 0x4UL, 0x2UL, 0x1L + 0x8UL, 0x4UL, 0x2UL, 0x1L }; /* Use the key schedule specific in the standard (ANSI X3.92-1981) */ static const unsigned char pc1[56] = { - 56, 48, 40, 32, 24, 16, 8, 0, 57, 49, 41, 33, 25, 17, - 9, 1, 58, 50, 42, 34, 26, 18, 10, 2, 59, 51, 43, 35, + 56, 48, 40, 32, 24, 16, 8, 0, 57, 49, 41, 33, 25, 17, + 9, 1, 58, 50, 42, 34, 26, 18, 10, 2, 59, 51, 43, 35, 62, 54, 46, 38, 30, 22, 14, 6, 61, 53, 45, 37, 29, 21, - 13, 5, 60, 52, 44, 36, 28, 20, 12, 4, 27, 19, 11, 3 + 13, 5, 60, 52, 44, 36, 28, 20, 12, 4, 27, 19, 11, 3 }; static const unsigned char totrot[16] = { 1, 2, 4, 6, - 8, 10, 12, 14, - 15, 17, 19, 21, + 8, 10, 12, 14, + 15, 17, 19, 21, 23, 25, 27, 28 }; @@ -1278,7 +1278,7 @@ static const ulong64 des_fp[8][256] = { CONST64(0x40404000,0x00004040), CONST64(0x40404010,0x00004040), CONST64(0x40404000,0x40004040), CONST64(0x40404010,0x40004040), CONST64(0x40404000,0x00404040), CONST64(0x40404010,0x00404040), CONST64(0x40404000,0x40404040), CONST64(0x40404010,0x40404040) }}; - + static void cookey(const ulong32 *raw1, ulong32 *keyout); @@ -1408,7 +1408,7 @@ static void desfunc(ulong32 *block, const ulong32 *keys) des_fp[7][byte(right, 3)]; leftt = (ulong32)(tmp >> 32); right = (ulong32)(tmp & 0xFFFFFFFFUL); - + block[0] = right; block[1] = leftt; } diff --git a/sdk/lib/cryptlib/tomcrypt.h b/sdk/lib/cryptlib/tomcrypt.h index fe96d1a69f3..73d7d1bb572 100644 --- a/sdk/lib/cryptlib/tomcrypt.h +++ b/sdk/lib/cryptlib/tomcrypt.h @@ -22,11 +22,11 @@ */ /* - * This file contains code from the LibTomCrypt cryptographic + * This file contains code from the LibTomCrypt cryptographic * library written by Tom St Denis (tomstdenis@iahu.ca). LibTomCrypt * is in the public domain. The code in this file is tailored to * special requirements. Take a look at http://libtomcrypt.org for the - * original version. + * original version. */ #ifndef __WINE_TOMCRYPT_H_ @@ -78,8 +78,8 @@ enum { #define CONST64(a,b) ((((ULONG64)(a)) << 32) | (b)) typedef ULONG64 ulong64; -/* this is the "32-bit at least" data type - * Re-define it to suit your platform but it must be at least 32-bits +/* this is the "32-bit at least" data type + * Re-define it to suit your platform but it must be at least 32-bits */ typedef ULONG32 ulong32; @@ -117,8 +117,8 @@ static inline unsigned ROR(unsigned word, int i) #define byte(x, n) (((x) >> (8 * (n))) & 255) -typedef struct tag_rc2_key { - unsigned xkey[64]; +typedef struct tag_rc2_key { + unsigned xkey[64]; } rc2_key; typedef struct tag_des_key { @@ -184,7 +184,7 @@ unsigned long rc4_read(unsigned char *buf, unsigned long len, prng_state *prng); typedef unsigned long mp_digit; typedef ulong64 mp_word; #define DIGIT_BIT 28 - + #define MP_DIGIT_BIT DIGIT_BIT #define MP_MASK ((((mp_digit)1)<<((mp_digit)DIGIT_BIT))-((mp_digit)1)) #define MP_DIGIT_MAX MP_MASK @@ -376,7 +376,7 @@ int mp_exptmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); int mp_prime_fermat(mp_int *a, mp_int *b, int *result); /* This gives [for a given bit size] the number of trials required - * such that Miller-Rabin gives a prob of failure lower than 2^-96 + * such that Miller-Rabin gives a prob of failure lower than 2^-96 */ int mp_prime_rabin_miller_trials(int size); @@ -388,7 +388,7 @@ int mp_prime_rabin_miller_trials(int size); int mp_prime_next_prime(mp_int *a, int t, int bbs_style); /* makes a truly random prime of a given size (bytes), - * call with bbs = 1 if you want it to be congruent to 3 mod 4 + * call with bbs = 1 if you want it to be congruent to 3 mod 4 * * You have to supply a callback which fills in a buffer with random bytes. "dat" is a parameter you can * have passed to the callback (e.g. a state or something). This function doesn't use "dat" itself @@ -401,7 +401,7 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style); /* makes a truly random prime of a given size (bits), * * Flags are as follows: - * + * * LTM_PRIME_BBS - make prime congruent to 3 mod 4 * LTM_PRIME_SAFE - make sure (p-1)/2 is prime as well (implies LTM_PRIME_BBS) * LTM_PRIME_2MSB_OFF - make the 2nd highest bit zero diff --git a/sdk/lib/dnslib/addr.c b/sdk/lib/dnslib/addr.c index b91c532e49a..88747f5d198 100644 --- a/sdk/lib/dnslib/addr.c +++ b/sdk/lib/dnslib/addr.c @@ -47,15 +47,15 @@ FamilyInfo_GetForFamily(IN WORD AddressFamily) case AF_INET: /* Return IPv4 Family Info */ return &AddrFamilyTable[0]; - + case AF_INET6: /* Return IPv6 Family Info */ return &AddrFamilyTable[1]; - + case AF_ATM: /* Return ATM Family Info */ return &AddrFamilyTable[2]; - + default: /* Invalid family */ return NULL; diff --git a/sdk/lib/dnslib/dnsaddr.c b/sdk/lib/dnslib/dnsaddr.c index 310a0966f8b..56ff15025d0 100644 --- a/sdk/lib/dnslib/dnsaddr.c +++ b/sdk/lib/dnslib/dnsaddr.c @@ -61,7 +61,7 @@ DnsAddrArray_AddAddr(IN PDNS_ARRAY DnsAddrArray, { /* Make sure we have an array */ if (!DnsAddrArray) return FALSE; - + /* Check if we should validate the Address Family */ if (AddressFamily) { @@ -83,7 +83,7 @@ DnsAddrArray_AddAddr(IN PDNS_ARRAY DnsAddrArray, /* Make sure we have space in the array */ if (DnsAddrArray->AllocatedAddresses < DnsAddrArray->UsedAddresses) { - return FALSE; + return FALSE; } /* Now add the address */ diff --git a/sdk/lib/dnslib/hostent.c b/sdk/lib/dnslib/hostent.c index f7c9e64bb39..185b871689e 100644 --- a/sdk/lib/dnslib/hostent.c +++ b/sdk/lib/dnslib/hostent.c @@ -59,7 +59,7 @@ Dns_PtrArrayToOffsetArray(PCHAR *List, ULONG_PTR Base) { /* Loop every pointer in the list */ - do + do { /* Update the pointer */ *List = (PCHAR)((ULONG_PTR)*List - Base); diff --git a/sdk/lib/dnslib/straddr.c b/sdk/lib/dnslib/straddr.c index d503ae5e9e6..5f5988992d9 100644 --- a/sdk/lib/dnslib/straddr.c +++ b/sdk/lib/dnslib/straddr.c @@ -189,7 +189,7 @@ Dns_StringToAddressEx(OUT PVOID Address, AddressName = AnsiName; } - /* + /* * If the caller doesn't know what the family is, we'll assume IPv4 and * check if we failed or not. If the caller told us it's IPv4, then just * do IPv4... @@ -343,7 +343,7 @@ Dns_StringToDnsAddrEx(OUT PDNS_ADDRESS DnsAddr, AddressName = AnsiName; } - /* + /* * If the caller doesn't know what the family is, we'll assume IPv4 and * check if we failed or not. If the caller told us it's IPv4, then just * do IPv4... diff --git a/sdk/lib/drivers/aux_klib/aux_klib.c b/sdk/lib/drivers/aux_klib/aux_klib.c index c0b74a37b50..cd0f90b4910 100644 --- a/sdk/lib/drivers/aux_klib/aux_klib.c +++ b/sdk/lib/drivers/aux_klib/aux_klib.c @@ -59,7 +59,7 @@ AuxKlibQueryModuleInformation( PAGED_CODE(); - if (gKlibInitialized != 1) + if (gKlibInitialized != 1) { return STATUS_UNSUCCESSFUL; } @@ -86,7 +86,7 @@ AuxKlibQueryModuleInformation( PRTL_PROCESS_MODULES processModules = &processModulesMinimal; ULONG sysInfoLength = sizeof(processModulesMinimal); ULONG resultLength; - + // loop until we have a large-enough buffer for all modules do { @@ -142,7 +142,7 @@ AuxKlibQueryModuleInformation( goto Cleanup; } - if (*InformationLength < modulesSize) + if (*InformationLength < modulesSize) { status = STATUS_BUFFER_TOO_SMALL; *InformationLength = modulesSize; @@ -150,7 +150,7 @@ AuxKlibQueryModuleInformation( } // copy the information to the input array - for (UINT32 i = 0; i < processModules->NumberOfModules; i++) + for (UINT32 i = 0; i < processModules->NumberOfModules; i++) { ModuleInfo[i].BasicInfo.ImageBase = processModules->Modules[i].ImageBase; diff --git a/sdk/lib/drivers/chew/workqueue.c b/sdk/lib/drivers/chew/workqueue.c index cf83b8c7a04..81c0467e4b5 100644 --- a/sdk/lib/drivers/chew/workqueue.c +++ b/sdk/lib/drivers/chew/workqueue.c @@ -65,7 +65,7 @@ VOID NTAPI ChewWorkItem(PDEVICE_OBJECT DeviceObject, PVOID ChewItem) BOOLEAN ChewCreate(VOID (*Worker)(PVOID), PVOID WorkerContext) { PWORK_ITEM Item; - Item = ExAllocatePoolWithTag(NonPagedPool, + Item = ExAllocatePoolWithTag(NonPagedPool, sizeof(WORK_ITEM), CHEW_TAG); diff --git a/sdk/lib/drivers/csq/csq.c b/sdk/lib/drivers/csq/csq.c index 6402938f9b1..71cd86a746e 100644 --- a/sdk/lib/drivers/csq/csq.c +++ b/sdk/lib/drivers/csq/csq.c @@ -29,7 +29,7 @@ #define DECLSPEC_IMPORT #include - + /*! * @brief Cancel routine that is installed on any IRP that this library manages * @@ -80,7 +80,7 @@ IopCsqCancelRoutine( Csq->CsqCompleteCanceledIrp(Csq, Irp); } - + /*! * @brief Set up a CSQ struct to initialize the queue * @@ -121,7 +121,7 @@ IoCsqInitialize( return STATUS_SUCCESS; } - + /*! * @brief Set up a CSQ struct to initialize the queue (extended version) * @@ -161,7 +161,7 @@ IoCsqInitializeEx( return STATUS_SUCCESS; } - + /*! * @brief Insert an IRP into the CSQ * @@ -182,7 +182,7 @@ IoCsqInsertIrp( IoCsqInsertIrpEx(Csq, Irp, Context, 0); } - + /*! * @brief Insert an IRP into the CSQ, with additional tracking context * @@ -307,7 +307,7 @@ IoCsqInsertIrpEx( return Retval; } - + /*! * @brief Remove anb IRP from the queue * diff --git a/sdk/lib/drivers/hidparser/parser.c b/sdk/lib/drivers/hidparser/parser.c index 6d35cbe41fc..f65c117a881 100644 --- a/sdk/lib/drivers/hidparser/parser.c +++ b/sdk/lib/drivers/hidparser/parser.c @@ -118,7 +118,7 @@ HidParser_AllocateCollection( // // done - // + // return HIDP_STATUS_SUCCESS; } @@ -436,7 +436,7 @@ HidParser_SignRange( for (Index = 0; Index < 4; Index++) { - if (Minimum & Mask) + if (Minimum & Mask) { Minimum |= Mask; if (Maximum & Mask) @@ -831,10 +831,10 @@ HidParser_ParseReportDescriptor( { // preprocess the local state if relevant (usages for // collections and report items) - if (CurrentItem->Tag != ITEM_TAG_MAIN_END_COLLECTION) + if (CurrentItem->Tag != ITEM_TAG_MAIN_END_COLLECTION) { // make all usages extended for easier later processing - for (Index = 0; Index < ParserContext->LocalItemState.UsageStackUsed; Index++) + for (Index = 0; Index < ParserContext->LocalItemState.UsageStackUsed; Index++) { // // is it already extended @@ -882,8 +882,8 @@ HidParser_ParseReportDescriptor( // make new collection current // CurrentCollection = NewCollection; - } - else if (CurrentItem->Tag == ITEM_TAG_MAIN_END_COLLECTION) + } + else if (CurrentItem->Tag == ITEM_TAG_MAIN_END_COLLECTION) { // // assert on ending the root collection @@ -895,8 +895,8 @@ HidParser_ParseReportDescriptor( // CurrentCollection = CurrentCollection->Root; ASSERT(CurrentCollection); - } - else + } + else { ReportType = HID_REPORT_TYPE_ANY; @@ -1043,7 +1043,7 @@ HidParser_ParseReportDescriptor( case ITEM_TAG_GLOBAL_POP: { DebugFunction("[HIDPARSE] ITEM_TAG_GLOBAL_POP\n"); - if (ParserContext->GlobalItemState.Next == NULL) + if (ParserContext->GlobalItemState.Next == NULL) { // // pop without push @@ -1081,7 +1081,7 @@ HidParser_ParseReportDescriptor( } case ITEM_TYPE_LOCAL: { - switch (CurrentItem->Tag) + switch (CurrentItem->Tag) { case ITEM_TAG_LOCAL_USAGE: { diff --git a/sdk/lib/drivers/hidparser/parser.h b/sdk/lib/drivers/hidparser/parser.h index 32061daa4b9..343af95b557 100644 --- a/sdk/lib/drivers/hidparser/parser.h +++ b/sdk/lib/drivers/hidparser/parser.h @@ -143,9 +143,9 @@ typedef struct __GLOBAL_ITEM_STATE_ }GLOBAL_ITEM_STATE, *PGLOBAL_ITEM_STATE; -typedef struct usage_value +typedef struct usage_value { - union + union { struct { USHORT UsageId; @@ -213,7 +213,7 @@ typedef struct __HID_COLLECTION__ struct __HID_COLLECTION__ ** Nodes; struct __HID_COLLECTION__ * Root; - struct _HID_REPORT ** Reports; + struct _HID_REPORT ** Reports; ULONG Offsets[1]; diff --git a/sdk/lib/drivers/ip/network/arp.c b/sdk/lib/drivers/ip/network/arp.c index 9cd272b2dae..a7b9cb756e9 100644 --- a/sdk/lib/drivers/ip/network/arp.c +++ b/sdk/lib/drivers/ip/network/arp.c @@ -191,7 +191,7 @@ VOID ARPReceive( PIP_INTERFACE Interface = (PIP_INTERFACE)Context; ULONG BytesCopied, DataSize; PCHAR DataBuffer; - + PAGED_CODE(); TI_DbgPrint(DEBUG_ARP, ("Called.\n")); diff --git a/sdk/lib/drivers/ip/network/interface.c b/sdk/lib/drivers/ip/network/interface.c index 108e961c9e9..3cf607ff24f 100644 --- a/sdk/lib/drivers/ip/network/interface.c +++ b/sdk/lib/drivers/ip/network/interface.c @@ -158,7 +158,7 @@ PIP_INTERFACE GetDefaultInterface(VOID) KIRQL OldIrql; ULONG Index = 0; ULONG IfStatus; - + IF_LIST_ITER(CurrentIF); TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); @@ -174,8 +174,8 @@ PIP_INTERFACE GetDefaultInterface(VOID) TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); } - } EndFor(CurrentIF); - + } EndFor(CurrentIF); + /* Try to continue from the next adapter */ ForEachInterface(CurrentIF) { if (CurrentIF->Context && (Index++ == NextDefaultAdapter)) { @@ -190,7 +190,7 @@ PIP_INTERFACE GetDefaultInterface(VOID) TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); } } EndFor(CurrentIF); - + /* No luck, so we'll choose the first adapter this time */ Index = 0; ForEachInterface(CurrentIF) { @@ -207,7 +207,7 @@ PIP_INTERFACE GetDefaultInterface(VOID) TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); } } EndFor(CurrentIF); - + /* Even that didn't work, so we'll just go with loopback */ NextDefaultAdapter = 0; TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); diff --git a/sdk/lib/drivers/ip/network/ip.c b/sdk/lib/drivers/ip/network/ip.c index ac26f16225f..0d8b729f5a1 100644 --- a/sdk/lib/drivers/ip/network/ip.c +++ b/sdk/lib/drivers/ip/network/ip.c @@ -125,7 +125,7 @@ VOID NTAPI IPTimeoutDpcFn(PKDPC Dpc, */ { IpTimerExpirations++; - + if ((IpTimerExpirations % 10) == 0) { LogActiveObjects(); @@ -232,7 +232,7 @@ PIP_INTERFACE IPCreateInterface( ExFreePoolWithTag(IF, IP_INTERFACE_TAG); return NULL; } - + TCPRegisterInterface(IF); #ifdef __NTDRIVER__ @@ -256,7 +256,7 @@ VOID IPDestroyInterface( #ifdef __NTDRIVER__ RemoveTDIInterfaceEntity( IF ); #endif - + TCPUnregisterInterface(IF); ExFreePool(IF->TCPContext); @@ -286,7 +286,7 @@ VOID IPAddInterfaceRoute( PIP_INTERFACE IF ) { * other computers */ if (IF != Loopback) ARPTransmit(NULL, NULL, IF); - + TCPUpdateInterfaceIPInformation(IF); } diff --git a/sdk/lib/drivers/ip/network/neighbor.c b/sdk/lib/drivers/ip/network/neighbor.c index 7477a8f9f3c..c9f460d38e5 100644 --- a/sdk/lib/drivers/ip/network/neighbor.c +++ b/sdk/lib/drivers/ip/network/neighbor.c @@ -139,7 +139,7 @@ VOID NBTimeout(VOID) if (NCE->EventTimer - NCE->EventCount == 0) { /* Unlink and destroy the NCE */ *PrevNCE = NCE->Next; - + /* Choose the proper failure status */ if (NCE->State & NUD_INCOMPLETE) { @@ -151,7 +151,7 @@ VOID NBTimeout(VOID) /* This guy was stale for way too long */ Status = NDIS_STATUS_REQUEST_ABORTED; } - + NBFlushPacketQueue(NCE, Status); ExFreePoolWithTag(NCE, NCE_TAG); @@ -245,7 +245,7 @@ VOID NBDestroyNeighborsForInterface(PIP_INTERFACE Interface) for (i = 0; i <= NB_HASHMASK; i++) { TcpipAcquireSpinLockAtDpcLevel(&NeighborCache[i].Lock); - + for (PrevNCE = &NeighborCache[i].Cache; (NCE = *PrevNCE) != NULL;) { @@ -264,7 +264,7 @@ VOID NBDestroyNeighborsForInterface(PIP_INTERFACE Interface) PrevNCE = &NCE->Next; } } - + TcpipReleaseSpinLockFromDpcLevel(&NeighborCache[i].Lock); } KeLowerIrql(OldIrql); @@ -466,10 +466,10 @@ PNEIGHBOR_CACHE_ENTRY NBLocateNeighbor( { break; } - + NCE = NCE->Next; } - + if (NCE != NULL) break; } @@ -651,7 +651,7 @@ ULONG NBCopyNeighbors ArpTable[Size].Index = Interface->Index; ArpTable[Size].AddrSize = CurNCE->LinkAddressLength; RtlCopyMemory - (ArpTable[Size].PhysAddr, + (ArpTable[Size].PhysAddr, CurNCE->LinkAddress, CurNCE->LinkAddressLength); ArpTable[Size].LogAddr = CurNCE->Address.Address.IPv4Address; @@ -667,6 +667,6 @@ ULONG NBCopyNeighbors } TcpipReleaseSpinLock(&NeighborCache[i].Lock, OldIrql); } - + return Size; } diff --git a/sdk/lib/drivers/ip/network/receive.c b/sdk/lib/drivers/ip/network/receive.c index 52c929bb88a..bddef7972dd 100644 --- a/sdk/lib/drivers/ip/network/receive.c +++ b/sdk/lib/drivers/ip/network/receive.c @@ -303,7 +303,7 @@ VOID ProcessFragment( TI_DbgPrint(DEBUG_IP, ("Continueing assembly.\n")); /* We have a reassembly structure */ TcpipAcquireSpinLock(&IPDR->Lock, &OldIrql); - + /* Reset the timeout since we received a fragment */ IPDR->TimeoutCount = 0; } else { @@ -454,7 +454,7 @@ VOID ProcessFragment( Assemble the datagram and pass it to an upper layer protocol */ TI_DbgPrint(DEBUG_IP, ("Complete datagram received.\n")); - + RemoveIPDR(IPDR); TcpipReleaseSpinLock(&IPDR->Lock, OldIrql); @@ -539,7 +539,7 @@ VOID IPDatagramReassemblyTimeout( TcpipReleaseSpinLockFromDpcLevel(&CurrentIPDR->Lock); RemoveEntryList(CurrentEntry); FreeIPDR(CurrentIPDR); - } + } else { ASSERT(CurrentIPDR->TimeoutCount < MAX_TIMEOUT_COUNT); @@ -562,9 +562,9 @@ VOID IPv4Receive(PIP_INTERFACE IF, PIP_PACKET IPPacket) { UCHAR FirstByte; ULONG BytesCopied; - + TI_DbgPrint(DEBUG_IP, ("Received IPv4 datagram.\n")); - + /* Read in the first IP header byte for size information */ BytesCopied = CopyPacketToBuffer((PCHAR)&FirstByte, IPPacket->NdisPacket, @@ -623,7 +623,7 @@ VOID IPv4Receive(PIP_INTERFACE IF, PIP_PACKET IPPacket) AddrInitIPv4(&IPPacket->SrcAddr, ((PIPv4_HEADER)IPPacket->Header)->SrcAddr); AddrInitIPv4(&IPPacket->DstAddr, ((PIPv4_HEADER)IPPacket->Header)->DstAddr); - + TI_DbgPrint(MID_TRACE,("IPPacket->Position = %d\n", IPPacket->Position)); diff --git a/sdk/lib/drivers/ip/network/router.c b/sdk/lib/drivers/ip/network/router.c index b74062365d3..e03619f7a11 100644 --- a/sdk/lib/drivers/ip/network/router.c +++ b/sdk/lib/drivers/ip/network/router.c @@ -344,9 +344,9 @@ VOID RouterRemoveRoutesForInterface(PIP_INTERFACE Interface) PLIST_ENTRY CurrentEntry; PLIST_ENTRY NextEntry; PFIB_ENTRY Current; - + TcpipAcquireSpinLock(&FIBLock, &OldIrql); - + CurrentEntry = FIBListHead.Flink; while (CurrentEntry != &FIBListHead) { NextEntry = CurrentEntry->Flink; @@ -357,7 +357,7 @@ VOID RouterRemoveRoutesForInterface(PIP_INTERFACE Interface) CurrentEntry = NextEntry; } - + TcpipReleaseSpinLock(&FIBLock, OldIrql); } diff --git a/sdk/lib/drivers/ip/network/transmit.c b/sdk/lib/drivers/ip/network/transmit.c index 1673933d0a6..269602ed70d 100644 --- a/sdk/lib/drivers/ip/network/transmit.c +++ b/sdk/lib/drivers/ip/network/transmit.c @@ -33,7 +33,7 @@ VOID IPSendComplete (MAX_TRACE, ("Called. Context (0x%X) NdisPacket (0x%X) NdisStatus (0x%X)\n", Context, NdisPacket, NdisStatus)); - + IFC->Status = NdisStatus; KeSetEvent(&IFC->Event, 0, FALSE); } diff --git a/sdk/lib/drivers/ip/transport/datagram/datagram.c b/sdk/lib/drivers/ip/transport/datagram/datagram.c index 13acca1f181..053a3020894 100644 --- a/sdk/lib/drivers/ip/transport/datagram/datagram.c +++ b/sdk/lib/drivers/ip/transport/datagram/datagram.c @@ -24,7 +24,7 @@ BOOLEAN DGRemoveIRP( LockObject(AddrFile, &OldIrql); - for( ListEntry = AddrFile->ReceiveQueue.Flink; + for( ListEntry = AddrFile->ReceiveQueue.Flink; ListEntry != &AddrFile->ReceiveQueue; ListEntry = ListEntry->Flink ) { @@ -88,7 +88,7 @@ DGDeliverData( { DataBuffer = IPPacket->Data; } - else if (AddrFile->HeaderIncl) + else if (AddrFile->HeaderIncl) { DataBuffer = IPPacket->Header; } diff --git a/sdk/lib/drivers/ip/transport/tcp/accept.c b/sdk/lib/drivers/ip/transport/tcp/accept.c index ab47b9da101..aab177a94ad 100644 --- a/sdk/lib/drivers/ip/transport/tcp/accept.c +++ b/sdk/lib/drivers/ip/transport/tcp/accept.c @@ -22,23 +22,23 @@ NTSTATUS TCPCheckPeerForAccept(PVOID Context, PTDI_CONNECTION_INFORMATION WhoIsConnecting; PTA_IP_ADDRESS RemoteAddress; struct ip_addr ipaddr; - + if (Request->RequestFlags & TDI_QUERY_ACCEPT) DbgPrint("TDI_QUERY_ACCEPT NOT SUPPORTED!!!\n"); WhoIsConnecting = (PTDI_CONNECTION_INFORMATION)Request->ReturnConnectionInformation; RemoteAddress = (PTA_IP_ADDRESS)WhoIsConnecting->RemoteAddress; - + RemoteAddress->TAAddressCount = 1; RemoteAddress->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; RemoteAddress->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; - + Status = TCPTranslateError(LibTCPGetPeerName(newpcb, &ipaddr, &RemoteAddress->Address[0].Address[0].sin_port)); - + RemoteAddress->Address[0].Address[0].in_addr = ipaddr.addr; - + return Status; } @@ -61,7 +61,7 @@ NTSTATUS TCPListen(PCONNECTION_ENDPOINT Connection, UINT Backlog) TI_DbgPrint(DEBUG_TCP, ("Connection->SocketContext %x\n", Connection->SocketContext)); - + AddressToBind.addr = Connection->AddressFile->Address.Address.IPv4Address; Status = TCPTranslateError(LibTCPBind(Connection, @@ -79,7 +79,7 @@ NTSTATUS TCPListen(PCONNECTION_ENDPOINT Connection, UINT Backlog) { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - + /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF); } @@ -146,7 +146,7 @@ NTSTATUS TCPAccept ( PTDI_REQUEST Request, LockObject(Listener, &OldIrql); Bucket = ExAllocateFromNPagedLookasideList(&TdiBucketLookasideList); - + if (Bucket) { Bucket->AssociatedEndpoint = Connection; diff --git a/sdk/lib/drivers/ip/transport/tcp/event.c b/sdk/lib/drivers/ip/transport/tcp/event.c index 1d9918c821f..02613c2af17 100644 --- a/sdk/lib/drivers/ip/transport/tcp/event.c +++ b/sdk/lib/drivers/ip/transport/tcp/event.c @@ -24,11 +24,11 @@ BucketCompletionWorker(PVOID Context) { PTDI_BUCKET Bucket = (PTDI_BUCKET)Context; PTCP_COMPLETION_ROUTINE Complete; - + Complete = (PTCP_COMPLETION_ROUTINE)Bucket->Request.RequestNotifyObject; - + Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - + DereferenceObject(Bucket->AssociatedEndpoint); ExFreeToNPagedLookasideList(&TdiBucketLookasideList, Bucket); @@ -54,22 +54,22 @@ FlushReceiveQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status, const { PTDI_BUCKET Bucket; PLIST_ENTRY Entry; - + ReferenceObject(Connection); - + if (interlocked) { while ((Entry = ExInterlockedRemoveHeadList(&Connection->ReceiveRequest, &Connection->Lock))) { Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + TI_DbgPrint(DEBUG_TCP, ("Completing Receive request: %x %x\n", Bucket->Request, Status)); - + Bucket->Status = Status; Bucket->Information = 0; - + CompleteBucket(Connection, Bucket, FALSE); } } @@ -78,12 +78,12 @@ FlushReceiveQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status, const while (!IsListEmpty(&Connection->ReceiveRequest)) { Entry = RemoveHeadList(&Connection->ReceiveRequest); - + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); - + Bucket->Information = 0; Bucket->Status = Status; - + CompleteBucket(Connection, Bucket, FALSE); } } @@ -96,22 +96,22 @@ FlushSendQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status, const BOO { PTDI_BUCKET Bucket; PLIST_ENTRY Entry; - + ReferenceObject(Connection); if (interlocked) { while ((Entry = ExInterlockedRemoveHeadList(&Connection->SendRequest, &Connection->Lock))) { - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + TI_DbgPrint(DEBUG_TCP, ("Completing Send request: %x %x\n", Bucket->Request, Status)); - + Bucket->Status = Status; Bucket->Information = 0; - + CompleteBucket(Connection, Bucket, FALSE); } } @@ -120,12 +120,12 @@ FlushSendQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status, const BOO while (!IsListEmpty(&Connection->SendRequest)) { Entry = RemoveHeadList(&Connection->SendRequest); - + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); - + Bucket->Information = 0; Bucket->Status = Status; - + CompleteBucket(Connection, Bucket, FALSE); } } @@ -138,18 +138,18 @@ FlushShutdownQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status, const { PTDI_BUCKET Bucket; PLIST_ENTRY Entry; - + ReferenceObject(Connection); if (interlocked) { while ((Entry = ExInterlockedRemoveHeadList(&Connection->ShutdownRequest, &Connection->Lock))) - { + { Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Bucket->Status = Status; Bucket->Information = 0; - + CompleteBucket(Connection, Bucket, FALSE); } } @@ -158,12 +158,12 @@ FlushShutdownQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status, const while (!IsListEmpty(&Connection->ShutdownRequest)) { Entry = RemoveHeadList(&Connection->ShutdownRequest); - + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); - + Bucket->Information = 0; Bucket->Status = Status; - + CompleteBucket(Connection, Bucket, FALSE); } } @@ -176,16 +176,16 @@ FlushConnectQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status) { PTDI_BUCKET Bucket; PLIST_ENTRY Entry; - + ReferenceObject(Connection); while ((Entry = ExInterlockedRemoveHeadList(&Connection->ConnectRequest, &Connection->Lock))) { Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Bucket->Status = Status; Bucket->Information = 0; - + CompleteBucket(Connection, Bucket, FALSE); } @@ -197,16 +197,16 @@ FlushListenQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status) { PTDI_BUCKET Bucket; PLIST_ENTRY Entry; - + ReferenceObject(Connection); while ((Entry = ExInterlockedRemoveHeadList(&Connection->ListenRequest, &Connection->Lock))) { Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Bucket->Status = Status; Bucket->Information = 0; - + DereferenceObject(Bucket->AssociatedEndpoint); CompleteBucket(Connection, Bucket, FALSE); } @@ -216,9 +216,9 @@ FlushListenQueue(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status) VOID FlushAllQueues(PCONNECTION_ENDPOINT Connection, NTSTATUS Status) -{ +{ ReferenceObject(Connection); - + // flush receive queue FlushReceiveQueue(Connection, Status, TRUE); @@ -227,19 +227,19 @@ FlushAllQueues(PCONNECTION_ENDPOINT Connection, NTSTATUS Status) { Status = STATUS_FILE_CLOSED; } - + // flush listen queue FlushListenQueue(Connection, Status); - + // flush send queue FlushSendQueue(Connection, Status, TRUE); - + // flush connect queue FlushConnectQueue(Connection, Status); // flush shutdown queue FlushShutdownQueue(Connection, Status, TRUE); - + DereferenceObject(Connection); } @@ -292,7 +292,7 @@ TCPFinEventHandler(void *arg, const err_t err) UnlockObject(Connection, OldIrql); } - + VOID TCPAcceptEventHandler(void *arg, PTCP_PCB newpcb) { @@ -302,48 +302,48 @@ TCPAcceptEventHandler(void *arg, PTCP_PCB newpcb) PIRP Irp; NTSTATUS Status; KIRQL OldIrql; - + ReferenceObject(Connection); - + while ((Entry = ExInterlockedRemoveHeadList(&Connection->ListenRequest, &Connection->Lock))) { PIO_STACK_LOCATION IrpSp; - + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Irp = Bucket->Request.RequestContext; IrpSp = IoGetCurrentIrpStackLocation( Irp ); - + TI_DbgPrint(DEBUG_TCP,("[IP, TCPAcceptEventHandler] Getting the socket\n")); - + Status = TCPCheckPeerForAccept(newpcb, (PTDI_REQUEST_KERNEL)&IrpSp->Parameters); - + TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n", Status)); - + Bucket->Status = Status; Bucket->Information = 0; - + if (Status == STATUS_SUCCESS) { LockObject(Bucket->AssociatedEndpoint, &OldIrql); /* sanity assert...this should never be in anything else but a CLOSED state */ ASSERT( ((PTCP_PCB)Bucket->AssociatedEndpoint->SocketContext)->state == CLOSED ); - + /* free socket context created in FileOpenConnection, as we're using a new one */ LibTCPClose(Bucket->AssociatedEndpoint, TRUE, FALSE); /* free previously created socket context (we don't use it, we use newpcb) */ Bucket->AssociatedEndpoint->SocketContext = newpcb; - + LibTCPAccept(newpcb, (PTCP_PCB)Connection->SocketContext, Bucket->AssociatedEndpoint); UnlockObject(Bucket->AssociatedEndpoint, OldIrql); } - + DereferenceObject(Bucket->AssociatedEndpoint); - + CompleteBucket(Connection, Bucket, FALSE); if (Status == STATUS_SUCCESS) @@ -351,7 +351,7 @@ TCPAcceptEventHandler(void *arg, PTCP_PCB newpcb) break; } } - + DereferenceObject(Connection); } @@ -365,39 +365,39 @@ TCPSendEventHandler(void *arg, const u16_t space) NTSTATUS Status; PMDL Mdl; ULONG BytesSent; - + ReferenceObject(Connection); while ((Entry = ExInterlockedRemoveHeadList(&Connection->SendRequest, &Connection->Lock))) { UINT SendLen = 0; PVOID SendBuffer = 0; - + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Irp = Bucket->Request.RequestContext; Mdl = Irp->MdlAddress; - + TI_DbgPrint(DEBUG_TCP, ("Getting the user buffer from %x\n", Mdl)); - + NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); - + TI_DbgPrint(DEBUG_TCP, ("Writing %d bytes to %x\n", SendLen, SendBuffer)); - + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); TI_DbgPrint (DEBUG_TCP, ("Connection->SocketContext: %x\n", Connection->SocketContext)); - + Status = TCPTranslateError(LibTCPSend(Connection, SendBuffer, SendLen, &BytesSent, TRUE)); - + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", BytesSent)); - + if( Status == STATUS_PENDING ) { ExInterlockedInsertHeadList(&Connection->SendRequest, @@ -410,10 +410,10 @@ TCPSendEventHandler(void *arg, const u16_t space) TI_DbgPrint(DEBUG_TCP, ("Completing Send request: %x %x\n", Bucket->Request, Status)); - + Bucket->Status = Status; Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? BytesSent : 0; - + CompleteBucket(Connection, Bucket, FALSE); } } @@ -429,7 +429,7 @@ TCPSendEventHandler(void *arg, const u16_t space) DereferenceObject(Connection); } } - + DereferenceObject(Connection); } @@ -451,7 +451,7 @@ TCPRecvEventHandler(void *arg) while ((Entry = ExInterlockedRemoveHeadList(&Connection->ReceiveRequest, &Connection->Lock))) { Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Irp = Bucket->Request.RequestContext; Mdl = Irp->MdlAddress; @@ -481,19 +481,19 @@ TCPConnectEventHandler(void *arg, const err_t err) PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; - + ReferenceObject(Connection); - + while ((Entry = ExInterlockedRemoveHeadList(&Connection->ConnectRequest, &Connection->Lock))) { - + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Bucket->Status = TCPTranslateError(err); Bucket->Information = 0; - + CompleteBucket(Connection, Bucket, FALSE); } - + DereferenceObject(Connection); } diff --git a/sdk/lib/drivers/ip/transport/tcp/if.c b/sdk/lib/drivers/ip/transport/tcp/if.c index ba697a340cd..aba55d23abd 100644 --- a/sdk/lib/drivers/ip/transport/tcp/if.c +++ b/sdk/lib/drivers/ip/transport/tcp/if.c @@ -23,14 +23,14 @@ TCPSendDataCallback(struct netif *netif, struct pbuf *p, struct ip_addr *dest) if (((*(u8_t*)p->payload) & 0xF0) == 0x40) { Header = p->payload; - + LocalAddress.Type = IP_ADDRESS_V4; LocalAddress.Address.IPv4Address = Header->SrcAddr; - + RemoteAddress.Type = IP_ADDRESS_V4; RemoteAddress.Address.IPv4Address = Header->DstAddr; } - else + else { return ERR_IF; } @@ -96,20 +96,20 @@ err_t TCPInterfaceInit(struct netif *netif) { PIP_INTERFACE IF = netif->state; - + netif->hwaddr_len = IF->AddressLength; RtlCopyMemory(netif->hwaddr, IF->Address, netif->hwaddr_len); netif->output = TCPSendDataCallback; netif->mtu = IF->MTU; - + netif->name[0] = 'e'; netif->name[1] = 'n'; - + netif->flags |= NETIF_FLAG_BROADCAST; - + TCPUpdateInterfaceLinkStatus(IF); - + TCPUpdateInterfaceIPInformation(IF); return 0; @@ -121,12 +121,12 @@ TCPRegisterInterface(PIP_INTERFACE IF) struct ip_addr ipaddr; struct ip_addr netmask; struct ip_addr gw; - + gw.addr = 0; ipaddr.addr = 0; netmask.addr = 0; - - IF->TCPContext = netif_add(IF->TCPContext, + + IF->TCPContext = netif_add(IF->TCPContext, &ipaddr, &netmask, &gw, @@ -147,19 +147,19 @@ TCPUpdateInterfaceIPInformation(PIP_INTERFACE IF) struct ip_addr ipaddr; struct ip_addr netmask; struct ip_addr gw; - + gw.addr = 0; - + GetInterfaceIPv4Address(IF, ADE_UNICAST, (PULONG)&ipaddr.addr); - + GetInterfaceIPv4Address(IF, ADE_ADDRMASK, (PULONG)&netmask.addr); - + netif_set_addr(IF->TCPContext, &ipaddr, &netmask, &gw); - + if (ipaddr.addr != 0) { netif_set_up(IF->TCPContext); @@ -169,4 +169,4 @@ TCPUpdateInterfaceIPInformation(PIP_INTERFACE IF) { netif_set_down(IF->TCPContext); } -} +} diff --git a/sdk/lib/drivers/ip/transport/tcp/tcp.c b/sdk/lib/drivers/ip/transport/tcp/tcp.c index 675971bb2a1..d18b350a967 100644 --- a/sdk/lib/drivers/ip/transport/tcp/tcp.c +++ b/sdk/lib/drivers/ip/transport/tcp/tcp.c @@ -43,29 +43,29 @@ DisconnectTimeoutDpc(PKDPC Dpc, while (!IsListEmpty(&Connection->SendRequest)) { Entry = RemoveHeadList(&Connection->SendRequest); - + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); - + Bucket->Information = 0; Bucket->Status = STATUS_FILE_CLOSED; - + CompleteBucket(Connection, Bucket, FALSE); } - + while (!IsListEmpty(&Connection->ShutdownRequest)) { Entry = RemoveHeadList( &Connection->ShutdownRequest ); - + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - + Bucket->Status = STATUS_TIMEOUT; Bucket->Information = 0; - + CompleteBucket(Connection, Bucket, FALSE); } - + UnlockObjectFromDpcLevel(Connection); - + DereferenceObject(Connection); } @@ -176,7 +176,7 @@ VOID TCPReceive(PIP_INTERFACE Interface, PIP_PACKET IPPacket) TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to lwIP\n", IPPacket->TotalSize, IPPacket->HeaderSize)); - + LibIPInsertPacket(Interface->TCPContext, IPPacket->Header, IPPacket->TotalSize); } @@ -202,13 +202,13 @@ NTSTATUS TCPStartup(VOID) sizeof(TDI_BUCKET), TDI_BUCKET_TAG, 0); - + /* Initialize our IP library */ LibIPInitialize(); - + /* Register this protocol with IP layer */ IPRegisterProtocol(IPPROTO_TCP, TCPReceive); - + TCPInitialized = TRUE; return STATUS_SUCCESS; @@ -226,7 +226,7 @@ NTSTATUS TCPShutdown(VOID) return STATUS_SUCCESS; ExDeleteNPagedLookasideList(&TdiBucketLookasideList); - + LibIPShutdown(); /* Deregister this protocol with IP layer */ @@ -334,7 +334,7 @@ NTSTATUS TCPConnect Status = TCPTranslateError(LibTCPBind(Connection, &bindaddr, Connection->AddressFile->Port)); - + if (NT_SUCCESS(Status)) { /* Copy bind address into connection */ @@ -348,7 +348,7 @@ NTSTATUS TCPConnect { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - + /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF); } @@ -364,12 +364,12 @@ NTSTATUS TCPConnect UnlockObject(Connection, OldIrql); return STATUS_NO_MEMORY; } - + Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); - + Status = TCPTranslateError(LibTCPConnect(Connection, &connaddr, RemotePort)); @@ -415,7 +415,7 @@ NTSTATUS TCPDisconnect TCPTranslateError(LibTCPShutdown(Connection, 0, 1)); Status = STATUS_TIMEOUT; } - else + else { /* Use the timeout specified or 1 second if none was specified */ if (Timeout) @@ -502,7 +502,7 @@ NTSTATUS TCPReceiveData return STATUS_NO_MEMORY; } - + Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; @@ -548,7 +548,7 @@ NTSTATUS TCPSendData SendLength, BytesSent, FALSE)); - + TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Send: %x, %d\n", Status, SendLength)); /* Keep this request around ... there was no data yet */ @@ -562,10 +562,10 @@ NTSTATUS TCPSendData TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Failed to allocate bucket\n")); return STATUS_NO_MEMORY; } - + Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; - + InsertTailList( &Connection->SendRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Queued write irp\n")); } @@ -607,7 +607,7 @@ NTSTATUS TCPGetSockAddress struct ip_addr ipaddr; NTSTATUS Status; KIRQL OldIrql; - + AddressIP->TAAddressCount = 1; AddressIP->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; AddressIP->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; @@ -628,9 +628,9 @@ NTSTATUS TCPGetSockAddress } UnlockObject(Connection, OldIrql); - + AddressIP->Address[0].Address[0].in_addr = ipaddr.addr; - + RtlZeroMemory(&AddressIP->Address[0].Address[0].sin_zero, sizeof(AddressIP->Address[0].Address[0].sin_zero)); diff --git a/sdk/lib/drivers/ip/transport/udp/udp.c b/sdk/lib/drivers/ip/transport/udp/udp.c index 2f7dae94594..783dae988b9 100644 --- a/sdk/lib/drivers/ip/transport/udp/udp.c +++ b/sdk/lib/drivers/ip/transport/udp/udp.c @@ -347,7 +347,7 @@ NTSTATUS UDPStartup( #ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); #endif - + Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); if( !NT_SUCCESS(Status) ) return Status; diff --git a/sdk/lib/drivers/lwip/src/api/api_lib.c b/sdk/lib/drivers/lwip/src/api/api_lib.c index 4bdf08edfcc..9cf93d4a191 100644 --- a/sdk/lib/drivers/lwip/src/api/api_lib.c +++ b/sdk/lib/drivers/lwip/src/api/api_lib.c @@ -3,12 +3,12 @@ * Sequential API External module * */ - + /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/api/api_msg.c b/sdk/lib/drivers/lwip/src/api/api_msg.c index d4e44b9ad20..1de915cf7f2 100644 --- a/sdk/lib/drivers/lwip/src/api/api_msg.c +++ b/sdk/lib/drivers/lwip/src/api/api_msg.c @@ -6,9 +6,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -332,7 +332,7 @@ sent_tcp(void *arg, struct tcp_pcb *pcb, u16_t len) API_EVENT(conn, NETCONN_EVT_SENDPLUS, len); } } - + return ERR_OK; } @@ -1254,7 +1254,7 @@ do_writemore(struct netconn *conn) if (available < len) { /* don't try to write more than sendbuf */ len = available; - if (dontblock){ + if (dontblock){ if (!len) { err = ERR_WOULDBLOCK; goto err_mem; @@ -1490,7 +1490,7 @@ do_close(struct api_msg_msg *msg) */ void do_join_leave_group(struct api_msg_msg *msg) -{ +{ if (ERR_IS_FATAL(msg->conn->last_err)) { msg->err = msg->conn->last_err; } else { diff --git a/sdk/lib/drivers/lwip/src/api/err.c b/sdk/lib/drivers/lwip/src/api/err.c index 92fa8b7dba1..78a576f3545 100644 --- a/sdk/lib/drivers/lwip/src/api/err.c +++ b/sdk/lib/drivers/lwip/src/api/err.c @@ -6,9 +6,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/api/netbuf.c b/sdk/lib/drivers/lwip/src/api/netbuf.c index 9390c9ee983..cea0fa3ba8c 100644 --- a/sdk/lib/drivers/lwip/src/api/netbuf.c +++ b/sdk/lib/drivers/lwip/src/api/netbuf.c @@ -3,12 +3,12 @@ * Network buffer management * */ - + /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/api/netdb.c b/sdk/lib/drivers/lwip/src/api/netdb.c index 6a4bac561ce..34540043452 100644 --- a/sdk/lib/drivers/lwip/src/api/netdb.c +++ b/sdk/lib/drivers/lwip/src/api/netdb.c @@ -5,7 +5,7 @@ */ /* - * Redistribution and use in source and binary forms, with or without modification, + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -14,21 +14,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Simon Goldschmidt * */ @@ -258,7 +258,7 @@ lwip_freeaddrinfo(struct addrinfo *ai) * * @param nodename descriptive name or address string of the host * (may be NULL -> local address) - * @param servname port number as string of NULL + * @param servname port number as string of NULL * @param hints structure containing input values that set socktype and protocol * @param res pointer to a pointer where to store the result (set to NULL on failure) * @return 0 on success, non-zero on failure diff --git a/sdk/lib/drivers/lwip/src/api/netifapi.c b/sdk/lib/drivers/lwip/src/api/netifapi.c index 43e47203a9a..ba0e1eea818 100644 --- a/sdk/lib/drivers/lwip/src/api/netifapi.c +++ b/sdk/lib/drivers/lwip/src/api/netifapi.c @@ -5,7 +5,7 @@ */ /* - * Redistribution and use in source and binary forms, with or without modification, + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -14,21 +14,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * */ #include "lwip/opt.h" diff --git a/sdk/lib/drivers/lwip/src/api/sockets.c b/sdk/lib/drivers/lwip/src/api/sockets.c index 359919e7842..122e14b5fa8 100644 --- a/sdk/lib/drivers/lwip/src/api/sockets.c +++ b/sdk/lib/drivers/lwip/src/api/sockets.c @@ -75,7 +75,7 @@ struct lwip_sock { tested by select */ u16_t sendevent; /** error happened for this socket, set by event_callback(), tested by select */ - u16_t errevent; + u16_t errevent; /** last error that occurred on this socket */ int err; /** counter of how many threads are waiting for this socket using select */ @@ -580,7 +580,7 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags, buf = sock->lastdata; } else { /* If this is non-blocking call, then check first */ - if (((flags & MSG_DONTWAIT) || netconn_is_nonblocking(sock->conn)) && + if (((flags & MSG_DONTWAIT) || netconn_is_nonblocking(sock->conn)) && (sock->rcvevent <= 0)) { if (off > 0) { /* update receive window */ @@ -652,9 +652,9 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags, if (netconn_type(sock->conn) == NETCONN_TCP) { LWIP_ASSERT("invalid copylen, len would underflow", len >= copylen); len -= copylen; - if ( (len <= 0) || - (p->flags & PBUF_FLAG_PUSH) || - (sock->rcvevent <= 0) || + if ( (len <= 0) || + (p->flags & PBUF_FLAG_PUSH) || + (sock->rcvevent <= 0) || ((flags & MSG_PEEK)!=0)) { done = 1; } @@ -885,7 +885,7 @@ lwip_sendto(int s, const void *data, size_t size, int flags, #endif /* LWIP_UDP */ } UNLOCK_TCPIP_CORE(); - + pbuf_free(p); } else { err = ERR_MEM; @@ -1469,11 +1469,11 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) /* Do length and type checks for the various options first, to keep it readable. */ switch (level) { - + /* Level: SOL_SOCKET */ case SOL_SOCKET: switch (optname) { - + case SO_ACCEPTCONN: case SO_BROADCAST: /* UNIMPL case SO_DEBUG: */ @@ -1524,7 +1524,7 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) err = ENOPROTOOPT; } /* switch (optname) */ break; - + /* Level: IPPROTO_IP */ case IPPROTO_IP: switch (optname) { @@ -1564,7 +1564,7 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) err = ENOPROTOOPT; } /* switch (optname) */ break; - + #if LWIP_TCP /* Level: IPPROTO_TCP */ case IPPROTO_TCP: @@ -1572,7 +1572,7 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) err = EINVAL; break; } - + /* If this is no TCP socket, ignore any options. */ if (sock->conn->type != NETCONN_TCP) return 0; @@ -1586,7 +1586,7 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) case TCP_KEEPCNT: #endif /* LWIP_TCP_KEEPALIVE */ break; - + default: LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, UNIMPL: optname=0x%x, ..)\n", s, optname)); @@ -1601,7 +1601,7 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) err = EINVAL; break; } - + /* If this is no UDP lite socket, ignore any options. */ if (sock->conn->type != NETCONN_UDPLITE) { return 0; @@ -1611,7 +1611,7 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) case UDPLITE_SEND_CSCOV: case UDPLITE_RECV_CSCOV: break; - + default: LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_UDPLITE, UNIMPL: optname=0x%x, ..)\n", s, optname)); @@ -1626,7 +1626,7 @@ lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) err = ENOPROTOOPT; } /* switch */ - + if (err != ERR_OK) { sock_set_errno(sock, err); return -1; @@ -1721,7 +1721,7 @@ lwip_getsockopt_internal(void *arg) /* only overwrite ERR_OK or tempoary errors */ if ((sock->err == 0) || (sock->err == EINPROGRESS)) { sock_set_errno(sock, err_to_errno(sock->conn->last_err)); - } + } *(int *)optval = sock->err; sock->err = 0; LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, SO_ERROR) = %d\n", diff --git a/sdk/lib/drivers/lwip/src/api/tcpip.c b/sdk/lib/drivers/lwip/src/api/tcpip.c index cb3cead1384..05aa5e41769 100644 --- a/sdk/lib/drivers/lwip/src/api/tcpip.c +++ b/sdk/lib/drivers/lwip/src/api/tcpip.c @@ -311,7 +311,7 @@ tcpip_apimsg(struct api_msg *apimsg) /* catch functions that don't set err */ apimsg->msg.err = ERR_VAL; #endif - + if (sys_mbox_valid(&mbox)) { msg.type = TCPIP_MSG_API; msg.msg.apimsg = apimsg; @@ -361,14 +361,14 @@ err_t tcpip_netifapi(struct netifapi_msg* netifapimsg) { struct tcpip_msg msg; - + if (sys_mbox_valid(&mbox)) { err_t err = sys_sem_new(&netifapimsg->msg.sem, 0); if (err != ERR_OK) { netifapimsg->msg.err = err; return err; } - + msg.type = TCPIP_MSG_NETIFAPI; msg.msg.netifapimsg = netifapimsg; sys_mbox_post(&mbox, &msg); @@ -390,7 +390,7 @@ tcpip_netifapi(struct netifapi_msg* netifapimsg) err_t tcpip_netifapi_lock(struct netifapi_msg* netifapimsg) { - LOCK_TCPIP_CORE(); + LOCK_TCPIP_CORE(); netifapimsg->function(&(netifapimsg->msg)); UNLOCK_TCPIP_CORE(); return netifapimsg->msg.err; diff --git a/sdk/lib/drivers/lwip/src/core/def.c b/sdk/lib/drivers/lwip/src/core/def.c index 352b55241a5..bb4b8e01fcd 100644 --- a/sdk/lib/drivers/lwip/src/core/def.c +++ b/sdk/lib/drivers/lwip/src/core/def.c @@ -44,7 +44,7 @@ * Again with the aim of being simple, correct and fully portable. * Byte swapping is the second thing you would want to optimize. You will * need to port it to your architecture and in your cc.h: - * + * * #define LWIP_PLATFORM_BYTESWAP 1 * #define LWIP_PLATFORM_HTONS(x) * #define LWIP_PLATFORM_HTONL(x) diff --git a/sdk/lib/drivers/lwip/src/core/dhcp.c b/sdk/lib/drivers/lwip/src/core/dhcp.c index cf0b081d267..feb2b83c3f4 100644 --- a/sdk/lib/drivers/lwip/src/core/dhcp.c +++ b/sdk/lib/drivers/lwip/src/core/dhcp.c @@ -197,14 +197,14 @@ static void dhcp_handle_nak(struct netif *netif) { struct dhcp *dhcp = netif->dhcp; - LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_handle_nak(netif=%p) %c%c%"U16_F"\n", + LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_handle_nak(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num)); /* Set the interface down since the address must no longer be used, as per RFC2131 */ netif_set_down(netif); /* remove IP address from interface */ netif_set_ipaddr(netif, IP_ADDR_ANY); netif_set_gw(netif, IP_ADDR_ANY); - netif_set_netmask(netif, IP_ADDR_ANY); + netif_set_netmask(netif, IP_ADDR_ANY); /* Change to a defined state */ dhcp_set_state(dhcp, DHCP_BACKING_OFF); /* We can immediately restart discovery */ @@ -373,7 +373,7 @@ dhcp_fine_tmr() while (netif != NULL) { /* only act on DHCP configured interfaces */ if (netif->dhcp != NULL) { - /* timer is active (non zero), and is about to trigger now */ + /* timer is active (non zero), and is about to trigger now */ if (netif->dhcp->request_timeout > 1) { netif->dhcp->request_timeout--; } @@ -564,7 +564,7 @@ dhcp_handle_ack(struct netif *netif) if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_ROUTER)) { ip4_addr_set_u32(&dhcp->offered_gw_addr, htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_ROUTER))); } - + #if LWIP_DNS /* DNS servers */ n = 0; @@ -670,7 +670,7 @@ dhcp_start(struct netif *netif) LWIP_ASSERT("pbuf p_out wasn't freed", dhcp->p_out == NULL); LWIP_ASSERT("reply wasn't freed", dhcp->msg_in == NULL ); } - + /* clear data structure */ memset(dhcp, 0, sizeof(struct dhcp)); /* dhcp_set_state(&dhcp, DHCP_OFF); */ @@ -1183,7 +1183,7 @@ dhcp_release(struct netif *netif) ip_addr_set_zero(&dhcp->offered_si_addr); #endif /* LWIP_DHCP_BOOTP_FILE */ dhcp->offered_t0_lease = dhcp->offered_t1_renew = dhcp->offered_t2_rebind = 0; - + /* create and initialize the DHCP message header */ result = dhcp_create_msg(netif, dhcp, DHCP_RELEASE); if (result == ERR_OK) { @@ -1207,7 +1207,7 @@ dhcp_release(struct netif *netif) netif_set_ipaddr(netif, IP_ADDR_ANY); netif_set_gw(netif, IP_ADDR_ANY); netif_set_netmask(netif, IP_ADDR_ANY); - + return result; } diff --git a/sdk/lib/drivers/lwip/src/core/dns.c b/sdk/lib/drivers/lwip/src/core/dns.c index d63361226f2..f7c8c449a9f 100644 --- a/sdk/lib/drivers/lwip/src/core/dns.c +++ b/sdk/lib/drivers/lwip/src/core/dns.c @@ -49,13 +49,13 @@ * The lwIP version of the resolver also adds a non-blocking version of * gethostbyname() that will work with a raw API application. This function * checks for an IP address string first and converts it if it is valid. - * gethostbyname() then does a dns_lookup() to see if the name is - * already in the table. If so, the IP is returned. If not, a query is + * gethostbyname() then does a dns_lookup() to see if the name is + * already in the table. If so, the IP is returned. If not, a query is * issued and the function returns with a ERR_INPROGRESS status. The app * using the dns client must then go into a waiting state. * * Once a hostname has been resolved (or found to be non-existent), - * the resolver code calls a specified callback function (which + * the resolver code calls a specified callback function (which * must be implemented by the module that uses the resolver). */ @@ -234,7 +234,7 @@ dns_init() ip_addr_t dnsserver; dns_payload = (u8_t *)LWIP_MEM_ALIGN(dns_payload_buffer); - + /* initialize default DNS server address */ DNS_SERVER_ADDRESS(&dnsserver); @@ -648,7 +648,7 @@ dns_check_entry(u8_t i) pEntry->numdns = 0; pEntry->tmr = 1; pEntry->retries = 0; - + /* send DNS packet for this entry */ err = dns_send(pEntry->numdns, pEntry->name, i); if (err != ERR_OK) { @@ -758,7 +758,7 @@ dns_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t goto memerr; } - /* copy dns payload inside static buffer for processing */ + /* copy dns payload inside static buffer for processing */ if (pbuf_copy_partial(p, dns_payload, p->tot_len, 0) == p->tot_len) { /* The ID in the DNS header should be our entry into the name table. */ hdr = (struct dns_hdr*)dns_payload; diff --git a/sdk/lib/drivers/lwip/src/core/init.c b/sdk/lib/drivers/lwip/src/core/init.c index 691bdcaaf60..3ac275b061a 100644 --- a/sdk/lib/drivers/lwip/src/core/init.c +++ b/sdk/lib/drivers/lwip/src/core/init.c @@ -6,9 +6,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -188,7 +188,7 @@ #if NETCONN_MORE != TCP_WRITE_FLAG_MORE #error "NETCONN_MORE != TCP_WRITE_FLAG_MORE" #endif -#endif /* LWIP_NETCONN && LWIP_TCP */ +#endif /* LWIP_NETCONN && LWIP_TCP */ #if LWIP_SOCKET /* Check that the SO_* socket options and SOF_* lwIP-internal flags match */ #if SO_ACCEPTCONN != SOF_ACCEPTCONN diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/autoip.c b/sdk/lib/drivers/lwip/src/core/ipv4/autoip.c index b122da27e3f..70684cf7710 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv4/autoip.c +++ b/sdk/lib/drivers/lwip/src/core/ipv4/autoip.c @@ -43,9 +43,9 @@ /******************************************************************************* * USAGE: - * + * * define LWIP_AUTOIP 1 in your lwipopts.h - * + * * If you don't use tcpip.c (so, don't call, you don't call tcpip_init): * - First, call autoip_init(). * - call autoip_tmr() all AUTOIP_TMR_INTERVAL msces, @@ -55,7 +55,7 @@ * * Without DHCP: * - Call autoip_start() after netif_add(). - * + * * With DHCP: * - define LWIP_DHCP_AUTOIP_COOP 1 in your lwipopts.h. * - Configure your DHCP Client. @@ -202,7 +202,7 @@ autoip_create_addr(struct netif *netif, ip_addr_t *ipaddr) u32_t addr = ntohl(LWIP_AUTOIP_CREATE_SEED_ADDR(netif)); addr += netif->autoip->tried_llipaddr; addr = AUTOIP_NET | (addr & 0xffff); - /* Now, 169.254.0.0 <= addr <= 169.254.255.255 */ + /* Now, 169.254.0.0 <= addr <= 169.254.255.255 */ if (addr < AUTOIP_RANGE_START) { addr += AUTOIP_RANGE_END - AUTOIP_RANGE_START + 1; @@ -213,7 +213,7 @@ autoip_create_addr(struct netif *netif, ip_addr_t *ipaddr) LWIP_ASSERT("AUTOIP address not in range", (addr >= AUTOIP_RANGE_START) && (addr <= AUTOIP_RANGE_END)); ip4_addr_set_u32(ipaddr, htonl(addr)); - + LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("autoip_create_addr(): tried_llipaddr=%"U16_F", %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n", (u16_t)(netif->autoip->tried_llipaddr), ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr), @@ -268,7 +268,7 @@ autoip_bind(struct netif *netif) netif_set_ipaddr(netif, &autoip->llipaddr); netif_set_netmask(netif, &sn_mask); - netif_set_gw(netif, &gw_addr); + netif_set_gw(netif, &gw_addr); /* bring the interface up */ netif_set_up(netif); @@ -493,7 +493,7 @@ autoip_arp_reply(struct netif *netif, struct etharp_hdr *hdr) */ IPADDR2_COPY(&sipaddr, &hdr->sipaddr); IPADDR2_COPY(&dipaddr, &hdr->dipaddr); - + if ((netif->autoip->state == AUTOIP_STATE_PROBING) || ((netif->autoip->state == AUTOIP_STATE_ANNOUNCING) && (netif->autoip->sent_num == 0))) { diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/icmp.c b/sdk/lib/drivers/lwip/src/core/ipv4/icmp.c index 47ba857138d..aaf39c357e8 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv4/icmp.c +++ b/sdk/lib/drivers/lwip/src/core/ipv4/icmp.c @@ -103,7 +103,7 @@ icmp_input(struct pbuf *p, struct netif *inp) case ICMP_ER: /* This is OK, echo reply might have been parsed by a raw PCB (as obviously, an echo request has been sent, too). */ - break; + break; case ICMP_ECHO: #if !LWIP_MULTICAST_PING || !LWIP_BROADCAST_PING { @@ -227,7 +227,7 @@ icmp_input(struct pbuf *p, struct netif *inp) } break; default: - LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %"S16_F" code %"S16_F" not supported.\n", + LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %"S16_F" code %"S16_F" not supported.\n", (s16_t)type, (s16_t)code)); ICMP_STATS_INC(icmp.proterr); ICMP_STATS_INC(icmp.drop); diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/igmp.c b/sdk/lib/drivers/lwip/src/core/ipv4/igmp.c index 45bb5d95c29..0382e5b04df 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv4/igmp.c +++ b/sdk/lib/drivers/lwip/src/core/ipv4/igmp.c @@ -8,29 +8,29 @@ * Copyright (c) 2002 CITEL Technologies Ltd. * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY CITEL TECHNOLOGIES AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is a contribution to the lwIP TCP/IP stack. * The Swedish Institute of Computer Science and Adam Dunkels @@ -70,7 +70,7 @@ Steve Reynolds * RFC 2236 - Internet Group Management Protocol, Version 2 - V2 <- this code is based on this RFC (it's the "de facto" standard) * RFC 3376 - Internet Group Management Protocol, Version 3 - V3 * RFC 4604 - Using Internet Group Management Protocol Version 3... - V3+ - * RFC 2113 - IP Router Alert Option - + * RFC 2113 - IP Router Alert Option - *----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------- @@ -95,7 +95,7 @@ Steve Reynolds #include "string.h" -/* +/* * IGMP constants */ #define IGMP_TTL 1 @@ -167,7 +167,7 @@ igmp_init(void) */ void igmp_dump_group_list() -{ +{ struct igmp_group *group = igmp_group_list; while (group != NULL) { @@ -316,7 +316,7 @@ struct igmp_group * igmp_lookup_group(struct netif *ifp, ip_addr_t *addr) { struct igmp_group *group = igmp_group_list; - + /* Search if the group already exists */ group = igmp_lookfor_group(ifp, addr); if (group != NULL) { @@ -334,7 +334,7 @@ igmp_lookup_group(struct netif *ifp, ip_addr_t *addr) group->last_reporter_flag = 0; group->use = 0; group->next = igmp_group_list; - + igmp_group_list = group; } @@ -395,7 +395,7 @@ igmp_input(struct pbuf *p, struct netif *inp, ip_addr_t *dest) IGMP_STATS_INC(igmp.recv); - /* Note that the length CAN be greater than 8 but only 8 are used - All are included in the checksum */ + /* Note that the length CAN be greater than 8 but only 8 are used - All are included in the checksum */ iphdr = (struct ip_hdr *)p->payload; if (pbuf_header(p, -(s16_t)(IPH_HL(iphdr) * 4)) || (p->len < IGMP_MINLEN)) { pbuf_free(p); @@ -421,7 +421,7 @@ igmp_input(struct pbuf *p, struct netif *inp, ip_addr_t *dest) /* Packet is ok so find an existing group */ group = igmp_lookfor_group(inp, dest); /* use the destination IP address of incoming packet */ - + /* If group can be found or create... */ if (!group) { pbuf_free(p); @@ -614,7 +614,7 @@ igmp_leavegroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr) IGMP_STATS_INC(igmp.tx_leave); igmp_send(group, IGMP_LEAVE_GROUP); } - + /* Disable the group at the MAC level */ if (netif->igmp_mac_filter != NULL) { LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup: igmp_mac_filter(DEL ")); @@ -622,11 +622,11 @@ igmp_leavegroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr) LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", netif)); netif->igmp_mac_filter(netif, groupaddr, IGMP_DEL_MAC_FILTER); } - + LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup: remove group: ")); ip_addr_debug_print(IGMP_DEBUG, groupaddr); - LWIP_DEBUGF(IGMP_DEBUG, ("\n")); - + LWIP_DEBUGF(IGMP_DEBUG, ("\n")); + /* Free the group */ igmp_remove_group(group); } else { @@ -768,13 +768,13 @@ igmp_send(struct igmp_group *group, u8_t type) /* IP header + "router alert" option + IGMP header */ p = pbuf_alloc(PBUF_TRANSPORT, IGMP_MINLEN, PBUF_RAM); - + if (p) { igmp = (struct igmp_msg *)p->payload; LWIP_ASSERT("igmp_send: check that first pbuf can hold struct igmp_msg", (p->len >= sizeof(struct igmp_msg))); ip_addr_copy(src, group->netif->ip_addr); - + if (type == IGMP_V2_MEMB_REPORT) { dest = &(group->group_address); ip_addr_copy(igmp->igmp_group_address, group->group_address); diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/inet_chksum.c b/sdk/lib/drivers/lwip/src/core/ipv4/inet_chksum.c index 960252f64f1..014b891eedf 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv4/inet_chksum.c +++ b/sdk/lib/drivers/lwip/src/core/ipv4/inet_chksum.c @@ -48,8 +48,8 @@ * aim of being simple, correct and fully portable. Checksumming is the * first thing you would want to optimize for your platform. If you create * your own version, link it in and in your cc.h put: - * - * #define LWIP_CHKSUM + * + * #define LWIP_CHKSUM * * Or you can select from the implementations below by defining * LWIP_CHKSUM_ALGORITHM to 1, 2 or 3. @@ -72,7 +72,7 @@ * * @param dataptr points to start of data to be summed at any boundary * @param len length of data to be summed - * @return host order (!) lwip checksum (non-inverted Internet sum) + * @return host order (!) lwip checksum (non-inverted Internet sum) * * @note accumulator size limits summable length to 64k * @note host endianess is irrelevant (p3 RFC1071) @@ -128,7 +128,7 @@ lwip_standard_chksum(void *dataptr, u16_t len) * * @param dataptr points to start of data to be summed at any boundary * @param len length of data to be summed - * @return host order (!) lwip checksum (non-inverted Internet sum) + * @return host order (!) lwip checksum (non-inverted Internet sum) */ static u16_t @@ -178,12 +178,12 @@ lwip_standard_chksum(void *dataptr, int len) /** * An optimized checksum routine. Basically, it uses loop-unrolling on * the checksum loop, treating the head and tail bytes specially, whereas - * the inner loop acts on 8 bytes at a time. + * the inner loop acts on 8 bytes at a time. * * @arg start of buffer to be checksummed. May be an odd byte address. * @len number of bytes in the buffer to be checksummed. - * @return host order (!) lwip checksum (non-inverted Internet sum) - * + * @return host order (!) lwip checksum (non-inverted Internet sum) + * * by Curt McDowell, Broadcom Corp. December 8th, 2005 */ diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/ip.c b/sdk/lib/drivers/lwip/src/core/ipv4/ip.c index 95d2db404c0..0e09b3c0472 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv4/ip.c +++ b/sdk/lib/drivers/lwip/src/core/ipv4/ip.c @@ -1,7 +1,7 @@ /** * @file * This is the IPv4 layer implementation for incoming and outgoing IP traffic. - * + * * @see ip_frag.c * */ @@ -295,7 +295,7 @@ return_noroute: * forwarded (using ip_forward). The IP checksum is always checked. * * Finally, the packet is sent to the upper layer protocol input function. - * + * * @param p the received IP packet (p->payload points to IP header) * @param inp the netif on which this packet was received * @return ERR_OK if the packet was processed (could return ERR_* if it wasn't diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/ip_addr.c b/sdk/lib/drivers/lwip/src/core/ipv4/ip_addr.c index 8f633ff2310..bbd78534a5a 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv4/ip_addr.c +++ b/sdk/lib/drivers/lwip/src/core/ipv4/ip_addr.c @@ -6,9 +6,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -45,8 +45,8 @@ const ip_addr_t ip_addr_any = { IPADDR_ANY }; const ip_addr_t ip_addr_broadcast = { IPADDR_BROADCAST }; /** - * Determine if an address is a broadcast address on a network interface - * + * Determine if an address is a broadcast address on a network interface + * * @param addr address to be checked * @param netif the network interface against which the address is checked * @return returns non-zero if the address is a broadcast address diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/ip_frag.c b/sdk/lib/drivers/lwip/src/core/ipv4/ip_frag.c index 8d184345dff..e1bda3f0795 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv4/ip_frag.c +++ b/sdk/lib/drivers/lwip/src/core/ipv4/ip_frag.c @@ -6,9 +6,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,25 +17,25 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * - * Author: Jani Monoses + * + * Author: Jani Monoses * Simon Goldschmidt * original reassembly code by Adam Dunkels - * + * */ #include "lwip/opt.h" @@ -185,7 +185,7 @@ ip_reass_free_complete_datagram(struct ip_reassdata *ipr, struct ip_reassdata *p } #endif /* LWIP_ICMP */ - /* First, free all received pbufs. The individual pbufs need to be released + /* First, free all received pbufs. The individual pbufs need to be released separately as they have not yet been chained */ p = ipr->p; while (p != NULL) { @@ -303,7 +303,7 @@ ip_reass_enqueue_new_datagram(struct ip_hdr *fraghdr, int clen) static void ip_reass_dequeue_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev) { - + /* dequeue the reass struct */ if (reassdatagrams == ipr) { /* it was the first in the list */ @@ -337,7 +337,7 @@ ip_reass_chain_frag_into_datagram_and_validate(struct ip_reassdata *ipr, struct int valid = 1; /* Extract length and fragment offset from current fragment */ - fraghdr = (struct ip_hdr*)new_p->payload; + fraghdr = (struct ip_hdr*)new_p->payload; len = ntohs(IPH_LEN(fraghdr)) - IPH_HL(fraghdr) * 4; offset = (ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) * 8; @@ -538,7 +538,7 @@ ip_reass(struct pbuf *p) goto nullreturn; } } else { - if (((ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) == 0) && + if (((ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) == 0) && ((ntohs(IPH_OFFSET(&ipr->iphdr)) & IP_OFFMASK) != 0)) { /* ipr->iphdr is not the header from the first fragment, but fraghdr is * -> copy fraghdr into ipr->iphdr since we want to have the header @@ -547,11 +547,11 @@ ip_reass(struct pbuf *p) SMEMCPY(&ipr->iphdr, fraghdr, IP_HLEN); } } - /* Track the current number of pbufs current 'in-flight', in order to limit + /* Track the current number of pbufs current 'in-flight', in order to limit the number of fragments that may be enqueued at any one time */ ip_reass_pbufcount += clen; - /* At this point, we have either created a new entry or pointing + /* At this point, we have either created a new entry or pointing * to an existing one */ /* check for 'no more fragments', and update queue entry*/ @@ -663,7 +663,7 @@ ipfrag_free_pbuf_custom(struct pbuf *p) * * @return ERR_OK if sent successfully, err_t otherwise */ -err_t +err_t ip_frag(struct pbuf *p, struct netif *netif, ip_addr_t *dest) { struct pbuf *rambuf; @@ -818,8 +818,8 @@ ip_frag(struct pbuf *p, struct netif *netif, ip_addr_t *dest) pbuf_realloc(rambuf, left + IP_HLEN); } - /* This part is ugly: we alloc a RAM based pbuf for - * the link level header for each chunk and then + /* This part is ugly: we alloc a RAM based pbuf for + * the link level header for each chunk and then * free it.A PBUF_ROM style pbuf for which pbuf_header * worked would make things simpler. */ @@ -848,7 +848,7 @@ ip_frag(struct pbuf *p, struct netif *netif, ip_addr_t *dest) * will have already sent the packet, the free will really free, and * there will be zero memory penalty. */ - + pbuf_free(rambuf); #endif /* IP_FRAG_USES_STATIC_BUF */ left -= cop; diff --git a/sdk/lib/drivers/lwip/src/core/ipv6/inet6.c b/sdk/lib/drivers/lwip/src/core/ipv6/inet6.c index c3de85c0930..fa381583209 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv6/inet6.c +++ b/sdk/lib/drivers/lwip/src/core/ipv6/inet6.c @@ -7,9 +7,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -18,21 +18,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -56,8 +56,8 @@ chksum(void *dataptr, u16_t len) { u16_t *sdataptr = dataptr; u32_t acc; - - + + for(acc = 0; len > 1; len -= 2) { acc += *sdataptr++; } @@ -87,7 +87,7 @@ inet_chksum_pseudo(struct pbuf *p, acc = 0; swapped = 0; - for(q = p; q != NULL; q = q->next) { + for(q = p; q != NULL; q = q->next) { acc += chksum(q->payload, q->len); while (acc >> 16) { acc = (acc & 0xffff) + (acc >> 16); @@ -101,7 +101,7 @@ inet_chksum_pseudo(struct pbuf *p, if (swapped) { acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8); } - + for(i = 0; i < 8; i++) { acc += ((u16_t *)src->addr)[i] & 0xffff; acc += ((u16_t *)dest->addr)[i] & 0xffff; @@ -142,20 +142,20 @@ inet_chksum_pbuf(struct pbuf *p) u32_t acc; struct pbuf *q; u8_t swapped; - + acc = 0; swapped = 0; for(q = p; q != NULL; q = q->next) { acc += chksum(q->payload, q->len); while (acc >> 16) { acc = (acc & 0xffff) + (acc >> 16); - } + } if (q->len % 2 != 0) { swapped = 1 - swapped; acc = (acc & 0xff << 8) | (acc & 0xff00 >> 8); } } - + if (swapped) { acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8); } diff --git a/sdk/lib/drivers/lwip/src/core/ipv6/ip6_addr.c b/sdk/lib/drivers/lwip/src/core/ipv6/ip6_addr.c index 2da6cea4276..a74bc31375c 100644 --- a/sdk/lib/drivers/lwip/src/core/ipv6/ip6_addr.c +++ b/sdk/lib/drivers/lwip/src/core/ipv6/ip6_addr.c @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -42,7 +42,7 @@ ip_addr_netcmp(struct ip_addr *addr1, struct ip_addr *addr2, (addr1->addr[1] & mask->addr[1]) == (addr2->addr[1] & mask->addr[1]) && (addr1->addr[2] & mask->addr[2]) == (addr2->addr[2] & mask->addr[2]) && (addr1->addr[3] & mask->addr[3]) == (addr2->addr[3] & mask->addr[3])); - + } u8_t diff --git a/sdk/lib/drivers/lwip/src/core/mem.c b/sdk/lib/drivers/lwip/src/core/mem.c index 1659a2c7a43..66016917a12 100644 --- a/sdk/lib/drivers/lwip/src/core/mem.c +++ b/sdk/lib/drivers/lwip/src/core/mem.c @@ -471,7 +471,7 @@ mem_trim(void *rmem, mem_size_t newsize) /* else { next struct mem is used but size between mem and mem2 is not big enough to create another struct mem - -> don't do anyhting. + -> don't do anyhting. -> the remaining space stays unused since it is too small } */ #if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT diff --git a/sdk/lib/drivers/lwip/src/core/memp.c b/sdk/lib/drivers/lwip/src/core/memp.c index 9f680e244f9..8f31a07edd4 100644 --- a/sdk/lib/drivers/lwip/src/core/memp.c +++ b/sdk/lib/drivers/lwip/src/core/memp.c @@ -8,9 +8,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -19,21 +19,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -155,19 +155,19 @@ static const char *memp_desc[MEMP_MAX] = { * extern u8_t __attribute__((section(".onchip_mem"))) memp_memory_UDP_PCB_base[]; */ #define LWIP_MEMPOOL(name,num,size,desc) u8_t memp_memory_ ## name ## _base \ - [((num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size)))]; + [((num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size)))]; #include "lwip/memp_std.h" /** This array holds the base of each memory pool. */ -static u8_t *const memp_bases[] = { -#define LWIP_MEMPOOL(name,num,size,desc) memp_memory_ ## name ## _base, +static u8_t *const memp_bases[] = { +#define LWIP_MEMPOOL(name,num,size,desc) memp_memory_ ## name ## _base, #include "lwip/memp_std.h" }; #else /* MEMP_SEPARATE_POOLS */ /** This is the actual memory used by the pools (all pools in one big block). */ -static u8_t memp_memory[MEM_ALIGNMENT - 1 +static u8_t memp_memory[MEM_ALIGNMENT - 1 #define LWIP_MEMPOOL(name,num,size,desc) + ( (num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size) ) ) #include "lwip/memp_std.h" ]; @@ -331,7 +331,7 @@ memp_overflow_init(void) /** * Initialize this module. - * + * * Carves out memp_memory into linked lists for each pool-type. */ void @@ -394,7 +394,7 @@ memp_malloc_fn(memp_t type, const char* file, const int line) { struct memp *memp; SYS_ARCH_DECL_PROTECT(old_level); - + LWIP_ERROR("memp_malloc: type < MEMP_MAX", (type < MEMP_MAX), return NULL;); SYS_ARCH_PROTECT(old_level); @@ -403,7 +403,7 @@ memp_malloc_fn(memp_t type, const char* file, const int line) #endif /* MEMP_OVERFLOW_CHECK >= 2 */ memp = memp_tab[type]; - + if (memp != NULL) { memp_tab[type] = memp->next; #if MEMP_OVERFLOW_CHECK @@ -455,9 +455,9 @@ memp_free(memp_t type, void *mem) #endif /* MEMP_OVERFLOW_CHECK >= 2 */ #endif /* MEMP_OVERFLOW_CHECK */ - MEMP_STATS_DEC(used, type); - - memp->next = memp_tab[type]; + MEMP_STATS_DEC(used, type); + + memp->next = memp_tab[type]; memp_tab[type] = memp; #if MEMP_SANITY_CHECK diff --git a/sdk/lib/drivers/lwip/src/core/netif.c b/sdk/lib/drivers/lwip/src/core/netif.c index 4a02e77f31f..8c1e4e58a08 100644 --- a/sdk/lib/drivers/lwip/src/core/netif.c +++ b/sdk/lib/drivers/lwip/src/core/netif.c @@ -64,13 +64,13 @@ #define NETIF_STATUS_CALLBACK(n) do{ if (n->status_callback) { (n->status_callback)(n); }}while(0) #else #define NETIF_STATUS_CALLBACK(n) -#endif /* LWIP_NETIF_STATUS_CALLBACK */ +#endif /* LWIP_NETIF_STATUS_CALLBACK */ #if LWIP_NETIF_LINK_CALLBACK #define NETIF_LINK_CALLBACK(n) do{ if (n->link_callback) { (n->link_callback)(n); }}while(0) #else #define NETIF_LINK_CALLBACK(n) -#endif /* LWIP_NETIF_LINK_CALLBACK */ +#endif /* LWIP_NETIF_LINK_CALLBACK */ struct netif *netif_list; struct netif *netif_default; @@ -444,17 +444,17 @@ netif_set_default(struct netif *netif) /** * Bring an interface up, available for processing * traffic. - * + * * @note: Enabling DHCP on a down interface will make it come * up once configured. - * + * * @see dhcp_start() - */ + */ void netif_set_up(struct netif *netif) { if (!(netif->flags & NETIF_FLAG_UP)) { netif->flags |= NETIF_FLAG_UP; - + #if LWIP_SNMP snmp_get_sysuptime(&netif->ts); #endif /* LWIP_SNMP */ @@ -463,7 +463,7 @@ void netif_set_up(struct netif *netif) if (netif->flags & NETIF_FLAG_LINK_UP) { #if LWIP_ARP - /* For Ethernet network interfaces, we would like to send a "gratuitous ARP" */ + /* For Ethernet network interfaces, we would like to send a "gratuitous ARP" */ if (netif->flags & (NETIF_FLAG_ETHARP)) { etharp_gratuitous(netif); } @@ -484,9 +484,9 @@ void netif_set_up(struct netif *netif) * * @note: Enabling DHCP on a down interface will make it come * up once configured. - * + * * @see dhcp_start() - */ + */ void netif_set_down(struct netif *netif) { if (netif->flags & NETIF_FLAG_UP) { @@ -551,7 +551,7 @@ void netif_set_link_up(struct netif *netif ) if (netif->flags & NETIF_FLAG_UP) { #if LWIP_ARP - /* For Ethernet network interfaces, we would like to send a "gratuitous ARP" */ + /* For Ethernet network interfaces, we would like to send a "gratuitous ARP" */ if (netif->flags & NETIF_FLAG_ETHARP) { etharp_gratuitous(netif); } diff --git a/sdk/lib/drivers/lwip/src/core/pbuf.c b/sdk/lib/drivers/lwip/src/core/pbuf.c index 1e5e53b12a4..0c3e91f1f16 100644 --- a/sdk/lib/drivers/lwip/src/core/pbuf.c +++ b/sdk/lib/drivers/lwip/src/core/pbuf.c @@ -12,13 +12,13 @@ * * Multiple packets may be queued, also using this singly linked list. * This is called a "packet queue". - * + * * So, a packet queue consists of one or more pbuf chains, each of * which consist of one or more pbufs. CURRENTLY, PACKET QUEUES ARE * NOT SUPPORTED!!! Use helper structs to queue multiple packets. - * + * * The differences between a pbuf chain and a packet queue are very - * precise but subtle. + * precise but subtle. * * The last pbuf of a packet has a ->tot_len field that equals the * ->len field. It can be found by traversing the list. If the last @@ -518,7 +518,7 @@ pbuf_header(struct pbuf *p, s16_t header_size_increment) if ((header_size_increment == 0) || (p == NULL)) { return 0; } - + if (header_size_increment < 0){ increment_magnitude = -header_size_increment; /* Check that we aren't going to move off the end of the pbuf */ @@ -529,7 +529,7 @@ pbuf_header(struct pbuf *p, s16_t header_size_increment) /* Can't assert these as some callers speculatively call pbuf_header() to see if it's OK. Will return 1 below instead. */ /* Check that we've got the correct type of pbuf to work with */ - LWIP_ASSERT("p->type == PBUF_RAM || p->type == PBUF_POOL", + LWIP_ASSERT("p->type == PBUF_RAM || p->type == PBUF_POOL", p->type == PBUF_RAM || p->type == PBUF_POOL); /* Check that we aren't going to move off the beginning of the pbuf */ LWIP_ASSERT("p->payload - increment_magnitude >= p + SIZEOF_STRUCT_PBUF", @@ -606,7 +606,7 @@ pbuf_header(struct pbuf *p, s16_t header_size_increment) * * Assuming existing chains a->b->c with the following reference * counts, calling pbuf_free(a) results in: - * + * * 1->2->3 becomes ...1->3 * 3->3->3 becomes 2->3->3 * 1->1->2 becomes ......1 @@ -734,10 +734,10 @@ pbuf_ref(struct pbuf *p) /** * Concatenate two pbufs (each may be a pbuf chain) and take over * the caller's reference of the tail pbuf. - * + * * @note The caller MAY NOT reference the tail pbuf afterwards. * Use pbuf_chain() for that purpose. - * + * * @see pbuf_chain() */ @@ -768,10 +768,10 @@ pbuf_cat(struct pbuf *h, struct pbuf *t) /** * Chain two pbufs (or pbuf chains) together. - * + * * The caller MUST call pbuf_free(t) once it has stopped * using it. Use pbuf_cat() instead if you no longer use t. - * + * * @param h head pbuf (chain) * @param t tail pbuf (chain) * @note The pbufs MUST belong to the same packet. @@ -909,7 +909,7 @@ pbuf_copy(struct pbuf *p_to, struct pbuf *p_from) * * @param buf the pbuf from which to copy data * @param dataptr the application supplied buffer - * @param len length of data to copy (dataptr must be big enough). No more + * @param len length of data to copy (dataptr must be big enough). No more * than buf->tot_len will be copied, irrespective of len * @param offset offset into the packet buffer from where to begin copying len bytes * @return the number of bytes copied, or 0 on failure diff --git a/sdk/lib/drivers/lwip/src/core/raw.c b/sdk/lib/drivers/lwip/src/core/raw.c index 7160c0fbd9c..e9dcda3237c 100644 --- a/sdk/lib/drivers/lwip/src/core/raw.c +++ b/sdk/lib/drivers/lwip/src/core/raw.c @@ -168,14 +168,14 @@ raw_connect(struct raw_pcb *pcb, ip_addr_t *ipaddr) /** * Set the callback function for received packets that match the - * raw PCB's protocol and binding. - * + * raw PCB's protocol and binding. + * * The callback function MUST either * - eat the packet by calling pbuf_free() and returning non-zero. The * packet will not be passed to other raw PCBs or other protocol layers. * - not free the packet, and return zero. The packet will be matched * against further PCBs and/or forwarded to another protocol layers. - * + * * @return non-zero if the packet was free()d, zero if the packet remains * available for others. */ @@ -206,9 +206,9 @@ raw_sendto(struct raw_pcb *pcb, struct pbuf *p, ip_addr_t *ipaddr) struct netif *netif; ip_addr_t *src_ip; struct pbuf *q; /* q will be sent down the stack */ - + LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_TRACE, ("raw_sendto\n")); - + /* not enough space to add an IP header to first pbuf in given p chain? */ if (pbuf_header(p, IP_HLEN)) { /* allocate header in new pbuf */ diff --git a/sdk/lib/drivers/lwip/src/core/stats.c b/sdk/lib/drivers/lwip/src/core/stats.c index 8ea82497674..6aa59e0930a 100644 --- a/sdk/lib/drivers/lwip/src/core/stats.c +++ b/sdk/lib/drivers/lwip/src/core/stats.c @@ -6,9 +6,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -72,18 +72,18 @@ void stats_display_proto(struct stats_proto *proto, const char *name) { LWIP_PLATFORM_DIAG(("\n%s\n\t", name)); - LWIP_PLATFORM_DIAG(("xmit: %"STAT_COUNTER_F"\n\t", proto->xmit)); - LWIP_PLATFORM_DIAG(("recv: %"STAT_COUNTER_F"\n\t", proto->recv)); - LWIP_PLATFORM_DIAG(("fw: %"STAT_COUNTER_F"\n\t", proto->fw)); - LWIP_PLATFORM_DIAG(("drop: %"STAT_COUNTER_F"\n\t", proto->drop)); - LWIP_PLATFORM_DIAG(("chkerr: %"STAT_COUNTER_F"\n\t", proto->chkerr)); - LWIP_PLATFORM_DIAG(("lenerr: %"STAT_COUNTER_F"\n\t", proto->lenerr)); - LWIP_PLATFORM_DIAG(("memerr: %"STAT_COUNTER_F"\n\t", proto->memerr)); - LWIP_PLATFORM_DIAG(("rterr: %"STAT_COUNTER_F"\n\t", proto->rterr)); - LWIP_PLATFORM_DIAG(("proterr: %"STAT_COUNTER_F"\n\t", proto->proterr)); - LWIP_PLATFORM_DIAG(("opterr: %"STAT_COUNTER_F"\n\t", proto->opterr)); - LWIP_PLATFORM_DIAG(("err: %"STAT_COUNTER_F"\n\t", proto->err)); - LWIP_PLATFORM_DIAG(("cachehit: %"STAT_COUNTER_F"\n", proto->cachehit)); + LWIP_PLATFORM_DIAG(("xmit: %"STAT_COUNTER_F"\n\t", proto->xmit)); + LWIP_PLATFORM_DIAG(("recv: %"STAT_COUNTER_F"\n\t", proto->recv)); + LWIP_PLATFORM_DIAG(("fw: %"STAT_COUNTER_F"\n\t", proto->fw)); + LWIP_PLATFORM_DIAG(("drop: %"STAT_COUNTER_F"\n\t", proto->drop)); + LWIP_PLATFORM_DIAG(("chkerr: %"STAT_COUNTER_F"\n\t", proto->chkerr)); + LWIP_PLATFORM_DIAG(("lenerr: %"STAT_COUNTER_F"\n\t", proto->lenerr)); + LWIP_PLATFORM_DIAG(("memerr: %"STAT_COUNTER_F"\n\t", proto->memerr)); + LWIP_PLATFORM_DIAG(("rterr: %"STAT_COUNTER_F"\n\t", proto->rterr)); + LWIP_PLATFORM_DIAG(("proterr: %"STAT_COUNTER_F"\n\t", proto->proterr)); + LWIP_PLATFORM_DIAG(("opterr: %"STAT_COUNTER_F"\n\t", proto->opterr)); + LWIP_PLATFORM_DIAG(("err: %"STAT_COUNTER_F"\n\t", proto->err)); + LWIP_PLATFORM_DIAG(("cachehit: %"STAT_COUNTER_F"\n", proto->cachehit)); } #if IGMP_STATS @@ -91,20 +91,20 @@ void stats_display_igmp(struct stats_igmp *igmp) { LWIP_PLATFORM_DIAG(("\nIGMP\n\t")); - LWIP_PLATFORM_DIAG(("xmit: %"STAT_COUNTER_F"\n\t", igmp->xmit)); - LWIP_PLATFORM_DIAG(("recv: %"STAT_COUNTER_F"\n\t", igmp->recv)); - LWIP_PLATFORM_DIAG(("drop: %"STAT_COUNTER_F"\n\t", igmp->drop)); - LWIP_PLATFORM_DIAG(("chkerr: %"STAT_COUNTER_F"\n\t", igmp->chkerr)); - LWIP_PLATFORM_DIAG(("lenerr: %"STAT_COUNTER_F"\n\t", igmp->lenerr)); - LWIP_PLATFORM_DIAG(("memerr: %"STAT_COUNTER_F"\n\t", igmp->memerr)); - LWIP_PLATFORM_DIAG(("proterr: %"STAT_COUNTER_F"\n\t", igmp->proterr)); - LWIP_PLATFORM_DIAG(("rx_v1: %"STAT_COUNTER_F"\n\t", igmp->rx_v1)); + LWIP_PLATFORM_DIAG(("xmit: %"STAT_COUNTER_F"\n\t", igmp->xmit)); + LWIP_PLATFORM_DIAG(("recv: %"STAT_COUNTER_F"\n\t", igmp->recv)); + LWIP_PLATFORM_DIAG(("drop: %"STAT_COUNTER_F"\n\t", igmp->drop)); + LWIP_PLATFORM_DIAG(("chkerr: %"STAT_COUNTER_F"\n\t", igmp->chkerr)); + LWIP_PLATFORM_DIAG(("lenerr: %"STAT_COUNTER_F"\n\t", igmp->lenerr)); + LWIP_PLATFORM_DIAG(("memerr: %"STAT_COUNTER_F"\n\t", igmp->memerr)); + LWIP_PLATFORM_DIAG(("proterr: %"STAT_COUNTER_F"\n\t", igmp->proterr)); + LWIP_PLATFORM_DIAG(("rx_v1: %"STAT_COUNTER_F"\n\t", igmp->rx_v1)); LWIP_PLATFORM_DIAG(("rx_group: %"STAT_COUNTER_F"\n", igmp->rx_group)); LWIP_PLATFORM_DIAG(("rx_general: %"STAT_COUNTER_F"\n", igmp->rx_general)); - LWIP_PLATFORM_DIAG(("rx_report: %"STAT_COUNTER_F"\n\t", igmp->rx_report)); - LWIP_PLATFORM_DIAG(("tx_join: %"STAT_COUNTER_F"\n\t", igmp->tx_join)); - LWIP_PLATFORM_DIAG(("tx_leave: %"STAT_COUNTER_F"\n\t", igmp->tx_leave)); - LWIP_PLATFORM_DIAG(("tx_report: %"STAT_COUNTER_F"\n\t", igmp->tx_report)); + LWIP_PLATFORM_DIAG(("rx_report: %"STAT_COUNTER_F"\n\t", igmp->rx_report)); + LWIP_PLATFORM_DIAG(("tx_join: %"STAT_COUNTER_F"\n\t", igmp->tx_join)); + LWIP_PLATFORM_DIAG(("tx_leave: %"STAT_COUNTER_F"\n\t", igmp->tx_leave)); + LWIP_PLATFORM_DIAG(("tx_report: %"STAT_COUNTER_F"\n\t", igmp->tx_report)); } #endif /* IGMP_STATS */ @@ -113,9 +113,9 @@ void stats_display_mem(struct stats_mem *mem, const char *name) { LWIP_PLATFORM_DIAG(("\nMEM %s\n\t", name)); - LWIP_PLATFORM_DIAG(("avail: %"U32_F"\n\t", (u32_t)mem->avail)); - LWIP_PLATFORM_DIAG(("used: %"U32_F"\n\t", (u32_t)mem->used)); - LWIP_PLATFORM_DIAG(("max: %"U32_F"\n\t", (u32_t)mem->max)); + LWIP_PLATFORM_DIAG(("avail: %"U32_F"\n\t", (u32_t)mem->avail)); + LWIP_PLATFORM_DIAG(("used: %"U32_F"\n\t", (u32_t)mem->used)); + LWIP_PLATFORM_DIAG(("max: %"U32_F"\n\t", (u32_t)mem->max)); LWIP_PLATFORM_DIAG(("err: %"U32_F"\n", (u32_t)mem->err)); } @@ -139,15 +139,15 @@ void stats_display_sys(struct stats_sys *sys) { LWIP_PLATFORM_DIAG(("\nSYS\n\t")); - LWIP_PLATFORM_DIAG(("sem.used: %"U32_F"\n\t", (u32_t)sys->sem.used)); - LWIP_PLATFORM_DIAG(("sem.max: %"U32_F"\n\t", (u32_t)sys->sem.max)); - LWIP_PLATFORM_DIAG(("sem.err: %"U32_F"\n\t", (u32_t)sys->sem.err)); - LWIP_PLATFORM_DIAG(("mutex.used: %"U32_F"\n\t", (u32_t)sys->mutex.used)); - LWIP_PLATFORM_DIAG(("mutex.max: %"U32_F"\n\t", (u32_t)sys->mutex.max)); - LWIP_PLATFORM_DIAG(("mutex.err: %"U32_F"\n\t", (u32_t)sys->mutex.err)); - LWIP_PLATFORM_DIAG(("mbox.used: %"U32_F"\n\t", (u32_t)sys->mbox.used)); - LWIP_PLATFORM_DIAG(("mbox.max: %"U32_F"\n\t", (u32_t)sys->mbox.max)); - LWIP_PLATFORM_DIAG(("mbox.err: %"U32_F"\n\t", (u32_t)sys->mbox.err)); + LWIP_PLATFORM_DIAG(("sem.used: %"U32_F"\n\t", (u32_t)sys->sem.used)); + LWIP_PLATFORM_DIAG(("sem.max: %"U32_F"\n\t", (u32_t)sys->sem.max)); + LWIP_PLATFORM_DIAG(("sem.err: %"U32_F"\n\t", (u32_t)sys->sem.err)); + LWIP_PLATFORM_DIAG(("mutex.used: %"U32_F"\n\t", (u32_t)sys->mutex.used)); + LWIP_PLATFORM_DIAG(("mutex.max: %"U32_F"\n\t", (u32_t)sys->mutex.max)); + LWIP_PLATFORM_DIAG(("mutex.err: %"U32_F"\n\t", (u32_t)sys->mutex.err)); + LWIP_PLATFORM_DIAG(("mbox.used: %"U32_F"\n\t", (u32_t)sys->mbox.used)); + LWIP_PLATFORM_DIAG(("mbox.max: %"U32_F"\n\t", (u32_t)sys->mbox.max)); + LWIP_PLATFORM_DIAG(("mbox.err: %"U32_F"\n\t", (u32_t)sys->mbox.err)); } #endif /* SYS_STATS */ diff --git a/sdk/lib/drivers/lwip/src/core/tcp.c b/sdk/lib/drivers/lwip/src/core/tcp.c index b710d2e2a46..105b68e74c0 100644 --- a/sdk/lib/drivers/lwip/src/core/tcp.c +++ b/sdk/lib/drivers/lwip/src/core/tcp.c @@ -10,9 +10,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -21,21 +21,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -72,17 +72,17 @@ #endif /* LWIP_TCP_KEEPALIVE */ const char * const tcp_state_str[] = { - "CLOSED", - "LISTEN", - "SYN_SENT", - "SYN_RCVD", - "ESTABLISHED", - "FIN_WAIT_1", - "FIN_WAIT_2", - "CLOSE_WAIT", - "CLOSING", - "LAST_ACK", - "TIME_WAIT" + "CLOSED", + "LISTEN", + "SYN_SENT", + "SYN_RCVD", + "ESTABLISHED", + "FIN_WAIT_1", + "FIN_WAIT_2", + "CLOSE_WAIT", + "CLOSING", + "LAST_ACK", + "TIME_WAIT" }; /* last local TCP port */ @@ -118,7 +118,7 @@ struct tcp_pcb *tcp_tmp_pcb; u8_t tcp_active_pcbs_changed; -/** Timer counter to handle calling slow-timer from tcp_tmr() */ +/** Timer counter to handle calling slow-timer from tcp_tmr() */ static u8_t tcp_timer; static u8_t tcp_timer_ctr; static u16_t tcp_new_port(void); @@ -202,7 +202,7 @@ tcp_close_shutdown(struct tcp_pcb *pcb, u8_t rst_on_unacked_data) * however, it is in this state once allocated and as yet unused * and the user needs some way to free it should the need arise. * Calling tcp_close() with a pcb that has already been closed, (i.e. twice) - * or for a pcb that has been used and then entered the CLOSED state + * or for a pcb that has been used and then entered the CLOSED state * is erroneous, but this should never happen as the pcb has in those cases * been freed, and so any remaining handles are bogus. */ err = ERR_OK; @@ -357,7 +357,7 @@ void tcp_abandon(struct tcp_pcb *pcb, int reset) { u32_t seqno, ackno; -#if LWIP_CALLBACK_API +#if LWIP_CALLBACK_API tcp_err_fn errf; #endif /* LWIP_CALLBACK_API */ void *errf_arg; @@ -385,7 +385,7 @@ tcp_abandon(struct tcp_pcb *pcb, int reset) if (pcb->unsent != NULL) { tcp_segs_free(pcb->unsent); } -#if TCP_QUEUE_OOSEQ +#if TCP_QUEUE_OOSEQ if (pcb->ooseq != NULL) { tcp_segs_free(pcb->ooseq); } @@ -570,7 +570,7 @@ tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog) return (struct tcp_pcb *)lpcb; } -/** +/** * Update the state that tracks the available window space to advertise. * * Returns how much extra window would be advertised if we sent an @@ -649,7 +649,7 @@ tcp_new_port(void) u8_t i; u16_t n = 0; struct tcp_pcb *pcb; - + again: if (tcp_port++ == TCP_LOCAL_PORT_RANGE_END) { tcp_port = TCP_LOCAL_PORT_RANGE_START; @@ -757,7 +757,7 @@ tcp_connect(struct tcp_pcb *pcb, ip_addr_t *ipaddr, u16_t port, pcb->ssthresh = pcb->mss * 10; #if LWIP_CALLBACK_API pcb->connected = connected; -#else /* LWIP_CALLBACK_API */ +#else /* LWIP_CALLBACK_API */ LWIP_UNUSED_ARG(connected); #endif /* LWIP_CALLBACK_API */ @@ -870,7 +870,7 @@ tcp_slowtmr_start: LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_slowtmr: cwnd %"U16_F " ssthresh %"U16_F"\n", pcb->cwnd, pcb->ssthresh)); - + /* The following needs to be called AFTER cwnd is set to one mss - STJ */ tcp_rexmit_rto(pcb); @@ -901,11 +901,11 @@ tcp_slowtmr_start: LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: KEEPALIVE timeout. Aborting connection to %"U16_F".%"U16_F".%"U16_F".%"U16_F".\n", ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip), ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip))); - + ++pcb_remove; ++pcb_reset; } - else if((u32_t)(tcp_ticks - pcb->tmr) > + else if((u32_t)(tcp_ticks - pcb->tmr) > (pcb->keep_idle + pcb->keep_cnt_sent * TCP_KEEP_INTVL(pcb)) / TCP_SLOW_INTERVAL) { @@ -998,7 +998,7 @@ tcp_slowtmr_start: } } - + /* Steps through all of the TIME-WAIT PCBs. */ prev = NULL; pcb = tcp_tw_pcbs; @@ -1010,7 +1010,7 @@ tcp_slowtmr_start: if ((u32_t)(tcp_ticks - pcb->tmr) > 2 * TCP_MSL / TCP_SLOW_INTERVAL) { ++pcb_remove; } - + /* If the PCB should be removed, do it. */ @@ -1172,7 +1172,7 @@ tcp_setprio(struct tcp_pcb *pcb, u8_t prio) * * @param seg the old tcp_seg * @return a copy of seg - */ + */ struct tcp_seg * tcp_seg_copy(struct tcp_seg *seg) { @@ -1182,7 +1182,7 @@ tcp_seg_copy(struct tcp_seg *seg) if (cseg == NULL) { return NULL; } - SMEMCPY((u8_t *)cseg, (const u8_t *)seg, sizeof(struct tcp_seg)); + SMEMCPY((u8_t *)cseg, (const u8_t *)seg, sizeof(struct tcp_seg)); pbuf_ref(cseg->p); return cseg; } @@ -1222,7 +1222,7 @@ tcp_kill_prio(u8_t prio) mprio = TCP_PRIO_MAX; - + /* We kill the oldest active connection that has lower priority than prio. */ inactivity = 0; inactive = NULL; @@ -1279,7 +1279,7 @@ tcp_alloc(u8_t prio) { struct tcp_pcb *pcb; u32_t iss; - + pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB); if (pcb == NULL) { /* Try killing oldest connection in TIME-WAIT. */ @@ -1324,7 +1324,7 @@ tcp_alloc(u8_t prio) pcb->snd_wl2 = iss; pcb->snd_nxt = iss; pcb->lastack = iss; - pcb->snd_lbb = iss; + pcb->snd_lbb = iss; pcb->tmr = tcp_ticks; pcb->last_timer = tcp_timer_ctr; @@ -1332,11 +1332,11 @@ tcp_alloc(u8_t prio) #if LWIP_CALLBACK_API pcb->recv = tcp_recv_null; -#endif /* LWIP_CALLBACK_API */ - +#endif /* LWIP_CALLBACK_API */ + /* Init KEEPALIVE timer */ pcb->keep_idle = TCP_KEEPIDLE_DEFAULT; - + #if LWIP_TCP_KEEPALIVE pcb->keep_intvl = TCP_KEEPINTVL_DEFAULT; pcb->keep_cnt = TCP_KEEPCNT_DEFAULT; @@ -1371,7 +1371,7 @@ tcp_new(void) * * @param pcb tcp_pcb to set the callback argument * @param arg void pointer argument to pass to callback functions - */ + */ void tcp_arg(struct tcp_pcb *pcb, void *arg) { @@ -1387,7 +1387,7 @@ tcp_arg(struct tcp_pcb *pcb, void *arg) * * @param pcb tcp_pcb to set the recv callback * @param recv callback function to call for this pcb when data is received - */ + */ void tcp_recv(struct tcp_pcb *pcb, tcp_recv_fn recv) { @@ -1401,7 +1401,7 @@ tcp_recv(struct tcp_pcb *pcb, tcp_recv_fn recv) * * @param pcb tcp_pcb to set the sent callback * @param sent callback function to call for this pcb when data is successfully sent - */ + */ void tcp_sent(struct tcp_pcb *pcb, tcp_sent_fn sent) { @@ -1416,7 +1416,7 @@ tcp_sent(struct tcp_pcb *pcb, tcp_sent_fn sent) * @param pcb tcp_pcb to set the err callback * @param err callback function to call for this pcb when a fatal error * has occured on the connection - */ + */ void tcp_err(struct tcp_pcb *pcb, tcp_err_fn err) { @@ -1431,7 +1431,7 @@ tcp_err(struct tcp_pcb *pcb, tcp_err_fn err) * @param pcb tcp_pcb to set the accept callback * @param accept callback function to call for this pcb when LISTENing * connection has been connected to another host - */ + */ void tcp_accept(struct tcp_pcb *pcb, tcp_accept_fn accept) { @@ -1447,16 +1447,16 @@ tcp_accept(struct tcp_pcb *pcb, tcp_accept_fn accept) * from TCP. The interval is specified in terms of the TCP coarse * timer interval, which is called twice a second. * - */ + */ void tcp_poll(struct tcp_pcb *pcb, tcp_poll_fn poll, u8_t interval) { LWIP_ASSERT("invalid socket state for poll", pcb->state != LISTEN); #if LWIP_CALLBACK_API pcb->poll = poll; -#else /* LWIP_CALLBACK_API */ +#else /* LWIP_CALLBACK_API */ LWIP_UNUSED_ARG(poll); -#endif /* LWIP_CALLBACK_API */ +#endif /* LWIP_CALLBACK_API */ pcb->pollinterval = interval; } @@ -1540,7 +1540,7 @@ tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb) TCP_RMV(pcblist, pcb); tcp_pcb_purge(pcb); - + /* if there is an outstanding delayed ACKs, send it */ if (pcb->state != TIME_WAIT && pcb->state != LISTEN && @@ -1571,7 +1571,7 @@ u32_t tcp_next_iss(void) { static u32_t iss = 6510; - + iss += tcp_ticks; /* XXX */ return iss; } @@ -1703,21 +1703,21 @@ tcp_debug_print_pcbs(void) pcb->local_port, pcb->remote_port, pcb->snd_nxt, pcb->rcv_nxt)); tcp_debug_print_state(pcb->state); - } + } LWIP_DEBUGF(TCP_DEBUG, ("Listen PCB states:\n")); for(pcb = (struct tcp_pcb *)tcp_listen_pcbs.pcbs; pcb != NULL; pcb = pcb->next) { LWIP_DEBUGF(TCP_DEBUG, ("Local port %"U16_F", foreign port %"U16_F" snd_nxt %"U32_F" rcv_nxt %"U32_F" ", pcb->local_port, pcb->remote_port, pcb->snd_nxt, pcb->rcv_nxt)); tcp_debug_print_state(pcb->state); - } + } LWIP_DEBUGF(TCP_DEBUG, ("TIME-WAIT PCB states:\n")); for(pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) { LWIP_DEBUGF(TCP_DEBUG, ("Local port %"U16_F", foreign port %"U16_F" snd_nxt %"U32_F" rcv_nxt %"U32_F" ", pcb->local_port, pcb->remote_port, pcb->snd_nxt, pcb->rcv_nxt)); tcp_debug_print_state(pcb->state); - } + } } /** diff --git a/sdk/lib/drivers/lwip/src/core/tcp_in.c b/sdk/lib/drivers/lwip/src/core/tcp_in.c index 4ec971ac0fb..051869ff964 100644 --- a/sdk/lib/drivers/lwip/src/core/tcp_in.c +++ b/sdk/lib/drivers/lwip/src/core/tcp_in.c @@ -6,7 +6,7 @@ * * These functions are generally called in the order (ip_input() ->) * tcp_input() -> * tcp_process() -> tcp_receive() (-> application). - * + * */ /* @@ -166,7 +166,7 @@ tcp_input(struct pbuf *p, struct netif *inp) for an active connection. */ prev = NULL; - + for(pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { LWIP_ASSERT("tcp_input: active pcb->state != CLOSED", pcb->state != CLOSED); LWIP_ASSERT("tcp_input: active pcb->state != TIME-WAIT", pcb->state != TIME_WAIT); @@ -253,7 +253,7 @@ tcp_input(struct pbuf *p, struct netif *inp) /* put this listening pcb at the head of the listening list */ tcp_listen_pcbs.listen_pcbs = lpcb; } - + LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packed for LISTENing connection.\n")); tcp_listen_input(lpcb); pbuf_free(p); @@ -588,7 +588,7 @@ tcp_process(struct tcp_pcb *pcb) acceptable = 1; } } else { - if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt, + if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt, pcb->rcv_nxt+pcb->rcv_wnd)) { acceptable = 1; } @@ -609,12 +609,12 @@ tcp_process(struct tcp_pcb *pcb) } } - if ((flags & TCP_SYN) && (pcb->state != SYN_SENT && pcb->state != SYN_RCVD)) { + if ((flags & TCP_SYN) && (pcb->state != SYN_SENT && pcb->state != SYN_RCVD)) { /* Cope with new connection attempt after remote end crashed */ tcp_ack_now(pcb); return ERR_OK; } - + if ((pcb->flags & TF_RXCLOSED) == 0) { /* Update the PCB (in)activity timer unless rx is closed (see tcp_shutdown) */ pcb->tmr = tcp_ticks; @@ -892,7 +892,7 @@ tcp_receive(struct tcp_pcb *pcb) #if TCP_WND_DEBUG } else { if (pcb->snd_wnd != tcphdr->wnd) { - LWIP_DEBUGF(TCP_WND_DEBUG, + LWIP_DEBUGF(TCP_WND_DEBUG, ("tcp_receive: no window update lastack %"U32_F" ackno %" U32_F" wl1 %"U32_F" seqno %"U32_F" wl2 %"U32_F"\n", pcb->lastack, ackno, pcb->snd_wl1, seqno, pcb->snd_wl2)); @@ -902,17 +902,17 @@ tcp_receive(struct tcp_pcb *pcb) /* (From Stevens TCP/IP Illustrated Vol II, p970.) Its only a * duplicate ack if: - * 1) It doesn't ACK new data - * 2) length of received packet is zero (i.e. no payload) - * 3) the advertised window hasn't changed + * 1) It doesn't ACK new data + * 2) length of received packet is zero (i.e. no payload) + * 3) the advertised window hasn't changed * 4) There is outstanding unacknowledged data (retransmission timer running) * 5) The ACK is == biggest ACK sequence number so far seen (snd_una) - * - * If it passes all five, should process as a dupack: - * a) dupacks < 3: do nothing - * b) dupacks == 3: fast retransmit - * c) dupacks > 3: increase cwnd - * + * + * If it passes all five, should process as a dupack: + * a) dupacks < 3: do nothing + * b) dupacks == 3: fast retransmit + * c) dupacks > 3: increase cwnd + * * If it only passes 1-3, should reset dupack counter (and add to * stats, which we don't do in lwIP) * @@ -1053,7 +1053,7 @@ tcp_receive(struct tcp_pcb *pcb) ->unsent list after a retransmission, so these segments may in fact have been sent once. */ while (pcb->unsent != NULL && - TCP_SEQ_BETWEEN(ackno, ntohl(pcb->unsent->tcphdr->seqno) + + TCP_SEQ_BETWEEN(ackno, ntohl(pcb->unsent->tcphdr->seqno) + TCP_TCPLEN(pcb->unsent), pcb->snd_nxt)) { LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: removing %"U32_F":%"U32_F" from pcb->unsent\n", ntohl(pcb->unsent->tcphdr->seqno), ntohl(pcb->unsent->tcphdr->seqno) + @@ -1065,7 +1065,7 @@ tcp_receive(struct tcp_pcb *pcb) if (pcb->unsent == NULL) { pcb->unsent_oversize = 0; } -#endif /* TCP_OVERSIZE */ +#endif /* TCP_OVERSIZE */ LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_receive: queuelen %"U16_F" ... ", (u16_t)pcb->snd_queuelen)); LWIP_ASSERT("pcb->snd_queuelen >= pbuf_clen(next->p)", (pcb->snd_queuelen >= pbuf_clen(next->p))); /* Prevent ACK for FIN to generate a sent event */ @@ -1211,7 +1211,7 @@ tcp_receive(struct tcp_pcb *pcb) /* The sequence number must be within the window (above rcv_nxt and below rcv_nxt + rcv_wnd) in order to be further processed. */ - if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt, + if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt, pcb->rcv_nxt + pcb->rcv_wnd - 1)){ if (pcb->rcv_nxt == seqno) { /* The incoming segment is the next in sequence. We check if @@ -1220,12 +1220,12 @@ tcp_receive(struct tcp_pcb *pcb) tcplen = TCP_TCPLEN(&inseg); if (tcplen > pcb->rcv_wnd) { - LWIP_DEBUGF(TCP_INPUT_DEBUG, + LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: other end overran receive window" "seqno %"U32_F" len %"U16_F" right edge %"U32_F"\n", seqno, tcplen, pcb->rcv_nxt + pcb->rcv_wnd)); if (TCPH_FLAGS(inseg.tcphdr) & TCP_FIN) { - /* Must remove the FIN from the header as we're trimming + /* Must remove the FIN from the header as we're trimming * that byte of sequence-space from the packet */ TCPH_FLAGS_SET(inseg.tcphdr, TCPH_FLAGS(inseg.tcphdr) &~ TCP_FIN); } @@ -1245,7 +1245,7 @@ tcp_receive(struct tcp_pcb *pcb) - inseq overlaps with ooseq */ if (pcb->ooseq != NULL) { if (TCPH_FLAGS(inseg.tcphdr) & TCP_FIN) { - LWIP_DEBUGF(TCP_INPUT_DEBUG, + LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: received in-order FIN, binning ooseq queue\n")); /* Received in-order FIN means anything that was received * out of order must now have been received in-order, so @@ -1352,7 +1352,7 @@ tcp_receive(struct tcp_pcb *pcb) recv_flags |= TF_GOT_FIN; if (pcb->state == ESTABLISHED) { /* force passive close or we can move to active close */ pcb->state = CLOSE_WAIT; - } + } } pcb->ooseq = cseg->next; @@ -1465,12 +1465,12 @@ tcp_receive(struct tcp_pcb *pcb) } /* check if the remote side overruns our receive window */ if ((u32_t)tcplen + seqno > pcb->rcv_nxt + (u32_t)pcb->rcv_wnd) { - LWIP_DEBUGF(TCP_INPUT_DEBUG, + LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: other end overran receive window" "seqno %"U32_F" len %"U16_F" right edge %"U32_F"\n", seqno, tcplen, pcb->rcv_nxt + pcb->rcv_wnd)); if (TCPH_FLAGS(next->next->tcphdr) & TCP_FIN) { - /* Must remove the FIN from the header as we're trimming + /* Must remove the FIN from the header as we're trimming * that byte of sequence-space from the packet */ TCPH_FLAGS_SET(next->next->tcphdr, TCPH_FLAGS(next->next->tcphdr) &~ TCP_FIN); } @@ -1531,7 +1531,7 @@ tcp_receive(struct tcp_pcb *pcb) } /** - * Parses the options contained in the incoming segment. + * Parses the options contained in the incoming segment. * * Called from tcp_listen_input() and tcp_process(). * Currently, only the MSS option is supported! @@ -1588,7 +1588,7 @@ tcp_parseopt(struct tcp_pcb *pcb) return; } /* TCP timestamp option with valid length */ - tsval = (opts[c+2]) | (opts[c+3] << 8) | + tsval = (opts[c+2]) | (opts[c+3] << 8) | (opts[c+4] << 16) | (opts[c+5] << 24); if (flags & TCP_SYN) { pcb->ts_recent = ntohl(tsval); diff --git a/sdk/lib/drivers/lwip/src/core/tcp_out.c b/sdk/lib/drivers/lwip/src/core/tcp_out.c index ee19fe06f69..94395e25d4e 100644 --- a/sdk/lib/drivers/lwip/src/core/tcp_out.c +++ b/sdk/lib/drivers/lwip/src/core/tcp_out.c @@ -197,7 +197,7 @@ tcp_create_segment(struct tcp_pcb *pcb, struct pbuf *p, u8_t flags, u32_t seqno, /* wnd and chksum are set in tcp_output */ seg->tcphdr->urgp = 0; return seg; -} +} /** * Allocate a PBUF_RAM pbuf, perhaps with extra space at the end. @@ -212,7 +212,7 @@ tcp_create_segment(struct tcp_pcb *pcb, struct pbuf *p, u8_t flags, u32_t seqno, * @param pcb The TCP connection that willo enqueue the pbuf. * @param apiflags API flags given to tcp_write. * @param first_seg true when this pbuf will be used in the first enqueued segment. - * @param + * @param */ #if TCP_OVERSIZE static struct pbuf * @@ -379,7 +379,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_write(pcb=%p, data=%p, len=%"U16_F", apiflags=%"U16_F")\n", (void *)pcb, arg, len, (u16_t)apiflags)); - LWIP_ERROR("tcp_write: arg == NULL (programmer violates API)", + LWIP_ERROR("tcp_write: arg == NULL (programmer violates API)", arg != NULL, return ERR_ARG;); err = tcp_write_checks(pcb, len); @@ -857,7 +857,7 @@ tcp_send_empty_ack(struct tcp_pcb *pcb) return ERR_BUF; } tcphdr = (struct tcp_hdr *)p->payload; - LWIP_DEBUGF(TCP_OUTPUT_DEBUG, + LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: sending ACK for %"U32_F"\n", pcb->rcv_nxt)); /* remove ACK flags from the PCB, as we send an empty ACK now */ pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW); @@ -869,7 +869,7 @@ tcp_send_empty_ack(struct tcp_pcb *pcb) if (pcb->flags & TF_TIMESTAMP) { tcp_build_timestamp_option(pcb, (u32_t *)(tcphdr + 1)); } -#endif +#endif #if CHECKSUM_GEN_TCP tcphdr->chksum = inet_chksum_pseudo(p, &(pcb->local_ip), &(pcb->remote_ip), @@ -950,7 +950,7 @@ tcp_output(struct tcp_pcb *pcb) ", seg == NULL, ack %"U32_F"\n", pcb->snd_wnd, pcb->cwnd, wnd, pcb->lastack)); } else { - LWIP_DEBUGF(TCP_CWND_DEBUG, + LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_output: snd_wnd %"U16_F", cwnd %"U16_F", wnd %"U32_F ", effwnd %"U32_F", seq %"U32_F", ack %"U32_F"\n", pcb->snd_wnd, pcb->cwnd, wnd, @@ -961,7 +961,7 @@ tcp_output(struct tcp_pcb *pcb) /* data available and window allows it to be sent? */ while (seg != NULL && ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) { - LWIP_ASSERT("RST not expected here!", + LWIP_ASSERT("RST not expected here!", (TCPH_FLAGS(seg->tcphdr) & TCP_RST) == 0); /* Stop sending if the nagle algorithm would prevent it * Don't stop: @@ -1086,7 +1086,7 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb) } #endif - /* Set retransmission timer running if it is not currently enabled + /* Set retransmission timer running if it is not currently enabled This must be set before checking the route. */ if (pcb->rtime == -1) { pcb->rtime = 0; @@ -1317,12 +1317,12 @@ tcp_rexmit(struct tcp_pcb *pcb) * * @param pcb the tcp_pcb for which to retransmit the first unacked segment */ -void +void tcp_rexmit_fast(struct tcp_pcb *pcb) { if (pcb->unacked != NULL && !(pcb->flags & TF_INFR)) { /* This is fast retransmit. Retransmit the first unacked segment. */ - LWIP_DEBUGF(TCP_FR_DEBUG, + LWIP_DEBUGF(TCP_FR_DEBUG, ("tcp_receive: dupacks %"U16_F" (%"U32_F "), fast retransmit %"U32_F"\n", (u16_t)pcb->dupacks, pcb->lastack, @@ -1336,19 +1336,19 @@ tcp_rexmit_fast(struct tcp_pcb *pcb) } else { pcb->ssthresh = pcb->cwnd / 2; } - + /* The minimum value for ssthresh should be 2 MSS */ if (pcb->ssthresh < 2*pcb->mss) { - LWIP_DEBUGF(TCP_FR_DEBUG, + LWIP_DEBUGF(TCP_FR_DEBUG, ("tcp_receive: The minimum value for ssthresh %"U16_F " should be min 2 mss %"U16_F"...\n", pcb->ssthresh, 2*pcb->mss)); pcb->ssthresh = 2*pcb->mss; } - + pcb->cwnd = pcb->ssthresh + 3 * pcb->mss; pcb->flags |= TF_INFR; - } + } } @@ -1370,12 +1370,12 @@ tcp_keepalive(struct tcp_pcb *pcb) ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip), ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip))); - LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: tcp_ticks %"U32_F" pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n", + LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: tcp_ticks %"U32_F" pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n", tcp_ticks, pcb->tmr, pcb->keep_cnt_sent)); - + p = tcp_output_alloc_header(pcb, 0, 0, htonl(pcb->snd_nxt - 1)); if(p == NULL) { - LWIP_DEBUGF(TCP_DEBUG, + LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: could not allocate memory for pbuf\n")); return; } @@ -1419,15 +1419,15 @@ tcp_zero_window_probe(struct tcp_pcb *pcb) u16_t len; u8_t is_fin; - LWIP_DEBUGF(TCP_DEBUG, + LWIP_DEBUGF(TCP_DEBUG, ("tcp_zero_window_probe: sending ZERO WINDOW probe to %" U16_F".%"U16_F".%"U16_F".%"U16_F"\n", ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip), ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip))); - LWIP_DEBUGF(TCP_DEBUG, + LWIP_DEBUGF(TCP_DEBUG, ("tcp_zero_window_probe: tcp_ticks %"U32_F - " pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n", + " pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n", tcp_ticks, pcb->tmr, pcb->keep_cnt_sent)); seg = pcb->unacked; diff --git a/sdk/lib/drivers/lwip/src/core/udp.c b/sdk/lib/drivers/lwip/src/core/udp.c index 32c7d38403a..ae91c8622d2 100644 --- a/sdk/lib/drivers/lwip/src/core/udp.c +++ b/sdk/lib/drivers/lwip/src/core/udp.c @@ -100,7 +100,7 @@ udp_new_port(void) { u16_t n = 0; struct udp_pcb *pcb; - + again: if (udp_port++ == UDP_LOCAL_PORT_RANGE_END) { udp_port = UDP_LOCAL_PORT_RANGE_START; @@ -207,7 +207,7 @@ udp_input(struct pbuf *p, struct netif *inp) /* all packets for DHCP_CLIENT_PORT not coming from DHCP_SERVER_PORT are dropped! */ if (src == DHCP_SERVER_PORT) { if ((inp->dhcp != NULL) && (inp->dhcp->pcb != NULL)) { - /* accept the packe if + /* accept the packe if (- broadcast or directed to us) -> DHCP is link-layer-addressed, local ip is always ANY! - inp->dhcp->pcb->remote == ANY or iphdr->src */ if ((ip_addr_isany(&inp->dhcp->pcb->remote_ip) || @@ -253,9 +253,9 @@ udp_input(struct pbuf *p, struct netif *inp) (broadcast && (ip_addr_isany(&pcb->local_ip) || ip_addr_netcmp(&pcb->local_ip, ip_current_dest_addr(), &inp->netmask)))) { -#endif /* IP_SOF_BROADCAST_RECV */ +#endif /* IP_SOF_BROADCAST_RECV */ local_match = 1; - if ((uncon_pcb == NULL) && + if ((uncon_pcb == NULL) && ((pcb->flags & UDP_FLAGS_CONNECTED) == 0)) { /* the first unconnected matching PCB */ uncon_pcb = pcb; @@ -482,7 +482,7 @@ udp_send_chksum(struct udp_pcb *pcb, struct pbuf *p, * * If the PCB already has a remote address association, it will * be restored after the data is sent. - * + * * @return lwIP error code (@see udp_send for possible error codes) * * @see udp_disconnect() udp_send() @@ -613,7 +613,7 @@ udp_sendto_if_chksum(struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *dst_ip, udphdr->src = htons(pcb->local_port); udphdr->dest = htons(dst_port); /* in UDP, 0 checksum means 'no checksum' */ - udphdr->chksum = 0x0000; + udphdr->chksum = 0x0000; /* Multicast Loop? */ #if LWIP_IGMP diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/autoip.h b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/autoip.h index e62b72e8cd8..d00aa2ef3e3 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/autoip.h +++ b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/autoip.h @@ -40,7 +40,7 @@ * Please coordinate changes and requests with Dominik Spies * */ - + #ifndef __LWIP_AUTOIP_H__ #define __LWIP_AUTOIP_H__ diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h index d47a7d8a2e2..15641463aed 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h +++ b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/igmp.h b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/igmp.h index 8aabac24817..57038f4fcab 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/igmp.h +++ b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/igmp.h @@ -2,29 +2,29 @@ * Copyright (c) 2002 CITEL Technologies Ltd. * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY CITEL TECHNOLOGIES AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is a contribution to the lwIP TCP/IP stack. * The Swedish Institute of Computer Science and Adam Dunkels @@ -64,8 +64,8 @@ extern "C" { * these should really be linked from the interface, but * if we keep them separate we will not affect the lwip original code * too much - * - * There will be a group for the all systems group address but this + * + * There will be a group for the all systems group address but this * will not run the state machine as it is used to kick off reports * from all the other groups */ diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet.h b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet.h index 7bff49b59e6..213d47a6be7 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet.h +++ b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet_chksum.h b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet_chksum.h index 79a2d90f2f7..7c5d17e3090 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet_chksum.h +++ b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet_chksum.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip.h b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip.h index 00c83a0a12a..d88ab8a107e 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip.h +++ b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -136,7 +136,7 @@ struct ip_hdr { PACK_STRUCT_FIELD(u16_t _chksum); /* source and destination IP addresses */ PACK_STRUCT_FIELD(ip_addr_p_t src); - PACK_STRUCT_FIELD(ip_addr_p_t dest); + PACK_STRUCT_FIELD(ip_addr_p_t dest); } PACK_STRUCT_STRUCT; PACK_STRUCT_END #ifdef PACK_STRUCT_USE_INCLUDES diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip_frag.h b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip_frag.h index 77b5eb1eef7..d6f1b77d373 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip_frag.h +++ b/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip_frag.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Jani Monoses * */ diff --git a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/icmp.h b/sdk/lib/drivers/lwip/src/include/ipv6/lwip/icmp.h index 87e9ffd9640..4397d2e87a4 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/icmp.h +++ b/sdk/lib/drivers/lwip/src/include/ipv6/lwip/icmp.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/inet.h b/sdk/lib/drivers/lwip/src/include/ipv6/lwip/inet.h index de1a0b63611..32a5261bdee 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/inet.h +++ b/sdk/lib/drivers/lwip/src/include/ipv6/lwip/inet.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip.h b/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip.h index a01cfc65b3a..73a1c5cc9e0 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip.h +++ b/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -84,7 +84,7 @@ extern "C" { struct ip_hdr { #if BYTE_ORDER == LITTLE_ENDIAN u8_t tclass1:4, v:4; - u8_t flow1:4, tclass2:4; + u8_t flow1:4, tclass2:4; #else u8_t v:4, tclass1:4; u8_t tclass2:8, flow1:4; diff --git a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip_addr.h b/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip_addr.h index b2d8ae566d7..f5b606a8609 100644 --- a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip_addr.h +++ b/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip_addr.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/api.h b/sdk/lib/drivers/lwip/src/include/lwip/api.h index 7a9fa9366c0..63d99bf2923 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/api.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/api.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/api_msg.h b/sdk/lib/drivers/lwip/src/include/lwip/api_msg.h index f9e1c7d2954..3f063e2a649 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/api_msg.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/api_msg.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/arch.h b/sdk/lib/drivers/lwip/src/include/lwip/arch.h index 4d6df773fc3..2c3eb473847 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/arch.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/arch.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -71,7 +71,7 @@ extern "C" { #ifndef LWIP_UNUSED_ARG #define LWIP_UNUSED_ARG(x) (void)x -#endif /* LWIP_UNUSED_ARG */ +#endif /* LWIP_UNUSED_ARG */ #ifdef LWIP_PROVIDE_ERRNO diff --git a/sdk/lib/drivers/lwip/src/include/lwip/debug.h b/sdk/lib/drivers/lwip/src/include/lwip/debug.h index 0fe041396fc..aa96d1aebb1 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/debug.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/debug.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -66,7 +66,7 @@ #define LWIP_ASSERT(message, assertion) do { if(!(assertion)) \ LWIP_PLATFORM_ASSERT(message); } while(0) #else /* LWIP_NOASSERT */ -#define LWIP_ASSERT(message, assertion) +#define LWIP_ASSERT(message, assertion) #endif /* LWIP_NOASSERT */ /** if "expression" isn't true, then print "message" and execute "handler" expression */ @@ -92,7 +92,7 @@ } while(0) #else /* LWIP_DEBUG */ -#define LWIP_DEBUGF(debug, message) +#define LWIP_DEBUGF(debug, message) #endif /* LWIP_DEBUG */ #endif /* __LWIP_DEBUG_H__ */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/def.h b/sdk/lib/drivers/lwip/src/include/lwip/def.h index 73a1b560b31..e695ed7ccd6 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/def.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/def.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -52,7 +52,7 @@ extern "C" { #define LWIP_MAKE_U16(a, b) ((a << 8) | b) #else #define LWIP_MAKE_U16(a, b) ((b << 8) | a) -#endif +#endif #ifndef LWIP_PLATFORM_BYTESWAP #define LWIP_PLATFORM_BYTESWAP 0 diff --git a/sdk/lib/drivers/lwip/src/include/lwip/dhcp.h b/sdk/lib/drivers/lwip/src/include/lwip/dhcp.h index 32d93381d12..ca1c1de3db4 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/dhcp.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/dhcp.h @@ -16,11 +16,11 @@ extern "C" { #endif /** period (in seconds) of the application calling dhcp_coarse_tmr() */ -#define DHCP_COARSE_TIMER_SECS 60 +#define DHCP_COARSE_TIMER_SECS 60 /** period (in milliseconds) of the application calling dhcp_coarse_tmr() */ #define DHCP_COARSE_TIMER_MSECS (DHCP_COARSE_TIMER_SECS * 1000UL) /** period (in milliseconds) of the application calling dhcp_fine_tmr() */ -#define DHCP_FINE_TIMER_MSECS 500 +#define DHCP_FINE_TIMER_MSECS 500 #define DHCP_CHADDR_LEN 16U #define DHCP_SNAME_LEN 64U @@ -28,9 +28,9 @@ extern "C" { struct dhcp { - /** transaction identifier of last sent request */ + /** transaction identifier of last sent request */ u32_t xid; - /** our connection to the DHCP server */ + /** our connection to the DHCP server */ struct udp_pcb *pcb; /** incoming msg */ struct dhcp_msg *msg_in; @@ -53,7 +53,7 @@ struct dhcp ip_addr_t offered_ip_addr; ip_addr_t offered_sn_mask; ip_addr_t offered_gw_addr; - + u32_t offered_t0_lease; /* lease period (in seconds) */ u32_t offered_t1_renew; /* recommended renew time (usually 50% of lease period) */ u32_t offered_t2_rebind; /* recommended rebind time (usually 66% of lease period) */ @@ -131,7 +131,7 @@ void dhcp_arp_reply(struct netif *netif, ip_addr_t *addr); void dhcp_coarse_tmr(void); /** to be called every half second */ void dhcp_fine_tmr(void); - + /** DHCP message item offsets and length */ #define DHCP_OP_OFS 0 #define DHCP_HTYPE_OFS 1 @@ -152,7 +152,7 @@ void dhcp_fine_tmr(void); #define DHCP_COOKIE_OFS DHCP_MSG_LEN #define DHCP_OPTIONS_OFS (DHCP_MSG_LEN + 4) -#define DHCP_CLIENT_PORT 68 +#define DHCP_CLIENT_PORT 68 #define DHCP_SERVER_PORT 67 /** DHCP client states */ @@ -173,7 +173,7 @@ void dhcp_fine_tmr(void); /** AUTOIP cooperatation flags */ #define DHCP_AUTOIP_COOP_STATE_OFF 0 #define DHCP_AUTOIP_COOP_STATE_ON 1 - + #define DHCP_BOOTREQUEST 1 #define DHCP_BOOTREPLY 2 @@ -198,7 +198,7 @@ void dhcp_fine_tmr(void); #define DHCP_OPTION_PAD 0 #define DHCP_OPTION_SUBNET_MASK 1 /* RFC 2132 3.3 */ #define DHCP_OPTION_ROUTER 3 -#define DHCP_OPTION_DNS_SERVER 6 +#define DHCP_OPTION_DNS_SERVER 6 #define DHCP_OPTION_HOSTNAME 12 #define DHCP_OPTION_IP_TTL 23 #define DHCP_OPTION_MTU 26 diff --git a/sdk/lib/drivers/lwip/src/include/lwip/dns.h b/sdk/lib/drivers/lwip/src/include/lwip/dns.h index 6c7d9b07399..5d7945a7391 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/dns.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/dns.h @@ -1,7 +1,7 @@ /** * lwip DNS resolver header file. - * Author: Jim Pettinato + * Author: Jim Pettinato * April 2007 * ported from uIP resolv.c Copyright (c) 2002-2003, Adam Dunkels. diff --git a/sdk/lib/drivers/lwip/src/include/lwip/err.h b/sdk/lib/drivers/lwip/src/include/lwip/err.h index ac907729fcd..1a5af394630 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/err.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/err.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/init.h b/sdk/lib/drivers/lwip/src/include/lwip/init.h index 32385345429..e5833e55c30 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/init.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/init.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/mem.h b/sdk/lib/drivers/lwip/src/include/lwip/mem.h index 5bb906b63fe..fec03bc8ab8 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/mem.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/mem.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/memp.h b/sdk/lib/drivers/lwip/src/include/lwip/memp.h index f0d07399434..efad238a93e 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/memp.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/memp.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/memp_std.h b/sdk/lib/drivers/lwip/src/include/lwip/memp_std.h index 461ed1acf8a..7304e2c62ed 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/memp_std.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/memp_std.h @@ -15,7 +15,7 @@ #define LWIP_MALLOC_MEMPOOL(num, size) LWIP_MEMPOOL(POOL_##size, num, (size + sizeof(struct memp_malloc_helper)), "MALLOC_"#size) #define LWIP_MALLOC_MEMPOOL_START #define LWIP_MALLOC_MEMPOOL_END -#endif /* LWIP_MALLOC_MEMPOOL */ +#endif /* LWIP_MALLOC_MEMPOOL */ #ifndef LWIP_PBUF_MEMPOOL /* This treats "pbuf pools" just like any other pool. diff --git a/sdk/lib/drivers/lwip/src/include/lwip/netbuf.h b/sdk/lib/drivers/lwip/src/include/lwip/netbuf.h index 7d247d71b60..ddee0273e0a 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/netbuf.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/netbuf.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/netdb.h b/sdk/lib/drivers/lwip/src/include/lwip/netdb.h index 7587e2f2d16..80040bbfcd7 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/netdb.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/netdb.h @@ -1,5 +1,5 @@ /* - * Redistribution and use in source and binary forms, with or without modification, + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -8,21 +8,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Simon Goldschmidt * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/netif.h b/sdk/lib/drivers/lwip/src/include/lwip/netif.h index f7e4937453d..bd93112f8f6 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/netif.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/netif.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -290,7 +290,7 @@ void netif_set_remove_callback(struct netif *netif, netif_status_callback_fn rem void netif_set_link_up(struct netif *netif); void netif_set_link_down(struct netif *netif); -/** Ask if a link is up */ +/** Ask if a link is up */ #define netif_is_link_up(netif) (((netif)->flags & NETIF_FLAG_LINK_UP) ? (u8_t)1 : (u8_t)0) #if LWIP_NETIF_LINK_CALLBACK diff --git a/sdk/lib/drivers/lwip/src/include/lwip/netifapi.h b/sdk/lib/drivers/lwip/src/include/lwip/netifapi.h index 33318efaf6c..6ac16f3b5a5 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/netifapi.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/netifapi.h @@ -1,5 +1,5 @@ /* - * Redistribution and use in source and binary forms, with or without modification, + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -8,23 +8,23 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * */ - + #ifndef __LWIP_NETIFAPI_H__ #define __LWIP_NETIFAPI_H__ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/opt.h b/sdk/lib/drivers/lwip/src/include/lwip/opt.h index b8ebec86b15..76490a1d28d 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/opt.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/opt.h @@ -6,9 +6,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -60,7 +60,7 @@ #define SYS_LIGHTWEIGHT_PROT 0 #endif -/** +/** * NO_SYS==1: Provides VERY minimal functionality. Otherwise, * use lwIP facilities. */ @@ -183,8 +183,8 @@ /** * MEMP_USE_CUSTOM_POOLS==1: whether to include a user file lwippools.h * that defines additional pools beyond the "standard" ones required - * by lwIP. If you set this to 1, you must have lwippools.h in your - * inlude path somewhere. + * by lwIP. If you set this to 1, you must have lwippools.h in your + * inlude path somewhere. */ #ifndef MEMP_USE_CUSTOM_POOLS #define MEMP_USE_CUSTOM_POOLS 0 @@ -334,7 +334,7 @@ /** * MEMP_NUM_TCPIP_MSG_API: the number of struct tcpip_msg, which are used - * for callback/timeout API communication. + * for callback/timeout API communication. * (only needed if you use tcpip.c) */ #ifndef MEMP_NUM_TCPIP_MSG_API @@ -343,7 +343,7 @@ /** * MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used - * for incoming packets. + * for incoming packets. * (only needed if you use tcpip.c) */ #ifndef MEMP_NUM_TCPIP_MSG_INPKT @@ -408,7 +408,7 @@ #endif /** - * PBUF_POOL_SIZE: the number of buffers in the pbuf pool. + * PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */ #ifndef PBUF_POOL_SIZE #define PBUF_POOL_SIZE 16 @@ -751,7 +751,7 @@ #endif /** - * SNMP_PRIVATE_MIB: + * SNMP_PRIVATE_MIB: * When using a private MIB, you have to create a file 'private_mib.h' that contains * a 'struct mib_array_node mib_private' which contains your MIB. */ @@ -799,7 +799,7 @@ ---------------------------------- */ /** - * LWIP_IGMP==1: Turn on IGMP module. + * LWIP_IGMP==1: Turn on IGMP module. */ #ifndef LWIP_IGMP #define LWIP_IGMP 0 @@ -916,12 +916,12 @@ #endif /** - * TCP_WND: The size of a TCP window. This must be at least + * TCP_WND: The size of a TCP window. This must be at least * (2 * TCP_MSS) for things to work well */ #ifndef TCP_WND #define TCP_WND (4 * TCP_MSS) -#endif +#endif /** * TCP_MAXRTX: Maximum number of retransmissions of data segments. @@ -1790,14 +1790,14 @@ #ifndef CHECKSUM_GEN_IP #define CHECKSUM_GEN_IP 1 #endif - + /** * CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets. */ #ifndef CHECKSUM_GEN_UDP #define CHECKSUM_GEN_UDP 1 #endif - + /** * CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets. */ @@ -1811,14 +1811,14 @@ #ifndef CHECKSUM_GEN_ICMP #define CHECKSUM_GEN_ICMP 1 #endif - + /** * CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets. */ #ifndef CHECKSUM_CHECK_IP #define CHECKSUM_CHECK_IP 1 #endif - + /** * CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets. */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/pbuf.h b/sdk/lib/drivers/lwip/src/include/lwip/pbuf.h index 99d5443bf36..7602869740b 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/pbuf.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/pbuf.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -149,11 +149,11 @@ struct pbuf *pbuf_alloced_custom(pbuf_layer l, u16_t length, pbuf_type type, struct pbuf_custom *p, void *payload_mem, u16_t payload_mem_len); #endif /* LWIP_SUPPORT_CUSTOM_PBUF */ -void pbuf_realloc(struct pbuf *p, u16_t size); +void pbuf_realloc(struct pbuf *p, u16_t size); u8_t pbuf_header(struct pbuf *p, s16_t header_size); void pbuf_ref(struct pbuf *p); u8_t pbuf_free(struct pbuf *p); -u8_t pbuf_clen(struct pbuf *p); +u8_t pbuf_clen(struct pbuf *p); void pbuf_cat(struct pbuf *head, struct pbuf *tail); void pbuf_chain(struct pbuf *head, struct pbuf *tail); struct pbuf *pbuf_dechain(struct pbuf *p); diff --git a/sdk/lib/drivers/lwip/src/include/lwip/sio.h b/sdk/lib/drivers/lwip/src/include/lwip/sio.h index 28ae2f225d6..dca34794c62 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/sio.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/sio.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,17 +11,17 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. @@ -53,7 +53,7 @@ typedef void * sio_fd_t; #ifndef sio_open /** * Opens a serial device for communication. - * + * * @param devnum device number * @return handle to serial device if successful, NULL otherwise */ @@ -63,10 +63,10 @@ sio_fd_t sio_open(u8_t devnum); #ifndef sio_send /** * Sends a single character to the serial device. - * + * * @param c character to send * @param fd serial device handle - * + * * @note This function will block until the character can be sent. */ void sio_send(u8_t c, sio_fd_t fd); @@ -75,9 +75,9 @@ void sio_send(u8_t c, sio_fd_t fd); #ifndef sio_recv /** * Receives a single character from the serial device. - * + * * @param fd serial device handle - * + * * @note This function will block until a character is received. */ u8_t sio_recv(sio_fd_t fd); @@ -86,12 +86,12 @@ u8_t sio_recv(sio_fd_t fd); #ifndef sio_read /** * Reads from the serial device. - * + * * @param fd serial device handle * @param data pointer to data buffer for receiving * @param len maximum length (in bytes) of data to receive * @return number of bytes actually received - may be 0 if aborted by sio_read_abort - * + * * @note This function will block until data can be received. The blocking * can be cancelled by calling sio_read_abort(). */ @@ -102,7 +102,7 @@ u32_t sio_read(sio_fd_t fd, u8_t *data, u32_t len); /** * Tries to read from the serial device. Same as sio_read but returns * immediately if no data is available and never blocks. - * + * * @param fd serial device handle * @param data pointer to data buffer for receiving * @param len maximum length (in bytes) of data to receive @@ -114,12 +114,12 @@ u32_t sio_tryread(sio_fd_t fd, u8_t *data, u32_t len); #ifndef sio_write /** * Writes to the serial device. - * + * * @param fd serial device handle * @param data pointer to data to send * @param len length (in bytes) of data to send * @return number of bytes actually sent - * + * * @note This function will block until all data can be sent. */ u32_t sio_write(sio_fd_t fd, u8_t *data, u32_t len); @@ -128,7 +128,7 @@ u32_t sio_write(sio_fd_t fd, u8_t *data, u32_t len); #ifndef sio_read_abort /** * Aborts a blocking sio_read() call. - * + * * @param fd serial device handle */ void sio_read_abort(sio_fd_t fd); diff --git a/sdk/lib/drivers/lwip/src/include/lwip/snmp.h b/sdk/lib/drivers/lwip/src/include/lwip/snmp.h index 2ed043dd5f3..fbd2c5a85b2 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/snmp.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/snmp.h @@ -2,8 +2,8 @@ * Copyright (c) 2001, 2002 Leon Woestenberg * Copyright (c) 2001, 2002 Axon Digital Design B.V., The Netherlands. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -12,21 +12,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Leon Woestenberg * */ @@ -109,7 +109,7 @@ void snmp_set_sysname(u8_t *ocstr, u8_t *ocstrlen); void snmp_set_syslocation(u8_t *ocstr, u8_t *ocstrlen); /* network interface */ -void snmp_add_ifinoctets(struct netif *ni, u32_t value); +void snmp_add_ifinoctets(struct netif *ni, u32_t value); void snmp_inc_ifinucastpkts(struct netif *ni); void snmp_inc_ifinnucastpkts(struct netif *ni); void snmp_inc_ifindiscards(struct netif *ni); @@ -167,7 +167,7 @@ void snmp_inc_icmpoutdestunreachs(void); void snmp_inc_icmpouttimeexcds(void); void snmp_inc_icmpoutparmprobs(void); void snmp_inc_icmpoutsrcquenchs(void); -void snmp_inc_icmpoutredirects(void); +void snmp_inc_icmpoutredirects(void); void snmp_inc_icmpoutechos(void); void snmp_inc_icmpoutechoreps(void); void snmp_inc_icmpouttimestamps(void); @@ -242,7 +242,7 @@ void snmp_get_snmpenableauthentraps(u8_t *value); #define snmp_set_syslocation(ocstr, ocstrlen); /* network interface */ -#define snmp_add_ifinoctets(ni,value) +#define snmp_add_ifinoctets(ni,value) #define snmp_inc_ifinucastpkts(ni) #define snmp_inc_ifinnucastpkts(ni) #define snmp_inc_ifindiscards(ni) @@ -282,26 +282,26 @@ void snmp_get_snmpenableauthentraps(u8_t *value); /* ICMP */ #define snmp_inc_icmpinmsgs() -#define snmp_inc_icmpinerrors() -#define snmp_inc_icmpindestunreachs() +#define snmp_inc_icmpinerrors() +#define snmp_inc_icmpindestunreachs() #define snmp_inc_icmpintimeexcds() -#define snmp_inc_icmpinparmprobs() -#define snmp_inc_icmpinsrcquenchs() -#define snmp_inc_icmpinredirects() -#define snmp_inc_icmpinechos() +#define snmp_inc_icmpinparmprobs() +#define snmp_inc_icmpinsrcquenchs() +#define snmp_inc_icmpinredirects() +#define snmp_inc_icmpinechos() #define snmp_inc_icmpinechoreps() -#define snmp_inc_icmpintimestamps() +#define snmp_inc_icmpintimestamps() #define snmp_inc_icmpintimestampreps() #define snmp_inc_icmpinaddrmasks() #define snmp_inc_icmpinaddrmaskreps() #define snmp_inc_icmpoutmsgs() #define snmp_inc_icmpouterrors() -#define snmp_inc_icmpoutdestunreachs() -#define snmp_inc_icmpouttimeexcds() +#define snmp_inc_icmpoutdestunreachs() +#define snmp_inc_icmpouttimeexcds() #define snmp_inc_icmpoutparmprobs() #define snmp_inc_icmpoutsrcquenchs() -#define snmp_inc_icmpoutredirects() -#define snmp_inc_icmpoutechos() +#define snmp_inc_icmpoutredirects() +#define snmp_inc_icmpoutechos() #define snmp_inc_icmpoutechoreps() #define snmp_inc_icmpouttimestamps() #define snmp_inc_icmpouttimestampreps() diff --git a/sdk/lib/drivers/lwip/src/include/lwip/snmp_asn1.h b/sdk/lib/drivers/lwip/src/include/lwip/snmp_asn1.h index 605fa3f16c9..a231d03288a 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/snmp_asn1.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/snmp_asn1.h @@ -2,7 +2,7 @@ * @file * Abstract Syntax Notation One (ISO 8824, 8825) codec. */ - + /* * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands. * All rights reserved. diff --git a/sdk/lib/drivers/lwip/src/include/lwip/snmp_structs.h b/sdk/lib/drivers/lwip/src/include/lwip/snmp_structs.h index 0d3b46a928d..e9bd9d379fe 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/snmp_structs.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/snmp_structs.h @@ -54,7 +54,7 @@ extern "C" { #endif /* MIB object instance */ -#define MIB_OBJECT_NONE 0 +#define MIB_OBJECT_NONE 0 #define MIB_OBJECT_SCALAR 1 #define MIB_OBJECT_TAB 2 @@ -113,7 +113,7 @@ struct mib_node /** tests length and/or range BEFORE setting */ u8_t (*set_test)(struct obj_def *od, u16_t len, void *value); /** sets object value, only to be called when set_test() */ - void (*set_value)(struct obj_def *od, u16_t len, void *value); + void (*set_value)(struct obj_def *od, u16_t len, void *value); /** One out of MIB_NODE_AR, MIB_NODE_LR or MIB_NODE_EX */ u8_t node_type; /* array or max list length */ @@ -161,7 +161,7 @@ struct mib_ram_array_node struct mib_list_node { - struct mib_list_node *prev; + struct mib_list_node *prev; struct mib_list_node *next; s32_t objid; struct mib_node *nptr; @@ -223,7 +223,7 @@ struct mib_external_node void (*get_value_a)(u8_t rid, struct obj_def *od, u16_t len, void *value); u8_t (*set_test_a)(u8_t rid, struct obj_def *od, u16_t len, void *value); void (*set_value_a)(u8_t rid, struct obj_def *od, u16_t len, void *value); - /** async Panic Close (agent returns error reply, + /** async Panic Close (agent returns error reply, e.g. used for external transaction cleanup) */ void (*get_object_def_pc)(u8_t rid, u8_t ident_len, s32_t *ident); void (*get_value_pc)(u8_t rid, struct obj_def *od); diff --git a/sdk/lib/drivers/lwip/src/include/lwip/sockets.h b/sdk/lib/drivers/lwip/src/include/lwip/sockets.h index 3ea32f13fba..a1003b04f45 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/sockets.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/sockets.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -304,7 +304,7 @@ typedef struct ip_mreq { #endif /* FD_SET */ /** LWIP_TIMEVAL_PRIVATE: if you want to use the struct timeval provided - * by your system, set this to 0 and include in cc.h */ + * by your system, set this to 0 and include in cc.h */ #ifndef LWIP_TIMEVAL_PRIVATE #define LWIP_TIMEVAL_PRIVATE 1 #endif diff --git a/sdk/lib/drivers/lwip/src/include/lwip/stats.h b/sdk/lib/drivers/lwip/src/include/lwip/stats.h index 1f5152a9491..d828980a9be 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/stats.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/stats.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -53,7 +53,7 @@ extern "C" { #else #define STAT_COUNTER u16_t #define STAT_COUNTER_F U16_F -#endif +#endif struct stats_proto { STAT_COUNTER xmit; /* Transmitted packets. */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/sys.h b/sdk/lib/drivers/lwip/src/include/lwip/sys.h index dc9351335a9..b25b8c6e62d 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/sys.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/sys.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -80,7 +80,7 @@ typedef u8_t sys_mbox_t; /** sys_mbox_tryfetch() returns SYS_MBOX_EMPTY if appropriate. * For now we use the same magic value, but we allow this to change in future. */ -#define SYS_MBOX_EMPTY SYS_ARCH_TIMEOUT +#define SYS_MBOX_EMPTY SYS_ARCH_TIMEOUT #include "lwip/err.h" #include "arch/sys_arch.h" @@ -119,7 +119,7 @@ void sys_mutex_lock(sys_mutex_t *mutex); void sys_mutex_unlock(sys_mutex_t *mutex); /** Delete a semaphore * @param mutex the mutex to delete */ -void sys_mutex_free(sys_mutex_t *mutex); +void sys_mutex_free(sys_mutex_t *mutex); #ifndef sys_mutex_valid /** Check if a mutex is valid/allocated: return 1 for valid, 0 for invalid */ int sys_mutex_valid(sys_mutex_t *mutex); diff --git a/sdk/lib/drivers/lwip/src/include/lwip/tcp.h b/sdk/lib/drivers/lwip/src/include/lwip/tcp.h index c6e61ad1f1b..8d8995103a7 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/tcp.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/tcp.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -173,7 +173,7 @@ struct tcp_pcb { /* ports are in host byte order */ u16_t remote_port; - + u8_t flags; #define TF_ACK_DELAY ((u8_t)0x01U) /* Delayed ACK. */ #define TF_ACK_NOW ((u8_t)0x02U) /* Immediate ACK. */ @@ -236,12 +236,12 @@ struct tcp_pcb { #if TCP_OVERSIZE /* Extra bytes available at the end of the last pbuf in unsent. */ u16_t unsent_oversize; -#endif /* TCP_OVERSIZE */ +#endif /* TCP_OVERSIZE */ /* These are ordered by sequence number: */ struct tcp_seg *unsent; /* Unsent (queued) segments. */ struct tcp_seg *unacked; /* Sent but unacknowledged segments. */ -#if TCP_QUEUE_OOSEQ +#if TCP_QUEUE_OOSEQ struct tcp_seg *ooseq; /* Received out of sequence segments. */ #endif /* TCP_QUEUE_OOSEQ */ @@ -271,7 +271,7 @@ struct tcp_pcb { u32_t keep_intvl; u32_t keep_cnt; #endif /* LWIP_TCP_KEEPALIVE */ - + /* Persist timer counter */ u8_t persist_cnt; /* Persist timer back-off */ @@ -281,7 +281,7 @@ struct tcp_pcb { u8_t keep_cnt_sent; }; -struct tcp_pcb_listen { +struct tcp_pcb_listen { /* Common members of all PCB types */ IP_PCB; /* Protocol specific PCB members */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/tcp_impl.h b/sdk/lib/drivers/lwip/src/include/lwip/tcp_impl.h index 173de44e444..7c1655a24fd 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/tcp_impl.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/tcp_impl.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -282,7 +282,7 @@ struct tcp_seg { u16_t oversize_left; /* Extra bytes available at the end of the last pbuf in unsent (used for asserting vs. tcp_pcb.unsent_oversized only) */ -#endif /* TCP_OVERSIZE_DBGCHECK */ +#endif /* TCP_OVERSIZE_DBGCHECK */ #if TCP_CHECKSUM_ON_COPY u16_t chksum; u8_t chksum_swapped; @@ -309,7 +309,7 @@ extern u8_t tcp_active_pcbs_changed; /* The TCP PCB lists. */ union tcp_listen_pcbs_t { /* List of all TCP PCBs in LISTEN state. */ - struct tcp_pcb_listen *listen_pcbs; + struct tcp_pcb_listen *listen_pcbs; struct tcp_pcb *pcbs; }; extern struct tcp_pcb *tcp_bound_pcbs; @@ -321,7 +321,7 @@ extern struct tcp_pcb *tcp_tw_pcbs; /* List of all TCP PCBs in TIME-WAIT. * extern struct tcp_pcb *tcp_tmp_pcb; /* Only used for temporary storage. */ -/* Axioms about the above lists: +/* Axioms about the above lists: 1) Every TCP PCB that is not CLOSED is in one of the lists. 2) A PCB is only in one of the lists. 3) All PCBs in the tcp_listen_pcbs list is in LISTEN state. diff --git a/sdk/lib/drivers/lwip/src/include/lwip/tcpip.h b/sdk/lib/drivers/lwip/src/include/lwip/tcpip.h index 637476e1a90..f98340aefd3 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/tcpip.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/tcpip.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/lwip/timers.h b/sdk/lib/drivers/lwip/src/include/lwip/timers.h index 04e78e0feab..bcf9369c5d4 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/timers.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/timers.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * Simon Goldschmidt * diff --git a/sdk/lib/drivers/lwip/src/include/lwip/udp.h b/sdk/lib/drivers/lwip/src/include/lwip/udp.h index f1e6d3f1e4f..5282b0640dd 100644 --- a/sdk/lib/drivers/lwip/src/include/lwip/udp.h +++ b/sdk/lib/drivers/lwip/src/include/lwip/udp.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -113,7 +113,7 @@ struct udp_pcb { /** receive callback function */ udp_recv_fn recv; /** user-supplied argument for the recv callback */ - void *recv_arg; + void *recv_arg; }; /* udp_pcbs export for exernal reference (e.g. SNMP agent) */ extern struct udp_pcb *udp_pcbs; diff --git a/sdk/lib/drivers/lwip/src/include/lwipopts.h b/sdk/lib/drivers/lwip/src/include/lwipopts.h index c31fff2ca8f..5b8bd15dc96 100644 --- a/sdk/lib/drivers/lwip/src/include/lwipopts.h +++ b/sdk/lib/drivers/lwip/src/include/lwipopts.h @@ -58,7 +58,7 @@ /* FIXME: These MSS and TCP Window definitions assume an MTU * of 1500. We need to add some code to lwIP which would allow us - * to change these values based upon the interface we are + * to change these values based upon the interface we are * using. Currently ReactOS only supports Ethernet so we're * fine for now but it does need to be fixed later when we * add support for other transport mediums */ diff --git a/sdk/lib/drivers/lwip/src/include/netif/etharp.h b/sdk/lib/drivers/lwip/src/include/netif/etharp.h index 859608df912..69bb684cfae 100644 --- a/sdk/lib/drivers/lwip/src/include/netif/etharp.h +++ b/sdk/lib/drivers/lwip/src/include/netif/etharp.h @@ -2,9 +2,9 @@ * Copyright (c) 2001-2003 Swedish Institute of Computer Science. * Copyright (c) 2003-2004 Leon Woestenberg * Copyright (c) 2003-2004 Axon Digital Design B.V., The Netherlands. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -13,21 +13,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/netif/loopif.h b/sdk/lib/drivers/lwip/src/include/netif/loopif.h index 304af4b39ab..f8dcd949949 100644 --- a/sdk/lib/drivers/lwip/src/include/netif/loopif.h +++ b/sdk/lib/drivers/lwip/src/include/netif/loopif.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,21 +11,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ diff --git a/sdk/lib/drivers/lwip/src/include/netif/ppp_oe.h b/sdk/lib/drivers/lwip/src/include/netif/ppp_oe.h index e1cdfa51991..e0897a35e50 100644 --- a/sdk/lib/drivers/lwip/src/include/netif/ppp_oe.h +++ b/sdk/lib/drivers/lwip/src/include/netif/ppp_oe.h @@ -6,13 +6,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/include/netif/slipif.h b/sdk/lib/drivers/lwip/src/include/netif/slipif.h index 7b6ce5e28f5..cfd09339458 100644 --- a/sdk/lib/drivers/lwip/src/include/netif/slipif.h +++ b/sdk/lib/drivers/lwip/src/include/netif/slipif.h @@ -1,33 +1,33 @@ /* * Copyright (c) 2001, Swedish Institute of Computer Science. - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -76,6 +76,6 @@ void slipif_received_bytes(struct netif *netif, u8_t *data, u8_t len); #ifdef __cplusplus } #endif - -#endif + +#endif diff --git a/sdk/lib/drivers/lwip/src/include/rosip.h b/sdk/lib/drivers/lwip/src/include/rosip.h index 03aaf0c6a98..af852910d2f 100644 --- a/sdk/lib/drivers/lwip/src/include/rosip.h +++ b/sdk/lib/drivers/lwip/src/include/rosip.h @@ -25,7 +25,7 @@ struct lwip_callback_msg { /* Synchronization */ KEVENT Event; - + /* Input */ union { struct { @@ -60,7 +60,7 @@ struct lwip_callback_msg int Callback; } Close; } Input; - + /* Output */ union { struct { diff --git a/sdk/lib/drivers/lwip/src/netif/etharp.c b/sdk/lib/drivers/lwip/src/netif/etharp.c index 5e382d1d60e..1228c4d00a3 100644 --- a/sdk/lib/drivers/lwip/src/netif/etharp.c +++ b/sdk/lib/drivers/lwip/src/netif/etharp.c @@ -42,7 +42,7 @@ * This file is part of the lwIP TCP/IP stack. * */ - + #include "lwip/opt.h" #if LWIP_ARP || LWIP_ETHERNET @@ -84,7 +84,7 @@ const struct eth_addr ethzero = {{0,0,0,0,0,0}}; /** the time an ARP entry stays pending after first request, * for ARP_TMR_INTERVAL = 5000, this is * (2 * 5) seconds = 10 seconds. - * + * * @internal Keep this number at least 2, otherwise it might * run out instantly if the timeout occurs directly after a request. */ @@ -243,14 +243,14 @@ etharp_tmr(void) /** * Search the ARP table for a matching or new entry. - * + * * If an IP address is given, return a pending or stable ARP entry that matches * the address. If no match is found, create a new entry with this address set, * but in state ETHARP_EMPTY. The caller must check and possibly change the * state of the returned entry. - * + * * If ipaddr is NULL, return a initialized new entry in state ETHARP_EMPTY. - * + * * In all cases, attempt to create new entries from an empty entry. If no * empty entries are available and ETHARP_FLAG_TRY_HARD flag is set, recycle * old entries. Heuristic choose the least important entry for recycling. @@ -258,7 +258,7 @@ etharp_tmr(void) * @param ipaddr IP address to find in ARP cache, or to add if not found. * @param flags @see definition of ETHARP_FLAG_* * @param netif netif related to this address (used for NETIF_HWADDRHINT) - * + * * @return The ARP entry index that matched or is created, ERR_MEM if no * entry is found or could be recycled. */ @@ -337,7 +337,7 @@ etharp_find_entry(ip_addr_t *ipaddr, u8_t flags) } } /* { we have no match } => try to create a new entry */ - + /* don't create new entry, only search? */ if (((flags & ETHARP_FLAG_FIND_ONLY) != 0) || /* or no empty entry found and not allowed to recycle? */ @@ -345,15 +345,15 @@ etharp_find_entry(ip_addr_t *ipaddr, u8_t flags) LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: no empty entry found and not allowed to recycle\n")); return (s8_t)ERR_MEM; } - + /* b) choose the least destructive entry to recycle: * 1) empty entry * 2) oldest stable entry * 3) oldest pending entry without queued packets * 4) oldest pending entry with queued packets - * + * * { ETHARP_FLAG_TRY_HARD is set at this point } - */ + */ /* 1) empty entry available? */ if (empty < ARP_TABLE_SIZE) { @@ -431,7 +431,7 @@ etharp_send_ip(struct netif *netif, struct pbuf *p, struct eth_addr *src, struct * * If a pending entry is resolved, any queued packets will be sent * at this point. - * + * * @param netif netif related to this entry (used for NETIF_ADDRHINT) * @param ipaddr IP address of the inserted ARP entry. * @param ethaddr Ethernet address of the inserted ARP entry. @@ -670,7 +670,7 @@ etharp_ip_input(struct netif *netif, struct pbuf *p) #endif /* ETHARP_TRUST_IP_MAC */ /** - * Responds to ARP requests to us. Upon ARP replies to us, add entry to cache + * Responds to ARP requests to us. Upon ARP replies to us, add entry to cache * send out queued IP packets. Updates cache with snooped address pairs. * * Should be called for incoming ARP packets. The pbuf in the argument @@ -846,13 +846,13 @@ etharp_output_to_arp_index(struct netif *netif, struct pbuf *q, u8_t arp_idx) /* if arp table entry is about to expire: re-request it, but only if its state is ETHARP_STATE_STABLE to prevent flooding the network with ARP requests if this address is used frequently. */ - if ((arp_table[arp_idx].state == ETHARP_STATE_STABLE) && + if ((arp_table[arp_idx].state == ETHARP_STATE_STABLE) && (arp_table[arp_idx].ctime >= ARP_AGE_REREQUEST_USED)) { if (etharp_request(netif, &arp_table[arp_idx].ipaddr) == ERR_OK) { arp_table[arp_idx].state = ETHARP_STATE_STABLE_REREQUESTING; } } - + return etharp_send_ip(netif, q, (struct eth_addr*)(netif->hwaddr), &arp_table[arp_idx].ethaddr); } @@ -990,11 +990,11 @@ etharp_output(struct netif *netif, struct pbuf *q, ip_addr_t *ipaddr) * is sent for the given address. The packet is queued on this entry. * * If the IP address was already stable in the cache, and a packet is - * given, it is directly sent and no ARP request is sent out. - * + * given, it is directly sent and no ARP request is sent out. + * * If the IP address was already stable in the cache, and no packet is * given, an ARP request is sent out. - * + * * @param netif The lwIP network interface on which ipaddr * must be queried for. * @param ipaddr The IP address to be resolved. @@ -1079,7 +1079,7 @@ etharp_query(struct netif *netif, ip_addr_t *ipaddr, struct pbuf *q) struct pbuf *p; int copy_needed = 0; /* IF q includes a PBUF_REF, PBUF_POOL or PBUF_RAM, we have no choice but - * to copy the whole queue into a new PBUF_RAM (see bug #11400) + * to copy the whole queue into a new PBUF_RAM (see bug #11400) * PBUF_ROMs can be left as they are, since ROM must not get changed. */ p = q; while (p) { @@ -1224,7 +1224,7 @@ etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr, #endif /* LWIP_AUTOIP */ ETHADDR16_COPY(ðhdr->src, ethsrc_addr); /* Copy struct ip_addr2 to aligned ip_addr, to support compilers without - * structure packing. */ + * structure packing. */ IPADDR2_COPY(&hdr->sipaddr, ipsrc_addr); IPADDR2_COPY(&hdr->dipaddr, ipdst_addr); @@ -1363,7 +1363,7 @@ ethernet_input(struct pbuf *p, struct netif *netif) ip_input(p, netif); } break; - + case PP_HTONS(ETHTYPE_ARP): if (!(netif->flags & NETIF_FLAG_ETHARP)) { goto free_and_return; diff --git a/sdk/lib/drivers/lwip/src/netif/ethernetif.c b/sdk/lib/drivers/lwip/src/netif/ethernetif.c index 8ec40be12ef..27060e39b6a 100644 --- a/sdk/lib/drivers/lwip/src/netif/ethernetif.c +++ b/sdk/lib/drivers/lwip/src/netif/ethernetif.c @@ -6,9 +6,9 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -17,21 +17,21 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ @@ -84,7 +84,7 @@ static void low_level_init(struct netif *netif) { struct ethernetif *ethernetif = netif->state; - + /* set MAC hardware address length */ netif->hwaddr_len = ETHARP_HWADDR_LEN; @@ -95,12 +95,12 @@ low_level_init(struct netif *netif) /* maximum transfer unit */ netif->mtu = 1500; - + /* device capabilities */ /* don't set NETIF_FLAG_ETHARP if this device is not an ethernet one */ netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP; - - /* Do whatever else is needed to initialize interface. */ + + /* Do whatever else is needed to initialize interface. */ } /** @@ -126,7 +126,7 @@ low_level_output(struct netif *netif, struct pbuf *p) struct pbuf *q; initiate transfer(); - + #if ETH_PAD_SIZE pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */ #endif @@ -143,7 +143,7 @@ low_level_output(struct netif *netif, struct pbuf *p) #if ETH_PAD_SIZE pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */ #endif - + LINK_STATS_INC(link.xmit); return ERR_OK; @@ -174,7 +174,7 @@ low_level_input(struct netif *netif) /* We allocate a pbuf chain of pbufs from the pool. */ p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL); - + if (p != NULL) { #if ETH_PAD_SIZE @@ -207,7 +207,7 @@ low_level_input(struct netif *netif) LINK_STATS_INC(link.drop); } - return p; + return p; } /** @@ -277,7 +277,7 @@ ethernetif_init(struct netif *netif) struct ethernetif *ethernetif; LWIP_ASSERT("netif != NULL", (netif != NULL)); - + ethernetif = mem_malloc(sizeof(struct ethernetif)); if (ethernetif == NULL) { LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_init: out of memory\n")); @@ -305,9 +305,9 @@ ethernetif_init(struct netif *netif) * is available...) */ netif->output = etharp_output; netif->linkoutput = low_level_output; - + ethernetif->ethaddr = (struct eth_addr *)&(netif->hwaddr[0]); - + /* initialize the hardware */ low_level_init(netif); diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/auth.c b/sdk/lib/drivers/lwip/src/netif/ppp/auth.c index 0fd87a3796c..f99763cd781 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/auth.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/auth.c @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -479,7 +479,7 @@ link_established(int unit) if (go->neg_chap) { ChapAuthPeer(unit, ppp_settings.our_name, go->chap_mdtype); auth |= CHAP_PEER; - } + } #endif /* CHAP_SUPPORT */ #if PAP_SUPPORT && CHAP_SUPPORT else @@ -610,7 +610,7 @@ auth_peer_success(int unit, u16_t protocol, char *name, int namelen) } BCOPY(name, peer_authname, namelen); peer_authname[namelen] = 0; - + /* * If there is no more authentication still to be done, * proceed to the network (or callback) phase. @@ -749,7 +749,7 @@ check_idle(void *arg) { struct ppp_idle idle; u_short itime; - + LWIP_UNUSED_ARG(arg); if (!get_idle_time(0, &idle)) { return; @@ -802,7 +802,7 @@ auth_check_options(void) wo->neg_chap = 1; wo->neg_upap = 1; } - + /* * Check whether we have appropriate secrets to use * to authenticate the peer. @@ -876,7 +876,7 @@ check_passwd( int unit, char *auser, int userlen, char *apasswd, int passwdlen, char passwd[256], user[256]; char secret[MAXWORDLEN]; static u_short attempts = 0; - + /* * Make copies of apasswd and auser, then null-terminate them. */ @@ -888,7 +888,7 @@ check_passwd( int unit, char *auser, int userlen, char *apasswd, int passwdlen, /* XXX Validate user name and password. */ ret = UPAP_AUTHACK; /* XXX Assume all entries OK. */ - + if (ret == UPAP_AUTHNAK) { if (*msg == (char *) 0) { *msg = "Login incorrect"; @@ -963,7 +963,7 @@ plogin(char *user, char *passwd, char **msg, int *msglen) LWIP_UNUSED_ARG(msglen); - /* The new lines are here align the file when + /* The new lines are here align the file when * compared against the pppd 2.3.11 code */ @@ -1101,7 +1101,7 @@ get_secret(int unit, char *client, char *server, char *secret, int *secret_len, int ret = 0, len; struct wordlist *addrs; char secbuf[MAXWORDLEN]; - + addrs = NULL; secbuf[0] = 0; @@ -1152,7 +1152,7 @@ set_allowed_addrs(int unit, struct wordlist *addrs) struct ipcp_options *wo = &ipcp_wantoptions[unit]; u32_t a; struct hostent *hp; - + if (wo->hisaddr == 0 && *p != '!' && *p != '-' && strchr(p, '/') == NULL) { hp = gethostbyname(p); if (hp != NULL && hp->h_addrtype == AF_INET) { diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/auth.h b/sdk/lib/drivers/lwip/src/netif/ppp/auth.h index a8069ec4640..8af17ac5cff 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/auth.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/auth.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/chap.c b/sdk/lib/drivers/lwip/src/netif/ppp/chap.c index f10e27d2eaf..892cefadf3d 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/chap.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/chap.c @@ -8,13 +8,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -190,7 +190,7 @@ ChapAuthWithPeer(int unit, char *our_name, u_char digest) /* * We get here as a result of LCP coming up. - * So even if CHAP was open before, we will + * So even if CHAP was open before, we will * have to re-authenticate ourselves. */ cstate->clientstate = CHAPCS_LISTEN; @@ -207,7 +207,7 @@ ChapAuthPeer(int unit, char *our_name, u_char digest) cstate->chal_name = our_name; cstate->chal_type = digest; - + if (cstate->serverstate == CHAPSS_INITIAL || cstate->serverstate == CHAPSS_PENDING) { /* lower layer isn't up - wait until later */ @@ -272,7 +272,7 @@ static void ChapRechallenge(void *arg) { chap_state *cstate = (chap_state *) arg; - + /* if we aren't sending a response, don't worry. */ if (cstate->serverstate != CHAPSS_OPEN) { return; @@ -343,7 +343,7 @@ static void ChapProtocolReject(int unit) { chap_state *cstate = &chap[unit]; - + if (cstate->serverstate != CHAPSS_INITIAL && cstate->serverstate != CHAPSS_CLOSED) { auth_peer_fail(unit, PPP_CHAP); @@ -366,7 +366,7 @@ ChapInput(int unit, u_char *inpacket, int packet_len) u_char *inp; u_char code, id; int len; - + /* * Parse header (code, id and length). * If packet too short, drop it. @@ -388,7 +388,7 @@ ChapInput(int unit, u_char *inpacket, int packet_len) return; } len -= CHAP_HEADERLEN; - + /* * Action depends on code (as in fact it usually does :-). */ @@ -396,19 +396,19 @@ ChapInput(int unit, u_char *inpacket, int packet_len) case CHAP_CHALLENGE: ChapReceiveChallenge(cstate, inp, id, len); break; - + case CHAP_RESPONSE: ChapReceiveResponse(cstate, inp, id, len); break; - + case CHAP_FAILURE: ChapReceiveFailure(cstate, inp, id, len); break; - + case CHAP_SUCCESS: ChapReceiveSuccess(cstate, inp, id, len); break; - + default: /* Need code reject? */ CHAPDEBUG(LOG_WARNING, ("Unknown CHAP code (%d) received.\n", code)); break; @@ -486,7 +486,7 @@ ChapReceiveChallenge(chap_state *cstate, u_char *inp, u_char id, int len) cstate->resp_transmits = 0; /* generate MD based on negotiated type */ - switch (cstate->resp_type) { + switch (cstate->resp_type) { case CHAP_DIGEST_MD5: MD5Init(&mdContext); @@ -497,7 +497,7 @@ ChapReceiveChallenge(chap_state *cstate, u_char *inp, u_char id, int len) BCOPY(hash, cstate->response, MD5_SIGNATURE_SIZE); cstate->resp_length = MD5_SIGNATURE_SIZE; break; - + #if MSCHAP_SUPPORT case CHAP_MICROSOFT: ChapMS(cstate, rchallenge, rchallenge_len, secret, secret_len); @@ -529,7 +529,7 @@ ChapReceiveResponse(chap_state *cstate, u_char *inp, int id, int len) u_char hash[MD5_SIGNATURE_SIZE]; CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: Rcvd id %d.\n", id)); - + if (cstate->serverstate == CHAPSS_CLOSED || cstate->serverstate == CHAPSS_PENDING) { CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: in state %d\n", @@ -554,7 +554,7 @@ ChapReceiveResponse(chap_state *cstate, u_char *inp, int id, int len) ChapSendStatus(cstate, CHAP_FAILURE); return; } - + if (len < 2) { CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: rcvd short packet.\n")); return; @@ -562,7 +562,7 @@ ChapReceiveResponse(chap_state *cstate, u_char *inp, int id, int len) GETCHAR(remmd_len, inp); /* get length of MD */ remmd = inp; /* get pointer to MD */ INCPTR(remmd_len, inp); - + len -= sizeof (u_char) + remmd_len; if (len < 0) { CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: rcvd short packet.\n")); @@ -570,7 +570,7 @@ ChapReceiveResponse(chap_state *cstate, u_char *inp, int id, int len) } UNTIMEOUT(ChapChallengeTimeout, cstate); - + if (len >= (int)sizeof(rhostname)) { len = sizeof(rhostname) - 1; } @@ -601,19 +601,19 @@ ChapReceiveResponse(chap_state *cstate, u_char *inp, int id, int len) MD5Update(&mdContext, &cstate->chal_id, 1); MD5Update(&mdContext, (u_char*)secret, secret_len); MD5Update(&mdContext, cstate->challenge, cstate->chal_len); - MD5Final(hash, &mdContext); - + MD5Final(hash, &mdContext); + /* compare local and remote MDs and send the appropriate status */ if (memcmp (hash, remmd, MD5_SIGNATURE_SIZE) == 0) { code = CHAP_SUCCESS; /* they are the same! */ } break; - + default: CHAPDEBUG(LOG_INFO, ("unknown digest type %d\n", cstate->chal_type)); } } - + BZERO(secret, sizeof(secret)); ChapSendStatus(cstate, code); @@ -655,9 +655,9 @@ ChapReceiveSuccess(chap_state *cstate, u_char *inp, u_char id, int len) cstate->clientstate)); return; } - + UNTIMEOUT(ChapResponseTimeout, cstate); - + /* * Print message. */ @@ -712,7 +712,7 @@ ChapSendChallenge(chap_state *cstate) u_char *outp; int chal_len, name_len; int outlen; - + chal_len = cstate->chal_len; name_len = (int)strlen(cstate->chal_name); outlen = CHAP_HEADERLEN + sizeof (u_char) + chal_len + name_len; @@ -729,11 +729,11 @@ ChapSendChallenge(chap_state *cstate) INCPTR(chal_len, outp); BCOPY(cstate->chal_name, outp, name_len); /* append hostname */ - + pppWrite(cstate->unit, outpacket_buf[cstate->unit], outlen + PPP_HDRLEN); CHAPDEBUG(LOG_INFO, ("ChapSendChallenge: Sent id %d.\n", cstate->chal_id)); - + TIMEOUT(ChapChallengeTimeout, cstate, cstate->timeouttime); ++cstate->chal_transmits; } @@ -760,7 +760,7 @@ ChapSendStatus(chap_state *cstate, int code) outp = outpacket_buf[cstate->unit]; MAKEHEADER(outp, PPP_CHAP); /* paste in a header */ - + PUTCHAR(code, outp); PUTCHAR(cstate->chal_id, outp); PUTSHORT(outlen, outp); @@ -785,8 +785,8 @@ ChapGenChallenge(chap_state *cstate) u_char *ptr = cstate->challenge; int i; - /* pick a random challenge length between MIN_CHALLENGE_LENGTH and - MAX_CHALLENGE_LENGTH */ + /* pick a random challenge length between MIN_CHALLENGE_LENGTH and + MAX_CHALLENGE_LENGTH */ chal_len = (unsigned) ((((magic() >> 16) * (MAX_CHALLENGE_LENGTH - MIN_CHALLENGE_LENGTH)) >> 16) @@ -819,11 +819,11 @@ ChapSendResponse(chap_state *cstate) outp = outpacket_buf[cstate->unit]; MAKEHEADER(outp, PPP_CHAP); - + PUTCHAR(CHAP_RESPONSE, outp); /* we are a response */ PUTCHAR(cstate->resp_id, outp); /* copy id from challenge packet */ PUTSHORT(outlen, outp); /* packet length */ - + PUTCHAR(md_len, outp); /* length of MD */ BCOPY(cstate->response, outp, md_len); /* copy MD to buffer */ INCPTR(md_len, outp); diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/chap.h b/sdk/lib/drivers/lwip/src/netif/ppp/chap.h index fedcab8da1a..517b7749658 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/chap.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/chap.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/chpms.c b/sdk/lib/drivers/lwip/src/netif/ppp/chpms.c index 81a887b83a0..f177f828a1d 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/chpms.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/chpms.c @@ -11,13 +11,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -288,11 +288,11 @@ MakeKey( u_char *key, /* IN 56 bit DES key missing parity bits */ des_key[5] = Get7Bits(key, 35); des_key[6] = Get7Bits(key, 42); des_key[7] = Get7Bits(key, 49); - + #ifndef USE_CRYPT des_set_odd_parity((des_cblock *)des_key); #endif - + #if 0 CHAPDEBUG(LOG_INFO, ("MakeKey: 56-bit input : %02X%02X%02X%02X%02X%02X%02X\n", key[0], key[1], key[2], key[3], key[4], key[5], key[6])); @@ -350,7 +350,7 @@ ChapMS_LANMan( char *rchallenge, int i; u_char UcasePassword[MAX_NT_PASSWORD]; /* max is actually 14 */ u_char PasswordHash[16]; - + /* LANMan password is case insensitive */ BZERO(UcasePassword, sizeof(UcasePassword)); for (i = 0; i < secret_len; i++) { diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/chpms.h b/sdk/lib/drivers/lwip/src/netif/ppp/chpms.h index df070fb356b..d09e782c705 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/chpms.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/chpms.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/fsm.c b/sdk/lib/drivers/lwip/src/netif/ppp/fsm.c index e8a254ede52..2dc86e16d43 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/fsm.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/fsm.c @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -230,7 +230,7 @@ fsm_open(fsm *f) f->state = LS_REQSENT; } break; - + case LS_CLOSING: f->state = LS_STOPPING; /* fall through */ @@ -422,28 +422,28 @@ fsm_input(fsm *f, u_char *inpacket, int l) case CONFREQ: fsm_rconfreq(f, id, inp, len); break; - + case CONFACK: fsm_rconfack(f, id, inp, len); break; - + case CONFNAK: case CONFREJ: fsm_rconfnakrej(f, code, id, inp, len); break; - + case TERMREQ: fsm_rtermreq(f, id, inp, len); break; - + case TERMACK: fsm_rtermack(f); break; - + case CODEREJ: fsm_rcoderej(f, inp, len); break; - + default: FSMDEBUG(LOG_INFO, ("fsm_input(%s): default: \n", PROTO_NAME(f))); if( !f->callbacks->extcode || @@ -463,7 +463,7 @@ fsm_rconfreq(fsm *f, u_char id, u_char *inp, int len) { int code, reject_if_disagree; - FSMDEBUG(LOG_INFO, ("fsm_rconfreq(%s): Rcvd id %d state=%d (%s)\n", + FSMDEBUG(LOG_INFO, ("fsm_rconfreq(%s): Rcvd id %d state=%d (%s)\n", PROTO_NAME(f), id, f->state, ppperr_strerr[f->state])); switch( f->state ) { case LS_CLOSED: @@ -488,7 +488,7 @@ fsm_rconfreq(fsm *f, u_char id, u_char *inp, int len) f->state = LS_REQSENT; break; } - + /* * Pass the requested configuration options * to protocol-specific code for checking. @@ -501,10 +501,10 @@ fsm_rconfreq(fsm *f, u_char id, u_char *inp, int len) } else { code = CONFACK; } - + /* send the Ack, Nak or Rej to the peer */ fsm_sdata(f, (u_char)code, id, inp, len); - + if (code == CONFACK) { if (f->state == LS_ACKRCVD) { UNTIMEOUT(fsm_timeout, f); /* Cancel timeout */ @@ -536,7 +536,7 @@ fsm_rconfack(fsm *f, int id, u_char *inp, int len) { FSMDEBUG(LOG_INFO, ("fsm_rconfack(%s): Rcvd id %d state=%d (%s)\n", PROTO_NAME(f), id, f->state, ppperr_strerr[f->state])); - + if (id != f->reqid || f->seen_ack) { /* Expected id? */ return; /* Nope, toss... */ } @@ -547,25 +547,25 @@ fsm_rconfack(fsm *f, int id, u_char *inp, int len) return; } f->seen_ack = 1; - + switch (f->state) { case LS_CLOSED: case LS_STOPPED: fsm_sdata(f, TERMACK, (u_char)id, NULL, 0); break; - + case LS_REQSENT: f->state = LS_ACKRCVD; f->retransmits = f->maxconfreqtransmits; break; - + case LS_ACKRCVD: /* Huh? an extra valid Ack? oh well... */ UNTIMEOUT(fsm_timeout, f); /* Cancel timeout */ fsm_sconfreq(f, 0); f->state = LS_REQSENT; break; - + case LS_ACKSENT: UNTIMEOUT(fsm_timeout, f); /* Cancel timeout */ f->state = LS_OPENED; @@ -574,7 +574,7 @@ fsm_rconfack(fsm *f, int id, u_char *inp, int len) (*f->callbacks->up)(f); /* Inform upper layers */ } break; - + case LS_OPENED: /* Go down and restart negotiation */ if (f->callbacks->down) { @@ -616,7 +616,7 @@ fsm_rconfnakrej(fsm *f, int code, int id, u_char *inp, int len) case LS_STOPPED: fsm_sdata(f, TERMACK, (u_char)id, NULL, 0); break; - + case LS_REQSENT: case LS_ACKSENT: /* They didn't agree to what we wanted - try another request */ @@ -627,14 +627,14 @@ fsm_rconfnakrej(fsm *f, int code, int id, u_char *inp, int len) fsm_sconfreq(f, 0); /* Send Configure-Request */ } break; - + case LS_ACKRCVD: /* Got a Nak/reject when we had already had an Ack?? oh well... */ UNTIMEOUT(fsm_timeout, f); /* Cancel timeout */ fsm_sconfreq(f, 0); f->state = LS_REQSENT; break; - + case LS_OPENED: /* Go down and restart negotiation */ if (f->callbacks->down) { @@ -689,9 +689,9 @@ fsm_rtermreq(fsm *f, int id, u_char *p, int len) static void fsm_rtermack(fsm *f) { - FSMDEBUG(LOG_INFO, ("fsm_rtermack(%s): state=%d (%s)\n", + FSMDEBUG(LOG_INFO, ("fsm_rtermack(%s): state=%d (%s)\n", PROTO_NAME(f), f->state, ppperr_strerr[f->state])); - + switch (f->state) { case LS_CLOSING: UNTIMEOUT(fsm_timeout, f); @@ -708,11 +708,11 @@ fsm_rtermack(fsm *f) (*f->callbacks->finished)(f); } break; - + case LS_ACKRCVD: f->state = LS_REQSENT; break; - + case LS_OPENED: if (f->callbacks->down) { (*f->callbacks->down)(f); /* Inform upper layers */ @@ -720,7 +720,7 @@ fsm_rtermack(fsm *f) fsm_sconfreq(f, 0); break; default: - FSMDEBUG(LOG_INFO, ("fsm_rtermack(%s): UNHANDLED state=%d (%s)!!!\n", + FSMDEBUG(LOG_INFO, ("fsm_rtermack(%s): UNHANDLED state=%d (%s)!!!\n", PROTO_NAME(f), f->state, ppperr_strerr[f->state])); } } @@ -733,10 +733,10 @@ static void fsm_rcoderej(fsm *f, u_char *inp, int len) { u_char code, id; - - FSMDEBUG(LOG_INFO, ("fsm_rcoderej(%s): state=%d (%s)\n", + + FSMDEBUG(LOG_INFO, ("fsm_rcoderej(%s): state=%d (%s)\n", PROTO_NAME(f), f->state, ppperr_strerr[f->state])); - + if (len < HEADERLEN) { FSMDEBUG(LOG_INFO, ("fsm_rcoderej: Rcvd short Code-Reject packet!\n")); return; @@ -745,7 +745,7 @@ fsm_rcoderej(fsm *f, u_char *inp, int len) GETCHAR(id, inp); FSMDEBUG(LOG_WARNING, ("%s: Rcvd Code-Reject for code %d, id %d\n", PROTO_NAME(f), code, id)); - + if( f->state == LS_ACKRCVD ) { f->state = LS_REQSENT; } @@ -783,7 +783,7 @@ fsm_protreject(fsm *f) (*f->callbacks->finished)(f); } break; - + case LS_OPENED: if( f->callbacks->down ) { (*f->callbacks->down)(f); @@ -797,7 +797,7 @@ fsm_protreject(fsm *f) f->state = LS_STOPPING; break; - + default: FSMDEBUG(LOG_INFO, ("%s: Protocol-reject event in state %d (%s)!\n", PROTO_NAME(f), f->state, ppperr_strerr[f->state])); @@ -813,7 +813,7 @@ fsm_sconfreq(fsm *f, int retransmit) { u_char *outp; int cilen; - + if( f->state != LS_REQSENT && f->state != LS_ACKRCVD && f->state != LS_ACKSENT ) { /* Not currently negotiating - reset options */ if( f->callbacks->resetci ) { @@ -821,15 +821,15 @@ fsm_sconfreq(fsm *f, int retransmit) } f->nakloops = 0; } - + if( !retransmit ) { /* New request - reset retransmission counter, use new ID */ f->retransmits = f->maxconfreqtransmits; f->reqid = ++f->id; } - + f->seen_ack = 0; - + /* * Make up the request packet */ @@ -848,11 +848,11 @@ fsm_sconfreq(fsm *f, int retransmit) /* send the request to our peer */ fsm_sdata(f, CONFREQ, f->reqid, outp, cilen); - + /* start the retransmit timer */ --f->retransmits; TIMEOUT(fsm_timeout, f, f->timeouttime); - + FSMDEBUG(LOG_INFO, ("%s: sending Configure-Request, id %d\n", PROTO_NAME(f), f->reqid)); } diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/fsm.h b/sdk/lib/drivers/lwip/src/netif/ppp/fsm.h index 8d41b5f511c..0057cf3f517 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/fsm.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/fsm.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.c b/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.c index f0ab2e0e172..aef7fb0af29 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.c @@ -9,13 +9,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -280,7 +280,7 @@ static void ipcp_resetci(fsm *f) { ipcp_options *wo = &ipcp_wantoptions[f->unit]; - + wo->req_addr = wo->neg_addr && ipcp_allowoptions[f->unit].neg_addr; if (wo->ouraddr == 0) { wo->accept_local = 1; @@ -462,7 +462,7 @@ ipcp_ackci(fsm *f, u_char *p, int len) } \ } \ } - + #define ACKCIADDR(opt, neg, old, val1, val2) \ if (neg) { \ int addrlen = (old? CILEN_ADDRS: CILEN_ADDR); \ @@ -591,7 +591,7 @@ ipcp_nakci(fsm *f, u_char *p, int len) no.neg = 1; \ code \ } - + #define NAKCIDNS(opt, neg, code) \ if (go->neg && \ ((cilen = p[1]) == CILEN_ADDR) && \ @@ -1091,7 +1091,7 @@ ipcp_reqci(fsm *f, u_char *inp/* Requested CIs */,int *len/* Length of requested ho->vj_protocol = cishort; if (cilen == CILEN_VJ) { GETCHAR(maxslotindex, p); - if (maxslotindex > ao->maxslotindex) { + if (maxslotindex > ao->maxslotindex) { IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Naking VJ max slot %d\n", maxslotindex)); orc = CONFNAK; if (!reject_if_disagree) { @@ -1152,7 +1152,7 @@ endswitch: rc = CONFREJ; ucp = inp; /* Backup */ } - + /* Need to move CI? */ if (ucp != cip) { BCOPY(cip, ucp, cilen); /* Move it */ diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.h b/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.h index de03f460ecb..bcfd25caa16 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -73,7 +73,7 @@ #define IPCP_VJ_COMP 0x002d /* current value for VJ compression option */ #define IPCP_VJ_COMP_OLD 0x0037 /* "old" (i.e, broken) value for VJ */ - /* compression option */ + /* compression option */ typedef struct ipcp_options { u_int neg_addr : 1; /* Negotiate IP Address? */ diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/lcp.c b/sdk/lib/drivers/lwip/src/netif/ppp/lcp.c index 54f758aa646..06b426a3d4e 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/lcp.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/lcp.c @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -49,7 +49,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ - + #include "lwip/opt.h" @@ -107,7 +107,7 @@ static u32_t lcp_echo_number = 0; /* ID number of next ech static u32_t lcp_echo_timer_running = 0; /* TRUE if a timer is running */ /* @todo: do we really need such a large buffer? The typical 1500 bytes seem too much. */ -static u_char nak_buffer[PPP_MRU]; /* where we construct a nak packet */ +static u_char nak_buffer[PPP_MRU]; /* where we construct a nak packet */ /* * Callbacks for fsm code. (CI = Configuration Information) @@ -278,7 +278,7 @@ lcp_init(int unit) ao->neg_lqr = 0; /* no LQR implementation yet */ ao->neg_cbcp = (CBCP_SUPPORT != 0); - /* + /* * Set transmit escape for the flag and escape characters plus anything * set for the allowable options. */ @@ -293,7 +293,7 @@ lcp_init(int unit) xmit_accm[unit][1], xmit_accm[unit][2], xmit_accm[unit][3])); - + lcp_phase[unit] = PHASE_INITIALIZE; } @@ -412,7 +412,7 @@ lcp_extcode(fsm *f, int code, u_char id, u_char *inp, int len) case PROTREJ: lcp_rprotrej(f, inp, len); break; - + case ECHOREQ: if (f->state != LS_OPENED) { break; @@ -892,7 +892,7 @@ lcp_nakci(fsm *f, u_char *p, int len) goto bad; } try.neg_chap = 0; - + } else if (cishort == PPP_CHAP && cilen == CILEN_CHAP) { GETCHAR(cichar, p); if (go->neg_chap) { @@ -910,7 +910,7 @@ lcp_nakci(fsm *f, u_char *p, int len) */ try.neg_upap = 0; } - + } else { /* * We don't recognize what they're suggesting. @@ -1179,7 +1179,7 @@ lcp_rejci(fsm *f, u_char *p, int len) try.neg = 0; \ LCPDEBUG(LOG_INFO, ("lcp_rejci: Callback opt %d rejected\n", opt)); \ } - + REJCISHORT(CI_MRU, neg_mru, go->mru); REJCILONG(CI_ASYNCMAP, neg_asyncmap, go->asyncmap); REJCICHAP(CI_AUTHTYPE, neg_chap, PPP_CHAP, go->chap_mdtype); @@ -1191,7 +1191,7 @@ lcp_rejci(fsm *f, u_char *p, int len) REJCILONG(CI_MAGICNUMBER, neg_magicnumber, go->magicnumber); REJCIVOID(CI_PCOMPRESSION, neg_pcompression); REJCIVOID(CI_ACCOMPRESSION, neg_accompression); - + /* * If there are any remaining CIs, then this packet is bad. */ @@ -1205,7 +1205,7 @@ lcp_rejci(fsm *f, u_char *p, int len) *go = try; } return 1; - + bad: LCPDEBUG(LOG_WARNING, ("lcp_rejci: received bad Reject!\n")); return 0; @@ -1220,7 +1220,7 @@ bad: * CONFNAK; returns CONFREJ if it can't return CONFACK. */ static int -lcp_reqci(fsm *f, +lcp_reqci(fsm *f, u_char *inp, /* Requested CIs */ int *lenp, /* Length of requested CIs */ int reject_if_disagree) @@ -1318,13 +1318,13 @@ lcp_reqci(fsm *f, break; } GETLONG(cilong, p); - + /* * Asyncmap must have set at least the bits * which are set in lcp_allowoptions[unit].asyncmap. */ if ((ao->asyncmap & ~cilong) != 0) { - LCPDEBUG(LOG_INFO, ("lcp_reqci: Nak ASYNCMAP %lX missing %lX\n", + LCPDEBUG(LOG_INFO, ("lcp_reqci: Nak ASYNCMAP %lX missing %lX\n", cilong, ao->asyncmap)); orc = CONFNAK; PUTCHAR(CI_ASYNCMAP, nakp); @@ -1354,7 +1354,7 @@ lcp_reqci(fsm *f, break; } GETSHORT(cishort, p); - + /* * Authtype must be UPAP or CHAP. * @@ -1365,7 +1365,7 @@ lcp_reqci(fsm *f, * Whether we end up doing CHAP or UPAP depends then on * the ordering of the CIs in the peer's Configure-Request. */ - + if (cishort == PPP_PAP) { if (ho->neg_chap) { /* we've already accepted CHAP */ LCPDEBUG(LOG_WARNING, ("lcp_reqci: Reject AUTHTYPE PAP already accepted\n")); @@ -1432,7 +1432,7 @@ lcp_reqci(fsm *f, ho->neg_chap = 1; break; } - + /* * We don't recognize the protocol they're asking for. * Nak it with something we're willing to do. @@ -1451,7 +1451,7 @@ lcp_reqci(fsm *f, PUTSHORT(PPP_PAP, nakp); } break; - + case CI_QUALITY: GETSHORT(cishort, p); GETLONG(cilong, p); @@ -1465,7 +1465,7 @@ lcp_reqci(fsm *f, orc = CONFREJ; break; } - + /* * Check the protocol and the reporting period. * XXX When should we Nak this, and what with? @@ -1479,7 +1479,7 @@ lcp_reqci(fsm *f, break; } break; - + case CI_MAGICNUMBER: if (!(ao->neg_magicnumber || go->neg_magicnumber) || cilen != CILEN_LONG) { @@ -1507,8 +1507,8 @@ lcp_reqci(fsm *f, ho->neg_magicnumber = 1; ho->magicnumber = cilong; break; - - + + case CI_PCOMPRESSION: #if TRACELCP > 0 snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " PCOMPRESSION"); @@ -1521,7 +1521,7 @@ lcp_reqci(fsm *f, } ho->neg_pcompression = 1; break; - + case CI_ACCOMPRESSION: #if TRACELCP > 0 snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " ACCOMPRESSION"); @@ -1534,7 +1534,7 @@ lcp_reqci(fsm *f, } ho->neg_accompression = 1; break; - + case CI_MRRU: #if TRACELCP > 0 snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " CI_MRRU"); @@ -1542,7 +1542,7 @@ lcp_reqci(fsm *f, #endif orc = CONFREJ; break; - + case CI_SSNHF: #if TRACELCP > 0 snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " CI_SSNHF"); @@ -1550,7 +1550,7 @@ lcp_reqci(fsm *f, #endif orc = CONFREJ; break; - + case CI_EPDISC: #if TRACELCP > 0 snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " CI_EPDISC"); @@ -1558,7 +1558,7 @@ lcp_reqci(fsm *f, #endif orc = CONFREJ; break; - + default: #if TRACELCP snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " unknown %d", citype); @@ -1730,7 +1730,7 @@ static void print_string( char *p, int len, void (*printer) (void *, char *, ...), void *arg) { int c; - + printer(arg, "\""); for (; len > 0; --len) { c = *p++; @@ -1897,7 +1897,7 @@ lcp_printpkt( u_char *p, int plen, void (*printer) (void *, char *, ...), void * printer(arg, ">"); } break; - + case TERMACK: case TERMREQ: if (len > 0 && *p >= ' ' && *p < 0x7f) { @@ -1907,7 +1907,7 @@ lcp_printpkt( u_char *p, int plen, void (*printer) (void *, char *, ...), void * len = 0; } break; - + case ECHOREQ: case ECHOREP: case DISCREQ: diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/lcp.h b/sdk/lib/drivers/lwip/src/netif/ppp/lcp.h index b9201eeb50b..92f45bb3416 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/lcp.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/lcp.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/magic.c b/sdk/lib/drivers/lwip/src/netif/ppp/magic.c index 3732a424179..1a9d16dd44b 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/magic.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/magic.c @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/magic.h b/sdk/lib/drivers/lwip/src/netif/ppp/magic.h index eba70d20b00..183643947ec 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/magic.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/magic.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/md5.c b/sdk/lib/drivers/lwip/src/netif/ppp/md5.c index dc3cc751b73..be49f1fc123 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/md5.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/md5.c @@ -141,7 +141,7 @@ MD5Update(MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen) PPPDEBUG(LOG_INFO, ("MD5Update: %u:%.*H\n", inLen, LWIP_MIN(inLen, 20) * 2, inBuf)); PPPDEBUG(LOG_INFO, ("MD5Update: %u:%s\n", inLen, inBuf)); #endif - + /* compute number of bytes mod 64 */ mdi = (int)((mdContext->i[0] >> 3) & 0x3F); diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/pap.c b/sdk/lib/drivers/lwip/src/netif/ppp/pap.c index 5fb9f886c05..aa806dcac55 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/pap.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/pap.c @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -214,7 +214,7 @@ upap_timeout(void *arg) { upap_state *u = (upap_state *) arg; - UPAPDEBUG(LOG_INFO, ("upap_timeout: %d timeout %d expired s=%d\n", + UPAPDEBUG(LOG_INFO, ("upap_timeout: %d timeout %d expired s=%d\n", u->us_unit, u->us_timeouttime, u->us_clientstate)); if (u->us_clientstate != UPAPCS_AUTHREQ) { @@ -552,7 +552,7 @@ upap_sauthreq(upap_state *u) u_char *outp; int outlen; - outlen = UPAP_HEADERLEN + 2 * sizeof (u_char) + outlen = UPAP_HEADERLEN + 2 * sizeof (u_char) + u->us_userlen + u->us_passwdlen; outp = outpacket_buf[u->us_unit]; diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/pap.h b/sdk/lib/drivers/lwip/src/netif/ppp/pap.h index c99a2040196..b48cbac3470 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/pap.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/pap.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ppp.c b/sdk/lib/drivers/lwip/src/netif/ppp/ppp.c index 8e8fae9f9f4..affc2405d8e 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/ppp.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/ppp.c @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -566,9 +566,9 @@ pppOverSerialOpen(sio_fd_t fd, pppLinkStatusCB_fn linkStatusCB, void *linkStatus vj_compress_init(&pc->vjComp); #endif /* VJ_SUPPORT */ - /* + /* * Default the in and out accm so that escape and flag characters - * are always escaped. + * are always escaped. */ pc->rx.inACCM[15] = 0x60; /* no need to protect since RX is not running */ pc->outACCM[15] = 0x60; @@ -655,7 +655,7 @@ int pppOverEthernetOpen(struct netif *ethif, const char *service_name, const cha #endif /* PPPOE_SUPPORT */ -/* Close a PPP connection and release the descriptor. +/* Close a PPP connection and release the descriptor. * Any outstanding packets in the queues are dropped. * Return 0 on success, an error code on failure. */ int @@ -723,7 +723,7 @@ nPut(PPPControl *pc, struct pbuf *nb) LINK_STATS_INC(link.xmit); } -/* +/* * pppAppend - append given character to end of given pbuf. If outACCM * is not NULL and the character needs to be escaped, do so. * If pbuf is full, append another. @@ -733,7 +733,7 @@ static struct pbuf * pppAppend(u_char c, struct pbuf *nb, ext_accm *outACCM) { struct pbuf *tb = nb; - + /* Make sure there is room for the character and an escape code. * Sure we don't quite fill the buffer if the character doesn't * get escaped but is one character worth complicating this? */ @@ -859,9 +859,9 @@ pppifOutput(struct netif *netif, struct pbuf *pb, ip_addr_t *ipaddr) } #if VJ_SUPPORT - /* + /* * Attempt Van Jacobson header compression if VJ is configured and - * this is an IP packet. + * this is an IP packet. */ if (protocol == PPP_IP && pc->vjEnabled) { switch (vj_compress_tcp(&pc->vjComp, pb)) { @@ -921,7 +921,7 @@ pppifOutput(struct netif *netif, struct pbuf *pb, ip_addr_t *ipaddr) /* Update FCS before checking for special characters. */ fcsOut = PPP_FCS(fcsOut, c); - + /* Copy to output buffer escaping special characters. */ tailMB = pppAppend(c, tailMB, &pc->outACCM); } @@ -937,7 +937,7 @@ pppifOutput(struct netif *netif, struct pbuf *pb, ip_addr_t *ipaddr) /* If we failed to complete the packet, throw it away. */ if (!tailMB) { PPPDEBUG(LOG_WARNING, - ("pppifOutput[%d]: Alloc err - dropping proto=%d\n", + ("pppifOutput[%d]: Alloc err - dropping proto=%d\n", pd, protocol)); pbuf_free(headMB); LINK_STATS_INC(link.memerr); @@ -1114,7 +1114,7 @@ pppWrite(int pd, const u_char *s, int n) /* Copy to output buffer escaping special characters. */ tailMB = pppAppend(c, tailMB, &pc->outACCM); } - + /* Add FCS and trailing flag. */ c = ~fcsOut & 0xFF; tailMB = pppAppend(c, tailMB, &pc->outACCM); @@ -1152,11 +1152,11 @@ ppp_send_config( int unit, u16_t mtu, u32_t asyncmap, int pcomp, int accomp) { PPPControl *pc = &pppControl[unit]; int i; - + pc->mtu = mtu; pc->pcomp = pcomp; pc->accomp = accomp; - + /* Load the ACCM bits for the 32 control codes. */ for (i = 0; i < 32/8; i++) { pc->outACCM[i] = (u_char)((asyncmap >> (8 * i)) & 0xFF); @@ -1277,13 +1277,13 @@ GetMask(u32_t addr) nmask = IP_CLASSA_NET; } else if (IP_CLASSB(addr)) { nmask = IP_CLASSB_NET; - } else { + } else { nmask = IP_CLASSC_NET; } /* class D nets are disallowed by bad_ip_adrs */ mask = subnetMask | htonl(nmask); - + /* XXX * Scan through the system's network interfaces. * Get each netmask and OR them into our mask. @@ -1300,7 +1300,7 @@ sifvjcomp(int pd, int vjcomp, u8_t cidcomp, u8_t maxcid) { #if PPPOS_SUPPORT && VJ_SUPPORT PPPControl *pc = &pppControl[pd]; - + pc->vjEnabled = vjcomp; pc->vjComp.compressSlot = cidcomp; pc->vjComp.maxSlotIndex = maxcid; @@ -1343,7 +1343,7 @@ sifup(int pd) { PPPControl *pc = &pppControl[pd]; int st = 1; - + if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) { st = 0; PPPDEBUG(LOG_WARNING, ("sifup[%d]: bad parms\n", pd)); @@ -1388,7 +1388,7 @@ sifdown(int pd) { PPPControl *pc = &pppControl[pd]; int st = 1; - + if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) { st = 0; PPPDEBUG(LOG_WARNING, ("sifdown[%d]: bad parms\n", pd)); @@ -1419,7 +1419,7 @@ sifaddr( int pd, u32_t o, u32_t h, u32_t m, u32_t ns1, u32_t ns2) { PPPControl *pc = &pppControl[pd]; int st = 1; - + if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) { st = 0; PPPDEBUG(LOG_WARNING, ("sifup[%d]: bad parms\n", pd)); @@ -1445,7 +1445,7 @@ cifaddr( int pd, u32_t o, u32_t h) { PPPControl *pc = &pppControl[pd]; int st = 1; - + LWIP_UNUSED_ARG(o); LWIP_UNUSED_ARG(h); if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) { @@ -1608,7 +1608,7 @@ pppInput(void *arg) pd = ((struct pppInputHeader *)nb->payload)->unit; protocol = ((struct pppInputHeader *)nb->payload)->proto; - + if(pbuf_header(nb, -(int)sizeof(struct pppInputHeader))) { LWIP_ASSERT("pbuf_header failed\n", 0); goto drop; @@ -1667,7 +1667,7 @@ pppInput(void *arg) #else /* PPPOS_SUPPORT && VJ_SUPPORT */ /* No handler for this protocol so drop the packet. */ PPPDEBUG(LOG_INFO, - ("pppInput[%d]: drop VJ UnComp in %d:.*H\n", + ("pppInput[%d]: drop VJ UnComp in %d:.*H\n", pd, nb->len, LWIP_MIN(nb->len * 2, 40), nb->payload)); #endif /* PPPOS_SUPPORT && VJ_SUPPORT */ break; @@ -1809,14 +1809,14 @@ pppInProc(PPPControlRx *pcrx, u_char *s, int l) /* If we haven't received the packet header, drop what has come in. */ } else if (pcrx->inState < PDDATA) { PPPDEBUG(LOG_WARNING, - ("pppInProc[%d]: Dropping incomplete packet %d\n", + ("pppInProc[%d]: Dropping incomplete packet %d\n", pcrx->pd, pcrx->inState)); LINK_STATS_INC(link.lenerr); pppDrop(pcrx); /* If the fcs is invalid, drop the packet. */ } else if (pcrx->inFCS != PPP_GOODFCS) { PPPDEBUG(LOG_INFO, - ("pppInProc[%d]: Dropping bad fcs 0x%"X16_F" proto=0x%"X16_F"\n", + ("pppInProc[%d]: Dropping bad fcs 0x%"X16_F" proto=0x%"X16_F"\n", pcrx->pd, pcrx->inFCS, pcrx->inProtocol)); /* Note: If you get lots of these, check for UART frame errors or try different baud rate */ LINK_STATS_INC(link.chkerr); @@ -2023,7 +2023,7 @@ drop: void ppp_set_netif_statuscallback(int pd, netif_status_callback_fn status_callback) { - netif_set_status_callback(&pppControl[pd].netif, status_callback); + netif_set_status_callback(&pppControl[pd].netif, status_callback); } #endif /* LWIP_NETIF_STATUS_CALLBACK */ @@ -2038,7 +2038,7 @@ ppp_set_netif_statuscallback(int pd, netif_status_callback_fn status_callback) void ppp_set_netif_linkcallback(int pd, netif_status_callback_fn link_callback) { - netif_set_link_callback(&pppControl[pd].netif, link_callback); + netif_set_link_callback(&pppControl[pd].netif, link_callback); } #endif /* LWIP_NETIF_LINK_CALLBACK */ diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ppp.h b/sdk/lib/drivers/lwip/src/netif/ppp/ppp.h index 08d6e62d87f..7866478d9a7 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/ppp.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/ppp.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -138,7 +138,7 @@ typedef void (*pppLinkStatusCB_fn)(void *ctx, int errCode, void *arg); * This initializes the PPP control block but does not * attempt to negotiate the LCP session. * Return a new PPP connection descriptor on success or - * an error code (negative) on failure. + * an error code (negative) on failure. */ int pppOverSerialOpen(sio_fd_t fd, pppLinkStatusCB_fn linkStatusCB, void *linkStatusCtx); #endif /* PPPOS_SUPPORT */ @@ -155,9 +155,9 @@ int pppOverEthernetOpen(struct netif *ethif, const char *service_name, const cha #define pppOpen(fd,cb,ls) pppOverSerialOpen(fd,cb,ls) /* - * Close a PPP connection and release the descriptor. + * Close a PPP connection and release the descriptor. * Any outstanding packets in the queues are dropped. - * Return 0 on success, an error code on failure. + * Return 0 on success, an error code on failure. */ int pppClose(int pd); @@ -168,7 +168,7 @@ void pppSigHUP(int pd); /* * Get and set parameters for the given connection. - * Return 0 on success, an error code on failure. + * Return 0 on success, an error code on failure. */ int pppIOCtl(int pd, int cmd, void *arg); diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ppp_oe.c b/sdk/lib/drivers/lwip/src/netif/ppp/ppp_oe.c index fdf52ae23d8..d50c7c1b0d3 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/ppp_oe.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/ppp_oe.c @@ -6,13 +6,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -575,7 +575,7 @@ pppoe_data_input(struct netif *netif, struct pbuf *pb) PPPDEBUG(LOG_ERR, ("pppoe_data_input: pbuf_header failed\n")); LINK_STATS_INC(link.lenerr); goto drop; - } + } pb = pppSingleBuf (pb); @@ -615,7 +615,7 @@ pppoe_data_input(struct netif *netif, struct pbuf *pb) PPPDEBUG(LOG_ERR, ("pppoe_data_input: pbuf_header PPPOE_HEADERLEN failed\n")); LINK_STATS_INC(link.lenerr); goto drop; - } + } PPPDEBUG(LOG_DEBUG, ("pppoe_data_input: %c%c%"U16_F": pkthdr.len=%d, pppoe.len=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, @@ -1071,7 +1071,7 @@ pppoe_xmit(struct pppoe_softc *sc, struct pbuf *pb) LINK_STATS_INC(link.lenerr); pbuf_free(pb); return ERR_BUF; - } + } p = (u8_t*)pb->payload + sizeof(struct eth_hdr); PPPOE_ADD_HEADER(p, 0, sc->sc_session, len); diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/pppdebug.h b/sdk/lib/drivers/lwip/src/netif/ppp/pppdebug.h index 81349971db6..15c113ec6dd 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/pppdebug.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/pppdebug.h @@ -8,13 +8,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/randm.c b/sdk/lib/drivers/lwip/src/netif/ppp/randm.c index b736091fc51..94dc49494de 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/randm.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/randm.c @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, @@ -233,7 +233,7 @@ avRandomize(void) * Return a new random number. * Here we use the Borland rand() function to supply a pseudo random * number which we make truely random by combining it with our own - * seed which is randomized by truely random events. + * seed which is randomized by truely random events. * Thus the numbers will be truely random unless there have been no * operator or network events in which case it will be pseudo random * seeded by the real time clock. diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/randm.h b/sdk/lib/drivers/lwip/src/netif/ppp/randm.h index a0984b0202e..468f0016268 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/randm.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/randm.h @@ -7,13 +7,13 @@ * The authors hereby grant permission to use, copy, modify, distribute, * and license this software and its documentation for any purpose, provided * that existing copyright notices are retained in all copies and that this -* notice and the following disclaimer are included verbatim in any +* notice and the following disclaimer are included verbatim in any * distributions. No written agreement, license, or royalty fee is required * for any of the authorized uses. * * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/vj.c b/sdk/lib/drivers/lwip/src/netif/ppp/vj.c index 40fdad13d0e..eaa4617fda7 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/vj.c +++ b/sdk/lib/drivers/lwip/src/netif/ppp/vj.c @@ -52,7 +52,7 @@ vj_compress_init(struct vjcompress *comp) { register u_char i; register struct cstate *tstate = comp->tstate; - + #if MAX_SLOTS == 0 memset((char *)comp, 0, sizeof(*comp)); #endif @@ -148,7 +148,7 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf *pb) u_char new_seq[16]; register u_char *cp = new_seq; - /* + /* * Check that the packet is IP proto TCP. */ if (IPH_PROTO(ip) != IP_PROTO_TCP) { @@ -158,7 +158,7 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf *pb) /* * Bail if this is an IP fragment or if the TCP packet isn't * `compressible' (i.e., ACK isn't set or some other control bit is - * set). + * set). */ if ((IPH_OFFSET(ip) & PP_HTONS(0x3fff)) || pb->tot_len < 40) { return (TYPE_IP); @@ -192,7 +192,7 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf *pb) */ register struct cstate *lcs; register struct cstate *lastcs = comp->last_cs; - + do { lcs = cs; cs = cs->cs_next; INCR(vjs_searches); @@ -255,11 +255,11 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf *pb) * different between the previous & current datagram, we send the * current datagram `uncompressed'. */ - if (((u_short *)ip)[0] != ((u_short *)&cs->cs_ip)[0] - || ((u_short *)ip)[3] != ((u_short *)&cs->cs_ip)[3] - || ((u_short *)ip)[4] != ((u_short *)&cs->cs_ip)[4] - || TCPH_HDRLEN(th) != TCPH_HDRLEN(oth) - || (deltaS > 5 && BCMP(ip + 1, &cs->cs_ip + 1, (deltaS - 5) << 2)) + if (((u_short *)ip)[0] != ((u_short *)&cs->cs_ip)[0] + || ((u_short *)ip)[3] != ((u_short *)&cs->cs_ip)[3] + || ((u_short *)ip)[4] != ((u_short *)&cs->cs_ip)[4] + || TCPH_HDRLEN(th) != TCPH_HDRLEN(oth) + || (deltaS > 5 && BCMP(ip + 1, &cs->cs_ip + 1, (deltaS - 5) << 2)) || (TCPH_HDRLEN(th) > 5 && BCMP(th + 1, oth + 1, (TCPH_HDRLEN(th) - 5) << 2))) { goto uncompressed; } @@ -429,7 +429,7 @@ vj_uncompress_uncomp(struct pbuf *nb, struct vjcompress *comp) register u_int hlen; register struct cstate *cs; register struct ip_hdr *ip; - + ip = (struct ip_hdr *)nb->payload; hlen = IPH_HL(ip) << 2; if (IPH_PROTO(ip) >= MAX_SLOTS @@ -437,7 +437,7 @@ vj_uncompress_uncomp(struct pbuf *nb, struct vjcompress *comp) || (hlen += TCPH_HDRLEN(((struct tcp_hdr *)&((char *)ip)[hlen])) << 2) > nb->len || hlen > MAX_HDR) { - PPPDEBUG(LOG_INFO, ("vj_uncompress_uncomp: bad cid=%d, hlen=%d buflen=%d\n", + PPPDEBUG(LOG_INFO, ("vj_uncompress_uncomp: bad cid=%d, hlen=%d buflen=%d\n", IPH_PROTO(ip), hlen, nb->len)); comp->flags |= VJF_TOSS; INCR(vjs_errorin); @@ -456,7 +456,7 @@ vj_uncompress_uncomp(struct pbuf *nb, struct vjcompress *comp) * Uncompress a packet of type TYPE_COMPRESSED_TCP. * The packet is composed of a buffer chain and the first buffer * must contain an accurate chain length. - * The first buffer must include the entire compressed TCP/IP header. + * The first buffer must include the entire compressed TCP/IP header. * This procedure replaces the compressed header with the uncompressed * header and returns the length of the VJ header. */ @@ -475,9 +475,9 @@ vj_uncompress_tcp(struct pbuf **nb, struct vjcompress *comp) cp = (u_char *)n0->payload; changes = *cp++; if (changes & NEW_C) { - /* + /* * Make sure the state index is in range, then grab the state. - * If we have a good state index, clear the 'discard' flag. + * If we have a good state index, clear the 'discard' flag. */ if (*cp >= MAX_SLOTS) { PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: bad cid=%d\n", *cp)); @@ -487,10 +487,10 @@ vj_uncompress_tcp(struct pbuf **nb, struct vjcompress *comp) comp->flags &=~ VJF_TOSS; comp->last_recv = *cp++; } else { - /* + /* * this packet has an implicit state index. If we've * had a line error since the last time we got an - * explicit state index, we have to toss the packet. + * explicit state index, we have to toss the packet. */ if (comp->flags & VJF_TOSS) { PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: tossing\n")); @@ -559,11 +559,11 @@ vj_uncompress_tcp(struct pbuf **nb, struct vjcompress *comp) */ vjlen = (u_short)(cp - (u_char*)n0->payload); if (n0->len < vjlen) { - /* + /* * We must have dropped some characters (crc should detect - * this but the old slip framing won't) + * this but the old slip framing won't) */ - PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: head buffer %d too short %d\n", + PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: head buffer %d too short %d\n", n0->len, vjlen)); goto bad; } @@ -584,7 +584,7 @@ vj_uncompress_tcp(struct pbuf **nb, struct vjcompress *comp) tmp = (tmp & 0xffff) + (tmp >> 16); tmp = (tmp & 0xffff) + (tmp >> 16); IPH_CHKSUM_SET(&cs->cs_ip, (u_short)(~tmp)); - + /* Remove the compressed header and prepend the uncompressed header. */ if(pbuf_header(n0, -((s16_t)(vjlen)))) { /* Can we cope with this failing? Just assert for now */ diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/vj.h b/sdk/lib/drivers/lwip/src/netif/ppp/vj.h index fad1213646a..139297d32e2 100644 --- a/sdk/lib/drivers/lwip/src/netif/ppp/vj.h +++ b/sdk/lib/drivers/lwip/src/netif/ppp/vj.h @@ -43,7 +43,7 @@ * sequence number changes, one change per bit set in the header * (there may be no changes and there are two special cases where * the receiver implicitly knows what changed -- see below). - * + * * There are 5 numbers which can change (they are always inserted * in the following order): TCP urgent pointer, window, * acknowlegement, sequence number and IP ID. (The urgent pointer diff --git a/sdk/lib/drivers/lwip/src/netif/slipif.c b/sdk/lib/drivers/lwip/src/netif/slipif.c index 2777630902a..a7301430e13 100644 --- a/sdk/lib/drivers/lwip/src/netif/slipif.c +++ b/sdk/lib/drivers/lwip/src/netif/slipif.c @@ -6,35 +6,35 @@ /* * Copyright (c) 2001-2004 Swedish Institute of Computer Science. - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * This file is built upon the file: src/arch/rtxc/netif/sioslip.c * - * Author: Magnus Ivarsson + * Author: Magnus Ivarsson * Simon Goldschmidt * * Usage: This netif can be used in three ways: @@ -47,10 +47,10 @@ * packets and puts completed packets on a queue which is fed into * the stack from the main loop (needs SYS_LIGHTWEIGHT_PROT for * pbuf_alloc to work on ISR level!). - * + * */ -/* +/* * This is an arch independent SLIP netif. The specific serial hooks must be * provided by another file. They are sio_open, sio_read/sio_tryread and sio_send */ diff --git a/sdk/lib/drivers/lwip/src/rosmem.c b/sdk/lib/drivers/lwip/src/rosmem.c index e1dccb63f48..b8f1f40956f 100644 --- a/sdk/lib/drivers/lwip/src/rosmem.c +++ b/sdk/lib/drivers/lwip/src/rosmem.c @@ -17,11 +17,11 @@ void * calloc(mem_size_t count, mem_size_t size) { void *mem = malloc(count * size); - + if (!mem) return NULL; - + RtlZeroMemory(mem, count * size); - + return mem; } @@ -36,28 +36,28 @@ void * realloc(void *mem, size_t size) { void* new_mem; - + /* realloc() with a NULL mem pointer acts like a call to malloc() */ if (mem == NULL) { return malloc(size); } - + /* realloc() with a size 0 acts like a call to free() */ if (size == 0) { free(mem); return NULL; } - + /* Allocate the new buffer first */ new_mem = malloc(size); if (new_mem == NULL) { /* The old buffer is still intact */ return NULL; } - + /* Copy the data over */ RtlCopyMemory(new_mem, mem, size); - + /* Deallocate the old buffer */ free(mem); diff --git a/sdk/lib/drivers/lwip/src/sys_arch.c b/sdk/lib/drivers/lwip/src/sys_arch.c index 7fe6ca8db84..5b9c0483b2d 100644 --- a/sdk/lib/drivers/lwip/src/sys_arch.c +++ b/sdk/lib/drivers/lwip/src/sys_arch.c @@ -28,9 +28,9 @@ typedef struct _thread_t u32_t sys_now(void) { LARGE_INTEGER CurrentTime; - + KeQuerySystemTime(&CurrentTime); - + return (CurrentTime.QuadPart - StartTime.QuadPart) / 10000; } @@ -51,15 +51,15 @@ err_t sys_sem_new(sys_sem_t *sem, u8_t count) { ASSERT(count == 0 || count == 1); - + /* It seems lwIP uses the semaphore implementation as either a completion event or a lock * so I optimize for this case by using a synchronization event and setting its initial state * to signalled for a lock and non-signalled for a completion event */ KeInitializeEvent(&sem->Event, SynchronizationEvent, count); - + sem->Valid = 1; - + return ERR_OK; } @@ -77,7 +77,7 @@ void sys_sem_free(sys_sem_t* sem) { /* No op (allocated in stack) */ - + sys_sem_set_invalid(sem); } @@ -96,7 +96,7 @@ sys_arch_sem_wait(sys_sem_t* sem, u32_t timeout) PVOID WaitObjects[] = {&sem->Event, &TerminationEvent}; LargeTimeout.QuadPart = Int32x32To64(timeout, -10000); - + KeQuerySystemTime(&PreWaitTime); Status = KeWaitForMultipleObjects(2, @@ -119,27 +119,27 @@ sys_arch_sem_wait(sys_sem_t* sem, u32_t timeout) { /* DON'T remove ourselves from the thread list! */ PsTerminateSystemThread(STATUS_SUCCESS); - + /* We should never get here! */ ASSERT(FALSE); - + return 0; } - + return SYS_ARCH_TIMEOUT; } err_t sys_mbox_new(sys_mbox_t *mbox, int size) -{ +{ KeInitializeSpinLock(&mbox->Lock); - + InitializeListHead(&mbox->ListHead); - + KeInitializeEvent(&mbox->Event, NotificationEvent, FALSE); - + mbox->Valid = 1; - + return ERR_OK; } @@ -157,7 +157,7 @@ void sys_mbox_free(sys_mbox_t *mbox) { ASSERT(IsListEmpty(&mbox->ListHead)); - + sys_mbox_set_invalid(mbox); } @@ -165,16 +165,16 @@ void sys_mbox_post(sys_mbox_t *mbox, void *msg) { PLWIP_MESSAGE_CONTAINER Container; - + Container = ExAllocatePool(NonPagedPool, sizeof(*Container)); ASSERT(Container); - + Container->Message = msg; - + ExInterlockedInsertTailList(&mbox->ListHead, &Container->ListEntry, &mbox->Lock); - + KeSetEvent(&mbox->Event, IO_NO_INCREMENT, FALSE); } @@ -189,9 +189,9 @@ sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout) PLIST_ENTRY Entry; KIRQL OldIrql; PVOID WaitObjects[] = {&mbox->Event, &TerminationEvent}; - + LargeTimeout.QuadPart = Int32x32To64(timeout, -10000); - + KeQuerySystemTime(&PreWaitTime); Status = KeWaitForMultipleObjects(2, @@ -211,31 +211,31 @@ sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout) if (IsListEmpty(&mbox->ListHead)) KeClearEvent(&mbox->Event); KeReleaseSpinLock(&mbox->Lock, OldIrql); - + Container = CONTAINING_RECORD(Entry, LWIP_MESSAGE_CONTAINER, ListEntry); Message = Container->Message; ExFreePool(Container); - + if (msg) *msg = Message; KeQuerySystemTime(&PostWaitTime); TimeDiff = PostWaitTime.QuadPart - PreWaitTime.QuadPart; TimeDiff /= 10000; - + return TimeDiff; } else if (Status == STATUS_WAIT_1) { /* DON'T remove ourselves from the thread list! */ PsTerminateSystemThread(STATUS_SUCCESS); - + /* We should never get here! */ ASSERT(FALSE); - + return 0; } - + return SYS_ARCH_TIMEOUT; } @@ -262,17 +262,17 @@ LwipThreadMain(PVOID Context) { thread_t Container = (thread_t)Context; KIRQL OldIrql; - + ExInterlockedInsertHeadList(&ThreadListHead, &Container->ListEntry, &ThreadListLock); - + Container->ThreadFunction(Container->ThreadContext); - + KeAcquireSpinLock(&ThreadListLock, &OldIrql); RemoveEntryList(&Container->ListEntry); KeReleaseSpinLock(&ThreadListLock, OldIrql); - + ExFreePool(Container); - + PsTerminateSystemThread(STATUS_SUCCESS); } @@ -308,14 +308,14 @@ sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize void sys_init(void) -{ +{ KeInitializeSpinLock(&ThreadListLock); InitializeListHead(&ThreadListHead); - + KeQuerySystemTime(&StartTime); - + KeInitializeEvent(&TerminationEvent, NotificationEvent, FALSE); - + ExInitializeNPagedLookasideList(&MessageLookasideList, NULL, NULL, @@ -323,7 +323,7 @@ sys_init(void) sizeof(struct lwip_callback_msg), LWIP_MESSAGE_TAG, 0); - + ExInitializeNPagedLookasideList(&QueueEntryLookasideList, NULL, NULL, @@ -338,15 +338,15 @@ sys_shutdown(void) { PLIST_ENTRY CurrentEntry; thread_t Container; - + /* Set the termination event */ KeSetEvent(&TerminationEvent, IO_NO_INCREMENT, FALSE); - + /* Loop through the thread list and wait for each to die */ while ((CurrentEntry = ExInterlockedRemoveHeadList(&ThreadListHead, &ThreadListLock))) { Container = CONTAINING_RECORD(CurrentEntry, struct _thread_t, ListEntry); - + if (Container->ThreadFunction) { KeWaitForSingleObject(Container->Handle, @@ -354,11 +354,11 @@ sys_shutdown(void) KernelMode, FALSE, NULL); - + ZwClose(Container->Handle); } } - + ExDeleteNPagedLookasideList(&MessageLookasideList); ExDeleteNPagedLookasideList(&QueueEntryLookasideList); } diff --git a/sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.c b/sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.c index 81720984530..713498b1a59 100644 --- a/sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.c +++ b/sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.c @@ -211,7 +211,7 @@ START_TEST(test_tcp_fast_retx_recover) EXPECT_RET(pcb->dupacks == 3); memset(&txcounters, 0, sizeof(txcounters)); /* TODO: check expected data?*/ - + /* send data5, not output yet */ err = tcp_write(pcb, data5, sizeof(data5), TCP_WRITE_FLAG_COPY); EXPECT_RET(err == ERR_OK); diff --git a/sdk/lib/drivers/rtlver/rtl.c b/sdk/lib/drivers/rtlver/rtl.c index 6259abb1325..3017a215c82 100644 --- a/sdk/lib/drivers/rtlver/rtl.c +++ b/sdk/lib/drivers/rtlver/rtl.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel - Vista+ APIs * LICENSE: GPL v2 - See COPYING in the top level directory * FILE: lib/drivers/ntoskrnl_vista/rtl.c - * PURPOSE: Implementation of RtlIsNtDdiVersionAvailable and RtlIsServicePackVersionInstalled + * PURPOSE: Implementation of RtlIsNtDdiVersionAvailable and RtlIsServicePackVersionInstalled * PROGRAMMERS: Pierre Schweitzer */ diff --git a/sdk/lib/drivers/sound/mmebuddy/deviceinstance.c b/sdk/lib/drivers/sound/mmebuddy/deviceinstance.c index 2e34aa6dc4c..4caf9ab25be 100644 --- a/sdk/lib/drivers/sound/mmebuddy/deviceinstance.c +++ b/sdk/lib/drivers/sound/mmebuddy/deviceinstance.c @@ -191,7 +191,7 @@ CreateSoundDeviceInstance( } /* Set up the members of the structure */ - (*SoundDeviceInstance)->Next = NULL; + (*SoundDeviceInstance)->Next = NULL; (*SoundDeviceInstance)->Device = SoundDevice; (*SoundDeviceInstance)->Handle = NULL; (*SoundDeviceInstance)->Thread = NULL; diff --git a/sdk/lib/drivers/sound/mmixer/controls.c b/sdk/lib/drivers/sound/mmixer/controls.c index 684a44b37ab..3b5a8036b25 100644 --- a/sdk/lib/drivers/sound/mmixer/controls.c +++ b/sdk/lib/drivers/sound/mmixer/controls.c @@ -5,7 +5,7 @@ * PURPOSE: Mixer Control Iteration Functions * PROGRAMMER: Johannes Anderwald */ - + #include "precomp.h" #define YDEBUG @@ -1576,7 +1576,7 @@ MMixerInitializeFilter( /* store mixer info */ *OutMixerInfo = MixerInfo; - /* now allocate an array which will receive the indices of the pin + /* now allocate an array which will receive the indices of the pin * which has a ADC / DAC nodetype in its path */ Status = MMixerAllocateTopologyPinArray(MixerContext, Topology, &Pins); @@ -1624,7 +1624,7 @@ MMixerInitializeFilter( } - /* now get the bridge pin which is at the end of node path + /* now get the bridge pin which is at the end of node path * For sink pins (wave out) search down stream * For source pins (wave in) search up stream */ @@ -1886,7 +1886,7 @@ MMixerRemoveEvent( IN PMIXER_EVENT MixerEventRoutine) { PLIST_ENTRY EventList; - PEVENT_NOTIFICATION_ENTRY NotificationEntry; + PEVENT_NOTIFICATION_ENTRY NotificationEntry; /* Lookup through mixers */ EventList = MixerInfo->EventList.Flink; diff --git a/sdk/lib/drivers/sound/mmixer/filter.c b/sdk/lib/drivers/sound/mmixer/filter.c index 2687e16e606..a41bcee7bb7 100644 --- a/sdk/lib/drivers/sound/mmixer/filter.c +++ b/sdk/lib/drivers/sound/mmixer/filter.c @@ -203,7 +203,7 @@ MMixerGetControlTypeFromTopologyNode( else if (IsEqualGUIDAligned(NodeType, (LPGUID)&KSNODETYPE_SUPERMIX)) { /* supermix control - * MIXERCONTROL_CONTROLTYPE_MUTE if KSPROPERTY_AUDIO_MUTE is supported + * MIXERCONTROL_CONTROLTYPE_MUTE if KSPROPERTY_AUDIO_MUTE is supported */ UNIMPLEMENTED; return MIXERCONTROL_CONTROLTYPE_VOLUME; diff --git a/sdk/lib/drivers/sound/mmixer/topology.c b/sdk/lib/drivers/sound/mmixer/topology.c index 226883dbcf2..136dc61dee1 100644 --- a/sdk/lib/drivers/sound/mmixer/topology.c +++ b/sdk/lib/drivers/sound/mmixer/topology.c @@ -951,7 +951,7 @@ MMixerGetNextNodesFromPinIndex( TopologyNodes = Pin->NodesConnectedFrom; TopologyNodesCount = Pin->NodesConnectedFromCount; } - else + else { /* get down stream nodes */ TopologyNodes = Pin->NodesConnectedTo; @@ -990,7 +990,7 @@ MMixerGetNextNodesFromNodeIndex( TopologyNodes = Topology->TopologyNodes[NodeIndex].NodeConnectedFrom; TopologyNodesCount = Topology->TopologyNodes[NodeIndex].NodeConnectedFromCount; } - else + else { /* get down stream nodes */ TopologyNodes = Topology->TopologyNodes[NodeIndex].NodeConnectedTo; diff --git a/sdk/lib/drivers/sound/soundblaster/rate.c b/sdk/lib/drivers/sound/soundblaster/rate.c index 6855f61a5cf..865fde060d7 100644 --- a/sdk/lib/drivers/sound/soundblaster/rate.c +++ b/sdk/lib/drivers/sound/soundblaster/rate.c @@ -148,4 +148,4 @@ SbDsp4SetInputRate( return SbDsp4WriteRate(BasePort, Rate, Timeout); } - + diff --git a/sdk/lib/drivers/wdf/kmdf/src/core/fxdpc.cpp b/sdk/lib/drivers/wdf/kmdf/src/core/fxdpc.cpp index 3f264368d10..b7620bc1fd9 100644 --- a/sdk/lib/drivers/wdf/kmdf/src/core/fxdpc.cpp +++ b/sdk/lib/drivers/wdf/kmdf/src/core/fxdpc.cpp @@ -36,7 +36,7 @@ extern "C" { // // Public constructors // - + FxDpc::FxDpc( __in PFX_DRIVER_GLOBALS FxDriverGlobals ) : @@ -57,7 +57,7 @@ FxDpc::FxDpc( MarkDisposeOverride(ObjectDoNotLock); } - + FxDpc::~FxDpc() { // diff --git a/sdk/lib/drivers/wdf/shared/core/fxdriver.cpp b/sdk/lib/drivers/wdf/shared/core/fxdriver.cpp index 7c3ca62c201..b459d0529e2 100644 --- a/sdk/lib/drivers/wdf/shared/core/fxdriver.cpp +++ b/sdk/lib/drivers/wdf/shared/core/fxdriver.cpp @@ -559,7 +559,7 @@ FxDriver::GetRegistryPath( return pString; } - + VOID FxDriver::ConfigureConstraints( __in_opt PWDF_OBJECT_ATTRIBUTES DriverAttributes diff --git a/sdk/lib/drivers/wdf/shared/core/fxfileobjectapi.cpp b/sdk/lib/drivers/wdf/shared/core/fxfileobjectapi.cpp index 3c36b87587d..ff0d53b0c14 100644 --- a/sdk/lib/drivers/wdf/shared/core/fxfileobjectapi.cpp +++ b/sdk/lib/drivers/wdf/shared/core/fxfileobjectapi.cpp @@ -91,7 +91,7 @@ Return Value: } } - + __drv_maxIRQL(DISPATCH_LEVEL) ULONG STDCALL diff --git a/sdk/lib/drivers/wdf/shared/core/fxirpqueue.cpp b/sdk/lib/drivers/wdf/shared/core/fxirpqueue.cpp index 16114ac320f..37edd1f3993 100644 --- a/sdk/lib/drivers/wdf/shared/core/fxirpqueue.cpp +++ b/sdk/lib/drivers/wdf/shared/core/fxirpqueue.cpp @@ -109,7 +109,7 @@ Returns: m_LockObject = LockObject; } - + _Must_inspect_result_ NTSTATUS FxIrpQueue::InsertTailRequest( @@ -162,7 +162,7 @@ Returns: return Status; } - + _Must_inspect_result_ NTSTATUS FxIrpQueue::InsertHeadRequest( @@ -214,7 +214,7 @@ Returns: return Status; } - + MdIrp FxIrpQueue::GetNextRequest( __out PMdIoCsqIrpContext* pCsqContext @@ -234,7 +234,7 @@ Routine Description: return RemoveNextIrpFromQueue(NULL, pCsqContext); } - + _Must_inspect_result_ NTSTATUS FxIrpQueue::GetNextRequest( diff --git a/sdk/lib/drivers/wdf/shared/core/fxworkitem.cpp b/sdk/lib/drivers/wdf/shared/core/fxworkitem.cpp index 7ae80c3214f..7ce12121023 100644 --- a/sdk/lib/drivers/wdf/shared/core/fxworkitem.cpp +++ b/sdk/lib/drivers/wdf/shared/core/fxworkitem.cpp @@ -64,7 +64,7 @@ FxWorkItem::FxWorkItem( MarkDisposeOverride(ObjectDoNotLock); } - + FxWorkItem::~FxWorkItem( VOID ) diff --git a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgpnp.cpp b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgpnp.cpp index 40d93c5ebce..34fb59d1b39 100644 --- a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgpnp.cpp +++ b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/fxpkgpnp.cpp @@ -343,7 +343,7 @@ FxPkgPnp::Dispose( return FxPackage::Dispose(); // __super call } - + _Must_inspect_result_ NTSTATUS FxPkgPnp::Initialize( diff --git a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/pnpstatemachine.cpp b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/pnpstatemachine.cpp index c3e4b26ea58..3f75c250863 100644 --- a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/pnpstatemachine.cpp +++ b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/pnpstatemachine.cpp @@ -781,7 +781,7 @@ Return Value: (sizeof(m_PnpMachine.m_States.History)/ sizeof(m_PnpMachine.m_States.History[0]))); } - + /*++ The locking model for the PnP state machine requires that events be enqueued @@ -1151,7 +1151,7 @@ Routine Description: } } } - + VOID FxPkgPnp::PnpEnterNewState( __in WDF_DEVICE_PNP_STATE State @@ -1258,7 +1258,7 @@ Return Value: } } } - + WDF_DEVICE_PNP_STATE FxPkgPnp::PnpEventCheckForDevicePresence( __inout FxPkgPnp* This diff --git a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/powerpolicystatemachine.cpp b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/powerpolicystatemachine.cpp index e6ed0ddbae2..e0f23f7b575 100644 --- a/sdk/lib/drivers/wdf/shared/irphandlers/pnp/powerpolicystatemachine.cpp +++ b/sdk/lib/drivers/wdf/shared/irphandlers/pnp/powerpolicystatemachine.cpp @@ -3344,7 +3344,7 @@ FxPkgPnp::PowerPolicyProcessEventInner( } } } - + VOID FxPkgPnp::PowerPolicyEnterNewState( __in WDF_DEVICE_POWER_POLICY_STATE NewState @@ -3454,7 +3454,7 @@ Return Value: } } - + /*++ One of the goals of the Driver Framework is to make it really easy to write diff --git a/sdk/lib/drivers/wdf/shared/object/fxuserobject.cpp b/sdk/lib/drivers/wdf/shared/object/fxuserobject.cpp index 83b3cac20d8..29520956c54 100644 --- a/sdk/lib/drivers/wdf/shared/object/fxuserobject.cpp +++ b/sdk/lib/drivers/wdf/shared/object/fxuserobject.cpp @@ -103,4 +103,4 @@ FxUserObject::FxUserObject( { return; } - + diff --git a/sdk/lib/drivers/wdf/shared/object/fxuserobjectapi.cpp b/sdk/lib/drivers/wdf/shared/object/fxuserobjectapi.cpp index 91b6a1939d5..ba2fde014d1 100644 --- a/sdk/lib/drivers/wdf/shared/object/fxuserobjectapi.cpp +++ b/sdk/lib/drivers/wdf/shared/object/fxuserobjectapi.cpp @@ -33,7 +33,7 @@ extern "C" { #endif } - + extern "C" { _Must_inspect_result_ diff --git a/sdk/lib/dxguid/dxguid-mingw.c b/sdk/lib/dxguid/dxguid-mingw.c index a93784f4803..254a8d1c40d 100644 --- a/sdk/lib/dxguid/dxguid-mingw.c +++ b/sdk/lib/dxguid/dxguid-mingw.c @@ -2,7 +2,7 @@ dxguid.c - DirectX GUIDs - Base on Filp Navara dxguid for mingw + Base on Filp Navara dxguid for mingw updated by Magnus Olsen (magnus@greatlord.com) This library is distributed in the hope that it will be useful, diff --git a/sdk/lib/epsapi/enum/modules.c b/sdk/lib/epsapi/enum/modules.c index 3a70b3e07b8..140a53296b0 100644 --- a/sdk/lib/epsapi/enum/modules.c +++ b/sdk/lib/epsapi/enum/modules.c @@ -45,19 +45,19 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle, #endif ListHead = &(NtCurrentPeb()->Ldr->InLoadOrderModuleList); Current = ListHead->Flink; - + while(Current != ListHead) { PLDR_DATA_TABLE_ENTRY LoaderModule = CONTAINING_RECORD(Current, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - + /* return the current module to the callback */ Status = Callback(ProcessHandle, LoaderModule, CallbackContext); - + if(!NT_SUCCESS(Status)) { goto Failure; } - + Current = LoaderModule->InLoadOrderLinks.Flink; } #if 0 @@ -74,43 +74,43 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle, PPEB_LDR_DATA LoaderData; LDR_DATA_TABLE_ENTRY LoaderModule; PLIST_ENTRY ListHead, Current; - + /* query the process basic information (includes the PEB address) */ Status = NtQueryInformationProcess(ProcessHandle, ProcessBasicInformation, &BasicInformation, sizeof(BasicInformation), NULL); - + if(!NT_SUCCESS(Status)) { DPRINT(FAILED_WITH_STATUS, "NtQueryInformationProcess", Status); goto Failure; } - + /* get the address of the PE Loader data */ Status = NtReadVirtualMemory(ProcessHandle, &(BasicInformation.PebBaseAddress->Ldr), &LoaderData, sizeof(LoaderData), NULL); - + if(!NT_SUCCESS(Status)) { DPRINT(FAILED_WITH_STATUS, "NtReadVirtualMemory", Status); goto Failure; } - + /* head of the module list: the last element in the list will point to this */ ListHead = &LoaderData->InLoadOrderModuleList; - + /* get the address of the first element in the list */ Status = NtReadVirtualMemory(ProcessHandle, &(LoaderData->InLoadOrderModuleList.Flink), &Current, sizeof(Current), NULL); - + while(Current != ListHead) { /* read the current module */ @@ -119,7 +119,7 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle, &LoaderModule, sizeof(LoaderModule), NULL); - + if(!NT_SUCCESS(Status)) { DPRINT(FAILED_WITH_STATUS, "NtReadVirtualMemory", Status); @@ -128,12 +128,12 @@ PsaEnumerateProcessModules(IN HANDLE ProcessHandle, /* return the current module to the callback */ Status = Callback(ProcessHandle, &LoaderModule, CallbackContext); - + if(!NT_SUCCESS(Status)) { goto Failure; } - + /* address of the next module in the list */ Current = LoaderModule.InLoadOrderLinks.Flink; } diff --git a/sdk/lib/fslib/ext2lib/Badblock.c b/sdk/lib/fslib/ext2lib/Badblock.c index 28567b24cd1..1c6f0ce4f12 100644 --- a/sdk/lib/fslib/ext2lib/Badblock.c +++ b/sdk/lib/fslib/ext2lib/Badblock.c @@ -19,7 +19,7 @@ bool create_bad_block_inode( PEXT2_FILESYS Ext2Sys, bool retval; EXT2_INODE inode; LARGE_INTEGER SysTime; - + NtQuerySystemTime(&SysTime); ext2_mark_inode_bitmap(Ext2Sys->inode_map, EXT2_BAD_INO); diff --git a/sdk/lib/fslib/ext2lib/Bitmap.c b/sdk/lib/fslib/ext2lib/Bitmap.c index 07fabd0ab61..c4abe3c3a7c 100644 --- a/sdk/lib/fslib/ext2lib/Bitmap.c +++ b/sdk/lib/fslib/ext2lib/Bitmap.c @@ -226,7 +226,7 @@ bool ext2_write_inode_bitmap(PEXT2_FILESYS fs) return false; nbytes = (size_t) ((EXT2_INODES_PER_GROUP(fs->ext2_sb)+7) / 8); - + bitmap_block = (char *)RtlAllocateHeap(RtlGetProcessHeap(), 0, fs->blocksize); if (!bitmap_block) return false; @@ -249,7 +249,7 @@ bool ext2_write_inode_bitmap(PEXT2_FILESYS fs) retval = NT_SUCCESS(Ext2WriteDisk( fs, ((ULONGLONG)blk * fs->blocksize), - fs->blocksize, + fs->blocksize, (unsigned char *)bitmap_block)); if (!retval) @@ -407,7 +407,7 @@ bool read_bitmaps(PEXT2_FILESYS fs, int do_inode, int do_block) { retval = NT_SUCCESS(Ext2ReadDisk( fs, - ((ULONGLONG)blk * fs->blocksize), + ((ULONGLONG)blk * fs->blocksize), block_nbytes, (unsigned char *) block_bitmap)); @@ -436,8 +436,8 @@ bool read_bitmaps(PEXT2_FILESYS fs, int do_inode, int do_block) if (blk) { retval = NT_SUCCESS(Ext2ReadDisk( - fs, ((LONGLONG)blk * fs->blocksize), - inode_nbytes, + fs, ((LONGLONG)blk * fs->blocksize), + inode_nbytes, (unsigned char *)inode_bitmap)); if (!retval) @@ -461,7 +461,7 @@ bool read_bitmaps(PEXT2_FILESYS fs, int do_inode, int do_block) } return true; - + cleanup: if (do_block) diff --git a/sdk/lib/fslib/ext2lib/Group.c b/sdk/lib/fslib/ext2lib/Group.c index 3ba8fbbff13..b172e79269b 100644 --- a/sdk/lib/fslib/ext2lib/Group.c +++ b/sdk/lib/fslib/ext2lib/Group.c @@ -35,7 +35,7 @@ bool ext2_bg_has_super(PEXT2_SUPER_BLOCK pExt2Sb, int group_block) if (test_root(group_block, 3) || (test_root(group_block, 5)) || test_root(group_block, 7)) return true; - + return false; } diff --git a/sdk/lib/fslib/ext2lib/Inode.c b/sdk/lib/fslib/ext2lib/Inode.c index 69ad49a23a2..a5a78f3f97b 100644 --- a/sdk/lib/fslib/ext2lib/Inode.c +++ b/sdk/lib/fslib/ext2lib/Inode.c @@ -35,7 +35,7 @@ bool ext2_get_inode_lba(PEXT2_FILESYS Ext2Sys, ULONG no, LONGLONG *offset) *offset = loc; - return true; + return true; } bool ext2_load_inode(PEXT2_FILESYS Ext2Sys, ULONG no, PEXT2_INODE pInode) @@ -65,7 +65,7 @@ bool ext2_save_inode(PEXT2_FILESYS Ext2Sys, ULONG no, PEXT2_INODE pInode) { bRet = NT_SUCCESS(Ext2WriteDisk( Ext2Sys, - offset, + offset, sizeof(EXT2_INODE), (unsigned char *)pInode)); } @@ -93,12 +93,12 @@ bool ext2_new_inode(PEXT2_FILESYS fs, ULONG dir, int mode, if (!map) return false; - - if (dir > 0) + + if (dir > 0) dir_group = (dir - 1) / EXT2_INODES_PER_GROUP(fs->ext2_sb); start_inode = (dir_group * EXT2_INODES_PER_GROUP(fs->ext2_sb)) + 1; - + if (start_inode < EXT2_FIRST_INODE(fs->ext2_sb)) start_inode = EXT2_FIRST_INODE(fs->ext2_sb); @@ -115,7 +115,7 @@ bool ext2_new_inode(PEXT2_FILESYS fs, ULONG dir, int mode, i = EXT2_FIRST_INODE(fs->ext2_sb); } while (i != start_inode); - + if (ext2_test_inode_bitmap(map, i)) return false; @@ -138,21 +138,21 @@ bool ext2_expand_block( PEXT2_FILESYS Ext2Sys, PEXT2_INODE Inode, ULONG Offset = 0; PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; - + pData = (ULONG *)RtlAllocateHeap(RtlGetProcessHeap(), 0, Ext2Sys->blocksize); - + if (!pData) { bRet = false; goto errorout; } - + if (!ext2_read_block(Ext2Sys, dwContent, (void *)pData)) { bRet = false; goto errorout; } - + if (layer == 1) { *dwRet = dwContent; @@ -169,7 +169,7 @@ bool ext2_expand_block( PEXT2_FILESYS Ext2Sys, PEXT2_INODE Inode, j = Index % temp; dwBlk = pData[i]; - + if (dwBlk == 0) { if (ext2_alloc_block(Ext2Sys, 0, &dwBlk) ) @@ -179,11 +179,11 @@ bool ext2_expand_block( PEXT2_FILESYS Ext2Sys, PEXT2_INODE Inode, Inode->i_blocks += (Ext2Sys->blocksize / SECTOR_SIZE); } - + if (!bDirty) goto errorout; } - + if (!ext2_expand_block(Ext2Sys, Inode, dwBlk, j, layer - 1, bDirty, &dwNewBlk, &Offset)) { bRet = false; @@ -274,7 +274,7 @@ bool ext2_expand_inode( PEXT2_FILESYS Ext2Sys, &dwNewBlk, &Offset ); } - + break; } @@ -371,7 +371,7 @@ bool ext2_block_map(PEXT2_FILESYS Ext2Sys, PEXT2_INODE inode, ULONG block, ULONG { dwBlk = inode->i_block[i==0 ? (Index):(i + 12 - 1)]; - bRet = ext2_get_block(Ext2Sys, dwBlk, Index , i, &dwBlk); + bRet = ext2_get_block(Ext2Sys, dwBlk, Index , i, &dwBlk); break; } @@ -391,8 +391,8 @@ bool ext2_block_map(PEXT2_FILESYS Ext2Sys, PEXT2_INODE inode, ULONG block, ULONG ULONG ext2_build_bdl(PEXT2_FILESYS Ext2Sys, PEXT2_INODE ext2_inode, - IN ULONG offset, - IN ULONG size, + IN ULONG offset, + IN ULONG size, OUT PEXT2_BDL *ext2_bdl ) { ULONG nBeg, nEnd, nBlocks; @@ -432,17 +432,17 @@ ULONG ext2_build_bdl(PEXT2_FILESYS Ext2Sys, { memset(ext2bdl, 0, sizeof(EXT2_BDL) * nBlocks); - + for (i = nBeg; i < nEnd; i++) { if (!ext2_block_map(Ext2Sys, ext2_inode, i, &dwBlk)) { goto fail; } - + lba = (LONGLONG) dwBlk; lba = lba * Ext2Sys->blocksize; - + if (nBlocks == 1) // ie. (nBeg == nEnd - 1) { dwBytes = size; @@ -513,13 +513,13 @@ bool ext2_read_inode(PEXT2_FILESYS Ext2Sys, if (blocks <= 0) return false; - - + + for(i = 0; i < blocks; i++) { bRet = NT_SUCCESS(Ext2ReadDisk( Ext2Sys, - ext2_bdl[i].Lba, + ext2_bdl[i].Lba, ext2_bdl[i].Length, (PUCHAR)Buffer + ext2_bdl[i].Offset )); @@ -579,12 +579,12 @@ bool ext2_write_inode (PEXT2_FILESYS Ext2Sys, if (blocks <= 0) return false; - + for(i = 0; i < blocks; i++) { bRet = NT_SUCCESS(Ext2WriteDisk( Ext2Sys, - ext2_bdl[i].Lba, + ext2_bdl[i].Lba, ext2_bdl[i].Length, (PUCHAR)Buffer + ext2_bdl[i].Offset )); @@ -608,7 +608,7 @@ bool ext2_write_inode (PEXT2_FILESYS Ext2Sys, errorout: - + if (ext2_bdl) RtlFreeHeap(RtlGetProcessHeap(), 0, ext2_bdl); @@ -645,7 +645,7 @@ ext2_add_entry( PEXT2_FILESYS Ext2Sys, while ((char *)dir < buf + parent_inode.i_size) { - if ((dir->inode == 0 && dir->rec_len >= rec_len) || + if ((dir->inode == 0 && dir->rec_len >= rec_len) || (dir->rec_len >= dir->name_len + rec_len) ) { if (dir->inode) @@ -662,7 +662,7 @@ ext2_add_entry( PEXT2_FILESYS Ext2Sys, dir->inode = inode; dir->name_len = strlen(name); memcpy(dir->name, name, strlen(name)); - + bRet = true; break; } diff --git a/sdk/lib/fslib/ext2lib/Memory.c b/sdk/lib/fslib/ext2lib/Memory.c index 630a67f3d52..1d9b339376d 100644 --- a/sdk/lib/fslib/ext2lib/Memory.c +++ b/sdk/lib/fslib/ext2lib/Memory.c @@ -97,7 +97,7 @@ bool ext2_allocate_group_table(PEXT2_FILESYS fs, ULONG group, group_blk = fs->ext2_sb->s_first_data_block + (group * fs->ext2_sb->s_blocks_per_group); - + last_blk = group_blk + fs->ext2_sb->s_blocks_per_group; if (last_blk >= fs->ext2_sb->s_blocks_count) last_blk = fs->ext2_sb->s_blocks_count - 1; @@ -108,7 +108,7 @@ bool ext2_allocate_group_table(PEXT2_FILESYS fs, ULONG group, if (!bmap) bmap = fs->block_map; - + /* * Allocate the inode table */ @@ -150,7 +150,7 @@ bool ext2_allocate_group_table(PEXT2_FILESYS fs, ULONG group, retval = ext2_get_free_blocks(fs, start_blk, last_blk, 1, bmap, &new_blk); - if (!retval) + if (!retval) retval = ext2_get_free_blocks(fs, group_blk, last_blk, 1, bmap, &new_blk); @@ -165,7 +165,7 @@ bool ext2_allocate_group_table(PEXT2_FILESYS fs, ULONG group, { retval = ext2_get_free_blocks(fs, start_blk, last_blk, 1, bmap, &new_blk); - if (!retval) + if (!retval) retval = ext2_get_free_blocks(fs, group_blk, last_blk, 1, bmap, &new_blk); if (!retval) @@ -321,7 +321,7 @@ bool ext2_alloc_block(PEXT2_FILESYS fs, ULONG goal, ULONG *ret) { goto fail; } - + ext2_block_alloc_stats(fs, block, +1); *ret = block; diff --git a/sdk/lib/fslib/ext2lib/Mke2fs.c b/sdk/lib/fslib/ext2lib/Mke2fs.c index b3dc5e14c8d..70ada12814f 100644 --- a/sdk/lib/fslib/ext2lib/Mke2fs.c +++ b/sdk/lib/fslib/ext2lib/Mke2fs.c @@ -181,13 +181,13 @@ bool zero_blocks(PEXT2_FILESYS fs, ULONG blk, ULONG num, } return true; -} +} bool zap_sector(PEXT2_FILESYS Ext2Sys, int sect, int nsect) { unsigned char *buf; - ULONG *magic; + ULONG *magic; buf = (unsigned char *) RtlAllocateHeap(RtlGetProcessHeap(), 0, SECTOR_SIZE*nsect); @@ -197,7 +197,7 @@ bool zap_sector(PEXT2_FILESYS Ext2Sys, int sect, int nsect) sect, sect + nsect - 1); return false; } - + #define BSD_DISKMAGIC (0x82564557UL) /* The disk magic number */ #define BSD_MAGICDISK (0x57455682UL) /* The disk magic number reversed */ #define BSD_LABEL_OFFSET 64 @@ -205,7 +205,7 @@ bool zap_sector(PEXT2_FILESYS Ext2Sys, int sect, int nsect) if (sect == 0) { Ext2ReadDisk( - Ext2Sys, + Ext2Sys, (LONGLONG)(sect * SECTOR_SIZE), SECTOR_SIZE, buf); @@ -226,13 +226,13 @@ bool zap_sector(PEXT2_FILESYS Ext2Sys, int sect, int nsect) clean_up: RtlFreeHeap(RtlGetProcessHeap(), 0, buf); - + return true; } -bool ext2_mkdir( PEXT2_FILESYS fs, +bool ext2_mkdir( PEXT2_FILESYS fs, ULONG parent, - ULONG inum, + ULONG inum, char *name, ULONG *no, PEXT2_INODE pid ) @@ -246,7 +246,7 @@ bool ext2_mkdir( PEXT2_FILESYS fs, int filetype = 0; LARGE_INTEGER SysTime; - + NtQuerySystemTime(&SysTime); /* @@ -310,7 +310,7 @@ bool ext2_mkdir( PEXT2_FILESYS fs, if (!retval) goto cleanup; - retval = ext2_save_inode(fs, ino, &inode); + retval = ext2_save_inode(fs, ino, &inode); if (!retval) goto cleanup; @@ -343,7 +343,7 @@ bool ext2_mkdir( PEXT2_FILESYS fs, goto cleanup; } - + /* * Update accounting.... */ @@ -367,7 +367,7 @@ bool create_root_dir(PEXT2_FILESYS fs) EXT2_INODE inode; retval = ext2_mkdir(fs, EXT2_ROOT_INO, EXT2_ROOT_INO, 0, NULL, &inode); - + if (!retval) { DPRINT1("Mke2fs: while creating root dir"); @@ -375,7 +375,7 @@ bool create_root_dir(PEXT2_FILESYS fs) } { - inode.i_uid = 0; + inode.i_uid = 0; inode.i_gid = 0; retval = ext2_save_inode(fs, EXT2_ROOT_INO, &inode); @@ -418,7 +418,7 @@ bool create_lost_and_found(PEXT2_FILESYS Ext2Sys) Ext2Sys->umask = 077; retval = ext2_mkdir(Ext2Sys, EXT2_ROOT_INO, 0, name, &ino, &inode); - + if (!retval) { DPRINT1("Mke2fs: while creating /lost+found.\n"); @@ -434,7 +434,7 @@ bool create_lost_and_found(PEXT2_FILESYS Ext2Sys) { if (lpf_size >= 16*1024) break; - + retval = ext2_alloc_block(Ext2Sys, 0, &dwBlk); if (! retval) @@ -459,10 +459,10 @@ bool create_lost_and_found(PEXT2_FILESYS Ext2Sys) { inode.i_size = lpf_size; - ASSERT( (inode.i_size/Ext2Sys->blocksize) == + ASSERT( (inode.i_size/Ext2Sys->blocksize) == Ext2DataBlocks(Ext2Sys, inode.i_blocks/(Ext2Sys->blocksize/SECTOR_SIZE))); - ASSERT( (inode.i_blocks/(Ext2Sys->blocksize/SECTOR_SIZE)) == + ASSERT( (inode.i_blocks/(Ext2Sys->blocksize/SECTOR_SIZE)) == Ext2TotalBlocks(Ext2Sys, inode.i_size/Ext2Sys->blocksize)); } @@ -491,13 +491,13 @@ errorout: bool write_primary_superblock(PEXT2_FILESYS Ext2Sys, PEXT2_SUPER_BLOCK super) { - bool bRet; + bool bRet; bRet = NT_SUCCESS(Ext2WriteDisk( Ext2Sys, ((LONGLONG)SUPERBLOCK_OFFSET), SUPERBLOCK_SIZE, (PUCHAR)super)); - + return bRet; @@ -533,9 +533,9 @@ bool ext2_flush(PEXT2_FILESYS fs) PEXT2_GROUP_DESC group_shadow = 0; LARGE_INTEGER SysTime; - + NtQuerySystemTime(&SysTime); - + fs_state = fs->ext2_sb->s_state; RtlTimeToSecondsSince1970(&SysTime, &fs->ext2_sb->s_wtime); @@ -543,7 +543,7 @@ bool ext2_flush(PEXT2_FILESYS fs) super_shadow = fs->ext2_sb; group_shadow = fs->group_desc; - + /* * Write out master superblock. This has to be done * separately, since it is located at a fixed location @@ -875,7 +875,7 @@ Ext2Format( Status = STATUS_UNSUCCESSFUL; - // Initialize + // Initialize if (!ext2_initialize_sb(&FileSys)) { DPRINT1("Mke2fs: error...\n"); diff --git a/sdk/lib/fslib/ext2lib/Mke2fs.h b/sdk/lib/fslib/ext2lib/Mke2fs.h index c81ef8a3576..22d3cccc763 100644 --- a/sdk/lib/fslib/ext2lib/Mke2fs.h +++ b/sdk/lib/fslib/ext2lib/Mke2fs.h @@ -261,7 +261,7 @@ Ext2OpenDevice( PEXT2_FILESYS Ext2Sys, NTSTATUS Ext2CloseDevice( PEXT2_FILESYS Ext2Sys); -NTSTATUS +NTSTATUS Ext2ReadDisk( PEXT2_FILESYS Ext2Sys, ULONGLONG Offset, ULONG Length, diff --git a/sdk/lib/fslib/ext2lib/ext2_fs.h b/sdk/lib/fslib/ext2lib/ext2_fs.h index 864551c8c0a..49ca2c7fc9a 100644 --- a/sdk/lib/fslib/ext2lib/ext2_fs.h +++ b/sdk/lib/fslib/ext2lib/ext2_fs.h @@ -215,7 +215,7 @@ struct ext2_dx_countlimit { #define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ #define EXT2_NOCOMPR_FL 0x00000400 /* Access raw compressed data */ #define EXT2_ECOMPR_FL 0x00000800 /* Compression error */ -/* End compression flags --- maybe not all used */ +/* End compression flags --- maybe not all used */ #define EXT2_BTREE_FL 0x00001000 /* btree format dir */ #define EXT2_INDEX_FL 0x00001000 /* hash-indexed directory */ #define EXT2_IMAGIC_FL 0x00002000 @@ -393,7 +393,7 @@ struct ext2_super_block { * the incompatible feature set is that if there is a bit set * in the incompatible feature set that the kernel doesn't * know about, it should refuse to mount the filesystem. - * + * * e2fsck's requirements are more strict; if it doesn't know * about a feature in either the compatible or incompatible * feature set, it must abort and not try to meddle with @@ -416,14 +416,14 @@ struct ext2_super_block { __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ __u16 s_padding1; - /* + /* * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. */ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ __u32 s_journal_inum; /* inode number of journal file */ __u32 s_journal_dev; /* device number of journal file */ __u32 s_last_orphan; /* start of list of inodes to delete */ - + __u32 s_reserved[197]; /* Padding to the end of the block */ }; @@ -444,7 +444,7 @@ struct ext2_super_block { #define EXT2_OS_MASIX 2 #define EXT2_OS_FREEBSD 3 #define EXT2_OS_LITES 4 -#define EXT2_OS_WINNT 5 +#define EXT2_OS_WINNT 5 /* * Revision levels diff --git a/sdk/lib/fslib/vfatlib/vfatlib.c b/sdk/lib/fslib/vfatlib/vfatlib.c index fec1f736c20..0f2d7f07b64 100644 --- a/sdk/lib/fslib/vfatlib/vfatlib.c +++ b/sdk/lib/fslib/vfatlib/vfatlib.c @@ -155,7 +155,7 @@ VfatFormat( PartitionInfo.RewritePartition = FALSE; PartitionInfo.RecognizedPartition = FALSE; } - + /* If it already has a FAT FS, we'll use that type. * If it doesn't, we will determine the FAT type based on size and offset */ if (PartitionInfo.PartitionType != PARTITION_FAT_12 && @@ -174,7 +174,7 @@ VfatFormat( else if (PartitionInfo.StartingOffset.QuadPart < (1024LL * 255LL * 63LL * 512LL)) { /* Partition starts below the 8.4GB boundary ==> CHS partition */ - + if (PartitionInfo.PartitionLength.QuadPart < (32LL * 1024LL * 1024LL)) { /* FAT16 CHS partition (partition size < 32MB) */ @@ -194,7 +194,7 @@ VfatFormat( else { /* Partition starts above the 8.4GB boundary ==> LBA partition */ - + if (PartitionInfo.PartitionLength.QuadPart < (512LL * 1024LL * 1024LL)) { /* FAT16 LBA partition (partition size < 512MB) */ diff --git a/sdk/lib/fslib/vfatxlib/fatx.c b/sdk/lib/fslib/vfatxlib/fatx.c index 026bdd1a576..e182f53f778 100644 --- a/sdk/lib/fslib/vfatxlib/fatx.c +++ b/sdk/lib/fslib/vfatxlib/fatx.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS VFATX filesystem library * FILE: fatx.c * PURPOSE: Fatx support - * PROGRAMMERS: + * PROGRAMMERS: * REVISIONS: */ diff --git a/sdk/lib/fslib/vfatxlib/vfatxlib.c b/sdk/lib/fslib/vfatxlib/vfatxlib.c index d5b73e37f12..7866d2f6f8a 100644 --- a/sdk/lib/fslib/vfatxlib/vfatxlib.c +++ b/sdk/lib/fslib/vfatxlib/vfatxlib.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS VFATx filesystem library * FILE: vfatxlib.c * PURPOSE: Main API - * PROGRAMMERS: + * PROGRAMMERS: * REVISIONS: * CSH 05/04-2003 Created */ diff --git a/sdk/lib/inflib/infput.c b/sdk/lib/inflib/infput.c index 7661582659c..c1dccd9a8a7 100644 --- a/sdk/lib/inflib/infput.c +++ b/sdk/lib/inflib/infput.c @@ -55,7 +55,7 @@ Output(POUTPUTBUFFER OutBuf, PCWSTR Text) OutBuf->Status = INF_STATUS_NO_MEMORY; return; } - + /* Need to copy old contents? */ if (NULL != OutBuf->Buffer) { diff --git a/sdk/lib/ppcmmu/mmuobject.c b/sdk/lib/ppcmmu/mmuobject.c index 45190bbdbdf..71b9665ba27 100644 --- a/sdk/lib/ppcmmu/mmuobject.c +++ b/sdk/lib/ppcmmu/mmuobject.c @@ -101,9 +101,9 @@ int _mmumain(int action, void *arg1, void *arg2, void *arg3, void *tf) case 5: /* EE -- Try to get a serial interrupt if debugging enabled, then fall - * back to primary handler + * back to primary handler */ - if (!SerialInterrupt(action, trap_frame) && callback[action]) + if (!SerialInterrupt(action, trap_frame) && callback[action]) { trapcallback(action, trap_frame); } @@ -163,7 +163,7 @@ int _mmumain(int action, void *arg1, void *arg2, void *arg3, void *tf) break; case 0x10d: copy(trap_frame, (void *)0xf040, sizeof(*trap_frame)); - __asm__("mr 1,%0\n\tb trap_finish_start" : : "r" + __asm__("mr 1,%0\n\tb trap_finish_start" : : "r" (((int)trap_frame) - 16)); break; case 0x10e: @@ -194,7 +194,7 @@ int _mmumain(int action, void *arg1, void *arg2, void *arg3, void *tf) __asm__("mfmsr %0" : "=r" (tmp)); tmp &= ~0x30; __asm__("mtmsr %0" : : "r" (tmp)); - + for(i = 0; i < 4; i++) { SetBat(i, 0, GetPhys(0xf000 + i * 16), GetPhys(0xf004 + i * 16)); SetBat(i, 1, GetPhys(0xf008 + i * 16), GetPhys(0xf00c + i * 16)); @@ -244,7 +244,7 @@ void outdig(int dig) void outnum(unsigned long num) { int i; - for( i = 0; i < 8; i++ ) + for( i = 0; i < 8; i++ ) { outdig(num >> 28); num <<= 4; @@ -383,7 +383,7 @@ ppc_map_t *allocpage() fmtout("Problem! NextPage is low (%x)\n", NextPage); while(1); } - + PpcPageTable[NextPage].addr = MMU_ADDR_RESERVED; return &PpcPageTable[NextPage++]; } @@ -475,7 +475,7 @@ void freevsid(int vsid) ppc_map_t *map = &PpcPageTable[PPC_PAGE_NUMBER((paddr_t)info)]; for(i = 0; i < 256; i++) { - if(info->tree[i]) + if(info->tree[i]) freevsidtree(info->tree[i]); } freepage(map); @@ -488,7 +488,7 @@ void mmufreevsid(int vsid, int mask) { if(mask & (1 << i)) freevsid((vsid << 4) + i); - } + } } int mmuaddpage(ppc_map_info_t *info, int count) @@ -512,7 +512,7 @@ int mmuaddpage(ppc_map_info_t *info, int count) if(!VsidInfo) return -1; ptehi = (1 << 31) | (vsid << 7) | ((virt >> 22) & 0x3f); - + if(info[i].phys) { PagePtr = &PpcPageTable[PPC_PAGE_NUMBER(info[i].phys)]; } else { @@ -525,7 +525,7 @@ int mmuaddpage(ppc_map_info_t *info, int count) phys = PPC_PAGE_ADDR((PagePtr - PpcPageTable)); ptelo = phys & ~PPC_PAGE_MASK; - + if (phys < 0x30000) { /* Should not be allocating physical */ @@ -571,7 +571,7 @@ ppc_pteg_t *PtegFromPage(ppc_map_t *map, int hfun) int PageMatch(vaddr_t addr, ppc_pte_t pte) { int vsid_pte = (pte.pteh >> 7) & 15, api_pte = pte.pteh & 63; - return + return (((addr >> 28) & 15) == vsid_pte) && (((addr >> 22) & 63) == api_pte); } @@ -631,7 +631,7 @@ void mmugetpage(ppc_map_info_t *info, int count) { int i; ppc_map_t *PagePtr; - + for( i = 0; i < count; i++ ) { if(!info[i].addr && !info[i].proc) @@ -695,8 +695,8 @@ int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr) void printmap(vaddr_t vaddr, ppc_map_t *map) { - fmtout("%x: proc %x addr %x\n", - PPC_PAGE_ADDR(map - PpcPageTable), + fmtout("%x: proc %x addr %x\n", + PPC_PAGE_ADDR(map - PpcPageTable), map->proc, vaddr); } @@ -756,7 +756,7 @@ void callkernel(void *fun_ptr, void *arg) __asm__("mfmsr 3\n\t" "ori 3,3,0x30\n\t" "mtmsr 3\n\t" - "mtsdr1 %0\n\t" + "mtsdr1 %0\n\t" "mr 0,%2\n\t" "mtctr 0\n\t" "mr 3,%1\n\t" diff --git a/sdk/lib/ppcmmu/mmuutil.c b/sdk/lib/ppcmmu/mmuutil.c index e693c43c4b8..73f65c70f29 100644 --- a/sdk/lib/ppcmmu/mmuutil.c +++ b/sdk/lib/ppcmmu/mmuutil.c @@ -320,7 +320,7 @@ inline void SetSDR1( int sdr ) { __asm__("mtsdr1 3"); __asm__("sync"); __asm__("isync"); - + for( i = 0; i < 256; i++ ) { j = i << 12; __asm__("tlbie %0,0" : : "r" (j)); @@ -356,7 +356,7 @@ int PpcVirt2phys( vaddr_t virt, int inst ) { int i, bath, batl, sr, sdr1, physbase, vahi, valo; int npteg, hash, hashmask, ptehi, ptelo, ptegaddr; int vsid, pteh, ptevsid, pteapi; - + if( msr & txmask ) { sr = GetSR( virt >> 28 ); vsid = sr & 0xfffffff; @@ -393,7 +393,7 @@ int PpcVirt2phys( vaddr_t virt, int inst ) { if( (ptehi & 64) != pteh ) continue; if( ptevsid != (vsid & 0xffffff) ) continue; if( pteapi != ((virt >> 22) & 0x3f) ) continue; - + return (ptelo & 0xfffff000) | (virt & 0xfff); } } diff --git a/sdk/lib/pseh/powerpc/framebased.S b/sdk/lib/pseh/powerpc/framebased.S index a00052e9076..2ba9bf97a98 100644 --- a/sdk/lib/pseh/powerpc/framebased.S +++ b/sdk/lib/pseh/powerpc/framebased.S @@ -53,7 +53,7 @@ _SEHGlobalUnwind: lwz 3,4(1) stwu 1,-132(1) stmw 2,-128(1) - + xor 6,6,6 xor 5,5,5 lis 4,.RestoreRegisters@ha diff --git a/sdk/lib/rossym/dwarf386.c b/sdk/lib/rossym/dwarf386.c index 80a594b01a7..bfa9f749df8 100644 --- a/sdk/lib/rossym/dwarf386.c +++ b/sdk/lib/rossym/dwarf386.c @@ -7,7 +7,7 @@ #include "dwarf.h" char* -dwarf386regs[] = +dwarf386regs[] = { "AX", "CX", diff --git a/sdk/lib/rossym/dwarfabbrev.c b/sdk/lib/rossym/dwarfabbrev.c index d21ca6a25d1..b5cf60bd548 100644 --- a/sdk/lib/rossym/dwarfabbrev.c +++ b/sdk/lib/rossym/dwarfabbrev.c @@ -2,7 +2,7 @@ * Dwarf abbreviation parsing code. * * The convention here is that calling dwarfgetabbrevs relinquishes - * access to any abbrevs returned previously. Will have to add + * access to any abbrevs returned previously. Will have to add * explicit reference counting if this turns out not to be acceptable. */ diff --git a/sdk/lib/rossym/dwarfinfo.c b/sdk/lib/rossym/dwarfinfo.c index cc25499483a..1d71d8a1cc8 100644 --- a/sdk/lib/rossym/dwarfinfo.c +++ b/sdk/lib/rossym/dwarfinfo.c @@ -135,7 +135,7 @@ dwarflookupnameinunit(Dwarf *d, ulong unit, char *name, DwarfSym *s) werrstr("symbol '%s' not found", name); return -1; } - + int dwarflookupsubname(Dwarf *d, DwarfSym *parent, char *name, DwarfSym *s) @@ -193,7 +193,7 @@ dwarflookupfn(Dwarf *d, ulong unit, ulong pc, DwarfSym *s) continue; if(s->attrs.lowpc <= pc && pc < s->attrs.highpc) return 0; - } + } werrstr("fn containing pc 0x%lux not found", pc); return -1; } @@ -304,11 +304,11 @@ dwarfnextsymat(Dwarf *d, DwarfSym *s, int depth) } /* - * The funny game with t and s make sure that + * The funny game with t and s make sure that * if we get to the end of a run of a particular * depth, we leave s so that a call to nextsymat with depth-1 * will actually produce the desired guy. We could change - * the interface to dwarfnextsym instead, but I'm scared + * the interface to dwarfnextsym instead, but I'm scared * to touch it. */ t = *s; diff --git a/sdk/lib/rossym/dwarfpc.c b/sdk/lib/rossym/dwarfpc.c index 4edb5569ae9..2bb863d0f48 100644 --- a/sdk/lib/rossym/dwarfpc.c +++ b/sdk/lib/rossym/dwarfpc.c @@ -1,6 +1,6 @@ /* * Dwarf pc to source line conversion. - * + * * Maybe should do the reverse here, but what should the interface look like? * One possibility is to use the Plan 9 line2addr interface: * @@ -340,10 +340,10 @@ dwarfpctoline(Dwarf *d, ulong pc, char **cdir, char **dir, char **file, char **f if (dwarfenumunit(d, unit, &proc) >= 0) { dwarfnextsymat(d, &proc, 0); while (dwarfnextsymat(d, &proc, 1) == 1) { - if (proc.attrs.tag == TagSubprogram && + if (proc.attrs.tag == TagSubprogram && proc.attrs.have.name && - proc.attrs.declfile == emit.file && - proc.attrs.declline <= *line && + proc.attrs.declfile == emit.file && + proc.attrs.declline <= *line && proc.attrs.declline > lastline) { lastline = proc.attrs.declline; free(*function); diff --git a/sdk/lib/rossym/pe.c b/sdk/lib/rossym/pe.c index a00716cd185..e86e2196f9f 100644 --- a/sdk/lib/rossym/pe.c +++ b/sdk/lib/rossym/pe.c @@ -12,7 +12,7 @@ #include "pe.h" #include "rossympriv.h" -PeSect *pesection(Pe *pe, const char *name) +PeSect *pesection(Pe *pe, const char *name) { int i; ANSI_STRING WantName; @@ -22,7 +22,7 @@ PeSect *pesection(Pe *pe, const char *name) PANSI_STRING AnsiString = ANSI_NAME_STRING(&pe->sect[i]); if (WantName.Length == AnsiString->Length && !memcmp(AnsiString->Buffer, name, WantName.Length)) { - DPRINT("Found %s (%d) @ %x (%x)\n", name, i, + DPRINT("Found %s (%d) @ %x (%x)\n", name, i, ((PCHAR)pe->imagebase)+pe->sect[i].VirtualAddress, pe->sect[i].SizeOfRawData); return &pe->sect[i]; @@ -90,7 +90,7 @@ loadmemsection(Pe *pe, char *name, DwarfBlock *b) PCHAR DataSource = ((char *)pe->fd) + s->VirtualAddress; DPRINT("Copying to %x from %x (%x)\n", DataSource, b->data, b->len); RtlCopyMemory(b->data, DataSource, s->SizeOfRawData); - + return s->SizeOfRawData; } @@ -128,11 +128,11 @@ ulong pefindrva(struct _IMAGE_SECTION_HEADER *SectionHeaders, int NumberOfSectio DPRINT("Finding RVA for Physical %x\n", TargetPhysical); for (i = 0; i < NumberOfSections; i++) { DPRINT("Section %d name %s Raw %x Virt %x\n", - i, - ANSI_NAME_STRING(&SectionHeaders[i])->Buffer, + i, + ANSI_NAME_STRING(&SectionHeaders[i])->Buffer, SectionHeaders[i].PointerToRawData, SectionHeaders[i].VirtualAddress); - if (TargetPhysical >= SectionHeaders[i].PointerToRawData && + if (TargetPhysical >= SectionHeaders[i].PointerToRawData && TargetPhysical < SectionHeaders[i].PointerToRawData + SectionHeaders[i].SizeOfRawData) { DPRINT("RVA %x\n", TargetPhysical - SectionHeaders[i].PointerToRawData + SectionHeaders[i].VirtualAddress); return TargetPhysical - SectionHeaders[i].PointerToRawData + SectionHeaders[i].VirtualAddress; diff --git a/sdk/lib/rossym_new/dwarf.h b/sdk/lib/rossym_new/dwarf.h index 3d1101e2e99..182b2f4f218 100644 --- a/sdk/lib/rossym_new/dwarf.h +++ b/sdk/lib/rossym_new/dwarf.h @@ -385,7 +385,7 @@ struct DwarfExpr struct DwarfSym { DwarfAttrs attrs; - + /* not for consumer use... */ uint num; DwarfBuf b; diff --git a/sdk/lib/rossym_new/dwarf386.c b/sdk/lib/rossym_new/dwarf386.c index 80a594b01a7..bfa9f749df8 100644 --- a/sdk/lib/rossym_new/dwarf386.c +++ b/sdk/lib/rossym_new/dwarf386.c @@ -7,7 +7,7 @@ #include "dwarf.h" char* -dwarf386regs[] = +dwarf386regs[] = { "AX", "CX", diff --git a/sdk/lib/rossym_new/dwarfabbrev.c b/sdk/lib/rossym_new/dwarfabbrev.c index aba3b14464b..47f51aecedb 100644 --- a/sdk/lib/rossym_new/dwarfabbrev.c +++ b/sdk/lib/rossym_new/dwarfabbrev.c @@ -2,7 +2,7 @@ * Dwarf abbreviation parsing code. * * The convention here is that calling dwarfgetabbrevs relinquishes - * access to any abbrevs returned previously. Will have to add + * access to any abbrevs returned previously. Will have to add * explicit reference counting if this turns out not to be acceptable. */ diff --git a/sdk/lib/rossym_new/dwarfcfa.c b/sdk/lib/rossym_new/dwarfcfa.c index e5e58b8f786..83c5e3a4a62 100644 --- a/sdk/lib/rossym_new/dwarfcfa.c +++ b/sdk/lib/rossym_new/dwarfcfa.c @@ -453,19 +453,19 @@ int dwarfregunwind(Dwarf *d, ulong pc, ulong fde, DwarfExpr *cfa, PROSSYM_REGIST registers->Registers[i] = registers->Registers[r[i].reg]; break; case RuleRegOff: { - BOOLEAN success = + BOOLEAN success = RosSymCallbacks.MemGetProc - (d->pe->fd, + (d->pe->fd, ®isters->Registers[i], r[i].offset + registers->Registers[r[i].reg], - d->addrsize); + d->addrsize); if (!success) return -1; } break; case RuleCfaOffset: { - BOOLEAN success = + BOOLEAN success = RosSymCallbacks.MemGetProc - (d->pe->fd, + (d->pe->fd, ®isters->Registers[i], r[i].offset + cfaLocation, d->addrsize); @@ -484,7 +484,7 @@ int dwarfregunwind(Dwarf *d, ulong pc, ulong fde, DwarfExpr *cfa, PROSSYM_REGIST RosSymCallbacks.MemGetProc (d->pe->fd, &cfaSpace[i], cfaLocation + (i * 4), d->addrsize); } - werrstr("CFA(%x) [%08x, %08x, %08x, %08x]", + werrstr("CFA(%x) [%08x, %08x, %08x, %08x]", cfaLocation, cfaSpace[0], cfaSpace[1], cfaSpace[2], cfaSpace[3]); return 0; diff --git a/sdk/lib/rossym_new/dwarfinfo.c b/sdk/lib/rossym_new/dwarfinfo.c index fc6f9564e46..5107840b74e 100644 --- a/sdk/lib/rossym_new/dwarfinfo.c +++ b/sdk/lib/rossym_new/dwarfinfo.c @@ -640,7 +640,7 @@ void stackpush(DwarfStack *stack, ulong value) stack->data[stack->length++] = value; } -ulong stackpop(DwarfStack *stack) +ulong stackpop(DwarfStack *stack) { ASSERT(stack->length > 0); ulong val = stack->data[--stack->length]; @@ -874,8 +874,8 @@ int dwarfgetarg(Dwarf *d, const char *name, DwarfBuf *buf, ulong cfa, PROSSYM_RE werrstr("REG[%d] value %x", reg, (ulong)registers->Registers[reg]); stackpush(&stack, registers->Registers[reg]); } else if (opcode >= OpBreg0 && opcode < OpRegx) { - ulong val, - reg = opcode - OpBreg0, + ulong val, + reg = opcode - OpBreg0, offset = dwarfget128s(buf); void* addr = (void*)(ULONG_PTR)registers->Registers[reg]; werrstr("BREG[%d] reg %x offset %x", reg, addr, offset); @@ -916,13 +916,13 @@ int dwarfargvalue(Dwarf *d, DwarfSym *proc, ulong pc, ulong cfa, PROSSYM_REGISTE werrstr("lookup in unit %x-%x, pc %x", unit.attrs.lowpc, unit.attrs.highpc, pc); pc -= unit.attrs.lowpc; - - werrstr("paramblock %s -> unit %x type %x fde %x len %d registers %x", - parameter->name, - parameter->unit, - parameter->type, - parameter->fde, - parameter->len, + + werrstr("paramblock %s -> unit %x type %x fde %x len %d registers %x", + parameter->name, + parameter->unit, + parameter->type, + parameter->fde, + parameter->len, registers); // Seek our range in loc @@ -931,7 +931,7 @@ int dwarfargvalue(Dwarf *d, DwarfSym *proc, ulong pc, ulong cfa, PROSSYM_REGISTE locbuf.d = d; locbuf.addrsize = d->addrsize; - + if (parameter->loctype == TConstant) { locbuf.p = d->loc.data + parameter->fde; locbuf.ep = d->loc.data + d->loc.len; @@ -960,7 +960,7 @@ int dwarfargvalue(Dwarf *d, DwarfSym *proc, ulong pc, ulong cfa, PROSSYM_REGISTE gotarg = dwarfgetarg(d, parameter->name, &instream, cfa, registers, ¶meter->value); if (gotarg == -1) return -1; - + return 0; } @@ -991,7 +991,7 @@ dwarfgetparams(Dwarf *d, DwarfSym *s, ulong pc, int pnum, DwarfParam *paramblock int res = dwarfnextsymat(d, s, ¶m); while (res == 0 && ip < pnum) { if (param.attrs.tag == TagFormalParameter && - param.attrs.have.name && + param.attrs.have.name && param.attrs.have.location) { paramblocks[ip].name = malloc(strlen(param.attrs.name)+1); strcpy(paramblocks[ip].name, param.attrs.name); @@ -1000,11 +1000,11 @@ dwarfgetparams(Dwarf *d, DwarfSym *s, ulong pc, int pnum, DwarfParam *paramblock paramblocks[ip].loctype = param.attrs.have.location; paramblocks[ip].len = param.attrs.location.b.len; paramblocks[ip].fde = (ulong)param.attrs.location.b.data; - werrstr("param[%d] block %s -> type %x loctype %x fde %x len %x", - ip, - paramblocks[ip].name, + werrstr("param[%d] block %s -> type %x loctype %x fde %x len %x", + ip, + paramblocks[ip].name, paramblocks[ip].type, - paramblocks[ip].loctype, + paramblocks[ip].loctype, paramblocks[ip].fde, paramblocks[ip].len); ip++; diff --git a/sdk/lib/rossym_new/dwarfpc.c b/sdk/lib/rossym_new/dwarfpc.c index eb7b7d2d9f8..93c3fdd7de5 100644 --- a/sdk/lib/rossym_new/dwarfpc.c +++ b/sdk/lib/rossym_new/dwarfpc.c @@ -1,6 +1,6 @@ /* * Dwarf pc to source line conversion. - * + * * Maybe should do the reverse here, but what should the interface look like? * One possibility is to use the Plan 9 line2addr interface: * @@ -327,16 +327,16 @@ dwarfpctoline(Dwarf *d, DwarfSym *proc, ulong pc, char **file, char **function, if (!cdir && dwarfdir) cdir = dwarfdir; - + char *filefull = malloc(strlen(cdir) + strlen(*file) + 2); strcpy(filefull, cdir); strcat(filefull, "/"); strcat(filefull, *file); *file = filefull; - + *function = nil; lastline = 0; - + runit = dwarfaddrtounit(d, pc, &unit); if (runit == 0) { DwarfSym compunit = { }; @@ -345,7 +345,7 @@ dwarfpctoline(Dwarf *d, DwarfSym *proc, ulong pc, char **file, char **function, return -1; renum = dwarfnextsymat(d, &compunit, proc); while (renum == 0) { - if (proc->attrs.tag == TagSubprogram && + if (proc->attrs.tag == TagSubprogram && proc->attrs.have.name) { if (proc->attrs.lowpc <= pc && proc->attrs.highpc > pc) { @@ -367,7 +367,7 @@ dwarfpctoline(Dwarf *d, DwarfSym *proc, ulong pc, char **file, char **function, return -1; renum = dwarfnextsymat(d, &compunit, proc); while (renum == 0) { - if (proc->attrs.tag == TagSubprogram && + if (proc->attrs.tag == TagSubprogram && proc->attrs.have.name && proc->attrs.declfile == emit.file) { diff --git a/sdk/lib/rossym_new/find.c b/sdk/lib/rossym_new/find.c index 74a96e823f4..a9f162de382 100644 --- a/sdk/lib/rossym_new/find.c +++ b/sdk/lib/rossym_new/find.c @@ -51,9 +51,9 @@ RosSymGetAddressInformation DwarfSym proc = { }; int i; int res = dwarfpctoline - (RosSymInfo, + (RosSymInfo, &proc, - RelativeAddress + RosSymInfo->pe->imagebase, + RelativeAddress + RosSymInfo->pe->imagebase, &RosSymLineInfo->FileName, &RosSymLineInfo->FunctionName, &RosSymLineInfo->LineNumber); @@ -70,9 +70,9 @@ RosSymGetAddressInformation DwarfExpr cfa = { }; ulong cfaLocation; if (dwarfregunwind - (RosSymInfo, - RelativeAddress + RosSymInfo->pe->imagebase, - proc.attrs.framebase.c, + (RosSymInfo, + RelativeAddress + RosSymInfo->pe->imagebase, + proc.attrs.framebase.c, &cfa, ®isters) == -1) { werrstr("Can't get cfa location for %s", RosSymLineInfo->FunctionName); @@ -102,11 +102,11 @@ RosSymGetAddressInformation } for (i = 0; i < RosSymLineInfo->NumParams; i++) { - werrstr("Getting arg %s, unit %x, type %x", + werrstr("Getting arg %s, unit %x, type %x", params[i].name, params[i].unit, params[i].type); res = dwarfargvalue - (RosSymInfo, - &proc, + (RosSymInfo, + &proc, RelativeAddress + RosSymInfo->pe->imagebase, cfaLocation, ®isters, @@ -153,27 +153,27 @@ RosSymAggregate(PROSSYM_INFO RosSymInfo, PCHAR Type, PROSSYM_AGGREGATE Aggregate } else if (dwarflookupnameinunit(RosSymInfo, unit, Type, &type) != 0 || (type.attrs.tag != TagStructType && type.attrs.tag != TagUnionType)) return FALSE; - + DwarfSym element = { }, inner = { }; int count = 0; - + werrstr("type %s (want %s) type %x\n", type.attrs.name, Type, type.attrs.type); - + if (type.attrs.have.type) { if (dwarfseeksym(RosSymInfo, unit, type.attrs.type, &inner) == -1) return FALSE; type = inner; } - + werrstr("finding members %d\n", type.attrs.haskids); while (dwarfnextsymat(RosSymInfo, &type, &element) != -1) { if (element.attrs.have.name) werrstr("%x %s\n", element.attrs.tag, element.attrs.name); if (element.attrs.tag == TagMember) count++; } - + werrstr("%d members\n", count); - + if (!count) return FALSE; memset(&element, 0, sizeof(element)); Aggregate->NumElements = count; @@ -191,7 +191,7 @@ RosSymAggregate(PROSSYM_INFO RosSymInfo, PCHAR Type, PROSSYM_AGGREGATE Aggregate // Seek our range in loc DwarfBuf locbuf; DwarfBuf instream = { }; - + locbuf.d = RosSymInfo; locbuf.addrsize = RosSymInfo->addrsize; @@ -199,15 +199,15 @@ RosSymAggregate(PROSSYM_INFO RosSymInfo, PCHAR Type, PROSSYM_AGGREGATE Aggregate instream = locbuf; instream.p = element.attrs.datamemberloc.b.data; instream.ep = element.attrs.datamemberloc.b.data + element.attrs.datamemberloc.b.len; - werrstr("datamemberloc type %x %p:%x\n", + werrstr("datamemberloc type %x %p:%x\n", element.attrs.have.datamemberloc, element.attrs.datamemberloc.b.data, element.attrs.datamemberloc.b.len); } if (dwarfgetarg(RosSymInfo, element.attrs.name, &instream, 0, NULL, &Aggregate->Elements[count].BaseOffset) == -1) Aggregate->Elements[count].BaseOffset = -1; - werrstr("tag %x name %s base %x type %x\n", - element.attrs.tag, element.attrs.name, + werrstr("tag %x name %s base %x type %x\n", + element.attrs.tag, element.attrs.name, Aggregate->Elements[count].BaseOffset, Aggregate->Elements[count].TypeId); count++; @@ -216,7 +216,7 @@ RosSymAggregate(PROSSYM_INFO RosSymInfo, PCHAR Type, PROSSYM_AGGREGATE Aggregate for (count = 0; count < Aggregate->NumElements; count++) { memset(&type, 0, sizeof(type)); memset(&inner, 0, sizeof(inner)); - werrstr("seeking type %x (%s) from %s\n", + werrstr("seeking type %x (%s) from %s\n", Aggregate->Elements[count].TypeId, Aggregate->Elements[count].Type, Aggregate->Elements[count].Name); diff --git a/sdk/lib/rossym_new/fromfile.c b/sdk/lib/rossym_new/fromfile.c index ae9b2d5b7a9..0fe8a36799a 100644 --- a/sdk/lib/rossym_new/fromfile.c +++ b/sdk/lib/rossym_new/fromfile.c @@ -97,7 +97,7 @@ RosSymCreateFromFile(PVOID FileContext, PROSSYM_INFO *RosSymInfo) // Convert names to ANSI_STRINGs for (SectionIndex = 0; SectionIndex < NtHeaders.FileHeader.NumberOfSections; - SectionIndex++) + SectionIndex++) { ANSI_STRING astr; if (SectionHeaders[SectionIndex].Name[0] != '/') { @@ -122,7 +122,7 @@ RosSymCreateFromFile(PVOID FileContext, PROSSYM_INFO *RosSymInfo) if (!RosSymReadFile(FileContext, astr.Buffer, MAXIMUM_DWARF_NAME_SIZE)) goto freeall; astr.Length = GetStrnlen(astr.Buffer, MAXIMUM_DWARF_NAME_SIZE); - astr.MaximumLength = MAXIMUM_DWARF_NAME_SIZE; + astr.MaximumLength = MAXIMUM_DWARF_NAME_SIZE; DPRINT("Long name %d, %s\n", SectionIndex, astr.Buffer); } *ANSI_NAME_STRING(&SectionHeaders[SectionIndex]) = astr; diff --git a/sdk/lib/rossym_new/frommem.c b/sdk/lib/rossym_new/frommem.c index 0c213b6ec7e..d4b2251a28d 100644 --- a/sdk/lib/rossym_new/frommem.c +++ b/sdk/lib/rossym_new/frommem.c @@ -29,7 +29,7 @@ RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymI PIMAGE_SECTION_HEADER SectionHeaders; ULONG SectionIndex; unsigned SymbolTable, NumSymbols; - + /* Check if MZ header is valid */ DosHeader = (PIMAGE_DOS_HEADER) ImageStart; if (ImageSize < sizeof(IMAGE_DOS_HEADER) @@ -38,7 +38,7 @@ RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymI DPRINT1("Image doesn't have a valid DOS header\n"); return FALSE; } - + /* Locate NT header */ NtHeaders = (PIMAGE_NT_HEADERS)((char *) ImageStart + DosHeader->e_lfanew); if (ImageSize < DosHeader->e_lfanew + sizeof(IMAGE_NT_HEADERS) @@ -47,18 +47,18 @@ RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymI DPRINT1("Image doesn't have a valid PE header\n"); return FALSE; } - + SymbolTable = NtHeaders->FileHeader.PointerToSymbolTable; NumSymbols = NtHeaders->FileHeader.NumberOfSymbols; - + /* Search for the section header */ ULONG SectionHeaderSize = NtHeaders->FileHeader.NumberOfSections * sizeof(IMAGE_SECTION_HEADER); SectionHeaders = RosSymAllocMem(SectionHeaderSize); RtlCopyMemory(SectionHeaders, IMAGE_FIRST_SECTION(NtHeaders), SectionHeaderSize); - + // Convert names to ANSI_STRINGs for (SectionIndex = 0; SectionIndex < NtHeaders->FileHeader.NumberOfSections; - SectionIndex++) + SectionIndex++) { if (SectionHeaders[SectionIndex].Name[0] != '/') { AnsiNameString.Buffer = RosSymAllocMem(IMAGE_SIZEOF_SHORT_NAME); @@ -69,7 +69,7 @@ RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymI UNICODE_STRING intConv; NTSTATUS Status; ULONG StringOffset; - + if (!RtlCreateUnicodeStringFromAsciiz(&intConv, (PCSZ)SectionHeaders[SectionIndex].Name + 1)) goto freeall; Status = RtlUnicodeStringToInteger(&intConv, 10, &StringOffset); @@ -87,14 +87,14 @@ RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymI PossibleStringLength = MAXIMUM_DWARF_NAME_SIZE; RtlCopyMemory(AnsiNameString.Buffer, StringTarget, PossibleStringLength); AnsiNameString.Length = strlen(AnsiNameString.Buffer); - AnsiNameString.MaximumLength = MAXIMUM_DWARF_NAME_SIZE; + AnsiNameString.MaximumLength = MAXIMUM_DWARF_NAME_SIZE; } memcpy (&SectionHeaders[SectionIndex], &AnsiNameString, sizeof(AnsiNameString)); } - + Pe *pe = RosSymAllocMem(sizeof(*pe)); pe->fd = ImageStart; pe->e2 = peget2; @@ -108,14 +108,14 @@ RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymI pe->nsymbols = NtHeaders->FileHeader.NumberOfSymbols; pe->symtab = malloc(pe->nsymbols * sizeof(CoffSymbol)); PSYMENT SymbolData = (PSYMENT) - (((PCHAR)ImageStart) + + (((PCHAR)ImageStart) + pefindrva - (pe->sect, - pe->nsections, + (pe->sect, + pe->nsections, NtHeaders->FileHeader.PointerToSymbolTable)); int i, j; for (i = 0, j = 0; i < pe->nsymbols; i++) { - if ((SymbolData[i].e_scnum < 1) || + if ((SymbolData[i].e_scnum < 1) || (SymbolData[i].e_sclass != C_EXT && SymbolData[i].e_sclass != C_STAT)) continue; @@ -124,12 +124,12 @@ RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymI pe->symtab[j].name = malloc(sizeof(SymbolData[i].e.e_name)+1); strcpy(pe->symtab[j].name, SymbolData[i].e.e_name); } else { - PCHAR SymbolName = ((PCHAR)ImageStart) + + PCHAR SymbolName = ((PCHAR)ImageStart) + pefindrva - (pe->sect, - pe->nsections, - NtHeaders->FileHeader.PointerToSymbolTable + - (NtHeaders->FileHeader.NumberOfSymbols * 18) + + (pe->sect, + pe->nsections, + NtHeaders->FileHeader.PointerToSymbolTable + + (NtHeaders->FileHeader.NumberOfSymbols * 18) + SymbolData[i].e.e.e_offset); pe->symtab[j].name = malloc(strlen(SymbolName)+1); strcpy(pe->symtab[j].name, SymbolName); @@ -143,17 +143,17 @@ RosSymCreateFromMem(PVOID ImageStart, ULONG_PTR ImageSize, PROSSYM_INFO *RosSymI } pe->nsymbols = j; pe->loadsection = loadmemsection; - *RosSymInfo = dwarfopen(pe); + *RosSymInfo = dwarfopen(pe); return !!*RosSymInfo; - + freeall: if (AnsiNameString.Buffer) RosSymFreeMem(AnsiNameString.Buffer); for (SectionIndex = 0; SectionIndex < NtHeaders->FileHeader.NumberOfSections; SectionIndex++) RtlFreeAnsiString(ANSI_NAME_STRING(&SectionHeaders[SectionIndex])); RosSymFreeMem(SectionHeaders); - + return FALSE; } diff --git a/sdk/lib/rossym_new/pe.c b/sdk/lib/rossym_new/pe.c index 62dcfb5f589..39a1ea1d6a9 100644 --- a/sdk/lib/rossym_new/pe.c +++ b/sdk/lib/rossym_new/pe.c @@ -3,7 +3,7 @@ #define NDEBUG #include -PeSect *pesection(Pe *pe, const char *name) +PeSect *pesection(Pe *pe, const char *name) { int i; ANSI_STRING WantName; @@ -13,7 +13,7 @@ PeSect *pesection(Pe *pe, const char *name) PANSI_STRING AnsiString = ANSI_NAME_STRING(&pe->sect[i]); if (WantName.Length == AnsiString->Length && !memcmp(AnsiString->Buffer, name, WantName.Length)) { - werrstr("Found %s (%d) @ %x (%x)\n", name, i, + werrstr("Found %s (%d) @ %x (%x)\n", name, i, ((PCHAR)pe->imagebase)+pe->sect[i].VirtualAddress, pe->sect[i].SizeOfRawData); return &pe->sect[i]; @@ -81,7 +81,7 @@ loadmemsection(Pe *pe, char *name, DwarfBlock *b) PCHAR DataSource = ((char *)pe->fd) + s->VirtualAddress; werrstr("Copying to %x from %x (%x)\n", DataSource, b->data, b->len); RtlCopyMemory(b->data, DataSource, s->SizeOfRawData); - + return s->SizeOfRawData; } @@ -115,11 +115,11 @@ ulong pefindrva(struct _IMAGE_SECTION_HEADER *SectionHeaders, int NumberOfSectio werrstr("Finding RVA for Physical %x\n", TargetPhysical); for (i = 0; i < NumberOfSections; i++) { werrstr("Section %d name %s Raw %x Virt %x\n", - i, - ANSI_NAME_STRING(&SectionHeaders[i])->Buffer, + i, + ANSI_NAME_STRING(&SectionHeaders[i])->Buffer, SectionHeaders[i].PointerToRawData, SectionHeaders[i].VirtualAddress); - if (TargetPhysical >= SectionHeaders[i].PointerToRawData && + if (TargetPhysical >= SectionHeaders[i].PointerToRawData && TargetPhysical < SectionHeaders[i].PointerToRawData + SectionHeaders[i].SizeOfRawData) { werrstr("RVA %x\n", TargetPhysical - SectionHeaders[i].PointerToRawData + SectionHeaders[i].VirtualAddress); return TargetPhysical - SectionHeaders[i].PointerToRawData + SectionHeaders[i].VirtualAddress; diff --git a/sdk/lib/rtl/amd64/slist.S b/sdk/lib/rtl/amd64/slist.S index a29ecd6a169..69d6fa11c76 100644 --- a/sdk/lib/rtl/amd64/slist.S +++ b/sdk/lib/rtl/amd64/slist.S @@ -373,7 +373,7 @@ ENDFUNC */ ExpInterlockedFlushSList: FUNC RtlInterlockedFlushSList - + mov [rsp + P3Home], rbx .SAVEREG rbx, P3Home .ENDPROLOG diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 87e370ed89f..a0bd12b28fb 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -220,7 +220,7 @@ UnwindOpSlots( 2, // UWOP_SET_FPREG_LARGE }; - if ((UnwindCode.UnwindOp == UWOP_ALLOC_LARGE) && + if ((UnwindCode.UnwindOp == UWOP_ALLOC_LARGE) && (UnwindCode.OpInfo != 0)) { return 3; @@ -228,7 +228,7 @@ UnwindOpSlots( else { return UnwindOpExtraSlotTable[UnwindCode.UnwindOp] + 1; - } + } } static @@ -471,7 +471,7 @@ GetEstablisherFrame( if ((CodeOffset >= UnwindInfo->SizeOfProlog) || ((UnwindInfo->Flags & UNW_FLAG_CHAININFO) != 0)) { - return GetReg(Context, UnwindInfo->FrameRegister) - + return GetReg(Context, UnwindInfo->FrameRegister) - UnwindInfo->FrameOffset * 16; } @@ -1104,7 +1104,7 @@ RtlSetUnwindContext( _In_ DWORD64 TargetFrame) { KNONVOLATILE_CONTEXT_POINTERS ContextPointers; - + /* Capture pointers to the non-volatiles up to the target frame */ RtlpCaptureNonVolatileContextPointers(&ContextPointers, TargetFrame); diff --git a/sdk/lib/rtl/avltable.c b/sdk/lib/rtl/avltable.c index d0c44f6eb41..5b704a06135 100644 --- a/sdk/lib/rtl/avltable.c +++ b/sdk/lib/rtl/avltable.c @@ -248,7 +248,7 @@ RtlEnumerateGenericTableWithoutSplayingAvl(IN PRTL_AVL_TABLE Table, IN OUT PVOID *RestartKey) { PRTL_BALANCED_LINKS CurrentNode; - + /* Skip an empty tree */ if (RtlIsGenericTableEmptyAvl(Table)) return NULL; @@ -271,7 +271,7 @@ RtlEnumerateGenericTableWithoutSplayingAvl(IN PRTL_AVL_TABLE Table, /* If there was one, update the restart key */ if (CurrentNode) *RestartKey = CurrentNode; } - + /* Return the node's data if it was found, otherwise return NULL */ if (CurrentNode) return &((PTABLE_ENTRY_HEADER)CurrentNode)->UserData; return NULL; @@ -303,15 +303,15 @@ RtlDeleteElementGenericTableAvl(IN PRTL_AVL_TABLE Table, /* Find the node */ SearchResult = RtlpFindAvlTableNodeOrParent(Table, Buffer, &Node); if (SearchResult != TableFoundNode) return FALSE; - + /* If this node was the key, update it */ if (Node == Table->RestartKey) Table->RestartKey = RtlRealPredecessorAvl(Node); - + /* Do the delete */ Table->DeleteCount++; RtlpDeleteAvlTreeNode(Table, Node); Table->NumberGenericTableElements--; - + /* Reset accounting */ Table->WhichOrderedElement = 0; Table->OrderedPointer = NULL; diff --git a/sdk/lib/rtl/error.c b/sdk/lib/rtl/error.c index dc3e53fc59e..82c9461c3da 100644 --- a/sdk/lib/rtl/error.c +++ b/sdk/lib/rtl/error.c @@ -203,7 +203,7 @@ RtlSetThreadErrorMode(IN ULONG NewMode, /* Return old mode */ if (OldMode) *OldMode = Teb->HardErrorMode; - + /* Set new one and return success */ Teb->HardErrorMode = NewMode; return STATUS_SUCCESS; diff --git a/sdk/lib/rtl/i386/interlck.S b/sdk/lib/rtl/i386/interlck.S index 7ad7a085216..8a2ee727a02 100644 --- a/sdk/lib/rtl/i386/interlck.S +++ b/sdk/lib/rtl/i386/interlck.S @@ -93,7 +93,7 @@ _RtlpInterlockedPushEntrySListResume: /* If [ebp] equals edx:eax, exchange it with ecx:ebx */ LOCK cmpxchg8b qword ptr [ebp] - + /* If not equal, retry with edx:eax, being the content of [ebp] now */ jnz _RtlpInterlockedPushEntrySListResume @@ -140,7 +140,7 @@ _RtlpInterlockedFlushSListResume: /* If [ebp] equals edx:eax, exchange it with ecx:ebx */ LOCK cmpxchg8b qword ptr [ebp] - + /* If not equal, retry with edx:eax, being the content of [ebp] now */ jnz _RtlpInterlockedFlushSListResume @@ -149,5 +149,5 @@ _RtlpInterlockedFlushSListEnd: pop ebp pop ebx ret 4 - + END diff --git a/sdk/lib/rtl/powerpc/interlocked.c b/sdk/lib/rtl/powerpc/interlocked.c index 8a4e48112c1..edbc47031e8 100644 --- a/sdk/lib/rtl/powerpc/interlocked.c +++ b/sdk/lib/rtl/powerpc/interlocked.c @@ -51,7 +51,7 @@ InterlockedDecrement( } PSLIST_ENTRY -WINAPI +WINAPI InterlockedPopEntrySList( PSLIST_HEADER ListHead) { diff --git a/sdk/lib/rtl/priv.c b/sdk/lib/rtl/priv.c index 2b4cadd9f3b..34b860f1975 100644 --- a/sdk/lib/rtl/priv.c +++ b/sdk/lib/rtl/priv.c @@ -389,7 +389,7 @@ RtlReleasePrivilege(IN PVOID ReturnedState) /* Otherwise, restore old state */ ZwAdjustPrivilegesToken(State->Token, FALSE, State->OldPrivileges, 0, NULL, NULL); - + } /* If we used a different buffer for old privileges, just free it */ diff --git a/sdk/lib/rtl/res.c b/sdk/lib/rtl/res.c index 5a785fd6b92..716136be6a5 100644 --- a/sdk/lib/rtl/res.c +++ b/sdk/lib/rtl/res.c @@ -219,7 +219,7 @@ LdrFindResource_U(PVOID BaseAddress, if (ResourceInfo) { DPRINT( "module %p type %lx name %lx lang %04lx level %lu\n", - BaseAddress, ResourceInfo->Type, + BaseAddress, ResourceInfo->Type, Level > 1 ? ResourceInfo->Name : 0, Level > 2 ? ResourceInfo->Language : 0, Level ); } diff --git a/sdk/lib/rtl/rtlavl.h b/sdk/lib/rtl/rtlavl.h index 7f3a549b071..7d8ae74b0a5 100644 --- a/sdk/lib/rtl/rtlavl.h +++ b/sdk/lib/rtl/rtlavl.h @@ -31,7 +31,7 @@ RtlpCopyAvlNodeData(IN PRTL_BALANCED_LINKS Node1, { *Node1 = *Node2; } - + FORCEINLINE RTL_GENERIC_COMPARE_RESULTS RtlpAvlCompareRoutine(IN PRTL_AVL_TABLE Table, diff --git a/sdk/lib/rtl/splaytree.c b/sdk/lib/rtl/splaytree.c index 6dc13aaeea8..9a0efda86cb 100644 --- a/sdk/lib/rtl/splaytree.c +++ b/sdk/lib/rtl/splaytree.c @@ -158,7 +158,7 @@ SwapSplayLinks(PRTL_SPLAY_LINKS LinkA, ASSERT(RtlRightChild(LinkA) == RtlRightChild(&Tb)); ASSERT(RtlParent(LinkB) == RtlParent(&Ta)); ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); - ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); + ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); } else { diff --git a/sdk/lib/rtl/version.c b/sdk/lib/rtl/version.c index efe3eadd141..7d6add1202b 100644 --- a/sdk/lib/rtl/version.c +++ b/sdk/lib/rtl/version.c @@ -167,7 +167,7 @@ RtlVerifyVersionInfo(IN PRTL_OSVERSIONINFOEXW VersionInfo, { if (Condition == VER_EQUAL) { - Condition = RtlpVerGetCondition(ConditionMask, VER_MINORVERSION); + Condition = RtlpVerGetCondition(ConditionMask, VER_MINORVERSION); } DoNextCheck = (VersionInfo->dwMinorVersion == Version.dwMinorVersion); @@ -185,7 +185,7 @@ RtlVerifyVersionInfo(IN PRTL_OSVERSIONINFOEXW VersionInfo, { if (Condition == VER_EQUAL) { - Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMAJOR); + Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMAJOR); } DoNextCheck = (VersionInfo->wServicePackMajor == Version.wServicePackMajor); @@ -202,7 +202,7 @@ RtlVerifyVersionInfo(IN PRTL_OSVERSIONINFOEXW VersionInfo, { if (Condition == VER_EQUAL) { - Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMINOR); + Condition = RtlpVerGetCondition(ConditionMask, VER_SERVICEPACKMINOR); } Comparison = RtlpVerCompare(Version.wServicePackMinor, diff --git a/sdk/lib/rtl/wait.c b/sdk/lib/rtl/wait.c index 5cecf6cc025..bab26365d5c 100644 --- a/sdk/lib/rtl/wait.c +++ b/sdk/lib/rtl/wait.c @@ -129,7 +129,7 @@ Wait_thread_proc(LPVOID Arg) */ NTSTATUS NTAPI -RtlRegisterWait(PHANDLE NewWaitObject, +RtlRegisterWait(PHANDLE NewWaitObject, HANDLE Object, WAITORTIMERCALLBACKFUNC Callback, PVOID Context, @@ -154,8 +154,8 @@ RtlRegisterWait(PHANDLE NewWaitObject, Wait->DeleteCount = 0; Wait->CompletionEvent = NULL; - Status = NtCreateEvent( &Wait->CancelEvent, - EVENT_ALL_ACCESS, + Status = NtCreateEvent( &Wait->CancelEvent, + EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); diff --git a/sdk/lib/skiplist/skiplist.c b/sdk/lib/skiplist/skiplist.c index 639e5595e1d..b46d536537e 100644 --- a/sdk/lib/skiplist/skiplist.c +++ b/sdk/lib/skiplist/skiplist.c @@ -372,7 +372,7 @@ LookupElementSkiplist(PSKIPLIST Skiplist, PVOID Element, PDWORD ElementIndex) { dwIndex += pNode->Distance[i]; pNode = pNode->Next[i]; - } + } // Reduce the number of comparisons by not comparing the same node on different levels twice. pLastComparedNode = pNode->Next[i]; diff --git a/sdk/tools/fatten/fatfs/ff.c b/sdk/tools/fatten/fatfs/ff.c index 4e4f2160038..22a65dd8f86 100644 --- a/sdk/tools/fatten/fatfs/ff.c +++ b/sdk/tools/fatten/fatfs/ff.c @@ -964,7 +964,7 @@ FRESULT remove_chain ( /* FR_OK(0):succeeded, !=0:error */ #if _USE_TRIM if (ecl + 1 == nxt) { /* Is next cluster contiguous? */ ecl = nxt; - } else { /* End of contiguous clusters */ + } else { /* End of contiguous clusters */ rt[0] = clust2sect(fs, scl); /* Start sector */ rt[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */ disk_ioctl(fs->drv, CTRL_TRIM, rt); /* Erase the block */ @@ -2130,7 +2130,7 @@ int get_ldnumber ( /* Returns logical drive number (-1:invalid drive) */ for (tt = *path; (UINT)*tt >= (_USE_LFN ? ' ' : '!') && *tt != ':'; tt++) ; /* Find ':' in the path */ if (*tt == ':') { /* If a ':' is exist in the path name */ tp = *path; - i = *tp++ - '0'; + i = *tp++ - '0'; if (i < 10 && tp == tt) { /* Is there a numeric drive id? */ if (i < _VOLUMES) { /* If a drive id is found, get the value and strip it */ vol = (int)i; @@ -2976,7 +2976,7 @@ FRESULT f_getcwd ( res = dir_read(&dj, 0); if (res != FR_OK) break; if (ccl == ld_clust(dj.fs, dj.dir)) break; /* Found the entry */ - res = dir_next(&dj, 0); + res = dir_next(&dj, 0); } while (res == FR_OK); if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */ if (res != FR_OK) break; diff --git a/sdk/tools/fatten/fatfs/ffconf.h b/sdk/tools/fatten/fatfs/ffconf.h index 3f3513a1dc1..7c6d81c61da 100644 --- a/sdk/tools/fatten/fatfs/ffconf.h +++ b/sdk/tools/fatten/fatfs/ffconf.h @@ -210,7 +210,7 @@ / defined by _NORTC_MON, _NORTC_MDAY and _NORTC_YEAR. / When timestamp feature is enabled (_FS_NORTC == 0), get_fattime() function need / to be added to the project to read current time form RTC. _NORTC_MON, -/ _NORTC_MDAY and _NORTC_YEAR have no effect. +/ _NORTC_MDAY and _NORTC_YEAR have no effect. / These options have no effect at read-only configuration (_FS_READONLY == 1). */ diff --git a/sdk/tools/fatten/fatten.c b/sdk/tools/fatten/fatten.c index 452b33fcc2c..883780d7f30 100644 --- a/sdk/tools/fatten/fatten.c +++ b/sdk/tools/fatten/fatten.c @@ -237,7 +237,7 @@ int main(int oargc, char* oargv[]) label[i] = ch; } - + if (!invalid) { // Pad the label with spaces diff --git a/sdk/tools/hhpcomp/hhp_reader.cpp b/sdk/tools/hhpcomp/hhp_reader.cpp index 14f38fd86ad..1feb4ad408b 100644 --- a/sdk/tools/hhpcomp/hhp_reader.cpp +++ b/sdk/tools/hhpcomp/hhp_reader.cpp @@ -1,17 +1,17 @@ // This file is part of hhpcomp, a free HTML Help Project (*.hhp) compiler. // Copyright (C) 2015 Benedikt Freisen -// +// // 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 Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/sdk/tools/hhpcomp/hhp_reader.h b/sdk/tools/hhpcomp/hhp_reader.h index 6a89fe20992..5fdc2f78d87 100644 --- a/sdk/tools/hhpcomp/hhp_reader.h +++ b/sdk/tools/hhpcomp/hhp_reader.h @@ -1,17 +1,17 @@ // This file is part of hhpcomp, a free HTML Help Project (*.hhp) compiler. // Copyright (C) 2015 Benedikt Freisen -// +// // 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 Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -30,7 +30,7 @@ class hhp_section { private: string name; - + public: virtual void process_line(string line) = 0; string get_name(); @@ -45,7 +45,7 @@ private: string value; bool has_default_value; string default_value; - + public: hhp_pair(string key, bool has_default_value = false, string default_value = ""); void set_value(string value); @@ -59,7 +59,7 @@ protected: map entries; void add_entry(hhp_pair* entry); - + public: virtual void process_line(string line); }; @@ -88,7 +88,7 @@ private: hhp_pair* display_compile_note; hhp_pair* flat; hhp_pair* full_text_search_stop_list_file; - + public: hhp_options_section(); ~hhp_options_section(); @@ -114,22 +114,22 @@ private: hhp_options_section* options; hhp_files_section* files; set unique_file_pathes; - + void add_section(hhp_section* section); void read(); void compute_unique_file_pathes_set(); - + public: hhp_reader(string filename); ~hhp_reader(); - + string get_title_string(); string get_contents_file_string(); string get_index_file_string(); string get_default_topic_string(); unsigned int get_language_code(); string get_compiled_file_string(); - + set::iterator get_file_pathes_iterator_begin(); set::iterator get_file_pathes_iterator_end(); }; diff --git a/sdk/tools/hhpcomp/hhpcomp.cpp b/sdk/tools/hhpcomp/hhpcomp.cpp index 58d09d3a897..7510a92eb12 100644 --- a/sdk/tools/hhpcomp/hhpcomp.cpp +++ b/sdk/tools/hhpcomp/hhpcomp.cpp @@ -1,17 +1,17 @@ // This file is part of hhpcomp, a free HTML Help Project (*.hhp) compiler. // Copyright (C) 2015 Benedikt Freisen -// +// // 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 Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/sdk/tools/hhpcomp/lzx_compress/lz_nonslide.c b/sdk/tools/hhpcomp/lzx_compress/lz_nonslide.c index 79158dfc5bd..8c76f4d562f 100644 --- a/sdk/tools/hhpcomp/lzx_compress/lz_nonslide.c +++ b/sdk/tools/hhpcomp/lzx_compress/lz_nonslide.c @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* +/* * Document here */ #include @@ -46,7 +46,7 @@ void lz_init(lz_info *lzi, int wsize, int max_dist, output_match_t output_match, output_literal_t output_literal, void *user_data) { - /* the reason for the separate max_dist value is LZX can't reach the + /* the reason for the separate max_dist value is LZX can't reach the first three characters in its nominal window. But using a smaller window results in inefficiency when dealing with reset intervals which are the length of the nominal window */ @@ -60,12 +60,12 @@ void lz_init(lz_info *lzi, int wsize, int max_dist, lzi->min_match = min_match; if (lzi->min_match < 3) lzi->min_match = 3; - lzi->max_dist = max_dist; - lzi->block_buf_size = wsize + lzi->max_dist; + lzi->max_dist = max_dist; + lzi->block_buf_size = wsize + lzi->max_dist; lzi->block_buf = malloc(lzi->block_buf_size); lzi->block_bufe = lzi->block_buf + lzi->block_buf_size; assert(lzi->block_buf != NULL); - + lzi->cur_loc = 0; lzi->block_loc = 0; lzi->chars_in_buf = 0; @@ -114,7 +114,7 @@ int tmp_output_match(lz_info *lzi, int match_pos, int match_len) { lz_user_data *lzud = (lz_user_data *)lzi->user_data; int mod_match_loc; - + mod_match_loc = match_pos; fprintf(lzud->outfile, "(%d, %d)(%d)\n", match_pos, match_len, mod_match_loc); @@ -280,13 +280,13 @@ static void lz_analyze_block(lz_info *lzi) #endif } -void lz_stop_compressing(lz_info *lzi) +void lz_stop_compressing(lz_info *lzi) { lzi->stop = 1; /* fprintf(stderr, "Stopping...\n");*/ } -int lz_compress(lz_info *lzi, int nchars) +int lz_compress(lz_info *lzi, int nchars) { u_char *bbp, *bbe; @@ -311,7 +311,7 @@ int lz_compress(lz_info *lzi, int nchars) #endif memmove(lzi->block_buf, lzi->block_buf + lzi->chars_in_buf - bytes_to_move, bytes_to_move); - + lzi->block_loc = bytes_to_move - residual; lzi->chars_in_buf = bytes_to_move; #ifdef DEBUG_ANALYZE_BLOCK @@ -365,7 +365,7 @@ int lz_compress(lz_info *lzi, int nchars) len = 1; /* this is the lazy eval case */ } - else + else #endif if (lzi->output_match(lzi, (*prevp - lzi->block_buf) - lzi->block_loc, len) < 0) { @@ -375,7 +375,7 @@ int lz_compress(lz_info *lzi, int nchars) } else len = 1; - + if (len < lzi->min_match) { assert(len == 1); lzi->output_literal(lzi, *bbp); diff --git a/sdk/tools/hhpcomp/lzx_compress/lzx_compress.h b/sdk/tools/hhpcomp/lzx_compress/lzx_compress.h index 9390fbfeedc..b25b32e5419 100644 --- a/sdk/tools/hhpcomp/lzx_compress/lzx_compress.h +++ b/sdk/tools/hhpcomp/lzx_compress/lzx_compress.h @@ -28,7 +28,7 @@ typedef struct lzx_results long len_uncompressed_input; } lzx_results; -int lzx_init(struct lzx_data **lzxdp, int wsize_code, +int lzx_init(struct lzx_data **lzxdp, int wsize_code, lzx_get_bytes_t get_bytes, void *get_bytes_arg, lzx_at_eof_t at_eof, lzx_put_bytes_t put_bytes, void *put_bytes_arg, diff --git a/sdk/tools/hhpcomp/lzx_compress/lzx_constants.h b/sdk/tools/hhpcomp/lzx_compress/lzx_constants.h index 02b8ebac8b4..d06d37045b7 100644 --- a/sdk/tools/hhpcomp/lzx_compress/lzx_constants.h +++ b/sdk/tools/hhpcomp/lzx_compress/lzx_constants.h @@ -17,7 +17,7 @@ -------------------------------------- The above lines apply to the lzxcomp library as a whole. This file, lzx_constants.h, however, is probably uncopyrightable, and in any - case I explicitly place it in the public domain. + case I explicitly place it in the public domain. Matthew T. Russotto */ diff --git a/sdk/tools/hhpcomp/lzx_compress/lzx_layer.c b/sdk/tools/hhpcomp/lzx_compress/lzx_layer.c index 3d6ec0e60b9..a03fcb61bca 100644 --- a/sdk/tools/hhpcomp/lzx_compress/lzx_layer.c +++ b/sdk/tools/hhpcomp/lzx_compress/lzx_layer.c @@ -78,15 +78,15 @@ static int cmp_leaves(const void *in_a, const void *in_b) { const struct h_elem *a = in_a; const struct h_elem *b = in_b; - + if (!a->freq && b->freq) return 1; if (a->freq && !b->freq) return -1; - + if (a->freq == b->freq) return a->sym - b->sym; - + return a->freq - b->freq; } @@ -95,7 +95,7 @@ cmp_pathlengths(const void *in_a, const void *in_b) { const struct h_elem *a = in_a; const struct h_elem *b = in_b; - + if (a->pathlength == b->pathlength) #if 0 return a->sym - b->sym; @@ -107,7 +107,7 @@ cmp_pathlengths(const void *in_a, const void *in_b) } /* standard huffman building algorithm */ -static void +static void build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) { h_elem *leaves = malloc(nelem * sizeof(h_elem)); @@ -151,13 +151,13 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) } assert (!codes_too_long); } - + cur_leaf = leaves; next_inode = cur_inode = inodes; - + do { f1 = f2 = NULL; - if (leaves_left && + if (leaves_left && ((cur_inode == next_inode) || (cur_leaf->freq <= cur_inode->freq))) { f1 = (ih_elem *)cur_leaf++; @@ -166,8 +166,8 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) else if (cur_inode != next_inode) { f1 = cur_inode++; } - - if (leaves_left && + + if (leaves_left && ((cur_inode == next_inode) || (cur_leaf->freq <= cur_inode->freq))) { f2 = (ih_elem *)cur_leaf++; @@ -176,7 +176,7 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) else if (cur_inode != next_inode) { f2 = cur_inode++; } - + #ifdef DEBUG_HUFFMAN fprintf(stderr, "%d %d\n", f1, f2); #endif @@ -202,11 +202,11 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) while (f1 && f2); } while (codes_too_long); - + #ifdef DEBUG_HUFFMAN cur_inode = inodes; while (cur_inode < next_inode) { - fprintf(stderr, "%d l: %3d%c r: %3d%c freq: %8d\n", + fprintf(stderr, "%d l: %3d%c r: %3d%c freq: %8d\n", cur_inode - inodes, (cur_inode->left->sym!=-1)?(((struct h_elem *)cur_inode->left)-leaves):(cur_inode->left-inodes), (cur_inode->left->sym!=-1)?'l':'i', @@ -217,7 +217,7 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) cur_inode++; } #endif - + /* now traverse tree depth-first */ cur_inode = next_inode - 1; pathlength = 0; @@ -233,17 +233,17 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) else { /* mark node */ cur_inode->pathlength = pathlength; -#if 0 +#if 0 if (cur_inode->right) { /* right node of previously unmarked node is unmarked */ cur_inode = cur_inode->right; cur_inode->pathlength = -1; pathlength++; } - else + else #endif { - + /* time to come up. Keep coming up until an unmarked node is reached */ /* or the tree is exhausted */ do { @@ -263,16 +263,16 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) } } while (cur_inode); - + #ifdef DEBUG_HUFFMAN cur_inode = inodes; while (cur_inode < next_inode) { - fprintf(stderr, "%d l: %3d%c r: %3d%c freq: %8d pathlength %4d\n", + fprintf(stderr, "%d l: %3d%c r: %3d%c freq: %8d pathlength %4d\n", cur_inode - inodes, (cur_inode->left->sym!=-1)?(((struct h_elem *)cur_inode->left)-leaves):(cur_inode->left-inodes), (cur_inode->left->sym!=-1)?'l':'i', (cur_inode->right->sym!=-1)?(((struct h_elem *)cur_inode->right)-leaves):(cur_inode->right-inodes), - (cur_inode->right->sym!=-1)?'l':'i', + (cur_inode->right->sym!=-1)?'l':'i', (cur_inode->freq), (cur_inode->pathlength) ); @@ -280,11 +280,11 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) } #endif free(inodes); - + /* the pathlengths are already in order, so this sorts by symbol */ qsort(leaves, nelem, sizeof(h_elem), cmp_pathlengths); - - /** + + /** Microsoft's second condition on its canonical huffman codes is: For each level, starting at the deepest level of the tree and then @@ -292,13 +292,13 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) alternative way of stating this constraint is that if any tree node has children then all tree nodes to the left of it with the same path length must also have children. - + These 'alternatives' are not equivalent. The latter alternative gives the common canonical code where the longest code is all zeros. The former gives an opposite code where the longest code is all ones. Microsoft uses the former alternative. **/ - + #if 0 pathlength = leaves[0].pathlength; cur_code = 0; @@ -326,12 +326,12 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) cur_code++; } #endif - + #ifdef DEBUG_HUFFMAN for (i = 0; i < nleaves; i++) { char code[18]; int j; - + cur_code = leaves[i].code; code[leaves[i].pathlength] = 0; for (j = leaves[i].pathlength-1; j >= 0; j--) { @@ -358,19 +358,19 @@ build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree) leaves[1].code = 0; } } - + memset(tree, 0, nelem * sizeof(huff_entry)); for (i = 0; i < nleaves; i++) { tree[leaves[i].sym].codelength = leaves[i].pathlength; tree[leaves[i].sym].code = leaves[i].code; } - + free(leaves); } - + /* from Stuart Caie's code -- I'm hoping this code is too small to encumber this file. If not, you could rip it out and hard-code the tables */ - + static void lzx_init_static(void) { int i, j; @@ -449,7 +449,7 @@ lzx_get_chars(lz_info *lzi, int n, u_char *buf) lzud->left_in_block -= chars_read; #else lzud->left_in_frame -= chars_read % LZX_FRAME_SIZE; - if (lzud->left_in_frame < 0) + if (lzud->left_in_frame < 0) lzud->left_in_frame += LZX_FRAME_SIZE; #endif if ((chars_read < n) && (lzud->left_in_frame)) { @@ -530,7 +530,7 @@ static int find_match_at(lz_info *lzi, int loc, int match_len, int *match_locp) return -1; } #endif -static void check_entropy(lzx_data *lzud, int main_index) +static void check_entropy(lzx_data *lzud, int main_index) { /* entropy = - sum_alphabet P(x) * log2 P(x) */ /* entropy = - sum_alphabet f(x)/N * log2 (f(x)/N) */ @@ -538,12 +538,12 @@ static void check_entropy(lzx_data *lzud, int main_index) /* entropy = - 1/N (sum_alphabet f(x) * log2 f(x)) - sum_alphabet f(x) log2 N */ /* entropy = - 1/N (sum_alphabet f(x) * log2 f(x)) - log2 N sum_alphabet f(x) */ /* entropy = - 1/N (sum_alphabet f(x) * log2 f(x)) - N * log2 N */ - + /* entropy = - 1/N ((sum_alphabet f(x) * log2 f(x) ) - N * log2 N) */ /* entropy = - 1/N ((sum_alphabet f(x) * ln f(x) * 1/ln 2) - N * ln N * 1/ln 2) */ /* entropy = 1/(N ln 2) (N * ln N - (sum_alphabet f(x) * ln f(x))) */ /* entropy = 1/(N ln 2) (N * ln N + (sum_alphabet -f(x) * ln f(x))) */ - + /* entropy = 1/(N ln 2) ( sum_alphabet ln N * f(x) + (sum_alphabet -f(x) * ln f(x))) */ /* entropy = 1/(N ln 2) ( sum_alphabet ln N * f(x) + (-f(x) * ln f(x))) */ /* entropy = -1/(N ln 2) ( sum_alphabet -ln N * f(x) + (f(x) * ln f(x))) */ @@ -553,14 +553,14 @@ static void check_entropy(lzx_data *lzud, int main_index) /* entropy = -1/N ( sum_alphabet f(x)(log2 f(x)/N)) */ /* entropy = - ( sum_alphabet f(x)/N(log2 f(x)/N)) */ /* entropy = - ( sum_alphabet P(x)(log2 P(x))) */ - + double freq; double n_ln_n; double rn_ln2; double cur_ratio; int n; - + /* delete old entropy accumulation */ if (lzud->main_freq_table[main_index] != 1) { freq = (double)lzud->main_freq_table[main_index]-1; @@ -609,7 +609,7 @@ lzx_output_match(lz_info *lzi, int match_pos, int match_len) int i; int pos; for (i = 0; i < match_len; i++) { - + #ifdef NONSLIDE pos = match_pos + lzi->block_loc + i; fprintf(stderr, "%c", lzi->block_buf[pos]); @@ -672,13 +672,13 @@ lzx_output_match(lz_info *lzi, int match_pos, int match_len) lzud->R0 = -match_pos; /* calculate position base using binary search of table; if log2 can be - done in hardware, approximation might work; + done in hardware, approximation might work; trunc(log2(formatted_offset*formatted_offset)) gets either the proper position slot or the next one, except for slots 0, 1, and 39-49 Slots 0-1 are handled by the R0-R1 procedures - Slots 36-49 (formatted_offset >= 262144) can be found by + Slots 36-49 (formatted_offset >= 262144) can be found by (formatted_offset/131072) + 34 == (formatted_offset >> 17) + 34; */ @@ -767,7 +767,7 @@ lzx_output_match(lz_info *lzi, int match_pos, int match_len) return 0; /* accept the match */ } -static void +static void lzx_output_literal(lz_info *lzi, u_char ch) { lzx_data *lzud = (lzx_data *)lzi->user_data; @@ -818,7 +818,7 @@ static void lzx_write_bits(lzx_data *lzxd, int nbits, uint32_t bits) nbits -= shift_bits; cur_bits = 0; } - /* (cur_bits + nbits) < 16. If nbits = 0, we're done. + /* (cur_bits + nbits) < 16. If nbits = 0, we're done. otherwise move bits in */ shift_bits = nbits; mask_bits = (1U << shift_bits) - 1; @@ -864,18 +864,18 @@ lzx_write_compressed_literals(lzx_data *lzxd, int block_type) /* * 0x80000000 | bit 31 in intelligent bit ordering * (position_slot << 25) | bits 30-25 - * (position_footer << 8) | bits 8-24 + * (position_footer << 8) | bits 8-24 * (match_len - MIN_MATCH); bits 0-7 * */ - + match_len_m2 = block_code & 0xFF; /* 8 bits */ position_footer = (block_code >> 8)& 0x1FFFF; /* 17 bits */ position_slot = (block_code >> 25) & 0x3F; /* 6 bits */ #ifdef DEBUG_MATCHES_2 fprintf(stderr, "%08x, %3d %2d %d\n", lzxd->len_uncompressed_input + frame_count, match_len_m2, position_slot, position_footer); -#endif +#endif if (match_len_m2 < NUM_PRIMARY_LENGTHS) { length_header = match_len_m2; length_footer = 255; /* personal encoding for NULL */ @@ -926,7 +926,7 @@ lzx_write_compressed_literals(lzx_data *lzxd, int block_type) lzxd->len_uncompressed_input += frame_count; } -static int +static int lzx_write_compressed_tree(struct lzx_data *lzxd, struct huff_entry *tree, uint8_t *prevlengths, int treesize) @@ -982,7 +982,7 @@ lzx_write_compressed_tree(struct lzx_data *lzxd, *codep++ = 19; *runp++ = excess; freqs[19]++; - /* right, MS lies again. Code is NOT + /* right, MS lies again. Code is NOT prev_len + len (mod 17), it's prev_len - len (mod 17)*/ *codep = prevlengths[i-cur_run] - last_len; if (*codep > 16) *codep += 17; @@ -1049,7 +1049,7 @@ lzx_write_compressed_tree(struct lzx_data *lzxd, return 0; } -void +void lzx_reset(lzx_data *lzxd) { lzxd->need_1bit_header = 1; @@ -1068,7 +1068,7 @@ int lzx_compress_block(lzx_data *lzxd, int block_size, int subdivide) long comp_bits; long comp_bits_ovh; long uncomp_length; - + if ((lzxd->block_size != block_size) || (lzxd->block_codes == NULL)) { if (lzxd->block_codes != NULL) free(lzxd->block_codes); lzxd->block_size = block_size; @@ -1089,13 +1089,13 @@ int lzx_compress_block(lzx_data *lzxd, int block_size, int subdivide) lz_compress(lzxd->lzi, lzxd->left_in_block); if (lzxd->left_in_frame == 0) lzxd->left_in_frame = LZX_FRAME_SIZE; - - if ((lzxd->subdivide<0) || !lzxd->left_in_block || + + if ((lzxd->subdivide<0) || !lzxd->left_in_block || (!lz_left_to_process(lzxd->lzi) && lzxd->at_eof(lzxd->in_arg))) { /* now one block is LZ-analyzed. */ /* time to write it out */ uncomp_length = lzxd->block_size - lzxd->left_in_block - written_sofar; - /* uncomp_length will sometimes be 0 when input length is + /* uncomp_length will sometimes be 0 when input length is an exact multiple of frame size */ if (uncomp_length == 0) continue; @@ -1105,7 +1105,7 @@ int lzx_compress_block(lzx_data *lzxd, int block_size, int subdivide) #endif lzxd->subdivide = 1; } - + if (lzxd->need_1bit_header) { /* one bit Intel preprocessing header */ /* always 0 because this implementation doesn't do Intel preprocessing */ @@ -1140,32 +1140,32 @@ int lzx_compress_block(lzx_data *lzxd, int block_size, int subdivide) /* now write out the aligned offset trees if present */ if (block_type == LZX_ALIGNED_OFFSET_BLOCK) { for (i = 0; i < LZX_ALIGNED_SIZE; i++) { - lzx_write_bits(lzxd, 3, lzxd->aligned_tree[i].codelength); + lzx_write_bits(lzxd, 3, lzxd->aligned_tree[i].codelength); } } /* end extra bits */ build_huffman_tree(lzxd->main_tree_size, LZX_MAX_CODE_LENGTH, lzxd->main_freq_table, lzxd->main_tree); - build_huffman_tree(NUM_SECONDARY_LENGTHS, 16, + build_huffman_tree(NUM_SECONDARY_LENGTHS, 16, lzxd->length_freq_table, lzxd->length_tree); /* now write the pre-tree and tree for main 1 */ lzx_write_compressed_tree(lzxd, lzxd->main_tree, lzxd->prev_main_treelengths, NUM_CHARS); - + /* now write the pre-tree and tree for main 2*/ lzx_write_compressed_tree(lzxd, lzxd->main_tree + NUM_CHARS, lzxd->prev_main_treelengths + NUM_CHARS, lzxd->main_tree_size - NUM_CHARS); - + /* now write the pre tree and tree for length */ lzx_write_compressed_tree(lzxd, lzxd->length_tree, lzxd->prev_length_treelengths, NUM_SECONDARY_LENGTHS); - + /* now write literals */ lzx_write_compressed_literals(lzxd, block_type); - + /* copy treelengths somewhere safe to do delta compression */ for (i = 0; i < lzxd->main_tree_size; i++) { lzxd->prev_main_treelengths[i] = lzxd->main_tree[i].codelength; @@ -1176,7 +1176,7 @@ int lzx_compress_block(lzx_data *lzxd, int block_size, int subdivide) lzxd->main_entropy = 0.0; lzxd->last_ratio = 9999999.0; lzxd->block_codesp = lzxd->block_codes; - + memset(lzxd->length_freq_table, 0, NUM_SECONDARY_LENGTHS * sizeof(int)); memset(lzxd->main_freq_table, 0, lzxd->main_tree_size * sizeof(int)); memset(lzxd->aligned_freq_table, 0, LZX_ALIGNED_SIZE * sizeof(int)); @@ -1186,7 +1186,7 @@ int lzx_compress_block(lzx_data *lzxd, int block_size, int subdivide) return 0; } -int lzx_init(struct lzx_data **lzxdp, int wsize_code, +int lzx_init(struct lzx_data **lzxdp, int wsize_code, lzx_get_bytes_t get_bytes, void *get_bytes_arg, lzx_at_eof_t at_eof, lzx_put_bytes_t put_bytes, void *put_bytes_arg, diff --git a/sdk/tools/hhpcomp/utils.cpp b/sdk/tools/hhpcomp/utils.cpp index ea62013b46c..e34634195f5 100644 --- a/sdk/tools/hhpcomp/utils.cpp +++ b/sdk/tools/hhpcomp/utils.cpp @@ -1,17 +1,17 @@ // This file is part of hhpcomp, a free HTML Help Project (*.hhp) compiler. // Copyright (C) 2015 Benedikt Freisen -// +// // 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 Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -24,7 +24,7 @@ #if defined(_WIN32) #define WIN32_LEAN_AND_MEAN #include - #include // for GetFullPathNameA + #include // for GetFullPathNameA #else #include #endif diff --git a/sdk/tools/hhpcomp/utils.h b/sdk/tools/hhpcomp/utils.h index c027b9eb9e7..49d07f8428f 100644 --- a/sdk/tools/hhpcomp/utils.h +++ b/sdk/tools/hhpcomp/utils.h @@ -1,17 +1,17 @@ // This file is part of hhpcomp, a free HTML Help Project (*.hhp) compiler. // Copyright (C) 2015 Benedikt Freisen -// +// // 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 Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/sdk/tools/kbdtool/parser.c b/sdk/tools/kbdtool/parser.c index a1ca567201a..a58d5457ead 100644 --- a/sdk/tools/kbdtool/parser.c +++ b/sdk/tools/kbdtool/parser.c @@ -918,7 +918,7 @@ DoLAYOUT(IN PLAYOUT LayoutData, exit(1); } } - + /* Check if we have found any ScanCode in the file */ if (ScanCodeCount == -1) diff --git a/sdk/tools/mkisofs/reactos/xconfig.h b/sdk/tools/mkisofs/reactos/xconfig.h index 484acc3db4b..8cb5b739500 100644 --- a/sdk/tools/mkisofs/reactos/xconfig.h +++ b/sdk/tools/mkisofs/reactos/xconfig.h @@ -187,7 +187,7 @@ #define uid_t int #define gid_t int #define nlink_t unsigned long - + #ifdef _MSC_VER #define mode_t int #endif diff --git a/sdk/tools/port/getopt.c b/sdk/tools/port/getopt.c index 1613acafad8..90c41814a0a 100644 --- a/sdk/tools/port/getopt.c +++ b/sdk/tools/port/getopt.c @@ -16,7 +16,7 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see . */ - + #include "getopt.h" #include @@ -114,7 +114,7 @@ int optopt = '?'; /* Keep a global copy of all internal members of getopt_data. */ static struct _getopt_data getopt_data; - + /* Exchange two adjacent subsequences of ARGV. One subsequence is elements [first_nonopt,last_nonopt) which contains all the non-options that have been skipped so far. @@ -407,7 +407,7 @@ _getopt_initialize (int argc, d->__initialized = 1; return optstring; } - + /* Scan elements of ARGV (whose length is ARGC) for option characters given in OPTSTRING. @@ -736,7 +736,7 @@ GETOPT_ENTRY(__posix_getopt, 1) GETOPT_ENTRY(getopt, 1) #endif - + #ifdef TEST /* Compile with -DTEST to make an executable for use in testing diff --git a/sdk/tools/port/getopt1.c b/sdk/tools/port/getopt1.c index d767dcce131..fb3936e4cc0 100644 --- a/sdk/tools/port/getopt1.c +++ b/sdk/tools/port/getopt1.c @@ -16,7 +16,7 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see . */ - + #include "getopt.h" #include "getopt_int.h" @@ -60,7 +60,7 @@ _getopt_long_only_r (int argc, char **argv, const char *options, 1, d, 0); } - + #ifdef TEST #include diff --git a/sdk/tools/port/getopt_int.h b/sdk/tools/port/getopt_int.h index 0a0125e018d..51aa549d8c9 100644 --- a/sdk/tools/port/getopt_int.h +++ b/sdk/tools/port/getopt_int.h @@ -27,7 +27,7 @@ extern int _getopt_internal (int ___argc, char **___argv, const struct option *__longopts, int *__longind, int __long_only, int __posixly_correct); - + /* Reentrant versions which can handle parsing multiple argument vectors at the same time. */ diff --git a/sdk/tools/rsym/dwarf2.h b/sdk/tools/rsym/dwarf2.h index f07054d6ebc..3ff1f38cfd4 100644 --- a/sdk/tools/rsym/dwarf2.h +++ b/sdk/tools/rsym/dwarf2.h @@ -751,7 +751,7 @@ enum dwarf_macinfo_record_type DW_MACINFO_end_file = 4, DW_MACINFO_vendor_ext = 255 }; - + /* @@@ For use with GNU frame unwind information. */ #define DW_EH_PE_absptr 0x00 diff --git a/sdk/tools/rsym/rsym64.c b/sdk/tools/rsym/rsym64.c index b7e3a665294..80861e4814f 100644 --- a/sdk/tools/rsym/rsym64.c +++ b/sdk/tools/rsym/rsym64.c @@ -270,7 +270,7 @@ DwExecIntruction(PDW2CFSTATE State, char *pc) /* These work differently. We are in a new function. * We have to parse a lea opcode to find the adress of - * the jump target. This is the reference to find the + * the jump target. This is the reference to find the * appropriate C_SCOPE_TABLE. */ case 6: /* Filter func */ // printf("Found a filter func at 0x%lx\n", State->Location); @@ -292,9 +292,9 @@ DwExecIntruction(PDW2CFSTATE State, char *pc) fprintf(stderr, "unknown instruction 0x%x at 0x%p\n", Code, pc); exit(1); } - + State->FramePtrDiff = State->FramePtr - PrevFramePtr; - DPRINT("@%p: code=%x, Loc=%lx, offset=%lx, reg=0x%lx:%s\n", + DPRINT("@%p: code=%x, Loc=%lx, offset=%lx, reg=0x%lx:%s\n", (void*)((ULONG)pc - g_ehframep), Code, State->Location, State->Offset, State->Reg, regs[State->Reg].name); return Length; } @@ -441,7 +441,7 @@ StoreUnwindInfo(PUNWIND_INFO Info, PDW2FDE pFde, ULONG FunctionStart) ULONG *pExceptionHandler; PC_SCOPE_TABLE pScopeTable; - /* Set flag for exception handler */ + /* Set flag for exception handler */ Info->Flags |= UNW_FLAG_EHANDLER; /* Store address of handler and number of scope tables */ @@ -460,7 +460,7 @@ StoreUnwindInfo(PUNWIND_INFO Info, PDW2FDE pFde, ULONG FunctionStart) pScopeTable->Entry[i].Handler = 1;//State.SehBlock[i].Handler; pScopeTable->Entry[i].Target = State.SehBlock[i].Target; } - + /* Update size */ cbSize += 8 + State.cScopes * sizeof(C_SCOPE_TABLE_ENTRY); } @@ -535,7 +535,7 @@ GeneratePData(PFILE_INFO File) /* Get sizes */ CountUnwindData(File); -// printf("cFuncs = %ld, cUWOPS = %ld, cScopes = %ld\n", +// printf("cFuncs = %ld, cUWOPS = %ld, cScopes = %ld\n", // File->cFuncs, File->cUWOP, File->cScopes); /* Initialize section header for .pdata */ @@ -727,7 +727,7 @@ ParsePEHeaders(PFILE_INFO File) /* Check if MZ header exists */ File->DosHeader = (PIMAGE_DOS_HEADER)File->FilePtr; - if ((File->DosHeader->e_magic != IMAGE_DOS_MAGIC) || + if ((File->DosHeader->e_magic != IMAGE_DOS_MAGIC) || (File->DosHeader->e_lfanew == 0L)) { perror("Input file is not a PE image.\n"); @@ -735,7 +735,7 @@ ParsePEHeaders(PFILE_INFO File) } /* Locate PE file header */ - File->FileHeader = (PIMAGE_FILE_HEADER)(File->FilePtr + + File->FileHeader = (PIMAGE_FILE_HEADER)(File->FilePtr + File->DosHeader->e_lfanew + sizeof(ULONG)); /* Check for x64 image */ @@ -794,7 +794,7 @@ ParsePEHeaders(PFILE_INFO File) { unsigned long index = strtoul(pName+1, 0, 10); pName = File->Strings + index; - + // Hack, simply remove all sections with long names File->UseSection[i] = 0; } @@ -806,7 +806,7 @@ ParsePEHeaders(PFILE_INFO File) File->eh_frame.idx = i; File->eh_frame.p = File->FilePtr + File->eh_frame.psh->PointerToRawData; } - + /* Increase number of used sections */ if (File->UseSection[i]) File->UsedSections = i+1; @@ -814,7 +814,7 @@ ParsePEHeaders(PFILE_INFO File) } /* This is the actual size of the new section headers */ - File->NewSectionHeaderSize = + File->NewSectionHeaderSize = (File->UsedSections+2) * sizeof(IMAGE_SECTION_HEADER); /* Calculate the position to start writing the sections to */ diff --git a/sdk/tools/rsym/rsym64.h b/sdk/tools/rsym/rsym64.h index 0249ebc7945..4000a42d577 100644 --- a/sdk/tools/rsym/rsym64.h +++ b/sdk/tools/rsym/rsym64.h @@ -122,7 +122,7 @@ typedef struct _UNWIND_INFO OPTIONAL ULONG ExceptionHandler; OPTIONAL ULONG FunctionEntry; }; - OPTIONAL ULONG ExceptionData[]; + OPTIONAL ULONG ExceptionData[]; */ } UNWIND_INFO, *PUNWIND_INFO; diff --git a/sdk/tools/widl/client.c b/sdk/tools/widl/client.c index 30b0dce5b8a..20ebd51a581 100644 --- a/sdk/tools/widl/client.c +++ b/sdk/tools/widl/client.c @@ -20,7 +20,7 @@ #include "config.h" #include "wine/port.h" - + #include #include #ifdef HAVE_UNISTD_H diff --git a/sdk/tools/widl/write_msft.c b/sdk/tools/widl/write_msft.c index 2fa7e193619..88cdbc78248 100644 --- a/sdk/tools/widl/write_msft.c +++ b/sdk/tools/widl/write_msft.c @@ -900,7 +900,7 @@ static int encode_type( if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; } else { @@ -936,7 +936,7 @@ static int encode_type( if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { int mix_field; - + if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & VT_TYPEMASK) | VT_ARRAY; } else { @@ -1551,7 +1551,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) } /* update the index data */ - typeinfo->func_indices[typeinfo->typeinfo->cElement & 0xffff] = id; + typeinfo->func_indices[typeinfo->typeinfo->cElement & 0xffff] = id; typeinfo->func_offsets[typeinfo->typeinfo->cElement & 0xffff] = offset; typeinfo->func_names[typeinfo->typeinfo->cElement & 0xffff] = name_offset; @@ -1607,7 +1607,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) unsigned int typedata_size; INT *typedata; unsigned int var_datawidth, var_alignment = 0; - int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; + int var_type_size, var_kind = 0 /* VAR_PERINSTANCE */; int alignment; int varflags = 0; const attr_t *attr; @@ -2705,7 +2705,7 @@ int create_msft_typelib(typelib_t *typelib) set_help_context(msft); set_help_string_dll(msft); set_help_string_context(msft); - + /* midl adds two sets of custom data to the library: the current unix time and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE"); diff --git a/sdk/tools/xml2sdb/tinyxml2.cpp b/sdk/tools/xml2sdb/tinyxml2.cpp index 7ab0c9a59c2..6f28dd5c837 100644 --- a/sdk/tools/xml2sdb/tinyxml2.cpp +++ b/sdk/tools/xml2sdb/tinyxml2.cpp @@ -716,7 +716,7 @@ XMLNode::~XMLNode() } } -const char* XMLNode::Value() const +const char* XMLNode::Value() const { // Catch an edge case: XMLDocuments don't have a a Value. Carefully return nullptr. if ( this->ToDocument() ) @@ -1239,12 +1239,12 @@ bool XMLUnknown::Accept( XMLVisitor* visitor ) const // --------- XMLAttribute ---------- // -const char* XMLAttribute::Name() const +const char* XMLAttribute::Name() const { return _name.GetStr(); } -const char* XMLAttribute::Value() const +const char* XMLAttribute::Value() const { return _value.GetStr(); } @@ -1434,7 +1434,7 @@ void XMLElement::SetText( const char* inText ) } -void XMLElement::SetText( int v ) +void XMLElement::SetText( int v ) { char buf[BUF_SIZE]; XMLUtil::ToStr( v, buf, BUF_SIZE ); @@ -1442,7 +1442,7 @@ void XMLElement::SetText( int v ) } -void XMLElement::SetText( unsigned v ) +void XMLElement::SetText( unsigned v ) { char buf[BUF_SIZE]; XMLUtil::ToStr( v, buf, BUF_SIZE ); @@ -1450,7 +1450,7 @@ void XMLElement::SetText( unsigned v ) } -void XMLElement::SetText( bool v ) +void XMLElement::SetText( bool v ) { char buf[BUF_SIZE]; XMLUtil::ToStr( v, buf, BUF_SIZE ); @@ -1458,7 +1458,7 @@ void XMLElement::SetText( bool v ) } -void XMLElement::SetText( float v ) +void XMLElement::SetText( float v ) { char buf[BUF_SIZE]; XMLUtil::ToStr( v, buf, BUF_SIZE ); @@ -1466,7 +1466,7 @@ void XMLElement::SetText( float v ) } -void XMLElement::SetText( double v ) +void XMLElement::SetText( double v ) { char buf[BUF_SIZE]; XMLUtil::ToStr( v, buf, BUF_SIZE ); @@ -1808,7 +1808,7 @@ void XMLDocument::Clear() _commentPool.Trace( "comment" ); _attributePool.Trace( "attribute" ); #endif - + #ifdef DEBUG if ( !hadError ) { TIXMLASSERT( _elementPool.CurrentAllocs() == _elementPool.Untracked() ); @@ -1884,7 +1884,7 @@ static FILE* callfopen( const char* filepath, const char* mode ) #endif return fp; } - + void XMLDocument::DeleteNode( XMLNode* node ) { TIXMLASSERT( node ); TIXMLASSERT(node->_document == this ); diff --git a/sdk/tools/xml2sdb/tinyxml2.h b/sdk/tools/xml2sdb/tinyxml2.h index 06eee304a90..3a08bd60afe 100644 --- a/sdk/tools/xml2sdb/tinyxml2.h +++ b/sdk/tools/xml2sdb/tinyxml2.h @@ -319,7 +319,7 @@ public: ~MemPoolT() { Clear(); } - + void Clear() { // Delete the blocks. while( !_blockPtrs.Empty()) { @@ -363,7 +363,7 @@ public: _nUntracked++; return result; } - + virtual void Free( void* mem ) { if ( !mem ) { return; @@ -533,7 +533,7 @@ public: static bool IsWhiteSpace( char p ) { return !IsUTF8Continuation(p) && isspace( static_cast(p) ); } - + inline static bool IsNameStartChar( unsigned char ch ) { if ( ch >= 128 ) { // This is a heuristic guess in attempt to not implement Unicode-aware isalpha() @@ -544,7 +544,7 @@ public: } return ch == ':' || ch == '_'; } - + inline static bool IsNameChar( unsigned char ch ) { return IsNameStartChar( ch ) || isdigit( ch ) @@ -558,7 +558,7 @@ public: } return strncmp( p, q, nChar ) == 0; } - + inline static bool IsUTF8Continuation( char p ) { return ( p & 0x80 ) != 0; } @@ -1275,14 +1275,14 @@ public: return a->QueryFloatValue( value ); } - + /** Given an attribute name, QueryAttribute() returns XML_NO_ERROR, XML_WRONG_ATTRIBUTE_TYPE if the conversion can't be performed, or XML_NO_ATTRIBUTE if the attribute doesn't exist. It is overloaded for the primitive types, and is a generally more convenient replacement of QueryIntAttribute() and related functions. - + If successful, the result of the conversion will be written to 'value'. If not successful, nothing will be written to 'value'. This allows you to provide default @@ -1410,7 +1410,7 @@ public: @verbatim Hullaballoo!This is text @endverbatim - + For this XML: @verbatim @@ -1424,13 +1424,13 @@ public: /// Convenience method for setting text inside an element. See SetText() for important limitations. void SetText( int value ); /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( unsigned value ); + void SetText( unsigned value ); /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( bool value ); + void SetText( bool value ); /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( double value ); + void SetText( double value ); /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( float value ); + void SetText( float value ); /** Convenience method to query the value of a child text node. This is probably best @@ -1555,8 +1555,8 @@ public: /** Load an XML file from disk. You are responsible - for providing and closing the FILE*. - + for providing and closing the FILE*. + NOTE: The file should be opened as binary ("rb") not text in order for TinyXML-2 to correctly do newline normalization. @@ -1693,7 +1693,7 @@ public: } /// If there is an error, print it to stdout. void PrintError() const; - + /// Clear the document, resetting it to the initial state. void Clear();