Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 69091: [USER32] - Fix MSVC warning (C4305: '-=' : truncation from 'double' to 'float')
by tfaber＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: tfaber Date: Mon Sep 7 16:11:59 2015 New Revision: 69091 URL: http://svn.reactos.org/svn/reactos?rev=69091&view=rev Log: [USER32] - Fix MSVC warning (C4305: '-=' : truncation from 'double' to 'float') Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Mon Sep 7 16:11:59 2015 @@ -649,7 +649,7 @@ prev = current_line->net_length - 1; w = current_line->net_length; d = (float)current_line->width/(float)fw; - if (d > 1.2) d -= 0.2; + if (d > 1.2f) d -= 0.2f; next = prev/d; if (next >= prev) next = prev-1; do {

1 0

[cwittich] 69090: [MMSYS] include stdlib.h for _countof
by cwittich＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: cwittich Date: Mon Sep 7 14:56:46 2015 New Revision: 69090 URL: http://svn.reactos.org/svn/reactos?rev=69090&view=rev Log: [MMSYS] include stdlib.h for _countof Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.h [iso-8859-1] Mon Sep 7 14:56:46 2015 @@ -16,6 +16,7 @@ #include <cpl.h> #include <tchar.h> #include <setupapi.h> +#include <stdlib.h> #include "resource.h"

1 0

[cwittich] 69089: [MMSYS] don't mix TCHAR with WCHAR
by cwittich＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: cwittich Date: Mon Sep 7 14:53:31 2015 New Revision: 69089 URL: http://svn.reactos.org/svn/reactos?rev=69089&view=rev Log: [MMSYS] don't mix TCHAR with WCHAR Modified: trunk/reactos/dll/cpl/mmsys/volume.c Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Mon Sep 7 14:53:31 2015 @@ -224,8 +224,9 @@ { UINT NumMixers; MIXERCAPS mxc; - LPCWSTR nodevices; - LoadString(hApplet, IDS_NO_DEVICES, (LPTSTR)&nodevices, 0); + TCHAR szNoDevices[256]; + + LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, _countof(szNoDevices)); NumMixers = mixerGetNumDevs(); if (!NumMixers) @@ -237,7 +238,7 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE); SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconNoHW); - SetDlgItemText(hwndDlg, IDC_DEVICE_NAME, nodevices); + SetDlgItemText(hwndDlg, IDC_DEVICE_NAME, szNoDevices); return; }

1 0

[rnaumann] 69088: [mmsys] -State if there are no audio devices installed -remove an obsolete resource ID Patch by Jared Smudde CORE-10009 #resolve
by rnaumann＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: rnaumann Date: Mon Sep 7 14:44:29 2015 New Revision: 69088 URL: http://svn.reactos.org/svn/reactos?rev=69088&view=rev Log: [mmsys] -State if there are no audio devices installed -remove an obsolete resource ID Patch by Jared Smudde CORE-10009 #resolve Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/mmsys/volume.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc [iso-8859-1] Mon Sep 7 14:44:29 2015 @@ -15,7 +15,6 @@ /* Icons */ IDI_CPLICON ICON "resources/3004.ico" IDI_MIDICON ICON "resources/4353.ico" -4353 ICON "resources/4353.ico" 4354 ICON "resources/4354.ico" 4355 ICON "resources/4355.ico" 4356 ICON "resources/4356.ico" Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Mon Sep 7 14:44:29 2015 @@ -224,6 +224,8 @@ { UINT NumMixers; MIXERCAPS mxc; + LPCWSTR nodevices; + LoadString(hApplet, IDS_NO_DEVICES, (LPTSTR)&nodevices, 0); NumMixers = mixerGetNumDevs(); if (!NumMixers) @@ -235,6 +237,7 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE); SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconNoHW); + SetDlgItemText(hwndDlg, IDC_DEVICE_NAME, nodevices); return; }

1 0

[akhaldi] 69087: [CMAKE] Add even more missing dependencies on xdk. CORE-9586
by akhaldi＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: akhaldi Date: Mon Sep 7 11:13:09 2015 New Revision: 69087 URL: http://svn.reactos.org/svn/reactos?rev=69087&view=rev Log: [CMAKE] Add even more missing dependencies on xdk. CORE-9586 Modified: trunk/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/math/CMakeLists.txt trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt trunk/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt trunk/reactos/dll/opengl/mesa/tnl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/vbo/CMakeLists.txt trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt trunk/reactos/lib/cmlib/CMakeLists.txt trunk/reactos/lib/cportlib/CMakeLists.txt trunk/reactos/lib/cryptlib/CMakeLists.txt trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt trunk/reactos/lib/fast486/CMakeLists.txt trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt trunk/reactos/lib/lsalib/CMakeLists.txt trunk/reactos/lib/sdk/cpprt/CMakeLists.txt trunk/reactos/lib/sdk/ioevent/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/usersrv.cmake Modified: trunk/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/drivers/co… ============================================================================== --- trunk/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -4,3 +4,4 @@ meta.c) add_library(mesa_drv_common STATIC ${SOURCE}) +add_dependencies(mesa_drv_common xdk) Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -70,6 +70,7 @@ precomp.h) add_library(mesa_main STATIC ${SOURCE}) +add_dependencies(mesa_main xdk) add_pch(mesa_main precomp.h SOURCE) if(NOT MSVC) Modified: trunk/reactos/dll/opengl/mesa/math/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/math/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/math/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/math/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -11,4 +11,5 @@ precomp.h) add_library(mesa_math STATIC ${SOURCE}) +add_dependencies(mesa_math xdk) add_pch(mesa_math precomp.h SOURCE) Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/CMa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -28,6 +28,7 @@ precomp.h) add_library(mesa_swrast STATIC ${SOURCE}) +add_dependencies(mesa_swrast xdk) add_pch(mesa_swrast precomp.h SOURCE) if(MSVC) Modified: trunk/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast_set… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -4,3 +4,4 @@ ss_triangle.c) add_library(mesa_swrast_setup STATIC ${SOURCE}) +add_dependencies(mesa_swrast_setup xdk) Modified: trunk/reactos/dll/opengl/mesa/tnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/tnl/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/mesa/tnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/tnl/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -18,4 +18,5 @@ precomp.h) add_library(mesa_tnl STATIC ${SOURCE}) +add_dependencies(mesa_tnl xdk) add_pch(mesa_tnl precomp.h SOURCE) Modified: trunk/reactos/dll/opengl/mesa/vbo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/vbo/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/mesa/vbo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/vbo/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -18,4 +18,5 @@ precomp.h) add_library(mesa_vbo STATIC ${SOURCE}) +add_dependencies(mesa_vbo xdk) add_pch(mesa_vbo precomp.h SOURCE) Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -1,9 +1,7 @@ -PROJECT(SHELL) +project(SHELL) set_cpp(WITH_RUNTIME) - add_definitions(-DUNICODE -D_UNICODE) - include_directories(${REACTOS_SOURCE_DIR}/lib/atl) list(APPEND SOURCE @@ -11,3 +9,4 @@ dde.cpp) add_library(shelldesktop ${SOURCE}) +add_dependencies(shelldesktop xdk) Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -17,3 +17,4 @@ CStartMenu.cpp) add_library(shellmenu ${SOURCE}) +add_dependencies(shellmenu xdk) Modified: trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -18,3 +18,4 @@ add_dependencies(wine psdk) add_library(wineldr loader.c) +add_dependencies(wineldr xdk) Modified: trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -47,4 +47,5 @@ src/cxa.c src/c_locale.c) +add_dependencies(stlport xdk) add_pch(stlport src/stlport_prefix.h SOURCE) Modified: trunk/reactos/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -16,7 +16,7 @@ if(CMAKE_CROSSCOMPILING) add_library(cmlib ${SOURCE}) - add_dependencies(cmlib bugcodes) + add_dependencies(cmlib bugcodes xdk) add_pch(cmlib cmlib.h SOURCE) else() add_definitions( Modified: trunk/reactos/lib/cportlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/cportlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -1,2 +1,3 @@ add_library(cportlib cport.c) +add_dependencies(cportlib xdk) Modified: trunk/reactos/lib/cryptlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cryptlib/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/cryptlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cryptlib/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -1,5 +1,5 @@ -add_library(cryptlib +list(APPEND SOURCE aes.c des.c md4.c @@ -8,3 +8,6 @@ rc4.c sha1.c util.c) + +add_library(cryptlib ${SOURCE}) +add_dependencies(cryptlib xdk) Modified: trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/stdunk/C… ============================================================================== --- trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -1,3 +1,4 @@ set_cpp() add_library(stdunk cunknown.cpp) +add_dependencies(stdunk xdk) Modified: trunk/reactos/lib/fast486/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/fast486/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -11,3 +11,4 @@ fpu.c) add_library(fast486 ${SOURCE}) +add_dependencies(fast486 xdk) Modified: trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/CMakeLis… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -14,4 +14,5 @@ vfatlib.h) add_library(vfatlib ${SOURCE}) +add_dependencies(vfatlib xdk) add_pch(vfatlib vfatlib.h SOURCE) Modified: trunk/reactos/lib/lsalib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/CMakeLists.txt?… ============================================================================== --- trunk/reactos/lib/lsalib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/lsalib/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -1,3 +1,4 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) add_library(lsalib lsa.c) +add_dependencies(lsalib xdk) Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -20,3 +20,4 @@ endif() add_library(cpprt ${SOURCE} ${cpprt_asm}) +add_dependencies(cpprt xdk) Modified: trunk/reactos/lib/sdk/ioevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/ioevent/CMakeLists… ============================================================================== --- trunk/reactos/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -1,2 +1,3 @@ add_library(ioevent ioevent.c) +add_dependencies(ioevent xdk) Modified: trunk/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/CMa… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -19,7 +19,7 @@ mfdrv/init.c mfdrv/objects.c mfdrv/text.c - rosglue.c -) + rosglue.c) add_library(winegdi ${SOURCE}) +add_dependencies(winegdi xdk) Modified: trunk/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/concfg… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -1,5 +1,3 @@ -list(APPEND SOURCE - settings.c) - -add_library(concfg ${SOURCE}) +add_library(concfg settings.c) +add_dependencies(concfg xdk) Modified: trunk/reactos/win32ss/user/winsrv/usersrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv.cmake [iso-8859-1] Mon Sep 7 11:13:09 2015 @@ -10,6 +10,7 @@ usersrv/usersrv.h) add_library(usersrv ${USERSRV_SOURCE}) +add_dependencies(usersrv xdk) add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE}) list(APPEND USERSRV_IMPORT_LIBS basesrv)

1 0

[tfaber] 69086: [CMAKE] - Fix more missing dependencies on xdk CORE-9586
by tfaber＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: tfaber Date: Mon Sep 7 10:05:42 2015 New Revision: 69086 URL: http://svn.reactos.org/svn/reactos?rev=69086&view=rev Log: [CMAKE] - Fix more missing dependencies on xdk CORE-9586 Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/hal/halx86/acpi.cmake trunk/reactos/hal/halx86/legacy.cmake trunk/reactos/hal/halx86/up.cmake trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt trunk/reactos/lib/drivers/chew/CMakeLists.txt trunk/reactos/lib/drivers/csq/CMakeLists.txt trunk/reactos/lib/drivers/hidparser/CMakeLists.txt trunk/reactos/lib/drivers/ip/CMakeLists.txt trunk/reactos/lib/drivers/libusb/CMakeLists.txt trunk/reactos/lib/drivers/lwip/CMakeLists.txt trunk/reactos/lib/drivers/sound/legacy/CMakeLists.txt trunk/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt trunk/reactos/lib/drivers/sound/mmixer/CMakeLists.txt trunk/reactos/lib/drivers/sound/shared/CMakeLists.txt trunk/reactos/lib/drivers/sound/soundblaster/CMakeLists.txt trunk/reactos/lib/drivers/sound/uartmidi/CMakeLists.txt trunk/reactos/subsystems/win/basesrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/CMakeLists.txt trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -157,7 +157,7 @@ add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm}) add_pch(freeldr_common include/freeldr.h FREELDR_COMMON_SOURCE) -add_dependencies(freeldr_common bugcodes) +add_dependencies(freeldr_common bugcodes xdk) if(ARCH STREQUAL "i386" AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -647,7 +647,7 @@ # Now do some stuff which is specific to each type if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) - add_dependencies(${MODULE} bugcodes) + add_dependencies(${MODULE} bugcodes xdk) if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") endif() Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -165,7 +165,7 @@ add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") -add_dependencies(acpica bugcodes) +add_dependencies(acpica bugcodes xdk) list(APPEND ACPI_SOURCE busmgr/bus.c Modified: trunk/reactos/hal/halx86/acpi.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi.cmake?rev=… ============================================================================== --- trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -6,7 +6,7 @@ legacy/bus/pcibus.c) add_object_library(lib_hal_acpi ${HAL_ACPI_SOURCE}) -add_dependencies(lib_hal_acpi bugcodes) +add_dependencies(lib_hal_acpi bugcodes xdk) #add_pch(lib_hal_acpi include/hal.h) if(MSVC) Modified: trunk/reactos/hal/halx86/legacy.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy.cmake?re… ============================================================================== --- trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -12,7 +12,7 @@ legacy/halpcat.c) add_object_library(lib_hal_legacy ${HAL_LEGACY_SOURCE}) -add_dependencies(lib_hal_legacy bugcodes) +add_dependencies(lib_hal_legacy bugcodes xdk) #add_pch(lib_hal_legacy include/hal.h) if(MSVC) Modified: trunk/reactos/hal/halx86/up.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up.cmake?rev=69… ============================================================================== --- trunk/reactos/hal/halx86/up.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up.cmake [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -4,4 +4,4 @@ up/processor.c) add_object_library(lib_hal_up ${HAL_UP_SOURCE}) -add_dependencies(lib_hal_up bugcodes) +add_dependencies(lib_hal_up bugcodes xdk) 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] Mon Sep 7 10:05:42 2015 @@ -17,7 +17,7 @@ ff_time.c) add_library(fullfat ${SOURCE}) -add_dependencies(fullfat bugcodes) +add_dependencies(fullfat bugcodes xdk) if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(fullfat "-Wno-unused-but-set-variable") Modified: trunk/reactos/lib/drivers/chew/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/CMakeList… ============================================================================== --- trunk/reactos/lib/drivers/chew/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -1,4 +1,4 @@ add_definitions(-D_NTOSKRNL_) add_library(chew workqueue.c) -add_dependencies(chew bugcodes) +add_dependencies(chew bugcodes xdk) Modified: trunk/reactos/lib/drivers/csq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/CMakeLists… ============================================================================== --- trunk/reactos/lib/drivers/csq/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/csq/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -1,4 +1,4 @@ add_definitions(-D_NTOSKRNL_) add_library(csq csq.c) -add_dependencies(csq bugcodes) +add_dependencies(csq bugcodes xdk) Modified: trunk/reactos/lib/drivers/hidparser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/CMak… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -9,5 +9,5 @@ parser.h) add_library(hidparser ${SOURCE}) -add_dependencies(hidparser bugcodes) +add_dependencies(hidparser bugcodes xdk) add_pch(hidparser parser.h SOURCE) Modified: trunk/reactos/lib/drivers/ip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/CMakeLists.… ============================================================================== --- trunk/reactos/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -35,4 +35,4 @@ add_library(ip ${SOURCE} ${ip_asm}) add_pch(ip precomp.h SOURCE) -add_dependencies(ip bugcodes) +add_dependencies(ip asm) Modified: trunk/reactos/lib/drivers/libusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/CMakeLi… ============================================================================== --- trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -17,5 +17,5 @@ libusb.h) add_library(libusb ${SOURCE}) -add_dependencies(libusb bugcodes) +add_dependencies(libusb bugcodes xdk) add_pch(libusb libusb.h SOURCE) Modified: trunk/reactos/lib/drivers/lwip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/CMakeList… ============================================================================== --- trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -59,7 +59,7 @@ precomp.h) add_library(lwip ${SOURCE}) -add_dependencies(lwip bugcodes) +add_dependencies(lwip bugcodes xdk) add_pch(lwip precomp.h SOURCE) if(NOT MSVC) Modified: trunk/reactos/lib/drivers/sound/legacy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/legacy/C… ============================================================================== --- trunk/reactos/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -8,4 +8,4 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(audioleg devname.c hardware.c) -add_dependencies(audioleg bugcodes) +add_dependencies(audioleg bugcodes xdk) Modified: trunk/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/libusbau… ============================================================================== --- trunk/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/libusbaudio/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -9,4 +9,4 @@ format.c) add_library(libusbaudio ${SOURCE}) -add_dependencies(libusbaudio bugcodes) +add_dependencies(libusbaudio bugcodes xdk) Modified: trunk/reactos/lib/drivers/sound/mmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/C… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -17,4 +17,4 @@ add_library(mmixer ${SOURCE}) add_pch(mmixer precomp.h SOURCE) -add_dependencies(mmixer bugcodes) +add_dependencies(mmixer bugcodes xdk) Modified: trunk/reactos/lib/drivers/sound/shared/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/shared/C… ============================================================================== --- trunk/reactos/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -8,4 +8,4 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(audio time.c) -add_dependencies(audio bugcodes) +add_dependencies(audio bugcodes xdk) Modified: trunk/reactos/lib/drivers/sound/soundblaster/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/soundbla… ============================================================================== --- trunk/reactos/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -14,4 +14,4 @@ add_library(soundblaster ${SOURCE}) add_pch(soundblaster precomp.h) -add_dependencies(soundblaster bugcodes) +add_dependencies(soundblaster bugcodes xdk) Modified: trunk/reactos/lib/drivers/sound/uartmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/uartmidi… ============================================================================== --- trunk/reactos/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -8,4 +8,4 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(uartmidi midiuart.c) -add_dependencies(uartmidi bugcodes) +add_dependencies(uartmidi bugcodes xdk) Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/CMa… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -27,5 +27,5 @@ target_link_libraries(basesrv ${PSEH_LIB}) add_importlibs(basesrv csrsrv ntdll) add_pch(basesrv basesrv.h SOURCE) -add_dependencies(basesrv bugcodes) +add_dependencies(basesrv bugcodes xdk) add_cd_file(TARGET basesrv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -31,5 +31,5 @@ add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} advapi32) add_importlibs(winsrv ${CONSRV_IMPORT_LIBS} ${USERSRV_IMPORT_LIBS} csrsrv gdi32 user32 kernel32 ntdll) -add_dependencies(winsrv bugcodes) +add_dependencies(winsrv bugcodes xdk) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Mon Sep 7 10:05:42 2015 @@ -84,7 +84,7 @@ set_module_type(kmtest_drv kernelmodedriver) target_link_libraries(kmtest_drv kmtest_printf chkstk ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) -add_dependencies(kmtest_drv bugcodes) +add_dependencies(kmtest_drv bugcodes xdk) add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(kmtest_drv include/kmt_test.h) add_cd_file(TARGET kmtest_drv DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 69085: [CMAKE] Add hpp in the new style build.
by akhaldi＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: akhaldi Date: Mon Sep 7 10:00:51 2015 New Revision: 69085 URL: http://svn.reactos.org/svn/reactos?rev=69085&view=rev Log: [CMAKE] Add hpp in the new style build. Modified: trunk/reactos/cmake/host-tools.cmake Modified: trunk/reactos/cmake/host-tools.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/host-tools.cmake?rev… ============================================================================== --- trunk/reactos/cmake/host-tools.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/host-tools.cmake [iso-8859-1] Mon Sep 7 10:00:51 2015 @@ -6,7 +6,7 @@ string(TOUPPER ${CMAKE_BUILD_TYPE} _build_type) # List of host tools -list(APPEND host_tools_list bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le) +list(APPEND host_tools_list bin2c hpp widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le) if(NOT MSVC) list(APPEND host_tools_list rsym) endif()

1 0

[tfaber] 69084: [BOOTLIB] - Add missing xdk dependency
by tfaber＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: tfaber Date: Mon Sep 7 09:50:00 2015 New Revision: 69084 URL: http://svn.reactos.org/svn/reactos?rev=69084&view=rev Log: [BOOTLIB] - Add missing xdk dependency Modified: trunk/reactos/boot/environ/CMakeLists.txt Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Mon Sep 7 09:50:00 2015 @@ -47,7 +47,7 @@ add_asm_files(bootlib_asm ${BOOTLIB_ASM_SOURCE}) add_library(bootlib ${BOOTLIB_SOURCE} ${bootlib_asm}) add_pch(bootlib app/bootmgr/bootmgr.h BOOTLIB_SOURCE) -add_dependencies(bootlib bugcodes) +add_dependencies(bootlib bugcodes xdk) list(APPEND BOOTMGR_BASE_SOURCE app/bootmgr/efiemu.c

1 0

[tfaber] 69083: [XDK][DDK][PSDK] - Generate XDK headers during build. To make changes to wdm.h, ntddk.h, ntifs.h, devioctl.h, ntdef.h or winnt.h, edit the appropriate files in include/xdk (as you s...
by tfaber＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: tfaber Date: Mon Sep 7 09:46:43 2015 New Revision: 69083 URL: http://svn.reactos.org/svn/reactos?rev=69083&view=rev Log: [XDK][DDK][PSDK] - Generate XDK headers during build. To make changes to wdm.h, ntddk.h, ntifs.h, devioctl.h, ntdef.h or winnt.h, edit the appropriate files in include/xdk (as you should already have been doing for a long time). CORE-9586 #resolve Added: trunk/reactos/include/xdk/CMakeLists.txt (with props) Removed: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/devioctl.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/generate.bat Modified: trunk/reactos/CMakeLists.txt trunk/reactos/include/asm/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=69083&r… Modified: trunk/reactos/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/CMakeLists.txt… Removed: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=69… Removed: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=69… Removed: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=69082 Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… Removed: trunk/reactos/include/psdk/devioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/devioctl.h?re… Removed: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=6… Removed: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… Added: trunk/reactos/include/xdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/CMakeLists.txt… Removed: trunk/reactos/include/xdk/generate.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/generate.bat?r…

1 0

[tfaber] 69082: [ACPI] - Reinstate the HPET hack, the VMware builders show that it's still needed. Reverts r69066.
by tfaber＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: tfaber Date: Mon Sep 7 09:08:48 2015 New Revision: 69082 URL: http://svn.reactos.org/svn/reactos?rev=69082&view=rev Log: [ACPI] - Reinstate the HPET hack, the VMware builders show that it's still needed. Reverts r69066. Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Mon Sep 7 09:08:48 2015 @@ -1192,6 +1192,14 @@ snprintf(device->pnp.bus_id, sizeof(device->pnp.bus_id), "%s", bus_id); buffer.Pointer = NULL; + /* HACK: Skip HPET */ + if (strstr(device->pnp.bus_id, "HPET")) + { + DPRINT("Using HPET hack\n"); + result = -1; + goto end; + } + break; }

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