Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* Merge 50707, 50713, 50742, 50779, 50795 and 50796 from the cmake branch.
* Merge state.c change from 50740.

svn path=/trunk/; revision=52255
This commit is contained in:
Amine Khaldi 2011-06-15 19:36:15 +00:00
parent ddab848f06
commit 47b2fb3e68
12 changed files with 47 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/wine/wined3d/state.c
View file

@ -963,7 +963,7 @@ void state_fogstartend(DWORD state, struct wined3d_stateblock *stateblock, struc
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;

2
reactos/dll/win32/batt/resource.h
View file

@ -1 +1 @@
#define IDI_BATTERY 2
#define IDI_BATTERY 2

4
reactos/dll/win32/winmm/registry.c
View file

@ -29,10 +29,10 @@ BOOL LoadRegistryMMEDrivers(char* key)
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;

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;

2
reactos/lib/3rdparty/libsamplerate/CMakeLists.txt vendored
View file

@ -6,4 +6,4 @@ list(APPEND SOURCE
src_zoh.c)
add_library(libsamplerate ${SOURCE})
add_dependencies(libsamplerate psdk)
add_dependencies(libsamplerate psdk)

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