Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[janderwald] 50716: - Apply same fix for wmilib - set_entrypoint macro appears to be broken for msvc 16.00.30319.01 (VS 2010)

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 15 17:39:00 2011 New Revision: 50716 URL: http://svn.reactos.org/svn/reactos?rev=50716&view=rev Log: - Apply same fix for wmilib - set_entrypoint macro appears to be broken for msvc 16.00.30319.01 (VS 2010) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Tue Feb 15 17:39:00 2011 @@ -8,8 +8,8 @@ add_library(wmilib SHARED ${SOURCE}) -set_module_type(wmilib kernelmodedriver) set_entrypoint(wmilib 0) +set_target_properties(wmilib PROPERTIES SUFFIX ".sys") add_importlibs(wmilib ntoskrnl) add_importlib_target(wmilib.spec)

13 years, 10 months

[tkreuzer] 50715: [WINE] Don't define __ASM_DEFINE_FUNC and __ASM_STDCALL_FUNC on MSVC builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 15 17:36:10 2011 New Revision: 50715 URL: http://svn.reactos.org/svn/reactos?rev=50715&view=rev Log: [WINE] Don't define __ASM_DEFINE_FUNC and __ASM_STDCALL_FUNC on MSVC builds Modified: branches/cmake-bringup/include/reactos/wine/config.h Modified: branches/cmake-bringup/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] Tue Feb 15 17:36:10 2011 @@ -1020,10 +1020,12 @@ #define __ASM_CFI(str) str /* Define to a macro to define an assembly function */ +#ifndef _MSC_VER #ifndef NO_UNDERSCORE_PREFIX #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl _" #name suffix "\n\t.def _" #name suffix "; .scl 2; .type 32; .endef\n_" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); #else #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.def " #name suffix "; .scl 2; .type 32; .endef\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); +#endif #endif /* Define to a macro to generate an assembly function directive */ @@ -1045,7 +1047,9 @@ /* Define to a macro to generate an assembly function with stdcall calling convention */ +#ifndef _MSC_VER #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code) +#endif /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */

13 years, 10 months

[janderwald] 50714: - Fix drmk build for msvc

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 15 17:29:11 2011 New Revision: 50714 URL: http://svn.reactos.org/svn/reactos?rev=50714&view=rev Log: - Fix drmk build for msvc Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Tue Feb 15 17:29:11 2011 @@ -10,8 +10,8 @@ add_library(drmk SHARED ${SOURCE}) -set_module_type(drmk kernelmodedriver) set_entrypoint(drmk 0) +set_target_properties(drmk PROPERTIES SUFFIX ".sys") add_importlibs(drmk ntoskrnl) add_importlib_target(drmk.spec)

13 years, 10 months

[gadamopoulos] 50713: [acpi] -Fix compilation with msc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 15 17:12:36 2011 New Revision: 50713 URL: http://svn.reactos.org/svn/reactos?rev=50713&view=rev Log: [acpi] -Fix compilation with msc Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c branches/cmake-bringup/drivers/bus/acpi/main.c branches/cmake-bringup/drivers/bus/acpi/osl.c branches/cmake-bringup/drivers/bus/acpi/pnp.c Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Tue Feb 15 17:12:36 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: branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Tue Feb 15 17:12:36 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: branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Tue Feb 15 17:12:36 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: branches/cmake-bringup/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/main.c [iso-8859-1] Tue Feb 15 17:12:36 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: branches/cmake-bringup/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/osl.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -67,6 +67,8 @@ ACPI_STATUS AcpiOsInitialize (void) { + UINT32 i; + DPRINT("AcpiOsInitialize called\n"); #ifndef NDEBUG @@ -74,8 +76,6 @@ AcpiDbgLevel = 0x00FFFFFF; AcpiDbgLayer = 0xFFFFFFFF; #endif - - UINT32 i; for (i = 0; i < NUM_SEMAPHORES; i++) { @@ -209,10 +209,11 @@ AcpiOsAcquireObject ( ACPI_CACHE_T *Cache) { + void* ptr; PNPAGED_LOOKASIDE_LIST List = (PNPAGED_LOOKASIDE_LIST)Cache; + DPRINT("AcpiOsAcquireObject from %p\n", Cache); - void* ptr = - ExAllocateFromNPagedLookasideList(List); + ptr = ExAllocateFromNPagedLookasideList(List); ASSERT(ptr); RtlZeroMemory(ptr,List->L.Size); @@ -692,8 +693,10 @@ UINT64 AcpiOsGetTimer (void) { + LARGE_INTEGER Timer; + DPRINT("AcpiOsGetTimer\n"); - LARGE_INTEGER Timer; + KeQueryTickCount(&Timer); return Timer.QuadPart; @@ -758,9 +761,10 @@ AcpiOsGetRootPointer ( void) { + ACPI_PHYSICAL_ADDRESS pa = 0; + DPRINT("AcpiOsGetRootPointer\n"); - ACPI_PHYSICAL_ADDRESS pa = 0; - + AcpiFindRootPointer(&pa); return pa; } Modified: branches/cmake-bringup/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/pnp.c [iso-8859-1] Tue Feb 15 17:12:36 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)

13 years, 10 months

[tkreuzer] 50712: [NMIDEBUG] Fix compilation with MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 15 17:03:28 2011 New Revision: 50712 URL: http://svn.reactos.org/svn/reactos?rev=50712&view=rev Log: [NMIDEBUG] Fix compilation with MSVC Modified: branches/cmake-bringup/drivers/base/nmidebug/nmidebug.c Modified: branches/cmake-bringup/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/nmid… ============================================================================== --- branches/cmake-bringup/drivers/base/nmidebug/nmidebug.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/nmidebug/nmidebug.c [iso-8859-1] Tue Feb 15 17:03:28 2011 @@ -21,7 +21,14 @@ { ((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]); ((PCHAR)&KiBugCheckData[4])[3] |= 1; +#ifdef _MSC_VER + __asm + { + rcr KiBugCheckData[4], 8 + } +#else __asm__("rcrl %b[shift], %k[retval]" : [retval] "=rm" (KiBugCheckData[4]) : "[retval]" (KiBugCheckData[4]), [shift] "Nc" (8)); +#endif } BOOLEAN

13 years, 10 months

[gadamopoulos] 50711: [uniata] - Fix some compilation issues with msc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 15 17:01:38 2011 New Revision: 50711 URL: http://svn.reactos.org/svn/reactos?rev=50711&view=rev Log: [uniata] - Fix some compilation issues with msc Modified: branches/cmake-bringup/drivers/storage/ide/uniata/id_sata.cpp Modified: branches/cmake-bringup/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Tue Feb 15 17:01:38 2011 @@ -237,7 +237,8 @@ return FALSE; } // end UniataSataEvent() -ULONG +ULONG +NTAPI UniataSataReadPort4( IN PHW_CHANNEL chan, IN ULONG io_port_ndx, @@ -302,6 +303,7 @@ } // end UniataSataReadPort4() VOID +NTAPI UniataSataWritePort4( IN PHW_CHANNEL chan, IN ULONG io_port_ndx,

13 years, 10 months

[gadamopoulos] 50710: [comctl32] - Fix compilation with msc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 15 16:19:10 2011 New Revision: 50710 URL: http://svn.reactos.org/svn/reactos?rev=50710&view=rev Log: [comctl32] - Fix compilation with msc Modified: branches/cmake-bringup/dll/win32/comctl32/monthcal.c Modified: branches/cmake-bringup/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/monthcal.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comctl32/monthcal.c [iso-8859-1] Tue Feb 15 16:19:10 2011 @@ -147,8 +147,8 @@ /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; /* valid date limits */ -static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; -static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; +static const SYSTEMTIME max_allowed_date = { 9999, 12, 0, 31, 0, 0, 0, 0 }; +static const SYSTEMTIME min_allowed_date = { 1752, 9, 0, 14, 0, 0, 0, 0 }; #define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0))

13 years, 10 months

[gadamopoulos] 50709: [glu32] - Fix compilation with msc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 15 16:03:55 2011 New Revision: 50709 URL: http://svn.reactos.org/svn/reactos?rev=50709&view=rev Log: [glu32] - Fix compilation with msc Modified: branches/cmake-bringup/dll/win32/glu32/libutil/mipmap.c Modified: branches/cmake-bringup/dll/win32/glu32/libutil/mipmap.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/l… ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/libutil/mipmap.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/glu32/libutil/mipmap.c [iso-8859-1] Tue Feb 15 16:03:55 2011 @@ -6577,7 +6577,7 @@ * Contributed by Gerk Huisma <gerk(a)five-d.demon.nl>. */ -typedef WINAPI void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level, +typedef void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border,

13 years, 10 months

[gadamopoulos] 50708: [shell32] - Fix some compilation issues with msc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 15 16:01:02 2011 New Revision: 50708 URL: http://svn.reactos.org/svn/reactos?rev=50708&view=rev Log: [shell32] - Fix some compilation issues with msc Modified: branches/cmake-bringup/dll/win32/shell32/shelllink.c Modified: branches/cmake-bringup/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/shelllink.c [iso-8859-1] Tue Feb 15 16:01:02 2011 @@ -187,9 +187,13 @@ /* strdup on the process heap */ static LPWSTR __inline HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) { + INT len; + LPWSTR p; + assert(str); - INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); + + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len );

13 years, 10 months

[gadamopoulos] 50707: [winmm] - Fix compilation with msc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 15 15:57:42 2011 New Revision: 50707 URL: http://svn.reactos.org/svn/reactos?rev=50707&view=rev Log: [winmm] - Fix compilation with msc Modified: branches/cmake-bringup/dll/win32/winmm/registry.c Modified: branches/cmake-bringup/dll/win32/winmm/registry.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/r… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/registry.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/registry.c [iso-8859-1] Tue Feb 15 15:57:42 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;

13 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2011