Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

patch by Igor Paliychuk <mansonigor at gmail dot com>:

Browse source 
- [CMAKE] Reduce difference with cmake branch
- msvc fixes
- minor changes by me

svn path=/trunk/; revision=51871
This commit is contained in:
Matthias Kupfer 2011-05-23 19:30:50 +00:00
parent 26e319dd8c
commit 54e3afb4ee
16 changed files with 58 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/setup/usetup/filesup.c
View file

@ -126,7 +126,7 @@ SetupCopyFile(PWCHAR SourceFileName,
FILE_SEQUENTIAL_ONLY);
if(!NT_SUCCESS(Status))
{
DPRINT1("NtOpenFile failed: %x\n", Status);
DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName);
goto done;
}
#else

1
reactos/boot/bootdata/txtsetup.sif
View file

@ -40,6 +40,7 @@ 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

3
reactos/configure.sh
View file

@ -10,7 +10,6 @@ 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
@ -34,5 +33,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...)."

2
reactos/dll/win32/kernel32/kernel32.rc
View file

@ -9,8 +9,8 @@
#include "locale_rc.rc"
#include "lang/de-DE.rc"
#include "lang/en-US.rc"
#include "lang/de-DE.rc"
#include "lang/es-ES.rc"
#include "lang/ru-RU.rc"
#include "lang/uk-UA.rc"

8
reactos/dll/win32/shlwapi/shlwapi_Hu.rc
View file

@ -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

8
reactos/dll/win32/shlwapi/shlwapi_Pt.rc
View file

@ -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

14
reactos/drivers/bus/acpi/busmgr/button.c
View file

@ -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 = {
.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 {

15
reactos/drivers/bus/acpi/busmgr/power.c
View file

@ -64,14 +64,13 @@ 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 = {
.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 {

14
reactos/drivers/bus/acpi/busmgr/system.c
View file

@ -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 = {
.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

7
reactos/drivers/bus/acpi/main.c
View file

@ -12,6 +12,13 @@
#define NDEBUG
#include <debug.h>
NTSTATUS
NTAPI
DriverEntry (
PDRIVER_OBJECT DriverObject,
PUNICODE_STRING RegistryPath
);
#ifdef ALLOC_PRAGMA
#pragma alloc_text (INIT, DriverEntry)
#pragma alloc_text (PAGE, Bus_AddDevice)

7
reactos/drivers/bus/acpi/pnp.c
View file

@ -10,11 +10,16 @@
#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)

2
reactos/drivers/bus/acpi/power.c
View file

@ -224,7 +224,7 @@ Bus_PDO_Power (
return status;
}
#ifndef NDEBUG
#if !defined(NDEBUG) || defined(_MSC_VER)
PCHAR
PowerMinorFunctionString (

3
reactos/drivers/bus/pcix/pci/busno.c
View file

@ -20,9 +20,10 @@ BOOLEAN
NTAPI
PciAreBusNumbersConfigured(IN PPCI_PDO_EXTENSION PdoExtension)
{
PAGED_CODE();
UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus;
PAGED_CODE();
/* Get all relevant bus number details */
PrimaryBus = PdoExtension->Dependent.type1.PrimaryBus;
BaseBus = PdoExtension->ParentFdoExtension->BaseBus;

4
reactos/hal/halx86/mp/i386/mps.S
View file

@ -11,7 +11,9 @@
/* INCLUDES ******************************************************************/
#include <ndk/asm.h>
#include <asm.inc>
#include <ks386.inc>
/* FUNCTIONS *****************************************************************/

7
reactos/lib/3rdparty/libsamplerate/src_linear.c vendored
View file

@ -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 @@ 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)
{ 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++)

2
reactos/ntoskrnl/ke/i386/cpu.c
View file

@ -41,7 +41,7 @@ ULONG KeDcacheFlushCount = 0;
ULONG KeIcacheFlushCount = 0;
ULONG KiDmaIoCoherency = 0;
ULONG KePrefetchNTAGranularity = 32;
CHAR KeNumberProcessors;
CHAR KeNumberProcessors = 0;
KAFFINITY KeActiveProcessors = 1;
BOOLEAN KiI386PentiumLockErrataPresent;
BOOLEAN KiSMTProcessorsPresent;