Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 50642: - Add new-style syscall definitions in win32k_arwinss.
by fireball＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: fireball Date: Thu Feb 10 10:41:01 2011 New Revision: 50642 URL: http://svn.reactos.org/svn/reactos?rev=50642&view=rev Log: - Add new-style syscall definitions in win32k_arwinss. Added: branches/arwinss/reactos/subsystems/win32/win32k/sys-stubs.S - copied unchanged from r50633, trunk/reactos/subsystems/win32/win32k/sys-stubs.S branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h (with props) Added: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Thu Feb 10 10:41:01 2011 @@ -1,0 +1,98 @@ +// SVC_(<NAME>, <ARG_COUNT>) +// +// +SVC_(wine_server_call, 1) +SVC_(NtGdiGetStockObject, 1) +SVC_(RosGdiAlphaBlend, 11) +SVC_(RosGdiBitBlt, 9) +SVC_(RosGdiCreateBitmap, 3) +SVC_(RosGdiCreateDIBSection, 4) +SVC_(RosGdiDeleteBitmap, 1) +SVC_(RosGdiGetBitmapBits, 3) +SVC_(RosGdiGetDIBits, 8) +SVC_(RosGdiGetPixel, 3) +SVC_(RosGdiPatBlt, 6) +SVC_(RosGdiSetBitmapBits, 3) +SVC_(RosGdiSetDIBColorTable, 4) +SVC_(RosGdiSetDIBits, 7) +SVC_(RosGdiSetDIBitsToDevice, 12) +SVC_(RosGdiStretchBlt, 11) +SVC_(RosGdiCreateDC, 6) +SVC_(RosGdiDeleteDC, 1) +SVC_(RosGdiGetDCOrgEx, 2) +SVC_(RosGdiPaintRgn, 2) +SVC_(RosGdiSelectBitmap, 2) +SVC_(RosGdiSelectBrush, 2) +SVC_(RosGdiSelectFont, 3) +SVC_(RosGdiSelectPen, 3) +SVC_(RosGdiSetBkColor, 2) +SVC_(RosGdiSetDCBrushColor, 2) +SVC_(RosGdiSetDCOrg, 3) +SVC_(RosGdiSetBrushOrg, 3) +SVC_(RosGdiSetDCPenColor, 2) +SVC_(RosGdiSetDeviceClipping, 4) +SVC_(RosGdiSetDeviceGammaRamp, 2) +SVC_(RosGdiSetPixel, 4) +SVC_(RosGdiSetPixelFormat, 3) +SVC_(RosGdiSetTextColor, 2) +SVC_(RosGdiChoosePixelFormat, 2) +SVC_(RosGdiDescribePixelFormat, 4) +SVC_(RosGdiEnumDeviceFonts, 4) +SVC_(RosGdiGetCharWidth, 4) +SVC_(RosGdiGetDeviceCaps, 2) +SVC_(RosGdiGetDeviceGammaRamp, 2) +SVC_(RosGdiSetWindow, 5) +SVC_(RosGdiGetICMProfile, 3) +SVC_(RosGdiGetNearestColor, 2) +SVC_(RosGdiGetPixelFormat, 1) +SVC_(RosGdiGetSystemPaletteEntries, 4) +SVC_(RosGdiGetTextExtentExPoint, 7) +SVC_(RosGdiGetTextMetrics, 2) +SVC_(RosGdiArc, 10) +SVC_(RosGdiEllipse, 5) +SVC_(RosGdiExtEscape, 6) +SVC_(RosGdiExtFloodFill, 5) +SVC_(RosGdiExtTextOut, 10) +SVC_(RosGdiLineTo, 5) +SVC_(RosGdiPolyPolygon, 4) +SVC_(RosGdiPolyPolyline, 4) +SVC_(RosGdiPolygon, 3) +SVC_(RosGdiPolyline, 3) +SVC_(RosGdiRealizeDefaultPalette, 1) +SVC_(RosGdiRealizePalette, 3) +SVC_(RosGdiRectangle, 2) +SVC_(RosGdiRoundRect, 7) +SVC_(RosGdiSwapBuffers, 1) +SVC_(RosGdiUnrealizePalette, 1) +SVC_(RosUserSetCursor, 1) +SVC_(RosUserGetCursorPos, 1) +SVC_(RosUserSetCursorPos, 2) +SVC_(RosUserClipCursor, 1) +SVC_(RosUserChangeDisplaySettings, 5) +SVC_(RosUserEnumDisplayMonitors, 3) +SVC_(RosUserEnumDisplaySettings, 4) +SVC_(RosUserGetMonitorInfo, 2) +SVC_(RosUserGetKeyboardLayout, 1) +SVC_(RosUserGetKeyboardLayoutName, 1) +SVC_(RosUserLoadKeyboardLayoutEx, 7) +SVC_(RosUserActivateKeyboardLayout, 2) +SVC_(RosUserUnloadKeyboardLayout, 1) +SVC_(RosUserSetAsyncKeyboardState, 1) +SVC_(RosUserGetAsyncKeyboardState, 1) +SVC_(RosUserVkKeyScanEx, 3) +SVC_(RosUserGetKeyNameText, 3) +SVC_(RosUserToUnicodeEx, 7) +SVC_(RosUserMapVirtualKeyEx, 4) +SVC_(RosUserGetAsyncKeyState, 1) +SVC_(RosUserSetMonitorInfo, 2) +SVC_(RosUserRegisterShellHookWindow, 1) +SVC_(RosUserDeRegisterShellHookWindow, 1) +SVC_(RosUserBuildShellHookHwndList, 2) +SVC_(SwmNewWindow, 4) +SVC_(SwmAddDesktopWindow, 3) +SVC_(SwmDestroyWindow, 1) +SVC_(SwmSetForeground, 1) +SVC_(SwmPosChanged, 5) +SVC_(SwmGetWindowFromPoint, 2) +SVC_(SwmShowWindow, 3) +SVC_(NtUserInitialize, 3) Propchange: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 50641: Merge resource file related changes from cmake branch part 1
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 10:39:34 2011 New Revision: 50641 URL: http://svn.reactos.org/svn/reactos?rev=50641&view=rev Log: Merge resource file related changes from cmake branch part 1 Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/find/lang/bg-BG.rc trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/find/lang/el-GR.rc trunk/reactos/base/applications/cmdutils/find/lang/en-US.rc trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc trunk/reactos/base/applications/cmdutils/find/lang/fr-FR.rc trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc trunk/reactos/base/applications/cmdutils/find/lang/lt-LT.rc trunk/reactos/base/applications/cmdutils/find/lang/no-NO.rc trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc trunk/reactos/base/applications/cmdutils/find/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc trunk/reactos/base/applications/cmdutils/find/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc trunk/reactos/base/applications/findstr/lang/bg-BG.rc trunk/reactos/base/applications/findstr/lang/ca-ES.rc trunk/reactos/base/applications/findstr/lang/cs-CZ.rc trunk/reactos/base/applications/findstr/lang/de-DE.rc trunk/reactos/base/applications/findstr/lang/el-GR.rc trunk/reactos/base/applications/findstr/lang/en-US.rc trunk/reactos/base/applications/findstr/lang/es-ES.rc trunk/reactos/base/applications/findstr/lang/fr-FR.rc trunk/reactos/base/applications/findstr/lang/it-IT.rc trunk/reactos/base/applications/findstr/lang/lt-LT.rc trunk/reactos/base/applications/findstr/lang/no-NO.rc trunk/reactos/base/applications/findstr/lang/pl-PL.rc trunk/reactos/base/applications/findstr/lang/pt-BR.rc trunk/reactos/base/applications/findstr/lang/ru-RU.rc trunk/reactos/base/applications/findstr/lang/sk-SK.rc trunk/reactos/base/applications/findstr/lang/sv-SE.rc trunk/reactos/base/applications/findstr/lang/uk-UA.rc trunk/reactos/base/applications/games/winmine/lang/da-DK.rc trunk/reactos/base/applications/network/ping/lang/de-DE.rc trunk/reactos/base/applications/network/ping/lang/en-US.rc trunk/reactos/base/applications/network/ping/lang/fr-FR.rc trunk/reactos/base/applications/network/ping/lang/it-IT.rc trunk/reactos/base/applications/network/ping/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/el-GR.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/notepad/lang/eu-ES.rc trunk/reactos/base/applications/notepad/lang/fi-FI.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/hu-HU.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/lang/nl-NL.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sl-SI.rc trunk/reactos/base/applications/notepad/lang/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/base/applications/wordpad/Da.rc trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/It.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Lt.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/Ro.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Sv.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/Uk.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/cmdutils/find/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/findstr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/games/winmine/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/network/ping/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it…

1 0

[tkreuzer] 50640: Merge all amd64 related changes from cmake branch
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 10:30:43 2011 New Revision: 50640 URL: http://svn.reactos.org/svn/reactos?rev=50640&view=rev Log: Merge all amd64 related changes from cmake branch Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/xdk/amd64/ke.h trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s trunk/reactos/lib/sdk/crt/except/amd64/seh.s trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S trunk/reactos/lib/sdk/crt/math/amd64/atan.S trunk/reactos/lib/sdk/crt/math/amd64/atan2.S trunk/reactos/lib/sdk/crt/math/amd64/ceil.S trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S trunk/reactos/lib/sdk/crt/math/amd64/exp.S trunk/reactos/lib/sdk/crt/math/amd64/fabs.S trunk/reactos/lib/sdk/crt/math/amd64/floor.S trunk/reactos/lib/sdk/crt/math/amd64/floorf.S trunk/reactos/lib/sdk/crt/math/amd64/fmod.S trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S trunk/reactos/lib/sdk/crt/math/amd64/log.S trunk/reactos/lib/sdk/crt/math/amd64/log10.S trunk/reactos/lib/sdk/crt/math/amd64/pow.S trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S trunk/reactos/lib/sdk/crt/math/amd64/tan.S trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/ke/amd64/thrdini.c trunk/reactos/ntoskrnl/ke/amd64/trap.S trunk/reactos/ntoskrnl/mm/amd64/init.c trunk/reactos/tools/rsym/rsym64.h Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -81,6 +81,7 @@ #define CR4_PGE 0x80 #define CR4_FXSR 0x200 #define CR4_XMMEXCPT 0x400 +#define CR4_CHANNELS 0x800 // // EFlags @@ -98,6 +99,39 @@ #define EFLAGS_USER_SANITIZE 0x3F4DD7 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 +#define EFLAGS_TF_MASK 0x0100 +#define EFLAGS_TF_SHIFT 0x0008 +#define EFLAGS_ID_MASK 0x200000 +#define EFLAGS_IF_MASK 0x0200 +#define EFLAGS_IF_SHIFT 0x0009 + +// +// Machine Specific Registers +// +#define MSR_EFER 0xC0000080 +#define MSR_STAR 0xC0000081 +#define MSR_LSTAR 0xC0000082 +#define MSR_CSTAR 0xC0000083 +#define MSR_SYSCALL_MASK 0xC0000084 +#define MSR_FS_BASE 0xC0000100 +#define MSR_GS_BASE 0xC0000101 +#define MSR_GS_SWAP 0xC0000102 +#define MSR_MCG_STATUS 0x017A +#define MSR_AMD_ACCESS 0x9C5A203A + +// +// Flags in MSR_EFER +// +#define MSR_LMA 0x0400 +#define MSR_LME 0x0100 +#define MSR_SCE 0x0001 +#define MSR_NXE 0x0800 +#define MSR_PAT 0x0277 +#define MSR_DEGUG_CTL 0x01D9 +#define MSR_LAST_BRANCH_FROM 0x01DB +#define MSR_LAST_BRANCH_TO 0x01DC +#define MSR_LAST_EXCEPTION_FROM 0x01DD +#define MSR_LAST_EXCEPTION_TO 0x01DE // // IPI Types @@ -114,6 +148,15 @@ #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 + +// +// Service Table +// +#define NUMBER_SERVICE_TABLES 2 +#define SERVICE_NUMBER_MASK 0xFFF +#define SERVICE_TABLE_SHIFT 7 +#define SERVICE_TABLE_MASK 0x20 +#define SERVICE_TABLE_TEST 0x20 // // HAL Variables @@ -143,6 +186,8 @@ #else #define SYNCH_LEVEL (IPI_LEVEL - 2) #endif + +#define NMI_STACK_SIZE 0x2000 // // Trap Frame Definition @@ -863,6 +908,56 @@ UINT64 Return; } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; +typedef struct _DISPATCHER_CONTEXT +{ + ULONG64 ControlPc; + PVOID ImageBase; + PVOID FunctionEntry; + PVOID EstablisherFrame; + ULONG64 TargetIp; + PVOID ContextRecord; + PVOID LanguageHandler; + PVOID HandlerData; + PVOID HistoryTable; + ULONG ScopeIndex; +} DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; + + +typedef struct _KSTART_FRAME +{ + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5Home; + ULONG64 Return; +} KSTART_FRAME, *PKSTART_FRAME; + +typedef struct _KSWITCH_FRAME +{ + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5Home; + ULONG64 ApcBypass; + ULONG64 Rbp; + ULONG64 Return; +} KSWITCH_FRAME, *PKSWITCH_FRAME; + +typedef struct _KTIMER_TABLE_ENTRY +{ + ULONG_PTR Lock; + LIST_ENTRY Entry; + ULARGE_INTEGER Time; +} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; + +typedef struct _KTIMER_TABLE +{ + KTIMER* TimerExpiry[64]; + KTIMER_TABLE_ENTRY TimerEntries[256]; +} KTIMER_TABLE, *PKTIMER_TABLE; + // // Inline function to get current KPRCB // Modified: trunk/reactos/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/amd64/ke.h?rev… ============================================================================== --- trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -67,7 +67,7 @@ { KIRQL OldIrql; - OldIrql = __readcr8(); + OldIrql = (KIRQL)__readcr8(); //ASSERT(OldIrql <= NewIrql); __writecr8(NewIrql); return OldIrql; Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,21 +10,25 @@ #include <asm.inc> +/* CODE **********************************************************************/ +.code64 PUBLIC MsgUnimplemented MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" -.proc _chkstk +FUNC _chkstk + .endprolog UNIMPLEMENTED chkstk ret -.endp +ENDFUNC _chkstk -.proc _alloca_probe +FUNC _alloca_probe + .endprolog UNIMPLEMENTED alloca_probe ret -.endp +ENDFUNC _alloca_probe END /* EOF */ Modified: trunk/reactos/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/s… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -17,42 +17,43 @@ /* GLOBALS *******************************************************************/ -.globl _global_unwind2 -.globl _local_unwind2 -.globl _abnormal_termination -.globl _except_handler2 -.globl _except_handler3 +PUBLIC _global_unwind2 +PUBLIC _local_unwind2 +PUBLIC _abnormal_termination +PUBLIC _except_handler2 +PUBLIC _except_handler3 -/* FUNCTIONS *****************************************************************/ +/* CODE **********************************************************************/ +.code64 -.func _unwind_handler -_unwind_handler: +FUNC _unwind_handler + .endprolog ret -.endfunc +ENDFUNC _unwind_handler -.func _global_unwind2 -_global_unwind2: +FUNC _global_unwind2 + .endprolog ret -.endfunc +ENDFUNC _global_unwind2 -.func _abnormal_termination -_abnormal_termination: +FUNC _abnormal_termination + .endprolog ret -.endfunc +ENDFUNC _abnormal_termination -.func _local_unwind2 -_local_unwind2: +FUNC _local_unwind2 + .endprolog ret -.endfunc +ENDFUNC _local_unwind2 -.func _except_handler2 -_except_handler2: +FUNC _except_handler2 + .endprolog ret -.endfunc +ENDFUNC _except_handler2 -.func _except_handler3 -_except_handler3: +FUNC _except_handler3 + .endprolog ret -.endfunc +ENDFUNC _except_handler3 END Modified: trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/all… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,18 +10,21 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* DATA **********************************************************************/ +.code64 PUBLIC _fltused _fltused: - .long 0x9875 + .long HEX(9875) -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 -.proc alldiv +FUNC alldiv + .endprolog UNIMPLEMENTED alldiv ret -.endp alldiv +ENDFUNC alldiv + +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/atan.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/ata… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,11 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC atan atan: UNIMPLEMENTED atan ret + +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/atan2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/ata… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,11 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC atan2 atan2: UNIMPLEMENTED atan2 ret + +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceil.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC ceil @@ -20,3 +19,4 @@ UNIMPLEMENTED ceil ret +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC ceilf @@ -39,7 +38,7 @@ fstp dword ptr [rsp] movss xmm0, [rsp] - + add rsp, 16 ret Modified: trunk/reactos/lib/sdk/crt/math/amd64/exp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/exp… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC exp Modified: trunk/reactos/lib/sdk/crt/math/amd64/fabs.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fab… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,12 +10,12 @@ #include <asm.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 -PUBLIC fabs -fabs: +PUBLIC _fabs +_fabs: UNIMPLEMENTED fabs ret +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/floor.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC floor Modified: trunk/reactos/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC floorf Modified: trunk/reactos/lib/sdk/crt/math/amd64/fmod.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fmo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,10 +10,11 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 -PUBLIC fmod -fmod: +PUBLIC _fmod +_fmod: UNIMPLEMENTED fmod ret Modified: trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fmo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,7 +10,8 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC fmodf fmodf: Modified: trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/lde… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,7 +10,8 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC ldexp ldexp: Modified: trunk/reactos/lib/sdk/crt/math/amd64/log.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/log… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/log.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/log.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,9 +10,12 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC log log: UNIMPLEMENTED log ret + +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/log10.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/log… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,10 +10,12 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC log10 log10: UNIMPLEMENTED log10 ret +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/pow.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/pow… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,10 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC pow pow: UNIMPLEMENTED pow ret +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/sqr… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC sqrt sqrt: Modified: trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/sqr… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC sqrtf sqrtf: Modified: trunk/reactos/lib/sdk/crt/math/amd64/tan.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/tan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC tan tan: Modified: trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/amd64/s… ============================================================================== --- trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,41 +11,45 @@ #include <asm.inc> #include <ksamd64.inc> -#define JUMP_BUFFER_Frame 0x00 -#define JUMP_BUFFER_Rbx 0x08 -#define JUMP_BUFFER_Rsp 0x10 -#define JUMP_BUFFER_Rbp 0x18 -#define JUMP_BUFFER_Rsi 0x20 -#define JUMP_BUFFER_Rdi 0x28 -#define JUMP_BUFFER_R12 0x30 -#define JUMP_BUFFER_R13 0x38 -#define JUMP_BUFFER_R14 0x40 -#define JUMP_BUFFER_R15 0x48 -#define JUMP_BUFFER_Rip 0x50 -#define JUMP_BUFFER_Spare 0x58 -#define JUMP_BUFFER_Xmm6 0x60 -#define JUMP_BUFFER_Xmm7 0x70 -#define JUMP_BUFFER_Xmm8 0x80 -#define JUMP_BUFFER_Xmm9 0x90 -#define JUMP_BUFFER_Xmm10 0xa0 -#define JUMP_BUFFER_Xmm11 0xb0 -#define JUMP_BUFFER_Xmm12 0xc0 -#define JUMP_BUFFER_Xmm13 0xd0 -#define JUMP_BUFFER_Xmm14 0xe0 -#define JUMP_BUFFER_Xmm15 0xf0 +#define JUMP_BUFFER_Frame 0 /* 0x00 */ +#define JUMP_BUFFER_Rbx 8 /* 0x08 */ +#define JUMP_BUFFER_Rsp 16 /* 0x10 */ +#define JUMP_BUFFER_Rbp 24 /* 0x18 */ +#define JUMP_BUFFER_Rsi 32 /* 0x20 */ +#define JUMP_BUFFER_Rdi 40 /* 0x28 */ +#define JUMP_BUFFER_R12 48 /* 0x30 */ +#define JUMP_BUFFER_R13 56 /* 0x38 */ +#define JUMP_BUFFER_R14 64 /* 0x40 */ +#define JUMP_BUFFER_R15 72 /* 0x48 */ +#define JUMP_BUFFER_Rip 80 /* 0x50 */ +#define JUMP_BUFFER_Spare 88 /* 0x58 */ +#define JUMP_BUFFER_Xmm6 96 /* 0x60 */ +#define JUMP_BUFFER_Xmm7 112 /* 0x70 */ +#define JUMP_BUFFER_Xmm8 128 /* 0x80 */ +#define JUMP_BUFFER_Xmm9 144 /* 0x90 */ +#define JUMP_BUFFER_Xmm10 160 /* 0xa0 */ +#define JUMP_BUFFER_Xmm11 176 /* 0xb0 */ +#define JUMP_BUFFER_Xmm12 192 /* 0xc0 */ +#define JUMP_BUFFER_Xmm13 208 /* 0xd0 */ +#define JUMP_BUFFER_Xmm14 224 /* 0xe0 */ +#define JUMP_BUFFER_Xmm15 240 /* 0xf0 */ /* FUNCTIONS ******************************************************************/ +.code64 -/* +/*! * int _setjmp(jmp_buf env); * - * Parameters: <rcx> - jmp_buf env - * Returns: 0 - * Notes: Sets up the jmp_buf + * \param <rcx> - jmp_buf env + * \return 0 + * \note Sets up the jmp_buf */ PUBLIC _setjmp -.proc _setjmp +FUNC _setjmp + + .endprolog + /* Load rsp as it was before the call into rax */ lea rax, [rsp + 8] /* Load return address into r8 */ @@ -73,18 +77,21 @@ movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 xor rax, rax ret -.endp setjmp +ENDFUNC _setjmp -/* +/*! * int _setjmpex(jmp_buf _Buf,void *_Ctx); * - * Parameters: <rcx> - jmp_buf env - * <rdx> - frame - * Returns: 0 - * Notes: Sets up the jmp_buf + * \param <rcx> - jmp_buf env + * \param <rdx> - frame + * \return 0 + * \note Sets up the jmp_buf */ PUBLIC _setjmpex -.proc _setjmpex +FUNC _setjmpex + + .endprolog + /* Load rsp as it was before the call into rax */ lea rax, [rsp + 8] /* Load return address into r8 */ @@ -112,19 +119,21 @@ movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 xor rax, rax ret -.endp setjmpex +ENDFUNC _setjmpex -/* +/*! * void longjmp(jmp_buf env, int value); * - * Parameters: <rcx> - jmp_buf setup by _setjmp - * <rdx> - int value to return - * Returns: Doesn't return - * Notes: Non-local goto + * \param <rcx> - jmp_buf setup by _setjmp + * \param <rdx> - int value to return + * \return Doesn't return + * \note Non-local goto */ PUBLIC longjmp -.proc longjmp +FUNC longjmp + + .endprolog // FIXME: handle frame @@ -152,9 +161,9 @@ /* return param2 or 1 if it was 0 */ mov rax, rdx test rax, rax - jnz 2f + jnz l2 inc rax -2: jmp r8 -.endp longjmp +l2: jmp r8 +ENDFUNC longjmp END Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -131,6 +131,7 @@ Temp >>= 16; return (PVOID)Temp; } +#define MiPdeToAddress MiPteToAddress BOOLEAN FORCEINLINE @@ -157,8 +158,6 @@ MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, IN PMMPTE PointerPte) { - ULONG_PTR Offset; - /* Store the Address */ NewPte->u.Long = (ULONG64)PointerPte; @@ -197,9 +196,11 @@ // FIXME, only copied from x86 #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) +#define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) +#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.LargePage == 1) #if !defined(CONFIG_SMP) #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) #else @@ -231,8 +232,13 @@ #define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE #define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ MI_HYPERSPACE_PTES * PAGE_SIZE) -#define MI_ZERO_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ - PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ + PAGE_SIZE) + /* On x86, these two are the same */ #define MMPDE MMPTE Modified: trunk/reactos/ntoskrnl/ke/amd64/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/thrdini.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -12,24 +12,9 @@ #define NDEBUG #include <debug.h> -typedef struct _KSWITCHFRAME -{ - PVOID ExceptionList; - BOOLEAN ApcBypassDisable; - PVOID RetAddr; -} KSWITCHFRAME, *PKSWITCHFRAME; - -typedef struct _KSTART_FRAME -{ - PKSYSTEM_ROUTINE SystemRoutine; - PKSTART_ROUTINE StartRoutine; - PVOID StartContext; - BOOLEAN UserThread; -} KSTART_FRAME, *PKSTART_FRAME; - typedef struct _KUINIT_FRAME { - KSWITCHFRAME CtxSwitchFrame; + KSWITCH_FRAME CtxSwitchFrame; KSTART_FRAME StartFrame; KTRAP_FRAME TrapFrame; //FX_SAVE_AREA FxSaveArea; @@ -37,7 +22,7 @@ typedef struct _KKINIT_FRAME { - KSWITCHFRAME CtxSwitchFrame; + KSWITCH_FRAME CtxSwitchFrame; KSTART_FRAME StartFrame; //FX_SAVE_AREA FxSaveArea; } KKINIT_FRAME, *PKKINIT_FRAME; @@ -55,7 +40,7 @@ //PFX_SAVE_AREA FxSaveArea; //PFXSAVE_FORMAT FxSaveFormat; PKSTART_FRAME StartFrame; - PKSWITCHFRAME CtxSwitchFrame; + PKSWITCH_FRAME CtxSwitchFrame; PKTRAP_FRAME TrapFrame; CONTEXT LocalContext; PCONTEXT Context = NULL; @@ -140,7 +125,7 @@ Thread->PreviousMode = UserMode; /* Tell KiThreadStartup of that too */ - StartFrame->UserThread = TRUE; +// StartFrame->UserThread = TRUE; } else { @@ -170,18 +155,18 @@ Thread->PreviousMode = KernelMode; /* Tell KiThreadStartup of that too */ - StartFrame->UserThread = FALSE; +// StartFrame->UserThread = FALSE; } /* Now setup the remaining data for KiThreadStartup */ - StartFrame->StartContext = StartContext; - StartFrame->StartRoutine = StartRoutine; - StartFrame->SystemRoutine = SystemRoutine; +// StartFrame->StartContext = StartContext; +// StartFrame->StartRoutine = StartRoutine; +// StartFrame->SystemRoutine = SystemRoutine; /* And set up the Context Switch Frame */ - CtxSwitchFrame->RetAddr = KiThreadStartup; - CtxSwitchFrame->ApcBypassDisable = TRUE; - CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END;; +// CtxSwitchFrame->RetAddr = KiThreadStartup; +// CtxSwitchFrame->ApcBypassDisable = TRUE; +// CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END;; /* Save back the new value of the kernel stack. */ Thread->KernelStack = (PVOID)CtxSwitchFrame; Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -76,7 +76,7 @@ #define TRAPFLAG_SYSTEMSERVICE (TRAPFLAG_VOLATILES|TRAPFLAG_DEBUG) #define TRAPFLAG_ALL HEX(ff) -/* +/* * Stack Layout: * |-------------------| * | KTRAP_FRAME | @@ -89,7 +89,7 @@ */ /* - * ENTER_TRAP_FRAME - Allocate SIZE_KTRAP_FRAME and save registers to it + * ENTER_TRAP_FRAME - Allocate KTRAP_FRAME_LENGTH and save registers to it */ MACRO(ENTER_TRAP_FRAME, Flags) LOCAL dont_swap @@ -107,8 +107,8 @@ endif /* Make room for a KTRAP_FRAME */ - sub rsp, (SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME) - .allocstack (SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME) + sub rsp, (KTRAP_FRAME_LENGTH - SIZE_INITIAL_FRAME) + .allocstack (KTRAP_FRAME_LENGTH - SIZE_INITIAL_FRAME) .endprolog /* Save rbp */ @@ -278,12 +278,12 @@ .PROC InternalDispatchException /* Allocate stack space for EXCEPTION_RECORD and KEXCEPTION_FRAME */ - sub rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME - .allocstack (SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME) + sub rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH + .allocstack (EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH) .endprolog /* Set up EXCEPTION_RECORD */ - lea rcx, [rsp + SIZE_KEXCEPTION_FRAME] + lea rcx, [rsp + KEXCEPTION_FRAME_LENGTH] mov [rcx + EXCEPTION_RECORD_ExceptionCode], eax xor rax, rax mov [rcx + EXCEPTION_RECORD_ExceptionFlags], eax @@ -341,7 +341,7 @@ movdqa xmm14, [rsp + KEXCEPTION_FRAME_Xmm14] movdqa xmm15, [rsp + KEXCEPTION_FRAME_Xmm15] - add rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME + add rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH ret .ENDP InternalDispatchException @@ -516,7 +516,7 @@ KiInvalidOpcodeKernel: /* Kernel mode fault */ - + /* Dispatch the exception */ mov eax, STATUS_ILLEGAL_INSTRUCTION mov edx, 3 @@ -837,7 +837,7 @@ mov r10, 0 mov r11, 0 call InternalDispatchException - + LEAVE_TRAP_FRAME iretq .ENDP KiRaiseAssertion Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -27,10 +27,16 @@ /* GLOBALS *****************************************************************/ /* Template PTE and PDE for a kernel page */ -MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | 0xFFFFF000}; +MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; + +/* Template PDE for a demand-zero page */ +MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; +MMPTE DemandZeroPte = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; + +/* Template PTE for prototype page */ +MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | + PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; /* Sizes */ ///SIZE_T MmSessionSize = MI_SESSION_SIZE; @@ -413,7 +419,7 @@ TmplPte.u.Flush.Write = 1; HyperTemplatePte = TmplPte; - /* Create PDPTs (72 KB) for shared system address space, + /* Create PDPTs (72 KB) for shared system address space, * skip page tables and hyperspace */ /* Loop the PXEs */ @@ -492,7 +498,7 @@ /* Page-align the nonpaged pool size */ MmSizeOfNonPagedPoolInBytes &= ~(PAGE_SIZE - 1); - + /* Now, check if there was a registry size for the maximum size */ if (!MmMaximumNonPagedPoolInBytes) { @@ -501,7 +507,7 @@ MmMaximumNonPagedPoolInBytes += (MmNumberOfPhysicalPages - 1024) / 256 * MmMaxAdditionNonPagedPoolPerMb; } - + /* Don't let the maximum go too high */ if (MmMaximumNonPagedPoolInBytes > MI_MAX_NONPAGED_POOL_SIZE) { @@ -517,7 +523,7 @@ { /* Put non paged pool after the PFN database */ MmNonPagedPoolStart = (PCHAR)MmPfnDatabase + MxPfnSizeInBytes; - MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - + MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - (ULONG64)MmNonPagedPoolStart; } @@ -688,7 +694,7 @@ PMMPTE Pte; MMPTE TmplPte; ULONG Size, BitMapSize; - + /* Default size for paged pool is 4 times non paged pool */ MmSizeOfPagedPoolInBytes = 4 * MmMaximumNonPagedPoolInBytes; @@ -767,7 +773,7 @@ // Allocate the allocation bitmap, which tells us which regions have not yet // been mapped into memory - MmPagedPoolInfo.PagedPoolAllocationMap = + MmPagedPoolInfo.PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); @@ -783,7 +789,7 @@ // Given the allocation bitmap and a base address, we can therefore figure // out which page is the last page of that allocation, and thus how big the // entire allocation is. - MmPagedPoolInfo.EndOfPagedPoolBitmap = + MmPagedPoolInfo.EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); @@ -859,7 +865,7 @@ //MmPagedPoolSize = MM_PAGED_POOL_SIZE; //ASSERT((PCHAR)MmPagedPoolBase + MmPagedPoolSize < (PCHAR)MmNonPagedSystemStart); - + HalInitializeBios(0, LoaderBlock); } @@ -871,7 +877,7 @@ MiSyncARM3WithROS(IN PVOID AddressStart, IN PVOID AddressEnd) { - + } NTSTATUS Modified: trunk/reactos/tools/rsym/rsym64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym64.h?rev=50… ============================================================================== --- trunk/reactos/tools/rsym/rsym64.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym64.h [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,6 +10,7 @@ #endif +#define IMAGE_FILE_MACHINE_I386 0x14c #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_DIRECTORY_ENTRY_IMPORT 1 #define IMAGE_DIRECTORY_ENTRY_EXCEPTION 3

1 0

[fireball] 50639: - Add a missing ORing of the registry-loaded GlobalFlags value in ExpInitializeExecutive. Thanks to Robert Horvath for spotting the issue. See issue #5870 for more details.
by fireball＠svn.reactos.org 09 Feb '11

09 Feb '11

Author: fireball Date: Wed Feb 9 21:22:47 2011 New Revision: 50639 URL: http://svn.reactos.org/svn/reactos?rev=50639&view=rev Log: - Add a missing ORing of the registry-loaded GlobalFlags value in ExpInitializeExecutive. Thanks to Robert Horvath for spotting the issue. See issue #5870 for more details. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=506… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Feb 9 21:22:47 2011 @@ -1061,6 +1061,9 @@ if (CmNtCSDReleaseType == 1) CmNtSpBuildNumber |= 1830 << 16; } + /* Add loaded CmNtGlobalFlag value */ + NtGlobalFlag |= CmNtGlobalFlag; + /* Initialize the executive at phase 0 */ if (!ExInitSystem()) KeBugCheck(PHASE0_INITIALIZATION_FAILED); Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Wed Feb 9 21:22:47 2011 @@ -1585,6 +1585,7 @@ extern WCHAR CmInstallUILanguageId[]; extern ULONG CmInstallUILanguageIdLength; extern ULONG CmInstallUILanguageIdType; +extern ULONG CmNtGlobalFlag; extern LANGID PsInstallUILanguageId; extern LANGID PsDefaultUILanguageId; extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[];

1 0

[fireball] 50638: - Robert Horvath: Add GlobalFlag entry in hivesys_{arch}.inf with the default value 0x0. See issue #5870 for more details.
by fireball＠svn.reactos.org 09 Feb '11

09 Feb '11

Author: fireball Date: Wed Feb 9 20:50:28 2011 New Revision: 50638 URL: http://svn.reactos.org/svn/reactos?rev=50638&view=rev Log: - Robert Horvath: Add GlobalFlag entry in hivesys_{arch}.inf with the default value 0x0. See issue #5870 for more details. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Feb 9 20:50:28 2011 @@ -886,6 +886,7 @@ ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ "autocheck autochk *" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Feb 9 20:50:28 2011 @@ -740,6 +740,7 @@ ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ "autocheck autochk *" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Feb 9 20:50:28 2011 @@ -979,6 +979,7 @@ ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ "autocheck autochk *" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control"

1 0

[fireball] 50637: - Robert Horvath: LocalUnlock has to be different from GlobalUnlock. The subtle difference between LocalUnlock and GlobalUnlock, is, that the former will return FALSE and set ERRO...
by fireball＠svn.reactos.org 09 Feb '11

09 Feb '11

Author: fireball Date: Wed Feb 9 20:42:44 2011 New Revision: 50637 URL: http://svn.reactos.org/svn/reactos?rev=50637&view=rev Log: - Robert Horvath: LocalUnlock has to be different from GlobalUnlock. The subtle difference between LocalUnlock and GlobalUnlock, is, that the former will return FALSE and set ERROR_NOT_LOCKED on LMEM_FIXED allocations. Fixes 1 kernel32:heap failure. See issue #5869 for more details. Modified: trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Wed Feb 9 20:42:44 2011 @@ -441,8 +441,62 @@ NTAPI LocalUnlock(HLOCAL hMem) { - /* This is the same as a Global Unlock */ - return GlobalUnlock(hMem); + PBASE_HEAP_HANDLE_ENTRY HandleEntry; + BOOL RetVal = TRUE; + + /* Check if this was a simple allocated heap entry */ + if (!((ULONG_PTR)hMem & BASE_HEAP_IS_HANDLE_ENTRY)) + { + /* Fail, because LocalUnlock is not supported on LMEM_FIXED allocations */ + SetLastError(ERROR_NOT_LOCKED); + return FALSE; + } + + /* Otherwise, lock the heap */ + RtlLockHeap(hProcessHeap); + + /* Get the handle entry */ + HandleEntry = BaseHeapGetEntry(hMem); + BASE_TRACE_HANDLE(HandleEntry, hMem); + + _SEH2_TRY + { + /* Make sure it's valid */ + if (!BaseHeapValidateEntry(HandleEntry)) + { + /* It's not, fail */ + BASE_TRACE_FAILURE(); + SetLastError(ERROR_INVALID_HANDLE); + RetVal = FALSE; + } + else + { + /* Otherwise, decrement lock count, unless we're already at 0*/ + if (!HandleEntry->LockCount--) + { + /* In which case we simply lock it back and fail */ + HandleEntry->LockCount++; + SetLastError(ERROR_NOT_LOCKED); + RetVal = FALSE; + } + else if (!HandleEntry->LockCount) + { + /* Nothing to unlock */ + SetLastError(NO_ERROR); + RetVal = FALSE; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_PARAMETER); + RetVal = FALSE; + } + _SEH2_END + + /* All done. Unlock the heap and return the pointer */ + RtlUnlockHeap(hProcessHeap); + return RetVal; } /* EOF */

1 0

[akhaldi] 50636: [CMAKE] - Fix build.
by akhaldi＠svn.reactos.org 09 Feb '11

09 Feb '11

Author: akhaldi Date: Wed Feb 9 17:06:56 2011 New Revision: 50636 URL: http://svn.reactos.org/svn/reactos?rev=50636&view=rev Log: [CMAKE] - Fix build. Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Wed Feb 9 17:06:56 2011 @@ -445,7 +445,6 @@ add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE}) -set_source_files_properties(${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S PROPERTIES GENERATED TRUE) add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi asm) add_minicd_target(ntoskrnl reactos ntoskrnl.exe)

1 0

[tkreuzer] 50635: sync trunk HEAD (r50626)
by tkreuzer＠svn.reactos.org 09 Feb '11

09 Feb '11

Author: tkreuzer Date: Wed Feb 9 15:56:57 2011 New Revision: 50635 URL: http://svn.reactos.org/svn/reactos?rev=50635&view=rev Log: sync trunk HEAD (r50626) Added: branches/cmake-bringup/include/asm/syscalls.inc - copied unchanged from r50626, trunk/reactos/include/reactos/syscalls.inc branches/cmake-bringup/ntoskrnl/ex/zw.S - copied unchanged from r50626, trunk/reactos/ntoskrnl/ex/zw.S branches/cmake-bringup/ntoskrnl/include/internal/napi.h - copied unchanged from r50626, trunk/reactos/ntoskrnl/include/internal/napi.h branches/cmake-bringup/ntoskrnl/include/sysfuncs.h - copied unchanged from r50626, trunk/reactos/ntoskrnl/include/sysfuncs.h branches/cmake-bringup/ntoskrnl/ntdll.S - copied unchanged from r50626, trunk/reactos/ntoskrnl/ntdll.S branches/cmake-bringup/subsystems/win32/win32k/include/napi.h - copied unchanged from r50626, trunk/reactos/subsystems/win32/win32k/include/napi.h branches/cmake-bringup/subsystems/win32/win32k/sys-stubs.S - copied unchanged from r50626, trunk/reactos/subsystems/win32/win32k/sys-stubs.S branches/cmake-bringup/subsystems/win32/win32k/w32ksvc.h - copied unchanged from r50626, trunk/reactos/subsystems/win32/win32k/w32ksvc.h Removed: branches/cmake-bringup/lib/ntdllsys/ branches/cmake-bringup/lib/win32ksys/ branches/cmake-bringup/tools/nci/ Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/base/setup/usetup/cabinet.c branches/cmake-bringup/boot/bootdata/hivedef_amd64.inf branches/cmake-bringup/boot/bootdata/hivedef_arm.inf branches/cmake-bringup/boot/bootdata/hivedef_i386.inf branches/cmake-bringup/boot/freeldr/freeldr/include/fs/ntfs.h branches/cmake-bringup/dll/win32/setupapi/cfgmgr.c branches/cmake-bringup/dll/win32/setupapi/setupapi.spec branches/cmake-bringup/dll/win32/syssetup/install.c branches/cmake-bringup/dll/win32/wdmaud.drv/legacy.c branches/cmake-bringup/dll/win32/wdmaud.drv/mixer.c branches/cmake-bringup/include/reactos/libs/sound/mmebuddy.h branches/cmake-bringup/lib/CMakeLists.txt branches/cmake-bringup/lib/rtl/heap.c branches/cmake-bringup/lib/rtl/nls.c branches/cmake-bringup/lib/rtl/unicode.c branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/ntoskrnl/ke/powerpc/cpu.c branches/cmake-bringup/ntoskrnl/mm/section.c branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/eng/xlate.c branches/cmake-bringup/subsystems/win32/win32k/objects/gdiobj.c branches/cmake-bringup/tools/CMakeLists.txt Propchange: branches/cmake-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 9 15:56:57 2011 @@ -3,4 +3,4 @@ /branches/reactx/reactos:49994-49995 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 -/trunk/reactos:48236-50570,50601-50602 +/trunk/reactos:48236-50626 Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -54,9 +54,9 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS widl nci gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS nci gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS widl gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() @@ -185,40 +185,6 @@ add_subdirectory(ntoskrnl) add_subdirectory(subsystems) - # nci generated intermediate files - - list(APPEND nci_output - ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h - ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S - ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S - ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S - ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) - - list(APPEND nci_folders - ${CMAKE_CURRENT_BINARY_DIR}/dll/ntdll/def - ${CMAKE_CURRENT_BINARY_DIR}/lib/ntdllsys/ntdll - ${CMAKE_CURRENT_BINARY_DIR}/lib/win32ksys - ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/include/internal - ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/ex - ${CMAKE_CURRENT_BINARY_DIR}/subsystems/win32/win32k/include) - - file(MAKE_DIRECTORY ${nci_folders}) - - add_custom_command( - OUTPUT ${nci_output} - COMMAND native-nci -arch ${ARCH} ${REACTOS_SOURCE_DIR}/ntoskrnl/sysfuncs.lst ${REACTOS_SOURCE_DIR}/subsystems/win32/win32k/w32ksvc.db ${nci_output} - DEPENDS native-nci ${nci_folders}) - - set_source_files_properties(${nci_output} PROPERTIES GENERATED TRUE) - - add_custom_target(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) - add_custom_target(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) - add_custom_target(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) - add_custom_target(kernel_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h) - add_custom_target(subsystem_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h) - add_custom_target(kernel_zw ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) - file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) add_custom_target(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) Modified: branches/cmake-bringup/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/cabinet.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -890,7 +890,7 @@ RtlInitAnsiString(&AnsiString, Search->File->FileName); wcscpy(DestName, DestPath); - UnicodeString.MaximumLength = sizeof(DestName) - wcslen(DestName); + UnicodeString.MaximumLength = sizeof(DestName) - wcslen(DestName) * sizeof(WCHAR); UnicodeString.Buffer = DestName + wcslen(DestName); UnicodeString.Length = 0; RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE); Modified: branches/cmake-bringup/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/bootdata/hiv… ============================================================================== --- branches/cmake-bringup/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ branches/cmake-bringup/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -97,7 +97,7 @@ HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" -HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" +HKCU,"Control Panel\Desktop","FontSmoothing",0,"0" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","ForegroundFlashCount",0x00010003,0x00000003 Modified: branches/cmake-bringup/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/bootdata/hiv… ============================================================================== --- branches/cmake-bringup/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ branches/cmake-bringup/boot/bootdata/hivedef_arm.inf [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -28,7 +28,7 @@ HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" -HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" +HKCU,"Control Panel\Desktop","FontSmoothing",0,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 HKCU,"Control Panel\Desktop","UserPreferencesMask",3,10,00,00,80 HKCU,"Control Panel\Desktop","LowPowerActive",,"0" Modified: branches/cmake-bringup/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/bootdata/hiv… ============================================================================== Binary files - no diff available. Modified: branches/cmake-bringup/boot/freeldr/freeldr/include/fs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/include/fs/ntfs.h [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/include/fs/ntfs.h [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -1,6 +1,7 @@ /* * FreeLoader NTFS support * Copyright (C) 2004 Filip Navara <xnavara(a)volny.cz> + * Copyright (C) 2011 Pierre Schweitzer <pierre.schweitzer(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,16 +31,22 @@ #define NTFS_FILE_BADCLUS 8 #define NTFS_FILE_QUOTA 9 #define NTFS_FILE_UPCASE 10 +#define NTFS_FILE_EXTEND 11 #define NTFS_ATTR_TYPE_STANDARD_INFORMATION 0x10 #define NTFS_ATTR_TYPE_ATTRIBUTE_LIST 0x20 #define NTFS_ATTR_TYPE_FILENAME 0x30 +#define NTFS_ATTR_TYPE_OBJECT_ID 0x40 #define NTFS_ATTR_TYPE_SECURITY_DESCRIPTOR 0x50 +#define NTFS_ATTR_TYPE_VOLUME_NAME 0x60 +#define NTFS_ATTR_TYPE_VOLUME_INFORMATION 0x70 #define NTFS_ATTR_TYPE_DATA 0x80 #define NTFS_ATTR_TYPE_INDEX_ROOT 0x90 #define NTFS_ATTR_TYPE_INDEX_ALLOCATION 0xa0 #define NTFS_ATTR_TYPE_BITMAP 0xb0 -#define NTFS_ATTR_TYPE_SYMLINK 0xc0 +#define NTFS_ATTR_TYPE_REPARSE_POINT 0xc0 +#define NTFS_ATTR_TYPE_EA_INFORMATION 0xd0 +#define NTFS_ATTR_TYPE_EA 0xe0 #define NTFS_ATTR_TYPE_END 0xffffffff #define NTFS_ATTR_NORMAL 0 @@ -126,7 +133,8 @@ { ULONG ValueLength; USHORT ValueOffset; - USHORT Flags; + UCHAR Flags; + UCHAR Reserved; } Resident; // Non-resident attributes struct @@ -134,8 +142,8 @@ ULONGLONG LowestVCN; ULONGLONG HighestVCN; USHORT MappingPairsOffset; - UCHAR CompressionUnit; - UCHAR Reserved[5]; + USHORT CompressionUnit; + UCHAR Reserved[4]; LONGLONG AllocatedSize; LONGLONG DataSize; LONGLONG InitializedSize; @@ -180,7 +188,20 @@ WCHAR FileName[0]; } NTFS_FILE_NAME_ATTR, *PNTFS_FILE_NAME_ATTR; -typedef struct { +typedef struct +{ + ULONG Type; + USHORT RecLength; + UCHAR NameLength; + UCHAR NameOffset; + ULONGLONG StartingVCN; + ULONGLONG BaseFileRef; + USHORT AttrId; + PWCHAR Name; +} NTFS_ATTR_LIST_ATTR, *PNTFS_ATTR_LIST_ATTR; + +typedef struct +{ union { struct Modified: branches/cmake-bringup/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -2915,6 +2915,61 @@ RpcEndExcept; return ret; +} + + +/*********************************************************************** + * CM_Is_Version_Available_Ex [SETUPAPI.@] + */ +BOOL WINAPI CM_Is_Version_Available( + WORD wVersion) +{ + TRACE("%hu\n", wVersion); + return CM_Is_Version_Available_Ex(wVersion, NULL); +} + + +/*********************************************************************** + * CM_Is_Version_Available_Ex [SETUPAPI.@] + */ +BOOL WINAPI CM_Is_Version_Available_Ex( + WORD wVersion, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + WORD wServerVersion; + CONFIGRET ret; + + TRACE("%hu %lx\n", wVersion, hMachine); + + if (wVersion <= 0x400) + return TRUE; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return FALSE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return FALSE; + } + + RpcTryExcept + { + ret = PNP_GetVersion(BindingHandle, &wServerVersion); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + if (ret != CR_SUCCESS) + return FALSE; + + return (wServerVersion >= wVersion); } Modified: branches/cmake-bringup/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/setupapi.spec [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -137,8 +137,8 @@ @ stub CM_Invert_Range_List @ stdcall CM_Is_Dock_Station_Present(ptr) @ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) -@ stub CM_Is_Version_Available -@ stub CM_Is_Version_Available_Ex +@ stdcall CM_Is_Version_Available(long) +@ stdcall CM_Is_Version_Available_Ex(long long) @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stdcall CM_Locate_DevNode_ExA(ptr str long long) Modified: branches/cmake-bringup/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu… ============================================================================== --- branches/cmake-bringup/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/syssetup/install.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -477,15 +477,21 @@ SC_HANDLE hService = NULL; BOOL ret = FALSE; - hSCManager = OpenSCManager(NULL, NULL, 0); + hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); if (hSCManager == NULL) + { + DPRINT1("Unable to open the service control manager.\n"); goto cleanup; + } hService = OpenServiceW(hSCManager, L"PlugPlay", SERVICE_CHANGE_CONFIG | SERVICE_START); if (hService == NULL) + { + DPRINT1("Unable to open PlugPlay service\n"); goto cleanup; + } ret = ChangeServiceConfigW(hService, SERVICE_NO_CHANGE, @@ -494,11 +500,17 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (!ret) + { + DPRINT1("Unable to change the service configuration\n"); goto cleanup; + } ret = StartServiceW(hService, 0, NULL); if (!ret) + { + DPRINT("Unable to start service\n"); goto cleanup; + } ret = TRUE; Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -544,6 +544,25 @@ return MMSYSERR_NOERROR; } +VOID +CALLBACK +LegacyCompletionRoutine( + IN DWORD dwErrorCode, + IN DWORD dwNumberOfBytesTransferred, + IN LPOVERLAPPED lpOverlapped) +{ + PSOUND_OVERLAPPED Overlap; + PWDMAUD_DEVICE_INFO DeviceInfo; + + Overlap = (PSOUND_OVERLAPPED)lpOverlapped; + DeviceInfo = (PWDMAUD_DEVICE_INFO)Overlap->CompletionContext; + + /* Call mmebuddy overlap routine */ + Overlap->OriginalCompletionRoutine(dwErrorCode, DeviceInfo->Header.DataUsed, lpOverlapped); + + HeapFree(GetProcessHeap(), 0, DeviceInfo); +} + MMRESULT WdmAudCommitWaveBufferByLegacy( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, @@ -554,7 +573,7 @@ { HANDLE Handle; MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; + PWDMAUD_DEVICE_INFO DeviceInfo; PSOUND_DEVICE SoundDevice; MMDEVICE_TYPE DeviceType; BOOL Ret; @@ -577,36 +596,52 @@ Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( Result == MMSYSERR_NOERROR ); - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - DeviceInfo.Header.FrameExtent = Length; + DeviceInfo = (PWDMAUD_DEVICE_INFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WDMAUD_DEVICE_INFO)); + if (!DeviceInfo) + { + // no memory + return MMSYSERR_NOMEM; + } + + DeviceInfo->Header.FrameExtent = Length; if (DeviceType == WAVE_OUT_DEVICE_TYPE) { - DeviceInfo.Header.DataUsed = Length; - } - DeviceInfo.Header.Data = OffsetPtr; - DeviceInfo.Header.Size = sizeof(WDMAUD_DEVICE_INFO); - DeviceInfo.Header.PresentationTime.Numerator = 1; - DeviceInfo.Header.PresentationTime.Denominator = 1; - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - - - + DeviceInfo->Header.DataUsed = Length; + } + DeviceInfo->Header.Data = OffsetPtr; + DeviceInfo->Header.Size = sizeof(WDMAUD_DEVICE_INFO); + DeviceInfo->Header.PresentationTime.Numerator = 1; + DeviceInfo->Header.PresentationTime.Denominator = 1; + DeviceInfo->hDevice = Handle; + DeviceInfo->DeviceType = DeviceType; + + + // create completion event Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (Overlap->Standard.hEvent == NULL) + { + // no memory + return MMSYSERR_NOMEM; + } + + Overlap->OriginalCompletionRoutine = CompletionRoutine; + Overlap->CompletionContext = (PVOID)DeviceInfo; if (DeviceType == WAVE_OUT_DEVICE_TYPE) { - Ret = WriteFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); + Ret = WriteFileEx(KernelHandle, DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, LegacyCompletionRoutine); if (Ret) WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); } else if (DeviceType == WAVE_IN_DEVICE_TYPE) { - Ret = ReadFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); - //if (Ret) - // WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); - } + Ret = ReadFileEx(KernelHandle, DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, LegacyCompletionRoutine); + if (Ret) + WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); + } + + // close event handle + CloseHandle(Overlap->Standard.hEvent); return MMSYSERR_NOERROR; } Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -421,7 +421,7 @@ PSOUND_OVERLAPPED Overlap = (PSOUND_OVERLAPPED)lpOverlapped; /* Call mmebuddy overlap routine */ - Overlap->OriginalCompletionRoutine(dwErrorCode, Overlap->OriginalBufferSize, lpOverlapped); + Overlap->OriginalCompletionRoutine(dwErrorCode, PtrToUlong(Overlap->CompletionContext), lpOverlapped); } MMRESULT @@ -527,7 +527,7 @@ DeviceInfo.Header.PresentationTime.Numerator = 1; DeviceInfo.Header.PresentationTime.Denominator = 1; - Overlap->OriginalBufferSize = Length; + Overlap->CompletionContext = UlongToPtr(Length); Overlap->OriginalCompletionRoutine = CompletionRoutine; Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); Modified: branches/cmake-bringup/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/l… ============================================================================== --- branches/cmake-bringup/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -185,8 +185,8 @@ PWAVEHDR Header; BOOL PerformCompletion; - DWORD OriginalBufferSize; LPOVERLAPPED_COMPLETION_ROUTINE OriginalCompletionRoutine; + PVOID CompletionContext; } SOUND_OVERLAPPED, *PSOUND_OVERLAPPED; Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -14,7 +14,6 @@ add_subdirectory(fslib) add_subdirectory(lsalib) #add_subdirectory(nls) -add_subdirectory(ntdllsys) add_subdirectory(ppcmmu) add_subdirectory(pseh) add_subdirectory(recyclebin) @@ -23,7 +22,6 @@ add_subdirectory(sdk) add_subdirectory(smlib) add_subdirectory(tdilib) -add_subdirectory(win32ksys) else() Modified: branches/cmake-bringup/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/heap.c?re… ============================================================================== --- branches/cmake-bringup/lib/rtl/heap.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/heap.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -233,12 +233,6 @@ { /* Clear out all flags except the last entry one */ FreeEntry->Flags &= HEAP_ENTRY_LAST_ENTRY; - } - - /* Check if PreviousSize of the next entry matches ours */ - if (!(FreeEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) - { - ASSERT(((PHEAP_ENTRY)FreeEntry + BlockSize)->PreviousSize == BlockSize); } /* Insert it either into dedicated or non-dedicated list */ Modified: branches/cmake-bringup/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/nls.c?rev… ============================================================================== --- branches/cmake-bringup/lib/rtl/nls.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/nls.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -235,6 +235,8 @@ ULONG Size = 0; ULONG i; + PAGED_CODE_RTL(); + if (NlsMbCodePageTag == FALSE) { /* single-byte code page */ @@ -299,6 +301,8 @@ ULONG MbSize) { ULONG Length = 0; + + PAGED_CODE_RTL(); if (!NlsMbCodePageTag) { @@ -503,6 +507,8 @@ { ULONG Size = 0; ULONG i; + + PAGED_CODE_RTL(); if (NlsMbCodePageTag == FALSE) { Modified: branches/cmake-bringup/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/unicode.c… ============================================================================== --- branches/cmake-bringup/lib/rtl/unicode.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/unicode.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -76,7 +76,14 @@ PAGED_CODE_RTL(); - Length = RtlAnsiStringToUnicodeSize(AnsiSource); + if (NlsMbCodePageTag == FALSE) + { + Length = AnsiSource->Length * 2 + sizeof(WCHAR); + } + else + { + Length = RtlxAnsiStringToUnicodeSize(AnsiSource); + } if (Length > MAXUSHORT) return STATUS_INVALID_PARAMETER_2; UniDest->Length = (USHORT)Length - sizeof(WCHAR); @@ -90,6 +97,9 @@ { return STATUS_BUFFER_OVERFLOW; } + + /* UniDest->MaximumLength must be even due to sizeof(WCHAR) being 2 */ + ASSERT(!(UniDest->MaximumLength & 1) && UniDest->Length <= UniDest->MaximumLength); Status = RtlMultiByteToUnicodeN(UniDest->Buffer, UniDest->Length, @@ -122,6 +132,8 @@ RtlxAnsiStringToUnicodeSize(IN PCANSI_STRING AnsiString) { ULONG Size; + + PAGED_CODE_RTL(); /* Convert from Mb String to Unicode Size */ RtlMultiByteToUnicodeSize(&Size, @@ -963,7 +975,16 @@ PAGED_CODE_RTL(); - Length = RtlUnicodeStringToAnsiSize(UniSource); + ASSERT(!(UniSource->Length & 1)); + + if (NlsMbCodePageTag == FALSE) + { + Length = (UniSource->Length + sizeof(WCHAR)) / sizeof(WCHAR); + } + else + { + Length = RtlxUnicodeStringToAnsiSize(UniSource); + } if (Length > MAXUSHORT) return STATUS_INVALID_PARAMETER_2; AnsiDest->Length = (USHORT)Length - sizeof(CHAR); @@ -1953,6 +1974,10 @@ { ULONG Size; + PAGED_CODE_RTL(); + + ASSERT(!(UnicodeString->Length & 1)); + /* Convert the Unicode String to Mb Size */ RtlUnicodeToMultiByteSize(&Size, UnicodeString->Buffer, Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -107,6 +107,7 @@ ex/work.c ex/xipdisp.c ex/zone.c + ex/zw.S fsrtl/dbcsname.c fsrtl/fastio.c fsrtl/faulttol.c @@ -269,7 +270,6 @@ vf/driver.c wmi/wmi.c ntoskrnl.rc - ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def) if(ARCH MATCHES i386) @@ -451,3 +451,5 @@ add_minicd_target(ntoskrnl reactos ntoskrnl.exe) add_livecd_target(ntoskrnl reactos/system32) add_importlib_target(ntoskrnl.spec) + +add_library(ntdllsys ntdll.S) Modified: branches/cmake-bringup/ntoskrnl/ke/powerpc/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/power… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -44,7 +44,7 @@ CPUID(IN ULONG CpuInfo[4], IN ULONG InfoType) { - RtlZeroMemory(CpuInfo, sizeof(CpuInfo)); + RtlZeroMemory(CpuInfo, 4 * sizeof(ULONG)); } VOID Modified: branches/cmake-bringup/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/secti… ============================================================================== --- branches/cmake-bringup/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/mm/section.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -689,9 +689,6 @@ if(!Intsafe_AddULong32(&nPrevVirtualEndOfSegment, pssSegments[i].VirtualAddress, pssSegments[i].Length)) DIE(("The image is larger than 4GB\n")); } - - /* spare our caller some work in validating the segments */ - *Flags = EXEFMT_LOAD_ASSUME_SEGMENTS_SORTED | EXEFMT_LOAD_ASSUME_SEGMENTS_NO_OVERLAP; if(nSectionAlignment >= PAGE_SIZE) *Flags |= EXEFMT_LOAD_ASSUME_SEGMENTS_PAGE_ALIGNED; Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -192,3 +192,5 @@ add_dependencies(win32k gendib_generated subsystem_napi) add_cab_target(win32k 1) add_importlib_target(win32k.spec) + +add_library(win32ksys sys-stubs.S) Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -91,7 +91,7 @@ iColor >>= 13; iNewColor |= iColor & 0x3E0; - /* Copy green */ + /* Copy blue */ iColor >>= 13; iNewColor |= iColor & 0x1F; @@ -417,11 +417,11 @@ pexlo->aulXlate[0] = PALETTE_ulGetNearestPaletteIndex(ppalSrc, crSrcBackColor); } + else if (ppalSrc->flFlags & PAL_RGB) + { + pexlo->aulXlate[0] = crSrcBackColor; + } else if (ppalSrc->flFlags & PAL_BGR) - { - pexlo->aulXlate[0] = crSrcBackColor; - } - else if (ppalSrc->flFlags & PAL_RGB) { pexlo->aulXlate[0] = RGB(GetBValue(crSrcBackColor), GetGValue(crSrcBackColor), Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -272,64 +272,51 @@ FASTCALL InterlockedPopFreeEntry(VOID) { - ULONG idxFirst, idxNext, idxPrev; + ULONG iFirst, iNext, iPrev; PGDI_TABLE_ENTRY pEntry; - DWORD PrevProcId; DPRINT("Enter InterLockedPopFreeEntry\n"); - while (TRUE) - { - idxFirst = GdiHandleTable->FirstFree; - - if (!idxFirst) + do + { + /* Get the index and sequence number of the first free entry */ + iFirst = GdiHandleTable->FirstFree; + + /* Check if we have a free entry */ + if (!(iFirst & GDI_HANDLE_INDEX_MASK)) { /* Increment FirstUnused and get the new index */ - idxFirst = InterlockedIncrement((LONG*)&GdiHandleTable->FirstUnused) - 1; - - /* Check if we have entries left */ - if (idxFirst >= GDI_HANDLE_COUNT) + iFirst = InterlockedIncrement((LONG*)&GdiHandleTable->FirstUnused) - 1; + + /* Check if we have unused entries left */ + if (iFirst >= GDI_HANDLE_COUNT) { DPRINT1("No more gdi handles left!\n"); return 0; } /* Return the old index */ - return idxFirst; + return iFirst; } /* Get a pointer to the first free entry */ - pEntry = GdiHandleTable->Entries + idxFirst; - - /* Try to lock the entry */ - PrevProcId = InterlockedCompareExchange((LONG*)&pEntry->ProcessId, 1, 0); - if (PrevProcId != 0) - { - /* The entry was locked or not free, wait and start over */ - DelayExecution(); - continue; - } - - /* Sanity check: is entry really free? */ - ASSERT(((ULONG_PTR)pEntry->KernelData & ~GDI_HANDLE_INDEX_MASK) == 0); + pEntry = GdiHandleTable->Entries + (iFirst & GDI_HANDLE_INDEX_MASK); + + /* Create a new value with an increased sequence number */ + iNext = (USHORT)(ULONG_PTR)pEntry->KernelData; + iNext |= (iFirst & ~GDI_HANDLE_INDEX_MASK) + 0x10000; /* Try to exchange the FirstFree value */ - idxNext = (ULONG_PTR)pEntry->KernelData; - idxPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, - idxNext, - idxFirst); - - /* Unlock the free entry */ - (void)InterlockedExchange((LONG*)&pEntry->ProcessId, 0); - - /* If we succeeded, break out of the loop */ - if (idxPrev == idxFirst) - { - break; - } - } - - return idxFirst; + iPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, + iNext, + iFirst); + } + while (iPrev != iFirst); + + /* Sanity check: is entry really free? */ + ASSERT(((ULONG_PTR)pEntry->KernelData & ~GDI_HANDLE_INDEX_MASK) == 0); + + return iFirst & GDI_HANDLE_INDEX_MASK; } /* Pushes an entry of the handle table to the free list, @@ -338,7 +325,7 @@ FASTCALL InterlockedPushFreeEntry(ULONG idxToFree) { - ULONG idxFirstFree, idxPrev; + ULONG iToFree, iFirst, iPrev; PGDI_TABLE_ENTRY pFreeEntry; DPRINT("Enter InterlockedPushFreeEntry\n"); @@ -346,18 +333,26 @@ pFreeEntry = GdiHandleTable->Entries + idxToFree; ASSERT((pFreeEntry->Type & GDI_ENTRY_BASETYPE_MASK) == 0); ASSERT(pFreeEntry->ProcessId == 0); - pFreeEntry->UserData = NULL; + pFreeEntry->UserData = NULL; // FIXME + ASSERT(pFreeEntry->UserData == NULL); do { - idxFirstFree = GdiHandleTable->FirstFree; - pFreeEntry->KernelData = (PVOID)(ULONG_PTR)idxFirstFree; - - idxPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, - idxToFree, - idxFirstFree); - } - while (idxPrev != idxFirstFree); + /* Get the current first free index and sequence number */ + iFirst = GdiHandleTable->FirstFree; + + /* Set the KernelData member to the index of the first free entry */ + pFreeEntry->KernelData = UlongToPtr(iFirst & GDI_HANDLE_INDEX_MASK); + + /* Combine new index and increased sequence number in iToFree */ + iToFree = idxToFree | ((iFirst & ~GDI_HANDLE_INDEX_MASK) + 0x10000); + + /* Try to atomically update the first free entry */ + iPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, + iToFree, + iFirst); + } + while (iPrev != iFirst); } Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Wed Feb 9 15:56:57 2011 @@ -6,7 +6,6 @@ add_subdirectory(gendib) add_subdirectory(geninc) add_subdirectory(mkhive) -add_subdirectory(nci) add_subdirectory(spec2def) add_subdirectory(unicode)

1 0

[fireball] 50634: - Enable simple FontSmoothing by default. It matters for arwinss, trunk just ignores this value and always smoothes the fonts.
by fireball＠svn.reactos.org 09 Feb '11

09 Feb '11

Author: fireball Date: Wed Feb 9 14:07:10 2011 New Revision: 50634 URL: http://svn.reactos.org/svn/reactos?rev=50634&view=rev Log: - Enable simple FontSmoothing by default. It matters for arwinss, trunk just ignores this value and always smoothes the fonts. Modified: trunk/reactos/boot/bootdata/hivedef_amd64.inf trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Wed Feb 9 14:07:10 2011 @@ -97,7 +97,7 @@ HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" -HKCU,"Control Panel\Desktop","FontSmoothing",0,"0" +HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","ForegroundFlashCount",0x00010003,0x00000003 Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Wed Feb 9 14:07:10 2011 @@ -28,7 +28,7 @@ HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" -HKCU,"Control Panel\Desktop","FontSmoothing",0,"0" +HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 HKCU,"Control Panel\Desktop","UserPreferencesMask",3,10,00,00,80 HKCU,"Control Panel\Desktop","LowPowerActive",,"0" Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== Binary files - no diff available.

1 0

[fireball] 50633: - Add GetTransform declaration. (until we have undocgdi.h).
by fireball＠svn.reactos.org 09 Feb '11

09 Feb '11

Author: fireball Date: Wed Feb 9 13:31:31 2011 New Revision: 50633 URL: http://svn.reactos.org/svn/reactos?rev=50633&view=rev Log: - Add GetTransform declaration. (until we have undocgdi.h). Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Wed Feb 9 13:31:31 2011 @@ -3110,6 +3110,7 @@ int WINAPI GetTextFaceW(HDC,int,LPWSTR); BOOL WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA); BOOL WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW); +BOOL WINAPI GetTransform(HDC,DWORD,XFORM*); BOOL WINAPI GetViewportExtEx(HDC,LPSIZE); BOOL WINAPI GetViewportOrgEx(HDC,LPPOINT); BOOL WINAPI GetWindowExtEx(HDC,LPSIZE);

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