Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[akhaldi] 52255: [CMAKE] * Merge 50707, 50713, 50742, 50779, 50795 and 50796 from the cmake branch. * Merge state.c change from 50740.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 15 19:36:15 2011 New Revision: 52255 URL: http://svn.reactos.org/svn/reactos?rev=52255&view=rev Log: [CMAKE] * Merge 50707, 50713, 50742, 50779, 50795 and 50796 from the cmake branch. * Merge state.c change from 50740. Modified: trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/win32/batt/resource.h trunk/reactos/dll/win32/winmm/registry.c trunk/reactos/drivers/bus/acpi/busmgr/button.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/system.c trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/acpi/pnp.c trunk/reactos/drivers/bus/acpi/power.c trunk/reactos/drivers/bus/pcix/pci/busno.c trunk/reactos/lib/3rdparty/libsamplerate/CMakeLists.txt trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -963,7 +963,7 @@ fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f / 0.0f; + fogstart = -INFINITY; fogend = 0.0f; } break; Modified: trunk/reactos/dll/win32/batt/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/resource.h?… ============================================================================== --- trunk/reactos/dll/win32/batt/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/batt/resource.h [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -1,1 +1,1 @@ -#define IDI_BATTERY 2 +#define IDI_BATTERY 2 Modified: trunk/reactos/dll/win32/winmm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/registry.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -29,10 +29,10 @@ HKEY drivers_key; DWORD value_name_length = 256; - char value_name[value_name_length]; + char value_name[256]; DWORD value_data_length = 256; - char value_data[value_data_length]; + char value_data[256]; DWORD value_type; Modified: trunk/reactos/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -42,13 +42,13 @@ static int acpi_button_remove (struct acpi_device *device, int type); static struct acpi_driver acpi_button_driver = { - .name = ACPI_BUTTON_DRIVER_NAME, - .class = ACPI_BUTTON_CLASS, - .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", - .ops = { - .add = acpi_button_add, - .remove = acpi_button_remove, - }, + {0,0}, + ACPI_BUTTON_DRIVER_NAME, + ACPI_BUTTON_CLASS, + 0, + 0, + "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", + {acpi_button_add,acpi_button_remove} }; struct acpi_button { Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -64,14 +64,13 @@ static int acpi_power_resume(struct acpi_device *device, int state); static struct acpi_driver acpi_power_driver = { - .name = ACPI_POWER_DRIVER_NAME, - .class = ACPI_POWER_CLASS, - .ids = ACPI_POWER_HID, - .ops = { - .add = acpi_power_add, - .remove = acpi_power_remove, - .resume = acpi_power_resume, - }, + {0,0}, + ACPI_POWER_DRIVER_NAME, + ACPI_POWER_CLASS, + 0, + 0, + ACPI_POWER_HID, + {acpi_power_add, acpi_power_remove, NULL, NULL, acpi_power_resume} }; struct acpi_power_reference { Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -48,13 +48,13 @@ ACPI_STATUS acpi_suspend (UINT32 state); static struct acpi_driver acpi_system_driver = { - .name = ACPI_SYSTEM_DRIVER_NAME, - .class = ACPI_SYSTEM_CLASS, - .ids = ACPI_SYSTEM_HID, - .ops = { - .add = acpi_system_add, - .remove = acpi_system_remove - }, + {0,0}, + ACPI_SYSTEM_DRIVER_NAME, + ACPI_SYSTEM_CLASS, + 0, + 0, + ACPI_SYSTEM_HID, + {acpi_system_add, acpi_system_remove} }; struct acpi_system Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -11,6 +11,13 @@ #define NDEBUG #include <debug.h> + +NTSTATUS +NTAPI +DriverEntry ( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath + ); #ifdef ALLOC_PRAGMA #pragma alloc_text (INIT, DriverEntry) Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -9,12 +9,17 @@ #include <wdmguid.h> #define NDEBUG #include <debug.h> + +NTSTATUS +Bus_PlugInDevice ( + struct acpi_device *Device, + PFDO_DEVICE_DATA FdoData + ); #ifdef ALLOC_PRAGMA #pragma alloc_text (PAGE, Bus_PnP) #pragma alloc_text (PAGE, Bus_PlugInDevice) #pragma alloc_text (PAGE, Bus_InitializePdo) -#pragma alloc_text (PAGE, Bus_UnPlugDevice) #pragma alloc_text (PAGE, Bus_DestroyPdo) #pragma alloc_text (PAGE, Bus_FDO_PnP) #pragma alloc_text (PAGE, Bus_StartFdo) Modified: trunk/reactos/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -224,7 +224,7 @@ return status; } -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(_MSC_VER) PCHAR PowerMinorFunctionString ( Modified: trunk/reactos/drivers/bus/pcix/pci/busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/busno… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -20,8 +20,9 @@ NTAPI PciAreBusNumbersConfigured(IN PPCI_PDO_EXTENSION PdoExtension) { + UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; + PAGED_CODE(); - UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; /* Get all relevant bus number details */ PrimaryBus = PdoExtension->Dependent.type1.PrimaryBus; Modified: trunk/reactos/lib/3rdparty/libsamplerate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/CMakeLists.txt [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -6,4 +6,4 @@ src_zoh.c) add_library(libsamplerate ${SOURCE}) -add_dependencies(libsamplerate psdk) +add_dependencies(libsamplerate psdk) Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] Wed Jun 15 19:36:15 2011 @@ -30,6 +30,9 @@ #include "float_cast.h" #include "common.h" +#include <windows.h> +#include <debug.h> + static int linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ; static void linear_reset (SRC_PRIVATE *psrc) ; @@ -107,8 +110,8 @@ src_ratio = psrc->last_ratio + priv->out_gen * (data->src_ratio - psrc->last_ratio) / priv->out_count ; if (SRC_DEBUG && priv->in_used < priv->channels && input_index < 1.0) - { printf ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; - exit (1) ; + { DPRINT1 ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; + ASSERT (0) ; } ; for (ch = 0 ; ch < priv->channels ; ch++)

13 years, 6 months

[rharabien] 52254: [NTOSKRNL] - Revert part of r52244. It was incorrect. Spotted by Alex Ionescu

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Jun 15 19:28:22 2011 New Revision: 52254 URL: http://svn.reactos.org/svn/reactos?rev=52254&view=rev Log: [NTOSKRNL] - Revert part of r52244. It was incorrect. Spotted by Alex Ionescu Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=522… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Jun 15 19:28:22 2011 @@ -1922,14 +1922,14 @@ ProcessInfo = &InitBuffer->ProcessInfo; ExpLoadInitialProcess(InitBuffer, &ProcessParameters, &Environment); + /* Clean the screen */ + if (InbvBootDriverInstalled) FinalizeBootLogo(); + /* Update progress bar */ InbvUpdateProgressBar(100); - /* Disallow strings to be displayed */ - InbvEnableDisplayString(FALSE); - - /* Clean the screen */ - if (InbvBootDriverInstalled) FinalizeBootLogo(); + /* Allow strings to be displayed */ + InbvEnableDisplayString(TRUE); /* Wait 5 seconds for initial process to initialize */ Timeout.QuadPart = Int32x32To64(5, -10000000);

13 years, 6 months

[tkreuzer] 52253: [FREELDR] - Add underscore to names of trap handlers and add C prototypes (will be needed later) - Move multiboot code to seperate file multiboot.S, not compiled atm, the code was...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 15 19:17:00 2011 New Revision: 52253 URL: http://svn.reactos.org/svn/reactos?rev=52253&view=rev Log: [FREELDR] - Add underscore to names of trap handlers and add C prototypes (will be needed later) - Move multiboot code to seperate file multiboot.S, not compiled atm, the code wasn't in use anyway - Remove EnableA20 dummy Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Wed Jun 15 19:17:00 2011 @@ -17,12 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -.intel_syntax noprefix -#define HEX(y) 0x##y - #include <asm.inc> #include <arch/pc/x86common.h> #include <multiboot.h> + +EXTERN _BootMain:PROC +EXTERN _InitIdt:PROC .code32 @@ -74,6 +74,7 @@ nop nop +#ifndef _USE_ML /* * Switches the processor to protected mode * it destroys eax @@ -213,12 +214,9 @@ /* Now return in r-mode! */ ret - +#endif .code32 -PUBLIC _EnableA20 -_EnableA20: - ret Int386_regsin: .long 0 @@ -295,153 +293,6 @@ nop -/* Multiboot support - * - * Allows freeldr to be loaded as a "multiboot kernel" by - * other boot loaders like Grub - */ - -#define MB_INFO_SIZE 90 -#define MB_INFO_FLAGS_OFFSET 0 -#define MB_INFO_BOOT_DEVICE_OFFSET 12 -#define MB_INFO_COMMAND_LINE_OFFSET 16 -#define CMDLINE_SIZE 256 - -/* - * We want to execute at 0x8000 (to be compatible with bootsector - * loading), but Grub only allows loading of multiboot kernels - * above 1MB. So we let Grub load us there and then relocate - * ourself to 0x8000 - */ -#define FREELDR_BASE HEX(8000) -#define INITIAL_BASE HEX(200000) - - /* Align 32 bits boundary */ -.align 4 - - /* Multiboot header */ -MultibootHeader: - /* magic */ - .long MULTIBOOT_HEADER_MAGIC - /* flags */ - .long MULTIBOOT_HEADER_FLAGS - /* checksum */ - .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) - /* header_addr */ - .long INITIAL_BASE + MultibootHeader - FREELDR_BASE - /* load_addr */ - .long INITIAL_BASE - /* load_end_addr */ - .long INITIAL_BASE + __bss_start__ - FREELDR_BASE - /* bss_end_addr */ - .long INITIAL_BASE + __bss_end__ - FREELDR_BASE - /* entry_addr */ - .long INITIAL_BASE + MultibootEntry - FREELDR_BASE - -MultibootEntry: - cli /* Even after setting up the our IDT below we are - * not ready to handle hardware interrupts (no entries - * in IDT), so there's no sti here. Interrupts will be - * enabled in due time */ - - /* Although the multiboot spec says we should be called with the - * segment registers set to 4GB flat mode, let's be sure and set up - * our own */ - lgdt gdtptrhigh + INITIAL_BASE - FREELDR_BASE - /* Reload segment selectors */ - //ljmp $PMODE_CS, $(mb1 + INITIAL_BASE - FREELDR_BASE) - jmp far ptr PMODE_CS: (mb1 + INITIAL_BASE - FREELDR_BASE) -mb1: - mov dx, PMODE_DS - mov ds, dx - mov es, dx - - /* Check for valid multiboot signature */ - cmp eax, MULTIBOOT_BOOTLOADER_MAGIC - jne mbfail - - /* Store multiboot info in a safe place */ - mov esi, ebx - mov edi, offset mb_info + INITIAL_BASE - FREELDR_BASE - mov ecx, MB_INFO_SIZE - rep movsb - - /* Save commandline */ - mov edx, [ebx + MB_INFO_FLAGS_OFFSET] - test dword ptr [ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE - jz mb3 - mov esi, [ebx + MB_INFO_COMMAND_LINE_OFFSET] - mov edi, offset cmdline + INITIAL_BASE - FREELDR_BASE - mov ecx, CMDLINE_SIZE -mb2: lodsb - stosb - test al, al - jz mb3 - dec ecx - jnz mb2 -mb3: - - /* Copy to low mem */ - mov esi, INITIAL_BASE - mov edi, FREELDR_BASE - mov ecx, (offset __bss_end__ - FREELDR_BASE) - add ecx, 3 - shr ecx, 2 - rep movsd - - /* Load the GDT and IDT */ - lgdt gdtptr - lidt i386idtptr - - /* Clear prefetch queue & correct CS, - * jump to low mem */ - //ljmp $PMODE_CS, $mb4 - jmp far ptr PMODE_CS:mb4 -mb4: - /* Reload segment selectors */ - mov dx, PMODE_DS - mov ds, dx - mov es, dx - mov fs, dx - mov gs, dx - mov ss, dx - mov esp, STACK32ADDR - - mov ebx, offset mb_info - /* See if the boot device was passed in */ - mov edx, [ebx + MB_INFO_FLAGS_OFFSET] - test edx, MB_INFO_FLAG_BOOT_DEVICE - jz mb5 - /* Retrieve boot device info */ - mov eax, [ebx + MB_INFO_BOOT_DEVICE_OFFSET] - shr eax, 16 - inc al - mov byte ptr [_FrldrBootPartition], al - mov byte ptr [_FrldrBootDrive], ah - jmp mb6 -mb5: /* No boot device known, assume first partition of first harddisk */ - mov byte ptr [_FrldrBootDrive], HEX(80) - mov byte ptr [_FrldrBootPartition], 1 -mb6: - /* Check for command line */ - mov eax, offset cmdline - test dword ptr [ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE - jnz mb7 - xor eax, eax -mb7: - - /* GO! */ - push eax - call _BootMain - -mbfail: - call switch_to_real - .code16 - int 0x19 -mbstop: jmp mbstop /* We should never get here */ - - .code32 - /* 16-bit stack pointer */ stack16: .word STACK16ADDR @@ -496,22 +347,11 @@ .word HEX(27) /* Limit */ .long gdt /* Base Address */ -/* Initial GDT table pointer for multiboot */ -gdtptrhigh: - .word HEX(27) /* Limit */ - .long gdt + INITIAL_BASE - FREELDR_BASE /* Base Address */ - /* Real-mode IDT pointer */ rmode_idtptr: .word HEX(3ff) /* Limit */ .long 0 /* Base Address */ -mb_info: - .fill MB_INFO_SIZE, 1, 0 - -cmdline: - .fill CMDLINE_SIZE, 1, 0 - PUBLIC _FrldrBootDrive _FrldrBootDrive: .long 0 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S [iso-8859-1] Wed Jun 15 19:17:00 2011 @@ -26,91 +26,91 @@ .p2align 2 /* force 4-byte alignment */ EXTERN(i386idt) /* Exception 0 - Divide By Zero */ - .word i386DivideByZero /* Offset 0 - 15 */ + .word _i386DivideByZero /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Flags, Zero Byte */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 1 - Debug Exception */ - .word i386DebugException /* Offset 0 - 15 */ + .word _i386DebugException /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 2 - NMI */ - .word i386NMIException /* Offset 0 - 15 */ + .word _i386NMIException /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 3 - Breakpoint (INT 3) */ - .word i386Breakpoint /* Offset 0 - 15 */ + .word _i386Breakpoint /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 4 - Overflow (INTO with EFLAGS[OF] set) */ - .word i386Overflow /* Offset 0 - 15 */ + .word _i386Overflow /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 5 - Bound Exception */ - .word i386BoundException /* Offset 0 - 15 */ + .word _i386BoundException /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 6 - Invalid Opcode */ - .word i386InvalidOpcode /* Offset 0 - 15 */ + .word _i386InvalidOpcode /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 7 - FPU Not Available */ - .word i386FPUNotAvailable /* Offset 0 - 15 */ + .word _i386FPUNotAvailable /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 8 - Double Fault */ - .word i386DoubleFault /* Offset 0 - 15 */ + .word _i386DoubleFault /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 9 - Coprocessor Segment Overrun */ - .word i386CoprocessorSegment /* Offset 0 - 15 */ + .word _i386CoprocessorSegment /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 10 (0x0A) - Invalid TSS */ - .word i386InvalidTSS /* Offset 0 - 15 */ + .word _i386InvalidTSS /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 11 (0x0B) - Segment Not Present */ - .word i386SegmentNotPresent /* Offset 0 - 15 */ + .word _i386SegmentNotPresent /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 12 (0x0C) - Stack Exception */ - .word i386StackException /* Offset 0 - 15 */ + .word _i386StackException /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 13 (0x0D) - General Protection Fault */ - .word i386GeneralProtectionFault /* Offset 0 - 15 */ + .word _i386GeneralProtectionFault /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 14 (0x0E) - Page Fault */ - .word i386PageFault /* Offset 0 - 15 */ + .word _i386PageFault /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ @@ -122,19 +122,19 @@ .word 0x0000 /* Offset 16 - 31 */ /* Exception 16 (0x10) - Coprocessor Error */ - .word i386CoprocessorError /* Offset 0 - 15 */ + .word _i386CoprocessorError /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 17 (0x11) - Alignment Check */ - .word i386AlignmentCheck /* Offset 0 - 15 */ + .word _i386AlignmentCheck /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ /* Exception 18 (0x12) - Machine Check */ - .word i386MachineCheck /* Offset 0 - 15 */ + .word _i386MachineCheck /* Offset 0 - 15 */ .word 0x0008 /* Selector */ .word 0x8e00 /* Zero byte, flags */ .word 0x0000 /* Offset 16 - 31 */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] Wed Jun 15 19:17:00 2011 @@ -122,26 +122,26 @@ .endm /************************************************************************/ -TRAP_STUB i386DivideByZero, 0 -TRAP_STUB i386DebugException, 1 -TRAP_STUB i386NMIException, 2 -TRAP_STUB i386Breakpoint, 3 -TRAP_STUB i386Overflow, 4 -TRAP_STUB i386BoundException, 5 -TRAP_STUB i386InvalidOpcode, 6 -TRAP_STUB i386FPUNotAvailable, 7 -TRAP_STUB2 i386DoubleFault, 8 -TRAP_STUB i386CoprocessorSegment, 9 -TRAP_STUB2 i386InvalidTSS, 10 -TRAP_STUB2 i386SegmentNotPresent, 11 -TRAP_STUB2 i386StackException, 12 -TRAP_STUB2 i386GeneralProtectionFault, 13 -TRAP_STUB2 i386PageFault, 14 +TRAP_STUB _i386DivideByZero, 0 +TRAP_STUB _i386DebugException, 1 +TRAP_STUB _i386NMIException, 2 +TRAP_STUB _i386Breakpoint, 3 +TRAP_STUB _i386Overflow, 4 +TRAP_STUB _i386BoundException, 5 +TRAP_STUB _i386InvalidOpcode, 6 +TRAP_STUB _i386FPUNotAvailable, 7 +TRAP_STUB2 _i386DoubleFault, 8 +TRAP_STUB _i386CoprocessorSegment, 9 +TRAP_STUB2 _i386InvalidTSS, 10 +TRAP_STUB2 _i386SegmentNotPresent, 11 +TRAP_STUB2 _i386StackException, 12 +TRAP_STUB2 _i386GeneralProtectionFault, 13 +TRAP_STUB2 _i386PageFault, 14 // 15 is reserved -TRAP_STUB i386CoprocessorError, 16 -TRAP_STUB i386AlignmentCheck, 17 -TRAP_STUB i386MachineCheck, 18 -TRAP_STUB i386SimdFloatError, 19 +TRAP_STUB _i386CoprocessorError, 16 +TRAP_STUB _i386AlignmentCheck, 17 +TRAP_STUB _i386MachineCheck, 18 +TRAP_STUB _i386SimdFloatError, 19 /************************************************************************ * DEBUGGING SUPPORT FUNCTIONS Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Wed Jun 15 19:17:00 2011 @@ -22,8 +22,6 @@ VOID PcMachInit(const char *CmdLine) { - EnableA20(); - /* Setup vtbl */ MachVtbl.ConsPutChar = PcConsPutChar; MachVtbl.ConsKbHit = PcConsKbHit; Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S [iso-8859-1] Wed Jun 15 19:17:00 2011 @@ -1,0 +1,178 @@ +/* + * FreeLoader + * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> + * + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <asm.inc> +#include <arch/pc/x86common.h> +#include <multiboot.h> + + +/* Multiboot support + * + * Allows freeldr to be loaded as a "multiboot kernel" by + * other boot loaders like Grub + */ + +#define MB_INFO_SIZE 90 +#define MB_INFO_FLAGS_OFFSET 0 +#define MB_INFO_BOOT_DEVICE_OFFSET 12 +#define MB_INFO_COMMAND_LINE_OFFSET 16 +#define CMDLINE_SIZE 256 + +/* + * We want to execute at 0x8000 (to be compatible with bootsector + * loading), but Grub only allows loading of multiboot kernels + * above 1MB. So we let Grub load us there and then relocate + * ourself to 0x8000 + */ +#define INITIAL_BASE HEX(200000) + + /* Align 32 bits boundary */ +.align 4 + + /* Multiboot header */ +MultibootHeader: + /* magic */ + .long MULTIBOOT_HEADER_MAGIC + /* flags */ + .long MULTIBOOT_HEADER_FLAGS + /* checksum */ + .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) + /* header_addr */ + .long INITIAL_BASE + MultibootHeader - FREELDR_BASE + /* load_addr */ + .long INITIAL_BASE + /* load_end_addr */ + .long INITIAL_BASE + __bss_start__ - FREELDR_BASE + /* bss_end_addr */ + .long INITIAL_BASE + __bss_end__ - FREELDR_BASE + /* entry_addr */ + .long INITIAL_BASE + MultibootEntry - FREELDR_BASE + +MultibootEntry: + cli /* Even after setting up the our IDT below we are + * not ready to handle hardware interrupts (no entries + * in IDT), so there's no sti here. Interrupts will be + * enabled in due time */ + + /* Although the multiboot spec says we should be called with the + * segment registers set to 4GB flat mode, let's be sure and set up + * our own */ + lgdt gdtptrhigh + INITIAL_BASE - FREELDR_BASE + /* Reload segment selectors */ + //ljmp $PMODE_CS, $(mb1 + INITIAL_BASE - FREELDR_BASE) + jmp far ptr PMODE_CS: (mb1 + INITIAL_BASE - FREELDR_BASE) +mb1: + mov dx, PMODE_DS + mov ds, dx + mov es, dx + + /* Check for valid multiboot signature */ + cmp eax, MULTIBOOT_BOOTLOADER_MAGIC + jne mbfail + + /* Store multiboot info in a safe place */ + mov esi, ebx + mov edi, offset mb_info + INITIAL_BASE - FREELDR_BASE + mov ecx, MB_INFO_SIZE + rep movsb + + /* Save commandline */ + mov edx, [ebx + MB_INFO_FLAGS_OFFSET] + test dword ptr [ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE + jz mb3 + mov esi, [ebx + MB_INFO_COMMAND_LINE_OFFSET] + mov edi, offset cmdline + INITIAL_BASE - FREELDR_BASE + mov ecx, CMDLINE_SIZE +mb2: lodsb + stosb + test al, al + jz mb3 + dec ecx + jnz mb2 +mb3: + + /* Copy to low mem */ + mov esi, INITIAL_BASE + mov edi, FREELDR_BASE + mov ecx, (offset __bss_end__ - FREELDR_BASE) + add ecx, 3 + shr ecx, 2 + rep movsd + + /* Load the GDT and IDT */ + lgdt gdtptr + lidt i386idtptr + + /* Clear prefetch queue & correct CS, + * jump to low mem */ + //ljmp $PMODE_CS, $mb4 + jmp far ptr PMODE_CS:mb4 +mb4: + /* Reload segment selectors */ + mov dx, PMODE_DS + mov ds, dx + mov es, dx + mov fs, dx + mov gs, dx + mov ss, dx + mov esp, STACK32ADDR + + mov ebx, offset mb_info + /* See if the boot device was passed in */ + mov edx, [ebx + MB_INFO_FLAGS_OFFSET] + test edx, MB_INFO_FLAG_BOOT_DEVICE + jz mb5 + /* Retrieve boot device info */ + mov eax, [ebx + MB_INFO_BOOT_DEVICE_OFFSET] + shr eax, 16 + inc al + mov byte ptr [_FrldrBootPartition], al + mov byte ptr [_FrldrBootDrive], ah + jmp mb6 +mb5: /* No boot device known, assume first partition of first harddisk */ + mov byte ptr [_FrldrBootDrive], HEX(80) + mov byte ptr [_FrldrBootPartition], 1 +mb6: + /* Check for command line */ + mov eax, offset cmdline + test dword ptr [ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE + jnz mb7 + xor eax, eax +mb7: + + /* GO! */ + push eax + call _BootMain + +mbfail: + call switch_to_real + .code16 + int 0x19 +mbstop: jmp mbstop /* We should never get here */ + +mb_info: + .fill MB_INFO_SIZE, 1, 0 + +cmdline: + .fill CMDLINE_SIZE, 1, 0 + +/* Initial GDT table pointer for multiboot */ +gdtptrhigh: + .word HEX(27) /* Limit */ + .long gdt + INITIAL_BASE - FREELDR_BASE /* Base Address */ Propchange: trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] Wed Jun 15 19:17:00 2011 @@ -72,6 +72,7 @@ return STATUS_NOT_IMPLEMENTED; } +#ifndef _MSC_VER NTHALAPI VOID NTAPI @@ -119,3 +120,4 @@ #error unimplemented #endif } +#endif Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] Wed Jun 15 19:17:00 2011 @@ -1,24 +1,11 @@ #include <asm.inc> - -.code16 -PUBLIC _mainCRTStartup -_mainCRTStartup: -_LoaderEntry: - ret - -.endcode16 .code32 // globals -PUBLIC _FrldrBootPartition -_FrldrBootPartition: -PUBLIC _FrldrBootDrive -_FrldrBootDrive: - PUBLIC _PageDirectoryStart _PageDirectoryStart: PUBLIC _PageDirectoryEnd @@ -32,13 +19,6 @@ _kernel_pagetable: PUBLIC _lowmem_pagetable _lowmem_pagetable: - - -PUBLIC RealEntryPoint -RealEntryPoint: - -PUBLIC _EnableA20 -_EnableA20: PUBLIC _ChainLoadBiosBootSectorCode _ChainLoadBiosBootSectorCode: @@ -73,9 +53,6 @@ PUBLIC _PnpBiosSupported _PnpBiosSupported: -PUBLIC _Int386 -_Int386: - PUBLIC _PxeCallApi _PxeCallApi: Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h [iso-8859-1] Wed Jun 15 19:17:00 2011 @@ -24,4 +24,23 @@ #undef KIP0PCRADDRESS #define KIP0PCRADDRESS 0xffdff000 +void i386DivideByZero(void); +void i386DebugException(void); +void i386NMIException(void); +void i386Breakpoint(void); +void i386Overflow(void); +void i386BoundException(void); +void i386InvalidOpcode(void); +void i386FPUNotAvailable(void); +void i386DoubleFault(void); +void i386CoprocessorSegment(void); +void i386InvalidTSS(void); +void i386SegmentNotPresent(void); +void i386StackException(void); +void i386GeneralProtectionFault(void); +void i386PageFault(void); +void i386CoprocessorError(void); +void i386AlignmentCheck(void); +void i386MachineCheck(void); + /* EOF */

13 years, 6 months

[tkreuzer] 52252: [ASM] Fix .fill macro for msvc

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 15 19:07:50 2011 New Revision: 52252 URL: http://svn.reactos.org/svn/reactos?rev=52252&view=rev Log: [ASM] Fix .fill macro for msvc Modified: trunk/reactos/include/asm/asm.inc Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=52… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Wed Jun 15 19:07:50 2011 @@ -116,13 +116,12 @@ .fill MACRO count, size, value REPEAT count - if (size == 1) + if (size EQ 1) DB value - elseif (size == 2) + elseif (size EQ 2) DW value - elseif (size == 4) + elseif (size EQ 4) DD value - else endif ENDM ENDM

13 years, 6 months

[akhaldi] 52251: [CMAKE] * Rename _math.h to math.h and merge r50732 from the cmake branch. * Remove msvchelper.h as it's not needed anymore for d3d8 and d3d9. * Skip ftp, libxslt and ksproxy from ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 15 18:55:48 2011 New Revision: 52251 URL: http://svn.reactos.org/svn/reactos?rev=52251&view=rev Log: [CMAKE] * Rename _math.h to math.h and merge r50732 from the cmake branch. * Remove msvchelper.h as it's not needed anymore for d3d8 and d3d9. * Skip ftp, libxslt and ksproxy from msvc build. * Dedicated to igorko. Added: trunk/reactos/include/reactos/wine/math.h - copied unchanged from r52248, trunk/reactos/include/reactos/wine/_math.h Removed: trunk/reactos/include/reactos/msvchelper.h trunk/reactos/include/reactos/wine/_math.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt trunk/reactos/dll/3rdparty/CMakeLists.txt trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -2,7 +2,9 @@ add_subdirectory(arp) add_subdirectory(dwnl) add_subdirectory(finger) -add_subdirectory(ftp) +if(NOT MSVC) + add_subdirectory(ftp) # FIXME: fix msvc build +endif() add_subdirectory(ipconfig) add_subdirectory(net) add_subdirectory(netstat) @@ -10,7 +12,7 @@ add_subdirectory(ping) add_subdirectory(route) if(NOT MSVC) -add_subdirectory(telnet) + add_subdirectory(telnet) # FIXME: fix msvc build endif() add_subdirectory(tracert) add_subdirectory(whois) Modified: trunk/reactos/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -5,7 +5,8 @@ add_subdirectory(libjpeg) add_subdirectory(libpng) add_subdirectory(libtiff) -add_subdirectory(libxslt) + if(NOT MSVC) -add_subdirectory(mesa32) + add_subdirectory(libxslt) + add_subdirectory(mesa32) endif() Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -16,7 +16,9 @@ add_subdirectory(dsound) #add_subdirectory(dsound_new) #disabled in trunk add_subdirectory(dxdiagn) -add_subdirectory(ksproxy) +if(NOT MSVC) + add_subdirectory(ksproxy) #FIXME: fix msvc build +endif() add_subdirectory(ksuser) add_subdirectory(msdmo) #add_subdirectory(msdvbnp) #disabled in trunk Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -6,10 +6,6 @@ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -if(MSVC) - add_definitions(-FImsvchelper.h) -endif() set_rc_compiler() Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -6,10 +6,6 @@ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -if(MSVC) - add_definitions(-FImsvchelper.h) -endif() set_rc_compiler() Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -196,8 +196,8 @@ } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if(m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; } } @@ -218,8 +218,8 @@ } else { - if (m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if (m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; } } Removed: trunk/reactos/include/reactos/msvchelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/msvchelper… ============================================================================== --- trunk/reactos/include/reactos/msvchelper.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/msvchelper.h (removed) @@ -1,32 +1,0 @@ - -// -#ifdef _M_IX86 -void __stdcall wined3d_mutex_lock(void); -void __stdcall wined3d_mutex_unlock(void); -void* __stdcall WineDirect3DCreate(unsigned int dxVersion,void *parent); - -void __inline wined3d_mutex_lock_inline(void) -{ - wined3d_mutex_lock(); -} - -void __inline wined3d_mutex_unlock_inline(void) -{ - wined3d_mutex_unlock(); -} - -__inline -struct IWineD3D* WineDirect3DCreate_inline(unsigned int dxVersion,void *parent) -{ - return WineDirect3DCreate(dxVersion, parent); -} - -#define wined3d_mutex_lock wined3d_mutex_lock_inline -#define wined3d_mutex_unlock wined3d_mutex_unlock_inline -#define WineDirect3DCreate WineDirect3DCreate_inline - -#endif /* _M_IX86 */ - - - - Removed: trunk/reactos/include/reactos/wine/_math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/_math… ============================================================================== --- trunk/reactos/include/reactos/wine/_math.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/_math.h (removed) @@ -1,26 +1,0 @@ -#ifndef __WINE_MATH_H_ -#define __WINE_MATH_H_ - -#include <crt/math.h> - -#ifdef _MSC_VER -__forceinline float _NaN() -{ - unsigned long NaN = 0x7fc00000; - return *(float*)&NaN; -} -#define NAN _NaN() - -__forceinline float _Infinity() -{ - unsigned long Infinity = 0x7f800000; - return *(float*)&Infinity; -} -#define INFINITY _Infinity() - -#else -#define NAN (0.0f / 0.0f) -#define INFINITY (1.0F/0.0F) -#endif - -#endif /* __WINE_MATH_H_ */

13 years, 6 months

[gadamopoulos] 52250: [ntoskrnl] - Fix compilation with msvc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Jun 15 18:33:55 2011 New Revision: 52250 URL: http://svn.reactos.org/svn/reactos?rev=52250&view=rev Log: [ntoskrnl] - Fix compilation with msvc Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] Wed Jun 15 18:33:55 2011 @@ -181,7 +181,7 @@ PROSSYM_KM_OWN_CONTEXT FileContext; ULONG_PTR RelativeAddress; NTSTATUS Status; - ROSSYM_LINEINFO LineInfo = { }; + ROSSYM_LINEINFO LineInfo = {0}; struct { enum _ROSSYM_REGNAME regname;

13 years, 6 months

[cfinck] 52248: [UNICODE] - Finally say goodbye to my "wcsfuncs" experiment started in 2008. We have (and always had) Wine's "unicode" library for this, which does the same and is more complete. No...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jun 15 18:20:05 2011 New Revision: 52248 URL: http://svn.reactos.org/svn/reactos?rev=52248&view=rev Log: [UNICODE] - Finally say goodbye to my "wcsfuncs" experiment started in 2008. We have (and always had) Wine's "unicode" library for this, which does the same and is more complete. Now that host tools only use include/host, we only need to include <wine/unicode.h> and it will choose the right file in either include/host or include/reactos. - Fix some include guards in PSDK headers to match the MS ones. - Always define WINE_UNICODE_API to an empty string instead of doing this separately for every module. - Cleanup some empty directories or non-existing include pathes. Removed: trunk/reactos/include/reactos/wcsfuncs.h trunk/reactos/tools/unicode/wine/ Modified: trunk/reactos/include/host/wine/unicode.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winnetwk.h trunk/reactos/include/psdk/winnls.h trunk/reactos/include/psdk/winreg.h trunk/reactos/include/psdk/winsvc.h trunk/reactos/include/psdk/winver.h trunk/reactos/include/reactos/wine/unicode.h trunk/reactos/lib/cmlib/CMakeLists.txt trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/inflib/inflib.rbuild trunk/reactos/lib/newinflib/CMakeLists.txt trunk/reactos/lib/newinflib/builddep.h trunk/reactos/lib/newinflib/inflib.rbuild trunk/reactos/tools/mkhive/CMakeLists.txt trunk/reactos/tools/mkhive/mkhive.rbuild trunk/reactos/tools/unicode/CMakeLists.txt trunk/reactos/tools/unicode/unicode.rbuild trunk/reactos/tools/wmc/CMakeLists.txt trunk/reactos/tools/wmc/wmc.rbuild trunk/reactos/tools/wrc/CMakeLists.txt trunk/reactos/tools/wrc/wrc.rbuild Modified: trunk/reactos/include/host/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/wine/unicode.… ============================================================================== --- trunk/reactos/include/host/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/host/wine/unicode.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -54,11 +54,7 @@ #endif #ifndef WINE_UNICODE_API -# if defined(_MSC_VER) || defined(__MINGW32__) -# define WINE_UNICODE_API DECLSPEC_IMPORT -# else -# define WINE_UNICODE_API -# endif +#define WINE_UNICODE_API #endif #ifndef WINE_UNICODE_INLINE Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -52,21 +52,11 @@ #include <wingdi.h> #include <winuser.h> #include <wincon.h> -#ifndef _WINNLS_H #include <winnls.h> -#endif -#ifndef _WINVER_H #include <winver.h> -#endif -#ifndef _WINNETWK_H #include <winnetwk.h> -#endif -#ifndef _WINREG_H #include <winreg.h> -#endif -#ifndef _WINSVC_H #include <winsvc.h> -#endif #ifndef WIN32_LEAN_AND_MEAN #include <cderr.h> Modified: trunk/reactos/include/psdk/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnetwk.h?re… ============================================================================== --- trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,5 +1,5 @@ -#ifndef _WINNETWK_H -#define _WINNETWK_H +#ifndef _WINNETWK_ +#define _WINNETWK_ #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,5 +1,5 @@ -#ifndef _WINNLS_H -#define _WINNLS_H +#ifndef _WINNLS_ +#define _WINNLS_ #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winreg.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,5 +1,5 @@ -#ifndef _WINREG_H -#define _WINREG_H +#ifndef _WINREG_ +#define _WINREG_ #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,5 +1,5 @@ -#ifndef _WINSVC_H -#define _WINSVC_H +#ifndef _WINSVC_ +#define _WINSVC_ #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/winver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winver.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winver.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winver.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,5 +1,5 @@ -#ifndef _WINVER_H -#define _WINVER_H +#ifndef VER_H +#define VER_H #ifdef __cplusplus extern "C" { Removed: trunk/reactos/include/reactos/wcsfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wcsfuncs.h… ============================================================================== --- trunk/reactos/include/reactos/wcsfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wcsfuncs.h (removed) @@ -1,23 +1,0 @@ -/* - PROJECT: ReactOS - LICENSE: GPL v2 or any later version - FILE: include/host/wcsfuncs.h - PURPOSE: Header for the "host_wcsfuncs" static library - COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> -*/ - -#ifndef _HOST_WCSFUNCS_H -#define _HOST_WCSFUNCS_H - -/* Map str*W functions to wcs* function */ - -#define isspaceW iswspace -#define strchrW wcschr -#define strcmpiW _wcsicmp -#define strcpyW wcscpy -#define strlenW wcslen -#define strncmpW wcsncmp -#define strtolW wcstol -#define strtoulW wcstoul - -#endif Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,5 +1,12 @@ -#ifndef _WINE_UNICODE_H -#define _WINE_UNICODE_H +/* + * PROJECT: ReactOS + * LICENSE: LGPL v2.1 or any later version + * PURPOSE: Map Wine's Unicode functions to native wcs* functions wherever possible + * AUTHORS: ? + */ + +#ifndef __WINE_WINE_UNICODE_H +#define __WINE_WINE_UNICODE_H #include <stdarg.h> #include <stdlib.h> @@ -8,6 +15,14 @@ #include <windef.h> #include <winbase.h> #include <winnls.h> + +#ifndef WINE_UNICODE_API +#define WINE_UNICODE_API +#endif + +#ifndef WINE_UNICODE_INLINE +#define WINE_UNICODE_INLINE static inline +#endif #define memicmpW(s1,s2,n) _wcsnicmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) #define strlenW(s) wcslen((const wchar_t *)(s)) @@ -25,6 +40,7 @@ #define strncmpiW(s1,s2,n) _wcsnicmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) #define strtoulW(s1,s2,b) wcstoul((const wchar_t *)(s1),(wchar_t **)(s2),(b)) #define strspnW(str, accept) wcsspn((const wchar_t *)(str), (const wchar_t *)(accept)) +#define strpbrkW(str, accept) wcspbrk((const wchar_t *)(str), (const wchar_t *)(accept)) #define tolowerW(n) towlower((n)) #define toupperW(n) towupper((n)) #define islowerW(n) iswlower((n)) @@ -45,28 +61,6 @@ #define vsnprintfW _vsnwprintf #define isprintW iswprint -#ifndef WINE_UNICODE_API -# if defined(_MSC_VER) -# define WINE_UNICODE_API __declspec(dllimport) -# else -# define WINE_UNICODE_API __attribute__((dllimport)) -# endif -#endif - -#ifndef __VALIST -#ifdef __GNUC__ -#define __VALIST __gnuc_va_list -#else -#define __VALIST char* -#endif -#endif /* defined __VALIST */ - -static __inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) -{ - for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str; - return NULL; -} - static __inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; Modified: trunk/reactos/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -17,7 +17,6 @@ add_dependencies(cmlib bugcodes) else() add_definitions( - -DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DCMLIB_HOST) add_library(cmlibhost ${SOURCE}) Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=5224… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -13,7 +13,6 @@ #define _CMLIB_DEBUG_ 1 #ifdef CMLIB_HOST - #include <wine/unicode.h> #include <typedefs.h> #include <stdio.h> #include <string.h> @@ -68,9 +67,6 @@ #define PKEVENT PVOID #define PWORK_QUEUE_ITEM PVOID #define EX_PUSH_LOCK PULONG_PTR - - /* For <host/wcsfuncs.h> */ - #define USE_HOST_WCSFUNCS #define CMLTRACE(x, ...) #else @@ -89,10 +85,12 @@ #endif #include <ntdef.h> - #undef DECLSPEC_IMPORT - #define DECLSPEC_IMPORT #include <ntddk.h> - #include <wcsfuncs.h> + + /* Prevent inclusion of Windows headers through <wine/unicode.h> */ + #define _WINDEF_ + #define _WINBASE_ + #define _WINNLS_ #endif @@ -121,6 +119,7 @@ #define CMAPI NTAPI +#include <wine/unicode.h> #include <wchar.h> #include "hivedata.h" #include "cmdata.h" Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -14,8 +14,6 @@ <file>hivewrt.c</file> </module> <module name="cmlibhost" type="hoststaticlibrary"> - <define name="WINE_UNICODE_API">" "</define> - <include base="unicode" /> <include base="cmlibhost">.</include> <define name="__NO_CTYPE_INLINES" /> <define name="_NTOSKRNL_" /> Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r… ============================================================================== --- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -11,7 +11,6 @@ <file>infrosput.c</file> </module> <module name="inflibhost" type="hoststaticlibrary" allowwarnings="true"> - <include base="ReactOS">include/host</include> <include base="inflibhost">.</include> <define name="__NO_CTYPE_INLINES" /> <group compilerset="gcc"> Modified: trunk/reactos/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -19,7 +19,7 @@ infhostput.c infhostrtl.c) - add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST -DUSE_HOST_WCSFUNCS) + add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) if(NOT MSVC) add_compiler_flags(-Wpointer-arith -Wwrite-strings) endif() Modified: trunk/reactos/lib/newinflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/builddep.h?r… ============================================================================== --- trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -8,7 +8,6 @@ /* Definitions native to the host on which we're building */ -#include <wine/unicode.h> #include <typedefs.h> #include <stdarg.h> @@ -63,7 +62,6 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <wcsfuncs.h> extern PVOID InfpHeap; @@ -83,4 +81,6 @@ #endif /* INFLIB_HOST */ +#include <wine/unicode.h> + /* EOF */ Modified: trunk/reactos/lib/newinflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/inflib.rbuil… ============================================================================== --- trunk/reactos/lib/newinflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/inflib.rbuild [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -11,11 +11,8 @@ <file>infrosput.c</file> </module> <module name="newinflibhost" type="hoststaticlibrary" allowwarnings="true"> - <define name="WINE_UNICODE_API">" "</define> - <include base="unicode" /> <include base="newinflibhost">.</include> <define name="__NO_CTYPE_INLINES" /> - <define name="USE_HOST_WCSFUNCS" /> <group compilerset="gcc"> <compilerflag>-Wwrite-strings</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> Modified: trunk/reactos/tools/mkhive/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/CMakeLists.tx… ============================================================================== --- trunk/reactos/tools/mkhive/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,7 +1,5 @@ -add_definitions( - -DMKHIVE_HOST - -DWINE_UNICODE_API= ) +add_definitions(-DMKHIVE_HOST) include_directories( ${REACTOS_SOURCE_DIR}/lib/newinflib Modified: trunk/reactos/tools/mkhive/mkhive.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="mkhive" type="buildtool"> - <define name="WINE_UNICODE_API">" "</define> - <include base="unicode" /> <include base="newinflibhost">.</include> <include base="cmlibhost">.</include> <include base="zlibhost">.</include> Modified: trunk/reactos/tools/unicode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/CMakeLists.t… ============================================================================== --- trunk/reactos/tools/unicode/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,6 +1,3 @@ - -add_definitions(-DWINE_UNICODE_API= ) - list(APPEND SOURCE casemap.c compose.c Modified: trunk/reactos/tools/unicode/unicode.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.rbui… ============================================================================== --- trunk/reactos/tools/unicode/unicode.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/unicode.rbuild [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="unicode" type="hoststaticlibrary"> - <define name="WINE_UNICODE_API">" "</define> <file>casemap.c</file> <file>compose.c</file> <file>cptable.c</file> @@ -72,4 +71,4 @@ <file>c_28604.c</file> <file>c_28605.c</file> <file>c_28606.c</file> -</module> +</module> Modified: trunk/reactos/tools/wmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/tools/wmc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -9,6 +9,4 @@ add_executable(wmc ${SOURCE}) -add_definitions(-DWINE_UNICODE_API= ) - target_link_libraries(wmc unicode) Modified: trunk/reactos/tools/wmc/wmc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.rbuild?rev=5… ============================================================================== --- trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="wmc" type="buildtool" allowwarnings="true"> - <define name="WINE_UNICODE_API">" "</define> - <include base="unicode">.</include> <library>unicode</library> <file>lang.c</file> <file>mcl.c</file> Modified: trunk/reactos/tools/wrc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/tools/wrc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -14,6 +14,4 @@ add_executable(wrc ${SOURCE}) -add_definitions(-DWINE_UNICODE_API= ) - target_link_libraries(wrc wpp unicode) Modified: trunk/reactos/tools/wrc/wrc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.rbuild?rev=5… ============================================================================== --- trunk/reactos/tools/wrc/wrc.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/wrc.rbuild [iso-8859-1] Wed Jun 15 18:20:05 2011 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="wrc" type="buildtool" allowwarnings="true"> - <define name="WINE_UNICODE_API">" "</define> - <include base="unicode" /> - <include base="wpp" /> <library>unicode</library> <library>wpp</library> <file>dumpres.c</file>

13 years, 6 months

[cgutman] 52247: [FLOPPY] - Validate the handle type - Fix a bug that broke file system remounting after a media change

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jun 15 17:07:07 2011 New Revision: 52247 URL: http://svn.reactos.org/svn/reactos?rev=52247&view=rev Log: [FLOPPY] - Validate the handle type - Fix a bug that broke file system remounting after a media change Modified: trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/ioctl.c trunk/reactos/drivers/storage/floppy/readwrite.c Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Wed Jun 15 17:07:07 2011 @@ -1189,7 +1189,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) + if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, PsThreadType, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) { WARN_(FLOPPY, "Unable to reference returned thread handle; failing init\n"); return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/storage/floppy/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc… ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] Wed Jun 15 17:07:07 2011 @@ -126,7 +126,7 @@ * Therefore if we see one below in the switch, we can return STATUS_SUCCESS * immediately. */ - if(DriveInfo->DeviceObject->Flags & DO_VERIFY_VOLUME && !(DriveInfo->DeviceObject->Flags & SL_OVERRIDE_VERIFY_VOLUME)) + if(DriveInfo->DeviceObject->Flags & DO_VERIFY_VOLUME && !(Stack->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { INFO_(FLOPPY, "DeviceIoctl(): completing with STATUS_VERIFY_REQUIRED\n"); Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED; Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Wed Jun 15 17:07:07 2011 @@ -454,7 +454,7 @@ * Check to see if the volume needs to be verified. If so, * we can get out of here quickly. */ - if(DeviceObject->Flags & DO_VERIFY_VOLUME && !(DeviceObject->Flags & SL_OVERRIDE_VERIFY_VOLUME)) + if(DeviceObject->Flags & DO_VERIFY_VOLUME && !(Stack->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { INFO_(FLOPPY, "ReadWritePassive(): DO_VERIFY_VOLUME set; Completing with STATUS_VERIFY_REQUIRED\n"); Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED;

13 years, 6 months

[tkreuzer] 52246: [RTL] Fix useage of volatile in casts.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 15 13:33:48 2011 New Revision: 52246 URL: http://svn.reactos.org/svn/reactos?rev=52246&view=rev Log: [RTL] Fix useage of volatile in casts. Modified: trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=522… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Wed Jun 15 13:33:48 2011 @@ -45,7 +45,7 @@ static LONG ThreadPoolIOWorkerThreadsRequests; static LONG ThreadPoolIOWorkerThreadsLongRequests; -#define IsThreadPoolInitialized() ((volatile LONG)ThreadPoolInitialized == 1) +#define IsThreadPoolInitialized() (*((volatile LONG*)&ThreadPoolInitialized) == 1) static NTSTATUS RtlpInitializeThreadPool(VOID) @@ -614,8 +614,8 @@ /* FIXME - figure out an effective method to determine if it's appropriate to lower the number of threads. For now let's always terminate if there's at least one thread and no queued items. */ - Terminate = ((volatile LONG)ThreadPoolIOWorkerThreads - (volatile LONG)ThreadPoolIOWorkerThreadsLongRequests >= WORKERTHREAD_CREATION_THRESHOLD) && - ((volatile LONG)ThreadPoolIOWorkerThreadsRequests == 0); + Terminate = (*((volatile LONG*)&ThreadPoolIOWorkerThreads) - *((volatile LONG*)&ThreadPoolIOWorkerThreadsLongRequests) >= WORKERTHREAD_CREATION_THRESHOLD) && + (*((volatile LONG*)&ThreadPoolIOWorkerThreadsRequests) == 0); if (Terminate) { @@ -718,7 +718,7 @@ { /* FIXME - we might want to optimize this */ if (TimeoutCount++ > 2 && - (volatile LONG)ThreadPoolWorkerThreads - (volatile LONG)ThreadPoolWorkerThreadsLongRequests >= WORKERTHREAD_CREATION_THRESHOLD) + *((volatile LONG*)&ThreadPoolWorkerThreads) - *((volatile LONG*)&ThreadPoolWorkerThreadsLongRequests) >= WORKERTHREAD_CREATION_THRESHOLD) { Terminate = TRUE; } @@ -819,7 +819,7 @@ /* Grow the thread pool */ Status = RtlpStartWorkerThread(RtlpIoWorkerThreadProc); - if (!NT_SUCCESS(Status) && (volatile LONG)ThreadPoolIOWorkerThreads != 0) + if (!NT_SUCCESS(Status) && *((volatile LONG*)&ThreadPoolIOWorkerThreads) != 0) { /* We failed to create the thread, but there's at least one there so we can at least queue the request */ @@ -846,7 +846,7 @@ /* Grow the thread pool */ Status = RtlpStartWorkerThread(RtlpWorkerThreadProc); - if (!NT_SUCCESS(Status) && (volatile LONG)ThreadPoolWorkerThreads != 0) + if (!NT_SUCCESS(Status) && *((volatile LONG*)&ThreadPoolWorkerThreads) != 0) { /* We failed to create the thread, but there's at least one there so we can at least queue the request */

13 years, 6 months

[rharabien] 52245: [HID] - Remove unneeded .def file

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Jun 15 13:07:26 2011 New Revision: 52245 URL: http://svn.reactos.org/svn/reactos?rev=52245&view=rev Log: [HID] - Remove unneeded .def file Removed: trunk/reactos/dll/win32/hid/hid.def Removed: trunk/reactos/dll/win32/hid/hid.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.def?rev=… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.def (removed) @@ -1,50 +1,0 @@ -LIBRARY hid.dll - -EXPORTS -HidD_FlushQueue@4 -HidD_FreePreparsedData@4 -HidD_GetAttributes@8 -HidD_GetConfiguration@12 -HidD_GetFeature@12 -HidD_GetHidGuid@4 -HidD_GetIndexedString@16 -HidD_GetInputReport@12 -HidD_GetManufacturerString@12 -HidD_GetMsGenreDescriptor@12 -HidD_GetNumInputBuffers@8 -HidD_GetPhysicalDescriptor@12 -HidD_GetPreparsedData@8 -HidD_GetProductString@12 -HidD_GetSerialNumberString@12 -HidD_Hello@8 -HidD_SetConfiguration@12 -HidD_SetFeature@12 -HidD_SetNumInputBuffers@8 -HidD_SetOutputReport@12 -HidP_GetButtonCaps@16 -HidP_GetCaps@8 -HidP_GetData@24 -HidP_GetExtendedAttributes@20 -HidP_GetLinkCollectionNodes@12 -HidP_GetScaledUsageValue@32 -HidP_GetSpecificButtonCaps@28 -HidP_GetSpecificValueCaps@28 -HidP_GetUsageValue@32 -HidP_GetUsageValueArray@36 -HidP_GetUsages@32 -HidP_GetUsagesEx@28 -HidP_GetValueCaps@16 -HidP_InitializeReportForID@20 -HidP_MaxDataListLength@8 -HidP_MaxUsageListLength@12 -HidP_SetData@24 -HidP_SetScaledUsageValue@32 -HidP_SetUsageValue@32 -HidP_SetUsageValueArray@36 -HidP_SetUsages@32 -HidP_TranslateUsagesToI8042ScanCodes@24 -HidP_UnsetUsages@32 -HidP_UsageListDifference@20 -;HidservInstaller@0 - -; EOF

13 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011