Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[tkreuzer] 42240: Hey Arch, thanks for breaking other architectures...
by tkreuzer＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: tkreuzer Date: Sun Jul 26 23:46:21 2009 New Revision: 42240 URL: http://svn.reactos.org/svn/reactos?rev=42240&view=rev Log: Hey Arch, thanks for breaking other architectures... Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Jul 26 23:46:21 2009 @@ -5737,6 +5737,7 @@ #else +FORCEINLINE VOID NTAPI KeInitializeSpinLock(

1 0

[tkreuzer] 42239: Add -Wno-format to dmusic
by tkreuzer＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: tkreuzer Date: Sun Jul 26 22:35:05 2009 New Revision: 42239 URL: http://svn.reactos.org/svn/reactos?rev=42239&view=rev Log: Add -Wno-format to dmusic Modified: branches/ros-amd64-bringup/reactos/dll/directx/dmusic/dmusic.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/directx/dmusic/dmusic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/dmusic/dmusic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/dmusic/dmusic.rbuild [iso-8859-1] Sun Jul 26 22:35:05 2009 @@ -5,6 +5,7 @@ <importlibrary definition="dmusic.spec" /> <redefine name="_WIN32_WINNT">0x600</redefine> <define name="__WINESRC__" /> + <compilerflag>-Wno-format</compilerflag> <include base="dmusic">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library>

1 0

[tkreuzer] 42238: Fix some 64 bit isuues.
by tkreuzer＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: tkreuzer Date: Sun Jul 26 22:31:23 2009 New Revision: 42238 URL: http://svn.reactos.org/svn/reactos?rev=42238&view=rev Log: Fix some 64 bit isuues. Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Sun Jul 26 22:31:23 2009 @@ -155,7 +155,7 @@ hwnd, pEP->idObject, pEP->idChild, - (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, + (DWORD_PTR)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD)EngGetTickCount(), pEH->Proc); return Result; @@ -185,14 +185,14 @@ if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL)) { // if all process || all thread || other thread same process if (!(pEH->idProcess) || !(pEH->idThread) || - (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess)) + (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)(DWORD_PTR)pEH->idProcess)) { Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild); } }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && ( ((pEH->idProcess && - NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess) && + NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)(DWORD_PTR)pEH->idProcess) && !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !pEH->idProcess ) ) { Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sun Jul 26 22:31:23 2009 @@ -1082,7 +1082,7 @@ Mod = NULL; Global = FALSE; - if (!NT_SUCCESS(PsLookupThreadByThreadId((HANDLE) ThreadId, &Thread))) + if (!NT_SUCCESS(PsLookupThreadByThreadId((HANDLE)(DWORD_PTR) ThreadId, &Thread))) { DPRINT1("Invalid thread id 0x%x\n", ThreadId); SetLastWin32Error(ERROR_INVALID_PARAMETER); Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jul 26 22:31:23 2009 @@ -978,7 +978,7 @@ PWINDOW_OBJECT Window; PMSGMEMORY MsgMemoryEntry; PVOID UserMem; - UINT Size; + SIZE_T Size; USER_MESSAGE Msg; DECLARE_RETURN(BOOL); @@ -1021,18 +1021,18 @@ Info.LParamSize = Size; UserMem = NULL; Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0, - &Info.LParamSize, MEM_COMMIT, PAGE_READWRITE); + &Size, MEM_COMMIT, PAGE_READWRITE); if (! NT_SUCCESS(Status)) { SetLastNtError(Status); RETURN( (BOOL) -1); } /* Transfer lParam data to user-mode mem */ - Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Size); + Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Info.LParamSize); if (! NT_SUCCESS(Status)) { ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, - &Info.LParamSize, MEM_RELEASE); + &Size, MEM_RELEASE); SetLastNtError(Status); RETURN( (BOOL) -1); } @@ -1111,7 +1111,7 @@ PWINDOW_OBJECT Window = NULL; PMSGMEMORY MsgMemoryEntry; PVOID UserMem; - UINT Size; + SIZE_T Size; USER_MESSAGE Msg; DECLARE_RETURN(BOOL); // USER_REFERENCE_ENTRY Ref; @@ -1155,7 +1155,7 @@ Info.LParamSize = Size; UserMem = NULL; Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0, - &Info.LParamSize, MEM_COMMIT, PAGE_READWRITE); + &Size, MEM_COMMIT, PAGE_READWRITE); if (! NT_SUCCESS(Status)) { @@ -1163,11 +1163,11 @@ RETURN( (BOOL) -1); } /* Transfer lParam data to user-mode mem */ - Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Size); + Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Info.LParamSize); if (! NT_SUCCESS(Status)) { ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, - &Info.LParamSize, MEM_DECOMMIT); + &Size, MEM_DECOMMIT); SetLastNtError(Status); RETURN( (BOOL) -1); } @@ -1409,7 +1409,7 @@ DPRINT("Enter NtUserPostThreadMessage\n"); UserEnterExclusive(); - Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); + Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)idThread,&peThread); if( Status == STATUS_SUCCESS ) { Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sun Jul 26 22:31:23 2009 @@ -749,7 +749,7 @@ if (!((Wnd->Style & (WS_CHILD | WS_POPUP)) != WS_CHILD)) break; - if(!(Menu = UserGetMenuObject((HMENU) Wnd->IDMenu))) + if(!(Menu = UserGetMenuObject((HMENU)(DWORD_PTR) Wnd->IDMenu))) break; Menu->MenuInfo.WndOwner = hWnd;

1 0

[ros-arm-bringup] 42237: - Initialize MmLowestPhysicalPage to -1, otherwise setting this value will never work properly since we'll never find a page lower than 0 (the default laoder-initialized value). - Fixed by Stef.
by ros-arm-bringup＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: ros-arm-bringup Date: Sun Jul 26 21:44:27 2009 New Revision: 42237 URL: http://svn.reactos.org/svn/reactos?rev=42237&view=rev Log: - Initialize MmLowestPhysicalPage to -1, otherwise setting this value will never work properly since we'll never find a page lower than 0 (the default laoder-initialized value). - Fixed by Stef. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sun Jul 26 21:44:27 2009 @@ -203,7 +203,7 @@ // // This is where we keep track of the most basic physical layout markers // -ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; // // The total number of pages mapped by the boot loader, which include the kernel

1 0

[jimtabor] 42236: - At a minimum set the desktop to global class.
by jimtabor＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: jimtabor Date: Sun Jul 26 18:57:34 2009 New Revision: 42236 URL: http://svn.reactos.org/svn/reactos?rev=42236&view=rev Log: - At a minimum set the desktop to global class. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Sun Jul 26 18:57:34 2009 @@ -126,7 +126,7 @@ * Create the desktop window class */ Class.cbSize = sizeof(WNDCLASSEXW); - Class.style = 0; + Class.style = CS_GLOBALCLASS; Class.lpfnWndProc = DtbgWindowProc; Class.cbClsExtra = 0; Class.cbWndExtra = 0;

1 0

[sginsberg] 42235: - Revert winbase.h interlocked intrinsic change for now *sigh*
by sginsberg＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: sginsberg Date: Sun Jul 26 18:18:56 2009 New Revision: 42235 URL: http://svn.reactos.org/svn/reactos?rev=42235&view=rev Log: - Revert winbase.h interlocked intrinsic change for now *sigh* Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Jul 26 18:18:56 2009 @@ -1835,52 +1835,6 @@ #define InterlockedCompareExchangeAcquire64 InterlockedCompareExchange64 #define InterlockedCompareExchangeRelease64 InterlockedCompareExchange64 -#if !defined(InterlockedAnd) -#define InterlockedAnd InterlockedAnd_Inline -FORCEINLINE -LONG -InterlockedAnd_Inline(IN OUT volatile LONG *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = _InterlockedCompareExchange((volatile long *)Target, - i & Set, - i); - - } while (i != j); - - return j; -} -#endif - -#if !defined(InterlockedOr) -#define InterlockedOr InterlockedOr_Inline -FORCEINLINE -LONG -InterlockedOr_Inline(IN OUT volatile LONG *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = _InterlockedCompareExchange((volatile long *)Target, - i | Set, - i); - - } while (i != j); - - return j; -} -#endif - #else // !(defined (_M_AMD64) || defined (_M_IA64)) LONG WINAPI InterlockedOr(IN OUT LONG volatile *,LONG); @@ -1917,6 +1871,52 @@ VOID WINAPI InitializeSListHead(PSLIST_HEADER); USHORT WINAPI QueryDepthSList(PSLIST_HEADER); + +#if !defined(InterlockedAnd) +#define InterlockedAnd InterlockedAnd_Inline +FORCEINLINE +LONG +InterlockedAnd_Inline(IN OUT volatile LONG *Target, + IN LONG Set) +{ + LONG i; + LONG j; + + j = *Target; + do { + i = j; + j = _InterlockedCompareExchange((volatile long *)Target, + i & Set, + i); + + } while (i != j); + + return j; +} +#endif + +#if !defined(InterlockedOr) +#define InterlockedOr InterlockedOr_Inline +FORCEINLINE +LONG +InterlockedOr_Inline(IN OUT volatile LONG *Target, + IN LONG Set) +{ + LONG i; + LONG j; + + j = *Target; + do { + i = j; + j = _InterlockedCompareExchange((volatile long *)Target, + i | Set, + i); + + } while (i != j); + + return j; +} +#endif #endif /* __INTERLOCKED_DECLARED */

1 0

[jimtabor] 42234: - [Win32k] More Class work. Moved to use thread and process information structures. - Tested wine, Firefox 1.15.xx and AbiWord 2.6.8.
by jimtabor＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: jimtabor Date: Sun Jul 26 18:17:50 2009 New Revision: 42234 URL: http://svn.reactos.org/svn/reactos?rev=42234&view=rev Log: - [Win32k] More Class work. Moved to use thread and process information structures. - Tested wine, Firefox 1.15.xx and AbiWord 2.6.8. Modified: trunk/reactos/subsystems/win32/win32k/eng/semaphor.c trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/misc/usrheap.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -38,7 +38,7 @@ EngAcquireSemaphore ( IN HSEMAPHORE hsem ) { // www.osr.com/ddk/graphics/gdifncs_14br.htm - PW32THREAD W32Thread; + PTHREADINFO W32Thread; ASSERT(hsem); IntGdiAcquireSemaphore ( hsem ); W32Thread = PsGetThreadWin32Thread(PsGetCurrentThread()); @@ -62,7 +62,7 @@ EngReleaseSemaphore ( IN HSEMAPHORE hsem ) { // www.osr.com/ddk/graphics/gdifncs_5u3r.htm - PW32THREAD W32Thread; + PTHREADINFO W32Thread; ASSERT(hsem); W32Thread = PsGetThreadWin32Thread(PsGetCurrentThread()); if (W32Thread) --W32Thread->dwEngAcquireCount; Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -42,7 +42,7 @@ OUT PWNDPROC_INFO wpInfo); void FASTCALL -DestroyProcessClasses(PW32PROCESS Process ); +DestroyProcessClasses(PPROCESSINFO Process ); PCLS IntReferenceClass(IN OUT PCLS BaseClass, @@ -59,6 +59,7 @@ IN PUNICODE_STRING ClassName, IN PUNICODE_STRING MenuName, IN WNDPROC wpExtra, + IN DWORD fnID, IN DWORD dwFlags); BOOL @@ -83,6 +84,7 @@ IN PUNICODE_STRING ClassName, IN PUNICODE_STRING MenuName, IN WNDPROC wpExtra, + IN DWORD fnID, IN DWORD dwFlags, IN PDESKTOP Desktop, IN PPROCESSINFO pi); Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/clipboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/clipboard.h [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -22,8 +22,8 @@ typedef struct _CLIPBOARDSYSTEM { - PW32THREAD ClipboardThread; - PW32THREAD ClipboardOwnerThread; + PTHREADINFO ClipboardThread; + PTHREADINFO ClipboardOwnerThread; PWINDOW_OBJECT ClipboardWindow; PWINDOW_OBJECT ClipboardViewerWindow; PWINDOW_OBJECT ClipboardOwnerWindow; Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -6,7 +6,7 @@ typedef struct tagCURICON_PROCESS { LIST_ENTRY ListEntry; - PW32PROCESS Process; + PPROCESSINFO Process; } CURICON_PROCESS, *PCURICON_PROCESS; typedef struct _CURICON_OBJECT @@ -69,7 +69,7 @@ HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange); BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject); PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(PWINSTATION_OBJECT WinStaObject); -VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process); +VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process); BOOL FASTCALL IntGetCursorLocation(PWINSTATION_OBJECT WinStaObject, POINT *loc); Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -198,7 +198,7 @@ { PW32HEAP_USER_MAPPING Mapping; PTHREADINFO pti; - PW32PROCESS W32Process; + PPROCESSINFO W32Process; PWIN32HEAP pheapDesktop; ULONG_PTR Delta = 0; @@ -228,7 +228,7 @@ DesktopHeapAddressToUser(PVOID lpMem) { PW32HEAP_USER_MAPPING Mapping; - PW32PROCESS W32Process; + PPROCESSINFO W32Process; W32Process = PsGetCurrentProcessWin32Process(); Mapping = W32Process->HeapMappings.Next; 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] Sun Jul 26 18:17:50 2009 @@ -44,7 +44,7 @@ ULONG ulShareCount; USHORT cExclusiveLock; USHORT BaseFlags; - PW32THREAD Tid; + PTHREADINFO Tid; } BASEOBJECT, *POBJ; typedef struct _CLIENTOBJ Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -97,7 +97,7 @@ DWORD APIENTRY UserInsertMenuItem(HMENU hMenu, UINT uItem, BOOL fByPosition, LPCMENUITEMINFOW lpmii); BOOL FASTCALL -IntCleanupMenus(struct _EPROCESS *Process, PW32PROCESS Win32Process); +IntCleanupMenus(struct _EPROCESS *Process, PPROCESSINFO Win32Process); BOOL FASTCALL IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition, Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -34,7 +34,7 @@ typedef struct _THREADINFO { - W32THREAD W32Thread; + W32THREAD; PTL ptl; PVOID ppi; // FIXME: use PPROCESSINFO struct _USER_MESSAGE_QUEUE* MessageQueue; @@ -53,7 +53,7 @@ LIST_ENTRY PtiLink; CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. - + /* ReactOS */ LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; BOOLEAN IsExiting; @@ -89,7 +89,15 @@ RTL_AVL_TABLE GDIEngUserMemAllocTable; /* Process AVL Table. */ LIST_ENTRY GDIDcAttrFreeList; LIST_ENTRY GDIBrushAttrFreeList; -/* ReactOS, will move to PROCESSINFO */ +} W32PROCESS, *PW32PROCESS; + +typedef struct _PROCESSINFO +{ + W32PROCESS; + + PCLS pclsPrivateList; + PCLS pclsPublicList; + /* ReactOS */ LIST_ENTRY ClassList; LIST_ENTRY MenuListHead; FAST_MUTEX PrivateFontListLock; @@ -98,16 +106,6 @@ LIST_ENTRY DriverObjListHead; struct _KBL* KeyboardLayout; W32HEAP_USER_MAPPING HeapMappings; -} W32PROCESS, *PW32PROCESS; - -typedef struct _PROCESSINFO -{ - W32PROCESS XzyxW32Process; /* Place holder. */ - - PCLS pclsPrivateList; - PCLS pclsPublicList; - /* ReactOS */ - } PROCESSINFO; #endif /* __INCLUDE_NAPI_WIN32_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -62,7 +62,7 @@ } WINSTATION_OBJECT, *PWINSTATION_OBJECT; extern WINSTATION_OBJECT *InputWindowStation; -extern PW32PROCESS LogonProcess; +extern PPROCESSINFO LogonProcess; NTSTATUS FASTCALL InitWindowStationImpl(VOID); Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -55,7 +55,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, BOOLEAN Create) { - PW32PROCESS Win32Process; + PPROCESSINFO Win32Process; DECLARE_RETURN(NTSTATUS); DPRINT("Enter Win32kProcessCallback\n"); Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -28,7 +28,7 @@ IN OUT PVOID *CommitAddress, IN OUT PSIZE_T CommitSize) { - PW32PROCESS W32Process; + PPROCESSINFO W32Process; PW32HEAP_USER_MAPPING Mapping; PVOID UserBase = NULL; NTSTATUS Status; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -26,17 +26,17 @@ int ClsId; } FnidToiCls[] = { - { FNID_BUTTON, ICLS_BUTTON}, - { FNID_EDIT, ICLS_EDIT}, - { FNID_STATIC, ICLS_STATIC}, - { FNID_LISTBOX, ICLS_LISTBOX}, - { FNID_SCROLLBAR, ICLS_SCROLLBAR}, - { FNID_COMBOBOX, ICLS_COMBOBOX}, - { FNID_MDICLIENT, ICLS_MDICLIENT}, - { FNID_COMBOLBOX, ICLS_COMBOLBOX}, - { FNID_DIALOG, ICLS_DIALOG}, - { FNID_MENU, ICLS_MENU}, - { FNID_ICONTITLE, ICLS_ICONTITLE} + { FNID_BUTTON, ICLS_BUTTON}, + { FNID_EDIT, ICLS_EDIT}, + { FNID_STATIC, ICLS_STATIC}, + { FNID_LISTBOX, ICLS_LISTBOX}, + { FNID_SCROLLBAR, ICLS_SCROLLBAR}, + { FNID_COMBOBOX, ICLS_COMBOBOX}, + { FNID_MDICLIENT, ICLS_MDICLIENT}, + { FNID_COMBOLBOX, ICLS_COMBOLBOX}, + { FNID_DIALOG, ICLS_DIALOG}, + { FNID_MENU, ICLS_MENU}, + { FNID_ICONTITLE, ICLS_ICONTITLE} }; static @@ -118,7 +118,7 @@ /* clean all process classes. all process windows must cleaned first!! */ -void FASTCALL DestroyProcessClasses(PW32PROCESS Process ) +void FASTCALL DestroyProcessClasses(PPROCESSINFO Process ) { PCLS Class; PPROCESSINFO pi = (PPROCESSINFO)Process; @@ -815,6 +815,7 @@ IN PUNICODE_STRING ClassName, IN PUNICODE_STRING MenuName, IN WNDPROC wpExtra, + IN DWORD fnID, IN DWORD dwFlags, IN PDESKTOP Desktop, IN PPROCESSINFO pi) @@ -865,14 +866,21 @@ Class->rpdeskParent = Desktop; Class->pclsBase = Class; Class->atomClassName = Atom; - + Class->fnid = fnID; Class->CSF_flags = dwFlags; if (dwFlags & CSF_SYSTEMCLASS) { + int iCls; + dwFlags &= ~CSF_ANSIPROC; Class->WndProcExtra = wpExtra; Class->System = TRUE; + /* Now set the Atom table, notice only non ntuser.c atoms can go in.*/ + if (LockupFnIdToiCls(Class->fnid, &iCls)) + { + gpsi->atomSysClass[iCls] = Class->atomClassName; + } } _SEH2_TRY @@ -1159,6 +1167,7 @@ IN PUNICODE_STRING ClassName, IN PUNICODE_STRING MenuName, IN WNDPROC wpExtra, + IN DWORD fnID, IN DWORD dwFlags) { PTHREADINFO pti; @@ -1211,6 +1220,7 @@ ClassName, MenuName, wpExtra, + fnID, dwFlags, pti->Desktop, pi); @@ -1894,19 +1904,12 @@ &ClassName, &MenuName, SystemClasses[i].ProcA, + SystemClasses[i].ClassId, CSF_SYSTEMCLASS, NULL, pi); if (Class != NULL) { - int iCls; - - Class->fnid = SystemClasses[i].ClassId; - if (LockupFnIdToiCls(Class->fnid, &iCls)) - { - gpsi->atomSysClass[iCls] = Class->atomClassName; - } - ASSERT(Class->System); Class->pclsNext = SystemClassList; (void)InterlockedExchangePointer((PVOID*)&SystemClassList, @@ -2028,6 +2031,7 @@ &CapturedName, &CapturedMenuName, wpExtra, + fnID, Flags); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -290,7 +290,7 @@ static BOOLEAN FASTCALL ReferenceCurIconByProcess(PCURICON_OBJECT CurIcon) { - PW32PROCESS Win32Process; + PPROCESSINFO Win32Process; PCURICON_PROCESS Current; Win32Process = PsGetCurrentProcessWin32Process(); @@ -387,7 +387,7 @@ HBITMAP bmpMask, bmpColor; BOOLEAN Ret; PCURICON_PROCESS Current = NULL; - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); + PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); /* Private objects can only be destroyed by their own process */ if (NULL == CurIcon->hModule) @@ -464,7 +464,7 @@ } VOID FASTCALL -IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process) +IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process) { PWINSTATION_OBJECT WinSta; PCURICON_OBJECT CurIcon, tmp; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -1134,6 +1134,7 @@ &ClassName, &MenuName, NULL, + FNID_MESSAGEWND, CSF_SYSTEMCLASS, NULL, pi); @@ -1846,7 +1847,7 @@ IntUnmapDesktopView(IN PDESKTOP DesktopObject) { PW32THREADINFO ti; - PW32PROCESS CurrentWin32Process; + PPROCESSINFO CurrentWin32Process; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; NTSTATUS Status = STATUS_SUCCESS; @@ -1897,7 +1898,7 @@ IntMapDesktopView(IN PDESKTOP DesktopObject) { PW32THREADINFO ti; - PW32PROCESS CurrentWin32Process; + PPROCESSINFO CurrentWin32Process; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; PVOID UserBase = NULL; SIZE_T ViewSize = 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -45,7 +45,7 @@ /* FUNCTIONS *****************************************************************/ static BOOL FASTCALL -co_AddGuiApp(PW32PROCESS W32Data) +co_AddGuiApp(PPROCESSINFO W32Data) { W32Data->W32PF_flags |= W32PF_CREATEDWINORDC; if (InterlockedIncrement(&NrGuiAppsRunning) == 1) @@ -65,7 +65,7 @@ } static void FASTCALL -RemoveGuiApp(PW32PROCESS W32Data) +RemoveGuiApp(PPROCESSINFO W32Data) { W32Data->W32PF_flags &= ~W32PF_CREATEDWINORDC; if (InterlockedDecrement(&NrGuiAppsRunning) == 0) @@ -77,7 +77,7 @@ BOOL FASTCALL co_IntGraphicsCheck(BOOL Create) { - PW32PROCESS W32Data; + PPROCESSINFO W32Data; W32Data = PsGetCurrentProcessWin32Process(); if (Create) @@ -102,7 +102,7 @@ FASTCALL IntUserManualGuiCheck(LONG Check) { - PW32PROCESS W32Data; + PPROCESSINFO W32Data; DPRINT("Enter IntUserManualGuiCheck\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -313,7 +313,7 @@ IntCreateMenu(PHANDLE Handle, BOOL IsMenuBar) { PMENU_OBJECT Menu; - PW32PROCESS CurrentWin32Process; + PPROCESSINFO CurrentWin32Process; Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, Handle, @@ -418,7 +418,7 @@ PMENU_OBJECT FASTCALL IntCloneMenu(PMENU_OBJECT Source) { - PW32PROCESS CurrentWin32Process; + PPROCESSINFO CurrentWin32Process; HANDLE hMenu; PMENU_OBJECT Menu; @@ -1284,7 +1284,7 @@ * Internal function. Called when the process is destroyed to free the remaining menu handles. */ BOOL FASTCALL -IntCleanupMenus(struct _EPROCESS *Process, PW32PROCESS Win32Process) +IntCleanupMenus(struct _EPROCESS *Process, PPROCESSINFO Win32Process) { PEPROCESS CurrentProcess; PLIST_ENTRY LastHead = NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -2224,7 +2224,7 @@ IN BOOL Unknown2) { PEPROCESS Process; - PW32PROCESS W32Process; + PPROCESSINFO W32Process; NTSTATUS Status; HANDLE Handles[2]; LARGE_INTEGER Timeout; @@ -2246,7 +2246,7 @@ return WAIT_FAILED; } - W32Process = (PW32PROCESS)Process->Win32Process; + W32Process = (PPROCESSINFO)Process->Win32Process; if (!W32Process) { ObDereferenceObject(Process); 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] Sun Jul 26 18:17:50 2009 @@ -260,7 +260,7 @@ DWORD uiFlags) { PEPROCESS Process; - PW32PROCESS W32Process; + PPROCESSINFO W32Process; NTSTATUS Status; DWORD Ret = 0; DECLARE_RETURN(DWORD); @@ -281,7 +281,7 @@ RETURN( 0); } - W32Process = (PW32PROCESS)Process->Win32Process; + W32Process = (PPROCESSINFO)Process->Win32Process; if(!W32Process) { ObDereferenceObject(Process); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -71,7 +71,7 @@ { HWND hWnd; PWINDOW_OBJECT Window; - PW32PROCESS W32d = PsGetCurrentProcessWin32Process(); + PPROCESSINFO W32d = PsGetCurrentProcessWin32Process(); hWnd = UserGetForegroundWindow(); 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] Sun Jul 26 18:17:50 2009 @@ -874,7 +874,7 @@ { UserEnterShared(); GetW32ThreadInfo(); - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); + PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); _SEH2_TRY { pUserConnect->siClient.psi = gpsi; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -15,7 +15,7 @@ /* registered Logon process */ -PW32PROCESS LogonProcess = NULL; +PPROCESSINFO LogonProcess = NULL; BOOL FASTCALL co_IntRegisterLogonProcess(HANDLE ProcessId, BOOL Register) @@ -41,12 +41,12 @@ return FALSE; } - LogonProcess = (PW32PROCESS)Process->Win32Process; + LogonProcess = (PPROCESSINFO)Process->Win32Process; } else { /* Deregister the logon process */ - if (LogonProcess != (PW32PROCESS)Process->Win32Process) + if (LogonProcess != (PPROCESSINFO)Process->Win32Process) { ObDereferenceObject(Process); return FALSE; @@ -314,7 +314,7 @@ case ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING: { BOOL Enable; - PW32PROCESS Process = PsGetCurrentProcessWin32Process(); + PPROCESSINFO Process = PsGetCurrentProcessWin32Process(); if(Process != NULL) { 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] Sun Jul 26 18:17:50 2009 @@ -348,7 +348,7 @@ */ static LRESULT co_UserFreeWindow(PWINDOW_OBJECT Window, - PW32PROCESS ProcessData, + PPROCESSINFO ProcessData, PTHREADINFO ThreadData, BOOLEAN SendMessages) { Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -421,7 +421,7 @@ if (Characteristics & FR_PRIVATE) { - PW32PROCESS Win32Process = PsGetCurrentProcessWin32Process(); + PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process(); IntLockProcessPrivateFonts(Win32Process); InsertTailList(&Win32Process->PrivateFontListHead, &Entry->ListEntry); IntUnLockProcessPrivateFonts(Win32Process); @@ -940,7 +940,7 @@ static PFONTGDI FASTCALL FindFaceNameInLists(PUNICODE_STRING FaceName) { - PW32PROCESS Win32Process; + PPROCESSINFO Win32Process; PFONTGDI Font; /* Search the process local list */ @@ -2690,7 +2690,7 @@ NTSTATUS Status = STATUS_SUCCESS; PTEXTOBJ TextObj; UNICODE_STRING FaceName; - PW32PROCESS Win32Process; + PPROCESSINFO Win32Process; UINT MatchScore; if (!pTextObj) @@ -3003,7 +3003,7 @@ LOGFONTW LogFont; PFONTFAMILYINFO Info; DWORD Count; - PW32PROCESS Win32Process; + PPROCESSINFO Win32Process; /* Make a safe copy */ Status = MmCopyFromCaller(&LogFont, UnsafeLogFont, sizeof(LOGFONTW)); 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] Sun Jul 26 18:17:50 2009 @@ -345,7 +345,7 @@ POBJ INTERNAL_CALL GDIOBJ_AllocObjWithHandle(ULONG ObjectType) { - PW32PROCESS W32Process; + PPROCESSINFO W32Process; POBJ newObject = NULL; HANDLE CurrentProcessId, LockedProcessId; UCHAR TypeIndex; @@ -398,7 +398,7 @@ PrevProcId = InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, LockedProcessId, 0); if (PrevProcId == NULL) { - PW32THREAD Thread = (PW32THREAD)PsGetCurrentThreadWin32Thread(); + PTHREADINFO Thread = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); HGDIOBJ Handle; Entry->KernelData = newObject; @@ -540,11 +540,11 @@ Object = Entry->KernelData; if ((Object->cExclusiveLock == 0 || - Object->Tid == (PW32THREAD)PsGetCurrentThreadWin32Thread()) && + Object->Tid == (PTHREADINFO)PsGetCurrentThreadWin32Thread()) && Object->ulShareCount == 0) { BOOL Ret; - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); + PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); /* Clear the basetype field so when unlocking the handle it gets finally deleted and increment reuse counter */ Entry->Type = (Entry->Type + GDI_ENTRY_REUSE_INC) & ~GDI_ENTRY_BASETYPE_MASK; @@ -684,9 +684,9 @@ PGDI_TABLE_ENTRY Entry, End; ULONG Index = RESERVE_ENTRIES_COUNT; HANDLE ProcId; - PW32PROCESS W32Process; - - W32Process = (PW32PROCESS)Process->Win32Process; + PPROCESSINFO W32Process; + + W32Process = (PPROCESSINFO)Process->Win32Process; ASSERT(W32Process); if (W32Process->GDIHandleCount > 0) @@ -740,7 +740,7 @@ GDI_CleanupForProcess(struct _EPROCESS *Process) { PEPROCESS CurrentProcess; - PW32PROCESS W32Process; + PPROCESSINFO W32Process; DPRINT("Starting CleanupForProcess prochandle %x Pid %d\n", Process, Process->UniqueProcessId); CurrentProcess = PsGetCurrentProcess(); @@ -749,7 +749,7 @@ KeAttachProcess(&Process->Pcb); } - W32Process = (PW32PROCESS)CurrentProcess->Win32Process; + W32Process = (PPROCESSINFO)CurrentProcess->Win32Process; /* Delete objects. Begin with types that are not referenced by other types */ IntDeleteHandlesForProcess(Process, GDILoObjType_LO_DC_TYPE); @@ -862,7 +862,7 @@ if ( (Entry->KernelData != NULL) && ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) == HandleUpper) ) { - PW32THREAD Thread = (PW32THREAD)PsGetCurrentThreadWin32Thread(); + PTHREADINFO Thread = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); Object = Entry->KernelData; if (Object->cExclusiveLock == 0) @@ -1071,7 +1071,7 @@ */ PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; - PW32THREAD Thread; + PTHREADINFO Thread; HGDIOBJ hObj; GDIDBG_INITLOOPTRACE(); @@ -1081,7 +1081,7 @@ DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); - Thread = (PW32THREAD)PsGetCurrentThreadWin32Thread(); + Thread = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); if (!GDI_HANDLE_IS_STOCKOBJ(hObj)) { @@ -1115,7 +1115,7 @@ PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); if (PrevType == OldType && Entry->KernelData != NULL) { - PW32THREAD PrevThread; + PTHREADINFO PrevThread; POBJ Object; /* We successfully set the stock object flag. @@ -1131,14 +1131,14 @@ if (PrevProcId != GDI_GLOBAL_PROCESS) { PEPROCESS OldProcess; - PW32PROCESS W32Process; + PPROCESSINFO W32Process; NTSTATUS Status; /* FIXME */ Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); if (NT_SUCCESS(Status)) { - W32Process = (PW32PROCESS)OldProcess->Win32Process; + W32Process = (PPROCESSINFO)OldProcess->Win32Process; if (W32Process != NULL) { InterlockedDecrement(&W32Process->GDIHandleCount); @@ -1200,14 +1200,14 @@ { PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; - PW32THREAD Thread; + PTHREADINFO Thread; BOOL Ret = TRUE; GDIDBG_INITLOOPTRACE(); DPRINT("GDIOBJ_SetOwnership: hObj: 0x%x, NewProcess: 0x%x\n", ObjectHandle, (NewOwner ? PsGetProcessId(NewOwner) : 0)); - Thread = (PW32THREAD)PsGetCurrentThreadWin32Thread(); + Thread = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); if (!GDI_HANDLE_IS_STOCKOBJ(ObjectHandle)) { @@ -1221,7 +1221,7 @@ PrevProcId = InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, ProcessId, LockedProcessId); if (PrevProcId == ProcessId) { - PW32THREAD PrevThread; + PTHREADINFO PrevThread; if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) { @@ -1231,7 +1231,7 @@ if (Object->cExclusiveLock == 0 || PrevThread == Thread) { PEPROCESS OldProcess; - PW32PROCESS W32Process; + PPROCESSINFO W32Process; NTSTATUS Status; /* dereference the process' object counter */ @@ -1241,7 +1241,7 @@ Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); if (NT_SUCCESS(Status)) { - W32Process = (PW32PROCESS)OldProcess->Win32Process; + W32Process = (PPROCESSINFO)OldProcess->Win32Process; if (W32Process != NULL) { InterlockedDecrement(&W32Process->GDIHandleCount); @@ -1255,7 +1255,7 @@ ProcessId = PsGetProcessId(NewOwner); /* Increase the new process' object counter */ - W32Process = (PW32PROCESS)NewOwner->Win32Process; + W32Process = (PPROCESSINFO)NewOwner->Win32Process; if (W32Process != NULL) { InterlockedIncrement(&W32Process->GDIHandleCount); @@ -1328,7 +1328,7 @@ GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo) { PGDI_TABLE_ENTRY FromEntry; - PW32THREAD Thread; + PTHREADINFO Thread; HANDLE FromProcessId, FromLockedProcessId, FromPrevProcId; BOOL Ret = TRUE; @@ -1336,7 +1336,7 @@ DPRINT("GDIOBJ_CopyOwnership: from: 0x%x, to: 0x%x\n", CopyFrom, CopyTo); - Thread = (PW32THREAD)PsGetCurrentThreadWin32Thread(); + Thread = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); if (!GDI_HANDLE_IS_STOCKOBJ(CopyFrom) && !GDI_HANDLE_IS_STOCKOBJ(CopyTo)) { @@ -1350,7 +1350,7 @@ FromPrevProcId = InterlockedCompareExchangePointer((PVOID*)&FromEntry->ProcessId, FromProcessId, FromLockedProcessId); if (FromPrevProcId == FromProcessId) { - PW32THREAD PrevThread; + PTHREADINFO PrevThread; POBJ Object; if ((FromEntry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Sun Jul 26 18:17:50 2009 @@ -138,7 +138,7 @@ static __inline PVOID UserHeapAddressToUser(PVOID lpMem) { - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); + PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + (ULONG_PTR)W32Process->HeapMappings.UserMapping); }

1 0

[sginsberg] 42233: - Misc fixes for msvc: - C89 compliance for "dbgprint" - Fix more calling convention declarations in the DDK and gdi32 - Define noreturn attribute for crt's abort compatibly - Fix some of the mess in psdk's intrinsics -- this needs some major clean up. - Define DbgPrintEx the same way in debug.h as in NDK and DDK - UUID doesn't need Wine-specific types -- include standard PSDK headers.
by sginsberg＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: sginsberg Date: Sun Jul 26 17:36:35 2009 New Revision: 42233 URL: http://svn.reactos.org/svn/reactos?rev=42233&view=rev Log: - Misc fixes for msvc: - C89 compliance for "dbgprint" - Fix more calling convention declarations in the DDK and gdi32 - Define noreturn attribute for crt's abort compatibly - Fix some of the mess in psdk's intrinsics -- this needs some major clean up. - Define DbgPrintEx the same way in debug.h as in NDK and DDK - UUID doesn't need Wine-specific types -- include standard PSDK headers. Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/include/crt/process.h trunk/reactos/include/ddk/ddkmapi.h trunk/reactos/include/ddk/hidclass.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/debug.h trunk/reactos/lib/sdk/uuid/uuid.rbuild Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -35,6 +35,7 @@ { char psBuffer[128]; char psBuffer2[128]; + char *nlptr2; char cmd[255]; char test[300]; FILE *pPipe; @@ -60,7 +61,7 @@ { while(fgets(psBuffer2, 128, pPipe2)) { - char *nlptr2 = strchr(psBuffer2, '\n'); + nlptr2 = strchr(psBuffer2, '\n'); if (nlptr2) *nlptr2 = '\0'; puts(psBuffer2); Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -115,36 +115,36 @@ } LOCALFONT, *PLOCALFONT; // sdk/winspool.h -typedef BOOL WINAPI (*ABORTPRINTER) (HANDLE); -typedef BOOL WINAPI (*CLOSEPRINTER) (HANDLE); -typedef BOOL WINAPI (*CLOSESPOOLFILEHANDLE) (HANDLE, HANDLE); // W2k8 -typedef HANDLE WINAPI (*COMMITSPOOLDATA) (HANDLE,HANDLE,DWORD); // W2k8 -typedef LONG WINAPI (*DOCUMENTPROPERTIESW) (HWND,HANDLE,LPWSTR,PDEVMODEW,PDEVMODEW,DWORD); -typedef BOOL WINAPI (*ENDDOCPRINTER) (HANDLE); -typedef BOOL WINAPI (*ENDPAGEPRINTER) (HANDLE); -typedef BOOL WINAPI (*GETPRINTERW) (HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); -typedef BOOL WINAPI (*GETPRINTERDRIVERW) (HANDLE,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); -typedef HANDLE WINAPI (*GETSPOOLFILEHANDLE) (HANDLE); // W2k8 -typedef BOOL WINAPI (*ISVALIDDEVMODEW) (PDEVMODEW,size_t); -typedef BOOL WINAPI (*OPENPRINTERW) (LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW); -typedef BOOL WINAPI (*READPRINTER) (HANDLE,PVOID,DWORD,PDWORD); -typedef BOOL WINAPI (*RESETPRINTERW) (HANDLE,LPPRINTER_DEFAULTSW); -typedef LPWSTR WINAPI (*STARTDOCDLGW) (HANDLE,DOCINFOW *); -typedef DWORD WINAPI (*STARTDOCPRINTERW) (HANDLE,DWORD,PBYTE); -typedef BOOL WINAPI (*STARTPAGEPRINTER) (HANDLE); +typedef BOOL (WINAPI *ABORTPRINTER) (HANDLE); +typedef BOOL (WINAPI *CLOSEPRINTER) (HANDLE); +typedef BOOL (WINAPI *CLOSESPOOLFILEHANDLE) (HANDLE, HANDLE); // W2k8 +typedef HANDLE (WINAPI *COMMITSPOOLDATA) (HANDLE,HANDLE,DWORD); // W2k8 +typedef LONG (WINAPI *DOCUMENTPROPERTIESW) (HWND,HANDLE,LPWSTR,PDEVMODEW,PDEVMODEW,DWORD); +typedef BOOL (WINAPI *ENDDOCPRINTER) (HANDLE); +typedef BOOL (WINAPI *ENDPAGEPRINTER) (HANDLE); +typedef BOOL (WINAPI *GETPRINTERW) (HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); +typedef BOOL (WINAPI *GETPRINTERDRIVERW) (HANDLE,LPWSTR,DWORD,LPBYTE,DWORD,LPDWORD); +typedef HANDLE (WINAPI *GETSPOOLFILEHANDLE) (HANDLE); // W2k8 +typedef BOOL (WINAPI *ISVALIDDEVMODEW) (PDEVMODEW,size_t); +typedef BOOL (WINAPI *OPENPRINTERW) (LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW); +typedef BOOL (WINAPI *READPRINTER) (HANDLE,PVOID,DWORD,PDWORD); +typedef BOOL (WINAPI *RESETPRINTERW) (HANDLE,LPPRINTER_DEFAULTSW); +typedef LPWSTR (WINAPI *STARTDOCDLGW) (HANDLE,DOCINFOW *); +typedef DWORD (WINAPI *STARTDOCPRINTERW) (HANDLE,DWORD,PBYTE); +typedef BOOL (WINAPI *STARTPAGEPRINTER) (HANDLE); // ddk/winsplp.h -typedef BOOL WINAPI (*SEEKPRINTER) (HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD,BOOL); -typedef BOOL WINAPI (*SPLREADPRINTER) (HANDLE,LPBYTE *,DWORD); +typedef BOOL (WINAPI *SEEKPRINTER) (HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD,BOOL); +typedef BOOL (WINAPI *SPLREADPRINTER) (HANDLE,LPBYTE *,DWORD); // Same as ddk/winsplp.h DriverUnloadComplete? -typedef BOOL WINAPI (*SPLDRIVERUNLOADCOMPLETE) (LPWSTR); +typedef BOOL (WINAPI *SPLDRIVERUNLOADCOMPLETE) (LPWSTR); // Driver support: // DrvDocumentEvent api/winddiui.h not W2k8 DocumentEventAW -typedef INT WINAPI (*DOCUMENTEVENT) (HANDLE,HDC,INT,ULONG,PVOID,ULONG,PVOID); +typedef INT (WINAPI *DOCUMENTEVENT) (HANDLE,HDC,INT,ULONG,PVOID,ULONG,PVOID); // DrvQueryColorProfile -typedef BOOL WINAPI (*QUERYCOLORPROFILE) (HANDLE,PDEVMODEW,ULONG,VOID*,ULONG,FLONG); +typedef BOOL (WINAPI *QUERYCOLORPROFILE) (HANDLE,PDEVMODEW,ULONG,VOID*,ULONG,FLONG); // Unknown: -typedef DWORD WINAPI (*QUERYSPOOLMODE) (HANDLE,DWORD,DWORD); -typedef DWORD WINAPI (*QUERYREMOTEFONTS) (DWORD,DWORD,DWORD); +typedef DWORD (WINAPI *QUERYSPOOLMODE) (HANDLE,DWORD,DWORD); +typedef DWORD (WINAPI *QUERYREMOTEFONTS) (DWORD,DWORD,DWORD); extern CLOSEPRINTER fpClosePrinter; Modified: trunk/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/process.h?rev=… ============================================================================== --- trunk/reactos/include/crt/process.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/process.h [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -40,7 +40,7 @@ #pragma push_macro("abort") #undef abort #endif - void __cdecl __declspec(noreturn) abort(void); + __declspec(noreturn) void __cdecl abort(void); #if __MINGW_GNUC_PREREQ(4,4) #pragma pop_macro("abort") #undef abort Modified: trunk/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkmapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ddkmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ddkmapi.h [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -95,8 +95,8 @@ #define DDNOTIFY_CLOSEVIDEOPORT 0x0200 #define DDNOTIFY_CLOSECAPTURE 0x0400 -typedef DWORD (*LPDXAPI)(DWORD dwFunctionNum, LPVOID lpvInBuffer, DWORD cbInBuffer, LPVOID lpvOutBuffer, DWORD cbOutBuffer); -typedef ULONG (*LPDD_NOTIFYCALLBACK) (DWORD dwFlags, PVOID pContext, DWORD dwParam1, DWORD dwParam2); +typedef DWORD (PASCAL *LPDXAPI)(DWORD dwFunctionNum, LPVOID lpvInBuffer, DWORD cbInBuffer, LPVOID lpvOutBuffer, DWORD cbOutBuffer); +typedef ULONG (PASCAL *LPDD_NOTIFYCALLBACK) (DWORD dwFlags, PVOID pContext, DWORD dwParam1, DWORD dwParam2); typedef struct _DDCAPBUFFINFO { Modified: trunk/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidclass.h?rev… ============================================================================== --- trunk/reactos/include/ddk/hidclass.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/hidclass.h [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -98,11 +98,11 @@ DeviceObjectRemoved }; -typedef VOID DDKAPI (*PHID_STATUS_CHANGE)( +typedef VOID (DDKAPI *PHID_STATUS_CHANGE)( PVOID Context, enum DeviceObjectState State); -typedef NTSTATUS DDKAPI (*PHIDP_GETCAPS)( +typedef NTSTATUS (DDKAPI *PHIDP_GETCAPS)( IN PHIDP_PREPARSED_DATA PreparsedData, OUT PHIDP_CAPS Capabilities); Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -1835,6 +1835,52 @@ #define InterlockedCompareExchangeAcquire64 InterlockedCompareExchange64 #define InterlockedCompareExchangeRelease64 InterlockedCompareExchange64 +#if !defined(InterlockedAnd) +#define InterlockedAnd InterlockedAnd_Inline +FORCEINLINE +LONG +InterlockedAnd_Inline(IN OUT volatile LONG *Target, + IN LONG Set) +{ + LONG i; + LONG j; + + j = *Target; + do { + i = j; + j = _InterlockedCompareExchange((volatile long *)Target, + i & Set, + i); + + } while (i != j); + + return j; +} +#endif + +#if !defined(InterlockedOr) +#define InterlockedOr InterlockedOr_Inline +FORCEINLINE +LONG +InterlockedOr_Inline(IN OUT volatile LONG *Target, + IN LONG Set) +{ + LONG i; + LONG j; + + j = *Target; + do { + i = j; + j = _InterlockedCompareExchange((volatile long *)Target, + i | Set, + i); + + } while (i != j); + + return j; +} +#endif + #else // !(defined (_M_AMD64) || defined (_M_IA64)) LONG WINAPI InterlockedOr(IN OUT LONG volatile *,LONG); @@ -1871,52 +1917,6 @@ VOID WINAPI InitializeSListHead(PSLIST_HEADER); USHORT WINAPI QueryDepthSList(PSLIST_HEADER); - -#if !defined(InterlockedAnd) -#define InterlockedAnd InterlockedAnd_Inline -FORCEINLINE -LONG -InterlockedAnd_Inline(IN OUT volatile LONG *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = _InterlockedCompareExchange((volatile long *)Target, - i & Set, - i); - - } while (i != j); - - return j; -} -#endif - -#if !defined(InterlockedOr) -#define InterlockedOr InterlockedOr_Inline -FORCEINLINE -LONG -InterlockedOr_Inline(IN OUT volatile LONG *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = _InterlockedCompareExchange((volatile long *)Target, - i | Set, - i); - - } while (i != j); - - return j; -} -#endif #endif /* __INTERLOCKED_DECLARED */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -4901,7 +4901,7 @@ #if (_MSC_FULL_VER >= 13012035) -DWORD __readfsdword(DWORD); +unsigned long __readfsdword(const unsigned long Offset); #pragma intrinsic(__readfsdword) __inline PVOID GetCurrentFiber(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); } Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -31,6 +31,7 @@ IN ... ); +NTSYSAPI ULONG __cdecl DbgPrintEx( Modified: trunk/reactos/lib/sdk/uuid/uuid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.rbuild?r… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.rbuild [iso-8859-1] Sun Jul 26 17:36:35 2009 @@ -1,6 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="uuid" type="staticlibrary"> - <include base="ReactOS">include/reactos/wine</include> <file>uuid.c</file> </module>

1 0

[dchapyshev] 42232: - Use documented structure instead array - Add some defines
by dchapyshev＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: dchapyshev Date: Sun Jul 26 15:16:19 2009 New Revision: 42232 URL: http://svn.reactos.org/svn/reactos?rev=42232&view=rev Log: - Use documented structure instead array - Add some defines Added: trunk/reactos/drivers/filesystems/fs_rec/udfs.h (with props) Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h trunk/reactos/drivers/filesystems/fs_rec/udfs.c Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Sun Jul 26 15:16:19 2009 @@ -13,6 +13,8 @@ #include <ntifs.h> #include <ntdddisk.h> #include <ntddcdrm.h> + +#include "udfs.h" // // Tag for memory allocations Modified: trunk/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] Sun Jul 26 15:16:19 2009 @@ -20,9 +20,10 @@ FsRecIsUdfsVolume(IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize) { - PUCHAR Buffer = NULL; + PVOLSTRUCTDESC VolumeStructDesc = NULL; LARGE_INTEGER Offset; ULONG State = 0; + PAGED_CODE(); Offset.QuadPart = UDFS_VRS_START_OFFSET; while (TRUE) @@ -31,7 +32,7 @@ &Offset, SectorSize, SectorSize, - (PVOID)&Buffer, + (PVOID)&VolumeStructDesc, NULL)) { break; @@ -41,28 +42,27 @@ { case 0: - if ((Buffer[1] == 'B') && - (Buffer[2] == 'E') && - (Buffer[3] == 'A') && - (Buffer[4] == '0') && - (Buffer[5] == '1')) + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_BEA01, + VSD_STD_ID_LEN)) { State = 1; } else { - ExFreePool(Buffer); + ExFreePool(VolumeStructDesc); return FALSE; } break; case 1: - if ((Buffer[1] == 'N') && - (Buffer[2] == 'S') && - (Buffer[3] == 'R') && - (Buffer[4] == '0') && - ((Buffer[5] == '2') || (Buffer[5] == '3'))) + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_NSR03, + VSD_STD_ID_LEN) || + !strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_NSR02, + VSD_STD_ID_LEN)) { State = 2; } @@ -70,13 +70,11 @@ case 2: - if ((Buffer[1] == 'T') && - (Buffer[2] == 'E') && - (Buffer[3] == 'A') && - (Buffer[4] == '0') && - (Buffer[5] == '1')) + if (!strncmp((const char*)VolumeStructDesc->Ident, + VSD_STD_ID_TEA01, + VSD_STD_ID_LEN)) { - ExFreePool(Buffer); + ExFreePool(VolumeStructDesc); return TRUE; } break; @@ -85,12 +83,12 @@ Offset.QuadPart += SectorSize; if (Offset.QuadPart == UDFS_AVDP_SECTOR) { - ExFreePool(Buffer); + ExFreePool(VolumeStructDesc); return FALSE; } } - ExFreePool(Buffer); + ExFreePool(VolumeStructDesc); return TRUE; } Added: trunk/reactos/drivers/filesystems/fs_rec/udfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/udfs.h (added) +++ trunk/reactos/drivers/filesystems/fs_rec/udfs.h [iso-8859-1] Sun Jul 26 15:16:19 2009 @@ -1,0 +1,29 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/udfs.h + * PURPOSE: UDFS Header File + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +/* Standard Identifier (EMCA 167r2 2/9.1.2) */ +#define VSD_STD_ID_NSR02 "NSR02" /* (3/9.1) */ + +/* Standard Identifier (ECMA 167r3 2/9.1.2) */ +#define VSD_STD_ID_BEA01 "BEA01" /* (2/9.2) */ +#define VSD_STD_ID_BOOT2 "BOOT2" /* (2/9.4) */ +#define VSD_STD_ID_CD001 "CD001" /* (ECMA-119) */ +#define VSD_STD_ID_CDW02 "CDW02" /* (ECMA-168) */ +#define VSD_STD_ID_NSR03 "NSR03" /* (3/9.1) */ +#define VSD_STD_ID_TEA01 "TEA01" /* (2/9.3) */ + +/* Volume Structure Descriptor (ECMA 167r3 2/9.1) */ +#define VSD_STD_ID_LEN 5 +typedef struct _VOLSTRUCTDESC +{ + UCHAR Type; + UCHAR Ident[VSD_STD_ID_LEN]; + UCHAR Version; + UCHAR Data[2041]; +} VOLSTRUCTDESC, *PVOLSTRUCTDESC; + Propchange: trunk/reactos/drivers/filesystems/fs_rec/udfs.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 42231: - Never release the user lock when processing a user server request! The user lock was being released to perform a csr notification (it still happens this way in trunk) allowing another request to start processing. Fix this by moving csr notification outside the user lock. - Don't rely on a reqinfo->data_count but use a simple boolean var for tracking the memory which must be freed.
by fireball＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: fireball Date: Sun Jul 26 15:13:00 2009 New Revision: 42231 URL: http://svn.reactos.org/svn/reactos?rev=42231&view=rev Log: - Never release the user lock when processing a user server request! The user lock was being released to perform a csr notification (it still happens this way in trunk) allowing another request to start processing. Fix this by moving csr notification outside the user lock. - Don't rely on a reqinfo->data_count but use a simple boolean var for tracking the memory which must be freed. Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/csr.c branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/csr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/csr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/csr.c [iso-8859-1] Sun Jul 26 15:13:00 2009 @@ -71,13 +71,9 @@ KeAttachProcess(&CsrProcess->Pcb); } - UserLeave(); - Status = ZwRequestWaitReplyPort(WindowsApiPort, &Request->Header, &Request->Header); - - UserEnterExclusive(); if (CsrProcess != OldProcess) { Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] Sun Jul 26 15:13:00 2009 @@ -71,6 +71,7 @@ enum request req = reqinfo->u.req.request_header.req; UCHAR i; ULONG DataWritten=0; + BOOLEAN FreeReqData = FALSE; DPRINT("WineServer call of type 0x%x\n", req); @@ -106,6 +107,9 @@ /* Advance to the next data block */ DataWritten += reqinfo->data[i].size; } + + /* Set the allocation flag so we free this memory later */ + FreeReqData = TRUE; } else { @@ -127,7 +131,7 @@ } /* Free the request data area if needed */ - if (reqinfo->data_count > 1) ExFreePool(RequestData); + if (FreeReqData) ExFreePool(RequestData); /* Copy back the reply data if any */ if (ReplySize && reqinfo->reply_data) @@ -154,11 +158,12 @@ /* Release lock */ UserLeave(); - //if (reply.reply_header.error) - // DPRINT1("returning error 0x%08X\n", reply.reply_header.error); - - //if (reply.reply_header.error == 0x103 || - // reply.reply_header.error == STATUS_ACCESS_DENIED) DbgBreakPoint(); + /* Perform any pending notifies without holding the lock */ + if (req == REQ_create_desktop) + { + if (reply.reply_header.error != STATUS_OBJECT_NAME_EXISTS) + CsrNotifyCreateDesktop((HDESK)((struct create_desktop_reply *)&reply)->handle); + } return reply.reply_header.error; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009