From e345b5a4834e3dda02a9f015c24cbad9dae2f8b9 Mon Sep 17 00:00:00 2001 From: Matthias Kupfer Date: Mon, 23 May 2011 19:48:04 +0000 Subject: [PATCH] revert previous commit due to serious build problems svn path=/trunk/; revision=51872 --- reactos/base/setup/usetup/filesup.c | 2 +- reactos/boot/bootdata/txtsetup.sif | 1 - reactos/configure.sh | 3 ++- reactos/dll/win32/kernel32/kernel32.rc | 2 +- reactos/dll/win32/shlwapi/shlwapi_Hu.rc | 8 ++++---- reactos/dll/win32/shlwapi/shlwapi_Pt.rc | 8 ++++---- reactos/drivers/bus/acpi/busmgr/button.c | 14 +++++++------- reactos/drivers/bus/acpi/busmgr/power.c | 15 ++++++++------- reactos/drivers/bus/acpi/busmgr/system.c | 14 +++++++------- reactos/drivers/bus/acpi/main.c | 7 ------- reactos/drivers/bus/acpi/pnp.c | 7 +------ reactos/drivers/bus/acpi/power.c | 2 +- reactos/drivers/bus/pcix/pci/busno.c | 3 +-- reactos/hal/halx86/mp/i386/mps.S | 4 +--- reactos/lib/3rdparty/libsamplerate/src_linear.c | 7 ++----- reactos/ntoskrnl/ke/i386/cpu.c | 2 +- 16 files changed, 41 insertions(+), 58 deletions(-) diff --git a/reactos/base/setup/usetup/filesup.c b/reactos/base/setup/usetup/filesup.c index 0051b0abed0..f0d8152e1f9 100644 --- a/reactos/base/setup/usetup/filesup.c +++ b/reactos/base/setup/usetup/filesup.c @@ -126,7 +126,7 @@ SetupCopyFile(PWCHAR SourceFileName, FILE_SEQUENTIAL_ONLY); if(!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); + DPRINT1("NtOpenFile failed: %x\n", Status); goto done; } #else diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif index 183ee5b1089..3b89c64499f 100644 --- a/reactos/boot/bootdata/txtsetup.sif +++ b/reactos/boot/bootdata/txtsetup.sif @@ -40,7 +40,6 @@ scsiport.sys=,,,,,,x,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2fs.sys=,,,,,,x,,,,,,4 -vgafonts.cab=,,,,,,,,,,,,1 classpnp.sys=,,,,,,,,,,,,4 pcix.sys=,,,,,,,,,,,,4 pcmcia.sys=,,,,,,,,,,,,4 diff --git a/reactos/configure.sh b/reactos/configure.sh index 2d73732cea6..d265d1dc79e 100755 --- a/reactos/configure.sh +++ b/reactos/configure.sh @@ -10,6 +10,7 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH +echo ARCH $ARCH ROS $ROS_ARCH if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] then echo Creating directories in $REACTOS_OUTPUT_PATH @@ -33,5 +34,5 @@ cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" cd ../reactos cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" -echo "Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...)." +echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...). diff --git a/reactos/dll/win32/kernel32/kernel32.rc b/reactos/dll/win32/kernel32/kernel32.rc index afc92ab5b84..39092b2d47a 100644 --- a/reactos/dll/win32/kernel32/kernel32.rc +++ b/reactos/dll/win32/kernel32/kernel32.rc @@ -9,8 +9,8 @@ #include "locale_rc.rc" -#include "lang/en-US.rc" #include "lang/de-DE.rc" +#include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" diff --git a/reactos/dll/win32/shlwapi/shlwapi_Hu.rc b/reactos/dll/win32/shlwapi/shlwapi_Hu.rc index 94ce85e2e52..676b1d4c87d 100644 --- a/reactos/dll/win32/shlwapi/shlwapi_Hu.rc +++ b/reactos/dll/win32/shlwapi/shlwapi_Hu.rc @@ -33,10 +33,10 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Ne jelení&tse meg ezt az üzenetet mégegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Mégse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE diff --git a/reactos/dll/win32/shlwapi/shlwapi_Pt.rc b/reactos/dll/win32/shlwapi/shlwapi_Pt.rc index bd07373744d..2080fc5bcdc 100644 --- a/reactos/dll/win32/shlwapi/shlwapi_Pt.rc +++ b/reactos/dll/win32/shlwapi/shlwapi_Pt.rc @@ -34,10 +34,10 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Não" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE diff --git a/reactos/drivers/bus/acpi/busmgr/button.c b/reactos/drivers/bus/acpi/busmgr/button.c index 73f4a615c99..9344a5f1f7d 100644 --- a/reactos/drivers/bus/acpi/busmgr/button.c +++ b/reactos/drivers/bus/acpi/busmgr/button.c @@ -42,13 +42,13 @@ static int acpi_button_add (struct acpi_device *device); static int acpi_button_remove (struct acpi_device *device, int type); static struct acpi_driver acpi_button_driver = { - {0,0}, - ACPI_BUTTON_DRIVER_NAME, - ACPI_BUTTON_CLASS, - 0, - 0, - "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", - {acpi_button_add,acpi_button_remove} + .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, + }, }; struct acpi_button { diff --git a/reactos/drivers/bus/acpi/busmgr/power.c b/reactos/drivers/bus/acpi/busmgr/power.c index 4027ef829cc..c10e98112ed 100644 --- a/reactos/drivers/bus/acpi/busmgr/power.c +++ b/reactos/drivers/bus/acpi/busmgr/power.c @@ -64,13 +64,14 @@ static int acpi_power_remove (struct acpi_device *device, int type); static int acpi_power_resume(struct acpi_device *device, int state); static struct acpi_driver acpi_power_driver = { - {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} + .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, + }, }; struct acpi_power_reference { diff --git a/reactos/drivers/bus/acpi/busmgr/system.c b/reactos/drivers/bus/acpi/busmgr/system.c index 79d8af4c263..ca5a0852bf9 100644 --- a/reactos/drivers/bus/acpi/busmgr/system.c +++ b/reactos/drivers/bus/acpi/busmgr/system.c @@ -48,13 +48,13 @@ static int acpi_system_remove (struct acpi_device *device, int type); ACPI_STATUS acpi_suspend (UINT32 state); static struct acpi_driver acpi_system_driver = { - {0,0}, - ACPI_SYSTEM_DRIVER_NAME, - ACPI_SYSTEM_CLASS, - 0, - 0, - ACPI_SYSTEM_HID, - {acpi_system_add, acpi_system_remove} + .name = ACPI_SYSTEM_DRIVER_NAME, + .class = ACPI_SYSTEM_CLASS, + .ids = ACPI_SYSTEM_HID, + .ops = { + .add = acpi_system_add, + .remove = acpi_system_remove + }, }; struct acpi_system diff --git a/reactos/drivers/bus/acpi/main.c b/reactos/drivers/bus/acpi/main.c index 7f2ae262e1b..175ad53d728 100644 --- a/reactos/drivers/bus/acpi/main.c +++ b/reactos/drivers/bus/acpi/main.c @@ -12,13 +12,6 @@ #define NDEBUG #include -NTSTATUS -NTAPI -DriverEntry ( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath - ); - #ifdef ALLOC_PRAGMA #pragma alloc_text (INIT, DriverEntry) #pragma alloc_text (PAGE, Bus_AddDevice) diff --git a/reactos/drivers/bus/acpi/pnp.c b/reactos/drivers/bus/acpi/pnp.c index 7151320dbd0..9259fb9d2a5 100644 --- a/reactos/drivers/bus/acpi/pnp.c +++ b/reactos/drivers/bus/acpi/pnp.c @@ -10,16 +10,11 @@ #define NDEBUG #include -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) diff --git a/reactos/drivers/bus/acpi/power.c b/reactos/drivers/bus/acpi/power.c index cb58d4ff0dd..2f7175c74ad 100644 --- a/reactos/drivers/bus/acpi/power.c +++ b/reactos/drivers/bus/acpi/power.c @@ -224,7 +224,7 @@ Bus_PDO_Power ( return status; } -#if !defined(NDEBUG) || defined(_MSC_VER) +#ifndef NDEBUG PCHAR PowerMinorFunctionString ( diff --git a/reactos/drivers/bus/pcix/pci/busno.c b/reactos/drivers/bus/pcix/pci/busno.c index caf7632cd79..6b6316493f3 100644 --- a/reactos/drivers/bus/pcix/pci/busno.c +++ b/reactos/drivers/bus/pcix/pci/busno.c @@ -20,9 +20,8 @@ BOOLEAN 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; diff --git a/reactos/hal/halx86/mp/i386/mps.S b/reactos/hal/halx86/mp/i386/mps.S index 250ab9c7d97..094780f4826 100644 --- a/reactos/hal/halx86/mp/i386/mps.S +++ b/reactos/hal/halx86/mp/i386/mps.S @@ -11,9 +11,7 @@ /* INCLUDES ******************************************************************/ -#include - -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/3rdparty/libsamplerate/src_linear.c b/reactos/lib/3rdparty/libsamplerate/src_linear.c index ab483bc4450..f97ba45db22 100644 --- a/reactos/lib/3rdparty/libsamplerate/src_linear.c +++ b/reactos/lib/3rdparty/libsamplerate/src_linear.c @@ -30,9 +30,6 @@ #include "float_cast.h" #include "common.h" -#include -#include - static int linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ; static void linear_reset (SRC_PRIVATE *psrc) ; @@ -110,8 +107,8 @@ linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) 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) - { DPRINT1 ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; - ASSERT (0) ; + { printf ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; + exit (1) ; } ; for (ch = 0 ; ch < priv->channels ; ch++) diff --git a/reactos/ntoskrnl/ke/i386/cpu.c b/reactos/ntoskrnl/ke/i386/cpu.c index 0fd2dcc459d..7f3358cdee9 100644 --- a/reactos/ntoskrnl/ke/i386/cpu.c +++ b/reactos/ntoskrnl/ke/i386/cpu.c @@ -41,7 +41,7 @@ ULONG KeDcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; ULONG KePrefetchNTAGranularity = 32; -CHAR KeNumberProcessors = 0; +CHAR KeNumberProcessors; KAFFINITY KeActiveProcessors = 1; BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiSMTProcessorsPresent;