Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[akhaldi] 64120: [WIN32SS] * Remove extraneous parentheses. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 11 13:34:39 2014 New Revision: 64120 URL: http://svn.reactos.org/svn/reactos?rev=64120&view=rev Log: [WIN32SS] * Remove extraneous parentheses. CORE-8516 Modified: trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Thu Sep 11 13:34:39 2014 @@ -512,7 +512,7 @@ PTIMER pTmr; BOOL TimersRemoved = FALSE; - if ((Window == NULL)) + if (Window == NULL) return FALSE; TimerEnterExclusive();

10 years, 3 months

[akhaldi] 64119: [WINEMP3.ACM] * Link with mingwex. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 11 13:24:10 2014 New Revision: 64119 URL: http://svn.reactos.org/svn/reactos?rev=64119&view=rev Log: [WINEMP3.ACM] * Link with mingwex. CORE-8516 Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Thu Sep 11 13:24:10 2014 @@ -16,5 +16,10 @@ set_module_type(winemp3.acm win32dll) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm wine libmpg123 oldnames) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(winemp3.acm mingwex) +endif() + add_importlibs(winemp3.acm winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32 FOR all)

10 years, 3 months

[akhaldi] 64118: [SHELL32_APITEST] * CLSID_MenuDeskBar is already part of the uuid lib.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 11 11:07:03 2014 New Revision: 64118 URL: http://svn.reactos.org/svn/reactos?rev=64118&view=rev Log: [SHELL32_APITEST] * CLSID_MenuDeskBar is already part of the uuid lib. Modified: trunk/rostests/apitests/shell32/shelltest.h Modified: trunk/rostests/apitests/shell32/shelltest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shelltes… ============================================================================== --- trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] Thu Sep 11 11:07:03 2014 @@ -25,7 +25,6 @@ #define test_S_OK(hres, message) ok(hres == S_OK, "%s (0x%lx instead of S_OK)\n",message, hResult); #define test_HRES(hres, hresExpected, message) ok(hres == hresExpected, "%s (0x%lx instead of 0x%lx)\n",message, hResult,hresExpected); -DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(CLSID_MenuBandSite, 0xE13EF4E4, 0xD2F2, 0x11D0, 0x98, 0x16, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); template<typename Interface>

10 years, 3 months

[akhaldi] 64117: [WINMM_WINETEST] * Addendum to r64114. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 11 11:04:28 2014 New Revision: 64117 URL: http://svn.reactos.org/svn/reactos?rev=64117&view=rev Log: [WINMM_WINETEST] * Addendum to r64114. CORE-8516 Modified: trunk/rostests/winetests/winmm/CMakeLists.txt Modified: trunk/rostests/winetests/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/CMakeList… ============================================================================== --- trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] Thu Sep 11 11:04:28 2014 @@ -17,5 +17,8 @@ add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) - add_target_compile_flags(winmm_winetest "-Wno-format -Wno-unused-but-set-variable") + add_target_compile_flags(winmm_winetest "-Wno-format") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_target_compile_flags(winmm_winetest "-Wno-unused-but-set-variable") + endif() endif()

10 years, 3 months

[akhaldi] 64116: [OLEAUT32] * Link with mingwex. * Fall back to gas with vartype.c until http://llvm.org/bugs/show_bug.cgi?id=19027 is fixed. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 11 11:03:20 2014 New Revision: 64116 URL: http://svn.reactos.org/svn/reactos?rev=64116&view=rev Log: [OLEAUT32] * Link with mingwex. * Fall back to gas with vartype.c until http://llvm.org/bugs/show_bug.cgi?id=19027 is fixed. CORE-8516 Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Thu Sep 11 11:03:20 2014 @@ -49,6 +49,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(oleaut32 mingwex) + #FIXME: http://llvm.org/bugs/show_bug.cgi?id=19027 + set_property(SOURCE vartype.c APPEND_STRING PROPERTY COMPILE_FLAGS " -no-integrated-as") +endif() + add_idl_headers(oleaut32_idlheader oleaut32_oaidl.idl) add_dependencies(oleaut32 oleaut32_idlheader) set_module_type(oleaut32 win32dll)

10 years, 3 months

[akhaldi] 64115: [INCLUDES] * Define DECLSPEC_HOTPATCH to nothing until http://llvm.org/bugs/show_bug.cgi?id=20888 is fixed. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 11 10:50:15 2014 New Revision: 64115 URL: http://svn.reactos.org/svn/reactos?rev=64115&view=rev Log: [INCLUDES] * Define DECLSPEC_HOTPATCH to nothing until http://llvm.org/bugs/show_bug.cgi?id=20888 is fixed. CORE-8516 Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Thu Sep 11 10:50:15 2014 @@ -217,7 +217,8 @@ /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ #ifndef DECLSPEC_HOTPATCH -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__clang__) +/* FIXME: http://llvm.org/bugs/show_bug.cgi?id=20888 */ #define DECLSPEC_HOTPATCH #else #define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__)) Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Thu Sep 11 10:50:15 2014 @@ -2,7 +2,8 @@ /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ #ifndef DECLSPEC_HOTPATCH -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__clang__) +/* FIXME: http://llvm.org/bugs/show_bug.cgi?id=20888 */ #define DECLSPEC_HOTPATCH #else #define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))

10 years, 3 months

[akhaldi] 64114: [CMAKE] * Don't set -Wno-unused-but-set-variable until http://llvm.org/bugs/show_bug.cgi?id=20906 is fixed or the warnings are fixed upstream. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 11 10:43:57 2014 New Revision: 64114 URL: http://svn.reactos.org/svn/reactos?rev=64114&view=rev Log: [CMAKE] * Don't set -Wno-unused-but-set-variable until http://llvm.org/bugs/show_bug.cgi?id=20906 is fixed or the warnings are fixed upstream. CORE-8516 Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt trunk/reactos/dll/opengl/glu32/CMakeLists.txt trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/lib/3rdparty/adns/CMakeLists.txt trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -61,5 +61,7 @@ if(NOT MSVC) allow_warnings(libtiff) - add_target_compile_flags(libtiff "-Wno-unused-but-set-variable") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_target_compile_flags(libtiff "-Wno-unused-but-set-variable") + endif() endif() Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -48,5 +48,8 @@ add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(libxslt "-Wno-pointer-sign -Wno-unused-but-set-variable -Wno-unused-function") + add_target_compile_flags(libxslt "-Wno-pointer-sign -Wno-unused-function") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_target_compile_flags(libxslt "-Wno-unused-but-set-variable") + endif() endif() Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/CMakeList… ============================================================================== --- trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -113,11 +113,13 @@ set_module_type(glu32 win32dll) if(NOT MSVC) - add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable") + add_target_compile_flags(glu32 "-Wno-write-strings") if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_link_libraries(glu32 mingwex) #FIXME: longjmp exists in both our msvcrt and mingwex add_target_link_flags(glu32 "-Wl,--allow-multiple-definition") + else() + add_target_compile_flags(glu32 "-Wno-unused-but-set-variable") endif() endif() Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -60,7 +60,9 @@ add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(browseui "-Wno-unused-but-set-variable") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_target_compile_flags(browseui "-Wno-unused-but-set-variable") + endif() # Binutils linker bug if(LTCG) Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -29,6 +29,6 @@ add_subdirectory(midimap) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) -if(NOT MSVC) +if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(winmm "-Wno-unused-but-set-variable") endif() Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/C… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -12,8 +12,8 @@ add_library(fbtusb SHARED ${SOURCE} fbtusb.rc) -if(NOT MSVC) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") +if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) + add_target_compile_flags(fbtusb "-Wno-unused-but-set-variable") endif() set_module_type(fbtusb kernelmodedriver) Modified: trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/C… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -24,8 +24,8 @@ add_library(ext2fs SHARED ${SOURCE}) -if(NOT MSVC) - add_compile_flags("-Wno-unused-but-set-variable") +if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) + add_target_compile_flags(ext2fs "-Wno-unused-but-set-variable") endif() target_link_libraries(ext2fs ${PSEH_LIB}) Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -22,7 +22,10 @@ if(NOT MSVC) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable -Wno-narrowing") + add_target_compile_flags(uniata "-Wno-narrowing") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_target_compile_flags(uniata "-Wno-unused-but-set-variable") + endif() endif() add_pch(uniata stdafx.h SOURCE) Modified: trunk/reactos/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/CMakeLis… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -25,6 +25,6 @@ add_dependencies(adns psdk) add_pch(adns src/internal.h SOURCE) -if(NOT MSVC) +if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(adns "-Wno-unused-but-set-variable") endif() Modified: trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -19,6 +19,6 @@ add_dependencies(cardlib psdk) add_pch(cardlib cardlib.h SOURCE) -if(NOT MSVC AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) +if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(cardlib "-Wno-unused-but-set-variable") endif() Modified: trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -19,6 +19,6 @@ add_library(fullfat ${SOURCE}) add_dependencies(fullfat bugcodes) -if(NOT MSVC) +if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(fullfat "-Wno-unused-but-set-variable") endif() Modified: trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/CMa… ============================================================================== --- trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:43:57 2014 @@ -45,6 +45,6 @@ add_dependencies(libmpg123 psdk) add_pch(libmpg123 precomp.h SOURCE) -if(NOT MSVC) +if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(libmpg123 "-Wno-unused-but-set-variable") endif()

10 years, 3 months

[akhaldi] 64113: [GLU32] * Link with mingwex. * Allow multiple definitions at link time because longjmp exists in both our msvcrt and mingwex. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 11 10:13:05 2014 New Revision: 64113 URL: http://svn.reactos.org/svn/reactos?rev=64113&view=rev Log: [GLU32] * Link with mingwex. * Allow multiple definitions at link time because longjmp exists in both our msvcrt and mingwex. CORE-8516 Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/CMakeList… ============================================================================== --- trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:13:05 2014 @@ -114,6 +114,11 @@ if(NOT MSVC) add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable") + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(glu32 mingwex) + #FIXME: longjmp exists in both our msvcrt and mingwex + add_target_link_flags(glu32 "-Wl,--allow-multiple-definition") + endif() endif() add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll)

10 years, 3 months

[hpoussin] 64112: [CDFS] - Correctly decode address of first session, which now uses MSF format since r64106

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Sep 10 19:45:57 2014 New Revision: 64112 URL: http://svn.reactos.org/svn/reactos?rev=64112&view=rev Log: [CDFS] - Correctly decode address of first session, which now uses MSF format since r64106 Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Wed Sep 10 19:45:57 2014 @@ -200,7 +200,6 @@ PVD_HEADER VdHeader; ULONG Size; ULONG Offset; - ULONG i; CDROM_TOC Toc; DPRINT("CdfsGetVolumeData\n"); @@ -227,10 +226,14 @@ DPRINT("FirstTrack %u, LastTrack %u, TrackNumber %u\n", Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber); - Offset = 0; - for (i = 0; i < 4; i++) - { - Offset = (Offset << 8) + Toc.TrackData[0].Address[i]; + Offset = Toc.TrackData[0].Address[1] * 60 * 75; + Offset += Toc.TrackData[0].Address[2] * 75; + Offset += Toc.TrackData[0].Address[3]; + if (Offset >= 150) + { + /* Remove MSF numbering offset of first frame */ + /* FIXME: should be done only for real cdroms? */ + Offset -= 150; } CdInfo->VolumeOffset = Offset;

10 years, 3 months

[akhaldi] 64111: [CMAKE/CLANG] * Do not add PIC and PIE related flags. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 10 19:00:53 2014 New Revision: 64111 URL: http://svn.reactos.org/svn/reactos?rev=64111&view=rev Log: [CMAKE/CLANG] * Do not add PIC and PIE related flags. CORE-8516 Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=64111&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Sep 10 19:00:53 2014 @@ -37,6 +37,12 @@ set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") set(CMAKE_LINK_LIBRARY_SUFFIX "") set(CMAKE_CREATE_WIN32_EXE "") + set(CMAKE_C_COMPILE_OPTIONS_PIC "") + set(CMAKE_CXX_COMPILE_OPTIONS_PIC "") + set(CMAKE_C_COMPILE_OPTIONS_PIE "") + set(CMAKE_CXX_COMPILE_OPTIONS_PIE "") + set(CMAKE_SHARED_LIBRARY_C_FLAGS "") + set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "") endif() if(DBG)

10 years, 3 months

← Newer
1
...
29
30
31
32
33
34
35
...
42
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 September 2014