Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[dquintana] 63503: Sync with trunk r63502.

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri May 30 17:56:10 2014 New Revision: 63503 URL: http://svn.reactos.org/svn/reactos?rev=63503&view=rev Log: Sync with trunk r63502. Added: branches/shell-experiments/base/applications/network/net/cmdAccounts.c - copied unchanged from r63502, trunk/reactos/base/applications/network/net/cmdAccounts.c branches/shell-experiments/include/asm/ksarm.template.h - copied unchanged from r63502, trunk/reactos/include/asm/ksarm.template.h branches/shell-experiments/include/asm/kxarm.h - copied unchanged from r63502, trunk/reactos/include/asm/kxarm.h branches/shell-experiments/lib/sdk/crt/string/winesup.c - copied unchanged from r63502, trunk/reactos/lib/sdk/crt/string/winesup.c branches/shell-experiments/lib/sdk/crt/string/winesup.h - copied unchanged from r63502, trunk/reactos/lib/sdk/crt/string/winesup.h branches/shell-experiments/media/fonts/OpenSans-Bold.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-Bold.ttf branches/shell-experiments/media/fonts/OpenSans-BoldItalic.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-BoldItalic.ttf branches/shell-experiments/media/fonts/OpenSans-CondBold.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-CondBold.ttf branches/shell-experiments/media/fonts/OpenSans-CondLight.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-CondLight.ttf branches/shell-experiments/media/fonts/OpenSans-CondLightItalic.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-CondLightItalic.ttf branches/shell-experiments/media/fonts/OpenSans-ExtraBold.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-ExtraBold.ttf branches/shell-experiments/media/fonts/OpenSans-ExtraBoldItalic.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-ExtraBoldItalic.ttf branches/shell-experiments/media/fonts/OpenSans-Italic.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-Italic.ttf branches/shell-experiments/media/fonts/OpenSans-Light.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-Light.ttf branches/shell-experiments/media/fonts/OpenSans-LightItalic.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-LightItalic.ttf branches/shell-experiments/media/fonts/OpenSans-Regular.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-Regular.ttf branches/shell-experiments/media/fonts/OpenSans-Semibold.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-Semibold.ttf branches/shell-experiments/media/fonts/OpenSans-SemiboldItalic.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/OpenSans-SemiboldItalic.ttf branches/shell-experiments/media/fonts/Ubuntu-B.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-B.ttf branches/shell-experiments/media/fonts/Ubuntu-BI.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-BI.ttf branches/shell-experiments/media/fonts/Ubuntu-C.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-C.ttf branches/shell-experiments/media/fonts/Ubuntu-L.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-L.ttf branches/shell-experiments/media/fonts/Ubuntu-LI.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-LI.ttf branches/shell-experiments/media/fonts/Ubuntu-M.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-M.ttf branches/shell-experiments/media/fonts/Ubuntu-MI.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-MI.ttf branches/shell-experiments/media/fonts/Ubuntu-R.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-R.ttf branches/shell-experiments/media/fonts/Ubuntu-RI.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/Ubuntu-RI.ttf branches/shell-experiments/media/fonts/UbuntuMono-B.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/UbuntuMono-B.ttf branches/shell-experiments/media/fonts/UbuntuMono-BI.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/UbuntuMono-BI.ttf branches/shell-experiments/media/fonts/UbuntuMono-R.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/UbuntuMono-R.ttf branches/shell-experiments/media/fonts/UbuntuMono-RI.ttf - copied unchanged from r63502, trunk/reactos/media/fonts/UbuntuMono-RI.ttf branches/shell-experiments/media/fonts/doc/OpenSans/ - copied from r63502, trunk/reactos/media/fonts/doc/OpenSans/ branches/shell-experiments/media/fonts/doc/Ubuntu/ - copied from r63502, trunk/reactos/media/fonts/doc/Ubuntu/ Removed: branches/shell-experiments/ntoskrnl/include/internal/arm/ksarm.h branches/shell-experiments/ntoskrnl/include/internal/arm/kxarm.h branches/shell-experiments/win32ss/gdi/ntgdi/patblt.c Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/cmdutils/help/help.c branches/shell-experiments/base/applications/mscutils/servman/precomp.h branches/shell-experiments/base/applications/mscutils/servman/propsheet_depends.c branches/shell-experiments/base/applications/mscutils/servman/query.c branches/shell-experiments/base/applications/mscutils/servman/stop_dependencies.c branches/shell-experiments/base/applications/mstsc/connectdialog.c branches/shell-experiments/base/applications/network/net/CMakeLists.txt branches/shell-experiments/base/applications/network/net/main.c branches/shell-experiments/base/applications/network/net/net.h branches/shell-experiments/base/applications/shutdown/shutdown.c branches/shell-experiments/base/services/tcpsvcs/discard.c branches/shell-experiments/base/services/tcpsvcs/echo.c branches/shell-experiments/base/services/tcpsvcs/skelserver.c branches/shell-experiments/base/services/tcpsvcs/tcpsvcs.c branches/shell-experiments/base/services/tcpsvcs/tcpsvcs.h branches/shell-experiments/base/setup/setup/setup.c branches/shell-experiments/base/system/userinit/CMakeLists.txt branches/shell-experiments/base/system/userinit/userinit.c branches/shell-experiments/boot/bootdata/CMakeLists.txt branches/shell-experiments/boot/bootdata/hivecls.inf branches/shell-experiments/boot/bootdata/hivedef.inf (contents, props changed) branches/shell-experiments/boot/bootdata/hivesft.inf (contents, props changed) branches/shell-experiments/boot/bootdata/hivesys.inf branches/shell-experiments/cmake/CMakeMacros.cmake branches/shell-experiments/cmake/msvc.cmake branches/shell-experiments/dll/cpl/appwiz/createlink.c branches/shell-experiments/dll/ntdll/def/ntdll.spec branches/shell-experiments/dll/win32/advapi32/misc/logon.c branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/kernel32/client/file/copy.c branches/shell-experiments/dll/win32/lsasrv/authpackage.c branches/shell-experiments/dll/win32/msgina/lsa.c branches/shell-experiments/dll/win32/msvcrt/msvcrt.spec branches/shell-experiments/dll/win32/powrprof/powrprof.c branches/shell-experiments/dll/win32/setupapi/CMakeLists.txt branches/shell-experiments/dll/win32/setupapi/dirid.c branches/shell-experiments/dll/win32/setupapi/setupapi_private.h branches/shell-experiments/include/asm/CMakeLists.txt branches/shell-experiments/include/asm/genincdata.c branches/shell-experiments/include/crt/conio.h branches/shell-experiments/include/crt/crtdefs.h branches/shell-experiments/include/crt/msc/intrin.h branches/shell-experiments/include/ndk/arm/ketypes.h branches/shell-experiments/include/psdk/basetsd.h branches/shell-experiments/include/psdk/ntdef.h branches/shell-experiments/include/psdk/ras.h branches/shell-experiments/include/psdk/wingdi.h branches/shell-experiments/include/psdk/winnls.h branches/shell-experiments/include/psdk/winnt.h branches/shell-experiments/include/reactos/arm/armddk.h branches/shell-experiments/include/reactos/idl/ms-dtyp.idl branches/shell-experiments/include/reactos/libs/fast486/fast486.h branches/shell-experiments/include/reactos/msvctarget.h branches/shell-experiments/lib/3rdparty/stlport/src/stdio_streambuf.cpp branches/shell-experiments/lib/atl/statreg.h branches/shell-experiments/lib/fast486/common.c branches/shell-experiments/lib/fast486/common.h branches/shell-experiments/lib/fast486/common.inl branches/shell-experiments/lib/fast486/opcodes.c branches/shell-experiments/lib/fast486/opgroups.c branches/shell-experiments/lib/pseh/CMakeLists.txt branches/shell-experiments/lib/rtl/bitmap.c branches/shell-experiments/lib/sdk/crt/crt.cmake branches/shell-experiments/lib/sdk/crt/include/internal/locale.h branches/shell-experiments/lib/sdk/crt/libcntpr.cmake branches/shell-experiments/lib/sdk/crt/string/scanf.c branches/shell-experiments/lib/sdk/crt/string/scanf.h branches/shell-experiments/media/doc/3rd Party Files.txt branches/shell-experiments/media/fonts/CMakeLists.txt branches/shell-experiments/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI branches/shell-experiments/ntoskrnl/config/cmapi.c branches/shell-experiments/ntoskrnl/config/cminit.c branches/shell-experiments/ntoskrnl/config/cmvalue.c branches/shell-experiments/ntoskrnl/config/ntapi.c branches/shell-experiments/ntoskrnl/include/internal/cm.h branches/shell-experiments/ntoskrnl/lpc/complete.c branches/shell-experiments/ntoskrnl/lpc/create.c branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.h branches/shell-experiments/toolchain-msvc.cmake branches/shell-experiments/tools/geninc/geninc.c branches/shell-experiments/tools/spec2def/spec2def.c branches/shell-experiments/win32ss/gdi/gdi32/misc/gdientry.c branches/shell-experiments/win32ss/gdi/ntgdi/bitblt.c branches/shell-experiments/win32ss/include/ntuser.h branches/shell-experiments/win32ss/user/ntuser/desktop.h branches/shell-experiments/win32ss/user/ntuser/menu.c branches/shell-experiments/win32ss/user/ntuser/menu.h branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/ntuser/winpos.c branches/shell-experiments/win32ss/user/ntuser/winsta.c branches/shell-experiments/win32ss/user/ntuser/winsta.h branches/shell-experiments/win32ss/user/user32/lang/bg-BG.rc branches/shell-experiments/win32ss/user/user32/lang/cs-CZ.rc branches/shell-experiments/win32ss/user/user32/lang/da-DK.rc branches/shell-experiments/win32ss/user/user32/lang/de-DE.rc branches/shell-experiments/win32ss/user/user32/lang/el-GR.rc branches/shell-experiments/win32ss/user/user32/lang/en-US.rc branches/shell-experiments/win32ss/user/user32/lang/es-ES.rc branches/shell-experiments/win32ss/user/user32/lang/fr-FR.rc branches/shell-experiments/win32ss/user/user32/lang/he-IL.rc branches/shell-experiments/win32ss/user/user32/lang/hu-HU.rc branches/shell-experiments/win32ss/user/user32/lang/id-ID.rc branches/shell-experiments/win32ss/user/user32/lang/it-IT.rc branches/shell-experiments/win32ss/user/user32/lang/ja-JP.rc branches/shell-experiments/win32ss/user/user32/lang/lt-LT.rc branches/shell-experiments/win32ss/user/user32/lang/nl-NL.rc branches/shell-experiments/win32ss/user/user32/lang/no-NO.rc branches/shell-experiments/win32ss/user/user32/lang/pl-PL.rc branches/shell-experiments/win32ss/user/user32/lang/pt-BR.rc branches/shell-experiments/win32ss/user/user32/lang/ro-RO.rc branches/shell-experiments/win32ss/user/user32/lang/ru-RU.rc branches/shell-experiments/win32ss/user/user32/lang/sk-SK.rc branches/shell-experiments/win32ss/user/user32/lang/sv-SE.rc branches/shell-experiments/win32ss/user/user32/lang/tr-TR.rc branches/shell-experiments/win32ss/user/user32/lang/uk-UA.rc branches/shell-experiments/win32ss/user/user32/lang/zh-CN.rc branches/shell-experiments/win32ss/user/user32/windows/menu.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/stop_dependencies.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/services/tcpsvcs/discard.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/services… Modified: branches/shell-experiments/base/services/tcpsvcs/echo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/services… Modified: branches/shell-experiments/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/services… Modified: branches/shell-experiments/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/services… Modified: branches/shell-experiments/base/services/tcpsvcs/tcpsvcs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/services… Modified: branches/shell-experiments/base/setup/setup/setup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/se… Modified: branches/shell-experiments/base/system/userinit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/u… Modified: branches/shell-experiments/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/u… Modified: branches/shell-experiments/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/CMakeMa… Modified: branches/shell-experiments/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/msvc.cm… Modified: branches/shell-experiments/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/appwi… Modified: branches/shell-experiments/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/def… Modified: branches/shell-experiments/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/lsa… Modified: branches/shell-experiments/dll/win32/msgina/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/pow… Modified: branches/shell-experiments/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/set… Modified: branches/shell-experiments/dll/win32/setupapi/dirid.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/set… Modified: branches/shell-experiments/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/set… Modified: branches/shell-experiments/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/asm/C… Modified: branches/shell-experiments/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/asm/g… Modified: branches/shell-experiments/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/crt/c… Modified: branches/shell-experiments/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/crt/c… Modified: branches/shell-experiments/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/crt/m… Modified: branches/shell-experiments/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/a… Modified: branches/shell-experiments/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/ras.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/idl/ms-dtyp.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/msvctarget.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/lib/3rdparty/stlport/src/stdio_streambuf.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/atl/statreg.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/atl/statr… Modified: branches/shell-experiments/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/pseh/CMak… Modified: branches/shell-experiments/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/bitma… Modified: branches/shell-experiments/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/c… Modified: branches/shell-experiments/lib/sdk/crt/include/internal/locale.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/i… Modified: branches/shell-experiments/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/l… Modified: branches/shell-experiments/lib/sdk/crt/string/scanf.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/doc/3rd… Modified: branches/shell-experiments/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/fonts/C… Modified: branches/shell-experiments/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/themes/… Modified: branches/shell-experiments/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Removed: branches/shell-experiments/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Removed: branches/shell-experiments/ntoskrnl/include/internal/arm/kxarm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/lpc/complete.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/lpc/… Modified: branches/shell-experiments/ntoskrnl/lpc/create.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/lpc/… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/toolchain-msv… Modified: branches/shell-experiments/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/geninc/… Modified: branches/shell-experiments/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/spec2de… Modified: branches/shell-experiments/win32ss/gdi/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Removed: branches/shell-experiments/win32ss/gdi/ntgdi/patblt.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/inclu… Modified: branches/shell-experiments/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/winsta.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

10 years, 6 months

[jimtabor] 63502: [Win32k] - Fix removing menus and submenus. Dedicated to David Quintana and the New Explorer and Shell team.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri May 30 12:38:04 2014 New Revision: 63502 URL: http://svn.reactos.org/svn/reactos?rev=63502&view=rev Log: [Win32k] - Fix removing menus and submenus. Dedicated to David Quintana and the New Explorer and Shell team. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Fri May 30 12:38:04 2014 @@ -305,6 +305,9 @@ /* Menu Item fType. */ #define MFT_RTOL 0x6000 + +/* Menu Item fState. */ +#define MFS_HBMMENUBMP 0x20000000 typedef struct tagITEM { Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Fri May 30 12:38:04 2014 @@ -178,15 +178,7 @@ BOOL IntDestroyMenu( PMENU pMenu, BOOL bRecurse, BOOL RemoveFromProcess) { - /* DestroyMenu should not destroy system menu popup owner */ - if ((pMenu->fFlags & (MNF_POPUP | MNF_SYSSUBMENU)) == MNF_POPUP && pMenu->hWnd) - { - //PWND pWnd = ValidateHwndNoErr(pMenu->hWnd); - ERR("FIXME Pop up menu window thing'ie\n"); - - //co_UserDestroyWindow( pWnd ); - //pMenu->hWnd = 0; - } + PMENU SubMenu; if (pMenu->rgItems) /* recursively destroy submenus */ { @@ -194,33 +186,46 @@ ITEM *item = pMenu->rgItems; for (i = pMenu->cItems; i > 0; i--, item++) { - pMenu->cItems--; //// I hate recursion logic! (jt) 4/2014. See r63028 comment for IntDeleteMenuItems. + SubMenu = item->spSubMenu; + item->spSubMenu = NULL; + + /* Remove Item Text */ FreeMenuText(pMenu,item); - if (bRecurse && item->spSubMenu)//VerifyMenu(item->spSubMenu)) + + /* Remove Item Bitmap and set it for this process */ + if (item->hbmp && !(item->fState & MFS_HBMMENUBMP)) { - IntDestroyMenu(item->spSubMenu, bRecurse, RemoveFromProcess); - item->spSubMenu = NULL; + GreSetObjectOwner(item->hbmp, GDI_OBJ_HMGR_POWNED); + item->hbmp = NULL; + } + + /* Remove Item submenu */ + if (bRecurse && SubMenu)//VerifyMenu(SubMenu)) + { + /* Release submenu since it was referenced when inserted */ + IntReleaseMenuObject(SubMenu); + IntDestroyMenuObject(SubMenu, bRecurse, RemoveFromProcess); } } + /* Free the Item */ DesktopHeapFree(pMenu->head.rpdesk, pMenu->rgItems ); pMenu->rgItems = NULL; - pMenu->cItems = 0; //// What ever~! + pMenu->cItems = 0; } return TRUE; } BOOL FASTCALL -IntDestroyMenuObject(PMENU Menu, - BOOL bRecurse, BOOL RemoveFromProcess) +IntDestroyMenuObject(PMENU Menu, BOOL bRecurse, BOOL RemoveFromProcess) { if(Menu) { PWND Window; - + /* Remove all menu items */ IntDestroyMenu( Menu, bRecurse, RemoveFromProcess); - if(RemoveFromProcess) + if (RemoveFromProcess) { RemoveEntryList(&Menu->ListEntry); } @@ -234,9 +239,17 @@ if (Window) { Window->IDMenu = 0; + + /* DestroyMenu should not destroy system menu popup owner */ + if ((Menu->fFlags & (MNF_POPUP | MNF_SYSSUBMENU)) == MNF_POPUP) + { + // Should we check it to see if it has Class? + ERR("FIXME Pop up menu window thing'ie\n"); + //co_UserDestroyWindow( Window ); + //Menu->hWnd = 0; + } } } - //UserDereferenceObject(Menu); ret = UserDeleteObject(Menu->head.h, TYPE_MENU); if (!ret) { // Make sure it is really dead or just marked for deletion. @@ -338,7 +351,7 @@ BOOL FASTCALL IntRemoveMenuItem( PMENU pMenu, UINT nPos, UINT wFlags, BOOL bRecurse ) { - PITEM item, NewItems; + PITEM item; TRACE("(menu=%p pos=%04x flags=%04x)\n",pMenu, nPos, wFlags); if (!(item = MENU_FindItem( &pMenu, &nPos, wFlags ))) return FALSE; @@ -364,10 +377,7 @@ item++; nPos++; } - NewItems = DesktopHeapAlloc(pMenu->head.rpdesk, pMenu->cItems * sizeof(ITEM)); - RtlCopyMemory(NewItems, pMenu->rgItems, pMenu->cItems * sizeof(ITEM)); - DesktopHeapFree(pMenu->head.rpdesk, pMenu->rgItems); - pMenu->rgItems = NewItems; + pMenu->rgItems = DesktopHeapReAlloc(pMenu->head.rpdesk, pMenu->rgItems, pMenu->cItems * sizeof(ITEM)); } return TRUE; } @@ -819,6 +829,10 @@ if(lpmii->fMask & MIIM_BITMAP) { MenuItem->hbmp = lpmii->hbmpItem; + if (MenuItem->hbmp <= HBMMENU_POPUP_MINIMIZE && MenuItem->hbmp >= HBMMENU_CALLBACK) + MenuItem->fState |= MFS_HBMMENUBMP; + else + MenuItem->fState &= ~MFS_HBMMENUBMP; } if(lpmii->fMask & MIIM_CHECKMARKS) { @@ -858,6 +872,7 @@ ERR("Pop Up Menu Double Trouble!\n"); SubMenuObject = IntCreateMenu(&hMenu, FALSE); // It will be marked. if (!SubMenuObject) return FALSE; + IntReleaseMenuObject(SubMenuObject); // This will be referenced again after insertion. circref = TRUE; } if ( MENU_depth( SubMenuObject, 0) > MAXMENUDEPTH )

10 years, 6 months

[tkreuzer] 63501: [ASM] - Fix geninc and spec2def to support the MS ARM assembler - Add an MSVC compatible version of kxarm.h - autogenerate ksarm.h with geninc.c - Move some ARM definitions to NDK

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri May 30 00:30:38 2014 New Revision: 63501 URL: http://svn.reactos.org/svn/reactos?rev=63501&view=rev Log: [ASM] - Fix geninc and spec2def to support the MS ARM assembler - Add an MSVC compatible version of kxarm.h - autogenerate ksarm.h with geninc.c - Move some ARM definitions to NDK Added: trunk/reactos/include/asm/ksarm.template.h (with props) trunk/reactos/include/asm/kxarm.h - copied, changed from r63497, trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h Removed: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h Modified: trunk/reactos/include/asm/CMakeLists.txt trunk/reactos/include/asm/genincdata.c trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/tools/geninc/geninc.c trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/CMakeLists.txt… ============================================================================== --- trunk/reactos/include/asm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/asm/CMakeLists.txt [iso-8859-1] Fri May 30 00:30:38 2014 @@ -11,17 +11,19 @@ endif() if(ARCH STREQUAL "i386") - set(_filename ks386) + set(_filename ks386.inc) elseif(ARCH STREQUAL "amd64") - set(_filename ksamd64) + set(_filename ksamd64.inc) +elseif(ARCH STREQUAL "arm") + set(_filename ksarm.h) endif() get_target_property(genincdata_dll genincdata LOCATION) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc - COMMAND native-geninc ${genincdata_dll} ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc ${OPT_MS} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_filename} + COMMAND native-geninc ${genincdata_dll} ${CMAKE_CURRENT_BINARY_DIR}/${_filename} ${OPT_MS} DEPENDS genincdata native-geninc) add_custom_target(asm - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_filename}.inc) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_filename}) Modified: trunk/reactos/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/genincdata.c?r… ============================================================================== --- trunk/reactos/include/asm/genincdata.c [iso-8859-1] (original) +++ trunk/reactos/include/asm/genincdata.c [iso-8859-1] Fri May 30 00:30:38 2014 @@ -74,15 +74,18 @@ ASMGENDATA Table[] = { - +#if defined (_M_IX86) || defined (M_AMD64) /* PORTABLE CONSTANTS ********************************************************/ #include "ksx.template.h" +#endif /* ARCHITECTURE SPECIFIC CONTSTANTS ******************************************/ #ifdef _M_IX86 #include "ks386.template.h" #elif defined(_M_AMD64) #include "ksamd64.template.h" +#elif defined(_M_ARM) +#include "ksarm.template.h" #endif /* End of list */ Added: trunk/reactos/include/asm/ksarm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ksarm.template… ============================================================================== --- trunk/reactos/include/asm/ksarm.template.h (added) +++ trunk/reactos/include/asm/ksarm.template.h [iso-8859-1] Fri May 30 00:30:38 2014 @@ -0,0 +1,105 @@ + +RAW(""), +RAW("#include <kxarm.h>"), +RAW(""), + +HEADER("CPSR Values"), +CONSTANT(CPSR_THUMB_ENABLE), +CONSTANT(CPSR_FIQ_DISABLE), +CONSTANT(CPSR_IRQ_DISABLE), +CONSTANT(CPSR_USER_MODE), +CONSTANT(CPSR_FIQ_MODE), +CONSTANT(CPSR_IRQ_MODE), +CONSTANT(CPSR_SVC_MODE), +CONSTANT(CPSR_ABORT_MODE), +CONSTANT(CPSR_UND_MODE), +CONSTANT(CPSR_MODES), + +HEADER("C1 Register Values"), +CONSTANT(C1_MMU_CONTROL), +CONSTANT(C1_ALIGNMENT_CONTROL), +CONSTANT(C1_DCACHE_CONTROL), +CONSTANT(C1_ICACHE_CONTROL), +CONSTANT(C1_VECTOR_CONTROL), + +HEADER("Loader Parameter Block Offsets"), +OFFSET(LpbKernelStack, LOADER_PARAMETER_BLOCK, KernelStack), +OFFSET(LpbPanicStack, LOADER_PARAMETER_BLOCK, u.Arm.PanicStack), +OFFSET(LpbInterruptStack, LOADER_PARAMETER_BLOCK, u.Arm.InterruptStack), + +HEADER("Trap Frame offsets"), +OFFSET(TrDbgArgMark, KTRAP_FRAME, DbgArgMark), +OFFSET(TrR0, KTRAP_FRAME, R0), +OFFSET(TrR1, KTRAP_FRAME, R1), +OFFSET(TrR2, KTRAP_FRAME, R2), +OFFSET(TrR3, KTRAP_FRAME, R3), +OFFSET(TrR4, KTRAP_FRAME, R4), +OFFSET(TrR5, KTRAP_FRAME, R5), +OFFSET(TrR6, KTRAP_FRAME, R6), +OFFSET(TrR7, KTRAP_FRAME, R7), +OFFSET(TrR8, KTRAP_FRAME, R8), +OFFSET(TrR9, KTRAP_FRAME, R9), +OFFSET(TrR10, KTRAP_FRAME, R10), +OFFSET(TrR11, KTRAP_FRAME, R11), +OFFSET(TrR12, KTRAP_FRAME, R12), +OFFSET(TrUserSp, KTRAP_FRAME, UserSp), +OFFSET(TrUserLr, KTRAP_FRAME, UserLr), +OFFSET(TrSvcSp, KTRAP_FRAME, SvcSp), +OFFSET(TrSvcLr, KTRAP_FRAME, SvcLr), +OFFSET(TrPc, KTRAP_FRAME, Pc), +OFFSET(TrSpsr, KTRAP_FRAME, Spsr), +SIZE(TrapFrameLength, KTRAP_FRAME), + +HEADER("Exception Frame offsets"), +OFFSET(ExR4, KEXCEPTION_FRAME, R4), +OFFSET(ExR5, KEXCEPTION_FRAME, R5), +OFFSET(ExR6, KEXCEPTION_FRAME, R6), +OFFSET(ExR7, KEXCEPTION_FRAME, R7), +OFFSET(ExR8, KEXCEPTION_FRAME, R8), +OFFSET(ExR9, KEXCEPTION_FRAME, R9), +OFFSET(ExR10, KEXCEPTION_FRAME, R10), +OFFSET(ExR11, KEXCEPTION_FRAME, R11), +OFFSET(ExLr, KEXCEPTION_FRAME, Lr), +OFFSET(ExSpsr, KEXCEPTION_FRAME, Psr), // name? +SIZE(ExceptionFrameLength, KEXCEPTION_FRAME), + +HEADER("PCR"), +CONSTANTX(KiPcr, 0xFFFFF000), + +HEADER("PCR Offsets"), +//OFFSET(PcCurrentIrql, KPCR, CurrentIrql), + +HEADER("KTHREAD Offsets"), +OFFSET(ThKernelStack, KTHREAD, KernelStack), + +HEADER("CONTEXT Offsets"), +OFFSET(CsContextFlags, CONTEXT, ContextFlags), +OFFSET(CsR0, CONTEXT, R0), +OFFSET(CsR1, CONTEXT, R1), +OFFSET(CsR2, CONTEXT, R2), +OFFSET(CsR3, CONTEXT, R3), +OFFSET(CsR4, CONTEXT, R4), +OFFSET(CsR5, CONTEXT, R5), +OFFSET(CsR6, CONTEXT, R6), +OFFSET(CsR7, CONTEXT, R7), +OFFSET(CsR8, CONTEXT, R8), +OFFSET(CsR9, CONTEXT, R9), +OFFSET(CsR10, CONTEXT, R10), +OFFSET(CsR11, CONTEXT, R11), +OFFSET(CsR12, CONTEXT, R12), +OFFSET(CsSp, CONTEXT, Sp), +OFFSET(CsLr, CONTEXT, Lr), +OFFSET(CsPc, CONTEXT, Pc), +OFFSET(CsPsr, CONTEXT, Psr), + +CONSTANT(CONTEXT_FULL), + +HEADER("DebugService Control Types"), +CONSTANT(BREAKPOINT_BREAK), +CONSTANT(BREAKPOINT_PRINT), +CONSTANT(BREAKPOINT_PROMPT), +CONSTANT(BREAKPOINT_LOAD_SYMBOLS), +CONSTANT(BREAKPOINT_UNLOAD_SYMBOLS), +CONSTANT(BREAKPOINT_COMMAND_STRING), + + Propchange: trunk/reactos/include/asm/ksarm.template.h ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/include/asm/kxarm.h (from r63497, trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/kxarm.h?p2=tru… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/kxarm.h [iso-8859-1] Fri May 30 00:30:38 2014 @@ -1,3 +1,81 @@ + + +#ifdef _MSC_VER + + /* Globals */ + GBLS AreaName + GBLS FuncName + GBLS PrologName + GBLS FuncEndName +AreaName SETS "|.text|" + + MACRO + TEXTAREA + AREA |.text|,ALIGN=2,CODE,READONLY +AreaName SETS "|.text|" + MEND + + MACRO + NESTED_ENTRY $Name +FuncName SETS "$Name" +PrologName SETS "$Name":CC:"_Prolog" +FuncEndName SETS "$Name":CC:"_end" + AREA |.pdata|,ALIGN=2,PDATA + ALIGN 2 + EXPORT $FuncName [FUNC] +$FuncName + ROUT + MEND + + MACRO + PROLOG_END +$PrologName + MEND + + MACRO + ENTRY_END $Name +$FuncEndName + MEND + + MACRO + LEAF_ENTRY $Name +FuncName SETS "$Name" +PrologName SETS "Invalid Prolog" +FuncEndName SETS "$Name":CC:"_end" + ALIGN 2 + EXPORT $FuncName [FUNC] +$FuncName + ROUT + MEND + + MACRO + LEAF_END $Name +$FuncEndName + MEND + + MACRO + TRAP_PROLOG $Abort + fixme + MEND + + MACRO + SYSCALL_PROLOG $Abort + fixme + MEND + + MACRO + TRAP_EPILOG $SystemCall + fixme + MEND + +#else + +/* Compatibility define */ +#define EQU .equ + +.macro IMPORT Name + /* Ignore */ +.endm .macro TEXTAREA .section .text, "rx" @@ -5,18 +83,21 @@ .endm .macro NESTED_ENTRY Name - .global &Name +FuncName .equ &Name +PrologName .equ &Name&_Prolog +FuncEndName .equ &Name&_end + .global &FuncName .align 2 - .func &Name - &Name: -.endm - -.macro PROLOG_END Name - prolog_&Name: + .func &FuncName + &FuncName: +.endm + +.macro PROLOG_END + \PrologName: .endm .macro ENTRY_END Name - end_&Name: + &FuncEndName: .endfunc .endm @@ -30,57 +111,39 @@ sub lr, lr, #4 .endif - // // Save the bottom 4 registers - // stmdb sp, {r0-r3} - - // + // Save the abort lr, sp, spsr, cpsr - // mov r0, lr mov r1, sp mrs r2, cpsr mrs r3, spsr - - // + // Switch to SVC mode - // bic r2, r2, #CPSR_MODES orr r2, r2, #CPSR_SVC_MODE msr cpsr_c, r2 - - // + // Save the SVC sp before we modify it - // mov r2, sp - - // + // Make space for the trap frame - // sub sp, sp, #TrapFrameLength - - // + // Save abt32 state - // str r0, [sp, #TrPc] str lr, [sp, #TrSvcLr] - str r2, [sp, #TrSvcSp] - - // + str r2, [sp, #TrSvcSp] + // Restore the saved SPSR - // msr spsr_all, r3 - - // + // Restore our 4 registers - // ldmdb r1, {r0-r3} - - // + // Build trap frame // FIXME: Change to stmdb later - // str r0, [sp, #TrR0] str r1, [sp, #TrR1] str r2, [sp, #TrR2] @@ -102,17 +165,13 @@ ldr r0, =0xBADB0D00 str r0, [sp, #TrDbgArgMark] .endm - + .macro SYSCALL_PROLOG - // // Make space for the trap frame - // sub sp, sp, #TrapFrameLength - - // + // Build trap frame // FIXME: Change to stmdb later - // str r0, [sp, #TrR0] str r1, [sp, #TrR1] str r2, [sp, #TrR2] @@ -136,26 +195,20 @@ ldr r0, =0xBADB0D00 str r0, [sp, #TrDbgArgMark] .endm - + .macro TRAP_EPILOG SystemCall - // // ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00) - // ldr r0, [sp, #TrDbgArgMark] ldr r1, =0xBADB0D00 cmp r0, r1 bne 1f - - // + // Get the SPSR and restore it - // ldr r0, [sp, #TrSpsr] msr spsr_all, r0 - - // + // Restore the registers // FIXME: Use LDMIA later - // mov r0, sp add r0, r0, #TrUserSp ldm r0, {sp, lr}^ @@ -172,10 +225,8 @@ ldr r10, [sp, #TrR10] ldr r11, [sp, #TrR11] ldr r12, [sp, #TrR12] - - // + // Restore program execution state - // .if \SystemCall ldr lr, [sp, #TrPc] add sp, sp, #TrapFrameLength @@ -187,3 +238,7 @@ 1: b . .endm + +#endif + + Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Fri May 30 00:30:38 2014 @@ -26,6 +26,29 @@ // // Dependencies // + +// +// CPSR Values +// +#define CPSR_THUMB_ENABLE 0x20 +#define CPSR_FIQ_DISABLE 0x40 +#define CPSR_IRQ_DISABLE 0x80 +#define CPSR_USER_MODE 0x10 +#define CPSR_FIQ_MODE 0x11 +#define CPSR_IRQ_MODE 0x12 +#define CPSR_SVC_MODE 0x13 +#define CPSR_ABORT_MODE 0x17 +#define CPSR_UND_MODE 0x1B +#define CPSR_MODES 0x1F + +// +// C1 Register Values +// +#define C1_MMU_CONTROL 0x01 +#define C1_ALIGNMENT_CONTROL 0x02 +#define C1_DCACHE_CONTROL 0x04 +#define C1_ICACHE_CONTROL 0x1000 +#define C1_VECTOR_CONTROL 0x2000 // // IPI Types Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Fri May 30 00:30:38 2014 @@ -228,6 +228,7 @@ #define RESULT_NEGATIVE 1 #define RESULT_POSITIVE 2 +#if 0 DECLSPEC_IMPORT VOID __fastcall @@ -240,6 +241,7 @@ __fastcall KfAcquireSpinLock( IN OUT ULONG_PTR* SpinLock); +#endif #ifndef _WINNT_ // Removed: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h (removed) @@ -1,146 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/include/internal/arm/ksarm.h - * PURPOSE: Definitions and offsets for ARM Assembly and C code - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -#ifdef _ASM_ - -/* - * CPSR Values - */ -.equ CPSR_THUMB_ENABLE, 0x20 -.equ CPSR_FIQ_DISABLE, 0x40 -.equ CPSR_IRQ_DISABLE, 0x80 -.equ CPSR_USER_MODE, 0x10 -.equ CPSR_FIQ_MODE, 0x11 -.equ CPSR_IRQ_MODE, 0x12 -.equ CPSR_SVC_MODE, 0x13 -.equ CPSR_ABORT_MODE, 0x17 -.equ CPSR_UND_MODE, 0x1B -.equ CPSR_MODES, 0x1F - - -/* - * C1 Register Values - */ -.equ C1_MMU_CONTROL, 0x01 -.equ C1_ALIGNMENT_CONTROL, 0x02 -.equ C1_DCACHE_CONTROL, 0x04 -.equ C1_ICACHE_CONTROL, 0x1000 -.equ C1_VECTOR_CONTROL, 0x2000 - -/* - * Loader Parameter Block Offsets - */ -.equ LpbKernelStack, 0x18 -.equ LpbPanicStack, 0x74 -.equ LpbInterruptStack, 0x5C - -/* - * Trap Frame offsets - */ -.equ TrDbgArgMark, 0x00 -.equ TrR0, 0x04 -.equ TrR1, 0x08 -.equ TrR2, 0x0C -.equ TrR3, 0x10 -.equ TrR4, 0x14 -.equ TrR5, 0x18 -.equ TrR6, 0x1C -.equ TrR7, 0x20 -.equ TrR8, 0x24 -.equ TrR9, 0x28 -.equ TrR10, 0x2C -.equ TrR11, 0x30 -.equ TrR12, 0x34 -.equ TrUserSp, 0x38 -.equ TrUserLr, 0x3C -.equ TrSvcSp, 0x40 -.equ TrSvcLr, 0x44 -.equ TrPc, 0x48 -.equ TrSpsr, 0x4C -.equ TrapFrameLength, (23 * 0x04) - -/* - * Exception Frame offsets - */ -.equ ExR4, 0x00 -.equ ExR5, 0x04 -.equ ExR6, 0x08 -.equ ExR7, 0x0C -.equ ExR8, 0x10 -.equ ExR9, 0x14 -.equ ExR10, 0x18 -.equ ExR11, 0x1C -.equ ExLr, 0x20 -.equ ExSpsr, 0x24 -.equ ExceptionFrameLength, (10 * 0x04) - -/* - * PCR - */ -.equ KiPcr, 0xFFFFF000 - -/* - * PCR Offsets - */ -.equ PcCurrentIrql, 0x14C - -/* - * KTHREAD Offsets - */ -.equ ThKernelStack, 0x20 - -/* - * CONTEXT Offsets - */ -.equ CONTEXT_FULL, 0x43 -.equ CsContextFlags, 0x00 -.equ CsR0, 0x04 -.equ CsR1, 0x08 -.equ CsR2, 0x0C -.equ CsR3, 0x10 -.equ CsR4, 0x14 -.equ CsR5, 0x18 -.equ CsR6, 0x1C -.equ CsR7, 0x20 -.equ CsR8, 0x24 -.equ CsR9, 0x28 -.equ CsR10, 0x2C -.equ CsR11, 0x30 -.equ CsR12, 0x34 -.equ CsSp, 0x38 -.equ CsLr, 0x3C -.equ CsPc, 0x40 -.equ CsPsr, 0x44 - -/* - * DebugService Control Types - */ -.equ BREAKPOINT_BREAK, 0 -.equ BREAKPOINT_PRINT, 1 -.equ BREAKPOINT_PROMPT, 2 -.equ BREAKPOINT_LOAD_SYMBOLS, 3 -.equ BREAKPOINT_UNLOAD_SYMBOLS, 4 -.equ BREAKPOINT_COMMAND_STRING, 5 - -#else - -/* - * CPSR Values - */ -#define CPSR_THUMB_ENABLE 0x20 -#define CPSR_FIQ_DISABLE 0x40 -#define CPSR_IRQ_DISABLE 0x80 -#define CPSR_USER_MODE 0x10 -#define CPSR_FIQ_MODE 0x11 -#define CPSR_IRQ_MODE 0x12 -#define CPSR_SVC_MODE 0x13 -#define CPSR_ABORT_MODE 0x17 -#define CPSR_UND_MODE 0x1B -#define CPSR_MODES 0x1F - -#endif Removed: trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h (removed) @@ -1,189 +0,0 @@ - -.macro TEXTAREA - .section .text, "rx" - .align 2 -.endm - -.macro NESTED_ENTRY Name - .global &Name - .align 2 - .func &Name - &Name: -.endm - -.macro PROLOG_END Name - prolog_&Name: -.endm - -.macro ENTRY_END Name - end_&Name: - .endfunc -.endm - -.macro TRAP_PROLOG Abort - // - // Fixup lr - // -.if \Abort - sub lr, lr, #8 -.else - sub lr, lr, #4 -.endif - - // - // Save the bottom 4 registers - // - stmdb sp, {r0-r3} - - // - // Save the abort lr, sp, spsr, cpsr - // - mov r0, lr - mov r1, sp - mrs r2, cpsr - mrs r3, spsr - - // - // Switch to SVC mode - // - bic r2, r2, #CPSR_MODES - orr r2, r2, #CPSR_SVC_MODE - msr cpsr_c, r2 - - // - // Save the SVC sp before we modify it - // - mov r2, sp - - // - // Make space for the trap frame - // - sub sp, sp, #TrapFrameLength - - // - // Save abt32 state - // - str r0, [sp, #TrPc] - str lr, [sp, #TrSvcLr] - str r2, [sp, #TrSvcSp] - - // - // Restore the saved SPSR - // - msr spsr_all, r3 - - // - // Restore our 4 registers - // - ldmdb r1, {r0-r3} - - // - // Build trap frame - // FIXME: Change to stmdb later - // - str r0, [sp, #TrR0] - str r1, [sp, #TrR1] - str r2, [sp, #TrR2] - str r3, [sp, #TrR3] - str r4, [sp, #TrR4] - str r5, [sp, #TrR5] - str r6, [sp, #TrR6] - str r7, [sp, #TrR7] - str r8, [sp, #TrR8] - str r9, [sp, #TrR9] - str r10, [sp, #TrR10] - str r11, [sp, #TrR11] - str r12, [sp, #TrR12] - mov r12, sp - add r12, r12, #TrUserSp - stm r12, {sp, lr}^ - mrs r0, spsr_all - str r0, [sp, #TrSpsr] - ldr r0, =0xBADB0D00 - str r0, [sp, #TrDbgArgMark] -.endm - -.macro SYSCALL_PROLOG - // - // Make space for the trap frame - // - sub sp, sp, #TrapFrameLength - - // - // Build trap frame - // FIXME: Change to stmdb later - // - str r0, [sp, #TrR0] - str r1, [sp, #TrR1] - str r2, [sp, #TrR2] - str r3, [sp, #TrR3] - str r4, [sp, #TrR4] - str r5, [sp, #TrR5] - str r6, [sp, #TrR6] - str r7, [sp, #TrR7] - str r8, [sp, #TrR8] - str r9, [sp, #TrR9] - str r10, [sp, #TrR10] - str r11, [sp, #TrR11] - str r12, [sp, #TrR12] - mov r12, sp - add r12, r12, #TrUserSp - stm r12, {sp, lr}^ - str sp, [sp, #TrSvcSp] - str lr, [sp, #TrPc] - mrs r0, spsr_all - str r0, [sp, #TrSpsr] - ldr r0, =0xBADB0D00 - str r0, [sp, #TrDbgArgMark] -.endm - -.macro TRAP_EPILOG SystemCall - // - // ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00) - // - ldr r0, [sp, #TrDbgArgMark] - ldr r1, =0xBADB0D00 - cmp r0, r1 - bne 1f - - // - // Get the SPSR and restore it - // - ldr r0, [sp, #TrSpsr] - msr spsr_all, r0 - - // - // Restore the registers - // FIXME: Use LDMIA later - // - mov r0, sp - add r0, r0, #TrUserSp - ldm r0, {sp, lr}^ - ldr r0, [sp, #TrR0] - ldr r1, [sp, #TrR1] - ldr r2, [sp, #TrR2] - ldr r3, [sp, #TrR3] - ldr r4, [sp, #TrR4] - ldr r5, [sp, #TrR5] - ldr r6, [sp, #TrR6] - ldr r7, [sp, #TrR7] - ldr r8, [sp, #TrR8] - ldr r9, [sp, #TrR9] - ldr r10, [sp, #TrR10] - ldr r11, [sp, #TrR11] - ldr r12, [sp, #TrR12] - - // - // Restore program execution state - // -.if \SystemCall - ldr lr, [sp, #TrPc] - add sp, sp, #TrapFrameLength - movs pc, lr -.else - add sp, sp, #TrSvcSp - ldmia sp, {sp, lr, pc}^ -.endif -1: - b . -.endm Modified: trunk/reactos/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/geninc/geninc.c?rev=… ============================================================================== --- trunk/reactos/tools/geninc/geninc.c [iso-8859-1] (original) +++ trunk/reactos/tools/geninc/geninc.c [iso-8859-1] Fri May 30 00:30:38 2014 @@ -188,7 +188,14 @@ case TYPE_CONSTANT: if (ms_format) { - fprintf(output, "%s equ 0%"PRIx64"h\n", data.Name, data.Value); + if (Machine == IMAGE_FILE_MACHINE_ARMNT) + { + fprintf(output, "%s equ 0x%"PRIx64"\n", data.Name, data.Value); + } + else + { + fprintf(output, "%s equ 0%"PRIx64"h\n", data.Name, data.Value); + } } else { Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Fri May 30 00:30:38 2014 @@ -258,7 +258,13 @@ fprintf(file, "; File generated automatically, do not edit! \n\n"); if (giArch == ARCH_X86) + { fprintf(file, ".586\n.model flat\n"); + } + else if (giArch == ARCH_ARM) + { + fprintf(file, "#include <kxarm.h>\n TEXTAREA\n"); + } fprintf(file, ".code\n"); }

10 years, 6 months

[tkreuzer] 63500: [INCLUDE] - ntdef.h: Add #pragma once, include guiddef.h and kernelspecs.h, slightly cleanup the nameless struct/union stuff, fix PVOID64 definition, fix definition of UNALIGNED o...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri May 30 00:09:55 2014 New Revision: 63500 URL: http://svn.reactos.org/svn/reactos?rev=63500&view=rev Log: [INCLUDE] - ntdef.h: Add #pragma once, include guiddef.h and kernelspecs.h, slightly cleanup the nameless struct/union stuff, fix PVOID64 definition, fix definition of UNALIGNED on ARM, stop checking for too outdated MSVC versions (< 1300), start using ULONG32 instead of ULONG at some places (this is to be able to share the code with winnt.h later), add missing PROBE_ALIGNMENT32, DECLSPEC_NOTHROW, DECLSPEC_UUID, DECLSPEC_NOVTABLE, DECLSPEC_DEPRECATED, DECLSPEC_DEPRECATED_DDK, simpify HANDLE definition. Modified: trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Fri May 30 00:09:55 2014 @@ -20,25 +20,23 @@ #ifndef _NTDEF_ #define _NTDEF_ +#pragma once /* Dependencies */ #include <ctype.h> #include <basetsd.h> +#include <guiddef.h> #include <excpt.h> #include <sdkddkver.h> #include <specstrings.h> +#include <kernelspecs.h> // FIXME: Shouldn't be included! #include <stdarg.h> #include <string.h> -/* Helper macro to enable gcc's extension. */ -#ifndef __GNU_EXTENSION -#ifdef __GNUC__ -#define __GNU_EXTENSION __extension__ -#else -#define __GNU_EXTENSION -#endif +#ifdef __cplusplus +extern "C" { #endif /* Pseudo Modifiers for Input Parameters */ @@ -63,14 +61,9 @@ #define CRITICAL #endif +// FIXME: deprecated #ifndef FAR #define FAR -#endif - - -/* Defines the "size" of an any-size array */ -#ifndef ANYSIZE_ARRAY -#define ANYSIZE_ARRAY 1 #endif /* Constant modifier */ @@ -93,26 +86,22 @@ #endif #endif /* NULL */ - -// -// FIXME -// We should use the -fms-extensions compiler flag for gcc, -// and clean up the mess. -// -#ifndef __ANONYMOUS_DEFINED -#define __ANONYMOUS_DEFINED - -#ifndef NONAMELESSUNION +/* Defines the "size" of an any-size array */ +#ifndef ANYSIZE_ARRAY +#define ANYSIZE_ARRAY 1 +#endif + +/* Helper macro to enable gcc's extension. */ +#ifndef __GNU_EXTENSION #ifdef __GNUC__ -#define _ANONYMOUS_UNION __GNU_EXTENSION -#define _ANONYMOUS_STRUCT __GNU_EXTENSION -#elif defined(__WATCOMC__) || defined(_MSC_VER) -#define _ANONYMOUS_UNION -#define _ANONYMOUS_STRUCT -#endif /* __GNUC__/__WATCOMC__ */ -#endif /* NONAMELESSUNION */ - -#ifndef _ANONYMOUS_UNION +#define __GNU_EXTENSION __extension__ +#else +#define __GNU_EXTENSION +#endif +#endif + +#ifndef DUMMYUNIONNAME +#if defined(NONAMELESSUNION)// || !defined(_MSC_EXTENSIONS) #define _ANONYMOUS_UNION #define _UNION_NAME(x) x #define DUMMYUNIONNAME u @@ -124,7 +113,9 @@ #define DUMMYUNIONNAME6 u6 #define DUMMYUNIONNAME7 u7 #define DUMMYUNIONNAME8 u8 -#else +#define DUMMYUNIONNAME9 u9 +#else +#define _ANONYMOUS_UNION __GNU_EXTENSION #define _UNION_NAME(x) #define DUMMYUNIONNAME #define DUMMYUNIONNAME1 @@ -135,9 +126,12 @@ #define DUMMYUNIONNAME6 #define DUMMYUNIONNAME7 #define DUMMYUNIONNAME8 -#endif - -#ifndef _ANONYMOUS_STRUCT +#define DUMMYUNIONNAME9 +#endif /* NONAMELESSUNION */ +#endif /* !DUMMYUNIONNAME */ + +#ifndef DUMMYSTRUCTNAME +#if defined(NONAMELESSUNION)// || !defined(_MSC_EXTENSIONS) #define _ANONYMOUS_STRUCT #define _STRUCT_NAME(x) x #define DUMMYSTRUCTNAME s @@ -147,6 +141,7 @@ #define DUMMYSTRUCTNAME4 s4 #define DUMMYSTRUCTNAME5 s5 #else +#define _ANONYMOUS_STRUCT __GNU_EXTENSION #define _STRUCT_NAME(x) #define DUMMYSTRUCTNAME #define DUMMYSTRUCTNAME1 @@ -154,11 +149,14 @@ #define DUMMYSTRUCTNAME3 #define DUMMYSTRUCTNAME4 #define DUMMYSTRUCTNAME5 -#endif - -#endif /* __ANONYMOUS_DEFINED */ - -#if defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_PPC) || defined(_M_IA64) || defined(_M_AMD64) +#endif /* NONAMELESSUNION */ +#endif /* DUMMYSTRUCTNAME */ + +#if defined(STRICT_GS_ENABLED) +#pragma strict_gs_check(push, on) +#endif + +#if defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_PPC) || defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) #define ALIGNMENT_MACHINE #define UNALIGNED __unaligned #if defined(_WIN64) @@ -203,7 +201,7 @@ #endif /* Returns the type's alignment */ -#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#if defined(_MSC_VER) #define TYPE_ALIGNMENT(t) __alignof(t) #else #define TYPE_ALIGNMENT(t) FIELD_OFFSET(struct { char x; t test; }, test) @@ -217,8 +215,14 @@ #error "unknown architecture" #endif +#if defined(_WIN64) +#define PROBE_ALIGNMENT32(_s) TYPE_ALIGNMENT(ULONG) +#endif + /* Calling Conventions */ -#if defined(_M_IX86) +#if defined(_MANAGED) +#define FASTCALL __stdcall +#elif defined(_M_IX86) #define FASTCALL __fastcall #else #define FASTCALL @@ -234,15 +238,23 @@ #define DECLSPEC_NORETURN __declspec(noreturn) #ifndef DECLSPEC_ADDRSAFE -#if (_MSC_VER >= 1200) && (defined(_M_ALPHA) || defined(_M_AXP64)) +#if defined(_MSC_VER) && (defined(_M_ALPHA) || defined(_M_AXP64)) #define DECLSPEC_ADDRSAFE __declspec(address_safe) #else #define DECLSPEC_ADDRSAFE #endif #endif /* DECLSPEC_ADDRSAFE */ +#ifndef DECLSPEC_NOTHROW +#if !defined(MIDL_PASS) +#define DECLSPEC_NOTHROW __declspec(nothrow) +#else +#define DECLSPEC_NOTHROW +#endif +#endif + #ifndef NOP_FUNCTION -#if (_MSC_VER >= 1210) +#if defined(_MSC_VER) #define NOP_FUNCTION __noop #else #define NOP_FUNCTION (void)0 @@ -263,16 +275,12 @@ /* Inlines */ #ifndef FORCEINLINE -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #define FORCEINLINE __forceinline -#elif defined(_MSC_VER) -#define FORCEINLINE __inline -#else /* __GNUC__ */ -# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) -# define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) -# else -# define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) -# endif +#elif ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) +#else +# define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) #endif #endif /* FORCEINLINE */ @@ -294,10 +302,10 @@ /* Use to specify structure alignment */ #ifndef DECLSPEC_ALIGN -#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) +#if defined(_MSC_VER) && !defined(MIDL_PASS) #define DECLSPEC_ALIGN(x) __declspec(align(x)) #elif defined(__GNUC__) -#define DECLSPEC_ALIGN(x) __attribute__ ((__aligned__ (x))) +#define DECLSPEC_ALIGN(x) __attribute__ ((__aligned__(x))) #else #define DECLSPEC_ALIGN(x) #endif @@ -315,12 +323,53 @@ #define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(SYSTEM_CACHE_ALIGNMENT_SIZE) #endif +#ifndef DECLSPEC_UUID +#if defined(_MSC_VER) && defined(__cplusplus) +#define DECLSPEC_UUID(x) __declspec(uuid(x)) +#else +#define DECLSPEC_UUID(x) +#endif +#endif + +#ifndef DECLSPEC_NOVTABLE +#if defined(_MSC_VER) && defined(__cplusplus) +#define DECLSPEC_NOVTABLE __declspec(novtable) +#else +#define DECLSPEC_NOVTABLE +#endif +#endif + #ifndef DECLSPEC_SELECTANY -#if (_MSC_VER >= 1100) || defined(__GNUC__) -#define DECLSPEC_SELECTANY __declspec(selectany) +#if defined(_MSC_VER) || defined(__GNUC__) +#define DECLSPEC_SELECTANY __declspec(selectany) #else #define DECLSPEC_SELECTANY #endif +#endif + +#ifndef DECLSPEC_DEPRECATED +#if (defined(_MSC_VER) || defined(__GNUC__)) && !defined(MIDL_PASS) +#define DECLSPEC_DEPRECATED __declspec(deprecated) +#define DEPRECATE_SUPPORTED +#else +#define DECLSPEC_DEPRECATED +#undef DEPRECATE_SUPPORTED +#endif +#endif + +#ifdef DEPRECATE_DDK_FUNCTIONS +#ifdef _NTDDK_ +#define DECLSPEC_DEPRECATED_DDK DECLSPEC_DEPRECATED +#ifdef DEPRECATE_SUPPORTED +#define PRAGMA_DEPRECATED_DDK 1 +#endif +#else +#define DECLSPEC_DEPRECATED_DDK +#define PRAGMA_DEPRECATED_DDK 1 +#endif +#else +#define DECLSPEC_DEPRECATED_DDK +#define PRAGMA_DEPRECATED_DDK 0 #endif /* Use to silence unused variable warnings when it is intentional */ @@ -347,18 +396,15 @@ /* Void Pointers */ typedef void *PVOID; -//typedef void * POINTER_64 PVOID64; -typedef PVOID PVOID64; // FIXME! +typedef void * POINTER_64 PVOID64; /* Handle Type */ +typedef void *HANDLE, **PHANDLE;; #ifdef STRICT -typedef void *HANDLE; -#define DECLARE_HANDLE(n) typedef struct n##__{int i;}*n -#else -typedef PVOID HANDLE; +#define DECLARE_HANDLE(n) typedef struct n##__{int unused;} *n +#else #define DECLARE_HANDLE(n) typedef HANDLE n #endif -typedef HANDLE *PHANDLE; /* Upper-Case Versions of Some Standard C Types */ #ifndef VOID @@ -891,4 +937,8 @@ #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 +#ifdef __cplusplus +} // extern "C" +#endif + #endif /* _NTDEF_ */

10 years, 6 months

[tkreuzer] 63499: [INCLUDE] - rewrite msvctarget.h to define all native MSVC architecture macros and do not define x86 sub-architecture numbers, they are deprecated - basetsd.h: Fix header guard, i...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 29 23:43:19 2014 New Revision: 63499 URL: http://svn.reactos.org/svn/reactos?rev=63499&view=rev Log: [INCLUDE] - rewrite msvctarget.h to define all native MSVC architecture macros and do not define x86 sub-architecture numbers, they are deprecated - basetsd.h: Fix header guard, include msvctarget.h instead of adding some custom defines, add missing FIRMWARE_PTR definition, fix POINTER_64 definition Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/ras.h trunk/reactos/include/psdk/winnls.h trunk/reactos/include/reactos/idl/ms-dtyp.idl trunk/reactos/include/reactos/msvctarget.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Thu May 29 23:43:19 2014 @@ -1,5 +1,8 @@ -#ifndef _BASETSD_H -#define _BASETSD_H +#ifndef _BASETSD_H_ +#define _BASETSD_H_ +#pragma once + +#include <msvctarget.h> #ifndef _M_AMD64 #if !defined(__ROS_LONG64__) @@ -23,30 +26,7 @@ #error Not supported. #endif -#if !defined(_X86_) && !defined(_AMD64_) && !defined(_IA64_) && !defined(_ALPHA_) && \ - !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) - -#if defined(_M_AMD64) || defined(__x86_64__) -#define _AMD64_ -#elif defined(_M_IX86) || defined(__i386__) -#define _X86_ -#elif defined(_M_IA64) || defined(__ia64__) -#define _IA64_ -#elif defined(_M_ALPHA) || defined(__alpha__) -#define _ALPHA_ -#elif defined(_M_ARM) || defined(__arm__) -#define _ARM_ -#elif defined(_M_PPC) || defined(__powerpc__) -#define _PPC_ -#elif defined(_M_MRX000) || defined(__mips__) -#define _MIPS_ -#elif defined(_M_M68K) || defined(__68k__) -#define _68K_ -#endif - -#endif - -#if !defined(MIDL_PASS) && !defined(RC_INVOKED) +#if defined(_MSC_VER) && !defined(MIDL_PASS) && !defined(RC_INVOKED) #define POINTER_64 __ptr64 #if defined(_WIN64) #define POINTER_32 __ptr32 @@ -56,12 +36,18 @@ #else #define POINTER_64 #define POINTER_32 -#endif /* !defined(MIDL_PASS) && !defined(RC_INVOKED) */ +#endif /* defined(_MSC_VER) && !defined(MIDL_PASS) && !defined(RC_INVOKED) */ #if defined(_M_MRX000) || defined(_M_AMD64) || defined(_M_IA64) typedef unsigned __int64 POINTER_64_INT; #else typedef unsigned long POINTER_64_INT; +#endif + +#if defined(_IA64_) || defined(_AMD64_) + #define FIRMWARE_PTR +#else + #define FIRMWARE_PTR POINTER_32 #endif #if 0 /* Not supported yet */ @@ -214,4 +200,4 @@ #endif #endif /* !RC_INVOKED */ -#endif /* _BASETSD_H */ +#endif /* _BASETSD_H_ */ Modified: trunk/reactos/include/psdk/ras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ras.h?rev=634… ============================================================================== --- trunk/reactos/include/psdk/ras.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ras.h [iso-8859-1] Thu May 29 23:43:19 2014 @@ -13,7 +13,7 @@ /* TODO include <basetsd.h> from winnt.h so that this typedef is not necessary */ -#ifndef _BASETSD_H +#ifndef _BASETSD_H_ typedef unsigned long ULONG_PTR, *PULONG_PTR; #endif @@ -787,7 +787,7 @@ typedef DWORD (WINAPI *PFNRASSETCOMMSETTINGS) (HANDLE hPort,RASCOMMSETTINGS *pRasCommSettings,PVOID pvReserved); typedef struct tagRASCUSTOMSCRIPTEXTENSIONS { - DWORD dwSize; + DWORD dwSize; PFNRASSETCOMMSETTINGS pfnRasSetCommSettings; } RASCUSTOMSCRIPTEXTENSIONS; #endif /*(WINVER >= 0x501)*/ Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Thu May 29 23:43:19 2014 @@ -473,7 +473,7 @@ #define VS_ALLOW_LATIN 0x1 #define GSS_ALLOW_INHERITED_COMMON 0x1 #endif -#ifndef _BASETSD_H +#ifndef _BASETSD_H_ typedef long LONG_PTR; #endif Modified: trunk/reactos/include/reactos/idl/ms-dtyp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dty… ============================================================================== --- trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Thu May 29 23:43:19 2014 @@ -7,7 +7,7 @@ typedef unsigned char BYTE, *PBYTE, *LPBYTE; typedef unsigned long DWORD, *PDWORD, *LPDWORD; cpp_quote("#endif") -cpp_quote("#ifndef _BASETSD_H") +cpp_quote("#ifndef _BASETSD_H_") typedef unsigned int DWORD32; typedef unsigned __int64 DWORD64; cpp_quote("#endif") @@ -15,13 +15,13 @@ cpp_quote("#ifndef _WINDEF_H") typedef int INT, *LPINT; cpp_quote("#endif") -cpp_quote("#ifndef _BASETSD_H") +cpp_quote("#ifndef _BASETSD_H_") typedef signed char INT8; typedef signed short INT16; typedef signed int INT32; typedef signed __int64 INT64; cpp_quote("#endif") -cpp_quote("#ifndef _BASETSD_H") +cpp_quote("#ifndef _BASETSD_H_") typedef signed int LONG32; typedef signed __int64 LONG64; cpp_quote("#endif") @@ -37,7 +37,7 @@ cpp_quote("#ifndef _WINDEF_H") typedef unsigned int UINT; cpp_quote("#endif") -cpp_quote("#ifndef _BASETSD_H") +cpp_quote("#ifndef _BASETSD_H_") typedef unsigned char UINT8; typedef unsigned short UINT16; typedef unsigned int UINT32; @@ -46,7 +46,7 @@ cpp_quote("#ifndef _WINNT_") typedef unsigned long ULONG, *PULONG; cpp_quote("#endif") -cpp_quote("#ifndef _BASETSD_H") +cpp_quote("#ifndef _BASETSD_H_") typedef unsigned int ULONG32; typedef unsigned __int64 ULONG64; cpp_quote("#endif") @@ -77,7 +77,7 @@ cpp_quote("#ifndef _WINNT_") typedef BYTE BOOLEAN, *PBOOLEAN; cpp_quote("#endif") -cpp_quote("#ifndef _BASETSD_H") +cpp_quote("#ifndef _BASETSD_H_") #ifdef _WIN64 typedef __int64 LONG_PTR; typedef unsigned __int64 ULONG_PTR; Modified: trunk/reactos/include/reactos/msvctarget.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/msvctarget… ============================================================================== --- trunk/reactos/include/reactos/msvctarget.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/msvctarget.h [iso-8859-1] Thu May 29 23:43:19 2014 @@ -1,19 +1,52 @@ -#ifndef _MSC_VER -#ifndef __GNUC__ -#error Unsupported compiler -#endif + +#pragma once /* translate GCC target defines to MS equivalents. */ -#if defined(__i686__) && !defined(_M_IX86) -#define _M_IX86 600 -#undef __i686__ -#elif defined(__i586__) && !defined(_M_IX86) -#define _M_IX86 500 -#undef __i586__ -#elif defined(__i486__) && !defined(_M_IX86) -#define _M_IX86 400 -#undef __i486__ -#elif defined(__i386__) && !defined(_M_IX86) -#define _M_IX86 300 +#if defined(__i386__) + #if !defined(_X86_) + #define _X86_ 1 + #endif + #if !defined(_M_IX86) + #define _M_IX86 1 + #endif +#elif defined(__x86_64__) || defined(__x86_64) + #if !defined(_AMD64_) + #define _AMD64_ 1 + #endif + #if !defined(_M_AMD64) + #define _M_AMD64 1 + #endif + #if !defined(_M_X64) + #define _M_X64 1 + #endif +#elif defined(__arm__) + #if !defined(_ARM_) + #define _ARM_ 1 + #endif + #if !defined(_M_ARM) + #define _M_ARM 1 + #endif +#elif defined(__ia64__) + #if !defined(_IA64_) + #define _IA64_ 1 + #endif + #if !defined(_M_IA64) + #define _M_IA64 1 + #endif +#elif defined(__alpha__) + #if !defined(_ALPHA_) + #define _ALPHA_ 1 + #endif + #if !defined(_M_ALPHA) + #define _M_ALPHA 1 + #endif +#elif defined(__powerpc__) + #if !defined(_PPC_) + #define _PPC_ 1 + #endif + #if !defined(_M_PPC) + #define _M_PPC 1 + #endif +#else +#error Unknown architecture #endif -#endif

10 years, 6 months

[hbelusca] 63498: [USERINIT] - Remove two unuseful imports. - Rewrite StrToColorref to not use shell functions, and increase a bit the size of the szColor buffer in SetUserSysColors to match the ca...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 29 23:20:31 2014 New Revision: 63498 URL: http://svn.reactos.org/svn/reactos?rev=63498&view=rev Log: [USERINIT] - Remove two unuseful imports. - Rewrite StrToColorref to not use shell functions, and increase a bit the size of the szColor buffer in SetUserSysColors to match the capabilities of windows. Modified: trunk/reactos/base/system/userinit/CMakeLists.txt trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/CMake… ============================================================================== --- trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] Thu May 29 23:20:31 2014 @@ -2,5 +2,5 @@ add_executable(userinit userinit.c userinit.rc) target_link_libraries(userinit wine) set_module_type(userinit win32gui UNICODE) -add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(userinit user32 advapi32 shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET userinit DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Thu May 29 23:20:31 2014 @@ -227,7 +227,7 @@ { if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (findData.nFileSizeHigh || findData.nFileSizeLow)) { - memset(&ExecInfo, 0x0, sizeof(SHELLEXECUTEINFOW)); + ZeroMemory(&ExecInfo, sizeof(SHELLEXECUTEINFOW)); ExecInfo.cbSize = sizeof(ExecInfo); wcscpy(&szPath[len+1], findData.cFileName); ExecInfo.lpVerb = L"open"; @@ -430,11 +430,9 @@ TRACE("(%s)\n", debugstr_w(lpszCol)); - rgb[0] = StrToIntW(lpszCol); - lpszCol = StrChrW(lpszCol, L' ') + 1; - rgb[1] = StrToIntW(lpszCol); - lpszCol = StrChrW(lpszCol, L' ') + 1; - rgb[2] = StrToIntW(lpszCol); + rgb[0] = (BYTE)wcstoul(lpszCol, &lpszCol, 10); + rgb[1] = (BYTE)wcstoul(lpszCol, &lpszCol, 10); + rgb[2] = (BYTE)wcstoul(lpszCol, &lpszCol, 10); return RGB(rgb[0], rgb[1], rgb[2]); } @@ -443,7 +441,7 @@ { HKEY hKey; INT i; - WCHAR szColor[20]; + WCHAR szColor[25]; DWORD Type, Size; COLORREF crColor; LONG rc;

10 years, 6 months

[hbelusca] 63497: [PSDK] - Fix the CMYK macro which was totally broken. - Code formatting around RGB macro.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 29 22:37:43 2014 New Revision: 63497 URL: http://svn.reactos.org/svn/reactos?rev=63497&view=rev Log: [PSDK] - Fix the CMYK macro which was totally broken. - Code formatting around RGB macro. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Thu May 29 22:37:43 2014 @@ -2894,11 +2894,17 @@ typedef DWORD (CALLBACK *LPFNDEVCAPS)(LPSTR,LPSTR,UINT,LPSTR,LPDEVMODEA); -#define RGB(r,g,b) ((DWORD)(((BYTE)(r)|((WORD)(g)<<8))|(((DWORD)(BYTE)(b))<<16))) +#define GetRValue(rgb) ((BYTE)(rgb)) +#define GetGValue(rgb) ((BYTE)(((WORD)(rgb)) >> 8)) +#define GetBValue(rgb) ((BYTE)((rgb)>>16)) + +#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16))) +#define PALETTERGB(r,g,b) (0x02000000 | RGB(r,g,b)) +#define PALETTEINDEX(i) ((COLORREF)(0x01000000 | (DWORD)(WORD)(i))) + #define MAKEPOINTS(l) (*((POINTS*)&(l))) -#define MAKEROP4(f,b) (DWORD)((((b)<<8)&0xFF000000)|(f)) -#define PALETTEINDEX(i) ((0x01000000|(COLORREF)(WORD)(i))) -#define PALETTERGB(r,g,b) (0x02000000|RGB(r,g,b)) +#define MAKEROP4(f,b) (DWORD)((((b)<<8)&0xFF000000)|(f)) + int WINAPI AbortDoc(_In_ HDC); BOOL WINAPI AbortPath(_In_ HDC); int WINAPI AddFontResourceA(LPCSTR); @@ -3197,14 +3203,13 @@ BOOL WINAPI GdiTransparentBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ UINT); BOOL WINAPI GdiIsMetaFileDC(HDC); -#define GetCValue(cmyk) ((BYTE)(cmyk)) -#define GetMValue(cmyk) ((BYTE)((cmyk)>> 8)) -#define GetYValue(cmyk) ((BYTE)((cmyk)>>16)) -#define GetKValue(cmyk) ((BYTE)((cmyk)>>24)) -#define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(c)|((WORD)((BYTE)(m))<<8))|(((DWORD)(BYTE)(y))<<16))|(((DWORD)(BYTE)(k))<<24))) -#define GetRValue(c) ((BYTE)(c)) -#define GetGValue(c) ((BYTE)(((WORD)(c))>>8)) -#define GetBValue(c) ((BYTE)((c)>>16)) + +#define GetKValue(cmyk) ((BYTE)(cmyk)) +#define GetYValue(cmyk) ((BYTE)((cmyk)>> 8)) +#define GetMValue(cmyk) ((BYTE)((cmyk)>>16)) +#define GetCValue(cmyk) ((BYTE)((cmyk)>>24)) +#define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24))) + int WINAPI GetArcDirection(_In_ HDC); BOOL WINAPI GetAspectRatioFilterEx(_In_ HDC, _Out_ LPSIZE);

10 years, 6 months

[hbelusca] 63496: [LSASRV] - Just run again the loop if LsarOpenAccount call failed (that also avoids a call to LsarClose on a NULL handle, that is trapped by the kdbg if one enabled "set condition...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 29 21:34:35 2014 New Revision: 63496 URL: http://svn.reactos.org/svn/reactos?rev=63496&view=rev Log: [LSASRV] - Just run again the loop if LsarOpenAccount call failed (that also avoids a call to LsarClose on a NULL handle, that is trapped by the kdbg if one enabled "set condition * first always"). - Free the memory and the opened handles before returning in case of failure of LsapAddPrivilegeToTokenPrivileges. Maybe this cleaning step can be done more elegantly. Eric, can you please review that? It should be good I think. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Thu May 29 21:34:35 2014 @@ -1308,23 +1308,30 @@ TokenInfo1->Groups->Groups[i].Sid, ACCOUNT_VIEW, &AccountHandle); + if (!NT_SUCCESS(Status)) + continue; + + Status = LsarEnumeratePrivilegesAccount(AccountHandle, + &Privileges); if (NT_SUCCESS(Status)) { - Status = LsarEnumeratePrivilegesAccount(AccountHandle, - &Privileges); - if (NT_SUCCESS(Status)) + for (j = 0; j < Privileges->PrivilegeCount; j++) { - for (j = 0; j < Privileges->PrivilegeCount; j++) + Status = LsapAddPrivilegeToTokenPrivileges(&TokenInfo1->Privileges, + &(Privileges->Privilege[j])); + if (!NT_SUCCESS(Status)) { - Status = LsapAddPrivilegeToTokenPrivileges(&TokenInfo1->Privileges, - &(Privileges->Privilege[j])); - if (!NT_SUCCESS(Status)) - return Status; + /* We failed, clean everything and return */ + LsaIFree_LSAPR_PRIVILEGE_SET(Privileges); + LsarClose(&AccountHandle); + LsarClose(&PolicyHandle); + + return Status; } - - LsaIFree_LSAPR_PRIVILEGE_SET(Privileges); - Privileges = NULL; } + + LsaIFree_LSAPR_PRIVILEGE_SET(Privileges); + Privileges = NULL; } LsarClose(&AccountHandle);

10 years, 6 months

[aandrejevic] 63495: [NTOSKRNL] Implement NtSaveKey/NtSaveKeyEx and its backend CmSaveKey. CORE-8259 #resolve #comment Committed in revision r63495.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu May 29 19:44:36 2014 New Revision: 63495 URL: http://svn.reactos.org/svn/reactos?rev=63495&view=rev Log: [NTOSKRNL] Implement NtSaveKey/NtSaveKeyEx and its backend CmSaveKey. CORE-8259 #resolve #comment Committed in revision r63495. Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmvalue.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Thu May 29 19:44:36 2014 @@ -5,6 +5,7 @@ * PURPOSE: Configuration Manager - Internal Registry APIs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl + * Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ /* INCLUDES ******************************************************************/ @@ -2120,3 +2121,227 @@ return SubKeys; } + +HCELL_INDEX +NTAPI +CmpCopyCell(IN PHHIVE SourceHive, + IN HCELL_INDEX SourceCell, + IN PHHIVE DestinationHive, + IN HSTORAGE_TYPE StorageType) +{ + PCELL_DATA SourceData; + PCELL_DATA DestinationData = NULL; + HCELL_INDEX DestinationCell = HCELL_NIL; + LONG DataSize; + PAGED_CODE(); + + /* Get the data and the size of the source cell */ + SourceData = HvGetCell(SourceHive, SourceCell); + DataSize = HvGetCellSize(SourceHive, SourceData); + + /* Allocate a new cell in the destination hive */ + DestinationCell = HvAllocateCell(DestinationHive, + DataSize, + StorageType, + HCELL_NIL); + if (DestinationCell == HCELL_NIL) goto Cleanup; + + /* Get the data of the destination cell */ + DestinationData = HvGetCell(DestinationHive, DestinationCell); + + /* Copy the data from the source cell to the destination cell */ + RtlMoveMemory(DestinationData, SourceData, DataSize); + +Cleanup: + + /* Release the cells */ + if (SourceData) HvReleaseCell(SourceHive, SourceCell); + if (DestinationData) HvReleaseCell(DestinationHive, DestinationCell); + + /* Return the destination cell index */ + return DestinationCell; +} + +static +NTSTATUS +NTAPI +CmpDeepCopyKeyInternal(IN PHHIVE SourceHive, + IN HCELL_INDEX SrcKeyCell, + IN PHHIVE DestinationHive, + IN HCELL_INDEX Parent, + IN HSTORAGE_TYPE StorageType, + OUT PHCELL_INDEX DestKeyCell OPTIONAL) +{ + NTSTATUS Status; + PCM_KEY_NODE SrcNode, DestNode; + HCELL_INDEX NewKeyCell, SubKey, NewSubKey; + ULONG Index, SubKeyCount; + PAGED_CODE(); + + DPRINT("CmpDeepCopyKeyInternal(0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X)\n", + SourceHive, + SrcKeyCell, + DestinationHive, + Parent, + StorageType, + DestKeyCell); + + /* Get the source cell node */ + SrcNode = HvGetCell(SourceHive, SrcKeyCell); + + /* Sanity check */ + ASSERT(SrcNode->Signature == CM_KEY_NODE_SIGNATURE); + + /* Create a simple copy of the source key */ + NewKeyCell = CmpCopyCell(SourceHive, + SrcKeyCell, + DestinationHive, + StorageType); + if (NewKeyCell == HCELL_NIL) + { + /* Not enough storage space */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Get the destination cell node */ + DestNode = HvGetCell(DestinationHive, NewKeyCell); + + /* Set the parent */ + DestNode->Parent = Parent; + + // TODO: These should also be copied! + DestNode->Security = DestNode->Class = HCELL_NIL; + + /* Copy the value list */ + Status = CmpCopyKeyValueList(SourceHive, + &SrcNode->ValueList, + DestinationHive, + &DestNode->ValueList, + StorageType); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Clear the invalid subkey index */ + DestNode->SubKeyCounts[Stable] = DestNode->SubKeyCounts[Volatile] = 0; + DestNode->SubKeyLists[Stable] = DestNode->SubKeyLists[Volatile] = HCELL_NIL; + + /* Calculate the total number of subkeys */ + SubKeyCount = SrcNode->SubKeyCounts[Stable] + SrcNode->SubKeyCounts[Volatile]; + + /* Loop through all the subkeys */ + for (Index = 0; Index < SubKeyCount; Index++) + { + /* Get the subkey */ + SubKey = CmpFindSubKeyByNumber(SourceHive, SrcNode, Index); + ASSERT(SubKey != HCELL_NIL); + + /* Call the function recursively for the subkey */ + Status = CmpDeepCopyKeyInternal(SourceHive, + SubKey, + DestinationHive, + NewKeyCell, + StorageType, + &NewSubKey); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Add the copy of the subkey to the new key */ + if (!CmpAddSubKey(DestinationHive, + NewKeyCell, + NewSubKey)) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + } + + /* Set the cell index if requested and return success */ + if (DestKeyCell) *DestKeyCell = NewKeyCell; + Status = STATUS_SUCCESS; + +Cleanup: + + /* Release the cells */ + if (SrcNode) HvReleaseCell(SourceHive, SrcKeyCell); + if (DestNode) HvReleaseCell(DestinationHive, NewKeyCell); + + return Status; +} + +NTSTATUS +NTAPI +CmpDeepCopyKey(IN PHHIVE SourceHive, + IN HCELL_INDEX SrcKeyCell, + IN PHHIVE DestinationHive, + IN HSTORAGE_TYPE StorageType, + OUT PHCELL_INDEX DestKeyCell OPTIONAL) +{ + /* Call the internal function */ + return CmpDeepCopyKeyInternal(SourceHive, + SrcKeyCell, + DestinationHive, + HCELL_NIL, + StorageType, + DestKeyCell); +} + +NTSTATUS +NTAPI +CmSaveKey(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN HANDLE FileHandle, + IN ULONG Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + PCMHIVE KeyHive = NULL; + PAGED_CODE(); + + DPRINT("CmSaveKey(0x%08X, 0x%08X, %lu)\n", Kcb, FileHandle, Flags); + + /* Lock the registry and KCB */ + CmpLockRegistry(); + CmpAcquireKcbLockShared(Kcb); + + if (Kcb->Delete) + { + /* The source key has been deleted, do nothing */ + Status = STATUS_KEY_DELETED; + goto Cleanup; + } + + /* Create a new hive that will hold the key */ + Status = CmpInitializeHive(&KeyHive, + HINIT_CREATE, + HIVE_VOLATILE, + HFILE_TYPE_PRIMARY, + NULL, + NULL, + NULL, + NULL, + NULL, + 0); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Copy the key recursively into the new hive */ + Status = CmpDeepCopyKey(Kcb->KeyHive, + Kcb->KeyCell, + &KeyHive->Hive, + Stable, + &KeyHive->Hive.BaseBlock->RootCell); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Set the primary handle of the hive */ + KeyHive->FileHandles[HFILE_TYPE_PRIMARY] = FileHandle; + + /* Dump the hive into the file */ + HvWriteHive(&KeyHive->Hive); + +Cleanup: + + /* Free the hive */ + if (KeyHive) CmpDestroyHive(KeyHive); + + /* Release the locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + + return Status; +} Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Thu May 29 19:44:36 2014 @@ -235,6 +235,28 @@ /* Return the hive and success */ *RegistryHive = (PCMHIVE)Hive; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpDestroyHive(IN PCMHIVE CmHive) +{ + /* Remove the hive from the list */ + ExAcquirePushLockExclusive(&CmpHiveListHeadLock); + RemoveEntryList(&CmHive->HiveList); + ExReleasePushLock(&CmpHiveListHeadLock); + + /* Delete the flusher lock */ + ExDeleteResourceLite(CmHive->FlusherLock); + ExFreePoolWithTag(CmHive->FlusherLock, TAG_CM); + + /* Delete the view lock */ + ExFreePoolWithTag(CmHive->ViewLock, TAG_CM); + + /* Free the hive */ + HvFree(&CmHive->Hive); + return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c [iso-8859-1] Thu May 29 19:44:36 2014 @@ -361,3 +361,62 @@ ChildList->Count = Count; return STATUS_SUCCESS; } + +NTSTATUS +NTAPI +CmpCopyKeyValueList(IN PHHIVE SourceHive, + IN PCHILD_LIST SrcValueList, + IN PHHIVE DestinationHive, + IN OUT PCHILD_LIST DestValueList, + IN HSTORAGE_TYPE StorageType) + +{ + NTSTATUS Status = STATUS_SUCCESS; + HCELL_INDEX CellIndex = HCELL_NIL; + ULONG Index; + PCELL_DATA SrcListData = NULL; + PCELL_DATA DestListData = NULL; + + PAGED_CODE(); + + /* Set the count */ + DestValueList->Count = SrcValueList->Count; + + /* Check if the list is empty */ + if (!DestValueList->Count) + { + DestValueList->List = HCELL_NIL; + return STATUS_SUCCESS; + } + + /* Create a simple copy of the list */ + CellIndex = CmpCopyCell(SourceHive, + SrcValueList->List, + DestinationHive, + StorageType); + if (CellIndex == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the source and the destination value list */ + SrcListData = HvGetCell(SourceHive, SrcValueList->List); + DestListData = HvGetCell(DestinationHive, CellIndex); + + /* Copy the actual values */ + for (Index = 0; Index < SrcValueList->Count; Index++) + { + DestListData->u.KeyList[Index] = CmpCopyCell(SourceHive, + SrcListData->u.KeyList[Index], + DestinationHive, + StorageType); + if (DestListData->u.KeyList[Index] == HCELL_NIL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + } + + /* Release the cells */ + if (SrcListData) HvReleaseCell(SourceHive, SrcValueList->List); + if (DestListData) HvReleaseCell(DestinationHive, CellIndex); + + return Status; +} Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Thu May 29 19:44:36 2014 @@ -1148,8 +1148,8 @@ NtSaveKey(IN HANDLE KeyHandle, IN HANDLE FileHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* Call the extended API */ + return NtSaveKeyEx(KeyHandle, FileHandle, REG_STANDARD_FORMAT); } NTSTATUS @@ -1158,8 +1158,43 @@ IN HANDLE FileHandle, IN ULONG Flags) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PCM_KEY_BODY KeyObject; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + + PAGED_CODE(); + + DPRINT("NtSaveKeyEx(0x%08X, 0x%08X, %lu)\n", KeyHandle, FileHandle, Flags); + + /* Verify the flags */ + if ((Flags != REG_STANDARD_FORMAT) + && (Flags != REG_LATEST_FORMAT) + && (Flags != REG_NO_COMPRESSION)) + { + /* Only one of these values can be specified */ + return STATUS_INVALID_PARAMETER; + } + + /* Check for the SeBackupPrivilege */ + if (!SeSinglePrivilegeCheck(SeBackupPrivilege, PreviousMode)) + { + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_READ, + CmpKeyObjectType, + PreviousMode, + (PVOID*)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Call the internal API */ + Status = CmSaveKey(KeyObject->KeyControlBlock, FileHandle, Flags); + + ObDereferenceObject(KeyObject); + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Thu May 29 19:44:36 2014 @@ -786,6 +786,12 @@ IN ULONG CheckFlags ); +NTSTATUS +NTAPI +CmpDestroyHive( + IN PCMHIVE CmHive +); + PSECURITY_DESCRIPTOR NTAPI CmpHiveRootSecurityDescriptor( @@ -1322,6 +1328,16 @@ OUT PHCELL_INDEX CellToRelease ); +NTSTATUS +NTAPI +CmpCopyKeyValueList( + IN PHHIVE SourceHive, + IN PCHILD_LIST SrcValueList, + IN PHHIVE DestinationHive, + IN OUT PCHILD_LIST DestValueList, + IN HSTORAGE_TYPE StorageType +); + // // Boot Routines // @@ -1525,6 +1541,33 @@ CmCountOpenSubKeys( IN PCM_KEY_CONTROL_BLOCK RootKcb, IN BOOLEAN RemoveEmptyCacheEntries +); + +HCELL_INDEX +NTAPI +CmpCopyCell( + IN PHHIVE SourceHive, + IN HCELL_INDEX SourceCell, + IN PHHIVE DestinationHive, + IN HSTORAGE_TYPE StorageType +); + +NTSTATUS +NTAPI +CmpDeepCopyKey( + IN PHHIVE SourceHive, + IN HCELL_INDEX SrcKeyCell, + IN PHHIVE DestinationHive, + IN HSTORAGE_TYPE StorageType, + OUT PHCELL_INDEX DestKeyCell OPTIONAL +); + +NTSTATUS +NTAPI +CmSaveKey( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN HANDLE FileHandle, + IN ULONG Flags ); //

10 years, 6 months

[ekohl] 63494: [ADVAPI32][MSGINA] Fix overflow of TokenSource.SourceName. CORE-8272 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 29 15:19:30 2014 New Revision: 63494 URL: http://svn.reactos.org/svn/reactos?rev=63494&view=rev Log: [ADVAPI32][MSGINA] Fix overflow of TokenSource.SourceName. CORE-8272 #resolve Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/msgina/lsa.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Thu May 29 15:19:30 2014 @@ -463,7 +463,7 @@ SE_GROUP_ENABLED_BY_DEFAULT; /* Set the token source */ - strcpy(TokenSource.SourceName, "LogonUser"); + strncpy(TokenSource.SourceName, "Advapi ", sizeof(TokenSource.SourceName)); AllocateLocallyUniqueId(&TokenSource.SourceIdentifier); Status = LsaLogonUser(LsaHandle, Modified: trunk/reactos/dll/win32/msgina/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lsa.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lsa.c [iso-8859-1] Thu May 29 15:19:30 2014 @@ -192,7 +192,7 @@ SE_GROUP_ENABLED_BY_DEFAULT; /* Set the token source */ - strcpy(TokenSource.SourceName, "LogonUser"); + strncpy(TokenSource.SourceName, "User32 ", sizeof(TokenSource.SourceName)); AllocateLocallyUniqueId(&TokenSource.SourceIdentifier); Status = LsaLogonUser(LsaHandle,

10 years, 6 months

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 May 2014