Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 75244: Sync with trunk r75243.
by hbelusca＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: hbelusca Date: Fri Jun 30 17:48:54 2017 New Revision: 75244 URL: http://svn.reactos.org/svn/reactos?rev=75244&view=rev Log: Sync with trunk r75243. Added: branches/setup_improvements/dll/shellext/ntobjshex/foldercommon.cpp - copied unchanged from r75243, trunk/reactos/dll/shellext/ntobjshex/foldercommon.cpp branches/setup_improvements/dll/shellext/ntobjshex/foldercommon.h - copied unchanged from r75243, trunk/reactos/dll/shellext/ntobjshex/foldercommon.h branches/setup_improvements/dll/win32/netapi32/netlogon.c - copied unchanged from r75243, trunk/reactos/dll/win32/netapi32/netlogon.c branches/setup_improvements/drivers/usb/usbhub_new/ - copied from r75243, trunk/reactos/drivers/usb/usbhub_new/ branches/setup_improvements/sdk/include/reactos/idl/netlogon.acf - copied unchanged from r75243, trunk/reactos/sdk/include/reactos/idl/netlogon.acf branches/setup_improvements/sdk/include/reactos/idl/netlogon.idl - copied unchanged from r75243, trunk/reactos/sdk/include/reactos/idl/netlogon.idl branches/setup_improvements/win32ss/reactx/dxg/ddsurf.c - copied unchanged from r75243, trunk/reactos/win32ss/reactx/dxg/ddsurf.c Modified: branches/setup_improvements/ (props changed) branches/setup_improvements/boot/bootdata/hivedef.inf branches/setup_improvements/boot/bootdata/hivesft.inf branches/setup_improvements/boot/bootdata/hivesys.inf branches/setup_improvements/dll/appcompat/apphelp/apphelp.h branches/setup_improvements/dll/appcompat/apphelp/hsdb.c branches/setup_improvements/dll/appcompat/apphelp/sdbfileattr.c branches/setup_improvements/dll/appcompat/apphelp/sdbwrite.c branches/setup_improvements/dll/appcompat/apphelp/sdbwrite.h branches/setup_improvements/dll/cpl/appwiz/addons.c branches/setup_improvements/dll/shellext/ntobjshex/ntobjenum.cpp branches/setup_improvements/dll/shellext/ntobjshex/ntobjfolder.cpp branches/setup_improvements/dll/shellext/ntobjshex/ntobjfolder.h branches/setup_improvements/dll/shellext/ntobjshex/ntobjshex.cpp branches/setup_improvements/dll/shellext/ntobjshex/precomp.h branches/setup_improvements/dll/shellext/ntobjshex/regfolder.cpp branches/setup_improvements/dll/shellext/ntobjshex/regfolder.h branches/setup_improvements/dll/win32/browseui/lang/bg-BG.rc branches/setup_improvements/dll/win32/browseui/lang/de-DE.rc branches/setup_improvements/dll/win32/browseui/lang/en-US.rc branches/setup_improvements/dll/win32/browseui/lang/es-ES.rc branches/setup_improvements/dll/win32/browseui/lang/fr-FR.rc branches/setup_improvements/dll/win32/browseui/lang/he-IL.rc branches/setup_improvements/dll/win32/browseui/lang/it-IT.rc branches/setup_improvements/dll/win32/browseui/lang/ja-JP.rc branches/setup_improvements/dll/win32/browseui/lang/pl-PL.rc branches/setup_improvements/dll/win32/browseui/lang/pt-BR.rc branches/setup_improvements/dll/win32/browseui/lang/ro-RO.rc branches/setup_improvements/dll/win32/browseui/lang/ru-RU.rc branches/setup_improvements/dll/win32/browseui/lang/sq-AL.rc branches/setup_improvements/dll/win32/browseui/lang/tr-TR.rc branches/setup_improvements/dll/win32/browseui/lang/uk-UA.rc branches/setup_improvements/dll/win32/browseui/lang/zh-CN.rc branches/setup_improvements/dll/win32/browseui/lang/zh-TW.rc branches/setup_improvements/dll/win32/browseui/resource.h branches/setup_improvements/dll/win32/browseui/shellbars/CBandSite.cpp branches/setup_improvements/dll/win32/browseui/shellbars/CBandSite.h branches/setup_improvements/dll/win32/browseui/shellbars/shellbars.h branches/setup_improvements/dll/win32/mpr/wnet.c branches/setup_improvements/dll/win32/netapi32/CMakeLists.txt branches/setup_improvements/dll/win32/netapi32/access.c branches/setup_improvements/dll/win32/netapi32/browser.c branches/setup_improvements/dll/win32/netapi32/netapi32.spec branches/setup_improvements/drivers/filesystems/fastfat/fastio.c branches/setup_improvements/drivers/filesystems/fastfat/finfo.c branches/setup_improvements/drivers/filesystems/fastfat/vfat.h branches/setup_improvements/drivers/usb/CMakeLists.txt branches/setup_improvements/drivers/usb/usbport/endpoint.c branches/setup_improvements/drivers/usb/usbport/roothub.c branches/setup_improvements/drivers/wdm/audio/legacy/wdmaud/control.c branches/setup_improvements/drivers/wdm/audio/legacy/wdmaud/mmixer.c branches/setup_improvements/drivers/wdm/audio/legacy/wdmaud/wdmaud.h branches/setup_improvements/ntoskrnl/config/cmapi.c branches/setup_improvements/sdk/include/ddk/buffring.h branches/setup_improvements/sdk/include/ddk/fcb.h branches/setup_improvements/sdk/include/ddk/fcbtable.h branches/setup_improvements/sdk/include/ddk/mrxfcb.h branches/setup_improvements/sdk/include/ddk/prefix.h branches/setup_improvements/sdk/include/ddk/rxprocs.h branches/setup_improvements/sdk/include/ddk/rxworkq.h branches/setup_improvements/sdk/include/psdk/lmbrowsr.h branches/setup_improvements/sdk/include/psdk/usb200.h branches/setup_improvements/sdk/include/psdk/wingdi.h branches/setup_improvements/sdk/include/reactos/drivers/directx/directxint.h branches/setup_improvements/sdk/include/reactos/drivers/usbport/usbmport.h branches/setup_improvements/sdk/include/reactos/idl/browser.idl branches/setup_improvements/sdk/include/reactos/wine/winternl.h branches/setup_improvements/sdk/lib/atl/cstringt.h branches/setup_improvements/sdk/lib/cmlib/cmlib.h branches/setup_improvements/sdk/lib/cmlib/cmname.c branches/setup_improvements/sdk/lib/cmlib/cmvalue.c branches/setup_improvements/sdk/lib/cmlib/hivecell.c branches/setup_improvements/sdk/lib/drivers/rxce/rxce.c branches/setup_improvements/sdk/lib/drivers/sound/mmixer/controls.c branches/setup_improvements/sdk/lib/drivers/sound/mmixer/mixer.c branches/setup_improvements/sdk/lib/drivers/sound/mmixer/mmixer.h branches/setup_improvements/sdk/lib/drivers/sound/mmixer/precomp.h branches/setup_improvements/sdk/tools/xml2sdb/CMakeLists.txt branches/setup_improvements/sdk/tools/xml2sdb/main.cpp branches/setup_improvements/sdk/tools/xml2sdb/xml2sdb.cpp branches/setup_improvements/sdk/tools/xml2sdb/xml2sdb.h branches/setup_improvements/win32ss/gdi/ntgdi/arc.c branches/setup_improvements/win32ss/gdi/ntgdi/fillshap.c branches/setup_improvements/win32ss/gdi/ntgdi/freetype.c branches/setup_improvements/win32ss/gdi/ntgdi/line.c branches/setup_improvements/win32ss/gdi/ntgdi/print.c branches/setup_improvements/win32ss/printing/base/spoolss/printprocessors.c branches/setup_improvements/win32ss/printing/base/spoolsv/printprocessors.c branches/setup_improvements/win32ss/printing/base/winspool/printers.c branches/setup_improvements/win32ss/printing/base/winspool/printprocessors.c branches/setup_improvements/win32ss/printing/processors/winprint/main.c branches/setup_improvements/win32ss/printing/providers/localspl/printerdata.c branches/setup_improvements/win32ss/printing/providers/localspl/printers.c branches/setup_improvements/win32ss/reactx/dxg/CMakeLists.txt branches/setup_improvements/win32ss/reactx/dxg/d3d.c branches/setup_improvements/win32ss/reactx/dxg/ddhmg.c branches/setup_improvements/win32ss/reactx/dxg/ddraw.c branches/setup_improvements/win32ss/reactx/dxg/dxg_driver.h branches/setup_improvements/win32ss/reactx/dxg/dxg_int.h branches/setup_improvements/win32ss/reactx/dxg/tags.h branches/setup_improvements/win32ss/reactx/ntddraw/ddraw.c branches/setup_improvements/win32ss/reactx/ntddraw/intddraw.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/setup_improvements/boot/bootdata/hivedef.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/dll/appcompat/apphelp/apphelp.h 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/apphelp/sdbfileattr.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/appcompat/apphelp/sdbwrite.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… Modified: branches/setup_improvements/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/cpl/appw… Modified: branches/setup_improvements/dll/shellext/ntobjshex/ntobjenum.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/ntobjshex/ntobjfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/ntobjshex/ntobjfolder.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/ntobjshex/ntobjshex.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/ntobjshex/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/shellext… Modified: branches/setup_improvements/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/shellbars/CBandSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/shellbars/CBandSite.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/browseui/shellbars/shellbars.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… Modified: branches/setup_improvements/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/mp… Modified: branches/setup_improvements/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ne… Modified: branches/setup_improvements/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ne… Modified: branches/setup_improvements/dll/win32/netapi32/browser.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ne… Modified: branches/setup_improvements/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ne… Modified: branches/setup_improvements/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/file… Modified: branches/setup_improvements/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/usb/… Modified: branches/setup_improvements/drivers/usb/usbport/endpoint.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/usb/… Modified: branches/setup_improvements/drivers/usb/usbport/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/usb/… Modified: branches/setup_improvements/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/wdm/… Modified: branches/setup_improvements/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/wdm/… Modified: branches/setup_improvements/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/drivers/wdm/… Modified: branches/setup_improvements/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/con… Modified: branches/setup_improvements/sdk/include/ddk/buffring.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ddk/fcb.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ddk/fcbtable.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ddk/mrxfcb.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ddk/prefix.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ddk/rxprocs.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/ddk/rxworkq.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/lmbrowsr.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/usb200.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/idl/browser.idl URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/include/reactos/wine/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/include/… Modified: branches/setup_improvements/sdk/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/atl/… Modified: branches/setup_improvements/sdk/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/cmli… Modified: branches/setup_improvements/sdk/lib/cmlib/cmname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/cmli… Modified: branches/setup_improvements/sdk/lib/cmlib/cmvalue.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/cmli… 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/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/driv… Modified: branches/setup_improvements/sdk/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/driv… Modified: branches/setup_improvements/sdk/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/driv… Modified: branches/setup_improvements/sdk/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/driv… Modified: branches/setup_improvements/sdk/lib/drivers/sound/mmixer/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/driv… Modified: branches/setup_improvements/sdk/tools/xml2sdb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/xm… Modified: branches/setup_improvements/sdk/tools/xml2sdb/main.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/xm… Modified: branches/setup_improvements/sdk/tools/xml2sdb/xml2sdb.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/xm… Modified: branches/setup_improvements/sdk/tools/xml2sdb/xml2sdb.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/tools/xm… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/fillshap.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/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/gdi/ntgdi/print.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… Modified: branches/setup_improvements/win32ss/printing/base/spoolss/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… Modified: branches/setup_improvements/win32ss/printing/base/spoolsv/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… Modified: branches/setup_improvements/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… Modified: branches/setup_improvements/win32ss/printing/base/winspool/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… Modified: branches/setup_improvements/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… Modified: branches/setup_improvements/win32ss/printing/providers/localspl/printerdata.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… Modified: branches/setup_improvements/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… Modified: branches/setup_improvements/win32ss/reactx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac… Modified: branches/setup_improvements/win32ss/reactx/dxg/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac… Modified: branches/setup_improvements/win32ss/reactx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac… Modified: branches/setup_improvements/win32ss/reactx/dxg/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac… Modified: branches/setup_improvements/win32ss/reactx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac… Modified: branches/setup_improvements/win32ss/reactx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac… Modified: branches/setup_improvements/win32ss/reactx/dxg/tags.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac… Modified: branches/setup_improvements/win32ss/reactx/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac… Modified: branches/setup_improvements/win32ss/reactx/ntddraw/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/reac…

1 0

[jimtabor] 75243: [NtGDI] - Remove DC information checking for non-BLT functions. WIP and part of CORE-12888.
by jimtabor＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: jimtabor Date: Fri Jun 30 00:33:41 2017 New Revision: 75243 URL: http://svn.reactos.org/svn/reactos?rev=75243&view=rev Log: [NtGDI] - Remove DC information checking for non-BLT functions. WIP and part of CORE-12888. Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/print.c Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Fri Jun 30 00:33:41 2017 @@ -318,12 +318,6 @@ EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (pDC->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(pDC); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } status = KeSaveFloatingPointState(&FloatSave); if (!NT_SUCCESS(status)) @@ -373,12 +367,6 @@ EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } if (arctype > GdiTypePie) { DC_UnlockDc(dc); Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Fri Jun 30 00:33:41 2017 @@ -220,12 +220,6 @@ EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } if (PATH_IsPathOpen(dc->dclevel)) { @@ -491,14 +485,6 @@ EngSetLastError(ERROR_INVALID_HANDLE); ExFreePoolWithTag(pTemp, TAG_SHAPE); return FALSE; - } - - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - ExFreePoolWithTag(pTemp, TAG_SHAPE); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; } DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); @@ -698,12 +684,6 @@ EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } /* Do we rotate or shear? */ if (!(dc->pdcattr->mxWorldToDevice.flAccel & XFORM_SCALE)) @@ -877,12 +857,6 @@ DPRINT1("NtGdiRoundRect() - hDC is invalid\n"); EngSetLastError(ERROR_INVALID_HANDLE); } - else if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - ret = TRUE; - } else { ret = IntRoundRect ( dc, LeftRect, TopRect, RightRect, BottomRect, Width, Height ); @@ -945,13 +919,6 @@ { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; - } - - if(pdc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(pdc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; } if (!pdc->dclevel.pSurface) @@ -1115,12 +1082,6 @@ EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } if (!dc->dclevel.pSurface) { Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Jun 30 00:33:41 2017 @@ -5116,12 +5116,6 @@ EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } pdcattr = dc->pdcattr; Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Fri Jun 30 00:33:41 2017 @@ -439,12 +439,6 @@ { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; - } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; } rcLockRect.left = dc->pdcattr->ptlCurrent.x; Modified: trunk/reactos/win32ss/gdi/ntgdi/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/print.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/print.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/print.c [iso-8859-1] Fri Jun 30 00:33:41 2017 @@ -141,11 +141,6 @@ EngSetLastError(ERROR_INVALID_HANDLE); return -1; } - if ( pDC->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(pDC); - return 0; - } if ( InSize && UnsafeInData ) {

1 0

[jimtabor] 75242: [PSDK] - Add EMRGRADIENTFILL, part of CORE-12888.
by jimtabor＠svn.reactos.org 30 Jun '17

30 Jun '17

Author: jimtabor Date: Fri Jun 30 00:17:50 2017 New Revision: 75242 URL: http://svn.reactos.org/svn/reactos?rev=75242&view=rev Log: [PSDK] - Add EMRGRADIENTFILL, part of CORE-12888. Modified: trunk/reactos/sdk/include/psdk/wingdi.h Modified: trunk/reactos/sdk/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wingdi.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/wingdi.h [iso-8859-1] Fri Jun 30 00:17:50 2017 @@ -2765,6 +2765,14 @@ COLOR16 Blue; COLOR16 Alpha; } TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; +typedef struct tagEMRGRADIENTFILL { + EMR emr; + RECTL rclBounds; + DWORD nVer; + DWORD nTri; + ULONG ulMode; + TRIVERTEX Ver[1]; +} EMRGRADIENTFILL, *PEMRGRADIENTFILL; typedef struct _GRADIENT_TRIANGLE { ULONG Vertex1; ULONG Vertex2;

1 0

[ashaposhnikov] 75241: [RAPPS] StringCbCatW => StringCchCatW, sizeof() => _countof() :(
by ashaposhnikov＠svn.reactos.org 29 Jun '17

29 Jun '17

Author: ashaposhnikov Date: Thu Jun 29 19:31:19 2017 New Revision: 75241 URL: http://svn.reactos.org/svn/reactos?rev=75241&view=rev Log: [RAPPS] StringCbCatW => StringCchCatW, sizeof() => _countof() :( Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Thu Jun 29 19:31:19 2017 @@ -56,12 +56,12 @@ pSettingsInfo->bLogEnabled = TRUE; if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, pSettingsInfo->szDownloadDir))) { - StringCbCatW(pSettingsInfo->szDownloadDir, sizeof(pSettingsInfo->szDownloadDir), L"\\RAPPS Downloads"); + StringCchCatW(pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir), L"\\RAPPS Downloads"); } else { ExpandEnvironmentStringsW(L"%SystemDrive%\\RAPPS Downloads", - pSettingsInfo->szDownloadDir, sizeof(pSettingsInfo->szDownloadDir)); + pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir)); } pSettingsInfo->bDelInstaller = FALSE;

1 0

[ashaposhnikov] 75240: [RAPPS] winmain.cpp: sizeof instead of _countof
by ashaposhnikov＠svn.reactos.org 29 Jun '17

29 Jun '17

Author: ashaposhnikov Date: Thu Jun 29 19:22:13 2017 New Revision: 75240 URL: http://svn.reactos.org/svn/reactos?rev=75240&view=rev Log: [RAPPS] winmain.cpp: sizeof instead of _countof Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Thu Jun 29 19:22:13 2017 @@ -56,12 +56,12 @@ pSettingsInfo->bLogEnabled = TRUE; if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, pSettingsInfo->szDownloadDir))) { - StringCbCatW(pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir), L"\\RAPPS Downloads"); + StringCbCatW(pSettingsInfo->szDownloadDir, sizeof(pSettingsInfo->szDownloadDir), L"\\RAPPS Downloads"); } else { ExpandEnvironmentStringsW(L"%SystemDrive%\\RAPPS Downloads", - pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir)); + pSettingsInfo->szDownloadDir, sizeof(pSettingsInfo->szDownloadDir)); } pSettingsInfo->bDelInstaller = FALSE;

1 0

[ashaposhnikov] 75239: [RAPPS] Fixed default "Download" folder default. Now defaults to "RAPPS Downloads" folder in user Documents or installation drive.
by ashaposhnikov＠svn.reactos.org 29 Jun '17

29 Jun '17

Author: ashaposhnikov Date: Thu Jun 29 18:57:52 2017 New Revision: 75239 URL: http://svn.reactos.org/svn/reactos?rev=75239&view=rev Log: [RAPPS] Fixed default "Download" folder default. Now defaults to "RAPPS Downloads" folder in user Documents or installation drive. Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Thu Jun 29 18:57:52 2017 @@ -54,9 +54,16 @@ pSettingsInfo->bSaveWndPos = TRUE; pSettingsInfo->bUpdateAtStart = FALSE; pSettingsInfo->bLogEnabled = TRUE; - StringCbCopyW(pSettingsInfo->szDownloadDir, - sizeof(pSettingsInfo->szDownloadDir), - L"C:\\Downloads"); + if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, pSettingsInfo->szDownloadDir))) + { + StringCbCatW(pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir), L"\\RAPPS Downloads"); + } + else + { + ExpandEnvironmentStringsW(L"%SystemDrive%\\RAPPS Downloads", + pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir)); + } + pSettingsInfo->bDelInstaller = FALSE; pSettingsInfo->Maximized = FALSE;

1 0

[mjansen] 75238: [APPHELP] Implement SdbpMatchExe, allowing to match applications / files based on properties. CORE-13284
by mjansen＠svn.reactos.org 29 Jun '17

29 Jun '17

Author: mjansen Date: Thu Jun 29 17:32:03 2017 New Revision: 75238 URL: http://svn.reactos.org/svn/reactos?rev=75238&view=rev Log: [APPHELP] Implement SdbpMatchExe, allowing to match applications / files based on properties. CORE-13284 Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/hsdb.c trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Thu Jun 29 17:32:03 2017 @@ -90,6 +90,7 @@ HSDB WINAPI SdbInitDatabase(DWORD, LPCWSTR); void WINAPI SdbReleaseDatabase(HSDB); BOOL WINAPI SdbGUIDToString(CONST GUID *Guid, PWSTR GuidString, SIZE_T Length); +LPCWSTR WINAPI SdbTagToString(TAG tag); PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type); void WINAPI SdbCloseDatabase(PDB); @@ -105,8 +106,12 @@ TAGID WINAPI SdbFindNextTag(PDB db, TAGID parent, TAGID prev_child); BOOL WINAPI SdbGetDatabaseID(PDB db, GUID* Guid); DWORD WINAPI SdbReadDWORDTag(PDB db, TAGID tagid, DWORD ret); +QWORD WINAPI SdbReadQWORDTag(PDB db, TAGID tagid, QWORD ret); +TAGID WINAPI SdbGetFirstChild(PDB db, TAGID parent); +TAGID WINAPI SdbGetNextChild(PDB db, TAGID parent, TAGID prev_child); /* sdbfileattr.c*/ +BOOL WINAPI SdbGetFileAttributes(LPCWSTR path, PATTRINFO *attr_info_ret, LPDWORD attr_count); BOOL WINAPI SdbFreeFileAttributes(PATTRINFO attr_info); /* layer.c */ Modified: trunk/reactos/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/hsdb… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] Thu Jun 29 17:32:03 2017 @@ -49,31 +49,132 @@ return (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY)); } -static BOOL WINAPI SdbpMatchExe(PDB db, TAGID exe, WCHAR* dir) -{ - static const WCHAR fmt[] = {'%','s','%','s',0}; - WCHAR buffer[256]; /* FIXME: rewrite using a buffer that can grow if needed, f.e. RtlInitBuffer stuff! */ +static BOOL SdbpMatchFileAttributes(PDB pdb, TAGID matching_file, PATTRINFO attribs, DWORD attr_count) +{ + TAGID child; + + for (child = SdbGetFirstChild(pdb, matching_file); + child != TAGID_NULL; child = SdbGetNextChild(pdb, matching_file, child)) + { + TAG tag = SdbGetTagFromTagID(pdb, child); + DWORD n; + + /* Already handled! */ + if (tag == TAG_NAME) + continue; + + if (tag == TAG_UPTO_BIN_FILE_VERSION || + tag == TAG_UPTO_BIN_PRODUCT_VERSION || + tag == TAG_UPTO_LINK_DATE) + { + SHIM_WARN("Unimplemented TAG_UPTO_XXXXX\n"); + continue; + } + + for (n = 0; n < attr_count; ++n) + { + PATTRINFO attr = attribs + n; + if (attr->flags == ATTRIBUTE_AVAILABLE && attr->type == tag) + { + DWORD dwval; + WCHAR* lpval; + QWORD qwval; + switch (tag & TAG_TYPE_MASK) + { + case TAG_TYPE_DWORD: + dwval = SdbReadDWORDTag(pdb, child, 0); + if (dwval != attr->dwattr) + return FALSE; + break; + case TAG_TYPE_STRINGREF: + lpval = SdbGetStringTagPtr(pdb, child); + if (!lpval || wcsicmp(attr->lpattr, lpval)) + return FALSE; + break; + case TAG_TYPE_QWORD: + qwval = SdbReadQWORDTag(pdb, child, 0); + if (qwval != attr->qwattr) + return FALSE; + break; + default: + SHIM_WARN("Unhandled type 0x%x MATCHING_FILE\n", (tag & TAG_TYPE_MASK)); + return FALSE; + } + } + } + if (n == attr_count) + SHIM_WARN("Unhandled tag %ws in MACHING_FILE\n", SdbTagToString(tag)); + } + return TRUE; +} + +static BOOL WINAPI SdbpMatchExe(PDB pdb, TAGID exe, const WCHAR* dir, PATTRINFO main_attribs, DWORD main_attr_count) +{ + RTL_UNICODE_STRING_BUFFER FullPathName = { { 0 } }; + WCHAR FullPathBuffer[MAX_PATH]; + UNICODE_STRING UnicodeDir; TAGID matching_file; - - /* TODO: check size/checksum from the main exe as well as from the extra files */ - for (matching_file = SdbFindFirstTag(db, exe, TAG_MATCHING_FILE); - matching_file != TAGID_NULL; matching_file = SdbFindNextTag(db, exe, matching_file)) - { - TAGID tagName = SdbFindFirstTag(db, matching_file, TAG_NAME); - LPWSTR name = SdbGetStringTagPtr(db, tagName); - - if (!wcscmp(name, L"*")) - { - // if attributes dont match main file, return FALSE! + PATTRINFO attribs = NULL; + DWORD attr_count; + BOOL IsMatch = FALSE; + + RtlInitUnicodeString(&UnicodeDir, dir); + RtlInitBuffer(&FullPathName.ByteBuffer, (PUCHAR)FullPathBuffer, sizeof(FullPathBuffer)); + + for (matching_file = SdbFindFirstTag(pdb, exe, TAG_MATCHING_FILE); + matching_file != TAGID_NULL; matching_file = SdbFindNextTag(pdb, exe, matching_file)) + { + TAGID tagName = SdbFindFirstTag(pdb, matching_file, TAG_NAME); + UNICODE_STRING Name; + USHORT Len; + + RtlInitUnicodeString(&Name, SdbGetStringTagPtr(pdb, tagName)); + + if (!Name.Buffer) + goto Cleanup; + + if (!wcscmp(Name.Buffer, L"*")) + { + if (!SdbpMatchFileAttributes(pdb, matching_file, main_attribs, main_attr_count)) + goto Cleanup; continue; } - snprintfW(buffer, _countof(buffer), fmt, dir, name); - if (!SdbpFileExists(buffer)) - return FALSE; - } - - return TRUE; + /* Technically, one UNICODE_NULL and one path separator. */ + Len = UnicodeDir.Length + Name.Length + sizeof(UNICODE_NULL) + sizeof(UNICODE_NULL); + if (!NT_SUCCESS(RtlEnsureBufferSize(RTL_SKIP_BUFFER_COPY, &FullPathName.ByteBuffer, Len))) + goto Cleanup; + + if (Len > FullPathName.ByteBuffer.Size) + goto Cleanup; + + RtlInitEmptyUnicodeString(&FullPathName.String, (PWCHAR)FullPathName.ByteBuffer.Buffer, FullPathName.ByteBuffer.Size); + + RtlCopyUnicodeString(&FullPathName.String, &UnicodeDir); + RtlAppendUnicodeToString(&FullPathName.String, L"\\"); + RtlAppendUnicodeStringToString(&FullPathName.String, &Name); + + if (!SdbpFileExists(FullPathName.String.Buffer)) + goto Cleanup; + + if (attribs) + SdbFreeFileAttributes(attribs); + + if (!SdbGetFileAttributes(FullPathName.String.Buffer, &attribs, &attr_count)) + goto Cleanup; + + if (!SdbpMatchFileAttributes(pdb, matching_file, attribs, attr_count)) + goto Cleanup; + } + + IsMatch = TRUE; + +Cleanup: + RtlFreeBuffer(&FullPathName.ByteBuffer); + if (attribs) + SdbFreeFileAttributes(attribs); + + return IsMatch; } static void SdbpAddDatabaseGuid(PDB db, PSDBQUERYRESULT result) @@ -331,7 +432,7 @@ BOOL ret = FALSE; TAGID database, iter, name; PATTRINFO attribs = NULL; - /*DWORD attr_count;*/ + DWORD attr_count; RTL_UNICODE_STRING_BUFFER DosApplicationName = { { 0 } }; WCHAR DosPathBuffer[MAX_PATH]; ULONG PathType = 0; @@ -390,10 +491,6 @@ /* We will use the buffer for exe name and directory. */ *(file_name++) = UNICODE_NULL; - /* Get information about executable required to match it with database entry */ - /*if (!SdbGetFileAttributes(path, &attribs, &attr_count)) - return FALSE;*/ - /* DATABASE is list TAG which contains all executables */ database = SdbFindFirstTag(db, TAGID_ROOT, TAG_DATABASE); if (database == TAGID_NULL) @@ -414,8 +511,16 @@ foundName = SdbGetStringTagPtr(db, name); if (foundName && !lstrcmpiW(foundName, file_name)) { + /* Get information about executable required to match it with database entry */ + if (!attribs) + { + if (!SdbGetFileAttributes(path, &attribs, &attr_count)) + goto Cleanup; + } + + /* We have a null terminator before the application name, so DosApplicationName only contains the path. */ - if (SdbpMatchExe(db, iter, DosApplicationName.String.Buffer)) + if (SdbpMatchExe(db, iter, DosApplicationName.String.Buffer, attribs, attr_count)) { ret = TRUE; SdbpAddExeMatch(hsdb, db, iter, result); Modified: trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbf… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] Thu Jun 29 17:32:03 2017 @@ -86,7 +86,7 @@ return NULL; } -static void WINAPI SdbpSetStringAttrFromAnsiString(PATTRINFO attr, TAG tag, PBYTE string, BYTE len) +static void WINAPI SdbpSetStringAttrFromAnsiString(PATTRINFO attr, TAG tag, PBYTE string, size_t len) { WCHAR* dest; if (!string)

1 0

[mjansen] 75237: [ATL] Add missing CString += overload (char). Patch by Alexander Shaposhnikov. CORE-13503
by mjansen＠svn.reactos.org 29 Jun '17

29 Jun '17

Author: mjansen Date: Thu Jun 29 17:09:49 2017 New Revision: 75237 URL: http://svn.reactos.org/svn/reactos?rev=75237&view=rev Log: [ATL] Add missing CString += overload (char). Patch by Alexander Shaposhnikov. CORE-13503 Modified: trunk/reactos/sdk/lib/atl/cstringt.h Modified: trunk/reactos/sdk/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/cstringt.h?rev… ============================================================================== --- trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] Thu Jun 29 17:09:49 2017 @@ -453,6 +453,12 @@ return *this; } + CStringT& operator+=(_In_ XCHAR ch) + { + CThisSimpleString::operator+=(ch); + return *this; + } + BOOL LoadString(_In_ UINT nID) { return LoadString(_AtlBaseModule.GetResourceInstance(), nID);

1 0

[tfaber] 75236: [KMTESTS:KERNEL32] - Add a test for SetFileAttributes/GetFileAttributes - Add KmtSendUlongToDriver helper and fix some doc comments CORE-13495
by tfaber＠svn.reactos.org 29 Jun '17

29 Jun '17

Author: tfaber Date: Thu Jun 29 16:16:20 2017 New Revision: 75236 URL: http://svn.reactos.org/svn/reactos?rev=75236&view=rev Log: [KMTESTS:KERNEL32] - Add a test for SetFileAttributes/GetFileAttributes - Add KmtSendUlongToDriver helper and fix some doc comments CORE-13495 Added: trunk/rostests/kmtests/kernel32/FileAttributes_user.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/kernel32/kernel32_drv.c trunk/rostests/kmtests/kernel32/kernel32_test.h trunk/rostests/kmtests/kmtest/support.c trunk/rostests/kmtests/kmtest/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Thu Jun 29 16:16:20 2017 @@ -125,6 +125,7 @@ example/Example_user.c hidparse/HidP_user.c + kernel32/FileAttributes_user.c kernel32/FindFile_user.c ntos_cc/CcCopyRead_user.c ntos_io/IoCreateFile_user.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Thu Jun 29 16:16:20 2017 @@ -148,6 +148,7 @@ DWORD KmtSendToDriver(IN DWORD ControlCode); DWORD KmtSendStringToDriver(IN DWORD ControlCode, IN PCSTR String); DWORD KmtSendWStringToDriver(IN DWORD ControlCode, IN PCWSTR String); +DWORD KmtSendUlongToDriver(IN DWORD ControlCode, IN DWORD Value); DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer OPTIONAL, IN DWORD InLength, IN OUT PDWORD OutLength); #else /* if !defined KMT_KERNEL_MODE && !defined KMT_USER_MODE */ #error either KMT_KERNEL_MODE or KMT_USER_MODE must be defined Added: trunk/rostests/kmtests/kernel32/FileAttributes_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FileAttr… ============================================================================== --- trunk/rostests/kmtests/kernel32/FileAttributes_user.c (added) +++ trunk/rostests/kmtests/kernel32/FileAttributes_user.c [iso-8859-1] Thu Jun 29 16:16:20 2017 @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for GetFileAttributes/SetFileAttributes + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +#include "kernel32_test.h" + +START_TEST(FileAttributes) +{ + PCWSTR FileName = L"\\\\.\\Global\\GLOBALROOT\\Device\\Kmtest-kernel32\\Somefile"; + BOOL Ret; + DWORD Attributes; + + KmtLoadDriver(L"kernel32", FALSE); + KmtOpenDriver(); + + /* Set read-only attribute */ + KmtSendUlongToDriver(IOCTL_EXPECT_SET_ATTRIBUTES, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_NORMAL); + Ret = SetFileAttributesW(FileName, FILE_ATTRIBUTE_READONLY); + ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); + + /* Set normal attribute */ + KmtSendUlongToDriver(IOCTL_EXPECT_SET_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL); + Ret = SetFileAttributesW(FileName, FILE_ATTRIBUTE_NORMAL); + ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); + + /* Set 0 attribute (driver should receive normal) */ + KmtSendUlongToDriver(IOCTL_EXPECT_SET_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL); + Ret = SetFileAttributesW(FileName, 0); + ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); + + /* Query read-only attribute */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, FILE_ATTRIBUTE_READONLY); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, FILE_ATTRIBUTE_READONLY); + + /* Query read-only + normal attribute */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_NORMAL); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_NORMAL); + + /* Query normal attribute */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, FILE_ATTRIBUTE_NORMAL); + + /* Query 0 attribute */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, 0); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, 0); + + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: trunk/rostests/kmtests/kernel32/FileAttributes_user.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/kmtests/kernel32/kernel32_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/kernel32… ============================================================================== --- trunk/rostests/kmtests/kernel32/kernel32_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/kernel32_drv.c [iso-8859-1] Thu Jun 29 16:16:20 2017 @@ -14,9 +14,13 @@ static KMT_MESSAGE_HANDLER TestMessageHandler; static KMT_IRP_HANDLER TestDirectoryControl; +static KMT_IRP_HANDLER TestQueryInformation; +static KMT_IRP_HANDLER TestSetInformation; static UNICODE_STRING ExpectedExpression = RTL_CONSTANT_STRING(L"<not set>"); static WCHAR ExpressionBuffer[MAX_PATH]; +static ULONG ExpectedSetAttributes = -1; +static ULONG ReturnQueryAttributes = -1; NTSTATUS TestEntry( @@ -35,6 +39,8 @@ *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE; KmtRegisterIrpHandler(IRP_MJ_DIRECTORY_CONTROL, NULL, TestDirectoryControl); + KmtRegisterIrpHandler(IRP_MJ_QUERY_INFORMATION, NULL, TestQueryInformation); + KmtRegisterIrpHandler(IRP_MJ_SET_INFORMATION, NULL, TestSetInformation); KmtRegisterMessageHandler(0, NULL, TestMessageHandler); return Status; @@ -79,6 +85,26 @@ break; } + case IOCTL_RETURN_QUERY_ATTRIBUTES: + { + DPRINT("IOCTL_RETURN_QUERY_ATTRIBUTES, InLength = %lu\n", InLength); + if (InLength != sizeof(ULONG)) + return STATUS_INVALID_PARAMETER; + + ReturnQueryAttributes = *(PULONG)Buffer; + DPRINT("IOCTL_RETURN_QUERY_ATTRIBUTES: %lu\n", ReturnQueryAttributes); + break; + } + case IOCTL_EXPECT_SET_ATTRIBUTES: + { + DPRINT("IOCTL_EXPECT_SET_ATTRIBUTES, InLength = %lu\n", InLength); + if (InLength != sizeof(ULONG)) + return STATUS_INVALID_PARAMETER; + + ExpectedSetAttributes = *(PULONG)Buffer; + DPRINT("IOCTL_EXPECT_SET_ATTRIBUTES: %lu\n", ExpectedSetAttributes); + break; + } default: return STATUS_NOT_SUPPORTED; } @@ -121,3 +147,79 @@ return Status; } + +static +NTSTATUS +TestQueryInformation( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_NOT_SUPPORTED; + PFILE_BASIC_INFORMATION BasicInfo; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStackLocation->MajorFunction, IoStackLocation->MinorFunction); + ASSERT(IoStackLocation->MajorFunction == IRP_MJ_QUERY_INFORMATION); + + Irp->IoStatus.Information = 0; + + ok_eq_ulong(IoStackLocation->Parameters.QueryFile.FileInformationClass, FileBasicInformation); + if (IoStackLocation->Parameters.QueryFile.FileInformationClass == FileBasicInformation) + { + ok(ReturnQueryAttributes != (ULONG)-1, "Unexpected QUERY_INFORMATION call\n"); + BasicInfo = Irp->AssociatedIrp.SystemBuffer; + BasicInfo->CreationTime.QuadPart = 126011664000000000; + BasicInfo->LastAccessTime.QuadPart = 130899112800000000; + BasicInfo->LastWriteTime.QuadPart = 130899112800000000; + BasicInfo->ChangeTime.QuadPart = 130899112800000000; + BasicInfo->FileAttributes = ReturnQueryAttributes; + ReturnQueryAttributes = -1; + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(*BasicInfo); + } + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +static +NTSTATUS +TestSetInformation( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_NOT_SUPPORTED; + PFILE_BASIC_INFORMATION BasicInfo; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStackLocation->MajorFunction, IoStackLocation->MinorFunction); + ASSERT(IoStackLocation->MajorFunction == IRP_MJ_SET_INFORMATION); + + ok_eq_ulong(IoStackLocation->Parameters.SetFile.FileInformationClass, FileBasicInformation); + if (IoStackLocation->Parameters.SetFile.FileInformationClass == FileBasicInformation) + { + ok(ExpectedSetAttributes != (ULONG)-1, "Unexpected SET_INFORMATION call\n"); + BasicInfo = Irp->AssociatedIrp.SystemBuffer; + ok_eq_longlong(BasicInfo->CreationTime.QuadPart, 0LL); + ok_eq_longlong(BasicInfo->LastAccessTime.QuadPart, 0LL); + ok_eq_longlong(BasicInfo->LastWriteTime.QuadPart, 0LL); + ok_eq_longlong(BasicInfo->ChangeTime.QuadPart, 0LL); + ok_eq_ulong(BasicInfo->FileAttributes, ExpectedSetAttributes); + ExpectedSetAttributes = -1; + Status = STATUS_SUCCESS; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Modified: trunk/rostests/kmtests/kernel32/kernel32_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/kernel32… ============================================================================== --- trunk/rostests/kmtests/kernel32/kernel32_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/kernel32_test.h [iso-8859-1] Thu Jun 29 16:16:20 2017 @@ -9,5 +9,7 @@ #define _KMTEST_FINDFILE_H_ #define IOCTL_EXPECT_EXPRESSION 1 +#define IOCTL_RETURN_QUERY_ATTRIBUTES 2 +#define IOCTL_EXPECT_SET_ATTRIBUTES 3 #endif /* !defined _KMTEST_FINDFILE_H_ */ Modified: trunk/rostests/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/support.c?… ============================================================================== --- trunk/rostests/kmtests/kmtest/support.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/support.c [iso-8859-1] Thu Jun 29 16:16:20 2017 @@ -213,7 +213,7 @@ /** * @name KmtSendToDriver * - * Unload special-purpose driver (stop the service) + * Send an I/O control message with no arguments to the driver opened with KmtOpenDriver * * @param ControlCode * @@ -236,7 +236,7 @@ /** * @name KmtSendStringToDriver * - * Unload special-purpose driver (stop the service) + * Send an I/O control message with a string argument to the driver opened with KmtOpenDriver * * @param ControlCode * @param String @@ -259,9 +259,9 @@ } /** - * @name KmtSendStringToDriver - * - * Unload special-purpose driver (stop the service) + * @name KmtSendWStringToDriver + * + * Send an I/O control message with a wide string argument to the driver opened with KmtOpenDriver * * @param ControlCode * @param String @@ -284,7 +284,34 @@ } /** + * @name KmtSendUlongToDriver + * + * Send an I/O control message with an integer argument to the driver opened with KmtOpenDriver + * + * @param ControlCode + * @param Value + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtSendUlongToDriver( + IN DWORD ControlCode, + IN DWORD Value) +{ + DWORD BytesRead; + + assert(ControlCode < 0x400); + + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), &Value, sizeof(Value), NULL, 0, &BytesRead, NULL)) + return GetLastError(); + + return ERROR_SUCCESS; +} + +/** * @name KmtSendBufferToDriver + * + * Send an I/O control message with the specified arguments to the driver opened with KmtOpenDriver * * @param ControlCode * @param Buffer @@ -308,4 +335,4 @@ return GetLastError(); return ERROR_SUCCESS; -} +} Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Thu Jun 29 16:16:20 2017 @@ -9,6 +9,7 @@ KMT_TESTFUNC Test_CcCopyRead; KMT_TESTFUNC Test_Example; +KMT_TESTFUNC Test_FileAttributes; KMT_TESTFUNC Test_FindFile; KMT_TESTFUNC Test_HidPDescription; KMT_TESTFUNC Test_IoCreateFile; @@ -34,6 +35,7 @@ { { "CcCopyRead", Test_CcCopyRead }, { "-Example", Test_Example }, + { "FileAttributes", Test_FileAttributes }, { "FindFile", Test_FindFile }, { "HidPDescription", Test_HidPDescription }, { "IoCreateFile", Test_IoCreateFile },

1 0

[tfaber] 75235: [KMTESTS:KERNEL32] - Rename FindFile_drv to kernel32_drv (and perform some other appropriate renames), since it can be used for multiple tests, not just FindFile - Change license to...
by tfaber＠svn.reactos.org 29 Jun '17

29 Jun '17

Author: tfaber Date: Thu Jun 29 15:30:23 2017 New Revision: 75235 URL: http://svn.reactos.org/svn/reactos?rev=75235&view=rev Log: [KMTESTS:KERNEL32] - Rename FindFile_drv to kernel32_drv (and perform some other appropriate renames), since it can be used for multiple tests, not just FindFile - Change license to LGPL (this is okay since nobody but me has touched these files) CORE-13495 Added: trunk/rostests/kmtests/kernel32/kernel32_drv.c - copied, changed from r75234, trunk/rostests/kmtests/kernel32/FindFile_drv.c trunk/rostests/kmtests/kernel32/kernel32_test.h - copied, changed from r75234, trunk/rostests/kmtests/kernel32/FindFile.h Removed: trunk/rostests/kmtests/kernel32/FindFile.h trunk/rostests/kmtests/kernel32/FindFile_drv.c Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kernel32/CMakeLists.txt trunk/rostests/kmtests/kernel32/FindFile_user.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Thu Jun 29 15:30:23 2017 @@ -155,12 +155,12 @@ add_dependencies(kmtest_drivers kmtest_drv example_drv - findfile_drv hidp_drv iocreatefile_drv iodeviceobject_drv iohelper_drv ioreadwrite_drv + kernel32_drv mmmaplockedpagesspecifycache_drv ntcreatesection_drv poirp_drv Modified: trunk/rostests/kmtests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/CMakeLis… ============================================================================== --- trunk/rostests/kmtests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/CMakeLists.txt [iso-8859-1] Thu Jun 29 15:30:23 2017 @@ -1,14 +1,14 @@ include_directories(../include) -list(APPEND FINDFILE_DRV_SOURCE +list(APPEND KERNEL32_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c - FindFile_drv.c) + kernel32_drv.c) -add_library(findfile_drv SHARED ${FINDFILE_DRV_SOURCE}) -set_module_type(findfile_drv kernelmodedriver) -target_link_libraries(findfile_drv kmtest_printf ${PSEH_LIB}) -add_importlibs(findfile_drv ntoskrnl hal) -add_target_compile_definitions(findfile_drv KMT_STANDALONE_DRIVER) -#add_pch(findfile_drv ../include/kmt_test.h) -add_rostests_file(TARGET findfile_drv) +add_library(kernel32_drv SHARED ${KERNEL32_DRV_SOURCE}) +set_module_type(kernel32_drv kernelmodedriver) +target_link_libraries(kernel32_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(kernel32_drv ntoskrnl hal) +add_target_compile_definitions(kernel32_drv KMT_STANDALONE_DRIVER) +#add_pch(kernel32_drv ../include/kmt_test.h) +add_rostests_file(TARGET kernel32_drv) Removed: trunk/rostests/kmtests/kernel32/FindFile.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FindFile… ============================================================================== --- trunk/rostests/kmtests/kernel32/FindFile.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/FindFile.h (removed) @@ -1,13 +0,0 @@ -/* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: FindFirstFile wildcard substitution test declarations - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> - */ - -#ifndef _KMTEST_FINDFILE_H_ -#define _KMTEST_FINDFILE_H_ - -#define IOCTL_EXPECT 1 - -#endif /* !defined _KMTEST_FINDFILE_H_ */ Removed: trunk/rostests/kmtests/kernel32/FindFile_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FindFile… ============================================================================== --- trunk/rostests/kmtests/kernel32/FindFile_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/FindFile_drv.c (removed) @@ -1,123 +0,0 @@ -/* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test driver for FindFirstFile's wildcard substitution - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> - */ - -#include <kmt_test.h> - -#define NDEBUG -#include <debug.h> - -#include "FindFile.h" - -static KMT_MESSAGE_HANDLER TestMessageHandler; -static KMT_IRP_HANDLER TestIrpHandler; - -static UNICODE_STRING ExpectedExpression = RTL_CONSTANT_STRING(L"<not set>"); -static WCHAR ExpressionBuffer[MAX_PATH]; - -NTSTATUS -TestEntry( - IN PDRIVER_OBJECT DriverObject, - IN PCUNICODE_STRING RegistryPath, - OUT PCWSTR *DeviceName, - IN OUT INT *Flags) -{ - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - UNREFERENCED_PARAMETER(RegistryPath); - - *DeviceName = L"FindFile"; - *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE; - - KmtRegisterIrpHandler(IRP_MJ_DIRECTORY_CONTROL, NULL, TestIrpHandler); - KmtRegisterMessageHandler(0, NULL, TestMessageHandler); - - return Status; -} - -VOID -TestUnload( - IN PDRIVER_OBJECT DriverObject) -{ - PAGED_CODE(); -} - -static -NTSTATUS -TestMessageHandler( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG ControlCode, - IN PVOID Buffer OPTIONAL, - IN SIZE_T InLength, - IN OUT PSIZE_T OutLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - switch (ControlCode) - { - case IOCTL_EXPECT: - { - C_ASSERT(sizeof(ExpressionBuffer) <= UNICODE_STRING_MAX_BYTES); - DPRINT("IOCTL_EXPECT, InLength = %lu\n", InLength); - if (InLength > sizeof(ExpressionBuffer)) - return STATUS_BUFFER_OVERFLOW; - - if (InLength % sizeof(WCHAR) != 0) - return STATUS_INVALID_PARAMETER; - - RtlInitEmptyUnicodeString(&ExpectedExpression, ExpressionBuffer, sizeof(ExpressionBuffer)); - RtlCopyMemory(ExpressionBuffer, Buffer, InLength); - ExpectedExpression.Length = (USHORT)InLength; - DPRINT("IOCTL_EXPECT: %wZ\n", &ExpectedExpression); - - break; - } - default: - return STATUS_NOT_SUPPORTED; - } - - return Status; -} - -static -NTSTATUS -TestIrpHandler( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IoStackLocation) -{ - NTSTATUS Status = STATUS_NOT_SUPPORTED; - - PAGED_CODE(); - - DPRINT("IRP %x/%x\n", IoStackLocation->MajorFunction, IoStackLocation->MinorFunction); - ASSERT(IoStackLocation->MajorFunction == IRP_MJ_DIRECTORY_CONTROL); - - ok(IoStackLocation->MinorFunction == IRP_MN_QUERY_DIRECTORY, "Minor function: %u\n", IoStackLocation->MinorFunction); - if (IoStackLocation->MinorFunction == IRP_MN_QUERY_DIRECTORY) - { - ok(IoStackLocation->Parameters.QueryDirectory.FileInformationClass == FileBothDirectoryInformation, - "FileInformationClass: %d\n", IoStackLocation->Parameters.QueryDirectory.FileInformationClass); - if (IoStackLocation->Parameters.QueryDirectory.FileInformationClass == FileBothDirectoryInformation) - { - ok(RtlEqualUnicodeString(IoStackLocation->Parameters.QueryDirectory.FileName, &ExpectedExpression, FALSE), - "Expression is '%wZ', expected '%wZ'\n", IoStackLocation->Parameters.QueryDirectory.FileName, &ExpectedExpression); - RtlZeroMemory(Irp->UserBuffer, IoStackLocation->Parameters.QueryDirectory.Length); - Status = STATUS_SUCCESS; - } - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; -} Modified: trunk/rostests/kmtests/kernel32/FindFile_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FindFile… ============================================================================== --- trunk/rostests/kmtests/kernel32/FindFile_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/FindFile_user.c [iso-8859-1] Thu Jun 29 15:30:23 2017 @@ -1,13 +1,13 @@ /* * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for FindFirstFile's wildcard substitution * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ #include <kmt_test.h> -#include "FindFile.h" +#include "kernel32_test.h" START_TEST(FindFile) { @@ -98,14 +98,14 @@ INT i; WCHAR ExpressionBuffer[MAX_PATH]; - KmtLoadDriver(L"FindFile", FALSE); + KmtLoadDriver(L"kernel32", FALSE); KmtOpenDriver(); for (i = 0; i < TestCount; i++) { trace("[%d] '%ls', '%ls'\n", i, Tests[i].Expression, Tests[i].ExpectedExpression); - KmtSendWStringToDriver(IOCTL_EXPECT, Tests[i].ExpectedExpression); - wcscpy(ExpressionBuffer, L"\\\\.\\Global\\GLOBALROOT\\Device\\Kmtest-FindFile\\"); + KmtSendWStringToDriver(IOCTL_EXPECT_EXPRESSION, Tests[i].ExpectedExpression); + wcscpy(ExpressionBuffer, L"\\\\.\\Global\\GLOBALROOT\\Device\\Kmtest-kernel32\\"); wcscat(ExpressionBuffer, Tests[i].Expression); FindHandle = FindFirstFileW(ExpressionBuffer, &FindData); ok(FindHandle != NULL && FindHandle != INVALID_HANDLE_VALUE, "Handle: %p, error=%lu\n", (PVOID)FindHandle, GetLastError()); Copied: trunk/rostests/kmtests/kernel32/kernel32_drv.c (from r75234, trunk/rostests/kmtests/kernel32/FindFile_drv.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/kernel32… ============================================================================== --- trunk/rostests/kmtests/kernel32/FindFile_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/kernel32_drv.c [iso-8859-1] Thu Jun 29 15:30:23 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test driver for FindFirstFile's wildcard substitution + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for kernel32 filesystem tests * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ @@ -10,10 +10,10 @@ #define NDEBUG #include <debug.h> -#include "FindFile.h" +#include "kernel32_test.h" static KMT_MESSAGE_HANDLER TestMessageHandler; -static KMT_IRP_HANDLER TestIrpHandler; +static KMT_IRP_HANDLER TestDirectoryControl; static UNICODE_STRING ExpectedExpression = RTL_CONSTANT_STRING(L"<not set>"); static WCHAR ExpressionBuffer[MAX_PATH]; @@ -31,10 +31,10 @@ UNREFERENCED_PARAMETER(RegistryPath); - *DeviceName = L"FindFile"; + *DeviceName = L"kernel32"; *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE; - KmtRegisterIrpHandler(IRP_MJ_DIRECTORY_CONTROL, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_DIRECTORY_CONTROL, NULL, TestDirectoryControl); KmtRegisterMessageHandler(0, NULL, TestMessageHandler); return Status; @@ -62,10 +62,10 @@ switch (ControlCode) { - case IOCTL_EXPECT: + case IOCTL_EXPECT_EXPRESSION: { C_ASSERT(sizeof(ExpressionBuffer) <= UNICODE_STRING_MAX_BYTES); - DPRINT("IOCTL_EXPECT, InLength = %lu\n", InLength); + DPRINT("IOCTL_EXPECT_EXPRESSION, InLength = %lu\n", InLength); if (InLength > sizeof(ExpressionBuffer)) return STATUS_BUFFER_OVERFLOW; @@ -75,7 +75,7 @@ RtlInitEmptyUnicodeString(&ExpectedExpression, ExpressionBuffer, sizeof(ExpressionBuffer)); RtlCopyMemory(ExpressionBuffer, Buffer, InLength); ExpectedExpression.Length = (USHORT)InLength; - DPRINT("IOCTL_EXPECT: %wZ\n", &ExpectedExpression); + DPRINT("IOCTL_EXPECT_EXPRESSION: %wZ\n", &ExpectedExpression); break; } @@ -88,7 +88,7 @@ static NTSTATUS -TestIrpHandler( +TestDirectoryControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation) Copied: trunk/rostests/kmtests/kernel32/kernel32_test.h (from r75234, trunk/rostests/kmtests/kernel32/FindFile.h) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/kernel32… ============================================================================== --- trunk/rostests/kmtests/kernel32/FindFile.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/kernel32_test.h [iso-8859-1] Thu Jun 29 15:30:23 2017 @@ -1,13 +1,13 @@ /* * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: FindFirstFile wildcard substitution test declarations + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel32 filesystem test declarations * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ #ifndef _KMTEST_FINDFILE_H_ #define _KMTEST_FINDFILE_H_ -#define IOCTL_EXPECT 1 +#define IOCTL_EXPECT_EXPRESSION 1 #endif /* !defined _KMTEST_FINDFILE_H_ */

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