[akhaldi] 52255: [CMAKE] * Merge 50707, 50713, 50742, 50779, 50795 and 50796 from the cmake branch. * Merge state.c change from 50740.
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/st... ============================================================================== --- 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?r... ============================================================================== --- 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/but... ============================================================================== --- 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/pow... ============================================================================== --- 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/sys... ============================================================================== --- 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?rev... ============================================================================== --- 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?re... ============================================================================== --- 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++)
-
akhaldi＠svn.reactos.org