Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 74744: Sync with trunk r74743.
by hbelusca＠svn.reactos.org 02 Jun '17

02 Jun '17

Author: hbelusca Date: Fri Jun 2 15:16:39 2017 New Revision: 74744 URL: http://svn.reactos.org/svn/reactos?rev=74744&view=rev Log: Sync with trunk r74743. Added: branches/setup_improvements/dll/appcompat/apphelp/shimeng.c - copied unchanged from r74743, trunk/reactos/dll/appcompat/apphelp/shimeng.c branches/setup_improvements/dll/appcompat/shims/genral/ignoredbgout.c - copied unchanged from r74743, trunk/reactos/dll/appcompat/shims/genral/ignoredbgout.c branches/setup_improvements/dll/win32/fltlib/fltlib.h - copied unchanged from r74743, trunk/reactos/dll/win32/fltlib/fltlib.h branches/setup_improvements/dll/win32/fltlib/message.c - copied unchanged from r74743, trunk/reactos/dll/win32/fltlib/message.c branches/setup_improvements/dll/win32/kernel32_vista/sync.c - copied unchanged from r74743, trunk/reactos/dll/win32/kernel32_vista/sync.c branches/setup_improvements/dll/win32/ntdll_vista/ - copied from r74743, trunk/reactos/dll/win32/ntdll_vista/ branches/setup_improvements/dll/win32/ufatx/ufatx.c - copied unchanged from r74743, trunk/reactos/dll/win32/ufatx/ufatx.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dspkginit.c - copied unchanged from r74743, trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dspkginit.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utresdecode.c - copied unchanged from r74743, trunk/reactos/drivers/bus/acpi/acpica/utilities/utresdecode.c branches/setup_improvements/drivers/filesystems/mup/dfs.c - copied unchanged from r74743, trunk/reactos/drivers/filesystems/mup/dfs.c branches/setup_improvements/drivers/filesystems/mup/dfs.h - copied unchanged from r74743, trunk/reactos/drivers/filesystems/mup/dfs.h branches/setup_improvements/drivers/filters/fltmgr/Messaging.c - copied unchanged from r74743, trunk/reactos/drivers/filters/fltmgr/Messaging.c branches/setup_improvements/drivers/filters/fltmgr/fltmgrint.h - copied unchanged from r74743, trunk/reactos/drivers/filters/fltmgr/fltmgrint.h branches/setup_improvements/sdk/include/ddk/backpack.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/backpack.h branches/setup_improvements/sdk/include/ddk/buffring.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/buffring.h branches/setup_improvements/sdk/include/ddk/fcb.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/fcb.h branches/setup_improvements/sdk/include/ddk/fcbtable.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/fcbtable.h branches/setup_improvements/sdk/include/ddk/lowio.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/lowio.h branches/setup_improvements/sdk/include/ddk/mrx.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/mrx.h branches/setup_improvements/sdk/include/ddk/mrxfcb.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/mrxfcb.h branches/setup_improvements/sdk/include/ddk/nodetype.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/nodetype.h branches/setup_improvements/sdk/include/ddk/ntrxdef.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/ntrxdef.h branches/setup_improvements/sdk/include/ddk/prefix.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/prefix.h branches/setup_improvements/sdk/include/ddk/rx.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rx.h branches/setup_improvements/sdk/include/ddk/rxcontx.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxcontx.h branches/setup_improvements/sdk/include/ddk/rxdata.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxdata.h branches/setup_improvements/sdk/include/ddk/rxlog.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxlog.h branches/setup_improvements/sdk/include/ddk/rxovride.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxovride.h branches/setup_improvements/sdk/include/ddk/rxpooltg.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxpooltg.h branches/setup_improvements/sdk/include/ddk/rxprocs.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxprocs.h branches/setup_improvements/sdk/include/ddk/rxstruc.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxstruc.h branches/setup_improvements/sdk/include/ddk/rxtimer.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxtimer.h branches/setup_improvements/sdk/include/ddk/rxtypes.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxtypes.h branches/setup_improvements/sdk/include/ddk/rxworkq.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/rxworkq.h branches/setup_improvements/sdk/include/ddk/scavengr.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/scavengr.h branches/setup_improvements/sdk/include/ddk/struchdr.h - copied unchanged from r74743, trunk/reactos/sdk/include/ddk/struchdr.h branches/setup_improvements/sdk/lib/drivers/rdbsslib/ - copied from r74743, trunk/reactos/sdk/lib/drivers/rdbsslib/ branches/setup_improvements/sdk/lib/drivers/rxce/ - copied from r74743, trunk/reactos/sdk/lib/drivers/rxce/ Removed: branches/setup_improvements/dll/appcompat/shims/shimlib/shimdbgsupp.c branches/setup_improvements/dll/shellext/slayer/ branches/setup_improvements/sdk/lib/rtl/condvar.c branches/setup_improvements/sdk/lib/rtl/srw.c Modified: branches/setup_improvements/ (props changed) branches/setup_improvements/base/applications/calc/convert.c branches/setup_improvements/base/applications/calc/lang/bg-BG.rc branches/setup_improvements/base/applications/calc/lang/cs-CZ.rc branches/setup_improvements/base/applications/calc/lang/de-DE.rc branches/setup_improvements/base/applications/calc/lang/el-GR.rc branches/setup_improvements/base/applications/calc/lang/en-US.rc branches/setup_improvements/base/applications/calc/lang/es-ES.rc branches/setup_improvements/base/applications/calc/lang/fr-FR.rc branches/setup_improvements/base/applications/calc/lang/he-IL.rc branches/setup_improvements/base/applications/calc/lang/hu-HU.rc branches/setup_improvements/base/applications/calc/lang/it-IT.rc branches/setup_improvements/base/applications/calc/lang/ja-JP.rc branches/setup_improvements/base/applications/calc/lang/ko-KR.rc branches/setup_improvements/base/applications/calc/lang/nl-NL.rc branches/setup_improvements/base/applications/calc/lang/no-NO.rc branches/setup_improvements/base/applications/calc/lang/pl-PL.rc branches/setup_improvements/base/applications/calc/lang/pt-BR.rc branches/setup_improvements/base/applications/calc/lang/ro-RO.rc branches/setup_improvements/base/applications/calc/lang/ru-RU.rc branches/setup_improvements/base/applications/calc/lang/sk-SK.rc branches/setup_improvements/base/applications/calc/lang/sq-AL.rc branches/setup_improvements/base/applications/calc/lang/sv-SE.rc branches/setup_improvements/base/applications/calc/lang/th-TH.rc branches/setup_improvements/base/applications/calc/lang/tr-TR.rc branches/setup_improvements/base/applications/calc/lang/uk-UA.rc branches/setup_improvements/base/applications/calc/lang/zh-CN.rc branches/setup_improvements/base/applications/calc/resource.h branches/setup_improvements/base/applications/mspaint/registry.cpp branches/setup_improvements/base/applications/mspaint/winproc.cpp branches/setup_improvements/base/applications/mstsc/constants.h branches/setup_improvements/base/applications/mstsc/licence.c branches/setup_improvements/base/applications/mstsc/precomp.h branches/setup_improvements/base/applications/mstsc/proto.h branches/setup_improvements/base/applications/mstsc/rdp.c branches/setup_improvements/base/applications/mstsc/secure.c branches/setup_improvements/base/applications/mstsc/settings.c branches/setup_improvements/base/applications/mstsc/ssl_calls.c branches/setup_improvements/base/applications/mstsc/uimain.c branches/setup_improvements/base/applications/mstsc/win32.c branches/setup_improvements/base/setup/usetup/interface/devinst.c branches/setup_improvements/base/shell/explorer/precomp.h branches/setup_improvements/base/shell/explorer/taskswnd.cpp branches/setup_improvements/base/shell/explorer/trayntfy.cpp branches/setup_improvements/base/shell/explorer/traywnd.cpp branches/setup_improvements/base/system/format/format.c branches/setup_improvements/boot/CMakeLists.txt branches/setup_improvements/boot/bootdata/bootcd/unattend.inf branches/setup_improvements/boot/bootdata/hivesft.inf branches/setup_improvements/boot/bootdata/hivesys.inf branches/setup_improvements/boot/environ/app/rosload/rosload.c branches/setup_improvements/boot/environ/include/bl.h branches/setup_improvements/boot/environ/lib/firmware/efi/firmware.c branches/setup_improvements/boot/environ/lib/io/device.c branches/setup_improvements/boot/environ/lib/io/display/display.c branches/setup_improvements/boot/environ/lib/io/display/efi/gop.c branches/setup_improvements/boot/environ/lib/misc/image.c branches/setup_improvements/boot/environ/lib/misc/util.c branches/setup_improvements/boot/environ/lib/mm/descriptor.c branches/setup_improvements/boot/environ/lib/mm/heapalloc.c branches/setup_improvements/boot/environ/lib/mm/i386/mmx86.c branches/setup_improvements/boot/environ/lib/mm/pagealloc.c branches/setup_improvements/boot/environ/lib/platform/time.c branches/setup_improvements/dll/appcompat/apphelp/CMakeLists.txt branches/setup_improvements/dll/appcompat/apphelp/apphelp.c branches/setup_improvements/dll/appcompat/apphelp/apphelp.h branches/setup_improvements/dll/appcompat/apphelp/apphelp.spec branches/setup_improvements/dll/appcompat/apphelp/hsdb.c branches/setup_improvements/dll/appcompat/shims/genral/CMakeLists.txt branches/setup_improvements/dll/appcompat/shims/shimlib/CMakeLists.txt branches/setup_improvements/dll/appcompat/shims/shimlib/shimlib.h branches/setup_improvements/dll/cpl/intl/advanced.c branches/setup_improvements/dll/cpl/sysdm/virtmem.c branches/setup_improvements/dll/ntdll/ldr/ldrinit.c branches/setup_improvements/dll/shellext/CMakeLists.txt branches/setup_improvements/dll/win32/CMakeLists.txt branches/setup_improvements/dll/win32/fltlib/CMakeLists.txt branches/setup_improvements/dll/win32/fltlib/fltlib.c branches/setup_improvements/dll/win32/fltlib/stubs.c branches/setup_improvements/dll/win32/gdiplus/graphics.c branches/setup_improvements/dll/win32/kernel32/client/appcache.c branches/setup_improvements/dll/win32/kernel32/client/except.c branches/setup_improvements/dll/win32/kernel32/client/proc.c branches/setup_improvements/dll/win32/kernel32/client/utils.c branches/setup_improvements/dll/win32/kernel32_vista/CMakeLists.txt branches/setup_improvements/dll/win32/kernel32_vista/kernel32_vista.spec branches/setup_improvements/dll/win32/msafd/misc/dllmain.c branches/setup_improvements/dll/win32/mswsock/extensions.c branches/setup_improvements/dll/win32/mswsock/mswhelper.c branches/setup_improvements/dll/win32/mswsock/mswhelper.h branches/setup_improvements/dll/win32/mswsock/nsplookup.c branches/setup_improvements/dll/win32/mswsock/stubs.c branches/setup_improvements/dll/win32/shell32/dialogs/drive.cpp branches/setup_improvements/dll/win32/syssetup/wizard.c branches/setup_improvements/dll/win32/ubtrfs/ubtrfs.c branches/setup_improvements/dll/win32/uext2/uext2.c branches/setup_improvements/dll/win32/ufat/ufat.c branches/setup_improvements/dll/win32/ufatx/CMakeLists.txt branches/setup_improvements/dll/win32/ufatx/ufatx.spec branches/setup_improvements/dll/win32/uffs/uffs.c branches/setup_improvements/dll/win32/untfs/untfs.c branches/setup_improvements/dll/win32/ureiserfs/ureiserfs.c branches/setup_improvements/dll/win32/uxtheme/draw.c branches/setup_improvements/dll/win32/uxtheme/metric.c branches/setup_improvements/dll/win32/uxtheme/msstyles.c branches/setup_improvements/dll/win32/uxtheme/ncscrollbar.c branches/setup_improvements/dll/win32/uxtheme/nonclient.c branches/setup_improvements/dll/win32/uxtheme/property.c branches/setup_improvements/dll/win32/uxtheme/system.c branches/setup_improvements/dll/win32/uxtheme/themehooks.c branches/setup_improvements/dll/win32/uxtheme/uxthemep.h branches/setup_improvements/dll/win32/ws2_32/src/sockctrl.c branches/setup_improvements/dll/win32/ws2_32/src/socklife.c branches/setup_improvements/drivers/bus/acpi/CMakeLists.txt branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsargs.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsdebug.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsmethod.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsopcode.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsutils.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswexec.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswload.c branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswload2.c branches/setup_improvements/drivers/bus/acpi/acpica/events/evxfevnt.c branches/setup_improvements/drivers/bus/acpi/acpica/executer/exdebug.c branches/setup_improvements/drivers/bus/acpi/acpica/executer/exdump.c branches/setup_improvements/drivers/bus/acpi/acpica/executer/exoparg1.c branches/setup_improvements/drivers/bus/acpi/acpica/executer/exresolv.c branches/setup_improvements/drivers/bus/acpi/acpica/include/acapps.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acdisasm.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acglobal.h branches/setup_improvements/drivers/bus/acpi/acpica/include/aclocal.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acopcode.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acpixf.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acpredef.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acresrc.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acrestyp.h branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl1.h branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl2.h branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl3.h branches/setup_improvements/drivers/bus/acpi/acpica/include/actypes.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acutils.h branches/setup_improvements/drivers/bus/acpi/acpica/include/acuuid.h branches/setup_improvements/drivers/bus/acpi/acpica/include/amlcode.h branches/setup_improvements/drivers/bus/acpi/acpica/include/amlresrc.h branches/setup_improvements/drivers/bus/acpi/acpica/include/platform/acgcc.h branches/setup_improvements/drivers/bus/acpi/acpica/include/platform/acintel.h branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsaccess.c branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsnames.c branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsutils.c branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsxfeval.c branches/setup_improvements/drivers/bus/acpi/acpica/parser/psobject.c branches/setup_improvements/drivers/bus/acpi/acpica/parser/psopcode.c branches/setup_improvements/drivers/bus/acpi/acpica/parser/psparse.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rscalc.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsdump.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsdumpinfo.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsinfo.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsmisc.c branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsserial.c branches/setup_improvements/drivers/bus/acpi/acpica/tables/tbfadt.c branches/setup_improvements/drivers/bus/acpi/acpica/tables/tbutils.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utdecode.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utownerid.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utresrc.c branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utxfmutex.c branches/setup_improvements/drivers/bus/acpi/busmgr/system.c branches/setup_improvements/drivers/bus/acpi/busmgr/utils.c branches/setup_improvements/drivers/bus/acpi/include/acpi_bus.h branches/setup_improvements/drivers/bus/acpi/main.c branches/setup_improvements/drivers/bus/acpi/pnp.c branches/setup_improvements/drivers/filesystems/mup/CMakeLists.txt branches/setup_improvements/drivers/filesystems/mup/mup.c branches/setup_improvements/drivers/filesystems/mup/mup.h branches/setup_improvements/drivers/filters/fltmgr/CMakeLists.txt branches/setup_improvements/drivers/filters/fltmgr/Dispatch.c branches/setup_improvements/drivers/filters/fltmgr/Object.c branches/setup_improvements/drivers/filters/fltmgr/fltmgr.h branches/setup_improvements/drivers/filters/fltmgr/fltmgr.spec branches/setup_improvements/drivers/storage/scsiport/scsiport.c branches/setup_improvements/hal/halx86/generic/bios.c branches/setup_improvements/hal/halx86/legacy/bus/pci_classes.ids branches/setup_improvements/hal/halx86/legacy/bus/pci_vendors.ids branches/setup_improvements/media/drivers/etc/protocol branches/setup_improvements/media/inf/intl.inf branches/setup_improvements/media/rapps/7zip.txt branches/setup_improvements/ntoskrnl/cc/view.c branches/setup_improvements/ntoskrnl/config/cmconfig.c branches/setup_improvements/ntoskrnl/config/cmdata.c branches/setup_improvements/ntoskrnl/config/cmsysini.c branches/setup_improvements/ntoskrnl/config/i386/cmhardwr.c branches/setup_improvements/ntoskrnl/config/powerpc/cmhardwr.c branches/setup_improvements/ntoskrnl/fstub/disksup.c branches/setup_improvements/ntoskrnl/io/iomgr/driver.c branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpinit.c branches/setup_improvements/ntoskrnl/ke/i386/traphdlr.c branches/setup_improvements/ntoskrnl/mm/ARM3/expool.c branches/setup_improvements/ntoskrnl/mm/ARM3/mminit.c branches/setup_improvements/ntoskrnl/mm/ARM3/pagfault.c branches/setup_improvements/ntoskrnl/mm/ARM3/section.c branches/setup_improvements/ntoskrnl/mm/ARM3/session.c branches/setup_improvements/ntoskrnl/mm/ARM3/special.c branches/setup_improvements/ntoskrnl/mm/ARM3/sysldr.c branches/setup_improvements/sdk/include/ddk/fltuserstructures.h branches/setup_improvements/sdk/include/ndk/cmtypes.h branches/setup_improvements/sdk/include/ndk/rtlfuncs.h branches/setup_improvements/sdk/include/psdk/ntstatus.h branches/setup_improvements/sdk/include/reactos/arc/arc.h branches/setup_improvements/sdk/include/reactos/arc/setupblk.h branches/setup_improvements/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h branches/setup_improvements/sdk/include/reactos/mc/bugcodes.mc branches/setup_improvements/sdk/lib/cmlib/hivecell.c branches/setup_improvements/sdk/lib/drivers/CMakeLists.txt branches/setup_improvements/sdk/lib/fslib/btrfslib/btrfslib.c branches/setup_improvements/sdk/lib/fslib/ext2lib/Mke2fs.c branches/setup_improvements/sdk/lib/fslib/ffslib/ffslib.c branches/setup_improvements/sdk/lib/fslib/ntfslib/ntfslib.c branches/setup_improvements/sdk/lib/fslib/reiserfslib/reiserfslib.c branches/setup_improvements/sdk/lib/fslib/vfatlib/vfatlib.c branches/setup_improvements/sdk/lib/fslib/vfatxlib/vfatxlib.c branches/setup_improvements/sdk/lib/rtl/CMakeLists.txt branches/setup_improvements/sdk/lib/rtl/env.c branches/setup_improvements/sdk/lib/rtl/handle.c branches/setup_improvements/sdk/tools/hhpcomp/chmc/list.h branches/setup_improvements/win32ss/drivers/videoprt/int10.c branches/setup_improvements/win32ss/drivers/videoprt/videoprt.c branches/setup_improvements/win32ss/drivers/videoprt/videoprt.h branches/setup_improvements/win32ss/gdi/eng/engobjects.h branches/setup_improvements/win32ss/gdi/ntgdi/coord.c branches/setup_improvements/win32ss/gdi/ntgdi/coord.h branches/setup_improvements/win32ss/gdi/ntgdi/dcutil.c branches/setup_improvements/win32ss/gdi/ntgdi/freetype.c branches/setup_improvements/win32ss/user/ntuser/main.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/setup_improvements/base/applications/calc/convert.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mspaint/registry.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/proto.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/applica… Modified: branches/setup_improvements/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/shell/e… Modified: branches/setup_improvements/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… Modified: branches/setup_improvements/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/CMakeLi… Modified: branches/setup_improvements/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… Modified: branches/setup_improvements/boot/environ/app/rosload/rosload.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/io/display/efi/gop.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/mm/heapalloc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/boot/environ/lib/platform/time.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/environ… Modified: branches/setup_improvements/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/shims/genral/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/shims/shimlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Removed: branches/setup_improvements/dll/appcompat/shims/shimlib/shimdbgsupp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/shims/shimlib/shimlib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/cpl/intl… Modified: branches/setup_improvements/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/cpl/sysd… Modified: branches/setup_improvements/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/ntdll/ld… Modified: branches/setup_improvements/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/CM… Modified: branches/setup_improvements/dll/win32/fltlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/fl… Modified: branches/setup_improvements/dll/win32/fltlib/fltlib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/fl… Modified: branches/setup_improvements/dll/win32/fltlib/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/fl… Modified: branches/setup_improvements/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/gd… Modified: branches/setup_improvements/dll/win32/kernel32/client/appcache.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/kernel32_vista/kernel32_vista.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ke… Modified: branches/setup_improvements/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/extensions.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/mswhelper.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/mswhelper.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/mswsock/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ms… Modified: branches/setup_improvements/dll/win32/shell32/dialogs/drive.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… Modified: branches/setup_improvements/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sy… Modified: branches/setup_improvements/dll/win32/ubtrfs/ubtrfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ub… Modified: branches/setup_improvements/dll/win32/uext2/uext2.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ue… Modified: branches/setup_improvements/dll/win32/ufat/ufat.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uf… Modified: branches/setup_improvements/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uf… Modified: branches/setup_improvements/dll/win32/ufatx/ufatx.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uf… Modified: branches/setup_improvements/dll/win32/uffs/uffs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uf… Modified: branches/setup_improvements/dll/win32/untfs/untfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/un… Modified: branches/setup_improvements/dll/win32/ureiserfs/ureiserfs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ur… Modified: branches/setup_improvements/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… Modified: branches/setup_improvements/dll/win32/ws2_32/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ws… Modified: branches/setup_improvements/dll/win32/ws2_32/src/socklife.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ws… Modified: branches/setup_improvements/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsargs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsdebug.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsmethod.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsopcode.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dsutils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswexec.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswload.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/dispatcher/dswload2.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/events/evxfevnt.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/executer/exdebug.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/executer/exdump.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/executer/exoparg1.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/executer/exresolv.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acapps.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acopcode.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acpredef.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acresrc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acrestyp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl1.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl2.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/actbl3.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/acuuid.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/amlcode.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/amlresrc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/platform/acgcc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/include/platform/acintel.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsnames.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsutils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/namespace/nsxfeval.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/parser/psobject.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/parser/psopcode.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/parser/psparse.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rscalc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsdump.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsdumpinfo.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsinfo.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsmisc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/resources/rsserial.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/tables/tbfadt.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utdecode.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utownerid.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utresrc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/acpica/utilities/utxfmutex.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/bus/… Modified: branches/setup_improvements/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filters/fltmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/filters/fltmgr/Dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/filters/fltmgr/Object.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/filters/fltmgr/fltmgr.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/filters/fltmgr/fltmgr.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/filt… Modified: branches/setup_improvements/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/stor… Modified: branches/setup_improvements/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/hal/halx86/g… Modified: branches/setup_improvements/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/hal/halx86/l… Modified: branches/setup_improvements/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/hal/halx86/l… Modified: branches/setup_improvements/media/drivers/etc/protocol URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/driver… Modified: branches/setup_improvements/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/inf/in… Modified: branches/setup_improvements/media/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/rapps/… Modified: branches/setup_improvements/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/cc/… Modified: branches/setup_improvements/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/fst… Modified: branches/setup_improvements/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/… Modified: branches/setup_improvements/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/… Modified: branches/setup_improvements/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/ke/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/mm/… Modified: branches/setup_improvements/sdk/include/ddk/fltuserstructures.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/cmli… Modified: branches/setup_improvements/sdk/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/driv… Modified: branches/setup_improvements/sdk/lib/fslib/btrfslib/btrfslib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/ffslib/ffslib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/ntfslib/ntfslib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/reiserfslib/reiserfslib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/fslib/vfatxlib/vfatxlib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/fsli… Modified: branches/setup_improvements/sdk/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Removed: branches/setup_improvements/sdk/lib/rtl/condvar.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Modified: branches/setup_improvements/sdk/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Modified: branches/setup_improvements/sdk/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Removed: branches/setup_improvements/sdk/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/rtl/… Modified: branches/setup_improvements/sdk/tools/hhpcomp/chmc/list.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/hh… Modified: branches/setup_improvements/win32ss/drivers/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/driv… Modified: branches/setup_improvements/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/driv… Modified: branches/setup_improvements/win32ss/drivers/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/driv… Modified: branches/setup_improvements/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/user…

1 0

[hbelusca] 74743: [FREELDR]: Split the "main" winldr.h header into the one containing global code that actually doesn't really depend on the "windows" NT loader part, and one that actually concerns...
by hbelusca＠svn.reactos.org 02 Jun '17

02 Jun '17

Author: hbelusca Date: Fri Jun 2 00:52:36 2017 New Revision: 74743 URL: http://svn.reactos.org/svn/reactos?rev=74743&view=rev Log: [FREELDR]: Split the "main" winldr.h header into the one containing global code that actually doesn't really depend on the "windows" NT loader part, and one that actually concerns code just for the NT Loader. The latter goes into ntldr. Added: branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.h - copied, changed from r74742, branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h Modified: branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h branches/setup_improvements/boot/freeldr/freeldr/ntldr/setupldr.c branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.c branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlmemory.c branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlregistry.c Modified: branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -22,20 +22,20 @@ #include <arc/setupblk.h> +// See freeldr/ntldr/winldr.h #define TAG_WLDR_DTE 'eDlW' #define TAG_WLDR_BDE 'dBlW' #define TAG_WLDR_NAME 'mNlW' -/* Entry-point to kernel */ -typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); - // Some definitions + +// FIXME: This one has nothing to do here!! #define SECTOR_SIZE 512 // Descriptors -#define NUM_GDT 128 // Must be 128 -#define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 +#define NUM_GDT 128 // Must be 128 +#define NUM_IDT 0x100 // Only 16 are used though. Must be 0x100 #include <pshpack1.h> typedef struct /* Root System Descriptor Pointer */ @@ -58,27 +58,6 @@ CHAR ArcName[MAX_PATH]; } ARC_DISK_SIGNATURE_EX, *PARC_DISK_SIGNATURE_EX; -#define MAX_OPTIONS_LENGTH 255 - -typedef struct _LOADER_SYSTEM_BLOCK -{ - LOADER_PARAMETER_BLOCK LoaderBlock; - LOADER_PARAMETER_EXTENSION Extension; - SETUP_LOADER_BLOCK SetupBlock; -#ifdef _M_IX86 - HEADLESS_LOADER_BLOCK HeadlessLoaderBlock; -#endif - NLS_DATA_BLOCK NlsDataBlock; - CHAR LoadOptions[MAX_OPTIONS_LENGTH+1]; - CHAR ArcBootDeviceName[MAX_PATH+1]; - // CHAR ArcHalDeviceName[MAX_PATH]; - CHAR NtBootPathName[MAX_PATH+1]; - CHAR NtHalPathName[MAX_PATH+1]; - ARC_DISK_INFORMATION ArcDiskInformation; -} LOADER_SYSTEM_BLOCK, *PLOADER_SYSTEM_BLOCK; - -extern PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; - /////////////////////////////////////////////////////////////////////////////////////// // // ReactOS Loading Functions @@ -87,18 +66,22 @@ VOID LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, IN USHORT OperatingSystemVersion); -// conversion.c +VOID +LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, + IN USHORT OperatingSystemVersion); + + +// conversion.c and conversion.h PVOID VaToPa(PVOID Va); PVOID PaToVa(PVOID Pa); VOID List_PaToVa(_In_ LIST_ENTRY *ListEntry); -VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); + // peloader.c BOOLEAN WinLdrLoadImage(IN PCHAR FileName, TYPE_OF_MEMORY MemoryType, OUT PVOID *ImageBasePA); - BOOLEAN WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, @@ -112,54 +95,13 @@ IN PCCH DirectoryPath, IN PLDR_DATA_TABLE_ENTRY ScanDTE); -// winldr.c -PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, - TYPE_OF_MEMORY MemoryType); - -// wlmemory.c -BOOLEAN -WinLdrSetupMemoryLayout(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock); - -// wlregistry.c -BOOLEAN WinLdrInitSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); - -BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); - - BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, IN PCH DllName, OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); -VOID -WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR Options, - LPCSTR SystemPath, - LPCSTR BootPath, - USHORT VersionToBoot); -BOOLEAN -WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath, - IN LPCSTR AnsiFileName, - IN LPCSTR OemFileName, - IN LPCSTR LanguageFileName); -BOOLEAN -WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - LPWSTR RegistryPath, - LPWSTR ImagePath, - LPWSTR ServiceName); -VOID -WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); - +// arch/xxx/winldr.c BOOLEAN MempSetupPaging(IN PFN_NUMBER StartPage, IN PFN_NUMBER NumberOfPages, @@ -169,19 +111,7 @@ MempUnmapPage(PFN_NUMBER Page); VOID -MempDump(); - -VOID -LoadAndBootWindowsCommon( - USHORT OperatingSystemVersion, - PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR BootOptions, - LPCSTR BootPath, - BOOLEAN Setup); - -VOID -LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, - IN USHORT OperatingSystemVersion); +MempDump(VOID); VOID WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); Modified: branches/setup_improvements/boot/freeldr/freeldr/ntldr/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/ntldr/setupldr.c [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/setupldr.c [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -19,6 +19,7 @@ */ #include <freeldr.h> +#include "winldr.h" #include <ndk/ldrtypes.h> #include <arc/setupblk.h> @@ -27,12 +28,6 @@ DBG_DEFAULT_CHANNEL(WINDOWS); #define TAG_BOOT_OPTIONS 'pOtB' - -void -WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrSetProcessorContext(void); // TODO: Move to .h VOID AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock); Modified: branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -20,6 +20,7 @@ */ #include <freeldr.h> +#include "winldr.h" #include "registry.h" #include <ndk/ldrtypes.h> @@ -96,7 +97,7 @@ /* Construct SystemRoot and ArcBoot from SystemPath */ PathSeparator = strstr(BootPath, "\\") - BootPath; strncpy(ArcBoot, BootPath, PathSeparator); - ArcBoot[PathSeparator] = 0; + ArcBoot[PathSeparator] = ANSI_NULL; TRACE("ArcBoot: %s\n", ArcBoot); TRACE("SystemRoot: %s\n", SystemRoot); @@ -249,7 +250,7 @@ { // There is no directory in the path strcpy(DllName, DriverPath); - DriverPath[0] = 0; + DriverPath[0] = ANSI_NULL; } TRACE("DriverPath: %s, DllName: %s, LPB\n", DriverPath, DllName); @@ -426,13 +427,13 @@ static BOOLEAN LoadModule( - PLOADER_PARAMETER_BLOCK LoaderBlock, - PCCH Path, - PCCH File, - TYPE_OF_MEMORY MemoryType, - PLDR_DATA_TABLE_ENTRY *Dte, - BOOLEAN IsKdTransportDll, - ULONG Percentage) + IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PCCH Path, + IN PCCH File, + IN PCCH ImportName, // BaseDllName + IN TYPE_OF_MEMORY MemoryType, + OUT PLDR_DATA_TABLE_ENTRY *Dte, + IN ULONG Percentage) { BOOLEAN Success; CHAR FullFileName[MAX_PATH]; @@ -444,7 +445,6 @@ UiDrawProgressBarCenter(Percentage, 100, ProgressString); strcpy(FullFileName, Path); - strcat(FullFileName, "SYSTEM32\\"); strcat(FullFileName, File); Success = WinLdrLoadImage(FullFileName, MemoryType, &BaseAddress); @@ -455,15 +455,13 @@ } TRACE("%s loaded successfully at %p\n", File, BaseAddress); - strcpy(FullFileName, "WINDOWS\\SYSTEM32\\"); - strcat(FullFileName, File); /* * Cheat about the base DLL name if we are loading * the Kernel Debugger Transport DLL, to make the * PE loader happy. */ Success = WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, - (IsKdTransportDll ? "KDCOM.DLL" : File), + ImportName, FullFileName, BaseAddress, Dte); @@ -475,22 +473,82 @@ BOOLEAN LoadWindowsCore(IN USHORT OperatingSystemVersion, IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR BootOptions, - IN LPCSTR BootPath, + IN PCSTR BootOptions, + IN PCSTR BootPath, IN OUT PLDR_DATA_TABLE_ENTRY* KernelDTE) { BOOLEAN Success; + PCSTR Options; CHAR DirPath[MAX_PATH]; + CHAR KernelFileName[MAX_PATH]; + CHAR HalFileName[MAX_PATH]; CHAR KdTransportDllName[MAX_PATH]; PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL; if (!KernelDTE) return FALSE; + /* Initialize SystemRoot\System32 path */ + strcpy(DirPath, BootPath); + strcat(DirPath, "SYSTEM32\\"); + + // + // TODO: Parse also the separate INI values "Kernel=" and "Hal=" + // + + /* Default KERNEL and HAL file names */ + strcpy(KernelFileName, "NTOSKRNL.EXE"); + strcpy(HalFileName , "HAL.DLL"); + + /* Find any /KERNEL= or /HAL= switch in the boot options */ + Options = BootOptions; + while (Options) + { + /* Skip possible initial whitespace */ + Options += strspn(Options, " \t"); + + /* Check whether a new commutator starts and it is either KERNEL or HAL */ + if (*Options != '/' || (++Options, + !(_strnicmp(Options, "KERNEL=", 7) == 0 || + _strnicmp(Options, "HAL=", 4) == 0)) ) + { + /* Search for another whitespace */ + Options = strpbrk(Options, " \t"); + continue; + } + else + { + size_t i = strcspn(Options, " \t"); /* Skip whitespace */ + if (i == 0) + { + /* Use the default values */ + break; + } + + /* We have found either KERNEL or HAL commutator */ + if (_strnicmp(Options, "KERNEL=", 7) == 0) + { + Options += 7; i -= 7; + strncpy(KernelFileName, Options, i); + KernelFileName[i] = ANSI_NULL; + _strupr(KernelFileName); + } + else if (_strnicmp(Options, "HAL=", 4) == 0) + { + Options += 4; i -= 4; + strncpy(HalFileName, Options, i); + HalFileName[i] = ANSI_NULL; + _strupr(HalFileName); + } + } + } + + TRACE("Kernel file = '%s' ; HAL file = '%s'\n", KernelFileName, HalFileName); + /* Load the Kernel */ - LoadModule(LoaderBlock, BootPath, "NTOSKRNL.EXE", LoaderSystemCode, KernelDTE, FALSE, 30); + LoadModule(LoaderBlock, DirPath, KernelFileName, "NTOSKRNL.EXE", LoaderSystemCode, KernelDTE, 30); /* Load the HAL */ - LoadModule(LoaderBlock, BootPath, "HAL.DLL", LoaderHalCode, &HalDTE, FALSE, 45); + LoadModule(LoaderBlock, DirPath, HalFileName, "HAL.DLL", LoaderHalCode, &HalDTE, 45); /* Load the Kernel Debugger Transport DLL */ if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) @@ -525,27 +583,28 @@ * "...foo /DEBUGPORT= bar..." * (in that case, we default the port to COM). */ - while (BootOptions) + Options = BootOptions; + while (Options) { /* Skip possible initial whitespace */ - BootOptions += strspn(BootOptions, " \t"); + Options += strspn(Options, " \t"); /* Check whether a new commutator starts and it is the DEBUGPORT one */ - if (*BootOptions != '/' || _strnicmp(++BootOptions, "DEBUGPORT=", 10) != 0) + if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0) { /* Search for another whitespace */ - BootOptions = strpbrk(BootOptions, " \t"); + Options = strpbrk(Options, " \t"); continue; } else { /* We found the DEBUGPORT commutator. Move to the port name. */ - BootOptions += 10; + Options += 10; break; } } - if (BootOptions) + if (Options) { /* * We have found the DEBUGPORT commutator. Parse the port name. @@ -553,33 +612,30 @@ * If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM". */ strcpy(KdTransportDllName, "KD"); - if (_strnicmp(BootOptions, "COM", 3) == 0 && '0' <= BootOptions[3] && BootOptions[3] <= '9') + if (_strnicmp(Options, "COM", 3) == 0 && '0' <= Options[3] && Options[3] <= '9') { - strncat(KdTransportDllName, BootOptions, 3); + strncat(KdTransportDllName, Options, 3); } else { - size_t i = strcspn(BootOptions, " \t:"); /* Skip valid separators: whitespace or colon */ + size_t i = strcspn(Options, " \t:"); /* Skip valid separators: whitespace or colon */ if (i == 0) strcat(KdTransportDllName, "COM"); else - strncat(KdTransportDllName, BootOptions, i); + strncat(KdTransportDllName, Options, i); } strcat(KdTransportDllName, ".DLL"); _strupr(KdTransportDllName); /* - * Load the transport DLL. Specify it to LoadModule so that it can - * change the base DLL name of the loaded transport DLL to the default - * "KDCOM.DLL" name, to make the PE loader happy. + * Load the transport DLL. Override the base DLL name of the + * loaded transport DLL to the default "KDCOM.DLL" name. */ - LoadModule(LoaderBlock, BootPath, KdTransportDllName, LoaderSystemCode, &KdComDTE, TRUE, 60); + LoadModule(LoaderBlock, DirPath, KdTransportDllName, "KDCOM.DLL", LoaderSystemCode, &KdComDTE, 60); } } /* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */ - strcpy(DirPath, BootPath); - strcat(DirPath, "system32\\"); Success = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); Success &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); if (KdComDTE) @@ -691,7 +747,7 @@ /* Allocate and minimalist-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); - /* Load Hive */ + /* Load the system hive */ UiDrawBackdrop(); UiDrawProgressBarCenter(15, 100, "Loading system hive..."); Success = WinLdrInitSystemHive(LoaderBlock, BootPath); Copied: branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.h (from r74742, branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/winldr.h [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -22,20 +22,25 @@ #include <arc/setupblk.h> +#if 0 +// See freeldr/include/winldr.h #define TAG_WLDR_DTE 'eDlW' #define TAG_WLDR_BDE 'dBlW' #define TAG_WLDR_NAME 'mNlW' + +#endif /* Entry-point to kernel */ typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); // Some definitions -#define SECTOR_SIZE 512 + +#if 0 // Descriptors -#define NUM_GDT 128 // Must be 128 -#define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 +#define NUM_GDT 128 // Must be 128 +#define NUM_IDT 0x100 // Only 16 are used though. Must be 0x100 #include <pshpack1.h> typedef struct /* Root System Descriptor Pointer */ @@ -58,6 +63,8 @@ CHAR ArcName[MAX_PATH]; } ARC_DISK_SIGNATURE_EX, *PARC_DISK_SIGNATURE_EX; +#endif + #define MAX_OPTIONS_LENGTH 255 typedef struct _LOADER_SYSTEM_BLOCK @@ -79,38 +86,15 @@ extern PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; -/////////////////////////////////////////////////////////////////////////////////////// -// -// ReactOS Loading Functions -// -/////////////////////////////////////////////////////////////////////////////////////// -VOID LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, - IN USHORT OperatingSystemVersion); // conversion.c +#if 0 PVOID VaToPa(PVOID Va); PVOID PaToVa(PVOID Pa); VOID List_PaToVa(_In_ LIST_ENTRY *ListEntry); +#endif VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); -// peloader.c -BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA); - - -BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry); - -BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE); // winldr.c PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, @@ -121,18 +105,16 @@ WinLdrSetupMemoryLayout(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock); // wlregistry.c -BOOLEAN WinLdrInitSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); +BOOLEAN +WinLdrInitSystemHive( + IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PCSTR SystemRoot, + IN BOOLEAN Setup); BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN LPCSTR DirectoryPath); - -BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); - +// winldr.c VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, LPCSTR Options, @@ -160,17 +142,6 @@ VOID WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); -BOOLEAN -MempSetupPaging(IN PFN_NUMBER StartPage, - IN PFN_NUMBER NumberOfPages, - IN BOOLEAN KernelMapping); - -VOID -MempUnmapPage(PFN_NUMBER Page); - -VOID -MempDump(); - VOID LoadAndBootWindowsCommon( USHORT OperatingSystemVersion, @@ -178,13 +149,3 @@ LPCSTR BootOptions, LPCSTR BootPath, BOOLEAN Setup); - -VOID -LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, - IN USHORT OperatingSystemVersion); - -VOID -WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -WinLdrSetProcessorContext(VOID); Modified: branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlmemory.c [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlmemory.c [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -9,6 +9,7 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> +#include "winldr.h" #include <debug.h> Modified: branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlregistry.c [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/ntldr/wlregistry.c [iso-8859-1] Fri Jun 2 00:52:36 2017 @@ -9,6 +9,7 @@ /* INCLUDES ***************************************************************/ #include <freeldr.h> +#include "winldr.h" #include "registry.h" #include <debug.h>

1 0

[hbelusca] 74742: [USETUP]: Creating a registry key with zero access is just plainly invalid. Fix it. It was not caught before because, we never ever booted a 1st-stage setup with a valid mounted e...
by hbelusca＠svn.reactos.org 02 Jun '17

02 Jun '17

Author: hbelusca Date: Fri Jun 2 00:44:04 2017 New Revision: 74742 URL: http://svn.reactos.org/svn/reactos?rev=74742&view=rev Log: [USETUP]: Creating a registry key with zero access is just plainly invalid. Fix it. It was not caught before because, we never ever booted a 1st-stage setup with a valid mounted existing SYSTEM key (as Windows does). Modified: trunk/reactos/base/setup/usetup/interface/devinst.c Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Fri Jun 2 00:44:04 2017 @@ -341,7 +341,7 @@ } InitializeObjectAttributes(&ObjectAttributes, &ServicesU, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&hServices, 0, &ObjectAttributes, 0, NULL, 0, NULL); + Status = NtCreateKey(&hServices, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, 0, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey('%wZ') failed with status 0x%08lx\n", &ServicesU, Status);

1 0

[hbelusca] 74741: [MKHIVE][CMAKE]: Make mkhive a bit more flexible, so that it can generate only specific hives on-demand (and not all of them always at once). I need this for building a single boo...
by hbelusca＠svn.reactos.org 02 Jun '17

02 Jun '17

Author: hbelusca Date: Fri Jun 2 00:34:10 2017 New Revision: 74741 URL: http://svn.reactos.org/svn/reactos?rev=74741&view=rev Log: [MKHIVE][CMAKE]: Make mkhive a bit more flexible, so that it can generate only specific hives on-demand (and not all of them always at once). I need this for building a single bootcd registry hive. I commit these changes in my branch because it's too much über-advanced code for our trunk, yet... (and it will uncover deep "setup" hacks in NTOS' iomgr & pnpmgr as soon as I'll enable 1-st stage setup to have a proper registry present as done on windows). CORE-13347 #comment Committed in r74741 but just in the setup_improvements branch for the moment. Modified: branches/setup_improvements/sdk/cmake/CMakeMacros.cmake branches/setup_improvements/sdk/tools/mkhive/binhive.c branches/setup_improvements/sdk/tools/mkhive/cmi.c branches/setup_improvements/sdk/tools/mkhive/mkhive.c branches/setup_improvements/sdk/tools/mkhive/mkhive.h branches/setup_improvements/sdk/tools/mkhive/reginf.c branches/setup_improvements/sdk/tools/mkhive/registry.c branches/setup_improvements/sdk/tools/mkhive/registry.h Modified: branches/setup_improvements/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/cmake/CM… ============================================================================== --- branches/setup_improvements/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/setup_improvements/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Fri Jun 2 00:34:10 2017 @@ -762,6 +762,22 @@ NO_CAB FOR bootcd regtest) + # bootcd setup system hive + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV + COMMAND native-mkhive -h:SETUPREG -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf + DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivesys.inf) + + add_custom_target(bootcd_hives + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV) + + add_cd_file( + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV + TARGET bootcd_hives + DESTINATION reactos + NO_CAB + FOR bootcd regtest) + # livecd hives list(APPEND _livecd_inf_files ${_registry_inf} @@ -769,27 +785,27 @@ ${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst.inf) add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/default - ${CMAKE_BINARY_DIR}/boot/bootdata/security - ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/system - COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files} + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/security + COMMAND native-mkhive -h:SYSTEM,SOFTWARE,DEFAULT,SAM,SECURITY -d:${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files} DEPENDS native-mkhive ${_livecd_inf_files}) add_custom_target(livecd_hives - DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/default - ${CMAKE_BINARY_DIR}/boot/bootdata/security - ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/system) + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/security) add_cd_file( - FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/default - ${CMAKE_BINARY_DIR}/boot/bootdata/security - ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/system + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/security TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) @@ -797,7 +813,7 @@ # BCD Hive add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD - COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf + COMMAND native-mkhive -h:BCD -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivebcd.inf) add_custom_target(bcd_hive Modified: branches/setup_improvements/sdk/tools/mkhive/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/mk… ============================================================================== --- branches/setup_improvements/sdk/tools/mkhive/binhive.c [iso-8859-1] (original) +++ branches/setup_improvements/sdk/tools/mkhive/binhive.c [iso-8859-1] Fri Jun 2 00:34:10 2017 @@ -33,26 +33,26 @@ BOOL ExportBinaryHive( IN PCSTR FileName, - IN PCMHIVE Hive) + IN PCMHIVE CmHive) { FILE *File; BOOL ret; - printf (" Creating binary hive: %s\n", FileName); + printf(" Creating binary hive: %s\n", FileName); /* Create new hive file */ - File = fopen (FileName, "w+b"); + File = fopen(FileName, "wb"); if (File == NULL) { printf(" Error creating/opening file\n"); return FALSE; } - fseek (File, 0, SEEK_SET); + fseek(File, 0, SEEK_SET); - Hive->FileHandles[HFILE_TYPE_PRIMARY] = (HANDLE)File; - ret = HvWriteHive(&Hive->Hive); - fclose (File); + CmHive->FileHandles[HFILE_TYPE_PRIMARY] = (HANDLE)File; + ret = HvWriteHive(&CmHive->Hive); + fclose(File); return ret; } Modified: branches/setup_improvements/sdk/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/mk… ============================================================================== --- branches/setup_improvements/sdk/tools/mkhive/cmi.c [iso-8859-1] (original) +++ branches/setup_improvements/sdk/tools/mkhive/cmi.c [iso-8859-1] Fri Jun 2 00:34:10 2017 @@ -55,8 +55,12 @@ OUT PVOID Buffer, IN SIZE_T BufferLength) { - DPRINT1("CmpFileRead() unimplemented\n"); - return FALSE; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + FILE *File = CmHive->FileHandles[HFILE_TYPE_PRIMARY]; + if (fseek(File, *FileOffset, SEEK_SET) != 0) + return FALSE; + + return (fread(Buffer, 1, BufferLength, File) == BufferLength); } static BOOLEAN Modified: branches/setup_improvements/sdk/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/mk… ============================================================================== --- branches/setup_improvements/sdk/tools/mkhive/mkhive.c [iso-8859-1] (original) +++ branches/setup_improvements/sdk/tools/mkhive/mkhive.c [iso-8859-1] Fri Jun 2 00:34:10 2017 @@ -21,8 +21,9 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/mkhive.c * PURPOSE: Hive maker - * PROGRAMMER: Eric Kohl - * Hervé Poussineau + * PROGRAMMERS: Eric Kohl + * HervÃ© Poussineau + * HermÃ¨s BÃ©lusca-MaÃ¯to */ #include <limits.h> @@ -48,11 +49,13 @@ #endif -void usage (void) +void usage(void) { - printf ("Usage: mkhive <dstdir> <inffiles>\n\n"); - printf (" dstdir - binary hive files are created in this directory\n"); - printf (" inffiles - inf files with full path\n"); + printf("Usage: mkhive -h:hive1[,hiveN...] -d:<dstdir> <inffiles>\n\n" + " -h:hiveN - Comma-separated list of hives to create. Possible values are:\n" + " SETUPREG, SYSTEM, SOFTWARE, DEFAULT, SAM, SECURITY, BCD.\n" + " -d:dstdir - The binary hive files are created in this directory.\n" + " inffiles - List of INF files with full path.\n"); } void convert_path(char *dst, char *src) @@ -83,80 +86,106 @@ dst[i] = 0; } -int main (int argc, char *argv[]) +int main(int argc, char *argv[]) { - char FileName[PATH_MAX]; - int i; + INT ret; + UINT i; + PCSTR HiveList = NULL; + CHAR DestPath[PATH_MAX] = ""; + CHAR FileName[PATH_MAX]; - if (argc < 3) + if (argc < 4) { - usage (); - return 1; + usage(); + return -1; } - printf ("Binary hive maker\n"); + printf("Binary hive maker\n"); - RegInitializeRegistry (); - - for (i = 2; i < argc; i++) + /* Read the options */ + for (i = 1; i < argc && *argv[i] == '-'; i++) { - convert_path (FileName, argv[i]); - ImportRegistryFile (FileName); + if (argv[i][1] == 'h' && (argv[i][2] == ':' || argv[i][2] == '=')) + { + HiveList = argv[i] + 3; + } + else if (argv[i][1] == 'd' && (argv[i][2] == ':' || argv[i][2] == '=')) + { + convert_path(DestPath, argv[i] + 3); + } + else + { + fprintf(stderr, "Unrecognized option: %s\n", argv[i]); + return -1; + } } - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "default"); - if (!ExportBinaryHive (FileName, &DefaultHive)) + /* Check whether we have all the parameters needed */ + if (!HiveList || !*HiveList) { - return 1; + fprintf(stderr, "The mandatory list of hives is missing.\n"); + return -1; + } + if (!*DestPath) + { + fprintf(stderr, "The mandatory output directory is missing.\n"); + return -1; + } + if (i >= argc) + { + fprintf(stderr, "Not enough parameters, or the list of INF files is missing.\n"); + return -1; } - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "sam"); - if (!ExportBinaryHive (FileName, &SamHive)) + /* Initialize the registry */ + RegInitializeRegistry(HiveList); + + /* Default to failure */ + ret = -1; + + /* Now we should have the list of INF files: parse it */ + for (; i < argc; ++i) { - return 1; + convert_path(FileName, argv[i]); + if (!ImportRegistryFile(FileName)) + goto Quit; } - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "security"); - if (!ExportBinaryHive (FileName, &SecurityHive)) + for (i = 0; i < MAX_NUMBER_OF_REGISTRY_HIVES; ++i) { - return 1; + /* Skip this registry hive if it's not in the list */ + if (!strstr(HiveList, RegistryHives[i].HiveName)) + continue; + + strcpy(FileName, DestPath); + strcat(FileName, DIR_SEPARATOR_STRING); + strcat(FileName, RegistryHives[i].HiveName); + + /* Exception for the special setup registry hive */ + // if (strcmp(RegistryHives[i].HiveName, "SETUPREG") == 0) + if (i == 0) + strcat(FileName, ".HIV"); + + if (!ExportBinaryHive(FileName, RegistryHives[i].CmHive)) + goto Quit; + + /* If we happen to deal with the special setup registry hive, stop there */ + // if (strcmp(RegistryHives[i].HiveName, "SETUPREG") == 0) + if (i == 0) + break; } - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "software"); - if (!ExportBinaryHive (FileName, &SoftwareHive)) - { - return 1; - } + /* Success */ + ret = 0; - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "system"); - if (!ExportBinaryHive (FileName, &SystemHive)) - { - return 1; - } +Quit: + /* Shut down the registry */ + RegShutdownRegistry(); - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "BCD"); - if (!ExportBinaryHive (FileName, &BcdHive)) - { - return 1; - } + if (ret == 0) + printf(" Done.\n"); - RegShutdownRegistry (); - - printf (" Done.\n"); - - return 0; + return ret; } /* EOF */ Modified: branches/setup_improvements/sdk/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/mk… ============================================================================== --- branches/setup_improvements/sdk/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ branches/setup_improvements/sdk/tools/mkhive/mkhive.h [iso-8859-1] Fri Jun 2 00:34:10 2017 @@ -21,7 +21,7 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/mkhive.h * PURPOSE: Hive maker - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl * Hervé Poussineau */ Modified: branches/setup_improvements/sdk/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/mk… ============================================================================== --- branches/setup_improvements/sdk/tools/mkhive/reginf.c [iso-8859-1] (original) +++ branches/setup_improvements/sdk/tools/mkhive/reginf.c [iso-8859-1] Fri Jun 2 00:34:10 2017 @@ -21,7 +21,7 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/reginf.c * PURPOSE: Inf file import code - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl * Hervé Poussineau */ @@ -68,40 +68,40 @@ /* FUNCTIONS ****************************************************************/ static BOOL -GetRootKey (PWCHAR Name) +get_root_key(PWCHAR Name) { - if (!strcmpiW (Name, HKCR)) - { - strcpyW (Name, HKCRPath); - return TRUE; - } - - if (!strcmpiW (Name, HKCU)) - { - strcpyW (Name, HKCUPath); - return TRUE; - } - - if (!strcmpiW (Name, HKLM)) - { - strcpyW (Name, HKLMPath); - return TRUE; - } - - if (!strcmpiW (Name, HKU)) - { - strcpyW (Name, HKUPath); - return TRUE; - } - - if (!strcmpiW (Name, BCD)) - { - strcpyW (Name, BCDPath); + if (!strcmpiW(Name, HKCR)) + { + strcpyW(Name, HKCRPath); + return TRUE; + } + + if (!strcmpiW(Name, HKCU)) + { + strcpyW(Name, HKCUPath); + return TRUE; + } + + if (!strcmpiW(Name, HKLM)) + { + strcpyW(Name, HKLMPath); + return TRUE; + } + + if (!strcmpiW(Name, HKU)) + { + strcpyW(Name, HKUPath); + return TRUE; + } + + if (!strcmpiW(Name, BCD)) + { + strcpyW(Name, BCDPath); return TRUE; } #if 0 - if (!strcmpiW (Name, HKR)) + if (!strcmpiW(Name, HKR)) return FALSE; #endif @@ -110,47 +110,44 @@ /*********************************************************************** - * AppendMultiSzValue + * append_multi_sz_value * * Append a multisz string to a multisz registry value. */ +// NOTE: Synced with setupapi/install.c ; see also usetup/registry.c static VOID -AppendMultiSzValue ( +append_multi_sz_value( IN HKEY KeyHandle, IN PWCHAR ValueName, IN PWCHAR Strings, - IN ULONG StringSize) + IN ULONG StringSize) // In characters { - ULONG Size; + ULONG Size, Total; // In bytes ULONG Type; - ULONG Total; PWCHAR Buffer; PWCHAR p; size_t len; LONG Error; - Error = RegQueryValueExW ( - KeyHandle, - ValueName, - NULL, - &Type, - NULL, - &Size); - if ((Error != ERROR_SUCCESS) || - (Type != REG_MULTI_SZ)) + Error = RegQueryValueExW(KeyHandle, + ValueName, + NULL, + &Type, + NULL, + &Size); + if ((Error != ERROR_SUCCESS) || (Type != REG_MULTI_SZ)) return; - Buffer = malloc ((Size + StringSize) * sizeof(WCHAR)); + Buffer = malloc(Size + StringSize * sizeof(WCHAR)); if (Buffer == NULL) return; - Error = RegQueryValueExW ( - KeyHandle, - ValueName, - NULL, - NULL, - (PUCHAR)Buffer, - &Size); + Error = RegQueryValueExW(KeyHandle, + ValueName, + NULL, + NULL, + (PUCHAR)Buffer, + &Size); if (Error != ERROR_SUCCESS) goto done; @@ -166,27 +163,26 @@ if (*p == 0) /* not found, need to append it */ { - memcpy (p, Strings, len); + memcpy(p, Strings, len * sizeof(WCHAR)); p[len] = 0; - Total += len; + Total += len * sizeof(WCHAR); } Strings += len; } if (Total != Size) { - DPRINT ("setting value %S to %S\n", ValueName, Buffer); - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - REG_MULTI_SZ, - (PUCHAR)Buffer, - Total * sizeof(WCHAR)); + DPRINT("setting value %S to %S\n", ValueName, Buffer); + RegSetValueExW(KeyHandle, + ValueName, + 0, + REG_MULTI_SZ, + (PUCHAR)Buffer, + Total + sizeof(WCHAR)); } done: - free (Buffer); + free(Buffer); } @@ -202,7 +198,7 @@ IN PINFCONTEXT Context, IN ULONG Flags) { - WCHAR EmptyStr = (CHAR)0; + WCHAR EmptyStr = 0; ULONG Type; ULONG Size; LONG Error; @@ -211,11 +207,11 @@ { if (ValueName) { - RegDeleteValueW (KeyHandle, ValueName); + RegDeleteValueW(KeyHandle, ValueName); } else { - RegDeleteKeyW (KeyHandle, NULL); + RegDeleteKeyW(KeyHandle, NULL); } return TRUE; @@ -226,19 +222,16 @@ if (Flags & (FLG_ADDREG_NOCLOBBER | FLG_ADDREG_OVERWRITEONLY)) { - Error = RegQueryValueExW ( - KeyHandle, - ValueName, - NULL, - NULL, - NULL, - NULL); - if ((Error == ERROR_SUCCESS) && - (Flags & FLG_ADDREG_NOCLOBBER)) + Error = RegQueryValueExW(KeyHandle, + ValueName, + NULL, + NULL, + NULL, + NULL); + if ((Error == ERROR_SUCCESS) && (Flags & FLG_ADDREG_NOCLOBBER)) return TRUE; - if ((Error != ERROR_SUCCESS) && - (Flags & FLG_ADDREG_OVERWRITEONLY)) + if ((Error != ERROR_SUCCESS) && (Flags & FLG_ADDREG_OVERWRITEONLY)) return TRUE; } @@ -274,22 +267,22 @@ } if (!(Flags & FLG_ADDREG_BINVALUETYPE) || - (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5)) + (Type == REG_DWORD && InfHostGetFieldCount(Context) == 5)) { PWCHAR Str = NULL; if (Type == REG_MULTI_SZ) { - if (InfHostGetMultiSzField (Context, 5, NULL, 0, &Size) != 0) + if (InfHostGetMultiSzField(Context, 5, NULL, 0, &Size) != 0) Size = 0; if (Size) { - Str = malloc (Size * sizeof(WCHAR)); + Str = malloc(Size * sizeof(WCHAR)); if (Str == NULL) return FALSE; - InfHostGetMultiSzField (Context, 5, Str, Size, NULL); + InfHostGetMultiSzField(Context, 5, Str, Size, NULL); } if (Flags & FLG_ADDREG_APPEND) @@ -297,45 +290,43 @@ if (Str == NULL) return TRUE; - AppendMultiSzValue ( - KeyHandle, - ValueName, - Str, - Size); - - free (Str); + append_multi_sz_value(KeyHandle, + ValueName, + Str, + Size); + + free(Str); return TRUE; } /* else fall through to normal string handling */ } else { - if (InfHostGetStringField (Context, 5, NULL, 0, &Size) != 0) + if (InfHostGetStringField(Context, 5, NULL, 0, &Size) != 0) Size = 0; if (Size) { - Str = malloc (Size * sizeof(WCHAR)); + Str = malloc(Size * sizeof(WCHAR)); if (Str == NULL) return FALSE; - InfHostGetStringField (Context, 5, Str, Size, NULL); + InfHostGetStringField(Context, 5, Str, Size, NULL); } } if (Type == REG_DWORD) { - ULONG dw = Str ? strtoulW (Str, NULL, 0) : 0; + ULONG dw = Str ? strtoulW(Str, NULL, 0) : 0; DPRINT("setting dword %S to %x\n", ValueName, dw); - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - Type, - (const PUCHAR)&dw, - sizeof(ULONG)); + RegSetValueExW(KeyHandle, + ValueName, + 0, + Type, + (const PUCHAR)&dw, + sizeof(ULONG)); } else { @@ -343,53 +334,50 @@ if (Str) { - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - Type, - (PVOID)Str, - Size * sizeof(WCHAR)); + RegSetValueExW(KeyHandle, + ValueName, + 0, + Type, + (PVOID)Str, + Size * sizeof(WCHAR)); } else { - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - Type, - (PVOID)&EmptyStr, - sizeof(WCHAR)); - } - } - free (Str); + RegSetValueExW(KeyHandle, + ValueName, + 0, + Type, + (PVOID)&EmptyStr, + sizeof(WCHAR)); + } + } + free(Str); } else /* get the binary data */ { PUCHAR Data = NULL; - if (InfHostGetBinaryField (Context, 5, NULL, 0, &Size) != 0) + if (InfHostGetBinaryField(Context, 5, NULL, 0, &Size) != 0) Size = 0; if (Size) { - Data = malloc (Size); + Data = malloc(Size); if (Data == NULL) return FALSE; DPRINT("setting binary data %S len %d\n", ValueName, Size); - InfHostGetBinaryField (Context, 5, Data, Size, NULL); - } - - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - Type, - (PVOID)Data, - Size); - - free (Data); + InfHostGetBinaryField(Context, 5, Data, Size, NULL); + } + + RegSetValueExW(KeyHandle, + ValueName, + 0, + Type, + (PVOID)Data, + Size); + + free(Data); } return TRUE; @@ -401,7 +389,7 @@ * Called once for each AddReg and DelReg entry in a given section. */ static BOOL -registry_callback (HINF hInf, PWCHAR Section, BOOL Delete) +registry_callback(HINF hInf, PWCHAR Section, BOOL Delete) { WCHAR Buffer[MAX_INF_STRING_LENGTH]; PWCHAR ValuePtr; @@ -413,21 +401,21 @@ BOOL Ok; - Ok = InfHostFindFirstLine (hInf, Section, NULL, &Context) == 0; + Ok = InfHostFindFirstLine(hInf, Section, NULL, &Context) == 0; if (!Ok) return TRUE; /* Don't fail if the section isn't present */ - for (;Ok; Ok = (InfHostFindNextLine (Context, Context) == 0)) + for (;Ok; Ok = (InfHostFindNextLine(Context, Context) == 0)) { /* get root */ - if (InfHostGetStringField (Context, 1, Buffer, MAX_INF_STRING_LENGTH, NULL) != 0) + if (InfHostGetStringField(Context, 1, Buffer, sizeof(Buffer)/sizeof(WCHAR), NULL) != 0) continue; - if (!GetRootKey (Buffer)) + if (!get_root_key(Buffer)) continue; /* get key */ - Length = strlenW (Buffer); - if (InfHostGetStringField (Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - (ULONG)Length, NULL) != 0) + Length = strlenW(Buffer); + if (InfHostGetStringField(Context, 2, Buffer + Length, sizeof(Buffer)/sizeof(WCHAR) - (ULONG)Length, NULL) != 0) *Buffer = 0; DPRINT("KeyName: <%S>\n", Buffer); @@ -439,7 +427,7 @@ else { /* get flags */ - if (InfHostGetIntField (Context, 4, (INT *)&Flags) != 0) + if (InfHostGetIntField(Context, 4, (INT *)&Flags) != 0) Flags = 0; } @@ -447,7 +435,7 @@ if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) { - if (RegOpenKeyW (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) + if (RegOpenKeyW(NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) { DPRINT("RegOpenKey(%S) failed\n", Buffer); continue; /* ignore if it doesn't exist */ @@ -455,7 +443,7 @@ } else { - if (RegCreateKeyW (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) + if (RegCreateKeyW(NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) { DPRINT("RegCreateKey(%S) failed\n", Buffer); continue; @@ -463,7 +451,7 @@ } /* get value name */ - if (InfHostGetStringField (Context, 3, Buffer, MAX_INF_STRING_LENGTH, NULL) == 0) + if (InfHostGetStringField(Context, 3, Buffer, sizeof(Buffer)/sizeof(WCHAR), NULL) == 0) { ValuePtr = Buffer; } @@ -473,7 +461,7 @@ } /* and now do it */ - if (!do_reg_operation (KeyHandle, ValuePtr, Context, Flags)) + if (!do_reg_operation(KeyHandle, ValuePtr, Context, Flags)) { return FALSE; } @@ -494,21 +482,25 @@ /* Load inf file from install media. */ if (InfHostOpenFile(&hInf, FileName, 0, &ErrorLine) != 0) { - DPRINT1 ("InfHostOpenFile(%s) failed\n", FileName); + DPRINT1("InfHostOpenFile(%s) failed\n", FileName); return FALSE; } - if (!registry_callback (hInf, (PWCHAR)DelReg, TRUE)) - { - DPRINT1 ("registry_callback() for DelReg failed\n"); - } - - if (!registry_callback (hInf, (PWCHAR)AddReg, FALSE)) - { - DPRINT1 ("registry_callback() for AddReg failed\n"); - } - - InfHostCloseFile (hInf); + if (!registry_callback(hInf, (PWCHAR)DelReg, TRUE)) + { + DPRINT1("registry_callback() for DelReg failed\n"); + InfHostCloseFile(hInf); + return FALSE; + } + + if (!registry_callback(hInf, (PWCHAR)AddReg, FALSE)) + { + DPRINT1("registry_callback() for AddReg failed\n"); + InfHostCloseFile(hInf); + return FALSE; + } + + InfHostCloseFile(hInf); return TRUE; } Modified: branches/setup_improvements/sdk/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/mk… ============================================================================== --- branches/setup_improvements/sdk/tools/mkhive/registry.c [iso-8859-1] (original) +++ branches/setup_improvements/sdk/tools/mkhive/registry.c [iso-8859-1] Fri Jun 2 00:34:10 2017 @@ -21,7 +21,8 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/registry.c * PURPOSE: Registry code - * PROGRAMMER: HervÃ© Poussineau + * PROGRAMMERS: HervÃ© Poussineau + * HermÃ¨s BÃ©lusca-MaÃ¯to */ /* @@ -38,12 +39,13 @@ static CMHIVE RootHive; static PMEMKEY RootKey; -CMHIVE DefaultHive; /* \Registry\User\.DEFAULT */ -CMHIVE SamHive; /* \Registry\Machine\SAM */ -CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ -CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ -CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ -CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ + +static CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ +static CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ +static CMHIVE DefaultHive; /* \Registry\User\.DEFAULT */ +static CMHIVE SamHive; /* \Registry\Machine\SAM */ +static CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ +static CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ // // TODO: Write these values in a more human-readable form. @@ -56,7 +58,7 @@ // A cross-check was subsequently done with the system hives to verify that // the security descriptors were the same. // -UCHAR BcdSecurity[] = +static UCHAR BcdSecurity[] = { // SECURITY_DESCRIPTOR_RELATIVE 0x01, // Revision @@ -118,7 +120,7 @@ 0x01, 0x02, 0x00, 0x00 }; -UCHAR SoftwareSecurity[] = +static UCHAR SoftwareSecurity[] = { // SECURITY_DESCRIPTOR_RELATIVE 0x01, // Revision @@ -234,7 +236,7 @@ }; // Same security for SYSTEM, SAM and .DEFAULT -UCHAR SystemSecurity[] = +static UCHAR SystemSecurity[] = { // SECURITY_DESCRIPTOR_RELATIVE 0x01, // Revision @@ -330,6 +332,24 @@ 0x01, 0x02, 0x00, 0x00 }; + +HIVE_LIST_ENTRY RegistryHives[/*MAX_NUMBER_OF_REGISTRY_HIVES*/] = +{ + /* Special Setup system registry hive */ + // WARNING: Please *keep* it in first position! + { "SETUPREG", L"Registry\\Machine\\SYSTEM" , &SystemHive , SystemSecurity , sizeof(SystemSecurity) }, + + /* Regular registry hives */ + { "SYSTEM" , L"Registry\\Machine\\SYSTEM" , &SystemHive , SystemSecurity , sizeof(SystemSecurity) }, + { "SOFTWARE", L"Registry\\Machine\\SOFTWARE" , &SoftwareHive, SoftwareSecurity, sizeof(SoftwareSecurity) }, + { "DEFAULT" , L"Registry\\User\\.DEFAULT" , &DefaultHive , SystemSecurity , sizeof(SystemSecurity) }, + { "SAM" , L"Registry\\Machine\\SAM" , &SamHive , SystemSecurity , sizeof(SystemSecurity) }, + { "SECURITY", L"Registry\\Machine\\SECURITY" , &SecurityHive, NULL , 0 }, + { "BCD" , L"Registry\\Machine\\BCD00000000", &BcdHive , BcdSecurity , sizeof(BcdSecurity) }, +}; +C_ASSERT(_countof(RegistryHives) == MAX_NUMBER_OF_REGISTRY_HIVES); + + static PMEMKEY CreateInMemoryStructure( IN PCMHIVE RegistryHive, @@ -346,6 +366,7 @@ return Key; } +LIST_ENTRY CmiHiveListHead; LIST_ENTRY CmiReparsePointsHead; static LONG @@ -671,9 +692,9 @@ RepGetValueData( IN PHHIVE Hive, IN PCM_KEY_VALUE ValueCell, - OUT ULONG* Type OPTIONAL, + OUT PULONG Type OPTIONAL, OUT PUCHAR Data OPTIONAL, - IN OUT ULONG* DataSize OPTIONAL) + IN OUT PULONG DataSize OPTIONAL) { ULONG DataLength; PVOID DataCell; @@ -759,16 +780,16 @@ ConnectRegistry( IN HKEY RootKey, IN PCMHIVE HiveToConnect, - IN PUCHAR Descriptor, - IN ULONG DescriptorLength, - IN LPCWSTR Path) + IN PUCHAR SecurityDescriptor, + IN ULONG SecurityDescriptorLength, + IN PCWSTR Path) { NTSTATUS Status; PREPARSE_POINT ReparsePoint; PMEMKEY NewKey; LONG rc; - ReparsePoint = (PREPARSE_POINT)malloc(sizeof(REPARSE_POINT)); + ReparsePoint = (PREPARSE_POINT)malloc(sizeof(*ReparsePoint)); if (!ReparsePoint) return FALSE; @@ -794,7 +815,7 @@ */ Status = CmiCreateSecurityKey(&HiveToConnect->Hive, HiveToConnect->Hive.BaseBlock->RootCell, - Descriptor, DescriptorLength); + SecurityDescriptor, SecurityDescriptorLength); if (!NT_SUCCESS(Status)) DPRINT1("Failed to add security for root key '%S'\n", Path); @@ -821,18 +842,64 @@ ReparsePoint->DestinationHive = NewKey->RegistryHive; ReparsePoint->DestinationKeyCellOffset = NewKey->KeyCellOffset; InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); + return TRUE; } -LIST_ENTRY CmiHiveListHead; +static BOOL +CreateSymLink( + IN PCWSTR LinkKeyPath OPTIONAL, + IN OUT PHKEY LinkKeyHandle OPTIONAL, + // IN PCWSTR TargetKeyPath OPTIONAL, + IN HKEY TargetKeyHandle) +{ + PMEMKEY LinkKey, TargetKey; + PREPARSE_POINT ReparsePoint; + + ReparsePoint = (PREPARSE_POINT)malloc(sizeof(*ReparsePoint)); + if (!ReparsePoint) + return FALSE; + + if (LinkKeyPath && !(LinkKeyHandle && *LinkKeyHandle)) + { + /* Create the link key */ + RegCreateKeyExW(NULL, + LinkKeyPath, + 0, + NULL, + REG_OPTION_VOLATILE, + 0, + NULL, + (HKEY*)&LinkKey, + NULL); + } + else if (LinkKeyHandle) + { + /* Use the user-provided link key handle */ + LinkKey = HKEY_TO_MEMKEY(*LinkKeyHandle); + } + + if (LinkKeyHandle) + *LinkKeyHandle = MEMKEY_TO_HKEY(LinkKey); + + TargetKey = HKEY_TO_MEMKEY(TargetKeyHandle); + + ReparsePoint->SourceHive = LinkKey->RegistryHive; + ReparsePoint->SourceKeyCellOffset = LinkKey->KeyCellOffset; + ReparsePoint->DestinationHive = TargetKey->RegistryHive; + ReparsePoint->DestinationKeyCellOffset = TargetKey->KeyCellOffset; + InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); + + return TRUE; +} VOID -RegInitializeRegistry(VOID) -{ - UNICODE_STRING RootKeyName = RTL_CONSTANT_STRING(L"\\"); +RegInitializeRegistry( + IN PCSTR HiveList) +{ NTSTATUS Status; - PMEMKEY ControlSetKey, CurrentControlSetKey; - PREPARSE_POINT ReparsePoint; + UINT i; + HKEY ControlSetKey; InitializeListHead(&CmiHiveListHead); InitializeListHead(&CmiReparsePointsHead); @@ -847,70 +914,56 @@ RootKey = CreateInMemoryStructure(&RootHive, RootHive.Hive.BaseBlock->RootCell); - /* Create DEFAULT key */ - ConnectRegistry(NULL, - &DefaultHive, - SystemSecurity, sizeof(SystemSecurity), - L"Registry\\User\\.DEFAULT"); - - /* Create SAM key */ - ConnectRegistry(NULL, - &SamHive, - SystemSecurity, sizeof(SystemSecurity), - L"Registry\\Machine\\SAM"); - - /* Create SECURITY key */ - ConnectRegistry(NULL, - &SecurityHive, - NULL, 0, - L"Registry\\Machine\\SECURITY"); - - /* Create SOFTWARE key */ - ConnectRegistry(NULL, - &SoftwareHive, - SoftwareSecurity, sizeof(SoftwareSecurity), - L"Registry\\Machine\\SOFTWARE"); - - /* Create BCD key */ - ConnectRegistry(NULL, - &BcdHive, - BcdSecurity, sizeof(BcdSecurity), - L"Registry\\Machine\\BCD00000000"); - - /* Create SYSTEM key */ - ConnectRegistry(NULL, - &SystemHive, - SystemSecurity, sizeof(SystemSecurity), - L"Registry\\Machine\\SYSTEM"); - - /* Create 'ControlSet001' key */ + for (i = 0; i < _countof(RegistryHives); ++i) + { + /* Skip this registry hive if it's not in the list */ + if (!strstr(HiveList, RegistryHives[i].HiveName)) + continue; + + /* Create the registry key */ + ConnectRegistry(NULL, + RegistryHives[i].CmHive, + RegistryHives[i].SecurityDescriptor, + RegistryHives[i].SecurityDescriptorLength, + RegistryHives[i].HiveRegistryPath); + + /* If we happen to deal with the special setup registry hive, stop there */ + // if (strcmp(RegistryHives[i].HiveName, "SETUPREG") == 0) + if (i == 0) + break; + } + + /* Create the 'ControlSet001' key */ RegCreateKeyW(NULL, L"Registry\\Machine\\SYSTEM\\ControlSet001", - (HKEY*)&ControlSetKey); - - /* Create 'CurrentControlSet' key */ - RegCreateKeyExW(NULL, - L"Registry\\Machine\\SYSTEM\\CurrentControlSet", - 0, - NULL, - REG_OPTION_VOLATILE, - 0, - NULL, - (HKEY*)&CurrentControlSetKey, - NULL); - - /* Connect 'CurrentControlSet' to 'ControlSet001' */ - ReparsePoint = (PREPARSE_POINT)malloc(sizeof(REPARSE_POINT)); - ReparsePoint->SourceHive = CurrentControlSetKey->RegistryHive; - ReparsePoint->SourceKeyCellOffset = CurrentControlSetKey->KeyCellOffset; - ReparsePoint->DestinationHive = ControlSetKey->RegistryHive; - ReparsePoint->DestinationKeyCellOffset = ControlSetKey->KeyCellOffset; - InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); + &ControlSetKey); + + /* Create the 'CurrentControlSet' key as a symlink to 'ControlSet001' */ + CreateSymLink(L"Registry\\Machine\\SYSTEM\\CurrentControlSet", + NULL, ControlSetKey); + +#if 0 + /* Link SECURITY to SAM */ + CmpLinkKeyToHive(L"\\Registry\\Machine\\Security\\SAM", L"\\Registry\\Machine\\SAM\\SAM"); + /* Link S-1-5-18 to .Default */ + CmpLinkKeyToHive(L"\\Registry\\User\\S-1-5-18", L"\\Registry\\User\\.Default"); +#endif } VOID RegShutdownRegistry(VOID) { + PLIST_ENTRY Entry; + PREPARSE_POINT ReparsePoint; + + /* Clean up the reparse points list */ + while (!IsListEmpty(&CmiReparsePointsHead)) + { + Entry = RemoveHeadList(&CmiReparsePointsHead); + ReparsePoint = CONTAINING_RECORD(Entry, REPARSE_POINT, ListEntry); + free(ReparsePoint); + } + /* FIXME: clean up the complete hive */ free(RootKey); Modified: branches/setup_improvements/sdk/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/mk… ============================================================================== --- branches/setup_improvements/sdk/tools/mkhive/registry.h [iso-8859-1] (original) +++ branches/setup_improvements/sdk/tools/mkhive/registry.h [iso-8859-1] Fri Jun 2 00:34:10 2017 @@ -26,12 +26,17 @@ #define HKEY_TO_MEMKEY(hKey) ((PMEMKEY)(hKey)) #define MEMKEY_TO_HKEY(memKey) ((HKEY)(memKey)) -extern CMHIVE DefaultHive; /* \Registry\User\.DEFAULT */ -extern CMHIVE SamHive; /* \Registry\Machine\SAM */ -extern CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ -extern CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ -extern CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ -extern CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ +typedef struct _HIVE_LIST_ENTRY +{ + PCSTR HiveName; + PCWSTR HiveRegistryPath; + PCMHIVE CmHive; + PUCHAR SecurityDescriptor; + ULONG SecurityDescriptorLength; +} HIVE_LIST_ENTRY, *PHIVE_LIST_ENTRY; + +#define MAX_NUMBER_OF_REGISTRY_HIVES 7 +extern HIVE_LIST_ENTRY RegistryHives[]; #define ERROR_SUCCESS 0L #define ERROR_UNSUCCESSFUL 1L @@ -57,7 +62,8 @@ #define REG_QWORD_LITTLE_ENDIAN 11 VOID -RegInitializeRegistry(VOID); +RegInitializeRegistry( + IN PCSTR HiveList); VOID RegShutdownRegistry(VOID);

1 0

[hbelusca] 74740: [MKHIVE]: Fix string byte size vs. count in number of characters confusion in append_multi_sz_value(); this was already OK in wine's code. Should fix corrupted multi-string entrie...
by hbelusca＠svn.reactos.org 02 Jun '17

02 Jun '17

Author: hbelusca Date: Fri Jun 2 00:05:53 2017 New Revision: 74740 URL: http://svn.reactos.org/svn/reactos?rev=74740&view=rev Log: [MKHIVE]: Fix string byte size vs. count in number of characters confusion in append_multi_sz_value(); this was already OK in wine's code. Should fix corrupted multi-string entries in the livecd registry hives, for example... In addition, always open the hive file to be created in write mode only. CORE-13347 Modified: trunk/reactos/sdk/tools/mkhive/binhive.c trunk/reactos/sdk/tools/mkhive/reginf.c Modified: trunk/reactos/sdk/tools/mkhive/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/binhive.c… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/binhive.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/binhive.c [iso-8859-1] Fri Jun 2 00:05:53 2017 @@ -41,7 +41,7 @@ printf(" Creating binary hive: %s\n", FileName); /* Create new hive file */ - File = fopen(FileName, "w+b"); + File = fopen(FileName, "wb"); if (File == NULL) { printf(" Error creating/opening file\n"); Modified: trunk/reactos/sdk/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/reginf.c?… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/reginf.c [iso-8859-1] Fri Jun 2 00:05:53 2017 @@ -120,11 +120,10 @@ IN HKEY KeyHandle, IN PWCHAR ValueName, IN PWCHAR Strings, - IN ULONG StringSize) + IN ULONG StringSize) // In characters { - ULONG Size; + ULONG Size, Total; // In bytes ULONG Type; - ULONG Total; PWCHAR Buffer; PWCHAR p; size_t len; @@ -139,7 +138,7 @@ if ((Error != ERROR_SUCCESS) || (Type != REG_MULTI_SZ)) return; - Buffer = malloc ((Size + StringSize) * sizeof(WCHAR)); + Buffer = malloc(Size + StringSize * sizeof(WCHAR)); if (Buffer == NULL) return; @@ -164,9 +163,9 @@ if (*p == 0) /* not found, need to append it */ { - memcpy (p, Strings, len); + memcpy(p, Strings, len * sizeof(WCHAR)); p[len] = 0; - Total += len; + Total += len * sizeof(WCHAR); } Strings += len; } @@ -179,7 +178,7 @@ 0, REG_MULTI_SZ, (PUCHAR)Buffer, - Total * sizeof(WCHAR)); + Total + sizeof(WCHAR)); } done:

1 0

[hbelusca] 74739: [MKHIVE]: Formatting changes only + sync back the names of the reg-inf functions with the ones where they are coming from (aka. Wine's setupapi/install.c).
by hbelusca＠svn.reactos.org 02 Jun '17

02 Jun '17

Author: hbelusca Date: Fri Jun 2 00:00:37 2017 New Revision: 74739 URL: http://svn.reactos.org/svn/reactos?rev=74739&view=rev Log: [MKHIVE]: Formatting changes only + sync back the names of the reg-inf functions with the ones where they are coming from (aka. Wine's setupapi/install.c). Modified: trunk/reactos/sdk/tools/mkhive/binhive.c trunk/reactos/sdk/tools/mkhive/reginf.c Modified: trunk/reactos/sdk/tools/mkhive/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/binhive.c… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/binhive.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/binhive.c [iso-8859-1] Fri Jun 2 00:00:37 2017 @@ -33,26 +33,26 @@ BOOL ExportBinaryHive( IN PCSTR FileName, - IN PCMHIVE Hive) + IN PCMHIVE CmHive) { FILE *File; BOOL ret; - printf (" Creating binary hive: %s\n", FileName); + printf(" Creating binary hive: %s\n", FileName); /* Create new hive file */ - File = fopen (FileName, "w+b"); + File = fopen(FileName, "w+b"); if (File == NULL) { printf(" Error creating/opening file\n"); return FALSE; } - fseek (File, 0, SEEK_SET); + fseek(File, 0, SEEK_SET); - Hive->FileHandles[HFILE_TYPE_PRIMARY] = (HANDLE)File; - ret = HvWriteHive(&Hive->Hive); - fclose (File); + CmHive->FileHandles[HFILE_TYPE_PRIMARY] = (HANDLE)File; + ret = HvWriteHive(&CmHive->Hive); + fclose(File); return ret; } Modified: trunk/reactos/sdk/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/reginf.c?… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/reginf.c [iso-8859-1] Fri Jun 2 00:00:37 2017 @@ -21,7 +21,7 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/reginf.c * PURPOSE: Inf file import code - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl * Hervé Poussineau */ @@ -68,40 +68,40 @@ /* FUNCTIONS ****************************************************************/ static BOOL -GetRootKey (PWCHAR Name) +get_root_key(PWCHAR Name) { - if (!strcmpiW (Name, HKCR)) - { - strcpyW (Name, HKCRPath); - return TRUE; - } - - if (!strcmpiW (Name, HKCU)) - { - strcpyW (Name, HKCUPath); - return TRUE; - } - - if (!strcmpiW (Name, HKLM)) - { - strcpyW (Name, HKLMPath); - return TRUE; - } - - if (!strcmpiW (Name, HKU)) - { - strcpyW (Name, HKUPath); - return TRUE; - } - - if (!strcmpiW (Name, BCD)) - { - strcpyW (Name, BCDPath); + if (!strcmpiW(Name, HKCR)) + { + strcpyW(Name, HKCRPath); + return TRUE; + } + + if (!strcmpiW(Name, HKCU)) + { + strcpyW(Name, HKCUPath); + return TRUE; + } + + if (!strcmpiW(Name, HKLM)) + { + strcpyW(Name, HKLMPath); + return TRUE; + } + + if (!strcmpiW(Name, HKU)) + { + strcpyW(Name, HKUPath); + return TRUE; + } + + if (!strcmpiW(Name, BCD)) + { + strcpyW(Name, BCDPath); return TRUE; } #if 0 - if (!strcmpiW (Name, HKR)) + if (!strcmpiW(Name, HKR)) return FALSE; #endif @@ -110,12 +110,13 @@ /*********************************************************************** - * AppendMultiSzValue + * append_multi_sz_value * * Append a multisz string to a multisz registry value. */ +// NOTE: Synced with setupapi/install.c ; see also usetup/registry.c static VOID -AppendMultiSzValue ( +append_multi_sz_value( IN HKEY KeyHandle, IN PWCHAR ValueName, IN PWCHAR Strings, @@ -129,28 +130,25 @@ size_t len; LONG Error; - Error = RegQueryValueExW ( - KeyHandle, - ValueName, - NULL, - &Type, - NULL, - &Size); - if ((Error != ERROR_SUCCESS) || - (Type != REG_MULTI_SZ)) + Error = RegQueryValueExW(KeyHandle, + ValueName, + NULL, + &Type, + NULL, + &Size); + if ((Error != ERROR_SUCCESS) || (Type != REG_MULTI_SZ)) return; Buffer = malloc ((Size + StringSize) * sizeof(WCHAR)); if (Buffer == NULL) return; - Error = RegQueryValueExW ( - KeyHandle, - ValueName, - NULL, - NULL, - (PUCHAR)Buffer, - &Size); + Error = RegQueryValueExW(KeyHandle, + ValueName, + NULL, + NULL, + (PUCHAR)Buffer, + &Size); if (Error != ERROR_SUCCESS) goto done; @@ -175,18 +173,17 @@ if (Total != Size) { - DPRINT ("setting value %S to %S\n", ValueName, Buffer); - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - REG_MULTI_SZ, - (PUCHAR)Buffer, - Total * sizeof(WCHAR)); + DPRINT("setting value %S to %S\n", ValueName, Buffer); + RegSetValueExW(KeyHandle, + ValueName, + 0, + REG_MULTI_SZ, + (PUCHAR)Buffer, + Total * sizeof(WCHAR)); } done: - free (Buffer); + free(Buffer); } @@ -202,7 +199,7 @@ IN PINFCONTEXT Context, IN ULONG Flags) { - WCHAR EmptyStr = (CHAR)0; + WCHAR EmptyStr = 0; ULONG Type; ULONG Size; LONG Error; @@ -211,11 +208,11 @@ { if (ValueName) { - RegDeleteValueW (KeyHandle, ValueName); + RegDeleteValueW(KeyHandle, ValueName); } else { - RegDeleteKeyW (KeyHandle, NULL); + RegDeleteKeyW(KeyHandle, NULL); } return TRUE; @@ -226,19 +223,16 @@ if (Flags & (FLG_ADDREG_NOCLOBBER | FLG_ADDREG_OVERWRITEONLY)) { - Error = RegQueryValueExW ( - KeyHandle, - ValueName, - NULL, - NULL, - NULL, - NULL); - if ((Error == ERROR_SUCCESS) && - (Flags & FLG_ADDREG_NOCLOBBER)) + Error = RegQueryValueExW(KeyHandle, + ValueName, + NULL, + NULL, + NULL, + NULL); + if ((Error == ERROR_SUCCESS) && (Flags & FLG_ADDREG_NOCLOBBER)) return TRUE; - if ((Error != ERROR_SUCCESS) && - (Flags & FLG_ADDREG_OVERWRITEONLY)) + if ((Error != ERROR_SUCCESS) && (Flags & FLG_ADDREG_OVERWRITEONLY)) return TRUE; } @@ -274,22 +268,22 @@ } if (!(Flags & FLG_ADDREG_BINVALUETYPE) || - (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5)) + (Type == REG_DWORD && InfHostGetFieldCount(Context) == 5)) { PWCHAR Str = NULL; if (Type == REG_MULTI_SZ) { - if (InfHostGetMultiSzField (Context, 5, NULL, 0, &Size) != 0) + if (InfHostGetMultiSzField(Context, 5, NULL, 0, &Size) != 0) Size = 0; if (Size) { - Str = malloc (Size * sizeof(WCHAR)); + Str = malloc(Size * sizeof(WCHAR)); if (Str == NULL) return FALSE; - InfHostGetMultiSzField (Context, 5, Str, Size, NULL); + InfHostGetMultiSzField(Context, 5, Str, Size, NULL); } if (Flags & FLG_ADDREG_APPEND) @@ -297,45 +291,43 @@ if (Str == NULL) return TRUE; - AppendMultiSzValue ( - KeyHandle, - ValueName, - Str, - Size); - - free (Str); + append_multi_sz_value(KeyHandle, + ValueName, + Str, + Size); + + free(Str); return TRUE; } /* else fall through to normal string handling */ } else { - if (InfHostGetStringField (Context, 5, NULL, 0, &Size) != 0) + if (InfHostGetStringField(Context, 5, NULL, 0, &Size) != 0) Size = 0; if (Size) { - Str = malloc (Size * sizeof(WCHAR)); + Str = malloc(Size * sizeof(WCHAR)); if (Str == NULL) return FALSE; - InfHostGetStringField (Context, 5, Str, Size, NULL); + InfHostGetStringField(Context, 5, Str, Size, NULL); } } if (Type == REG_DWORD) { - ULONG dw = Str ? strtoulW (Str, NULL, 0) : 0; + ULONG dw = Str ? strtoulW(Str, NULL, 0) : 0; DPRINT("setting dword %S to %x\n", ValueName, dw); - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - Type, - (const PUCHAR)&dw, - sizeof(ULONG)); + RegSetValueExW(KeyHandle, + ValueName, + 0, + Type, + (const PUCHAR)&dw, + sizeof(ULONG)); } else { @@ -343,53 +335,50 @@ if (Str) { - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - Type, - (PVOID)Str, - Size * sizeof(WCHAR)); + RegSetValueExW(KeyHandle, + ValueName, + 0, + Type, + (PVOID)Str, + Size * sizeof(WCHAR)); } else { - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - Type, - (PVOID)&EmptyStr, - sizeof(WCHAR)); - } - } - free (Str); + RegSetValueExW(KeyHandle, + ValueName, + 0, + Type, + (PVOID)&EmptyStr, + sizeof(WCHAR)); + } + } + free(Str); } else /* get the binary data */ { PUCHAR Data = NULL; - if (InfHostGetBinaryField (Context, 5, NULL, 0, &Size) != 0) + if (InfHostGetBinaryField(Context, 5, NULL, 0, &Size) != 0) Size = 0; if (Size) { - Data = malloc (Size); + Data = malloc(Size); if (Data == NULL) return FALSE; DPRINT("setting binary data %S len %d\n", ValueName, Size); - InfHostGetBinaryField (Context, 5, Data, Size, NULL); - } - - RegSetValueExW ( - KeyHandle, - ValueName, - 0, - Type, - (PVOID)Data, - Size); - - free (Data); + InfHostGetBinaryField(Context, 5, Data, Size, NULL); + } + + RegSetValueExW(KeyHandle, + ValueName, + 0, + Type, + (PVOID)Data, + Size); + + free(Data); } return TRUE; @@ -401,7 +390,7 @@ * Called once for each AddReg and DelReg entry in a given section. */ static BOOL -registry_callback (HINF hInf, PWCHAR Section, BOOL Delete) +registry_callback(HINF hInf, PWCHAR Section, BOOL Delete) { WCHAR Buffer[MAX_INF_STRING_LENGTH]; PWCHAR ValuePtr; @@ -413,21 +402,21 @@ BOOL Ok; - Ok = InfHostFindFirstLine (hInf, Section, NULL, &Context) == 0; + Ok = InfHostFindFirstLine(hInf, Section, NULL, &Context) == 0; if (!Ok) return TRUE; /* Don't fail if the section isn't present */ - for (;Ok; Ok = (InfHostFindNextLine (Context, Context) == 0)) + for (;Ok; Ok = (InfHostFindNextLine(Context, Context) == 0)) { /* get root */ - if (InfHostGetStringField (Context, 1, Buffer, MAX_INF_STRING_LENGTH, NULL) != 0) + if (InfHostGetStringField(Context, 1, Buffer, sizeof(Buffer)/sizeof(WCHAR), NULL) != 0) continue; - if (!GetRootKey (Buffer)) + if (!get_root_key(Buffer)) continue; /* get key */ - Length = strlenW (Buffer); - if (InfHostGetStringField (Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - (ULONG)Length, NULL) != 0) + Length = strlenW(Buffer); + if (InfHostGetStringField(Context, 2, Buffer + Length, sizeof(Buffer)/sizeof(WCHAR) - (ULONG)Length, NULL) != 0) *Buffer = 0; DPRINT("KeyName: <%S>\n", Buffer); @@ -439,7 +428,7 @@ else { /* get flags */ - if (InfHostGetIntField (Context, 4, (INT *)&Flags) != 0) + if (InfHostGetIntField(Context, 4, (INT *)&Flags) != 0) Flags = 0; } @@ -447,7 +436,7 @@ if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) { - if (RegOpenKeyW (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) + if (RegOpenKeyW(NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) { DPRINT("RegOpenKey(%S) failed\n", Buffer); continue; /* ignore if it doesn't exist */ @@ -455,7 +444,7 @@ } else { - if (RegCreateKeyW (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) + if (RegCreateKeyW(NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) { DPRINT("RegCreateKey(%S) failed\n", Buffer); continue; @@ -463,7 +452,7 @@ } /* get value name */ - if (InfHostGetStringField (Context, 3, Buffer, MAX_INF_STRING_LENGTH, NULL) == 0) + if (InfHostGetStringField(Context, 3, Buffer, sizeof(Buffer)/sizeof(WCHAR), NULL) == 0) { ValuePtr = Buffer; } @@ -473,7 +462,7 @@ } /* and now do it */ - if (!do_reg_operation (KeyHandle, ValuePtr, Context, Flags)) + if (!do_reg_operation(KeyHandle, ValuePtr, Context, Flags)) { return FALSE; } @@ -494,25 +483,25 @@ /* Load inf file from install media. */ if (InfHostOpenFile(&hInf, FileName, 0, &ErrorLine) != 0) { - DPRINT1 ("InfHostOpenFile(%s) failed\n", FileName); + DPRINT1("InfHostOpenFile(%s) failed\n", FileName); return FALSE; } - if (!registry_callback (hInf, (PWCHAR)DelReg, TRUE)) - { - DPRINT1 ("registry_callback() for DelReg failed\n"); - InfHostCloseFile (hInf); + if (!registry_callback(hInf, (PWCHAR)DelReg, TRUE)) + { + DPRINT1("registry_callback() for DelReg failed\n"); + InfHostCloseFile(hInf); return FALSE; } - if (!registry_callback (hInf, (PWCHAR)AddReg, FALSE)) - { - DPRINT1 ("registry_callback() for AddReg failed\n"); - InfHostCloseFile (hInf); + if (!registry_callback(hInf, (PWCHAR)AddReg, FALSE)) + { + DPRINT1("registry_callback() for AddReg failed\n"); + InfHostCloseFile(hInf); return FALSE; } - InfHostCloseFile (hInf); + InfHostCloseFile(hInf); return TRUE; }

1 0

[hbelusca] 74738: [MKHIVE]: Implement CmpFileRead().
by hbelusca＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: hbelusca Date: Thu Jun 1 23:54:08 2017 New Revision: 74738 URL: http://svn.reactos.org/svn/reactos?rev=74738&view=rev Log: [MKHIVE]: Implement CmpFileRead(). Modified: trunk/reactos/sdk/tools/mkhive/cmi.c Modified: trunk/reactos/sdk/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/cmi.c?rev… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/cmi.c [iso-8859-1] Thu Jun 1 23:54:08 2017 @@ -55,8 +55,12 @@ OUT PVOID Buffer, IN SIZE_T BufferLength) { - DPRINT1("CmpFileRead() unimplemented\n"); - return FALSE; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + FILE *File = CmHive->FileHandles[HFILE_TYPE_PRIMARY]; + if (fseek(File, *FileOffset, SEEK_SET) != 0) + return FALSE; + + return (fread(Buffer, 1, BufferLength, File) == BufferLength); } static BOOLEAN

1 0

[pschweitzer] 74737: [RDBSS] Fix uninit var usage CORE-13345 CORE-11327
by pschweitzer＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: pschweitzer Date: Thu Jun 1 21:37:08 2017 New Revision: 74737 URL: http://svn.reactos.org/svn/reactos?rev=74737&view=rev Log: [RDBSS] Fix uninit var usage CORE-13345 CORE-11327 Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Thu Jun 1 21:37:08 2017 @@ -809,7 +809,7 @@ } /* Validate name is correct */ - for (NextChar = 0; CurChar + 1 < MaxChars; NextChar = CurChar + 1) + for (NextChar = 0, CurChar = 0; CurChar + 1 < MaxChars; NextChar = CurChar + 1) { USHORT i;

1 0

[hbelusca] 74736: [BUGCODES]: Move our MORAL_EXCEPTION_ERROR BSOD to where it should really belong (aka BSOD 0x9A) (see https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/bug-check-...
by hbelusca＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: hbelusca Date: Thu Jun 1 20:20:25 2017 New Revision: 74736 URL: http://svn.reactos.org/svn/reactos?rev=74736&view=rev Log: [BUGCODES]: Move our MORAL_EXCEPTION_ERROR BSOD to where it should really belong (aka BSOD 0x9A) (see https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/bug-chec… why). BSOD 0x7C is however legit: BUGCODE_NDIS_DRIVER. Modified: trunk/reactos/sdk/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/sdk/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/mc/bug… ============================================================================== --- trunk/reactos/sdk/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/mc/bugcodes.mc [iso-8859-1] Thu Jun 1 20:20:25 2017 @@ -1093,15 +1093,9 @@ MessageId=0x7C Severity=Success Facility=System -SymbolicName=MORAL_EXCEPTION_ERROR -Language=English -An attempt was made to execute a proprietary machine code instruction. -The system has been shut down to prevent damage to your conscience. - -If this is the first time you have seen this error screen, read -<http://www.gnu.org/philosophy/free-sw.html>. - -If problems continue, remove all nonfree software from your computer. +SymbolicName=BUGCODE_NDIS_DRIVER +Language=English +BUGCODE_NDIS_DRIVER . MessageId=0x7D @@ -1197,6 +1191,20 @@ SymbolicName=INVALID_WORK_QUEUE_ITEM Language=English INVALID_WORK_QUEUE_ITEM +. + +MessageId=0x9A +Severity=Success +Facility=System +SymbolicName=MORAL_EXCEPTION_ERROR +Language=English +An attempt was made to execute a proprietary machine code instruction. +The system has been shut down to prevent damage to your conscience. + +If this is the first time you have seen this error screen, read +<http://www.gnu.org/philosophy/free-sw.html>. + +If problems continue, remove all nonfree software from your computer. . MessageId=0xA0

1 0

[hbelusca] 74735: [NTOS]: Better clean up behind ourselves on failure paths (aka. closing handles). These functions are clearly not written with correct cleanup-on-failure concept in mind...
by hbelusca＠svn.reactos.org 01 Jun '17

01 Jun '17

Author: hbelusca Date: Thu Jun 1 18:37:48 2017 New Revision: 74735 URL: http://svn.reactos.org/svn/reactos?rev=74735&view=rev Log: [NTOS]: Better clean up behind ourselves on failure paths (aka. closing handles). These functions are clearly not written with correct cleanup-on-failure concept in mind... Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Thu Jun 1 18:37:48 2017 @@ -382,7 +382,8 @@ NULL, NULL); Status = NtOpenKey(&SystemHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + return Status; /* Create the BIOS Information key */ RtlInitUnicodeString(&KeyName, @@ -406,7 +407,10 @@ BiosHandle = NULL; } else if (!NT_SUCCESS(Status)) + { + NtClose(SystemHandle); return Status; + } /* Create the CPU Key, and check if it already existed */ RtlInitUnicodeString(&KeyName, L"CentralProcessor"); @@ -431,7 +435,11 @@ CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, CmpConfigurationAreaSize, TAG_CM); - if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES; + if (!CmpConfigurationData) + { + // FIXME: Cleanup stuff!! + return STATUS_INSUFFICIENT_RESOURCES; + } /* Loop all CPUs */ for (i = 0; i < KeNumberProcessors; i++) @@ -440,7 +448,7 @@ Prcb = KiProcessorBlock[i]; /* Setup the Configuration Entry for the Processor */ - RtlZeroMemory(&ConfigData, sizeof (ConfigData)); + RtlZeroMemory(&ConfigData, sizeof(ConfigData)); ConfigData.ComponentEntry.Class = ProcessorClass; ConfigData.ComponentEntry.Type = CentralProcessor; ConfigData.ComponentEntry.Key = i; @@ -477,7 +485,12 @@ InterfaceTypeUndefined, 0xFFFFFFFF, IndexTable); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) + { + NtClose(BiosHandle); + NtClose(SystemHandle); + return Status; + } /* Check if we have an FPU */ if (KeI386NpxPresent) @@ -505,8 +518,10 @@ IndexTable); if (!NT_SUCCESS(Status)) { - /* Failed, close the CPU handle and return */ + /* We failed, close all the opened handles and return */ NtClose(KeyHandle); + NtClose(BiosHandle); + NtClose(SystemHandle); return Status; } @@ -672,7 +687,15 @@ Status = ZwOpenSection(&SectionHandle, SECTION_ALL_ACCESS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) goto Quickie; + if (!NT_SUCCESS(Status)) + { + /* We failed, close all the opened handles and return */ + // NtClose(KeyHandle); + NtClose(BiosHandle); + NtClose(SystemHandle); + /* 'Quickie' closes KeyHandle */ + goto Quickie; + } /* Map the first 1KB of memory to get the IVT */ ViewSize = PAGE_SIZE; @@ -939,7 +962,7 @@ if (BiosVersion) ExFreePoolWithTag(BiosVersion, TAG_CM); Quickie: - /* Close the procesor handle */ + /* Close the processor handle */ NtClose(KeyHandle); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… ============================================================================== --- trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] Thu Jun 1 18:37:48 2017 @@ -95,7 +95,7 @@ } } - /* Add slashes were we previously had NULLs */ + /* Add slashes where we previously had NULLs */ CurrentDate[4] = CurrentDate[7] = '/'; /* Check which date is newer */ @@ -244,7 +244,7 @@ PCHAR PartialString = NULL, BiosVersion; CHAR CpuString[48]; PVOID BaseAddress = NULL; - LARGE_INTEGER ViewBase = {{0}}; + LARGE_INTEGER ViewBase = {{0, 0}}; ULONG_PTR VideoRomBase; PCHAR CurrentVersion; extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; @@ -287,7 +287,8 @@ NULL, NULL); Status = NtOpenKey(&SystemHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + return Status; /* Create the BIOS Information key */ RtlInitUnicodeString(&KeyName, @@ -311,7 +312,10 @@ BiosHandle = NULL; } else if (!NT_SUCCESS(Status)) + { + NtClose(SystemHandle); return Status; + } /* Create the CPU Key, and check if it already existed */ RtlInitUnicodeString(&KeyName, L"CentralProcessor"); @@ -336,7 +340,11 @@ CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, CmpConfigurationAreaSize, TAG_CM); - if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES; + if (!CmpConfigurationData) + { + // FIXME: Cleanup stuff!! + return STATUS_INSUFFICIENT_RESOURCES; + } /* Loop all CPUs */ for (i = 0; i < KeNumberProcessors; i++) @@ -345,7 +353,7 @@ Prcb = KiProcessorBlock[i]; /* Setup the Configuration Entry for the Processor */ - RtlZeroMemory(&ConfigData, sizeof (ConfigData)); + RtlZeroMemory(&ConfigData, sizeof(ConfigData)); ConfigData.ComponentEntry.Class = ProcessorClass; ConfigData.ComponentEntry.Type = CentralProcessor; ConfigData.ComponentEntry.Key = i; @@ -382,7 +390,12 @@ InterfaceTypeUndefined, 0xFFFFFFFF, IndexTable); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) + { + NtClose(BiosHandle); + NtClose(SystemHandle); + return Status; + } { /* Setup the Configuration Entry for the FPU */ @@ -408,8 +421,10 @@ IndexTable); if (!NT_SUCCESS(Status)) { - /* Failed, close the CPU handle and return */ + /* We failed, close all the opened handles and return */ NtClose(KeyHandle); + NtClose(BiosHandle); + NtClose(SystemHandle); return Status; } @@ -428,7 +443,7 @@ //Ki386Cpuid(0x80000000, &ExtendedId, &Dummy, &Dummy, &Dummy); if (ExtendedId >= 0x80000004) { - /* Do all the CPUIDs requred to get the full name */ + /* Do all the CPUIDs required to get the full name */ PartialString = CpuString; for (ExtendedId = 2; ExtendedId <= 4; ExtendedId++) { @@ -559,7 +574,15 @@ Status = ZwOpenSection(&SectionHandle, SECTION_ALL_ACCESS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) goto Quickie; + if (!NT_SUCCESS(Status)) + { + /* We failed, close all the opened handles and return */ + // NtClose(KeyHandle); + NtClose(BiosHandle); + NtClose(SystemHandle); + /* 'Quickie' closes KeyHandle */ + goto Quickie; + } /* Map the first 1KB of memory to get the IVT */ ViewSize = PAGE_SIZE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs