Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[sedwards] 15108: remove whitespace from end of lines
by sedwards＠svn.reactos.com 08 May '05

08 May '05

remove whitespace from end of lines Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c Modified: trunk/reactos/drivers/bus/acpi/ospm/bn.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bm.h Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bn.h Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/bus/pci/pcidef.h Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/serenum/detect.c Modified: trunk/reactos/drivers/bus/serenum/fdo.c Modified: trunk/reactos/drivers/bus/serenum/misc.c Modified: trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/drivers/bus/serenum/serenum.c Modified: trunk/reactos/drivers/bus/serenum/serenum.h Modified: trunk/reactos/drivers/dd/blue/blue.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.h Modified: trunk/reactos/drivers/dd/debugout/debugout.c Modified: trunk/reactos/drivers/dd/green/createclose.c Modified: trunk/reactos/drivers/dd/green/dispatch.c Modified: trunk/reactos/drivers/dd/green/green.c Modified: trunk/reactos/drivers/dd/green/green.h Modified: trunk/reactos/drivers/dd/green/keyboard.c Modified: trunk/reactos/drivers/dd/green/misc.c Modified: trunk/reactos/drivers/dd/green/pnp.c Modified: trunk/reactos/drivers/dd/green/screen.c Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c Modified: trunk/reactos/drivers/dd/mpu401/portio.c Modified: trunk/reactos/drivers/dd/null/null.c Modified: trunk/reactos/drivers/dd/parallel/parallel.c Modified: trunk/reactos/drivers/dd/parallel/parallel.h Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/cleanup.c Modified: trunk/reactos/drivers/dd/serial/close.c Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/power.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.c Modified: trunk/reactos/drivers/dd/serial/serial.h Modified: trunk/reactos/drivers/dd/sndblst/portio.c Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c Modified: trunk/reactos/drivers/dd/sound/dsp.c Modified: trunk/reactos/drivers/dd/sound/mixer.c Modified: trunk/reactos/drivers/dd/sound/sb16.c Modified: trunk/reactos/drivers/dd/sound/sb16.h Modified: trunk/reactos/drivers/dd/sound/sound.c Modified: trunk/reactos/drivers/dd/sound/wave.c Modified: trunk/reactos/drivers/dd/sound/wave.h Modified: trunk/reactos/drivers/dd/test/test.c Modified: trunk/reactos/drivers/fs/cdfs/cdfs.c Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c Modified: trunk/reactos/drivers/fs/cdfs/close.c Modified: trunk/reactos/drivers/fs/cdfs/common.c Modified: trunk/reactos/drivers/fs/cdfs/create.c Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/cdfs/finfo.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/fs/cdfs/misc.c Modified: trunk/reactos/drivers/fs/cdfs/rw.c Modified: trunk/reactos/drivers/fs/ext2/attr.c Modified: trunk/reactos/drivers/fs/ext2/blockdev.c Modified: trunk/reactos/drivers/fs/ext2/dir.c Modified: trunk/reactos/drivers/fs/ext2/ext2fs.h Modified: trunk/reactos/drivers/fs/ext2/file.c Modified: trunk/reactos/drivers/fs/ext2/inode.c Modified: trunk/reactos/drivers/fs/ext2/quota.c Modified: trunk/reactos/drivers/fs/ext2/rw.c Modified: trunk/reactos/drivers/fs/ext2/security.c Modified: trunk/reactos/drivers/fs/ext2/super.c Modified: trunk/reactos/drivers/fs/fs_rec/fat.c Modified: trunk/reactos/drivers/fs/minix/bitops.c Modified: trunk/reactos/drivers/fs/minix/block.c Modified: trunk/reactos/drivers/fs/minix/blockdev.c Modified: trunk/reactos/drivers/fs/minix/cache.c Modified: trunk/reactos/drivers/fs/minix/dir.c Modified: trunk/reactos/drivers/fs/minix/inode.c Modified: trunk/reactos/drivers/fs/minix/minix.h Modified: trunk/reactos/drivers/fs/minix/mount.c Modified: trunk/reactos/drivers/fs/minix/rw.c Modified: trunk/reactos/drivers/fs/ms/create.c Modified: trunk/reactos/drivers/fs/ms/finfo.c [truncated at 100 lines; 288 more skipped] _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c --- trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -16,7 +16,7 @@ #ifdef ALLOC_PRAGMA -// Make the initialization routines discardable, so that they +// Make the initialization routines discardable, so that they // don't waste space #pragma alloc_text(init, DriverEntry) @@ -27,8 +27,8 @@ NTSTATUS STDCALL ACPIDispatchDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PIO_STACK_LOCATION IrpSp; NTSTATUS Status; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/bn.c --- trunk/reactos/drivers/bus/acpi/ospm/bn.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/bn.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -176,7 +176,7 @@ * ------------- * Either fixed-feature or generic (namespace) types. */ - if (strncmp(device->id.hid, BN_HID_POWER_BUTTON, + if (strncmp(device->id.hid, BN_HID_POWER_BUTTON, sizeof(BM_DEVICE_HID)) == 0) { if (device->id.type == BM_TYPE_FIXED_BUTTON) { @@ -185,7 +185,7 @@ /* Register for fixed-feature events. */ status = acpi_install_fixed_event_handler( - ACPI_EVENT_POWER_BUTTON, bn_notify_fixed, + ACPI_EVENT_POWER_BUTTON, bn_notify_fixed, (void*)button); } else { @@ -201,7 +201,7 @@ * ------------- * Either fixed-feature or generic (namespace) types. */ - else if (strncmp( device->id.hid, BN_HID_SLEEP_BUTTON, + else if (strncmp( device->id.hid, BN_HID_SLEEP_BUTTON, sizeof(BM_DEVICE_HID)) == 0) { if (device->id.type == BM_TYPE_FIXED_BUTTON) { @@ -210,7 +210,7 @@ /* Register for fixed-feature events. */ status = acpi_install_fixed_event_handler( - ACPI_EVENT_SLEEP_BUTTON, bn_notify_fixed, + ACPI_EVENT_SLEEP_BUTTON, bn_notify_fixed, (void*)button); } else { @@ -224,7 +224,7 @@ * LID Switch? * ----------- */ - else if (strncmp( device->id.hid, BN_HID_LID_SWITCH, + else if (strncmp( device->id.hid, BN_HID_LID_SWITCH, sizeof(BM_DEVICE_HID)) == 0) { button->type = BN_TYPE_LID_SWITCH; @@ -360,7 +360,7 @@ */ MEMCPY(criteria.hid, BN_HID_LID_SWITCH, sizeof(BN_HID_LID_SWITCH)); status = bm_register_driver(&criteria, &driver); - + if (status == AE_NOT_FOUND) status = AE_OK; @@ -457,13 +457,13 @@ case BN_TYPE_POWER_BUTTON_FIXED: DEBUG_PRINT(ACPI_INFO, ("Fixed-feature button status change event detected.\n")); - /*bm_generate_event(button->device_handle, BN_PROC_ROOT, + /*bm_generate_event(button->device_handle, BN_PROC_ROOT, BN_PROC_POWER_BUTTON, BN_NOTIFY_STATUS_CHANGE, 0);*/ break; case BN_TYPE_SLEEP_BUTTON_FIXED: DEBUG_PRINT(ACPI_INFO, ("Fixed-feature button status change event detected.\n")); - /*bm_generate_event(button->device_handle, BN_PROC_ROOT, + /*bm_generate_event(button->device_handle, BN_PROC_ROOT, BN_PROC_SLEEP_BUTTON, BN_NOTIFY_STATUS_CHANGE, 0);*/ break; @@ -507,11 +507,11 @@ case BM_NOTIFY_DEVICE_ADDED: status = bn_add_device(device_handle, context); break; - + case BM_NOTIFY_DEVICE_REMOVED: status = bn_remove_device(context); break; - + case BN_NOTIFY_STATUS_CHANGE: DEBUG_PRINT(ACPI_INFO, ("Button status change event detected.\n")); @@ -525,7 +525,7 @@ case BN_TYPE_POWER_BUTTON: case BN_TYPE_POWER_BUTTON_FIXED: - /*bm_generate_event(device_handle, BN_PROC_ROOT, + /*bm_generate_event(device_handle, BN_PROC_ROOT, BN_PROC_POWER_BUTTON, notify_type, 0);*/ break; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -214,7 +214,7 @@ * Evaluate _STA: * -------------- */ - status = bm_evaluate_simple_integer(device->acpi_handle, "_STA", + status = bm_evaluate_simple_integer(device->acpi_handle, "_STA", &(device->status)); return status; @@ -263,12 +263,12 @@ } if (info.valid & ACPI_VALID_UID) { - MEMCPY((void*)device->id.uid, (void*)info.unique_id, + MEMCPY((void*)device->id.uid, (void*)info.unique_id, sizeof(BM_DEVICE_UID)); } if (info.valid & ACPI_VALID_HID) { - MEMCPY((void*)device->id.hid, (void*)info.hardware_id, + MEMCPY((void*)device->id.hid, (void*)info.hardware_id, sizeof(BM_DEVICE_HID)); } @@ -311,7 +311,7 @@ /* * Presence of _DCK indicates a docking station. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_DCK", &acpi_handle))) { device->flags |= BM_FLAGS_DOCKING_STATION; } @@ -320,7 +320,7 @@ * Presence of _EJD and/or _EJx indicates 'ejectable'. * TODO: _EJx... */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_EJD", &acpi_handle))) { device->flags |= BM_FLAGS_EJECTABLE; } @@ -328,9 +328,9 @@ /* * Presence of _PR0 or _PS0 indicates 'power manageable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR0", &acpi_handle)) || - ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS0", &acpi_handle))) { device->flags |= BM_FLAGS_POWER_CONTROL; } @@ -338,7 +338,7 @@ /* * Presence of _CRS indicates 'configurable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_CRS", &acpi_handle))) { device->flags |= BM_FLAGS_CONFIGURABLE; } @@ -351,9 +351,9 @@ /* * Presence of _HID or _ADR indicates 'identifiable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_HID", &acpi_handle)) || - ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_ADR", &acpi_handle))) { device->flags |= BM_FLAGS_IDENTIFIABLE; } @@ -361,7 +361,7 @@ /* * Presence of _STA indicates 'dynamic status'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_STA", &acpi_handle))) { device->flags |= BM_FLAGS_DYNAMIC_STATUS; } @@ -428,7 +428,7 @@ /* * Device Type: * ------------ - */ + */ switch (acpi_type) { case INTERNAL_TYPE_SCOPE: device->id.type = BM_TYPE_SCOPE; @@ -481,7 +481,7 @@ /* * Power Management: * ----------------- - * If this node doesn't provide direct power control + * If this node doesn't provide direct power control * then we inherit PM capabilities from its parent. * * TODO: Inherit! @@ -572,8 +572,8 @@ if (ACPI_SUCCESS(status)) { /* - * TODO: This is a hack to get around the problem - * identifying scope objects. Scopes + * TODO: This is a hack to get around the problem + * identifying scope objects. Scopes * somehow need to be uniquely identified. */ status = acpi_get_type(child_handle, &acpi_type); @@ -621,7 +621,7 @@ else { level--; child_handle = parent_handle; - acpi_get_parent(parent_handle, + acpi_get_parent(parent_handle, &parent_handle); if (parent) { @@ -683,7 +683,7 @@ node->device.acpi_handle = ACPI_ROOT_OBJECT; node->device.id.type = BM_TYPE_FIXED_BUTTON; if (device_hid) { - MEMCPY((void*)node->device.id.hid, device_hid, + MEMCPY((void*)node->device.id.hid, device_hid, sizeof(node->device.id.hid)); } node->device.flags = BM_FLAGS_FIXED_FEATURE; @@ -950,14 +950,14 @@ */ DEBUG_PRINT(ACPI_INFO, ("Registering for all device notifications.\n")); - status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, &bm_notify, NULL); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to register for standard notifications.\n")); return_ACPI_STATUS(status); } - status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, ACPI_DEVICE_NOTIFY, &bm_notify, NULL); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to register for device-specific notifications.\n")); @@ -1019,13 +1019,13 @@ DEBUG_PRINT(ACPI_INFO, ("Unregistering for device notifications.\n")); - status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, &bm_notify); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to un-register for standard notifications.\n")); } - status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, ACPI_DEVICE_NOTIFY, &bm_notify); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to un-register for device-specific notifications.\n")); _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -63,13 +63,13 @@ DEBUG_PRINT(ACPI_INFO, ("Sending notify [0x%02x] to device [0x%02x].\n", notify_type, node->device.handle)); - if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || + if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || !(node->driver.notify)) { DEBUG_PRINT(ACPI_WARN, ("No driver installed for device [0x%02x].\n", node->device.handle)); return_ACPI_STATUS(AE_NOT_EXIST); } - status = node->driver.notify(notify_type, node->device.handle, + status = node->driver.notify(notify_type, node->device.handle, &(node->driver.context)); return_ACPI_STATUS(status); @@ -130,7 +130,7 @@ if (ACPI_FAILURE(status)) { return_ACPI_STATUS(status); } - + if (old_status == node->device.status) { return_ACPI_STATUS(AE_OK); } @@ -138,12 +138,12 @@ if (status_change) { *status_change = TRUE; } - + /* * Device Insertion? * ----------------- */ - if ((device->status & BM_STATUS_PRESENT) && + if ((device->status & BM_STATUS_PRESENT) && !(old_status & BM_STATUS_PRESENT)) { /* TODO: Make sure driver is loaded, and if not, load. */ status = bm_generate_notify(node, BM_NOTIFY_DEVICE_ADDED); @@ -153,7 +153,7 @@ * Device Removal? * --------------- */ - else if (!(device->status & BM_STATUS_PRESENT) && + else if (!(device->status & BM_STATUS_PRESENT) && (old_status & BM_STATUS_PRESENT)) { /* TODO: Unload driver if last device instance. */ status = bm_generate_notify(node, BM_NOTIFY_DEVICE_REMOVED); @@ -247,7 +247,7 @@ /* * Device-Specific or Standard? * ---------------------------- - * Device-specific notifies are forwarded to the control module's + * Device-specific notifies are forwarded to the control module's * notify() function for processing. Standard notifies are handled * internally. */ _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -72,21 +72,21 @@ /* * Calculate Power State: * ---------------------- - * Try to infer the devices's power state by checking the state of - * the devices's power resources. We start by evaluating _PR0 - * (resource requirements at D0) and work through _PR1 and _PR2. - * We know the current devices power state when all resources (for - * a give Dx state) are ON. If no power resources are on then the + * Try to infer the devices's power state by checking the state of + * the devices's power resources. We start by evaluating _PR0 + * (resource requirements at D0) and work through _PR1 and _PR2. + * We know the current devices power state when all resources (for + * a give Dx state) are ON. If no power resources are on then the * device is assumed to be off (D3). */ for (i=ACPI_STATE_D0; i<ACPI_STATE_D3; i++) { - status = bm_evaluate_reference_list(device->acpi_handle, + status = bm_evaluate_reference_list(device->acpi_handle, object_name, &pr_list); if (ACPI_SUCCESS(status)) { - status = bm_pr_list_get_state(&pr_list, + status = bm_pr_list_get_state(&pr_list, &list_state); if (ACPI_SUCCESS(status)) { @@ -137,7 +137,7 @@ device->power.state = ACPI_STATE_UNKNOWN; if (device->flags & BM_FLAGS_POWER_STATE) { - status = bm_evaluate_simple_integer(device->acpi_handle, + status = bm_evaluate_simple_integer(device->acpi_handle, "_PSC", &(device->power.state)); } else { @@ -204,24 +204,24 @@ /* * Get Resources: * -------------- - * Get the power resources associated with the device's current + * Get the power resources associated with the device's current * and target power states. */ if (device->power.state != ACPI_STATE_UNKNOWN) { object_name[3] = '0' + device->power.state; - bm_evaluate_reference_list(device->acpi_handle, + bm_evaluate_reference_list(device->acpi_handle, object_name, &current_list); } object_name[3] = '0' + state; - bm_evaluate_reference_list(device->acpi_handle, object_name, + bm_evaluate_reference_list(device->acpi_handle, object_name, &target_list); /* * Transition Resources: * --------------------- - * Transition all power resources referenced by this device to - * the correct power state (taking into consideration sequencing + * Transition all power resources referenced by this device to + * the correct power state (taking into consideration sequencing * and dependencies to other devices). */ if (current_list.count || target_list.count) { @@ -234,7 +234,7 @@ /* * Execute _PSx: * ------------- - * Execute the _PSx method corresponding to the target Dx state, + * Execute the _PSx method corresponding to the target Dx state, * if it exists. */ object_name[2] = 'S'; @@ -287,17 +287,17 @@ * Power Management Flags: * ----------------------- */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PSC", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PSC", &acpi_handle))) { device->power.flags |= BM_FLAGS_POWER_STATE; } - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_IRC", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_IRC", &acpi_handle))) { device->power.flags |= BM_FLAGS_INRUSH_CURRENT; } - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PRW", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PRW", &acpi_handle))) { device->power.flags |= BM_FLAGS_WAKE_CAPABLE; } @@ -317,22 +317,22 @@ * Figure out which Dx states are supported by this device for the * S0 (working) state. Note that D0 and D3 are required (assumed). */ - device->power.dx_supported[ACPI_STATE_S0] = BM_FLAGS_D0_SUPPORT | + device->power.dx_supported[ACPI_STATE_S0] = BM_FLAGS_D0_SUPPORT | BM_FLAGS_D3_SUPPORT; - if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR1", - &acpi_handle))) || - (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS1", + if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR1", + &acpi_handle))) || + (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS1", &acpi_handle)))) { - device->power.dx_supported[ACPI_STATE_S0] |= + device->power.dx_supported[ACPI_STATE_S0] |= BM_FLAGS_D1_SUPPORT; } - if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR2", - &acpi_handle))) || - (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS2", + if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR2", + &acpi_handle))) || + (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS2", &acpi_handle)))) { - device->power.dx_supported[ACPI_STATE_S0] |= + device->power.dx_supported[ACPI_STATE_S0] |= BM_FLAGS_D2_SUPPORT; } @@ -352,28 +352,28 @@ /* * Evalute _SxD: * ------------- - * Which returns the highest (power) Dx state supported in - * this system (Sx) state. We convert this value to a bit + * Which returns the highest (power) Dx state supported in + * this system (Sx) state. We convert this value to a bit * mask of supported states (conceptually simpler). */ - status = bm_evaluate_simple_integer(device->acpi_handle, + status = bm_evaluate_simple_integer(device->acpi_handle, object_name, &dx_supported); if (ACPI_SUCCESS(status)) { switch (dx_supported) { case 0: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D0_SUPPORT; /* fall through */ case 1: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D1_SUPPORT; /* fall through */ case 2: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D2_SUPPORT; /* fall through */ case 3: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D3_SUPPORT; break; } @@ -381,12 +381,12 @@ /* * Validate: * --------- - * Mask of any states that _Sx_d falsely advertises - * (e.g.claims D1 support but neither _PR2 or _PS2 - * exist). In other words, S1-S5 can't offer a Dx + * Mask of any states that _Sx_d falsely advertises + * (e.g.claims D1 support but neither _PR2 or _PS2 + * exist). In other words, S1-S5 can't offer a Dx * state that isn't supported by S0. */ - device->power.dx_supported[i] &= + device->power.dx_supported[i] &= device->power.dx_supported[ACPI_STATE_S0]; } _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -27,7 +27,7 @@ * TODO: * ----- * 1. Sequencing of power resource list transitions. - * 2. Global serialization of power resource transtions (see ACPI + * 2. Global serialization of power resource transtions (see ACPI * spec section 7.1.2/7.1.3). * 3. Better error handling. */ @@ -51,13 +51,13 @@ BM_NOTIFY notify_type, BM_HANDLE device_handle, void **context); - + ACPI_STATUS bm_pr_request ( BM_REQUEST *request, void *context); - + /*********************************************************************** ***** * Internal Functions ************************************************************************ ****/ @@ -133,7 +133,7 @@ pr->state = ACPI_STATE_UNKNOWN; - /* + /* * Evaluate _STA: * -------------- * Evalute _STA to determine whether the power resource is ON or OFF. @@ -151,7 +151,7 @@ } /* - * Mask off all bits but the first as some systems return non-standard + * Mask off all bits but the first as some systems return non-standard * values (e.g. 0x51). */ switch (device_status & 0x01) { @@ -269,7 +269,7 @@ * ----------------------------- * The current state of a list of power resources is ON if all * power resources are currently in the ON state. In other words, - * if any power resource in the list is OFF then the collection + * if any power resource in the list is OFF then the collection * isn't fully ON. */ for (i = 0; i < pr_list->count; i++) { @@ -328,13 +328,13 @@ /* * Reference Target: * ----------------- - * Reference all resources for the target power state first (so - * the device doesn't get turned off while transitioning). Power + * Reference all resources for the target power state first (so + * the device doesn't get turned off while transitioning). Power * resources that aren't on (new reference count of 1) are turned on. */ for (i = 0; i < target_list->count; i++) { - status = bm_get_device_context(target_list->handles[i], + status = bm_get_device_context(target_list->handles[i], (BM_DRIVER_CONTEXT*)(&pr)); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_WARN, ("Invalid reference to power resource [0x%02X].\n", target_list->handles[i])); @@ -355,12 +355,12 @@ * Dereference Current: * -------------------- * Dereference all resources for the current power state. Power - * resources no longer referenced (new reference count of 0) are + * resources no longer referenced (new reference count of 0) are * turned off. */ for (i = 0; i < current_list->count; i++) { - status = bm_get_device_context(current_list->handles[i], + status = bm_get_device_context(current_list->handles[i], (BM_DRIVER_CONTEXT*)(&pr)); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_WARN, ("Invalid reference to power resource [0x%02X].\n", target_list->handles[i])); @@ -434,7 +434,7 @@ pr->device_handle = device->handle; pr->acpi_handle = device->acpi_handle; - /* + /* * Get information on this power resource. */ status = acpi_evaluate_object(pr->acpi_handle, NULL, NULL, &buffer); _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -62,7 +62,7 @@ DEBUG_PRINT(ACPI_INFO, ("Sending request [0x%02x] to device [0x%02x].\n", request->command, node->device.handle)); - if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || + if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || !(node->driver.request)) { DEBUG_PRINT(ACPI_WARN, ("No driver installed for device [0x%02x].\n", node->device.handle)); return_ACPI_STATUS(AE_NOT_EXIST); @@ -137,7 +137,7 @@ if (ACPI_FAILURE(status)) { break; } - status = bm_copy_to_buffer(&(request->buffer), + status = bm_copy_to_buffer(&(request->buffer), &(device->power.state), sizeof(BM_POWER_STATE)); break; @@ -145,7 +145,7 @@ { BM_POWER_STATE *power_state = NULL; - status = bm_cast_buffer(&(request->buffer), + status = bm_cast_buffer(&(request->buffer), (void**)&power_state, sizeof(BM_POWER_STATE)); if (ACPI_FAILURE(status)) { break; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -57,7 +57,7 @@ return AE_BAD_PARAMETER; } - /* + /* * Present? * -------- * We're only going to match on devices that are present. @@ -67,22 +67,22 @@ return AE_NOT_FOUND; } - /* + /* * type? */ if (criteria->type && !(criteria->type & device->id.type)) { return AE_NOT_FOUND; } - /* + /* * hid? */ - if ((criteria->hid[0]) && (0 != STRNCMP(criteria->hid, + if ((criteria->hid[0]) && (0 != STRNCMP(criteria->hid, device->id.hid, sizeof(BM_DEVICE_HID)))) { return AE_NOT_FOUND; } - /* + /* * adr? */ if ((criteria->adr) && (criteria->adr != device->id.adr)) { @@ -149,7 +149,7 @@ if (node->scope.head) { status = bm_compare(&(node->device), criteria); if (ACPI_SUCCESS(status)) { - results->handles[results->count++] = + results->handles[results->count++] = node->device.handle; } node = node->scope.head; @@ -163,16 +163,16 @@ else { status = bm_compare(&(node->device), criteria); if (ACPI_SUCCESS(status)) { - results->handles[results->count++] = + results->handles[results->count++] = node->device.handle; } /* * Locate Next Device: * ------------------- - * The next node is either a peer at this level - * (node->next is valid), or we work are way back - * up the tree until we either find a non-parsed + * The next node is either a peer at this level + * (node->next is valid), or we work are way back + * up the tree until we either find a non-parsed * peer or hit the top (node->parent is NULL). */ while (!node->next && node->parent) { _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -199,7 +199,7 @@ if (!package || (package->type != ACPI_TYPE_PACKAGE) || (package->package.count == 0) || !package_format || - (package_format->length < 1) || + (package_format->length < 1) || (!package_format->pointer) || !buffer) { return_ACPI_STATUS(AE_BAD_PARAMETER); } @@ -228,7 +228,7 @@ tail_offset += sizeof(ACPI_INTEGER); break; case 'S': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + sizeof(ACPI_INTEGER) + 1; tail_offset += sizeof(ACPI_INTEGER); break; @@ -243,12 +243,12 @@ case ACPI_TYPE_BUFFER: switch (format[i]) { case 'S': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + element->string.length + 1; tail_offset += sizeof(u8*); break; case 'B': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + element->buffer.length; tail_offset += sizeof(u8*); break; @@ -293,14 +293,14 @@ case ACPI_TYPE_INTEGER: switch (format[i]) { case 'N': - *((ACPI_INTEGER*)head) = + *((ACPI_INTEGER*)head) = element->integer.value; head += sizeof(ACPI_INTEGER); break; case 'S': pointer = (u8**)head; *pointer = tail; - *((ACPI_INTEGER*)tail) = + *((ACPI_INTEGER*)tail) = element->integer.value; head += sizeof(ACPI_INTEGER*); tail += sizeof(ACPI_INTEGER); @@ -320,7 +320,7 @@ case 'S': pointer = (u8**)head; *pointer = tail; - memcpy(tail, element->string.pointer, + memcpy(tail, element->string.pointer, element->string.length); head += sizeof(u8*); tail += element->string.length; @@ -331,7 +331,7 @@ case 'B': pointer = (u8**)head; *pointer = tail; - memcpy(tail, element->buffer.pointer, + memcpy(tail, element->buffer.pointer, element->buffer.length); head += sizeof(u8*); tail += element->buffer.length; @@ -361,11 +361,11 @@ * PARAMETERS: <TBD> * * RETURN: AE_OK - * AE_BUFFER_OVERFLOW Evaluated object returned data, but + * AE_BUFFER_OVERFLOW Evaluated object returned data, but * caller did not provide buffer. * * DESCRIPTION: Helper for acpi_evaluate_object that handles buffer - * allocation. Note that the caller is responsible for + * allocation. Note that the caller is responsible for * freeing buffer->pointer! * ************************************************************************ ****/ @@ -389,8 +389,8 @@ /* * Evalute Object: * --------------- - * The first attempt is just to get the size of the object data - * (that is unless there's no return data, e.g. _INI); the second + * The first attempt is just to get the size of the object data + * (that is unless there's no return data, e.g. _INI); the second * gets the data. */ status = acpi_evaluate_object(acpi_handle, pathname, arguments, buffer); @@ -407,14 +407,14 @@ } /* Re-evaluate -- this time it should work */ - status = acpi_evaluate_object(acpi_handle, pathname, + status = acpi_evaluate_object(acpi_handle, pathname, arguments, buffer); } if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); if (buffer && buffer->pointer) { - acpi_os_free(buffer->pointer); + acpi_os_free(buffer->pointer); buffer->pointer = NULL; buffer->length = 0; } @@ -467,7 +467,7 @@ * Validate Data: * -------------- */ - status = bm_cast_buffer(&buffer, (void**)&element, + status = bm_cast_buffer(&buffer, (void**)&element, sizeof(ACPI_OBJECT)); if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); @@ -535,7 +535,7 @@ * Validate Package: * ----------------- */ - status = bm_cast_buffer(&buffer, (void**)&package, + status = bm_cast_buffer(&buffer, (void**)&package, sizeof(ACPI_OBJECT)); if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); @@ -571,7 +571,7 @@ * Resolve reference string (e.g. "\_PR_.CPU_") to an * ACPI_HANDLE. */ - status = acpi_get_handle(acpi_handle, + status = acpi_get_handle(acpi_handle, element->string.pointer, &reference_handle); if (ACPI_FAILURE(status)) { status = AE_BAD_DATA; @@ -583,7 +583,7 @@ /* * Resolve ACPI_HANDLE to BM_HANDLE. */ - status = bm_get_handle(reference_handle, + status = bm_get_handle(reference_handle, &(reference_list->handles[i])); if (ACPI_FAILURE(status)) { status = AE_BAD_DATA; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -79,7 +79,7 @@ if (!BM_NODE_PRESENT(node->parent)) { return_ACPI_STATUS(AE_OK); } - + /* * Dynamic Status? * --------------- @@ -94,7 +94,7 @@ * Evaluate _STA: * -------------- */ - status = bm_evaluate_simple_integer(node->device.acpi_handle, "_STA", + status = bm_evaluate_simple_integer(node->device.acpi_handle, "_STA", &(node->device.status)); if (ACPI_SUCCESS(status)) { *device_status = node->device.status; @@ -232,7 +232,7 @@ /* * Install driver: * ---------------- - * For each match, record the driver information and execute the + * For each match, record the driver information and execute the * driver's Notify() funciton (if present) to notify the driver * of the device's presence. */ @@ -247,7 +247,7 @@ DEBUG_PRINT(ACPI_INFO, ("Registering driver for device [0x%02x].\n", node->device.handle)); /* Notify driver of new device. */ - status = driver->notify(BM_NOTIFY_DEVICE_ADDED, + status = driver->notify(BM_NOTIFY_DEVICE_ADDED, node->device.handle, &(node->driver.context)); if (ACPI_SUCCESS(status)) { node->driver.notify = driver->notify; @@ -319,7 +319,7 @@ DEBUG_PRINT(ACPI_INFO, ("Unregistering driver for device [0x%02x].\n", node->device.handle)); /* Notify driver of device removal. */ - status = node->driver.notify(BM_NOTIFY_DEVICE_REMOVED, + status = node->driver.notify(BM_NOTIFY_DEVICE_REMOVED, node->device.handle, &(node->driver.context)); node->device.flags &= ~BM_FLAGS_DRIVER_CONTROL; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -128,7 +128,7 @@ RESOURCE* resource; ULONG i; KIRQL Dirql; - + /* Count number of resources */ Done = FALSE; resource = resources; @@ -161,7 +161,7 @@ } resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); } - + /* Allocate memory */ *ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); ResourceList = (PCM_RESOURCE_LIST)ExAllocatePool(PagedPool, *ResourceListSize); @@ -175,7 +175,7 @@ ResourceList->List[0].PartialResourceList.Revision = 1; ResourceList->List[0].PartialResourceList.Count = NumberOfResources; ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; - + /* Fill resources list structure */ Done = FALSE; resource = resources; @@ -189,7 +189,7 @@ for (i = 0; i < irq_data->number_of_interrupts; i++) { ResourceDescriptor->Type = CmResourceTypeInterrupt; - + ResourceDescriptor->ShareDisposition = (irq_data->shared_exclusive == SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); ResourceDescriptor->Flags = @@ -253,7 +253,7 @@ } resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); } - + acpi_rs_dump_resource_list(resource); return TRUE; } _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bm.h --- trunk/reactos/drivers/bus/acpi/ospm/include/bm.h 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/include/bm.h 2005-05-08 02:16:32 UTC (rev 15108) @@ -158,7 +158,7 @@ #define BM_HID_SLEEP_BUTTON "PNP0C0E" /* - * BM_DEVICE_CID: + * BM_DEVICE_CID: * The compatibility ID can be a string with 44 characters * The extra pad is in case there is a change. It also * provides 8 byte alignment for the BM_DEVICE_ID structure. @@ -564,7 +564,7 @@ ACPI_STATUS [truncated at 1000 lines; 39227 more skipped]

1 0

[sedwards] 15107: remove whitespace from end of lines
by sedwards＠svn.reactos.com 08 May '05

08 May '05

remove whitespace from end of lines Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c Modified: trunk/reactos/boot/freeldr/fdebug/resource.h Modified: trunk/reactos/boot/freeldr/fdebug/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/math/i386.h Modified: trunk/reactos/boot/freeldr/freeldr/math/powerpc.h Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/memset.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/print.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/version.c Modified: trunk/reactos/boot/freeldr/freeldr/video/bank.c Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c Modified: trunk/reactos/boot/freeldr/freeldr/video/palette.c Modified: trunk/reactos/boot/freeldr/freeldr/video/pixel.c Modified: trunk/reactos/boot/freeldr/freeldr/video/video.c Modified: trunk/reactos/boot/freeldr/install/linux/finstext2.h Modified: trunk/reactos/boot/freeldr/install/volume.c Modified: trunk/reactos/boot/freeldr/ntvdmpat.c _____ Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c --- trunk/reactos/boot/freeldr/fdebug/fdebug.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -57,7 +57,7 @@ MyRegisterClass(hInstance); // Perform application initialization: - if (!InitInstance (hInstance, nCmdShow)) + if (!InitInstance (hInstance, nCmdShow)) { return FALSE; } @@ -65,9 +65,9 @@ hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_FDEBUG); // Main message loop: - while (GetMessage(&msg, NULL, 0, 0)) + while (GetMessage(&msg, NULL, 0, 0)) { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) + if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); @@ -96,7 +96,7 @@ { WNDCLASSEX wcex; - wcex.cbSize = sizeof(WNDCLASSEX); + wcex.cbSize = sizeof(WNDCLASSEX); wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.lpfnWndProc = (WNDPROC)WndProc; @@ -156,7 +156,7 @@ NONCLIENTMETRICS ncm; HFONT hFont; - switch (message) + switch (message) { case WM_CREATE: @@ -174,7 +174,7 @@ break; case WM_COMMAND: - wmId = LOWORD(wParam); + wmId = LOWORD(wParam); wmEvent = HIWORD(wParam); if (lParam == (LPARAM)hEditWnd && wmEvent == EN_CHANGE) @@ -312,7 +312,7 @@ return TRUE; case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -340,7 +340,7 @@ GetWindowText(GetDlgItem(hDlg, IDC_BAUTRATE), strBaudRate, MAX_PATH); } - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -392,7 +392,7 @@ GetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName, MAX_PATH); } - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { EndDialog(hDlg, LOWORD(wParam)); return TRUE; _____ Modified: trunk/reactos/boot/freeldr/fdebug/resource.h --- trunk/reactos/boot/freeldr/fdebug/resource.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/fdebug/resource.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -29,7 +29,7 @@ #define IDC_STATIC -1 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 132 _____ Modified: trunk/reactos/boot/freeldr/fdebug/rs232.c --- trunk/reactos/boot/freeldr/fdebug/rs232.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/fdebug/rs232.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -83,16 +83,16 @@ // [in] Pointer to a null-terminated string that specifies device-control information. // The string must have the same form as the mode command's command-line arguments. // -// For example, the following string specifies a baud rate of 1200, no parity, 8 data bits, and 1 stop bit: +// For example, the following string specifies a baud rate of 1200, no parity, 8 data bits, and 1 stop bit: // "baud=1200 parity=N data=8 stop=1" // // The following string specifies a baud rate of 115200, no parity, 8 data bits, and 1 stop bit: // "115200,n,8,1" // -// The device name is ignored if it is included in the string, but it must specify a valid device, as follows: +// The device name is ignored if it is included in the string, but it must specify a valid device, as follows: // "COM1: baud=1200 parity=N data=8 stop=1" // -// For further information on mode command syntax, refer to the end-user documentation for your operating system. +// For further information on mode command syntax, refer to the end-user documentation for your operating system. BOOL Rs232ConfigurePortWin32(TCHAR* DeviceControlString) { DCB dcb; @@ -157,28 +157,28 @@ } // Members -// ReadIntervalTimeout -// Specifies the maximum time, in milliseconds, allowed to elapse between the arrival of two characters on the communications line. During a ReadFile operation, the time period begins when the first character is received. If the interval between the arrival of any two characters exceeds this amount, the ReadFile operation is completed and any buffered data is returned. A value of zero indicates that interval time-outs are not used. -// A value of MAXDWORD, combined with zero values for both the ReadTotalTimeoutConstant and ReadTotalTimeoutMultiplier members, specifies that the read operation is to return immediately with the characters that have already been received, even if no characters have been received. -// -// ReadTotalTimeoutMultiplier -// Specifies the multiplier, in milliseconds, used to calculate the total time-out period for read operations. For each read operation, this value is multiplied by the requested number of bytes to be read. -// ReadTotalTimeoutConstant -// Specifies the constant, in milliseconds, used to calculate the total time-out period for read operations. For each read operation, this value is added to the product of the ReadTotalTimeoutMultiplier member and the requested number of bytes. -// A value of zero for both the ReadTotalTimeoutMultiplier and ReadTotalTimeoutConstant members indicates that total time-outs are not used for read operations. -// -// WriteTotalTimeoutMultiplier -// Specifies the multiplier, in milliseconds, used to calculate the total time-out period for write operations. For each write operation, this value is multiplied by the number of bytes to be written. -// WriteTotalTimeoutConstant -// Specifies the constant, in milliseconds, used to calculate the total time-out period for write operations. For each write operation, this value is added to the product of the WriteTotalTimeoutMultiplier member and the number of bytes to be written. -// A value of zero for both the WriteTotalTimeoutMultiplier and WriteTotalTimeoutConstant members indicates that total time-outs are not used for write operations. -// +// ReadIntervalTimeout +// Specifies the maximum time, in milliseconds, allowed to elapse between the arrival of two characters on the communications line. During a ReadFile operation, the time period begins when the first character is received. If the interval between the arrival of any two characters exceeds this amount, the ReadFile operation is completed and any buffered data is returned. A value of zero indicates that interval time-outs are not used. +// A value of MAXDWORD, combined with zero values for both the ReadTotalTimeoutConstant and ReadTotalTimeoutMultiplier members, specifies that the read operation is to return immediately with the characters that have already been received, even if no characters have been received. +// +// ReadTotalTimeoutMultiplier +// Specifies the multiplier, in milliseconds, used to calculate the total time-out period for read operations. For each read operation, this value is multiplied by the requested number of bytes to be read. +// ReadTotalTimeoutConstant +// Specifies the constant, in milliseconds, used to calculate the total time-out period for read operations. For each read operation, this value is added to the product of the ReadTotalTimeoutMultiplier member and the requested number of bytes. +// A value of zero for both the ReadTotalTimeoutMultiplier and ReadTotalTimeoutConstant members indicates that total time-outs are not used for read operations. +// +// WriteTotalTimeoutMultiplier +// Specifies the multiplier, in milliseconds, used to calculate the total time-out period for write operations. For each write operation, this value is multiplied by the number of bytes to be written. +// WriteTotalTimeoutConstant +// Specifies the constant, in milliseconds, used to calculate the total time-out period for write operations. For each write operation, this value is added to the product of the WriteTotalTimeoutMultiplier member and the number of bytes to be written. +// A value of zero for both the WriteTotalTimeoutMultiplier and WriteTotalTimeoutConstant members indicates that total time-outs are not used for write operations. +// // Remarks -// If an application sets ReadIntervalTimeout and ReadTotalTimeoutMultiplier to MAXDWORD and sets ReadTotalTimeoutConstant to a value greater than zero and less than MAXDWORD, one of the following occurs when the ReadFile function is called: -// -// If there are any characters in the input buffer, ReadFile returns immediately with the characters in the buffer. -// If there are no characters in the input buffer, ReadFile waits until a character arrives and then returns immediately. -// If no character arrives within the time specified by ReadTotalTimeoutConstant, ReadFile times out. +// If an application sets ReadIntervalTimeout and ReadTotalTimeoutMultiplier to MAXDWORD and sets ReadTotalTimeoutConstant to a value greater than zero and less than MAXDWORD, one of the following occurs when the ReadFile function is called: +// +// If there are any characters in the input buffer, ReadFile returns immediately with the characters in the buffer. +// If there are no characters in the input buffer, ReadFile waits until a character arrives and then returns immediately. +// If no character arrives within the time specified by ReadTotalTimeoutConstant, ReadFile times out. BOOL Rs232SetCommunicationTimeoutsWin32(DWORD ReadIntervalTimeout, DWORD ReadTotalTimeoutMultiplier, DWORD ReadTotalTimeoutConstant, DWORD WriteTotalTimeoutMultiplier, DWORD WriteTotalTimeoutConstant) { COMMTIMEOUTS ct; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -197,44 +197,44 @@ WRITE_PORT_UCHAR((PUCHAR)0x43, 0x34); /* binary, mode 2, LSB/MSB, ch 0 */ WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH & 0xff); /* LSB */ WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH >> 8); /* MSB */ - + /* Stage 1: Coarse calibration */ - + WaitFor8254Wraparound(); - + delay_count = 1; - + do { delay_count <<= 1; /* Next delay count to try */ WaitFor8254Wraparound(); - + __StallExecutionProcessor(delay_count); /* Do the delay */ - + CurCount = Read8254Timer(); } while (CurCount > LATCH / 2); - + delay_count >>= 1; /* Get bottom value for delay */ - + /* Stage 2: Fine calibration */ - + calib_bit = delay_count; /* Which bit are we going to test */ - + for(i=0;i<PRECISION;i++) { calib_bit >>= 1; /* Next bit to calibrate */ if(!calib_bit) break; /* If we have done all bits, stop */ - + delay_count |= calib_bit; /* Set the bit in delay_count */ - + WaitFor8254Wraparound(); - + __StallExecutionProcessor(delay_count); /* Do the delay */ - + CurCount = Read8254Timer(); if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */ delay_count &= ~calib_bit; /* calibrated bit back off */ } - + /* We're finished: Do the finishing touches */ delay_count /= (MILLISEC / 2); /* Calculate delay_count for 1ms */ } _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -464,7 +464,7 @@ if (ConfigTable->Signature != MP_CT_SIGNATURE) return NULL; - DbgPrint((DPRINT_HWDETECT, + DbgPrint((DPRINT_HWDETECT, "MP Configuration Table at: %x\n", (ULONG)ConfigTable)); @@ -538,7 +538,7 @@ CpuEntry = (PMP_PROCESSOR_ENTRY)Ptr; DbgPrint((DPRINT_HWDETECT, "Processor Entry\n")); - DbgPrint((DPRINT_HWDETECT, + DbgPrint((DPRINT_HWDETECT, "APIC Id %u APIC Version %u Flags %x Signature %x Feature %x\n", CpuEntry->LocalApicId, CpuEntry->LocalApicVersion, _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -168,7 +168,7 @@ return TRUE; } -BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) +BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) { PARTITION_TABLE_ENTRY PartitionTableEntry; UCHAR VolumeType; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -47,12 +47,12 @@ // interrupt from the AT real-time clock chip which is available on INT 70; // because newer BIOSes may have much more precise timers available, it is // not possible to use this function accurately for very short delays unless - // the precise behavior of the BIOS is known (or found through testing) + // the precise behavior of the BIOS is known (or found through testing) while (msec) { msec_this = msec; - + if (msec_this > 4000) { msec_this = 4000; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -88,7 +88,7 @@ // A search must then be made to find them, FFFFh will also terminate this // second list. In some cases, only a "stub" VBE may be present, supporting // only AX=4F00h; this case may be assumed if the list of supported video modes -// is empty (consisting of a single word of FFFFh) +// is empty (consisting of a single word of FFFFh) VOID BiosSetVideoFont8x16(VOID) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -136,7 +136,7 @@ * CH = feature connector bits * CL = switch settings * AH destroyed (at least by Tseng ET4000 BIOS v8.00n) - * + * * Installation check;EGA */ Regs.b.ah = 0x12; @@ -161,7 +161,7 @@ * This function is commonly used to check for the presence of a VGA. * * Installation check;VGA - * + * * Values for display combination code: * 00h no display * 01h monochrome adapter w/ monochrome display @@ -309,15 +309,15 @@ * CL = bottom scan line containing cursor (bits 0-4) * Return: * Nothing - * + * * Specify the starting and ending scan lines to be occupied * by the hardware cursor in text modes. * * AMI 386 BIOS and AST Premier 386 BIOS will lock up the * system if AL is not equal to the current video mode. - * + * * Bitfields for cursor start and options: - * + * * Bit(s) Description * 7 should be zero * 6,5 cursor blink @@ -460,7 +460,7 @@ * * Note: While VBE 1.1 and higher will zero out all unused bytes * of the buffer, v1.0 did not, so applications that want to be - * backward compatible should clear the buffer before calling + * backward compatible should clear the buffer before calling */ Regs.w.ax = 0x4F01; Regs.w.cx = Mode; @@ -563,7 +563,7 @@ * 121h 1600x1200x32K * 122h 1600x1200x64K * 81FFh special full-memory access mode - * + * * Notes: The special mode 81FFh preserves the contents of the video memory and gives * access to all of the memory; VESA recommends that the special mode be a packed-pixel * mode. For VBE 2.0+, it is required that the VBE implement the mode, but not place it _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -58,8 +58,8 @@ PUCHAR Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; insb\n\t" - : "=D" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; insb\n\t" + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -71,7 +71,7 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; insw" - : "=D" (Buffer), "=c" (Count) + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -83,17 +83,17 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; insl" - : "=D" (Buffer), "=c" (Count) + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } #undef READ_PORT_UCHAR -UCHAR +UCHAR STDCALL READ_PORT_UCHAR (PUCHAR Port) { UCHAR Value; - + __asm__("inb %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -107,7 +107,7 @@ READ_PORT_USHORT (USHORT* Port) { USHORT Value; - + __asm__("inw %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -121,7 +121,7 @@ READ_PORT_ULONG (ULONG* Port) { ULONG Value; - + __asm__("inl %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -130,14 +130,14 @@ } #undef WRITE_PORT_BUFFER_UCHAR -VOID +VOID STDCALL WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; outsb" - : "=S" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; outsb" + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -149,7 +149,7 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; outsw" - : "=S" (Buffer), "=c" (Count) + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -160,8 +160,8 @@ ULONG* Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; outsl" - : "=S" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; outsl" + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -172,7 +172,7 @@ UCHAR Value) { __asm__("outb %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; @@ -185,7 +185,7 @@ USHORT Value) { __asm__("outw %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; @@ -198,7 +198,7 @@ ULONG Value) { __asm__("outl %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -149,7 +149,7 @@ #define IDEWriteDMAStatus(Address, Data) \ (WRITE_PORT_UCHAR((PUCHAR)((Address) + 2), (Data))) #define IDEWritePRDTable(Address, Data) \ - (WRITE_PORT_ULONG((PULONG)((Address) + 4), (Data))) + (WRITE_PORT_ULONG((PULONG)((Address) + 4), (Data))) /* * Data block read and write commands _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -31,11 +31,11 @@ BOOLEAN AcpiPresent = FALSE; char BootPath[0x100]; -void le_swap( const void *start_addr_v, - const void *end_addr_v, +void le_swap( const void *start_addr_v, + const void *end_addr_v, const void *target_addr_v ) { - long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), - *end_addr = (long *)ROUND_UP((long)end_addr_v,8), + long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), + *end_addr = (long *)ROUND_UP((long)end_addr_v,8), *target_addr = (long *)ROUND_DOWN((long)target_addr_v,8); long tmp; while( start_addr <= end_addr ) { @@ -107,7 +107,7 @@ void PpcPutChar( int ch ) { char buf[3]; - if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } + if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } else { buf[0] = ch; buf[1] = 0; } buf[2] = 0; ofw_print_string( buf ); @@ -167,12 +167,12 @@ return FALSE; } -VOID PpcVideoSetPaletteColor( UCHAR Color, +VOID PpcVideoSetPaletteColor( UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue ) { printf( "SetPaletteColor(%x,%x,%x,%x)\n", Color, Red, Green, Blue ); } -VOID PpcVideoGetPaletteColor( UCHAR Color, +VOID PpcVideoGetPaletteColor( UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue ) { printf( "GetPaletteColor(%x)\n", Color); } @@ -198,7 +198,7 @@ BiosMemoryMap[0].BaseAddress = 0; BiosMemoryMap[0].Length = 32 * 1024 * 1024; /* Assume 32 meg for now */ - printf( "Returning memory map (%dk total)\n", + printf( "Returning memory map (%dk total)\n", (int)BiosMemoryMap[0].Length / 1024 ); return 1; @@ -226,7 +226,7 @@ return 0; } -VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, +VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second ) { printf("RTCGeturrentDateTime\n"); } @@ -256,7 +256,7 @@ MachVtbl.VideoSetTextCursorPosition = PpcVideoSetTextCursorPosition; MachVtbl.VideoHideShowTextCursor = PpcVideoHideShowTextCursor; MachVtbl.VideoPutChar = PpcVideoPutChar; - MachVtbl.VideoCopyOffScreenBufferToVRAM = + MachVtbl.VideoCopyOffScreenBufferToVRAM = PpcVideoCopyOffScreenBufferToVRAM; MachVtbl.VideoIsPaletteFixed = PpcVideoIsPaletteFixed; MachVtbl.VideoSetPaletteColor = PpcVideoSetPaletteColor; @@ -276,13 +276,13 @@ MachVtbl.HwDetect = PpcHwDetect; printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() ); - BootMain("freeldr-ppc"); + BootMain("freeldr-ppc"); } void MachInit(char *CmdLine) { int len; printf( "Determining boot device:\n" ); - len = ofw_getprop(chosen_package, "bootpath", + len = ofw_getprop(chosen_package, "bootpath", BootPath, sizeof(BootPath)); printf( "Got %d bytes of path\n", len ); BootPath[len] = 0; _____ Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -89,7 +89,7 @@ CacheBlock = (PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheBlock); } } - + return NULL; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c --- trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <freeldr.h> +#include <freeldr.h> #include <cmdline.h> #include <rtl.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/custom.c --- trunk/reactos/boot/freeldr/freeldr/custom.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/custom.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include <freeldr.h> #include <rtl.h> #include <ui.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -109,7 +109,7 @@ // They want an extended partition entry so we will need // to loop through all the extended partitions on the disk // and return the one they want. - + ExtendedPartitionNumber = PartitionNumber - 5; // Set the initial relative starting sector to 0 _____ Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c --- trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include <freeldr.h> #include <drivemap.h> #include <rtl.h> @@ -120,7 +120,7 @@ BOOL DriveMapIsValidDriveString(PCHAR DriveString) { ULONG Index; - + // Now verify that the user has given us appropriate strings if ((strlen(DriveString) < 3) || ((DriveString[0] != 'f') && (DriveString[0] != 'F') && (DriveString[0] != 'h') && (DriveString[0] != 'H')) || _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c --- trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include <freeldr.h> #include <rtl.h> #include <arch.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -949,7 +949,7 @@ { return FALSE; } - + // Copy the data to their buffer RtlCopyMemory(InodeBuffer, (PVOID)(FILESYSBUFFER + (InodeOffsetInBlock * EXT3_INODE_SIZE(Ext2SuperBlock))), sizeof(EXT2_INODE)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -318,8 +318,8 @@ SectorsPerFat = FatBootSector->SectorsPerFat ? FatBootSector->SectorsPerFat : Fat32BootSector->SectorsPerFatBig; TotalSectors = FatBootSector->TotalSectors ? FatBootSector->TotalSectors : FatBootSector->TotalSectorsBig; DataSectorCount = TotalSectors - (FatBootSector->ReservedSectors + (FatBootSector->NumberOfFats * SectorsPerFat) + RootDirSectors); - -//mjl + +//mjl if (FatBootSector->SectorsPerCluster == 0) CountOfClusters = 0; else @@ -861,7 +861,7 @@ } fat = *((USHORT *) ((PVOID)FILESYSBUFFER + ThisFatEntOffset)); - if (Cluster & 0x0001) + if (Cluster & 0x0001) fat = fat >> 4; /* Cluster number is ODD */ else fat = fat & 0x0FFF; /* Cluster number is EVEN */ @@ -870,7 +870,7 @@ case FAT16: case FATX16: - + FatOffset = (Cluster * 2); ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); ThisFatEntOffset = (FatOffset % BytesPerSector); @@ -1111,7 +1111,7 @@ break; } } - + return TRUE; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h --- trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -46,7 +46,7 @@ UCHAR BootCodeAndData[448]; // The remainder of the boot sector USHORT BootSectorMagic; // 0xAA55 - + } PACKED FAT_BOOTSECTOR, *PFAT_BOOTSECTOR; typedef struct _FAT32_BOOTSECTOR @@ -82,7 +82,7 @@ UCHAR BootCodeAndData[420]; // The remainder of the boot sector USHORT BootSectorMagic; // 0xAA55 - + } PACKED FAT32_BOOTSECTOR, *PFAT32_BOOTSECTOR; typedef struct _FATX_BOOTSECTOR @@ -93,7 +93,7 @@ USHORT NumberOfFats; /* Number of FAT tables */ ULONG Unknown; /* Always 0? */ UCHAR Unused[494]; /* Actually size should be 4078 (boot block is 4096 bytes) */ - + } PACKED FATX_BOOTSECTOR, *PFATX_BOOTSECTOR; /* _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -139,7 +139,7 @@ { FileName++; } - + // // Check file system type and pass off to appropriate handler // _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -110,7 +110,7 @@ { AttrName = (PWCHAR)((PCHAR)AttrRecord + AttrRecord->NameOffset); if (!RtlCompareMemory(AttrName, Name, NameLength << 1)) - { + { /* Found it, fill up the context and return. */ Context->Record = AttrRecord; if (AttrRecord->IsNonResident) @@ -125,7 +125,7 @@ if (DataRunOffset != -1) { /* Normal run. */ - Context->CacheRunStartLCN = + Context->CacheRunStartLCN = Context->CacheRunLastLCN = DataRunOffset; } else @@ -200,7 +200,7 @@ ULONGLONG CurrentOffset; ULONGLONG ReadLength; ULONGLONG AlreadyRead; - + if (!Context->Record->IsNonResident) { if (Offset > Context->Record->Resident.ValueLength) @@ -286,7 +286,7 @@ /* * Go to next run in the list. */ - + if (*DataRun == 0) break; DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); @@ -341,7 +341,7 @@ BOOL NtfsReadMftRecord(ULONG MFTIndex, PNTFS_MFT_RECORD Buffer) { ULONGLONG BytesRead; - + BytesRead = NtfsReadAttribute(&NtfsMFTContext, MFTIndex * NtfsMftRecordSize, (PCHAR)Buffer, NtfsMftRecordSize); if (BytesRead != NtfsMftRecordSize) return FALSE; @@ -433,7 +433,7 @@ MmFreeMemory(MftRecord); return FALSE; } - + IndexRecord = MmAllocateMemory(NtfsIndexRecordSize); if (IndexRecord == NULL) { @@ -514,7 +514,7 @@ break; RecordOffset += IndexBlockSize; } - + if (RecordOffset >= IndexAllocationSize) { break; @@ -533,7 +533,7 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) - { + { if (NtfsCompareFileName(FileName, IndexEntry)) { DbgPrint((DPRINT_FILESYSTEM, "File found\n")); @@ -551,7 +551,7 @@ MmFreeMemory(BitmapData); } - + MmFreeMemory(IndexRecord); } else _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -57,7 +57,7 @@ #define NTFS_FILE_NAME_POSIX 0 #define NTFS_FILE_NAME_WIN32 1 #define NTFS_FILE_NAME_DOS 2 -#define NTFS_FILE_NAME_WIN32_AND_DOS 3 +#define NTFS_FILE_NAME_WIN32_AND_DOS 3 typedef struct { _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -37,7 +37,7 @@ #define ROUND_UP(N, S) (((N) + (S) - 1) & ~((S) - 1)) #define ROUND_DOWN(N, S) ((N) & ~((S) - 1)) #define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n") - + extern BOOL UserInterfaceUp; /* Tells us if the user interface is displayed */ VOID BootMain(LPSTR CmdLine); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h --- trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -102,9 +102,9 @@ ULONG Code32Start; // here loaders can put a different // start address for 32-bit code. - // + // // 0x1000 = default for zImage - // + // // 0x100000 = default for big kernel ULONG RamdiskAddress; // address of loaded ramdisk image _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h --- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -39,7 +39,7 @@ VOID (*ConsPutChar)(int Ch); BOOL (*ConsKbHit)(VOID); int (*ConsGetCh)(VOID); - + VOID (*VideoClearScreen)(UCHAR Attr); VIDEODISPLAYMODE (*VideoSetDisplayMode)(char *DisplayMode, BOOL Init); VOID (*VideoGetDisplaySize)(PULONG Width, PULONG Height, PULONG Depth); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h --- trunk/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -1,16 +1,16 @@ /* multiboot.h - the header for Multiboot */ /* Copyright (C) 1999 Free Software Foundation, Inc. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program 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 General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -157,48 +157,48 @@ STDCALL FrLdrCreateModule(LPSTR ModuleName); -ULONG_PTR -STDCALL -FrLdrLoadModule(FILE *ModuleImage, - LPSTR ModuleName, +ULONG_PTR +STDCALL +FrLdrLoadModule(FILE *ModuleImage, + LPSTR ModuleName, PULONG ModuleSize); BOOL STDCALL FrLdrLoadKernel(PCHAR szFileName, INT nPos); - + BOOL -FrLdrLoadNlsFile(PCHAR szSystemRoot, +FrLdrLoadNlsFile(PCHAR szSystemRoot, PCHAR szErrorOut); - + BOOL -FrLdrLoadDriver(PCHAR szFileName, +FrLdrLoadDriver(PCHAR szFileName, INT nPos); BOOL LoadSymbolFile(PCHAR szSystemRoot, PCHAR ModuleName, INT nPos); - + VOID -FrLdrLoadBootDrivers(PCHAR szSystemRoot, +FrLdrLoadBootDrivers(PCHAR szSystemRoot, INT nPos); - + BOOL STDCALL -FrLdrCloseModule(ULONG_PTR ModuleBase, +FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID -STDCALL +STDCALL FrLdrStartup(ULONG Magic); -VOID -FASTCALL +VOID +FASTCALL FrLdrGetKernelBase(VOID); -VOID -FASTCALL +VOID +FASTCALL FrLdrSetupPae(ULONG Magic); VOID [truncated at 1000 lines; 1866 more skipped]

1 0

[sedwards] 15106: remove whitespace from end of lines
by sedwards＠svn.reactos.com 08 May '05

08 May '05

remove whitespace from end of lines Modified: trunk/reactos/subsys/win32k/dib/dib.c Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/eng/bitblt.c Modified: trunk/reactos/subsys/win32k/eng/clip.c Modified: trunk/reactos/subsys/win32k/eng/debug.c Modified: trunk/reactos/subsys/win32k/eng/device.c Modified: trunk/reactos/subsys/win32k/eng/event.c Modified: trunk/reactos/subsys/win32k/eng/float.c Modified: trunk/reactos/subsys/win32k/eng/gradient.c Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/eng/objects.h Modified: trunk/reactos/subsys/win32k/eng/paint.c Modified: trunk/reactos/subsys/win32k/eng/palette.c Modified: trunk/reactos/subsys/win32k/eng/surface.c Modified: trunk/reactos/subsys/win32k/eng/transblt.c Modified: trunk/reactos/subsys/win32k/eng/xlate.c Modified: trunk/reactos/subsys/win32k/include/desktop.h Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/include/intgdi.h Modified: trunk/reactos/subsys/win32k/include/menu.h Modified: trunk/reactos/subsys/win32k/include/msgqueue.h Modified: trunk/reactos/subsys/win32k/include/winpos.h Modified: trunk/reactos/subsys/win32k/include/winsta.h Modified: trunk/reactos/subsys/win32k/ldr/loader.c Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/main/svctabm.c Modified: trunk/reactos/subsys/win32k/misc/driver.c Modified: trunk/reactos/subsys/win32k/misc/object.c Modified: trunk/reactos/subsys/win32k/misc/ssec.c Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/prop.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/subsys/win32k/ntuser/useratom.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/subsys/win32k/objects/bezier.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c Modified: trunk/reactos/subsys/win32k/objects/coord.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/objects/icm.c Modified: trunk/reactos/subsys/win32k/objects/line.c Modified: trunk/reactos/subsys/win32k/objects/palette.c Modified: trunk/reactos/subsys/win32k/objects/path.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/subsys/win32k/objects/polyfill.c Modified: trunk/reactos/subsys/win32k/objects/region.c Modified: trunk/reactos/subsys/win32k/objects/stockobj.c Modified: trunk/reactos/subsys/win32k/objects/wingl.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.c --- trunk/reactos/subsys/win32k/dib/dib.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -95,7 +95,7 @@ ULONG ResultNibble; ULONG Result; ULONG i; - static const ULONG ExpandDest[16] = + static const ULONG ExpandDest[16] = { 0x55555555 /* 0000 */, 0x555555AA /* 0001 */, @@ -114,7 +114,7 @@ 0xAAAAAA55 /* 1110 */, 0xAAAAAAAA /* 1111 */, }; - static const ULONG ExpandSource[16] = + static const ULONG ExpandSource[16] = { 0x33333333 /* 0000 */, 0x333333CC /* 0001 */, @@ -133,7 +133,7 @@ 0xCCCCCC33 /* 1110 */, 0xCCCCCCCC /* 1111 */, }; - static const ULONG ExpandPattern[16] = + static const ULONG ExpandPattern[16] = { 0x0F0F0F0F /* 0000 */, 0x0F0F0FF0 /* 0001 */, @@ -180,7 +180,7 @@ for (i = 0; i < 8; i++) { ResultNibble = Rop & ExpandDest[Dest & 0xF] & ExpandSource[Source & 0xF] & ExpandPattern[Pattern & 0xF]; - Result |= (((ResultNibble & 0xFF000000) ? 0x8 : 0x0) | ((ResultNibble & 0x00FF0000) ? 0x4 : 0x0) | + Result |= (((ResultNibble & 0xFF000000) ? 0x8 : 0x0) | ((ResultNibble & 0x00FF0000) ? 0x4 : 0x0) | ((ResultNibble & 0x0000FF00) ? 0x2 : 0x0) | ((ResultNibble & 0x000000FF) ? 0x1 : 0x0)) << (i * 4); Dest >>= 4; Source >>= 4; _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -310,8 +310,8 @@ ULONG RoundedRight; UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - + UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); + RoundedRight = BltInfo->DestRect.right - ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x1); SourceY = BltInfo->SourcePoint.y; @@ -324,7 +324,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -337,11 +337,11 @@ for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) { SourceX = BltInfo->SourcePoint.x; - + for (DestX = BltInfo->DestRect.left; DestX < RoundedRight; DestX += 2, DestBits++, SourceX += 2) { Dest = *DestBits; - + if (UsesSource) { Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); @@ -369,7 +369,7 @@ if (BltInfo->PatternSurface) { Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - } + } DIB_16BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFF); DestBits = (PULONG)((ULONG_PTR)DestBits + 2); @@ -386,7 +386,7 @@ ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 1) + BltInfo->DestSurface->lDelta); } - + return TRUE; } @@ -415,22 +415,22 @@ }*/ /* if */ // This one should be correct, but it's too long -/* +/* unsigned char r1, g1, b1, r2, g2, b2, rr, gr, br; unsigned short res; - + r1 = (a & 0xF800) >> 11; g1 = (a & 0x7E0) >> 5; b1 = (a & 0x1F); - + r2 = (b & 0xF800) >> 11; g2 = (b & 0x7E0) >> 5; b2 = (b & 0x1F); - + rr = (r1+r2) / 2; gr = (g1+g2) / 2; br = (b1+b2) / 2; - + res = (rr << 11) + (gr << 5) + br; return res; @@ -473,7 +473,7 @@ UINT DestY, RECTL *DestRect) { LONG Left, Right; - + while (ClipSpans[*SpanIndex].Y < DestY || (ClipSpans[*SpanIndex].Y == DestY && ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width < DestRect->left)) @@ -561,7 +561,7 @@ } /* if */ PrevSource = Source; } /* if */ - + if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) { int x; ScaleLineAvg16(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left); @@ -629,46 +629,46 @@ case BMF_24BPP: case BMF_32BPP: /* Not implemented yet. */ - return FALSE; + return FALSE; break; case BMF_16BPP: return ScaleRectAvg16(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); break; - + default: DPRINT1("DIB_16BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } - - + + return TRUE; } -BOOLEAN +BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) { ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest; ULONG *DestBits; - + RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x1); SourceY = SourcePoint->y; DestBits = (ULONG*)(DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 1); - + for(Y = DestRect->top; Y < DestRect->bottom; Y++) { SourceX = SourcePoint->x; for(X = DestRect->left; X < RoundedRight; X += 2, DestBits++, SourceX += 2) { Dest = *DestBits; - + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); if(Source != iTransColor) { @@ -685,7 +685,7 @@ *DestBits = Dest; } - + if(X < DestRect->right) { Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); @@ -693,13 +693,13 @@ { *((USHORT*)DestBits) = (USHORT)XLATEOBJ_iXlate(ColorTranslation, Source); } - + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } SourceY++; DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); } - + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -352,7 +352,7 @@ UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - RoundedRight = BltInfo->DestRect.right - + RoundedRight = BltInfo->DestRect.right - ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 31); SourceY = BltInfo->SourcePoint.y; @@ -360,7 +360,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -383,7 +383,7 @@ { #if 0 /* FIXME: This case is completely untested!!! */ - + Dest = *((PBYTE)DestBits); NoBits = 31 - (DestX & 31); @@ -402,12 +402,12 @@ Pattern |= (DIB_GetSource(PatternObj, (X + BrushOrigin.x + k) % PatternWidth, PatternY, BltInfo->XlatePatternToDest) << (31 - k)); } - Dest = DIB_DoRop(Rop4, Dest, Source, Pattern); + Dest = DIB_DoRop(Rop4, Dest, Source, Pattern); Dest &= ~((1 << (31 - NoBits)) - 1); Dest |= *((PBYTE)DestBits) & ((1 << (31 - NoBits)) - 1); *DestBits = Dest; - + DestX += NoBits; SourceX += NoBits; #endif @@ -441,7 +441,7 @@ } } - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); + *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); } if (DestX < BltInfo->DestRect.right) @@ -474,7 +474,7 @@ PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; } } - + return TRUE; } @@ -490,7 +490,7 @@ return FALSE; } -BOOLEAN +BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -246,7 +246,7 @@ UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - + SourceY = BltInfo->SourcePoint.y; DestBits = (PBYTE)( BltInfo->DestSurface->pvScan0 + @@ -257,7 +257,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -269,11 +269,11 @@ for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) { SourceX = BltInfo->SourcePoint.x; - + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits += 3, SourceX++) { Dest = *((PUSHORT)DestBits) + (*(DestBits + 2) << 16); - + if (UsesSource) { Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); @@ -298,7 +298,7 @@ DestBits -= (BltInfo->DestRect.right - BltInfo->DestRect.left) * 3; DestBits += BltInfo->DestSurface->lDelta; } - + return TRUE; } @@ -312,20 +312,20 @@ return FALSE; } -BOOLEAN +BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) { ULONG X, Y, SourceX, SourceY, Source, wd, Dest; BYTE *DestBits; - + SourceY = SourcePoint->y; DestBits = (BYTE*)(DestSurf->pvScan0 + (DestRect->left << 2) + DestRect->top * DestSurf->lDelta); wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); - + for(Y = DestRect->top; Y < DestRect->bottom; Y++) { SourceX = SourcePoint->x; @@ -339,11 +339,11 @@ *(DestBits + 2) = Dest >> 16; } } - + SourceY++; DestBits = (BYTE*)((ULONG_PTR)DestBits + wd); } - + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -306,7 +306,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -314,15 +314,15 @@ Pattern = BltInfo->Brush->iSolidColor; } } - + for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) { SourceX = BltInfo->SourcePoint.x; - + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++, SourceX++) { Dest = *DestBits; - + if (UsesSource) { Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); @@ -347,7 +347,7 @@ ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2) + BltInfo->DestSurface->lDelta); } - + return TRUE; } @@ -398,13 +398,13 @@ while (skip-- > 0) *Target++ = *Source; } - + static BOOLEAN FinalCopy32(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT ClipSpansCount, UINT *SpanIndex, UINT DestY, RECTL *DestRect) { LONG Left, Right; - + while (ClipSpans[*SpanIndex].Y < DestY || (ClipSpans[*SpanIndex].Y == DestY && ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width < DestRect->left)) @@ -458,7 +458,7 @@ UINT ClipSpansCount; UINT SpanIndex; LONG DestY; - + if (! ClipobjToSpans(&ClipSpans, &ClipSpansCount, ClipRegion, DestRect)) { return FALSE; @@ -492,7 +492,7 @@ } /* if */ PrevSource = Source; } /* if */ - + if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) { int x; ScaleLineAvg32(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left); @@ -500,7 +500,7 @@ ScanLine[x] = average32(ScanLine[x], ScanLineAhead[x]); PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta); } /* if */ - + if (! FinalCopy32(Target, ScanLine, ClipSpans, ClipSpansCount, &SpanIndex, DestY, DestRect)) { /* No more spans, everything else is clipped away, we're done */ @@ -560,38 +560,38 @@ case BMF_16BPP: case BMF_24BPP: /* Not implemented yet. */ - return FALSE; + return FALSE; break; - + case BMF_32BPP: return ScaleRectAvg32(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); break; - + default: //DPRINT1("DIB_32BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } - - + + return TRUE; } -BOOLEAN +BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) { ULONG X, Y, SourceX, SourceY, Source, wd; ULONG *DestBits; - + SourceY = SourcePoint->y; DestBits = (ULONG*)(DestSurf->pvScan0 + (DestRect->left << 2) + DestRect->top * DestSurf->lDelta); wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); - + for(Y = DestRect->top; Y < DestRect->bottom; Y++) { SourceX = SourcePoint->x; @@ -603,11 +603,11 @@ *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); } } - + SourceY++; DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); } - + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -231,7 +231,7 @@ BOOLEAN UsesPattern; PULONG DestBits; LONG RoundedRight; - static const ULONG ExpandSolidColor[16] = + static const ULONG ExpandSolidColor[16] = { 0x00000000 /* 0 */, 0x11111111 /* 1 */, @@ -262,7 +262,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -292,7 +292,7 @@ if (BltInfo->PatternSurface) { Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - } + } DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); @@ -307,13 +307,13 @@ if (UsesSource) { Source = - (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest)) | + (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest)) | (DIB_GetSource(BltInfo->SourceSurface, SourceX + 0, SourceY, BltInfo->XlateSourceToDest) << 4) | - (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3, SourceY, BltInfo->XlateSourceToDest) << 8) | + (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3, SourceY, BltInfo->XlateSourceToDest) << 8) | (DIB_GetSource(BltInfo->SourceSurface, SourceX + 2, SourceY, BltInfo->XlateSourceToDest) << 12) | - (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5, SourceY, BltInfo->XlateSourceToDest) << 16) | + (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5, SourceY, BltInfo->XlateSourceToDest) << 16) | (DIB_GetSource(BltInfo->SourceSurface, SourceX + 4, SourceY, BltInfo->XlateSourceToDest) << 20) | - (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7, SourceY, BltInfo->XlateSourceToDest) << 24) | + (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7, SourceY, BltInfo->XlateSourceToDest) << 24) | (DIB_GetSource(BltInfo->SourceSurface, SourceX + 6, SourceY, BltInfo->XlateSourceToDest) << 28); } if (BltInfo->PatternSurface) @@ -327,7 +327,7 @@ Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 7) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24; Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 6) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 28; } - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); + *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); } /* Process the rest of pixel on the line */ @@ -341,9 +341,9 @@ if (BltInfo->PatternSurface) { Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - } + } DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); - } + } SourceY++; if (BltInfo->PatternSurface) @@ -366,7 +366,7 @@ return FALSE; } -BOOLEAN +BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -271,7 +271,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -311,7 +311,7 @@ Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24; } - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); + *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); } if (DestX < BltInfo->DestRect.right) @@ -319,7 +319,7 @@ for (; DestX < BltInfo->DestRect.right; DestX++) { Dest = DIB_8BPP_GetPixel(BltInfo->DestSurface, DestX, DestY); - + if (UsesSource) { Source = DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left), SourceY, BltInfo->XlateSourceToDest); @@ -397,7 +397,7 @@ UINT DestY, RECTL *DestRect) { LONG Left, Right; - + while (ClipSpans[*SpanIndex].Y < DestY || (ClipSpans[*SpanIndex].Y == DestY && ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width < DestRect->left)) @@ -485,7 +485,7 @@ } /* if */ PrevSource = Source; } /* if */ - + if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) { int x; ScaleLineAvg8(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left); @@ -493,7 +493,7 @@ ScanLine[x] = average8(ScanLine[x], ScanLineAhead[x]); PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta); } /* if */ - + if (! FinalCopy8(Target, ScanLine, ClipSpans, ClipSpansCount, &SpanIndex, DestY, DestRect)) { /* No more spans, everything else is clipped away, we're done */ @@ -552,36 +552,36 @@ case BMF_24BPP: case BMF_32BPP: /* Not implemented yet. */ - return FALSE; + return FALSE; break; - + case BMF_8BPP: return ScaleRectAvg8(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); break; - + default: DPRINT1("DIB_8BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } - + return TRUE; } -BOOLEAN +BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) { ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest; ULONG *DestBits; - + RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x3); SourceY = SourcePoint->y; DestBits = (ULONG*)(DestSurf->pvScan0 + DestRect->left + (DestRect->top * DestSurf->lDelta)); wd = DestSurf->lDelta - (DestRect->right - DestRect->left); - + for(Y = DestRect->top; Y < DestRect->bottom; Y++) { DestBits = (ULONG*)(DestSurf->pvScan0 + DestRect->left + @@ -590,7 +590,7 @@ for (X = DestRect->left; X < RoundedRight; X += 4, DestBits++) { Dest = *DestBits; - + Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); if(Source != iTransColor) { @@ -604,14 +604,14 @@ Dest &= 0xFFFF00FF; Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 8) & 0xFF00); } - + Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); if(Source != iTransColor) { Dest &= 0xFF00FFFF; Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 16) & 0xFF0000); } - + Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); if(Source != iTransColor) { @@ -621,7 +621,7 @@ *DestBits = Dest; } - + if(X < DestRect->right) { for (; X < DestRect->right; X++) @@ -636,7 +636,7 @@ } SourceY++; } - + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -75,7 +75,7 @@ static BOOLEAN STDCALL BltMask(SURFOBJ* Dest, SURFOBJ* Source, - SURFOBJ* Mask, + SURFOBJ* Mask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, @@ -93,7 +93,7 @@ SURFOBJ *PatternObj = NULL; PBITMAPOBJ PatternBitmap; ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0; - + if (Mask == NULL) { return FALSE; @@ -126,10 +126,10 @@ { lMask = tMask; c8 = SourcePoint->x & 0x07; - + if(PatternBitmap != NULL) PatternY = (DestRect->top + j) % PatternHeight; - + for (i = 0; i < dx; i++) { if (0 != (*lMask & maskbit[c8])) @@ -165,7 +165,7 @@ static BOOLEAN STDCALL BltPatCopy(SURFOBJ* Dest, SURFOBJ* Source, - SURFOBJ* Mask, + SURFOBJ* Mask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, @@ -375,7 +375,7 @@ OutputRect.right = DestRect->right + Translate.x; OutputRect.top = DestRect->top + Translate.y; OutputRect.bottom = DestRect->bottom + Translate.y; - + if(BrushOrigin) { AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; @@ -644,7 +644,7 @@ ) { // www.osr.com/ddk/graphics/gdifncs_0bs7.htm - + POINTL InputPoint; RECTL InputRect; RECTL OutputRect; @@ -669,7 +669,7 @@ InputPoint.x = InputRect.left + Translate.x; InputPoint.y = InputRect.top + Translate.y; - + OutputRect = *prclDest; /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's @@ -690,7 +690,7 @@ OutputRect.right = prclDest->right + Translate.x; OutputRect.top = prclDest->top + Translate.y; OutputRect.bottom = prclDest->bottom + Translate.y; - + if (NULL != BrushOrigin) { AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; @@ -707,8 +707,8 @@ DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); IntEngLeave(&EnterLeaveDest); IntEngLeave(&EnterLeaveSource); - - return FALSE; + + return FALSE; } else { @@ -803,7 +803,7 @@ static BOOLEAN STDCALL AlphaBltMask(SURFOBJ* Dest, SURFOBJ* Source, - SURFOBJ* Mask, + SURFOBJ* Mask, XLATEOBJ* ColorTranslation, XLATEOBJ* SrcColorTranslation, RECTL* DestRect, @@ -826,7 +826,7 @@ r = (int)GetRValue(BrushColor); g = (int)GetGValue(BrushColor); b = (int)GetBValue(BrushColor); - + tMask = Mask->pvScan0 + (SourcePoint->y * Mask->lDelta) + SourcePoint->x; for (j = 0; j < dy; j++) { @@ -845,7 +845,7 @@ Background = DIB_GetSource(Dest, DestRect->left + i, DestRect->top + j, SrcColorTranslation); - NewColor = + NewColor = RGB((*lMask * (r - GetRValue(Background)) >> 8) + GetRValue(Background), (*lMask * (g - GetGValue(Background)) >> 8) + GetGValue(Background), (*lMask * (b - GetBValue(Background)) >> 8) + GetBValue(Background)); @@ -976,7 +976,7 @@ OutputRect.right = DestRect->right + Translate.x; OutputRect.top = DestRect->top + Translate.y; OutputRect.bottom = DestRect->bottom + Translate.y; - + if(BrushOrigin) { AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; _____ Modified: trunk/reactos/subsys/win32k/eng/clip.c --- trunk/reactos/subsys/win32k/eng/clip.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/clip.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Clipping Functions @@ -206,13 +206,13 @@ IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds) { CLIPGDI *Clip; - + if(count > 1) { RECTL *dest; - + Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) * sizeof(RECTL)), TAG_CLIPOBJ); - + if(Clip != NULL) { Clip->EnumRects.c = count; @@ -228,7 +228,7 @@ Clip->ClipObj.iFComplexity = ((Clip->EnumRects.c <= 4) ? FC_RECT4 : FC_COMPLEX); Clip->ClipObj.iMode = TC_RECTANGLES; Clip->ClipObj.rclBounds = *rcBounds; - + return GDIToObj(Clip, CLIP); } } @@ -241,14 +241,14 @@ Clip->EnumRects.c = 1; Clip->EnumOrder = CD_ANY; Clip->EnumRects.arcl[0] = *rcBounds; - + Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && (rcBounds->left == rcBounds->right)) ? DC_TRIVIAL : DC_RECT); Clip->ClipObj.iFComplexity = FC_RECT; Clip->ClipObj.iMode = TC_RECTANGLES; Clip->ClipObj.rclBounds = *rcBounds; - + return GDIToObj(Clip, CLIP); } } @@ -358,7 +358,7 @@ { return FALSE; } - + /* copy rectangles */ src = ClipGDI->EnumRects.arcl + ClipGDI->EnumPos; for(i = 0, dest = pERects->arcl; @@ -367,7 +367,7 @@ { *dest = *src; } - + pERects->c = nCopy; ClipGDI->EnumPos+=nCopy; _____ Modified: trunk/reactos/subsys/win32k/eng/debug.c --- trunk/reactos/subsys/win32k/eng/debug.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/debug.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Brush Functions _____ Modified: trunk/reactos/subsys/win32k/eng/device.c --- trunk/reactos/subsys/win32k/eng/device.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/device.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Device Functions _____ Modified: trunk/reactos/subsys/win32k/eng/event.c --- trunk/reactos/subsys/win32k/eng/event.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/event.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -37,7 +37,7 @@ { return FALSE; } - KeInitializeEvent((PKEVENT)(*Event), SynchronizationEvent, FALSE); + KeInitializeEvent((PKEVENT)(*Event), SynchronizationEvent, FALSE); return TRUE; } @@ -69,7 +69,7 @@ if (!NT_SUCCESS(Status)) { return NULL; - } + } return (PEVENT)Event; } _____ Modified: trunk/reactos/subsys/win32k/eng/float.c --- trunk/reactos/subsys/win32k/eng/float.c 2005-05-08 02:08:57 UTC (rev 15105) [truncated at 1000 lines; 14927 more skipped]

1 0

[ion] 15105: Update DDK so generic HAL can build
by ion＠svn.reactos.com 08 May '05

08 May '05

Update DDK so generic HAL can build Modified: branches/new_headers/reactos/hal/hal/hal.c Modified: branches/new_headers/reactos/include/ddk/winddk.h Modified: branches/new_headers/reactos/include/reactos/buildno.h _____ Modified: branches/new_headers/reactos/hal/hal/hal.c --- branches/new_headers/reactos/hal/hal/hal.c 2005-05-08 01:47:30 UTC (rev 15104) +++ branches/new_headers/reactos/hal/hal/hal.c 2005-05-08 02:08:57 UTC (rev 15105) @@ -12,6 +12,8 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> +#include <ndk/haltypes.h> +#include <ndk/kdtypes.h> #include <roscfg.h> #define NDEBUG @@ -758,7 +760,7 @@ return (KIRQL)0; } - +#undef KeLowerIrql VOID STDCALL KeLowerIrql( @@ -782,7 +784,7 @@ return Value; } - +#undef KeRaiseIrql VOID STDCALL KeRaiseIrql( _____ Modified: branches/new_headers/reactos/include/ddk/winddk.h --- branches/new_headers/reactos/include/ddk/winddk.h 2005-05-08 01:47:30 UTC (rev 15104) +++ branches/new_headers/reactos/include/ddk/winddk.h 2005-05-08 02:08:57 UTC (rev 15105) @@ -169,6 +169,9 @@ typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE; typedef struct _DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION; typedef struct _DRIVE_LAYOUT_INFORMATION_EX *PDRIVE_LAYOUT_INFORMATION_EX; +typedef struct _BUS_HANDLER *PBUS_HANDLER; +typedef struct _PEB *PPEB; +typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; typedef struct _NAMED_PIPE_CREATE_PARAMETERS *PNAMED_PIPE_CREATE_PARAMETERS; typedef struct _MAILSLOT_CREATE_PARAMETERS *PMAILSLOT_CREATE_PARAMETERS; typedef struct _FILE_GET_QUOTA_INFORMATION *PFILE_GET_QUOTA_INFORMATION; @@ -328,7 +331,6 @@ extern NTOSAPI POBJECT_TYPE SeTokenObjectType; extern NTOSAPI CCHAR KeNumberProcessors; -extern NTOSAPI PHAL_DISPATCH_TABLE HalDispatchTable; extern NTOSAPI PHAL_PRIVATE_DISPATCH_TABLE HalPrivateDispatchTable; @@ -3893,8 +3895,208 @@ IN PVOID Argument1, IN PVOID Argument2); +typedef enum _HAL_QUERY_INFORMATION_CLASS +{ + HalInstalledBusInformation, + HalProfileSourceInformation, + HalInformationClassUnused1, + HalPowerInformation, + HalProcessorSpeedInformation, + HalCallbackInformation, + HalMapRegisterInformation, + HalMcaLogInformation, + HalFrameBufferCachingInformation, + HalDisplayBiosInformation, + HalProcessorFeatureInformation, + HalNumaTopologyInterface, + HalErrorInformation, + HalCmcLogInformation, + HalCpeLogInformation, + HalQueryMcaInterface, + HalQueryAMLIIllegalIOPortAddresses, + HalQueryMaxHotPlugMemoryAddress, + HalPartitionIpiInterface, + HalPlatformInformation, + HalQueryProfileSourceList +} HAL_QUERY_INFORMATION_CLASS, *PHAL_QUERY_INFORMATION_CLASS; +typedef enum _HAL_SET_INFORMATION_CLASS + { + HalProfileSourceInterval, + HalProfileSourceInterruptHandler, + HalMcaRegisterDriver, + HalKernelErrorHandler, + HalCmcRegisterDriver, + HalCpeRegisterDriver, + HalMcaLog, + HalCmcLog, + HalCpeLog, + HalGenerateCmcInterrupt +} HAL_SET_INFORMATION_CLASS, *PHAL_SET_INFORMATION_CLASS; +/* Function Type Defintions for Dispatch Functions */ + +typedef +VOID +(*PDEVICE_CONTROL_COMPLETION)( + IN struct _DEVICE_CONTROL_CONTEXT *ControlContext + ); + +typedef struct _DEVICE_CONTROL_CONTEXT { + NTSTATUS Status; + PDEVICE_HANDLER_OBJECT DeviceHandler; + PDEVICE_OBJECT DeviceObject; + ULONG ControlCode; + PVOID Buffer; + PULONG BufferLength; + PVOID Context; +} DEVICE_CONTROL_CONTEXT, *PDEVICE_CONTROL_CONTEXT; + +typedef struct _PM_DISPATCH_TABLE { + ULONG Signature; + ULONG Version; + PVOID Function[1]; +} PM_DISPATCH_TABLE, *PPM_DISPATCH_TABLE; + +typedef NTSTATUS STDCALL +(*pHalDeviceControl)(IN PDEVICE_HANDLER_OBJECT DeviceHandler, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN OUT PVOID Buffer OPTIONAL, + IN OUT PULONG BufferLength OPTIONAL, + IN PVOID Context, + IN PDEVICE_CONTROL_COMPLETION CompletionRoutine); + +typedef VOID FASTCALL +(*pHalExamineMBR)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MBRTypeIdentifier, + OUT PVOID *Buffer); + +typedef VOID FASTCALL +(*pHalIoAssignDriveLetters)(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString); + +typedef NTSTATUS FASTCALL +(*pHalIoReadPartitionTable)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); + +typedef NTSTATUS FASTCALL +(*pHalIoSetPartitionInformation)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType); + +typedef NTSTATUS FASTCALL +(*pHalIoWritePartitionTable)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); + +typedef PBUS_HANDLER FASTCALL +(*pHalHandlerForBus)(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber); + +typedef VOID FASTCALL +(*pHalReferenceBusHandler)(IN PBUS_HANDLER BusHandler); + +typedef NTSTATUS STDCALL +(*pHalQuerySystemInformation)(IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength); + + +typedef NTSTATUS STDCALL +(*pHalSetSystemInformation)(IN HAL_SET_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN PVOID Buffer); + + +typedef NTSTATUS STDCALL +(*pHalQueryBusSlots)(IN PBUS_HANDLER BusHandler, + IN ULONG BufferSize, + OUT PULONG SlotNumbers, + OUT PULONG ReturnedLength); + +typedef NTSTATUS STDCALL +(*pHalInitPnpDriver)(VOID); + +typedef NTSTATUS STDCALL +(*pHalInitPowerManagement)(IN PPM_DISPATCH_TABLE PmDriverDispatchTable, + OUT PPM_DISPATCH_TABLE *PmHalDispatchTable); + +typedef struct _DMA_ADAPTER * STDCALL +(*pHalGetDmaAdapter)(IN PVOID Context, + IN struct _DEVICE_DESCRIPTION *DeviceDescriptor, + OUT PULONG NumberOfMapRegisters); + +typedef NTSTATUS STDCALL +(*pHalGetInterruptTranslator)(IN INTERFACE_TYPE ParentInterfaceType, + IN ULONG ParentBusNumber, + IN INTERFACE_TYPE BridgeInterfaceType, + IN USHORT Size, + IN USHORT Version, + OUT PTRANSLATOR_INTERFACE Translator, + OUT PULONG BridgeBusNumber); + +typedef NTSTATUS STDCALL (*pHalStartMirroring)(VOID); + +typedef NTSTATUS STDCALL (*pHalEndMirroring)(IN ULONG PassNumber); + +typedef NTSTATUS STDCALL +(*pHalMirrorPhysicalMemory)(IN PHYSICAL_ADDRESS PhysicalAddress, + IN LARGE_INTEGER NumberOfBytes); + +typedef NTSTATUS STDCALL +(*pHalMirrorVerify)(IN PHYSICAL_ADDRESS PhysicalAddress, + IN LARGE_INTEGER NumberOfBytes); + +typedef VOID STDCALL +(*pHalEndOfBoot)(VOID); + +typedef BOOLEAN STDCALL +(*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows); + +typedef struct { + ULONG Version; + pHalQuerySystemInformation HalQuerySystemInformation; + pHalSetSystemInformation HalSetSystemInformation; + pHalQueryBusSlots HalQueryBusSlots; + ULONG Spare1; + pHalExamineMBR HalExamineMBR; + pHalIoAssignDriveLetters HalIoAssignDriveLetters; + pHalIoReadPartitionTable HalIoReadPartitionTable; + pHalIoSetPartitionInformation HalIoSetPartitionInformation; + pHalIoWritePartitionTable HalIoWritePartitionTable; + + pHalHandlerForBus HalReferenceHandlerForBus; + pHalReferenceBusHandler HalReferenceBusHandler; + pHalReferenceBusHandler HalDereferenceBusHandler; + + pHalInitPnpDriver HalInitPnpDriver; + pHalInitPowerManagement HalInitPowerManagement; + + pHalGetDmaAdapter HalGetDmaAdapter; + pHalGetInterruptTranslator HalGetInterruptTranslator; + + pHalStartMirroring HalStartMirroring; + pHalEndMirroring HalEndMirroring; + pHalMirrorPhysicalMemory HalMirrorPhysicalMemory; + pHalEndOfBoot HalEndOfBoot; + pHalMirrorVerify HalMirrorVerify; + +} HAL_DISPATCH, *PHAL_DISPATCH; + + +extern HAL_DISPATCH HalDispatchTable; +#define HALDISPATCH HalDispatchTable + /* ** Storage structures */ _____ Modified: branches/new_headers/reactos/include/reactos/buildno.h --- branches/new_headers/reactos/include/reactos/buildno.h 2005-05-08 01:47:30 UTC (rev 15104) +++ branches/new_headers/reactos/include/reactos/buildno.h 2005-05-08 02:08:57 UTC (rev 15105) @@ -1,9 +1,9 @@ /* Do not edit - Machine generated */ #ifndef _INC_REACTOS_BUILDNO #define _INC_REACTOS_BUILDNO -#define KERNEL_VERSION_BUILD 20050507 -#define KERNEL_VERSION_BUILD_STR "20050507-r15066" -#define KERNEL_VERSION_BUILD_RC "20050507-r15066\0" +#define KERNEL_VERSION_BUILD 20050508 +#define KERNEL_VERSION_BUILD_STR "20050508-r15096" +#define KERNEL_VERSION_BUILD_RC "20050508-r15096\0" #define KERNEL_RELEASE_RC "0.3-SVN\0" #define KERNEL_RELEASE_STR "0.3-SVN" #define KERNEL_VERSION_RC "0.3-SVN\0"

1 0

[ion] 15104: Limited build
by ion＠svn.reactos.com 08 May '05

08 May '05

Limited build Modified: branches/new_headers/reactos/Makefile _____ Modified: branches/new_headers/reactos/Makefile --- branches/new_headers/reactos/Makefile 2005-05-08 01:45:21 UTC (rev 15103) +++ branches/new_headers/reactos/Makefile 2005-05-08 01:47:30 UTC (rev 15104) @@ -58,13 +58,7 @@ # User mode libraries # libpcap packet epsapi -DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ - gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ - msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 serialui setupapi shell32 shlwapi smlib smdll snmpapi \ - syssetup twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ - urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv dhcpcapi \ - $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) +DLLS = ntdll smlib smdll snmpapi user32 lsasrv SUBSYS = smss win32k csrss ntvdm @@ -104,14 +98,12 @@ # System applications # autochk cmd format services setup usetup welcome winlogon msiexec -SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regsvr32 \ - reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \ - winlogon regedit winefile notepad reactos lsass dhcp +SYS_APPS = # System services SYS_SVC = rpcss eventlog umpnpmgr -APPS = testsets utils +APPS = # External modules and (sub)systems for ReactOS

1 0

[ion] 15103: Update ntoskrnl.h. Probably incorrect for now, it's an old version
by ion＠svn.reactos.com 08 May '05

08 May '05

Update ntoskrnl.h. Probably incorrect for now, it's an old version Modified: branches/new_headers/reactos/ntoskrnl/include/ntoskrnl.h _____ Modified: branches/new_headers/reactos/ntoskrnl/include/ntoskrnl.h --- branches/new_headers/reactos/ntoskrnl/include/ntoskrnl.h 2005-05-08 01:41:18 UTC (rev 15102) +++ branches/new_headers/reactos/ntoskrnl/include/ntoskrnl.h 2005-05-08 01:45:21 UTC (rev 15103) @@ -6,37 +6,29 @@ /* include the ntoskrnl config.h file */ #include "config.h" -#include <roscfg.h> +#include <reactos/roscfg.h> #include <reactos/version.h> #include <reactos/resource.h> #include <reactos/bugcodes.h> +#include <reactos/defines.h> +#include <reactos/string.h> #include <limits.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <wchar.h> -#include <roskrnl.h> -#include <ntos/minmax.h> -#include <ntos/synch.h> -#include <ntos/keyboard.h> -#include <ntos/ntdef.h> -#include <ntos/ntpnp.h> -#include <rosrtl/minmax.h> -#include <rosrtl/string.h> -#include <ddk/halfuncs.h> -#include <ddk/kefuncs.h> -#include <ddk/pnptypes.h> -#include <ddk/pnpfuncs.h> -#include <ddk/wdmguid.h> -#include <ntdll/ldr.h> +#include <ddk/ntifs.h> +#include <ndk/ntndk.h> + +/* Leave Intact */ #include <pseh.h> #include <internal/ctype.h> -#include <internal/ntoskrnl.h> +#include <internal/id.h> #include <internal/ke.h> #include <internal/i386/segment.h> #include <internal/i386/mm.h> #include <internal/i386/fpu.h> +#include <internal/i386/tss.h> #include <internal/module.h> #include <internal/handle.h> #include <internal/pool.h> @@ -51,6 +43,7 @@ #include <internal/kd.h> #include <internal/ex.h> #include <internal/ob.h> +#include <internal/nt.h> #include "internal/xhal.h" #include <internal/v86m.h> #include <internal/ifs.h> @@ -63,11 +56,10 @@ #include <internal/trap.h> #include <internal/safe.h> #include <internal/test.h> -#include <napi/core.h> -#include <napi/dbg.h> -#include <napi/teb.h> -#include <napi/win32.h> +#endif /* INCLUDE_NTOSKRNL_H */ + + #ifndef RTL_CONSTANT_STRING #define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ { \

1 0

[ion] 15102: Finally, add NDK. Still needs lot of work
by ion＠svn.reactos.com 08 May '05

08 May '05

Finally, add NDK. Still needs lot of work Added: branches/new_headers/reactos/include/ndk/ Added: branches/new_headers/reactos/include/ndk/cctypes.h Added: branches/new_headers/reactos/include/ndk/extypes.h Added: branches/new_headers/reactos/include/ndk/halfuncs.h Added: branches/new_headers/reactos/include/ndk/haltypes.h Added: branches/new_headers/reactos/include/ndk/i386/ Added: branches/new_headers/reactos/include/ndk/i386/floatsave.h Added: branches/new_headers/reactos/include/ndk/i386/segment.h Added: branches/new_headers/reactos/include/ndk/inbvfuncs.h Added: branches/new_headers/reactos/include/ndk/iofuncs.h Added: branches/new_headers/reactos/include/ndk/iotypes.h Added: branches/new_headers/reactos/include/ndk/kdfuncs.h Added: branches/new_headers/reactos/include/ndk/kdtypes.h Added: branches/new_headers/reactos/include/ndk/kefuncs.h Added: branches/new_headers/reactos/include/ndk/ketypes.h Added: branches/new_headers/reactos/include/ndk/ldrfuncs.h Added: branches/new_headers/reactos/include/ndk/ldrtypes.h Added: branches/new_headers/reactos/include/ndk/lpctypes.h Added: branches/new_headers/reactos/include/ndk/mmtypes.h Added: branches/new_headers/reactos/include/ndk/ntndk.h Added: branches/new_headers/reactos/include/ndk/obfuncs.h Added: branches/new_headers/reactos/include/ndk/obtypes.h Added: branches/new_headers/reactos/include/ndk/potypes.h Added: branches/new_headers/reactos/include/ndk/psfuncs.h Added: branches/new_headers/reactos/include/ndk/pstypes.h Added: branches/new_headers/reactos/include/ndk/rosfuncs.h Added: branches/new_headers/reactos/include/ndk/rostypes.h Added: branches/new_headers/reactos/include/ndk/rtlfuncs.h Added: branches/new_headers/reactos/include/ndk/rtltypes.h Added: branches/new_headers/reactos/include/ndk/sefuncs.h Added: branches/new_headers/reactos/include/ndk/setypes.h Added: branches/new_headers/reactos/include/ndk/umtypes.h Added: branches/new_headers/reactos/include/ndk/zwfuncs.h Added: branches/new_headers/reactos/include/ndk/zwtypes.h _____ Added: branches/new_headers/reactos/include/ndk/cctypes.h --- branches/new_headers/reactos/include/ndk/cctypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/cctypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,45 @@ +/* $Id: cctypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/cctypes.h + * PURPOSE: Definitions for exported Cache Manager Types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _CCTYPES_H +#define _CCTYPES_H + +#include <reactos/helper.h> + +#ifdef __NTOSKRNL__ +extern ULONG EXPORTED CcFastMdlReadWait; +extern ULONG EXPORTED CcFastReadNotPossible; +extern ULONG EXPORTED CcFastReadWait; +#else +extern ULONG IMPORTED CcFastMdlReadWait; +extern ULONG IMPORTED CcFastReadNotPossible; +extern ULONG IMPORTED CcFastReadWait; +#endif + +#endif + _____ Added: branches/new_headers/reactos/include/ndk/extypes.h --- branches/new_headers/reactos/include/ndk/extypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/extypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,63 @@ +/* $Id: extypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/extypes.h + * PURPOSE: Definitions for exported Executive Kernel Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _EXTYPES_H +#define _EXTYPES_H + +#include <reactos/helper.h> + +#ifdef __NTOSKRNL__ +extern POBJECT_TYPE EXPORTED ExIoCompletionType; +#else +extern POBJECT_TYPE IMPORTED ExIoCompletionType; +#endif + +typedef enum _HARDERROR_RESPONSE_OPTION { + OptionAbortRetryIgnore, + OptionOk, + OptionOkCancel, + OptionRetryCancel, + OptionYesNo, + OptionYesNoCancel, + OptionShutdownSystem +} HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION; + +typedef enum _HARDERROR_RESPONSE { + ResponseReturnToCaller, + ResponseNotHandled, + ResponseAbort, + ResponseCancel, + ResponseIgnore, + ResponseNo, + ResponseOk, + ResponseRetry, + ResponseYes +} HARDERROR_RESPONSE, *PHARDERROR_RESPONSE; + +#endif + _____ Added: branches/new_headers/reactos/include/ndk/halfuncs.h --- branches/new_headers/reactos/include/ndk/halfuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/halfuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,181 @@ +/* $Id: halfuncs.h,v 1.1.2.2 2004/10/25 02:57:20 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/halfuncs.h + * PURPOSE: Prototypes for exported Hardware Abstraction Layer Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _HALFUNCS_H +#define _HALFUNCS_H + +#include "haltypes.h" + +BOOLEAN +STDCALL +HalAllProcessorsStarted(VOID); + +VOID +STDCALL +HalAcquireDisplayOwnership( + IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters +); + +NTSTATUS +STDCALL +HalAllocateAdapterChannel( + IN PADAPTER_OBJECT AdapterObject, + IN PWAIT_CONTEXT_BLOCK WaitContextBlock, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine +); + +BOOLEAN +STDCALL +HalBeginSystemInterrupt( + ULONG Vector, + KIRQL Irql, + PKIRQL OldIrql +); + +BOOLEAN +STDCALL +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql +); + +VOID +STDCALL +HalDisplayString ( + IN PCHAR String +); + +BOOLEAN +STDCALL +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode +); + +VOID +STDCALL +HalEndSystemInterrupt( + KIRQL Irql, + ULONG Unknown2 +); + +BOOLEAN +STDCALL +HalGetEnvironmentVariable( + PCH Name, + PCH Value, + USHORT ValueLength +); + +VOID +STDCALL +HalInitializeProcessor( + ULONG ProcessorNumber, + PVOID ProcessorStack +); + +BOOLEAN +STDCALL +HalInitSystem( + ULONG BootPhase, + PLOADER_PARAMETER_BLOCK LoaderBlock +); + +BOOLEAN +STDCALL +HalQueryDisplayOwnership(VOID); + +VOID +STDCALL +HalReportResourceUsage(VOID); + +VOID +FASTCALL +HalRequestSoftwareInterrupt( + KIRQL SoftwareInterruptRequested +); + +VOID +STDCALL +HalReleaseDisplayOwnership(VOID); + +VOID +STDCALL +HalReturnToFirmware( + ULONG Action +); + +VOID +STDCALL +HalRequestIpi( + ULONG Unknown +); + +BOOLEAN +STDCALL +HalSetEnvironmentVariable( + IN PCH Name, + IN PCH Value +); + +BOOLEAN +STDCALL +HalStartNextProcessor( + ULONG Unknown1, + ULONG Unknown2 +); + +VOID +STDCALL +IoAssignDriveLetters( + PLOADER_PARAMETER_BLOCK LoaderBlock, + PSTRING NtDeviceName, + PUCHAR NtSystemPath, + PSTRING NtSystemPathString +); + +/* FIXME FIXME FIXME */ + +#define HAL_PRIVATE_DISPATCH_VERSION 1 +#define HAL_DISPATCH_VERSION 3 + +typedef struct _HAL_PRIVATE_DISPATCH { + ULONG Version; +} HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; + +extern HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +#define HALPRIVATEDISPATCH HalPrivateDispatchTable + +/* The Following Functions are called through the Dispatch Table */ +#define HalQuerySystemInformation HALDISPATCH.HalQuerySystemInformation +#define HalIoAssignDriveLetters HALDISPATCH.HalIoAssignDriveLetters +#define HalIoReadPartitionTable HALDISPATCH.HalIoReadPartitionTable +#define HalIoWritePartitionTable HALDISPATCH.HalIoWritePartitionTable +#define HalIoSetPartitionInformation HALDISPATCH.HalIoSetPartitionInformation +#endif _____ Added: branches/new_headers/reactos/include/ndk/haltypes.h --- branches/new_headers/reactos/include/ndk/haltypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/haltypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,89 @@ +/* $Id: haltypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/haltypes.h + * PURPOSE: Definitions for Hardware Abstraction Layer types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _HALTYPES_H +#define _HALTYPES_H + +#include <reactos/helper.h> +#include <ddk/ntdddisk.h> + +/* HalReturnToFirmware */ +#define FIRMWARE_HALT 1 +#define FIRMWARE_POWERDOWN 2 +#define FIRMWARE_REBOOT 3 + +/* Boot Flags */ +#define MB_FLAGS_MEM_INFO (0x1) +#define MB_FLAGS_BOOT_DEVICE (0x2) +#define MB_FLAGS_COMMAND_LINE (0x4) +#define MB_FLAGS_MODULE_INFO (0x8) +#define MB_FLAGS_AOUT_SYMS (0x10) +#define MB_FLAGS_ELF_SYMS (0x20) +#define MB_FLAGS_MMAP_INFO (0x40) +#define MB_FLAGS_DRIVES_INFO (0x80) +#define MB_FLAGS_CONFIG_TABLE (0x100) +#define MB_FLAGS_BOOT_LOADER_NAME (0x200) +#define MB_FLAGS_APM_TABLE (0x400) +#define MB_FLAGS_GRAPHICS_TABLE (0x800) + +typedef struct _LOADER_MODULE { + ULONG ModStart; + ULONG ModEnd; + ULONG String; + ULONG Reserved; +} LOADER_MODULE, *PLOADER_MODULE; + +typedef struct _LOADER_PARAMETER_BLOCK { + ULONG Flags; + ULONG MemLower; + ULONG MemHigher; + ULONG BootDevice; + ULONG CommandLine; + ULONG ModsCount; + ULONG ModsAddr; + UCHAR Syms[12]; + ULONG MmapLength; + ULONG MmapAddr; + ULONG DrivesCount; + ULONG DrivesAddr; + ULONG ConfigTable; + ULONG BootLoaderName; +} LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; + +#ifdef __NTOSKRNL__ +extern ULONG EXPORTED KdComPortInUse; +#else +extern ULONG IMPORTED KdComPortInUse; +#endif + +typedef struct _DRIVE_LAYOUT_INFORMATION { + DWORD PartitionCount; + DWORD Signature; + PARTITION_INFORMATION PartitionEntry[1]; +} DRIVE_LAYOUT_INFORMATION; +#endif + _____ Added: branches/new_headers/reactos/include/ndk/i386/floatsave.h --- branches/new_headers/reactos/include/ndk/i386/floatsave.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/i386/floatsave.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,11 @@ +#ifndef __NAPI_I386_FLOATSAVE_H__ +#define __NAPI_I386_FLOATSAVE_H__ + +#define FLOAT_SAVE_CONTROL (0xFFFF037F) +#define FLOAT_SAVE_STATUS (0xFFFF0000) +#define FLOAT_SAVE_TAG (0xFFFFFFFF) +#define FLOAT_SAVE_DATA (0xFFFF0000) + +#endif /* __NAPI_I386_FLOATSAVE_H__ */ + +/* EOF */ _____ Added: branches/new_headers/reactos/include/ndk/i386/segment.h --- branches/new_headers/reactos/include/ndk/i386/segment.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/i386/segment.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,12 @@ +#ifndef _ASM_SEGMENT_H +#define _ASM_SEGMENT_H + +#define KERNEL_CS (0x8) +#define KERNEL_DS (0x10) +#define USER_CS (0x18 + 0x3) +#define USER_DS (0x20 + 0x3) +#define RESERVED_FOR_TSS (0x28) +#define PCR_SELECTOR (0x30) +#define TEB_SELECTOR (0x38 + 0x3) + +#endif /* _ASM_SEGMENT_H */ _____ Added: branches/new_headers/reactos/include/ndk/inbvfuncs.h --- branches/new_headers/reactos/include/ndk/inbvfuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/inbvfuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,118 @@ +/* $Id: inbvfuncs.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/haltypes.h + * PURPOSE: Prototypes for Boot Video Driver not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _INBVFUNCS_H +#define _INBVFUNCS_H + +VOID +STDCALL +InbvAcquireDisplayOwnership(VOID); + +BOOLEAN +STDCALL +InbvCheckDisplayOwnership(VOID); + +BOOLEAN +STDCALL +InbvDisplayString( + IN PCHAR String +); + +VOID +STDCALL +InbvEnableBootDriver( + IN BOOLEAN Enable +); + +BOOLEAN +STDCALL +InbvEnableDisplayString( + IN BOOLEAN Enable +); + +VOID +STDCALL +InbvInstallDisplayStringFilter( + IN PVOID Unknown +); + +BOOLEAN +STDCALL +InbvIsBootDriverInstalled(VOID); + +VOID +STDCALL +InbvNotifyDisplayOwnershipLost( + IN PVOID Callback +); + +BOOLEAN +STDCALL +InbvResetDisplay(VOID); + +VOID +STDCALL +InbvSetScrollRegion( + IN ULONG Left, + IN ULONG Top, + IN ULONG Width, + IN ULONG Height +); + +VOID +STDCALL +InbvSetTextColor( + IN ULONG Color +); + +VOID +STDCALL +InbvSolidColorFill( + IN ULONG Left, + IN ULONG Top, + IN ULONG Width, + IN ULONG Height, + IN ULONG Color +); + +VOID +STDCALL +VidCleanUp(VOID); + +BOOLEAN +STDCALL +VidInitialize(VOID); + +BOOLEAN +STDCALL +VidResetDisplay(VOID); + +BOOLEAN +STDCALL +VidIsBootDriverInstalled(VOID); + +#endif _____ Added: branches/new_headers/reactos/include/ndk/iofuncs.h --- branches/new_headers/reactos/include/ndk/iofuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/iofuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,42 @@ +/* + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/iofuncs.h + * PURPOSE: Definitions for exported I/O Manager Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _IOFUNCS_H +#define _IOFUNCS_H + +NTSTATUS +STDCALL +IoSetIoCompletion ( + IN PVOID IoCompletion, + IN PVOID KeyContext, + IN PVOID ApcContext, + IN NTSTATUS IoStatus, + IN ULONG_PTR IoStatusInformation, + IN BOOLEAN Quota + ); +#endif + _____ Added: branches/new_headers/reactos/include/ndk/iotypes.h --- branches/new_headers/reactos/include/ndk/iotypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/iotypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,89 @@ +/* + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/iotypes.h + * PURPOSE: Definitions for exported I/O Manager Types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _IOTYPES_H +#define _IOTYPES_H + +#include <reactos/helper.h> + +#ifdef __NTOSKRNL__ +extern POBJECT_TYPE EXPORTED IoAdapterObjectType; +extern POBJECT_TYPE EXPORTED IoDeviceHandlerObjectType; +extern POBJECT_TYPE EXPORTED IoDeviceObjectType; +extern POBJECT_TYPE EXPORTED IoDriverObjectType; +extern POBJECT_TYPE EXPORTED IoFileObjectType; +extern ULONG EXPORTED IoReadOperationCount; +extern ULONGLONG EXPORTED IoReadTransferCount; +extern ULONG EXPORTED IoWriteOperationCount; +extern ULONGLONG EXPORTED IoWriteTransferCount; +extern KSPIN_LOCK EXPORTED IoStatisticsLock; +#else +extern POBJECT_TYPE IMPORTED IoAdapterObjectType; +extern POBJECT_TYPE IMPORTED IoDeviceHandlerObjectType; +extern POBJECT_TYPE IMPORTED IoDeviceObjectType; +extern POBJECT_TYPE IMPORTED IoDriverObjectType; +extern POBJECT_TYPE IMPORTED IoFileObjectType; +extern ULONG IMPORTED IoReadOperationCount; +extern ULONGLONG IMPORTED IoReadTransferCount; +extern ULONG IMPORTED IoWriteOperationCount; +extern ULONGLONG IMPORTED IoWriteTransferCount; +extern KSPIN_LOCK IMPORTED IoStatisticsLock; +#endif + +typedef struct _MAILSLOT_CREATE_PARAMETERS { + ULONG MailslotQuota; + ULONG MaximumMessageSize; + LARGE_INTEGER ReadTimeout; + BOOLEAN TimeoutSpecified; +} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS; + +typedef struct _NAMED_PIPE_CREATE_PARAMETERS { + ULONG NamedPipeType; + ULONG ReadMode; + ULONG CompletionMode; + ULONG MaximumInstances; + ULONG InboundQuota; + ULONG OutboundQuota; + LARGE_INTEGER DefaultTimeout; + BOOLEAN TimeoutSpecified; +} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; + +/* + * PURPOSE: Special timer associated with each device + */ +#define IO_TYPE_DRIVER 4L +#define IO_TYPE_TIMER 9L +typedef struct _IO_TIMER { + USHORT Type; /* Every IO Object has a Type */ + USHORT TimerEnabled; /* Tells us if the Timer is enabled or not */ + LIST_ENTRY IoTimerList; /* List of other Timers on the system */ + PIO_TIMER_ROUTINE TimerRoutine; /* The associated timer routine */ + PVOID Context; /* Context */ + PDEVICE_OBJECT DeviceObject; /* Driver that owns this IO Timer */ +} IO_TIMER, *PIO_TIMER; +#endif + _____ Added: branches/new_headers/reactos/include/ndk/kdfuncs.h --- branches/new_headers/reactos/include/ndk/kdfuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/kdfuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,108 @@ +/* $Id: kdfuncs.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/kdfuncs.h + * PURPOSE: Prototypes for Kernel Debugger Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _KDFUNCS_H +#define _KDFUNCS_H + +#include "kdtypes.h" + +BYTE +STDCALL +KdPollBreakIn(VOID); + +BOOLEAN +STDCALL +KdPortInitialize( + PKD_PORT_INFORMATION PortInformation, + DWORD Unknown1, + DWORD Unknown2 +); + +BOOLEAN +STDCALL +KdPortInitializeEx( + PKD_PORT_INFORMATION PortInformation, + DWORD Unknown1, + DWORD Unknown2 +); + +BOOLEAN +STDCALL +KdPortGetByte( + PUCHAR ByteRecieved +); + +BOOLEAN +STDCALL +KdPortGetByteEx( + PKD_PORT_INFORMATION PortInformation, + PUCHAR ByteRecieved +); + +BOOLEAN +STDCALL +KdPortPollByte( + PUCHAR ByteRecieved +); + +BOOLEAN +STDCALL +KdPortPollByteEx( + PKD_PORT_INFORMATION PortInformation, + PUCHAR ByteRecieved +); + +VOID +STDCALL +KdPortPutByte( + UCHAR ByteToSend +); + +VOID +STDCALL +KdPortPutByteEx( + PKD_PORT_INFORMATION PortInformation, + UCHAR ByteToSend +); + +VOID +STDCALL +KdPortRestore(VOID); + +VOID +STDCALL +KdPortSave (VOID); + +BOOLEAN +STDCALL +KdPortDisableInterrupts(VOID); + +BOOLEAN +STDCALL +KdPortEnableInterrupts(VOID); + +#endif _____ Added: branches/new_headers/reactos/include/ndk/kdtypes.h --- branches/new_headers/reactos/include/ndk/kdtypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/kdtypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,37 @@ +/* $Id: kdtypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/kdtypes.h + * PURPOSE: Definitions for Kernel Debugger Types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _KDTYPES_H +#define _KDTYPES_H + +typedef struct _KD_PORT_INFORMATION { + ULONG ComPort; + ULONG BaudRate; + ULONG BaseAddress; +} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; + +#endif _____ Added: branches/new_headers/reactos/include/ndk/kefuncs.h --- branches/new_headers/reactos/include/ndk/kefuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/kefuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,294 @@ +/* $Id: kefuncs.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/kefuncs.h + * PURPOSE: Prototypes for Kernel Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _KEFUNCS_H +#define _KEFUNCS_H + +#include "ketypes.h" + +VOID +STDCALL +KeInitializeApc( + IN PKAPC Apc, + IN PKTHREAD Thread, + IN KAPC_ENVIRONMENT TargetEnvironment, + IN PKKERNEL_ROUTINE KernelRoutine, + IN PKRUNDOWN_ROUTINE RundownRoutine OPTIONAL, + IN PKNORMAL_ROUTINE NormalRoutine, + IN KPROCESSOR_MODE Mode, + IN PVOID Context +); + +VOID +STDCALL +KeEnterKernelDebugger(VOID); + +VOID +FASTCALL +KiAcquireSpinLock( + PKSPIN_LOCK SpinLock +); + +VOID +FASTCALL +KiReleaseSpinLock( + PKSPIN_LOCK SpinLock +); + +VOID +STDCALL +KiDeliverApc( + IN KPROCESSOR_MODE PreviousMode, + IN PVOID Reserved, + IN PKTRAP_FRAME TrapFrame +); + +VOID +STDCALL +KiDispatchInterrupt(VOID); + + +BOOLEAN +STDCALL +KeAreApcsDisabled( + VOID + ); + +VOID +STDCALL +KeFlushQueuedDpcs( + VOID + ); + +ULONG +STDCALL +KeGetRecommendedSharedDataAlignment( + VOID + ); + +ULONG +STDCALL +KeQueryRuntimeThread( + IN PKTHREAD Thread, + OUT PULONG UserTime + ); + +BOOLEAN +STDCALL +KeSetKernelStackSwapEnable( + IN BOOLEAN Enable + ); + +BOOLEAN +STDCALL +KeDeregisterBugCheckReasonCallback( + IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord + ); + +BOOLEAN +STDCALL +KeRegisterBugCheckReasonCallback( + IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord, + IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine, + IN KBUGCHECK_CALLBACK_REASON Reason, + IN PUCHAR Component + ); + +VOID +STDCALL +KeTerminateThread( + IN KPRIORITY Increment +); + +BOOLEAN +STDCALL +KeIsExecutingDpc( + VOID +); + +VOID +STDCALL +KeSetEventBoostPriority( + IN PKEVENT Event, + IN PKTHREAD *Thread OPTIONAL +); + +PVOID +STDCALL +KeFindConfigurationEntry( + IN PVOID Unknown, + IN ULONG Class, + IN CONFIGURATION_TYPE Type, [truncated at 1000 lines; 10962 more skipped]

1 0

[ion] 15101: Add new WIN32K headers
by ion＠svn.reactos.com 08 May '05

08 May '05

Add new WIN32K headers Added: branches/new_headers/reactos/include/win32k/ Added: branches/new_headers/reactos/include/win32k/bitmaps.h Added: branches/new_headers/reactos/include/win32k/brush.h Added: branches/new_headers/reactos/include/win32k/cliprgn.h Added: branches/new_headers/reactos/include/win32k/color.h Added: branches/new_headers/reactos/include/win32k/coord.h Added: branches/new_headers/reactos/include/win32k/cursoricon.h Added: branches/new_headers/reactos/include/win32k/dc.h Added: branches/new_headers/reactos/include/win32k/debug.h Added: branches/new_headers/reactos/include/win32k/debug1.h Added: branches/new_headers/reactos/include/win32k/driver.h Added: branches/new_headers/reactos/include/win32k/fillshap.h Added: branches/new_headers/reactos/include/win32k/float.h Added: branches/new_headers/reactos/include/win32k/font.h Added: branches/new_headers/reactos/include/win32k/gdiobj.h Added: branches/new_headers/reactos/include/win32k/icm.h Added: branches/new_headers/reactos/include/win32k/kapi.h Added: branches/new_headers/reactos/include/win32k/line.h Added: branches/new_headers/reactos/include/win32k/math.h Added: branches/new_headers/reactos/include/win32k/menu.h Added: branches/new_headers/reactos/include/win32k/metafile.h Added: branches/new_headers/reactos/include/win32k/misc.h Added: branches/new_headers/reactos/include/win32k/ntddraw.h Added: branches/new_headers/reactos/include/win32k/ntuser.h Added: branches/new_headers/reactos/include/win32k/paint.h Added: branches/new_headers/reactos/include/win32k/path.h Added: branches/new_headers/reactos/include/win32k/pen.h Added: branches/new_headers/reactos/include/win32k/print.h Added: branches/new_headers/reactos/include/win32k/region.h Added: branches/new_headers/reactos/include/win32k/text.h Added: branches/new_headers/reactos/include/win32k/user32/ Added: branches/new_headers/reactos/include/win32k/user32/accel.h Added: branches/new_headers/reactos/include/win32k/user32/callback.h Added: branches/new_headers/reactos/include/win32k/user32/regcontrol.h Added: branches/new_headers/reactos/include/win32k/user32/wininternal.h Added: branches/new_headers/reactos/include/win32k/wingl.h _____ Added: branches/new_headers/reactos/include/win32k/bitmaps.h --- branches/new_headers/reactos/include/win32k/bitmaps.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/bitmaps.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,317 @@ + +#ifndef __WIN32K_BITMAPS_H +#define __WIN32K_BITMAPS_H + +/* GDI logical bitmap object */ +typedef struct _BITMAPOBJ +{ + SURFOBJ SurfObj; + FLONG flHooks; + FLONG flFlags; + SIZE dimension; /* For SetBitmapDimension(), do NOT use + to get width/height of bitmap, use + bitmap.bmWidth/bitmap.bmHeight for + that */ + + /* For device-independent bitmaps: */ + DIBSECTION *dib; + RGBQUAD *ColorMap; +} BITMAPOBJ, *PBITMAPOBJ; + +#define BITMAPOBJ_IS_APIBITMAP 0x1 + +/* Internal interface */ + +#define BITMAPOBJ_AllocBitmap() \ + ((HBITMAP) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_FreeBitmap(hBMObj) \ + GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) +#define BITMAPOBJ_LockBitmap(hBMObj) GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) +#define BITMAPOBJ_UnlockBitmap(hBMObj) GDIOBJ_UnlockObj((HGDIOBJ) hBMObj) +BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); + +INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); +HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP hBitmap); +INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); +int STDCALL DIB_GetDIBImageBytes (INT width, INT height, INT depth); +INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse); +INT STDCALL BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer); +HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice); + +HBITMAP FASTCALL IntCreateCompatibleBitmap(PDC Dc, INT Width, INT Height); + +/* User Entry Points */ +BOOL +STDCALL +NtGdiBitBlt ( + HDC hDCDest, + INT XDest, + INT YDest, + INT Width, + INT Height, + HDC hDCSrc, + INT XSrc, + INT YSrc, + DWORD ROP + ); +HBITMAP +STDCALL +NtGdiCreateBitmap ( + INT Width, + INT Height, + UINT Planes, + UINT BitsPerPel, + CONST VOID * Bits + ); +HBITMAP +STDCALL +NtGdiCreateCompatibleBitmap ( + HDC hDC, + INT Width, + INT Height + ); +HBITMAP +STDCALL +NtGdiCreateBitmapIndirect ( + CONST BITMAP * BM + ); +HBITMAP +STDCALL +NtGdiCreateDIBitmap ( + HDC hDC, + CONST BITMAPINFOHEADER * bmih, + DWORD Init, + CONST VOID * bInit, + CONST BITMAPINFO * bmi, + UINT Usage + ); +HBITMAP +STDCALL +NtGdiCreateDIBSection ( + HDC hDC, + CONST BITMAPINFO * bmi, + UINT Usage, + VOID * Bits, + HANDLE hSection, + DWORD dwOffset + ); +HBITMAP +STDCALL +NtGdiCreateDiscardableBitmap ( + HDC hDC, + INT Width, + INT Height + ); +BOOL +STDCALL +NtGdiExtFloodFill ( + HDC hDC, + INT XStart, + INT YStart, + COLORREF Color, + UINT FillType + ); +BOOL +STDCALL +NtGdiFloodFill ( + HDC hDC, + INT XStart, + INT YStart, + COLORREF Fill + ); +LONG +STDCALL +NtGdiGetBitmapBits ( + HBITMAP hBitmap, + LONG Buffer, + LPVOID Bits + ); +BOOL +STDCALL +NtGdiGetBitmapDimensionEx ( + HBITMAP hBitmap, + LPSIZE Dimension + ); +UINT +STDCALL +NtGdiGetDIBColorTable ( + HDC hDC, + UINT StartIndex, + UINT Entries, + RGBQUAD * Colors + ); +INT +STDCALL +NtGdiGetDIBits ( + HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + LPVOID Bits, + LPBITMAPINFO bi, + UINT Usage + ); +COLORREF +STDCALL +NtGdiGetPixel ( + HDC hDC, + INT XPos, + INT YPos + ); +BOOL +STDCALL +NtGdiGradientFill ( + HDC hdc, + PTRIVERTEX pVertex, + ULONG uVertex, + PVOID pMesh, + ULONG uMesh, + ULONG ulMode + ); +BOOL +STDCALL +NtGdiMaskBlt ( + HDC hDCDest, + INT XDest, + INT YDest, + INT Width, + INT Height, + HDC hDCSrc, + INT XSrc, + INT YSrc, + HBITMAP hMaskBitmap, + INT xMask, + INT yMask, + DWORD ROP + ); +BOOL +STDCALL +NtGdiPlgBlt ( + HDC hDCDest, + CONST POINT * Point, + HDC hDCSrc, + INT XSrc, + INT YSrc, + INT Width, + INT Height, + HBITMAP hMaskBitmap, + INT xMask, + INT yMask + ); +LONG +STDCALL +NtGdiSetBitmapBits ( + HBITMAP hBitmap, + DWORD Bytes, + CONST VOID * Bits + ); +BOOL +STDCALL +NtGdiSetBitmapDimensionEx ( + HBITMAP hBitmap, + INT Width, + INT Height, + LPSIZE Size + ); +UINT +STDCALL +NtGdiSetDIBColorTable ( + HDC hDC, + UINT StartIndex, + UINT Entries, + CONST RGBQUAD * Colors + ); +INT +STDCALL +NtGdiSetDIBits ( + HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + CONST VOID * Bits, + CONST BITMAPINFO * bmi, + UINT ColorUse + ); +INT +STDCALL +NtGdiSetDIBitsToDevice ( + HDC hDC, + INT XDest, + INT YDest, + DWORD Width, + DWORD Height, + INT XSrc, + INT YSrc, + UINT StartScan, + UINT ScanLines, + CONST VOID * Bits, + CONST BITMAPINFO * bmi, + UINT ColorUse + ); +COLORREF +STDCALL +NtGdiSetPixel ( + HDC hDC, + INT X, + INT Y, + COLORREF Color + ); +BOOL +STDCALL +NtGdiSetPixelV ( + HDC hDC, + INT X, + INT Y, + COLORREF Color + ); +BOOL +STDCALL +NtGdiStretchBlt ( + HDC hDCDest, + INT XOriginDest, + INT YOriginDest, + INT WidthDest, + INT HeightDest, + HDC hDCSrc, + INT XOriginSrc, + INT YOriginSrc, + INT WidthSrc, + INT HeightSrc, + DWORD ROP + ); +INT +STDCALL +NtGdiStretchDIBits ( + HDC hDC, + INT XDest, + INT YDest, + INT DestWidth, + INT DestHeight, + INT XSrc, + INT YSrc, + INT SrcWidth, + INT SrcHeight, + CONST VOID * Bits, + CONST BITMAPINFO * BitsInfo, + UINT Usage, + DWORD ROP + ); + +BOOL +STDCALL +NtGdiTransparentBlt( + HDC hdcDst, + INT xDst, + INT yDst, + INT cxDst, + INT cyDst, + HDC hdcSrc, + INT xSrc, + INT ySrc, + INT cxSrc, + INT cySrc, + COLORREF TransColor + ); + +#endif + _____ Added: branches/new_headers/reactos/include/win32k/brush.h --- branches/new_headers/reactos/include/win32k/brush.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/brush.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,146 @@ +#ifndef __WIN32K_BRUSH_H +#define __WIN32K_BRUSH_H + +/* Internal interface */ + +#define NB_HATCH_STYLES 6 + +/* + * The layout of this structure is taken from "Windows Graphics Programming" + * book written by Feng Yuan. + * + * DON'T MODIFY THIS STRUCTURE UNLESS REALLY NEEDED AND EVEN THEN ASK ON + * A MAILING LIST FIRST. + */ + +typedef struct +{ + ULONG AttrFlags; + COLORREF lbColor; +} BRUSHATTR, *PBRUSHATTR; + +typedef struct +{ + ULONG ulStyle; + HBITMAP hbmPattern; + HANDLE hbmClient; + ULONG flAttrs; + + ULONG ulBrushUnique; + BRUSHATTR *pBrushAttr; + BRUSHATTR BrushAttr; + POINT ptOrigin; + ULONG bCacheGrabbed; + COLORREF crBack; + COLORREF crFore; + ULONG ulPalTime; + ULONG ulSurfTime; + PVOID ulRealization; + ULONG Unknown4C[3]; + POINT ptPenWidth; + ULONG ulPenStyle; + DWORD *pStyle; + ULONG dwStyleCount; + ULONG Unknown6C; +} GDIBRUSHOBJ, *PGDIBRUSHOBJ; + +typedef struct +{ + BRUSHOBJ BrushObject; + PGDIBRUSHOBJ GdiBrushObject; + XLATEOBJ *XlateObject; +} GDIBRUSHINST, *PGDIBRUSHINST; + +/* GDI Brush Attributes */ + +#define GDIBRUSH_NEED_BK_CLR 0x0002 /* Background color is needed */ +#define GDIBRUSH_DITHER_OK 0x0004 /* Allow color dithering */ +#define GDIBRUSH_IS_SOLID 0x0010 /* Solid brush */ +#define GDIBRUSH_IS_HATCH 0x0020 /* Hatch brush */ +#define GDIBRUSH_IS_BITMAP 0x0040 /* DDB pattern brush */ +#define GDIBRUSH_IS_DIB 0x0080 /* DIB pattern brush */ +#define GDIBRUSH_IS_NULL 0x0100 /* Null/hollow brush */ +#define GDIBRUSH_IS_GLOBAL 0x0200 /* Stock objects */ +#define GDIBRUSH_IS_PEN 0x0400 /* Pen */ +#define GDIBRUSH_IS_OLDSTYLEPEN 0x0800 /* Geometric pen */ +#define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transparent mask (?) */ +#define GDIBRUSH_CACHED_IS_SOLID 0x80000000 + +#define BRUSHOBJ_AllocBrush() ((HBRUSH) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BRUSH)) +#define BRUSHOBJ_FreeBrush(hBrush) GDIOBJ_FreeObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH) +#define BRUSHOBJ_LockBrush(hBrush) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) +#define BRUSHOBJ_UnlockBrush(hBrush) GDIOBJ_UnlockObj((HGDIOBJ)hBrush) +BOOL INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody); + +#ifdef __USE_W32API +typedef struct _PATRECT { + RECT r; + HBRUSH hBrush; +} PATRECT, * PPATRECT; +#endif + +HBRUSH STDCALL +NtGdiCreateBrushIndirect( + CONST LOGBRUSH *LogBrush); + +HBRUSH STDCALL +NtGdiCreateDIBPatternBrush( + HGLOBAL hDIBPacked, + UINT ColorSpec); + +HBRUSH STDCALL +NtGdiCreateDIBPatternBrushPt( + CONST VOID *PackedDIB, + UINT Usage); + +HBRUSH STDCALL +NtGdiCreateHatchBrush( + INT Style, + COLORREF Color); + +HBRUSH STDCALL +NtGdiCreatePatternBrush( + HBITMAP hBitmap); + +HBRUSH STDCALL +NtGdiCreateSolidBrush( + COLORREF Color); + +BOOL STDCALL +NtGdiFixBrushOrgEx( + VOID); + +BOOL STDCALL +NtGdiPatBlt( + HDC hDC, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP); + +BOOL STDCALL +NtGdiPolyPatBlt( + HDC hDC, + DWORD dwRop, + PPATRECT pRects, + INT cRects, + ULONG Reserved); + +BOOL STDCALL +NtGdiPatBlt( + HDC hDC, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP); + +BOOL STDCALL +NtGdiSetBrushOrgEx( + HDC hDC, + INT XOrg, + INT YOrg, + LPPOINT Point); + +#endif _____ Added: branches/new_headers/reactos/include/win32k/cliprgn.h --- branches/new_headers/reactos/include/win32k/cliprgn.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/cliprgn.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,81 @@ +#ifndef _WIN32K_CLIPRGN_H +#define _WIN32K_CLIPRGN_H + +HRGN WINAPI SaveVisRgn(HDC hdc); +INT WINAPI SelectVisRgn(HDC hdc, HRGN hrgn); + +int +STDCALL +NtGdiExcludeClipRect ( + HDC hDC, + int LeftRect, + int TopRect, + int RightRect, + int BottomRect + ); +int +STDCALL +NtGdiExtSelectClipRgn ( + HDC hDC, + HRGN hrgn, + int fnMode + ); +int +STDCALL +NtGdiGetClipBox ( + HDC hDC, + LPRECT rc + ); +int +STDCALL +NtGdiGetMetaRgn ( + HDC hDC, + HRGN hrgn + ); +int +STDCALL +NtGdiIntersectClipRect ( + HDC hDC, + int LeftRect, + int TopRect, + int RightRect, + int BottomRect + ); +int +STDCALL +NtGdiOffsetClipRgn ( + HDC hDC, + int XOffset, + int YOffset + ); +BOOL +STDCALL +NtGdiPtVisible ( + HDC hDC, + int X, + int Y + ); +BOOL +STDCALL +NtGdiRectVisible ( + HDC hDC, + CONST PRECT rc + ); +BOOL +STDCALL +NtGdiSelectClipPath ( + HDC hDC, + int Mode + ); +int +STDCALL +NtGdiSelectClipRgn ( + HDC hDC, + HRGN hrgn + ); +int +STDCALL +NtGdiSetMetaRgn ( + HDC hDC + ); +#endif _____ Added: branches/new_headers/reactos/include/win32k/color.h --- branches/new_headers/reactos/include/win32k/color.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/color.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,116 @@ +#ifndef __WIN32K_COLOR_H +#define __WIN32K_COLOR_H + +#ifndef CLR_INVALID +#define CLR_INVALID 0xffffffff +#endif +#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ +#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ +#define PC_SYS_MAPPED 0x10 /* logical palentry is a direct alias for system palentry */ + +BOOL +STDCALL +NtGdiAnimatePalette ( + HPALETTE hpal, + UINT StartIndex, + UINT Entries, + CONST PPALETTEENTRY ppe + ); +HPALETTE +STDCALL +NtGdiCreateHalftonePalette ( + HDC hDC + ); +HPALETTE +STDCALL +NtGdiCreatePalette ( + CONST PLOGPALETTE lgpl + ); +BOOL +STDCALL +NtGdiGetColorAdjustment ( + HDC hDC, + LPCOLORADJUSTMENT ca + ); +COLORREF +STDCALL +NtGdiGetNearestColor ( + HDC hDC, + COLORREF Color + ); +UINT +STDCALL +NtGdiGetNearestPaletteIndex ( + HPALETTE hpal, + COLORREF Color + ); +UINT +STDCALL +NtGdiGetPaletteEntries ( + HPALETTE hpal, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe + ); +UINT +STDCALL +NtGdiGetSystemPaletteEntries ( + HDC hDC, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe + ); +UINT +STDCALL +NtGdiGetSystemPaletteUse ( + HDC hDC + ); +UINT +STDCALL +NtGdiRealizePalette ( + HDC hDC + ); +BOOL +STDCALL +NtGdiResizePalette ( + HPALETTE hpal, + UINT Entries + ); +HPALETTE +STDCALL +NtGdiSelectPalette ( + HDC hDC, + HPALETTE hpal, + BOOL ForceBackground + ); +BOOL +STDCALL +NtGdiSetColorAdjustment ( + HDC hDC, + CONST LPCOLORADJUSTMENT ca + ); +UINT +STDCALL +NtGdiSetPaletteEntries ( + HPALETTE hpal, + UINT Start, + UINT Entries, + CONST LPPALETTEENTRY pe + ); +UINT +STDCALL +NtGdiSetSystemPaletteUse ( + HDC hDC, + UINT Usage + ); +BOOL +STDCALL +NtGdiUnrealizeObject ( + HGDIOBJ hgdiobj + ); +BOOL +STDCALL +NtGdiUpdateColors ( + HDC hDC + ); +#endif _____ Added: branches/new_headers/reactos/include/win32k/coord.h --- branches/new_headers/reactos/include/win32k/coord.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/coord.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,151 @@ +#ifndef __WIN32K_COORD_H +#define __WIN32K_COORD_H + +BOOL +STDCALL +NtGdiCombineTransform ( + LPXFORM XformResult, + CONST LPXFORM xform1, + CONST LPXFORM xform2 + ); + +VOID +FASTCALL +IntDPtoLP ( PDC dc, LPPOINT Points, INT Count ); + +VOID +FASTCALL +CoordDPtoLP ( PDC Dc, LPPOINT Point ); + +BOOL +STDCALL +NtGdiDPtoLP ( + HDC hDC, + LPPOINT Points, + int Count + ); + +int +FASTCALL +IntGetGraphicsMode ( PDC dc ); + +int +STDCALL +NtGdiGetGraphicsMode ( HDC hDC ); + +BOOL +STDCALL +NtGdiGetWorldTransform ( + HDC hDC, + LPXFORM Xform + ); + +VOID +FASTCALL +CoordLPtoDP ( PDC Dc, LPPOINT Point ); + +VOID +FASTCALL +IntLPtoDP ( PDC dc, LPPOINT Points, INT Count ); + +BOOL +STDCALL +NtGdiLPtoDP ( + HDC hDC, + LPPOINT Points, + int Count + ); +BOOL +STDCALL +NtGdiModifyWorldTransform ( + HDC hDC, + CONST LPXFORM Xform, + DWORD Mode + ); +BOOL +STDCALL +NtGdiOffsetViewportOrgEx ( + HDC hDC, + int XOffset, + int YOffset, + LPPOINT Point + ); +BOOL +STDCALL +NtGdiOffsetWindowOrgEx ( + HDC hDC, + int XOffset, + int YOffset, + LPPOINT Point + ); +BOOL +STDCALL +NtGdiScaleViewportExtEx ( + HDC hDC, + int Xnum, + int Xdenom, + int Ynum, + int Ydenom, + LPSIZE Size + ); +BOOL +STDCALL +NtGdiScaleWindowExtEx ( + HDC hDC, + int Xnum, + int Xdenom, + int Ynum, + int Ydenom, + LPSIZE Size + ); +int +STDCALL +NtGdiSetGraphicsMode ( + HDC hDC, + int Mode + ); +int +STDCALL +NtGdiSetMapMode ( + HDC hDC, + int MapMode + ); +BOOL +STDCALL +NtGdiSetViewportExtEx ( + HDC hDC, + int XExtent, + int YExtent, + LPSIZE Size + ); +BOOL +STDCALL +NtGdiSetViewportOrgEx ( + HDC hDC, + int X, + int Y, + LPPOINT Point + ); +BOOL +STDCALL +NtGdiSetWindowExtEx ( + HDC hDC, + int XExtent, + int YExtent, + LPSIZE Size + ); +BOOL +STDCALL +NtGdiSetWindowOrgEx ( + HDC hDC, + int X, + int Y, + LPPOINT Point + ); +BOOL +STDCALL +NtGdiSetWorldTransform ( + HDC hDC, + CONST LPXFORM Xform + ); +#endif _____ Added: branches/new_headers/reactos/include/win32k/cursoricon.h --- branches/new_headers/reactos/include/win32k/cursoricon.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/cursoricon.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,95 @@ + +#ifndef __WIN32K_CURSORICON_H +#define __WIN32K_CURSORICON_H + +#include <pshpack1.h> + +/* Structures for reading icon/cursor files and resources */ +// Structures for reading icon files and resources +typedef struct _ICONIMAGE +{ + BITMAPINFOHEADER icHeader; // DIB header + RGBQUAD icColors[1]; // Color table + BYTE icXOR[1]; // DIB bits for XOR mask + BYTE icAND[1]; // DIB bits for AND mask +} ICONIMAGE, *LPICONIMAGE; + +typedef struct _CURSORIMAGE +{ + BITMAPINFOHEADER icHeader; // DIB header + RGBQUAD icColors[1]; // Color table + BYTE icXOR[1]; // DIB bits for XOR mask + BYTE icAND[1]; // DIB bits for AND mask +} CURSORIMAGE, *LPCURSORIMAGE; + +typedef struct +{ + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; +} ICONRESDIR; + +typedef struct +{ + WORD wWidth; + WORD wHeight; +} CURSORRESDIR; + +typedef struct +{ + WORD wPlanes; // Number of Color Planes in the XOR image + WORD wBitCount; // Bits per pixel in the XOR image +} ICONDIR; + +typedef struct +{ + WORD wXHotspot; // Number of Color Planes in the XOR image + WORD wYHotspot; // Bits per pixel in the XOR image +} CURSORDIR; + +typedef struct +{ + BYTE bWidth; // Width, in pixels, of the icon image + BYTE bHeight; // Height, in pixels, of the icon image + BYTE bColorCount; // Number of colors in image (0 if >=8bpp) + BYTE bReserved; // Reserved ( must be 0) + union + { ICONDIR icon; + CURSORDIR cursor; + } Info; + DWORD dwBytesInRes; // How many bytes in this resource? + DWORD dwImageOffset; // Where in the file is this image? +} CURSORICONDIRENTRY; + +typedef struct +{ + WORD idReserved; // Reserved (must be 0) + WORD idType; // Resource Type (1 for icons, 0 for cursors) + WORD idCount; // How many images? + CURSORICONDIRENTRY idEntries[1]; // An entry for idCount number of images +} CURSORICONDIR; + +typedef struct +{ + union + { ICONRESDIR icon; + CURSORRESDIR cursor; + } ResInfo; + WORD wPlanes; // Color Planes + WORD wBitCount; // Bits per pixel + DWORD dwBytesInRes; // how many bytes in this resource? + WORD nID; // the ID +} GRPCURSORICONDIRENTRY; + +typedef struct +{ + WORD idReserved; // Reserved (must be 0) + WORD idType; // Resource type (1 for icons) + WORD idCount; // How many images? + GRPCURSORICONDIRENTRY idEntries[1]; // The entries for each image +} GRPCURSORICONDIR; + +#include <poppack.h> + +#endif _____ Added: branches/new_headers/reactos/include/win32k/dc.h --- branches/new_headers/reactos/include/win32k/dc.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/dc.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,228 @@ + +#ifndef __WIN32K_DC_H +#define __WIN32K_DC_H + +typedef struct _WIN_DC_INFO +{ + int flags; + HRGN hClipRgn; /* Clip region (may be 0) */ + HRGN hVisRgn; /* Visible region (must never be 0) */ + HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ + HPEN hPen; + HBRUSH hBrush; + HFONT hFont; + HBITMAP hBitmap; + HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ + +/* #if 0 */ + HANDLE hDevice; + HPALETTE hPalette; + + GdiPath path; +/* #endif */ + + WORD ROPmode; + WORD polyFillMode; + WORD stretchBltMode; + WORD relAbsMode; + WORD backgroundMode; + COLORREF backgroundColor; + COLORREF textColor; + + short brushOrgX; + short brushOrgY; + + WORD textAlign; /* Text alignment from SetTextAlign() */ + short charExtra; /* Spacing from SetTextCharacterExtra() */ + short breakTotalExtra; /* Total extra space for justification */ + short breakCount; /* Break char. count */ + short breakExtra; /* breakTotalExtra / breakCount */ + short breakRem; /* breakTotalExtra % breakCount */ + + RECT totalExtent; + BYTE bitsPerPixel; + + INT MapMode; + INT GraphicsMode; /* Graphics mode */ + INT DCOrgX; /* DC origin */ + INT DCOrgY; + +#if 0 + FARPROC lpfnPrint; /* AbortProc for Printing */ +#endif + + INT CursPosX; /* Current position */ + INT CursPosY; + INT ArcDirection; + + XFORM xformWorld2Wnd; /* World-to-window transformation */ + XFORM xformWorld2Vport; /* World-to-viewport transformation */ [truncated at 1000 lines; 4556 more skipped]

1 0

[ion] 15100: Add PSEH
by ion＠svn.reactos.com 08 May '05

08 May '05

Add PSEH Added: branches/new_headers/reactos/include/pseh/ Added: branches/new_headers/reactos/include/pseh/excpt.h Added: branches/new_headers/reactos/include/pseh/framebased/ Added: branches/new_headers/reactos/include/pseh/framebased/internal.h Added: branches/new_headers/reactos/include/pseh/framebased.h Added: branches/new_headers/reactos/include/pseh/native.h Added: branches/new_headers/reactos/include/pseh/prettybased.h Added: branches/new_headers/reactos/include/pseh/setjmp.h _____ Added: branches/new_headers/reactos/include/pseh/excpt.h --- branches/new_headers/reactos/include/pseh/excpt.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/excpt.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,32 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is 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 Software. + + THE SOFTWARE IS 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. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_EXCPT_H_ +#define KJK_PSEH_EXCPT_H_ + +#define _SEH_CONTINUE_EXECUTION (-1) +#define _SEH_CONTINUE_SEARCH (0) +#define _SEH_EXECUTE_HANDLER (1) + +#endif + +/* EOF */ _____ Added: branches/new_headers/reactos/include/pseh/framebased/internal.h --- branches/new_headers/reactos/include/pseh/framebased/internal.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/framebased/internal.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,132 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is 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 Software. + + THE SOFTWARE IS 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. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_FRAMEBASED_INTERNAL_H_ +#define KJK_PSEH_FRAMEBASED_INTERNAL_H_ + +struct _EXCEPTION_RECORD; +struct _EXCEPTION_POINTERS; +struct _CONTEXT; + +typedef int (__cdecl * _SEHFrameHandler_t) +( + struct _EXCEPTION_RECORD *, + void *, + struct _CONTEXT *, + void * +); + +typedef struct __SEHRegistration +{ + struct __SEHRegistration * SER_Prev; + _SEHFrameHandler_t SER_Handler; +} +_SEHRegistration_t; + +struct __SEHPortableFrame; +struct __SEHPortableTryLevel; + +typedef long (__stdcall * _SEHFilter_t) +( + struct _EXCEPTION_POINTERS *, + struct __SEHPortableFrame * +); + +typedef __declspec(noreturn) void (__stdcall * _SEHHandler_t) +( + struct __SEHPortableTryLevel * +); + +typedef void (__stdcall * _SEHFinally_t) +( + struct __SEHPortableFrame * +); + +typedef struct __SEHHandlers +{ + _SEHFilter_t SH_Filter; + _SEHFinally_t SH_Finally; +} +_SEHHandlers_t; + +typedef struct __SEHPortableTryLevel +{ + struct __SEHPortableTryLevel * SPT_Next; + const _SEHHandlers_t * SPT_Handlers; +} +_SEHPortableTryLevel_t; + +typedef struct __SEHPortableFrame +{ + _SEHRegistration_t SPF_Registration; + unsigned long SPF_Code; + _SEHHandler_t SPF_Handler; + _SEHPortableTryLevel_t * SPF_TopTryLevel; +} +_SEHPortableFrame_t; + +#ifdef __cplusplus +extern "C" +{ +#endif + +extern void __stdcall _SEHEnterFrame_s +( + _SEHPortableFrame_t *, + _SEHPortableTryLevel_t * +); + +extern void __stdcall _SEHEnterTry_s(_SEHPortableTryLevel_t *); +extern void __stdcall _SEHLeave_s(void); + +#if !defined(_SEH_NO_FASTCALL) +# ifdef _M_IX86 +# define _SEH_FASTCALL __fastcall +# else +# define _SEH_FASTCALL __stdcall +# endif + +extern void _SEH_FASTCALL _SEHEnterFrame_f +( + _SEHPortableFrame_t *, + _SEHPortableTryLevel_t * +); + +extern void _SEH_FASTCALL _SEHEnterTry_f(_SEHPortableTryLevel_t *); +extern void _SEH_FASTCALL _SEHLeave_f(void); + +# define _SEHEnterFrame _SEHEnterFrame_f +# define _SEHEnterTry _SEHEnterTry_f +# define _SEHLeave _SEHLeave_f +#else +# define _SEHEnterFrame _SEHEnterFrame_s +# define _SEHEnterTry _SEHEnterTry_s +# define _SEHLeave _SEHLeave_s +#endif + +#ifdef __cplusplus +} +#endif + +#endif + +/* EOF */ _____ Added: branches/new_headers/reactos/include/pseh/framebased.h --- branches/new_headers/reactos/include/pseh/framebased.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/framebased.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,389 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is 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 Software. + + THE SOFTWARE IS 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. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_FRAMEBASED_H_ +#define KJK_PSEH_FRAMEBASED_H_ + +#include <pseh/framebased/internal.h> +#include <pseh/excpt.h> + +#ifndef offsetof +# include <stddef.h> +#endif + +/* + Fall back to non-optimal, non-native NLG implementation for environments + without their own (e.g., currently, kernel-mode ReactOS/Windows). THIS IS NOT + RECOMMENDED AND IT WILL BE DROPPED IN A FUTURE VERSION BECAUSE IT MAY CAUSE + SEVERE STACK CORRUPTION. REIMPLEMENT OR PORT YOUR COMPILER'S NATIVE NLG + IMPLEMENTATION INSTEAD. +*/ +#ifdef _SEH_NO_NATIVE_NLG +# include <pseh/setjmp.h> +#else +# include <setjmp.h> +# define _SEHLongJmp longjmp +# define _SEHSetJmp setjmp +# define _SEHJmpBuf_t jmp_buf +#endif +unsigned long DbgPrint(char * Format,...); +typedef struct __SEHFrame +{ + _SEHPortableFrame_t SEH_Header; + void * SEH_Locals; +} +_SEHFrame_t; + +typedef struct __SEHTryLevel +{ + _SEHPortableTryLevel_t ST_Header; + _SEHJmpBuf_t ST_JmpBuf; +} +_SEHTryLevel_t; + +static __declspec(noreturn) __inline void __stdcall _SEHCompilerSpecificHandler +( + _SEHPortableTryLevel_t * trylevel +) +{ + _SEHTryLevel_t * mytrylevel; + mytrylevel = _SEH_CONTAINING_RECORD(trylevel, _SEHTryLevel_t, ST_Header); + _SEHLongJmp(mytrylevel->ST_JmpBuf, 1); +} + +static const int _SEHScopeKind = 1; +static _SEHPortableFrame_t * const _SEHPortableFrame = 0; + +/* SHARED LOCALS */ +/* Access the locals for the current frame */ +#define _SEH_ACCESS_LOCALS(LOCALS_) \ + _SEH_LOCALS_TYPENAME(LOCALS_) * _SEHPLocals; \ + _SEHPLocals = \ + _SEH_PVOID_CAST \ + ( \ + _SEH_LOCALS_TYPENAME(LOCALS_) *, \ + _SEH_CONTAINING_RECORD(_SEHPortableFrame, _SEHFrame_t, SEH_Header) \ + ->SEH_Locals \ + ); + +/* Access local variable VAR_ */ +#define _SEH_VAR(VAR_) _SEHPLocals->VAR_ + +/* FILTER FUNCTIONS */ +/* Declares a filter function's prototype */ +#define _SEH_FILTER(NAME_) \ + long __stdcall NAME_ \ + ( \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, \ + struct __SEHPortableFrame * _SEHPortableFrame \ + ) + +/* Declares a static filter */ +#define _SEH_STATIC_FILTER(ACTION_) ((_SEHFilter_t)((ACTION_) + 2)) + +/* Declares a PSEH filter wrapping a regular filter function */ +#define _SEH_WRAP_FILTER(WRAPPER_, NAME_) \ + static __inline _SEH_FILTER(WRAPPER_) \ + { \ + return (NAME_)(_SEHExceptionPointers); \ + } + +/* FINALLY FUNCTIONS */ +/* Declares a finally function's prototype */ +#define _SEH_FINALLYFUNC(NAME_) \ + void __stdcall NAME_ \ + ( \ + struct __SEHPortableFrame * _SEHPortableFrame \ + ) + +/* Declares a PSEH finally function wrapping a regular function */ +#define _SEH_WRAP_FINALLY(WRAPPER_, NAME_) \ + _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ()) + +#define _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ARGS_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ + { \ + NAME_ ARGS_; \ + } + +#define _SEH_WRAP_FINALLY_LOCALS_ARGS(WRAPPER_, LOCALS_, NAME_, ARGS_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ + { \ + _SEH_ACCESS_LOCALS(LOCALS_); \ + NAME_ ARGS_; \ + } + +/* SAFE BLOCKS */ +#define _SEHX_TRY_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH), \ + (FINALLY_) \ + ) + +#define _SEHX_END_FINALLY _SEH_HANDLE _SEH_END + +#define _SEHX_TRY_FILTER(FILTER_) \ + _SEH_TRY_FILTER_FINALLY((FILTER_), 0) + +#define _SEHX_TRY_HANDLE_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER), \ + (FINALLY_) \ + ) + +#define _SEHX_TRY \ + _SEH_TRY_HANDLE_FINALLY(0) + +#ifdef __cplusplus +# define _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_) \ + static const _SEHHandlers_t _SEHHandlers = { (FILTER_), (FINALLY_) }; +#else +# define _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_) \ + _SEHHandlers_t _SEHHandlers = { (0), (0) }; \ + _SEHHandlers.SH_Filter = (FILTER_); \ + _SEHHandlers.SH_Finally = (FINALLY_); +#endif + +#define _SEHX_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \ + { \ + _SEHPortableFrame_t * const _SEHCurPortableFrame = _SEHPortableFrame; \ + \ + { \ + _SEHFrame_t _SEHFrame; \ + _SEHTryLevel_t _SEHTryLevel; \ + _SEHPortableFrame_t * const _SEHPortableFrame = \ + _SEHScopeKind ? &_SEHFrame.SEH_Header : _SEHCurPortableFrame; \ + \ + (void)_SEHPortableFrame; \ + \ + _SEH_DECLARE_HANDLERS((FILTER_), (FINALLY_)); \ + \ + _SEHTryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEHScopeKind) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEHFrame.SEH_Locals = &_SEHLocals; \ + \ + _SEHFrame.SEH_Header.SPF_Handler = _SEHCompilerSpecificHandler; \ + _SEHEnterFrame(&_SEHFrame.SEH_Header, &_SEHTryLevel.ST_Header); \ + } \ + else \ + _SEHEnterTry(&_SEHTryLevel.ST_Header); \ + \ + { \ + static const int _SEHScopeKind = 0; \ + (void)_SEHScopeKind; \ + \ + if(_SEHSetJmp(_SEHTryLevel.ST_JmpBuf) == 0) \ + { \ + for(;;) \ + { + +#define _SEHX_HANDLE \ + \ + break; \ + } \ + \ + _SEHLeave(); \ + } \ + else \ + { \ + _SEHLeave(); + +#define _SEHX_END \ + } \ + \ + if(_SEHHandlers.SH_Finally) \ + _SEHHandlers.SH_Finally(_SEHPortableFrame); \ + } \ + } \ + } + +#define _SEHX_LEAVE break + +#define _SEHX_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) + +#define _SEHX_GetExceptionPointers() \ + ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) + +#define _SEHX_AbnormalTermination() (_SEHPortableFrame->SPF_Code != 0) + +/* New syntax */ + +/* + NOTE: do not move, remove or modify any instance of _SEH2_ASSUME and + _SEH2_ASSUMING without doing extensive tests for correctness. Compilers can + generate the wrong code in presence of __assume in unpredictable ways. BE SURE + IT DOESN'T HAPPEN +*/ +#if defined(_MSC_VER) && (_MSC_VER > 1200) +# define _SEH2_ASSUME(X_) __assume(X_) +# if !defined(_SEH_NO_NATIVE_NLG) + /* + If we use the native setjmp, the compiler stops keeping track of variables, so + their actual values don't matter anymore. Optimize out some assignments + */ +# define _SEH2_ASSUMING(X_) +# else + /* No native setjmp, no magic, no assumptions. Actually set the values */ +# define _SEH2_ASSUMING(X_) X_ +# endif +#else +# define _SEH2_ASSUME(X_) +# define _SEH2_ASSUMING(X_) X_ +#endif + +#ifdef __cplusplus +# define _SEH2_INIT_CONST static const +#else +# define _SEH2_INIT_CONST register const +#endif + +#define _SEH_LEAVE break + +#define _SEH_TRY \ + { \ + _SEH2_INIT_CONST int _SEH2TopTryLevel = (_SEHScopeKind != 0); \ + _SEHPortableFrame_t * const _SEH2CurPortableFrame = _SEHPortableFrame; \ + \ + { \ + static const int _SEHScopeKind = 0; \ + register int _SEH2State = 0; \ + register int _SEH2Handle = 0; \ + _SEHFrame_t _SEH2Frame; \ + _SEHTryLevel_t _SEH2TryLevel; \ + _SEHPortableFrame_t * const _SEHPortableFrame = \ + _SEH2TopTryLevel ? &_SEH2Frame.SEH_Header : _SEH2CurPortableFrame; \ + \ + (void)_SEHScopeKind; \ + (void)_SEHPortableFrame; \ + (void)_SEH2Handle; \ + \ + for(;;) \ + { \ + if(_SEH2State) \ + { \ + for(;;) \ + { \ + { + +#define _SEH_EXCEPT(FILTER_) \ + } \ + \ + break; \ + } \ + \ + _SEH2_ASSUME(_SEH2Handle == 0); \ + break; \ + } \ + else \ + { \ + _SEH_DECLARE_HANDLERS((FILTER_), 0); \ + \ + _SEH2TryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEH2TopTryLevel) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEH2Frame.SEH_Locals = &_SEHLocals; \ + \ + _SEH2Frame.SEH_Header.SPF_Handler = _SEHCompilerSpecificHandler; \ + _SEHEnterFrame(&_SEH2Frame.SEH_Header, &_SEH2TryLevel.ST_Header); \ + } \ + else \ + _SEHEnterTry(&_SEH2TryLevel.ST_Header); \ + \ + if((_SEH2Handle = _SEHSetJmp(_SEH2TryLevel.ST_JmpBuf)) == 0) \ + { \ + _SEH2_ASSUMING(++ _SEH2State); \ + _SEH2_ASSUME(_SEH2State != 0); \ + continue; \ + } \ + else \ + { \ + break; \ + } \ + } \ + \ + break; \ + } \ + \ + _SEHLeave(); \ + \ + if(_SEH2Handle) \ + { + +#define _SEH_FINALLY(FINALLY_) \ + } \ + \ + break; \ + } \ + \ + _SEHLeave(); \ + break; \ + } \ + else \ + { \ + _SEH_DECLARE_HANDLERS(0, (FINALLY_)); \ + \ + _SEH2TryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEH2TopTryLevel) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEH2Frame.SEH_Locals = &_SEHLocals; \ + \ + _SEH2Frame.SEH_Header.SPF_Handler = 0; \ + _SEHEnterFrame(&_SEH2Frame.SEH_Header, &_SEH2TryLevel.ST_Header); \ + } \ + else \ + _SEHEnterTry(&_SEH2TryLevel.ST_Header); \ + \ + ++ _SEH2State; \ + _SEH2_ASSUME(_SEH2State != 0); \ + continue; \ + } \ + \ + break; \ + } \ + \ + (FINALLY_)(&_SEH2Frame.SEH_Header); \ + if(0) \ + { + +#define _SEH_END \ + } \ + } \ + } + +#define _SEH_HANDLE _SEH_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + +#define _SEH_GetExceptionCode _SEHX_GetExceptionCode +#define _SEH_GetExceptionPointers _SEHX_GetExceptionPointers +#define _SEH_AbnormalTermination _SEHX_AbnormalTermination + +#endif + +/* EOF */ _____ Added: branches/new_headers/reactos/include/pseh/native.h --- branches/new_headers/reactos/include/pseh/native.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/native.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,242 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is 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 Software. + + THE SOFTWARE IS 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. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_NATIVE_H_ +#define KJK_PSEH_NATIVE_H_ + +#include <excpt.h> +#include <pseh/excpt.h> + +/* + Note: just define __inline to an empty symbol if your C compiler doesn't + support it +*/ +#ifdef __cplusplus +# ifndef __inline +# define __inline inline +# endif +#endif + +typedef long (__stdcall * _SEHFilter_t) +( + long, + struct _EXCEPTION_POINTERS *, + void * +); + +typedef void (__stdcall * _SEHFinally_t) +( + int, + void * +); + +static __inline long _SEHCallFilter +( + _SEHFilter_t _SEHFilter, + long _SEHExceptionCode, + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, + void * _SEHPVLocals +) +{ + if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + return _SEH_EXECUTE_HANDLER; + else if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH)) + return _SEH_CONTINUE_SEARCH; + else if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_CONTINUE_EXECUTION)) + return _SEH_CONTINUE_EXECUTION; + else if(_SEHFilter) + return _SEHFilter(_SEHExceptionCode, _SEHExceptionPointers, _SEHPVLocals); + else + return _SEH_CONTINUE_SEARCH; +} + +static __inline void _SEHCallFinally +( + _SEHFinally_t _SEHFinally, + int _SEHAbnormalTermination, + void * _SEHPVLocals +) +{ + if(_SEHFinally) + (_SEHFinally)(_SEHAbnormalTermination, _SEHPVLocals); +} + +/* SHARED LOCALS */ +/* Access the locals for the current frame */ +#define _SEH_ACCESS_LOCALS(LOCALS_) \ + _SEH_LOCALS_TYPENAME(LOCALS_) * _SEHPLocals; \ + _SEHPLocals = _SEH_PVOID_CAST(_SEH_LOCALS_TYPENAME(LOCALS_) *, _SEHPVLocals); + +/* Access local variable VAR_ */ +#define _SEH_VAR(VAR_) _SEHPLocals->VAR_ + +/* FILTER FUNCTIONS */ +/* Declares a filter function's prototype */ +#define _SEH_FILTER(NAME_) \ + long __stdcall NAME_ \ + ( \ + long _SEHExceptionCode, \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, \ + void * _SEHPVLocals \ + ) + +/* Declares a static filter */ +#define _SEH_STATIC_FILTER(ACTION_) ((_SEHFilter_t)((ACTION_) + 2)) + +/* Declares a PSEH filter wrapping a regular filter function */ +#define _SEH_WRAP_FILTER(WRAPPER_, NAME_) \ + static __inline _SEH_FILTER(WRAPPER_) \ + { \ + return (NAME_)(_SEHExceptionPointers); \ + } + +/* FINALLY FUNCTIONS */ +/* Declares a finally function's prototype */ +#define _SEH_FINALLYFUNC(NAME_) \ + void __stdcall NAME_ \ + ( \ + int _SEHAbnormalTermination, \ + void * _SEHPVLocals \ + ) + +/* Declares a PSEH finally function wrapping a regular function */ +#define _SEH_WRAP_FINALLY(WRAPPER_, NAME_) \ + _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ()) + +#define _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ARGS_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ + { \ + NAME_ ARGS_; \ + } + +#define _SEH_WRAP_FINALLY_LOCALS_ARGS(WRAPPER_, LOCALS_, NAME_, ARGS_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ + { \ + _SEH_ACCESS_LOCALS(LOCALS_); \ + NAME_ ARGS_; \ + } + +/* SAFE BLOCKS */ +#define _SEH_TRY_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH), \ + (FINALLY_) \ + ) + +#define _SEH_END_FINALLY _SEH_HANDLE _SEH_END + +#define _SEH_TRY_FILTER(FILTER_) \ + _SEH_TRY_FILTER_FINALLY((FILTER_), NULL) + +#define _SEH_TRY_HANDLE_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER), \ + (FINALLY_) \ + ) + +#define _SEH_TRY \ + _SEH_TRY_HANDLE_FINALLY(NULL) + +#define _SEH_CALL_FILTER(FILTER_) \ + _SEHCallFilter \ + ( \ + (FILTER_), \ + GetExceptionCode(), \ + GetExceptionPointers(), \ + _SEHPVLocals \ + ) + +#define _SEH_CALL_FINALLY(FINALLY_) \ + _SEHCallFinally((FINALLY_), (AbnormalTermination() != 0), _SEHPVLocals) + +#define _SEH_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \ + __try \ + { \ + _SEHFinally_t _SEHFinally = (FINALLY_); \ + _SEHFilter_t _SEHFilter = (FILTER_); \ + void * _SEHPVLocals = &_SEHLocals; \ + (void)_SEHPVLocals; \ + \ + __try \ + { + +#define _SEH_HANDLE \ + } \ + __except(_SEH_CALL_FILTER(_SEHFilter)) \ + { \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers = GetExceptionPointers();\ + long _SEHExceptionCode = GetExceptionCode(); \ + +#define _SEH_END \ + } \ + } \ + __finally \ + { \ + _SEH_CALL_FINALLY(_SEHFinally); \ + } + +#define _SEH_LEAVE __leave + +#define _SEH_GetExceptionCode() (_SEHExceptionCode) +#define _SEH_GetExceptionPointers() (_SEHExceptionPointers) +#define _SEH_AbnormalTermination() (_SEHAbnormalTermination) + +/* New syntax */ + +#define _SEH2_TRY \ + { \ + void * _SEHPVLocals = &_SEHLocals; \ + (void)_SEHPVLocals; \ + \ + __try \ + { + +#define _SEH2_EXCEPT(FILTER_) \ + } \ + __except(_SEH_CALL_FILTER(FILTER_)) \ + { \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers = GetExceptionPointers();\ + long _SEHExceptionCode = GetExceptionCode(); \ + +#define _SEH2_FINALLY(FINALLY_) \ + } \ + __finally \ + { \ + _SEH_CALL_FINALLY(FINALLY_) + +#define _SEH2_END \ + } \ + } + +#define _SEH2_HANDLE _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + +#define _SEH2_LEAVE _SEH_LEAVE + +#define _SEH2_GetExceptionCode _SEH_GetExceptionCode +#define _SEH2_GetExceptionPointers _SEH_GetExceptionPointers +#define _SEH2_AbnormalTermination _SEH_AbnormalTermination + +#endif + +/* EOF */ _____ Added: branches/new_headers/reactos/include/pseh/prettybased.h --- branches/new_headers/reactos/include/pseh/prettybased.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/prettybased.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,299 @@ +/* + Copyright (c) 2004 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is 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 Software. + + THE SOFTWARE IS 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. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ +/* +Pretty PSEH + +Made to be macro compatible with ms seh syntax and to be pretty, having the +finally block inline etc. Being pretty is not cheap. PPSEH has more +overhead than PSEH, thou mostly during exception/unwinding. Normal execution +only add the overhead of one setjmp, and only in the try/finally case. +PPSEH is probably much less portable than PSEH also..... + +ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT !ALERT! +-must always use non-native NLG cause a special version of longjmp (which doesn't +restore esp) is needed + +-compiler must use ebp as stack frame pointer, cause the finally block rely +on this to access external variables + +-all external variables that are used in the except/finally block MUST be volatile +to prevent variables from being optimized into registers. +See: http://alphalinux.org/archives/axp-list/1998/February1998/0330.html + +-you can't use return within a try/except/finally block + +-you can't use __LEAVE within a (for/do/while) loop. it will only leave the loop +and not the try-block itself + + +USAGE: + +__TRY{ + __LEAVE; +} +__EXCEPT(_SEH_STATIC_FILTER(EXCEPTION_EXECUTE_HANDLER)){ +} +__ENDTRY; + + +__TRY{ +} +__FINALLY{ +} +__ENDTRY; + + +_SEH_FILTER(filter){ + return EXCEPTION_EXECUTE_HANDLER; +} +__TRY2{ +} +__EXCEPT2(filter){ +} +__FINALLY2{ +} +__ENDTRY2; + + + +-Gunnar + +*/ + + +#ifndef KJK_PPSEH_FRAMEBASED_H_ +#define KJK_PPSEH_FRAMEBASED_H_ + +#include <pseh/framebased/internal.h> +#include <pseh/excpt.h> +#include <malloc.h> + +#ifndef offsetof +# include <stddef.h> +#endif + +/* +Must always use non-native NLG since we need a special version of longjmp which does +not restore esp +*/ +#include <pseh/setjmp.h> + + +typedef struct __SEHFrame +{ + _SEHPortableFrame_t SEH_Header; + _SEHJmpBuf_t SEH_JmpBuf; + _SEHJmpBuf_t* SEH_JmpRetPtr; +} +_SEHFrame_t; + +/* + Note: just define __inline to an empty symbol if your C compiler doesn't + support it +*/ +#ifdef __cplusplus +# ifndef __inline +# define __inline inline +# endif +#endif + + +/* FILTER FUNCTIONS */ +/* Declares a filter function's prototype */ +#define _SEH_FILTER(NAME_) \ + long __stdcall NAME_ \ + ( \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, \ + struct __SEHPortableFrame * _SEHPortableFrame \ + ) + + +/* Declares a static filter */ +#define _SEH_STATIC_FILTER(ACTION_) ((_SEHFilter_t)((ACTION_) + 2)) + + +static __declspec(noreturn) __inline void __stdcall _SEHCompilerSpecificHandler +( + _SEHPortableFrame_t * frame +) +{ + _SEHFrame_t * myframe; + myframe = (_SEHFrame_t *)(((char *)frame) - offsetof(_SEHFrame_t, SEH_Header)); + _SEHLongJmp(myframe->SEH_JmpBuf, 1); +} + + + +void __stdcall _FinallyPretty +( + struct __SEHPortableFrame * frame +) +{ + _SEHFrame_t * myframe; + _SEHJmpBuf_t jmpRetBuf; + + myframe = (_SEHFrame_t *)(((char *)frame) - offsetof(_SEHFrame_t, SEH_Header)); + + if(_SEHSetJmp(jmpRetBuf) == 0) + { + myframe->SEH_JmpRetPtr = &jmpRetBuf; + _SEHLongJmp_KeepEsp(myframe->SEH_JmpBuf, 2); + } +} + + + +#define ___EXCEPT_DUAL(filter) \ + } while(0); \ + \ + _SEHLeave(&_SEHFrame->SEH_Header); \ + } \ + else \ + { \ + _SEHHandlers.SH_Filter = (filter); \ + _SEHHandlers.SH_Finally = _FinallyPretty; \ + \ + if(_loop == 2 || (_ret = _SEHSetJmp(_SEHFrame->SEH_JmpBuf))) \ + { \ + if (_ret == 1) \ + { \ + _SEHLeave(&_SEHFrame->SEH_Header); \ + do \ [truncated at 1000 lines; 178 more skipped]

1 0

[ion] 15099: Add basic headers from trunk
by ion＠svn.reactos.com 08 May '05

08 May '05

Add basic headers from trunk Added: branches/new_headers/reactos/include/csrss/ Added: branches/new_headers/reactos/include/csrss/csrss.h Added: branches/new_headers/reactos/include/reactos/ Added: branches/new_headers/reactos/include/reactos/buildno.h Added: branches/new_headers/reactos/include/reactos/config.h Added: branches/new_headers/reactos/include/reactos/errcodes.h Added: branches/new_headers/reactos/include/reactos/exeformat.h Added: branches/new_headers/reactos/include/reactos/resource.h Added: branches/new_headers/reactos/include/reactos/rossym.h Added: branches/new_headers/reactos/include/reactos/version.h Added: branches/new_headers/reactos/include/reactos/version.rc Added: branches/new_headers/reactos/include/reactos/winlogon.h Added: branches/new_headers/reactos/include/wine/ Added: branches/new_headers/reactos/include/wine/cfgmgr32.h Added: branches/new_headers/reactos/include/wine/cguid.h Added: branches/new_headers/reactos/include/wine/commctrl.h Added: branches/new_headers/reactos/include/wine/commdlg.h Added: branches/new_headers/reactos/include/wine/config.h Added: branches/new_headers/reactos/include/wine/debug.h Added: branches/new_headers/reactos/include/wine/dlgs.h Added: branches/new_headers/reactos/include/wine/docobj.h Added: branches/new_headers/reactos/include/wine/exception.h Added: branches/new_headers/reactos/include/wine/exdisp.h Added: branches/new_headers/reactos/include/wine/guiddef.h Added: branches/new_headers/reactos/include/wine/initguid.h Added: branches/new_headers/reactos/include/wine/list.h Added: branches/new_headers/reactos/include/wine/mmddk.h Added: branches/new_headers/reactos/include/wine/mmreg.h Added: branches/new_headers/reactos/include/wine/mmsystem.h Added: branches/new_headers/reactos/include/wine/msacm.h Added: branches/new_headers/reactos/include/wine/msacmdlg.h Added: branches/new_headers/reactos/include/wine/msacmdrv.h Added: branches/new_headers/reactos/include/wine/msi.h Added: branches/new_headers/reactos/include/wine/msidefs.h Added: branches/new_headers/reactos/include/wine/msiquery.h Added: branches/new_headers/reactos/include/wine/netspi.h Added: branches/new_headers/reactos/include/wine/npapi.h Added: branches/new_headers/reactos/include/wine/ntstatus.h Added: branches/new_headers/reactos/include/wine/oaidl.h Added: branches/new_headers/reactos/include/wine/objbase.h Added: branches/new_headers/reactos/include/wine/objidl.h Added: branches/new_headers/reactos/include/wine/ocidl.h Added: branches/new_headers/reactos/include/wine/ole2.h Added: branches/new_headers/reactos/include/wine/oleidl.h Added: branches/new_headers/reactos/include/wine/port.h Added: branches/new_headers/reactos/include/wine/prsht.h Added: branches/new_headers/reactos/include/wine/richedit.h Added: branches/new_headers/reactos/include/wine/richole.h Added: branches/new_headers/reactos/include/wine/rpcfc.h Added: branches/new_headers/reactos/include/wine/rpcss_shared.h Added: branches/new_headers/reactos/include/wine/servprov.h Added: branches/new_headers/reactos/include/wine/setupapi.h Added: branches/new_headers/reactos/include/wine/shellapi.h Added: branches/new_headers/reactos/include/wine/shldisp.h Added: branches/new_headers/reactos/include/wine/shlguid.h Added: branches/new_headers/reactos/include/wine/shlobj.h Added: branches/new_headers/reactos/include/wine/shlwapi.h Added: branches/new_headers/reactos/include/wine/shobjidl.h Added: branches/new_headers/reactos/include/wine/shtypes.h Added: branches/new_headers/reactos/include/wine/test.h Added: branches/new_headers/reactos/include/wine/unicode.h Added: branches/new_headers/reactos/include/wine/unknwn.h Added: branches/new_headers/reactos/include/wine/urlmon.h Added: branches/new_headers/reactos/include/wine/winbase16.h Added: branches/new_headers/reactos/include/wine/windef.h Added: branches/new_headers/reactos/include/wine/windef16.h Added: branches/new_headers/reactos/include/wine/wine_common_ver.rc Added: branches/new_headers/reactos/include/wine/wingdi.h Added: branches/new_headers/reactos/include/wine/wingdi16.h Added: branches/new_headers/reactos/include/wine/wininet.h Added: branches/new_headers/reactos/include/wine/winnetwk.h Added: branches/new_headers/reactos/include/wine/winnt.h Added: branches/new_headers/reactos/include/wine/winternl.h Added: branches/new_headers/reactos/include/wine/winuser.h Added: branches/new_headers/reactos/include/wine/winuser16.h Added: branches/new_headers/reactos/include/wine/wownt32.h Added: branches/new_headers/reactos/include/wine/wpp.h Added: branches/new_headers/reactos/include/wine/wtypes.h _____ Added: branches/new_headers/reactos/include/csrss/csrss.h --- branches/new_headers/reactos/include/csrss/csrss.h 2005-05-08 01:32:28 UTC (rev 15098) +++ branches/new_headers/reactos/include/csrss/csrss.h 2005-05-08 01:38:42 UTC (rev 15099) @@ -0,0 +1,830 @@ +#ifndef __INCLUDE_CSRSS_CSRSS_H +#define __INCLUDE_CSRSS_CSRSS_H + +#include <windows.h> +#include <ddk/ntddblue.h> +#include <ntos.h> + +#define CSR_CSRSS_SECTION_SIZE (65536) + +typedef __declspec(noreturn) VOID CALLBACK(*PCONTROLDISPATCHER)(DWORD); + +typedef struct +{ +} CSRSS_CONNECT_PROCESS_REQUEST, *PCSRSS_CONNECT_PROCESS_REQUEST; + +typedef struct +{ +} CSRSS_CONNECT_PROCESS_REPLY, *PCSRSS_CONNECT_PROCESS_REPLY; + +typedef struct +{ + HANDLE NewProcessId; + ULONG Flags; + PCONTROLDISPATCHER CtrlDispatcher; +} CSRSS_CREATE_PROCESS_REQUEST, *PCSRSS_CREATE_PROCESS_REQUEST; + +typedef struct +{ + HANDLE Console; + HANDLE InputHandle; + HANDLE OutputHandle; +} CSRSS_CREATE_PROCESS_REPLY, *PCSRSS_CREATE_PROCESS_REPLY; + +typedef struct +{ +} CSRSS_TERMINATE_PROCESS_REQUEST, *PCSRSS_TERMINATE_PROCESS_REQUEST; + +typedef struct +{ +} CSRSS_TERMINATE_PROCESS_REPLY, *PCSRSS_TERMINATE_PROCESS_REPLY; + +typedef struct +{ + ULONG nMaxIds; +} CSRSS_GET_PROCESS_LIST_REQUEST, *PCSRSS_GET_PROCESS_LIST_REQUEST; + +typedef struct +{ + ULONG nProcessIdsCopied; + ULONG nProcessIdsTotal; + HANDLE ProcessId[1]; +} CSRSS_GET_PROCESS_LIST_REPLY, *PCSRSS_GET_PROCESS_LIST_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + ULONG NrCharactersToWrite; + BYTE Buffer[1]; +} CSRSS_WRITE_CONSOLE_REQUEST, *PCSRSS_WRITE_CONSOLE_REQUEST; + +typedef struct +{ + ULONG NrCharactersWritten; +} CSRSS_WRITE_CONSOLE_REPLY, *PCSRSS_WRITE_CONSOLE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + WORD NrCharactersToRead; + WORD nCharsCanBeDeleted; /* number of chars already in buffer that can be backspaced */ +} CSRSS_READ_CONSOLE_REQUEST, *PCSRSS_READ_CONSOLE_REQUEST; + +typedef struct +{ + HANDLE EventHandle; + ULONG NrCharactersRead; + BYTE Buffer[1]; +} CSRSS_READ_CONSOLE_REPLY, *PCSRSS_READ_CONSOLE_REPLY; + +typedef struct +{ + PCONTROLDISPATCHER CtrlDispatcher; +} CSRSS_ALLOC_CONSOLE_REQUEST, *PCSRSS_ALLOC_CONSOLE_REQUEST; + +typedef struct +{ + HANDLE Console; + HANDLE InputHandle; + HANDLE OutputHandle; +} CSRSS_ALLOC_CONSOLE_REPLY, *PCSRSS_ALLOC_CONSOLE_REPLY; + +typedef struct +{ +} CSRSS_FREE_CONSOLE_REQUEST, *PCSRSS_FREE_CONSOLE_REQUEST; + +typedef struct +{ +} CSRSS_FREE_CONSOLE_REPLY, *PCSRSS_FREE_CONSOLE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +} CSRSS_SCREEN_BUFFER_INFO_REQUEST, *PCSRSS_SCREEN_BUFFER_INFO_REQUEST; + +typedef struct +{ + CONSOLE_SCREEN_BUFFER_INFO Info; +} CSRSS_SCREEN_BUFFER_INFO_REPLY, *PCSRSS_SCREEN_BUFFER_INFO_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + COORD Position; +} CSRSS_SET_CURSOR_REQUEST, *PCSRSS_SET_CURSOR_REQUEST; + +typedef struct +{ +} CSRSS_SET_CURSOR_REPLY, *PCSRSS_SET_CURSOR_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + union + { + CHAR AsciiChar; + WCHAR UnicodeChar; + } Char; + COORD Position; + WORD Length; +} CSRSS_FILL_OUTPUT_REQUEST, *PCSRSS_FILL_OUTPUT_REQUEST; + +typedef struct +{ + ULONG NrCharactersWritten; +} CSRSS_FILL_OUTPUT_REPLY, *PCSRSS_FILL_OUTPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + CHAR Attribute; + COORD Coord; + WORD Length; +} CSRSS_FILL_OUTPUT_ATTRIB_REQUEST, *PCSRSS_FILL_OUTPUT_ATTRIB_REQUEST; + +typedef struct +{ +} CSRSS_FILL_OUTPUT_ATTRIB_REPLY, *PCSRSS_FILL_OUTPUT_ATTRIB_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; +} CSRSS_READ_INPUT_REQUEST, *PCSRSS_READ_INPUT_REQUEST; + +typedef struct +{ + INPUT_RECORD Input; + BOOL MoreEvents; + HANDLE Event; +} CSRSS_READ_INPUT_REPLY, *PCSRSS_READ_INPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + WORD Length; + COORD Coord; + CHAR String[1]; +} CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST; + +typedef struct +{ + COORD EndCoord; + ULONG NrCharactersWritten; +} CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + WORD Length; + COORD Coord; + CHAR String[1]; +} CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST; + +typedef struct +{ + COORD EndCoord; +} CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +} CSRSS_GET_CURSOR_INFO_REQUEST, *PCSRSS_GET_CURSOR_INFO_REQUEST; + +typedef struct +{ + CONSOLE_CURSOR_INFO Info; +} CSRSS_GET_CURSOR_INFO_REPLY, *PCSRSS_GET_CURSOR_INFO_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + CONSOLE_CURSOR_INFO Info; +} CSRSS_SET_CURSOR_INFO_REQUEST, *PCSRSS_SET_CURSOR_INFO_REQUEST; + +typedef struct +{ +} CSRSS_SET_CURSOR_INFO_REPLY, *PCSRSS_SET_CURSOR_INFO_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + CHAR Attrib; +} CSRSS_SET_ATTRIB_REQUEST, *PCSRSS_SET_ATTRIB_REQUEST; + +typedef struct +{ +} CSRSS_SET_ATTRIB_REPLY, *PCSRSS_SET_ATTRIB_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD Mode; +} CSRSS_SET_CONSOLE_MODE_REQUEST, *PCSRSS_SET_CONSOLE_MODE_REQUEST; + +typedef struct +{ +} CSRSS_SET_CONSOLE_MODE_REPLY, *PCSRSS_SET_CONSOLE_MODE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +} CSRSS_GET_CONSOLE_MODE_REQUEST, *PCSRSS_GET_CONSOLE_MODE_REQUEST; + +typedef struct +{ + DWORD ConsoleMode; +} CSRSS_GET_CONSOLE_MODE_REPLY, *PCSRSS_GET_CONSOLE_MODE_REPLY; + +typedef struct +{ + /* may want to add some parameters here someday */ +} CSRSS_CREATE_SCREEN_BUFFER_REQUEST, *PCSRSS_CREATE_SCREEN_BUFFER_REQUEST; + +typedef struct +{ + HANDLE OutputHandle; /* handle to newly created screen buffer */ +} CSRSS_CREATE_SCREEN_BUFFER_REPLY, *PCSRSS_CREATE_SCREEN_BUFFER_REPLY; + +typedef struct +{ + HANDLE OutputHandle; /* handle to screen buffer to switch to */ +} CSRSS_SET_SCREEN_BUFFER_REQUEST, *PCSRSS_SET_SCREEN_BUFFER_REQUEST; + +typedef struct +{ +} CSRSS_SET_SCREEN_BUFFER_REPLY, *PCSRSS_SET_SCREEN_BUFFER_REPLY; + +typedef struct +{ + HANDLE UniqueThread; +} CSRSS_IDENTIFY_ALERTABLE_THREAD_REQUEST, *PCSRSS_IDENTIFY_ALERTABLE_THREAD_REQUEST; + +typedef struct +{ + CLIENT_ID Cid; +} CSRSS_IDENTIFY_ALERTABLE_THREAD_REPLY, *PCSRSS_IDENTIFY_ALERTABLE_THREAD_REPLY; + +typedef struct +{ + HANDLE Console; + DWORD Length; + WCHAR Title[1]; +} CSRSS_SET_TITLE_REQUEST, *PCSRSS_SET_TITLE_REQUEST; + +typedef struct +{ +} CSRSS_SET_TITLE_REPLY, *PCSRSS_SET_TITLE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +} CSRSS_GET_TITLE_REQUEST, *PCSRSS_GET_TITLE_REQUEST; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD Length; + WCHAR Title[1]; +} CSRSS_GET_TITLE_REPLY, *PCSRSS_GET_TITLE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + COORD BufferSize; + COORD BufferCoord; + SMALL_RECT WriteRegion; + CHAR_INFO* CharInfo; +} CSRSS_WRITE_CONSOLE_OUTPUT_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_REQUEST; + +typedef struct +{ + SMALL_RECT WriteRegion; +} CSRSS_WRITE_CONSOLE_OUTPUT_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleInput; +} CSRSS_FLUSH_INPUT_BUFFER_REQUEST, *PCSRSS_FLUSH_INPUT_BUFFER_REQUEST; + +typedef struct +{ +} CSRSS_FLUSH_INPUT_BUFFER_REPLY, *PCSRSS_FLUSH_INPUT_BUFFER_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + SMALL_RECT ScrollRectangle; + BOOLEAN UseClipRectangle; + SMALL_RECT ClipRectangle; + COORD DestinationOrigin; + CHAR_INFO Fill; +} CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST; + +typedef struct +{ +} CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REPLY, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD NumCharsToRead; + COORD ReadCoord; +}CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST; + +typedef struct +{ + COORD EndCoord; + DWORD CharsRead; + CHAR String[1]; +}CSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD NumAttrsToRead; + COORD ReadCoord; +}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST; + +typedef struct +{ + COORD EndCoord; + CHAR String[1]; +}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +}CSRSS_GET_NUM_INPUT_EVENTS_REQUEST, *PCSRSS_GET_NUM_INPUT_EVENTS_REQUEST; + +typedef struct +{ + DWORD NumInputEvents; +}CSRSS_GET_NUM_INPUT_EVENTS_REPLY, *PCSRSS_GET_NUM_INPUT_EVENTS_REPLY; + +typedef struct +{ + HANDLE ProcessId; +} CSRSS_REGISTER_SERVICES_PROCESS_REQUEST, *PCSRSS_REGISTER_SERVICES_PROCESS_REQUEST; + +typedef struct +{ +} CSRSS_REGISTER_SERVICES_PROCESS_REPLY, *PCSRSS_REGISTER_SERVICES_PROCESS_REPLY; + +typedef struct +{ + UINT Flags; + DWORD Reserved; +} CSRSS_EXIT_REACTOS_REQUEST, *PCSRSS_EXIT_REACTOS_REQUEST; + +typedef struct +{ +} CSRSS_EXIT_REACTOS_REPLY, *PCSRSS_EXIT_REACTOS_REPLY; + +typedef struct +{ + DWORD Level; + DWORD Flags; +} CSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST, *PCSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST; + +typedef struct +{ +} CSRSS_SET_SHUTDOWN_PARAMETERS_REPLY, *PCSRSS_SET_SHUTDOWN_PARAMETERS_REPLY; + +typedef struct +{ +} CSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST, *PCSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST; + +typedef struct +{ + DWORD Level; + DWORD Flags; +} CSRSS_GET_SHUTDOWN_PARAMETERS_REPLY, *PCSRSS_GET_SHUTDOWN_PARAMETERS_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD Length; + INPUT_RECORD* InputRecord; +} CSRSS_PEEK_CONSOLE_INPUT_REQUEST, *PCSRSS_PEEK_CONSOLE_INPUT_REQUEST; + +typedef struct +{ + DWORD Length; +} CSRSS_PEEK_CONSOLE_INPUT_REPLY, *PCSRSS_PEEK_CONSOLE_INPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + COORD BufferSize; + COORD BufferCoord; + SMALL_RECT ReadRegion; + CHAR_INFO* CharInfo; +} CSRSS_READ_CONSOLE_OUTPUT_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_REQUEST; + +typedef struct +{ + SMALL_RECT ReadRegion; +} CSRSS_READ_CONSOLE_OUTPUT_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD Length; + INPUT_RECORD* InputRecord; +} CSRSS_WRITE_CONSOLE_INPUT_REQUEST, *PCSRSS_WRITE_CONSOLE_INPUT_REQUEST; + +typedef struct +{ + DWORD Length; +} CSRSS_WRITE_CONSOLE_INPUT_REPLY, *PCSRSS_WRITE_CONSOLE_INPUT_REPLY; + +typedef struct +{ +} CSRSS_GET_INPUT_HANDLE_REQUEST, *PCSRSS_GET_INPUT_HANDLE_REQUEST; + +typedef struct +{ + HANDLE InputHandle; +} CSRSS_GET_INPUT_HANDLE_REPLY, *PCSRSS_GET_INPUT_HANDLE_REPLY; + +typedef struct +{ +} CSRSS_GET_OUTPUT_HANDLE_REQUEST, *PCSRSS_GET_OUTPUT_HANDLE_REQUEST; + +typedef struct +{ + HANDLE OutputHandle; +} CSRSS_GET_OUTPUT_HANDLE_REPLY, *PCSRSS_GET_OUTPUT_HANDLE_REPLY; + +typedef struct +{ + HANDLE Handle; +} CSRSS_CLOSE_HANDLE_REQUEST, *PCSRSS_CLOSE_HANDLE_REQUEST; + +typedef struct +{ +} CSRSS_CLOSE_HANDLE_REPLY, *PCSRSS_CLOSE_HANDLE_REPLY; + +typedef struct +{ + HANDLE Handle; +} CSRSS_VERIFY_HANDLE_REQUEST, *PCSRSS_VERIFY_HANDLE_REQUEST; + +typedef struct +{ +} CSRSS_VERIFY_HANDLE_REPLY, *PCSRSS_VERIFY_HANDLE_REPLY; + +typedef struct +{ + HANDLE Handle; + HANDLE ProcessId; +} CSRSS_DUPLICATE_HANDLE_REQUEST, *PCSRSS_DUPLICATE_HANDLE_REQUEST; + +typedef struct +{ + HANDLE Handle; +} CSRSS_DUPLICATE_HANDLE_REPLY, *PCSRSS_DUPLICATE_HANDLE_REPLY; + +#define CONSOLE_HARDWARE_STATE_GET 0 +#define CONSOLE_HARDWARE_STATE_SET 1 + +#define CONSOLE_HARDWARE_STATE_GDI_MANAGED 0 +#define CONSOLE_HARDWARE_STATE_DIRECT 1 + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD SetGet; /* 0=get; 1=set */ + DWORD State; +} CSRSS_SETGET_CONSOLE_HW_STATE_REQUEST, *PCSRSS_SETGET_CONSOLE_HW_STATE_REQUEST; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD SetGet; /* 0=get; 1=set */ + DWORD State; +} CSRSS_SETGET_CONSOLE_HW_STATE_REPLY, *PCSRSS_SETGET_CONSOLE_HW_STATE_REPLY; + +typedef struct +{ +} CSRSS_GET_CONSOLE_WINDOW_REQUEST, *PCSRSS_GET_CONSOLE_WINDOW_REQUEST; + +typedef struct +{ + HWND WindowHandle; +} CSRSS_GET_CONSOLE_WINDOW_REPLY, *PCSRSS_GET_CONSOLE_WINDOW_REPLY; + +typedef struct +{ + HICON WindowIcon; +} CSRSS_SET_CONSOLE_ICON_REQUEST, *PCSRSS_SET_CONSOLE_ICON_REQUEST; + +typedef struct +{ +} CSRSS_SET_CONSOLE_ICON_REPLY, *PCSRSS_SET_CONSOLE_ICON_REPLY; + +typedef struct +{ + HDESK DesktopHandle; +} CSRSS_CREATE_DESKTOP_REQUEST, *PCSRSS_CREATE_DESKTOP_REQUEST; + +typedef struct +{ +} CSRSS_CREATE_DESKTOP_REPLY, *PCSRSS_CREATE_DESKTOP_REPLY; + +typedef struct +{ + HWND DesktopWindow; + ULONG Width; + ULONG Height; +} CSRSS_SHOW_DESKTOP_REQUEST, *PCSRSS_SHOW_DESKTOP_REQUEST; + +typedef struct +{ +} CSRSS_SHOW_DESKTOP_REPLY, *PCSRSS_SHOW_DESKTOP_REPLY; + +typedef struct +{ + HWND DesktopWindow; +} CSRSS_HIDE_DESKTOP_REQUEST, *PCSRSS_HIDE_DESKTOP_REQUEST; + +typedef struct +{ +} CSRSS_HIDE_DESKTOP_REPLY, *PCSRSS_HIDE_DESKTOP_REPLY; + +typedef struct +{ + HWND LogonNotifyWindow; +} CSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST, *PCSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST; + +typedef struct +{ +} CSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY, *PCSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY; + +typedef struct +{ + HANDLE ProcessId; + BOOL Register; +} CSRSS_REGISTER_LOGON_PROCESS_REQUEST, *PCSRSS_REGISTER_LOGON_PROCESS_REQUEST; + +typedef struct +{ +} CSRSS_REGISTER_LOGON_PROCESS_REPLY, *PCSRSS_REGISTER_LOGON_PROCESS_REPLY; + +typedef struct +{ +} CSRSS_GET_CONSOLE_CP_REQUEST, *PCSRSS_GET_CONSOLE_CP_REQUEST; + +typedef struct +{ + UINT CodePage; +} CSRSS_GET_CONSOLE_CP_REPLY, *PCSRSS_GET_CONSOLE_CP_REPLY; + +typedef struct +{ + UINT CodePage; +} CSRSS_SET_CONSOLE_CP_REQUEST, *PCSRSS_SET_CONSOLE_CP_REQUEST; + +typedef struct +{ +} CSRSS_SET_CONSOLE_CP_REPLY, *PCSRSS_SET_CONSOLE_CP_REPLY; + +typedef struct +{ +} CSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST, *PCSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST; + +typedef struct +{ + UINT CodePage; +} CSRSS_GET_CONSOLE_OUTPUT_CP_REPLY, *PCSRSS_GET_CONSOLE_OUTPUT_CP_REPLY; + +typedef struct +{ + UINT CodePage; +} CSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST, *PCSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST; + +typedef struct +{ +} CSRSS_SET_CONSOLE_OUTPUT_CP_REPLY, *PCSRSS_SET_CONSOLE_OUTPUT_CP_REPLY; + +typedef struct +{ +} CSRSS_GET_INPUT_WAIT_HANDLE_REQUEST, *PCSRSS_GET_INPUT_WAIT_HANDLE_REQUEST; + +typedef struct +{ + HANDLE InputWaitHandle; +} CSRSS_GET_INPUT_WAIT_HANDLE_REPLY, *PCSRSS_GET_INPUT_WAIT_HANDLE_REPLY; + +#define CSRSS_MAX_WRITE_CONSOLE_REQUEST \ + (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(CSRSS_WRITE_CONSOLE_REQUEST)) + +#define CSRSS_MAX_SET_TITLE_REQUEST (MAX_MESSAGE_DATA - sizeof( HANDLE ) - sizeof( DWORD ) - sizeof( ULONG ) - LPC_MESSAGE_BASE_SIZE) + +#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST )) + +#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB ((MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST )) / 2) + +#define CSRSS_MAX_READ_CONSOLE_REQUEST (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_READ_CONSOLE_REQUEST )) + +#define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST)) + +#define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST)) + +/* WCHARs, not bytes! */ +#define CSRSS_MAX_TITLE_LENGTH 80 + +#define CSRSS_CREATE_PROCESS (0x0) +#define CSRSS_TERMINATE_PROCESS (0x1) +#define CSRSS_WRITE_CONSOLE (0x2) +#define CSRSS_READ_CONSOLE (0x3) +#define CSRSS_ALLOC_CONSOLE (0x4) +#define CSRSS_FREE_CONSOLE (0x5) +#define CSRSS_CONNECT_PROCESS (0x6) +#define CSRSS_SCREEN_BUFFER_INFO (0x7) +#define CSRSS_SET_CURSOR (0x8) +#define CSRSS_FILL_OUTPUT (0x9) +#define CSRSS_READ_INPUT (0xA) +#define CSRSS_WRITE_CONSOLE_OUTPUT_CHAR (0xB) +#define CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB (0xC) +#define CSRSS_FILL_OUTPUT_ATTRIB (0xD) +#define CSRSS_GET_CURSOR_INFO (0xE) +#define CSRSS_SET_CURSOR_INFO (0xF) +#define CSRSS_SET_ATTRIB (0x10) +#define CSRSS_GET_CONSOLE_MODE (0x11) +#define CSRSS_SET_CONSOLE_MODE (0x12) +#define CSRSS_CREATE_SCREEN_BUFFER (0x13) +#define CSRSS_SET_SCREEN_BUFFER (0x14) +#define CSRSS_SET_TITLE (0x15) +#define CSRSS_GET_TITLE (0x16) +#define CSRSS_WRITE_CONSOLE_OUTPUT (0x17) +#define CSRSS_FLUSH_INPUT_BUFFER (0x18) +#define CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER (0x19) +#define CSRSS_READ_CONSOLE_OUTPUT_CHAR (0x1A) +#define CSRSS_READ_CONSOLE_OUTPUT_ATTRIB (0x1B) +#define CSRSS_GET_NUM_INPUT_EVENTS (0x1C) +#define CSRSS_REGISTER_SERVICES_PROCESS (0x1D) +#define CSRSS_EXIT_REACTOS (0x1E) +#define CSRSS_GET_SHUTDOWN_PARAMETERS (0x1F) +#define CSRSS_SET_SHUTDOWN_PARAMETERS (0x20) +#define CSRSS_PEEK_CONSOLE_INPUT (0x21) +#define CSRSS_READ_CONSOLE_OUTPUT (0x22) +#define CSRSS_WRITE_CONSOLE_INPUT (0x23) +#define CSRSS_GET_INPUT_HANDLE (0x24) +#define CSRSS_GET_OUTPUT_HANDLE (0x25) +#define CSRSS_CLOSE_HANDLE (0x26) +#define CSRSS_VERIFY_HANDLE (0x27) +#define CSRSS_DUPLICATE_HANDLE (0x28) +#define CSRSS_SETGET_CONSOLE_HW_STATE (0x29) +#define CSRSS_GET_CONSOLE_WINDOW (0x2A) +#define CSRSS_CREATE_DESKTOP (0x2B) +#define CSRSS_SHOW_DESKTOP (0x2C) +#define CSRSS_HIDE_DESKTOP (0x2D) +#define CSRSS_SET_CONSOLE_ICON (0x2E) +#define CSRSS_SET_LOGON_NOTIFY_WINDOW (0x2F) +#define CSRSS_REGISTER_LOGON_PROCESS (0x30) +#define CSRSS_GET_CONSOLE_CP (0x31) +#define CSRSS_SET_CONSOLE_CP (0x32) +#define CSRSS_GET_CONSOLE_OUTPUT_CP (0x33) +#define CSRSS_SET_CONSOLE_OUTPUT_CP (0x34) +#define CSRSS_GET_INPUT_WAIT_HANDLE (0x35) +#define CSRSS_GET_PROCESS_LIST (0x36) + +/* Keep in sync with definition below. */ +#define CSRSS_REQUEST_HEADER_SIZE (LPC_MESSAGE_BASE_SIZE + sizeof(ULONG)) + +typedef struct +{ + union + { + LPC_MESSAGE Header; + struct + { + BYTE HeaderReserved[LPC_MESSAGE_BASE_SIZE]; + ULONG Type; + union + { + CSRSS_CREATE_PROCESS_REQUEST CreateProcessRequest; + CSRSS_CONNECT_PROCESS_REQUEST ConnectRequest; + CSRSS_WRITE_CONSOLE_REQUEST WriteConsoleRequest; + CSRSS_READ_CONSOLE_REQUEST ReadConsoleRequest; + CSRSS_ALLOC_CONSOLE_REQUEST AllocConsoleRequest; + CSRSS_SCREEN_BUFFER_INFO_REQUEST ScreenBufferInfoRequest; + CSRSS_SET_CURSOR_REQUEST SetCursorRequest; + CSRSS_FILL_OUTPUT_REQUEST FillOutputRequest; + CSRSS_READ_INPUT_REQUEST ReadInputRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST WriteConsoleOutputCharRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST WriteConsoleOutputAttribRequest; + CSRSS_FILL_OUTPUT_ATTRIB_REQUEST FillOutputAttribRequest; + CSRSS_SET_CURSOR_INFO_REQUEST SetCursorInfoRequest; + CSRSS_GET_CURSOR_INFO_REQUEST GetCursorInfoRequest; + CSRSS_SET_ATTRIB_REQUEST SetAttribRequest; + CSRSS_SET_CONSOLE_MODE_REQUEST SetConsoleModeRequest; + CSRSS_GET_CONSOLE_MODE_REQUEST GetConsoleModeRequest; + CSRSS_CREATE_SCREEN_BUFFER_REQUEST CreateScreenBufferRequest; + CSRSS_SET_SCREEN_BUFFER_REQUEST SetScreenBufferRequest; + CSRSS_SET_TITLE_REQUEST SetTitleRequest; + CSRSS_GET_TITLE_REQUEST GetTitleRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_REQUEST WriteConsoleOutputRequest; + CSRSS_FLUSH_INPUT_BUFFER_REQUEST FlushInputBufferRequest; + CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST ScrollConsoleScreenBufferRequest; + CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST ReadConsoleOutputCharRequest; + CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST ReadConsoleOutputAttribRequest; + CSRSS_GET_NUM_INPUT_EVENTS_REQUEST GetNumInputEventsRequest; + CSRSS_REGISTER_SERVICES_PROCESS_REQUEST RegisterServicesProcessRequest; + CSRSS_EXIT_REACTOS_REQUEST ExitReactosRequest; + CSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST SetShutdownParametersRequest; + CSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST GetShutdownParametersRequest; + CSRSS_PEEK_CONSOLE_INPUT_REQUEST PeekConsoleInputRequest; + CSRSS_READ_CONSOLE_OUTPUT_REQUEST ReadConsoleOutputRequest; + CSRSS_WRITE_CONSOLE_INPUT_REQUEST WriteConsoleInputRequest; + CSRSS_CLOSE_HANDLE_REQUEST CloseHandleRequest; + CSRSS_VERIFY_HANDLE_REQUEST VerifyHandleRequest; + CSRSS_DUPLICATE_HANDLE_REQUEST DuplicateHandleRequest; + CSRSS_SETGET_CONSOLE_HW_STATE_REQUEST ConsoleHardwareStateRequest; + CSRSS_GET_CONSOLE_WINDOW_REQUEST GetConsoleWindowRequest; + CSRSS_CREATE_DESKTOP_REQUEST CreateDesktopRequest; + CSRSS_SHOW_DESKTOP_REQUEST ShowDesktopRequest; + CSRSS_HIDE_DESKTOP_REQUEST HideDesktopRequest; + CSRSS_SET_CONSOLE_ICON_REQUEST SetConsoleIconRequest; + CSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST SetLogonNotifyWindowRequest; + CSRSS_REGISTER_LOGON_PROCESS_REQUEST RegisterLogonProcessRequest; + CSRSS_GET_CONSOLE_CP_REQUEST GetConsoleCodePage; + CSRSS_SET_CONSOLE_CP_REQUEST SetConsoleCodePage; + CSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST GetConsoleOutputCodePage; + CSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST SetConsoleOutputCodePage; + CSRSS_GET_INPUT_WAIT_HANDLE_REQUEST GetConsoleInputWaitHandle; + CSRSS_GET_PROCESS_LIST_REQUEST GetProcessListRequest; + } Data; + }; + }; +} CSRSS_API_REQUEST, *PCSRSS_API_REQUEST; + +typedef struct +{ + union + { + LPC_MESSAGE Header; + struct + { + BYTE HeaderReserved[LPC_MESSAGE_BASE_SIZE]; + NTSTATUS Status; + union + { + CSRSS_CREATE_PROCESS_REPLY CreateProcessReply; + CSRSS_CONNECT_PROCESS_REPLY ConnectReply; + CSRSS_FILL_OUTPUT_REPLY FillOutputReply; + CSRSS_WRITE_CONSOLE_REPLY WriteConsoleReply; + CSRSS_READ_CONSOLE_REPLY ReadConsoleReply; + CSRSS_ALLOC_CONSOLE_REPLY AllocConsoleReply; + CSRSS_SCREEN_BUFFER_INFO_REPLY ScreenBufferInfoReply; + CSRSS_READ_INPUT_REPLY ReadInputReply; + CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY WriteConsoleOutputCharReply; + CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY WriteConsoleOutputAttribReply; + CSRSS_GET_CURSOR_INFO_REPLY GetCursorInfoReply; + CSRSS_GET_CONSOLE_MODE_REPLY GetConsoleModeReply; + CSRSS_CREATE_SCREEN_BUFFER_REPLY CreateScreenBufferReply; + CSRSS_GET_TITLE_REPLY GetTitleReply; + CSRSS_WRITE_CONSOLE_OUTPUT_REPLY WriteConsoleOutputReply; + CSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY ReadConsoleOutputCharReply; + CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY ReadConsoleOutputAttribReply; + CSRSS_GET_NUM_INPUT_EVENTS_REPLY GetNumInputEventsReply; + CSRSS_SET_SHUTDOWN_PARAMETERS_REPLY SetShutdownParametersReply; + CSRSS_GET_SHUTDOWN_PARAMETERS_REPLY GetShutdownParametersReply; + CSRSS_PEEK_CONSOLE_INPUT_REPLY PeekConsoleInputReply; + CSRSS_READ_CONSOLE_OUTPUT_REPLY ReadConsoleOutputReply; + CSRSS_WRITE_CONSOLE_INPUT_REPLY WriteConsoleInputReply; + CSRSS_GET_INPUT_HANDLE_REPLY GetInputHandleReply; + CSRSS_GET_OUTPUT_HANDLE_REPLY GetOutputHandleReply; + CSRSS_DUPLICATE_HANDLE_REPLY DuplicateHandleReply; + CSRSS_SETGET_CONSOLE_HW_STATE_REPLY ConsoleHardwareStateReply; + CSRSS_GET_CONSOLE_WINDOW_REPLY GetConsoleWindowReply; + CSRSS_CREATE_DESKTOP_REPLY CreateDesktopReply; + CSRSS_SHOW_DESKTOP_REPLY ShowDesktopReply; + CSRSS_HIDE_DESKTOP_REPLY HideDesktopReply; + CSRSS_SET_CONSOLE_ICON_REPLY SetConsoleIconReply; + CSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY SetLogonNotifyWindowReply; + CSRSS_REGISTER_LOGON_PROCESS_REPLY RegisterLogonProcessReply; + CSRSS_GET_CONSOLE_CP_REPLY GetConsoleCodePage; + CSRSS_SET_CONSOLE_CP_REPLY SetConsoleCodePage; + CSRSS_GET_CONSOLE_OUTPUT_CP_REPLY GetConsoleOutputCodePage; + CSRSS_SET_CONSOLE_OUTPUT_CP_REPLY SetConsoleOutputCodePage; + CSRSS_GET_INPUT_WAIT_HANDLE_REPLY GetConsoleInputWaitHandle; + CSRSS_GET_PROCESS_LIST_REPLY GetProcessListReply; + } Data; + }; + }; +} CSRSS_API_REPLY, *PCSRSS_API_REPLY; + +#endif /* __INCLUDE_CSRSS_CSRSS_H */ _____ Added: branches/new_headers/reactos/include/reactos/buildno.h --- branches/new_headers/reactos/include/reactos/buildno.h 2005-05-08 01:32:28 UTC (rev 15098) +++ branches/new_headers/reactos/include/reactos/buildno.h 2005-05-08 01:38:42 UTC (rev 15099) @@ -0,0 +1,17 @@ +/* Do not edit - Machine generated */ +#ifndef _INC_REACTOS_BUILDNO +#define _INC_REACTOS_BUILDNO +#define KERNEL_VERSION_BUILD 20050507 +#define KERNEL_VERSION_BUILD_STR "20050507-r15066" +#define KERNEL_VERSION_BUILD_RC "20050507-r15066\0" +#define KERNEL_RELEASE_RC "0.3-SVN\0" +#define KERNEL_RELEASE_STR "0.3-SVN" +#define KERNEL_VERSION_RC "0.3-SVN\0" +#define KERNEL_VERSION_STR "0.3-SVN" +#define REACTOS_DLL_VERSION_MAJOR 42 +#define REACTOS_DLL_RELEASE_RC "42.3-SVN\0" +#define REACTOS_DLL_RELEASE_STR "42.3-SVN" +#define REACTOS_DLL_VERSION_RC "42.3-SVN\0" +#define REACTOS_DLL_VERSION_STR "42.3-SVN" +#endif +/* EOF */ _____ Added: branches/new_headers/reactos/include/reactos/config.h --- branches/new_headers/reactos/include/reactos/config.h 2005-05-08 01:32:28 UTC (rev 15098) +++ branches/new_headers/reactos/include/reactos/config.h 2005-05-08 01:38:42 UTC (rev 15099) @@ -0,0 +1,41 @@ +#ifndef _INC_REACTOS_CONFIG_H +#define _INC_REACTOS_CONFIG_H +/* $Id: config.h 12852 2005-01-06 13:58:04Z mf $ */ +/* ReactOS global configuration options */ + +#define CONFIG_PROCESSOR_FAMILY_I386 386L +#define CONFIG_PROCESSOR_FAMILY_I486 486L +#define CONFIG_PROCESSOR_FAMILY_I586 586L +#define CONFIG_PROCESSOR_FAMILY_IPII 686L + +#define CONFIG_PROCESSOR_FAMILY_ALPHA 0x10000000 + +#define CONFIG_ARCHITECTURE_IBMPC 0x00000000 +/* + * Processor and architecture. + */ +#define CONFIG_PROCESSOR_FAMILY CONFIG_PROCESSOR_FAMILY_I586 +#define CONFIG_ARCHITECTURE CONFIG_ARCHITECTURE_IBMPC +/* + * Hardware page size + */ +#define CONFIG_MEMORY_PAGE_SIZE 4096 +/* + * Use __fastcall calling conventions when needed + * in system components that require it. + */ + +/* #define CONFIG_USE_FASTCALL */ + +/* + * Enable debugging output on a per module + * base. + */ +#define DBG_NTOSKRNL_KE_MAIN +#define DBG_NTOSKRNL_MM_MM +#define DBG_NTOSKRNL_MM_NPOOL + +#define DBG_NTDLL_LDR_STARTUP +#define DBG_NTDLL_LDR_UTILS + +#endif /* ndef _INC_REACTOS_CONFIG_H */ _____ Added: branches/new_headers/reactos/include/reactos/errcodes.h --- branches/new_headers/reactos/include/reactos/errcodes.h 2005-05-08 01:32:28 UTC (rev 15098) +++ branches/new_headers/reactos/include/reactos/errcodes.h 2005-05-08 01:38:42 UTC (rev 15099) @@ -0,0 +1,8761 @@ +/* This file is generated with wmc version 1.0.0 (12-Jun-2000). Do not edit! */ +/* Source : kernel32.mc */ +/* Cmdline: wmc -H ../../include/reactos/errcodes.h -o errcodes.rc kernel32.mc */ +/* Date : Fri May 6 23:08:59 2005 */ + +#ifndef __WMCGENERATED_427c314b_H +#define __WMCGENERATED_427c314b_H + +/* Severity codes */ +#define STATUS_SEVERITY_ERROR 0x3 +#define STATUS_SEVERITY_INFORMATIONAL 0x1 +#define STATUS_SEVERITY_SUCCESS 0x0 +#define STATUS_SEVERITY_WARNING 0x2 + +/* Facility codes */ +#define FACILITY_ITF 0x4 +#define FACILITY_SYSTEM 0x0 +#define FACILITY_GENERAL 0x7 + +/* Message definitions */ + +/* kernel32.mc MESSAGE resources for kernel32.dll */ + + +/* message definitions */ + +/* Facility=System */ + +/* MessageId : 0x00000000 */ +/* Approx. msg: ERROR_SUCCESS - The operation completed successfully. */ +#define ERROR_SUCCESS ((ULONG)0x00000000L) + +/* MessageId : 0x00000001 */ +/* Approx. msg: ERROR_INVALID_FUNCTION - Incorrect function. */ +#define ERROR_INVALID_FUNCTION ((ULONG)0x00000001L) + +/* MessageId : 0x00000002 */ +/* Approx. msg: ERROR_FILE_NOT_FOUND - The system cannot find the file specified. */ +#define ERROR_FILE_NOT_FOUND ((ULONG)0x00000002L) + +/* MessageId : 0x00000003 */ +/* Approx. msg: ERROR_PATH_NOT_FOUND - The system cannot find the path specified. */ +#define ERROR_PATH_NOT_FOUND ((ULONG)0x00000003L) + +/* MessageId : 0x00000004 */ +/* Approx. msg: ERROR_TOO_MANY_OPEN_FILES - The system cannot open the file. */ +#define ERROR_TOO_MANY_OPEN_FILES ((ULONG)0x00000004L) + +/* MessageId : 0x00000005 */ +/* Approx. msg: ERROR_ACCESS_DENIED - Access is denied. */ +#define ERROR_ACCESS_DENIED ((ULONG)0x00000005L) + +/* MessageId : 0x00000006 */ +/* Approx. msg: ERROR_INVALID_HANDLE - The handle is invalid. */ +#define ERROR_INVALID_HANDLE ((ULONG)0x00000006L) + +/* MessageId : 0x00000007 */ +/* Approx. msg: ERROR_ARENA_TRASHED - The storage control blocks were destroyed. */ +#define ERROR_ARENA_TRASHED ((ULONG)0x00000007L) + +/* MessageId : 0x00000008 */ +/* Approx. msg: ERROR_NOT_ENOUGH_MEMORY - Not enough storage is available to process this command. */ +#define ERROR_NOT_ENOUGH_MEMORY ((ULONG)0x00000008L) + +/* MessageId : 0x00000009 */ +/* Approx. msg: ERROR_INVALID_BLOCK - The storage control block address is invalid. */ +#define ERROR_INVALID_BLOCK ((ULONG)0x00000009L) + +/* MessageId : 0x0000000a */ +/* Approx. msg: ERROR_BAD_ENVIRONMENT - The environment is incorrect. */ +#define ERROR_BAD_ENVIRONMENT ((ULONG)0x0000000aL) + +/* MessageId : 0x0000000b */ +/* Approx. msg: ERROR_BAD_FORMAT - An attempt was made to load a program with an incorrect format. */ +#define ERROR_BAD_FORMAT ((ULONG)0x0000000bL) + +/* MessageId : 0x0000000c */ +/* Approx. msg: ERROR_INVALID_ACCESS - The access code is invalid. */ +#define ERROR_INVALID_ACCESS ((ULONG)0x0000000cL) + +/* MessageId : 0x0000000d */ +/* Approx. msg: ERROR_INVALID_DATA - The data is invalid. */ +#define ERROR_INVALID_DATA ((ULONG)0x0000000dL) + +/* MessageId : 0x0000000e */ +/* Approx. msg: ERROR_OUTOFMEMORY - Not enough storage is available to complete this operation. */ +#define ERROR_OUTOFMEMORY ((ULONG)0x0000000eL) + +/* MessageId : 0x0000000f */ +/* Approx. msg: ERROR_INVALID_DRIVE - The system cannot find the drive specified. */ +#define ERROR_INVALID_DRIVE ((ULONG)0x0000000fL) + [truncated at 1000 lines; 27746 more skipped]

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
82
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005