diff --git a/reactos/dll/directx/wine/wined3d/state.c b/reactos/dll/directx/wine/wined3d/state.c index a2c197bbfe0..a43cc383ca1 100644 --- a/reactos/dll/directx/wine/wined3d/state.c +++ b/reactos/dll/directx/wine/wined3d/state.c @@ -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; diff --git a/reactos/dll/win32/batt/resource.h b/reactos/dll/win32/batt/resource.h index d506679737b..3f16329ea9a 100644 --- a/reactos/dll/win32/batt/resource.h +++ b/reactos/dll/win32/batt/resource.h @@ -1 +1 @@ -#define IDI_BATTERY 2 \ No newline at end of file +#define IDI_BATTERY 2 diff --git a/reactos/dll/win32/winmm/registry.c b/reactos/dll/win32/winmm/registry.c index 8cb17651048..b967723d14b 100644 --- a/reactos/dll/win32/winmm/registry.c +++ b/reactos/dll/win32/winmm/registry.c @@ -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; diff --git a/reactos/drivers/bus/acpi/busmgr/button.c b/reactos/drivers/bus/acpi/busmgr/button.c index 9344a5f1f7d..73f4a615c99 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 = { - .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 { diff --git a/reactos/drivers/bus/acpi/busmgr/power.c b/reactos/drivers/bus/acpi/busmgr/power.c index c10e98112ed..4027ef829cc 100644 --- a/reactos/drivers/bus/acpi/busmgr/power.c +++ b/reactos/drivers/bus/acpi/busmgr/power.c @@ -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 { diff --git a/reactos/drivers/bus/acpi/busmgr/system.c b/reactos/drivers/bus/acpi/busmgr/system.c index ca5a0852bf9..79d8af4c263 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 = { - .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 diff --git a/reactos/drivers/bus/acpi/main.c b/reactos/drivers/bus/acpi/main.c index 175ad53d728..7f2ae262e1b 100644 --- a/reactos/drivers/bus/acpi/main.c +++ b/reactos/drivers/bus/acpi/main.c @@ -12,6 +12,13 @@ #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 9259fb9d2a5..7151320dbd0 100644 --- a/reactos/drivers/bus/acpi/pnp.c +++ b/reactos/drivers/bus/acpi/pnp.c @@ -10,11 +10,16 @@ #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 2f7175c74ad..cb58d4ff0dd 100644 --- a/reactos/drivers/bus/acpi/power.c +++ b/reactos/drivers/bus/acpi/power.c @@ -224,7 +224,7 @@ Bus_PDO_Power ( return status; } -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(_MSC_VER) PCHAR PowerMinorFunctionString ( diff --git a/reactos/drivers/bus/pcix/pci/busno.c b/reactos/drivers/bus/pcix/pci/busno.c index 6b6316493f3..caf7632cd79 100644 --- a/reactos/drivers/bus/pcix/pci/busno.c +++ b/reactos/drivers/bus/pcix/pci/busno.c @@ -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; diff --git a/reactos/lib/3rdparty/libsamplerate/CMakeLists.txt b/reactos/lib/3rdparty/libsamplerate/CMakeLists.txt index d1864e1f763..136ae5c8668 100644 --- a/reactos/lib/3rdparty/libsamplerate/CMakeLists.txt +++ b/reactos/lib/3rdparty/libsamplerate/CMakeLists.txt @@ -6,4 +6,4 @@ list(APPEND SOURCE src_zoh.c) add_library(libsamplerate ${SOURCE}) -add_dependencies(libsamplerate psdk) \ No newline at end of file +add_dependencies(libsamplerate psdk) diff --git a/reactos/lib/3rdparty/libsamplerate/src_linear.c b/reactos/lib/3rdparty/libsamplerate/src_linear.c index f97ba45db22..ab483bc4450 100644 --- a/reactos/lib/3rdparty/libsamplerate/src_linear.c +++ b/reactos/lib/3rdparty/libsamplerate/src_linear.c @@ -30,6 +30,9 @@ #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) ; @@ -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++)