Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 58607: Synchronize with trunk r58606.
by hbelusca＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: hbelusca Date: Sun Mar 24 19:05:43 2013 New Revision: 58607 URL: http://svn.reactos.org/svn/reactos?rev=58607&view=rev Log: Synchronize with trunk r58606. Added: branches/ros-csrss/base/applications/cmdutils/doskey/lang/it-IT.rc - copied unchanged from r58606, trunk/reactos/base/applications/cmdutils/doskey/lang/it-IT.rc branches/ros-csrss/base/applications/dxdiag/lang/it-IT.rc - copied unchanged from r58606, trunk/reactos/base/applications/dxdiag/lang/it-IT.rc branches/ros-csrss/base/applications/fontview/lang/it-IT.rc - copied unchanged from r58606, trunk/reactos/base/applications/fontview/lang/it-IT.rc branches/ros-csrss/base/applications/magnify/lang/tr-TR.rc - copied unchanged from r58606, trunk/reactos/base/applications/magnify/lang/tr-TR.rc branches/ros-csrss/base/applications/mplay32/lang/tr-TR.rc - copied unchanged from r58606, trunk/reactos/base/applications/mplay32/lang/tr-TR.rc branches/ros-csrss/base/applications/mspaint/lang/tr-TR.rc - copied unchanged from r58606, trunk/reactos/base/applications/mspaint/lang/tr-TR.rc branches/ros-csrss/base/applications/network/wlanconf/lang/de-DE.rc - copied unchanged from r58606, trunk/reactos/base/applications/network/wlanconf/lang/de-DE.rc branches/ros-csrss/base/applications/network/wlanconf/lang/it-IT.rc - copied unchanged from r58606, trunk/reactos/base/applications/network/wlanconf/lang/it-IT.rc branches/ros-csrss/base/applications/sndrec32/lang/tr-TR.rc - copied unchanged from r58606, trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc branches/ros-csrss/base/applications/write/Tr.rc - copied unchanged from r58606, trunk/reactos/base/applications/write/Tr.rc branches/ros-csrss/dll/directx/ddraw/CMakeLists.txt - copied unchanged from r58606, trunk/reactos/dll/directx/ddraw/CMakeLists.txt branches/ros-csrss/dll/win32/propsys/ (props changed) - copied from r58606, trunk/reactos/dll/win32/propsys/ branches/ros-csrss/dll/win32/urlmon/axinstall.c - copied unchanged from r58606, trunk/reactos/dll/win32/urlmon/axinstall.c branches/ros-csrss/dll/win32/urlmon/resource.h - copied unchanged from r58606, trunk/reactos/dll/win32/urlmon/resource.h branches/ros-csrss/dll/win32/urlmon/urlmon.rc - copied unchanged from r58606, trunk/reactos/dll/win32/urlmon/urlmon.rc branches/ros-csrss/dll/win32/urlmon/urlmon_urlmon.rgs - copied unchanged from r58606, trunk/reactos/dll/win32/urlmon/urlmon_urlmon.rgs branches/ros-csrss/hal/halx86/acpi.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/acpi.cmake branches/ros-csrss/hal/halx86/apic.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/apic.cmake branches/ros-csrss/hal/halx86/generic.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/generic.cmake branches/ros-csrss/hal/halx86/legacy.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/legacy.cmake branches/ros-csrss/hal/halx86/minihal.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/minihal.cmake branches/ros-csrss/hal/halx86/pcidata.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/pcidata.cmake branches/ros-csrss/hal/halx86/pic.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/pic.cmake branches/ros-csrss/hal/halx86/up.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/up.cmake branches/ros-csrss/win32ss/user/user32/lang/zh-CN.rc - copied unchanged from r58606, trunk/reactos/win32ss/user/user32/lang/zh-CN.rc Removed: branches/ros-csrss/dll/win32/urlmon/protproxy.c branches/ros-csrss/dll/win32/urlmon/rsrc.rc branches/ros-csrss/dll/win32/urlmon/version.rc Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/cacls/lang/ja-JP.rc branches/ros-csrss/base/applications/cmdutils/doskey/doskey.rc branches/ros-csrss/base/applications/dxdiag/rsrc.rc branches/ros-csrss/base/applications/fontview/fontview.rc branches/ros-csrss/base/applications/games/solitaire/lang/ja-JP.rc branches/ros-csrss/base/applications/games/solitaire/lang/tr-TR.rc branches/ros-csrss/base/applications/games/spider/lang/ja-JP.rc branches/ros-csrss/base/applications/games/spider/lang/tr-TR.rc branches/ros-csrss/base/applications/games/winmine/lang/tr-TR.rc branches/ros-csrss/base/applications/logoff/lang/ja-JP.rc branches/ros-csrss/base/applications/magnify/rsrc.rc branches/ros-csrss/base/applications/mplay32/rsrc.rc branches/ros-csrss/base/applications/mscutils/devmgmt/lang/ja-JP.rc branches/ros-csrss/base/applications/mscutils/eventvwr/lang/ja-JP.rc branches/ros-csrss/base/applications/mscutils/servman/lang/ja-JP.rc branches/ros-csrss/base/applications/mspaint/lang/ja-JP.rc branches/ros-csrss/base/applications/mspaint/rsrc.rc branches/ros-csrss/base/applications/mstsc/lang/ja-JP.rc branches/ros-csrss/base/applications/network/wlanconf/wlanconf.rc branches/ros-csrss/base/applications/notepad/lang/ja-JP.rc branches/ros-csrss/base/applications/notepad/lang/tr-TR.rc branches/ros-csrss/base/applications/regedit/lang/it-IT.rc branches/ros-csrss/base/applications/regedit/lang/ja-JP.rc branches/ros-csrss/base/applications/regedit/rsrc.rc branches/ros-csrss/base/applications/shutdown/lang/it-IT.rc branches/ros-csrss/base/applications/sndrec32/lang/en-US.rc branches/ros-csrss/base/applications/sndrec32/rsrc.rc branches/ros-csrss/base/applications/sndvol32/lang/ja-JP.rc branches/ros-csrss/base/applications/taskmgr/lang/ja-JP.rc branches/ros-csrss/base/applications/wordpad/En.rc branches/ros-csrss/base/applications/wordpad/Tr.rc branches/ros-csrss/base/applications/wordpad/rsrc.rc branches/ros-csrss/base/applications/write/rsrc.rc branches/ros-csrss/base/shell/cmd/copy.c branches/ros-csrss/base/shell/cmd/echo.c branches/ros-csrss/base/shell/cmd/filecomp.c branches/ros-csrss/base/system/regsvr32/lang/ja-JP.rc branches/ros-csrss/base/system/services/database.c branches/ros-csrss/base/system/services/rpcserver.c branches/ros-csrss/base/system/services/services.c branches/ros-csrss/base/system/services/services.h branches/ros-csrss/boot/bootdata/CMakeLists.txt branches/ros-csrss/boot/bootdata/hivedef.inf branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/entry.S branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/winldr.c branches/ros-csrss/boot/freeldr/freeldr/debug.c branches/ros-csrss/boot/freeldr/freeldr/include/mm.h branches/ros-csrss/boot/freeldr/freeldr/mm/meminit.c branches/ros-csrss/cmake/CMakeMacros.cmake branches/ros-csrss/cmake/config.cmake branches/ros-csrss/cmake/gcc.cmake branches/ros-csrss/dll/cpl/access/lang/ja-JP.rc branches/ros-csrss/dll/cpl/sysdm/lang/ja-JP.rc branches/ros-csrss/dll/cpl/telephon/lang/ja-JP.rc branches/ros-csrss/dll/cpl/timedate/lang/it-IT.rc branches/ros-csrss/dll/cpl/timedate/rsrc.rc branches/ros-csrss/dll/directx/ksproxy/output_pin.cpp branches/ros-csrss/dll/ntdll/def/ntdll.spec branches/ros-csrss/dll/ntdll/ldr/ldrinit.c branches/ros-csrss/dll/opengl/opengl32/CMakeLists.txt branches/ros-csrss/dll/opengl/opengl32/font.c branches/ros-csrss/dll/opengl/opengl32/opengl32.spec branches/ros-csrss/dll/opengl/opengl32/wgl.c branches/ros-csrss/dll/win32/CMakeLists.txt branches/ros-csrss/dll/win32/kernel32/client/fiber.c branches/ros-csrss/dll/win32/kernel32/client/thread.c branches/ros-csrss/dll/win32/lsasrv/authpackage.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.spec branches/ros-csrss/dll/win32/lsasrv/policy.c branches/ros-csrss/dll/win32/msv1_0/CMakeLists.txt branches/ros-csrss/dll/win32/msv1_0/msv1_0.c branches/ros-csrss/dll/win32/msv1_0/msv1_0.h branches/ros-csrss/dll/win32/msv1_0/msv1_0.spec branches/ros-csrss/dll/win32/msxml3/attribute.c branches/ros-csrss/dll/win32/msxml3/cdata.c branches/ros-csrss/dll/win32/msxml3/dispex.c branches/ros-csrss/dll/win32/msxml3/domdoc.c branches/ros-csrss/dll/win32/msxml3/element.c branches/ros-csrss/dll/win32/msxml3/factory.c branches/ros-csrss/dll/win32/msxml3/httprequest.c branches/ros-csrss/dll/win32/msxml3/main.c branches/ros-csrss/dll/win32/msxml3/msxml_private.h branches/ros-csrss/dll/win32/msxml3/mxwriter.c branches/ros-csrss/dll/win32/msxml3/node.c branches/ros-csrss/dll/win32/msxml3/nodelist.c branches/ros-csrss/dll/win32/msxml3/saxreader.c branches/ros-csrss/dll/win32/msxml3/schema.c branches/ros-csrss/dll/win32/msxml3/text.c branches/ros-csrss/dll/win32/msxml3/xmlparser.c branches/ros-csrss/dll/win32/msxml3/xslpattern.l branches/ros-csrss/dll/win32/msxml3/xslpattern.yy.c branches/ros-csrss/dll/win32/netcfgx/lang/ja-JP.rc branches/ros-csrss/dll/win32/netid/lang/ja-JP.rc branches/ros-csrss/dll/win32/newdev/lang/ja-JP.rc branches/ros-csrss/dll/win32/newdev/wizard.c branches/ros-csrss/dll/win32/ole32/compobj.c branches/ros-csrss/dll/win32/ole32/compositemoniker.c branches/ros-csrss/dll/win32/ole32/defaulthandler.c branches/ros-csrss/dll/win32/ole32/moniker.c branches/ros-csrss/dll/win32/ole32/ole2.c branches/ros-csrss/dll/win32/ole32/pointermoniker.c branches/ros-csrss/dll/win32/ole32/rpc.c branches/ros-csrss/dll/win32/ole32/storage32.c branches/ros-csrss/dll/win32/ole32/usrmarshal.c branches/ros-csrss/dll/win32/oleaut32/connpt.h branches/ros-csrss/dll/win32/oleaut32/oleaut.c branches/ros-csrss/dll/win32/oleaut32/olepicture.c branches/ros-csrss/dll/win32/oleaut32/olepropframe.c branches/ros-csrss/dll/win32/oleaut32/recinfo.c branches/ros-csrss/dll/win32/oleaut32/tmarshal.c branches/ros-csrss/dll/win32/oleaut32/typelib.c branches/ros-csrss/dll/win32/oleaut32/typelib.h branches/ros-csrss/dll/win32/oleaut32/typelib2.c branches/ros-csrss/dll/win32/oleaut32/varformat.c branches/ros-csrss/dll/win32/oleaut32/variant.c branches/ros-csrss/dll/win32/oleaut32/variant.h branches/ros-csrss/dll/win32/oleaut32/vartype.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/shell32/CMakeLists.txt branches/ros-csrss/dll/win32/shlwapi/istream.c branches/ros-csrss/dll/win32/shlwapi/ordinal.c branches/ros-csrss/dll/win32/shlwapi/path.c branches/ros-csrss/dll/win32/shlwapi/reg.c branches/ros-csrss/dll/win32/shlwapi/shlwapi.rc branches/ros-csrss/dll/win32/shlwapi/shlwapi.spec branches/ros-csrss/dll/win32/shlwapi/string.c branches/ros-csrss/dll/win32/shlwapi/thread.c branches/ros-csrss/dll/win32/shlwapi/url.c branches/ros-csrss/dll/win32/syssetup/lang/ja-JP.rc branches/ros-csrss/dll/win32/urlmon/CMakeLists.txt branches/ros-csrss/dll/win32/urlmon/bindctx.c branches/ros-csrss/dll/win32/urlmon/binding.c branches/ros-csrss/dll/win32/urlmon/bindprot.c branches/ros-csrss/dll/win32/urlmon/download.c branches/ros-csrss/dll/win32/urlmon/file.c branches/ros-csrss/dll/win32/urlmon/ftp.c branches/ros-csrss/dll/win32/urlmon/http.c branches/ros-csrss/dll/win32/urlmon/internet.c branches/ros-csrss/dll/win32/urlmon/mk.c branches/ros-csrss/dll/win32/urlmon/protocol.c branches/ros-csrss/dll/win32/urlmon/sec_mgr.c branches/ros-csrss/dll/win32/urlmon/session.c branches/ros-csrss/dll/win32/urlmon/umon.c branches/ros-csrss/dll/win32/urlmon/umstream.c branches/ros-csrss/dll/win32/urlmon/uri.c branches/ros-csrss/dll/win32/urlmon/urlmon.spec branches/ros-csrss/dll/win32/urlmon/urlmon_main.c branches/ros-csrss/dll/win32/urlmon/urlmon_main.h branches/ros-csrss/dll/win32/urlmon/urlmon_urlmon.idl branches/ros-csrss/dll/win32/urlmon/usrmarshal.c branches/ros-csrss/dll/win32/userenv/lang/it-IT.rc branches/ros-csrss/dll/win32/windowscodecs/jpegformat.c branches/ros-csrss/drivers/usb/usbehci/ (props changed) branches/ros-csrss/drivers/usb/usbehci/hardware.cpp branches/ros-csrss/drivers/usb/usbehci/usb_queue.cpp branches/ros-csrss/drivers/usb/usbohci/ (props changed) branches/ros-csrss/drivers/usb/usbohci/hardware.cpp branches/ros-csrss/drivers/usb/usbohci/usb_request.cpp branches/ros-csrss/drivers/usb/usbstor/descriptor.c branches/ros-csrss/drivers/usb/usbstor/error.c branches/ros-csrss/drivers/usb/usbstor/fdo.c branches/ros-csrss/drivers/usb/usbstor/pdo.c branches/ros-csrss/drivers/usb/usbuhci/hardware.cpp branches/ros-csrss/hal/halx86/CMakeLists.txt branches/ros-csrss/include/asm/genincdata.c branches/ros-csrss/include/crt/mbstring.h branches/ros-csrss/include/crt/msc/intrin.h branches/ros-csrss/include/crt/sys/stat.h branches/ros-csrss/include/crt/sys/timeb.h branches/ros-csrss/include/ddk/ntsam.h branches/ros-csrss/include/ddk/ntstrsafe.h branches/ros-csrss/include/ddk/usbbusif.h branches/ros-csrss/include/ddk/wdm.h branches/ros-csrss/include/ndk/mmtypes.h branches/ros-csrss/include/ndk/obfuncs.h branches/ros-csrss/include/ndk/rtlfuncs.h branches/ros-csrss/include/psdk/propvarutil.h branches/ros-csrss/include/psdk/sal.h branches/ros-csrss/include/psdk/sal_old.h branches/ros-csrss/include/psdk/urlmon.idl branches/ros-csrss/include/xdk/kefuncs.h branches/ros-csrss/include/xdk/ketypes.h branches/ros-csrss/lib/drivers/libusb/hcd_controller.cpp (contents, props changed) branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp (contents, props changed) branches/ros-csrss/lib/drivers/libusb/usb_device.cpp (contents, props changed) branches/ros-csrss/lib/rtl/actctx.c branches/ros-csrss/lib/sdk/uuid/otherguids.c branches/ros-csrss/media/doc/README.WINE branches/ros-csrss/tools/geninc/geninc.c branches/ros-csrss/tools/mkhive/reginf.c branches/ros-csrss/tools/mkhive/registry.c branches/ros-csrss/tools/mkshelllink/mkshelllink.c branches/ros-csrss/tools/obj2bin/obj2bin.c branches/ros-csrss/tools/rsym/rsym.c branches/ros-csrss/win32ss/gdi/eng/floatobj.h branches/ros-csrss/win32ss/gdi/eng/mapping.c branches/ros-csrss/win32ss/gdi/gdi32/main/dllmain.c branches/ros-csrss/win32ss/gdi/ntgdi/freetype.c branches/ros-csrss/win32ss/gdi/ntgdi/palette.c branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/focus.c branches/ros-csrss/win32ss/user/ntuser/focus.h branches/ros-csrss/win32ss/user/ntuser/message.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/lang/en-US.rc branches/ros-csrss/win32ss/user/user32/user32.rc branches/ros-csrss/win32ss/user/user32/windows/nonclient.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/cacls/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cac… Modified: branches/ros-csrss/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cmd… Modified: branches/ros-csrss/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/dxd… Modified: branches/ros-csrss/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/fon… Modified: branches/ros-csrss/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/logoff/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/log… Modified: branches/ros-csrss/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/mag… Modified: branches/ros-csrss/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/mpl… Modified: branches/ros-csrss/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msc… Modified: branches/ros-csrss/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msc… Modified: branches/ros-csrss/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msc… Modified: branches/ros-csrss/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msp… Modified: branches/ros-csrss/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msp… Modified: branches/ros-csrss/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/mst… Modified: branches/ros-csrss/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/net… Modified: branches/ros-csrss/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/not… Modified: branches/ros-csrss/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/not… Modified: branches/ros-csrss/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/shutdown/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/shu… Modified: branches/ros-csrss/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/tas… Modified: branches/ros-csrss/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/wor… Modified: branches/ros-csrss/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/wor… Modified: branches/ros-csrss/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/wor… Modified: branches/ros-csrss/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/wri… Modified: branches/ros-csrss/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/copy.c… Modified: branches/ros-csrss/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/echo.c… Modified: branches/ros-csrss/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/fileco… Modified: branches/ros-csrss/base/system/regsvr32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/regsvr32/… Modified: branches/ros-csrss/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/CMakeLi… Modified: branches/ros-csrss/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… Modified: branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/CMakeMacros.cma… Modified: branches/ros-csrss/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/config.cmake?re… Modified: branches/ros-csrss/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/gcc.cmake?rev=5… Modified: branches/ros-csrss/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/access/lang/j… Modified: branches/ros-csrss/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/sysdm/lang/ja… Modified: branches/ros-csrss/dll/cpl/telephon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/telephon/lang… Modified: branches/ros-csrss/dll/cpl/timedate/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/timedate/lang… Modified: branches/ros-csrss/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/timedate/rsrc… Modified: branches/ros-csrss/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/ksproxy/o… Modified: branches/ros-csrss/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/def/ntdll.s… Modified: branches/ros-csrss/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/ldr/ldrinit… Modified: branches/ros-csrss/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/opengl32/C… Modified: branches/ros-csrss/dll/opengl/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/opengl32/f… Modified: branches/ros-csrss/dll/opengl/opengl32/opengl32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/opengl32/o… Modified: branches/ros-csrss/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/opengl32/w… Modified: branches/ros-csrss/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/CMakeLists.… Modified: branches/ros-csrss/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/auth… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/poli… Modified: branches/ros-csrss/dll/win32/msv1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msv1_0/CMak… Modified: branches/ros-csrss/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msv1_0/msv1… Modified: branches/ros-csrss/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msv1_0/msv1… Modified: branches/ros-csrss/dll/win32/msv1_0/msv1_0.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msv1_0/msv1… Modified: branches/ros-csrss/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/attr… Modified: branches/ros-csrss/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/cdat… Modified: branches/ros-csrss/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/disp… Modified: branches/ros-csrss/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/domd… Modified: branches/ros-csrss/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/elem… Modified: branches/ros-csrss/dll/win32/msxml3/factory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/fact… Modified: branches/ros-csrss/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/http… Modified: branches/ros-csrss/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/main… Modified: branches/ros-csrss/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/msxm… Modified: branches/ros-csrss/dll/win32/msxml3/mxwriter.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/mxwr… Modified: branches/ros-csrss/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/node… Modified: branches/ros-csrss/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/node… Modified: branches/ros-csrss/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/saxr… Modified: branches/ros-csrss/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/sche… Modified: branches/ros-csrss/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/text… Modified: branches/ros-csrss/dll/win32/msxml3/xmlparser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/xmlp… Modified: branches/ros-csrss/dll/win32/msxml3/xslpattern.l URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/xslp… Modified: branches/ros-csrss/dll/win32/msxml3/xslpattern.yy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/xslp… Modified: branches/ros-csrss/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netcfgx/lan… Modified: branches/ros-csrss/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netid/lang/… Modified: branches/ros-csrss/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/newdev/lang… Modified: branches/ros-csrss/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/newdev/wiza… Modified: branches/ros-csrss/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/compo… Modified: branches/ros-csrss/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/compo… Modified: branches/ros-csrss/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/defau… Modified: branches/ros-csrss/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/monik… Modified: branches/ros-csrss/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/ole2.… Modified: branches/ros-csrss/dll/win32/ole32/pointermoniker.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/point… Modified: branches/ros-csrss/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/rpc.c… Modified: branches/ros-csrss/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/stora… Modified: branches/ros-csrss/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/usrma… Modified: branches/ros-csrss/dll/win32/oleaut32/connpt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/co… Modified: branches/ros-csrss/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ol… Modified: branches/ros-csrss/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ol… Modified: branches/ros-csrss/dll/win32/oleaut32/olepropframe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ol… Modified: branches/ros-csrss/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/re… Modified: branches/ros-csrss/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/tm… Modified: branches/ros-csrss/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ty… Modified: branches/ros-csrss/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ty… Modified: branches/ros-csrss/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ty… Modified: branches/ros-csrss/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/va… Modified: branches/ros-csrss/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/va… Modified: branches/ros-csrss/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/va… Modified: branches/ros-csrss/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/va… Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… Modified: branches/ros-csrss/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/CMa… Modified: branches/ros-csrss/dll/win32/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/ist… Modified: branches/ros-csrss/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/ord… Modified: branches/ros-csrss/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/pat… Modified: branches/ros-csrss/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/reg… Modified: branches/ros-csrss/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/shl… Modified: branches/ros-csrss/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/shl… Modified: branches/ros-csrss/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/str… Modified: branches/ros-csrss/dll/win32/shlwapi/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/thr… Modified: branches/ros-csrss/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/url… Modified: branches/ros-csrss/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/syssetup/la… Modified: branches/ros-csrss/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/CMak… Modified: branches/ros-csrss/dll/win32/urlmon/bindctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/bind… Modified: branches/ros-csrss/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/bind… Modified: branches/ros-csrss/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/bind… Modified: branches/ros-csrss/dll/win32/urlmon/download.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/down… Modified: branches/ros-csrss/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/file… Modified: branches/ros-csrss/dll/win32/urlmon/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/ftp.… Modified: branches/ros-csrss/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/http… Modified: branches/ros-csrss/dll/win32/urlmon/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/inte… Modified: branches/ros-csrss/dll/win32/urlmon/mk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/mk.c… Modified: branches/ros-csrss/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/prot… Removed: branches/ros-csrss/dll/win32/urlmon/protproxy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/prot… Removed: branches/ros-csrss/dll/win32/urlmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/rsrc… Modified: branches/ros-csrss/dll/win32/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/sec_… Modified: branches/ros-csrss/dll/win32/urlmon/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/sess… Modified: branches/ros-csrss/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/umon… Modified: branches/ros-csrss/dll/win32/urlmon/umstream.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/umst… Modified: branches/ros-csrss/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/uri.… Modified: branches/ros-csrss/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/urlm… Modified: branches/ros-csrss/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/urlm… Modified: branches/ros-csrss/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/urlm… Modified: branches/ros-csrss/dll/win32/urlmon/urlmon_urlmon.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/urlm… Modified: branches/ros-csrss/dll/win32/urlmon/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/usrm… Removed: branches/ros-csrss/dll/win32/urlmon/version.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/vers… Modified: branches/ros-csrss/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/userenv/lan… Modified: branches/ros-csrss/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/windowscode… Modified: branches/ros-csrss/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbehci/h… Modified: branches/ros-csrss/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbehci/u… Modified: branches/ros-csrss/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbohci/h… Modified: branches/ros-csrss/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbohci/u… Modified: branches/ros-csrss/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/d… Modified: branches/ros-csrss/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/e… Modified: branches/ros-csrss/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/f… Modified: branches/ros-csrss/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/p… Modified: branches/ros-csrss/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbuhci/h… Modified: branches/ros-csrss/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/CMakeLists… Modified: branches/ros-csrss/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/asm/genincdat… Modified: branches/ros-csrss/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/mbstring.… Modified: branches/ros-csrss/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/msc/intri… Modified: branches/ros-csrss/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/sys/stat.… Modified: branches/ros-csrss/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/sys/timeb… Modified: branches/ros-csrss/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/ntsam.h?r… Modified: branches/ros-csrss/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/ntstrsafe… Modified: branches/ros-csrss/include/ddk/usbbusif.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/usbbusif.… Modified: branches/ros-csrss/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/wdm.h?rev… Modified: branches/ros-csrss/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/mmtypes.h… Modified: branches/ros-csrss/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/obfuncs.h… Modified: branches/ros-csrss/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/rtlfuncs.… Modified: branches/ros-csrss/include/psdk/propvarutil.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/propvaru… Modified: branches/ros-csrss/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/sal.h?re… Modified: branches/ros-csrss/include/psdk/sal_old.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/sal_old.… Modified: branches/ros-csrss/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/urlmon.i… Modified: branches/ros-csrss/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/xdk/kefuncs.h… Modified: branches/ros-csrss/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/xdk/ketypes.h… Modified: branches/ros-csrss/lib/drivers/libusb/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/hc… Modified: branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/hu… Modified: branches/ros-csrss/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/us… Modified: branches/ros-csrss/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/rtl/actctx.c?rev=… Modified: branches/ros-csrss/lib/sdk/uuid/otherguids.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/uuid/othergui… Modified: branches/ros-csrss/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/doc/README.WINE… Modified: branches/ros-csrss/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/geninc/geninc.c… Modified: branches/ros-csrss/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/mkhive/reginf.c… Modified: branches/ros-csrss/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/mkhive/registry… Modified: branches/ros-csrss/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/mkshelllink/mks… Modified: branches/ros-csrss/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/obj2bin/obj2bin… Modified: branches/ros-csrss/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/rsym/rsym.c?rev… Modified: branches/ros-csrss/win32ss/gdi/eng/floatobj.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/float… Modified: branches/ros-csrss/win32ss/gdi/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/mappi… Modified: branches/ros-csrss/win32ss/gdi/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/gdi32/mai… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/fre… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/pal… Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… Modified: branches/ros-csrss/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/f… Modified: branches/ros-csrss/win32ss/user/ntuser/focus.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/f… Modified: branches/ros-csrss/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… Modified: branches/ros-csrss/win32ss/user/user32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/l… Modified: branches/ros-csrss/win32ss/user/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/u… Modified: branches/ros-csrss/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w…

1 0

[tkreuzer] 58606: [FREELDR] - Set bugcheck data when the image is corrupt - Add 2 more useful debug constants: DEBUG_WARN and DEBUG_ERR - Use COM2 for debug output when _WINKD_ is defined - Fix amd...
by tkreuzer＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: tkreuzer Date: Sun Mar 24 17:09:03 2013 New Revision: 58606 URL: http://svn.reactos.org/svn/reactos?rev=58606&view=rev Log: [FREELDR] - Set bugcheck data when the image is corrupt - Add 2 more useful debug constants: DEBUG_WARN and DEBUG_ERR - Use COM2 for debug output when _WINKD_ is defined - Fix amd64 boot Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Sun Mar 24 17:09:03 2013 @@ -269,6 +269,7 @@ { PKGDTENTRY64 Entry; KDESCRIPTOR GdtDesc; + TRACE("Amd64SetupGdt(GdtBase = %p, TssBase = %p)\n", GdtBase, TssBase); /* Setup KGDT64_NULL */ Entry = KiGetGdtEntry(GdtBase, KGDT64_NULL); @@ -308,20 +309,22 @@ /* Set the new Gdt */ __lgdt(&GdtDesc.Limit); - TRACE("Gdtr.Base = %p, num = %ld\n", GdtDesc.Base, NUM_GDT); - + TRACE("Leave Amd64SetupGdt()\n"); } VOID Amd64SetupIdt(PVOID IdtBase) { KDESCRIPTOR IdtDesc, OldIdt; + ULONG Size; + TRACE("Amd64SetupIdt(IdtBase = %p)\n", IdtBase); /* Get old IDT */ - __sidt(&OldIdt); + __sidt(&OldIdt.Limit); /* Copy the old IDT */ - RtlCopyMemory(IdtBase, (PVOID)OldIdt.Base, OldIdt.Limit + 1); + Size = min(OldIdt.Limit + 1, NUM_IDT * sizeof(KIDTENTRY)); + //RtlCopyMemory(IdtBase, (PVOID)OldIdt.Base, Size); /* Setup the new IDT descriptor */ IdtDesc.Base = IdtBase; @@ -329,8 +332,7 @@ /* Set the new IDT */ __lidt(&IdtDesc.Limit); - TRACE("Idtr.Base = %p\n", IdtDesc.Base); - + TRACE("Leave Amd64SetupIdt()\n"); } VOID @@ -354,7 +356,7 @@ Amd64SetupGdt(GdtIdt, KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); /* Copy old Idt and set idtr */ - Amd64SetupIdt((PVOID)((ULONG64)GdtIdt + 2048)); // HACK! + Amd64SetupIdt((PVOID)((ULONG64)GdtIdt + NUM_GDT * sizeof(KGDTENTRY))); /* LDT is unused */ // __lldt(0); @@ -390,7 +392,7 @@ TssBasePage = Tss >> MM_PAGE_SHIFT; /* Allocate space for new GDT + IDT */ - BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? + BlockSize = NUM_GDT * sizeof(KGDTENTRY) + NUM_IDT * sizeof(KIDTENTRY); NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); if (GdtIdt == NULL) Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Mar 24 17:09:03 2013 @@ -24,6 +24,8 @@ #if DBG && !defined(_M_ARM) //#define DEBUG_ALL +//#define DEBUG_WARN +//#define DEBUG_ERR //#define DEBUG_INIFILE //#define DEBUG_REACTOS //#define DEBUG_CUSTOM @@ -49,7 +51,12 @@ //ULONG DebugPort = SCREEN; //ULONG DebugPort = BOCHS; //ULONG DebugPort = SCREEN|BOCHS; +#ifdef _WINKD_ +/* COM1 is the WinDbg port */ +ULONG ComPort = COM2; +#else ULONG ComPort = COM1; +#endif //ULONG BaudRate = 19200; ULONG BaudRate = 115200; @@ -59,6 +66,10 @@ { #if defined (DEBUG_ALL) memset(DbgChannels, MAX_LEVEL, DBG_CHANNELS_COUNT); +#elif defined (DEBUG_WARN) + memset(DbgChannels, WARN_LEVEL|FIXME_LEVEL|ERR_LEVEL, DBG_CHANNELS_COUNT); +#elif defined (DEBUG_ERR) + memset(DbgChannels, ERR_LEVEL, DBG_CHANNELS_COUNT); #else memset(DbgChannels, 0, DBG_CHANNELS_COUNT); #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Sun Mar 24 17:09:03 2013 @@ -23,7 +23,12 @@ #ifdef __GNUC__ #define FREELDR_SECTION_COUNT 3 #else +#ifdef _M_AMD64 +/* .text and .pdata */ +#define FREELDR_SECTION_COUNT 2 +#else #define FREELDR_SECTION_COUNT 1 +#endif #endif typedef struct _FREELDR_MEMORY_DESCRIPTOR Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sun Mar 24 17:09:03 2013 @@ -174,7 +174,7 @@ NtHeaders = RtlImageNtHeader(&__ImageBase); if (!NtHeaders) { - ERR("Coult not get NtHeaders!\n"); + ERR("Could not get NtHeaders!\n"); return FALSE; } @@ -184,8 +184,14 @@ (FileHeader->NumberOfSections != FREELDR_SECTION_COUNT) || (FileHeader->PointerToSymbolTable != 0) || (FileHeader->NumberOfSymbols != 0) || - (FileHeader->SizeOfOptionalHeader != 0xE0)) - { + (FileHeader->SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER))) + { + ERR("FreeLdr FileHeader is invalid.\n"); + BugCheckInfo[0] = FileHeader->Machine; + BugCheckInfo[1] = FileHeader->NumberOfSections; + BugCheckInfo[2] = FileHeader->PointerToSymbolTable; + BugCheckInfo[3] = FileHeader->NumberOfSymbols; + BugCheckInfo[4] = FileHeader->SizeOfOptionalHeader; return FALSE; } @@ -197,6 +203,12 @@ (OptionalHeader->SizeOfImage > MAX_FREELDR_PE_SIZE) || (OptionalHeader->SectionAlignment != OptionalHeader->FileAlignment)) { + ERR("FreeLdr OptionalHeader is invalid.\n"); + BugCheckInfo[0] = 0x80000000 | (OptionalHeader->Subsystem << 16) | OptionalHeader->Magic; + BugCheckInfo[1] = OptionalHeader->ImageBase; + BugCheckInfo[2] = OptionalHeader->SizeOfImage; + BugCheckInfo[3] = OptionalHeader->SectionAlignment; + BugCheckInfo[4] = OptionalHeader->FileAlignment; return FALSE; }

1 0

[hbelusca] 58605: [CONSOLE.DLL-CONSRV] - Further separate properties of the GUI terminal front-end and those independent of the UI. - Fix some console initialization steps.
by hbelusca＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: hbelusca Date: Sun Mar 24 17:08:10 2013 New Revision: 58605 URL: http://svn.reactos.org/svn/reactos?rev=58605&view=rev Log: [CONSOLE.DLL-CONSRV] - Further separate properties of the GUI terminal front-end and those independent of the UI. - Fix some console initialization steps. Added: branches/ros-csrss/win32ss/user/consrv/consolecpl.h (with props) branches/ros-csrss/win32ss/user/consrv/guisettings.c (with props) branches/ros-csrss/win32ss/user/consrv/guisettings.h (with props) Modified: branches/ros-csrss/dll/cpl/console/CMakeLists.txt branches/ros-csrss/dll/cpl/console/colors.c branches/ros-csrss/dll/cpl/console/console.c branches/ros-csrss/dll/cpl/console/console.h branches/ros-csrss/dll/cpl/console/font.c branches/ros-csrss/dll/cpl/console/layout.c branches/ros-csrss/dll/cpl/console/options.c branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/dll/win32/kernel32/client/console/init.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/consrv.rc branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/settings.c branches/ros-csrss/win32ss/user/consrv/settings.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/CMake… Modified: branches/ros-csrss/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/color… Modified: branches/ros-csrss/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… Modified: branches/ros-csrss/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… Modified: branches/ros-csrss/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/font.… Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… Modified: branches/ros-csrss/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/optio… Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/C… Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Added: branches/ros-csrss/win32ss/user/consrv/consolecpl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/consrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Added: branches/ros-csrss/win32ss/user/consrv/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Added: branches/ros-csrss/win32ss/user/consrv/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… Modified: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… Modified: branches/ros-csrss/win32ss/user/consrv/settings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s…

1 0

[akhaldi] 58604: * Add the PSEH3 related define for the TestBE runs.
by akhaldi＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: akhaldi Date: Sun Mar 24 16:48:09 2013 New Revision: 58604 URL: http://svn.reactos.org/svn/reactos?rev=58604&view=rev Log: * Add the PSEH3 related define for the TestBE runs. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=58604&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Mar 24 16:48:09 2013 @@ -94,6 +94,7 @@ # PSEH if(GCC_VERSION VERSION_GREATER 4.7) set(USE_PSEH3 1) + add_definitions(-D_USE_PSEH3=1) endif() # Other

1 0

[akhaldi] 58603: * Use PSEH3 for the TestBE runs.
by akhaldi＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: akhaldi Date: Sun Mar 24 16:08:28 2013 New Revision: 58603 URL: http://svn.reactos.org/svn/reactos?rev=58603&view=rev Log: * Use PSEH3 for the TestBE runs. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=58603&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Mar 24 16:08:28 2013 @@ -91,6 +91,11 @@ add_compile_flags("-mpreferred-stack-boundary=4") endif() +# PSEH +if(GCC_VERSION VERSION_GREATER 4.7) + set(USE_PSEH3 1) +endif() + # Other if(ARCH STREQUAL "amd64") add_definitions(-U_X86_ -UWIN32)

1 0

[tkreuzer] 58602: [HAL] Link to libgcc, hopefully fixes build for Pierre
by tkreuzer＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: tkreuzer Date: Sun Mar 24 13:27:52 2013 New Revision: 58602 URL: http://svn.reactos.org/svn/reactos?rev=58602&view=rev Log: [HAL] Link to libgcc, hopefully fixes build for Pierre Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Sun Mar 24 13:27:52 2013 @@ -41,6 +41,8 @@ add_cd_file(TARGET ${_halname} DESTINATION reactos/system32 NO_CAB FOR all) if(MSVC) add_target_link_flags(${_halname} "/ignore:4216 /ignore:4078") + else() + target_link_libraries(${_halname} -lgcc) endif() endfunction()

1 0

[akhaldi] 58601: [SHLWAPI_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: akhaldi Date: Sun Mar 24 12:36:17 2013 New Revision: 58601 URL: http://svn.reactos.org/svn/reactos?rev=58601&view=rev Log: [SHLWAPI_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/shlwapi/assoc.c trunk/rostests/winetests/shlwapi/clist.c trunk/rostests/winetests/shlwapi/clsid.c trunk/rostests/winetests/shlwapi/generated.c trunk/rostests/winetests/shlwapi/istream.c trunk/rostests/winetests/shlwapi/ordinal.c trunk/rostests/winetests/shlwapi/path.c trunk/rostests/winetests/shlwapi/shreg.c trunk/rostests/winetests/shlwapi/string.c trunk/rostests/winetests/shlwapi/testlist.c trunk/rostests/winetests/shlwapi/thread.c trunk/rostests/winetests/shlwapi/url.c Modified: trunk/rostests/winetests/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/assoc.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,11 +17,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "wine/test.h" -#include "shlwapi.h" -#include "shlguid.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> + +#include <wine/test.h> +#include <winreg.h> +#include <shlwapi.h> +#include <shlguid.h> #define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) #define expect_hr(expected, got) ok ( expected == got, "Expected %08x, got %08x\n", expected, got) @@ -78,7 +83,8 @@ hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || - hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); @@ -133,7 +139,8 @@ hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, &len); ok(hr == S_FALSE || - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* Win9x/NT4 */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win9x/NT4 */ || + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); if (hr != S_FALSE) { Modified: trunk/rostests/winetests/shlwapi/clist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/clist.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/clist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/clist.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,12 +17,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "objbase.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> + +#include <wine/test.h> +//#include "windef.h" +//#include "winbase.h" +#include <objbase.h> typedef struct tagSHLWAPI_CLIST { Modified: trunk/rostests/winetests/shlwapi/clsid.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/clsid.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/clsid.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/clsid.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,17 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - -#include "wine/test.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" -#include "winuser.h" -#include "initguid.h" -#include "shlguid.h" -#include "shobjidl.h" -#include "olectl.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdio.h> + +#include <wine/test.h> +//#include "winbase.h" +//#include "winerror.h" +//#include "winnls.h" +//#include "winuser.h" +#include <objbase.h> +#include <initguid.h> +#include <shlguid.h> +#include <shobjidl.h> +#include <olectl.h> DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); Modified: trunk/rostests/winetests/shlwapi/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/generat… ============================================================================== --- trunk/rostests/winetests/shlwapi/generated.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/generated.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -4,6 +4,10 @@ /* * Unit tests for data structure packing */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H #define WINVER 0x0501 #define _WIN32_IE 0x0501 @@ -12,13 +16,13 @@ #define WINE_NOWINSOCK #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "winreg.h" -#include "shlwapi.h" - -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +//#include "wtypes.h" +#include <winreg.h> +#include <shlwapi.h> + +#include <wine/test.h> /*********************************************************************** * Compatibility macros Modified: trunk/rostests/winetests/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/istream… ============================================================================== --- trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,16 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "shlwapi.h" +//#include <stdarg.h> +//#include <stdio.h> + +#include <wine/test.h> +//#include "windef.h" +//#include "winbase.h" +#include <winnls.h> +#include <winreg.h> +#include <objbase.h> +//#include "shlwapi.h" /* Function pointers for the SHCreateStreamOnFile functions */ Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… ============================================================================== --- trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,22 +17,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdio.h> #define COBJMACROS #define CONST_VTABLE -#include "wine/test.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "ole2.h" -#include "oaidl.h" -#include "ocidl.h" -#include "mlang.h" -#include "shlwapi.h" -#include "docobj.h" -#include "shobjidl.h" -#include "shlobj.h" +#include <wine/test.h> +//#include "winbase.h" +#include <winreg.h> +#include <winnls.h> +//#include "winerror.h" +//#include "winuser.h" +#include <ole2.h> +//#include "oaidl.h" +//#include "ocidl.h" +//#include "mlang.h" +#include <shlwapi.h> +//#include "docobj.h" +#include <shobjidl.h> +//#include "shlobj.h" /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; Modified: trunk/rostests/winetests/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/path.c?… ============================================================================== --- trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,21 +17,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> #include <stdio.h> -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" -#include "wininet.h" +#include <wine/test.h> +//#include "windef.h" +//#include "winbase.h" +#include <winreg.h> +#include <winnls.h> +#include <shlwapi.h> +#include <wininet.h> static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); +static HRESULT (WINAPI *pPathCreateFromUrlAlloc)(LPCWSTR, LPWSTR*, DWORD); static BOOL (WINAPI *pPathAppendA)(LPSTR, LPCSTR); /* ################ */ @@ -39,34 +45,88 @@ static const struct { const char *url; const char *path; - DWORD ret; + DWORD ret, todo; } TEST_PATHFROMURL[] = { - {"file:///c:/foo/ba%5Cr", "c:\\foo\\ba\\r", S_OK}, - {"file:///c:/foo/../ba%5Cr", "c:\\foo\\..\\ba\\r", S_OK}, - {"file:///host/c:/foo/bar", "\\host\\c:\\foo\\bar", S_OK}, - {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file:\\\\host\\ca\\foo\\bar", "\\\\host\\ca\\foo\\bar", S_OK}, - {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK}, - {"file:\\%5Chost\\c:\\foo\\bar", "\\\\host\\c:\\foo\\bar", S_OK}, - {"file:\\\\host\\cx:\\foo\\bar", "\\\\host\\cx:\\foo\\bar", S_OK}, - {"file://c:/foo/bar", "c:\\foo\\bar", S_OK}, - {"file://c:/d:/foo/bar", "c:\\d:\\foo\\bar", S_OK}, - {"file://c|/d|/foo/bar", "c:\\d|\\foo\\bar", S_OK}, - {"file://host/foo/bar", "\\\\host\\foo\\bar", S_OK}, - {"file:/foo/bar", "\\foo\\bar", S_OK}, - {"file:/foo/bar/", "\\foo\\bar\\", S_OK}, - {"file:foo/bar", "foo\\bar", S_OK}, - {"file:c:/foo/bar", "c:\\foo\\bar", S_OK}, - {"file:c|/foo/bar", "c:\\foo\\bar", S_OK}, - {"file:cx|/foo/bar", "cx|\\foo\\bar", S_OK}, - {"file:////c:/foo/bar", "c:\\foo\\bar", S_OK}, -/* {"file:////c:/foo/foo%20bar", "c:\\foo\\foo%20bar", S_OK},*/ - - {"c:\\foo\\bar", NULL, E_INVALIDARG}, - {"foo/bar", NULL, E_INVALIDARG}, - {"http://foo/bar", NULL, E_INVALIDARG}, + /* 0 leading slash */ + {"file:c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:c|/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:cx|/foo/bar", "cx|\\foo\\bar", S_OK, 0}, + {"file:c:foo/bar", "c:foo\\bar", S_OK, 0}, + {"file:c|foo/bar", "c:foo\\bar", S_OK, 0}, + {"file:c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0}, + {"file:foo%20ba%2fr", "foo ba/r", S_OK, 0}, + {"file:foo/bar/", "foo\\bar\\", S_OK, 0}, + + /* 1 leading (back)slash */ + {"file:/c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:\\c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:/c|/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:/cx|/foo/bar", "\\cx|\\foo\\bar", S_OK, 0}, + {"file:/c:foo/bar", "c:foo\\bar", S_OK, 0}, + {"file:/c|foo/bar", "c:foo\\bar", S_OK, 0}, + {"file:/c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0}, + {"file:/foo%20ba%2fr", "\\foo ba/r", S_OK, 0}, + {"file:/foo/bar/", "\\foo\\bar\\", S_OK, 0}, + + /* 2 leading (back)slashes */ + {"file://c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file://c:/d:/foo/bar", "c:\\d:\\foo\\bar", S_OK, 0}, + {"file://c|/d|/foo/bar", "c:\\d|\\foo\\bar", S_OK, 0}, + {"file://cx|/foo/bar", "\\\\cx|\\foo\\bar", S_OK, 0}, + {"file://c:foo/bar", "c:foo\\bar", S_OK, 0}, + {"file://c|foo/bar", "c:foo\\bar", S_OK, 0}, + {"file://c:/foo%20ba%2fr", "c:\\foo%20ba%2fr", S_OK, 0}, + {"file://c%3a/foo/../bar", "\\\\c:\\foo\\..\\bar", S_OK, 0}, + {"file://c%7c/foo/../bar", "\\\\c|\\foo\\..\\bar", S_OK, 0}, + {"file://foo%20ba%2fr", "\\\\foo ba/r", S_OK, 0}, + {"file://localhost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file://localhost/c:/foo%20ba%5Cr", "c:\\foo ba\\r", S_OK, 0}, + {"file://LocalHost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:\\\\localhost\\c:\\foo\\bar", "c:\\foo\\bar", S_OK, 0}, + {"file://incomplete", "\\\\incomplete", S_OK, 0}, + + /* 3 leading (back)slashes (omitting hostname) */ + {"file:///c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"File:///c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:///c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0}, + {"file:///foo%20ba%2fr", "\\foo ba/r", S_OK, 0}, + {"file:///foo/bar/", "\\foo\\bar\\", S_OK, 0}, + {"file:///localhost/c:/foo/bar", "\\localhost\\c:\\foo\\bar", S_OK, 0}, + + /* 4 leading (back)slashes */ + {"file:////c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:////c:/foo%20ba%2fr", "c:\\foo%20ba%2fr", S_OK, 0}, + {"file:////foo%20ba%2fr", "\\\\foo%20ba%2fr", S_OK, 0}, + + /* 5 and more leading (back)slashes */ + {"file://///c:/foo/bar", "\\\\c:\\foo\\bar", S_OK, 0}, + {"file://///c:/foo%20ba%2fr", "\\\\c:\\foo ba/r", S_OK, 0}, + {"file://///foo%20ba%2fr", "\\\\foo ba/r", S_OK, 0}, + {"file://////c:/foo/bar", "\\\\c:\\foo\\bar", S_OK, 0}, + + /* Leading (back)slashes cannot be escaped */ + {"file:%2f%2flocalhost%2fc:/foo/bar", "//localhost/c:\\foo\\bar", S_OK, 0}, + {"file:%5C%5Clocalhost%5Cc:/foo/bar", "\\\\localhost\\c:\\foo\\bar", S_OK, 0}, + + /* Hostname handling */ + {"file://l%6fcalhost/c:/foo/bar", "\\\\localhostc:\\foo\\bar", S_OK, 0}, + {"file://localhost:80/c:/foo/bar", "\\\\localhost:80c:\\foo\\bar", S_OK, 0}, + {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file://host//c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, + {"file://host/\\c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, + {"file://host/c:foo/bar", "\\\\hostc:foo\\bar", S_OK, 0}, + {"file://host/foo/bar", "\\\\host\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\ca\\foo\\bar", "\\\\host\\ca\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK, 0}, + {"file:\\%5Chost\\c:\\foo\\bar", "\\\\host\\c:\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\cx:\\foo\\bar", "\\\\host\\cx:\\foo\\bar", S_OK, 0}, + {"file:///host/c:/foo/bar", "\\host\\c:\\foo\\bar", S_OK, 0}, + + /* Not file URLs */ + {"c:\\foo\\bar", NULL, E_INVALIDARG, 0}, + {"foo/bar", NULL, E_INVALIDARG, 0}, + {"http://foo/bar", NULL, E_INVALIDARG, 0}, }; @@ -128,7 +188,7 @@ { LPWSTR wszString = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); - MultiByteToWideChar(0, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH); + MultiByteToWideChar(CP_ACP, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH); return wszString; } @@ -203,44 +263,86 @@ { size_t i; char ret_path[INTERNET_MAX_URL_LENGTH]; - DWORD len, ret; + DWORD len, len2, ret; WCHAR ret_pathW[INTERNET_MAX_URL_LENGTH]; WCHAR *pathW, *urlW; - static const char url[] = "http://www.winehq.org"; if (!pPathCreateFromUrlA) { win_skip("PathCreateFromUrlA not found\n"); return; } - /* Check ret_path = NULL */ - len = sizeof(url); - ret = pPathCreateFromUrlA(url, NULL, &len, 0); - ok ( ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret); - + /* Won't say how much is needed without a buffer */ + len = 0xdeca; + ret = pPathCreateFromUrlA("file://foo", NULL, &len, 0); + ok(ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret); + ok(len == 0xdeca, "got %x expected 0xdeca\n", len); + + /* Test the decoding itself */ for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); - if(TEST_PATHFROMURL[i].path) { - ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); - ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url); + if (!(TEST_PATHFROMURL[i].todo & 0x1)) + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); + else todo_wine + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); + if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { + if(!(TEST_PATHFROMURL[i].todo & 0x2)) { + ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); + ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url); + } else todo_wine + /* Wrong string, don't bother checking the length */ + ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } + if (pPathCreateFromUrlW) { len = INTERNET_MAX_URL_LENGTH; pathW = GetWideString(TEST_PATHFROMURL[i].path); urlW = GetWideString(TEST_PATHFROMURL[i].url); ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); - WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),0,0); - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - if(TEST_PATHFROMURL[i].path) { - ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", - ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); - ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),NULL,NULL); + if (!(TEST_PATHFROMURL[i].todo & 0x1)) + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); + else todo_wine + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); + if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { + if(!(TEST_PATHFROMURL[i].todo & 0x2)) { + ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", + ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); + ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + } else todo_wine + /* Wrong string, don't bother checking the length */ + ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", + ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } + + if (SUCCEEDED(ret)) + { + /* Check what happens if the buffer is too small */ + len2 = 2; + ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0); + ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url %s\n", ret, TEST_PATHFROMURL[i].url); + if(!(TEST_PATHFROMURL[i].todo & 0x4)) + ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); + else todo_wine + ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); + } + FreeWideString(urlW); FreeWideString(pathW); } + } + + if (pPathCreateFromUrlAlloc) + { + static const WCHAR fileW[] = {'f','i','l','e',':','/','/','f','o','o',0}; + static const WCHAR fooW[] = {'\\','\\','f','o','o',0}; + + pathW = NULL; + ret = pPathCreateFromUrlAlloc(fileW, &pathW, 0); + ok(ret == S_OK, "got 0x%08x expected S_OK\n", ret); + ok(lstrcmpiW(pathW, fooW) == 0, "got %s expected %s\n", wine_dbgstr_w(pathW), wine_dbgstr_w(fooW)); + HeapFree(GetProcessHeap(), 0, pathW); } } @@ -1369,6 +1471,7 @@ pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); + pPathCreateFromUrlAlloc = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlAlloc"); pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW"); pPathIsValidCharA = (void*)GetProcAddress(hShlwapi, (LPSTR)455); pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456); Modified: trunk/rostests/winetests/shlwapi/shreg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shreg.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/shreg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/shreg.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,16 +17,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "winuser.h" -#include "shlwapi.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h> + +#include <wine/test.h> +//#include "windef.h" +//#include "winbase.h" +//#include "winerror.h" +#include <winreg.h> +//#include "winuser.h" +#include <shlwapi.h> /* Keys used for testing */ #define REG_TEST_KEY "Software\\Wine\\Test" Modified: trunk/rostests/winetests/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.… ============================================================================== --- trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,18 +17,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - -#include "wine/test.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdio.h> + +#include <wine/test.h> +//#include "winbase.h" +//#include "winerror.h" +#include <winnls.h> +#include <ole2.h> #define NO_SHLWAPI_REG #define NO_SHLWAPI_PATH #define NO_SHLWAPI_GDI #define NO_SHLWAPI_STREAM -#include "shlwapi.h" -#include "shtypes.h" +#include <shlwapi.h> +//#include "shtypes.h" #define expect_eq(expr, val, type, fmt) do { \ type ret = expr; \ @@ -411,7 +416,7 @@ while(result->value) { - MultiByteToWideChar(0,0,result->byte_size_64,-1,szSrc,sizeof(szSrc)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,result->byte_size_64,-1,szSrc,sizeof(szSrc)/sizeof(WCHAR)); lpRes = StrCpyW(szBuff, szSrc); ok(!StrCmpW(szSrc, szBuff) && lpRes == szBuff, "Copied string %s wrong\n", result->byte_size_64); @@ -475,7 +480,7 @@ while (result->string) { - MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); return_val = StrToIntW(szBuff); ok(return_val == result->str_to_int, "converted '%s' wrong (%d)\n", result->string, return_val); @@ -525,7 +530,7 @@ while (result->string) { return_val = -1; - MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); bRet = StrToIntExW(szBuff, 0, &return_val); ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); @@ -539,7 +544,7 @@ while (result->string) { return_val = -1; - MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); bRet = StrToIntExW(szBuff, STIF_SUPPORT_HEX, &return_val); ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); @@ -604,7 +609,7 @@ while (result->string) { return_val = -1; - MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); bRet = pStrToInt64ExW(szBuff, 0, &return_val); ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); @@ -618,7 +623,7 @@ while (result->string) { return_val = -1; - MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); bRet = pStrToInt64ExW(szBuff, STIF_SUPPORT_HEX, &return_val); ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); @@ -693,7 +698,7 @@ while(result->value) { pStrFormatKBSizeW(result->value, szBuffW, 256); - WideCharToMultiByte(0,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),0,0); + WideCharToMultiByte(CP_ACP,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),NULL,NULL); ok(!strcmp(result->kb_size, szBuff), "Formatted %x%08x wrong: got %s, expected %s\n", (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); Modified: trunk/rostests/winetests/shlwapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/testlis… ============================================================================== --- trunk/rostests/winetests/shlwapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/testlist.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_clist(void); extern void func_clsid(void); Modified: trunk/rostests/winetests/shlwapi/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/thread.… ============================================================================== --- trunk/rostests/winetests/shlwapi/thread.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/thread.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -17,19 +17,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdio.h> #include <stdarg.h> #define COBJMACROS #define CONST_VTABLE -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "ole2.h" -#include "shlwapi.h" - -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +//#include "winreg.h" +//#include "winerror.h" +#include <ole2.h> +//#include "shlwapi.h" + +#include <wine/test.h> static HRESULT (WINAPI *pSHCreateThreadRef)(LONG*, IUnknown**); static HRESULT (WINAPI *pSHGetThreadRef)(IUnknown**); Modified: trunk/rostests/winetests/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/url.c?r… ============================================================================== --- trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] Sun Mar 24 12:36:17 2013 @@ -18,16 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "shlwapi.h" -#include "wininet.h" -#include "intshcut.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h> + +#include <wine/test.h> +//#include "windef.h" +//#include "winbase.h" +#include <winreg.h> +#include <winnls.h> +#include <shlwapi.h> +#include <wininet.h> +#include <intshcut.h> /* ################ */ static HMODULE hShlwapi; @@ -450,7 +455,8 @@ { "file://e:/b/c", FALSE, TRUE }, { "http:partial", FALSE, FALSE }, { "mailto://www.winehq.org/test.html", TRUE, FALSE }, - { "file:partial", FALSE, TRUE } + { "file:partial", FALSE, TRUE }, + { "File:partial", FALSE, TRUE }, }; /* ########################### */ @@ -459,7 +465,7 @@ { LPWSTR wszString = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); - MultiByteToWideChar(0, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH); + MultiByteToWideChar(CP_ACP, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH); return wszString; } @@ -1062,7 +1068,7 @@ BOOL choped; int pos; - MultiByteToWideChar(CP_ACP, 0, "http://www.winehq.org/X", -1, szUrl, 128); + MultiByteToWideChar(CP_ACP, 0, "http://www.winehq.org/X", -1, szUrl, sizeof(szUrl)/sizeof(szUrl[0])); pos = lstrlenW(szUrl) - 1; szUrl[pos] = i; urllen = INTERNET_MAX_URL_LENGTH; @@ -1219,7 +1225,7 @@ test_UrlIs_null(URLIS_URL); for(i = 0; i < sizeof(TEST_PATH_IS_URL) / sizeof(TEST_PATH_IS_URL[0]); i++) { - MultiByteToWideChar(CP_ACP, 0, TEST_PATH_IS_URL[i].path, -1, wurl, 80); + MultiByteToWideChar(CP_ACP, 0, TEST_PATH_IS_URL[i].path, -1, wurl, sizeof(wurl)/sizeof(*wurl)); ret = pUrlIsA( TEST_PATH_IS_URL[i].path, URLIS_URL ); ok( ret == TEST_PATH_IS_URL[i].expect, @@ -1234,7 +1240,7 @@ } } for(i = 0; i < sizeof(TEST_URLIS_ATTRIBS) / sizeof(TEST_URLIS_ATTRIBS[0]); i++) { - MultiByteToWideChar(CP_ACP, 0, TEST_URLIS_ATTRIBS[i].url, -1, wurl, 80); + MultiByteToWideChar(CP_ACP, 0, TEST_URLIS_ATTRIBS[i].url, -1, wurl, sizeof(wurl)/sizeof(*wurl)); ret = pUrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_OPAQUE); ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, @@ -1288,7 +1294,7 @@ ok(strcmp(szReturnUrl,TEST_URL_UNESCAPE[i].expect)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url); ZeroMemory(szReturnUrl, sizeof(szReturnUrl)); - /* if we set the bufferpointer to NULL here UrlUnescape fails and string gets not converted */ + /* if we set the buffer pointer to NULL here, UrlUnescape fails and the string is not converted */ res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); ok(res == E_INVALIDARG, "UrlUnescapeA returned 0x%x (expected E_INVALIDARG) for \"%s\"\n", @@ -1319,7 +1325,7 @@ ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ res = pUrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); @@ -1330,7 +1336,7 @@ ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ res = pUrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res);

1 0

[akhaldi] 58600: [SHLWAPI] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: akhaldi Date: Sun Mar 24 12:35:51 2013 New Revision: 58600 URL: http://svn.reactos.org/svn/reactos?rev=58600&view=rev Log: [SHLWAPI] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/shlwapi/istream.c trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/path.c trunk/reactos/dll/win32/shlwapi/reg.c trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/shlwapi/string.c trunk/reactos/dll/win32/shlwapi/thread.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/istream.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/istream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/istream.c [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -531,7 +531,7 @@ if (!lpszPath) return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); - MultiByteToWideChar(0, 0, lpszPath, -1, szPath, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, lpszPath, -1, szPath, MAX_PATH); return SHCreateStreamOnFileW(szPath, dwMode, lppStream); } Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -639,25 +639,6 @@ return 0; memcpy(lpszDest, xguid, iLen*sizeof(WCHAR)); return iLen; -} - -/************************************************************************* - * @ [SHLWAPI.29] - * - * Determine if a Unicode character is a space. - * - * PARAMS - * wc [I] Character to check. - * - * RETURNS - * TRUE, if wc is a space, - * FALSE otherwise. - */ -BOOL WINAPI IsCharSpaceW(WCHAR wc) -{ - WORD CharType; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); } /************************************************************************* @@ -2680,7 +2661,7 @@ lpSubKey = strRegistryPolicyW; retval = RegOpenKeyW(HKEY_LOCAL_MACHINE, lpSubKey, &hKey); - if (retval != ERROR_SUCCESS) + if (retval != ERROR_SUCCESS) retval = RegOpenKeyW(HKEY_CURRENT_USER, lpSubKey, &hKey); if (retval != ERROR_SUCCESS) return 0; @@ -2728,7 +2709,7 @@ /* we have a known policy */ /* check if this policy has been cached */ - if (*polArr == SHELL_NO_POLICY) + if (*polArr == SHELL_NO_POLICY) *polArr = SHGetRestriction(initial, polTable->appstr, polTable->keystr); return *polArr; } Modified: trunk/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/path.c [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -3246,6 +3246,9 @@ HRESULT ret; DWORD lenW = sizeof(bufW)/sizeof(WCHAR), lenA; + if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) + return E_INVALIDARG; + if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; if((ret = PathCreateFromUrlW(urlW.Buffer, pathW, &lenW, dwReserved)) == E_POINTER) { @@ -3287,61 +3290,156 @@ LPDWORD pcchPath, DWORD dwReserved) { static const WCHAR file_colon[] = { 'f','i','l','e',':',0 }; - HRESULT hr; - DWORD nslashes = 0; - WCHAR *ptr; + static const WCHAR localhost[] = { 'l','o','c','a','l','h','o','s','t',0 }; + DWORD nslashes, unescape, len; + const WCHAR *src; + WCHAR *tpath, *dst; + HRESULT ret; TRACE("(%s,%p,%p,0x%08x)\n", debugstr_w(pszUrl), pszPath, pcchPath, dwReserved); if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) return E_INVALIDARG; - - if (strncmpW(pszUrl, file_colon, 5)) + if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + file_colon, 5) != CSTR_EQUAL) return E_INVALIDARG; pszUrl += 5; - - while(*pszUrl == '/' || *pszUrl == '\\') { + ret = S_OK; + + src = pszUrl; + nslashes = 0; + while (*src == '/' || *src == '\\') { nslashes++; - pszUrl++; - } - - if(isalphaW(*pszUrl) && (pszUrl[1] == ':' || pszUrl[1] == '|') && (pszUrl[2] == '/' || pszUrl[2] == '\\')) - nslashes = 0; - - switch(nslashes) { + src++; + } + + /* We need a temporary buffer so we can compute what size to ask for. + * We know that the final string won't be longer than the current pszUrl + * plus at most two backslashes. All the other transformations make it + * shorter. + */ + len = 2 + lstrlenW(pszUrl) + 1; + if (*pcchPath < len) + tpath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + else + tpath = pszPath; + + len = 0; + dst = tpath; + unescape = 1; + switch (nslashes) + { + case 0: + /* 'file:' + escaped DOS path */ + break; + case 1: + /* 'file:/' + escaped DOS path */ + /* fall through */ + case 3: + /* 'file:///' (implied localhost) + escaped DOS path */ + if (!isalphaW(*src) || (src[1] != ':' && src[1] != '|')) + src -= 1; + break; case 2: - pszUrl -= 2; + if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, src, 9, + localhost, 9) == CSTR_EQUAL && + (src[9] == '/' || src[9] == '\\')) + { + /* 'file://localhost/' + escaped DOS path */ + src += 10; + } + else if (isalphaW(*src) && (src[1] == ':' || src[1] == '|')) + { + /* 'file://' + unescaped DOS path */ + unescape = 0; + } + else + { + /* 'file://hostname:port/path' (where path is escaped) + * or 'file:' + escaped UNC path (\\server\share\path) + * The second form is clearly specific to Windows and it might + * even be doing a network lookup to try to figure it out. + */ + while (*src && *src != '/' && *src != '\\') + src++; + len = src - pszUrl; + StrCpyNW(dst, pszUrl, len + 1); + dst += len; + if (isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) + { + /* 'Forget' to add a trailing '/', just like Windows */ + src++; + } + } break; - case 0: - break; + case 4: + /* 'file://' + unescaped UNC path (\\server\share\path) */ + unescape = 0; + if (isalphaW(*src) && (src[1] == ':' || src[1] == '|')) + break; + /* fall through */ default: - pszUrl -= 1; - break; - } - - hr = UrlUnescapeW((LPWSTR)pszUrl, pszPath, pcchPath, 0); - if(hr != S_OK) return hr; - - for(ptr = pszPath; *ptr; ptr++) - if(*ptr == '/') *ptr = '\\'; - - while(*pszPath == '\\') - pszPath++; - - if(isalphaW(*pszPath) && pszPath[1] == '|' && pszPath[2] == '\\') /* c|\ -> c:\ */ - pszPath[1] = ':'; - - if(nslashes == 2 && (ptr = strchrW(pszPath, '\\'))) { /* \\host\c:\ -> \\hostc:\ */ - ptr++; - if(isalphaW(*ptr) && (ptr[1] == ':' || ptr[1] == '|') && ptr[2] == '\\') { - memmove(ptr - 1, ptr, (strlenW(ptr) + 1) * sizeof(WCHAR)); - (*pcchPath)--; + /* 'file:/...' + escaped UNC path (\\server\share\path) */ + src -= 2; + } + + /* Copy the remainder of the path */ + len += lstrlenW(src); + StrCpyW(dst, src); + + /* First do the Windows-specific path conversions */ + for (dst = tpath; *dst; dst++) + if (*dst == '/') *dst = '\\'; + if (isalphaW(*tpath) && tpath[1] == '|') + tpath[1] = ':'; /* c| -> c: */ + + /* And only then unescape the path (i.e. escaped slashes are left as is) */ + if (unescape) + { + ret = UrlUnescapeW(tpath, NULL, &len, URL_UNESCAPE_INPLACE); + if (ret == S_OK) + { + /* When working in-place UrlUnescapeW() does not set len */ + len = lstrlenW(tpath); } } - TRACE("Returning %s\n",debugstr_w(pszPath)); - + if (*pcchPath < len + 1) + { + ret = E_POINTER; + *pcchPath = len + 1; + } + else + { + *pcchPath = len; + if (tpath != pszPath) + StrCpyW(pszPath, tpath); + } + if (tpath != pszPath) + HeapFree(GetProcessHeap(), 0, tpath); + + TRACE("Returning (%u) %s\n", *pcchPath, debugstr_w(pszPath)); + return ret; +} + +/************************************************************************* + * PathCreateFromUrlAlloc [SHLWAPI.@] + */ +HRESULT WINAPI PathCreateFromUrlAlloc(LPCWSTR pszUrl, LPWSTR *pszPath, + DWORD dwReserved) +{ + WCHAR pathW[MAX_PATH]; + DWORD size; + HRESULT hr; + + size = MAX_PATH; + hr = PathCreateFromUrlW(pszUrl, pathW, &size, dwReserved); + if (SUCCEEDED(hr)) + { + /* Yes, this is supposed to crash if pszPath is NULL */ + *pszPath = StrDupW(pathW); + } return hr; } Modified: trunk/reactos/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/reg.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -2232,7 +2232,7 @@ TRACE("(hkey=%p,%s,%p08x,%d)\n", hKeySrc, debugstr_a(lpszSrcSubKey), hKeyDst, dwReserved); if (lpszSrcSubKey) - MultiByteToWideChar(0, 0, lpszSrcSubKey, -1, szSubKeyW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, lpszSrcSubKey, -1, szSubKeyW, MAX_PATH); return SHCopyKeyW(hKeySrc, lpszSrcSubKey ? szSubKeyW : NULL, hKeyDst, dwReserved); } Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.rc [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -1,5 +1,5 @@ /* - * Top level resource file for shlwapi + * Resources for shlwapi * * Copyright 2004 Jon Griffiths * Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -566,6 +566,8 @@ @ stdcall HashData (ptr long ptr long) @ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA @ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW +@ stdcall IsCharSpaceA(long) +@ stdcall IsInternetESCEnabled() @ stdcall PathAddBackslashA (str) @ stdcall PathAddBackslashW (wstr) @ stdcall PathAddExtensionA (str str) @@ -586,6 +588,7 @@ @ stdcall PathCompactPathW(long wstr long) @ stdcall PathCreateFromUrlA(str ptr ptr long) @ stdcall PathCreateFromUrlW(wstr ptr ptr long) +@ stdcall PathCreateFromUrlAlloc(wstr ptr long) @ stdcall PathFileExistsA (str) @ stdcall PathFileExistsW (wstr) @ stdcall PathFindExtensionA (str) Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -1891,7 +1891,7 @@ if (lpszStr) { - len = MultiByteToWideChar(0, 0, lpszStr, -1, 0, 0) * sizeof(WCHAR); + len = MultiByteToWideChar(CP_ACP, 0, lpszStr, -1, NULL, 0) * sizeof(WCHAR); *lppszDest = CoTaskMemAlloc(len); } else @@ -1899,7 +1899,7 @@ if (*lppszDest) { - MultiByteToWideChar(0, 0, lpszStr, -1, *lppszDest, len/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszStr, -1, *lppszDest, len/sizeof(WCHAR)); hRet = S_OK; } else @@ -2828,3 +2828,28 @@ HeapFree(GetProcessHeap(), 0, dllname); return hr; } + +BOOL WINAPI IsCharSpaceA(CHAR c) +{ + WORD CharType; + return GetStringTypeA(GetSystemDefaultLCID(), CT_CTYPE1, &c, 1, &CharType) && (CharType & C1_SPACE); +} + +/************************************************************************* + * @ [SHLWAPI.29] + * + * Determine if a Unicode character is a space. + * + * PARAMS + * wc [I] Character to check. + * + * RETURNS + * TRUE, if wc is a space, + * FALSE otherwise. + */ +BOOL WINAPI IsCharSpaceW(WCHAR wc) +{ + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); +} Modified: trunk/reactos/dll/win32/shlwapi/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/thread.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/thread.c [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -534,7 +534,7 @@ TRACE("(%s,%d)\n", debugstr_a(lpszName), iInitial); if (lpszName) - MultiByteToWideChar(0, 0, lpszName, -1, szBuff, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, lpszName, -1, szBuff, MAX_PATH); return SHGlobalCounterCreateNamedW(lpszName ? szBuff : NULL, iInitial); } Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -270,8 +270,8 @@ ret = UrlCanonicalizeW(url, canonical, pcchCanonicalized, dwFlags); if(ret == S_OK) - WideCharToMultiByte(0, 0, canonical, -1, pszCanonicalized, - *pcchCanonicalized+1, 0, 0); + WideCharToMultiByte(CP_ACP, 0, canonical, -1, pszCanonicalized, + *pcchCanonicalized+1, NULL, NULL); HeapFree(GetProcessHeap(), 0, url); HeapFree(GetProcessHeap(), 0, canonical); @@ -631,8 +631,8 @@ relative = base + INTERNET_MAX_URL_LENGTH; combined = relative + INTERNET_MAX_URL_LENGTH; - MultiByteToWideChar(0, 0, pszBase, -1, base, INTERNET_MAX_URL_LENGTH); - MultiByteToWideChar(0, 0, pszRelative, -1, relative, INTERNET_MAX_URL_LENGTH); + MultiByteToWideChar(CP_ACP, 0, pszBase, -1, base, INTERNET_MAX_URL_LENGTH); + MultiByteToWideChar(CP_ACP, 0, pszRelative, -1, relative, INTERNET_MAX_URL_LENGTH); len = *pcchCombined; ret = UrlCombineW(base, relative, pszCombined?combined:NULL, &len, dwFlags); @@ -642,14 +642,14 @@ return ret; } - len2 = WideCharToMultiByte(0, 0, combined, len, 0, 0, 0, 0); + len2 = WideCharToMultiByte(CP_ACP, 0, combined, len, NULL, 0, NULL, NULL); if (len2 > *pcchCombined) { *pcchCombined = len2; HeapFree(GetProcessHeap(), 0, base); return E_POINTER; } - WideCharToMultiByte(0, 0, combined, len+1, pszCombined, (*pcchCombined)+1, - 0, 0); + WideCharToMultiByte(CP_ACP, 0, combined, len+1, pszCombined, (*pcchCombined)+1, + NULL, NULL); *pcchCombined = len2; HeapFree(GetProcessHeap(), 0, base); return S_OK; @@ -1601,7 +1601,7 @@ /* Win32 hashes the data as an ASCII string, presumably so that both A+W * return the same digests for the same URL. */ - WideCharToMultiByte(0, 0, pszUrl, -1, szUrl, MAX_PATH, 0, 0); + WideCharToMultiByte(CP_ACP, 0, pszUrl, -1, szUrl, MAX_PATH, NULL, NULL); HashData((const BYTE*)szUrl, (int)strlen(szUrl), lpDest, nDestLen); return S_OK; } @@ -1670,7 +1670,7 @@ WCHAR value[MAX_PATH], data[MAX_PATH]; WCHAR Wxx, Wyy; - MultiByteToWideChar(0, 0, + MultiByteToWideChar(CP_ACP, 0, "Software\\Microsoft\\Windows\\CurrentVersion\\URL\\Prefixes", -1, reg_path, MAX_PATH); RegOpenKeyExW(HKEY_LOCAL_MACHINE, reg_path, 0, 1, &newkey); @@ -1868,7 +1868,8 @@ return FALSE; case URLIS_FILEURL: - return !StrCmpNA("file:", pszUrl, 5); + return (CompareStringA(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + "file:", 5) == CSTR_EQUAL); case URLIS_DIRECTORY: last = pszUrl + strlen(pszUrl) - 1; @@ -1893,7 +1894,7 @@ */ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) { - static const WCHAR stemp[] = { 'f','i','l','e',':',0 }; + static const WCHAR file_colon[] = { 'f','i','l','e',':',0 }; PARSEDURLW base; DWORD res1; LPCWSTR last; @@ -1921,7 +1922,8 @@ return FALSE; case URLIS_FILEURL: - return !strncmpW(stemp, pszUrl, 5); + return (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + file_colon, 5) == CSTR_EQUAL); case URLIS_DIRECTORY: last = pszUrl + strlenW(pszUrl) - 1; @@ -2199,7 +2201,7 @@ (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); out = in + INTERNET_MAX_URL_LENGTH; - MultiByteToWideChar(0, 0, pszIn, -1, in, INTERNET_MAX_URL_LENGTH); + MultiByteToWideChar(CP_ACP, 0, pszIn, -1, in, INTERNET_MAX_URL_LENGTH); len = INTERNET_MAX_URL_LENGTH; ret = UrlGetPartW(in, out, &len, dwPart, dwFlags); @@ -2209,13 +2211,13 @@ return ret; } - len2 = WideCharToMultiByte(0, 0, out, len, 0, 0, 0, 0); + len2 = WideCharToMultiByte(CP_ACP, 0, out, len, NULL, 0, NULL, NULL); if (len2 > *pcchOut) { *pcchOut = len2+1; HeapFree(GetProcessHeap(), 0, in); return E_POINTER; } - len2 = WideCharToMultiByte(0, 0, out, len+1, pszOut, *pcchOut, 0, 0); + len2 = WideCharToMultiByte(CP_ACP, 0, out, len+1, pszOut, *pcchOut, NULL, NULL); *pcchOut = len2-1; HeapFree(GetProcessHeap(), 0, in); return ret; @@ -2529,7 +2531,7 @@ hRet = MLBuildResURLW(lpszLibName ? szLibName : NULL, hMod, dwFlags, lpszRes ? szRes : NULL, lpszDest ? szDest : NULL, dwDestLen); if (SUCCEEDED(hRet) && lpszDest) - WideCharToMultiByte(CP_ACP, 0, szDest, -1, lpszDest, dwDestLen, 0, 0); + WideCharToMultiByte(CP_ACP, 0, szDest, -1, lpszDest, dwDestLen, NULL, NULL); return hRet; } @@ -2623,3 +2625,12 @@ return S_OK; } + +/************************************************************************* + * IsInternetESCEnabled [SHLWAPI.@] + */ +BOOL WINAPI IsInternetESCEnabled(void) +{ + FIXME(": stub\n"); + return FALSE; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 24 12:35:51 2013 @@ -164,7 +164,7 @@ reactos/dll/win32/shdocvw # Autosync reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Autosync -reactos/dll/win32/shlwapi # Synced to Wine-1.5.13 +reactos/dll/win32/shlwapi # Synced to Wine-1.5.26 reactos/dll/win32/slbcsp # Synced to Wine-1.5.19 reactos/dll/win32/snmpapi # Synced to Wine-1.5.19 reactos/dll/win32/softpub # Synced to Wine-1.5.19

1 0

[gadamopoulos] 58599: [win32k] - Add a hackfix to ftGdiGetGlyphOutline to make it handle scaling more properly - Improves CORE-4657
by gadamopoulos＠svn.reactos.org 24 Mar '13

24 Mar '13

Author: gadamopoulos Date: Sun Mar 24 09:29:55 2013 New Revision: 58599 URL: http://svn.reactos.org/svn/reactos?rev=58599&view=rev Log: [win32k] - Add a hackfix to ftGdiGetGlyphOutline to make it handle scaling more properly - Improves CORE-4657 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c 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] Sun Mar 24 09:29:55 2013 @@ -1646,15 +1646,32 @@ IntLockFreeType; /* Scaling transform */ - if (aveWidth) - { - FT_Matrix scaleMat; - DPRINT("Scaling Trans!\n"); - scaleMat.xx = FT_FixedFromFloat(widthRatio); - scaleMat.xy = 0; - scaleMat.yx = 0; - scaleMat.yy = (1 << 16); - FT_Matrix_Multiply(&scaleMat, &transMat); + /*if (aveWidth)*/ + { + + FT_Matrix ftmatrix; + FLOATOBJ efTemp; + + PMATRIX pmx = DC_pmxWorldToDevice(dc); + + /* Create a freetype matrix, by converting to 16.16 fixpoint format */ + efTemp = pmx->efM11; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM12; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xy = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM21; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM22; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yy = FLOATOBJ_GetLong(&efTemp); + + FT_Matrix_Multiply(&ftmatrix, &transMat); needsTransform = TRUE; }

1 0

[tkreuzer] 58598: [INCLUDE] - Add missing __stosq intrinsic - Move architecture specific stuff to a later location in wdm.h to make sure we have ASSERT macros already - Add missing extern "C" to so...
by tkreuzer＠svn.reactos.org 23 Mar '13

23 Mar '13

Author: tkreuzer Date: Sat Mar 23 21:57:17 2013 New Revision: 58598 URL: http://svn.reactos.org/svn/reactos?rev=58598&view=rev Log: [INCLUDE] - Add missing __stosq intrinsic - Move architecture specific stuff to a later location in wdm.h to make sure we have ASSERT macros already - Add missing extern "C" to some NDK header - Remove duplicate sal definitions Modified: trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/sal.h trunk/reactos/include/psdk/sal_old.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/include/xdk/ketypes.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -117,6 +117,8 @@ #pragma intrinsic(__movsd) #endif #ifdef _M_AMD64 +void __stosq(unsigned __int64 * Dest, unsigned __int64 Data, size_t Count); +#pragma intrinsic(__stosq) void __movsq(unsigned __int64 * Destination, unsigned __int64 const * Source, size_t Count); #pragma intrinsic(__movsq) #endif Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5859… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -1675,567 +1675,6 @@ extern PCCHAR KeNumberProcessors; #endif - -#if defined(_M_IX86) -/** Kernel definitions for x86 **/ - -/* Interrupt request levels */ -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define CMCI_LEVEL 5 -#define PROFILE_LEVEL 27 -#define CLOCK1_LEVEL 28 -#define CLOCK2_LEVEL 28 -#define IPI_LEVEL 29 -#define POWER_LEVEL 30 -#define HIGH_LEVEL 31 -#define CLOCK_LEVEL CLOCK2_LEVEL - -#define KIP0PCRADDRESS 0xffdff000 -#define KI_USER_SHARED_DATA 0xffdf0000 -#define SharedUserData ((KUSER_SHARED_DATA * CONST)KI_USER_SHARED_DATA) - -#define PAGE_SIZE 0x1000 -#define PAGE_SHIFT 12L -#define KeGetDcacheFillSize() 1L - -#define EFLAG_SIGN 0x8000 -#define EFLAG_ZERO 0x4000 -#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) - -#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) - - -typedef struct _KFLOATING_SAVE { - ULONG ControlWord; - ULONG StatusWord; - ULONG ErrorOffset; - ULONG ErrorSelector; - ULONG DataOffset; - ULONG DataSelector; - ULONG Cr0NpxState; - ULONG Spare1; -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -extern NTKERNELAPI volatile KSYSTEM_TIME KeTickCount; - -#define YieldProcessor _mm_pause - -FORCEINLINE -VOID -KeMemoryBarrier(VOID) -{ - LONG Barrier, *Dummy = &Barrier; - UNREFERENCED_LOCAL_VARIABLE(Dummy); - -#if defined(__GNUC__) - __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); -#elif defined(_MSC_VER) - __asm xchg [Barrier], eax -#endif -} - -#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() - -_IRQL_requires_max_(HIGH_LEVEL) -_IRQL_saves_ -NTHALAPI -KIRQL -NTAPI -KeGetCurrentIrql(VOID); - -_IRQL_requires_max_(HIGH_LEVEL) -NTHALAPI -VOID -FASTCALL -KfLowerIrql( - _In_ _IRQL_restores_ _Notliteral_ KIRQL NewIrql); -#define KeLowerIrql(a) KfLowerIrql(a) - -_IRQL_requires_max_(HIGH_LEVEL) -_IRQL_raises_(NewIrql) -_IRQL_saves_ -NTHALAPI -KIRQL -FASTCALL -KfRaiseIrql( - _In_ KIRQL NewIrql); -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -_IRQL_requires_max_(DISPATCH_LEVEL) -_IRQL_saves_ -_IRQL_raises_(DISPATCH_LEVEL) -NTHALAPI -KIRQL -NTAPI -KeRaiseIrqlToDpcLevel(VOID); - -NTHALAPI -KIRQL -NTAPI -KeRaiseIrqlToSynchLevel(VOID); - -_Requires_lock_not_held_(*SpinLock) -_Acquires_lock_(*SpinLock) -_IRQL_requires_max_(DISPATCH_LEVEL) -_IRQL_saves_ -_IRQL_raises_(DISPATCH_LEVEL) -NTHALAPI -KIRQL -FASTCALL -KfAcquireSpinLock( - _Inout_ PKSPIN_LOCK SpinLock); -#define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) - -_Requires_lock_held_(*SpinLock) -_Releases_lock_(*SpinLock) -_IRQL_requires_(DISPATCH_LEVEL) -NTHALAPI -VOID -FASTCALL -KfReleaseSpinLock( - _Inout_ PKSPIN_LOCK SpinLock, - _In_ _IRQL_restores_ KIRQL NewIrql); -#define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) - -_Requires_lock_not_held_(*SpinLock) -_Acquires_lock_(*SpinLock) -_IRQL_requires_min_(DISPATCH_LEVEL) -NTKERNELAPI -VOID -FASTCALL -KefAcquireSpinLockAtDpcLevel( - _Inout_ PKSPIN_LOCK SpinLock); -#define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) - -_Requires_lock_held_(*SpinLock) -_Releases_lock_(*SpinLock) -_IRQL_requires_min_(DISPATCH_LEVEL) -NTKERNELAPI -VOID -FASTCALL -KefReleaseSpinLockFromDpcLevel( - _Inout_ PKSPIN_LOCK SpinLock); -#define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) - -NTSYSAPI -PKTHREAD -NTAPI -KeGetCurrentThread(VOID); - -_Always_(_Post_satisfies_(return<=0)) -_Must_inspect_result_ -_IRQL_requires_max_(DISPATCH_LEVEL) -_Kernel_float_saved_ -_At_(*FloatSave, _Kernel_requires_resource_not_held_(FloatState) _Kernel_acquires_resource_(FloatState)) -NTKERNELAPI -NTSTATUS -NTAPI -KeSaveFloatingPointState( - _Out_ PKFLOATING_SAVE FloatSave); - -_Success_(1) -_Kernel_float_restored_ -_At_(*FloatSave, _Kernel_requires_resource_held_(FloatState) _Kernel_releases_resource_(FloatState)) -NTKERNELAPI -NTSTATUS -NTAPI -KeRestoreFloatingPointState( - _In_ PKFLOATING_SAVE FloatSave); - -/* VOID - * KeFlushIoBuffers( - * IN PMDL Mdl, - * IN BOOLEAN ReadOperation, - * IN BOOLEAN DmaOperation) - */ -#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) - -/* x86 and x64 performs a 0x2C interrupt */ -#define DbgRaiseAssertionFailure __int2c - -FORCEINLINE -VOID -_KeQueryTickCount( - OUT PLARGE_INTEGER CurrentCount) -{ - for (;;) { -#ifdef NONAMELESSUNION - CurrentCount->s.HighPart = KeTickCount.High1Time; - CurrentCount->s.LowPart = KeTickCount.LowPart; - if (CurrentCount->s.HighPart == KeTickCount.High2Time) break; -#else - CurrentCount->HighPart = KeTickCount.High1Time; - CurrentCount->LowPart = KeTickCount.LowPart; - if (CurrentCount->HighPart == KeTickCount.High2Time) break; -#endif - YieldProcessor(); - } -} -#define KeQueryTickCount(CurrentCount) _KeQueryTickCount(CurrentCount) - - - - - -#elif defined(_M_AMD64) -/** Kernel definitions for AMD64 **/ - -/* Interrupt request levels */ -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define CMCI_LEVEL 5 -#define CLOCK_LEVEL 13 -#define IPI_LEVEL 14 -#define DRS_LEVEL 14 -#define POWER_LEVEL 14 -#define PROFILE_LEVEL 15 -#define HIGH_LEVEL 15 - -#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL -#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA) -#define SharedInterruptTime (KI_USER_SHARED_DATA + 0x8) -#define SharedSystemTime (KI_USER_SHARED_DATA + 0x14) -#define SharedTickCount (KI_USER_SHARED_DATA + 0x320) - -#define PAGE_SIZE 0x1000 -#define PAGE_SHIFT 12L - -#define EFLAG_SIGN 0x8000 -#define EFLAG_ZERO 0x4000 -#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) - -typedef struct _KFLOATING_SAVE { - ULONG Dummy; -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -typedef XSAVE_FORMAT XMM_SAVE_AREA32, *PXMM_SAVE_AREA32; - -#define KeQueryInterruptTime() \ - (*(volatile ULONG64*)SharedInterruptTime) - -#define KeQuerySystemTime(CurrentCount) \ - *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedSystemTime - -#define KeQueryTickCount(CurrentCount) \ - *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedTickCount - -#define KeGetDcacheFillSize() 1L - -#define YieldProcessor _mm_pause -#define MemoryBarrier __faststorefence -#define FastFence __faststorefence -#define LoadFence _mm_lfence -#define MemoryFence _mm_mfence -#define StoreFence _mm_sfence -#define LFENCE_ACQUIRE() LoadFence() - -FORCEINLINE -VOID -KeMemoryBarrier(VOID) -{ - // FIXME: Do we really need lfence after the __faststorefence ? - FastFence(); - LFENCE_ACQUIRE(); -} - -#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() - -FORCEINLINE -KIRQL -KeGetCurrentIrql(VOID) -{ - return (KIRQL)__readcr8(); -} - -FORCEINLINE -VOID -KeLowerIrql(IN KIRQL NewIrql) -{ - ASSERT((KIRQL)__readcr8() >= NewIrql); - __writecr8(NewIrql); -} - -FORCEINLINE -KIRQL -KfRaiseIrql(IN KIRQL NewIrql) -{ - KIRQL OldIrql; - - OldIrql = (KIRQL)__readcr8(); - ASSERT(OldIrql <= NewIrql); - __writecr8(NewIrql); - return OldIrql; -} -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -FORCEINLINE -KIRQL -KeRaiseIrqlToDpcLevel(VOID) -{ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -FORCEINLINE -KIRQL -KeRaiseIrqlToSynchLevel(VOID) -{ - return KfRaiseIrql(12); // SYNCH_LEVEL = IPI_LEVEL - 2 -} - -FORCEINLINE -PKTHREAD -KeGetCurrentThread(VOID) -{ - return (struct _KTHREAD *)__readgsqword(0x188); -} - -FORCEINLINE -NTSTATUS -KeSaveFloatingPointState(PVOID FloatingState) -{ - UNREFERENCED_PARAMETER(FloatingState); - return STATUS_SUCCESS; -} - -FORCEINLINE -NTSTATUS -KeRestoreFloatingPointState(PVOID FloatingState) -{ - UNREFERENCED_PARAMETER(FloatingState); - return STATUS_SUCCESS; -} - -/* VOID - * KeFlushIoBuffers( - * IN PMDL Mdl, - * IN BOOLEAN ReadOperation, - * IN BOOLEAN DmaOperation) - */ -#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) - -/* x86 and x64 performs a 0x2C interrupt */ -#define DbgRaiseAssertionFailure __int2c - -#elif defined(_M_IA64) -/** Kernel definitions for IA64 **/ - -/* Interrupt request levels */ -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define CMC_LEVEL 3 -#define DEVICE_LEVEL_BASE 4 -#define PC_LEVEL 12 -#define IPI_LEVEL 14 -#define DRS_LEVEL 14 -#define CLOCK_LEVEL 13 -#define POWER_LEVEL 15 -#define PROFILE_LEVEL 15 -#define HIGH_LEVEL 15 - -#define KI_USER_SHARED_DATA ((ULONG_PTR)(KADDRESS_BASE + 0xFFFE0000)) -extern volatile LARGE_INTEGER KeTickCount; - -#define PAUSE_PROCESSOR __yield(); - -FORCEINLINE -VOID -KeFlushWriteBuffer(VOID) -{ - __mf (); - return; -} - -NTSYSAPI -PKTHREAD -NTAPI -KeGetCurrentThread(VOID); - - -#elif defined(_M_PPC) - -/* Interrupt request levels */ -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define PROFILE_LEVEL 27 -#define CLOCK1_LEVEL 28 -#define CLOCK2_LEVEL 28 -#define IPI_LEVEL 29 -#define POWER_LEVEL 30 -#define HIGH_LEVEL 31 - -// -// Used to contain PFNs and PFN counts -// -typedef ULONG PFN_COUNT; -typedef ULONG PFN_NUMBER, *PPFN_NUMBER; -typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; - - -typedef struct _KFLOATING_SAVE { - ULONG Dummy; -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -typedef struct _KPCR_TIB { - PVOID ExceptionList; /* 00 */ - PVOID StackBase; /* 04 */ - PVOID StackLimit; /* 08 */ - PVOID SubSystemTib; /* 0C */ - _ANONYMOUS_UNION union { - PVOID FiberData; /* 10 */ - ULONG Version; /* 10 */ - } DUMMYUNIONNAME; - PVOID ArbitraryUserPointer; /* 14 */ - struct _KPCR_TIB *Self; /* 18 */ -} KPCR_TIB, *PKPCR_TIB; /* 1C */ - -#define PCR_MINOR_VERSION 1 -#define PCR_MAJOR_VERSION 1 - -typedef struct _KPCR { - KPCR_TIB Tib; /* 00 */ - struct _KPCR *Self; /* 1C */ - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IrrActive; /* 2C */ - ULONG IDR; /* 30 */ - PVOID KdVersionBlock; /* 34 */ - PUSHORT IDT; /* 38 */ - PUSHORT GDT; /* 3C */ - struct _KTSS *TSS; /* 40 */ - USHORT MajorVersion; /* 44 */ - USHORT MinorVersion; /* 46 */ - KAFFINITY SetMember; /* 48 */ - ULONG StallScaleFactor; /* 4C */ - UCHAR SpareUnused; /* 50 */ - UCHAR Number; /* 51 */ -} KPCR, *PKPCR; /* 54 */ - -#define KeGetPcr() PCR - -#define YieldProcessor() __asm__ __volatile__("nop"); - -FORCEINLINE -ULONG -NTAPI -KeGetCurrentProcessorNumber(VOID) -{ - ULONG Number; - __asm__ __volatile__ ( - "lwz %0, %c1(12)\n" - : "=r" (Number) - : "i" (FIELD_OFFSET(KPCR, Number)) - ); - return Number; -} - -NTHALAPI -VOID -FASTCALL -KfLowerIrql( - IN KIRQL NewIrql); -#define KeLowerIrql(a) KfLowerIrql(a) - -NTHALAPI -KIRQL -FASTCALL -KfRaiseIrql( - IN KIRQL NewIrql); -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -NTHALAPI -KIRQL -NTAPI -KeRaiseIrqlToDpcLevel(VOID); - -NTHALAPI -KIRQL -NTAPI -KeRaiseIrqlToSynchLevel(VOID); - - - -#elif defined(_M_MIPS) -#error MIPS Headers are totally incorrect - -// -// Used to contain PFNs and PFN counts -// -typedef ULONG PFN_COUNT; -typedef ULONG PFN_NUMBER, *PPFN_NUMBER; -typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; - -#define PASSIVE_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define PROFILE_LEVEL 27 -#define IPI_LEVEL 29 -#define HIGH_LEVEL 31 - -typedef struct _KPCR { - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IDR; /* 30 */ -} KPCR, *PKPCR; - -#define KeGetPcr() PCR - -typedef struct _KFLOATING_SAVE { -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -static __inline -ULONG -NTAPI -KeGetCurrentProcessorNumber(VOID) -{ - return 0; -} - -#define YieldProcessor() __asm__ __volatile__("nop"); - -#define KeLowerIrql(a) KfLowerIrql(a) -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -NTKERNELAPI -VOID -NTAPI -KfLowerIrql( - IN KIRQL NewIrql); - -NTKERNELAPI -KIRQL -NTAPI -KfRaiseIrql( - IN KIRQL NewIrql); - -NTKERNELAPI -KIRQL -NTAPI -KeRaiseIrqlToDpcLevel(VOID); - -NTKERNELAPI -KIRQL -NTAPI -KeRaiseIrqlToSynchLevel(VOID); - - -#elif defined(_M_ARM) -#include <armddk.h> -#else -#error Unknown Architecture -#endif /****************************************************************************** * Memory manager Types * @@ -10169,6 +9608,566 @@ /****************************************************************************** * Kernel Functions * ******************************************************************************/ +#if defined(_M_IX86) +/** Kernel definitions for x86 **/ + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CMCI_LEVEL 5 +#define PROFILE_LEVEL 27 +#define CLOCK1_LEVEL 28 +#define CLOCK2_LEVEL 28 +#define IPI_LEVEL 29 +#define POWER_LEVEL 30 +#define HIGH_LEVEL 31 +#define CLOCK_LEVEL CLOCK2_LEVEL + +#define KIP0PCRADDRESS 0xffdff000 +#define KI_USER_SHARED_DATA 0xffdf0000 +#define SharedUserData ((KUSER_SHARED_DATA * CONST)KI_USER_SHARED_DATA) + +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L +#define KeGetDcacheFillSize() 1L + +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 +#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) + +#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) +#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) +#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) + + +typedef struct _KFLOATING_SAVE { + ULONG ControlWord; + ULONG StatusWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + ULONG Cr0NpxState; + ULONG Spare1; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +extern NTKERNELAPI volatile KSYSTEM_TIME KeTickCount; + +#define YieldProcessor _mm_pause + +FORCEINLINE +VOID +KeMemoryBarrier(VOID) +{ + LONG Barrier, *Dummy = &Barrier; + UNREFERENCED_LOCAL_VARIABLE(Dummy); + +#if defined(__GNUC__) + __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); +#elif defined(_MSC_VER) + __asm xchg [Barrier], eax +#endif +} + +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() + +_IRQL_requires_max_(HIGH_LEVEL) +_IRQL_saves_ +NTHALAPI +KIRQL +NTAPI +KeGetCurrentIrql(VOID); + +_IRQL_requires_max_(HIGH_LEVEL) +NTHALAPI +VOID +FASTCALL +KfLowerIrql( + _In_ _IRQL_restores_ _Notliteral_ KIRQL NewIrql); +#define KeLowerIrql(a) KfLowerIrql(a) + +_IRQL_requires_max_(HIGH_LEVEL) +_IRQL_raises_(NewIrql) +_IRQL_saves_ +NTHALAPI +KIRQL +FASTCALL +KfRaiseIrql( + _In_ KIRQL NewIrql); +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_saves_ +_IRQL_raises_(DISPATCH_LEVEL) +NTHALAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel(VOID); + +NTHALAPI +KIRQL +NTAPI +KeRaiseIrqlToSynchLevel(VOID); + +_Requires_lock_not_held_(*SpinLock) +_Acquires_lock_(*SpinLock) +_IRQL_requires_max_(DISPATCH_LEVEL) +_IRQL_saves_ +_IRQL_raises_(DISPATCH_LEVEL) +NTHALAPI +KIRQL +FASTCALL +KfAcquireSpinLock( + _Inout_ PKSPIN_LOCK SpinLock); +#define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) + +_Requires_lock_held_(*SpinLock) +_Releases_lock_(*SpinLock) +_IRQL_requires_(DISPATCH_LEVEL) +NTHALAPI +VOID +FASTCALL +KfReleaseSpinLock( + _Inout_ PKSPIN_LOCK SpinLock, + _In_ _IRQL_restores_ KIRQL NewIrql); +#define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) + +_Requires_lock_not_held_(*SpinLock) +_Acquires_lock_(*SpinLock) +_IRQL_requires_min_(DISPATCH_LEVEL) +NTKERNELAPI +VOID +FASTCALL +KefAcquireSpinLockAtDpcLevel( + _Inout_ PKSPIN_LOCK SpinLock); +#define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) + +_Requires_lock_held_(*SpinLock) +_Releases_lock_(*SpinLock) +_IRQL_requires_min_(DISPATCH_LEVEL) +NTKERNELAPI +VOID +FASTCALL +KefReleaseSpinLockFromDpcLevel( + _Inout_ PKSPIN_LOCK SpinLock); +#define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) + +NTSYSAPI +PKTHREAD +NTAPI +KeGetCurrentThread(VOID); + +_Always_(_Post_satisfies_(return<=0)) +_Must_inspect_result_ +_IRQL_requires_max_(DISPATCH_LEVEL) +_Kernel_float_saved_ +_At_(*FloatSave, _Kernel_requires_resource_not_held_(FloatState) _Kernel_acquires_resource_(FloatState)) +NTKERNELAPI +NTSTATUS +NTAPI +KeSaveFloatingPointState( + _Out_ PKFLOATING_SAVE FloatSave); + +_Success_(1) +_Kernel_float_restored_ +_At_(*FloatSave, _Kernel_requires_resource_held_(FloatState) _Kernel_releases_resource_(FloatState)) +NTKERNELAPI +NTSTATUS +NTAPI +KeRestoreFloatingPointState( + _In_ PKFLOATING_SAVE FloatSave); + +/* VOID + * KeFlushIoBuffers( + * IN PMDL Mdl, + * IN BOOLEAN ReadOperation, + * IN BOOLEAN DmaOperation) + */ +#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) + +/* x86 and x64 performs a 0x2C interrupt */ +#define DbgRaiseAssertionFailure __int2c + +FORCEINLINE +VOID +_KeQueryTickCount( + OUT PLARGE_INTEGER CurrentCount) +{ + for (;;) { +#ifdef NONAMELESSUNION + CurrentCount->s.HighPart = KeTickCount.High1Time; + CurrentCount->s.LowPart = KeTickCount.LowPart; + if (CurrentCount->s.HighPart == KeTickCount.High2Time) break; +#else + CurrentCount->HighPart = KeTickCount.High1Time; + CurrentCount->LowPart = KeTickCount.LowPart; + if (CurrentCount->HighPart == KeTickCount.High2Time) break; +#endif + YieldProcessor(); + } +} +#define KeQueryTickCount(CurrentCount) _KeQueryTickCount(CurrentCount) + + + + + +#elif defined(_M_AMD64) +/** Kernel definitions for AMD64 **/ + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CMCI_LEVEL 5 +#define CLOCK_LEVEL 13 +#define IPI_LEVEL 14 +#define DRS_LEVEL 14 +#define POWER_LEVEL 14 +#define PROFILE_LEVEL 15 +#define HIGH_LEVEL 15 + +#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL +#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA) +#define SharedInterruptTime (KI_USER_SHARED_DATA + 0x8) +#define SharedSystemTime (KI_USER_SHARED_DATA + 0x14) +#define SharedTickCount (KI_USER_SHARED_DATA + 0x320) + +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L + +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 +#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) + +typedef struct _KFLOATING_SAVE { + ULONG Dummy; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +typedef XSAVE_FORMAT XMM_SAVE_AREA32, *PXMM_SAVE_AREA32; + +#define KeQueryInterruptTime() \ + (*(volatile ULONG64*)SharedInterruptTime) + +#define KeQuerySystemTime(CurrentCount) \ + *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedSystemTime + +#define KeQueryTickCount(CurrentCount) \ + *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedTickCount + +#define KeGetDcacheFillSize() 1L + +#define YieldProcessor _mm_pause +#define MemoryBarrier __faststorefence +#define FastFence __faststorefence +#define LoadFence _mm_lfence +#define MemoryFence _mm_mfence +#define StoreFence _mm_sfence +#define LFENCE_ACQUIRE() LoadFence() + +FORCEINLINE +VOID +KeMemoryBarrier(VOID) +{ + // FIXME: Do we really need lfence after the __faststorefence ? + FastFence(); + LFENCE_ACQUIRE(); +} + +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() + +FORCEINLINE +KIRQL +KeGetCurrentIrql(VOID) +{ + return (KIRQL)__readcr8(); +} + +FORCEINLINE +VOID +KeLowerIrql(IN KIRQL NewIrql) +{ + ASSERT((KIRQL)__readcr8() >= NewIrql); + __writecr8(NewIrql); +} + +FORCEINLINE +KIRQL +KfRaiseIrql(IN KIRQL NewIrql) +{ + KIRQL OldIrql; + + OldIrql = (KIRQL)__readcr8(); + ASSERT(OldIrql <= NewIrql); + __writecr8(NewIrql); + return OldIrql; +} +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +FORCEINLINE +KIRQL +KeRaiseIrqlToDpcLevel(VOID) +{ + return KfRaiseIrql(DISPATCH_LEVEL); +} + +FORCEINLINE +KIRQL +KeRaiseIrqlToSynchLevel(VOID) +{ + return KfRaiseIrql(12); // SYNCH_LEVEL = IPI_LEVEL - 2 +} + +FORCEINLINE +PKTHREAD +KeGetCurrentThread(VOID) +{ + return (struct _KTHREAD *)__readgsqword(0x188); +} + +FORCEINLINE +NTSTATUS +KeSaveFloatingPointState(PVOID FloatingState) +{ + UNREFERENCED_PARAMETER(FloatingState); + return STATUS_SUCCESS; +} + +FORCEINLINE +NTSTATUS +KeRestoreFloatingPointState(PVOID FloatingState) +{ + UNREFERENCED_PARAMETER(FloatingState); + return STATUS_SUCCESS; +} + +/* VOID + * KeFlushIoBuffers( + * IN PMDL Mdl, + * IN BOOLEAN ReadOperation, + * IN BOOLEAN DmaOperation) + */ +#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation) + +/* x86 and x64 performs a 0x2C interrupt */ +#define DbgRaiseAssertionFailure __int2c + +#elif defined(_M_IA64) +/** Kernel definitions for IA64 **/ + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CMC_LEVEL 3 +#define DEVICE_LEVEL_BASE 4 +#define PC_LEVEL 12 +#define IPI_LEVEL 14 +#define DRS_LEVEL 14 +#define CLOCK_LEVEL 13 +#define POWER_LEVEL 15 +#define PROFILE_LEVEL 15 +#define HIGH_LEVEL 15 + +#define KI_USER_SHARED_DATA ((ULONG_PTR)(KADDRESS_BASE + 0xFFFE0000)) +extern volatile LARGE_INTEGER KeTickCount; + +#define PAUSE_PROCESSOR __yield(); + +FORCEINLINE +VOID +KeFlushWriteBuffer(VOID) +{ + __mf (); + return; +} + +NTSYSAPI +PKTHREAD +NTAPI +KeGetCurrentThread(VOID); + + +#elif defined(_M_PPC) + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define PROFILE_LEVEL 27 +#define CLOCK1_LEVEL 28 +#define CLOCK2_LEVEL 28 +#define IPI_LEVEL 29 +#define POWER_LEVEL 30 +#define HIGH_LEVEL 31 + +// +// Used to contain PFNs and PFN counts +// +typedef ULONG PFN_COUNT; +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; + + +typedef struct _KFLOATING_SAVE { + ULONG Dummy; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +typedef struct _KPCR_TIB { + PVOID ExceptionList; /* 00 */ + PVOID StackBase; /* 04 */ + PVOID StackLimit; /* 08 */ + PVOID SubSystemTib; /* 0C */ + _ANONYMOUS_UNION union { + PVOID FiberData; /* 10 */ + ULONG Version; /* 10 */ + } DUMMYUNIONNAME; + PVOID ArbitraryUserPointer; /* 14 */ + struct _KPCR_TIB *Self; /* 18 */ +} KPCR_TIB, *PKPCR_TIB; /* 1C */ + +#define PCR_MINOR_VERSION 1 +#define PCR_MAJOR_VERSION 1 + +typedef struct _KPCR { + KPCR_TIB Tib; /* 00 */ + struct _KPCR *Self; /* 1C */ + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IrrActive; /* 2C */ + ULONG IDR; /* 30 */ + PVOID KdVersionBlock; /* 34 */ + PUSHORT IDT; /* 38 */ + PUSHORT GDT; /* 3C */ + struct _KTSS *TSS; /* 40 */ + USHORT MajorVersion; /* 44 */ + USHORT MinorVersion; /* 46 */ + KAFFINITY SetMember; /* 48 */ + ULONG StallScaleFactor; /* 4C */ + UCHAR SpareUnused; /* 50 */ + UCHAR Number; /* 51 */ +} KPCR, *PKPCR; /* 54 */ + +#define KeGetPcr() PCR + +#define YieldProcessor() __asm__ __volatile__("nop"); + +FORCEINLINE +ULONG +NTAPI +KeGetCurrentProcessorNumber(VOID) +{ + ULONG Number; + __asm__ __volatile__ ( + "lwz %0, %c1(12)\n" + : "=r" (Number) + : "i" (FIELD_OFFSET(KPCR, Number)) + ); + return Number; +} + +NTHALAPI +VOID +FASTCALL +KfLowerIrql( + IN KIRQL NewIrql); +#define KeLowerIrql(a) KfLowerIrql(a) + +NTHALAPI +KIRQL +FASTCALL +KfRaiseIrql( + IN KIRQL NewIrql); +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +NTHALAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel(VOID); + +NTHALAPI +KIRQL +NTAPI +KeRaiseIrqlToSynchLevel(VOID); + + + +#elif defined(_M_MIPS) +#error MIPS Headers are totally incorrect + +// +// Used to contain PFNs and PFN counts +// +typedef ULONG PFN_COUNT; +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; + +#define PASSIVE_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define PROFILE_LEVEL 27 +#define IPI_LEVEL 29 +#define HIGH_LEVEL 31 + +typedef struct _KPCR { + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IDR; /* 30 */ +} KPCR, *PKPCR; + +#define KeGetPcr() PCR + +typedef struct _KFLOATING_SAVE { +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +static __inline +ULONG +NTAPI +KeGetCurrentProcessorNumber(VOID) +{ + return 0; +} + +#define YieldProcessor() __asm__ __volatile__("nop"); + +#define KeLowerIrql(a) KfLowerIrql(a) +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +NTKERNELAPI +VOID +NTAPI +KfLowerIrql( + IN KIRQL NewIrql); + +NTKERNELAPI +KIRQL +NTAPI +KfRaiseIrql( + IN KIRQL NewIrql); + +NTKERNELAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel(VOID); + +NTKERNELAPI +KIRQL +NTAPI +KeRaiseIrqlToSynchLevel(VOID); + + +#elif defined(_M_ARM) +#include <armddk.h> +#else +#error Unknown Architecture +#endif NTKERNELAPI VOID Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -66,12 +66,12 @@ // // Flags for ProcessExecutionOptions // -#define MEM_EXECUTE_OPTION_DISABLE 0x1 +#define MEM_EXECUTE_OPTION_DISABLE 0x1 #define MEM_EXECUTE_OPTION_ENABLE 0x2 #define MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION 0x4 #define MEM_EXECUTE_OPTION_PERMANENT 0x8 #define MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE 0x10 -#define MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE 0x20 +#define MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE 0x20 #define MEM_EXECUTE_OPTION_VALID_FLAGS 0x3F #ifndef NTOS_MODE_USER @@ -989,6 +989,10 @@ ULONG NumberOfThunks; } DRIVER_SPECIFIED_VERIFIER_THUNKS, *PDRIVER_SPECIFIED_VERIFIER_THUNKS; +#ifdef __cplusplus +extern "C" { +#endif + // // Default heap size values. For user mode, these values are copied to a new // process's PEB by the kernel in MmCreatePeb. In kernel mode, RtlCreateHeap @@ -1007,6 +1011,10 @@ // extern POBJECT_TYPE NTSYSAPI MmSectionObjectType; +#ifdef __cplusplus +}; // extern "C" +#endif + #endif // !NTOS_MODE_USER #endif // _MMTYPES_H Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -25,6 +25,10 @@ #include <umtypes.h> #include <pstypes.h> #include <obtypes.h> + +#ifdef __cplusplus +extern "C" { +#endif #ifndef NTOS_MODE_USER @@ -576,4 +580,8 @@ #endif /* NTOS_MODE_USER */ +#ifdef __cplusplus +}; // extern "C" #endif + +#endif Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -3259,6 +3259,7 @@ _In_ ULONG MaximumResponseLength ); +#undef DbgBreakPoint VOID NTAPI DbgBreakPoint( Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=585… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -1090,7 +1090,6 @@ #define _In_function_class_(x) _In_function_class_(#x) #define _Called_from_function_class_(x) _In_function_class_(x) -#define _Function_class_(x) _SA_annotes1(SAL_functionClassNew, #x) #else // ] [ !_PREFAST_ Modified: trunk/reactos/include/psdk/sal_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal_old.h?rev… ============================================================================== --- trunk/reactos/include/psdk/sal_old.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal_old.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -53,7 +53,6 @@ #define __inner_fallthrough_dec __inline __nothrow void __FallThrough() {} #define __inner_override __declspec("__override") #define __inner_success(expr) __declspec("SAL_success("SPECSTRINGIZE(expr)")") -#define __inner_typefix(ctype) __declspec("SAL_typefix("SPECSTRINGIZE(ctype)")") #define __maybenull __declspec("SAL_maybenull") #define __maybereadonly __declspec("SAL_maybereadonly") #define __maybevalid __declspec("SAL_maybevalid") Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -2,6 +2,21 @@ * Kernel Functions * ******************************************************************************/ $if (_WDMDDK_) +#if defined(_M_IX86) +$include(x86/ke.h) +#elif defined(_M_AMD64) +$include(amd64/ke.h) +#elif defined(_M_IA64) +$include(ia64/ke.h) +#elif defined(_M_PPC) +$include(ppc/ke.h) +#elif defined(_M_MIPS) +$include(mips/ke.h) +#elif defined(_M_ARM) +$include(arm/ke.h) +#else +#error Unknown Architecture +#endif NTKERNELAPI VOID Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sat Mar 23 21:57:17 2013 @@ -1237,21 +1237,3 @@ $endif (_NTIFS_) -$if (_WDMDDK_) -#if defined(_M_IX86) -$include(x86/ke.h) -#elif defined(_M_AMD64) -$include(amd64/ke.h) -#elif defined(_M_IA64) -$include(ia64/ke.h) -#elif defined(_M_PPC) -$include(ppc/ke.h) -#elif defined(_M_MIPS) -$include(mips/ke.h) -#elif defined(_M_ARM) -$include(arm/ke.h) -#else -#error Unknown Architecture -#endif -$endif (_WDMDDK_) -

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