Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 55766: [NTOSKRNL] - Silence a warning - Unsilence 2 warnings
by cgutman＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: cgutman Date: Mon Feb 20 23:34:17 2012 New Revision: 55766 URL: http://svn.reactos.org/svn/reactos?rev=55766&view=rev Log: [NTOSKRNL] - Silence a warning - Unsilence 2 warnings Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon Feb 20 23:34:17 2012 @@ -1917,7 +1917,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("IopCreateDeviceNode() failed (Status %lx)\n", Status); + DPRINT1("IopCreateDeviceNode() failed (Status %lx)\n", Status); MmUnloadSystemImage(ModuleObject); LoadParams->Status = Status; (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); @@ -1936,7 +1936,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); + DPRINT1("IopInitializeDriver() failed (Status %lx)\n", Status); MmUnloadSystemImage(ModuleObject); IopFreeDeviceNode(DeviceNode); LoadParams->Status = Status; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Feb 20 23:34:17 2012 @@ -2601,7 +2601,7 @@ } else { - DPRINT1("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", + DPRINT("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", &DeviceNode->ServiceName, Status); } }

1 0

[akhaldi] 55765: * Addendum to r55764.
by akhaldi＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: akhaldi Date: Mon Feb 20 22:09:21 2012 New Revision: 55765 URL: http://svn.reactos.org/svn/reactos?rev=55765&view=rev Log: * Addendum to r55764. Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] Mon Feb 20 22:09:21 2012 @@ -9,4 +9,4 @@ set_entrypoint(w32kdll_2k3sp2 0) add_dependencies(w32kdll_2k3sp2 psdk ) -add_importlib_target(w32kdll_2k3sp2.spec) +add_importlib_target(w32kdll_2k3sp2.spec w32kdll_2k3sp2.dll) Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] Mon Feb 20 22:09:21 2012 @@ -10,4 +10,4 @@ target_link_libraries(w32kdll_ros win32ksys) add_dependencies(w32kdll_ros psdk) -add_importlib_target(w32kdll_ros.spec) +add_importlib_target(w32kdll_ros.spec w32kdll_ros.dll) Modified: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] Mon Feb 20 22:09:21 2012 @@ -8,4 +8,4 @@ set_entrypoint(w32kdll_vista 0) add_dependencies(w32kdll_vista psdk ) -add_importlib_target(w32kdll_vista.spec) +add_importlib_target(w32kdll_vista.spec w32kdll_dll.spec) Modified: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] Mon Feb 20 22:09:21 2012 @@ -7,4 +7,4 @@ set_entrypoint(w32kdll_xpsp2 0) add_dependencies(w32kdll_xpsp2 psdk ) -add_importlib_target(w32kdll_xpsp2.spec) +add_importlib_target(w32kdll_xpsp2.spec w32kdll_xpsp2.dll)

1 0

[akhaldi] 55764: [CMAKE] * Simplify the way we handle importlib targets by taking control of the importlib name.
by akhaldi＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: akhaldi Date: Mon Feb 20 22:08:14 2012 New Revision: 55764 URL: http://svn.reactos.org/svn/reactos?rev=55764&view=rev Log: [CMAKE] * Simplify the way we handle importlib targets by taking control of the importlib name. Modified: trunk/reactos/base/shell/explorer/notifyhook/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/directx/dinput/CMakeLists.txt trunk/reactos/dll/directx/dinput8/CMakeLists.txt trunk/reactos/dll/directx/dplay/CMakeLists.txt trunk/reactos/dll/directx/dplayx/CMakeLists.txt trunk/reactos/dll/directx/dsound/CMakeLists.txt trunk/reactos/dll/directx/ksuser/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/win32/acledit/CMakeLists.txt trunk/reactos/dll/win32/aclui/CMakeLists.txt trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/atl/CMakeLists.txt trunk/reactos/dll/win32/avicap32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/batt/CMakeLists.txt trunk/reactos/dll/win32/beepmidi/CMakeLists.txt trunk/reactos/dll/win32/cabinet/CMakeLists.txt trunk/reactos/dll/win32/cards/CMakeLists.txt trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comdlg32/CMakeLists.txt trunk/reactos/dll/win32/compstui/CMakeLists.txt trunk/reactos/dll/win32/credui/CMakeLists.txt trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/cryptnet/CMakeLists.txt trunk/reactos/dll/win32/cryptui/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/dll/win32/dhcpcsvc/CMakeLists.txt trunk/reactos/dll/win32/dnsapi/CMakeLists.txt trunk/reactos/dll/win32/fmifs/CMakeLists.txt trunk/reactos/dll/win32/gdi32/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/getuname/CMakeLists.txt trunk/reactos/dll/win32/glu32/CMakeLists.txt trunk/reactos/dll/win32/hlink/CMakeLists.txt trunk/reactos/dll/win32/icmp/CMakeLists.txt trunk/reactos/dll/win32/imagehlp/CMakeLists.txt trunk/reactos/dll/win32/imm32/CMakeLists.txt trunk/reactos/dll/win32/inetcomm/CMakeLists.txt trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/loadperf/CMakeLists.txt trunk/reactos/dll/win32/localui/CMakeLists.txt trunk/reactos/dll/win32/lpk/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lz32/CMakeLists.txt trunk/reactos/dll/win32/mlang/CMakeLists.txt trunk/reactos/dll/win32/mpr/CMakeLists.txt trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msimg32/CMakeLists.txt trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/msvcrt/CMakeLists.txt trunk/reactos/dll/win32/msvfw32/CMakeLists.txt trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/newdev/CMakeLists.txt trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt trunk/reactos/dll/win32/odbccp32/CMakeLists.txt trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/dll/win32/oleacc/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/oledlg/CMakeLists.txt trunk/reactos/dll/win32/opengl32/CMakeLists.txt trunk/reactos/dll/win32/pdh/CMakeLists.txt trunk/reactos/dll/win32/powrprof/CMakeLists.txt trunk/reactos/dll/win32/psapi/CMakeLists.txt trunk/reactos/dll/win32/rasapi32/CMakeLists.txt trunk/reactos/dll/win32/riched20/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/rsaenh/CMakeLists.txt trunk/reactos/dll/win32/samlib/CMakeLists.txt trunk/reactos/dll/win32/secur32/CMakeLists.txt trunk/reactos/dll/win32/sensapi/CMakeLists.txt trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/sfc_os/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/smdll/CMakeLists.txt trunk/reactos/dll/win32/snmpapi/CMakeLists.txt trunk/reactos/dll/win32/spoolss/CMakeLists.txt trunk/reactos/dll/win32/ufatx/CMakeLists.txt trunk/reactos/dll/win32/urlmon/CMakeLists.txt trunk/reactos/dll/win32/user32/CMakeLists.txt trunk/reactos/dll/win32/userenv/CMakeLists.txt trunk/reactos/dll/win32/usp10/CMakeLists.txt trunk/reactos/dll/win32/uxtheme/CMakeLists.txt trunk/reactos/dll/win32/version/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/winhttp/CMakeLists.txt trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/dll/win32/winspool/CMakeLists.txt trunk/reactos/dll/win32/wintrust/CMakeLists.txt trunk/reactos/dll/win32/wlanapi/CMakeLists.txt trunk/reactos/dll/win32/wldap32/CMakeLists.txt trunk/reactos/dll/win32/ws2_32/CMakeLists.txt trunk/reactos/dll/win32/ws2help/CMakeLists.txt trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt trunk/reactos/dll/win32/xmllite/CMakeLists.txt trunk/reactos/drivers/base/bootvid/CMakeLists.txt trunk/reactos/drivers/base/kdcom/CMakeLists.txt trunk/reactos/drivers/base/kddll/CMakeLists.txt trunk/reactos/drivers/battery/battc/CMakeLists.txt trunk/reactos/drivers/directx/dxgthk/CMakeLists.txt trunk/reactos/drivers/hid/hidclass/CMakeLists.txt trunk/reactos/drivers/hid/hidparse/CMakeLists.txt trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt trunk/reactos/drivers/network/ndis/CMakeLists.txt trunk/reactos/drivers/storage/class/class2/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt trunk/reactos/drivers/storage/scsiport/CMakeLists.txt trunk/reactos/drivers/usb/usbd/CMakeLists.txt trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt trunk/reactos/drivers/video/videoprt/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt trunk/reactos/drivers/wmi/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/subsystems/csr/csrsrv/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/notify… Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55764&… Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=55764… Modified: trunk/reactos/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/CMakeLi… Modified: trunk/reactos/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/CMakeL… Modified: trunk/reactos/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/CMakeLis… Modified: trunk/reactos/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/CMakeLi… Modified: trunk/reactos/dll/directx/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/CMakeLi… Modified: trunk/reactos/dll/directx/ksuser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/CMakeLi… Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… Modified: trunk/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Modified: trunk/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… Modified: trunk/reactos/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/CMakeLis… Modified: trunk/reactos/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/CMakeLists… Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… Modified: trunk/reactos/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/CMakeLi… Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… Modified: trunk/reactos/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/CMakeLists.… Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/CMakeLi… Modified: trunk/reactos/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/CMakeLis… Modified: trunk/reactos/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/CMakeLists… Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… Modified: trunk/reactos/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/CMakeLi… Modified: trunk/reactos/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/CMakeList… Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/CMakeLi… Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis… Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeList… Modified: trunk/reactos/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/CMakeLi… Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/CMakeList… Modified: trunk/reactos/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/CMakeLists… Modified: trunk/reactos/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/CMakeLists… Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… Modified: trunk/reactos/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/CMakeLi… Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists… Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/CMakeLists… Modified: trunk/reactos/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/CMakeLists.… Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/CMakeLi… Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/CMakeLists… Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/CMakeLi… Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Modified: trunk/reactos/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/CMakeLi… Modified: trunk/reactos/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/CMakeLis… Modified: trunk/reactos/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/CMakeLists.t… Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… Modified: trunk/reactos/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/CMakeLists.… Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists… Modified: trunk/reactos/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/CMakeLists.t… Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLis… Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/CMakeLis… Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/CMakeLis… Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… Modified: trunk/reactos/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/CMakeList… Modified: trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/CMakeLis… Modified: trunk/reactos/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/CMakeLi… Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/CMakeList… Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… Modified: trunk/reactos/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/CMakeList… Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/CMakeLi… Modified: trunk/reactos/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/CMakeLists.t… Modified: trunk/reactos/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/CMakeLi… Modified: trunk/reactos/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/CMakeLists… Modified: trunk/reactos/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/CMakeLi… Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/CMakeLi… Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList… Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/CMakeList… Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis… Modified: trunk/reactos/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/CMakeLis… Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… Modified: trunk/reactos/dll/win32/sfc_os/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/CMakeList… Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… Modified: trunk/reactos/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/CMakeLists… Modified: trunk/reactos/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/CMakeLis… Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/CMakeLis… Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeList… Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… Modified: trunk/reactos/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/CMakeLis… Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/CMakeLists… Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/CMakeLis… Modified: trunk/reactos/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/CMakeLis… Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… Modified: trunk/reactos/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/CMakeLis… Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… Modified: trunk/reactos/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/CMakeLi… Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… Modified: trunk/reactos/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/CMakeLis… Modified: trunk/reactos/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/CMakeList… Modified: trunk/reactos/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/CMakeLis… Modified: trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/CMakeL… Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/CMakeLis… Modified: trunk/reactos/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/CMake… Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/CMakeLi… Modified: trunk/reactos/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/CMakeLi… Modified: trunk/reactos/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/CMak… Modified: trunk/reactos/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxgthk/CMa… Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake… Modified: trunk/reactos/drivers/hid/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/CMake… Modified: trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/CMakeL… Modified: trunk/reactos/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/CMake… Modified: trunk/reactos/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… Modified: trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… Modified: trunk/reactos/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/C… Modified: trunk/reactos/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/CMakeList… Modified: trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/CM… Modified: trunk/reactos/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/CMa… Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk… Modified: trunk/reactos/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/CMakeLists.txt… Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… Modified: trunk/reactos/subsystems/csr/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/CMak… Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM…

1 0

[jgardou] 55763: [NTOSKRNL/MM] - Stop leaking references to PDEs. Still one reference left to the TLB mapping at process deletion.
by jgardou＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: jgardou Date: Mon Feb 20 20:51:18 2012 New Revision: 55763 URL: http://svn.reactos.org/svn/reactos?rev=55763&view=rev Log: [NTOSKRNL/MM] - Stop leaking references to PDEs. Still one reference left to the TLB mapping at process deletion. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Feb 20 20:51:18 2012 @@ -113,6 +113,12 @@ MmCreatePageFileMapping(Process, Address, SwapEntry); MmSetSavedSwapEntryPage(Page, 0); } +#if (_MI_PAGING_LEVELS == 2) + else if(Address < MmSystemRangeStart) + { + AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + } +#endif MmUnlockAddressSpace(AddressSpace); MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; @@ -191,6 +197,9 @@ PMM_REGION Region; PMM_PAGEOP PageOp; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); +#if (_MI_PAGING_LEVELS == 2) + BOOLEAN refPde = TRUE; +#endif /* * There is a window between taking the page fault and locking the @@ -326,7 +335,17 @@ KeBugCheck(MEMORY_MANAGEMENT); } MmSetSavedSwapEntryPage(Page, SwapEntry); - } + +#if (_MI_PAGING_LEVELS == 2) + /* PTE was already "created", no need to reference PDE */ + refPde = FALSE; +#endif + } +#if (_MI_PAGING_LEVELS == 2) + /* Add an additional page table reference */ + if(refPde) MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); +#endif /* * Set the page. If we fail because we are out of memory then @@ -337,16 +356,6 @@ Region->Protect, &Page, 1); - while (Status == STATUS_NO_MEMORY) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmCreateVirtualMapping(Process, - (PVOID)PAGE_ROUND_DOWN(Address), - Region->Protect, - &Page, - 1); - MmLockAddressSpace(AddressSpace); - } if (!NT_SUCCESS(Status)) { DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); @@ -393,9 +402,9 @@ for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) { PFN_NUMBER Page; - - if (MmIsPageSwapEntry(Process, - (char*)BaseAddress + (i * PAGE_SIZE))) + PVOID Address = (char*)BaseAddress + (i*PAGE_SIZE); + + if (MmIsPageSwapEntry(Process, Address)) { SWAPENTRY SwapEntry; @@ -403,11 +412,17 @@ (char*)BaseAddress + (i * PAGE_SIZE), &SwapEntry); MmFreeSwapPage(SwapEntry); +#if (_MI_PAGING_LEVELS == 2) + if(Address < MmSystemRangeStart) + { + AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + } +#endif } else { MmDeleteVirtualMapping(Process, - (char*)BaseAddress + (i*PAGE_SIZE), + Address, FALSE, NULL, &Page); if (Page != 0) { @@ -417,10 +432,16 @@ { MmFreeSwapPage(SavedSwapEntry); MmSetSavedSwapEntryPage(Page, 0); - } + } MmDeleteRmap(Page, Process, (char*)BaseAddress + (i * PAGE_SIZE)); MmReleasePageMemoryConsumer(MC_USER, Page); +#if (_MI_PAGING_LEVELS == 2) + if(Address < MmSystemRangeStart) + { + AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + } +#endif } } } Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Mon Feb 20 20:51:18 2012 @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> +#include "ARM3/miarm.h" + #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeBalancer) #pragma alloc_text(INIT, MmInitializeMemoryConsumer) @@ -234,8 +236,38 @@ VOID NTAPI +MiDeletePte(IN PMMPTE PointerPte, + IN PVOID VirtualAddress, + IN PEPROCESS CurrentProcess, + IN PMMPTE PrototypePte); + +VOID +NTAPI MmRebalanceMemoryConsumers(VOID) { +#if (_MI_PAGING_LEVELS == 2) + if(!MiIsBalancerThread()) + { + /* Clean up the unused PDEs */ + ULONG_PTR Address; + KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + PMMPDE pointerPde; + for(Address = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS; + Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; + Address += (PAGE_SIZE * PTE_COUNT)) + { + if(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) + { + pointerPde = MiAddressToPde(Address); + if(pointerPde->u.Hard.Valid) + MiDeletePte(pointerPde, MiPdeToPte(pointerPde), PsGetCurrentProcess(), NULL); + ASSERT(pointerPde->u.Hard.Valid == 0); + } + } + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } +#endif + if (MiBalancerThreadHandle != NULL && !MiIsBalancerThread()) { Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Mon Feb 20 20:51:18 2012 @@ -258,9 +258,22 @@ { /* Nobody but page fault should ask for creating the PDE, * Which imples that Process is the current one */ - ASSERT(Create == FALSE); MmDeleteHyperspaceMapping(PdeBase); - return NULL; + if(Create == FALSE) + return NULL; + else + { + KAPC_STATE ApcState; + PULONG ret; + /* Attach to process */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + + /* Retry */ + ret = MmGetPageTableForProcess(Process, Address, TRUE); + + /* Get Back to original process */ + KeUnstackDetachProcess(&ApcState); + } } else { @@ -293,6 +306,7 @@ } /* This is for kernel land address */ + ASSERT(Process == NULL); PointerPde = MiAddressToPde(Address); Pt = (PULONG)MiAddressToPte(Address); if (PointerPde->u.Hard.Valid == 0) Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Mon Feb 20 20:51:18 2012 @@ -44,6 +44,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#include "ARM3/miarm.h" MEMORY_AREA MiStaticMemoryAreas[MI_STATIC_MEMORY_AREAS]; ULONG MiStaticMemoryAreaCount; @@ -688,6 +690,12 @@ * * @remarks Lock the address space before calling this function. */ +VOID +NTAPI +MiDeletePte(IN PMMPTE PointerPte, + IN PVOID VirtualAddress, + IN PEPROCESS CurrentProcess, + IN PMMPTE PrototypePte); NTSTATUS NTAPI MmFreeMemoryArea( @@ -716,10 +724,10 @@ Address < (ULONG_PTR)EndAddress; Address += PAGE_SIZE) { - BOOLEAN Dirty = FALSE; - SWAPENTRY SwapEntry = 0; - PFN_NUMBER Page = 0; - + BOOLEAN Dirty = FALSE; + SWAPENTRY SwapEntry = 0; + PFN_NUMBER Page = 0; + if (MmIsPageSwapEntry(Process, (PVOID)Address)) { MmDeletePageFileMapping(Process, (PVOID)Address, &SwapEntry); @@ -733,6 +741,25 @@ FreePage(FreePageContext, MemoryArea, (PVOID)Address, Page, SwapEntry, (BOOLEAN)Dirty); } +#if (_MI_PAGING_LEVELS == 2) + /* Remove page table reference */ + if((SwapEntry || Page) && ((PVOID)Address < MmSystemRangeStart)) + { + ASSERT(AddressSpace != MmGetKernelAddressSpace()); + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + if(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) + { + /* No PTE relies on this PDE. Release it */ + KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + PMMPDE PointerPde = MiAddressToPde(Address); + ASSERT(PointerPde->u.Hard.Valid == 1); + MiDeletePte(PointerPde, MiPdeToPte(PointerPde), Process, NULL); + ASSERT(PointerPde->u.Hard.Valid == 0); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + } +#endif } if (Process != NULL && Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Feb 20 20:51:18 2012 @@ -57,6 +57,8 @@ #pragma alloc_text(INIT, MmInitSectionImplementation) #endif +#include "ARM3/miarm.h" + NTSTATUS NTAPI MiMapViewInSystemSpace(IN PVOID Section, @@ -1448,6 +1450,15 @@ Page = PFN_FROM_SSE(Entry); MmSharePageEntrySectionSegment(Segment, Offset); + + #if (_MI_PAGING_LEVELS == 2) + /* Reference Page Directory Entry */ + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } +#endif /* FIXME: Should we call MmCreateVirtualMappingUnsafe if * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? @@ -1538,6 +1549,15 @@ return(STATUS_SUCCESS); } +#if (_MI_PAGING_LEVELS == 2) + /* Reference Page Directory Entry */ + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } +#endif + /* * Satisfying a page fault on a map of /Device/PhysicalMemory is easy */ @@ -1658,6 +1678,12 @@ /* * Cleanup and release locks */ +#if (_MI_PAGING_LEVELS == 2) + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + } +#endif MmLockAddressSpace(AddressSpace); PageOp->Status = Status; MmspCompleteAndReleasePageOp(PageOp); @@ -1876,7 +1902,10 @@ MmSetPageProtect(Process, Address, Region->Protect); return(STATUS_SUCCESS); } - + + if(OldPage == 0) + DPRINT("OldPage == 0!\n"); + /* * Get or create a pageop */ @@ -1986,7 +2015,7 @@ MM_SECTION_PAGEOUT_CONTEXT* PageOutContext; BOOLEAN WasDirty; PFN_NUMBER Page; - + PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; if (Process) { @@ -2021,6 +2050,14 @@ { MmReleasePageMemoryConsumer(MC_USER, Page); } + +#if (_MI_PAGING_LEVELS == 2) + if(Address < MmSystemRangeStart) + { + if(Process->VmDeleted) DPRINT1("deleted!!!"); + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + } +#endif DPRINT("PhysicalAddress %x, Address %x\n", Page << PAGE_SHIFT, Address); } @@ -2254,6 +2291,13 @@ { MmSetSavedSwapEntryPage(Page, 0); MmLockAddressSpace(AddressSpace); + #if (_MI_PAGING_LEVELS == 2) + /* Page table was dereferenced while deleting the RMAP */ + if(Address < MmSystemRangeStart) + { + AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + } +#endif Status = MmCreatePageFileMapping(Process, Address, SwapEntry); @@ -2281,6 +2325,13 @@ /* * For private pages restore the old mappings. */ + #if (_MI_PAGING_LEVELS == 2) + /* Page table was dereferenced while deleting the RMAP */ + if(Address < MmSystemRangeStart) + { + AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + } +#endif if (Context.Private) { Status = MmCreateVirtualMapping(Process, @@ -2331,6 +2382,13 @@ * As above: undo our actions. * FIXME: Also free the swap page. */ +#if (_MI_PAGING_LEVELS == 2) + /* Page table was dereferenced while deleting the RMAP */ + if(Address < MmSystemRangeStart) + { + AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + } +#endif MmLockAddressSpace(AddressSpace); if (Context.Private) { @@ -2382,6 +2440,13 @@ if (Context.Private) { MmLockAddressSpace(AddressSpace); + #if (_MI_PAGING_LEVELS == 2) + /* Page table was dereferenced while deleting the RMAP */ + if(Address < MmSystemRangeStart) + { + AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + } +#endif Status = MmCreatePageFileMapping(Process, Address, SwapEntry);

1 0

[jgardou] 55762: [USETUP] - Print a bit more information when failing.
by jgardou＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: jgardou Date: Mon Feb 20 20:51:09 2012 New Revision: 55762 URL: http://svn.reactos.org/svn/reactos?rev=55762&view=rev Log: [USETUP] - Print a bit more information when failing. Modified: trunk/reactos/base/setup/usetup/filesup.c Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Mon Feb 20 20:51:09 2012 @@ -168,7 +168,7 @@ FileHandleSource); if(!NT_SUCCESS(Status)) { - DPRINT1("NtCreateSection failed: %x\n", Status); + DPRINT1("NtCreateSection failed: %x, %wZ\n", Status, SourceFileName); goto closesrc; } @@ -184,7 +184,7 @@ PAGE_READONLY ); if(!NT_SUCCESS(Status)) { - DPRINT1("NtMapViewOfSection failed: %x\n", Status); + DPRINT1("NtMapViewOfSection failed: %x, %wZ\n", Status, SourceFileName); goto closesrcsec; }

1 0

[jgardou] 55761: [NTOSKRNL/MM] - Make MmWorkingSetList PTE local - Map MmWorkingSetList to Vm.VmWorkingSetList when creating process.
by jgardou＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: jgardou Date: Mon Feb 20 20:50:36 2012 New Revision: 55761 URL: http://svn.reactos.org/svn/reactos?rev=55761&view=rev Log: [NTOSKRNL/MM] - Make MmWorkingSetList PTE local - Map MmWorkingSetList to Vm.VmWorkingSetList when creating process. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Mon Feb 20 20:50:36 2012 @@ -904,6 +904,8 @@ MiInitializeWorkingSetList(IN PEPROCESS CurrentProcess) { PMMPFN Pfn1; + PMMPTE sysPte; + MMPTE tempPte; /* Setup some bogus list data */ MmWorkingSetList->LastEntry = CurrentProcess->Vm.MinimumWorkingSetSize; @@ -923,6 +925,12 @@ Pfn1 = MiGetPfnEntry(CurrentProcess->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT); ASSERT(Pfn1->u4.PteFrame == MiGetPfnEntryIndex(Pfn1)); Pfn1->u1.Event = (PKEVENT)CurrentProcess; + + /* Map the process working set in kernel space */ + sysPte = MiReserveSystemPtes(1, SystemPteSpace); + MI_MAKE_HARDWARE_PTE_KERNEL(&tempPte, sysPte, MM_READWRITE, CurrentProcess->WorkingSetPage); + MI_WRITE_VALID_PTE(sysPte, tempPte); + CurrentProcess->Vm.VmWorkingSetList = MiPteToAddress(sysPte); } NTSTATUS @@ -1220,6 +1228,8 @@ /* Now write the PTE/PDE entry for the working set list index itself */ TempPte = ValidKernelPte; TempPte.u.Hard.PageFrameNumber = WsListIndex; + /* Hyperspace is local */ + MI_MAKE_LOCAL_PAGE(&TempPte); PdeOffset = MiAddressToPteOffset(MmWorkingSetList); HyperTable[PdeOffset] = TempPte; @@ -1377,6 +1387,7 @@ MiDecrementShareCount(Pfn2, Pfn1->u4.PteFrame); MiDecrementShareCount(Pfn1, Process->WorkingSetPage); ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); + MiReleaseSystemPtes(MiAddressToPte(Process->Vm.VmWorkingSetList), 1, SystemPteSpace); /* Now map hyperspace and its page table */ PageFrameIndex = Process->Pcb.DirectoryTableBase[1] >> PAGE_SHIFT; @@ -1388,7 +1399,7 @@ MiDecrementShareCount(Pfn2, Pfn1->u4.PteFrame); MiDecrementShareCount(Pfn1, PageFrameIndex); ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); - + /* Finally, nuke the PDE itself */ PageFrameIndex = Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT; Pfn1 = MiGetPfnEntry(PageFrameIndex); @@ -1399,6 +1410,8 @@ /* HACK: In Richard's original patch this ASSERT did work */ //DPRINT1("Ref count: %lx %lx\n", Pfn1->u3.e2.ReferenceCount, Pfn1->u2.ShareCount); //ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); + if(!((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress))) + DPRINT1("Ref count: %lx %lx\n", Pfn1->u3.e2.ReferenceCount, Pfn1->u2.ShareCount); } else {

1 0

[spetreolle] 55760: [MEDIA/INF] Ukrainian translation by Igor Paliychuk.
by spetreolle＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: spetreolle Date: Mon Feb 20 19:55:16 2012 New Revision: 55760 URL: http://svn.reactos.org/svn/reactos?rev=55760&view=rev Log: [MEDIA/INF] Ukrainian translation by Igor Paliychuk. Modified: trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/audio.inf (contents, props changed) trunk/reactos/media/inf/battery.inf trunk/reactos/media/inf/bda.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/disk.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hal.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/input.inf (contents, props changed) trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/ks.inf trunk/reactos/media/inf/kscaptur.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/netrtpnt.inf trunk/reactos/media/inf/nettcpip.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/unknown.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf trunk/reactos/media/inf/xboxdisp.inf Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=557… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=55… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/audio.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -native Propchange: trunk/reactos/media/inf/audio.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/bda.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bda.inf?rev=5576… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=55… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=5576… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/disk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/disk.inf?rev=557… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=5576… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hal.inf?rev=5576… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5576… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/input.inf?rev=55… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/input.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1,1 +1,0 @@ -native Propchange: trunk/reactos/media/inf/input.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ks.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ks.inf?rev=55760… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/kscaptur.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/kscaptur.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=5… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=5… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=55… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=557… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/unknown.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/unknown.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=5576… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/xboxdisp.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/xboxdisp.inf?rev… ============================================================================== Binary files - no diff available.

1 0

[gadamopoulos] 55759: - Hide test traces in test cd. This should make comparing test logs easier
by gadamopoulos＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: gadamopoulos Date: Mon Feb 20 19:26:27 2012 New Revision: 55759 URL: http://svn.reactos.org/svn/reactos?rev=55759&view=rev Log: - Hide test traces in test cd. This should make comparing test logs easier Modified: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd [iso-8859-1] Mon Feb 20 19:26:27 2012 @@ -1,3 +1,4 @@ @echo off +set WINETEST_DEBUG=0 dbgprint --process "ipconfig" -start rosautotest /r /s +start rosautotest /r /s Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Mon Feb 20 19:26:27 2012 @@ -314,7 +314,8 @@ } else { - if (winetest_debug > 0) + /* show todos even if traces are disabled*/ + /*if (winetest_debug > 0)*/ { fprintf( stdout, "%s:%d: Test marked todo: ", data->current_file, data->current_line ); @@ -555,7 +556,8 @@ current_test = test; test->func(); - if (winetest_debug) + /* show test results even if traces are disabled */ + /*if (winetest_debug)*/ { fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", test->name, successes + failures + todo_successes + todo_failures,

1 0

[gadamopoulos] 55758: [win32k] - Fix SPI_SETMOUSESPEED - Patch by Edijs Kolesnikovics, terminedijs@yahoo.com
by gadamopoulos＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: gadamopoulos Date: Mon Feb 20 18:05:33 2012 New Revision: 55758 URL: http://svn.reactos.org/svn/reactos?rev=55758&view=rev Log: [win32k] - Fix SPI_SETMOUSESPEED - Patch by Edijs Kolesnikovics, terminedijs(a)yahoo.com Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Feb 20 18:05:33 2012 @@ -45,7 +45,7 @@ static const WCHAR* VAL_HOVERTIME = L"MouseHoverTime"; static const WCHAR* VAL_HOVERWIDTH = L"MouseHoverWidth"; static const WCHAR* VAL_HOVERHEIGHT = L"MouseHoverHeight"; -//static const WCHAR* VAL_SENSITIVITY = L"MouseSensitivity"; +static const WCHAR* VAL_SENSITIVITY = L"MouseSensitivity"; static const WCHAR* KEY_DESKTOP = L"Control Panel\\Desktop"; static const WCHAR* VAL_SCRTO = L"ScreenSaveTimeOut"; @@ -220,7 +220,8 @@ /* Load mouse settings */ gspv.caiMouse.FirstThreshold = SpiLoadMouse(VAL_MOUSE1, 6); gspv.caiMouse.SecondThreshold = SpiLoadMouse(VAL_MOUSE2, 10); - gspv.caiMouse.Acceleration = gspv.iMouseSpeed = SpiLoadMouse(VAL_MOUSE3, 1); + gspv.caiMouse.Acceleration = SpiLoadMouse(VAL_MOUSE3, 1); + gspv.iMouseSpeed = SpiLoadMouse(VAL_SENSITIVITY, 10); gspv.bMouseBtnSwap = SpiLoadMouse(VAL_SWAP, 0); gspv.bSnapToDefBtn = SpiLoadMouse(VAL_SNAPDEFBTN, 0); gspv.iMouseTrails = SpiLoadMouse(VAL_MOUSETRAILS, 0); @@ -1262,8 +1263,13 @@ return SpiGetInt(pvParam, &gspv.iMouseSpeed, fl); case SPI_SETMOUSESPEED: - // vgl SETMOUSE - return SpiSetInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, VAL_MOUSE3, fl); + { + /* Allowed range is [1:20] */ + if ((INT_PTR)pvParam < 1 || (INT_PTR)pvParam > 20) + return 0; + else + return SpiSetInt(&gspv.iMouseSpeed, (INT_PTR)pvParam, KEY_MOUSE, VAL_SENSITIVITY, fl); + } case SPI_GETSCREENSAVERRUNNING: return SpiGetInt(pvParam, &gspv.bScrSaverRunning, fl);

1 0

[khornicek] 55757: [TRANSLATION] Renaming to match the CHINESE_TRADITIONAL sub lang.
by khornicek＠svn.reactos.org 20 Feb '12

20 Feb '12

Author: khornicek Date: Mon Feb 20 16:49:48 2012 New Revision: 55757 URL: http://svn.reactos.org/svn/reactos?rev=55757&view=rev Log: [TRANSLATION] Renaming to match the CHINESE_TRADITIONAL sub lang. Added: trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc - copied unchanged from r55756, trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Cn… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc (removed) @@ -1,490 +1,0 @@ -/* - * Resources for Common Dialogs - * - * Copyright 1999 Bertho Stultiens - * Copyright 1999 Klaas van Gend - * - * 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 "cdlg.h" -#include "filedlgbrowser.h" - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - -STRINGTABLE -{ - IDS_FILENOTFOUND "æ¾ä¸å°æªæ¡" - IDS_VERIFYFILE "è«æª¢é©æ¯å¦çµ¦äºæ£ç¢ºçæªæ¡åç¨±ã" - IDS_CREATEFILE "æ¾ä¸å°æªæ¡\n\ -æ¯å¦åµå»ºæ°æªæ¡?" - IDS_OVERWRITEFILE "æªæ¡å·²ç¶åå¨ã\n\ -è¦æ¿æå?" - IDS_INVALID_FILENAME_TITLE "æªæ¡åä¸åå¨ç¡æçåç¬¦" - IDS_INVALID_FILENAME "æªæ¡åä¸ä¸è½åå«ä»»ä½ä¸ä¸åç¬¦::\n\ - / : < > |" - IDS_PATHNOTEXISTING "è³æå¤¾ä¸åå¨" - IDS_FILENOTEXISTING "æªæ¡ä¸åå¨" -} - -STRINGTABLE -{ - IDS_UPFOLDER "åä¸ä¸å±¤" - IDS_NEWFOLDER "å»ºç«æ°è³æå¤¾" - IDS_LISTVIEW "æ¸å®" - IDS_REPORTVIEW "è©³ç´°è³æ" - IDS_TODESKTOP "é¡¯ç¤ºæ¡é¢" -} - -STRINGTABLE -{ - PD32_PRINT_TITLE "åå°" - - PD32_VALUE_UREADABLE "æ¸å¼ä¸å¯è®" - PD32_INVALID_PAGE_RANGE "éåå¼ä¸å¨é æ¸ç¯åã\n\ - è«è¼¸å¥ä¸å %d å %d ä¹éçæ¸ã" - PD32_FROM_NOT_ABOVE_TO "'å¾'é çå¼ä¸è½å¤§æ¼'å°'é çå¼ã" - PD32_MARGINS_OVERLAP "éç·£ç©ºç½éè¿æè½æ¼ç´å¤,\n\ -è«éæ°è¼¸å¥éç·£ç©ºç½ã" - PD32_NR_OF_COPIES_EMPTY "'ä»½æ¸' é ä¸è½ç©º." - PD32_TOO_LARGE_COPIES "ä½ çå°è¡¨æ©ä¸æ¯æééº¼å¤§çä»½æ¸ã\n\ - è«è¼¸å¥ä¸å 1 å %d ä¹éçæ¸ã" - PD32_PRINT_ERROR "å°è¡¨æ©é¯èª¤ã" - PD32_NO_DEFAULT_PRINTER "æ²æé»èªå°è¡¨æ©ã" - PD32_CANT_FIND_PRINTER "æ¾ä¸å°å°è¡¨æ©ã" - PD32_OUT_OF_MEMORY "å§åä¸å¤ ã" - PD32_GENERIC_ERROR "åºç¾ä¸äºé¯èª¤ã" - PD32_DRIVER_UNKNOWN "æ¾ä¸å°å°è¡¨æ©é©åå¨ã" - PD32_NO_DEVICES "å¨ä½¿ç¨èå°è¡¨æ©æéåè½(çé¢è¨å®, åå°æªæ¡)ä¹å, ä½ å¿é åè£å°è¡¨æ©ãè«è£ä¸åå°è¡¨æ©åè©¦ã" - - PD32_DEFAULT_PRINTER "é»èªå°è¡¨æ©; " - PD32_NR_OF_DOCUMENTS_IN_QUEUE "æ %d åææªæ£å¨çå¾åå°" - PD32_MARGINS_IN_INCHES "éç·£ç©ºç½ [è±å¯¸]" - PD32_MARGINS_IN_MILLIMETERS "éç·£ç©ºç½ [æ¯«ç±³]" - PD32_MILLIMETERS "æ¯«ç±³" - - PD32_PRINTER_STATUS_READY "å¾å½" - PD32_PRINTER_STATUS_PAUSED "æ«å; " - PD32_PRINTER_STATUS_ERROR "é¯èª¤; " - PD32_PRINTER_STATUS_PENDING_DELETION "çå¾åªé¤; " - PD32_PRINTER_STATUS_PAPER_JAM "å¡ç´; " - PD32_PRINTER_STATUS_PAPER_OUT "ç¡ç´; " - PD32_PRINTER_STATUS_MANUAL_FEED "æåé²ç´; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "ç´çåé¡; " - PD32_PRINTER_STATUS_OFFLINE "å°è¡¨æ©é¢ç·; " - PD32_PRINTER_STATUS_IO_ACTIVE "I/O æ´»å; " - PD32_PRINTER_STATUS_BUSY "ç¹å¿; " - PD32_PRINTER_STATUS_PRINTING "æ£å¨åå°; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "åºç´æç¤å·²æ»¿; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "ä¸å¯ç¨; " - PD32_PRINTER_STATUS_WAITING "çå¾; " - PD32_PRINTER_STATUS_PROCESSING "æ£å¨èç; " - PD32_PRINTER_STATUS_INITIALIZING "æ£å¨åå; " - PD32_PRINTER_STATUS_WARMING_UP "é ç±; " - PD32_PRINTER_STATUS_TONER_LOW "å¢¨ä½; " - PD32_PRINTER_STATUS_NO_TONER "æ²å¢¨; " - PD32_PRINTER_STATUS_PAGE_PUNT "é èçå§åè¶æ¯; " - PD32_PRINTER_STATUS_USER_INTERVENTION "ç¨æ¶å¹²é ; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "å§åä¸å¤ ; " - PD32_PRINTER_STATUS_DOOR_OPEN "å°è¡¨æ©èæ¯æéç; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "æ¾ä¸å°åå°æåå¨; " - PD32_PRINTER_STATUS_POWER_SAVE "çé»çæ; " -} - -STRINGTABLE /* Font styles */ -{ - IDS_FONT_REGULAR "" - IDS_FONT_BOLD "" - IDS_FONT_ITALIC "" - IDS_FONT_BOLD_ITALIC "" -} - -STRINGTABLE /* Color names */ -{ - IDS_COLOR_BLACK "" - IDS_COLOR_MAROON "" - IDS_COLOR_GREEN "" - IDS_COLOR_OLIVE "" - IDS_COLOR_NAVY "" - IDS_COLOR_PURPLE "" - IDS_COLOR_TEAL "" - IDS_COLOR_GRAY "" - IDS_COLOR_SILVER "" - IDS_COLOR_RED "åå" - IDS_COLOR_LIME "" - IDS_COLOR_YELLOW "" - IDS_COLOR_BLUE "" - IDS_COLOR_FUCHSIA "" - IDS_COLOR_AQUA "" - IDS_COLOR_WHITE "" -} - -STRINGTABLE -{ - IDS_FONT_SIZE "" - IDS_SAVE_BUTTON "" - IDS_SAVE_IN "å¦åçº(&A)..." - IDS_SAVE "å²å HTML" - IDS_SAVE_AS "å¦åæ°æª" - IDS_OPEN_FILE "Wineå°é·" -} - -/* - * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. - */ - -OPEN_FILE DIALOG 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "éå" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æªæ¡åç¨±(&N):", stc3, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "ç®é(&D):", -1, 110, 6, 92, 9 - LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "æªæ¡é¡å(&T):", stc2, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "ç£ç¢æ©(&V):", stc4, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "éå", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "å¯è®(&R)", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -SAVE_FILE DIALOG 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "å¦åæ°æª..." -FONT 8, "MS Shell Dlg" -{ - LTEXT "æªæ¡åç¨±(&N):", stc3, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "ç®é(&D):", -1, 110, 6, 92, 9 - LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "æªæ¡é¡å(&T):", stc2, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "ç£ç¢æ©(&V):", stc4, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "å¦åæ°æª", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "å¯è®(&R)", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT DIALOG 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "åå°" -FONT 8, "MS Shell Dlg" -{ - LTEXT "åå°", stc1, 6, 6, 40, 9 - LTEXT "", stc2, 60, 6, 150, 9 - GROUPBOX "åå°ç®æ¨(&P)", grp1, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "å¨é¨(&A)", rad1, 16, 45, 60, 12 - RADIOBUTTON "é¸æ©åæå", rad2, 16, 60, 60, 12 - RADIOBUTTON "åä¸ç¿»é ", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "åå°", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "çé¢è¨å®", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "", stc3, 60, 80, 30, 9 - LTEXT "", stc4, 120, 80, 30, 9 - LTEXT "å£ç¸®è³ªé(&Q):", stc5, 6, 100, 76, 9 - COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "åå°å°æªæ¡", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT_SETUP DIALOG 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "åå°è¨å®(&R)..." -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "åå°", grp1, 6, 6, 180, 72, BS_GROUPBOX - RADIOBUTTON "é»èªå°è¡¨æ©; ", rad1, 16, 16, 150, 12 - LTEXT "", stc1, 35, 30, 120, 9 - RADIOBUTTON "", rad2, 16, 44, 150, 12 - COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "ç¢ºå®", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "çé¢è¨å®", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "æ¹å", grp2, 6, 82, 100, 50, BS_GROUPBOX - RADIOBUTTON "ç¸±å(&P)", rad3, 50, 95, 50, 12 - RADIOBUTTON "æ©«å(&L)", rad4, 50, 110, 50, 12 - ICON "LANDSCAP", stc10, 10, 95, 32, 32 - ICON "PORTRAIT", stc11, 10, 95, 32, 32 - GROUPBOX "ç´å¼µ", grp3, 116, 82, 178, 50, BS_GROUPBOX - LTEXT "å¤§å°(&z)ï¼", stc2, 126, 95, 35, 9 - LTEXT "åå§æªæ¡:", stc3, 126, 110, 35, 9 - COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_FONT DIALOG 13, 54, 274, 147 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "åå" -FONT 8, "MS Shell Dlg" -{ - LTEXT "åå(&F):",stc1 ,6,3,90,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "ååæ¨£å¼(&Y):",stc2 ,108,3,60,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "å¤§å°(&S)ï¼",stc3,179,3,32,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "ç¢ºå®",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¥ç¨(&A)", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP - GROUPBOX "ææ",grp1,6,72,84,36,WS_GROUP - CHECKBOX "åªé¤ç·(&K)", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "åºç·(&U)", chx2, 10,94,78,10, BS_AUTOCHECKBOX - LTEXT "éè²(&C)ï¼", stc4 ,6,114,80,9 - COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "ç¯ä¾",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "è¯è¨:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_COLOR DIALOG 36, 24, 300, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "è²å½©" -FONT 8, "MS Shell Dlg" -{ - LTEXT "åºæ¬è²å½©(&B):", stc1, 4, 4, 140, 10 - LTEXT "èªå®è²å½©(&C):", stc2, 4, 106, 140, 10 - LTEXT "è²å½© | å¯¦å¿(&I)", stc3, 150, 151, 48, 10 - LTEXT "ç´(&R):", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "ç¶ (&G):",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "è(&B):",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "è²èª¿(&H):" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "æ¿åº¦(&S):" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "äº®åº¦(&L):" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "ç¢ºå®", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©", pshHelp,100,166, 44, 14 - PUSHBUTTON "æ°å¢èªå®è²å½©(&A)", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å®ç¾©èªå®è²å½©(&D) >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "è²å½© | å¯¦å¿(&I)",713,300,200,4,14 /* just a dummy */ -} - - -FINDDLGORD DIALOG 36, 24, 276, 62 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "æ¥æ¾" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æå°ç®æ¨(&N):", -1, 4, 8, 52, 8 - EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "å¨åæ¼å¯«é ç¬¦å(&W)", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "å¤§å°å¯«è¦çºç¸ç°(&C)", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "æ¹å", grp1, 127, 26, 78, 28 - CONTROL "ä¸(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "ä¸(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 - - DEFPUSHBUTTON "æ¾ä¸ä¸å(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)", pshHelp , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG 36, 24, 276, 94 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "åä»£" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æå°ç®æ¨(&N):", -1, 4, 8, 52, 8 - EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "åä»£çº(&P):", -1, 4, 26, 52, 8 - EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "å¨åæ¼å¯«é ç¬¦å(&W)", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "å¤§å°å¯«è¦çºç¸ç°(&C)", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "æ¾ä¸ä¸å(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åä»£(&R)", psh1 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "åä»£å¨é¨(&A)", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL , 212, 60, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)", pshHelp , 212, 78, 60, 14, WS_GROUP | WS_TABSTOP -} - - -PRINT32 DIALOG 32, 32, 288, 186 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP | DS_3DLOOK -CAPTION "åå°" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "ç¢ºå®", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL, 230,164, 50,14, WS_GROUP - PUSHBUTTON "å¹«å©(&H)", pshHelp, 50, 161, 50,14, WS_GROUP - - GROUPBOX "åå°", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "åå°å°æªæ¡", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "å±¬æ§(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "åç¨±(&N):", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "çææ¬(&S)", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "é¡å(&T)ï¼", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "åè¨»:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 - EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - - GROUPBOX "åå°ç®æ¨(&P)", grp1, 8,92, 144,64, WS_GROUP - CONTROL "å¨é¨(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "é¸æ(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER - EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "", stc2, 52,124, 20,8 - RTEXT "", stc3, 99,124, 20,8 -} - -PRINT32_SETUP DIALOG 32, 32, 288, 178 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "åå°è¨å®(&R)..." -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "ç¢ºå®",IDOK,176,156,50,14,WS_GROUP - PUSHBUTTON "åæ¶",IDCANCEL,230,156,50,14 -/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - - GROUPBOX "åå°", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "å±¬æ§(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "åç¨±(&N):", stc6, 16, 20, 36,8 - COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "çææ¬(&S)", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "é¡å(&T)ï¼", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "åè¨»:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "ç´å¼µ", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "å¤§å°(&z)ï¼", stc2, 16,108, 36, 8 - COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "åå§æªæ¡:", stc3, 16,128, 36, 8 - COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - - GROUPBOX "æ¹å", grp1, 180, 92, 100,56, WS_GROUP - ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "ç¸±å(&P)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "æ©«å(&L)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 -END - -PAGESETUPDLGORD DIALOG 32, 32, 240, 240 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "ç´å¼µ", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "å¤§å°(&S)ï¼", stc2, 16, 112, 36, 8 - COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "", stc3, 16, 132, 36, 8 - COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "æ¹å", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "ç¸±å(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "æ©«å(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "ç¶åæ¨é¡æ¬", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "å·¦(&L):", stc15, 88, 172, 30, 8 - EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "å³(&R):", stc16, 159, 172, 30, 8 - EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "", stc17, 88, 192, 30, 8 - EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "ä¸(&B):", stc18, 159, 192, 30, 8 - EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - DEFPUSHBUTTON "ç¢ºå®", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "åå°", psh3, 182, 220, 50, 14 -END - -NEWFILEOPENORD DIALOG 0, 0, 280, 164 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "éå" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æå°ä½ç½®(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY - COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - - LTEXT "æªæ¡åç¨±(&N):",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY - EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL - - LTEXT "æªæ¡é¡å(&T):",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY - COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - CONTROL "éåæå¯è®(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 - - DEFPUSHBUTTON "éå(&O)", IDOK,222,110,54,14 - PUSHBUTTON "åæ¶", IDCANCEL,222,128,54,14 - PUSHBUTTON "å¹«å©(&H)", pshHelp,222,145,54,14 -} - -NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | - WS_THICKFRAME -CAPTION "éå" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æªæ¡å(&F):", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT - EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP - - LTEXT "æªæ¡é¡å(&T):", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT - COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | - CBS_HASSTRINGS | CBS_DROPDOWNLIST - - DEFPUSHBUTTON "éå(&O)", IDOK, 350, 240, 40, 14, WS_GROUP - PUSHBUTTON "åæ¶", IDCANCEL, 395, 240, 40, 14 - PUSHBUTTON "å¹«å©(&H)", pshHelp, 350, 272, 40, 14 -} Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/rsrc.rc [iso-8859-1] Mon Feb 20 16:49:48 2012 @@ -46,7 +46,6 @@ #include "cdlg_Bg.rc" #include "cdlg_Ca.rc" -#include "cdlg_Cn.rc" #include "cdlg_Cs.rc" #include "cdlg_Da.rc" #include "cdlg_De.rc" @@ -74,5 +73,6 @@ #include "cdlg_Sv.rc" #include "cdlg_Th.rc" #include "cdlg_Tr.rc" +#include "cdlg_Tw.rc" #include "cdlg_Uk.rc" #include "cdlg_Zh.rc"

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