Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33766: Move the init of server info after heap is init.
by jimtabor＠svn.reactos.org 30 May '08

30 May '08

Author: jimtabor Date: Fri May 30 01:13:52 2008 New Revision: 33766 URL: http://svn.reactos.org/svn/reactos?rev=33766&view=rev Log: Move the init of server info after heap is init. Modified: trunk/reactos/subsystems/win32/win32k/include/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/ntuser.h [iso-8859-1] Fri May 30 01:13:52 2008 @@ -10,6 +10,7 @@ #define UserEnterCo UserEnterExclusive #define UserLeaveCo UserLeave +extern PSERVERINFO gpsi; NTSTATUS FASTCALL InitUserImpl(VOID); VOID FASTCALL CleanupUserImpl(VOID); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Fri May 30 01:13:52 2008 @@ -4,7 +4,6 @@ #define NDEBUG #include <debug.h> -extern PSERVERINFO gpsi; //static PEVENTTABLE GlobalEvents; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Fri May 30 01:13:52 2008 @@ -34,7 +34,6 @@ #define NDEBUG #include <debug.h> -extern PSERVERINFO gpsi; static BOOL Setup = FALSE; 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] Fri May 30 01:13:52 2008 @@ -13,7 +13,6 @@ #define NDEBUG #include <debug.h> -extern PSERVERINFO gpsi; /* * @unimplemented Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Fri May 30 01:13:52 2008 @@ -57,6 +57,9 @@ return Status; } + gpsi = UserHeapAlloc(sizeof(SERVERINFO)); + if (gpsi) RtlZeroMemory(gpsi, sizeof(SERVERINFO)); + return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri May 30 01:13:52 2008 @@ -33,7 +33,6 @@ #define NDEBUG #include <debug.h> -extern PSERVERINFO gpsi; /* dialog resources appear to pass this in 16 bits, handle them properly */ #define CW_USEDEFAULT16 (0x8000) @@ -51,8 +50,6 @@ NTSTATUS FASTCALL InitWindowImpl(VOID) { - gpsi = UserHeapAlloc(sizeof(SERVERINFO)); - if (gpsi) RtlZeroMemory(gpsi, sizeof(SERVERINFO)); return STATUS_SUCCESS; } 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] Fri May 30 01:13:52 2008 @@ -27,7 +27,6 @@ #define NDEBUG #include <debug.h> -extern PSERVERINFO gpsi; static COLORREF SysColors[] = {

1 0

[jimtabor] 33765: Modified GDIOBJ_Copy and Set owner to return bool. Start the use of server info for metrics data. Tested with Qemu on Linux.
by jimtabor＠svn.reactos.org 30 May '08

30 May '08

Author: jimtabor Date: Thu May 29 23:56:10 2008 New Revision: 33765 URL: http://svn.reactos.org/svn/reactos?rev=33765&view=rev Log: Modified GDIOBJ_Copy and Set owner to return bool. Start the use of server info for metrics data. Tested with Qemu on Linux. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c 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 May 29 23:56:10 2008 @@ -169,10 +169,12 @@ UINT HideAccel : 1; } WINDOW, *PWINDOW; +#define SRVINFO_METRICS 0x0020 + typedef struct _SERVERINFO { -// DWORD SystemMetrics[SM_CMETRICS]; // System Metrics -// COLORREF SystemColorCopy[COLOR_MENUBAR+1]; // Backup Copy of system colors. + DWORD SRVINFO_Flags; + DWORD SystemMetrics[SM_CMETRICS]; // System Metrics COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush HPEN SysColorPens[COLOR_MENUBAR+1]; // ReactOS exclusive Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu May 29 23:56:10 2008 @@ -277,7 +277,7 @@ BOOL INTERNAL_CALL DC_Cleanup(PVOID ObjectBody); HDC FASTCALL DC_GetNextDC (PDC pDC); VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); -VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner); +BOOL FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner); VOID FASTCALL DC_LockDisplay(HDC); VOID FASTCALL DC_UnlockDisplay(HDC); VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC); 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 May 29 23:56:10 2008 @@ -58,8 +58,8 @@ }; BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle); -VOID INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner); -VOID INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo); +BOOL INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner); +BOOL INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo); BOOL INTERNAL_CALL GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj); VOID INTERNAL_CALL GDIOBJ_UnlockObjByPtr(POBJ Object); VOID INTERNAL_CALL GDIOBJ_ShareUnlockObjByPtr(POBJ Object); @@ -82,6 +82,6 @@ BOOL FASTCALL NtGdiDeleteObject(HGDIOBJ hObject); BOOL FASTCALL IsObjectDead(HGDIOBJ); -BOOL FASTCALL IntGdiSetDCOwnerEx( HGDIOBJ, DWORD, BOOL); +BOOL FASTCALL IntGdiSetDCOwnerEx( HDC, DWORD, BOOL); #endif Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Thu May 29 23:56:10 2008 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ +/* * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -34,9 +34,243 @@ #define NDEBUG #include <debug.h> +extern PSERVERINFO gpsi; + +static BOOL Setup = FALSE; + /* FUNCTIONS *****************************************************************/ -/* FIXME: Alot of thse values should NOT be hardcoded but they are */ +BOOL +FASTCALL +InitMetrics(VOID) +{ + INT Index; + NTSTATUS Status; + PWINSTATION_OBJECT WinStaObject; + ULONG Width = 640, Height = 480; + + for (Index = 0; Index < SM_CMETRICS; Index++) + { + switch (Index) + { + case SM_CXSCREEN: + { + HDC ScreenDCHandle; + PDC ScreenDC; + + ScreenDCHandle = IntGdiCreateDC(NULL, NULL, NULL, NULL, TRUE); + if (NULL != ScreenDCHandle) + { + ScreenDC = DC_LockDc(ScreenDCHandle); + if (NULL != ScreenDC) + { + Width = ((PGDIDEVICE)ScreenDC->pPDev)->GDIInfo.ulHorzRes; + Height = ((PGDIDEVICE)ScreenDC->pPDev)->GDIInfo.ulVertRes; + DC_UnlockDc(ScreenDC); + } + NtGdiDeleteObjectApp(ScreenDCHandle); + } + gpsi->SystemMetrics[Index] = Width; + break; + } + case SM_CYSCREEN: + gpsi->SystemMetrics[Index] = Height; + break; + case SM_ARRANGE: + gpsi->SystemMetrics[Index] = 8; + break; + case SM_CLEANBOOT: + gpsi->SystemMetrics[Index] = 0; + break; + case SM_CMOUSEBUTTONS: + gpsi->SystemMetrics[Index] = 2; + break; + case SM_CXBORDER: + case SM_CYBORDER: + gpsi->SystemMetrics[Index] = 1; + break; + case SM_CXCURSOR: + case SM_CYCURSOR: + gpsi->SystemMetrics[Index] = 32; + break; + case SM_CXDLGFRAME: + case SM_CYDLGFRAME: + gpsi->SystemMetrics[Index] = 3; + break; + case SM_CXDOUBLECLK: + case SM_CYDOUBLECLK: + case SM_SWAPBUTTON: + { + PSYSTEM_CURSORINFO CurInfo; + Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, + KernelMode, + 0, + &WinStaObject); + if (!NT_SUCCESS(Status)) + gpsi->SystemMetrics[Index] = 0xFFFFFFFF; + break; + + CurInfo = IntGetSysCursorInfo(WinStaObject); + switch(Index) + { + case SM_CXDOUBLECLK: + gpsi->SystemMetrics[Index] = CurInfo->DblClickWidth; + break; + case SM_CYDOUBLECLK: + gpsi->SystemMetrics[Index] = CurInfo->DblClickWidth; + break; + case SM_SWAPBUTTON: + gpsi->SystemMetrics[Index] = CurInfo->SwapButtons; + break; + } + + ObDereferenceObject(WinStaObject); + break; + } + case SM_CXDRAG: + case SM_CYDRAG: + gpsi->SystemMetrics[Index] = 2; + break; + case SM_CXEDGE: + case SM_CYEDGE: + gpsi->SystemMetrics[Index] = 2; + break; + case SM_CXFRAME: + case SM_CYFRAME: + gpsi->SystemMetrics[Index] = 4; + break; + case SM_CXFULLSCREEN: + /* FIXME: shouldn't we take borders etc into account??? */ + gpsi->SystemMetrics[Index] = gpsi->SystemMetrics[SM_CXSCREEN]; + break; + case SM_CYFULLSCREEN: + gpsi->SystemMetrics[Index] = gpsi->SystemMetrics[SM_CYSCREEN]; + break; + case SM_CXHSCROLL: + case SM_CYHSCROLL: + gpsi->SystemMetrics[Index] = 16; + break; + case SM_CYVTHUMB: + case SM_CXHTHUMB: + gpsi->SystemMetrics[Index] = 16; + break; + case SM_CXICON: + case SM_CYICON: + gpsi->SystemMetrics[Index] = 32; + break; + case SM_CXICONSPACING: + case SM_CYICONSPACING: + gpsi->SystemMetrics[Index] = 64; + break; + case SM_CXMAXIMIZED: + /* This seems to be 8 pixels greater than the screen width */ + gpsi->SystemMetrics[Index] = gpsi->SystemMetrics[SM_CXSCREEN] + 8; + break; + case SM_CYMAXIMIZED: + /* This seems to be 20 pixels less than the screen height, taskbar maybe? */ + gpsi->SystemMetrics[Index] = gpsi->SystemMetrics[SM_CYSCREEN] - 20; + break; + case SM_CXMAXTRACK: + gpsi->SystemMetrics[Index] = gpsi->SystemMetrics[SM_CYSCREEN] + 12; + break; + case SM_CYMAXTRACK: + gpsi->SystemMetrics[Index] = gpsi->SystemMetrics[SM_CYSCREEN] + 12; + break; + case SM_CXMENUCHECK: + case SM_CYMENUCHECK: + gpsi->SystemMetrics[Index] = 13; + break; + case SM_CXMENUSIZE: + case SM_CYMENUSIZE: + gpsi->SystemMetrics[Index] = 18; + break; + case SM_CXMIN: + gpsi->SystemMetrics[Index] = 112; + break; + case SM_CYMIN: + gpsi->SystemMetrics[Index] = 27; + break; + case SM_CXMINIMIZED: + gpsi->SystemMetrics[Index] = 160; + break; + case SM_CYMINIMIZED: + gpsi->SystemMetrics[Index] = 24; + break; + case SM_CXMINSPACING: + gpsi->SystemMetrics[Index] = 160; + break; + case SM_CYMINSPACING: + gpsi->SystemMetrics[Index] = 24; + break; + case SM_CXMINTRACK: + gpsi->SystemMetrics[Index] = 112; + break; + case SM_CYMINTRACK: + gpsi->SystemMetrics[Index] = 27; + break; + case SM_CXSIZE: + case SM_CYSIZE: + gpsi->SystemMetrics[Index] = 18; + break; + case SM_CXSMICON: + case SM_CYSMICON: + gpsi->SystemMetrics[Index] = 16; + break; + case SM_CXSMSIZE: + gpsi->SystemMetrics[Index] = 12; + break; + case SM_CYSMSIZE: + gpsi->SystemMetrics[Index] = 14; + break; + case SM_CXVSCROLL: + case SM_CYVSCROLL: + gpsi->SystemMetrics[Index] = 16; + break; + case SM_CYCAPTION: + gpsi->SystemMetrics[Index] = 19; + break; + case SM_CYKANJIWINDOW: + gpsi->SystemMetrics[Index] = 0; + break; + case SM_CYMENU: + gpsi->SystemMetrics[Index] = 19; + break; + case SM_CYSMCAPTION: + gpsi->SystemMetrics[Index] = 15; + break; + case SM_DBCSENABLED: + case SM_DEBUG: + case SM_MENUDROPALIGNMENT: + case SM_MIDEASTENABLED: + gpsi->SystemMetrics[Index] = 0; + break; + case SM_MOUSEPRESENT: + gpsi->SystemMetrics[Index] = 1; + break; + case SM_NETWORK: + gpsi->SystemMetrics[Index] = 3; + break; + case SM_PENWINDOWS: + case SM_SECURE: + case SM_SHOWSOUNDS: + case SM_SLOWMACHINE: + gpsi->SystemMetrics[Index] = 0; + break; + case SM_CMONITORS: + gpsi->SystemMetrics[Index] = 1; + break; + case SM_REMOTESESSION: + gpsi->SystemMetrics[Index] = 0; + break; + default: + gpsi->SystemMetrics[Index] = 0xFFFFFFFF; + } + } + gpsi->SRVINFO_Flags |= SRVINFO_METRICS; + Setup = TRUE; + return TRUE; +} + ULONG FASTCALL UserGetSystemMetrics(ULONG Index) { @@ -44,6 +278,11 @@ PWINSTATION_OBJECT WinStaObject; ULONG Width, Height, Result; +// DPRINT1("UserGetSystemMetrics -> %d\n",Index); + if (gpsi && Setup) + return gpsi->SystemMetrics[Index]; + else + { Result = 0; switch (Index) { @@ -176,6 +415,7 @@ return SM_CXSCREEN == Index ? Width : Height; } case SM_CXSIZE: + InitMetrics(); case SM_CYSIZE: return(18); case SM_CXSMICON: @@ -218,11 +458,9 @@ default: return(0xFFFFFFFF); } + } } - - -/* FIXME: Alot of thse values should NOT be hardcoded but they are */ ULONG STDCALL NtUserGetSystemMetrics(ULONG Index) { @@ -238,4 +476,6 @@ UserLeave(); END_CLEANUP; } + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Thu May 29 23:56:10 2008 @@ -290,6 +290,8 @@ return NT_SUCCESS(Status); } +extern HDC hSystemBM; + BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID) { @@ -304,11 +306,15 @@ IntDestroyPrimarySurface(); return FALSE; } - DC_FreeDcAttr(ScreenDeviceContext); // Free the dcattr! - DC_SetOwnership(ScreenDeviceContext, NULL); // This hDC is inaccessible! + IntGdiSetDCOwnerEx(ScreenDeviceContext, GDI_OBJ_HMGR_PUBLIC, FALSE); /* Setup the cursor */ co_IntLoadDefaultCursors(); + + hSystemBM = NtGdiCreateCompatibleDC(ScreenDeviceContext); + + NtGdiSelectFont( hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); + IntGdiSetDCOwnerEx( hSystemBM, GDI_OBJ_HMGR_PUBLIC, FALSE); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu May 29 23:56:10 2008 @@ -2642,29 +2642,31 @@ return TRUE; } -VOID FASTCALL +BOOL +FASTCALL DC_SetOwnership(HDC hDC, PEPROCESS Owner) { PDC pDC; - GDIOBJ_SetOwnership(hDC, Owner); + if(!GDIOBJ_SetOwnership(hDC, Owner)) return FALSE; pDC = DC_LockDc(hDC); if (pDC) { if (pDC->w.hClipRgn) { - GDIOBJ_SetOwnership(pDC->w.hClipRgn, Owner); + if(!GDIOBJ_SetOwnership(pDC->w.hClipRgn, Owner)) return FALSE; } if (pDC->w.hVisRgn) { - GDIOBJ_SetOwnership(pDC->w.hVisRgn, Owner); + if(!GDIOBJ_SetOwnership(pDC->w.hVisRgn, Owner)) return FALSE; } if (pDC->w.hGCClipRgn) { - GDIOBJ_SetOwnership(pDC->w.hGCClipRgn, Owner); + if(!GDIOBJ_SetOwnership(pDC->w.hGCClipRgn, Owner)) return FALSE; } DC_UnlockDc(pDC); } + return TRUE; } // Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Thu May 29 23:56:10 2008 @@ -1151,12 +1151,13 @@ return FALSE; } -void INTERNAL_CALL +BOOL INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS NewOwner) { PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; PW32THREAD Thread; + BOOL Ret = TRUE; GDIDBG_INITLOOPTRACE(); @@ -1223,7 +1224,7 @@ (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, ProcessId); /* we're done! */ - return; + return Ret; } else { @@ -1245,6 +1246,7 @@ { DPRINT1("Attempted to change ownership of an object 0x%x currently being destroyed!!!\n", ObjectHandle); DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); + Ret = FALSE; } } else if (PrevProcId == LockedProcessId) @@ -1267,20 +1269,24 @@ else if ((HANDLE)((ULONG_PTR)PrevProcId & ~0x1) != PsGetCurrentProcessId()) { DPRINT1("Attempted to change ownership of object 0x%x (pid: 0x%x) from pid 0x%x!!!\n", ObjectHandle, (ULONG_PTR)PrevProcId & ~0x1, PsGetCurrentProcessId()); + Ret = FALSE; } else { DPRINT1("Attempted to change owner of invalid handle: 0x%x\n", ObjectHandle); - } - } -} - -void INTERNAL_CALL + Ret = FALSE; + } + } + return Ret; +} + +BOOL INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo) { PGDI_TABLE_ENTRY FromEntry; PW32THREAD Thread; HANDLE FromProcessId, FromLockedProcessId, FromPrevProcId; + BOOL Ret = TRUE; GDIDBG_INITLOOPTRACE(); @@ -1351,6 +1357,7 @@ else { DPRINT1("Attempted to copy ownership from an object 0x%x currently being destroyed!!!\n", CopyFrom); + Ret = FALSE; } } else if (FromPrevProcId == FromLockedProcessId) @@ -1374,8 +1381,10 @@ else { DPRINT1("Attempted to copy ownership from invalid handle: 0x%x\n", CopyFrom); - } - } + Ret = FALSE; + } + } + return Ret; } PVOID INTERNAL_CALL @@ -1410,6 +1419,60 @@ /** PUBLIC FUNCTIONS **********************************************************/ +BOOL +FASTCALL +IntGdiSetBrushOwner(PGDIBRUSHOBJ pbr, DWORD OwnerMask) +{ + // Inc/Dec share locks and process counts. + return TRUE; +} + + +BOOL +FASTCALL +IntGdiSetDCOwnerEx( HDC hDC, DWORD OwnerMask, BOOL NoSetBrush) +{ + PDC pDC; + BOOL Ret = FALSE; + + if (!hDC || (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC)) return FALSE; + + if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) + { + pDC = DC_LockDc ( hDC ); + MmCopyFromCaller(&pDC->Dc_Attr, pDC->pDc_Attr, sizeof(DC_ATTR)); + DC_UnlockDc( pDC ); + + DC_FreeDcAttr( hDC ); // Free the dcattr! + + if (!DC_SetOwnership( hDC, NULL )) // This hDC is inaccessible! + return Ret; + } + + if (OwnerMask == GDI_OBJ_HMGR_POWNED) + { + pDC = DC_LockDc ( hDC ); + if ( !pDC->pDc_Attr ) Ret = TRUE; // Must be zero. + DC_UnlockDc( pDC ); + if (!Ret) return Ret; + + if (!DC_SetOwnership( hDC, PsGetCurrentProcess() )) return Ret; + + DC_AllocateDcAttr( hDC ); // Allocate new dcattr + + DCU_SynchDcAttrtoUser( hDC ); // Copy data from dc to dcattr + } + + if ((OwnerMask != GDI_OBJ_HMGR_NONE) && !NoSetBrush) + { + pDC = DC_LockDc ( hDC ); + if (IntGdiSetBrushOwner((PGDIBRUSHOBJ)pDC->DcLevel.pbrFill, OwnerMask)) + IntGdiSetBrushOwner((PGDIBRUSHOBJ)pDC->DcLevel.pbrLine, OwnerMask); + DC_UnlockDc( pDC ); + } + return TRUE; +} + W32KAPI HANDLE APIENTRY @@ -1417,11 +1480,6 @@ IN ULONG ulType ) { -// ATM we use DC object for KernelData. This is wrong. -// The real type consists of BASEOBJECT and a pointer. -// The UserData is set in user mode, so it is always NULL. -// HANDLE should be HGDIOBJ -// POBJ pObject; HANDLE handle; @@ -1521,13 +1579,6 @@ } -BOOL -FASTCALL -IntGdiSetDCOwnerEx( HGDIOBJ hObject, DWORD OwnerMask, BOOL NoSetBrush) -{ - UNIMPLEMENTED; - return FALSE; -} W32KAPI INT 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 May 29 23:56:10 2008 @@ -19,7 +19,6 @@ /* * STOCKOBJ.C - GDI Stock Objects * - * $Id$ * */ @@ -66,11 +65,8 @@ }; #define NUM_SYSCOLORS (sizeof(SysColors) / sizeof(SysColors[0])) -//static HPEN SysColorPens[NUM_SYSCOLORS]; -//static HBRUSH SysColorBrushes[NUM_SYSCOLORS]; - -// System Bitmap DC and System Display DC... -HDC hSystemBM, hSystemDisplayDC; +// System Bitmap DC +HDC hSystemBM; /* GDI stock objects */

1 0

[greatlrd] 33764: 1. do not use wine def for reactos 2. this is almost 100% correct list of windows 2003 export list of msvcrt.def and it will make abiword working again for it was missing api wfreopen and allot more api from msvcrt 3. this add back api that was remove api they exists in windows 2003 export list 4. List was provide from colin f See issue #3293 for more details.
by greatlrd＠svn.reactos.org 30 May '08

30 May '08

Author: greatlrd Date: Thu May 29 20:27:29 2008 New Revision: 33764 URL: http://svn.reactos.org/svn/reactos?rev=33764&view=rev Log: 1. do not use wine def for reactos 2. this is almost 100% correct list of windows 2003 export list of msvcrt.def and it will make abiword working again for it was missing api wfreopen and allot more api from msvcrt 3. this add back api that was remove api they exists in windows 2003 export list 4. List was provide from colin f See issue #3293 for more details. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Thu May 29 20:27:29 2008 @@ -60,767 +60,789 @@ ?terminate@@YAXXZ=MSVCRT_terminate @49 ?unexpected@@YAXXZ=MSVCRT_unexpected @50 ?what@exception@@UBEPBDXZ=__thiscall_MSVCRT_what_exception @51 - _CIacos @52 - _CIasin @53 - _CIatan @54 - _CIatan2 @55 - _CIcos @56 - _CIcosh @57 - _CIexp @58 - _CIfmod @59 - _CIlog @60 - _CIlog10 @61 - _CIpow @62 - _CIsin @63 - _CIsinh @64 - _CIsqrt @65 - _CItan @66 - _CItanh @67 - _CxxThrowException @68 - _EH_prolog @69 - _Getdays @70 - _Getmonths @71 - _Gettnames @72 - _HUGE @73 DATA - _Strftime @74 - _XcptFilter @75 - __CppXcptFilter @76 - ;__CxxCallUnwindDtor - ;__CxxCallUnwindVecDtor - __CxxDetectRethrow @77 - ;__CxxExceptionFilter - __CxxFrameHandler @78 - ;_CxxFrameHandler2 - __CxxLongjmpUnwind@4 @79 - __CxxQueryExceptionSize @80 - ;__CxxRegisterExceptionObject - ;__CxxUnregisterExceptionObject - ;__DestructExceptionObject - __RTCastToVoid=MSVCRT___RTCastToVoid @81 - __RTDynamicCast=MSVCRT___RTDynamicCast @82 - __RTtypeid=MSVCRT___RTtypeid @83 - __STRINGTOLD @84 - __argc @85 DATA - __argv @86 DATA - __badioinfo @87 DATA - __crtCompareStringA=kernel32.CompareStringA @88 - __crtCompareStringW=kernel32.CompareStringW @89 - __crtGetLocaleInfoW=kernel32.GetLocaleInfo @90 - __crtGetStringTypeW=kernel32.GeStringTypeW @779 - __crtLCMapStringA @91 - ;__crtLCMapStringW - __dllonexit @92 - __doserrno @93 - __fpecode @94 - __getmainargs @96 - __initenv @97 DATA - ;__iob_func - __isascii @98 - __iscsym @99 - __iscsymf @100 - __lc_codepage @101 DATA - __lc_collate_cp @103 DATA - __lc_handle @104 DATA - ;__lc_handle_func - __lconv_init @105 - __mb_cur_max @106 DATA - __p___argc @107 - __p___argv @108 - __p___initenv @109 - __p___mb_cur_max @110 - __p___wargv @111 - __p___winitenv @112 - __p__acmdln @113 - __p__amblksiz @114 - __p__commode @115 - __p__daylight @116 - __p__dstbias @117 - __p__environ @118 - __p__fmode @120 - __p__iob @121 - ;__p__mbcasemap stub - __p__mbctype @123 - __p__osver @124 - __p__pctype @125 - __p__pgmptr @126 - __p__timezone @128 - __p__tzname @129 - __p__wcmdln @130 - __p__wenviron @131 - __p__winmajor @132 - __p__winminor @133 - __p__winver @134 - __p__wpgmptr @135 - ;__pctype_func - __pioinfo @136 DATA - ;__pwctype_func - ;__pwcptinfoptrs - __set_app_type @138 - __setlc_active @139 DATA - ;___setlc_active_func - __setusermatherr @140 - __threadhandle @141 - __threadid @142 - __toascii @143 - __unDName @144 - __unDNameEx @145 - ;__uncaught_exception - __unguarded_readlc_active @146 DATA - __wargv @147 DATA - ;__wcserror - __wgetmainargs @148 - __winitenv @149 DATA - _abnormal_termination @150 - ;_abs64 - _access @151 - _acmdln @152 DATA - _adj_fdiv_m16i@4 @153 - _adj_fdiv_m32@4 @154 - _adj_fdiv_m32i@4 @155 - _adj_fdiv_m64@8 @156 - _adj_fdiv_r @157 - _adj_fdivr_m16i@4 @158 - _adj_fdivr_m32@4 @159 - _adj_fdivr_m32i@4 @160 - _adj_fdivr_m64@8 @161 - _adj_fpatan @162 - _adj_fprem @163 - _adj_fprem1 @164 - _adj_fptan @165 - _adjust_fdiv @166 DATA - ;aexit_rtn - _aligned_free @167 - _aligned_malloc @168 - _aligned_offset_malloc @169 - _aligned_offset_realloc @170 - _aligned_realloc @171 - _amsg_exit @172 - _assert @173 - ;atoidbl - _atoi64=ntdll._atoi64 @175 - _atoldbl @176 - _beep @177 - _beginthread @178 - _beginthreadex @179 - _c_exit @180 - _cabs @181 - _callnewh @182 - _cexit @183 - _cgets @184 - _chdir @185 - _chdrive @186 - _chgsign @187 - _chkesp @188 - _chmod @189 - _chsize @190 - _clearfp @191 - _close @192 - _commit @193 - _commode @194 DATA - _control87 @195 - _controlfp @196 - _copysign @197 - _cprintf @198 - _cputs @199 - _creat @200 - _cscanf @201 - _ctype @202 DATA - _cwait @203 - ;_cwprintf - ;_cwscanf - _daylight @204 DATA - _dstbias @205 DATA - _dup @206 - _dup2 @207 - _ecvt @208 - _endthread @209 - _endthreadex @210 - _environ @211 DATA - _eof @212 - _errno @213 - _except_handler2 @214 - _except_handler3 @215 - _execl @216 - _execle @217 - _execlp @218 - _execlpe @219 - _execv @220 - _execve @221 - _execvp @222 - _execvpe @223 - _exit @224 - _expand @225 - _fcloseall @226 - _fcvt @227 - _fdopen @228 - _fgetchar @229 - _fgetwchar @230 - _filbuf @231 - _filelength @232 - _filelengthi64 @233 - _fileno @234 - _findclose @235 - _findfirst @236 - _findfirsti64 @237 - _findnext @238 - ;_findnext64 - _findnexti64 @239 - _finite @240 - _flsbuf @241 - _flushall @242 - _fmode @243 DATA - _fpclass @244 - ;_fpieee_flt stub - _fpreset @246 - _fputchar @247 - _fputwchar @248 - _fsopen @249 - _fstat @250 - _fstat64 @251 - _fstati64 @252 - _ftime @253 - _ftol=ntdll._ftol @254 - _fullpath @255 - _futime @256 - ;_futime64 - _gcvt @257 - ;_get_heap_handle - _get_osfhandle @258 - _get_sbh_threshold @259 - _getch @262 - _getche @263 - _getcwd @264 - _getdcwd @265 - _getdiskfree @266 - _getdllprocaddr @267 - _getdrive @268 - _getdrives @269 - _getmaxstdio @270 - _getmbcp @271 - _getpid @272 - ;_getsystime stub - _getw @274 - ;_getwch - ;_getwche - _getws @275 - _global_unwind2 @276 - _heapadd @277 - _heapchk @278 - _heapmin @279 - _heapset @280 - _heapwalk @282 - _hypot @283 - _i64toa=ntdll._i64toa @284 - _i64tow=ntdll._i64tow @285 - _initterm @286 - ;_inp stub - ;_inpd stub - ;_inpw stub - _iob @290 DATA - _isatty @291 - _isctype @292 - ;_ismbbalnum stub - ;_ismbbalpha stub - ;_ismbbgraph stub - ;_ismbbkalnum stub - _ismbbkana @297 - ;_ismbbkprint - ;_ismbbkpunct - _ismbblead @300 - ;_ismbbprint stub - ;_ismbbpunct stub - _ismbbtrail @303 - _ismbcalnum @304 - _ismbcalpha @305 - _ismbcdigit @306 - _ismbcgraph @307 - _ismbchira @308 - _ismbckata @309 - ;_ismbcl0 stub - ;_ismbcl1 stub - ;_ismbcl2 stub - ;_ismbclegal stub - _ismbclower @314 - _ismbcprint @315 - _ismbcpunct @316 - _ismbcspace @317 - _ismbcsymbol @318 - _ismbcupper @319 - _ismbslead @320 - _ismbstrail @321 - _isnan @322 - _itoa=ntdll._itoa @323 - _itow=ntdll._itow @324 - _j0 @325 - _j1 @326 - _jn @327 - _kbhit @328 - _lfind @329 - _loaddll @330 - _local_unwind2 @331 - ;_localtime64 - _lock @332 - _locking @333 - _logb @334 - _longjmpex=longjmp @335 ;wine - _lrotl @336 - _lrotr @337 - _lsearch @338 - _lseek @339 - _lseeki64 @340 - _ltoa=ntdll._ltoa @341 - _ltow=ntdll._ltow @342 - _makepath @343 - ;_matherr @344 ;not in msvcrt, but in wine, why? - _mbbtombc @345 - _mbbtype @346 - ;_mbcasemap - _mbccpy @347 - _mbclen @350 - _mbctohira @351 - _mbctokata @352 - _mbctolower @353 - _mbctoupper @355 - _mbctype @356 DATA - _mbsbtype @357 - _mbscat @358 - _mbschr @359 - _mbscmp @360 - _mbscoll @361 - _mbscpy @362 - _mbscspn @363 - _mbsdec @364 - _mbsdup=_strdup @365 - _mbsicmp @366 - _mbsicoll @367 - _mbsinc @368 - _mbslen @369 - _mbslwr @370 - _mbsnbcat @371 - _mbsnbcmp @372 - _mbsnbcnt @373 - _mbsnbcoll @374 - _mbsnbcpy @375 - ;_mbsnbcpy_s @376 wine - _mbsnbicmp @377 - _mbsnbicoll @378 - _mbsnbset @379 - _mbsncat @380 - _mbsnccnt @381 - _mbsncmp @382 - _mbsncpy @384 - _mbsnextc @385 - _mbsnicmp @386 - _mbsnicoll @387 - _mbsninc @388 - _mbsnset @389 - _mbspbrk @390 - _mbsrchr @391 - _mbsrev @392 - _mbsset @393 - _mbsspn @394 - _mbsspnp @395 - _mbsstr @396 - _mbstok @397 - _mbstrlen @398 - _mbsupr @399 - _memccpy=ntdll._memccpy @400 - _memicmp=ntdll._memicmp @401 - _mkdir @402 - ;_mkgmtime - ;_mkgmtime64 - _mktemp @403 - ;_mktime64 - _msize @404 - _nextafter @405 - _onexit @406 - _open @407 - _open_osfhandle @408 - ;_osplatform - _osver @409 DATA - _pclose @413 - _pctype @414 DATA - _pgmptr @415 DATA - _pipe @416 - _popen @417 - _purecall @418 - _putch @419 - _putenv @420 - _putw @421 - ;_putwch - _putws @422 - ;_pectype - _read @423 - ;_resetstkoflw - _rmdir @424 - _rmtmp @425 - _rotl @426 - ;_rotl64 - _rotr @427 - ;_rotr64 - _safe_fdiv @428 - _safe_fdivr @429 - _safe_fprem @430 - _safe_fprem1 @431 - _scalb @432 - ;_scprintf - ;_scwprintf - _searchenv @433 - _seh_longjmp_unwind@4 @434 - ;_set_SSE2_enable - _set_error_mode @435 - _set_sbh_threshold @436 - _seterrormode @437 - _setjmp @438 - _setjmp3 @439 - _setmaxstdio @440 - _setmbcp @441 - _setmode @442 - _sleep @444 - _snprintf @445 - _snwprintf @446 - ;_snwscanf - _sopen @447 - _spawnl @448 - _spawnle @449 - _spawnlp @450 - _spawnlpe @451 - _spawnv @452 - _spawnve @453 - _spawnvp @454 - _spawnvpe @455 - _splitpath=ntdll._splitpath @456 - _stat @457 - _stat64 @458 - _stati64 @459 - _statusfp @460 - _strcmpi=ntdll._strcmpi @461 - _strdate @462 - _strdup @463 - _strerror @464 - _stricmp=ntdll._stricmp @465 - _stricoll @466 - _strlwr=ntdll._strlwr @467 - _strnicmp=ntdll._strnicmp @469 - _strtoui64=strtoull @470 - _strnset @471 - _strrev @472 - _strset @473 - _strtime @474 - ;_strtoi64 - _strupr=ntdll._strupr @475 - _swab @476 - _sys_errlist @477 DATA - _sys_nerr @478 DATA - _tell @479 - _telli64 @480 - _tempnam @481 - ;_time64 - _timezone @482 DATA - _tolower @483 - _toupper @484 - _tzname @485 DATA - _tzset @486 - _ui64toa=ntdll._ui64toa @487 - _ui64tow=ntdll._ui64tow @488 - _ultoa=ntdll._ultoa @489 - _ultow=ntdll._ultow @490 - _umask @491 - _ungetch @492 - ;_ungetwch - _unlink @493 - _unloaddll @494 - _unlock @495 - _utime @496 - ;_utime64 - ;_vscprintf - ;_vscwprintf - _vsnprintf @497 - _vsnwprintf @498 - _waccess @499 - _wasctime @500 - _wchdir @501 - _wchmod @502 - _wcmdln @503 DATA - _wcreat @504 - _wcsdup @505 - ;_wcserror - _wcsicmp=ntdll._wcsicmp @506 - _wcsicoll @507 - _wcslwr=ntdll._wcslwr @508 - _wcsncoll @509 - _wcsnicmp=ntdll._wcsnicmp @510 - _wcsnicoll @511 - _wcsnset @512 - _wcsrev @513 - _wcsset @514 - ;_wcstoi64 - ;_wcstoui64 - _wcsupr=ntdll._wcsupr @515 - _wctime @516 - ;_wctime64 - ;_wctype - _wenviron @517 DATA - _wexecl @518 - _wexecle @519 - _wexeclp @520 - _wexeclpe @521 - _wexecv @522 - _wexecve @523 - _wexecvp @524 - _wexecvpe @525 - _wfdopen @526 - _wfindfirst @527 - ;_wfindfirst64 - _wfindfirsti64 @528 - _wfindnext @529 - ;_wfindnext64 - _wfindnexti64 @530 - _wfopen @531 - _wfsopen @533 - _wfullpath @534 - _wgetcwd @535 - _wgetdcwd @536 - _wgetenv @537 - _winmajor @538 DATA - _winminor @539 DATA - _winver @540 DATA - _wmakepath @541 - _wmkdir @542 - _wmktemp @543 - _wopen @544 - ;_wperror stub - _wpgmptr @546 DATA - _wpopen @547 - _wputenv @548 - _wremove @549 - _wrename @550 - _write @551 - _wrmdir @552 - _wsearchenv @553 - _wsetlocale @554 - _wsopen @555 - _wspawnl @556 - _wspawnle @557 - _wspawnlp @558 - _wspawnlpe @559 - _wspawnv @560 - _wspawnve @561 - _wspawnvp @562 - _wspawnvpe @563 - _wsplitpath @564 - _wstat @565 - _wstati64 @566 - _wstat64 @567 - _wstrdate @568 - _wstrtime @569 - _wsystem @570 - _wtempnam @571 - ;_wtmpnam stub - ;_wtof - _wtoi=ntdll._wtoi @573 - _wtoi64=ntdll._wtoi64 @574 - _wtol=ntdll._wtol @575 - _wunlink @576 - _wutime @577 - _y0 @578 - _y1 @579 - _yn @580 - abort @581 - abs=ntdll.abs @582 - acos @583 - asctime @584 - asin @585 - atan @586 - atan2 @587 - atexit @588 - atof @589 - atoi=ntdll.atoi @590 - atol=ntdll.atol @591 - bsearch=ntdll.bsearch @592 - calloc @593 - ceil @594 - clearerr @595 - clock @596 - cos @597 - cosh @598 - ctime @599 - difftime @600 - div @601 - exit @602 - exp @603 - fabs @604 - fclose @605 - feof @606 - ferror @607 - fflush @608 - fgetc @609 - fgetpos @610 - fgets @611 - fgetwc @612 - fgetws @613 - floor @614 - fmod @615 - fopen @616 - fprintf @617 - fputc @618 - fputs @619 - fputwc @620 - fputws @621 - fread @622 - free @623 - freopen @624 - frexp @625 - fscanf @626 - fseek @627 - fsetpos @628 - ftell @629 - fwprintf @630 - fwrite @631 - fwscanf @632 - getc @633 - getchar @634 - getenv @635 - gets @636 - getwc @637 - getwchar @638 - gmtime @639 - is_wctype=ntdll.iswctype @640 - isalnum @641 - isalpha @642 - iscntrl @643 - isdigit @644 - isgraph @645 - isleadbyte @646 - islower @647 - isprint @648 - ispunct @649 - isspace @650 - isupper @651 - iswalnum @652 - iswalpha=ntdll.iswalpha @653 - iswascii @654 - iswcntrl @655 - iswctype=ntdll.iswctype @656 - iswdigit @657 - iswgraph @658 - iswlower @659 - iswprint @660 - iswpunct @661 - iswspace @662 - iswupper @663 - iswxdigit @664 - isxdigit @665 - labs=ntdll.labs @666 - ldexp @667 - ldiv @668 - localeconv @669 - localtime @670 - log @671 - log10 @672 - longjmp @673 - malloc @674 - mblen @675 - mbstowcs=ntdll.mbstowcs @676 - mbtowc @677 - memchr=ntdll.memchr @678 - memcmp=ntdll.memcmp @679 - memcpy=ntdll.memcpy @680 - memmove=ntdll.memmove @681 - memset=ntdll.memset @682 - mktime @683 - modf @684 - perror @685 - pow @686 - printf @687 - putc @688 - putchar @689 - puts @690 - putwc @691 - putwchar=_fputwchar @692 - qsort=ntdll.qsort @693 - raise @694 - rand @695 - realloc @696 - remove @697 - rename @698 - rewind @699 - scanf @700 - setbuf @701 - setlocale @702 - setvbuf @703 - signal @704 - sin @705 - sinh @706 - sprintf @707 - sqrt @708 - srand @709 - sscanf @710 - strcat=ntdll.strcat @711 - ;strcat_s @712 wine - strchr=ntdll.strchr @713 - strcmp=ntdll.strcmp @714 - strcoll @715 - strcpy=ntdll.strcpy @716 - ;strcpy_s @717 wine - strcspn=ntdll.strcspn @718 - strerror @719 - strftime @720 - strlen=ntdll.strlen @721 - strncat=ntdll.strncat @722 - strncmp=ntdll.strncmp @723 - strncpy=ntdll.strncpy @724 - strpbrk=ntdll.strpbrk @725 - strrchr=ntdll.strrchr @726 - strspn=ntdll.strspn @727 - strstr=ntdll.strstr @728 - strtod @729 - strtok @730 - strtol=ntdll.strtol @731 - strtoul=ntdll.strtoul @732 - strxfrm @733 - swprintf @734 - swscanf @735 - system @736 - tan @737 - tanh @738 - time @739 - tmpfile @740 - tmpnam @741 - tolower=ntdll.tolower @742 - toupper=ntdll.toupper @743 - towlower=ntdll.towlower @744 - towupper=ntdll.towupper @745 - ungetc @746 - ungetwc @747 - vfprintf @748 - vfwprintf @749 - vprintf @750 - vsprintf @751 - vswprintf @752 - vwprintf @753 - wcscat=ntdll.wcscat @754 - wcschr=ntdll.wcschr @755 - wcscmp=ntdll.wcscmp @756 - wcscoll @757 - wcscpy=ntdll.wcscpy @758 - ;wcscpy_s @759 wine - wcscspn=ntdll.wcscspn @760 - wcsftime @761 - wcslen=ntdll.wcslen @762 - wcsncat=ntdll.wcsncat @763 - wcsncmp=ntdll.wcsncmp @764 - wcsncpy=ntdll.wcsncpy @765 - wcspbrk @766 - wcsrchr=ntdll.wcsrchr @767 - wcsspn=ntdll.wcsspn @768 - wcsstr=ntdll.wcsstr @769 - wcstod @770 - wcstok @771 - wcstol=ntdll.wcstol @772 - wcstombs=ntdll.wcstombs @773 - wcstoul=ntdll.wcstoul @774 - wcsxfrm @775 - wctomb @776 - wprintf @777 - wscanf @778 + _CIacos @56 + _CIasin @57 + _CIatan @58 + _CIatan2 @59 + _CIcos @60 + _CIcosh @61 + _CIexp @62 + _CIfmod @63 + _CIlog @64 + _CIlog10 @65 + _CIpow @66 + _CIsin @67 + _CIsinh @68 + _CIsqrt @69 + _CItan @70 + _CItanh @71 + _CxxThrowException @72 + _EH_prolog @73 + _Getdays @74 + _Getmonths @75 + _Gettnames @76 + _HUGE @77 DATA + _Strftime @78 + _XcptFilter @79 + __CppXcptFilter @80 +; __CxxCallUnwindDtor @81 +; __CxxCallUnwindVecDtor @82 + __CxxDetectRethrow @83 +; __CxxExceptionFilter @84 + __CxxFrameHandler @85 +; __CxxFrameHandler2 @86 + __CxxLongjmpUnwind @87 + __CxxQueryExceptionSize @88 +; __CxxRegisterExceptionObject @89 +; __CxxUnregisterExceptionObject @90 +; __DestructExceptionObject @91 + __RTCastToVoid=MSVCRT___RTCastToVoid @92 + __RTDynamicCast=MSVCRT___RTDynamicCast @93 + __RTtypeid=MSVCRT___RTtypeid @94 + __STRINGTOLD @95 +; ___lc_codepage_func @96 +; ___lc_collate_cp_func @97 +; ___lc_handle_func @98 +; ___mb_cur_max_func @99 +; ___setlc_active_func @100 +; ___unguarded_readlc_active_add_func @101 + __argc @102 DATA + __argv @103 DATA + __badioinfo @104 DATA + __crtCompareStringA=kernel32.CompareStringA @105 + __crtCompareStringW=kernel32.CompareStringW @106 + __crtGetLocaleInfoW=kernel32.GetLocaleInfo @107 + __crtGetStringTypeW=kernel32.GeStringTypeW @108 + __crtLCMapStringA @109 +; __crtLCMapStringW @110 + __dllonexit @111 + __doserrno @112 + __fpecode @113 + __getmainargs @114 + __initenv @115 +; __iob_func @116 + __isascii @117 + __iscsym @118 + __iscsymf @119 + __lc_codepage @120 DATA + __lc_collate_cp @121 DATA + __lc_handle @122 DATA + __lconv_init @123 + __mb_cur_max @124 DATA + __p___argc @125 + __p___argv @126 + __p___initenv @127 + __p___mb_cur_max @128 + __p___wargv @129 + __p___winitenv @130 + __p__acmdln @131 + __p__amblksiz @132 + __p__commode @133 + __p__daylight @134 + __p__dstbias @135 + __p__environ @136 +; __p__fileinfo @137 + __p__fmode @138 + __p__iob @139 +; __p__mbcasemap @140 + __p__mbctype @141 + __p__osver @142 + __p__pctype @143 + __p__pgmptr @144 + __p__pwctype @145 + __p__timezone @146 + __p__tzname @147 + __p__wcmdln @148 + __p__wenviron @149 + __p__winmajor @150 + __p__winminor @151 + __p__winver @152 + __p__wpgmptr @153 +; __pctype_func @154 + __pioinfo @155 DATA +; __pwctype_func @156 + __pxcptinfoptrs @157 + __set_app_type @158 + __setlc_active @159 DATA + __setusermatherr @160 + __threadhandle @161 + __threadid @162 + __toascii @163 + __unDName @164 + __unDNameEx @165 +; __uncaught_exception @166 + __unguarded_readlc_active @167 DATA + __wargv @168 DATA +; __wcserror @169 + __wgetmainargs @170 + __winitenv @171 DATA + _abnormal_termination @172 +; _abs64 @173 + _access @174 + _acmdln @175 DATA + _adj_fdiv_m16i @176 + _adj_fdiv_m32 @177 + _adj_fdiv_m32i @178 + _adj_fdiv_m64 @179 + _adj_fdiv_r @180 + _adj_fdivr_m16i @181 + _adj_fdivr_m32 @182 + _adj_fdivr_m32i @183 + _adj_fdivr_m64 @184 + _adj_fpatan @185 + _adj_fprem @186 + _adj_fprem1 @187 + _adj_fptan @188 + _adjust_fdiv @189 DATA + _aexit_rtn @190 + _aligned_free @191 + _aligned_malloc @192 + _aligned_offset_malloc @193 + _aligned_offset_realloc @194 + _aligned_realloc @195 + _amsg_exit @196 + _assert @197 +; _atodbl @198 + _atoi64=ntdll._atoi64 @199 + _atoldbl @200 + _beep @201 + _beginthread @202 + _beginthreadex @203 + _c_exit @204 + _cabs @205 + _callnewh @206 + _cexit @207 + _cgets @208 +; _cgetws @209 + _chdir @210 + _chdrive @211 + _chgsign @212 + _chkesp @213 + _chmod @214 + _chsize @215 + _clearfp @216 + _close @217 + _commit @218 + _commode @219 DATA + _control87 @220 + _controlfp @221 + _copysign @222 + _cprintf @223 + _cputs @224 +; _cputws @225 + _creat @226 + _cscanf @227 +; _ctime64 @228 + _ctype @229 DATA + _cwait @230 +; _cwprintf @231 +; _cwscanf @232 + _daylight @233 DATA + _dstbias @234 DATA + _dup @235 + _dup2 @236 + _ecvt @237 + _endthread @238 + _endthreadex @239 + _environ @240 DATA + _eof @241 + _errno @242 + _except_handler2 @243 + _except_handler3 @244 + _execl @245 + _execle @246 + _execlp @247 + _execlpe @248 + _execv @249 + _execve @250 + _execvp @251 + _execvpe @252 + _exit @253 + _expand @254 + _fcloseall @255 + _fcvt @256 + _fdopen @257 + _fgetchar @258 + _fgetwchar @259 + _filbuf @260 +; _fileinfo @261 + _filelength @262 + _filelengthi64 @263 + _fileno @264 + _findclose @265 + _findfirst @266 +; _findfirst64 @267 + _findfirsti64 @268 + _findnext @269 +; _findnext64 @270 + _findnexti64 @271 + _finite @272 + _flsbuf @273 + _flushall @274 + _fmode @275 DATA + _fpclass @276 + _fpieee_flt @277 + _fpreset @278 + _fputchar @279 + _fputwchar @280 + _fsopen @281 + _fstat @282 + _fstat64 @283 + _fstati64 @284 + _ftime @285 +; _ftime64 @286 + _ftol @287 + _fullpath @288 + _futime @289 +; _futime64 @290 + _gcvt @291 +; _get_heap_handle @292 + _get_osfhandle @293 + _get_sbh_threshold @294 + _getch @295 + _getche @296 + _getcwd @297 + _getdcwd @298 + _getdiskfree @299 + _getdllprocaddr @300 + _getdrive @301 + _getdrives @302 + _getmaxstdio @303 + _getmbcp @304 + _getpid @305 + _getsystime @306 + _getw @307 +; _getwch @308 +; _getwche @309 + _getws @310 + _global_unwind2 @311 +; _gmtime64 @312 + _heapadd @313 + _heapchk @314 + _heapmin @315 + _heapset @316 +; _heapused @317 + _heapwalk @318 + _hypot @319 + _i64toa=ntdll._i64toa @320 + _i64tow=ntdll._i64tow @321 + _initterm @322 +; _inp @323 +; _inpd @324 +; _inpw @325 + _iob @326 DATA + _isatty @327 + _isctype @328 + _ismbbalnum @329 + _ismbbalpha @330 + _ismbbgraph @331 + _ismbbkalnum @332 + _ismbbkana @333 +; _ismbbkprint @334 + _ismbbkpunct @335 + _ismbblead @336 + _ismbbprint @337 + _ismbbpunct @338 + _ismbbtrail @339 + _ismbcalnum @340 + _ismbcalpha @341 + _ismbcdigit @342 + _ismbcgraph @343 + _ismbchira @344 + _ismbckata @345 + _ismbcl0 @346 + _ismbcl1 @347 + _ismbcl2 @348 + _ismbclegal @349 + _ismbclower @350 + _ismbcprint @351 + _ismbcpunct @352 + _ismbcspace @353 + _ismbcsymbol @354 + _ismbcupper @355 + _ismbslead @356 + _ismbstrail @357 + _isnan @358 + _itoa=ntdll._itoa @359 + _itow=ntdll._itow @360 + _j0 @361 + _j1 @362 + _jn @363 + _kbhit @364 + _lfind @365 + _loaddll @366 + _local_unwind2 @367 +; _localtime64 @368 + _lock @369 + _locking @370 + _logb @371 + _longjmpex=longjmp @372 + _lrotl @373 + _lrotr @374 + _lsearch @375 + _lseek @376 + _lseeki64 @377 + _ltoa=ntdll._ltoa @378 + _ltow=ntdll._ltow @379 + _makepath @380 + _mbbtombc @381 + _mbbtype @382 +; _mbcasemap @383 + _mbccpy @384 + _mbcjistojms @385 + _mbcjmstojis @386 + _mbclen @387 + _mbctohira @388 + _mbctokata @389 + _mbctolower @390 + _mbctombb @391 + _mbctoupper @392 + _mbctype @393 DATA + _mbsbtype @394 + _mbscat @395 + _mbschr @396 + _mbscmp @397 + _mbscoll @398 + _mbscpy @399 + _mbscspn @400 + _mbsdec @401 + _mbsdup @402 + _mbsicmp @403 + _mbsicoll @404 + _mbsinc @405 + _mbslen @406 + _mbslwr @407 + _mbsnbcat @408 + _mbsnbcmp @409 + _mbsnbcnt @410 + _mbsnbcoll @411 + _mbsnbcpy @412 + _mbsnbicmp @413 + _mbsnbicoll @414 + _mbsnbset @415 + _mbsncat @416 + _mbsnccnt @417 + _mbsncmp @418 + _mbsncoll @419 + _mbsncpy @420 + _mbsnextc @421 + _mbsnicmp @422 + _mbsnicoll @423 + _mbsninc @424 + _mbsnset @425 + _mbspbrk @426 + _mbsrchr @427 + _mbsrev @428 + _mbsset @429 + _mbsspn @430 + _mbsspnp @431 + _mbsstr @432 + _mbstok @433 + _mbstrlen @434 + _mbsupr @435 + _memccpy=ntdll._memccpy @436 + _memicmp=ntdll._memicmp @437 + _mkdir @438 +; _mkgmtime @439 +; _mkgmtime64 @440 + _mktemp @441 +; _mktime64 @442 + _msize @443 + _nextafter @444 + _onexit @445 + _open @446 + _open_osfhandle @447 +; _osplatform @448 + _osver @449 DATA +; _outp @450 +; _outpd @451 +; _outpw @452 + _pclose @453 + _pctype @454 DATA + _pgmptr @455 DATA + _pipe @456 + _popen @457 + _purecall @458 + _putch @459 + _putenv @460 + _putw @461 +; _putwch @462 + _putws @463 + _pwctype @464 + _read @465 +; _resetstkoflw @466 + _rmdir @467 + _rmtmp @468 + _rotl @469 +; _rotl64 @470 + _rotr @471 +; _rotr64 @472 + _safe_fdiv @473 + _safe_fdivr @474 + _safe_fprem @475 + _safe_fprem1 @476 + _scalb @477 +; _scprintf @478 +; _scwprintf @479 + _searchenv @480 +; _seh_longjmp_unwind @481 +; _set_SSE2_enable @482 + _set_error_mode @483 + _set_sbh_threshold @484 + _seterrormode @485 + _setjmp @486 + _setjmp3 @487 + _setmaxstdio @488 + _setmbcp @489 + _setmode @490 + _setsystime @491 + _sleep @492 + _snprintf @493 +; _snscanf @494 + _snwprintf @495 +; _snwscanf @496 + _sopen @497 + _spawnl @498 + _spawnle @499 + _spawnlp @500 + _spawnlpe @501 + _spawnv @502 + _spawnve @503 + _spawnvp @504 + _spawnvpe @505 + _splitpath=ntdll._splitpath @506 + _stat @507 + _stat64 @508 + _stati64 @509 + _statusfp @510 + _strcmpi=ntdll._strcmpi @511 + _strdate @512 + _strdup @513 + _strerror @514 + _stricmp=ntdll._stricmp @515 + _stricoll @516 + _strlwr=ntdll._strlwr @517 + _strncoll @518 + _strnicmp=ntdll._strnicmp @519 + _strnicoll @520 + _strnset @521 + _strrev @522 + _strset @523 + _strtime @524 +; _strtoi64 @525 + _strtoui64=strtoull @526 + _strupr=ntdll._strupr @527 + _swab @528 + _sys_errlist @529 DATA + _sys_nerr @530 DATA + _tell @531 + _telli64 @532 + _tempnam @533 +; _time64 @534 + _timezone @535 DATA + _tolower @536 + _toupper @537 + _tzname @538 DATA + _tzset @539 + _ui64toa=ntdll._ui64toa @540 + _ui64tow=ntdll._ui64tow @541 + _ultoa=ntdll._ultoa @542 + _ultow=ntdll._ultow @543 + _umask @544 + _ungetch @545 +; _ungetwch @546 + _unlink @547 + _unloaddll @548 + _unlock @549 + _utime @550 +; _utime64 @551 +; _vscprintf @552 +; _vscwprintf @553 + _vsnprintf @554 + _vsnwprintf @555 + _waccess @556 + _wasctime @557 + _wchdir @558 + _wchmod @559 + _wcmdln @560 + _wcreat @561 + _wcsdup @562 +; _wcserror @563 + _wcsicmp=ntdll._wcsicmp @564 + _wcsicoll @565 + _wcslwr=ntdll._wcslwr @566 + _wcsncoll @567 + _wcsnicmp=ntdll._wcsnicmp @568 + _wcsnicoll @569 + _wcsnset @570 + _wcsrev @571 + _wcsset @572 +; _wcstoi64 @573 +; _wcstoui64 @574 + _wcsupr=ntdll._wcsupr @575 + _wctime @576 +; _wctime64 @577 +; _wctype @578 + _wenviron @579 DATA + _wexecl @580 + _wexecle @581 + _wexeclp @582 + _wexeclpe @583 + _wexecv @584 + _wexecve @585 + _wexecvp @586 + _wexecvpe @587 + _wfdopen @588 + _wfindfirst @589 +; _wfindfirst64 @590 + _wfindfirsti64 @591 + _wfindnext @592 +; _wfindnext64 @593 + _wfindnexti64 @594 + _wfopen @595 + _wfreopen @596 + _wfsopen @597 + _wfullpath @598 + _wgetcwd @599 + _wgetdcwd @600 + _wgetenv @601 + _winmajor @602 DATA + _winminor @603 DATA + _winver @604 DATA + _wmakepath @605 + _wmkdir @606 + _wmktemp @607 + _wopen @608 + _wperror @609 + _wpgmptr @610 DATA + _wpopen @611 + _wputenv @612 + _wremove @613 + _wrename @614 + _write @615 + _wrmdir @616 + _wsearchenv @617 + _wsetlocale @618 + _wsopen @619 + _wspawnl @620 + _wspawnle @621 + _wspawnlp @622 + _wspawnlpe @623 + _wspawnv @624 + _wspawnve @625 + _wspawnvp @626 + _wspawnvpe @627 + _wsplitpath @628 + _wstat @629 + _wstat64 @630 + _wstati64 @631 + _wstrdate @632 + _wstrtime @633 + _wsystem @634 + _wtempnam @635 + _wtmpnam @636 +; _wtof @637 + _wtoi=ntdll._wtoi @638 + _wtoi64=ntdll._wtoi64 @639 + _wtol=ntdll._wtol @640 + _wunlink @641 + _wutime @642 +; _wutime64 @643 + _y0 @644 + _y1 @645 + _yn @646 + abort @647 + abs=ntdll.abs @648 + acos @649 + asctime @650 + asin @651 + atan @652 + atan2 @653 + atexit @654 + atof @655 + atoi=ntdll.atoi @656 + atol=ntdll.atol @657 + bsearch=ntdll.bsearch @658 + calloc @659 + ceil @660 + clearerr @661 + clock @662 + cos @663 + cosh @664 + ctime @665 + difftime @666 + div @667 + exit @668 + exp @669 + fabs @670 + fclose @671 + feof @672 + ferror @673 + fflush @674 + fgetc @675 + fgetpos @676 + fgets @677 + fgetwc @678 + fgetws @679 + floor @680 + fmod @681 + fopen @682 + fprintf @683 + fputc @684 + fputs @685 + fputwc @686 + fputws @687 + fread @688 + free @689 + freopen @690 + frexp @691 + fscanf @692 + fseek @693 + fsetpos @694 + ftell @695 + fwprintf @696 + fwrite @697 + fwscanf @698 + getc @699 + getchar @700 + getenv @701 + gets @702 + getwc @703 + getwchar @704 + gmtime @705 + is_wctype=ntdll.iswctype @706 + isalnum @707 + isalpha @708 + iscntrl @709 + isdigit @710 + isgraph @711 + isleadbyte @712 + islower @713 + isprint @714 + ispunct @715 + isspace @716 + isupper @717 + iswalnum @718 + iswalpha=ntdll.iswalpha @719 + iswascii @720 + iswcntrl @721 + iswctype=ntdll.iswctype @722 + iswdigit @723 + iswgraph @724 + iswlower @725 + iswprint @726 + iswpunct @727 + iswspace @728 + iswupper @729 + iswxdigit @730 + isxdigit @731 + labs=ntdll.labs @732 + ldexp @733 + ldiv @734 + localeconv @735 + localtime @736 + log @737 + log10 @738 + longjmp @739 + malloc @740 + mblen @741 + mbstowcs=ntdll.mbstowcs @742 + mbtowc @743 + memchr=ntdll.memchr @744 + memcmp=ntdll.memcmp @745 + memcpy=ntdll.memcpy @746 + memmove=ntdll.memmove @747 + memset=ntdll.memset @748 + mktime @749 + modf @750 + perror @751 + pow @752 + printf @753 + putc @754 + putchar @755 + puts @756 + putwc @757 + putwchar=_fputwchar @758 + qsort=ntdll.qsort @759 + raise @760 + rand @761 + realloc @762 + remove @763 + rename @764 + rewind @765 + scanf @766 + setbuf @767 + setlocale @768 + setvbuf @769 + signal @770 + sin @771 + sinh @772 + sprintf @773 + sqrt @774 + srand @775 + sscanf @776 + strcat=ntdll.strcat @777 + strchr=ntdll.strchr @778 + strcmp=ntdll.strcmp @779 + strcoll @780 + strcpy=ntdll.strcpy @781 + strcspn=ntdll.strcspn @782 + strerror @783 + strftime @784 + strlen=ntdll.strlen @785 + strncat=ntdll.strncat @786 + strncmp=ntdll.strncmp @787 + strncpy=ntdll.strncpy @788 + strpbrk=ntdll.strpbrk @789 + strrchr=ntdll.strrchr @790 + strspn=ntdll.strspn @791 + strstr=ntdll.strstr @792 + strtod @793 + strtok @794 + strtol=ntdll.strtol @795 + strtoul=ntdll.strtoul @796 + strxfrm @797 + swprintf @798 + swscanf @799 + system @800 + tan @801 + tanh @802 + time @803 + tmpfile @804 + tmpnam @805 + tolower=ntdll.tolower @806 + toupper=ntdll.toupper @807 + towlower=ntdll.towlower @808 + towupper=ntdll.towupper @809 + ungetc @810 + ungetwc @811 + vfprintf @812 + vfwprintf @813 + vprintf @814 + vsprintf @815 + vswprintf @816 + vwprintf @817 + wcscat=ntdll.wcscat @818 + wcschr=ntdll.wcschr @819 + wcscmp=ntdll.wcscmp @820 + wcscoll @821 + wcscpy=ntdll.wcscpy @822 + wcscspn=ntdll.wcscspn @823 + wcsftime @824 + wcslen=ntdll.wcslen @825 + wcsncat=ntdll.wcsncat @826 + wcsncmp=ntdll.wcsncmp @827 + wcsncpy=ntdll.wcsncpy @828 + wcspbrk @829 + wcsrchr=ntdll.wcsrchr @830 + wcsspn=ntdll.wcsspn @831 + wcsstr=ntdll.wcsstr @832 + wcstod @833 + wcstok @834 + wcstol=ntdll.wcstol @835 + wcstombs=ntdll.wcstombs @836 + wcstoul=ntdll.wcstoul @837 + wcsxfrm @838 + wctomb @839 + wprintf @840 + wscanf @841

1 0

[greatlrd] 33763: patch by Jeffrey Morlan ( email : mrnobo1024 at yahoo dot com ) the comment above is my. See issue #3295 for more details.
by greatlrd＠svn.reactos.org 29 May '08

29 May '08

Author: greatlrd Date: Thu May 29 17:39:39 2008 New Revision: 33763 URL: http://svn.reactos.org/svn/reactos?rev=33763&view=rev Log: patch by Jeffrey Morlan ( email : mrnobo1024 at yahoo dot com ) the comment above is my. See issue #3295 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu May 29 17:39:39 2008 @@ -812,7 +812,12 @@ pDC = DC_LockDc(hdcMem); - IntSetDIBits(pDC, hBitmap, 0, BitsInfo->bmiHeader.biHeight, Bits, + /* Note BitsInfo->bmiHeader.biHeight is the number of scanline, + * if it negitve we getting to many scanline for scanline is UINT not + * a INT, so we need make the negtive value to positve and that make the + * count correct for negtive bitmap, TODO : we need testcase for this api */ + + IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, BitsInfo, Usage); DC_UnlockDc(pDC);

1 0

[tkreuzer] 33762: remove hFirstBitmap from the WIN_DC_INFO struct, wasn't used anyway and use StockObject(DEFAULT_BITMAP) for the default bitmap when creating a mem dc as on windows.
by tkreuzer＠svn.reactos.org 29 May '08

29 May '08

Author: tkreuzer Date: Thu May 29 14:44:23 2008 New Revision: 33762 URL: http://svn.reactos.org/svn/reactos?rev=33762&view=rev Log: remove hFirstBitmap from the WIN_DC_INFO struct, wasn't used anyway and use StockObject(DEFAULT_BITMAP) for the default bitmap when creating a mem dc as on windows. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu May 29 14:44:23 2008 @@ -59,7 +59,6 @@ HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ HBITMAP hBitmap; - HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ /* #if 0 */ GdiPath path; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu May 29 14:44:23 2008 @@ -60,7 +60,6 @@ { PDC NewDC, OrigDC; PDC_ATTR nDc_Attr, oDc_Attr; - HBITMAP hBitmap; HDC hNewDC, DisplayDC; HRGN hVisRgn; UNICODE_STRING DriverName; @@ -118,21 +117,8 @@ nDc_Attr->ptlViewportOrg = oDc_Attr->ptlViewportOrg; nDc_Attr->szlViewportExt = oDc_Attr->szlViewportExt; - /* Create default bitmap */ - if (!(hBitmap = IntGdiCreateBitmap( 1, 1, 1, NewDC->w.bitsPerPixel, NULL ))) - { - DC_UnlockDc( OrigDC ); - DC_UnlockDc( NewDC ); - DC_FreeDC( hNewDC ); - if (NULL != DisplayDC) - { - NtGdiDeleteObjectApp(DisplayDC); - } - return NULL; - } NewDC->DC_Type = DC_TYPE_MEMORY; // Always! - NewDC->w.hBitmap = hBitmap; - NewDC->w.hFirstBitmap = hBitmap; + NewDC->w.hBitmap = NtGdiGetStockObject(DEFAULT_BITMAP); NewDC->pPDev = OrigDC->pPDev; NewDC->DcLevel.hpal = OrigDC->DcLevel.hpal; @@ -1024,10 +1010,6 @@ NtGdiSelectBrush (DCHandle, STOCK_WHITE_BRUSH); NtGdiSelectFont (DCHandle, STOCK_SYSTEM_FONT); DC_LockDC (DCHandle); NtGdiSelectXxx does not recognize stock objects yet */ - if (DCToDelete->DC_Type == DC_TYPE_MEMORY) - { - NtGdiDeleteObject (DCToDelete->w.hFirstBitmap); - } if (DCToDelete->XlateBrush != NULL) EngDeleteXlate(DCToDelete->XlateBrush); if (DCToDelete->XlatePen != NULL) @@ -1042,9 +1024,9 @@ NtGdiDeleteObject (DCToDelete->w.hVisRgn); } if (NULL != DCToDelete->CombinedClip) - { - IntEngDeleteClipRegion(DCToDelete->CombinedClip); - } + { + IntEngDeleteClipRegion(DCToDelete->CombinedClip); + } if (DCToDelete->w.hGCClipRgn) { NtGdiDeleteObject (DCToDelete->w.hGCClipRgn); @@ -1336,7 +1318,6 @@ nDc_Attr->hbrush = Dc_Attr->hbrush; nDc_Attr->hlfntNew = Dc_Attr->hlfntNew; newdc->w.hBitmap = dc->w.hBitmap; - newdc->w.hFirstBitmap = dc->w.hFirstBitmap; newdc->DcLevel.hpal = dc->DcLevel.hpal; newdc->w.totalExtent = dc->w.totalExtent; newdc->w.bitsPerPixel = dc->w.bitsPerPixel; @@ -1405,8 +1386,6 @@ dc->DcLevel.flPath = dcs->DcLevel.flPath & ~DCPATH_SAVE; - dc->w.hFirstBitmap = dcs->w.hFirstBitmap; - Dc_Attr->dwLayout = sDc_Attr->dwLayout; dc->w.totalExtent = dcs->w.totalExtent; Dc_Attr->jROP2 = sDc_Attr->jROP2;

1 0

[jimtabor] 33761: Fix build.
by jimtabor＠svn.reactos.org 29 May '08

29 May '08

Author: jimtabor Date: Thu May 29 13:58:03 2008 New Revision: 33761 URL: http://svn.reactos.org/svn/reactos?rev=33761&view=rev Log: Fix build. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/windows/hook.c 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 May 29 13:58:03 2008 @@ -50,6 +50,7 @@ extern PW32PROCESSINFO g_pi; extern PW32PROCESSINFO g_kpi; +extern PSERVERINFO g_psi; static __inline PVOID SharedPtrToUser(PVOID Ptr) 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 May 29 13:58:03 2008 @@ -33,7 +33,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -extern PSERVERINFO g_psi; /* PRIVATE FUNCTIONS *********************************************************/

1 0

[jimtabor] 33760: Use server information structure for system colors.
by jimtabor＠svn.reactos.org 29 May '08

29 May '08

Author: jimtabor Date: Thu May 29 13:51:17 2008 New Revision: 33760 URL: http://svn.reactos.org/svn/reactos?rev=33760&view=rev Log: Use server information structure for system colors. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/objects/stockobj.c 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 May 29 13:51:17 2008 @@ -1,4 +1,4 @@ -/* $Id$ +/* * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -33,10 +33,6 @@ /* GLOBALS *******************************************************************/ -COLORREF SysColors[NUM_SYSCOLORS] = {0}; -HPEN SysPens[NUM_SYSCOLORS] = {0}; -HBRUSH SysBrushes[NUM_SYSCOLORS] = {0}; - /* Bits in the dwKeyData */ #define KEYDATA_ALT 0x2000 #define KEYDATA_PREVSTATE 0x4000 @@ -55,13 +51,8 @@ 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. */ - if(SysBrushes[0] == NULL) - { - /* only initialize once */ - (void)NtUserGetSysColors(SysColors, NUM_SYSCOLORS); - (void)NtUserGetSysColorPens(SysPens, NUM_SYSCOLORS); - (void)NtUserGetSysColorBrushes(SysBrushes, NUM_SYSCOLORS); - } + + // Done! g_psi! } /* @@ -72,7 +63,7 @@ { if(nIndex >= 0 && nIndex <= NUM_SYSCOLORS) { - return SysColors[nIndex]; + return g_psi->SysColors[nIndex]; } SetLastError(ERROR_INVALID_PARAMETER); @@ -87,7 +78,7 @@ { if(nIndex >= 0 && nIndex <= NUM_SYSCOLORS) { - return SysPens[nIndex]; + return g_psi->SysColorPens[nIndex]; } SetLastError(ERROR_INVALID_PARAMETER); @@ -102,7 +93,7 @@ { if(nIndex >= 0 && nIndex <= NUM_SYSCOLORS) { - return SysBrushes[nIndex]; + return g_psi->SysColorBrushes[nIndex]; } SetLastError(ERROR_INVALID_PARAMETER); @@ -132,11 +123,6 @@ if(cElements > 0) { Ret = NtUserSetSysColors(&ChangeSysColors, cElements); - if(Ret) - { - /* FIXME - just change it in the usermode structure, too, instead of asking win32k again */ - (void)NtUserGetSysColors(SysColors, NUM_SYSCOLORS); - } } else { 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 May 29 13:51:17 2008 @@ -171,8 +171,12 @@ typedef struct _SERVERINFO { - DWORD SrvEventActivity; - +// DWORD SystemMetrics[SM_CMETRICS]; // System Metrics +// COLORREF SystemColorCopy[COLOR_MENUBAR+1]; // Backup Copy of system colors. + COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor + HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush + HPEN SysColorPens[COLOR_MENUBAR+1]; // ReactOS exclusive + DWORD SrvEventActivity; } SERVERINFO, *PSERVERINFO; typedef struct _W32PROCESSINFO 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 May 29 13:51:17 2008 @@ -27,6 +27,8 @@ #define NDEBUG #include <debug.h> + +extern PSERVERINFO gpsi; static COLORREF SysColors[] = { @@ -64,8 +66,11 @@ }; #define NUM_SYSCOLORS (sizeof(SysColors) / sizeof(SysColors[0])) -static HPEN SysColorPens[NUM_SYSCOLORS]; -static HBRUSH SysColorBrushes[NUM_SYSCOLORS]; +//static HPEN SysColorPens[NUM_SYSCOLORS]; +//static HBRUSH SysColorBrushes[NUM_SYSCOLORS]; + +// System Bitmap DC and System Display DC... +HDC hSystemBM, hSystemDisplayDC; /* GDI stock objects */ @@ -182,9 +187,9 @@ { if((UINT)(*Elements) < NUM_SYSCOLORS) { - SysColors[*Elements] = *Colors; - IntGdiSetSolidBrushColor(SysColorBrushes[*Elements], *Colors); - IntGdiSetSolidPenColor(SysColorPens[*Elements], *Colors); + gpsi->SysColors[*Elements] = *Colors; + IntGdiSetSolidBrushColor(gpsi->SysColorBrushes[*Elements], *Colors); + IntGdiSetSolidPenColor(gpsi->SysColorPens[*Elements], *Colors); } Elements++; Colors++; @@ -209,7 +214,7 @@ for(i = 0; i < nBrushes; i++) { - *(Brushes++) = SysColorBrushes[i]; + *(Brushes++) = gpsi->SysColorBrushes[i]; } return nBrushes > 0; @@ -218,7 +223,7 @@ HGDIOBJ FASTCALL IntGetSysColorBrush(INT Object) { - return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : SysColorBrushes[Object]; + return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : gpsi->SysColorBrushes[Object]; } BOOL FASTCALL @@ -236,7 +241,7 @@ for(i = 0; i < nPens; i++) { - *(Pens++) = SysColorPens[i]; + *(Pens++) = gpsi->SysColorPens[i]; } return nPens > 0; @@ -256,7 +261,7 @@ return FALSE; } - col = &SysColors[0]; + col = &gpsi->SysColors[0]; for(i = 0; i < nColors; i++) { *(Colors++) = *(col++); @@ -268,7 +273,7 @@ DWORD FASTCALL IntGetSysColor(INT nIndex) { - return (NUM_SYSCOLORS <= (UINT)nIndex) ? 0 : SysColors[nIndex]; + return (NUM_SYSCOLORS <= (UINT)nIndex) ? 0 : gpsi->SysColors[nIndex]; } VOID FASTCALL @@ -277,15 +282,20 @@ UINT i; LOGPEN Pen; + for(i = 0; i < NUM_SYSCOLORS; i++) + { + gpsi->SysColors[i] = SysColors[i]; + } + /* Create the syscolor brushes */ for(i = 0; i < NUM_SYSCOLORS; i++) { - if(SysColorBrushes[i] == NULL) + if(gpsi->SysColorBrushes[i] == NULL) { - SysColorBrushes[i] = IntGdiCreateSolidBrush(SysColors[i]); - if(SysColorBrushes[i] != NULL) + gpsi->SysColorBrushes[i] = IntGdiCreateSolidBrush(SysColors[i]); + if(gpsi->SysColorBrushes[i] != NULL) { - GDIOBJ_ConvertToStockObj((HGDIOBJ*)&SysColorBrushes[i]); + GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorBrushes[i]); } } } @@ -296,13 +306,13 @@ Pen.lopnWidth.y = 0; for(i = 0; i < NUM_SYSCOLORS; i++) { - if(SysColorPens[i] == NULL) + if(gpsi->SysColorPens[i] == NULL) { Pen.lopnColor = SysColors[i]; - SysColorPens[i] = IntGdiExtCreatePen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); - if(SysColorPens[i] != NULL) + gpsi->SysColorPens[i] = IntGdiExtCreatePen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); + if(gpsi->SysColorPens[i] != NULL) { - GDIOBJ_ConvertToStockObj((HGDIOBJ*)&SysColorPens[i]); + GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorPens[i]); } } }

1 0

[fireball] 33759: Stefan Ginsberg <stefan__100__@hotmail.com> - Remove NT3/4 specific unimplemented function and change STDCALL -> NTAPI in mm.c - Make ReactOS i386 kernel exports almost fully correspond to W2003SP1 ntoskrnl.exe's exports.
by fireball＠svn.reactos.org 29 May '08

29 May '08

Author: fireball Date: Thu May 29 11:09:47 2008 New Revision: 33759 URL: http://svn.reactos.org/svn/reactos?rev=33759&view=rev Log: Stefan Ginsberg <stefan__100__(a)hotmail.com> - Remove NT3/4 specific unimplemented function and change STDCALL -> NTAPI in mm.c - Make ReactOS i386 kernel exports almost fully correspond to W2003SP1 ntoskrnl.exe's exports. Modified: trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=33759… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Thu May 29 11:09:47 2008 @@ -27,7 +27,7 @@ /* * @implemented */ -BOOLEAN STDCALL MmIsNonPagedSystemAddressValid(PVOID VirtualAddress) +BOOLEAN NTAPI MmIsNonPagedSystemAddressValid(PVOID VirtualAddress) { return MmIsAddressValid(VirtualAddress); } @@ -35,7 +35,7 @@ /* * @implemented */ -BOOLEAN STDCALL MmIsAddressValid(PVOID VirtualAddress) +BOOLEAN NTAPI MmIsAddressValid(PVOID VirtualAddress) /* * FUNCTION: Checks whether the given address is valid for a read or write * ARGUMENTS: @@ -353,7 +353,7 @@ /* * @unimplemented */ -ULONG STDCALL +ULONG NTAPI MmAdjustWorkingSetSize (ULONG Unknown0, ULONG Unknown1, ULONG Unknown2) @@ -362,23 +362,11 @@ return (0); } - -ULONG -STDCALL -MmDbgTranslatePhysicalAddress ( - ULONG Unknown0, - ULONG Unknown1 -) -{ - UNIMPLEMENTED; - return (0); -} - /* * @unimplemented */ BOOLEAN -STDCALL +NTAPI MmSetAddressRangeModified ( IN PVOID Address, IN ULONG Length Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Thu May 29 11:09:47 2008 @@ -9,6 +9,9 @@ CcDeferWrite@24 CcFastCopyRead@24 CcFastCopyWrite@16 +CcFastMdlReadWait DATA +CcFastReadNotPossible DATA +CcFastReadWait DATA CcFlushCache@16 CcGetDirtyPages@16 CcGetFileObjectFromBcb@4 @@ -17,9 +20,6 @@ CcGetLsnForFileObject@8 CcInitializeCacheMap@20 CcIsThereDirtyData@4 -CcFastMdlReadWait DATA -CcFastReadNotPossible DATA -CcFastReadWait DATA CcMapData@24 CcMdlRead@20 CcMdlReadComplete@8 @@ -37,6 +37,7 @@ CcSetBcbOwnerPointer@8 CcSetDirtyPageThreshold@8 CcSetDirtyPinnedData@8 +CcSetFileSizes@8 CcSetLogHandleForFile@12 CcSetReadAheadGranularity@8 CcUninitializeCacheMap@12 @@ -44,44 +45,29 @@ CcUnpinDataForThread@8 CcUnpinRepinnedBcb@12 CcWaitForCurrentLazyWriterActivity@0 -CcSetFileSizes@8 CcZeroData@16 CmRegisterCallback@12 CmUnRegisterCallback@8 DbgBreakPoint@0 DbgBreakPointWithStatus@4 +;DbgCommandString DbgLoadImageSymbols@12 DbgPrint -DbgPrompt@12 DbgPrintEx DbgPrintReturnControlC +DbgPrompt@12 DbgQueryDebugFilterState@8 DbgSetDebugFilterState@12 -@ExiAcquireFastMutex@4=@ExAcquireFastMutex@4 @ExAcquireFastMutexUnsafe@4 +ExAcquireResourceExclusiveLite@8 +ExAcquireResourceSharedLite@8 ExAcquireRundownProtection=@ExfAcquireRundownProtection@4 ExAcquireRundownProtectionCacheAware=@ExfAcquireRundownProtectionCacheAware@4 ExAcquireRundownProtectionCacheAwareEx=@ExfAcquireRundownProtectionCacheAwareEx@8 ExAcquireRundownProtectionEx=@ExfAcquireRundownProtectionEx@8 -ExInitializeRundownProtection=@ExfInitializeRundownProtection@4 -ExReInitializeRundownProtection=@ExfReInitializeRundownProtection@4 -ExReInitializeRundownProtectionCacheAware=@ExfReInitializeRundownProtectionCacheAware@4 -ExReleaseRundownProtection=@ExfReleaseRundownProtection@4 -ExReleaseRundownProtectionCacheAware=@ExfReleaseRundownProtectionCacheAware@4 -ExReleaseRundownProtectionCacheAwareEx=@ExfReleaseRundownProtectionCacheAwareEx@8 -ExReleaseRundownProtectionEx=@ExfReleaseRundownProtectionEx@8 -ExRundownCompleted=@ExfRundownCompleted@4 -ExRundownCompletedCacheAware=@ExfRundownCompletedCacheAware@4 -ExWaitForRundownProtectionRelease=@ExfWaitForRundownProtectionRelease@4 -ExWaitForRundownProtectionReleaseCacheAware=@ExfWaitForRundownProtectionReleaseCacheAware@4 -ExAllocateCacheAwareRundownProtection@8 -ExFreeCacheAwareRundownProtection@4 -ExInitializeRundownProtectionCacheAware@8 -ExSizeOfRundownProtectionCacheAware@0 -ExAcquireResourceExclusiveLite@8 -ExAcquireResourceSharedLite@8 ExAcquireSharedStarveExclusive@8 ExAcquireSharedWaitForExclusive@8 +ExAllocateCacheAwareRundownProtection@8 ExAllocateFromPagedLookasideList@4=ExiAllocateFromPagedLookasideList@4 ExAllocatePool@8 ExAllocatePoolWithQuota@8 @@ -95,10 +81,14 @@ ExDeleteResourceLite@4 ExDesktopObjectType ExDisableResourceBoostLite@4 +@ExEnterCriticalRegionAndAcquireFastMutexUnsafe@4 +;ExEnterCriticalRegionAndAcquireResourceExclusive +;ExEnterCriticalRegionAndAcquireResourceShared +;ExEnterCriticalRegionAndAcquireSharedWaitForExclusive ExEnumHandleTable@16 -@ExEnterCriticalRegionAndAcquireFastMutexUnsafe@4 ExEventObjectType=_ExEventObjectType ExExtendZone@12 +ExFreeCacheAwareRundownProtection@4 ExFreePool@4 ExFreePoolWithTag@8 ExFreeToPagedLookasideList@8=ExiFreeToPagedLookasideList@8 @@ -110,6 +100,8 @@ ExInitializeNPagedLookasideList@28 ExInitializePagedLookasideList@28 ExInitializeResourceLite@4 +ExInitializeRundownProtection=@ExfInitializeRundownProtection@4 +ExInitializeRundownProtectionCacheAware@8 ExInitializeZone@16 ExInterlockedAddLargeInteger@16 @ExInterlockedAddLargeStatistic@8 @@ -118,8 +110,8 @@ ExInterlockedDecrementLong@8 ExInterlockedExchangeUlong@12 ExInterlockedExtendZone@16 +@ExInterlockedFlushSList@4 ExInterlockedIncrementLong@8 -@ExInterlockedFlushSList@4 ExInterlockedInsertHeadList@12 ExInterlockedInsertTailList@12 ExInterlockedPopEntryList@8 @@ -139,37 +131,56 @@ ExRaiseException@4=RtlRaiseException@4 ExRaiseHardError@24 ExRaiseStatus@4=RtlRaiseStatus@4 +ExReInitializeRundownProtection=@ExfReInitializeRundownProtection@4 +ExReInitializeRundownProtectionCacheAware=@ExfReInitializeRundownProtectionCacheAware@4 ExRegisterCallback@12 ExReinitializeResourceLite@4 -@ExiReleaseFastMutex@4=@ExReleaseFastMutex@4 @ExReleaseFastMutexUnsafe@4 @ExReleaseFastMutexUnsafeAndLeaveCriticalRegion@4 +;ExReleaseResourceAndLeaveCriticalRegion ExReleaseResourceForThreadLite@8 @ExReleaseResourceLite@4 +ExReleaseRundownProtection=@ExfReleaseRundownProtection@4 +ExReleaseRundownProtectionCacheAware=@ExfReleaseRundownProtectionCacheAware@4 +ExReleaseRundownProtectionCacheAwareEx=@ExfReleaseRundownProtectionCacheAwareEx@8 +ExReleaseRundownProtectionEx=@ExfReleaseRundownProtectionEx@8 +ExRundownCompleted=@ExfRundownCompleted@4 +ExRundownCompletedCacheAware=@ExfRundownCompletedCacheAware@4 ExSemaphoreObjectType=_ExSemaphoreObjectType ExSetResourceOwnerPointer@8 ExSetTimerResolution@8 +ExSizeOfRundownProtectionCacheAware@0 ExSystemExceptionFilter@0 ExSystemTimeToLocalTime@8 -@ExiTryToAcquireFastMutex@4=@ExTryToAcquireFastMutex@4 -ExTryToAcquireResourceExclusiveLite@4 ExUnregisterCallback@4 ExUuidCreate@4 ExVerifySuite@4 +ExWaitForRundownProtectionRelease=@ExfWaitForRundownProtectionRelease@4 +ExWaitForRundownProtectionReleaseCacheAware=@ExfWaitForRundownProtectionReleaseCacheAware@4 ExWindowStationObjectType DATA +;ExfAcquirePushLockExclusive +;ExfAcquirePushLockShared @ExfInterlockedAddUlong@12 +@ExfInterlockedCompareExchange64@12 @ExfInterlockedInsertHeadList@12 @ExfInterlockedInsertTailList@12 -@ExfInterlockedCompareExchange64@12 @ExfInterlockedPopEntryList@8 @ExfInterlockedPushEntryList@12 @ExfInterlockedRemoveHeadList@8 +;ExfReleasePushLock +;ExfReleasePushLockExclusive +;ExfReleasePushLockShared +;ExfTryToWakePushLock +;ExfUnblockPushLock @Exfi386InterlockedDecrementLong@4 @Exfi386InterlockedExchangeUlong@8 @Exfi386InterlockedIncrementLong@4 Exi386InterlockedDecrementLong@4 Exi386InterlockedExchangeUlong@12 Exi386InterlockedIncrementLong@4 +@ExiAcquireFastMutex@4=@ExAcquireFastMutex@4 +@ExiReleaseFastMutex@4=@ExReleaseFastMutex@4 +@ExiTryToAcquireFastMutex@4=@ExTryToAcquireFastMutex@4 FsRtlAcquireFileExclusive ;FsRtlAddBaseMcbEntry FsRtlAddLargeMcbEntry @@ -209,8 +220,8 @@ FsRtlGetNextFileLock FsRtlGetNextLargeMcbEntry FsRtlGetNextMcbEntry +FsRtlIncrementCcFastReadNoWait FsRtlIncrementCcFastReadNotPossible -FsRtlIncrementCcFastReadNoWait FsRtlIncrementCcFastReadResourceMiss FsRtlIncrementCcFastReadWait ;FsRtlInitializeBaseMcb @@ -290,8 +301,9 @@ FsRtlUninitializeMcb FsRtlUninitializeOplock HalDispatchTable=_HalDispatchTable +@HalExamineMBR@16 HalPrivateDispatchTable DATA -@HalExamineMBR@16 +;HeadlessDispatch InbvAcquireDisplayOwnership@0 InbvCheckDisplayOwnership@0 InbvDisplayString@4 @@ -310,18 +322,18 @@ @InterlockedExchange@8 @InterlockedExchangeAdd@8 @InterlockedIncrement@4 +@InterlockedPopEntrySList@4 @InterlockedPushEntrySList@8 -@InterlockedPopEntrySList@4 IoAcquireCancelSpinLock@4 IoAcquireRemoveLockEx@20 IoAcquireVpbSpinLock@4 IoAdapterObjectType DATA IoAllocateAdapterChannel@20 -IoAllocateIrp@8 -IoAllocateMdl@20 IoAllocateController@16 IoAllocateDriverObjectExtension@16 IoAllocateErrorLogEntry@8 +IoAllocateIrp@8 +IoAllocateMdl@20 IoAllocateWorkItem@4 @IoAssignDriveLetters@16 IoAssignResources@24 @@ -376,6 +388,7 @@ IoDriverObjectType DATA IoEnqueueIrp@4 IoEnumerateDeviceObjectList@16 +;IoEnumerateRegisteredFiltersList IoFastQueryNetworkAttributes@20 IoFileObjectType=_IoFileObjectType IoForwardAndCatchIrp@8=IoForwardIrpSynchronously@8 @@ -391,18 +404,19 @@ IoGetBootDiskInformation@8 IoGetConfigurationInformation@0 IoGetCurrentProcess@0 -IoGetDeviceObjectPointer@16 IoGetDeviceAttachmentBaseRef@4 IoGetDeviceInterfaceAlias@12 IoGetDeviceInterfaces@16 -IoGetDriverObjectExtension@8 +IoGetDeviceObjectPointer@16 IoGetDeviceProperty@20 IoGetDeviceToVerify@4 IoGetDiskDeviceObject@8 IoGetDmaAdapter@12 +IoGetDriverObjectExtension@8 IoGetFileObjectGenericMapping@0 IoGetInitialStack@0 IoGetLowerDeviceObject@4 +;IoGetPagingIoPriority IoGetRelatedDeviceObject@4 IoGetRequestorProcess@4 IoGetRequestorProcessId@4 @@ -410,14 +424,15 @@ IoGetStackLimits@8 IoGetTopLevelIrp@0 IoInitializeIrp@12 +IoInitializeRemoveLockEx@20 +IoInitializeTimer@12 IoInvalidateDeviceRelations@8 IoInvalidateDeviceState@4 -IoInitializeRemoveLockEx@20 -IoInitializeTimer@12 IoIsFileOriginRemote@4 +IoIsOperationSynchronous@4 IoIsSystemThread@4 IoIsValidNameGraftingBuffer@8 -IoIsOperationSynchronous@4 +IoIsWdmVersionAvailable@8 IoMakeAssociatedIrp@8 IoOpenDeviceInterfaceRegistryKey@12 IoOpenDeviceRegistryKey@16 @@ -451,14 +466,13 @@ IoRemoveShareAccess@8 IoReportDetectedDevice@32 IoReportHalResourceUsage@16 +IoReportResourceForDetection@28 IoReportResourceUsage@36 -IoReportResourceForDetection@28 IoReportTargetDeviceChange@8 IoReportTargetDeviceChangeAsynchronous@16 IoRequestDeviceEject@4 IoReuseIrp@8 IoSetCompletionRoutineEx@28 -IoSetSystemPartition@4 IoSetDeviceInterfaceState@8 IoSetDeviceToVerify@8 IoSetFileOrigin@8 @@ -467,8 +481,9 @@ IoSetIoCompletion@24 @IoSetPartitionInformation@16 IoSetPartitionInformationEx@12 +IoSetShareAccess@16 IoSetStartIoAttributes@12 -IoSetShareAccess@16 +IoSetSystemPartition@4 IoSetThreadHardErrorMode@4 IoSetTopLevelIrp@4 IoStartNextPacket@8 @@ -477,9 +492,10 @@ IoStartTimer@4 IoStatisticsLock DATA IoStopTimer@4 +IoSynchronousInvalidateDeviceRelations@8 IoSynchronousPageWrite@20 -IoSynchronousInvalidateDeviceRelations@8 IoThreadToProcess@4 +;IoTranslateBusAddress IoUnregisterFileSystem@4 IoUnregisterFsRegistrationChange@8 IoUnregisterPlugPlayNotification@4 @@ -511,7 +527,6 @@ IoWriteTransferCount DATA @IofCallDriver@8 @IofCompleteRequest@8 -IoIsWdmVersionAvailable@8 KdChangeOption@24 KdDebuggerEnabled=_KdDebuggerEnabled KdDebuggerNotPresent=_KdDebuggerNotPresent @@ -520,27 +535,33 @@ KdEnteredDebugger KdPollBreakIn@0 KdPowerTransition@4 +;KdRefreshDebuggerNotPresent KdSystemDebugControl@28 Ke386CallBios@8 +;Ke386IoSetAccessProcess +;Ke386QueryIoAccessMap +;Ke386SetIoAccessMap @KeAcquireGuardedMutex@4 @KeAcquireGuardedMutexUnsafe@4 +@KeAcquireInStackQueuedSpinLockAtDpcLevel@8 +;KeAcquireInStackQueuedSpinLockForDpc +KeAcquireInterruptSpinLock@4 KeAcquireSpinLockAtDpcLevel@4 -@KeAcquireInStackQueuedSpinLockAtDpcLevel@8 -KeAcquireInterruptSpinLock@4 +;KeAcquireSpinLockForDpc KeAddSystemServiceTable@20 +;KeAreAllApcsDisabled KeAreApcsDisabled@0 KeAttachProcess@4 -;KeBoostCurrentThread KeBugCheck@4 KeBugCheckEx@20 KeCancelTimer@4 KeCapturePersistentThreadState@28 KeClearEvent@4 KeConnectInterrupt@4 -KeDcacheFlushCount DATA KeDelayExecutionThread@12 KeDeregisterBugCheckCallback@4 KeDeregisterBugCheckReasonCallback@4 +;KeDeregisterNmiCallback KeDetachProcess@0 KeDisconnectInterrupt@4 KeEnterCriticalRegion@0=_KeEnterCriticalRegion@0 @@ -550,6 +571,7 @@ KeFindConfigurationNextEntry@20 KeFlushEntireTb@8 KeFlushQueuedDpcs@0 +;KeGenericCallDpc KeGetCurrentThread@0 KeGetPreviousMode@0 KeGetRecommendedSharedDataAlignment@0 @@ -563,8 +585,8 @@ KeI386ReleaseGdtSelectors@8 ;KeI386ReleaseLid ;KeI386SetGdtSelector -KeIcacheFlushCount DATA KeInitializeApc@32 +;KeInitializeCrashDumpHeader KeInitializeDeviceQueue@4 KeInitializeDpc@12 KeInitializeEvent@12 @@ -575,6 +597,7 @@ KeInitializeQueue@8 KeInitializeSemaphore@12 KeInitializeSpinLock@4 +;KeInitializeThreadedDpc KeInitializeTimer@4 KeInitializeTimerEx@8 KeInsertByKeyDeviceQueue@12 @@ -583,8 +606,11 @@ KeInsertQueue@8 KeInsertQueueApc@16 KeInsertQueueDpc@12 +;KeInvalidateAllCaches +;KeIpiGenericCall KeIsAttachedProcess@0 KeIsExecutingDpc@0 +;KeIsWaitListEmpty KeLeaveCriticalRegion@0=_KeLeaveCriticalRegion@0 KeLeaveGuardedRegion@0=_KeLeaveGuardedRegion@0 KeLoaderBlock DATA @@ -608,13 +634,16 @@ KeReadStateTimer@4 KeRegisterBugCheckCallback@20 KeRegisterBugCheckReasonCallback@16 +;KeRegisterNmiCallback +@KeReleaseGuardedMutex@4 @KeReleaseGuardedMutexUnsafe@4 -@KeReleaseGuardedMutex@4 +;KeReleaseInStackQueuedSpinLockForDpc @KeReleaseInStackQueuedSpinLockFromDpcLevel@4 KeReleaseInterruptSpinLock@8 KeReleaseMutant@16 KeReleaseMutex@8 KeReleaseSemaphore@16 +;KeReleaseSpinLockForDpc KeReleaseSpinLockFromDpcLevel@4 KeRemoveByKeyDeviceQueue@8 KeRemoveByKeyDeviceQueueIfBusy@8 @@ -641,20 +670,22 @@ KeSetPriorityThread@8 KeSetProfileIrql@4 KeSetSystemAffinityThread@4 -;KeSetSwapContextNotifyRoutine KeSetTargetProcessorDpc@8 -;KeSetThreadSelectNotifyRoutine KeSetTimeIncrement@8 KeSetTimer@16 KeSetTimerEx@20 +;KeSignalCallDpcDone +;KeSignalCallDpcSynchronize KeStackAttachProcess@8 KeSynchronizeExecution@12 KeTerminateThread@4 +;KeTestSpinLock KeTickCount DATA @KeTryToAcquireGuardedMutex@4 +;KeTryToAcquireSpinLockAtDpcLevel +KeUnstackDetachProcess@4 KeUpdateRunTime@4 KeUpdateSystemTime@0 -KeUnstackDetachProcess@4 KeUserModeCallback@20 KeWaitForMultipleObjects@32 KeWaitForMutexObject@20=KeWaitForSingleObject@20 @@ -664,8 +695,8 @@ Kei386EoiHelper@0 @KiAcquireSpinLock@4 ;KiBugCheckData DATA +KiCheckForKernelApcDelivery@0 KiCoprocessorError@0 -KiCheckForKernelApcDelivery@0 KiDeliverApc@12 KiDispatchInterrupt@0 KiEnableTimerWatchdog @@ -673,7 +704,6 @@ @KiReleaseSpinLock@4 KiUnexpectedInterrupt ;Kii386SpinOnSpinLock -KiRawTicks DATA LdrAccessResource@16 LdrEnumResources@20 LdrFindResourceDirectory_U@16 @@ -697,11 +727,13 @@ MmAllocateMappingAddress@8 MmAllocateNonCachedMemory@4 MmAllocatePagesForMdl@28 +;MmAllocatePagesForMdlEx MmBuildMdlForNonPagedPool@4 MmCanFileBeTruncated@8 +;MmCommitSessionMappedView MmCreateMdl@12 +;MmCreateMirror MmCreateSection@32 -MmDbgTranslatePhysicalAddress@8 MmDisableModifiedWriteOfSection@4 MmFlushImageSection@8 MmForceSectionClosed@8 @@ -718,6 +750,7 @@ MmHighestUserAddress DATA MmIsAddressValid@4 MmIsDriverVerifying@4 +;MmIsIoSpaceActive MmIsNonPagedSystemAddressValid@4 MmIsRecursiveIoFault@0 MmIsThisAnNtAsSystem@0 @@ -780,10 +813,9 @@ NtClose@4 NtConnectPort@32 NtCreateEvent@20 -NtCreateTimer@16 -NtOpenEvent@12 NtCreateFile@44 NtCreateSection@28 +NtCreateTimer@16 NtDeleteAtom@4 NtDeleteFile@4 NtDeviceIoControlFile@40 @@ -797,6 +829,7 @@ NtMakePermanentObject@4 NtMapViewOfSection@40 NtNotifyChangeDirectoryFile@36 +NtOpenEvent@12 NtOpenFile@24 NtOpenProcess@16 NtOpenProcessToken@12 @@ -814,7 +847,6 @@ NtQueryQuotaInformationFile@36 NtQuerySecurityObject@20 NtQuerySystemInformation@16 -NtQuerySystemTime@4 NtQueryVolumeInformationFile@20 NtReadFile@36 NtRequestPort@8 @@ -827,29 +859,23 @@ NtSetQuotaInformationFile@16 NtSetSecurityObject@12 NtSetVolumeInformationFile@20 -NtSetSystemTime@8 NtShutdownSystem@4 NtTraceEvent@16 NtUnlockFile@20 NtVdmControl@8 -NtW32Call@20 NtWaitForSingleObject@12 NtWriteFile@36 - -; -; Object Manager ObAssignSecurity@16 ObCheckCreateObjectAccess@28 ObCheckObjectAccess@20 ObCloseHandle@8 ObCreateObject@36 ObCreateObjectType@16 +;ObDeleteCapturedInsertInfo ObDereferenceObject@4 ObDereferenceObjectDeferDelete@4 ObDereferenceSecurityDescriptor@8 -@ObfDereferenceObject@4 ObFindHandleForObject@20 -@ObfReferenceObject@4 ObGetObjectSecurity@12 ObInsertObject@24 ObIsKernelHandle@4 @@ -867,22 +893,25 @@ ;ObSetHandleAttributes@12 ;ObSetSecurityDescriptorInfo@24 ;ObSetSecurityObjectByPointer@12 - -; -; -; +@ObfDereferenceObject@4 +@ObfReferenceObject@4 ;PfxFindPrefix ;PfxInitialize ;PfxInsertPrefix ;PfxRemovePrefix PoCallDriver@8 +;PoCancelDeviceNotify PoQueueShutdownWorkItem@4 PoRegisterDeviceForIdleDetection@16 +;PoRegisterDeviceNotify PoRegisterSystemState@8 PoRequestPowerIrp@24 +;PoRequestShutdownEvent +;PoSetHiberRange PoSetDeviceBusy@4 PoSetPowerState@12 PoSetSystemState@4 +;PoShutdownBugCheck PoStartNextPowerIrp@4 PoUnregisterSystemState@4 ProbeForRead@12 @@ -901,14 +930,18 @@ PsGetContextThread@12 PsGetCurrentProcess@0=IoGetCurrentProcess@0 PsGetCurrentProcessId@0 +PsGetCurrentProcessSessionId@0 PsGetCurrentProcessWin32Process@0 -PsGetCurrentProcessSessionId@0 PsGetCurrentThread@0=KeGetCurrentThread@0 PsGetCurrentThreadId@0 PsGetCurrentThreadPreviousMode@0 -PsGetCurrentThreadWin32Thread@0 +;PsGetCurrentThreadProcess +;PsGetCurrentThreadProcessId PsGetCurrentThreadStackBase@0 PsGetCurrentThreadStackLimit@0 +;PsGetCurrentThreadTeb +PsGetCurrentThreadWin32Thread@0 +;PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion PsGetJobLock@4 PsGetJobSessionId@4 PsGetJobUIRestrictionsClass@4 @@ -926,6 +959,7 @@ PsGetProcessSectionBaseAddress@4 PsGetProcessSecurityPort@4 PsGetProcessSessionId@4 +;PsGetProcessSessionIdEx PsGetProcessWin32Process@4 PsGetProcessWin32WindowStation@4 PsGetThreadFreezeCount@4 @@ -940,6 +974,7 @@ PsImpersonateClient@20 PsInitialSystemProcess DATA PsIsProcessBeingDebugged@4 +;PsIsSystempProcess PsIsSystemThread@4 PsIsThreadImpersonating@4 PsIsThreadTerminating@4 @@ -956,36 +991,38 @@ PsReturnPoolQuota@12 PsReturnProcessNonPagedPoolQuota@8 PsReturnProcessPagedPoolQuota@8 +PsRevertThreadToSelf@4 PsRevertToSelf@0 -PsRevertThreadToSelf@4 PsSetContextThread@12 PsSetCreateProcessNotifyRoutine@8 PsSetCreateThreadNotifyRoutine@4 PsSetJobUIRestrictionsClass@8 PsSetLegoNotifyRoutine@4 +PsSetLoadImageNotifyRoutine@4 +PsSetProcessPriorityByClass@8 PsSetProcessPriorityClass@8 -PsSetProcessPriorityByClass@8 PsSetProcessSecurityPort@8 PsSetProcessWin32Process@8 PsSetProcessWindowStation@8 PsSetThreadHardErrorsAreDisabled@8 PsSetThreadWin32Thread@8 -PsSetLoadImageNotifyRoutine@4 PsTerminateSystemThread@4 PsThreadType=_PsThreadType +;PsWrapApcWow64Thread +READ_REGISTER_BUFFER_UCHAR@12 +READ_REGISTER_BUFFER_ULONG@12 +READ_REGISTER_BUFFER_USHORT@12 READ_REGISTER_UCHAR@4 READ_REGISTER_ULONG@4 READ_REGISTER_USHORT@4 -READ_REGISTER_BUFFER_UCHAR@12 -READ_REGISTER_BUFFER_ULONG@12 -READ_REGISTER_BUFFER_USHORT@12 KeRosDumpStackFrames@8 RtlAbsoluteToSelfRelativeSD@12 RtlAddAccessAllowedAce@16 +;RtlAddAccessAllowedAceEx RtlAddAce@20 RtlAddAtomToAtomTable@12 RtlAddRange@36 -;RtlAllocateAndInitializeSid +RtlAllocateAndInitializeSid@44 RtlAllocateHeap@12 RtlAnsiCharToUnicodeChar@4 RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4 @@ -1044,7 +1081,6 @@ RtlDestroyAtomTable@4 RtlDestroyHeap@4 RtlDowncaseUnicodeString@12 -RtlDuplicateUnicodeString@12 RtlEmptyAtomTable@8 RtlEnlargedIntegerMultiply@8 RtlEnlargedUnsignedDivide@16 @@ -1067,11 +1103,9 @@ RtlFindClearBitsAndSet@12 RtlFindClearRuns@16 RtlFindFirstRunClear@8 -RtlFindFirstRunSet@8 RtlFindLastBackwardRunClear@12 RtlFindLeastSignificantBit@8 RtlFindLongestRunClear@8 -RtlFindLongestRunSet@8 RtlFindMessage@20 RtlFindMostSignificantBit@8 RtlFindNextForwardRunClear@12 @@ -1082,8 +1116,8 @@ RtlFormatCurrentUserKeyPath@4 RtlFreeAnsiString@4 RtlFreeHeap@12 +RtlFreeOemString@4 RtlFreeRangeList@4 -RtlFreeOemString@4 RtlFreeUnicodeString@4 RtlGUIDFromString@8 RtlGenerate8dot3Name@16 @@ -1103,12 +1137,14 @@ RtlGetSetBootStatusData@24 RtlGetVersion@4 RtlHashUnicodeString@16 +RtlImageDirectoryEntryToData@16 RtlImageNtHeader@4 -RtlImageDirectoryEntryToData@16 RtlInitAnsiString@8 +;RtlInitAnsiStringEx RtlInitCodePageTable@8 RtlInitString@8 RtlInitUnicodeString@8 +;RtlInitUnicodeStringEx RtlInitializeBitMap@12 RtlInitializeGenericTable@20 RtlInitializeGenericTableAvl@20 @@ -1195,8 +1231,8 @@ RtlReserveChunk@20 RtlSecondsSince1970ToTime@8 RtlSecondsSince1980ToTime@8 +RtlSelfRelativeToAbsoluteSD@44 RtlSelfRelativeToAbsoluteSD2@8 -RtlSelfRelativeToAbsoluteSD@44 RtlSetAllBits@4 RtlSetBit@8 RtlSetBits@12 @@ -1218,6 +1254,14 @@ RtlTimeToSecondsSince1970@8 RtlTimeToSecondsSince1980@8 RtlTimeToTimeFields@8 +;RtlTraceDatabaseAdd +;RtlTraceDatabaseCreate +;RtlTraceDatabaseDestroy +;RtlTraceDatabaseEnumerate +;RtlTraceDatabaseFind +;RtlTraceDatabaseLock +;RtlTraceDatabaseUnlock +;RtlTraceDatabaseValidate @RtlUlongByteSwap@4 @RtlUlonglongByteSwap@8 RtlUnicodeStringToAnsiSize@4=RtlxUnicodeStringToAnsiSize@4 @@ -1295,6 +1339,7 @@ SeReleaseSecurityDescriptor@12 SeReleaseSubjectContext@4 SeSetAccessStateGenericMapping@8 +;SeSetAuditParameter SeSetSecurityDescriptorInfo@24 SeSetSecurityDescriptorInfoEx@28 SeSinglePrivilegeCheck@12 @@ -1308,14 +1353,30 @@ SeUnregisterLogonSessionTerminatedRoutine@4 SeValidSecurityDescriptor@8 VerSetConditionMask@16 +;VfFailDeviceNode +;VfFailDriver +;VfFailSystemBIOS +;VfIsVerificationEnabled +WRITE_REGISTER_BUFFER_UCHAR@12 +WRITE_REGISTER_BUFFER_ULONG@12 +WRITE_REGISTER_BUFFER_USHORT@12 WRITE_REGISTER_UCHAR@8 WRITE_REGISTER_ULONG@8 WRITE_REGISTER_USHORT@8 -WRITE_REGISTER_BUFFER_UCHAR@12 -WRITE_REGISTER_BUFFER_ULONG@12 -WRITE_REGISTER_BUFFER_USHORT@12 +;WmiFlushTrace +;WmiGetClock +;WmiQueryTrace +;WmiQueryTraceInformation +;WmiStartTrace +;WmiStopTrace +;WmiTraceFastEvent +;WmiTraceMessage +;WmiTraceMessageVa +;WmiUpdateTrace +;XIPDispatch ZwAccessCheckAndAuditAlarm@44 ZwAddBootEntry@8 +ZwAddDriverEntry@8 ZwAdjustPrivilegesToken@24 ZwAlertThread@4 ZwAllocateVirtualMemory@24 @@ -1334,6 +1395,8 @@ ZwCreateSection@28 ZwCreateSymbolicLinkObject@16 ZwCreateTimer@16 +ZwDeleteBootEntry@4 +ZwDeleteDriverEntry@4 ZwDeleteFile@4 ZwDeleteKey@4 ZwDeleteValueKey@8 @@ -1342,6 +1405,7 @@ ZwDuplicateObject@28 ZwDuplicateToken@24 ZwEnumerateBootEntries@8 +ZwEnumerateDriverEntries@8 ZwEnumerateKey@24 ZwEnumerateValueKey@24 ZwFlushInstructionCache@12 @@ -1355,6 +1419,8 @@ ZwLoadKey@8 ZwMakeTemporaryObject@4 ZwMapViewOfSection@40 +ZwModifyBootEntry@4 +ZwModifyDriverEntry@4 ZwNotifyChangeKey@40 ZwOpenDirectoryObject@12 ZwOpenEvent@12 @@ -1378,6 +1444,7 @@ ZwQueryDefaultUILanguage@4 ZwQueryDirectoryFile@44 ZwQueryDirectoryObject@28 +ZwQueryDriverEntryOrder@8 ZwQueryEaFile@36 ZwQueryFullAttributesFile@8 ZwQueryInformationAtom@20 @@ -1393,7 +1460,6 @@ ZwQuerySecurityObject@20 ZwQuerySymbolicLinkObject@12 ZwQuerySystemInformation@16 -ZwQuerySystemTime@4 ZwQueryValueKey@24 ZwQueryVolumeInformationFile@20 ZwReadFile@36 @@ -1403,10 +1469,12 @@ ZwRestoreKey@12 ZwSaveKey@8 ZwSaveKeyEx@12 +ZwSecureConnectPort@36 ZwSetBootEntryOrder@8 ZwSetBootOptions@8 ZwSetDefaultLocale@8 ZwSetDefaultUILanguage@4 +ZwSetDriverEntryOrder@8 ZwSetEaFile@16 ZwSetEvent@8 ZwSetInformationFile@20 @@ -1430,14 +1498,17 @@ ZwWaitForSingleObject@12 ZwWriteFile@36 ZwYieldExecution@0 +;_CIcos +;_CIsin +;_CIsqrt _abnormal_termination _alldiv +_alldvrm _allmul _alloca_probe _allrem _allshl _allshr -_alldvrm _aulldiv _aulldvrm _aullrem

1 0

[fireball] 33758: Stefan Ginsberg <stefan__100__@hotmail.com> - Remove usage of unexported RtlDuplicateUnicodeString in green.sys driver (this is basically the same fix which Herve applied to blue.sys).
by fireball＠svn.reactos.org 29 May '08

29 May '08

Author: fireball Date: Thu May 29 11:00:20 2008 New Revision: 33758 URL: http://svn.reactos.org/svn/reactos?rev=33758&view=rev Log: Stefan Ginsberg <stefan__100__(a)hotmail.com> - Remove usage of unexported RtlDuplicateUnicodeString in green.sys driver (this is basically the same fix which Herve applied to blue.sys). Modified: trunk/rosapps/drivers/green/green.c trunk/rosapps/drivers/green/green.h trunk/rosapps/drivers/green/pnp.c Modified: trunk/rosapps/drivers/green/green.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/green.c?rev=… ============================================================================== --- trunk/rosapps/drivers/green/green.c [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/green.c [iso-8859-1] Thu May 29 11:00:20 2008 @@ -41,13 +41,13 @@ } RtlZeroMemory(DriverExtension, sizeof(GREEN_DRIVER_EXTENSION)); - Status = RtlDuplicateUnicodeString( + Status = GreenDuplicateUnicodeString( 0, RegistryPath, &DriverExtension->RegistryPath); if (!NT_SUCCESS(Status)) { - DPRINT("RtlDuplicateUnicodeString() failed with status 0x%08lx\n", Status); + DPRINT("GreenDuplicateUnicodeString() failed with status 0x%08lx\n", Status); return Status; } @@ -66,3 +66,48 @@ return STATUS_SUCCESS; } + +NTSTATUS +GreenDuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString) +{ + if (SourceString == NULL || DestinationString == NULL + || SourceString->Length > SourceString->MaximumLength + || (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) + || Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + + if ((SourceString->Length == 0) + && (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + USHORT DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} Modified: trunk/rosapps/drivers/green/green.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/green.h?rev=… ============================================================================== --- trunk/rosapps/drivers/green/green.h [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/green.h [iso-8859-1] Thu May 29 11:00:20 2008 @@ -9,15 +9,8 @@ #include <wincon.h> #include <drivers/blue/ntddblue.h> -NTSYSAPI -NTSTATUS -NTAPI -RtlDuplicateUnicodeString( - IN ULONG Flags, - IN PCUNICODE_STRING SourceString, - OUT PUNICODE_STRING DestinationString -); #define RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE 1 +#define RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING 2 #define INFINITE -1 #define KEYBOARD_BUFFER_SIZE 100 @@ -190,3 +183,11 @@ ScreenDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +/************************************ green.c */ + +NTSTATUS +GreenDuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString); Modified: trunk/rosapps/drivers/green/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/pnp.c?rev=33… ============================================================================== --- trunk/rosapps/drivers/green/pnp.c [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/pnp.c [iso-8859-1] Thu May 29 11:00:20 2008 @@ -343,7 +343,7 @@ { UNICODE_STRING SourceU, String; RtlInitUnicodeString(&SourceU, Source); - Status = RtlDuplicateUnicodeString( + Status = GreenDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &SourceU, &String); @@ -377,7 +377,7 @@ if (SourceU.Length) { UNICODE_STRING String; - Status = RtlDuplicateUnicodeString( + Status = GreenDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &SourceU, &String); @@ -560,3 +560,4 @@ return Status; } +

1 0

[jimtabor] 33757: Update NtUserBitBltSysBmp.
by jimtabor＠svn.reactos.org 29 May '08

29 May '08

Author: jimtabor Date: Thu May 29 10:32:05 2008 New Revision: 33757 URL: http://svn.reactos.org/svn/reactos?rev=33757&view=rev Log: Update NtUserBitBltSysBmp. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c 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 May 29 10:32:05 2008 @@ -493,17 +493,17 @@ HDC NTAPI NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs); -DWORD +BOOL NTAPI NtUserBitBltSysBmp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7); + HDC hdc, + INT nXDest, + INT nYDest, + INT nWidth, + INT nHeight, + INT nXSrc, + INT nYSrc, + DWORD dwRop ); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu May 29 10:32:05 2008 @@ -36,21 +36,39 @@ return 0; } -DWORD -STDCALL +// +// Works like BitBlt, http://msdn.microsoft.com/en-us/library/ms532278(VS.85).aspx +// +BOOL +NTAPI NtUserBitBltSysBmp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7) -{ - UNIMPLEMENTED - - return 0; + HDC hdc, + INT nXDest, + INT nYDest, + INT nWidth, + INT nHeight, + INT nXSrc, + INT nYSrc, + DWORD dwRop ) +{ + BOOL Ret = FALSE; + UserEnterExclusive(); + UNIMPLEMENTED +#if 0 + Ret = NtGdiBitBlt( hdc, + nXDest, + nYDest, + nWidth, + nHeight, + hSystemBM, + nXSrc, + nYSrc, + dwRop, + 0, + 0); +#endif + UserLeave(); + return Ret; } DWORD

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