Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 38490: - Fix attributes
by dchapyshev＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: dchapyshev Date: Wed Dec 31 09:09:28 2008 New Revision: 38490 URL: http://svn.reactos.org/svn/reactos?rev=38490&view=rev Log: - Fix attributes Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Wed Dec 31 09:09:28 2008 @@ -116,15 +116,14 @@ (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); Status = NtCreateFile (&DirectoryHandle, - FILE_LIST_DIRECTORY | SYNCHRONIZE | - FILE_OPEN_FOR_BACKUP_INTENT, + FILE_LIST_DIRECTORY | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0);

1 0

[tkreuzer] 38489: Sync to trunk r38200
by tkreuzer＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: tkreuzer Date: Wed Dec 31 08:31:22 2008 New Revision: 38489 URL: http://svn.reactos.org/svn/reactos?rev=38489&view=rev Log: Sync to trunk r38200 Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/crtdbg.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/stdarg.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/vadefs.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/argv.c Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/resource.rc branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c branches/ros-amd64-bringup/reactos/base/applications/dxdiag/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c branches/ros-amd64-bringup/reactos/base/applications/notepad/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/sc/create.c branches/ros-amd64-bringup/reactos/base/applications/shutdown/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/de-DE.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/en-US.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/fr-FR.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/ko-KR.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/sl-SI.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/sv-SE.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c branches/ros-amd64-bringup/reactos/base/applications/wordpad/Da.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/De.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/En.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Fr.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Hu.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Ko.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Nl.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/No.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Pl.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Pt.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Ru.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Si.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Tr.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Zh.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c branches/ros-amd64-bringup/reactos/base/setup/reactos/lang/el-GR.rc branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/hy-AM.h branches/ros-amd64-bringup/reactos/base/setup/usetup/mui.c branches/ros-amd64-bringup/reactos/base/setup/usetup/muilanguages.h branches/ros-amd64-bringup/reactos/base/setup/usetup/settings.c branches/ros-amd64-bringup/reactos/base/shell/cmd/dir.c branches/ros-amd64-bringup/reactos/base/shell/explorer-new/explorer.rc branches/ros-amd64-bringup/reactos/base/system/services/database.c branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_arm.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_i386.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_arm.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_i386.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_arm.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_i386.inf branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c branches/ros-amd64-bringup/reactos/dll/cpl/liccpa/rsrc.rc branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_device.c branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_swapchain.c branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_swapchain.h branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/utils.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/font.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.spec branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphicspath.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/pen.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/region.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/iocompl.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/lfile.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/move.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/locale_rc.rc branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/atom.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lang.c branches/ros-amd64-bringup/reactos/dll/win32/user32/include/window.h branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/icon.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/mdi.c branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/fat.c branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/allocators.c branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/ks.rbuild branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/worker.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/registry.c branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/crt/malloc.h branches/ros-amd64-bringup/reactos/include/crt/sys/utime.h branches/ros-amd64-bringup/reactos/include/ddk/portcls.h branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h branches/ros-amd64-bringup/reactos/include/psdk/accctrl.h branches/ros-amd64-bringup/reactos/include/psdk/devguid.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusflat.h branches/ros-amd64-bringup/reactos/include/psdk/guiddef.h branches/ros-amd64-bringup/reactos/include/psdk/vfw.h branches/ros-amd64-bringup/reactos/include/psdk/winuser.h branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/lib/pseh/framebased-gcchack.c branches/ros-amd64-bringup/reactos/lib/pseh/i386/framebased-gcchack.S branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismbc.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismblead.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismbtrl.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbbtype.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbccpy.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbclen.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbslen.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsncpy.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsnextc.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsninc.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbstrlen.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/sys_stat/systime.c branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/volume.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dibobj.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/font.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/freetype.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdidbg.c branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/hy-AM.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_swapchain.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/atom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/fat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/crtdbg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stdarg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/vadefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/accctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/devguid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/argv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Modified: branches/ros-amd64-bringup/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/p… Modified: branches/ros-amd64-bringup/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/p… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismbc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismblead.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismbtrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbbtype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbccpy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbclen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbslen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsncpy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsnextc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsninc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbstrlen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/sys_stat/systime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…

1 0

[fireball] 38488: - Refactor MmFlushDataFileSection into a wrapper and an internal helper MiFlushDataFileSection. - Add a MiFlushPages routine which forces a flush of all data sections using internal helper MiFlushDataFileSection. - Now there is a forced flush of all data sections during Mm shutdown.
by fireball＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: fireball Date: Wed Dec 31 06:57:26 2008 New Revision: 38488 URL: http://svn.reactos.org/svn/reactos?rev=38488&view=rev Log: - Refactor MmFlushDataFileSection into a wrapper and an internal helper MiFlushDataFileSection. - Add a MiFlushPages routine which forces a flush of all data sections using internal helper MiFlushDataFileSection. - Now there is a forced flush of all data sections during Mm shutdown. Modified: branches/cache_manager_rewrite/mm.patch Modified: branches/cache_manager_rewrite/mm.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm.patch?… ============================================================================== --- branches/cache_manager_rewrite/mm.patch [iso-8859-1] (original) +++ branches/cache_manager_rewrite/mm.patch [iso-8859-1] Wed Dec 31 06:57:26 2008 @@ -1,6 +1,6 @@ Index: elf.inc.h =================================================================== ---- elf.inc.h (revision 38402) +--- elf.inc.h (revision 38484) +++ elf.inc.h (working copy) @@ -444,6 +444,7 @@ nReadStatus = ReadFileCb @@ -12,7 +12,7 @@ &pData, Index: freelist.c =================================================================== ---- freelist.c (revision 38402) +--- freelist.c (revision 38484) +++ freelist.c (working copy) @@ -632,6 +632,12 @@ } @@ -29,7 +29,7 @@ { Index: mm.c =================================================================== ---- mm.c (revision 38402) +--- mm.c (revision 38484) +++ mm.c (working copy) @@ -277,6 +277,7 @@ break; @@ -41,7 +41,7 @@ (PVOID)Address, Index: mminit.c =================================================================== ---- mminit.c (revision 38402) +--- mminit.c (revision 38484) +++ mminit.c (working copy) @@ -68,6 +68,9 @@ FALSE; @@ -53,7 +53,20 @@ /* PRIVATE FUNCTIONS *********************************************************/ VOID -@@ -506,6 +509,9 @@ +@@ -101,8 +104,11 @@ + /* Check if there are any dirty pages, and flush them. + There will be no other chance to do this later, since filesystems + are going to be shut down. */ +- CcRosFlushDirtyPages(128, &PagesWritten); ++ //CcRosFlushDirtyPages(128, &PagesWritten); + #endif ++ ++ /* Flush all dirty pages */ ++ MiFlushPages(); + } + + VOID +@@ -506,6 +512,9 @@ /* Initialize the balance set manager */ MmInitBsmThread(); @@ -65,7 +78,7 @@ Index: mpw.c =================================================================== ---- mpw.c (revision 38402) +--- mpw.c (revision 38484) +++ mpw.c (working copy) @@ -88,7 +88,7 @@ MmWriteDirtyPages(128, &PagesWritten); @@ -78,7 +91,7 @@ Index: pagefile.c =================================================================== ---- pagefile.c (revision 38402) +--- pagefile.c (revision 38484) +++ pagefile.c (working copy) @@ -1,5 +1,4 @@ /* @@ -88,7 +101,7 @@ * This program is free software; you can redistribute it and/or modify Index: pageop.c =================================================================== ---- pageop.c (revision 38402) +--- pageop.c (revision 38484) +++ pageop.c (working copy) @@ -81,14 +81,23 @@ /* @@ -197,7 +210,7 @@ - Index: pe.c =================================================================== ---- pe.c (revision 38402) +--- pe.c (revision 38484) +++ pe.c (working copy) @@ -240,7 +240,7 @@ lnOffset.QuadPart = pidhDosHeader->e_lfanew; @@ -219,7 +232,7 @@ DIE(("ReadFile failed with status %08X\n", nStatus)); Index: rmap.c =================================================================== ---- rmap.c (revision 38402) +--- rmap.c (revision 38484) +++ rmap.c (working copy) @@ -299,6 +299,17 @@ Status = MmPageOutVirtualMemory(AddressSpace, MemoryArea, @@ -241,7 +254,7 @@ KeBugCheck(MEMORY_MANAGEMENT); Index: section.c =================================================================== ---- section.c (revision 38402) +--- section.c (revision 38484) +++ section.c (working copy) @@ -62,6 +62,7 @@ PROS_SECTION_OBJECT Section; @@ -2756,7 +2769,7 @@ return(STATUS_SUCCESS); } -+VOID ++VOID +MmInitSectionImplementation2(VOID) +{ + LARGE_INTEGER DueTime; @@ -3698,7 +3711,7 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* -@@ -4965,37 +6135,558 @@ +@@ -4965,38 +6135,598 @@ return STATUS_INVALID_PAGE_PROTECTION; } @@ -3877,6 +3890,15 @@ + return STATUS_SUCCESS; } ++typedef struct _PAGE_IO_CONTEXT ++{ ++ PMM_SECTION_SEGMENT Segment; ++ ULONG Offset; ++ ULONG PageCount; ++ PMM_PAGEOP PageOp[16]; ++ WORK_QUEUE_ITEM WorkQueueItem; ++} PAGE_IO_CONTEXT, *PPAGE_IO_CONTEXT; ++ NTSTATUS +MmspWriteDataSectionPage(PMM_SECTION_SEGMENT Segment, + ULONG Offset, @@ -3917,7 +3939,7 @@ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Iosb.Status; + } -+ MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); ++ MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + if (!NT_SUCCESS(Status)) + { + MmSetPageEntrySectionSegment(Segment, Offset, Entry | 0x2); @@ -3926,15 +3948,6 @@ + MmspCompleteAndReleasePageOp(PageOp); + return Status; +} -+ -+typedef struct _PAGE_IO_CONTEXT -+{ -+ PMM_SECTION_SEGMENT Segment; -+ ULONG Offset; -+ ULONG PageCount; -+ PMM_PAGEOP PageOp[16]; -+ WORK_QUEUE_ITEM WorkQueueItem; -+} PAGE_IO_CONTEXT, *PPAGE_IO_CONTEXT; + +VOID NTAPI +MmspWriteDataSectionPages(PVOID Context) @@ -3949,7 +3962,7 @@ + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + -+ DPRINT("MmspWriteDataSectionPages\n"); ++ DPRINT("MmspWriteDataSectionPages, %p pages\n", ((PPAGE_IO_CONTEXT)Context)->PageCount); + + Mdl = alloca(MmSizeOfMdl(NULL, ((PPAGE_IO_CONTEXT)Context)->PageCount * PAGE_SIZE)); + Pfn = alloca(((PPAGE_IO_CONTEXT)Context)->PageCount * sizeof(PFN_TYPE)); @@ -4029,7 +4042,7 @@ + FALSE, + NULL); + -+ DPRINT("MmspWorkerThread\n"); ++ DPRINT1("MmspWorkerThread\n"); + + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); + @@ -4177,17 +4190,14 @@ +} + +NTSTATUS -+MmFlushDataFileSection(PROS_SECTION_OBJECT Section, PLARGE_INTEGER StartOffset, ULONG Length) ++MiFlushDataFileSection(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER StartOffset, ULONG Length) +{ -+ PMM_SECTION_SEGMENT Segment; + LARGE_INTEGER Offset; + PPAGE_IO_CONTEXT Context = NULL; + ULONG Entry, i; + PMM_PAGEOP PageOp; + PFN_TYPE Pfn; + -+ Segment = ((PROS_SECTION_OBJECT)Section)->Segment; -+ + if (StartOffset) + { + Offset.QuadPart = PAGE_ROUND_DOWN(StartOffset->QuadPart); @@ -4208,7 +4218,7 @@ + Pfn = PFN_FROM_SSE(Entry); + if (!IS_SWAP_FROM_SSE(Entry) && Pfn && !(Entry & 0x2) && MmGetRmapListHeadPage(Pfn) && MmIsDirtyPageRmap(Pfn)) + { -+ Entry|=0x2; ++ Entry |= 0x2; + MmSetPageEntrySectionSegment(Segment, i * PAGE_SIZE, Entry); + } + if (!IS_SWAP_FROM_SSE(Entry) && Pfn && (Entry & 0x2)) @@ -4275,12 +4285,55 @@ +} + +NTSTATUS ++MmFlushDataFileSection(PROS_SECTION_OBJECT Section, PLARGE_INTEGER StartOffset, ULONG Length) ++{ ++ PMM_SECTION_SEGMENT Segment; ++ ++ /* Get pointer to the segment */ ++ Segment = ((PROS_SECTION_OBJECT)Section)->Segment; ++ ++ /* Use internal helper */ ++ return MiFlushDataFileSection(Segment, StartOffset, Length); ++} ++ ++VOID NTAPI ++MiFlushPages(VOID) ++{ ++ PLIST_ENTRY entry; ++ PMM_SECTION_SEGMENT current; ++ ++ /* Grab the lock */ ++ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); ++ ++ DPRINT1("MiFlushPages started\n"); ++ ++ /* Go through all data sections and flush them */ ++ entry = DataSectionObjectListHead.Flink; ++ while (entry != &DataSectionObjectListHead) ++ { ++ current = CONTAINING_RECORD(entry, MM_SECTION_SEGMENT, ListEntry); ++ ++ /* Flush it */ ++ MiFlushDataFileSection(current, NULL, 0); ++ ++ /* Advance to the next section */ ++ entry = entry->Flink; ++ } ++ ++ DPRINT1("MiFlushPages finished\n"); ++ ++ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&DataSectionObjectLock); ++} ++ ++NTSTATUS ++NTAPI NtAllocateUserPhysicalPages(IN HANDLE ProcessHandle, IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) Index: virtual.c =================================================================== ---- virtual.c (revision 38402) +--- virtual.c (revision 38484) +++ virtual.c (working copy) @@ -581,7 +581,7 @@ NTSTATUS Status;

1 0

[fireball] 38487: - Add a new API to Freeldr's memory manager, which allows to override type of an already allocated memory. - WINLDR: Fix page tables buffer memory allocation so that it doesn't rely on luck anymore and always allocates a contiguous area of memory. Fixes spontaneous case of booting problem (immediate black screen after loading drivers, reboot of real hardware, halt of cpu in a virtual machine). - WINLDR: Fix some debug print.
by fireball＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: fireball Date: Wed Dec 31 06:21:36 2008 New Revision: 38487 URL: http://svn.reactos.org/svn/reactos?rev=38487&view=rev Log: - Add a new API to Freeldr's memory manager, which allows to override type of an already allocated memory. - WINLDR: Fix page tables buffer memory allocation so that it doesn't rely on luck anymore and always allocates a contiguous area of memory. Fixes spontaneous case of booting problem (immediate black screen after loading drivers, reboot of real hardware, halt of cpu in a virtual machine). - WINLDR: Fix some debug print. Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c 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] Wed Dec 31 06:21:36 2008 @@ -94,6 +94,7 @@ VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount); // Removes entries in the memory map that describe memory above 4G VOID MmUpdateLastFreePageHint(PVOID PageLookupTable, ULONG TotalPageCount); // Sets the LastFreePageHint to the last usable page of memory BOOLEAN MmAreMemoryPagesAvailable(PVOID PageLookupTable, ULONG TotalPageCount, PVOID PageAddress, ULONG PageCount); // Returns TRUE if the specified pages of memory are available, otherwise FALSE +VOID MmSetMemoryType(PVOID MemoryAddress, ULONG MemorySize, TYPE_OF_MEMORY NewType); // Use with EXTREME caution! ULONG GetSystemMemorySize(VOID); // Returns the amount of total memory in the system PPAGE_LOOKUP_TABLE_ITEM MmGetMemoryMap(ULONG *NoEntries); // Returns a pointer to the memory mapping table and a number of entries in it Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] Wed Dec 31 06:21:36 2008 @@ -182,6 +182,22 @@ return MemPointer; } +VOID MmSetMemoryType(PVOID MemoryAddress, ULONG MemorySize, TYPE_OF_MEMORY NewType) +{ + ULONG PagesNeeded; + ULONG StartPageNumber; + + // Find out how many blocks it will take to + // satisfy this allocation + PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; + + // Get the starting page number + StartPageNumber = MmGetPageNumberFromAddress(MemoryAddress); + + // Set new type for these pages + MmAllocatePagesInLookupTable(PageLookupTableAddress, StartPageNumber, PagesNeeded, NewType); +} + PVOID MmAllocateHighestMemoryBelowAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType) { ULONG PagesNeeded; Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Wed Dec 31 06:21:36 2008 @@ -405,7 +405,7 @@ /* Size of data is less than the virtual size - fill up the remainder with zeroes */ if (SizeOfRawData < VirtualSize) { - DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d", SizeOfRawData, VirtualSize)); + DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize)); RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); } Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Wed Dec 31 06:21:36 2008 @@ -133,13 +133,15 @@ TotalSize = (1+1+NumPageTables*2)*MM_PAGE_SIZE; // PDE+HAL+KernelPTEs == MemoryData - Buffer = MmAllocateMemoryWithType( - TotalSize - NumPageTables*MM_PAGE_SIZE, LoaderMemoryData); + Buffer = MmAllocateMemoryWithType(TotalSize, LoaderMemoryData); // Physical PTEs = FirmwareTemporary - PhysicalPageTablesBuffer = MmAllocateMemoryWithType( - NumPageTables*MM_PAGE_SIZE, LoaderFirmwareTemporary); - + PhysicalPageTablesBuffer = (PUCHAR)Buffer + TotalSize - NumPageTables*MM_PAGE_SIZE; + MmSetMemoryType(PhysicalPageTablesBuffer, + NumPageTables*MM_PAGE_SIZE, + LoaderFirmwareTemporary); + + // This check is now redundant if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != PhysicalPageTablesBuffer) {

1 0

[dchapyshev] 38486: - Fix ReadDirectoryChangesW - FindFirstChangeNotificationW +17 passed winetests
by dchapyshev＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: dchapyshev Date: Wed Dec 31 05:54:30 2008 New Revision: 38486 URL: http://svn.reactos.org/svn/reactos?rev=38486&view=rev Log: - Fix ReadDirectoryChangesW - FindFirstChangeNotificationW +17 passed winetests Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cn… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] Wed Dec 31 05:54:30 2008 @@ -92,12 +92,7 @@ &ObjectAttributes, &IoStatus, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, - FILE_DIRECTORY_FILE); - - /* - FIXME: I think we should use FILE_OPEN_FOR_BACKUP_INTENT. See M$ Q188321 - -Gunnar - */ + FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT); RtlFreeHeap(RtlGetProcessHeap(), 0, @@ -122,6 +117,7 @@ (BOOLEAN)bWatchSubtree); if (!NT_SUCCESS(Status)) { + NtClose(hDir); SetLastErrorByStatus(Status); return INVALID_HANDLE_VALUE; } @@ -185,24 +181,62 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine /* OPTIONAL???????? */ ) { + PVOID CompletionRoutine; NTSTATUS Status; IO_STATUS_BLOCK IoStatus; + HANDLE EventHandle; + PIO_APC_ROUTINE IoApcRoutine; if (lpOverlapped ) + { + if (lpCompletionRoutine) + { + CompletionRoutine = (PVOID) lpCompletionRoutine; + EventHandle = NULL; + IoApcRoutine = ApcRoutine; + } + else + { + if (((ULONG_PTR) lpOverlapped->hEvent & 1) == 0) + CompletionRoutine = (PVOID) lpOverlapped; + else + CompletionRoutine = NULL; + + EventHandle = lpOverlapped->hEvent; + IoApcRoutine = NULL; + } + lpOverlapped->Internal = STATUS_PENDING; + } + else + { + EventHandle = NULL; + IoApcRoutine = NULL; + CompletionRoutine = NULL; + } Status = NtNotifyChangeDirectoryFile( hDirectory, - lpOverlapped ? lpOverlapped->hEvent : NULL, - lpCompletionRoutine ? ApcRoutine : NULL, /* ApcRoutine OPTIONAL???? */ - lpCompletionRoutine, /* ApcContext */ - lpOverlapped ? (PIO_STATUS_BLOCK)lpOverlapped : &IoStatus, + EventHandle, + IoApcRoutine, + CompletionRoutine, /* ApcContext */ + lpOverlapped ? (PIO_STATUS_BLOCK)lpOverlapped->Internal : &IoStatus, lpBuffer, nBufferLength, dwNotifyFilter, (BOOLEAN)bWatchSubtree ); + if ((Status == STATUS_PENDING) && (!lpOverlapped)) + { + Status = NtWaitForSingleObject(hDirectory, FALSE, NULL); + + if (NT_SUCCESS(Status)) + { + Status = IoStatus.Status; + } + } + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status);

1 0

[cwittich] 38485: fix build
by cwittich＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: cwittich Date: Wed Dec 31 05:53:35 2008 New Revision: 38485 URL: http://svn.reactos.org/svn/reactos?rev=38485&view=rev Log: fix build Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] Wed Dec 31 05:53:35 2008 @@ -10,7 +10,6 @@ <file>main.c</file> <file>cryptui.rc</file> <library>wine</library> - <library>unicode</library> <library>kernel32</library> <library>user32</library> <library>ole32</library> Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] Wed Dec 31 05:53:35 2008 @@ -42,6 +42,7 @@ #define vsprintfW vswprintf #define snprintfW _snwprintf #define vsnprintfW _vsnwprintf +#define isprintW iswprint #ifndef WINE_UNICODE_API #define WINE_UNICODE_API __attribute__((dllimport))

1 0

[cwittich] 38484: sync wintrust and cryptui to wine 1.1.11
by cwittich＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: cwittich Date: Wed Dec 31 03:26:01 2008 New Revision: 38484 URL: http://svn.reactos.org/svn/reactos?rev=38484&view=rev Log: sync wintrust and cryptui to wine 1.1.11 Added: trunk/reactos/dll/win32/cryptui/cert.bmp (with props) trunk/reactos/dll/win32/cryptui/certerror.bmp (with props) trunk/reactos/dll/win32/cryptui/certwarning.bmp (with props) trunk/reactos/dll/win32/cryptui/checks.bmp (with props) trunk/reactos/dll/win32/cryptui/cryptui.rc (with props) trunk/reactos/dll/win32/cryptui/cryptui_En.rc (with props) trunk/reactos/dll/win32/cryptui/cryptuires.h (with props) trunk/reactos/dll/win32/cryptui/smallicons.bmp (with props) trunk/reactos/include/psdk/cryptdlg.h (with props) Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/dll/win32/cryptui/cryptui.spec trunk/reactos/dll/win32/cryptui/main.c trunk/reactos/dll/win32/wintrust/asn.c trunk/reactos/dll/win32/wintrust/crypt.c trunk/reactos/dll/win32/wintrust/softpub.c trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/dll/win32/wintrust/wintrust.spec trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/dll/win32/wintrust/wintrust_priv.h trunk/reactos/include/psdk/cryptuiapi.h trunk/reactos/include/psdk/mscat.h trunk/reactos/include/psdk/wintrust.h [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/cryptui/cert.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cert.bmp… Added: trunk/reactos/dll/win32/cryptui/certerror.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/certerro… Added: trunk/reactos/dll/win32/cryptui/certwarning.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/certwarn… Added: trunk/reactos/dll/win32/cryptui/checks.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/checks.b… Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Added: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Added: trunk/reactos/dll/win32/cryptui/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Added: trunk/reactos/dll/win32/cryptui/cryptuires.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptuir… Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… Added: trunk/reactos/dll/win32/cryptui/smallicons.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/smallico… Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… Modified: trunk/reactos/dll/win32/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/crypt.c… Modified: trunk/reactos/dll/win32/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/softpub… Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… Modified: trunk/reactos/dll/win32/wintrust/wintrust.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… Added: trunk/reactos/include/psdk/cryptdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cryptdlg.h?re… Modified: trunk/reactos/include/psdk/cryptuiapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cryptuiapi.h?… Modified: trunk/reactos/include/psdk/mscat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mscat.h?rev=3… Modified: trunk/reactos/include/psdk/wintrust.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wintrust.h?re…

1 0

[dchapyshev] 38483: - Add check of params
by dchapyshev＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: dchapyshev Date: Wed Dec 31 02:11:43 2008 New Revision: 38483 URL: http://svn.reactos.org/svn/reactos?rev=38483&view=rev Log: - Add check of params Modified: trunk/reactos/dll/win32/secur32/sspi.c Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Wed Dec 31 02:11:43 2008 @@ -182,7 +182,14 @@ PVOID Bar) { UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + + if (Handle) + { + Bar = NULL; + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return SEC_E_INVALID_HANDLE; } SECURITY_STATUS @@ -192,7 +199,14 @@ PVOID Bar) { UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + + if (Handle) + { + Bar = NULL; + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return SEC_E_INVALID_HANDLE; } SECURITY_STATUS @@ -210,7 +224,15 @@ ) { UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + + if (pszPackage) + { + phCred = NULL; + pExpires = NULL; + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return SEC_E_SECPKG_NOT_FOUND; } SECURITY_STATUS @@ -228,7 +250,15 @@ ) { UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + + if (pszPackage) + { + phCred = NULL; + pExpires = NULL; + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return SEC_E_SECPKG_NOT_FOUND; } SECURITY_STATUS @@ -309,7 +339,13 @@ ) { UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + + if (pszPackageName) + { + *ppPackageInfo = NULL; + return ERROR_CALL_NOT_IMPLEMENTED; + } + return SEC_E_SECPKG_NOT_FOUND; } SECURITY_STATUS @@ -320,7 +356,13 @@ ) { UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + + if (pszPackageName) + { + *ppPackageInfo = NULL; + return ERROR_CALL_NOT_IMPLEMENTED; + } + return SEC_E_SECPKG_NOT_FOUND; } SECURITY_STATUS @@ -433,7 +475,14 @@ ) { UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + + if (phCredential) + { + pBuffer = NULL; + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return SEC_E_INVALID_HANDLE; } SECURITY_STATUS @@ -445,7 +494,14 @@ ) { UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + + if (phCredential) + { + pBuffer = NULL; + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return SEC_E_INVALID_HANDLE; } SECURITY_STATUS

1 0

[cwittich] 38482: add dwmapi from wine 1.1.11
by cwittich＠svn.reactos.org 31 Dec '08

31 Dec '08

Author: cwittich Date: Wed Dec 31 02:02:56 2008 New Revision: 38482 URL: http://svn.reactos.org/svn/reactos?rev=38482&view=rev Log: add dwmapi from wine 1.1.11 Added: trunk/reactos/dll/win32/dwmapi/ (with props) trunk/reactos/dll/win32/dwmapi/dwmapi.rbuild (with props) trunk/reactos/dll/win32/dwmapi/dwmapi.spec (with props) trunk/reactos/dll/win32/dwmapi/dwmapi_main.c (with props) trunk/reactos/dll/win32/dwmapi/version.rc (with props) trunk/reactos/include/psdk/dwmapi.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=384… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed Dec 31 02:02:56 2008 @@ -7,6 +7,7 @@ <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_RSABASE" value="0x35700000" /> <property name="BASEADDRESS_RSAENH" value="0x35780000" /> + <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" /> <property name="BASEADDRESS_MPRAPI" value="0x4C400000" /> <property name="BASEADDRESS_PSTOREC" value="0x513D0000" /> <property name="BASEADDRESS_LPK" value="0x516C0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Dec 31 02:02:56 2008 @@ -249,6 +249,7 @@ dll\win32\cryptui\cryptui.dll 1 dll\win32\dbghelp\dbghelp.dll 1 dll\win32\dciman32\dciman32.dll 1 +dll\win32\dwmapi\dwmapi.dll 1 dll\win32\devmgr\devmgr.dll 1 dll\win32\dhcpcsvc\dhcpcsvc.dll 1 dll\win32\dnsapi\dnsapi.dll 1 Propchange: trunk/reactos/dll/win32/dwmapi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Dec 31 02:02:56 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/dwmapi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/dwmapi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/dwmapi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/dwmapi/dwmapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi.rb… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi.rbuild (added) +++ trunk/reactos/dll/win32/dwmapi/dwmapi.rbuild [iso-8859-1] Wed Dec 31 02:02:56 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="dwmapi" type="win32dll" baseaddress="${BASEADDRESS_DWMAPI}" installbase="system32" installname="dwmapi.dll" allowwarnings="true"> + <importlibrary definition="dwmapi.spec" /> + <include base="dwmapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>dwmapi_main.c</file> + <file>version.rc</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/dwmapi/dwmapi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi.spec (added) +++ trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Wed Dec 31 02:02:56 2008 @@ -1,0 +1,44 @@ +100 stub @ +101 stub @ +102 stdcall DwmEnableComposition (long) +103 stub @ +104 stub @ +105 stub @ +106 stub @ +107 stub @ +108 stub @ +109 stub @ +110 stub @ +111 stub @ +112 stub @ +113 stub @ + +115 stub @ +116 stub @ +117 stub @ +118 stub @ +119 stub @ +120 stub @ + +@ stub DwmAttachMilContent +@ stub DwmDefWindowProc +@ stub DwmDetachMilContent +@ stub DwmEnableBlurBehindWindow +@ stub DwmEnableMMCSS +@ stdcall DwmExtendFrameIntoClientArea(long ptr) +@ stdcall DwmFlush() +@ stdcall DwmGetColorizationColor(ptr long) +@ stub DwmGetCompositionTimingInfo +@ stub DwmGetGraphicsStreamClient +@ stub DwmGetGraphicsStreamTransformHint +@ stub DwmGetTransportAttributes +@ stub DwmGetWindowAttribute +@ stdcall DwmIsCompositionEnabled(ptr) +@ stub DwmModifyPreviousDxFrameDuration +@ stub DwmQueryThumbnailSourceSize +@ stub DwmRegisterThumbnail +@ stub DwmSetDxFrameDuration +@ stub DwmSetPresentParameters +@ stdcall DwmSetWindowAttribute(long long ptr long) +@ stdcall DwmUnregisterThumbnail(long) +@ stub DwmUpdateThumbnailProperties Propchange: trunk/reactos/dll/win32/dwmapi/dwmapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/dwmapi/dwmapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi_ma… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi_main.c (added) +++ trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] Wed Dec 31 02:02:56 2008 @@ -1,0 +1,121 @@ +/* + * Dwmapi + * + * Copyright 2007 Andras Kovacs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "dwmapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); + + +/* At process attach */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hInstDLL ); + break; + } + return TRUE; +} + +/********************************************************************** + * DwmIsCompositionEnabled (DWMAPI.@) + */ +HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) +{ + FIXME("%p\n", enabled); + + *enabled = FALSE; + return S_OK; +} + +/********************************************************************** + * DwmEnableComposition (DWMAPI.102) + */ +HRESULT WINAPI DwmEnableComposition(UINT uCompositionAction) +{ + FIXME("(%d) stub\n", uCompositionAction); + + return S_OK; +} + +/********************************************************************** + * DwmExtendFrameIntoClientArea (DWMAPI.@) + */ +HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) +{ + FIXME("(%p, %p) stub\n", hwnd, margins); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmGetColorizationColor (DWMAPI.@) + */ +HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) +{ + FIXME("(%p, %d) stub\n", colorization, opaque_blend); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmFlush (DWMAPI.@) + */ +HRESULT WINAPI DwmFlush() +{ + FIXME("() stub\n"); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmSetWindowAttribute (DWMAPI.@) + */ +HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) +{ + FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmUnregisterThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmUnregisterThumbnail(HTHUMBNAIL thumbnail) +{ + FIXME("(%p) stub\n", thumbnail); + + return E_NOTIMPL; +} Propchange: trunk/reactos/dll/win32/dwmapi/dwmapi_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/dwmapi/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/version.r… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/version.rc (added) +++ trunk/reactos/dll/win32/dwmapi/version.rc [iso-8859-1] Wed Dec 31 02:02:56 2008 @@ -1,0 +1,26 @@ +/* + * Copyright 2007 Andras Kovacs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Desktop Window Manager API" +#define WINE_FILENAME_STR "dwmapi.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/dwmapi/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed Dec 31 02:02:56 2008 @@ -76,6 +76,9 @@ <directory name="dciman32"> <xi:include href="dciman32/dciman32.rbuild" /> </directory> +<directory name="dwmapi"> + <xi:include href="dwmapi/dwmapi.rbuild" /> +</directory> <directory name="devmgr"> <xi:include href="devmgr/devmgr.rbuild" /> </directory> Added: trunk/reactos/include/psdk/dwmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dwmapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dwmapi.h (added) +++ trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] Wed Dec 31 02:02:56 2008 @@ -1,0 +1,45 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DWMAPI_H +#define __WINE_DWMAPI_H + +#include "wtypes.h" +#include "uxtheme.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef DWMAPI +# define DWMAPI STDAPI +# define DWMAPI_(type) STDAPI_(type) +#endif + +DECLARE_HANDLE(HTHUMBNAIL); + +DWMAPI DwmEnableComposition(UINT); +DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); +DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmIsCompositionEnabled(BOOL*); +DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); +DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DWMAPI_H */ Propchange: trunk/reactos/include/psdk/dwmapi.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jmorlan] 38481: Make IF /? work again
by jmorlan＠svn.reactos.org 30 Dec '08

30 Dec '08

Author: jmorlan Date: Tue Dec 30 17:55:50 2008 New Revision: 38481 URL: http://svn.reactos.org/svn/reactos?rev=38481&view=rev Log: Make IF /? work again Modified: trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/parser.c Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] Tue Dec 30 17:55:50 2008 @@ -120,7 +120,7 @@ {_T("history"), 0, CommandHistory}, #endif -// {_T("if"), 0, cmd_if}, + {_T("if"), 0, cmd_if}, #ifdef INCLUDE_CMD_LABEL {_T("label"), 0, cmd_label}, Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=38… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/if.c [iso-8859-1] Tue Dec 30 17:55:50 2008 @@ -49,13 +49,8 @@ return StringCmp(Left, Right); } -BOOL ExecuteIf(PARSED_COMMAND *Cmd) +INT cmd_if (LPTSTR param) { - INT result = FALSE; /* when set cause 'then' clause to be executed */ - LPTSTR param; - -#if 0 - /* FIXME: need to handle IF /?; will require special parsing */ TRACE ("cmd_if: (\'%s\')\n", debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) @@ -63,7 +58,15 @@ ConOutResPaging(TRUE,STRING_IF_HELP1); return 0; } -#endif + + error_syntax(param); + return 1; +} + +BOOL ExecuteIf(PARSED_COMMAND *Cmd) +{ + INT result = FALSE; /* when set cause 'then' clause to be executed */ + LPTSTR param; if (Cmd->If.Operator == IF_CMDEXTVERSION) { Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Tue Dec 30 17:55:50 2008 @@ -332,7 +332,7 @@ memset(Cmd, 0, sizeof(PARSED_COMMAND)); Cmd->Type = C_IF; - int Type = ParseToken(0, STANDARD_SEPS); + int Type = CurrentTokenType; if (_tcsicmp(CurrentToken, _T("/I")) == 0) { Cmd->If.Flags |= IFFLAG_IGNORECASE; @@ -488,13 +488,19 @@ /* Check for special forms */ if (_tcsicmp(ParsedLine, _T("if")) == 0) { - if (RedirList) - { - ParseError(); - FreeRedirection(RedirList); - return NULL; - } - return ParseIf(); + ParseToken(0, STANDARD_SEPS); + /* Do special parsing only if it's not followed by /? */ + if (_tcscmp(CurrentToken, _T("/?")) != 0) + { + if (RedirList) + { + ParseError(); + FreeRedirection(RedirList); + return NULL; + } + return ParseIf(); + } + Pos = _stpcpy(Pos, _T(" /?")); } /* Now get the tail */

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