Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 56081: [CMAKE] * unify spec2def and add_importlib_target * use module name instead of spec file name for deciding importlib target name
by jgardou＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: jgardou Date: Wed Mar 7 21:21:27 2012 New Revision: 56081 URL: http://svn.reactos.org/svn/reactos?rev=56081&view=rev Log: [CMAKE] * unify spec2def and add_importlib_target * use module name instead of spec file name for deciding importlib target name Modified: trunk/reactos/base/shell/explorer/notifyhook/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/cpl/odbccp32/CMakeLists.txt trunk/reactos/dll/directx/dinput/CMakeLists.txt trunk/reactos/dll/directx/dinput8/CMakeLists.txt trunk/reactos/dll/directx/dplay/CMakeLists.txt trunk/reactos/dll/directx/dplayx/CMakeLists.txt trunk/reactos/dll/directx/dsound/CMakeLists.txt trunk/reactos/dll/directx/ksuser/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/win32/acledit/CMakeLists.txt trunk/reactos/dll/win32/aclui/CMakeLists.txt trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/atl/CMakeLists.txt trunk/reactos/dll/win32/avicap32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/batt/CMakeLists.txt trunk/reactos/dll/win32/beepmidi/CMakeLists.txt trunk/reactos/dll/win32/cabinet/CMakeLists.txt trunk/reactos/dll/win32/cards/CMakeLists.txt trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comdlg32/CMakeLists.txt trunk/reactos/dll/win32/compstui/CMakeLists.txt trunk/reactos/dll/win32/credui/CMakeLists.txt trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/cryptnet/CMakeLists.txt trunk/reactos/dll/win32/cryptui/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/dll/win32/dhcpcsvc/CMakeLists.txt trunk/reactos/dll/win32/dnsapi/CMakeLists.txt trunk/reactos/dll/win32/fmifs/CMakeLists.txt trunk/reactos/dll/win32/gdi32/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/getuname/CMakeLists.txt trunk/reactos/dll/win32/glu32/CMakeLists.txt trunk/reactos/dll/win32/hlink/CMakeLists.txt trunk/reactos/dll/win32/icmp/CMakeLists.txt trunk/reactos/dll/win32/imagehlp/CMakeLists.txt trunk/reactos/dll/win32/imm32/CMakeLists.txt trunk/reactos/dll/win32/inetcomm/CMakeLists.txt trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/loadperf/CMakeLists.txt trunk/reactos/dll/win32/localui/CMakeLists.txt trunk/reactos/dll/win32/lpk/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lz32/CMakeLists.txt trunk/reactos/dll/win32/mlang/CMakeLists.txt trunk/reactos/dll/win32/mpr/CMakeLists.txt trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msimg32/CMakeLists.txt trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/msvcrt/CMakeLists.txt trunk/reactos/dll/win32/msvfw32/CMakeLists.txt trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/newdev/CMakeLists.txt trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt trunk/reactos/dll/win32/odbccp32/CMakeLists.txt trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/dll/win32/oleacc/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/oledlg/CMakeLists.txt trunk/reactos/dll/win32/opengl32/CMakeLists.txt trunk/reactos/dll/win32/pdh/CMakeLists.txt trunk/reactos/dll/win32/powrprof/CMakeLists.txt trunk/reactos/dll/win32/psapi/CMakeLists.txt trunk/reactos/dll/win32/rasapi32/CMakeLists.txt trunk/reactos/dll/win32/riched20/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/rsaenh/CMakeLists.txt trunk/reactos/dll/win32/samlib/CMakeLists.txt trunk/reactos/dll/win32/secur32/CMakeLists.txt trunk/reactos/dll/win32/sensapi/CMakeLists.txt trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/sfc_os/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/smdll/CMakeLists.txt trunk/reactos/dll/win32/snmpapi/CMakeLists.txt trunk/reactos/dll/win32/spoolss/CMakeLists.txt trunk/reactos/dll/win32/ufatx/CMakeLists.txt trunk/reactos/dll/win32/urlmon/CMakeLists.txt trunk/reactos/dll/win32/user32/CMakeLists.txt trunk/reactos/dll/win32/userenv/CMakeLists.txt trunk/reactos/dll/win32/usp10/CMakeLists.txt trunk/reactos/dll/win32/uxtheme/CMakeLists.txt trunk/reactos/dll/win32/version/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/winhttp/CMakeLists.txt trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/dll/win32/winspool/CMakeLists.txt trunk/reactos/dll/win32/wintrust/CMakeLists.txt trunk/reactos/dll/win32/wlanapi/CMakeLists.txt trunk/reactos/dll/win32/wldap32/CMakeLists.txt trunk/reactos/dll/win32/ws2_32/CMakeLists.txt trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt trunk/reactos/dll/win32/ws2help/CMakeLists.txt trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt trunk/reactos/dll/win32/xmllite/CMakeLists.txt trunk/reactos/drivers/base/bootvid/CMakeLists.txt trunk/reactos/drivers/base/kdcom/CMakeLists.txt trunk/reactos/drivers/base/kddll/CMakeLists.txt trunk/reactos/drivers/battery/battc/CMakeLists.txt trunk/reactos/drivers/directx/dxgthk/CMakeLists.txt trunk/reactos/drivers/hid/hidclass/CMakeLists.txt trunk/reactos/drivers/hid/hidparse/CMakeLists.txt trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt trunk/reactos/drivers/network/ndis/CMakeLists.txt trunk/reactos/drivers/storage/class/class2/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt trunk/reactos/drivers/storage/scsiport/CMakeLists.txt trunk/reactos/drivers/usb/usbd/CMakeLists.txt trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt trunk/reactos/drivers/video/videoprt/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt trunk/reactos/drivers/wmi/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/subsystems/csr/csrsrv/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/notify… Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56081&… Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56081… Modified: trunk/reactos/dll/cpl/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/CMakeList… Modified: trunk/reactos/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/CMakeLi… Modified: trunk/reactos/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/CMakeL… Modified: trunk/reactos/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/CMakeLis… Modified: trunk/reactos/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/CMakeLi… Modified: trunk/reactos/dll/directx/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/CMakeLi… Modified: trunk/reactos/dll/directx/ksuser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/CMakeLi… Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… Modified: trunk/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Modified: trunk/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… Modified: trunk/reactos/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/CMakeLis… Modified: trunk/reactos/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/CMakeLists… Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… Modified: trunk/reactos/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/CMakeLi… Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… Modified: trunk/reactos/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/CMakeLists.… Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/CMakeLi… Modified: trunk/reactos/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/CMakeLis… Modified: trunk/reactos/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/CMakeLists… Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… Modified: trunk/reactos/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/CMakeLi… Modified: trunk/reactos/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/CMakeList… Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/CMakeLi… Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis… Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeList… Modified: trunk/reactos/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/CMakeLi… Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/CMakeList… Modified: trunk/reactos/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/CMakeLists… Modified: trunk/reactos/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/CMakeLists… Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… Modified: trunk/reactos/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/CMakeLi… Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists… Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/CMakeLists… Modified: trunk/reactos/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/CMakeLists.… Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/CMakeLi… Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/CMakeLists… Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/CMakeLi… Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Modified: trunk/reactos/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/CMakeLi… Modified: trunk/reactos/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/CMakeLis… Modified: trunk/reactos/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/CMakeLists.t… Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… Modified: trunk/reactos/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/CMakeLists.… Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists… Modified: trunk/reactos/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/CMakeLists.t… Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLis… Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/CMakeLis… Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/CMakeLis… Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… Modified: trunk/reactos/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/CMakeList… Modified: trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/CMakeLis… Modified: trunk/reactos/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/CMakeLi… Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/CMakeList… Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… Modified: trunk/reactos/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/CMakeList… Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/CMakeLi… Modified: trunk/reactos/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/CMakeLists.t… Modified: trunk/reactos/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/CMakeLi… Modified: trunk/reactos/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/CMakeLists… Modified: trunk/reactos/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/CMakeLi… Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/CMakeLi… Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList… Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/CMakeList… Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis… Modified: trunk/reactos/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/CMakeLis… Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… Modified: trunk/reactos/dll/win32/sfc_os/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/CMakeList… Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… Modified: trunk/reactos/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/CMakeLists… Modified: trunk/reactos/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/CMakeLis… Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/CMakeLis… Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeList… Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… Modified: trunk/reactos/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/CMakeLis… Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/CMakeLists… Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/CMakeLis… Modified: trunk/reactos/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/CMakeLis… Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… Modified: trunk/reactos/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/CMakeLis… Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… Modified: trunk/reactos/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/CMakeLi… Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… Modified: trunk/reactos/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/CMakeLis… Modified: trunk/reactos/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/CMakeList… Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/CMake… Modified: trunk/reactos/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/CMakeLis… Modified: trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/CMakeL… Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/CMakeLis… Modified: trunk/reactos/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/CMake… Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/CMakeLi… Modified: trunk/reactos/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/CMakeLi… Modified: trunk/reactos/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/CMak… Modified: trunk/reactos/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxgthk/CMa… Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake… Modified: trunk/reactos/drivers/hid/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/CMake… Modified: trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/CMakeL… Modified: trunk/reactos/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/CMake… Modified: trunk/reactos/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… Modified: trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… Modified: trunk/reactos/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/C… Modified: trunk/reactos/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/CMakeList… Modified: trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/CM… Modified: trunk/reactos/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/CMa… Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk… Modified: trunk/reactos/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/CMakeLists.txt… Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… Modified: trunk/reactos/subsystems/csr/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/CMak… Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM…

1 0

[pschweitzer] 56080: [HALX86] Fix halx86 release build
by pschweitzer＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: pschweitzer Date: Wed Mar 7 21:19:30 2012 New Revision: 56080 URL: http://svn.reactos.org/svn/reactos?rev=56080&view=rev Log: [HALX86] Fix halx86 release build Modified: trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Wed Mar 7 21:19:30 2012 @@ -22,9 +22,17 @@ #endif #ifdef CONFIG_SMP +#ifdef DBG #define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0) #else +#define HAL_BUILD_TYPE 0 +#endif +#else +#ifdef DBG #define HAL_BUILD_TYPE ((DBG ? PRCB_BUILD_DEBUG : 0) | PRCB_BUILD_UNIPROCESSOR) +#else +#define HAL_BUILD_TYPE 0 | PRCB_BUILD_UNIPROCESSOR +#endif #endif typedef struct _HAL_BIOS_FRAME

1 0

[pschweitzer] 56079: [WIN32CSR] Fix win32csr release build
by pschweitzer＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: pschweitzer Date: Wed Mar 7 21:18:59 2012 New Revision: 56079 URL: http://svn.reactos.org/svn/reactos?rev=56079&view=rev Log: [WIN32CSR] Fix win32csr release build Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Wed Mar 7 21:18:59 2012 @@ -506,7 +506,9 @@ IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message) { +#ifdef DBG PCSR_PROCESS ProcessData = ThreadData->Process; +#endif ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING TextU, CaptionU;

1 0

[pschweitzer] 56078: [WIN32K] Fix win32k release build
by pschweitzer＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: pschweitzer Date: Wed Mar 7 21:18:30 2012 New Revision: 56078 URL: http://svn.reactos.org/svn/reactos?rev=56078&view=rev Log: [WIN32K] Fix win32k release build Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Wed Mar 7 21:18:30 2012 @@ -151,11 +151,11 @@ #else #define DBG_GET_PPI - #define DBG_DEFAULT_CHANNEL(x) () + #define DBG_DEFAULT_CHANNEL(x) - #define DBG_ENABLE_CHANNEL(ppi,ch,level) () - #define DBG_DISABLE_CHANNEL(ppi,ch,level) () - #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) () + #define DBG_ENABLE_CHANNEL(ppi,ch,level) + #define DBG_DISABLE_CHANNEL(ppi,ch,level) + #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) #define DBG_PRINT(ppi,ch,level) @@ -174,7 +174,8 @@ #define WARN_PPI(ppi,ch,fmt, ...) #define TRACE_PPI(ppi,ch,fmt, ...) - #define UNIMPLEMENTED + #define STUB + #endif #define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Wed Mar 7 21:18:30 2012 @@ -30,6 +30,7 @@ extern UCHAR Win32kSSPT[]; extern ULONG Win32kNumberOfSysCalls; +#ifdef DBG void NTAPI DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments) @@ -46,6 +47,7 @@ ulResult = UserDbgPostServiceHook(ulSyscallId, ulResult); return ulResult; } +#endif NTSTATUS APIENTRY @@ -564,8 +566,10 @@ PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); /* Register service hook callbacks */ +#ifdef DBG KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0); KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0); +#endif /* Create the global USER heap */ GlobalUserHeap = UserCreateHeap(&GlobalUserHeapSection, Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Wed Mar 7 21:18:30 2012 @@ -8,6 +8,7 @@ /** INCLUDES ******************************************************************/ +#ifdef DBG #include <win32k.h> #define NDEBUG #include <debug.h> @@ -728,4 +729,6 @@ return ret; } +#endif + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Mar 7 21:18:30 2012 @@ -1309,9 +1309,11 @@ } } +#ifdef DBG //#ifdef GDI_DEBUG DbgGdiHTIntegrityCheck(); //#endif +#endif ppi = PsGetCurrentProcessWin32Process(); DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId);

1 0

[pschweitzer] 56077: [DDK] Fix release build?
by pschweitzer＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: pschweitzer Date: Wed Mar 7 19:46:16 2012 New Revision: 56077 URL: http://svn.reactos.org/svn/reactos?rev=56077&view=rev Log: [DDK] Fix release build? Modified: trunk/reactos/include/ddk/wdm.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5607… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed Mar 7 19:46:16 2012 @@ -128,6 +128,16 @@ #define ALLOC_DATA_PRAGMA 1 #endif +/* Add NOP_FUNCTION support */ +#ifndef NOP_FUNCTION && (_MSC_VER >= 1210) +#define NOP_FUNCTION __noop +#else +#define NOP_FUNCTION (void)0 +#endif +#else +#ifndef NOP_FUNCTION +#define NOP_FUNCTION (void)0 +#endif #endif #if defined(_WIN64)

1 0

[rharabien] 56076: [FREELDR] - Try to fix release build
by rharabien＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: rharabien Date: Wed Mar 7 13:47:38 2012 New Revision: 56076 URL: http://svn.reactos.org/svn/reactos?rev=56076&view=rev Log: [FREELDR] - Try to fix release build Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Wed Mar 7 13:47:38 2012 @@ -254,92 +254,6 @@ DbgPrint("\n"); } } - -#else - -ULONG -DbgPrint(PCCH Format, ...) -{ - return 0; -} - -#endif // DBG - -ULONG -MsgBoxPrint(const char *Format, ...) -{ - va_list ap; - CHAR Buffer[512]; - ULONG Length; - - va_start(ap, Format); - - /* Construct a string */ - Length = _vsnprintf(Buffer, 512, Format, ap); - - /* Check if we went past the buffer */ - if (Length == MAXULONG) - { - /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; - - /* Put maximum */ - Length = sizeof(Buffer); - } - - /* Show it as a message box */ - UiMessageBox(Buffer); - - /* Cleanup and exit */ - va_end(ap); - return 0; -} - -//DECLSPEC_NORETURN -VOID -NTAPI -KeBugCheckEx( - IN ULONG BugCheckCode, - IN ULONG_PTR BugCheckParameter1, - IN ULONG_PTR BugCheckParameter2, - IN ULONG_PTR BugCheckParameter3, - IN ULONG_PTR BugCheckParameter4) -{ - char Buffer[70]; - sprintf(Buffer, "*** STOP: 0x%08lX (0x%08lX, 0x%08lX, 0x%08lX, 0x%08lX)", - BugCheckCode, BugCheckParameter1, BugCheckParameter2, - BugCheckParameter3, BugCheckParameter4); - UiMessageBoxCritical(Buffer); - assert(FALSE); - for (;;); -} - -VOID -NTAPI -RtlAssert(IN PVOID FailedAssertion, - IN PVOID FileName, - IN ULONG LineNumber, - IN PCHAR Message OPTIONAL) -{ - if (Message) - { - DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", - (PCHAR)FailedAssertion, - (PCHAR)FileName, - LineNumber, - Message); - } - else - { - DbgPrint("Assertion \'%s\' failed at %s line %d\n", - (PCHAR)FailedAssertion, - (PCHAR)FileName, - LineNumber); - } - - DbgBreakPoint(); -} - static BOOLEAN DbgAddDebugChannel( CHAR* channel, CHAR* level, CHAR op) @@ -398,7 +312,7 @@ return TRUE; } -BOOLEAN +VOID DbgParseDebugChannels(PCHAR Value) { CHAR *str, *separator, *c, op; @@ -425,8 +339,90 @@ } str = separator + 1; - }while(separator != NULL); - - return TRUE; -} - + } while(separator != NULL); +} + +#else + +ULONG +DbgPrint(PCCH Format, ...) +{ + return 0; +} + +#endif // DBG + +ULONG +MsgBoxPrint(const char *Format, ...) +{ + va_list ap; + CHAR Buffer[512]; + ULONG Length; + + va_start(ap, Format); + + /* Construct a string */ + Length = _vsnprintf(Buffer, 512, Format, ap); + + /* Check if we went past the buffer */ + if (Length == MAXULONG) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + /* Show it as a message box */ + UiMessageBox(Buffer); + + /* Cleanup and exit */ + va_end(ap); + return 0; +} + +//DECLSPEC_NORETURN +VOID +NTAPI +KeBugCheckEx( + IN ULONG BugCheckCode, + IN ULONG_PTR BugCheckParameter1, + IN ULONG_PTR BugCheckParameter2, + IN ULONG_PTR BugCheckParameter3, + IN ULONG_PTR BugCheckParameter4) +{ + char Buffer[70]; + sprintf(Buffer, "*** STOP: 0x%08lX (0x%08lX, 0x%08lX, 0x%08lX, 0x%08lX)", + BugCheckCode, BugCheckParameter1, BugCheckParameter2, + BugCheckParameter3, BugCheckParameter4); + UiMessageBoxCritical(Buffer); + assert(FALSE); + for (;;); +} + +VOID +NTAPI +RtlAssert(IN PVOID FailedAssertion, + IN PVOID FileName, + IN ULONG LineNumber, + IN PCHAR Message OPTIONAL) +{ + if (Message) + { + DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", + (PCHAR)FailedAssertion, + (PCHAR)FileName, + LineNumber, + Message); + } + else + { + DbgPrint("Assertion \'%s\' failed at %s line %d\n", + (PCHAR)FailedAssertion, + (PCHAR)FileName, + LineNumber); + } + + DbgBreakPoint(); +} Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Wed Mar 7 13:47:38 2012 @@ -38,14 +38,13 @@ #define DPRINT_HEAP 15 // messages in a bottle #define DBG_CHANNELS_COUNT 16 -BOOLEAN DbgParseDebugChannels(PCHAR Value); - #if DBG && !defined(_M_ARM) VOID DebugInit(VOID); ULONG DbgPrint(const char *Format, ...); VOID DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); + VOID DbgParseDebugChannels(PCHAR Value); #define ERR_LEVEL 0x1 #define FIXME_LEVEL 0x2 @@ -117,6 +116,7 @@ #define DebugInit() #define BugCheck(fmt, ...) #define DbgDumpBuffer(mask, buf, len) + #define DbgParseDebugChannels(val) #endif // DBG

1 0

[pschweitzer] 56073: [NTOSKRNL] Fix wrong sizeof usage with performance counters
by pschweitzer＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: pschweitzer Date: Wed Mar 7 07:38:31 2012 New Revision: 56073 URL: http://svn.reactos.org/svn/reactos?rev=56073&view=rev Log: [NTOSKRNL] Fix wrong sizeof usage with performance counters Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Wed Mar 7 07:38:31 2012 @@ -2170,7 +2170,7 @@ // Update performance counters // InterlockedIncrement((PLONG)&PoolDesc->RunningDeAllocs); - InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, -BlockSize * sizeof(POOL_BLOCK_SIZE)); + InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, -BlockSize * POOL_BLOCK_SIZE); // // Acquire the pool lock

1 0

[rharabien] 56072: [WIN32K] - When using output rect clipping results in input rect, scale them to input rect size. Fixes gdiplus:graphics winetest crash.
by rharabien＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: rharabien Date: Wed Mar 7 00:24:14 2012 New Revision: 56072 URL: http://svn.reactos.org/svn/reactos?rev=56072&view=rev Log: [WIN32K] - When using output rect clipping results in input rect, scale them to input rect size. Fixes gdiplus:graphics winetest crash. Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Wed Mar 7 00:24:14 2012 @@ -51,19 +51,11 @@ /* Validate output */ OutputRect = *DestRect; - if (OutputRect.right < OutputRect.left) - { - OutputRect.left = DestRect->right; - OutputRect.right = DestRect->left; - } - if (OutputRect.bottom < OutputRect.top) - { - OutputRect.left = DestRect->right; - OutputRect.right = DestRect->left; - } + RECTL_vMakeWellOrdered(&OutputRect); /* Validate input */ InputRect = *SourceRect; + RECTL_vMakeWellOrdered(&InputRect); if ( (InputRect.top < 0) || (InputRect.bottom < 0) || (InputRect.left < 0) || (InputRect.right < 0) || InputRect.right > psoSource->sizlBitmap.cx || @@ -124,6 +116,8 @@ OutputRect.right += Translate.x; OutputRect.top += Translate.y; OutputRect.bottom += Translate.y; + + ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); Ret = FALSE; ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity; @@ -141,10 +135,14 @@ ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; - Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; - Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; - Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; + /* take into acount clipping results when calculating new input rect (scaled to input rect size) */ + Rect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); + Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); + Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); + Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); + ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); + + /* Aplha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj); } @@ -166,10 +164,14 @@ ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { - Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; - Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; - Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; - Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; + /* take into acount clipping results when calculating new input rect (scaled to input rect size) */ + Rect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); + Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); + Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); + Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); + ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); + + /* Alpha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj) && Ret; }

1 0

[cgutman] 56071: [NTOSKRNL] - Hack IopDeleteDriver to workaround the boot driver unloading bugs I mailed ros-dev about - Should fix KVM testbot
by cgutman＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: cgutman Date: Wed Mar 7 00:14:13 2012 New Revision: 56071 URL: http://svn.reactos.org/svn/reactos?rev=56071&view=rev Log: [NTOSKRNL] - Hack IopDeleteDriver to workaround the boot driver unloading bugs I mailed ros-dev about - Should fix KVM testbot Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Mar 7 00:14:13 2012 @@ -73,12 +73,16 @@ DriverExtension = NextDriverExtension; } +#if 0 /* Check if the driver image is still loaded */ if (DriverObject->DriverSection) { /* Unload it */ MmUnloadSystemImage(DriverObject->DriverSection); } +#else + DPRINT1("HACK: Not unloading the driver image due to critical bugs!\n"); +#endif /* Check if it has a name */ if (DriverObject->DriverName.Buffer)

1 0

[cgutman] 56070: [NTOSKRNL] - Don't zero a page again that is already zeroed
by cgutman＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: cgutman Date: Wed Mar 7 00:01:51 2012 New Revision: 56070 URL: http://svn.reactos.org/svn/reactos?rev=56070&view=rev Log: [NTOSKRNL] - Don't zero a page again that is already zeroed Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed Mar 7 00:01:51 2012 @@ -327,6 +327,7 @@ { /* System wants a zero page, obtain one */ PageFrameNumber = MiRemoveZeroPage(Color); + NeedZero = FALSE; } /* Initialize it */

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