Author: mkupfer
Date: Mon May 23 19:30:50 2011
New Revision: 51871
URL: http://svn.reactos.org/svn/reactos?rev=51871&view=rev
Log:
patch by Igor Paliychuk <mansonigor at gmail dot com>:
- [CMAKE] Reduce difference with cmake branch
- msvc fixes
- minor changes by me
Modified:
trunk/reactos/base/setup/usetup/filesup.c
trunk/reactos/boot/bootdata/txtsetup.sif
trunk/reactos/configure.sh
trunk/reactos/dll/win32/kernel32/kernel32.rc
trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc
trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc
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/hal/halx86/mp/i386/mps.S
trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c
trunk/reactos/ntoskrnl/ke/i386/cpu.c
Modified: trunk/reactos/base/setup/usetup/filesup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.c?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Mon May 23 19:30:50
2011
@@ -126,7 +126,7 @@
FILE_SEQUENTIAL_ONLY);
if(!NT_SUCCESS(Status))
{
- DPRINT1("NtOpenFile failed: %x\n", Status);
+ DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName);
goto done;
}
#else
Modified: trunk/reactos/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Mon May 23 19:30:50
2011
@@ -40,6 +40,7 @@
fastfat.sys=,,,,,,x,,,,,,4
ramdisk.sys=,,,,,,x,,,,,,4
ext2fs.sys=,,,,,,x,,,,,,4
+vgafonts.cab=,,,,,,,,,,,,1
classpnp.sys=,,,,,,,,,,,,4
pcix.sys=,,,,,,,,,,,,4
pcmcia.sys=,,,,,,,,,,,,4
Modified: trunk/reactos/configure.sh
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/configure.sh [iso-8859-1] (original)
+++ trunk/reactos/configure.sh [iso-8859-1] Mon May 23 19:30:50 2011
@@ -10,7 +10,6 @@
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
@@ -34,5 +33,5 @@
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...)."
Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel32.rc?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Mon May 23
19:30:50 2011
@@ -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"
Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Mon May 23
19:30:50 2011
@@ -33,10 +33,10 @@
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
Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Mon May 23
19:30:50 2011
@@ -34,10 +34,10 @@
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
Modified: trunk/reactos/drivers/bus/acpi/busmgr/button.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/button.c?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Mon May 23
19:30:50 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/power.c?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Mon May 23
19:30:50 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/system.c?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Mon May 23
19:30:50 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?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Mon May 23 19:30:50 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=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Mon May 23 19:30:50 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?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Mon May 23 19:30:50 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.c?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] Mon May 23 19:30:50
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/hal/halx86/mp/i386/mps.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/i386/mps.S?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] Mon May 23 19:30:50 2011
@@ -11,7 +11,9 @@
/* INCLUDES ******************************************************************/
-#include <ndk/asm.h>
+#include <asm.inc>
+
+#include <ks386.inc>
/* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1]
(original)
+++ trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] Mon May
23 19:30:50 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++)
Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev=51871&r1=51870&r2=51871&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon May 23 19:30:50 2011
@@ -41,7 +41,7 @@
ULONG KeIcacheFlushCount = 0;
ULONG KiDmaIoCoherency = 0;
ULONG KePrefetchNTAGranularity = 32;
-CHAR KeNumberProcessors;
+CHAR KeNumberProcessors = 0;
KAFFINITY KeActiveProcessors = 1;
BOOLEAN KiI386PentiumLockErrataPresent;
BOOLEAN KiSMTProcessorsPresent;
