Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 53439: [CRT] Fix build
by tkreuzer＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tkreuzer Date: Thu Aug 25 09:34:26 2011 New Revision: 53439 URL: http://svn.reactos.org/svn/reactos?rev=53439&view=rev Log: [CRT] Fix build Modified: trunk/reactos/lib/sdk/crt/string/i386/tchar.h Modified: trunk/reactos/lib/sdk/crt/string/i386/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/i386/tchar.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/i386/tchar.h [iso-8859-1] Thu Aug 25 09:34:26 2011 @@ -10,6 +10,7 @@ #define _tcschr _wcschr #define _tcscmp _wcscmp #define _tcscpy _wcscpy +#define tcscpy wcscpy #define _tcslen _wcslen #define _tcsncat _wcsncat #define _tcsncmp _wcsncmp @@ -34,6 +35,7 @@ #define _tcschr _strchr #define _tcscmp _strcmp #define _tcscpy _strcpy +#define tcscpy strcpy #define _tcslen _strlen #define _tcsncat _strncat #define _tcsncmp _strncmp

1 0

[tkreuzer] 53438: [CRT] Add frame pointer omission info to strcpy and wcscpy
by tkreuzer＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tkreuzer Date: Thu Aug 25 09:25:26 2011 New Revision: 53438 URL: http://svn.reactos.org/svn/reactos?rev=53438&view=rev Log: [CRT] Add frame pointer omission info to strcpy and wcscpy Modified: trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc Modified: trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc [iso-8859-1] Thu Aug 25 09:25:26 2011 @@ -7,9 +7,11 @@ PUBLIC _tcscpy .code -_tcscpy: +FUNC tcscpy + FPO 0, 2, 2, 2, 0, FRAME_FPO push esi push edi + mov edi, [esp + 12] mov esi, [esp + 16] cld @@ -25,6 +27,7 @@ pop edi pop esi ret +ENDFUNC tcscpy END /* EOF */

1 0

[rharabien] 53437: [INF] - Add Polish translation of device names
by rharabien＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: rharabien Date: Thu Aug 25 09:18:43 2011 New Revision: 53437 URL: http://svn.reactos.org/svn/reactos?rev=53437&view=rev Log: [INF] - Add Polish translation of device names Modified: trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/audio.inf trunk/reactos/media/inf/battery.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hal.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=534… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=53… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Thu Aug 25 09:18:43 2011 @@ -77,6 +77,9 @@ AUDIOClassName = "Dispositivos de sonido, vídeo y juegos" [Strings.0416] +AUDIOClassName = "Kontrolery audio, wideo i gier" + +[Strings.0416] AUDIOClassName = "Controladores de som, vídeo e jogo" [Strings.0427] Modified: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=53… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=5343… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=5343… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hal.inf?rev=5343… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5343… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=5… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=53… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=534… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=5343… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

[gadamopoulos] 53436: [user32/win32k] - cleanup internal headers - remove unused functions and definitions - move shared definitions to ntuser.h
by gadamopoulos＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: gadamopoulos Date: Thu Aug 25 08:51:26 2011 New Revision: 53436 URL: http://svn.reactos.org/svn/reactos?rev=53436&view=rev Log: [user32/win32k] - cleanup internal headers - remove unused functions and definitions - move shared definitions to ntuser.h Added: trunk/reactos/dll/win32/user32/include/user_x.h (with props) Removed: trunk/reactos/dll/win32/user32/include/accel.h trunk/reactos/dll/win32/user32/include/cursor.h trunk/reactos/dll/win32/user32/include/draw.h trunk/reactos/dll/win32/user32/include/menu.h trunk/reactos/dll/win32/user32/include/message.h trunk/reactos/dll/win32/user32/include/scroll.h trunk/reactos/dll/win32/user32/include/window.h trunk/reactos/dll/win32/user32/include/winpos.h trunk/reactos/dll/win32/user32/include/winsta.h Modified: trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/include/controls.h trunk/reactos/dll/win32/user32/include/ntwrapper.h trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/misc/timer.c trunk/reactos/dll/win32/user32/misc/usrapihk.c trunk/reactos/dll/win32/user32/windows/accel.c trunk/reactos/dll/win32/user32/windows/caret.c trunk/reactos/dll/win32/user32/windows/clipboard.c trunk/reactos/dll/win32/user32/windows/cursoricon.c trunk/reactos/dll/win32/user32/windows/dc.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/messagebox.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/cleanup.h trunk/reactos/subsystems/win32/win32k/include/cliprgn.h trunk/reactos/subsystems/win32/win32k/include/gdifloat.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -786,7 +786,7 @@ TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(descr->items[index].str)); - __TRY /* hide a Delphi bug that passes a read-only buffer */ + _SEH2_TRY /* hide a Delphi bug that passes a read-only buffer */ { if(unicode) { @@ -799,13 +799,13 @@ (LPSTR)buffer, 0x7FFFFFFF, NULL, NULL) - 1; } } - __EXCEPT_PAGE_FAULT + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { WARN( "got an invalid buffer (Delphi bug?)\n" ); SetLastError( ERROR_INVALID_PARAMETER ); - return LB_ERR; - } - __ENDTRY + len = LB_ERR; + } + _SEH2_END } else { if (buffer) *((LPDWORD)buffer)=*(LPDWORD)(&descr->items[index].data); Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1482,7 +1482,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -1534,7 +1534,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -1615,7 +1615,7 @@ BOOL Hook; INT Ret = 0; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Removed: trunk/reactos/dll/win32/user32/include/accel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/a… ============================================================================== --- trunk/reactos/dll/win32/user32/include/accel.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/accel.h (removed) @@ -1,26 +1,0 @@ -/* $Id$ -*/ - -#pragma once - -/* ACCELERATOR TABLES CACHE */ -/* Cache entry */ -typedef struct _USER_ACCEL_CACHE_ENTRY -{ - struct _USER_ACCEL_CACHE_ENTRY * Next; - ULONG_PTR Usage; /* how many times the table has been loaded */ - HACCEL Object; /* handle to the NtUser accelerator table object */ - HGLOBAL Data; /* base address of the resource data */ -} -U32_ACCEL_CACHE_ENTRY; - -/* Lock guarding the cache */ -extern CRITICAL_SECTION U32AccelCacheLock; - -/* Cache */ -extern U32_ACCEL_CACHE_ENTRY * U32AccelCache; - -extern U32_ACCEL_CACHE_ENTRY ** WINAPI U32AccelCacheFind(HANDLE, HGLOBAL); -extern void WINAPI U32AccelCacheAdd(HACCEL, HGLOBAL); - -/* EOF */ Modified: trunk/reactos/dll/win32/user32/include/controls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -34,11 +34,7 @@ #define HBMMENU_POPUP_MINIMIZE ((HBITMAP) 11) #endif -/* winuser.h */ - - /* combo box */ - #define ID_CB_LISTBOX 1000 #define ID_CB_EDIT 1001 @@ -111,6 +107,10 @@ LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode); +LRESULT WINAPI PopupMenuWndProcA(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); +LRESULT WINAPI PopupMenuWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); +LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam,LPARAM lParam ); +LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam,LPARAM lParam ); LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode); Removed: trunk/reactos/dll/win32/user32/include/cursor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/cursor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/cursor.h (removed) @@ -1,15 +1,0 @@ -HCURSOR -CursorIconToCursor(HICON hIcon, - BOOL SemiTransparent); - -HICON CreateCursorIconFromData(PVOID ImageData, - ICONIMAGE* IconImage, - int cxDesired, - int cyDesired, - int xHotspot, - int yHotspot, - BOOL fIcon); - - -BOOL get_icon_size(HICON hIcon, SIZE *size); - Removed: trunk/reactos/dll/win32/user32/include/draw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/d… ============================================================================== --- trunk/reactos/dll/win32/user32/include/draw.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/draw.h (removed) @@ -1,1 +1,0 @@ -void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo); Removed: trunk/reactos/dll/win32/user32/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m… ============================================================================== --- trunk/reactos/dll/win32/user32/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/menu.h (removed) @@ -1,22 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: include/window.h - * PURPOSE: Window management definitions - */ - -#pragma once - -UINT -MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw); -BOOL -MenuInit(VOID); -VOID -MenuCleanup(VOID); -VOID -MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt); -VOID -MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar); - -LRESULT WINAPI PopupMenuWndProcA(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); -LRESULT WINAPI PopupMenuWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Removed: trunk/reactos/dll/win32/user32/include/message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m… ============================================================================== --- trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/message.h (removed) @@ -1,19 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: include/message.h - * PURPOSE: Message management definitions - */ - -#pragma once - -BOOL FASTCALL MessageInit(VOID); -VOID FASTCALL MessageCleanup(VOID); - -static __inline BOOL -IsCallProcHandle(IN WNDPROC lpWndProc) -{ - /* FIXME - check for 64 bit architectures... */ - return ((ULONG_PTR)lpWndProc & 0xFFFF0000) == 0xFFFF0000; -} Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/n… ============================================================================== --- trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -235,9 +235,27 @@ } EXTINLINE BOOL WINAPI +GetClipCursor(LPRECT lpRect) +{ + return NtUserGetClipCursor(lpRect); +} + +EXTINLINE BOOL WINAPI GetCursorInfo(PCURSORINFO pci) { return NtUserGetCursorInfo(pci); +} + +EXTINLINE BOOL WINAPI +ClipCursor(CONST RECT *lpRect) +{ + return NtUserClipCursor((RECT *)lpRect); +} + +EXTINLINE HCURSOR WINAPI +SetCursor(HCURSOR hCursor) +{ + return NtUserSetCursor(hCursor); } EXTINLINE HDC WINAPI @@ -484,3 +502,300 @@ { return NtUserValidateRect(hWnd, lpRect); } + +EXTINLINE BOOL WINAPI ShowCaret( HWND hWnd ) +{ + return NtUserShowCaret(hWnd); +} + +EXTINLINE BOOL WINAPI HideCaret( HWND hWnd ) +{ + return NtUserHideCaret(hWnd); +} + + + + +/* + Inline functions that make calling NtUserCall*** functions readable + These functions are prepended with NtUserx because they are not + real syscalls and they are inlined +*/ + +EXTINLINE BOOL NtUserxDestroyCaret(VOID) +{ + return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_DESTROY_CARET); +} + +EXTINLINE VOID NtUserxMsqClearWakeMask() +{ + NtUserCallNoParam(NOPARAM_ROUTINE_MSQCLEARWAKEMASK); +} + +EXTINLINE HMENU NtUserxCreateMenu() +{ + return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENU); +} + +EXTINLINE HMENU NtUserxCreatePopupMenu() +{ + return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENUPOPUP); +} + +EXTINLINE DWORD NtUserxGetMessagePos(VOID) +{ + return (DWORD)NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS); +} + +EXTINLINE BOOL NtUserxReleaseCapture(VOID) +{ + return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_RELEASECAPTURE); +} + +EXTINLINE BOOL NtUserxInitMessagePump() +{ + return NtUserCallNoParam(NOPARAM_ROUTINE_INIT_MESSAGE_PUMP); +} + +EXTINLINE BOOL NtUserxUnInitMessagePump() +{ + return NtUserCallNoParam(NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP); +} + +EXTINLINE HANDLE NtUserxMsqSetWakeMask(DWORD_PTR dwWaitMask) +{ + return (HANDLE)NtUserCallOneParam(dwWaitMask, ONEPARAM_ROUTINE_GETINPUTEVENT); +} + +EXTINLINE BOOL NtUserxSetCaretBlinkTime(UINT uMSeconds) +{ + return (BOOL)NtUserCallOneParam(uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME); +} + +EXTINLINE HWND NtUserxWindowFromDC(HDC hDC) +{ + return (HWND)NtUserCallOneParam((DWORD_PTR)hDC, ONEPARAM_ROUTINE_WINDOWFROMDC); +} + +EXTINLINE BOOL NtUserxSwapMouseButton(BOOL fSwap) +{ + return (BOOL)NtUserCallOneParam((DWORD_PTR)fSwap, ONEPARAM_ROUTINE_SWAPMOUSEBUTTON); +} + +EXTINLINE LPARAM NtUserxSetMessageExtraInfo(LPARAM lParam) +{ + return (LPARAM)NtUserCallOneParam((DWORD_PTR)lParam, ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO); +} + +EXTINLINE INT NtUserxShowCursor(BOOL bShow) +{ + return (INT)NtUserCallOneParam((DWORD_PTR)bShow, ONEPARAM_ROUTINE_SHOWCURSOR); +} + +EXTINLINE UINT NtUserxEnumClipboardFormats(UINT format) +{ + return (UINT)NtUserCallOneParam((DWORD_PTR)format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS); +} + +EXTINLINE HICON NtUserxCreateEmptyCurObject(DWORD_PTR Param) +{ + return (HICON)NtUserCallOneParam(Param, ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT); +} + +EXTINLINE BOOL NtUserxMessageBeep(UINT uType) +{ + return (BOOL)NtUserCallOneParam(uType, ONEPARAM_ROUTINE_MESSAGEBEEP); +} + +EXTINLINE HKL NtUserxGetKeyboardLayout(DWORD idThread) +{ + return (HKL)NtUserCallOneParam((DWORD_PTR) idThread, ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT); +} + +EXTINLINE INT NtUserxGetKeyboardType(INT nTypeFlag) +{ + return (INT)NtUserCallOneParam((DWORD_PTR) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE); +} + +EXTINLINE INT NtUserxReleaseDC(HDC hDC) +{ + return (INT)NtUserCallOneParam((DWORD_PTR) hDC, ONEPARAM_ROUTINE_RELEASEDC); +} + +EXTINLINE UINT NtUserxRealizePalette ( HDC hDC ) +{ + return (UINT)NtUserCallOneParam((DWORD_PTR) hDC, ONEPARAM_ROUTINE_REALIZEPALETTE); +} + +EXTINLINE VOID NtUserxCreateSystemThreads(DWORD param) +{ + NtUserCallOneParam(param, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); +} + +EXTINLINE HDWP NtUserxBeginDeferWindowPos(INT nNumWindows) +{ + return (HDWP)NtUserCallOneParam((DWORD_PTR)nNumWindows, ONEPARAM_ROUTINE_BEGINDEFERWNDPOS); +} + +EXTINLINE BOOL NtUserxReplyMessage(LRESULT lResult) +{ + return NtUserCallOneParam(lResult, ONEPARAM_ROUTINE_REPLYMESSAGE); +} + +EXTINLINE VOID NtUserxPostQuitMessage(int nExitCode) +{ + NtUserCallOneParam(nExitCode, ONEPARAM_ROUTINE_POSTQUITMESSAGE); +} + +EXTINLINE DWORD NtUserxGetQueueStatus(UINT flags) +{ + return (DWORD)NtUserCallOneParam(flags, ONEPARAM_ROUTINE_GETQUEUESTATUS); +} + +EXTINLINE BOOL NtUserxValidateRgn(HWND hWnd, HRGN hRgn) +{ + return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_VALIDATERGN); +} + +EXTINLINE BOOL NtUserxSetCursorPos(INT x, INT y) +{ + return (BOOL)NtUserCallTwoParam((DWORD)x, (DWORD)y, TWOPARAM_ROUTINE_SETCURSORPOS); +} + +EXTINLINE BOOL NtUserxEnableWindow(HWND hWnd, BOOL bEnable) +{ + return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)bEnable, TWOPARAM_ROUTINE_ENABLEWINDOW); +} + +EXTINLINE BOOL NtUserxUpdateUiState(HWND hWnd, DWORD Param) +{ + return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)Param, TWOPARAM_ROUTINE_ROS_UPDATEUISTATE); +} + +EXTINLINE BOOL NtUserxShowOwnedPopups(HWND hWnd, BOOL fShow) +{ + return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS); +} + +EXTINLINE BOOL NtUserxUnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc ) +{ + return (BOOL)NtUserCallTwoParam(nCode, (DWORD_PTR)pfnFilterProc, TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK); +} + +EXTINLINE BOOL NtUserxSetWindowContextHelpId(HWND hWnd, DWORD_PTR dwContextHelpId) +{ + return (BOOL)NtUserCallHwndParam(hWnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID); +} + +EXTINLINE BOOL NtUserxKillSystemTimer(HWND hWnd, UINT_PTR IDEvent) +{ + return (BOOL)NtUserCallHwndParam(hWnd, IDEvent, HWNDPARAM_ROUTINE_KILLSYSTEMTIMER); +} + +EXTINLINE VOID NtUserxSetDialogPointer(HWND hWnd, PVOID dlgInfo) +{ + NtUserCallHwndParam( hWnd, (DWORD_PTR)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); +} + +EXTINLINE VOID NtUserxNotifyWinEvent(HWND hWnd, PVOID ne) +{ + NtUserCallHwndParam(hWnd, (DWORD_PTR)ne, HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT); +} + +EXTINLINE DWORD NtUserxGetWindowContextHelpId(HWND hwnd) +{ + return NtUserCallHwnd(hwnd, HWND_ROUTINE_GETWNDCONTEXTHLPID); +} + +EXTINLINE BOOL NtUserxDeregisterShellHookWindow(HWND hWnd) +{ + return NtUserCallHwnd(hWnd, HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW); +} + +EXTINLINE BOOL NtUserxRegisterShellHookWindow(HWND hWnd) +{ + return NtUserCallHwnd(hWnd, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW); +} + +EXTINLINE HWND NtUserxSetTaskmanWindow(HWND hWnd) +{ + return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); +} + +EXTINLINE HWND NtUserxSetProgmanWindow(HWND hWnd) +{ + return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETPROGMANWINDOW); +} + +EXTINLINE UINT NtUserxArrangeIconicWindows(HWND hWnd) +{ + return (UINT)NtUserCallHwndLock( hWnd, HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS); +} + +EXTINLINE BOOL NtUserxUpdateWindow(HWND hWnd) +{ + return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_UPDATEWINDOW); +} + +EXTINLINE BOOL NtUserxDrawMenuBar(HWND hWnd) +{ + return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_DRAWMENUBAR); +} + +EXTINLINE BOOL NtUserxMDIRedrawFrame(HWND hWnd) +{ + return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_REDRAWFRAME); +} + +EXTINLINE BOOL NtUserxSetForegroundWindow(HWND hWnd) +{ + return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW); +} + + +/* Reactos specific definitions */ + +EXTINLINE LPARAM NtUserxGetMessageExtraInfo(VOID) +{ + return (LPARAM)NtUserCallNoParam(NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO); +} + +EXTINLINE BOOL NtUserxSwitchCaretShowing(THRDCARETINFO* CaretInfo) +{ + return (BOOL)NtUserCallOneParam((DWORD_PTR)CaretInfo, ONEPARAM_ROUTINE_SWITCHCARETSHOWING); +} + +EXTINLINE VOID NtUserxEnableProcessWindowGhosting(BOOL bEnable) +{ + NtUserCallOneParam((DWORD_PTR)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING); +} + +EXTINLINE PVOID NtUserxGetDesktopMapping(PVOID ptr) +{ + return (PVOID)NtUserCallOneParam((DWORD_PTR)ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING); +} + +EXTINLINE BOOL NtUserxGetCursorPos(POINT* lpPoint) +{ + return (BOOL)NtUserCallOneParam((DWORD_PTR)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION); +} + +EXTINLINE BOOL NtUserxSetMenuBarHeight(HMENU menu, INT height) +{ + return (BOOL)NtUserCallTwoParam((DWORD_PTR)menu, (DWORD_PTR)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT); +} + +EXTINLINE BOOL NtUserxSetGUIThreadHandle(DWORD_PTR field, HWND hwnd) +{ + return (BOOL)NtUserCallTwoParam((DWORD_PTR)field, (DWORD_PTR)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE); +} + +EXTINLINE BOOL NtUserxSetCaretPos(INT x, INT y) +{ + return (BOOL)NtUserCallTwoParam((DWORD_PTR)x, (DWORD_PTR)y, TWOPARAM_ROUTINE_SETCARETPOS); +} + +EXTINLINE BOOL NtUserxRegisterLogonProcess(DWORD dwProcessId, BOOL bRegister) +{ + return (BOOL)NtUserCallTwoParam((DWORD_PTR)dwProcessId, (DWORD_PTR)bRegister, TWOPARAM_ROUTINE_REGISTERLOGONPROCESS); +} Removed: trunk/reactos/dll/win32/user32/include/scroll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/s… ============================================================================== --- trunk/reactos/dll/win32/user32/include/scroll.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/scroll.h (removed) @@ -1,13 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: include/user32.h - * PURPOSE: Global user32 definitions - */ - -#pragma once - -LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam,LPARAM lParam ); -LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam,LPARAM lParam ); -VOID FASTCALL ScrollTrackScrollBar(HWND Wnd, INT SBType, POINT Pt); Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -19,7 +19,6 @@ #define NTOS_MODE_USER #define WIN32_NO_STATUS #include <windows.h> -#include <winuser.h> #include <windowsx.h> #include <winnls32.h> #include <ndk/cmfuncs.h> @@ -42,112 +41,11 @@ /* WINE Headers */ #include <wine/unicode.h> +/* SEH Support with PSEH */ +#include <pseh/pseh2.h> + /* Internal User32 Headers */ #include "user32p.h" -/* SEH Support with PSEH */ -#include <pseh/pseh2.h> - -#define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) -#define ISITHOOKED(HookId) (GetWin32ClientInfo()->fsHooks & HOOKID_TO_FLAG(HookId) ||\ - (GetWin32ClientInfo()->pDeskInfo && GetWin32ClientInfo()->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId))) - -/* Temporarily in here for now. */ - -extern RTL_CRITICAL_SECTION gcsUserApiHook; -extern USERAPIHOOK guah; -BOOL FASTCALL BeginIfHookedUserApiHook(VOID); -BOOL FASTCALL EndUserApiHook(VOID); -BOOL FASTCALL IsInsideUserApiHook(VOID); -VOID FASTCALL ResetUserApiHook(PUSERAPIHOOK); -BOOL FASTCALL IsMsgOverride(UINT,PUAHOWP); - -#define LOADUSERAPIHOOK \ - if (!gfServerProcess && \ - !IsInsideUserApiHook() && \ - (gpsi->dwSRVIFlags & SRVINFO_APIHOOK) && \ - !RtlIsThreadWithinLoaderCallout()) \ - { \ - NtUserCallNoParam(NOPARAM_ROUTINE_LOADUSERAPIHOOK); \ - } \ - -/* FIXME: Use ntgdi.h then cleanup... */ -LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); -BOOL FASTCALL IsMetaFile(HDC); - -extern PPROCESSINFO g_ppi; -extern ULONG_PTR g_ulSharedDelta; -extern PSERVERINFO gpsi; -extern BOOL gfServerProcess; - -static __inline PVOID -SharedPtrToUser(PVOID Ptr) -{ - ASSERT(Ptr != NULL); - ASSERT(g_ulSharedDelta != 0); - return (PVOID)((ULONG_PTR)Ptr - g_ulSharedDelta); -} - -static __inline PVOID -DesktopPtrToUser(PVOID Ptr) -{ - PCLIENTINFO pci; - PDESKTOPINFO pdi; - GetW32ThreadInfo(); - pci = GetWin32ClientInfo(); - pdi = pci->pDeskInfo; - - ASSERT(Ptr != NULL); - ASSERT(pdi != NULL); - if ((ULONG_PTR)Ptr >= (ULONG_PTR)pdi->pvDesktopBase && - (ULONG_PTR)Ptr < (ULONG_PTR)pdi->pvDesktopLimit) - { - return (PVOID)((ULONG_PTR)Ptr - pci->ulClientDelta); - } - else - { - /* NOTE: This is slow as it requires a call to win32k. This should only be - neccessary if a thread wants to access an object on a different - desktop */ - return (PVOID)NtUserGetDesktopMapping(Ptr); - } -} - -static __inline PVOID -SharedPtrToKernel(PVOID Ptr) -{ - ASSERT(Ptr != NULL); - ASSERT(g_ulSharedDelta != 0); - return (PVOID)((ULONG_PTR)Ptr + g_ulSharedDelta); -} - -static __inline BOOL -IsThreadHooked(PCLIENTINFO pci) -{ - return (pci->fsHooks|pci->pDeskInfo->fsHooks) != 0; -} - -static __inline PDESKTOPINFO -GetThreadDesktopInfo(VOID) -{ - PTHREADINFO ti; - PDESKTOPINFO di = NULL; - - ti = GetW32ThreadInfo(); - if (ti != NULL) - di = GetWin32ClientInfo()->pDeskInfo; - - return di; -} - -PCALLPROCDATA FASTCALL ValidateCallProc(HANDLE hCallProc); -PWND FASTCALL ValidateHwnd(HWND hwnd); -PWND FASTCALL ValidateHwndOrDesk(HWND hwnd); -PWND FASTCALL GetThreadDesktopWnd(VOID); -PVOID FASTCALL ValidateHandleNoErr(HANDLE handle, UINT uType); -PWND FASTCALL ValidateHwndNoErr(HWND hwnd); -VOID FASTCALL GetConnected(VOID); -BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi); -BOOL FASTCALL TestWindowProcess(PWND); -VOID UserGetWindowBorders(DWORD, DWORD, SIZE *, BOOL); -VOID FASTCALL IntNotifyWinEvent(DWORD, HWND, LONG, LONG, DWORD); +/* User macros */ +#include "user_x.h" Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -11,231 +11,90 @@ #pragma once /* Private User32 Headers */ -#include "accel.h" -#include "cursor.h" #include "controls.h" -#include "draw.h" #include "dde_private.h" -#include "menu.h" -#include "message.h" #include "regcontrol.h" #include "resource.h" -#include "scroll.h" -#include "window.h" -#include "winpos.h" -#include "winsta.h" #include "ntwrapper.h" + +/* global variables */ +extern HINSTANCE User32Instance; +#define user32_module User32Instance +extern PPROCESSINFO g_ppi; +extern ULONG_PTR g_ulSharedDelta; +extern PSERVERINFO gpsi; +extern BOOL gfServerProcess; +extern PUSER_HANDLE_TABLE gHandleTable; +extern PUSER_HANDLE_ENTRY gHandleEntries; +extern CRITICAL_SECTION U32AccelCacheLock; +extern HINSTANCE hImmInstance; #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) -/* One/Two Param Functions */ -#define NtUserMsqSetWakeMask(dwWaitMask) \ - (HANDLE)NtUserCallOneParam(dwWaitMask, ONEPARAM_ROUTINE_GETINPUTEVENT) +/* FIXME: move to a correct header */ +/* undocumented gdi32 definitions */ +BOOL WINAPI GdiDllInitialize(HANDLE, DWORD, LPVOID); +LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); -#define NtUserMsqClearWakeMask() \ - NtUserCallNoParam(NOPARAM_ROUTINE_MSQCLEARWAKEMASK) - -#define NtUserValidateRgn(hWnd, hRgn) \ - (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_VALIDATERGN) - -#define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \ - (BOOL)NtUserCallHwndParam(hWnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID) - -#define NtUserSetCaretPos(X, Y) \ - (BOOL)NtUserCallTwoParam((DWORD_PTR)X, (DWORD_PTR)Y, TWOPARAM_ROUTINE_SETCARETPOS) - -#define NtUserSetGUIThreadHandle(field, hwnd) \ - (BOOL)NtUserCallTwoParam((DWORD_PTR)field, (DWORD_PTR)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE) - -#define NtUserSetMenuBarHeight(menu, height) \ - (BOOL)NtUserCallTwoParam((DWORD_PTR)menu, (DWORD_PTR)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT) - -#define NtUserRegisterLogonProcess(hproc, x) \ - (BOOL)NtUserCallTwoParam((DWORD_PTR)hproc, (DWORD_PTR)x, TWOPARAM_ROUTINE_REGISTERLOGONPROC) - -#define NtUserGetSysColorBrushes(HBrushes, count) \ - (BOOL)NtUserCallTwoParam((DWORD_PTR)(HBrushes), (DWORD_PTR)(count), TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES) - -#define NtUserGetSysColors(ColorRefs, count) \ - (BOOL)NtUserCallTwoParam((DWORD_PTR)(ColorRefs), (DWORD_PTR)(count), TWOPARAM_ROUTINE_GETSYSCOLORS) - -#define NtUserSetCaretBlinkTime(uMSeconds) \ - (BOOL)NtUserCallOneParam((DWORD_PTR)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME) - -/* -#define NtUserEnumClipboardFormats(format) \ - (UINT)NtUserCallOneParam(format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS) -*/ - -#define NtUserWindowFromDC(hDC) \ - (HWND)NtUserCallOneParam((DWORD_PTR)hDC, ONEPARAM_ROUTINE_WINDOWFROMDC) - -#define NtUserSwitchCaretShowing(CaretInfo) \ - (BOOL)NtUserCallOneParam((DWORD_PTR)CaretInfo, ONEPARAM_ROUTINE_SWITCHCARETSHOWING) - -#define NtUserSwapMouseButton(fSwap) \ - (BOOL)NtUserCallOneParam((DWORD_PTR)fSwap, ONEPARAM_ROUTINE_SWAPMOUSEBUTTON) - -#define NtUserSetMessageExtraInfo(lParam) \ - (LPARAM)NtUserCallOneParam((DWORD_PTR)lParam, ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO) - -#define NtUserGetWindowContextHelpId(hwnd) \ - NtUserCallOneParam((DWORD_PTR)hwnd, ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID) - -#define NtUserGetCursorPos(lpPoint) \ - (BOOL)NtUserCallOneParam((DWORD_PTR)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION) - -#define NtUserEnableProcessWindowGhosting(bEnable) \ - NtUserCallOneParam((DWORD_PTR)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING) - -#define NtUserShowCursor(bShow) \ - NtUserCallOneParam((DWORD_PTR)bShow, ONEPARAM_ROUTINE_SHOWCURSOR) - -#define NtUserGetDesktopMapping(Ptr) \ - (PVOID)NtUserCallOneParam((DWORD_PTR)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING) - -#define NtUserSetCursorPos(x, y) \ - (BOOL)NtUserCallTwoParam((DWORD)x, (DWORD)y, TWOPARAM_ROUTINE_SETCURSORPOS) - -#define ShowCaret(hwnd) \ - NtUserShowCaret(hwnd) - -#define HideCaret(hwnd) \ - NtUserHideCaret(hwnd) - -/* Internal Thread Data */ -extern HINSTANCE User32Instance; -#define user32_module User32Instance -extern HINSTANCE hImmInstance; - -/* Critical Section*/ -extern RTL_CRITICAL_SECTION User32Crit; - -/* FIXME: Belongs to some header. */ -BOOL WINAPI GdiDllInitialize(HANDLE, DWORD, LPVOID); -void InitStockObjects(void); -VOID DeleteFrameBrushes(VOID); - -/* message spy definitions */ +/* definitions for spy.c */ #define SPY_DISPATCHMESSAGE 0x0101 #define SPY_SENDMESSAGE 0x0103 #define SPY_DEFWNDPROC 0x0105 - #define SPY_RESULT_OK 0x0001 #define SPY_RESULT_INVALIDHWND 0x0003 #define SPY_RESULT_DEFWND 0x0005 - - extern const char *SPY_GetMsgName(UINT msg, HWND hWnd); extern const char *SPY_GetVKeyName(WPARAM wParam); extern void SPY_EnterMessage(INT iFlag, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); -extern void SPY_ExitMessage(INT iFlag, HWND hwnd, UINT msg, - LRESULT lReturn, WPARAM wParam, LPARAM lParam); +extern void SPY_ExitMessage(INT iFlag, HWND hwnd, UINT msg, LRESULT lReturn, WPARAM wParam, LPARAM lParam); extern int SPY_Init(void); +/* definitions for usrapihk.c */ +extern RTL_CRITICAL_SECTION gcsUserApiHook; +extern USERAPIHOOK guah; +BOOL FASTCALL BeginIfHookedUserApiHook(VOID); +BOOL FASTCALL EndUserApiHook(VOID); +BOOL FASTCALL IsInsideUserApiHook(VOID); +VOID FASTCALL ResetUserApiHook(PUSERAPIHOOK); +BOOL FASTCALL IsMsgOverride(UINT,PUAHOWP); -/* Validate window handle types */ -#define VALIDATE_TYPE_FREE 0 -#define VALIDATE_TYPE_WIN 1 -#define VALIDATE_TYPE_MENU 2 -#define VALIDATE_TYPE_CURSOR 3 -#define VALIDATE_TYPE_MWPOS 4 -#define VALIDATE_TYPE_HOOK 5 -#define VALIDATE_TYPE_CALLPROC 7 -#define VALIDATE_TYPE_ACCEL 8 -#define VALIDATE_TYPE_MONITOR 12 -#define VALIDATE_TYPE_EVENT 15 -#define VALIDATE_TYPE_TIMER 16 +/* definitions for message.c */ +BOOL FASTCALL MessageInit(VOID); +VOID FASTCALL MessageCleanup(VOID); -#define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ -#define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ -#define NB_USER_HANDLES ((LAST_USER_HANDLE - FIRST_USER_HANDLE + 1) >> 1) -#define USER_HANDLE_TO_INDEX(hwnd) ((LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1) - -#define USER_HEADER_TO_BODY(ObjectHeader) \ - ((PVOID)(((PUSER_OBJECT_HEADER)ObjectHeader) + 1)) - -#define USER_BODY_TO_HEADER(ObjectBody) \ - ((PUSER_OBJECT_HEADER)(((PUSER_OBJECT_HEADER)ObjectBody) - 1)) - -#define HANDLEENTRY_INDESTROY 1 - -typedef struct _USER_HANDLE_ENTRY -{ - void *ptr; /* pointer to object */ - union - { - PVOID pi; - PTHREADINFO pti; // pointer to Win32ThreadInfo - PPROCESSINFO ppi; // pointer to W32ProcessInfo - }; - unsigned char type; /* object type (0 if free) */ - unsigned char flags; - unsigned short generation; /* generation counter */ -} USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; - -typedef struct _USER_HANDLE_TABLE -{ - PUSER_HANDLE_ENTRY handles; - PUSER_HANDLE_ENTRY freelist; - int nb_handles; - int allocated_handles; -} USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; - -extern PUSER_HANDLE_TABLE gHandleTable; -extern PUSER_HANDLE_ENTRY gHandleEntries; - -PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE); +/* definitions for misc.c */ +PCALLPROCDATA FASTCALL ValidateCallProc(HANDLE hCallProc); +PWND FASTCALL ValidateHwnd(HWND hwnd); +PWND FASTCALL ValidateHwndOrDesk(HWND hwnd); +PWND FASTCALL GetThreadDesktopWnd(VOID); +PVOID FASTCALL ValidateHandleNoErr(HANDLE handle, UINT uType); +PWND FASTCALL ValidateHwndNoErr(HWND hwnd); +BOOL FASTCALL TestWindowProcess(PWND); PVOID FASTCALL ValidateHandle(HANDLE, UINT); -#define WIN_GetFullHandle(h) ((HWND)(h)) +/* definitions for menu.c */ +BOOL MenuInit(VOID); +VOID MenuCleanup(VOID); +UINT MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw); +VOID MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt); +VOID MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar); -#ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) -# define __ms_va_list __builtin_ms_va_list -# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) -# define __ms_va_end(list) __builtin_ms_va_end(list) -# else -# define __ms_va_list va_list -# define __ms_va_start(list,arg) va_start(list,arg) -# define __ms_va_end(list) va_end(list) -# endif -#endif - -#ifdef _MSC_VER -#ifndef inline -#define inline __inline -#endif -#endif - -/* Hack away wine hack */ -#define __TRY if(1) -#define __EXCEPT_PAGE_FAULT else -#define __ENDTRY - -#define STATIC_UISTATE_GWL_OFFSET (sizeof(HFONT)+sizeof(HICON))// see UISTATE_GWL_OFFSET in static.c - -/* Retrieve the UI state for the control */ -static __inline BOOL STATIC_update_uistate(HWND hwnd, BOOL unicode) -{ - LONG flags, prevflags; - - if (unicode) - flags = DefWindowProcW(hwnd, WM_QUERYUISTATE, 0, 0); - else - flags = DefWindowProcA(hwnd, WM_QUERYUISTATE, 0, 0); - - prevflags = GetWindowLongW(hwnd, STATIC_UISTATE_GWL_OFFSET); - - if (prevflags != flags) - { - SetWindowLongW(hwnd, STATIC_UISTATE_GWL_OFFSET, flags); - return TRUE; - } - - return FALSE; -} - +/* misc definitions */ +BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi); +VOID FASTCALL ScrollTrackScrollBar(HWND Wnd, INT SBType, POINT Pt); +HCURSOR CursorIconToCursor(HICON hIcon, BOOL SemiTransparent); +BOOL get_icon_size(HICON hIcon, SIZE *size); +VOID FASTCALL IntNotifyWinEvent(DWORD, HWND, LONG, LONG, DWORD); +UINT WINAPI WinPosGetMinMaxInfo(HWND hWnd, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack); +VOID UserGetWindowBorders(DWORD, DWORD, SIZE *, BOOL); +void UserGetInsideRectNC(PWND Wnd, RECT *rect); +VOID FASTCALL GetConnected(VOID); +extern BOOL FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, LPARAM Context, BOOL Desktops); +extern BOOL FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, LPARAM Context, BOOL Desktops); +void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo); +BOOL UserDrawSysMenuButton( HWND hWnd, HDC hDC, LPRECT, BOOL down ); +HWND* WIN_ListChildren (HWND hWndparent); +VOID DeleteFrameBrushes(VOID); /* EOF */ Added: trunk/reactos/dll/win32/user32/include/user_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user_x.h (added) +++ trunk/reactos/dll/win32/user32/include/user_x.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1,0 +1,112 @@ + +static __inline PVOID +SharedPtrToUser(PVOID Ptr) +{ + ASSERT(Ptr != NULL); + ASSERT(g_ulSharedDelta != 0); + return (PVOID)((ULONG_PTR)Ptr - g_ulSharedDelta); +} + +static __inline PVOID +DesktopPtrToUser(PVOID Ptr) +{ + PCLIENTINFO pci; + PDESKTOPINFO pdi; + GetW32ThreadInfo(); + pci = GetWin32ClientInfo(); + pdi = pci->pDeskInfo; + + ASSERT(Ptr != NULL); + ASSERT(pdi != NULL); + if ((ULONG_PTR)Ptr >= (ULONG_PTR)pdi->pvDesktopBase && + (ULONG_PTR)Ptr < (ULONG_PTR)pdi->pvDesktopLimit) + { + return (PVOID)((ULONG_PTR)Ptr - pci->ulClientDelta); + } + else + { + /* NOTE: This is slow as it requires a call to win32k. This should only be + neccessary if a thread wants to access an object on a different + desktop */ + return (PVOID)NtUserxGetDesktopMapping(Ptr); + } +} + +static __inline BOOL +IsThreadHooked(PCLIENTINFO pci) +{ + return (pci->fsHooks|pci->pDeskInfo->fsHooks) != 0; +} + +static __inline PDESKTOPINFO +GetThreadDesktopInfo(VOID) +{ + PTHREADINFO ti; + PDESKTOPINFO di = NULL; + + ti = GetW32ThreadInfo(); + if (ti != NULL) + di = GetWin32ClientInfo()->pDeskInfo; + + return di; +} + +static __inline BOOL +IsCallProcHandle(IN WNDPROC lpWndProc) +{ + /* FIXME - check for 64 bit architectures... */ + return ((ULONG_PTR)lpWndProc & 0xFFFF0000) == 0xFFFF0000; +} + +#define STATIC_UISTATE_GWL_OFFSET (sizeof(HFONT)+sizeof(HICON))// see UISTATE_GWL_OFFSET in static.c + +/* Retrieve the UI state for the control */ +static __inline BOOL STATIC_update_uistate(HWND hwnd, BOOL unicode) +{ + LONG flags, prevflags; + + if (unicode) + flags = DefWindowProcW(hwnd, WM_QUERYUISTATE, 0, 0); + else + flags = DefWindowProcA(hwnd, WM_QUERYUISTATE, 0, 0); + + prevflags = GetWindowLongW(hwnd, STATIC_UISTATE_GWL_OFFSET); + + if (prevflags != flags) + { + SetWindowLongW(hwnd, STATIC_UISTATE_GWL_OFFSET, flags); + return TRUE; + } + + return FALSE; +} + +static __inline void LoadUserApiHook() +{ + if (!gfServerProcess && + !IsInsideUserApiHook() && + (gpsi->dwSRVIFlags & SRVINFO_APIHOOK) && + !RtlIsThreadWithinLoaderCallout()) + { + NtUserCallNoParam(NOPARAM_ROUTINE_LOADUSERAPIHOOK); + } +} + +#define UserHasDlgFrameStyle(Style, ExStyle) \ + (((ExStyle) & WS_EX_DLGMODALFRAME) || \ + (((Style) & WS_DLGFRAME) && (!((Style) & WS_THICKFRAME)))) + +#define UserHasThickFrameStyle(Style, ExStyle) \ + (((Style) & WS_THICKFRAME) && \ + (!(((Style) & (WS_DLGFRAME | WS_BORDER)) == WS_DLGFRAME))) + +#define UserHasThinFrameStyle(Style, ExStyle) \ + (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) + +/* macro for source compatibility with wine */ +#define WIN_GetFullHandle(h) ((HWND)(h)) + +#define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) +#define ISITHOOKED(HookId) (GetWin32ClientInfo()->fsHooks & HOOKID_TO_FLAG(HookId) ||\ + (GetWin32ClientInfo()->pDeskInfo && GetWin32ClientInfo()->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId))) + Propchange: trunk/reactos/dll/win32/user32/include/user_x.h ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/window.h (removed) @@ -1,67 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: include/window.h - * PURPOSE: Window management definitions - */ -#include <windows.h> - -extern COLORREF SysColors[]; -extern HPEN SysPens[]; -extern HBRUSH SysBrushes[]; - -#define NUM_SYSCOLORS 31 - - -#define UserHasAnyFrameStyle(Style, ExStyle) \ - (((Style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \ - ((ExStyle) & WS_EX_DLGMODALFRAME) || \ - (!((Style) & (WS_CHILD | WS_POPUP)))) - -#define UserHasDlgFrameStyle(Style, ExStyle) \ - (((ExStyle) & WS_EX_DLGMODALFRAME) || \ - (((Style) & WS_DLGFRAME) && (!((Style) & WS_THICKFRAME)))) - -#define UserHasThickFrameStyle(Style, ExStyle) \ - (((Style) & WS_THICKFRAME) && \ - (!(((Style) & (WS_DLGFRAME | WS_BORDER)) == WS_DLGFRAME))) - -#define UserHasThinFrameStyle(Style, ExStyle) \ - (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) - -#define UserHasBigFrameStyle(Style, ExStyle) \ - (((Style) & (WS_THICKFRAME | WS_DLGFRAME)) || \ - ((ExStyle) & WS_EX_DLGMODALFRAME)) - - -BOOL UserDrawSysMenuButton( HWND hWnd, HDC hDC, LPRECT, BOOL down ); -void -UserGetFrameSize(ULONG Style, ULONG ExStyle, SIZE *Size); -void -UserGetInsideRectNC(PWND Wnd, RECT *rect); - -DWORD -SCROLL_HitTest( HWND hwnd, INT nBar, POINT pt, BOOL bDragging ); - -LRESULT FASTCALL IntCallWindowProcW(BOOL IsAnsiProc, WNDPROC WndProc, PWND pWnd, - HWND hWnd, UINT Msg, WPARAM wParam, - LPARAM lParam); - -HWND WINAPI -User32CreateWindowEx(DWORD dwExStyle, - LPCSTR lpClassName, - LPCSTR lpWindowName, - DWORD dwStyle, - int x, - int y, - int nWidth, - int nHeight, - HWND hWndParent, - HMENU hMenu, - HINSTANCE hInstance, - LPVOID lpParam, - BOOL Unicode); - -HWND* WIN_ListChildren (HWND hWndparent); -WNDPROC FASTCALL IntGetWndProc(PWND, BOOL); -DWORD WINAPI GetRealWindowOwner(HWND); Removed: trunk/reactos/dll/win32/user32/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/winpos.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/winpos.h (removed) @@ -1,5 +1,0 @@ -BOOL -WinPosShowIconTitle(HWND hWnd, BOOL bShow); -UINT WINAPI -WinPosGetMinMaxInfo(HWND hWnd, POINT* MaxSize, POINT* MaxPos, - POINT* MinTrack, POINT* MaxTrack); Removed: trunk/reactos/dll/win32/user32/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/winsta.h (removed) @@ -1,12 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: include/winsta.h - * PURPOSE: Window stations - */ - -#pragma once - -extern BOOL FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, LPARAM Context, BOOL Desktops); -extern BOOL FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, LPARAM Context, BOOL Desktops); Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -113,7 +113,7 @@ return RealGetSystemMetrics(nIndex); } - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -336,7 +336,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -368,7 +368,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -243,7 +243,6 @@ { InitializeCriticalSection(&U32AccelCacheLock); GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); - InitStockObjects(); LoadAppInitDlls(); return TRUE; Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -42,9 +42,7 @@ WINAPI RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister) { - return NtUserCallTwoParam(dwProcessId, - (DWORD_PTR)bRegister, - TWOPARAM_ROUTINE_REGISTERLOGONPROC); + return NtUserxRegisterLogonProcess(dwProcessId,bRegister); } /* @@ -259,22 +257,6 @@ (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess ); } -BOOL -FASTCALL -IsMetaFile(HDC hDc) -{ - DWORD Type = GetObjectType((HGDIOBJ) hDc); - switch(Type) - { - case OBJ_METADC: - case OBJ_METAFILE: - case OBJ_ENHMETADC: - case OBJ_ENHMETAFILE: - return TRUE; - } - return FALSE; -} - PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE handle) @@ -301,24 +283,24 @@ /* * Decide whether an object is located on the desktop or shared heap */ -static const BOOL g_ObjectHeapTypeShared[VALIDATE_TYPE_EVENT + 1] = -{ - FALSE, /* VALIDATE_TYPE_FREE (not used) */ - FALSE, /* VALIDATE_TYPE_WIN */ - TRUE, /* VALIDATE_TYPE_MENU FALSE */ - TRUE, /* VALIDATE_TYPE_CURSOR */ - TRUE, /* VALIDATE_TYPE_MWPOS */ - FALSE, /* VALIDATE_TYPE_HOOK */ +static const BOOL g_ObjectHeapTypeShared[otEvent + 1] = +{ + FALSE, /* otFree (not used) */ + FALSE, /* otWindow */ + TRUE, /* otMenu FALSE */ + TRUE, /* otCursorIcon */ + TRUE, /* otSMWP */ + FALSE, /* otHook */ FALSE, /* (not used) */ - FALSE, /* VALIDATE_TYPE_CALLPROC */ - TRUE, /* VALIDATE_TYPE_ACCEL */ + FALSE, /* otCallProc */ + TRUE, /* otAccel */ FALSE, /* (not used) */ FALSE, /* (not used) */ FALSE, /* (not used) */ - TRUE, /* VALIDATE_TYPE_MONITOR */ + TRUE, /* otMonitor */ FALSE, /* (not used) */ FALSE, /* (not used) */ - TRUE /* VALIDATE_TYPE_EVENT */ + TRUE /* otEvent */ }; // @@ -331,7 +313,7 @@ PVOID ret; PUSER_HANDLE_ENTRY pEntry; - ASSERT(uType <= VALIDATE_TYPE_EVENT); + ASSERT(uType <= otEvent); pEntry = GetUser32Handle(handle); @@ -346,22 +328,22 @@ { switch ( uType ) { // Test (with wine too) confirms these results! - case VALIDATE_TYPE_WIN: + case otWindow: SetLastError(ERROR_INVALID_WINDOW_HANDLE); break; - case VALIDATE_TYPE_MENU: + case otMenu: SetLastError(ERROR_INVALID_MENU_HANDLE); break; - case VALIDATE_TYPE_CURSOR: + case otCursorIcon: SetLastError(ERROR_INVALID_CURSOR_HANDLE); break; - case VALIDATE_TYPE_MWPOS: + case otSMWP: SetLastError(ERROR_INVALID_DWP_HANDLE); break; - case VALIDATE_TYPE_HOOK: + case otHook: SetLastError(ERROR_INVALID_HOOK_HANDLE); break; - case VALIDATE_TYPE_ACCEL: + case otAccel: SetLastError(ERROR_INVALID_ACCEL_HANDLE); break; default: @@ -389,7 +371,7 @@ PVOID ret; PUSER_HANDLE_ENTRY pEntry; - ASSERT(uType <= VALIDATE_TYPE_EVENT); + ASSERT(uType <= otEvent); pEntry = GetUser32Handle(handle); @@ -417,7 +399,7 @@ { PUSER_HANDLE_ENTRY pEntry; - PCALLPROCDATA CallProc = ValidateHandle(hCallProc, VALIDATE_TYPE_CALLPROC); + PCALLPROCDATA CallProc = ValidateHandle(hCallProc, otCallProc); pEntry = GetUser32Handle(hCallProc); @@ -443,7 +425,7 @@ if (hwnd == ClientInfo->CallbackWnd.hWnd) return ClientInfo->CallbackWnd.pWnd; - Wnd = ValidateHandle((HANDLE)hwnd, VALIDATE_TYPE_WIN); + Wnd = ValidateHandle((HANDLE)hwnd, otWindow); if (Wnd != NULL) { return Wnd; @@ -467,7 +449,7 @@ if (hwnd == ClientInfo->CallbackWnd.hWnd) return ClientInfo->CallbackWnd.pWnd; - Wnd = ValidateHandleNoErr((HANDLE)hwnd, VALIDATE_TYPE_WIN); + Wnd = ValidateHandleNoErr((HANDLE)hwnd, otWindow); if (Wnd != NULL) { return Wnd; Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -129,7 +129,7 @@ WINAPI UserRealizePalette ( HDC hDC ) { - return NtUserCallOneParam((DWORD_PTR) hDC, ONEPARAM_ROUTINE_REALIZEPALETTE); + return NtUserxRealizePalette(hDC); } @@ -553,7 +553,7 @@ WINAPI CreateSystemThreads(DWORD dwUnknown) { - NtUserCallOneParam(dwUnknown, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); + NtUserxCreateSystemThreads(dwUnknown); } BOOL Modified: trunk/reactos/dll/win32/user32/misc/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/time… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/timer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/timer.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -39,9 +39,7 @@ */ BOOL WINAPI -KillSystemTimer( - HWND hWnd, - UINT_PTR IDEvent) +KillSystemTimer( HWND hWnd, UINT_PTR IDEvent) { - return NtUserCallHwndParam(hWnd, IDEvent, HWNDPARAM_ROUTINE_KILLSYSTEMTIMER); + return NtUserxKillSystemTimer(hWnd, IDEvent); } Modified: trunk/reactos/dll/win32/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/usra… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/usrapihk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/usrapihk.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -27,6 +27,7 @@ INT WINAPI RealSetScrollInfo(HWND,int,LPCSCROLLINFO,BOOL); BOOL WINAPI RealSystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI RealSystemParametersInfoW(UINT,UINT,PVOID,UINT); +DWORD WINAPI GetRealWindowOwner(HWND); /* GLOBALS *******************************************************************/ @@ -309,7 +310,7 @@ WINAPI RealMDIRedrawFrame(HWND hWnd, DWORD flags) { - return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_REDRAWFRAME); + return NtUserxMDIRedrawFrame(hWnd); } BOOL @@ -318,7 +319,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: trunk/reactos/dll/win32/user32/windows/accel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/a… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/accel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/accel.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -42,6 +42,16 @@ WORD cmd; WORD pad1; } PE_ACCEL, *LPPE_ACCEL; + +/* Cache entry */ +typedef struct _USER_ACCEL_CACHE_ENTRY +{ + struct _USER_ACCEL_CACHE_ENTRY * Next; + ULONG_PTR Usage; /* how many times the table has been loaded */ + HACCEL Object; /* handle to the NtUser accelerator table object */ + HGLOBAL Data; /* base address of the resource data */ +} +U32_ACCEL_CACHE_ENTRY; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/caret.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -88,7 +88,7 @@ WINAPI DestroyCaret(VOID) { - return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_DESTROY_CARET); + return NtUserxDestroyCaret(); } @@ -99,7 +99,7 @@ WINAPI SetCaretBlinkTime(UINT uMSeconds) { - return NtUserSetCaretBlinkTime(uMSeconds); + return NtUserxSetCaretBlinkTime(uMSeconds); } @@ -108,10 +108,9 @@ */ BOOL WINAPI -SetCaretPos(int X, - int Y) +SetCaretPos(int X, int Y) { - return NtUserSetCaretPos(X, Y); + return NtUserxSetCaretPos(X, Y); } /* EOF */ Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -30,8 +30,7 @@ WINAPI OpenClipboard(HWND hWndNewOwner) { - BOOL ret = NtUserOpenClipboard(hWndNewOwner, 0); - return ret; + return NtUserOpenClipboard(hWndNewOwner, 0); } /* @@ -41,8 +40,7 @@ WINAPI EnumClipboardFormats(UINT format) { - UINT ret = NtUserCallOneParam(format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS); - return ret; + return NtUserxEnumClipboardFormats(format); } /* Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -76,8 +76,7 @@ HICON CreateCursorIconHandle( PICONINFO IconInfo ) { - HICON hIcon = (HICON)NtUserCallOneParam(0, - ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT); + HICON hIcon = NtUserxCreateEmptyCurObject(0); if(!hIcon) return NULL; @@ -1239,24 +1238,11 @@ } /*********************************************************************** - * SetCursor (USER32.@) - * - * Set the cursor shape. - * - * RETURNS - * A handle to the previous cursor shape. - */ -HCURSOR WINAPI /*DECLSPEC_HOTPATCH*/ SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) -{ - return NtUserSetCursor(hCursor); -} - -/*********************************************************************** * ShowCursor (USER32.@) */ INT WINAPI /*DECLSPEC_HOTPATCH*/ ShowCursor( BOOL bShow ) { - return NtUserShowCursor(bShow); + return NtUserxShowCursor(bShow); } /*********************************************************************** @@ -1270,24 +1256,6 @@ return ci.hCursor; else return (HCURSOR)0; -} - - -/*********************************************************************** - * ClipCursor (USER32.@) - */ -BOOL WINAPI /*DECLSPEC_HOTPATCH*/ ClipCursor( const RECT *rect ) -{ - return NtUserClipCursor((RECT *)rect); -} - - -/*********************************************************************** - * GetClipCursor (USER32.@) - */ -BOOL WINAPI /*DECLSPEC_HOTPATCH*/ GetClipCursor( RECT *rect ) -{ - return NtUserGetClipCursor(rect); } @@ -1800,16 +1768,18 @@ if (IS_INTRESOURCE(name)) return LoadImageW(hinst, (LPCWSTR)name, type, desiredx, desiredy, loadflags); - __TRY { + _SEH2_TRY + { DWORD len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); u_name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, name, -1, u_name, len ); } - __EXCEPT_PAGE_FAULT { + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - __ENDTRY + _SEH2_YIELD(return 0); + } + _SEH2_END res = LoadImageW(hinst, u_name, type, desiredx, desiredy, loadflags); HeapFree(GetProcessHeap(), 0, u_name); return res; @@ -2133,10 +2103,9 @@ */ BOOL WINAPI -SetCursorPos(int X, - int Y) -{ - return NtUserSetCursorPos(X,Y); +SetCursorPos(int X, int Y) +{ + return NtUserxSetCursorPos(X,Y); } /* @@ -2154,7 +2123,7 @@ return FALSE; } - res = NtUserGetCursorPos(lpPoint); + res = NtUserxGetCursorPos(lpPoint); return res; } Modified: trunk/reactos/dll/win32/user32/windows/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dc.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -53,8 +53,8 @@ if (!hDC) return FALSE; // Null hDC return zero. GdiReleaseDC ( hDC ); // Release locals. - // Win 3.1 throw back, hWnd is ignored and not used. - return NtUserCallOneParam((DWORD_PTR) hDC, ONEPARAM_ROUTINE_RELEASEDC); + + return NtUserxReleaseDC(hDC); } @@ -65,5 +65,5 @@ WINAPI WindowFromDC(HDC hDC) { - return NtUserWindowFromDC(hDC); + return NtUserxWindowFromDC(hDC); } Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -31,19 +31,6 @@ static short iMenuSysKey = 0; /* FUNCTIONS *****************************************************************/ - -void -InitStockObjects(void) -{ - /* FIXME - Instead of copying the stuff to usermode we should map the tables to - userland. The current implementation has one big flaw: the system color - table doesn't get updated when another process changes them. That's why - we should rather map the table into usermode. But it only affects the - SysColors table - the pens, brushes and stock objects are not affected - as their handles never change. But it'd be faster to map them, too. */ - - // Done! gpsi! -} /* * @implemented @@ -522,7 +509,7 @@ } SendMessageA( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); - (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, hwnd); + NtUserxSetGUIThreadHandle(MSQ_STATE_MOVESIZE, hwnd); if (GetCapture() != hwnd) SetCapture( hwnd ); if (Style & WS_CHILD) @@ -681,7 +668,7 @@ if (lResult) moved = FALSE; } - (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL); + NtUserxSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL); SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 ); SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L); @@ -1595,7 +1582,7 @@ { case 0xffff: /* Caret timer */ /* switch showing byte in win32k and get information about the caret */ - if(NtUserSwitchCaretShowing(&CaretInfo) && (CaretInfo.hWnd == hWnd)) + if(NtUserxSwitchCaretShowing(&CaretInfo) && (CaretInfo.hWnd == hWnd)) { DrawCaret(hWnd, &CaretInfo); } @@ -1808,7 +1795,7 @@ /* Pack the information and call win32k */ if (Change) { - if (!NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)Flags | ((DWORD_PTR)Action << 3), TWOPARAM_ROUTINE_ROS_UPDATEUISTATE)) + if (!NtUserxUpdateUiState(hWnd, Flags | ((DWORD)Action << 3))) break; } @@ -2209,7 +2196,7 @@ BOOL Hook, msgOverride = FALSE; LRESULT Result = 0; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); if (Hook) @@ -2242,7 +2229,7 @@ BOOL Hook, msgOverride = FALSE; LRESULT Result = 0; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); if (Hook) Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -154,7 +154,7 @@ SETDLGINFO( hWnd, dlgInfo ); - NtUserCallHwndParam( hWnd, (DWORD_PTR)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); + NtUserxSetDialogPointer( hWnd, dlgInfo ); } else { @@ -1157,7 +1157,7 @@ if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); NtUserSetThreadState(0,DF_DIALOGACTIVE); - NtUserCallHwndParam( hwnd, 0, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); + NtUserxSetDialogPointer( hwnd, 0 ); } /* Window clean-up */ return DefWindowProcA( hwnd, msg, wParam, lParam ); Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1452,7 +1452,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -128,7 +128,7 @@ ne.idChild = idChild; ne.flags = flags; if (gpsi->dwInstalledEventHooks & GetMaskFromEvent(event)) - NtUserCallHwndParam(hwnd, (DWORD)&ne, HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT); + NtUserxNotifyWinEvent(hwnd, &ne); } /* FUNCTIONS *****************************************************************/ @@ -300,7 +300,7 @@ WINAPI DeregisterShellHookWindow(HWND hWnd) { - return NtUserCallHwnd(hWnd, HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW); + return NtUserxDeregisterShellHookWindow(hWnd); } /* @@ -310,7 +310,7 @@ WINAPI RegisterShellHookWindow(HWND hWnd) { - return NtUserCallHwnd(hWnd, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW); + return NtUserxRegisterShellHookWindow(hWnd); } /* @@ -320,7 +320,7 @@ WINAPI UnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc ) { - return NtUserCallTwoParam(nCode, (DWORD_PTR)pfnFilterProc, TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK); + return NtUserxUnhookWindowsHook(nCode, pfnFilterProc); } /* Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -104,10 +104,9 @@ * @implemented */ BOOL WINAPI -EnableWindow(HWND hWnd, - BOOL bEnable) -{ - return NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)bEnable, TWOPARAM_ROUTINE_ENABLEWINDOW); +EnableWindow(HWND hWnd, BOOL bEnable) +{ + return NtUserxEnableWindow(hWnd, bEnable); } /* @@ -128,7 +127,7 @@ HKL WINAPI GetKeyboardLayout(DWORD idThread) { - return (HKL)NtUserCallOneParam((DWORD_PTR) idThread, ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT); + return NtUserxGetKeyboardLayout(idThread); } @@ -220,7 +219,7 @@ int WINAPI GetKeyboardType(int nTypeFlag) { -return (int)NtUserCallOneParam((DWORD_PTR) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE); + return NtUserxGetKeyboardType( nTypeFlag ); } /* @@ -355,7 +354,7 @@ SwapMouseButton( BOOL fSwap) { - return NtUserSwapMouseButton(fSwap); + return NtUserxSwapMouseButton(fSwap); } Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -2915,7 +2915,7 @@ if (NewWnd != Mt->OwnerWnd) { Mt->OwnerWnd = NewWnd; - (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); // 1 + NtUserxSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); // 1 SetCapture(Mt->OwnerWnd); // 2 } @@ -3206,13 +3206,13 @@ /* owner may not be visible when tracking a popup, so use the menu itself */ capture_win = (wFlags & TPM_POPUPMENU) ? MenuInfo.Wnd : mt.OwnerWnd; - (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, capture_win); // 1 + NtUserxSetGUIThreadHandle(MSQ_STATE_MENUOWNER, capture_win); // 1 SetCapture(capture_win); // 2 while (! fEndMenu) { BOOL ErrorExit = FALSE; - PVOID menu = ValidateHandle(mt.CurrentMenu, VALIDATE_TYPE_MENU); + PVOID menu = ValidateHandle(mt.CurrentMenu, otMenu); if (!menu) /* sometimes happens if I do a window manager close */ break; @@ -3464,7 +3464,7 @@ else mt.TrackFlags &= ~TF_SKIPREMOVE; } - (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); + NtUserxSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); SetCapture(NULL); /* release the capture */ /* If dropdown is still painted and the close box is clicked on @@ -4072,7 +4072,7 @@ CreateMenu(VOID) { MenuLoadBitmaps(); - return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENU); + return NtUserxCreateMenu(); } @@ -4083,7 +4083,7 @@ CreatePopupMenu(VOID) { MenuLoadBitmaps(); - return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENUPOPUP); + return NtUserxCreatePopupMenu(); } @@ -4093,7 +4093,7 @@ BOOL WINAPI DrawMenuBar(HWND hWnd) { -// return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_DRAWMENUBAR); +// return NtUserxDrawMenuBar(hWnd); ROSMENUINFO MenuInfo; HMENU hMenu; hMenu = GetMenu(hWnd); @@ -4720,7 +4720,7 @@ IsMenu( HMENU Menu) { - if (ValidateHandle(Menu, VALIDATE_TYPE_MENU)) return TRUE; + if (ValidateHandle(Menu, otMenu)) return TRUE; return FALSE; } Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1035,7 +1035,7 @@ WINAPI GetMessageExtraInfo(VOID) { - return (LPARAM)NtUserCallNoParam(NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO); + return NtUserxGetMessageExtraInfo(); } @@ -1046,7 +1046,7 @@ WINAPI GetMessagePos(VOID) { - return NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS); + return NtUserxGetMessagePos(); } @@ -1100,10 +1100,9 @@ */ BOOL WINAPI -ReplyMessage( - LRESULT lResult) -{ - return NtUserCallOneParam(lResult, ONEPARAM_ROUTINE_REPLYMESSAGE); +ReplyMessage(LRESULT lResult) +{ + return NtUserxReplyMessage(lResult); } @@ -1115,7 +1114,7 @@ SetMessageExtraInfo( LPARAM lParam) { - return NtUserSetMessageExtraInfo(lParam); + return NtUserxSetMessageExtraInfo(lParam); } LRESULT FASTCALL @@ -1933,7 +1932,7 @@ PostQuitMessage( int nExitCode) { - NtUserCallOneParam(nExitCode, ONEPARAM_ROUTINE_POSTQUITMESSAGE); + NtUserxPostQuitMessage(nExitCode); } @@ -2495,7 +2494,7 @@ BOOL WINAPI ReleaseCapture(VOID) { - return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_RELEASECAPTURE); + return NtUserxReleaseCapture(); } @@ -2512,7 +2511,7 @@ SetLastError( ERROR_INVALID_FLAGS ); return 0; } - return NtUserCallOneParam(flags, ONEPARAM_ROUTINE_GETQUEUESTATUS); + return NtUserxGetQueueStatus(flags); } @@ -2677,7 +2676,7 @@ return FALSE; } } - if(NtUserCallNoParam(NOPARAM_ROUTINE_INIT_MESSAGE_PUMP)) { + if(NtUserxInitMessagePump()) { LeaveCriticalSection(&gcsMPH); return FALSE; } @@ -2692,7 +2691,7 @@ { EnterCriticalSection(&gcsMPH); if(gcLoadMPH > 0) { - if(NtUserCallNoParam(NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP)) { + if(NtUserxUnInitMessagePump()) { gcLoadMPH--; if(!gcLoadMPH) { InterlockedExchange((PLONG)&gfMessagePumpHook, 0); @@ -2767,7 +2766,7 @@ } } - MessageQueueHandle = NtUserMsqSetWakeMask(MAKELONG(dwWakeMask, dwFlags)); + MessageQueueHandle = NtUserxMsqSetWakeMask(MAKELONG(dwWakeMask, dwFlags)); if (MessageQueueHandle == NULL) { SetLastError(0); /* ? */ @@ -2777,7 +2776,7 @@ RealHandles = HeapAlloc(GetProcessHeap(), 0, (nCount + 1) * sizeof(HANDLE)); if (RealHandles == NULL) { - NtUserMsqClearWakeMask(); + NtUserxMsqClearWakeMask(); SetLastError(ERROR_NOT_ENOUGH_MEMORY); return WAIT_FAILED; } @@ -2790,7 +2789,7 @@ dwMilliseconds, dwFlags & MWMO_ALERTABLE); HeapFree(GetProcessHeap(), 0, RealHandles); - NtUserMsqClearWakeMask(); + NtUserxMsqClearWakeMask(); //FIXME("Result 0X%x\n",Result); return Result; } Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -890,7 +890,7 @@ WINAPI MessageBeep(UINT uType) { - return (BOOL)NtUserCallOneParam(uType, ONEPARAM_ROUTINE_MESSAGEBEEP); + return NtUserxMessageBeep(uType); } Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -450,7 +450,7 @@ if (menu && !(Style & WS_CHILD)) { TempRect = CurrentRect; - TempRect.bottom = TempRect.top + (UINT)NtUserSetMenuBarHeight(menu, 0); + TempRect.bottom = TempRect.top + (UINT)NtUserxSetMenuBarHeight(menu, 0); CurrentRect.top += MenuDrawMenuBar(hDC, &TempRect, hWnd, FALSE); } @@ -1104,7 +1104,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -1148,7 +1148,7 @@ { BOOL Hook, Ret = FALSE; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -200,7 +200,7 @@ BOOL Hook; int Ret = 0; - LOADUSERAPIHOOK + LoadUserApiHook(); Hook = BeginIfHookedUserApiHook(); @@ -244,7 +244,7 @@ pWnd->state & WNDS_INTERNALPAINT || pWnd->spwndChild ) { - return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_UPDATEWINDOW); + return NtUserxUpdateWindow(hWnd); } return TRUE; } @@ -258,7 +258,7 @@ HWND hWnd, HRGN hRgn) { - return NtUserCallHwndParamLock(hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN); + return NtUserxValidateRgn(hWnd, hRgn); } /* Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -65,7 +65,7 @@ HDWP WINAPI BeginDeferWindowPos(int nNumWindows) { - return (HDWP)NtUserCallOneParam((DWORD_PTR)nNumWindows, ONEPARAM_ROUTINE_BEGINDEFERWNDPOS); + return NtUserxBeginDeferWindowPos(nNumWindows); } @@ -1668,7 +1668,7 @@ BOOL WINAPI SetForegroundWindow(HWND hWnd) { - return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW); + return NtUserxSetForegroundWindow(hWnd); } @@ -1750,10 +1750,9 @@ * @implemented */ BOOL WINAPI -ShowOwnedPopups(HWND hWnd, - BOOL fShow) -{ - return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS); +ShowOwnedPopups(HWND hWnd, BOOL fShow) +{ + return NtUserxShowOwnedPopups(hWnd, fShow); } @@ -1816,7 +1815,7 @@ SetWindowContextHelpId(HWND hwnd, DWORD dwContextHelpId) { - return NtUserSetWindowContextHelpId(hwnd, dwContextHelpId); + return NtUserxSetWindowContextHelpId(hwnd, dwContextHelpId); } /* @@ -1825,7 +1824,7 @@ DWORD WINAPI GetWindowContextHelpId(HWND hwnd) { - return NtUserCallHwnd(hwnd, HWND_ROUTINE_GETWNDCONTEXTHLPID); + return NtUserxGetWindowContextHelpId(hwnd); } /* @@ -1879,7 +1878,7 @@ HWND WINAPI SetTaskmanWindow(HWND hWnd) { - return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); + return NtUserxSetTaskmanWindow(hWnd); } /* @@ -1888,7 +1887,7 @@ HWND WINAPI SetProgmanWindow(HWND hWnd) { - return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETPROGMANWINDOW); + return NtUserxSetProgmanWindow(hWnd); } /* @@ -1992,7 +1991,7 @@ VOID WINAPI DisableProcessWindowsGhosting(VOID) { - NtUserEnableProcessWindowGhosting(FALSE); + NtUserxEnableProcessWindowGhosting(FALSE); } /* EOF */ Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -108,7 +108,7 @@ UINT WINAPI ArrangeIconicWindows(HWND hWnd) { - return NtUserCallHwndLock( hWnd, HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS); + return NtUserxArrangeIconicWindows( hWnd ); } /* Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -5,6 +5,60 @@ typedef struct _THREADINFO *PTHREADINFO; struct _DESKTOP; struct _WND; + + +#define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ +#define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ + +#define HANDLEENTRY_INDESTROY 1 + +typedef struct _USER_HANDLE_ENTRY +{ + void *ptr; /* pointer to object */ + union + { + PVOID pi; + PTHREADINFO pti; // pointer to Win32ThreadInfo + PPROCESSINFO ppi; // pointer to W32ProcessInfo + }; + unsigned char type; /* object type (0 if free) */ + unsigned char flags; + unsigned short generation; /* generation counter */ +} USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; + +typedef struct _USER_HANDLE_TABLE +{ + PUSER_HANDLE_ENTRY handles; + PUSER_HANDLE_ENTRY freelist; + int nb_handles; + int allocated_handles; +} USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; + +typedef enum _USER_OBJECT_TYPE +{ + otFree = 0, + otWindow, + otMenu, + otCursorIcon, + otSMWP, + otHook, + otClipBoardData, + otCallProc, + otAccel, + otDDEaccess, + otDDEconv, + otDDExact, + otMonitor, + otKBDlayout, + otKBDfile, + otEvent, + otTimer, + otInputContext, + otHidData, + otDeviceInfo, + otTouchInput, + otGestureInfo +} USER_OBJECT_TYPE; typedef enum _USERTHREADINFOCLASS { @@ -699,6 +753,8 @@ #define SRVINFO_APIHOOK 0x0010 #define SRVINFO_METRICS 0x0020 +#define NUM_SYSCOLORS 31 + typedef struct tagOEMBITMAPINFO { INT x; @@ -727,9 +783,9 @@ typedef struct _PERUSERSERVERINFO { INT aiSysMet[SM_CMETRICS]; - ULONG argbSystemUnmatched[COLOR_LAST+1]; - COLORREF argbSystem[COLOR_LAST+1]; - HBRUSH ahbrSystem[COLOR_LAST+1]; + ULONG argbSystemUnmatched[NUM_SYSCOLORS]; + COLORREF argbSystem[NUM_SYSCOLORS]; + HBRUSH ahbrSystem[NUM_SYSCOLORS]; HBRUSH hbrGray; POINT ptCursor; POINT ptCursorReal; @@ -3119,7 +3175,6 @@ */ #define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005 -#define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 #define ONEPARAM_ROUTINE_CSRSS_GUICHECK 0xffff0008 #define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d @@ -3134,7 +3189,6 @@ #define MSQ_STATE_MOVESIZE 0x5 #define MSQ_STATE_CARET 0x6 #define TWOPARAM_ROUTINE_SETCARETPOS 0xfffd0060 -#define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0xfffd0062 #define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 #define HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT 0x1005 Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1,12 +1,4 @@ #pragma once - -#include "surface.h" - -typedef struct tagBITMAPV5INFO -{ - BITMAPV5HEADER bmiHeader; - RGBQUAD bmiColors[256]; -} BITMAPV5INFO, *PBITMAPV5INFO; INT APIENTRY BITMAP_GetObject(SURFACE * bmp, INT count, LPVOID buffer); HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits); Modified: trunk/reactos/subsystems/win32/win32k/include/cleanup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cleanup.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cleanup.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1,6 +1,4 @@ #pragma once - -NTSTATUS FASTCALL InitCleanupImpl(VOID); NTSTATUS FASTCALL IntSafeCopyUnicodeString(PUNICODE_STRING Dest, @@ -9,9 +7,3 @@ NTSTATUS FASTCALL IntSafeCopyUnicodeStringTerminateNULL(PUNICODE_STRING Dest, PUNICODE_STRING Source); - -NTSTATUS FASTCALL -IntUnicodeStringToNULLTerminated(PWSTR *Dest, PUNICODE_STRING Src); - -void FASTCALL -IntFreeNULLTerminatedFromUnicodeString(PWSTR NullTerminated, PUNICODE_STRING UnicodeString); Modified: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1,7 +1,4 @@ #pragma once - -#include <include/dc.h> -#include <include/region.h> INT FASTCALL IntGdiGetClipBox(PDC, RECTL* rc); INT FASTCALL IntGdiExtSelectClipRgn (PDC, PROSRGNDATA, int); Modified: trunk/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdifloat.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdifloat.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1,7 +1,5 @@ #pragma once -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> #include "dc.h" #include "math.h" #include "xformobj.h" Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -6,7 +6,6 @@ #pragma once /* Public GDI Object/Handle definitions */ -#include <win32k/ntgdihdl.h> #include "win32.h" /* The first 10 entries are never used in windows, they are empty */ Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1,65 +1,4 @@ #pragma once - -#include "gdiobj.h" -#include "bitmaps.h" -#include "pen.h" - -#define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ -#define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ - -#define HANDLEENTRY_INDESTROY 1 - -typedef struct _USER_HANDLE_ENTRY -{ - void *ptr; /* pointer to object */ - union - { - PVOID pi; - PTHREADINFO pti; // pointer to Win32ThreadInfo - PPROCESSINFO ppi; // pointer to W32ProcessInfo - }; - unsigned char type; /* object type (0 if free) */ - unsigned char flags; - unsigned short generation; /* generation counter */ -} USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; - - - -typedef struct _USER_HANDLE_TABLE -{ - PUSER_HANDLE_ENTRY handles; - PUSER_HANDLE_ENTRY freelist; - int nb_handles; - int allocated_handles; -} USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; - - - -typedef enum _USER_OBJECT_TYPE -{ - otFree = 0, - otWindow, - otMenu, - otCursorIcon, - otSMWP, - otHook, - otClipBoardData, - otCallProc, - otAccel, - otDDEaccess, - otDDEconv, - otDDExact, - otMonitor, - otKBDlayout, - otKBDfile, - otEvent, - otTimer, - otInputContext, - otHidData, - otDeviceInfo, - otTouchInput, - otGestureInfo -} USER_OBJECT_TYPE; typedef struct _USER_REFERENCE_ENTRY { Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1,7 +1,4 @@ #pragma once - -#include "gdiobj.h" -#include "brush.h" /* Internal interface */ Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -1,6 +1,4 @@ #pragma once - -#include "gdiobj.h" /* Type definitions ***********************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -23,74 +23,79 @@ #define DBG_ENABLE_EVENT_LOGGING 0 #define DBG_ENABLE_SERVICE_HOOKS 0 -/* Internal Win32k Headers */ +/* misc headers */ +#include <include/mmcopy.h> +#include <include/tags.h> #include <include/win32kdebug.h> -#include <include/accelerator.h> -#include <include/clipboard.h> -#include <include/cliprgn.h> -#include <include/bitmaps.h> +#include <include/cleanup.h> + +/* Internal NtGdi Headers */ +#include <include/gdiobj.h> +#include <include/surface.h> #include <include/brush.h> -#include <include/callback.h> -#include <include/caret.h> -#include <include/class.h> -#include <include/cleanup.h> #include <include/color.h> -#include <include/coord.h> -#include <include/csr.h> #include <include/dc.h> -#include <include/dce.h> #include <include/dib.h> #include <include/driver.h> #include <include/driverobj.h> #include <include/floatobj.h> -#include <include/gdiobj.h> #include <include/palette.h> #include <include/pdevobj.h> #include <include/rect.h> +#include <include/xformobj.h> +#include <include/xlateobj.h> +#include <include/cliprgn.h> +#include <include/region.h> +#include <include/eng.h> +#include <include/inteng.h> +#include <include/intgdi.h> +#include <include/intddraw.h> +#include <include/paint.h> +#include <include/path.h> +#include <include/bitmaps.h> +#include <include/text.h> +#include <include/misc.h> +#include <include/engobjects.h> +#include <include/engevent.h> +#include <include/ldevobj.h> +#include <include/device.h> +#include <include/pen.h> +#include <include/cliprgn.h> +#include <include/coord.h> +#include <include/gdifloat.h> +#include <dib/dib.h> +#include <include/gdidebug.h> + +/* Internal NtUser Headers */ +#include <include/ntuser.h> +#include <include/accelerator.h> +#include <include/clipboard.h> +#include <include/caret.h> +#include <include/class.h> +#include <include/dce.h> #include <include/sysparams.h> #include <include/win32.h> #include <include/window.h> #include <include/winsta.h> -#include <include/xformobj.h> -#include <include/xlateobj.h> - -#include <include/region.h> -#include <include/ntuser.h> #include <include/cursoricon.h> #include <include/desktop.h> -#include <include/eng.h> #include <include/focus.h> #include <include/guicheck.h> #include <include/hook.h> #include <include/hotkey.h> #include <include/input.h> -#include <include/inteng.h> -#include <include/intgdi.h> -#include <include/intddraw.h> #include <include/menu.h> #include <include/monitor.h> #include <include/mouse.h> #include <include/msgqueue.h> #include <include/object.h> -#include <include/paint.h> #include <include/painting.h> -#include <include/path.h> #include <include/prop.h> -#include <include/scroll.h> -#include <include/surface.h> -#include <include/tags.h> -#include <include/text.h> #include <include/timer.h> #include <include/useratom.h> #include <include/vis.h> #include <include/userfuncs.h> #include <include/winpos.h> -#include <include/mmcopy.h> -#include <include/misc.h> -#include <include/gdifloat.h> -#include <include/engobjects.h> -#include <include/engevent.h> -#include <include/ldevobj.h> -#include <include/device.h> -#include <dib/dib.h> -#include <include/gdidebug.h> +#include <include/scroll.h> +#include <include/csr.h> +#include <include/callback.h> Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -459,37 +459,6 @@ /* string is empty */ return STATUS_SUCCESS; -} - -NTSTATUS FASTCALL -IntUnicodeStringToNULLTerminated(PWSTR *Dest, PUNICODE_STRING Src) -{ - if (Src->Length + sizeof(WCHAR) <= Src->MaximumLength - && L'\0' == Src->Buffer[Src->Length / sizeof(WCHAR)]) - { - /* The unicode_string is already nul terminated. Just reuse it. */ - *Dest = Src->Buffer; - return STATUS_SUCCESS; - } - - *Dest = ExAllocatePoolWithTag(PagedPool, Src->Length + sizeof(WCHAR), TAG_STRING); - if (NULL == *Dest) - { - return STATUS_NO_MEMORY; - } - RtlCopyMemory(*Dest, Src->Buffer, Src->Length); - (*Dest)[Src->Length / 2] = L'\0'; - - return STATUS_SUCCESS; -} - -void FASTCALL -IntFreeNULLTerminatedFromUnicodeString(PWSTR NullTerminated, PUNICODE_STRING UnicodeString) -{ - if (NullTerminated != UnicodeString->Buffer) - { - ExFreePool(NullTerminated); - } } PPROCESSINFO Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -467,7 +467,7 @@ case TWOPARAM_ROUTINE_SETCARETPOS: RETURN( (DWORD_PTR)co_IntSetCaretPos((int)Param1, (int)Param2)); - case TWOPARAM_ROUTINE_REGISTERLOGONPROC: + case TWOPARAM_ROUTINE_REGISTERLOGONPROCESS: RETURN( (DWORD_PTR)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); case TWOPARAM_ROUTINE_SETCURSORPOS: Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -62,7 +62,6 @@ RGB(49, 106, 197), /* COLOR_MENUHILIGHT */ RGB(236, 233, 216) /* COLOR_MENUBAR */ }; -#define NUM_SYSCOLORS (sizeof(SysColors) / sizeof(SysColors[0])) // System Bitmap DC HDC hSystemBM; Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Thu Aug 25 08:51:26 2011 @@ -70,6 +70,7 @@ #include <win32k/ntuser.h> #include <win32k/ntgdityp.h> #include <win32k/ntgdibad.h> +#include <win32k/ntgdihdl.h> #include <ntgdi.h> /* Undocumented user definitions */

1 0

[tkreuzer] 53435: [FRAMEBUF_ACC] Same fix as r53434
by tkreuzer＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tkreuzer Date: Thu Aug 25 08:03:15 2011 New Revision: 53435 URL: http://svn.reactos.org/svn/reactos?rev=53435&view=rev Log: [FRAMEBUF_ACC] Same fix as r53434 Modified: trunk/reactos/drivers/video/displays/framebufacc/enable.c Modified: trunk/reactos/drivers/video/displays/framebufacc/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/enable.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebufacc/enable.c [iso-8859-1] Thu Aug 25 08:03:15 2011 @@ -108,13 +108,15 @@ } /* hw mouse pointer */ - + ppdev->pPointerAttributes = NULL; ppdev->PointerAttributesSize = 0; /* Test see if the driver support hw mouse or not */ - if (!EngDeviceIoControl(ppdev->hDriver,IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES, - &ppdev->ModeIndex, sizeof(PVIDEO_MODE), + if (!EngDeviceIoControl(ppdev->hDriver, + IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES, + NULL, + sizeof(PVIDEO_MODE), &ppdev->PointerCapabilities, sizeof(VIDEO_POINTER_CAPABILITIES), &returnedDataLength))

1 0

[tkreuzer] 53434: [FRAMEBUF_NEW] - According to MSDN IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES doesn't have an in-parameter. This code was copied from MS sample code, but it doesn't make sense, since ...
by tkreuzer＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tkreuzer Date: Thu Aug 25 07:58:53 2011 New Revision: 53434 URL: http://svn.reactos.org/svn/reactos?rev=53434&view=rev Log: [FRAMEBUF_NEW] - According to MSDN IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES doesn't have an in-parameter. This code was copied from MS sample code, but it doesn't make sense, since the size field doesn't even match the in-buffer size. VBox driver also doesn't use these parameters and we don't handle the ioctl anyway. Modified: trunk/reactos/drivers/video/displays/framebuf_new/pointer.c Modified: trunk/reactos/drivers/video/displays/framebuf_new/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_new/pointer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf_new/pointer.c [iso-8859-1] Thu Aug 25 07:58:53 2011 @@ -410,8 +410,8 @@ if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES, - &ppdev->ulMode, - sizeof(PVIDEO_MODE), + NULL, + 0, &ppdev->PointerCapabilities, sizeof(ppdev->PointerCapabilities), &returnedDataLength))

1 0

[tfaber] 53433: [CMAKE] - Do not spam MSVC build log with RC/nmake logo
by tfaber＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tfaber Date: Thu Aug 25 07:32:01 2011 New Revision: 53433 URL: http://svn.reactos.org/svn/reactos?rev=53433&view=rev Log: [CMAKE] - Do not spam MSVC build log with RC/nmake logo Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Thu Aug 25 07:32:01 2011 @@ -182,7 +182,7 @@ if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR MATCHES "MinGW Makefiles") set(CLEAN_COMMAND make clean) elseif(CMAKE_GENERATOR MATCHES "NMake Makefiles") - set(CLEAN_COMMAND nmake clean) + set(CLEAN_COMMAND nmake /nologo clean) endif() add_custom_target(${target}_clean COMMAND ${CLEAN_COMMAND} Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53433… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Aug 25 07:32:01 2011 @@ -36,7 +36,7 @@ link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt) -set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") if(MSVC_IDE) # Asm source files are not supported in VS generators yet. As a result, <DEFINES> isn't recognized. @@ -143,7 +143,7 @@ set(rc_result_incs "/I${arg} ${rc_result_incs}") endforeach() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE) + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE) endfunction() # Thanks MS for creating a stupid linker

1 0

[tkreuzer] 53432: [EVENTVWR] - remove some unneccessary casts - simplyfy code - use sizeof(PVOID) instead of sizeof(PEVENTLOGRECORD)
by tkreuzer＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tkreuzer Date: Thu Aug 25 07:20:02 2011 New Revision: 53432 URL: http://svn.reactos.org/svn/reactos?rev=53432&view=rev Log: [EVENTVWR] - remove some unneccessary casts - simplyfy code - use sizeof(PVOID) instead of sizeof(PEVENTLOGRECORD) Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Thu Aug 25 07:20:02 2011 @@ -123,8 +123,8 @@ return; for (iIndex = 0; iIndex < g_TotalRecords; iIndex++) - HeapFree(GetProcessHeap(), 0, (PEVENTLOGRECORD) g_RecordPtrs[iIndex]); - HeapFree(GetProcessHeap(), 0, (PEVENTLOGRECORD) g_RecordPtrs); + HeapFree(GetProcessHeap(), 0, g_RecordPtrs[iIndex]); + HeapFree(GetProcessHeap(), 0, g_RecordPtrs); g_RecordPtrs = NULL; } @@ -311,7 +311,7 @@ szMessage = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset); /* Allocate space for parameters */ - szArguments = (LPWSTR*)malloc(sizeof(LPVOID) * pevlr->NumStrings); + szArguments = malloc(sizeof(LPVOID) * pevlr->NumStrings); if (!szArguments) { return FALSE; @@ -325,15 +325,10 @@ { /* Not yet support for reading messages from parameter message DLL */ } - - szArguments[i] = szMessage; - szMessage += wcslen(szMessage) + 1; } - else - { - szArguments[i] = szMessage; - szMessage += wcslen(szMessage) + 1; - } + + szArguments[i] = szMessage; + szMessage += wcslen(szMessage) + 1; } szDll = wcstok(SourceModuleName, EVENT_DLL_SEPARATOR); @@ -386,7 +381,7 @@ if (!bDone) { LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); - swprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); + swprintf(EventText, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName); } free(szArguments); @@ -396,7 +391,7 @@ } LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); - swprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); + swprintf(EventText, szStringIDNotFound, (pevlr->EventID & 0xFFFF), SourceName); return FALSE; } @@ -555,7 +550,7 @@ GetNumberOfEventLogRecords (hEventLog , &dwTotalRecords); g_TotalRecords = dwTotalRecords; - g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(PEVENTLOGRECORD)); + g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(PVOID)); /* If we have at least 1000 records show the waiting dialog */ if (dwTotalRecords > 1000) @@ -570,7 +565,7 @@ while (dwCurrentRecord < dwTotalRecords) { - pevlr = (EVENTLOGRECORD*) HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD) * dwTotalRecords); + pevlr = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD) * dwTotalRecords); g_RecordPtrs[dwCurrentRecord] = pevlr; bResult = ReadEventLog(hEventLog, // Event log handle @@ -583,7 +578,7 @@ if((!bResult) && (GetLastError () == ERROR_INSUFFICIENT_BUFFER)) { HeapFree(GetProcessHeap(), 0, pevlr); - pevlr = (EVENTLOGRECORD*) HeapAlloc(GetProcessHeap(), 0, dwNeeded); + pevlr = HeapAlloc(GetProcessHeap(), 0, dwNeeded); g_RecordPtrs[dwCurrentRecord] = pevlr; ReadEventLogW(hEventLog, // event log handle @@ -622,8 +617,8 @@ GetEventType(pevlr->EventType, szEventTypeText); GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory); - swprintf(szEventID, L"%u", (DWORD)(pevlr->EventID & 0xFFFF)); - swprintf(szCategoryID, L"%u", (DWORD)(pevlr->EventCategory)); + swprintf(szEventID, L"%u", (pevlr->EventID & 0xFFFF)); + swprintf(szCategoryID, L"%u", pevlr->EventCategory); lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; lviEventItem.iItem = 0; @@ -689,7 +684,7 @@ i = swprintf(szWindowTitle, L"%s - %s Log on \\\\", szTitle, lpLogName); /* i = number of characters written */ /* lpComputerName can be NULL here if no records was read */ - dwMaxLength = sizeof(szWindowTitle)/sizeof(WCHAR)-i; + dwMaxLength = sizeof(szWindowTitle) / sizeof(WCHAR) - i; if(!lpComputerName) GetComputerNameW(szWindowTitle+i, &dwMaxLength); else

1 0

[tkreuzer] 53431: [USETUP] Use sizeof(WCHAR) instead of sizeof(PWCHAR) when calculating REG_SZ size for NtSetValueKey
by tkreuzer＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tkreuzer Date: Thu Aug 25 07:03:12 2011 New Revision: 53431 URL: http://svn.reactos.org/svn/reactos?rev=53431&view=rev Log: [USETUP] Use sizeof(WCHAR) instead of sizeof(PWCHAR) when calculating REG_SZ size for NtSetValueKey Modified: trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Thu Aug 25 07:03:12 2011 @@ -38,7 +38,7 @@ IN PINPUT_RECORD Ir, IN ULONG WaitEvent); -static +static ULONG FindLanguageIndex() { @@ -143,8 +143,8 @@ do { CONSOLE_SetStyledText ( - entry[index].X, - entry[index].Y, + entry[index].X, + entry[index].Y, entry[index].Flags, entry[index].Buffer); @@ -517,7 +517,7 @@ 0, REG_SZ, (PVOID)ACPage, - (wcslen(ACPage)+1) * sizeof(PWCHAR)); + (wcslen(ACPage)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -532,7 +532,7 @@ 0, REG_SZ, (PVOID)OEMCPage, - (wcslen(OEMCPage)+1) * sizeof(PWCHAR)); + (wcslen(OEMCPage)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -547,7 +547,7 @@ 0, REG_SZ, (PVOID)MACCPage, - (wcslen(MACCPage)+1) * sizeof(PWCHAR)); + (wcslen(MACCPage)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);

1 0

[akhaldi] 53430: [NEWCC] * Sync back some changes from the hg repo.
by akhaldi＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: akhaldi Date: Thu Aug 25 02:30:44 2011 New Revision: 53430 URL: http://svn.reactos.org/svn/reactos?rev=53430&view=rev Log: [NEWCC] * Sync back some changes from the hg repo. Added: branches/arty-newcc/ntoskrnl/ex/fastinterlck.c (with props) Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c branches/arty-newcc/ntoskrnl/CMakeLists.txt branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/copysup.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/lazyrite.c branches/arty-newcc/ntoskrnl/cache/logsup.c branches/arty-newcc/ntoskrnl/cache/mdlsup.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/cache/section/data.c branches/arty-newcc/ntoskrnl/cache/section/fault.c branches/arty-newcc/ntoskrnl/cache/section/io.c branches/arty-newcc/ntoskrnl/cache/section/newmm.h branches/arty-newcc/ntoskrnl/cache/section/reqtools.c branches/arty-newcc/ntoskrnl/cache/section/sptab.c branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c branches/arty-newcc/ntoskrnl/mm/amd64/init.c branches/arty-newcc/ntoskrnl/mm/section.c branches/arty-newcc/ntoskrnl/ps/psmgr.c Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -138,16 +138,18 @@ if (!NT_SUCCESS(Status)) break; - ReadLen = BLOCKSIZE - (ActualReadOffset & (BLOCKSIZE - 1)); - if (ReadLen > EndOfExtent - ActualReadOffset) + ReadLen = BLOCKSIZE - (ReadOffset & (BLOCKSIZE - 1)); + if (ReadLen > EndOfExtent - ReadOffset) { - ReadLen = EndOfExtent - ActualReadOffset; + ReadLen = EndOfExtent - ReadOffset; } RtlCopyMemory(TargetRead, ReadInPage, ReadLen); - ActualReadOffset += ReadLen; + ActualReadOffset += BLOCKSIZE; + ReadOffset += ReadLen; TargetRead += ReadLen; + ReadInPage = PageBuf; } ExFreePool(PageBuf); Modified: branches/arty-newcc/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/CMakeLists.… ============================================================================== --- branches/arty-newcc/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/CMakeLists.txt [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -18,7 +18,9 @@ set_rc_compiler() -set(NEWCC FALSE) +if(NOT DEFINED NEWCC) + set(NEWCC FALSE) +endif(NOT DEFINED NEWCC) if(NEWCC) add_definitions(-DNEWCC) @@ -29,12 +31,7 @@ cache/lazyrite.c cache/logsup.c cache/mdlsup.c - cache/pinsup.c - cache/section/data.c - cache/section/fault.c - cache/section/reqtools.c - cache/section/sptab.c - cache/section/swapout.c) + cache/pinsup.c) else() list(APPEND SOURCE cc/cacheman.c @@ -47,6 +44,11 @@ list(APPEND SOURCE cache/section/io.c + cache/section/data.c + cache/section/fault.c + cache/section/reqtools.c + cache/section/sptab.c + cache/section/swapout.c config/cmalloc.c config/cmapi.c config/cmboot.c Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #include "newcc.h" #include "section/newmm.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* STRUCTURES *****************************************************************/ Modified: branches/arty-newcc/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/copys… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -11,7 +11,7 @@ #include <ntoskrnl.h> #include "newcc.h" #include "section/newmm.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #include "newcc.h" #include "section/newmm.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ @@ -335,7 +335,7 @@ { ToWrite = MIN(UpperBound.QuadPart - LowerBound.QuadPart, (PAGE_SIZE - LowerBound.QuadPart) & (PAGE_SIZE - 1)); DPRINT("Zero last half %08x%08x %x\n", Target.u.HighPart, Target.u.LowPart, ToWrite); - Status = MiSimpleRead(FileObject, &Target, ZeroBuf, PAGE_SIZE, &IOSB); + Status = MiSimpleRead(FileObject, &Target, ZeroBuf, PAGE_SIZE, TRUE, &IOSB); if (!NT_SUCCESS(Status)) { ExFreePool(ZeroBuf); @@ -371,7 +371,7 @@ { ToWrite = UpperBound.QuadPart - Target.QuadPart; DPRINT("Zero first half %08x%08x %x\n", Target.u.HighPart, Target.u.LowPart, ToWrite); - Status = MiSimpleRead(FileObject, &Target, ZeroBuf, PAGE_SIZE, &IOSB); + Status = MiSimpleRead(FileObject, &Target, ZeroBuf, PAGE_SIZE, TRUE, &IOSB); if (!NT_SUCCESS(Status)) { ExFreePool(ZeroBuf); Modified: branches/arty-newcc/ntoskrnl/cache/lazyrite.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/lazyr… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #include "newcc.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ Modified: branches/arty-newcc/ntoskrnl/cache/logsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/logsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/logsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/logsup.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #include "newcc.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ Modified: branches/arty-newcc/ntoskrnl/cache/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/mdlsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/mdlsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/mdlsup.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -10,7 +10,7 @@ #include <ntoskrnl.h> #include "newcc.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -133,8 +133,6 @@ if (Immediate) { PROS_SECTION_OBJECT ToDeref = Bcb->SectionObject; - BOOLEAN Dirty = Bcb->Dirty; - Bcb->Map = NULL; Bcb->SectionObject = NULL; Bcb->BaseAddress = NULL; @@ -481,7 +479,6 @@ { // Fault in the pages. This forces reads to happen now. ULONG i; - CHAR Dummy; PCHAR FaultIn = Bcb->BaseAddress; DPRINT ("Faulting in pages at this point: file %wZ %08x%08x:%x\n", @@ -491,7 +488,7 @@ Bcb->Length); for (i = 0; i < Bcb->Length; i += PAGE_SIZE) { - Dummy = FaultIn[i]; + FaultIn[i] ^= 0; } } ASSERT(Bcb >= CcCacheSections && Bcb < (CcCacheSections + CACHE_NUM_SECTIONS)); Modified: branches/arty-newcc/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/data.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -61,15 +61,6 @@ ULONG_PTR MmSubsectionBase; -NTSTATUS -NTAPI -MiSimpleRead -(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - PVOID Buffer, - ULONG Length, - PIO_STATUS_BLOCK ReadStatus); - static const INFORMATION_CLASS_INFO ExSectionInfoClass[] = { ICI_SQ_SAME( sizeof(SECTION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionBasicInformation */ Modified: branches/arty-newcc/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/fault.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -655,7 +655,7 @@ } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) { - if (Thread->ActiveFaultCount > 1) + if (Thread->ActiveFaultCount > 2) { WORK_QUEUE_WITH_CONTEXT Context = { }; DPRINTC("Already fault handling ... going to work item (%x)\n", Address); Modified: branches/arty-newcc/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/io.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -166,7 +166,7 @@ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - DPRINT1("KeWaitForSingleObject(&ReadWait)\n"); + DPRINT("KeWaitForSingleObject(&ReadWait)\n"); if (!NT_SUCCESS (KeWaitForSingleObject (&ReadWait, @@ -215,8 +215,9 @@ ASSERT(DeviceObject); DPRINT - ("PAGING WRITE: FileObject %x Offset %x Length %d (%s:%d)\n", - &FileObject, + ("PAGING WRITE: FileObject %x <%wZ> Offset %x Length %d (%s:%d)\n", + FileObject, + &FileObject->FileName, FileOffset->LowPart, Length, File, @@ -256,7 +257,7 @@ if (Status == STATUS_PENDING) { - DPRINT1("KeWaitForSingleObject(&ReadWait)\n"); + DPRINT("KeWaitForSingleObject(&ReadWait)\n"); if (!NT_SUCCESS (KeWaitForSingleObject (&ReadWait, @@ -302,7 +303,7 @@ MmDeleteHyperspaceMapping(Hyperspace); KeLowerIrql(OldIrql); - DPRINT1("MiWriteBackPage(%wZ,%08x%08x,%s:%d)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart, File, Line); + DPRINT("MiWriteBackPage(%wZ,%08x%08x,%s:%d)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart, File, Line); Status = MiSimpleWrite (FileObject, FileOffset, Modified: branches/arty-newcc/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/newmm.h [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -16,7 +16,6 @@ #define CLEAN_SSE(E) ((E) & ~2) #define IS_DIRTY_SSE(E) ((E) & 2) -#define MEMORY_AREA_CACHE (2) #define MM_SEGMENT_FINALIZE (0x40000000) #define RMAP_SEGMENT_MASK ~0xff @@ -31,7 +30,7 @@ (((Consumer) == MC_USER) || \ ((Consumer) == MC_CACHE)) -#define SEC_CACHE (0x40000000) +#define SEC_CACHE (0x20000000) #define MiWaitForPageEvent(Process,Address) do { \ DPRINT("MiWaitForPageEvent %x:%x #\n", Process, Address); \ @@ -47,32 +46,11 @@ #define ENTRIES_PER_ELEMENT 256 extern KEVENT MmWaitPageEvent; - -typedef struct _MM_CACHE_SECTION_SEGMENT -{ - FAST_MUTEX Lock; /* lock which protects the page directory */ - PFILE_OBJECT FileObject; - ULARGE_INTEGER RawLength; /* length of the segment which is part of the mapped file */ - ULARGE_INTEGER Length; /* absolute length of the segment */ - ULONG ReferenceCount; - ULONG Protection; - ULONG Flags; - BOOLEAN WriteCopy; - - struct - { - LONG FileOffset; /* start offset into the file for image sections */ - ULONG_PTR VirtualAddress; /* dtart offset into the address range for image sections */ - ULONG Characteristics; - } Image; - - RTL_GENERIC_TABLE PageTable; -} MM_CACHE_SECTION_SEGMENT, *PMM_CACHE_SECTION_SEGMENT; typedef struct _CACHE_SECTION_PAGE_TABLE { LARGE_INTEGER FileOffset; - PMM_CACHE_SECTION_SEGMENT Segment; + PMM_SECTION_SEGMENT Segment; ULONG Refcount; ULONG PageEntries[ENTRIES_PER_ELEMENT]; } CACHE_SECTION_PAGE_TABLE, *PCACHE_SECTION_PAGE_TABLE; @@ -111,55 +89,66 @@ int Line; } MM_REQUIRED_RESOURCES, *PMM_REQUIRED_RESOURCES; +NTSTATUS +NTAPI +MmCreateCacheSection +(PROS_SECTION_OBJECT *SectionObject, + ACCESS_MASK DesiredAccess, + POBJECT_ATTRIBUTES ObjectAttributes, + PLARGE_INTEGER UMaximumSize, + ULONG SectionPageProtection, + ULONG AllocationAttributes, + PFILE_OBJECT FileObject); + PFN_NUMBER NTAPI MmWithdrawSectionPage -(PMM_CACHE_SECTION_SEGMENT Segment, PLARGE_INTEGER FileOffset, BOOLEAN *Dirty); +(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER FileOffset, BOOLEAN *Dirty); NTSTATUS NTAPI MmFinalizeSectionPageOut -(PMM_CACHE_SECTION_SEGMENT Segment, PLARGE_INTEGER FileOffset, PFN_NUMBER Page, +(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER FileOffset, PFN_NUMBER Page, BOOLEAN Dirty); /* sptab.c *******************************************************************/ VOID NTAPI -MiInitializeSectionPageTable(PMM_CACHE_SECTION_SEGMENT Segment); - -NTSTATUS -NTAPI -_MiSetPageEntryCacheSectionSegment -(PMM_CACHE_SECTION_SEGMENT Segment, +MiInitializeSectionPageTable(PMM_SECTION_SEGMENT Segment); + +NTSTATUS +NTAPI +_MmSetPageEntrySectionSegment +(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset, ULONG Entry, const char *file, int line); ULONG NTAPI -_MiGetPageEntryCacheSectionSegment -(PMM_CACHE_SECTION_SEGMENT Segment, +_MmGetPageEntrySectionSegment +(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset, const char *file, int line); -#define MiSetPageEntryCacheSectionSegment(S,O,E) _MiSetPageEntryCacheSectionSegment(S,O,E,__FILE__,__LINE__) -#define MiGetPageEntryCacheSectionSegment(S,O) _MiGetPageEntryCacheSectionSegment(S,O,__FILE__,__LINE__) +#define MmSetPageEntrySectionSegment(S,O,E) _MmSetPageEntrySectionSegment(S,O,E,__FILE__,__LINE__) +#define MmGetPageEntrySectionSegment(S,O) _MmGetPageEntrySectionSegment(S,O,__FILE__,__LINE__) typedef VOID (NTAPI *FREE_SECTION_PAGE_FUN) - (PMM_CACHE_SECTION_SEGMENT Segment, + (PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset); VOID NTAPI -MiFreePageTablesSectionSegment(PMM_CACHE_SECTION_SEGMENT Segment, FREE_SECTION_PAGE_FUN FreePage); +MmFreePageTablesSectionSegment(PMM_SECTION_SEGMENT Segment, FREE_SECTION_PAGE_FUN FreePage); /* Yields a lock */ -PMM_CACHE_SECTION_SEGMENT +PMM_SECTION_SEGMENT NTAPI MmGetSectionAssociation(PFN_NUMBER Page, PLARGE_INTEGER Offset); NTSTATUS NTAPI -MmSetSectionAssociation(PFN_NUMBER Page, PMM_CACHE_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset); +MmSetSectionAssociation(PFN_NUMBER Page, PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset); VOID NTAPI @@ -262,7 +251,7 @@ VOID NTAPI MiFreeSegmentPage -(PMM_CACHE_SECTION_SEGMENT Segment, +(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER FileOffset); NTSTATUS @@ -283,15 +272,15 @@ VOID NTAPI -_MmLockCacheSectionSegment(PMM_CACHE_SECTION_SEGMENT Segment, const char *file, int line); - -#define MmLockCacheSectionSegment(x) _MmLockCacheSectionSegment(x,__FILE__,__LINE__) - -VOID -NTAPI -_MmUnlockCacheSectionSegment(PMM_CACHE_SECTION_SEGMENT Segment, const char *file, int line); - -#define MmUnlockCacheSectionSegment(x) _MmUnlockCacheSectionSegment(x,__FILE__,__LINE__) +_MmLockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line); + +#define MmLockSectionSegment(x) _MmLockSectionSegment(x,__FILE__,__LINE__) + +VOID +NTAPI +_MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line); + +#define MmUnlockSectionSegment(x) _MmUnlockSectionSegment(x,__FILE__,__LINE__) VOID MmFreeCacheSectionPage @@ -306,7 +295,7 @@ VOID NTAPI -MmFinalizeSegment(PMM_CACHE_SECTION_SEGMENT Segment); +MmFinalizeSegment(PMM_SECTION_SEGMENT Segment); VOID NTAPI @@ -314,7 +303,7 @@ NTSTATUS NTAPI MmMapCacheViewInSystemSpaceAtOffset -(IN PMM_CACHE_SECTION_SEGMENT Segment, +(IN PMM_SECTION_SEGMENT Segment, OUT PVOID * MappedBase, IN PLARGE_INTEGER ViewOffset, IN OUT PULONG ViewSize); @@ -323,7 +312,7 @@ NTAPI _MiMapViewOfSegment (PMMSUPPORT AddressSpace, - PMM_CACHE_SECTION_SEGMENT Segment, + PMM_SECTION_SEGMENT Segment, PVOID* BaseAddress, SIZE_T ViewSize, ULONG Protect, @@ -388,24 +377,13 @@ NTSTATUS NTAPI -MmExtendCacheSection(PMM_CACHE_SECTION_SEGMENT Section, PLARGE_INTEGER NewSize, BOOLEAN ExtendFile); +MmExtendCacheSection(PROS_SECTION_OBJECT Section, PLARGE_INTEGER NewSize, BOOLEAN ExtendFile); NTSTATUS NTAPI _MiFlushMappedSection(PVOID BaseAddress, PLARGE_INTEGER BaseOffset, PLARGE_INTEGER FileSize, BOOLEAN Dirty, const char *File, int Line); #define MiFlushMappedSection(A,O,S,D) _MiFlushMappedSection(A,O,S,D,__FILE__,__LINE__) - -NTSTATUS -NTAPI -MmCreateCacheSection -(PMM_CACHE_SECTION_SEGMENT *SegmentObject, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PLARGE_INTEGER UMaximumSize, - ULONG SectionPageProtection, - ULONG AllocationAttributes, - PFILE_OBJECT FileObject); PVOID NTAPI @@ -420,4 +398,7 @@ ULONG NTAPI -MiCacheEvictPages(PVOID BaseAddress, ULONG Target); +MiCacheEvictPages(PMM_SECTION_SEGMENT Segment, ULONG Target); + +NTSTATUS +MiRosTrimCache(ULONG Target, ULONG Priority, PULONG NrFreed); Modified: branches/arty-newcc/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/reqtools.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/reqtools.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -148,6 +148,9 @@ FileOffset, PageBuf, RequiredResources->Amount, +#ifdef __ROS_CMAKE__ + TRUE, +#endif &IOSB); RtlZeroMemory ((PCHAR)PageBuf+RequiredResources->Amount, Modified: branches/arty-newcc/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/sptab.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -168,9 +168,6 @@ MmSetSectionAssociation(PFN_FROM_SSE(Entry), Segment, Offset); } PageTable->PageEntries[PageIndex] = Entry; - DPRINT - ("MiSetPageEntrySectionSegment(%p,%08x%08x,%x=>%x) %s:%d\n", - Segment, Offset->u.HighPart, Offset->u.LowPart, OldEntry, Entry, file, line); return STATUS_SUCCESS; } @@ -214,7 +211,8 @@ DPRINT("MiFreePageTablesSectionSegment(%p)\n", &Segment->PageTable); while ((Element = RtlGetElementGenericTable(&Segment->PageTable, 0))) { DPRINT - ("Delete table for %x -> %08x%08x\n", + ("Delete table for <%wZ> %x -> %08x%08x\n", + Segment->FileObject ? &Segment->FileObject->FileName : NULL, Segment, Element->FileOffset.u.HighPart, Element->FileOffset.u.LowPart); @@ -229,7 +227,7 @@ Entry = Element->PageEntries[i]; if (Entry && !IS_SWAP_FROM_SSE(Entry)) { - DPRINTC("Freeing page %x:%x @ %x\n", Segment, Entry, Offset.LowPart); + DPRINT("Freeing page %x:%x @ %x\n", Segment, Entry, Offset.LowPart); FreePage(Segment, &Offset); } } Added: branches/arty-newcc/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ex/fastinte… ============================================================================== --- branches/arty-newcc/ntoskrnl/ex/fastinterlck.c (added) +++ branches/arty-newcc/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -1,0 +1,460 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ex/fastinterlck.c + * PURPOSE: Portable Ex*Interlocked and REGISTER routines for non-x86 + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#if defined(_ARM_) || defined(_PPC_) || defined(NTOS_USE_GENERICS) + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#undef ExInterlockedPushEntrySList +#undef ExInterlockedPopEntrySList +#undef ExInterlockedAddULong +#undef ExInterlockedIncrementLong +#undef ExInterlockedDecrementLong +#undef ExInterlockedAddLargeStatistic + +/* FUNCTIONS ******************************************************************/ + +PSLIST_ENTRY +NTAPI +InterlockedPushEntrySList(IN PSLIST_HEADER ListHead, + IN PSLIST_ENTRY ListEntry) +{ + + PSINGLE_LIST_ENTRY FirstEntry, NextEntry; + PSINGLE_LIST_ENTRY Entry = (PVOID)ListEntry, Head = (PVOID)ListHead; + + FirstEntry = Head->Next; + do + { + Entry->Next = FirstEntry; + NextEntry = FirstEntry; + FirstEntry = (PVOID)_InterlockedCompareExchange((PLONG)Head, + (LONG)Entry, + (LONG)FirstEntry); + } while (FirstEntry != NextEntry); + + return FirstEntry; +} + +PSLIST_ENTRY +NTAPI +InterlockedPopEntrySList(IN PSLIST_HEADER ListHead) +{ + PSINGLE_LIST_ENTRY FirstEntry, NextEntry, Head = (PVOID)ListHead; + + FirstEntry = Head->Next; + do + { + if (!FirstEntry) return NULL; + + NextEntry = FirstEntry; + FirstEntry = (PVOID)_InterlockedCompareExchange((PLONG)Head, + (LONG)FirstEntry->Next, + (LONG)FirstEntry); + } while (FirstEntry != NextEntry); + + return FirstEntry; +} + +PSINGLE_LIST_ENTRY +FASTCALL +ExInterlockedFlushSList(IN PSLIST_HEADER ListHead) +{ + return (PVOID)_InterlockedExchange((PLONG)&ListHead->Next.Next, (LONG)NULL); +} + +PSLIST_ENTRY +FASTCALL +ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, + IN PSLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + return InterlockedPushEntrySList(ListHead, ListEntry); +} + +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPopEntrySList(IN PSLIST_HEADER ListHead, + IN PKSPIN_LOCK Lock) +{ + return InterlockedPopEntrySList(ListHead); +} + +ULONG +FASTCALL +ExfInterlockedAddUlong(IN PULONG Addend, + IN ULONG Increment, + PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + KeAcquireSpinLock(Lock, &OldIrql); + *Addend += Increment; + KeReleaseSpinLock(Lock, OldIrql); + return *Addend; +} + +LONGLONG +FASTCALL +ExfInterlockedCompareExchange64(IN OUT LONGLONG volatile *Destination, + IN PLONGLONG Exchange, + IN PLONGLONG Comparand) +{ + LONGLONG Result; + + Result = *Destination; + if (*Destination == *Comparand) *Destination = *Exchange; + return Result; +} + +PLIST_ENTRY +FASTCALL +ExfInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = ListEntry->Flink; + InsertHeadList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PLIST_ENTRY +FASTCALL +ExfInterlockedInsertTailList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = ListEntry->Blink; + InsertTailList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PSINGLE_LIST_ENTRY +FASTCALL +ExfInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + UNIMPLEMENTED; + return NULL; +} + +PSINGLE_LIST_ENTRY +FASTCALL +ExfInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + UNIMPLEMENTED; + return NULL; +} + +PLIST_ENTRY +FASTCALL +ExfInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + return ExInterlockedRemoveHeadList(ListHead, Lock); +} + +LARGE_INTEGER +NTAPI +ExInterlockedAddLargeInteger(IN PLARGE_INTEGER Addend, + IN LARGE_INTEGER Increment, + IN PKSPIN_LOCK Lock) +{ + LARGE_INTEGER Integer = {{0}}; + UNIMPLEMENTED; + return Integer; +} + +ULONG +NTAPI +ExInterlockedAddUlong(IN PULONG Addend, + IN ULONG Increment, + PKSPIN_LOCK Lock) +{ + return (ULONG)_InterlockedExchangeAdd((PLONG)Addend, Increment); +} + +INTERLOCKED_RESULT +NTAPI +ExInterlockedIncrementLong(IN PLONG Addend, + IN PKSPIN_LOCK Lock) +{ + return _InterlockedIncrement(Addend); +} + +INTERLOCKED_RESULT +NTAPI +ExInterlockedDecrementLong(IN PLONG Addend, + IN PKSPIN_LOCK Lock) +{ + return _InterlockedDecrement(Addend); +} + +ULONG +NTAPI +ExInterlockedExchangeUlong(IN PULONG Target, + IN ULONG Value, + IN PKSPIN_LOCK Lock) +{ + return (ULONG)_InterlockedExchange((PLONG)Target, Value); +} + +PLIST_ENTRY +NTAPI +ExInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = ListEntry->Flink; + InsertHeadList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PLIST_ENTRY +NTAPI +ExInterlockedInsertTailList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = ListEntry->Blink; + InsertTailList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PSINGLE_LIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + OldHead = PopEntryList(ListHead); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PSINGLE_LIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + OldHead = ListHead->Next; + PushEntryList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +PLIST_ENTRY +NTAPI +ExInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead = NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = RemoveHeadList(ListHead); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +VOID +FASTCALL +ExInterlockedAddLargeStatistic(IN PLONGLONG Addend, + IN ULONG Increment) +{ + UNIMPLEMENTED; +} + +LONGLONG +FASTCALL +ExInterlockedCompareExchange64(IN OUT LONGLONG volatile *Destination, + IN PLONGLONG Exchange, + IN PLONGLONG Comparand, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + LONGLONG Result; + + KeAcquireSpinLock(Lock, &OldIrql); + Result = *Destination; + if (*Destination == *Comparand) *Destination = *Exchange; + KeReleaseSpinLock(Lock, OldIrql); + return Result; +} + +VOID +NTAPI +READ_REGISTER_BUFFER_UCHAR(IN PUCHAR Register, + IN PUCHAR Buffer, + IN ULONG Count) +{ + PUCHAR registerBuffer = Register; + PUCHAR readBuffer = Buffer; + ULONG readCount; + + for (readCount = Count; readCount--; readBuffer++, registerBuffer++) + { + *readBuffer = *(volatile UCHAR * const)registerBuffer; + } +} + +VOID +NTAPI +READ_REGISTER_BUFFER_ULONG(IN PULONG Register, + IN PULONG Buffer, + IN ULONG Count) +{ + PULONG registerBuffer = Register; + PULONG readBuffer = Buffer; + ULONG readCount; + + for (readCount = Count; readCount--; readBuffer++, registerBuffer++) + { + *readBuffer = *(volatile ULONG * const)registerBuffer; + } +} + +VOID +NTAPI +READ_REGISTER_BUFFER_USHORT(IN PUSHORT Register, + IN PUSHORT Buffer, + IN ULONG Count) +{ + PUSHORT registerBuffer = Register; + PUSHORT readBuffer = Buffer; + ULONG readCount; + + for (readCount = Count; readCount--; readBuffer++, registerBuffer++) + { + *readBuffer = *(volatile USHORT * const)registerBuffer; + } +} + +UCHAR +NTAPI +READ_REGISTER_UCHAR(IN PUCHAR Register) +{ + return *(volatile UCHAR * const)Register; +} + +ULONG +NTAPI +READ_REGISTER_ULONG(IN PULONG Register) +{ + return *(volatile ULONG * const)Register; +} + +USHORT +NTAPI +READ_REGISTER_USHORT(IN PUSHORT Register) +{ + return *(volatile USHORT * const)Register; +} + +VOID +NTAPI +WRITE_REGISTER_BUFFER_UCHAR(IN PUCHAR Register, + IN PUCHAR Buffer, + IN ULONG Count) +{ + PUCHAR registerBuffer = Register; + PUCHAR writeBuffer = Buffer; + ULONG writeCount; + for (writeCount = Count; writeCount--; writeBuffer++, registerBuffer++) + { + *(volatile UCHAR * const)registerBuffer = *writeBuffer; + } + KeFlushWriteBuffer(); +} + +VOID +NTAPI +WRITE_REGISTER_BUFFER_ULONG(IN PULONG Register, + IN PULONG Buffer, + IN ULONG Count) +{ + PULONG registerBuffer = Register; + PULONG writeBuffer = Buffer; + ULONG writeCount; + for (writeCount = Count; writeCount--; writeBuffer++, registerBuffer++) + { + *(volatile ULONG * const)registerBuffer = *writeBuffer; + } + KeFlushWriteBuffer(); +} + +VOID +NTAPI +WRITE_REGISTER_BUFFER_USHORT(IN PUSHORT Register, + IN PUSHORT Buffer, + IN ULONG Count) +{ + PUSHORT registerBuffer = Register; + PUSHORT writeBuffer = Buffer; + ULONG writeCount; + for (writeCount = Count; writeCount--; writeBuffer++, registerBuffer++) + { + *(volatile USHORT * const)registerBuffer = *writeBuffer; + } + KeFlushWriteBuffer(); +} + +VOID +NTAPI +WRITE_REGISTER_UCHAR(IN PUCHAR Register, + IN UCHAR Value) +{ + *(volatile UCHAR * const)Register = Value; + KeFlushWriteBuffer(); +} + +VOID +NTAPI +WRITE_REGISTER_ULONG(IN PULONG Register, + IN ULONG Value) +{ + *(volatile ULONG * const)Register = Value; + KeFlushWriteBuffer(); +} + +VOID +NTAPI +WRITE_REGISTER_USHORT(IN PUSHORT Register, + IN USHORT Value) +{ + *(volatile USHORT * const)Register = Value; + KeFlushWriteBuffer(); +} + +#endif Propchange: branches/arty-newcc/ntoskrnl/ex/fastinterlck.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/io… ============================================================================== --- branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -2005,10 +2005,7 @@ PreviousMode, (PVOID*)&FileObject, NULL); - if (!NT_SUCCESS(Status)) { - DPRINT1("Status %x\n", Status); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Check for event */ if (Event) @@ -2024,7 +2021,6 @@ { /* Fail */ ObDereferenceObject(FileObject); - DPRINT1("Status %x\n", Status); return Status; } @@ -2067,10 +2063,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) { - DPRINT1("Status %x\n", Status); - return IopCleanupFailedIrp(FileObject, NULL, NULL); - } + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, NULL); /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Modified: branches/arty-newcc/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/amd64/in… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/amd64/init.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -11,7 +11,7 @@ /* INCLUDES ***************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> #include "../ARM3/miarm.h" Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -45,9 +45,8 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#ifdef NEWCC +#include "../cache/newcc.h" #include "../cache/section/newmm.h" -#endif #define NDEBUG #include <debug.h> #include <reactos/exeformat.h> @@ -56,6 +55,12 @@ #pragma alloc_text(INIT, MmCreatePhysicalMemorySection) #pragma alloc_text(INIT, MmInitSectionImplementation) #endif + +#undef MmSetPageEntrySectionSegment +#define MmSetPageEntrySectionSegment(S,O,E) do { \ + DPRINT("SetPageEntrySectionSegment(old,%x,%x,%x)\n", S,(O)->LowPart,E); \ + _MmSetPageEntrySectionSegment(S,O,E,__FILE__,__LINE__); \ + } while (0) NTSTATUS NTAPI @@ -114,7 +119,7 @@ { PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; - ULONG Offset; + LARGE_INTEGER Offset; BOOLEAN WasDirty; BOOLEAN Private; } @@ -158,10 +163,10 @@ #define PAGE_FROM_SSE(E) ((E) & 0xFFFFF000) #define PFN_FROM_SSE(E) ((E) >> PAGE_SHIFT) -#define SHARE_COUNT_FROM_SSE(E) (((E) & 0x00000FFE) >> 1) +#define SHARE_COUNT_FROM_SSE(E) (((E) & 0x00000FFC) >> 2) #define IS_SWAP_FROM_SSE(E) ((E) & 0x00000001) -#define MAX_SHARE_COUNT 0x7FF -#define MAKE_SSE(P, C) ((P) | ((C) << 1)) +#define MAX_SHARE_COUNT 0x3FF +#define MAKE_SSE(P, C) ((P) | ((C) << 2)) #define SWAPENTRY_FROM_SSE(E) ((E) >> 1) #define MAKE_SWAP_SSE(S) (((S) << 1) | 0x1) @@ -595,12 +600,12 @@ if(!AlignUp(&nPrevVirtualEndOfSegment, cbHeadersSize, nSectionAlignment)) DIE(("Cannot align the size of the section headers\n")); - pssSegments[0].FileOffset = 0; + pssSegments[0].Image.FileOffset = 0; pssSegments[0].Protection = PAGE_READONLY; - pssSegments[0].Length = nPrevVirtualEndOfSegment; - pssSegments[0].RawLength = nFileSizeOfHeaders; - pssSegments[0].VirtualAddress = 0; - pssSegments[0].Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA; + pssSegments[0].Length.QuadPart = nPrevVirtualEndOfSegment; + pssSegments[0].RawLength.QuadPart = nFileSizeOfHeaders; + pssSegments[0].Image.VirtualAddress = 0; + pssSegments[0].Image.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA; pssSegments[0].WriteCopy = TRUE; /* skip the headers segment */ @@ -615,7 +620,7 @@ /* validate the alignment */ if(!IsAligned(pishSectionHeaders[i].VirtualAddress, nSectionAlignment)) - DIE(("VirtualAddress[%u] is not aligned\n", i)); + DIE(("Image.VirtualAddress[%u] is not aligned\n", i)); /* sections must be contiguous, ordered by base address and non-overlapping */ if(pishSectionHeaders[i].VirtualAddress != nPrevVirtualEndOfSegment) @@ -637,16 +642,16 @@ // DIE(("PointerToRawData[%u] is not aligned\n", i)); /* conversion */ - pssSegments[i].FileOffset = pishSectionHeaders[i].PointerToRawData; - pssSegments[i].RawLength = pishSectionHeaders[i].SizeOfRawData; + pssSegments[i].Image.FileOffset = pishSectionHeaders[i].PointerToRawData; + pssSegments[i].RawLength.QuadPart = pishSectionHeaders[i].SizeOfRawData; } else { - ASSERT(pssSegments[i].FileOffset == 0); - ASSERT(pssSegments[i].RawLength == 0); + ASSERT(pssSegments[i].Image.FileOffset == 0); + ASSERT(pssSegments[i].RawLength.QuadPart == 0); } - ASSERT(Intsafe_CanAddLong64(pssSegments[i].FileOffset, pssSegments[i].RawLength)); + ASSERT(Intsafe_CanAddLong64(pssSegments[i].Image.FileOffset, pssSegments[i].RawLength.QuadPart)); nCharacteristics = pishSectionHeaders[i].Characteristics; @@ -668,25 +673,28 @@ pssSegments[i].WriteCopy = !(nCharacteristics & IMAGE_SCN_MEM_SHARED); if(pishSectionHeaders[i].Misc.VirtualSize == 0 || pishSectionHeaders[i].Misc.VirtualSize < pishSectionHeaders[i].SizeOfRawData) - pssSegments[i].Length = pishSectionHeaders[i].SizeOfRawData; + pssSegments[i].Length.QuadPart = pishSectionHeaders[i].SizeOfRawData; else - pssSegments[i].Length = pishSectionHeaders[i].Misc.VirtualSize; - - if(!AlignUp(&pssSegments[i].Length, pssSegments[i].Length, nSectionAlignment)) + pssSegments[i].Length.QuadPart = pishSectionHeaders[i].Misc.VirtualSize; + + if(!AlignUp(&pssSegments[i].Length.LowPart, pssSegments[i].Length.LowPart, nSectionAlignment)) DIE(("Cannot align the virtual size of section %u\n", i)); - ASSERT(IsAligned(pssSegments[i].Length, nSectionAlignment)); - - if(pssSegments[i].Length == 0) + ASSERT(IsAligned(pssSegments[i].Length.LowPart, nSectionAlignment)); + + if(pssSegments[i].Length.QuadPart == 0) DIE(("Virtual size of section %u is null\n", i)); - pssSegments[i].VirtualAddress = pishSectionHeaders[i].VirtualAddress; - pssSegments[i].Characteristics = pishSectionHeaders[i].Characteristics; - + pssSegments[i].Image.VirtualAddress = pishSectionHeaders[i].VirtualAddress; + pssSegments[i].Image.Characteristics = pishSectionHeaders[i].Characteristics; + /* ensure the memory image is no larger than 4GB */ - if(!Intsafe_AddULong32(&nPrevVirtualEndOfSegment, pssSegments[i].VirtualAddress, pssSegments[i].Length)) + if(!Intsafe_AddULong32(&nPrevVirtualEndOfSegment, pssSegments[i].Image.VirtualAddress, pssSegments[i].Length.QuadPart)) 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; @@ -750,23 +758,6 @@ //return KeWaitForSingleObject(&File->Lock, 0, KernelMode, FALSE, NULL); } - -VOID -MmFreePageTablesSectionSegment(PMM_SECTION_SEGMENT Segment) -{ - ULONG i; - if (Segment->Length > NR_SECTION_PAGE_TABLES * PAGE_SIZE) - { - for (i = 0; i < NR_SECTION_PAGE_TABLES; i++) - { - if (Segment->PageDirectory.PageTables[i] != NULL) - { - ExFreePool(Segment->PageDirectory.PageTables[i]); - } - } - } -} - VOID NTAPI MmFreeSectionSegments(PFILE_OBJECT FileObject) @@ -789,7 +780,7 @@ SectionSegments[i].ReferenceCount); KeBugCheck(MEMORY_MANAGEMENT); } - MmFreePageTablesSectionSegment(&SectionSegments[i]); + MmFreePageTablesSectionSegment(&SectionSegments[i], NULL); } ExFreePool(ImageSectionObject->Segments); ExFreePool(ImageSectionObject); @@ -807,98 +798,16 @@ DPRINT1("Data segment still referenced\n"); KeBugCheck(MEMORY_MANAGEMENT); } - MmFreePageTablesSectionSegment(Segment); + MmFreePageTablesSectionSegment(Segment, NULL); ExFreePool(Segment); FileObject->SectionObjectPointer->DataSectionObject = NULL; } -} - -VOID -NTAPI -MmLockSectionSegment(PMM_SECTION_SEGMENT Segment) -{ - ExAcquireFastMutex(&Segment->Lock); -} - -VOID -NTAPI -MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment) -{ - ExReleaseFastMutex(&Segment->Lock); -} - -VOID -NTAPI -MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, - ULONG Offset, - ULONG Entry) -{ - PSECTION_PAGE_TABLE Table; - ULONG DirectoryOffset; - ULONG TableOffset; - - if (Segment->Length <= NR_SECTION_PAGE_TABLES * PAGE_SIZE) - { - Table = (PSECTION_PAGE_TABLE)&Segment->PageDirectory; - } - else - { - DirectoryOffset = PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(Offset); - Table = Segment->PageDirectory.PageTables[DirectoryOffset]; - if (Table == NULL) - { - Table = - Segment->PageDirectory.PageTables[DirectoryOffset] = - ExAllocatePoolWithTag(NonPagedPool, sizeof(SECTION_PAGE_TABLE), - TAG_SECTION_PAGE_TABLE); - if (Table == NULL) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - memset(Table, 0, sizeof(SECTION_PAGE_TABLE)); - DPRINT("Table %x\n", Table); - } - } - TableOffset = PAGE_TO_SECTION_PAGE_TABLE_OFFSET(Offset); - Table->Entry[TableOffset] = Entry; -} - - -ULONG -NTAPI -MmGetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, - ULONG Offset) -{ - PSECTION_PAGE_TABLE Table; - ULONG Entry; - ULONG DirectoryOffset; - ULONG TableOffset; - - DPRINT("MmGetPageEntrySection(Segment %x, Offset %x)\n", Segment, Offset); - - if (Segment->Length <= NR_SECTION_PAGE_TABLES * PAGE_SIZE) - { - Table = (PSECTION_PAGE_TABLE)&Segment->PageDirectory; - } - else - { - DirectoryOffset = PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(Offset); - Table = Segment->PageDirectory.PageTables[DirectoryOffset]; - DPRINT("Table %x\n", Table); - if (Table == NULL) - { - return(0); - } - } - TableOffset = PAGE_TO_SECTION_PAGE_TABLE_OFFSET(Offset); - Entry = Table->Entry[TableOffset]; - return(Entry); } VOID NTAPI MmSharePageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, - ULONG Offset) + PLARGE_INTEGER Offset) { ULONG Entry; @@ -925,7 +834,7 @@ NTAPI MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section, PMM_SECTION_SEGMENT Segment, - ULONG Offset, + PLARGE_INTEGER Offset, BOOLEAN Dirty, BOOLEAN PageOut) { @@ -955,39 +864,39 @@ if (SHARE_COUNT_FROM_SSE(Entry) == 0) { PFILE_OBJECT FileObject; +#ifndef NEWCC PBCB Bcb; +#endif SWAPENTRY SavedSwapEntry; PFN_NUMBER Page; BOOLEAN IsImageSection; - ULONG FileOffset; - - FileOffset = Offset + Segment->FileOffset; + LARGE_INTEGER FileOffset; + + FileOffset.QuadPart = Offset->QuadPart + Segment->Image.FileOffset; IsImageSection = Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; Page = PFN_FROM_SSE(Entry); FileObject = Section->FileObject; if (FileObject != NULL && - !(Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) - { - - if ((FileOffset % PAGE_SIZE) == 0 && - (Offset + PAGE_SIZE <= Segment->RawLength || !IsImageSection)) + !(Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) + { + +#ifndef NEWCC + if ((FileOffset.QuadPart % PAGE_SIZE) == 0 && + (Offset->QuadPart + PAGE_SIZE <= Segment->RawLength.QuadPart || !IsImageSection)) { NTSTATUS Status; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; IsDirectMapped = TRUE; -#ifndef NEWCC - Status = CcRosUnmapCacheSegment(Bcb, FileOffset, Dirty); -#else - Status = STATUS_SUCCESS; -#endif + Status = CcRosUnmapCacheSegment(Bcb, FileOffset.LowPart, Dirty); if (!NT_SUCCESS(Status)) { - DPRINT1("CcRosUnmapCacheSegment failed, status = %x\n", Status); + DPRINT1("CcRosUnmapCacheSegment failed, status = %x\n", Status); KeBugCheck(MEMORY_MANAGEMENT); } } +#endif } SavedSwapEntry = MmGetSavedSwapEntryPage(Page); @@ -995,7 +904,7 @@ { if (!PageOut && ((Segment->Flags & MM_PAGEFILE_SEGMENT) || - (Segment->Characteristics & IMAGE_SCN_MEM_SHARED))) + (Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED))) { /* * FIXME: @@ -1018,7 +927,7 @@ else { if ((Segment->Flags & MM_PAGEFILE_SEGMENT) || - (Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + (Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { if (!PageOut) { @@ -1060,12 +969,12 @@ ULONG SegOffset) { #ifndef NEWCC - if (!(MemoryArea->Data.SectionData.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + if (!(MemoryArea->Data.SectionData.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { PBCB Bcb; PCACHE_SEGMENT CacheSeg; Bcb = MemoryArea->Data.SectionData.Section->FileObject->SectionObjectPointer->SharedCacheMap; - CacheSeg = CcRosLookupCacheSegment(Bcb, SegOffset + MemoryArea->Data.SectionData.Segment->FileOffset); + CacheSeg = CcRosLookupCacheSegment(Bcb, SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset); if (CacheSeg) { CcRosReleaseCacheSegment(Bcb, CacheSeg, CacheSeg->Valid, FALSE, TRUE); @@ -1123,8 +1032,8 @@ FileObject = MemoryArea->Data.SectionData.Section->FileObject; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - RawLength = MemoryArea->Data.SectionData.Segment->RawLength; - FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->FileOffset; + RawLength = MemoryArea->Data.SectionData.Segment->RawLength.QuadPart; + FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset; IsImageSection = MemoryArea->Data.SectionData.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; ASSERT(Bcb); @@ -1138,7 +1047,7 @@ */ if ((FileOffset % PAGE_SIZE) == 0 && (SegOffset + PAGE_SIZE <= RawLength || !IsImageSection) && - !(MemoryArea->Data.SectionData.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + !(MemoryArea->Data.SectionData.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { /* @@ -1278,8 +1187,8 @@ NTSTATUS NTAPI MiReadPage(PMEMORY_AREA MemoryArea, - ULONG SegOffset, - PPFN_NUMBER Page) + ULONG SegOffset, + PPFN_NUMBER Page) /* * FUNCTION: Read a page for a section backed memory area. * PARAMETERS: @@ -1289,15 +1198,13 @@ */ { MM_REQUIRED_RESOURCES Resources = { }; - + Resources.Context = MemoryArea->Data.SectionData.Section->FileObject; Resources.FileOffset.QuadPart = SegOffset + - MemoryArea->Data.SectionData.Segment->FileOffset; + MemoryArea->Data.SectionData.Segment->Image.FileOffset; Resources.Consumer = MC_USER; Resources.Amount = PAGE_SIZE; - - DPRINT1("%S, offset %x, len %d, page %x\n", ((PFILE_OBJECT)Resources.Context)->FileName.Buffer, Resources.FileOffset.LowPart, Resources.Amount, Resources.Page[0]); - + DPRINT("%S, offset %x, len %d, page %x\n", ((PFILE_OBJECT)Resources.Context)->FileName.Buffer, Resources.FileOffset.LowPart, Resources.Amount, Resources.Page[0]); NTSTATUS Status = MiReadFilePage(NULL, NULL, &Resources); *Page = Resources.Page[0]; return Status; @@ -1307,11 +1214,11 @@ NTSTATUS NTAPI MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address, + MEMORY_AREA* MemoryArea, + PVOID Address, BOOLEAN Locked) { - ULONG Offset; + LARGE_INTEGER Offset; PFN_NUMBER Page; NTSTATUS Status; PVOID PAddress; @@ -1336,8 +1243,8 @@ } PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset.QuadPart = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; @@ -1366,7 +1273,7 @@ /* * Get or create a page operation descriptor */ - PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset, MM_PAGEOP_PAGEIN, FALSE); + PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset.LowPart, MM_PAGEOP_PAGEIN, FALSE); if (PageOp == NULL) { DPRINT1("MmGetPageOp failed\n"); @@ -1423,7 +1330,7 @@ */ if (!MmIsPagePresent(Process, Address)) { - Entry = MmGetPageEntrySectionSegment(Segment, Offset); + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); if (PAGE_FROM_SSE(Entry) == 0 || HasSwapEntry) @@ -1438,7 +1345,7 @@ Page = PFN_FROM_SSE(Entry); - MmSharePageEntrySectionSegment(Segment, Offset); + MmSharePageEntrySectionSegment(Segment, &Offset); /* FIXME: Should we call MmCreateVirtualMappingUnsafe if * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? @@ -1539,7 +1446,7 @@ /* * Just map the desired physical page */ - Page = Offset >> PAGE_SHIFT; + Page = Offset.QuadPart >> PAGE_SHIFT; Status = MmCreateVirtualMappingUnsafe(Process, Address, Region->Protect, @@ -1564,7 +1471,7 @@ /* * Map anonymous memory for BSS sections */ - if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) + if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) { MmUnlockSectionSegment(Segment); MI_SET_USAGE(MI_USAGE_SECTION); @@ -1606,7 +1513,7 @@ /* * Get the entry corresponding to the offset within the section */ - Entry = MmGetPageEntrySectionSegment(Segment, Offset); + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); if (Entry == 0) { @@ -1622,7 +1529,7 @@ MmUnlockAddressSpace(AddressSpace); if ((Segment->Flags & MM_PAGEFILE_SEGMENT) || - (Offset >= PAGE_ROUND_UP(Segment->RawLength) && Section->AllocationAttributes & SEC_IMAGE)) + (Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart) && Section->AllocationAttributes & SEC_IMAGE)) { MI_SET_USAGE(MI_USAGE_SECTION); if (Process) MI_SET_PROCESS2(Process->ImageFileName); @@ -1636,7 +1543,7 @@ } else { - Status = MiReadPage(MemoryArea, Offset, &Page); + Status = MiReadPage(MemoryArea, Offset.QuadPart, &Page); if (!NT_SUCCESS(Status)) { DPRINT1("MiReadPage failed (Status %x)\n", Status); @@ -1666,7 +1573,7 @@ * Check the entry. No one should change the status of a page * that has a pending page-in. */ - Entry1 = MmGetPageEntrySectionSegment(Segment, Offset); + Entry1 = MmGetPageEntrySectionSegment(Segment, &Offset); if (Entry != Entry1) { DPRINT1("Someone changed ppte entry while we slept\n"); @@ -1678,7 +1585,7 @@ * data */ Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmSetPageEntrySectionSegment(Segment, Offset, Entry); + MmSetPageEntrySectionSegment(Segment, &Offset, Entry); MmUnlockSectionSegment(Segment); Status = MmCreateVirtualMapping(Process, @@ -1735,7 +1642,7 @@ * Check the entry. No one should change the status of a page * that has a pending page-in. */ - Entry1 = MmGetPageEntrySectionSegment(Segment, Offset); + Entry1 = MmGetPageEntrySectionSegment(Segment, &Offset); if (Entry != Entry1) { DPRINT1("Someone changed ppte entry while we slept\n"); @@ -1747,7 +1654,7 @@ * data */ Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmSetPageEntrySectionSegment(Segment, Offset, Entry); + MmSetPageEntrySectionSegment(Segment, &Offset, Entry); MmUnlockSectionSegment(Segment); /* @@ -1779,7 +1686,7 @@ Page = PFN_FROM_SSE(Entry); - MmSharePageEntrySectionSegment(Segment, Offset); + MmSharePageEntrySectionSegment(Segment, &Offset); MmUnlockSectionSegment(Segment); Status = MmCreateVirtualMapping(Process, @@ -1813,7 +1720,7 @@ PFN_NUMBER NewPage; NTSTATUS Status; PVOID PAddress; - ULONG Offset; + LARGE_INTEGER Offset; PMM_PAGEOP PageOp; PMM_REGION Region; ULONG Entry; @@ -1835,21 +1742,22 @@ * Find the offset of the page */ PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset.QuadPart = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); + /* * Lock the segment */ MmLockSectionSegment(Segment); OldPage = MmGetPfnForProcess(NULL, Address); - Entry = MmGetPageEntrySectionSegment(Segment, Offset); + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); MmUnlockSectionSegment(Segment); @@ -1875,7 +1783,7 @@ /* * Get or create a pageop */ - PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset, + PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset.LowPart, MM_PAGEOP_ACCESSFAULT, FALSE); if (PageOp == NULL) { @@ -1966,7 +1874,7 @@ MmDeleteRmap(OldPage, Process, PAddress); MmInsertRmap(NewPage, Process, PAddress); MmLockSectionSegment(Segment); - MmUnsharePageEntrySectionSegment(Section, Segment, Offset, FALSE, FALSE); + MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE); MmUnlockSectionSegment(Segment); PageOp->Status = STATUS_SUCCESS; @@ -2002,7 +1910,7 @@ MmLockSectionSegment(PageOutContext->Segment); MmUnsharePageEntrySectionSegment((PROS_SECTION_OBJECT)PageOutContext->Section, PageOutContext->Segment, - PageOutContext->Offset, + &PageOutContext->Offset, PageOutContext->WasDirty, TRUE); MmUnlockSectionSegment(PageOutContext->Segment); @@ -2050,9 +1958,9 @@ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; - Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; - FileOffset = Context.Offset + Context.Segment->FileOffset; + Context.Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; + FileOffset = Context.Offset.QuadPart + Context.Segment->Image.FileOffset; IsImageSection = Context.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; @@ -2060,7 +1968,7 @@ DirectMapped = FALSE; #ifndef NEWCC if (FileObject != NULL && - !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + !(Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { Bcb = FileObject->SectionObjectPointer->SharedCacheMap; @@ -2070,7 +1978,7 @@ * then note this is a direct mapped page. */ if ((FileOffset % PAGE_SIZE) == 0 && - (Context.Offset + PAGE_SIZE <= Context.Segment->RawLength || !IsImageSection)) + (Context.Offset.QuadPart + PAGE_SIZE <= Context.Segment->RawLength.QuadPart || !IsImageSection)) { DirectMapped = TRUE; } @@ -2093,7 +2001,7 @@ /* * Get the section segment entry and the physical address. */ - Entry = MmGetPageEntrySectionSegment(Context.Segment, Context.Offset); + Entry = MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset); if (!MmIsPagePresent(Process, Address)) { DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", @@ -2107,7 +2015,7 @@ * Prepare the context structure for the rmap delete call. */ Context.WasDirty = FALSE; - if (Context.Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || + if (Context.Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { @@ -2123,7 +2031,7 @@ */ if (DirectMapped && !Context.Private) { - if(!MiIsPageFromCache(MemoryArea, Context.Offset)) + if(!MiIsPageFromCache(MemoryArea, Context.Offset.LowPart)) { DPRINT1("Direct mapped non private page is not associated with the cache.\n"); KeBugCheck(MEMORY_MANAGEMENT); @@ -2142,10 +2050,10 @@ * If this wasn't a private page then we should have reduced the entry to * zero by deleting all the rmaps. */ - if (!Context.Private && MmGetPageEntrySectionSegment(Context.Segment, Context.Offset) != 0) + if (!Context.Private && MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset) != 0) { if (!(Context.Segment->Flags & MM_PAGEFILE_SEGMENT) && - !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + !(Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { KeBugCheck(MEMORY_MANAGEMENT); } @@ -2170,14 +2078,14 @@ if (!Context.WasDirty && SwapEntry != 0) { MmSetSavedSwapEntryPage(Page, 0); - MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, MAKE_SWAP_SSE(SwapEntry)); + MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry)); MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } } - else if (Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED) + else if (Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED) { if (Context.Private) { @@ -2190,7 +2098,7 @@ MmSetSavedSwapEntryPage(Page, 0); if (SwapEntry != 0) { - MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, MAKE_SWAP_SSE(SwapEntry)); + MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry)); } MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; @@ -2208,14 +2116,12 @@ } #ifndef NEWCC Status = CcRosUnmapCacheSegment(Bcb, FileOffset, FALSE); -#else - Status = STATUS_SUCCESS; -#endif if (!NT_SUCCESS(Status)) { DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status); KeBugCheck(MEMORY_MANAGEMENT); } +#endif PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); @@ -2293,7 +2199,7 @@ Process, Address); Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); + MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); PageOp->Status = STATUS_UNSUCCESSFUL; @@ -2339,7 +2245,7 @@ Process, Address); Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); + MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); PageOp->Status = STATUS_UNSUCCESSFUL; @@ -2353,9 +2259,9 @@ DPRINT("MM: Wrote section page 0x%.8X to swap!\n", Page << PAGE_SHIFT); MmSetSavedSwapEntryPage(Page, 0); if (Context.Segment->Flags & MM_PAGEFILE_SEGMENT || - Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED) - { - MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, MAKE_SWAP_SSE(SwapEntry)); + Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED) + { + MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry)); } else { @@ -2377,7 +2283,7 @@ else { Entry = MAKE_SWAP_SSE(SwapEntry); - MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); + MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } PageOp->Status = STATUS_SUCCESS; @@ -2392,7 +2298,7 @@ PVOID Address, PMM_PAGEOP PageOp) { - ULONG Offset; + LARGE_INTEGER Offset; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PFN_NUMBER Page; @@ -2408,8 +2314,8 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; /* * Get the segment and section. @@ -2421,7 +2327,7 @@ FileObject = Section->FileObject; DirectMapped = FALSE; if (FileObject != NULL && - !(Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + !(Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { Bcb = FileObject->SectionObjectPointer->SharedCacheMap; @@ -2430,8 +2336,8 @@ * memory area was mapped at an offset in the file which is page aligned * then note this is a direct mapped page. */ - if (((Offset + Segment->FileOffset) % PAGE_SIZE) == 0 && - (Offset + PAGE_SIZE <= Segment->RawLength || !IsImageSection)) + if (((Offset.QuadPart + Segment->Image.FileOffset) % PAGE_SIZE) == 0 && + (Offset.QuadPart + PAGE_SIZE <= Segment->RawLength.QuadPart || !IsImageSection)) { DirectMapped = TRUE; } @@ -2452,7 +2358,7 @@ /* * Get the section segment entry and the physical address. */ - Entry = MmGetPageEntrySectionSegment(Segment, Offset); + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); if (!MmIsPagePresent(Process, Address)) { DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n", @@ -2465,7 +2371,7 @@ /* * Check for a private (COWed) page. */ - if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || + if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { @@ -2489,7 +2395,7 @@ { ASSERT(SwapEntry == 0); #ifndef NEWCC - CcRosMarkDirtyCacheSegment(Bcb, Offset + Segment->FileOffset); + CcRosMarkDirtyCacheSegment(Bcb, Offset.LowPart + Segment->Image.FileOffset); #endif PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -2572,17 +2478,17 @@ */ if (DoCOW && MmIsPagePresent(Process, Address)) { - ULONG Offset; + LARGE_INTEGER Offset; ULONG Entry; PFN_NUMBER Page; - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; - Entry = MmGetPageEntrySectionSegment(Segment, Offset); + Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); Page = MmGetPfnForProcess(Process, Address); Protect = PAGE_READONLY; - if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || + if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { @@ -2657,7 +2563,7 @@ if (Section->AllocationAttributes & SEC_IMAGE) { Segment = MemoryArea->Data.SectionData.Segment; - Info->AllocationBase = (PUCHAR)MemoryArea->StartingAddress - Segment->VirtualAddress; + Info->AllocationBase = (PUCHAR)MemoryArea->StartingAddress - Segment->Image.VirtualAddress; Info->Type = MEM_IMAGE; } else @@ -2680,19 +2586,20 @@ MmpFreePageFileSegment(PMM_SECTION_SEGMENT Segment) { ULONG Length; - ULONG Offset; + LARGE_INTEGER Offset; ULONG Entry; ULONG SavedSwapEntry; PFN_NUMBER Page; Page = 0; - Length = PAGE_ROUND_UP(Segment->Length); - for (Offset = 0; Offset < Length; Offset += PAGE_SIZE) - { - Entry = MmGetPageEntrySectionSegment(Segment, Offset); + Length = PAGE_ROUND_UP(Segment->Length.QuadPart); + for (Offset.QuadPart = 0; Offset.QuadPart < Length; Offset.QuadPart += PAGE_SIZE) + { + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); if (Entry) { + MmSetPageEntrySectionSegment(Segment, &Offset, 0); if (IS_SWAP_FROM_SSE(Entry)) { MmFreeSwapPage(SWAPENTRY_FROM_SSE(Entry)); @@ -2708,7 +2615,6 @@ } MmReleasePageMemoryConsumer(MC_USER, Page); } - MmSetPageEntrySectionSegment(Segment, Offset, 0); } } } @@ -2740,21 +2646,41 @@ for (i = 0; i < NrSegments; i++) { - if (SectionSegments[i].Characteristics & IMAGE_SCN_MEM_SHARED) + if (SectionSegments[i].Image.Characteristics & IMAGE_SCN_MEM_SHARED) { MmLockSectionSegment(&SectionSegments[i]); } RefCount = InterlockedDecrementUL(&SectionSegments[i].ReferenceCount); - if (SectionSegments[i].Characteristics & IMAGE_SCN_MEM_SHARED) + if (SectionSegments[i].Image.Characteristics & IMAGE_SCN_MEM_SHARED) { if (RefCount == 0) { + MmUnlockSectionSegment(&SectionSegments[i]); MmpFreePageFileSegment(&SectionSegments[i]); - } - MmUnlockSectionSegment(&SectionSegments[i]); + } else + MmUnlockSectionSegment(&SectionSegments[i]); } } } +#ifdef NEWCC + else if (Section->Segment && Section->Segment->Flags & MM_DATAFILE_SEGMENT) + { + ULONG RefCount = 0; + PMM_SECTION_SEGMENT Segment = Section->Segment; + + if (Segment && + (RefCount = InterlockedDecrementUL(&Segment->ReferenceCount)) == 0) + { + DPRINT("Freeing section segment\n"); + Section->Segment = NULL; + MmFinalizeSegment(Segment); + } + else + { + DPRINT("RefCount %d\n", RefCount); + } + } +#endif else { /* @@ -2767,7 +2693,7 @@ if (Section->Segment->Flags & MM_PAGEFILE_SEGMENT) { MmpFreePageFileSegment(Section->Segment); - MmFreePageTablesSectionSegment(Section->Segment); + MmFreePageTablesSectionSegment(Section->Segment, NULL); ExFreePool(Section->Segment); Section->Segment = NULL; } @@ -2779,7 +2705,7 @@ if (Section->FileObject != NULL) { #ifndef NEWCC - CcRosDereferenceCache(Section->FileObject); + CcRosDereferenceCache(Section->FileObject); #endif ObDereferenceObject(Section->FileObject); Section->FileObject = NULL; @@ -2930,22 +2856,22 @@ ObDereferenceObject(Section); return(STATUS_NO_MEMORY); } + RtlZeroMemory(Segment, sizeof(MM_SECTION_SEGMENT)); Section->Segment = Segment; Segment->ReferenceCount = 1; ExInitializeFastMutex(&Segment->Lock); - Segment->FileOffset = 0; + Segment->Image.FileOffset = 0; Segment->Protection = SectionPageProtection; - Segment->RawLength = MaximumSize.u.LowPart; - Segment->Length = PAGE_ROUND_UP(MaximumSize.u.LowPart); + Segment->RawLength.QuadPart = MaximumSize.u.LowPart; + Segment->Length.QuadPart = PAGE_ROUND_UP(MaximumSize.u.LowPart); Segment->Flags = MM_PAGEFILE_SEGMENT; Segment->WriteCopy = FALSE; - RtlZeroMemory(&Segment->PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); - Segment->VirtualAddress = 0; - Segment->Characteristics = 0; + Segment->Image.VirtualAddress = 0; + Segment->Image.Characteristics = 0; *SectionObject = Section; + MiInitializeSectionPageTable(Segment); return(STATUS_SUCCESS); } - NTSTATUS NTAPI @@ -3145,22 +3071,22 @@ ExAcquireFastMutex(&Segment->Lock); FileObject->SectionObjectPointer->DataSectionObject = (PVOID)Segment; - Segment->FileOffset = 0; + Segment->Image.FileOffset = 0; Segment->Protection = SectionPageProtection; Segment->Flags = MM_DATAFILE_SEGMENT; - Segment->Characteristics = 0; + Segment->Image.Characteristics = 0; Segment->WriteCopy = FALSE; if (AllocationAttributes & SEC_RESERVE) { - Segment->Length = Segment->RawLength = 0; + Segment->Length.QuadPart = Segment->RawLength.QuadPart = 0; } else { - Segment->RawLength = MaximumSize.u.LowPart; - Segment->Length = PAGE_ROUND_UP(Segment->RawLength); - } - Segment->VirtualAddress = 0; - RtlZeroMemory(&Segment->PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); + Segment->RawLength.QuadPart = MaximumSize.QuadPart; + Segment->Length.QuadPart = PAGE_ROUND_UP(Segment->RawLength.QuadPart); + } + Segment->Image.VirtualAddress = 0; + MiInitializeSectionPageTable(Segment); } else { @@ -3175,11 +3101,11 @@ (void)InterlockedIncrementUL(&Segment->ReferenceCount); MmLockSectionSegment(Segment); - if (MaximumSize.u.LowPart > Segment->RawLength && + if (MaximumSize.QuadPart > Segment->RawLength.QuadPart && !(AllocationAttributes & SEC_RESERVE)) { - Segment->RawLength = MaximumSize.u.LowPart; - Segment->Length = PAGE_ROUND_UP(Segment->RawLength); + Segment->RawLength.QuadPart = MaximumSize.QuadPart; + Segment->Length.QuadPart = PAGE_ROUND_UP(Segment->RawLength.QuadPart); } } MmUnlockSectionSegment(Segment); @@ -3270,6 +3196,8 @@ ULONG BufferSize; ULONG UsedSize; PVOID Buffer; + PFILE_OBJECT FileObject = File; + IO_STATUS_BLOCK Iosb; ASSERT_IRQL_LESS(DISPATCH_LEVEL); @@ -3309,38 +3237,17 @@ UsedSize = 0; -#if 0 - Status = MmspPageRead(File, - Buffer, - BufferSize, - &FileOffset, - &UsedSize); -#else -/* - * FIXME: if we don't use ZwReadFile, caching is not enabled for the file and - * nothing will work. But using ZwReadFile is wrong, and using its side effects - * to initialize internal state is even worse. Our cache manager is in need of - * professional help - */ - { - IO_STATUS_BLOCK Iosb; - - Status = ZwReadFile(File, - NULL, - NULL, - NULL, - &Iosb, - Buffer, - BufferSize, - &FileOffset, - NULL); - - if(NT_SUCCESS(Status)) - { - UsedSize = Iosb.Information; - } - } + Status = MiSimpleRead + (FileObject, + &FileOffset, + Buffer, + BufferSize, +#ifdef __ROS_CMAKE__ + TRUE, #endif + &Iosb); + + UsedSize = Iosb.Information; if(NT_SUCCESS(Status) && UsedSize < OffsetAdjustment) { @@ -3376,8 +3283,8 @@ for( i = 1; i < ImageSectionObject->NrSegments; ++ i ) { - ASSERT(ImageSectionObject->Segments[i].VirtualAddress >= - ImageSectionObject->Segments[i - 1].VirtualAddress); + ASSERT(ImageSectionObject->Segments[i].Image.VirtualAddress >= + ImageSectionObject->Segments[i - 1].Image.VirtualAddress); } } @@ -3392,13 +3299,13 @@ for( i = 0; i < ImageSectionObject->NrSegments; ++ i ) { - ASSERT(ImageSectionObject->Segments[i].Length > 0); + ASSERT(ImageSectionObject->Segments[i].Length.QuadPart > 0); if(i > 0) { - ASSERT(ImageSectionObject->Segments[i].VirtualAddress >= - (ImageSectionObject->Segments[i - 1].VirtualAddress + - ImageSectionObject->Segments[i - 1].Length)); + ASSERT(ImageSectionObject->Segments[i].Image.VirtualAddress >= + (ImageSectionObject->Segments[i - 1].Image.VirtualAddress + + ImageSectionObject->Segments[i - 1].Length.QuadPart)); } } } @@ -3412,8 +3319,8 @@ for( i = 0; i < ImageSectionObject->NrSegments; ++ i ) { - ASSERT((ImageSectionObject->Segments[i].VirtualAddress % PAGE_SIZE) == 0); - ASSERT((ImageSectionObject->Segments[i].Length % PAGE_SIZE) == 0); + ASSERT((ImageSectionObject->Segments[i].Image.VirtualAddress % PAGE_SIZE) == 0); + ASSERT((ImageSectionObject->Segments[i].Length.QuadPart % PAGE_SIZE) == 0); } } #endif @@ -3428,7 +3335,7 @@ const MM_SECTION_SEGMENT *Segment2 = (const MM_SECTION_SEGMENT *)y; return - (Segment1->VirtualAddress - Segment2->VirtualAddress) >> + (Segment1->Image.VirtualAddress - Segment2->Image.VirtualAddress) >> ((sizeof(ULONG_PTR) - sizeof(int)) * 8); } @@ -3481,7 +3388,7 @@ for ( i = 0; i < ImageSectionObject->NrSegments; ++ i ) { - if(ImageSectionObject->Segments[i].Length == 0) + if(ImageSectionObject->Segments[i].Length.QuadPart == 0) { return FALSE; } @@ -3495,9 +3402,9 @@ * (NtMapViewOfSection could then refuse to map them, and they could * e.g. only be allowed as parameters to NtCreateProcess, like on UNIX) */ - if ((ImageSectionObject->Segments[i - 1].VirtualAddress + - ImageSectionObject->Segments[i - 1].Length) != - ImageSectionObject->Segments[i].VirtualAddress) + if ((ImageSectionObject->Segments[i - 1].Image.VirtualAddress + + ImageSectionObject->Segments[i - 1].Length.QuadPart) != + ImageSectionObject->Segments[i].Image.VirtualAddress) { return FALSE; } @@ -3543,19 +3450,19 @@ ULONG_PTR VirtualAddress; ULONG_PTR VirtualOffset; - VirtualAddress = EffectiveSegment->VirtualAddress; + VirtualAddress = EffectiveSegment->Image.VirtualAddress; /* Round down the virtual address to the nearest page */ - EffectiveSegment->VirtualAddress = PAGE_ROUND_DOWN(VirtualAddress); + EffectiveSegment->Image.VirtualAddress = PAGE_ROUND_DOWN(VirtualAddress); /* Round up the virtual size to the nearest page */ - EffectiveSegment->Length = PAGE_ROUND_UP(VirtualAddress + EffectiveSegment->Length) - - EffectiveSegment->VirtualAddress; + EffectiveSegment->Length.QuadPart = PAGE_ROUND_UP(VirtualAddress + EffectiveSegment->Length.QuadPart) - + EffectiveSegment->Image.VirtualAddress; /* Adjust the raw address and size */ - VirtualOffset = VirtualAddress - EffectiveSegment->VirtualAddress; - - if (EffectiveSegment->FileOffset < VirtualOffset) + VirtualOffset = VirtualAddress - EffectiveSegment->Image.VirtualAddress; + + if (EffectiveSegment->Image.FileOffset < VirtualOffset) { return FALSE; } @@ -3565,22 +3472,22 @@ * offset point in curious and odd places, but that's what we were * asked for */ - EffectiveSegment->FileOffset -= VirtualOffset; - EffectiveSegment->RawLength += VirtualOffset; + EffectiveSegment->Image.FileOffset -= VirtualOffset; + EffectiveSegment->RawLength.QuadPart += VirtualOffset; } else { PMM_SECTION_SEGMENT Segment = &ImageSectionObject->Segments[i]; ULONG_PTR EndOfEffectiveSegment; - EndOfEffectiveSegment = EffectiveSegment->VirtualAddress + EffectiveSegment->Length; + EndOfEffectiveSegment = EffectiveSegment->Image.VirtualAddress + EffectiveSegment->Length.QuadPart; ASSERT((EndOfEffectiveSegment % PAGE_SIZE) == 0); /* * The current segment begins exactly where the current effective * segment ended, therefore beginning a new effective segment */ - if (EndOfEffectiveSegment == Segment->VirtualAddress) + if (EndOfEffectiveSegment == Segment->Image.VirtualAddress) { LastSegment ++; ASSERT(LastSegment <= i); @@ -3601,14 +3508,14 @@ * Page-align the virtual size. We know for sure the virtual address * already is */ - ASSERT((EffectiveSegment->VirtualAddress % PAGE_SIZE) == 0); - EffectiveSegment->Length = PAGE_ROUND_UP(EffectiveSegment->Length); + ASSERT((EffectiveSegment->Image.VirtualAddress % PAGE_SIZE) == 0); + EffectiveSegment->Length.QuadPart = PAGE_ROUND_UP(EffectiveSegment->Length.QuadPart); } /* * The current segment is still part of the current effective segment: * extend the effective segment to reflect this */ - else if (EndOfEffectiveSegment > Segment->VirtualAddress) + else if (EndOfEffectiveSegment > Segment->Image.VirtualAddress) { static const ULONG FlagsToProtection[16] = { @@ -3637,21 +3544,21 @@ */ /* Unaligned segments must be contiguous within the file */ - if (Segment->FileOffset != (EffectiveSegment->FileOffset + - EffectiveSegment->RawLength)) + if (Segment->Image.FileOffset != (EffectiveSegment->Image.FileOffset + + EffectiveSegment->RawLength.QuadPart)) { return FALSE; } - EffectiveSegment->RawLength += Segment->RawLength; + EffectiveSegment->RawLength.QuadPart += Segment->RawLength.QuadPart; /* * Extend the virtual size */ - ASSERT(PAGE_ROUND_UP(Segment->VirtualAddress + Segment->Length) >= EndOfEffectiveSegment); - - EffectiveSegment->Length = PAGE_ROUND_UP(Segment->VirtualAddress + Segment->Length) - - EffectiveSegment->VirtualAddress; + ASSERT(PAGE_ROUND_UP(Segment->Image.VirtualAddress + Segment->Length.QuadPart) >= EndOfEffectiveSegment); + + EffectiveSegment->Length.QuadPart = PAGE_ROUND_UP(Segment->Image.VirtualAddress + Segment->Length.QuadPart) - + EffectiveSegment->Image.VirtualAddress; /* * Merge the protection @@ -3839,9 +3746,7 @@ { ExInitializeFastMutex(&ImageSectionObject->Segments[i].Lock); ImageSectionObject->Segments[i].ReferenceCount = 1; - - RtlZeroMemory(&ImageSectionObject->Segments[i].PageDirectory, - sizeof(ImageSectionObject->Segments[i].PageDirectory)); + MiInitializeSectionPageTable(&ImageSectionObject->Segments[i]); } ASSERT(NT_SUCCESS(Status)); @@ -3855,11 +3760,10 @@ PLARGE_INTEGER UMaximumSize, ULONG SectionPageProtection, ULONG AllocationAttributes, - HANDLE FileHandle) + PFILE_OBJECT FileObject) { PROS_SECTION_OBJECT Section; NTSTATUS Status; - PFILE_OBJECT FileObject; PMM_SECTION_SEGMENT SectionSegments; PMM_IMAGE_SECTION_OBJECT ImageSectionObject; ULONG i; @@ -3876,21 +3780,6 @@ else { FileAccess = FILE_READ_DATA; - } - - /* - * Reference the file handle - */ - Status = ObReferenceObjectByHandle(FileHandle, - FileAccess, - IoFileObjectType, - ExGetPreviousMode(), - (PVOID*)(PVOID)&FileObject, - NULL); - - if (!NT_SUCCESS(Status)) - { - return Status; } /* @@ -3942,7 +3831,7 @@ RtlZeroMemory(ImageSectionObject, sizeof(MM_IMAGE_SECTION_OBJECT)); - StatusExeFmt = ExeFmtpCreateImageSection(FileHandle, ImageSectionObject); + StatusExeFmt = ExeFmtpCreateImageSection(FileObject, ImageSectionObject); if (!NT_SUCCESS(StatusExeFmt)) { @@ -4045,8 +3934,16 @@ BoundaryAddressMultiple.QuadPart = 0; +#ifdef NEWCC + if (Segment->Flags & MM_DATAFILE_SEGMENT) { + LARGE_INTEGER FileOffset; + FileOffset.QuadPart = ViewOffset; + ObReferenceObject(Section); + return _MiMapViewOfSegment(AddressSpace, Segment, BaseAddress, ViewSize, Protect, &FileOffset, AllocationType, __FILE__, __LINE__); + } +#endif Status = MmCreateMemoryArea(AddressSpace, - MEMORY_AREA_SECTION_VIEW, + MEMORY_AREA_SECTION_VIEW, BaseAddress, ViewSize, Protect, @@ -4065,13 +3962,12 @@ MArea->Data.SectionData.Segment = Segment; MArea->Data.SectionData.Section = Section; - MArea->Data.SectionData.ViewOffset = ViewOffset; + MArea->Data.SectionData.ViewOffset.QuadPart = ViewOffset; MmInitializeRegion(&MArea->Data.SectionData.RegionListHead, ViewSize, 0, Protect); return(STATUS_SUCCESS); } - static VOID @@ -4081,7 +3977,7 @@ ULONG Entry; PFILE_OBJECT FileObject; PBCB Bcb; - ULONG Offset; + LARGE_INTEGER Offset; SWAPENTRY SavedSwapEntry; PMM_PAGEOP PageOp; NTSTATUS Status; @@ -4095,13 +3991,13 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) + - MemoryArea->Data.SectionData.ViewOffset; + Offset.QuadPart = ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset); + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.LowPart); while (PageOp) { @@ -4118,10 +4014,10 @@ MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Segment); MmspCompleteAndReleasePageOp(PageOp); - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset); - } - - Entry = MmGetPageEntrySectionSegment(Segment, Offset); + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.LowPart); + } + + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); /* * For a dirty, datafile, non-private page mark it as dirty in the @@ -4134,7 +4030,7 @@ FileObject = MemoryArea->Data.SectionData.Section->FileObject; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; #ifndef NEWCC - CcRosMarkDirtyCacheSegment(Bcb, Offset + Segment->FileOffset); + CcRosMarkDirtyCacheSegment(Bcb, Offset.QuadPart + Segment->Image.FileOffset); #endif ASSERT(SwapEntry == 0); } @@ -4180,7 +4076,7 @@ else { MmDeleteRmap(Page, Process, Address); - MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, FALSE); + MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, Dirty, FALSE); } } } @@ -4208,6 +4104,11 @@ Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; +#ifdef NEWCC + if (Segment->Flags & MM_DATAFILE_SEGMENT) + return MmUnmapViewOfCacheSegment(AddressSpace, BaseAddress); +#endif + MmLockSectionSegment(Segment); RegionListHead = &MemoryArea->Data.SectionData.RegionListHead; @@ -4281,7 +4182,7 @@ Offset -= PAGE_SIZE; PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, MemoryArea->Data.SectionData.Segment, - Offset + MemoryArea->Data.SectionData.ViewOffset); + Offset + MemoryArea->Data.SectionData.ViewOffset.QuadPart); if (PageOp) { MmUnlockAddressSpace(AddressSpace); @@ -4324,11 +4225,14 @@ * and calculate the image base address */ for (i = 0; i < NrSegments; i++) { - if (Segment == &SectionSegments[i]) - { - ImageBaseAddress = (char*)BaseAddress - (ULONG_PTR)SectionSegments[i].VirtualAddress; - break; - } + if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + if (Segment == &SectionSegments[i]) + { + ImageBaseAddress = (char*)BaseAddress - (ULONG_PTR)SectionSegments[i].Image.VirtualAddress; + break; + } + } } if (i >= NrSegments) { @@ -4337,10 +4241,13 @@ for (i = 0; i < NrSegments; i++) { - PVOID SBaseAddress = (PVOID) - ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].VirtualAddress); - - Status = MmUnmapViewOfSegment(AddressSpace, SBaseAddress); + if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + PVOID SBaseAddress = (PVOID) + ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); + + Status = MmUnmapViewOfSegment(AddressSpace, SBaseAddress); + } } } else @@ -4434,8 +4341,8 @@ } else { - Sbi->BaseAddress = (PVOID)Section->Segment->VirtualAddress; - Sbi->Size.QuadPart = Section->Segment->Length; + Sbi->BaseAddress = (PVOID)Section->Segment->Image.VirtualAddress; + Sbi->Size.QuadPart = Section->Segment->Length.QuadPart; } if (ResultLength != NULL) @@ -4617,10 +4524,13 @@ ImageSize = 0; for (i = 0; i < NrSegments; i++) { - ULONG_PTR MaxExtent; - MaxExtent = (ULONG_PTR)SectionSegments[i].VirtualAddress + - SectionSegments[i].Length; - ImageSize = max(ImageSize, MaxExtent); + if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + ULONG_PTR MaxExtent; + MaxExtent = (ULONG_PTR)SectionSegments[i].Image.VirtualAddress + + SectionSegments[i].Length.QuadPart; + ImageSize = max(ImageSize, MaxExtent); + } } ImageSectionObject->ImageSize = ImageSize; @@ -4648,23 +4558,26 @@ for (i = 0; i < NrSegments; i++) { - PVOID SBaseAddress = (PVOID) - ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].VirtualAddress); - MmLockSectionSegment(&SectionSegments[i]); - Status = MmMapViewOfSegment(AddressSpace, - Section, - &SectionSegments[i], - &SBaseAddress, - SectionSegments[i].Length, - SectionSegments[i].Protection, - 0, - 0); - MmUnlockSectionSegment(&SectionSegments[i]); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(AddressSpace); - return(Status); - } + if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + PVOID SBaseAddress = (PVOID) + ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); + MmLockSectionSegment(&SectionSegments[i]); + Status = MmMapViewOfSegment(AddressSpace, + Section, + &SectionSegments[i], + &SBaseAddress, + SectionSegments[i].Length.LowPart, + SectionSegments[i].Protection, + 0, + 0); + MmUnlockSectionSegment(&SectionSegments[i]); + if (!NT_SUCCESS(Status)) + { + MmUnlockAddressSpace(AddressSpace); + return(Status); + } + } } *BaseAddress = (PVOID)ImageBase; @@ -4777,6 +4690,29 @@ if (Segment->ReferenceCount != 0) { +#ifdef NEWCC + CC_FILE_SIZES FileSizes; + CcpLock(); + if (SectionObjectPointer->SharedCacheMap && (Segment->ReferenceCount > CcpCountCacheSections((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap))) + { + CcpUnlock(); + /* Check size of file */ + if (SectionObjectPointer->SharedCacheMap) + { + if (!CcGetFileSizes(Segment->FileObject, &FileSizes)) + { + return FALSE; + } + + if (NewFileSize->QuadPart <= FileSizes.FileSize.QuadPart) + { + return FALSE; + } + } + } + else + CcpUnlock(); +#else /* Check size of file */ if (SectionObjectPointer->SharedCacheMap) { @@ -4786,6 +4722,7 @@ return FALSE; } } +#endif } else { @@ -4824,7 +4761,27 @@ #endif return TRUE; case MmFlushForWrite: - break; + { + DPRINT("MmFlushImageSection(%d)\n", FlushType); + BOOLEAN Result = TRUE; +#ifdef NEWCC + PMM_SECTION_SEGMENT Segment = + (PMM_SECTION_SEGMENT)SectionObjectPointer->DataSectionObject; +#endif + + if (SectionObjectPointer->ImageSectionObject) { + DPRINT1("SectionObject has ImageSection\n"); + return FALSE; + } + +#ifdef NEWCC + CcpLock(); + Result = !SectionObjectPointer->SharedCacheMap || (Segment->ReferenceCount == CcpCountCacheSections((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap)); + CcpUnlock(); + DPRINT("Result %d\n", Result); +#endif + return Result; + } } return FALSE; } @@ -4968,9 +4925,10 @@ IN ULONG SectionPageProtection, IN ULONG AllocationAttributes, IN HANDLE FileHandle OPTIONAL, - IN PFILE_OBJECT File OPTIONAL) -{ - ULONG Protection; + IN PFILE_OBJECT FileObject OPTIONAL) +{ + NTSTATUS Status; + ULONG Protection, FileAccess; PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* Check if an ARM3 section is being created instead */ @@ -4984,7 +4942,7 @@ SectionPageProtection, AllocationAttributes &~ 1, FileHandle, - File); + FileObject); } /* @@ -5002,6 +4960,61 @@ return STATUS_INVALID_PAGE_PROTECTION; } + if (((DesiredAccess == SECTION_ALL_ACCESS || + (DesiredAccess & SECTION_MAP_WRITE)) && + (Protection == PAGE_READWRITE || + Protection == PAGE_EXECUTE_READWRITE)) && + !(AllocationAttributes & SEC_IMAGE)) + { + DPRINT("Creating a section with WRITE access\n"); + FileAccess = FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE; + } + else + { + DPRINT("Creating a section with READ access\n"); + FileAccess = FILE_READ_DATA | SYNCHRONIZE; + } + + if (!FileObject && FileHandle) + { + Status = ObReferenceObjectByHandle + (FileHandle, + FileAccess, + IoFileObjectType, + ExGetPreviousMode(), + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed: %x\n", Status); + return Status; + } + } else if (FileObject) + ObReferenceObject(FileObject); + +#ifndef NEWCC // A hack for initializing caching. + // This is needed only in the old case. + if (FileHandle) { + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + CHAR Buffer; + LARGE_INTEGER ByteOffset = { }; + Status = ZwReadFile + (FileHandle, + NULL, + NULL, + NULL, + &Iosb, + &Buffer, + sizeof(Buffer), + &ByteOffset, + NULL); + if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) + return Status; + // Caching is initialized... + } +#endif + if (AllocationAttributes & SEC_IMAGE) { return(MmCreateImageSection(SectionObject, @@ -5010,19 +5023,33 @@ MaximumSize, SectionPageProtection, AllocationAttributes, - FileHandle)); - } - + FileObject)); + } + +#ifndef NEWCC if (FileHandle != NULL) { + ASSERT(FileHandle); return(MmCreateDataFileSection(SectionObject, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes, - FileHandle)); - } + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes, + FileHandle)); + } +#else + if (FileHandle != NULL || FileObject != NULL) + { + return(MmCreateCacheSection(SectionObject, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes, + FileObject)); + } +#endif return(MmCreatePageFileSection(SectionObject, DesiredAccess, Modified: branches/arty-newcc/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ps/psmgr.c?… ============================================================================== --- branches/arty-newcc/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/ps/psmgr.c [iso-8859-1] Thu Aug 25 02:30:44 2011 @@ -305,8 +305,6 @@ KeBugCheckEx(PROCESS1_INITIALIZATION_FAILED, Status, 2, 0, 0); } - DPRINT1("Opened %wZ @ %x\n", &PsNtDllPathName, FileHandle); - /* Check if the image is valid */ Status = MmCheckSystemImage(FileHandle, TRUE); if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH)

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