Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50712: [NMIDEBUG] Fix compilation with MSVC
by tkreuzer＠svn.reactos.org 15 Feb '11

15 Feb '11

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

1 0

[gadamopoulos] 50711: [uniata] - Fix some compilation issues with msc
by gadamopoulos＠svn.reactos.org 15 Feb '11

15 Feb '11

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,

1 0

[gadamopoulos] 50710: [comctl32] - Fix compilation with msc
by gadamopoulos＠svn.reactos.org 15 Feb '11

15 Feb '11

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

1 0

[gadamopoulos] 50709: [glu32] - Fix compilation with msc
by gadamopoulos＠svn.reactos.org 15 Feb '11

15 Feb '11

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,

1 0

[gadamopoulos] 50708: [shell32] - Fix some compilation issues with msc
by gadamopoulos＠svn.reactos.org 15 Feb '11

15 Feb '11

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

1 0

[gadamopoulos] 50707: [winmm] - Fix compilation with msc
by gadamopoulos＠svn.reactos.org 15 Feb '11

15 Feb '11

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;

1 0

[gadamopoulos] 50706: [oskittcp] -Fix compilation with msc
by gadamopoulos＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: gadamopoulos Date: Tue Feb 15 15:54:42 2011 New Revision: 50706 URL: http://svn.reactos.org/svn/reactos?rev=50706&view=rev Log: [oskittcp] -Fix compilation with msc Modified: branches/cmake-bringup/lib/drivers/oskittcp/oskittcp/defaults.c branches/cmake-bringup/lib/drivers/oskittcp/oskittcp/interface.c Modified: branches/cmake-bringup/lib/drivers/oskittcp/oskittcp/defaults.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/oskit… ============================================================================== --- branches/cmake-bringup/lib/drivers/oskittcp/oskittcp/defaults.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/oskittcp/oskittcp/defaults.c [iso-8859-1] Tue Feb 15 15:54:42 2011 @@ -194,7 +194,11 @@ return RtlCompareMemory(b1, b2, len); } +#ifndef _MSC_VER + int memcmp(const void *b1, const void *b2, size_t len) { return RtlCompareMemory(b1, b2, len); } + +#endif Modified: branches/cmake-bringup/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/oskit… ============================================================================== --- branches/cmake-bringup/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Tue Feb 15 15:54:42 2011 @@ -129,9 +129,10 @@ int proto ) { struct socket *so; - - OSKLock(); - int error = socreate(domain, &so, type, proto); + int error ; + + OSKLock(); + error = socreate(domain, &so, type, proto); if( !error ) { so->so_connection = context; InitializeSocketFlags(so);

1 0

[janderwald] 50705: - Missed that fix - Really fixes mstask compilation ; )
by janderwald＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: janderwald Date: Tue Feb 15 15:29:09 2011 New Revision: 50705 URL: http://svn.reactos.org/svn/reactos?rev=50705&view=rev Log: - Missed that fix - Really fixes mstask compilation ;) Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/… ============================================================================== --- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Tue Feb 15 15:29:09 2011 @@ -8,6 +8,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_BINARY_DIR}/include/psdk) generate_idl_iids(mstask_local.idl)

1 0

[tkreuzer] 50704: [CMAKE] Temporarily don't compile mshtl on msvc. simply to see how many errors are left.
by tkreuzer＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: tkreuzer Date: Tue Feb 15 15:26:01 2011 New Revision: 50704 URL: http://svn.reactos.org/svn/reactos?rev=50704&view=rev Log: [CMAKE] Temporarily don't compile mshtl on msvc. simply to see how many errors are left. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Tue Feb 15 15:26:01 2011 @@ -89,8 +89,10 @@ add_subdirectory(msg711.acm) add_subdirectory(msgina) add_subdirectory(msgsm32.acm) +if(NOT MSVC) add_subdirectory(mshtml) add_subdirectory(mshtml.tlb) +endif() add_subdirectory(msi) add_subdirectory(msimg32) add_subdirectory(msimtf)

1 0

[janderwald] 50703: - Fix compilation of mstask
by janderwald＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: janderwald Date: Tue Feb 15 15:11:46 2011 New Revision: 50703 URL: http://svn.reactos.org/svn/reactos?rev=50703&view=rev Log: - Fix compilation of mstask Modified: branches/cmake-bringup/include/psdk/mstask.idl Modified: branches/cmake-bringup/include/psdk/mstask.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/msta… ============================================================================== --- branches/cmake-bringup/include/psdk/mstask.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/mstask.idl [iso-8859-1] Tue Feb 15 15:11:46 2011 @@ -58,6 +58,11 @@ cpp_quote("#define TASK_TRIGGER_FLAG_HAS_END_DATE 0x1") cpp_quote("#define TASK_TRIGGER_FLAG_KILL_AT_DURATION_END 0x2") cpp_quote("#define TASK_TRIGGER_FLAG_DISABLED 0x4") + + +cpp_quote("DEFINE_GUID(CLSID_CTaskScheduler, 0x148bd52a, 0xa2ab, 0x11ce, 0xb1,0x1f, 0x00,0xaa,0x00,0x53,0x05,0x03);") +cpp_quote("DEFINE_GUID(CLSID_CTask, 0x148bd520, 0xa2ab, 0x11ce, 0xb1,0x1f, 0x00,0xaa,0x00,0x53,0x05,0x03);") + [ local,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs