Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57637: Synchronize with trunk's revision r57636.
by hbelusca＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: hbelusca Date: Sun Oct 28 12:33:23 2012 New Revision: 57637 URL: http://svn.reactos.org/svn/reactos?rev=57637&view=rev Log: Synchronize with trunk's revision r57636. Modified: branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c Modified: branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… ============================================================================== --- branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Oct 28 12:33:23 2012 @@ -906,16 +906,16 @@ UINT32 ThisFatEntOffset; ULONG SectorCount; PUCHAR ReadBuffer; - BOOLEAN status = TRUE;; + BOOLEAN status = TRUE; //TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); - // We need a buffer for 2 secors - ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector, 'xTAF'); - if (!ReadBuffer) - { - return FALSE; - } + // We need a buffer for 2 secors + ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector, 'xTAF'); + if (!ReadBuffer) + { + return FALSE; + } switch(Volume->FatType) { @@ -929,7 +929,6 @@ TRACE("ThisFatSecNum: %d\n", ThisFatSecNum); TRACE("ThisFatEntOffset: %d\n", ThisFatEntOffset); - if (ThisFatEntOffset == (Volume->BytesPerSector - 1)) { SectorCount = 2; @@ -939,11 +938,11 @@ SectorCount = 1; } - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount, ReadBuffer)) - { - status = FALSE; - break; - } + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount, ReadBuffer)) + { + status = FALSE; + break; + } fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset)); fat = SWAPW(fat); @@ -963,8 +962,8 @@ if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, ReadBuffer)) { - status = FALSE; - break; + status = FALSE; + break; } fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset)); @@ -992,17 +991,17 @@ default: ERR("Unknown FAT type %d\n", Volume->FatType); - status = FALSE; - break; + status = FALSE; + break; } //TRACE("FAT entry is 0x%x.\n", fat); - HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); + HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); *ClusterPointer = fat; - return TRUE; + return status; } ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster)

1 0

[hbelusca] 57636: [FREELDR] Really use the 'status' variable.
by hbelusca＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: hbelusca Date: Sun Oct 28 12:32:31 2012 New Revision: 57636 URL: http://svn.reactos.org/svn/reactos?rev=57636&view=rev Log: [FREELDR] Really use the 'status' variable. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Oct 28 12:32:31 2012 @@ -906,16 +906,16 @@ UINT32 ThisFatEntOffset; ULONG SectorCount; PUCHAR ReadBuffer; - BOOLEAN status = TRUE;; + BOOLEAN status = TRUE; //TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); - // We need a buffer for 2 secors - ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector, 'xTAF'); - if (!ReadBuffer) - { - return FALSE; - } + // We need a buffer for 2 secors + ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector, 'xTAF'); + if (!ReadBuffer) + { + return FALSE; + } switch(Volume->FatType) { @@ -929,7 +929,6 @@ TRACE("ThisFatSecNum: %d\n", ThisFatSecNum); TRACE("ThisFatEntOffset: %d\n", ThisFatEntOffset); - if (ThisFatEntOffset == (Volume->BytesPerSector - 1)) { SectorCount = 2; @@ -939,11 +938,11 @@ SectorCount = 1; } - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount, ReadBuffer)) - { - status = FALSE; - break; - } + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount, ReadBuffer)) + { + status = FALSE; + break; + } fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset)); fat = SWAPW(fat); @@ -963,8 +962,8 @@ if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, ReadBuffer)) { - status = FALSE; - break; + status = FALSE; + break; } fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset)); @@ -992,17 +991,17 @@ default: ERR("Unknown FAT type %d\n", Volume->FatType); - status = FALSE; - break; + status = FALSE; + break; } //TRACE("FAT entry is 0x%x.\n", fat); - HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); + HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); *ClusterPointer = fat; - return TRUE; + return status; } ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster)

1 0

[hbelusca] 57635: - Synchronize with trunk's revision r57633. [WIN32CSR/BOOTDATA] - Finally get rid of win32csr, being replaced by winsrv and consrv. - Remove it from the subsystem command-line. [W...
by hbelusca＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: hbelusca Date: Sun Oct 28 12:13:03 2012 New Revision: 57635 URL: http://svn.reactos.org/svn/reactos?rev=57635&view=rev Log: - Synchronize with trunk's revision r57633. [WIN32CSR/BOOTDATA] - Finally get rid of win32csr, being replaced by winsrv and consrv. - Remove it from the subsystem command-line. [WINSRV] - Move a hack from win32csr to winsrv. Removed: branches/ros-csrss/win32ss/user/win32csr/ Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/boot/bootdata/hivesys_amd64.inf branches/ros-csrss/boot/bootdata/hivesys_arm.inf branches/ros-csrss/boot/bootdata/hivesys_i386.inf branches/ros-csrss/ntoskrnl/ex/win32k.c branches/ros-csrss/ntoskrnl/ps/win32.c branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/gdi/ntgdi/device.c branches/ros-csrss/win32ss/pch.h branches/ros-csrss/win32ss/user/ntuser/accelerator.c branches/ros-csrss/win32ss/user/ntuser/callback.c branches/ros-csrss/win32ss/user/ntuser/callproc.c branches/ros-csrss/win32ss/user/ntuser/class.c branches/ros-csrss/win32ss/user/ntuser/class.h branches/ros-csrss/win32ss/user/ntuser/clipboard.c branches/ros-csrss/win32ss/user/ntuser/csr.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c branches/ros-csrss/win32ss/user/ntuser/desktop.c branches/ros-csrss/win32ss/user/ntuser/desktop.h branches/ros-csrss/win32ss/user/ntuser/event.c branches/ros-csrss/win32ss/user/ntuser/hook.c branches/ros-csrss/win32ss/user/ntuser/input.c branches/ros-csrss/win32ss/user/ntuser/kbdlayout.c branches/ros-csrss/win32ss/user/ntuser/main.c branches/ros-csrss/win32ss/user/ntuser/menu.c branches/ros-csrss/win32ss/user/ntuser/message.c branches/ros-csrss/win32ss/user/ntuser/monitor.c branches/ros-csrss/win32ss/user/ntuser/msgqueue.c branches/ros-csrss/win32ss/user/ntuser/msgqueue.h branches/ros-csrss/win32ss/user/ntuser/object.c branches/ros-csrss/win32ss/user/ntuser/object.h branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/ntuser/timer.c branches/ros-csrss/win32ss/user/ntuser/window.c branches/ros-csrss/win32ss/user/ntuser/window.h branches/ros-csrss/win32ss/user/ntuser/winsta.c branches/ros-csrss/win32ss/user/user32/windows/cursoricon.c branches/ros-csrss/win32ss/user/winsrv/harderror.c branches/ros-csrss/win32ss/user/winsrv/init.c branches/ros-csrss/win32ss/user/winsrv/shutdown.c Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 12:13:03 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57633 +/trunk/reactos:57561-57634 Modified: branches/ros-csrss/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -1239,7 +1239,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=consrv:ConServerDllInitialization,2 ServerDll=win32csr:Win32CsrInitialization,4 ProfileControl=Off MaxRequestThreads=16" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=consrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: branches/ros-csrss/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesys_arm.inf [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -794,7 +794,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=consrv:ConServerDllInitialization,2 ServerDll=win32csr:Win32CsrInitialization,4 ProfileControl=Off MaxRequestThreads=16" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=consrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: branches/ros-csrss/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -1239,7 +1239,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=consrv:ConServerDllInitialization,2 ServerDll=win32csr:Win32CsrInitialization,4 ProfileControl=Off MaxRequestThreads=16" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=consrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: branches/ros-csrss/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ex/win32k.c?… ============================================================================== --- branches/ros-csrss/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ branches/ros-csrss/ntoskrnl/ex/win32k.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -40,6 +40,8 @@ PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpWindowStationObjectOkToClose = NULL; PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpDesktopObjectOkToClose = NULL; PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete = NULL; +PKWIN32_OPENMETHOD_CALLOUT ExpDesktopObjectOpen = NULL; +PKWIN32_CLOSEMETHOD_CALLOUT ExpDesktopObjectClose = NULL; /* FUNCTIONS ****************************************************************/ @@ -131,6 +133,44 @@ /* Call the Registered Callback */ ExpDesktopObjectDelete(&Parameters); +} + +NTSTATUS +NTAPI +ExpDesktopOpen(IN OB_OPEN_REASON Reason, + IN PEPROCESS Process OPTIONAL, + IN PVOID ObjectBody, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount) +{ + WIN32_OPENMETHOD_PARAMETERS Parameters; + + Parameters.OpenReason = Reason; + Parameters.Process = Process; + Parameters.Object = ObjectBody; + Parameters.GrantedAccess = GrantedAccess; + Parameters.HandleCount = HandleCount; + + return ExpDesktopObjectOpen(&Parameters); +} + +VOID +NTAPI +ExpDesktopClose(IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + WIN32_CLOSEMETHOD_PARAMETERS Parameters; + + Parameters.Process = Process; + Parameters.Object = Object; + Parameters.AccessMask = GrantedAccess; + Parameters.ProcessHandleCount = ProcessHandleCount; + Parameters.SystemHandleCount = SystemHandleCount; + + ExpDesktopObjectClose(&Parameters); } BOOLEAN @@ -169,6 +209,8 @@ ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; ObjectTypeInitializer.ParseProcedure = NULL; ObjectTypeInitializer.OkayToCloseProcedure = ExpDesktopOkToClose; + ObjectTypeInitializer.OpenProcedure = ExpDesktopOpen; + ObjectTypeInitializer.CloseProcedure = ExpDesktopClose; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, Modified: branches/ros-csrss/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ps/win32.c?r… ============================================================================== --- branches/ros-csrss/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ branches/ros-csrss/ntoskrnl/ps/win32.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -23,6 +23,8 @@ extern PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpWindowStationObjectOkToClose; extern PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpDesktopObjectOkToClose; extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; +extern PKWIN32_OPENMETHOD_CALLOUT ExpDesktopObjectOpen; +extern PKWIN32_CLOSEMETHOD_CALLOUT ExpDesktopObjectClose; extern PKWIN32_POWEREVENT_CALLOUT PopEventCallout; /* PRIVATE FUNCTIONS *********************************************************/ @@ -121,6 +123,8 @@ ExpWindowStationObjectOkToClose = CalloutData->WindowStationOkToCloseProcedure; ExpDesktopObjectOkToClose = CalloutData->DesktopOkToCloseProcedure; ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; + ExpDesktopObjectOpen = CalloutData->DesktopOpenProcedure; + ExpDesktopObjectClose = CalloutData->DesktopCloseProcedure; PopEventCallout = CalloutData->PowerEventCallout; KeGdiFlushUserBatch = CalloutData->BatchFlushRoutine; } Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.tx… ============================================================================== --- branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -14,7 +14,6 @@ add_subdirectory(reactx) add_subdirectory(user/consrv) add_subdirectory(user/user32) -add_subdirectory(user/win32csr) add_subdirectory(user/winsrv) spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) Modified: branches/ros-csrss/win32ss/gdi/ntgdi/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dev… ============================================================================== --- branches/ros-csrss/win32ss/gdi/ntgdi/device.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/gdi/ntgdi/device.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -32,15 +32,15 @@ SURFOBJ *pso; PDESKTOP rpDesk; + /* Create surface */ + pso = &PDEVOBJ_pSurface(gppdevPrimary)->SurfObj; + SurfSize = pso->sizlBitmap; + /* Attach monitor */ UserAttachMonitor((HDEV)gppdevPrimary); DPRINT("IntCreatePrimarySurface, gppdevPrimary=%p, gppdevPrimary->pSurface = %p\n", gppdevPrimary, gppdevPrimary->pSurface); - - /* Create surface */ - pso = &PDEVOBJ_pSurface(gppdevPrimary)->SurfObj; - SurfSize = pso->sizlBitmap; /* Put the pointer in the center of the screen */ gpsi->ptCursor.x = pso->sizlBitmap.cx / 2; Modified: branches/ros-csrss/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/pch.h?rev=576… ============================================================================== --- branches/ros-csrss/win32ss/pch.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/pch.h [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -36,6 +36,7 @@ /* Win32 headers */ /* FIXME: Defines in winbase.h that we need... */ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#define MAKEINTATOM(i) (LPWSTR)((ULONG_PTR)((WORD)(i))) #define WINBASEAPI #define STARTF_USESIZE 2 #define STARTF_USEPOSITION 4 Modified: branches/ros-csrss/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/a… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/accelerator.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/accelerator.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -257,7 +257,7 @@ RETURN( (HACCEL) NULL ); } - Accel = UserCreateObject(gHandleTable, NULL, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); + Accel = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); if (Accel == NULL) { Modified: branches/ros-csrss/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/callback.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -130,6 +130,9 @@ BOOL bResult; ULONG_PTR pLibNameBuffer = 0, pInitFuncBuffer = 0; + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); + TRACE("co_IntClientLoadLibrary: %S, %S, %d, %d\n", pstrLibName->Buffer, pstrLibName->Buffer, Unload, ApiHook); /* Calculate the size of the argument */ @@ -235,6 +238,9 @@ PWND pWnd; ULONG ResultLength; NTSTATUS Status; + + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); Arguments.Callback = CompletionCallback; Arguments.Wnd = hWnd; @@ -280,6 +286,9 @@ ULONG ResultLength; ULONG ArgumentLength; LRESULT Result; + + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); if (0 < lParamBufferSize) { @@ -363,6 +372,9 @@ NTSTATUS Status; PVOID ResultPointer; ULONG ResultLength; + + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); ResultPointer = NULL; ResultLength = sizeof(LRESULT); @@ -394,6 +406,8 @@ return (HMENU)Result; } +extern HCURSOR gDesktopCursor; + BOOL APIENTRY co_IntLoadDefaultCursors(VOID) { @@ -402,8 +416,11 @@ ULONG ResultLength; BOOL DefaultCursor = TRUE; + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); + ResultPointer = NULL; - ResultLength = sizeof(LRESULT); + ResultLength = sizeof(HCURSOR); UserLeaveCo(); @@ -414,6 +431,9 @@ &ResultLength); UserEnterCo(); + + /* HACK: The desktop class doen't have a proper cursor yet, so set it here */ + gDesktopCursor = *((HCURSOR*)ResultPointer); if (!NT_SUCCESS(Status)) { @@ -448,6 +468,8 @@ UINT lParamSize = 0; ASSERT(Proc); + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); pti = PsGetCurrentThreadWin32Thread(); if (pti->TIF_flags & TIF_INCLEANUP) @@ -834,6 +856,9 @@ ULONG ArgumentLength, ResultLength; PVOID Argument, ResultPointer; + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); + ArgumentLength = ResultLength = 0; Argument = ResultPointer = NULL; Modified: branches/ros-csrss/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/callproc.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/callproc.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -35,6 +35,7 @@ NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable, Desktop, + NULL, &Handle, otCallProc, sizeof(CALLPROCDATA)); Modified: branches/ros-csrss/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/class.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -641,9 +641,17 @@ PCLS Class; ASSERT(BaseClass->pclsBase == BaseClass); - Class = IntGetClassForDesktop(BaseClass, - ClassLink, - Desktop); + if (Desktop != NULL) + { + Class = IntGetClassForDesktop(BaseClass, + ClassLink, + Desktop); + } + else + { + Class = BaseClass; + } + if (Class != NULL) { Class->cWndReferenceCount++; @@ -1286,13 +1294,16 @@ } PCLS -IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance) +IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance, BOOL bDesktopThread) { PCLS *ClassLink, Class = NULL; RTL_ATOM ClassAtom; PTHREADINFO pti; - pti = PsGetCurrentThreadWin32Thread(); + if (bDesktopThread) + pti = gptiDesktopThread; + else + pti = PsGetCurrentThreadWin32Thread(); if ( !(pti->ppi->W32PF_flags & W32PF_CLASSESREGISTERED )) { Modified: branches/ros-csrss/win32ss/user/ntuser/class.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/class.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/class.h [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -39,7 +39,7 @@ IN PPROCESSINFO pi); PCLS -IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance); +IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance, BOOL bDesktopThread); BOOL FASTCALL UserRegisterSystemClasses(VOID); Modified: branches/ros-csrss/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -182,6 +182,7 @@ /* Create the clipboard data */ pClipboardData = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, + NULL, &hMem, otClipBoardData, cjDataSize); @@ -293,7 +294,7 @@ PCLIPBOARDDATA pMemObj; HANDLE hMem; - pMemObj = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, &hMem, otClipBoardData, + pMemObj = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, NULL, &hMem, otClipBoardData, sizeof(CLIPBOARDDATA) + sizeof(LCID)); if (pMemObj) { @@ -1080,7 +1081,7 @@ UserEnterExclusive(); /* Create Clipboard data object */ - pMemObj = UserCreateObject(gHandleTable, NULL, &hMem, otClipBoardData, sizeof(CLIPBOARDDATA) + cbData); + pMemObj = UserCreateObject(gHandleTable, NULL, NULL, &hMem, otClipBoardData, sizeof(CLIPBOARDDATA) + cbData); if (!pMemObj) goto cleanup; Modified: branches/ros-csrss/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -93,74 +93,4 @@ return Status; } - -NTSTATUS -APIENTRY -CsrInsertObject(HANDLE ObjectHandle, - ACCESS_MASK DesiredAccess, - PHANDLE Handle) -{ - NTSTATUS Status; - HANDLE CsrProcessHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - CLIENT_ID Cid; - - /* Put CSR'S CID */ - Cid.UniqueProcess = CsrProcess->UniqueProcessId; - Cid.UniqueThread = 0; - - /* Empty Attributes */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - - /* Get a Handle to Csrss */ - Status = ZwOpenProcess(&CsrProcessHandle, - PROCESS_DUP_HANDLE, - &ObjectAttributes, - &Cid); - - if ((NT_SUCCESS(Status))) - { - /* Duplicate the Handle */ - Status = ZwDuplicateObject(NtCurrentProcess(), - ObjectHandle, - CsrProcessHandle, - Handle, - DesiredAccess, - OBJ_INHERIT, - 0); - - /* Close our handle to CSRSS */ - ZwClose(CsrProcessHandle); - } - - return Status; -} - -NTSTATUS FASTCALL -CsrCloseHandle(HANDLE Handle) -{ - NTSTATUS Status; - PEPROCESS OldProcess; - - /* Switch to the process in which the handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(&CsrProcess->Pcb); - } - - Status = ZwClose(Handle); - - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } - - return Status; -} - /* EOF */ Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -209,7 +209,7 @@ PCURICON_OBJECT CurIcon; HANDLE hCurIcon; - CurIcon = UserCreateObject(gHandleTable, NULL, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); + CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); if (!CurIcon) { Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -11,11 +11,17 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserDesktop); -static -VOID -IntFreeDesktopHeap( - IN OUT PDESKTOP Desktop -); +static NTSTATUS +UserInitializeDesktop(PDESKTOP pdesk, PUNICODE_STRING DesktopName, PWINSTATION_OBJECT pwinsta); + +static NTSTATUS +IntMapDesktopView(IN PDESKTOP pdesk); + +static NTSTATUS +IntUnmapDesktopView(IN PDESKTOP pdesk); + +static VOID +IntFreeDesktopHeap(IN PDESKTOP pdesk); /* GLOBALS *******************************************************************/ @@ -23,6 +29,8 @@ PDESKTOP InputDesktop = NULL; HDESK InputDesktopHandle = NULL; HDC ScreenDeviceContext = NULL; +PTHREADINFO gptiDesktopThread; +HCURSOR gDesktopCursor = NULL; /* OBJECT CALLBACKS **********************************************************/ @@ -112,17 +120,16 @@ sizeof(DESKTOP), 0, 0, - (PVOID)&Desktop); + (PVOID*)&Desktop); if (!NT_SUCCESS(Status)) return Status; - /* Initialize shell hook window list and set the parent */ - RtlZeroMemory(Desktop, sizeof(DESKTOP)); - InitializeListHead(&Desktop->ShellHookWindows); - Desktop->rpwinstaParent = (PWINSTATION_OBJECT)ParseObject; - - /* Put the desktop on the window station's list of associated desktops */ - InsertTailList(&Desktop->rpwinstaParent->DesktopListHead, - &Desktop->ListEntry); + /* Initialize the desktop */ + Status = UserInitializeDesktop(Desktop, RemainingName, WinStaObject); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(Desktop); + return Status; + } /* Set the desktop object and return success */ *Object = Desktop; @@ -133,22 +140,29 @@ VOID APIENTRY IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) { - PDESKTOP Desktop = (PDESKTOP)Parameters->Object; - - TRACE("Deleting desktop object 0x%p\n", Desktop); + PDESKTOP pdesk = (PDESKTOP)Parameters->Object; + + TRACE("Deleting desktop object 0x%p\n", pdesk); + + ASSERT(pdesk->pDeskInfo->spwnd->spwndChild == NULL); + + if (pdesk->pDeskInfo->spwnd) + co_UserDestroyWindow(pdesk->pDeskInfo->spwnd); + + if (pdesk->spwndMessage) + co_UserDestroyWindow(pdesk->spwndMessage); /* Remove the desktop from the window station's list of associcated desktops */ - RemoveEntryList(&Desktop->ListEntry); - - IntFreeDesktopHeap(Desktop); + RemoveEntryList(&pdesk->ListEntry); + + /* Free the heap */ + IntFreeDesktopHeap(pdesk); } NTSTATUS NTAPI IntDesktopOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters) { - PTHREADINFO pti; - - pti = PsGetCurrentThreadWin32Thread(); + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); if( pti == NULL) { @@ -165,6 +179,29 @@ return STATUS_SUCCESS; } + +NTSTATUS NTAPI IntDesktopObjectOpen(PWIN32_OPENMETHOD_PARAMETERS Parameters) +{ + PPROCESSINFO ppi = PsGetProcessWin32Process(Parameters->Process); + if (ppi == NULL) + return STATUS_SUCCESS; + + return IntMapDesktopView((PDESKTOP)Parameters->Object); +} + +NTSTATUS NTAPI IntDesktopObjectClose(PWIN32_CLOSEMETHOD_PARAMETERS Parameters) +{ + PPROCESSINFO ppi = PsGetProcessWin32Process(Parameters->Process); + if (ppi == NULL) + { + /* This happens when the process leaks desktop handles. + * At this point the PPROCESSINFO is already destroyed */ + return STATUS_SUCCESS; + } + + return IntUnmapDesktopView((PDESKTOP)Parameters->Object); +} + /* PRIVATE FUNCTIONS **********************************************************/ @@ -596,8 +633,66 @@ case WM_SYSCOLORCHANGE: co_UserRedrawWindow(Wnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN); return TRUE; - } - return FALSE; // Not processed so go with callback. + case WM_SETCURSOR: + { + PCURICON_OBJECT pcurOld, pcurNew; + pcurNew = UserGetCurIconObject(gDesktopCursor); + if (!pcurNew) + { + return TRUE; + } + pcurOld = UserSetCursor(pcurNew, FALSE); + if (pcurOld) + { + UserDereferenceObject(pcurOld); + } + } + } + return TRUE; /* We are done. Do not do any callbacks to user mode */ +} + +BOOL FASTCALL +UserMessageWindowProc(PWND pwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *lResult) +{ + *lResult = 0; + + switch(Msg) + { + case WM_NCCREATE: + pwnd->fnid |= FNID_MESSAGEWND; + *lResult = (LRESULT)TRUE; + break; + case WM_DESTROY: + pwnd->fnid |= FNID_DESTROY; + break; + } + + return TRUE; /* We are done. Do not do any callbacks to user mode */ +} + +VOID NTAPI DesktopThreadMain() +{ + BOOL Ret; + MSG Msg; + + gptiDesktopThread = PsGetCurrentThreadWin32Thread(); + + UserEnterExclusive(); + + /* Register system classes. This thread does not belong to any desktop so the + classes will be allocated from the shared heap */ + UserRegisterSystemClasses(); + + while(TRUE) + { + Ret = co_IntGetPeekMessage(&Msg, 0, 0, 0, PM_REMOVE, TRUE); + if (Ret) + { + IntDispatchMessage(&Msg); + } + } + + UserLeave(); } HDC FASTCALL @@ -813,6 +908,8 @@ static VOID IntFreeDesktopHeap(IN OUT PDESKTOP Desktop) { + /* FIXME: Disable until unmapping works in mm */ +#if 0 if (Desktop->pheapDesktop != NULL) { MmUnmapViewInSessionSpace(Desktop->pheapDesktop); @@ -824,6 +921,7 @@ ObDereferenceObject(Desktop->hsectionDesktop); Desktop->hsectionDesktop = NULL; } +#endif } BOOL FASTCALL @@ -1030,6 +1128,61 @@ return TRUE; } +static NTSTATUS +UserInitializeDesktop(PDESKTOP pdesk, PUNICODE_STRING DesktopName, PWINSTATION_OBJECT pwinsta) +{ + PVOID DesktopHeapSystemBase = NULL; + ULONG_PTR HeapSize = 400 * 1024; + SIZE_T DesktopInfoSize; + ULONG i; + + TRACE("UserInitializeDesktop desktop 0x%p with name %wZ\n", pdesk, DesktopName); + + RtlZeroMemory(pdesk, sizeof(DESKTOP)); + + /* Link the desktop with the parent window station */ + pdesk->rpwinstaParent = pwinsta; + InsertTailList(&pwinsta->DesktopListHead, &pdesk->ListEntry); + + /* Create the desktop heap */ + pdesk->hsectionDesktop = NULL; + pdesk->pheapDesktop = UserCreateHeap(&pdesk->hsectionDesktop, + &DesktopHeapSystemBase, + HeapSize); + if (pdesk->pheapDesktop == NULL) + { + ERR("Failed to create desktop heap!\n"); + return STATUS_NO_MEMORY; + } + + /* Create DESKTOPINFO */ + DesktopInfoSize = sizeof(DESKTOPINFO) + DesktopName->Length + sizeof(WCHAR); + pdesk->pDeskInfo = RtlAllocateHeap(pdesk->pheapDesktop, + HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY, + DesktopInfoSize); + if (pdesk->pDeskInfo == NULL) + { + ERR("Failed to create the DESKTOP structure!\n"); + return STATUS_NO_MEMORY; + } + + /* Initialize the DESKTOPINFO */ + pdesk->pDeskInfo->pvDesktopBase = DesktopHeapSystemBase; + pdesk->pDeskInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); + RtlCopyMemory(pdesk->pDeskInfo->szDesktopName, + DesktopName->Buffer, + DesktopName->Length + sizeof(WCHAR)); + for (i = 0; i < NB_HOOKS; i++) + { + InitializeListHead(&pdesk->pDeskInfo->aphkStart[i]); + } + + InitializeListHead(&pdesk->ShellHookWindows); + InitializeListHead(&pdesk->PtiList); + + return STATUS_SUCCESS; +} + /* SYSCALLS *******************************************************************/ /* @@ -1073,43 +1226,35 @@ DWORD dwFlags, ACCESS_MASK dwDesiredAccess) { - PDESKTOP DesktopObject; - UNICODE_STRING DesktopName; + PDESKTOP pdesk = NULL; NTSTATUS Status = STATUS_SUCCESS; - HDESK Desktop; - CSR_API_MESSAGE Request; - PVOID DesktopHeapSystemBase = NULL; - SIZE_T DesktopInfoSize; + HDESK hdesk; BOOLEAN Context; - ULONG_PTR HeapSize = 400 * 1024; /* FIXME: Windows uses 200KB by default */ UNICODE_STRING ClassName; LARGE_STRING WindowName; BOOL NoHooks = FALSE; PWND pWnd = NULL; CREATESTRUCTW Cs; - INT i; PTHREADINFO ptiCurrent; + PCLS pcls; + DECLARE_RETURN(HDESK); TRACE("Enter NtUserCreateDesktop\n"); UserEnterExclusive(); ptiCurrent = PsGetCurrentThreadWin32Thread(); - if (ptiCurrent) - { + ASSERT(ptiCurrent); + ASSERT(gptiDesktopThread); + /* Turn off hooks when calling any CreateWindowEx from inside win32k. */ - NoHooks = (ptiCurrent->TIF_flags & TIF_DISABLEHOOKS); - ptiCurrent->TIF_flags |= TIF_DISABLEHOOKS; - ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; - } - /*else - {ERR("NtUserCreateDesktop: No ptiCurrent\n");}*/ - DesktopName.Buffer = NULL; + NoHooks = (ptiCurrent->TIF_flags & TIF_DISABLEHOOKS); + ptiCurrent->TIF_flags |= TIF_DISABLEHOOKS; + ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; /* * Try to open already existing desktop */ - Status = ObOpenObjectByName( ObjectAttributes, ExDesktopObjectType, @@ -1117,142 +1262,98 @@ NULL, dwDesiredAccess, (PVOID)&Context, - (HANDLE*)&Desktop); - if (!NT_SUCCESS(Status)) RETURN(NULL); + (HANDLE*)&hdesk); + if (!NT_SUCCESS(Status)) + { + ERR("ObOpenObjectByName failed to open/create desktop\n"); + SetLastNtError(Status); + RETURN(NULL); + } /* In case the object was not created (eg if it existed), return now */ if (Context == FALSE) { TRACE("NtUserCreateDesktop opened desktop %wZ\n", ObjectAttributes->ObjectName); - RETURN( Desktop); - } - - /* Capture desktop name */ - _SEH2_TRY - { - ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); - - Status = IntSafeCopyUnicodeStringTerminateNULL(&DesktopName, ObjectAttributes->ObjectName); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (! NT_SUCCESS(Status)) - { - ERR("Failed reading Object Attributes from user space.\n"); - SetLastNtError(Status); - RETURN( NULL); + RETURN( hdesk); } /* Reference the desktop */ - Status = ObReferenceObjectByHandle(Desktop, + Status = ObReferenceObjectByHandle(hdesk, 0, ExDesktopObjectType, KernelMode, - (PVOID)&DesktopObject, + (PVOID*)&pdesk, NULL); if (!NT_SUCCESS(Status)) { ERR("Failed to reference desktop object\n"); + SetLastNtError(Status); RETURN(NULL); } - TRACE("NtUserCreateDesktop created desktop 0x%p with name %wZ\n", DesktopObject, &DesktopName); - - DesktopObject->hsectionDesktop = NULL; - DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->hsectionDesktop, - &DesktopHeapSystemBase, - HeapSize); - if (DesktopObject->pheapDesktop == NULL) - { - ObDereferenceObject(DesktopObject); - ERR("Failed to create desktop heap!\n"); - RETURN(NULL); - } - - DesktopInfoSize = sizeof(DESKTOPINFO) + DesktopName.Length + sizeof(WCHAR); - - DesktopObject->pDeskInfo = RtlAllocateHeap(DesktopObject->pheapDesktop, - HEAP_NO_SERIALIZE, - DesktopInfoSize); - - if (DesktopObject->pDeskInfo == NULL) - { - ObDereferenceObject(DesktopObject); - ERR("Failed to create the DESKTOP structure!\n"); - RETURN(NULL); - } - - RtlZeroMemory(DesktopObject->pDeskInfo, - DesktopInfoSize); - - DesktopObject->pDeskInfo->pvDesktopBase = DesktopHeapSystemBase; - DesktopObject->pDeskInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); - RtlCopyMemory(DesktopObject->pDeskInfo->szDesktopName, - DesktopName.Buffer, - DesktopName.Length + sizeof(WCHAR)); - - /* Initialize some local (to win32k) desktop state. */ - InitializeListHead(&DesktopObject->PtiList); - DesktopObject->ActiveMessageQueue = NULL; - - /* Setup Global Hooks. */ - for (i = 0; i < NB_HOOKS; i++) - { - InitializeListHead(&DesktopObject->pDeskInfo->aphkStart[i]); - } - - /* - * Create a handle for CSRSS and notify CSRSS for Creating Desktop Background Windows and Threads. + if (!ptiCurrent->rpdesk) IntSetThreadDesktop(hdesk,FALSE); + + /* Get the desktop window class. The thread desktop does not belong to any desktop + * so the classes created there (including the desktop class) are allocated in the shared heap + * It would cause problems if we used a class that belongs to the caller */ - Request.ApiNumber = CSR_CREATE_API_NUMBER(CSR_GUI, CREATE_DESKTOP); - Status = CsrInsertObject(Desktop, - GENERIC_ALL, - (HANDLE*)&Request.Data.CreateDesktopRequest.DesktopHandle); - if (! NT_SUCCESS(Status)) - { - ERR("Failed to create desktop handle for CSRSS\n"); - ZwClose(Desktop); - SetLastNtError(Status); - RETURN( NULL); - } - - Status = co_CsrNotify((PCSR_API_MESSAGE)&Request, - sizeof(CSR_API_MESSAGE)); - if (! NT_SUCCESS(Status)) - { - CsrCloseHandle(Request.Data.CreateDesktopRequest.DesktopHandle); - ERR("Failed to notify CSRSS about new desktop\n"); - ZwClose(Desktop); - SetLastNtError(Status); - RETURN( NULL); - } - - if (ptiCurrent && !ptiCurrent->rpdesk) IntSetThreadDesktop(Desktop,FALSE); - - ClassName.Buffer = ((PWSTR)((ULONG_PTR)(WORD)(gpsi->atomSysClass[ICLS_HWNDMESSAGE]))); + ClassName.Buffer = WC_DESKTOP; ClassName.Length = 0; + pcls = IntGetAndReferenceClass(&ClassName, 0, TRUE); + if (pcls == NULL) + { + ASSERT(FALSE); + RETURN(NULL); + } + RtlZeroMemory(&WindowName, sizeof(WindowName)); - + RtlZeroMemory(&Cs, sizeof(Cs)); + Cs.x = UserGetSystemMetrics(SM_XVIRTUALSCREEN), + Cs.y = UserGetSystemMetrics(SM_YVIRTUALSCREEN), + Cs.cx = UserGetSystemMetrics(SM_CXVIRTUALSCREEN), + Cs.cy = UserGetSystemMetrics(SM_CYVIRTUALSCREEN), + Cs.style = WS_POPUP|WS_CLIPCHILDREN; + Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! + Cs.lpszName = (LPCWSTR) &WindowName; + Cs.lpszClass = (LPCWSTR) &ClassName; + + /* Use IntCreateWindow instead of co_UserCreateWindowEx cause the later expects a thread with a desktop */ + pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); + if (pWnd == NULL) + { + ERR("Failed to create desktop window for the new desktop\n"); + RETURN(NULL); + } + + pdesk->DesktopWindow = pWnd->head.h; + pdesk->pDeskInfo->spwnd = pWnd; + pWnd->fnid = FNID_DESKTOP; + + ClassName.Buffer = MAKEINTATOM(gpsi->atomSysClass[ICLS_HWNDMESSAGE]); + ClassName.Length = 0; + pcls = IntGetAndReferenceClass(&ClassName, 0, TRUE); + if (pcls == NULL) + { + ASSERT(FALSE); + RETURN(NULL); + } + + RtlZeroMemory(&WindowName, sizeof(WindowName)); RtlZeroMemory(&Cs, sizeof(Cs)); Cs.cx = Cs.cy = 100; Cs.style = WS_POPUP|WS_CLIPCHILDREN; - Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Leave it to Timo to not pass on notes! + Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Cs.lpszName = (LPCWSTR) &WindowName; Cs.lpszClass = (LPCWSTR) &ClassName; - - pWnd = co_UserCreateWindowEx(&Cs, &ClassName, &WindowName, NULL); - if (!pWnd) - { - ERR("Failed to create Message window handle\n"); - } - else - { - DesktopObject->spwndMessage = pWnd; - } + pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); + if (pWnd == NULL) + { + ERR("Failed to create message window for the new desktop\n"); + RETURN(NULL); + } + + pdesk->spwndMessage = pWnd; + pWnd->fnid = FNID_MESSAGEWND; /* Now,,, if !(WinStaObject->Flags & WSF_NOIO) is (not set) for desktop input output mode (see wiki) @@ -1262,14 +1363,18 @@ The rest is same as message window. http://msdn.microsoft.com/en-us/library/bb760250(VS.85).aspx */ - RETURN( Desktop); + RETURN( hdesk); CLEANUP: - if(DesktopName.Buffer != NULL) - { - ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); - } - if (!NoHooks && ptiCurrent) + if (pdesk != NULL) + { + ObDereferenceObject(pdesk); + } + if (_ret_ == NULL && hdesk != NULL) + { + ObCloseHandle(hdesk, UserMode); + } + if (!NoHooks) { ptiCurrent->TIF_flags &= ~TIF_DISABLEHOOKS; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/desktop.h [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -73,6 +73,7 @@ extern HDESK InputDesktopHandle; extern PCLS DesktopWindowClass; extern HDC ScreenDeviceContext; +extern PTHREADINFO gptiDesktopThread; typedef struct _SHELL_HOOK_WINDOW { @@ -104,6 +105,12 @@ NTSTATUS NTAPI IntDesktopOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters); +NTSTATUS NTAPI +IntDesktopObjectOpen(PWIN32_OPENMETHOD_PARAMETERS Parameters); + +NTSTATUS NTAPI +IntDesktopObjectClose(PWIN32_CLOSEMETHOD_PARAMETERS Parameters); + HDC FASTCALL IntGetScreenDC(VOID); @@ -283,4 +290,6 @@ PWND FASTCALL co_GetDesktopWindow(PWND); BOOL FASTCALL IntPaintDesktop(HDC); BOOL FASTCALL DesktopWindowProc(PWND, UINT, WPARAM, LPARAM, LRESULT *); +BOOL FASTCALL UserMessageWindowProc(PWND pwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *lResult); +VOID NTAPI DesktopThreadMain(); /* EOF */ Modified: branches/ros-csrss/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/e… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/event.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -378,7 +378,7 @@ } } // Creator, pti is set here. - pEH = UserCreateObject(gHandleTable, NULL, &Handle, otEvent, sizeof(EVENTHOOK)); + pEH = UserCreateObject(gHandleTable, NULL, NULL, &Handle, otEvent, sizeof(EVENTHOOK)); if (pEH) { InsertTailList(&GlobalEvents->Events, &pEH->Chain); Modified: branches/ros-csrss/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/h… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/hook.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -1569,7 +1569,7 @@ } ObDereferenceObject(WinStaObj); - Hook = UserCreateObject(gHandleTable, NULL, (PHANDLE)&Handle, otHook, sizeof(HOOK)); + Hook = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&Handle, otHook, sizeof(HOOK)); if (!Hook) { Modified: branches/ros-csrss/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/i… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/input.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -304,6 +304,7 @@ switch (Type) { case 0: RawInputThreadMain(); break; + case 1: DesktopThreadMain(); break; default: ERR("Wrong type: %x\n", Type); } Modified: branches/ros-csrss/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/k… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -131,7 +131,7 @@ L"Control\\Keyboard Layouts\\"; /* Create keyboard layout file object */ - pkf = UserCreateObject(gHandleTable, NULL, NULL, otKBDfile, sizeof(KBDFILE)); + pkf = UserCreateObject(gHandleTable, NULL, NULL, NULL, otKBDfile, sizeof(KBDFILE)); if (!pkf) { ERR("Failed to create object!\n"); @@ -206,7 +206,7 @@ PKL pKl; /* Create keyboard layout object */ - pKl = UserCreateObject(gHandleTable, NULL, NULL, otKBDlayout, sizeof(KL)); + pKl = UserCreateObject(gHandleTable, NULL, NULL, NULL, otKBDlayout, sizeof(KL)); if (!pKl) { ERR("Failed to create object!\n"); Modified: branches/ros-csrss/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/main.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -304,6 +304,7 @@ if (ptiCurrent->KeyboardLayout) UserReferenceObject(ptiCurrent->KeyboardLayout); ptiCurrent->TIF_flags &= ~TIF_INCLEANUP; + ptiCurrent->pcti = &ptiCurrent->cti; /* Initialize the CLIENTINFO */ pci = (PCLIENTINFO)pTeb->Win32ClientInfo; @@ -624,14 +625,16 @@ DPRINT("Win32k hInstance 0x%p!\n",hModuleWin); /* Register Object Manager Callbacks */ + CalloutData.ProcessCallout = Win32kProcessCallback; + CalloutData.ThreadCallout = Win32kThreadCallback; CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; + CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; + CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; - CalloutData.ProcessCallout = Win32kProcessCallback; - CalloutData.ThreadCallout = Win32kThreadCallback; + CalloutData.DesktopCloseProcedure = IntDesktopObjectClose; + CalloutData.DesktopOpenProcedure = IntDesktopObjectOpen; CalloutData.BatchFlushRoutine = NtGdiFlushUserBatch; - CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; - CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; /* Register our per-process and per-thread structures. */ PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); Modified: branches/ros-csrss/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/menu.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -249,7 +249,8 @@ PPROCESSINFO CurrentWin32Process; Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, - NULL, + NULL, + NULL, Handle, otMenu, sizeof(MENU_OBJECT)); @@ -360,8 +361,9 @@ return NULL; Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, - NULL, - &hMenu, + NULL, + NULL, + &hMenu, otMenu, sizeof(MENU_OBJECT)); if(!Menu) Modified: branches/ros-csrss/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/message.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -714,6 +714,13 @@ pMsg->lParam, &retval); break; + case FNID_MESSAGEWND: + DoCallBack = !UserMessageWindowProc( Window, + pMsg->message, + pMsg->wParam, + pMsg->lParam, + &retval); + break; } } @@ -1306,6 +1313,9 @@ { case FNID_DESKTOP: DoCallBack = !DesktopWindowProc(Window, Msg, wParam, lParam,(LRESULT*)&Result); + break; + case FNID_MESSAGEWND: + DoCallBack = !UserMessageWindowProc(Window, Msg, wParam, lParam,(LRESULT*)&Result); break; } if (!DoCallBack) @@ -1589,6 +1599,9 @@ { case FNID_DESKTOP: DoCallBack = !DesktopWindowProc(Window, Msg, wParam, lParamPacked, (LRESULT*)&Result); + break; + case FNID_MESSAGEWND: + DoCallBack = !UserMessageWindowProc(Window, Msg, wParam, lParam,(LRESULT*)&Result); break; } } @@ -2233,6 +2246,16 @@ } break; } + + case FNID_MESSAGEWND: + { + Window = UserGetWindowObject(hWnd); + if (Window) + { + Ret = !UserMessageWindowProc(Window, Msg, wParam, lParam,&lResult); + } + break; + } case FNID_DEFWINDOWPROC: /* Validate input */ if (hWnd) Modified: branches/ros-csrss/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/monitor.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/monitor.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -32,7 +32,7 @@ PMONITOR IntCreateMonitorObject() { - return UserCreateObject(gHandleTable, NULL, NULL, otMonitor, sizeof(MONITOR)); + return UserCreateObject(gHandleTable, NULL, NULL, NULL, otMonitor, sizeof(MONITOR)); } /* IntDestroyMonitorObject Modified: branches/ros-csrss/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -101,7 +101,7 @@ } /* Window has not been found */ - return NULL; + return pwndDesktop; } PCURICON_OBJECT Modified: branches/ros-csrss/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -298,4 +298,13 @@ DWORD APIENTRY IntGetQueueStatus(DWORD); UINT lParamMemorySize(UINT Msg, WPARAM wParam, LPARAM lParam); + +BOOL FASTCALL +co_IntGetPeekMessage( PMSG pMsg, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax, + UINT RemoveMsg, + BOOL bGMSG ); + /* EOF */ Modified: branches/ros-csrss/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/object.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -315,20 +315,24 @@ FASTCALL UserCreateObject( PUSER_HANDLE_TABLE ht, PDESKTOP pDesktop, + PTHREADINFO pti, HANDLE* h, USER_OBJECT_TYPE type, ULONG size) { HANDLE hi; PVOID Object; - PTHREADINFO pti; PPROCESSINFO ppi; BOOL dt; PDESKTOP rpdesk = pDesktop; - pti = GetW32ThreadInfo(); + /* We could get the desktop for the new object from the pti however this is + * not always the case for example when creating a new desktop window for + * the desktop thread*/ + + if (!pti) pti = GetW32ThreadInfo(); + if (!pDesktop) rpdesk = pti->rpdesk; ppi = pti->ppi; - if (!pDesktop) rpdesk = pti->rpdesk; switch (type) { Modified: branches/ros-csrss/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/object.h [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -33,7 +33,7 @@ VOID FASTCALL UserReferenceObject(PVOID obj); PVOID FASTCALL UserReferenceObjectByHandle(HANDLE handle, USER_OBJECT_TYPE type); BOOL FASTCALL UserDereferenceObject(PVOID obj); -PVOID FASTCALL UserCreateObject(PUSER_HANDLE_TABLE ht, struct _DESKTOP* pDesktop, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); +PVOID FASTCALL UserCreateObject(PUSER_HANDLE_TABLE ht, struct _DESKTOP* pDesktop, PTHREADINFO pti, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); BOOL FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ); PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE, HANDLE, USER_OBJECT_TYPE); Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -184,7 +184,8 @@ if (count == 0) count = 8; psmwp = (PSMWP) UserCreateObject( gHandleTable, - NULL, + NULL, + NULL, (PHANDLE)&hDwp, otSMWP, sizeof(SMWP)); Modified: branches/ros-csrss/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/t… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/timer.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -56,7 +56,7 @@ HANDLE Handle; PTIMER Ret = NULL; - Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); + Ret = UserCreateObject(gHandleTable, NULL, NULL, &Handle, otTimer, sizeof(TIMER)); if (Ret) { Ret->head.h = Handle; Modified: branches/ros-csrss/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/window.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -1661,7 +1661,8 @@ PCLS Class, PWND ParentWindow, PWND OwnerWindow, - PVOID acbiBuffer) + PVOID acbiBuffer, + PDESKTOP pdeskCreated) { PWND pWnd = NULL; HWND hWnd; @@ -1670,7 +1671,7 @@ BOOL MenuChanged; BOOL bUnicodeWindow; - pti = PsGetCurrentThreadWin32Thread(); + pti = pdeskCreated ? gptiDesktopThread : GetW32ThreadInfo(); if (!(Cs->dwExStyle & WS_EX_LAYOUTRTL)) { @@ -1690,8 +1691,7 @@ */ if ( Class->fnid != FNID_DIALOG ) { - PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); - if (ppi->dwLayout & LAYOUT_RTL) + if (pti->ppi->dwLayout & LAYOUT_RTL) { Cs->dwExStyle |= WS_EX_LAYOUTRTL; } @@ -1713,7 +1713,8 @@ /* Allocate the new window */ pWnd = (PWND) UserCreateObject( gHandleTable, - pti->rpdesk, + pdeskCreated ? pdeskCreated : pti->rpdesk, + pti, (PHANDLE)&hWnd, otWindow, sizeof(WND) + Class->cbwndExtra); @@ -1723,14 +1724,14 @@ goto AllocError; } - TRACE("Created object with handle %X\n", hWnd); - - if (NULL == pti->rpdesk->DesktopWindow) + TRACE("Created window object with handle %X\n", hWnd); + + if (pdeskCreated && pdeskCreated->DesktopWindow == NULL ) { /* HACK: Helper for win32csr/desktopbg.c */ /* If there is no desktop window yet, we must be creating it */ TRACE("CreateWindow setting desktop.\n"); - pti->rpdesk->DesktopWindow = hWnd; - pti->rpdesk->pDeskInfo->spwnd = pWnd; + pdeskCreated->DesktopWindow = hWnd; + pdeskCreated->pDeskInfo->spwnd = pWnd; } /* @@ -2010,7 +2011,7 @@ pCbtCreate = NULL; /* Get the class and reference it */ - Class = IntGetAndReferenceClass(ClassName, Cs->hInstance); + Class = IntGetAndReferenceClass(ClassName, Cs->hInstance, FALSE); if(!Class) { ERR("Failed to find class %wZ\n", ClassName); @@ -2059,7 +2060,8 @@ Class, ParentWindow, OwnerWindow, - acbiBuffer); + acbiBuffer, + NULL); if(!Window) { ERR("IntCreateWindow failed!\n"); @@ -2540,12 +2542,15 @@ TRACE("co_UserDestroyWindow \n"); - /* Check for owner thread */ - if ( (Window->head.pti->pEThread != PsGetCurrentThread()) || - Window->head.pti != PsGetCurrentThreadWin32Thread() ) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; + /* Check for owner thread */ + if ( Window->head.pti != PsGetCurrentThreadWin32Thread()) + { + /* Check if we are destroying the desktop window */ + if (! ((Window->head.rpdesk->dwDTFlags & DF_DESTROYED) && Window == Window->head.rpdesk->pDeskInfo->spwnd)) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } } /* If window was created successfully and it is hooked */ Modified: branches/ros-csrss/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/window.h [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -47,7 +47,13 @@ BOOL FASTCALL IntShowOwnedPopups( PWND owner, BOOL fShow ); LRESULT FASTCALL IntDefWindowProc( PWND Window, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL Ansi); VOID FASTCALL IntNotifyWinEvent(DWORD, PWND, LONG, LONG, DWORD); -PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW*, PUNICODE_STRING, PLARGE_STRING, PVOID); +PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, + PLARGE_STRING WindowName, + PCLS Class, + PWND ParentWindow, + PWND OwnerWindow, + PVOID acbiBuffer, + PDESKTOP pdeskCreated); BOOL FASTCALL IntEnableWindow(HWND,BOOL); BOOL FASTCALL IntIsWindowVisible(PWND); DWORD FASTCALL GetNCHitEx(PWND,POINT); Modified: branches/ros-csrss/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/winsta.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -229,10 +229,7 @@ { TEXTMETRICW tmw; UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); - if (! IntCreatePrimarySurface()) - { - return FALSE; - } + ScreenDeviceContext = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); if (NULL == ScreenDeviceContext) { @@ -240,6 +237,11 @@ return FALSE; } GreSetDCOwner(ScreenDeviceContext, GDI_OBJ_HMGR_PUBLIC); + + if (! IntCreatePrimarySurface()) + { + return FALSE; + } /* Setup the cursor */ co_IntLoadDefaultCursors(); Modified: branches/ros-csrss/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -2137,21 +2137,23 @@ ULONG ArgumentLength) { BOOL *DefaultCursor = (BOOL*)Arguments; - LRESULT Result = TRUE; + HCURSOR hCursor; if(*DefaultCursor) { /* set default cursor */ - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); + SetCursor(hCursor); } else { /* FIXME load system cursor scheme */ SetCursor(0); - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); - } - - return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); + hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); + SetCursor(hCursor); + } + + return(ZwCallbackReturn(&hCursor, sizeof(HCURSOR), STATUS_SUCCESS)); } BOOL get_icon_size(HICON hIcon, SIZE *size) Modified: branches/ros-csrss/win32ss/user/winsrv/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -141,6 +141,9 @@ UNICODE_STRING TempStringU, ParamStringU; ANSI_STRING TempStringA; + if (SizeOfAllUnicodeStrings) + *SizeOfAllUnicodeStrings = 0; + /* Read all strings from client space */ for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) { @@ -227,7 +230,9 @@ return Status; } - *SizeOfAllUnicodeStrings = Size; + if (SizeOfAllUnicodeStrings) + *SizeOfAllUnicodeStrings = Size; + return Status; } Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -356,6 +356,28 @@ NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); } +static HHOOK hhk = NULL; + +/*** HACK from win32csr... ***/ +LRESULT +CALLBACK +KeyboardHookProc(int nCode, + WPARAM wParam, + LPARAM lParam) +{ + return CallNextHookEx(hhk, nCode, wParam, lParam); +} +/*** END - HACK from win32csr... ***/ + +DWORD +WINAPI +CreateSystemThreads(PVOID pParam) +{ + NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); + DPRINT1("This thread should not terminate!\n"); + return 0; +} + CSR_SERVER_DLL_INIT(UserServerDllInitialization) { /* @@ -377,6 +399,13 @@ } return Status; */ + +/*** From win32csr... ***/ + HANDLE ServerThread; + CLIENT_ID ClientId; + NTSTATUS Status; + UINT i; +/*** END - From win32csr... ***/ /* Initialize memory */ UserSrvHeap = RtlGetProcessHeap(); // Initialize our own heap. @@ -399,6 +428,21 @@ // LoadedServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; LoadedServerDll->HardErrorCallback = Win32CsrHardError; +/*** From win32csr... ***/ + /* Start the Raw Input Thread and the Desktop Thread */ + for (i = 0; i < 2; ++i) + { + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)i, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + DPRINT1("Cannot start Raw Input Thread!\n"); + } +/*** END - From win32csr... ***/ + /* All done */ return STATUS_SUCCESS; } @@ -422,6 +466,18 @@ if (DLL_PROCESS_ATTACH == dwReason) { DllHandle = hDll; + +/*** HACK from win32csr... ***/ + +// +// HACK HACK HACK ReactOS to BOOT! Initialization BUG ALERT! See bug 5655. +// + hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! + +/*** END - HACK from win32csr... ***/ } return TRUE; Modified: branches/ros-csrss/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] Sun Oct 28 12:13:03 2012 @@ -471,7 +471,7 @@ return TRUE; } -/*** Taken from win32ss/user/win32csr/desktopbg.c ***/ +/*** Taken from win32ss/user/consrv/console.c ***/ BOOL FASTCALL DtbgIsDesktopVisible(VOID) { @@ -485,9 +485,7 @@ return VisibleDesktopWindow != NULL; } -/****************************************************/ - -/*** Taken from win32ss/user/consrv/console.c ***/ + /* TODO: Find another way to do it. */ VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, PCSR_PROCESS ProcessData, DWORD Timeout)

1 0

[hbelusca] 57634: Update properties
by hbelusca＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: hbelusca Date: Sun Oct 28 12:00:19 2012 New Revision: 57634 URL: http://svn.reactos.org/svn/reactos?rev=57634&view=rev Log: Update properties Modified: branches/ros-csrss/ (props changed) Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 12:00:19 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57630 +/trunk/reactos:57561-57633

1 0

[gadamopoulos] 57633: - Fix build I wonder how ninja managed to compile this locally
by gadamopoulos＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: gadamopoulos Date: Sun Oct 28 10:43:48 2012 New Revision: 57633 URL: http://svn.reactos.org/svn/reactos?rev=57633&view=rev Log: - Fix build I wonder how ninja managed to compile this locally Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Oct 28 10:43:48 2012 @@ -2504,7 +2504,7 @@ UserEnterExclusive(); /* Call the internal function */ - pwnd = co_UserCreateWindowEx(&Cs, &ustrClassName, plstrWindowName, acbiBuffer, NULL); + pwnd = co_UserCreateWindowEx(&Cs, &ustrClassName, plstrWindowName, acbiBuffer); if(!pwnd) {

1 0

[gadamopoulos] 57632: - Rewrite NtUserCreateDesktop and move the desktop thread completely in win32k like in windows in order to let desktop objects to be destroyed - Disable deleting the desktop h...
by gadamopoulos＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: gadamopoulos Date: Sun Oct 28 10:34:41 2012 New Revision: 57632 URL: http://svn.reactos.org/svn/reactos?rev=57632&view=rev Log: - Rewrite NtUserCreateDesktop and move the desktop thread completely in win32k like in windows in order to let desktop objects to be destroyed - Disable deleting the desktop heap until CORE-6729 is fixed - See CORE-6723 for more details Modified: trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/win32ss/gdi/ntgdi/device.c trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/ntuser/accelerator.c trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callproc.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/class.h trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/csr.c trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/desktop.h trunk/reactos/win32ss/user/ntuser/event.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/monitor.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/timer.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/window.h trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/user32/windows/cursoricon.c trunk/reactos/win32ss/user/win32csr/desktopbg.c trunk/reactos/win32ss/user/win32csr/dllmain.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -40,6 +40,8 @@ PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpWindowStationObjectOkToClose = NULL; PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpDesktopObjectOkToClose = NULL; PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete = NULL; +PKWIN32_OPENMETHOD_CALLOUT ExpDesktopObjectOpen = NULL; +PKWIN32_CLOSEMETHOD_CALLOUT ExpDesktopObjectClose = NULL; /* FUNCTIONS ****************************************************************/ @@ -131,6 +133,44 @@ /* Call the Registered Callback */ ExpDesktopObjectDelete(&Parameters); +} + +NTSTATUS +NTAPI +ExpDesktopOpen(IN OB_OPEN_REASON Reason, + IN PEPROCESS Process OPTIONAL, + IN PVOID ObjectBody, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount) +{ + WIN32_OPENMETHOD_PARAMETERS Parameters; + + Parameters.OpenReason = Reason; + Parameters.Process = Process; + Parameters.Object = ObjectBody; + Parameters.GrantedAccess = GrantedAccess; + Parameters.HandleCount = HandleCount; + + return ExpDesktopObjectOpen(&Parameters); +} + +VOID +NTAPI +ExpDesktopClose(IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + WIN32_CLOSEMETHOD_PARAMETERS Parameters; + + Parameters.Process = Process; + Parameters.Object = Object; + Parameters.AccessMask = GrantedAccess; + Parameters.ProcessHandleCount = ProcessHandleCount; + Parameters.SystemHandleCount = SystemHandleCount; + + ExpDesktopObjectClose(&Parameters); } BOOLEAN @@ -169,6 +209,8 @@ ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; ObjectTypeInitializer.ParseProcedure = NULL; ObjectTypeInitializer.OkayToCloseProcedure = ExpDesktopOkToClose; + ObjectTypeInitializer.OpenProcedure = ExpDesktopOpen; + ObjectTypeInitializer.CloseProcedure = ExpDesktopClose; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -23,6 +23,8 @@ extern PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpWindowStationObjectOkToClose; extern PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpDesktopObjectOkToClose; extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; +extern PKWIN32_OPENMETHOD_CALLOUT ExpDesktopObjectOpen; +extern PKWIN32_CLOSEMETHOD_CALLOUT ExpDesktopObjectClose; extern PKWIN32_POWEREVENT_CALLOUT PopEventCallout; /* PRIVATE FUNCTIONS *********************************************************/ @@ -121,6 +123,8 @@ ExpWindowStationObjectOkToClose = CalloutData->WindowStationOkToCloseProcedure; ExpDesktopObjectOkToClose = CalloutData->DesktopOkToCloseProcedure; ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; + ExpDesktopObjectOpen = CalloutData->DesktopOpenProcedure; + ExpDesktopObjectClose = CalloutData->DesktopCloseProcedure; PopEventCallout = CalloutData->PowerEventCallout; KeGdiFlushUserBatch = CalloutData->BatchFlushRoutine; } Modified: trunk/reactos/win32ss/gdi/ntgdi/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/device.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -32,15 +32,15 @@ SURFOBJ *pso; PDESKTOP rpDesk; + /* Create surface */ + pso = &PDEVOBJ_pSurface(gppdevPrimary)->SurfObj; + SurfSize = pso->sizlBitmap; + /* Attach monitor */ UserAttachMonitor((HDEV)gppdevPrimary); DPRINT("IntCreatePrimarySurface, gppdevPrimary=%p, gppdevPrimary->pSurface = %p\n", gppdevPrimary, gppdevPrimary->pSurface); - - /* Create surface */ - pso = &PDEVOBJ_pSurface(gppdevPrimary)->SurfObj; - SurfSize = pso->sizlBitmap; /* Put the pointer in the center of the screen */ gpsi->ptCursor.x = pso->sizlBitmap.cx / 2; Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=57632&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -36,6 +36,7 @@ /* Win32 headers */ /* FIXME: Defines in winbase.h that we need... */ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#define MAKEINTATOM(i) (LPWSTR)((ULONG_PTR)((WORD)(i))) #define WINBASEAPI #define STARTF_USESIZE 2 #define STARTF_USEPOSITION 4 Modified: trunk/reactos/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/accele… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/accelerator.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -257,7 +257,7 @@ RETURN( (HACCEL) NULL ); } - Accel = UserCreateObject(gHandleTable, NULL, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); + Accel = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); if (Accel == NULL) { Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -130,6 +130,9 @@ BOOL bResult; ULONG_PTR pLibNameBuffer = 0, pInitFuncBuffer = 0; + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); + TRACE("co_IntClientLoadLibrary: %S, %S, %d, %d\n", pstrLibName->Buffer, pstrLibName->Buffer, Unload, ApiHook); /* Calculate the size of the argument */ @@ -235,6 +238,9 @@ PWND pWnd; ULONG ResultLength; NTSTATUS Status; + + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); Arguments.Callback = CompletionCallback; Arguments.Wnd = hWnd; @@ -280,6 +286,9 @@ ULONG ResultLength; ULONG ArgumentLength; LRESULT Result; + + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); if (0 < lParamBufferSize) { @@ -363,6 +372,9 @@ NTSTATUS Status; PVOID ResultPointer; ULONG ResultLength; + + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); ResultPointer = NULL; ResultLength = sizeof(LRESULT); @@ -394,6 +406,8 @@ return (HMENU)Result; } +extern HCURSOR gDesktopCursor; + BOOL APIENTRY co_IntLoadDefaultCursors(VOID) { @@ -402,8 +416,11 @@ ULONG ResultLength; BOOL DefaultCursor = TRUE; + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); + ResultPointer = NULL; - ResultLength = sizeof(LRESULT); + ResultLength = sizeof(HCURSOR); UserLeaveCo(); @@ -414,6 +431,9 @@ &ResultLength); UserEnterCo(); + + /* HACK: The desktop class doen't have a proper cursor yet, so set it here */ + gDesktopCursor = *((HCURSOR*)ResultPointer); if (!NT_SUCCESS(Status)) { @@ -448,6 +468,8 @@ UINT lParamSize = 0; ASSERT(Proc); + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); pti = PsGetCurrentThreadWin32Thread(); if (pti->TIF_flags & TIF_INCLEANUP) @@ -834,6 +856,9 @@ ULONG ArgumentLength, ResultLength; PVOID Argument, ResultPointer; + /* Do not allow the desktop thread to do callback to user mode */ + ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread); + ArgumentLength = ResultLength = 0; Argument = ResultPointer = NULL; Modified: trunk/reactos/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callpr… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -35,6 +35,7 @@ NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable, Desktop, + NULL, &Handle, otCallProc, sizeof(CALLPROCDATA)); Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -641,9 +641,17 @@ PCLS Class; ASSERT(BaseClass->pclsBase == BaseClass); - Class = IntGetClassForDesktop(BaseClass, - ClassLink, - Desktop); + if (Desktop != NULL) + { + Class = IntGetClassForDesktop(BaseClass, + ClassLink, + Desktop); + } + else + { + Class = BaseClass; + } + if (Class != NULL) { Class->cWndReferenceCount++; @@ -1286,13 +1294,16 @@ } PCLS -IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance) +IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance, BOOL bDesktopThread) { PCLS *ClassLink, Class = NULL; RTL_ATOM ClassAtom; PTHREADINFO pti; - pti = PsGetCurrentThreadWin32Thread(); + if (bDesktopThread) + pti = gptiDesktopThread; + else + pti = PsGetCurrentThreadWin32Thread(); if ( !(pti->ppi->W32PF_flags & W32PF_CLASSESREGISTERED )) { Modified: trunk/reactos/win32ss/user/ntuser/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -39,7 +39,7 @@ IN PPROCESSINFO pi); PCLS -IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance); +IntGetAndReferenceClass(PUNICODE_STRING ClassName, HINSTANCE hInstance, BOOL bDesktopThread); BOOL FASTCALL UserRegisterSystemClasses(VOID); Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -182,6 +182,7 @@ /* Create the clipboard data */ pClipboardData = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, + NULL, &hMem, otClipBoardData, cjDataSize); @@ -293,7 +294,7 @@ PCLIPBOARDDATA pMemObj; HANDLE hMem; - pMemObj = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, &hMem, otClipBoardData, + pMemObj = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, NULL, &hMem, otClipBoardData, sizeof(CLIPBOARDDATA) + sizeof(LCID)); if (pMemObj) { @@ -1080,7 +1081,7 @@ UserEnterExclusive(); /* Create Clipboard data object */ - pMemObj = UserCreateObject(gHandleTable, NULL, &hMem, otClipBoardData, sizeof(CLIPBOARDDATA) + cbData); + pMemObj = UserCreateObject(gHandleTable, NULL, NULL, &hMem, otClipBoardData, sizeof(CLIPBOARDDATA) + cbData); if (!pMemObj) goto cleanup; Modified: trunk/reactos/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -88,74 +88,4 @@ return Status; } - -NTSTATUS -APIENTRY -CsrInsertObject(HANDLE ObjectHandle, - ACCESS_MASK DesiredAccess, - PHANDLE Handle) -{ - NTSTATUS Status; - HANDLE CsrProcessHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - CLIENT_ID Cid; - - /* Put CSR'S CID */ - Cid.UniqueProcess = CsrProcess->UniqueProcessId; - Cid.UniqueThread = 0; - - /* Empty Attributes */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - - /* Get a Handle to Csrss */ - Status = ZwOpenProcess(&CsrProcessHandle, - PROCESS_DUP_HANDLE, - &ObjectAttributes, - &Cid); - - if ((NT_SUCCESS(Status))) - { - /* Duplicate the Handle */ - Status = ZwDuplicateObject(NtCurrentProcess(), - ObjectHandle, - CsrProcessHandle, - Handle, - DesiredAccess, - OBJ_INHERIT, - 0); - - /* Close our handle to CSRSS */ - ZwClose(CsrProcessHandle); - } - - return Status; -} - -NTSTATUS FASTCALL -CsrCloseHandle(HANDLE Handle) -{ - NTSTATUS Status; - PEPROCESS OldProcess; - - /* Switch to the process in which the handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(&CsrProcess->Pcb); - } - - Status = ZwClose(Handle); - - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } - - return Status; -} - /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -209,7 +209,7 @@ PCURICON_OBJECT CurIcon; HANDLE hCurIcon; - CurIcon = UserCreateObject(gHandleTable, NULL, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); + CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); if (!CurIcon) { Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -11,11 +11,17 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserDesktop); -static -VOID -IntFreeDesktopHeap( - IN OUT PDESKTOP Desktop -); +static NTSTATUS +UserInitializeDesktop(PDESKTOP pdesk, PUNICODE_STRING DesktopName, PWINSTATION_OBJECT pwinsta); + +static NTSTATUS +IntMapDesktopView(IN PDESKTOP pdesk); + +static NTSTATUS +IntUnmapDesktopView(IN PDESKTOP pdesk); + +static VOID +IntFreeDesktopHeap(IN PDESKTOP pdesk); /* GLOBALS *******************************************************************/ @@ -23,6 +29,8 @@ PDESKTOP InputDesktop = NULL; HDESK InputDesktopHandle = NULL; HDC ScreenDeviceContext = NULL; +PTHREADINFO gptiDesktopThread; +HCURSOR gDesktopCursor = NULL; /* OBJECT CALLBACKS **********************************************************/ @@ -112,17 +120,16 @@ sizeof(DESKTOP), 0, 0, - (PVOID)&Desktop); + (PVOID*)&Desktop); if (!NT_SUCCESS(Status)) return Status; - /* Initialize shell hook window list and set the parent */ - RtlZeroMemory(Desktop, sizeof(DESKTOP)); - InitializeListHead(&Desktop->ShellHookWindows); - Desktop->rpwinstaParent = (PWINSTATION_OBJECT)ParseObject; - - /* Put the desktop on the window station's list of associated desktops */ - InsertTailList(&Desktop->rpwinstaParent->DesktopListHead, - &Desktop->ListEntry); + /* Initialize the desktop */ + Status = UserInitializeDesktop(Desktop, RemainingName, WinStaObject); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(Desktop); + return Status; + } /* Set the desktop object and return success */ *Object = Desktop; @@ -133,22 +140,29 @@ VOID APIENTRY IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) { - PDESKTOP Desktop = (PDESKTOP)Parameters->Object; - - TRACE("Deleting desktop object 0x%p\n", Desktop); + PDESKTOP pdesk = (PDESKTOP)Parameters->Object; + + TRACE("Deleting desktop object 0x%p\n", pdesk); + + ASSERT(pdesk->pDeskInfo->spwnd->spwndChild == NULL); + + if (pdesk->pDeskInfo->spwnd) + co_UserDestroyWindow(pdesk->pDeskInfo->spwnd); + + if (pdesk->spwndMessage) + co_UserDestroyWindow(pdesk->spwndMessage); /* Remove the desktop from the window station's list of associcated desktops */ - RemoveEntryList(&Desktop->ListEntry); - - IntFreeDesktopHeap(Desktop); + RemoveEntryList(&pdesk->ListEntry); + + /* Free the heap */ + IntFreeDesktopHeap(pdesk); } NTSTATUS NTAPI IntDesktopOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters) { - PTHREADINFO pti; - - pti = PsGetCurrentThreadWin32Thread(); + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); if( pti == NULL) { @@ -165,6 +179,29 @@ return STATUS_SUCCESS; } + +NTSTATUS NTAPI IntDesktopObjectOpen(PWIN32_OPENMETHOD_PARAMETERS Parameters) +{ + PPROCESSINFO ppi = PsGetProcessWin32Process(Parameters->Process); + if (ppi == NULL) + return STATUS_SUCCESS; + + return IntMapDesktopView((PDESKTOP)Parameters->Object); +} + +NTSTATUS NTAPI IntDesktopObjectClose(PWIN32_CLOSEMETHOD_PARAMETERS Parameters) +{ + PPROCESSINFO ppi = PsGetProcessWin32Process(Parameters->Process); + if (ppi == NULL) + { + /* This happens when the process leaks desktop handles. + * At this point the PPROCESSINFO is already destroyed */ + return STATUS_SUCCESS; + } + + return IntUnmapDesktopView((PDESKTOP)Parameters->Object); +} + /* PRIVATE FUNCTIONS **********************************************************/ @@ -596,8 +633,66 @@ case WM_SYSCOLORCHANGE: co_UserRedrawWindow(Wnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN); return TRUE; - } - return FALSE; // Not processed so go with callback. + case WM_SETCURSOR: + { + PCURICON_OBJECT pcurOld, pcurNew; + pcurNew = UserGetCurIconObject(gDesktopCursor); + if (!pcurNew) + { + return TRUE; + } + pcurOld = UserSetCursor(pcurNew, FALSE); + if (pcurOld) + { + UserDereferenceObject(pcurOld); + } + } + } + return TRUE; /* We are done. Do not do any callbacks to user mode */ +} + +BOOL FASTCALL +UserMessageWindowProc(PWND pwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *lResult) +{ + *lResult = 0; + + switch(Msg) + { + case WM_NCCREATE: + pwnd->fnid |= FNID_MESSAGEWND; + *lResult = (LRESULT)TRUE; + break; + case WM_DESTROY: + pwnd->fnid |= FNID_DESTROY; + break; + } + + return TRUE; /* We are done. Do not do any callbacks to user mode */ +} + +VOID NTAPI DesktopThreadMain() +{ + BOOL Ret; + MSG Msg; + + gptiDesktopThread = PsGetCurrentThreadWin32Thread(); + + UserEnterExclusive(); + + /* Register system classes. This thread does not belong to any desktop so the + classes will be allocated from the shared heap */ + UserRegisterSystemClasses(); + + while(TRUE) + { + Ret = co_IntGetPeekMessage(&Msg, 0, 0, 0, PM_REMOVE, TRUE); + if (Ret) + { + IntDispatchMessage(&Msg); + } + } + + UserLeave(); } HDC FASTCALL @@ -813,6 +908,8 @@ static VOID IntFreeDesktopHeap(IN OUT PDESKTOP Desktop) { + /* FIXME: Disable until unmapping works in mm */ +#if 0 if (Desktop->pheapDesktop != NULL) { MmUnmapViewInSessionSpace(Desktop->pheapDesktop); @@ -824,6 +921,7 @@ ObDereferenceObject(Desktop->hsectionDesktop); Desktop->hsectionDesktop = NULL; } +#endif } BOOL FASTCALL @@ -1030,6 +1128,61 @@ return TRUE; } +static NTSTATUS +UserInitializeDesktop(PDESKTOP pdesk, PUNICODE_STRING DesktopName, PWINSTATION_OBJECT pwinsta) +{ + PVOID DesktopHeapSystemBase = NULL; + ULONG_PTR HeapSize = 400 * 1024; + SIZE_T DesktopInfoSize; + ULONG i; + + TRACE("UserInitializeDesktop desktop 0x%p with name %wZ\n", pdesk, DesktopName); + + RtlZeroMemory(pdesk, sizeof(DESKTOP)); + + /* Link the desktop with the parent window station */ + pdesk->rpwinstaParent = pwinsta; + InsertTailList(&pwinsta->DesktopListHead, &pdesk->ListEntry); + + /* Create the desktop heap */ + pdesk->hsectionDesktop = NULL; + pdesk->pheapDesktop = UserCreateHeap(&pdesk->hsectionDesktop, + &DesktopHeapSystemBase, + HeapSize); + if (pdesk->pheapDesktop == NULL) + { + ERR("Failed to create desktop heap!\n"); + return STATUS_NO_MEMORY; + } + + /* Create DESKTOPINFO */ + DesktopInfoSize = sizeof(DESKTOPINFO) + DesktopName->Length + sizeof(WCHAR); + pdesk->pDeskInfo = RtlAllocateHeap(pdesk->pheapDesktop, + HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY, + DesktopInfoSize); + if (pdesk->pDeskInfo == NULL) + { + ERR("Failed to create the DESKTOP structure!\n"); + return STATUS_NO_MEMORY; + } + + /* Initialize the DESKTOPINFO */ + pdesk->pDeskInfo->pvDesktopBase = DesktopHeapSystemBase; + pdesk->pDeskInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); + RtlCopyMemory(pdesk->pDeskInfo->szDesktopName, + DesktopName->Buffer, + DesktopName->Length + sizeof(WCHAR)); + for (i = 0; i < NB_HOOKS; i++) + { + InitializeListHead(&pdesk->pDeskInfo->aphkStart[i]); + } + + InitializeListHead(&pdesk->ShellHookWindows); + InitializeListHead(&pdesk->PtiList); + + return STATUS_SUCCESS; +} + /* SYSCALLS *******************************************************************/ /* @@ -1073,43 +1226,35 @@ DWORD dwFlags, ACCESS_MASK dwDesiredAccess) { - PDESKTOP DesktopObject; - UNICODE_STRING DesktopName; + PDESKTOP pdesk = NULL; NTSTATUS Status = STATUS_SUCCESS; - HDESK Desktop; - CSR_API_MESSAGE Request; - PVOID DesktopHeapSystemBase = NULL; - SIZE_T DesktopInfoSize; + HDESK hdesk; BOOLEAN Context; - ULONG_PTR HeapSize = 400 * 1024; /* FIXME: Windows uses 200KB by default */ UNICODE_STRING ClassName; LARGE_STRING WindowName; BOOL NoHooks = FALSE; PWND pWnd = NULL; CREATESTRUCTW Cs; - INT i; PTHREADINFO ptiCurrent; + PCLS pcls; + DECLARE_RETURN(HDESK); TRACE("Enter NtUserCreateDesktop\n"); UserEnterExclusive(); ptiCurrent = PsGetCurrentThreadWin32Thread(); - if (ptiCurrent) - { + ASSERT(ptiCurrent); + ASSERT(gptiDesktopThread); + /* Turn off hooks when calling any CreateWindowEx from inside win32k. */ - NoHooks = (ptiCurrent->TIF_flags & TIF_DISABLEHOOKS); - ptiCurrent->TIF_flags |= TIF_DISABLEHOOKS; - ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; - } - /*else - {ERR("NtUserCreateDesktop: No ptiCurrent\n");}*/ - DesktopName.Buffer = NULL; + NoHooks = (ptiCurrent->TIF_flags & TIF_DISABLEHOOKS); + ptiCurrent->TIF_flags |= TIF_DISABLEHOOKS; + ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; /* * Try to open already existing desktop */ - Status = ObOpenObjectByName( ObjectAttributes, ExDesktopObjectType, @@ -1117,141 +1262,98 @@ NULL, dwDesiredAccess, (PVOID)&Context, - (HANDLE*)&Desktop); - if (!NT_SUCCESS(Status)) RETURN(NULL); + (HANDLE*)&hdesk); + if (!NT_SUCCESS(Status)) + { + ERR("ObOpenObjectByName failed to open/create desktop\n"); + SetLastNtError(Status); + RETURN(NULL); + } /* In case the object was not created (eg if it existed), return now */ if (Context == FALSE) { TRACE("NtUserCreateDesktop opened desktop %wZ\n", ObjectAttributes->ObjectName); - RETURN( Desktop); - } - - /* Capture desktop name */ - _SEH2_TRY - { - ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); - - Status = IntSafeCopyUnicodeStringTerminateNULL(&DesktopName, ObjectAttributes->ObjectName); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (! NT_SUCCESS(Status)) - { - ERR("Failed reading Object Attributes from user space.\n"); - SetLastNtError(Status); - RETURN( NULL); + RETURN( hdesk); } /* Reference the desktop */ - Status = ObReferenceObjectByHandle(Desktop, + Status = ObReferenceObjectByHandle(hdesk, 0, ExDesktopObjectType, KernelMode, - (PVOID)&DesktopObject, + (PVOID*)&pdesk, NULL); if (!NT_SUCCESS(Status)) { ERR("Failed to reference desktop object\n"); + SetLastNtError(Status); RETURN(NULL); } - TRACE("NtUserCreateDesktop created desktop 0x%p with name %wZ\n", DesktopObject, &DesktopName); - - DesktopObject->hsectionDesktop = NULL; - DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->hsectionDesktop, - &DesktopHeapSystemBase, - HeapSize); - if (DesktopObject->pheapDesktop == NULL) - { - ObDereferenceObject(DesktopObject); - ERR("Failed to create desktop heap!\n"); - RETURN(NULL); - } - - DesktopInfoSize = sizeof(DESKTOPINFO) + DesktopName.Length + sizeof(WCHAR); - - DesktopObject->pDeskInfo = RtlAllocateHeap(DesktopObject->pheapDesktop, - HEAP_NO_SERIALIZE, - DesktopInfoSize); - - if (DesktopObject->pDeskInfo == NULL) - { - ObDereferenceObject(DesktopObject); - ERR("Failed to create the DESKTOP structure!\n"); - RETURN(NULL); - } - - RtlZeroMemory(DesktopObject->pDeskInfo, - DesktopInfoSize); - - DesktopObject->pDeskInfo->pvDesktopBase = DesktopHeapSystemBase; - DesktopObject->pDeskInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); - RtlCopyMemory(DesktopObject->pDeskInfo->szDesktopName, - DesktopName.Buffer, - DesktopName.Length + sizeof(WCHAR)); - - /* Initialize some local (to win32k) desktop state. */ - InitializeListHead(&DesktopObject->PtiList); - DesktopObject->ActiveMessageQueue = NULL; - - /* Setup Global Hooks. */ - for (i = 0; i < NB_HOOKS; i++) - { - InitializeListHead(&DesktopObject->pDeskInfo->aphkStart[i]); - } - - /* - * Create a handle for CSRSS and notify CSRSS for Creating Desktop Background Windows and Threads. + if (!ptiCurrent->rpdesk) IntSetThreadDesktop(hdesk,FALSE); + + /* Get the desktop window class. The thread desktop does not belong to any desktop + * so the classes created there (including the desktop class) are allocated in the shared heap + * It would cause problems if we used a class that belongs to the caller */ - Request.Type = MAKE_CSR_API(CREATE_DESKTOP, CSR_GUI); - Status = CsrInsertObject(Desktop, - GENERIC_ALL, - (HANDLE*)&Request.Data.CreateDesktopRequest.DesktopHandle); - if (! NT_SUCCESS(Status)) - { - ERR("Failed to create desktop handle for CSRSS\n"); - ZwClose(Desktop); - SetLastNtError(Status); - RETURN( NULL); - } - - Status = co_CsrNotify(&Request); - if (! NT_SUCCESS(Status)) - { - CsrCloseHandle(Request.Data.CreateDesktopRequest.DesktopHandle); - ERR("Failed to notify CSRSS about new desktop\n"); - ZwClose(Desktop); - SetLastNtError(Status); - RETURN( NULL); - } - - if (ptiCurrent && !ptiCurrent->rpdesk) IntSetThreadDesktop(Desktop,FALSE); - - ClassName.Buffer = ((PWSTR)((ULONG_PTR)(WORD)(gpsi->atomSysClass[ICLS_HWNDMESSAGE]))); + ClassName.Buffer = WC_DESKTOP; ClassName.Length = 0; + pcls = IntGetAndReferenceClass(&ClassName, 0, TRUE); + if (pcls == NULL) + { + ASSERT(FALSE); + RETURN(NULL); + } + RtlZeroMemory(&WindowName, sizeof(WindowName)); - + RtlZeroMemory(&Cs, sizeof(Cs)); + Cs.x = UserGetSystemMetrics(SM_XVIRTUALSCREEN), + Cs.y = UserGetSystemMetrics(SM_YVIRTUALSCREEN), + Cs.cx = UserGetSystemMetrics(SM_CXVIRTUALSCREEN), + Cs.cy = UserGetSystemMetrics(SM_CYVIRTUALSCREEN), + Cs.style = WS_POPUP|WS_CLIPCHILDREN; + Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! + Cs.lpszName = (LPCWSTR) &WindowName; + Cs.lpszClass = (LPCWSTR) &ClassName; + + /* Use IntCreateWindow instead of co_UserCreateWindowEx cause the later expects a thread with a desktop */ + pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); + if (pWnd == NULL) + { + ERR("Failed to create desktop window for the new desktop\n"); + RETURN(NULL); + } + + pdesk->DesktopWindow = pWnd->head.h; + pdesk->pDeskInfo->spwnd = pWnd; + pWnd->fnid = FNID_DESKTOP; + + ClassName.Buffer = MAKEINTATOM(gpsi->atomSysClass[ICLS_HWNDMESSAGE]); + ClassName.Length = 0; + pcls = IntGetAndReferenceClass(&ClassName, 0, TRUE); + if (pcls == NULL) + { + ASSERT(FALSE); + RETURN(NULL); + } + + RtlZeroMemory(&WindowName, sizeof(WindowName)); RtlZeroMemory(&Cs, sizeof(Cs)); Cs.cx = Cs.cy = 100; Cs.style = WS_POPUP|WS_CLIPCHILDREN; - Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Leave it to Timo to not pass on notes! + Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Cs.lpszName = (LPCWSTR) &WindowName; Cs.lpszClass = (LPCWSTR) &ClassName; - - pWnd = co_UserCreateWindowEx(&Cs, &ClassName, &WindowName, NULL); - if (!pWnd) - { - ERR("Failed to create Message window handle\n"); - } - else - { - DesktopObject->spwndMessage = pWnd; - } + pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); + if (pWnd == NULL) + { + ERR("Failed to create message window for the new desktop\n"); + RETURN(NULL); + } + + pdesk->spwndMessage = pWnd; + pWnd->fnid = FNID_MESSAGEWND; /* Now,,, if !(WinStaObject->Flags & WSF_NOIO) is (not set) for desktop input output mode (see wiki) @@ -1261,14 +1363,18 @@ The rest is same as message window. http://msdn.microsoft.com/en-us/library/bb760250(VS.85).aspx */ - RETURN( Desktop); + RETURN( hdesk); CLEANUP: - if(DesktopName.Buffer != NULL) - { - ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); - } - if (!NoHooks && ptiCurrent) + if (pdesk != NULL) + { + ObDereferenceObject(pdesk); + } + if (_ret_ == NULL && hdesk != NULL) + { + ObCloseHandle(hdesk, UserMode); + } + if (!NoHooks) { ptiCurrent->TIF_flags &= ~TIF_DISABLEHOOKS; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -73,6 +73,7 @@ extern HDESK InputDesktopHandle; extern PCLS DesktopWindowClass; extern HDC ScreenDeviceContext; +extern PTHREADINFO gptiDesktopThread; typedef struct _SHELL_HOOK_WINDOW { @@ -104,6 +105,12 @@ NTSTATUS NTAPI IntDesktopOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters); +NTSTATUS NTAPI +IntDesktopObjectOpen(PWIN32_OPENMETHOD_PARAMETERS Parameters); + +NTSTATUS NTAPI +IntDesktopObjectClose(PWIN32_CLOSEMETHOD_PARAMETERS Parameters); + HDC FASTCALL IntGetScreenDC(VOID); @@ -283,4 +290,6 @@ PWND FASTCALL co_GetDesktopWindow(PWND); BOOL FASTCALL IntPaintDesktop(HDC); BOOL FASTCALL DesktopWindowProc(PWND, UINT, WPARAM, LPARAM, LRESULT *); +BOOL FASTCALL UserMessageWindowProc(PWND pwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *lResult); +VOID NTAPI DesktopThreadMain(); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -378,7 +378,7 @@ } } // Creator, pti is set here. - pEH = UserCreateObject(gHandleTable, NULL, &Handle, otEvent, sizeof(EVENTHOOK)); + pEH = UserCreateObject(gHandleTable, NULL, NULL, &Handle, otEvent, sizeof(EVENTHOOK)); if (pEH) { InsertTailList(&GlobalEvents->Events, &pEH->Chain); Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -1569,7 +1569,7 @@ } ObDereferenceObject(WinStaObj); - Hook = UserCreateObject(gHandleTable, NULL, (PHANDLE)&Handle, otHook, sizeof(HOOK)); + Hook = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&Handle, otHook, sizeof(HOOK)); if (!Hook) { Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -304,6 +304,7 @@ switch (Type) { case 0: RawInputThreadMain(); break; + case 1: DesktopThreadMain(); break; default: ERR("Wrong type: %x\n", Type); } Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -131,7 +131,7 @@ L"Control\\Keyboard Layouts\\"; /* Create keyboard layout file object */ - pkf = UserCreateObject(gHandleTable, NULL, NULL, otKBDfile, sizeof(KBDFILE)); + pkf = UserCreateObject(gHandleTable, NULL, NULL, NULL, otKBDfile, sizeof(KBDFILE)); if (!pkf) { ERR("Failed to create object!\n"); @@ -206,7 +206,7 @@ PKL pKl; /* Create keyboard layout object */ - pKl = UserCreateObject(gHandleTable, NULL, NULL, otKBDlayout, sizeof(KL)); + pKl = UserCreateObject(gHandleTable, NULL, NULL, NULL, otKBDlayout, sizeof(KL)); if (!pKl) { ERR("Failed to create object!\n"); Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -304,6 +304,7 @@ if (ptiCurrent->KeyboardLayout) UserReferenceObject(ptiCurrent->KeyboardLayout); ptiCurrent->TIF_flags &= ~TIF_INCLEANUP; + ptiCurrent->pcti = &ptiCurrent->cti; /* Initialize the CLIENTINFO */ pci = (PCLIENTINFO)pTeb->Win32ClientInfo; @@ -624,14 +625,16 @@ DPRINT("Win32k hInstance 0x%p!\n",hModuleWin); /* Register Object Manager Callbacks */ + CalloutData.ProcessCallout = Win32kProcessCallback; + CalloutData.ThreadCallout = Win32kThreadCallback; CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; + CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; + CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; - CalloutData.ProcessCallout = Win32kProcessCallback; - CalloutData.ThreadCallout = Win32kThreadCallback; + CalloutData.DesktopCloseProcedure = IntDesktopObjectClose; + CalloutData.DesktopOpenProcedure = IntDesktopObjectOpen; CalloutData.BatchFlushRoutine = NtGdiFlushUserBatch; - CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; - CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; /* Register our per-process and per-thread structures. */ PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -249,7 +249,8 @@ PPROCESSINFO CurrentWin32Process; Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, - NULL, + NULL, + NULL, Handle, otMenu, sizeof(MENU_OBJECT)); @@ -360,8 +361,9 @@ return NULL; Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, - NULL, - &hMenu, + NULL, + NULL, + &hMenu, otMenu, sizeof(MENU_OBJECT)); if(!Menu) Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -714,6 +714,13 @@ pMsg->lParam, &retval); break; + case FNID_MESSAGEWND: + DoCallBack = !UserMessageWindowProc( Window, + pMsg->message, + pMsg->wParam, + pMsg->lParam, + &retval); + break; } } @@ -1306,6 +1313,9 @@ { case FNID_DESKTOP: DoCallBack = !DesktopWindowProc(Window, Msg, wParam, lParam,(LRESULT*)&Result); + break; + case FNID_MESSAGEWND: + DoCallBack = !UserMessageWindowProc(Window, Msg, wParam, lParam,(LRESULT*)&Result); break; } if (!DoCallBack) @@ -1589,6 +1599,9 @@ { case FNID_DESKTOP: DoCallBack = !DesktopWindowProc(Window, Msg, wParam, lParamPacked, (LRESULT*)&Result); + break; + case FNID_MESSAGEWND: + DoCallBack = !UserMessageWindowProc(Window, Msg, wParam, lParam,(LRESULT*)&Result); break; } } @@ -2233,6 +2246,16 @@ } break; } + + case FNID_MESSAGEWND: + { + Window = UserGetWindowObject(hWnd); + if (Window) + { + Ret = !UserMessageWindowProc(Window, Msg, wParam, lParam,&lResult); + } + break; + } case FNID_DEFWINDOWPROC: /* Validate input */ if (hWnd) Modified: trunk/reactos/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/monito… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -32,7 +32,7 @@ PMONITOR IntCreateMonitorObject() { - return UserCreateObject(gHandleTable, NULL, NULL, otMonitor, sizeof(MONITOR)); + return UserCreateObject(gHandleTable, NULL, NULL, NULL, otMonitor, sizeof(MONITOR)); } /* IntDestroyMonitorObject Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -101,7 +101,7 @@ } /* Window has not been found */ - return NULL; + return pwndDesktop; } PCURICON_OBJECT Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -298,4 +298,13 @@ DWORD APIENTRY IntGetQueueStatus(DWORD); UINT lParamMemorySize(UINT Msg, WPARAM wParam, LPARAM lParam); + +BOOL FASTCALL +co_IntGetPeekMessage( PMSG pMsg, + HWND hWnd, + UINT MsgFilterMin, + UINT MsgFilterMax, + UINT RemoveMsg, + BOOL bGMSG ); + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -315,20 +315,24 @@ FASTCALL UserCreateObject( PUSER_HANDLE_TABLE ht, PDESKTOP pDesktop, + PTHREADINFO pti, HANDLE* h, USER_OBJECT_TYPE type, ULONG size) { HANDLE hi; PVOID Object; - PTHREADINFO pti; PPROCESSINFO ppi; BOOL dt; PDESKTOP rpdesk = pDesktop; - pti = GetW32ThreadInfo(); + /* We could get the desktop for the new object from the pti however this is + * not always the case for example when creating a new desktop window for + * the desktop thread*/ + + if (!pti) pti = GetW32ThreadInfo(); + if (!pDesktop) rpdesk = pti->rpdesk; ppi = pti->ppi; - if (!pDesktop) rpdesk = pti->rpdesk; switch (type) { Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -33,7 +33,7 @@ VOID FASTCALL UserReferenceObject(PVOID obj); PVOID FASTCALL UserReferenceObjectByHandle(HANDLE handle, USER_OBJECT_TYPE type); BOOL FASTCALL UserDereferenceObject(PVOID obj); -PVOID FASTCALL UserCreateObject(PUSER_HANDLE_TABLE ht, struct _DESKTOP* pDesktop, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); +PVOID FASTCALL UserCreateObject(PUSER_HANDLE_TABLE ht, struct _DESKTOP* pDesktop, PTHREADINFO pti, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); BOOL FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ); PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE, HANDLE, USER_OBJECT_TYPE); Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -183,7 +183,8 @@ if (count == 0) count = 8; psmwp = (PSMWP) UserCreateObject( gHandleTable, - NULL, + NULL, + NULL, (PHANDLE)&hDwp, otSMWP, sizeof(SMWP)); Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -56,7 +56,7 @@ HANDLE Handle; PTIMER Ret = NULL; - Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); + Ret = UserCreateObject(gHandleTable, NULL, NULL, &Handle, otTimer, sizeof(TIMER)); if (Ret) { Ret->head.h = Handle; Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -1661,7 +1661,8 @@ PCLS Class, PWND ParentWindow, PWND OwnerWindow, - PVOID acbiBuffer) + PVOID acbiBuffer, + PDESKTOP pdeskCreated) { PWND pWnd = NULL; HWND hWnd; @@ -1670,7 +1671,7 @@ BOOL MenuChanged; BOOL bUnicodeWindow; - pti = PsGetCurrentThreadWin32Thread(); + pti = pdeskCreated ? gptiDesktopThread : GetW32ThreadInfo(); if (!(Cs->dwExStyle & WS_EX_LAYOUTRTL)) { @@ -1690,8 +1691,7 @@ */ if ( Class->fnid != FNID_DIALOG ) { - PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); - if (ppi->dwLayout & LAYOUT_RTL) + if (pti->ppi->dwLayout & LAYOUT_RTL) { Cs->dwExStyle |= WS_EX_LAYOUTRTL; } @@ -1713,7 +1713,8 @@ /* Allocate the new window */ pWnd = (PWND) UserCreateObject( gHandleTable, - pti->rpdesk, + pdeskCreated ? pdeskCreated : pti->rpdesk, + pti, (PHANDLE)&hWnd, otWindow, sizeof(WND) + Class->cbwndExtra); @@ -1723,14 +1724,14 @@ goto AllocError; } - TRACE("Created object with handle %X\n", hWnd); - - if (NULL == pti->rpdesk->DesktopWindow) + TRACE("Created window object with handle %X\n", hWnd); + + if (pdeskCreated && pdeskCreated->DesktopWindow == NULL ) { /* HACK: Helper for win32csr/desktopbg.c */ /* If there is no desktop window yet, we must be creating it */ TRACE("CreateWindow setting desktop.\n"); - pti->rpdesk->DesktopWindow = hWnd; - pti->rpdesk->pDeskInfo->spwnd = pWnd; + pdeskCreated->DesktopWindow = hWnd; + pdeskCreated->pDeskInfo->spwnd = pWnd; } /* @@ -2010,7 +2011,7 @@ pCbtCreate = NULL; /* Get the class and reference it */ - Class = IntGetAndReferenceClass(ClassName, Cs->hInstance); + Class = IntGetAndReferenceClass(ClassName, Cs->hInstance, FALSE); if(!Class) { ERR("Failed to find class %wZ\n", ClassName); @@ -2059,7 +2060,8 @@ Class, ParentWindow, OwnerWindow, - acbiBuffer); + acbiBuffer, + NULL); if(!Window) { ERR("IntCreateWindow failed!\n"); @@ -2502,7 +2504,7 @@ UserEnterExclusive(); /* Call the internal function */ - pwnd = co_UserCreateWindowEx(&Cs, &ustrClassName, plstrWindowName, acbiBuffer); + pwnd = co_UserCreateWindowEx(&Cs, &ustrClassName, plstrWindowName, acbiBuffer, NULL); if(!pwnd) { @@ -2540,12 +2542,15 @@ TRACE("co_UserDestroyWindow \n"); - /* Check for owner thread */ - if ( (Window->head.pti->pEThread != PsGetCurrentThread()) || - Window->head.pti != PsGetCurrentThreadWin32Thread() ) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; + /* Check for owner thread */ + if ( Window->head.pti != PsGetCurrentThreadWin32Thread()) + { + /* Check if we are destroying the desktop window */ + if (! ((Window->head.rpdesk->dwDTFlags & DF_DESTROYED) && Window == Window->head.rpdesk->pDeskInfo->spwnd)) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } } /* If window was created successfully and it is hooked */ Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -47,7 +47,13 @@ BOOL FASTCALL IntShowOwnedPopups( PWND owner, BOOL fShow ); LRESULT FASTCALL IntDefWindowProc( PWND Window, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL Ansi); VOID FASTCALL IntNotifyWinEvent(DWORD, PWND, LONG, LONG, DWORD); -PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW*, PUNICODE_STRING, PLARGE_STRING, PVOID); +PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, + PLARGE_STRING WindowName, + PCLS Class, + PWND ParentWindow, + PWND OwnerWindow, + PVOID acbiBuffer, + PDESKTOP pdeskCreated); BOOL FASTCALL IntEnableWindow(HWND,BOOL); BOOL FASTCALL IntIsWindowVisible(PWND); DWORD FASTCALL GetNCHitEx(PWND,POINT); Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -229,10 +229,7 @@ { TEXTMETRICW tmw; UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); - if (! IntCreatePrimarySurface()) - { - return FALSE; - } + ScreenDeviceContext = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); if (NULL == ScreenDeviceContext) { @@ -240,6 +237,11 @@ return FALSE; } GreSetDCOwner(ScreenDeviceContext, GDI_OBJ_HMGR_PUBLIC); + + if (! IntCreatePrimarySurface()) + { + return FALSE; + } /* Setup the cursor */ co_IntLoadDefaultCursors(); Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -2137,21 +2137,23 @@ ULONG ArgumentLength) { BOOL *DefaultCursor = (BOOL*)Arguments; - LRESULT Result = TRUE; + HCURSOR hCursor; if(*DefaultCursor) { /* set default cursor */ - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); + SetCursor(hCursor); } else { /* FIXME load system cursor scheme */ SetCursor(0); - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); - } - - return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); + hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); + SetCursor(hCursor); + } + + return(ZwCallbackReturn(&hCursor, sizeof(HCURSOR), STATUS_SUCCESS)); } BOOL get_icon_size(HICON hIcon, SIZE *size) Modified: trunk/reactos/win32ss/user/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/desk… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/desktopbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/desktopbg.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -1,341 +1,27 @@ -/* - * win32ss/user/win32csr/desktopbg.c - * - * Desktop background window functions - * - * ReactOS Operating System - * - * Looks as a hax fix to a problem of not having a proper class window proc support - * which ReactOS has now. - * - * Notes on reason why this is here: - * http://www.reactos.org/archives/public/ros-kernel/2003-November/000538.html - * http://www.reactos.org/archives/public/ros-kernel/2003-November/000545.html - * http://www.reactos.org/archives/public/ros-kernel/2003-November/000586.html - * http://www.reactos.org/archives/public/ros-kernel/2003-November/000674.html - * Revision 6908 Move desktop window proc from WIN32K to CSRSS - * Bugs 42, 48 and 57. - * - * http://www.reactos.org/archives/public/ros-kernel/2003-December/001186.html - * - - Now this is used to start Desktops Threads with TEB support. - These first three are Application, Winlogon and ScreenSaver desktops. - - */ - #define NDEBUG #include "w32csr.h" #include <debug.h> -#define DESKTOP_WINDOW_ATOM 32769 - -#define PM_SHOW_DESKTOP 1 -#define PM_HIDE_DESKTOP 2 - -typedef struct tagDTBG_THREAD_DATA -{ - HDESK Desktop; - HANDLE Event; - NTSTATUS Status; -} DTBG_THREAD_DATA, *PDTBG_THREAD_DATA; - -typedef struct tagPRIVATE_NOTIFY_DESKTOP -{ - NMHDR hdr; - struct /* PM_SHOW_DESKTOP */ - { - int Width; - int Height; - } ShowDesktop; -} PRIVATE_NOTIFY_DESKTOP, *PPRIVATE_NOTIFY_DESKTOP; - -static BOOL BgInitialized = FALSE; -static HWND VisibleDesktopWindow = NULL; -#if 0 -static -LRESULT -CALLBACK -DtbgWindowProc(HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - PAINTSTRUCT PS; - - switch (Msg) - { - case WM_ERASEBKGND: - PaintDesktop((HDC)wParam); - return 1; - - case WM_PAINT: - if (BeginPaint(Wnd, &PS)) - EndPaint(Wnd, &PS); - return 0; - - case WM_SETCURSOR: - return (LRESULT)SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); - - case WM_NCCREATE: - return (LRESULT)TRUE; - - case WM_CREATE: - NtUserSetWindowFNID(Wnd, FNID_DESKTOP); // Anti-ReactOS hack! - case WM_CLOSE: - return 0; - - case WM_DISPLAYCHANGE: - MoveWindow(Wnd, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE); - break; - - case WM_NOTIFY: - { - PPRIVATE_NOTIFY_DESKTOP nmh = (PPRIVATE_NOTIFY_DESKTOP)lParam; - - /* Use WM_NOTIFY for private messages since - * it can't be sent between processes! - */ - switch (nmh->hdr.code) - { - case PM_SHOW_DESKTOP: - { - LRESULT Result; - - Result = !SetWindowPos(Wnd, NULL, 0, 0, - nmh->ShowDesktop.Width, - nmh->ShowDesktop.Height, - SWP_NOACTIVATE | SWP_NOZORDER | - SWP_SHOWWINDOW); - - UpdateWindow(Wnd); - VisibleDesktopWindow = Wnd; - return Result; - } - - case PM_HIDE_DESKTOP: - { - LRESULT Result; - - Result = !SetWindowPos(Wnd, NULL, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOZORDER | - SWP_NOMOVE | SWP_NOSIZE | SWP_HIDEWINDOW); - - UpdateWindow(Wnd); - VisibleDesktopWindow = NULL; - return Result; - } - - default: - DPRINT("Unknown notification code 0x%x sent to the desktop window!\n", - nmh->hdr.code); - return 0; - } - } - - default: - return DefWindowProcW(Wnd, Msg, wParam, lParam); - } - - return 0; -} - -static -BOOL -FASTCALL -DtbgInit(VOID) -{ - WNDCLASSEXW Class; - ATOM ClassAtom; - - /* - * Create the desktop window class - */ - Class.cbSize = sizeof(WNDCLASSEXW); - Class.style = 0; // Local Class - Class.lpfnWndProc = DtbgWindowProc; - Class.cbClsExtra = 0; - Class.cbWndExtra = 0; - Class.hInstance = (HINSTANCE)GetModuleHandleW(NULL); - Class.hIcon = NULL; - Class.hCursor = NULL; - Class.hbrBackground = GetSysColorBrush(COLOR_BACKGROUND); - Class.lpszMenuName = NULL; - Class.lpszClassName = (LPCWSTR)DESKTOP_WINDOW_ATOM; - ClassAtom = RegisterClassExW(&Class); - - if (ClassAtom == INVALID_ATOM) - { - DPRINT1("Unable to register desktop background class (error %d)\n", - GetLastError()); - - return FALSE; - } - - VisibleDesktopWindow = NULL; - - return TRUE; -} -#endif -static -DWORD -WINAPI -DtbgDesktopThread(PVOID Data) -{ - HWND BackgroundWnd; - MSG msg; - PDTBG_THREAD_DATA ThreadData = (PDTBG_THREAD_DATA)Data; - - DPRINT("DtbgDesktopThread\n"); - - if (!SetThreadDesktop(ThreadData->Desktop)) - { - DPRINT1("Failed to set thread desktop\n"); - ThreadData->Status = STATUS_UNSUCCESSFUL; - SetEvent(ThreadData->Event); - return 1; - } - - BackgroundWnd = CreateWindowW((LPCWSTR)DESKTOP_WINDOW_ATOM, - L"", - WS_POPUP | WS_CLIPCHILDREN, - GetSystemMetrics(SM_XVIRTUALSCREEN), - GetSystemMetrics(SM_YVIRTUALSCREEN), - GetSystemMetrics(SM_CXVIRTUALSCREEN), - GetSystemMetrics(SM_CYVIRTUALSCREEN), - NULL, NULL, - (HINSTANCE)GetModuleHandleW(L"user32.dll"), // Run in win32k/user32. - NULL); - - if (NULL == BackgroundWnd) - { - DPRINT1("Failed to create desktop background window\n"); - ThreadData->Status = STATUS_UNSUCCESSFUL; - SetEvent(ThreadData->Event); - return 1; - } - - DPRINT("BackgroundWnd 0x%p\n",BackgroundWnd); - - ThreadData->Status = STATUS_SUCCESS; - SetEvent(ThreadData->Event); - - while (GetMessageW(&msg, NULL, 0, 0)) - { - if (msg.message == WM_QUIT) - { - DPRINT1("DtbgDesktopThread WM_QUIT\n"); - } - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - - DPRINT1("DtbgDesktopThread Exit\n"); - return 1; -} - CSR_API(CsrCreateDesktop) { - DTBG_THREAD_DATA ThreadData; - HANDLE ThreadHandle; - - DPRINT("CsrCreateDesktop\n"); - - if (!BgInitialized) - { - BgInitialized = TRUE; - - // if (!DtbgInit()) - // return STATUS_UNSUCCESSFUL; - } - - /* - * The desktop handle we got from win32k is in - * the scope of CSRSS so we can just use it. - */ - ThreadData.Desktop = Request->Data.CreateDesktopRequest.DesktopHandle; - - ThreadData.Event = CreateEventW(NULL, FALSE, FALSE, NULL); - - if (NULL == ThreadData.Event) - { - DPRINT1("Failed to create event (error %d)\n", GetLastError()); - return STATUS_UNSUCCESSFUL; - } - - ThreadHandle = CreateThread(NULL, - 0, - DtbgDesktopThread, - (PVOID)&ThreadData, - 0, - NULL); - - if (NULL == ThreadHandle) - { - CloseHandle(ThreadData.Event); - DPRINT1("Failed to create desktop window thread.\n"); - return STATUS_UNSUCCESSFUL; - } - - CloseHandle(ThreadHandle); - - WaitForSingleObject(ThreadData.Event, INFINITE); - CloseHandle(ThreadData.Event); - - return ThreadData.Status; + return STATUS_SUCCESS; } CSR_API(CsrShowDesktop) { -#if 0 - PRIVATE_NOTIFY_DESKTOP nmh; - DPRINT("CsrShowDesktop\n"); - - nmh.hdr.hwndFrom = Request->Data.ShowDesktopRequest.DesktopWindow; - nmh.hdr.idFrom = 0; - nmh.hdr.code = PM_SHOW_DESKTOP; - - nmh.ShowDesktop.Width = (int)Request->Data.ShowDesktopRequest.Width; - nmh.ShowDesktop.Height = (int)Request->Data.ShowDesktopRequest.Height; - - if (SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, - WM_NOTIFY, - (WPARAM)nmh.hdr.hwndFrom, - (LPARAM)&nmh)) - { - return STATUS_UNSUCCESSFUL; - } -#endif return STATUS_SUCCESS; } CSR_API(CsrHideDesktop) { -#if 0 - PRIVATE_NOTIFY_DESKTOP nmh; - DPRINT("CsrHideDesktop\n"); - - nmh.hdr.hwndFrom = Request->Data.ShowDesktopRequest.DesktopWindow; - nmh.hdr.idFrom = 0; - nmh.hdr.code = PM_HIDE_DESKTOP; - - if (SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, - WM_NOTIFY, - (WPARAM)nmh.hdr.hwndFrom, - (LPARAM)&nmh)) - { - return STATUS_UNSUCCESSFUL; - } -#endif return STATUS_SUCCESS; } BOOL -FASTCALL -DtbgIsDesktopVisible(VOID) +FASTCALL DtbgIsDesktopVisible(VOID) { - VisibleDesktopWindow = GetDesktopWindow(); // DESKTOPWNDPROC + HWND VisibleDesktopWindow = GetDesktopWindow(); // DESKTOPWNDPROC if (VisibleDesktopWindow != NULL && !IsWindowVisible(VisibleDesktopWindow)) Modified: trunk/reactos/win32ss/user/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/dllm… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/dllmain.c [iso-8859-1] Sun Oct 28 10:34:41 2012 @@ -331,6 +331,7 @@ HANDLE ServerThread; CLIENT_ID ClientId; NTSTATUS Status; + UINT i; Win32CsrApiHeap = RtlGetProcessHeap(); @@ -352,15 +353,18 @@ RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); InitializeListHead(&DosDeviceHistory); - /* Start Raw Input Threads */ - Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - DPRINT1("Cannot start Raw Input Thread!\n"); + /* Start the Raw Input Thread and the Desktop Thread */ + for (i = 0; i < 2; ++i) + { + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)i, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + DPRINT1("Cannot start Raw Input Thread!\n"); + } return STATUS_SUCCESS; }

1 0

[hbelusca] 57631: Try to update properties.
by hbelusca＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: hbelusca Date: Sun Oct 28 10:15:26 2012 New Revision: 57631 URL: http://svn.reactos.org/svn/reactos?rev=57631&view=rev Log: Try to update properties. Modified: branches/ros-csrss/ (props changed) Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 10:15:26 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57629 +/trunk/reactos:57561-57630

1 0

[hbelusca] 57630: Synchronize with trunk's revision r57629.
by hbelusca＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: hbelusca Date: Sun Oct 28 10:05:08 2012 New Revision: 57630 URL: http://svn.reactos.org/svn/reactos?rev=57630&view=rev Log: Synchronize with trunk's revision r57629. Added: branches/ros-csrss/dll/opengl/glu32/ - copied from r57629, trunk/reactos/dll/opengl/glu32/ Removed: branches/ros-csrss/dll/opengl/mesa/src/glu/ Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt branches/ros-csrss/configure.sh branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt branches/ros-csrss/dll/opengl/CMakeLists.txt branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt branches/ros-csrss/dll/win32/advapi32/misc/logon.c branches/ros-csrss/dll/win32/samsrv/database.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/samsrv/setup.c branches/ros-csrss/dll/win32/shell32/iconcache.cpp branches/ros-csrss/drivers/hid/mouhid/mouhid.c branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/drivers/usb/usbhub/fdo.c branches/ros-csrss/drivers/usb/usbhub/usbhub.c branches/ros-csrss/drivers/usb/usbhub/usbhub.h branches/ros-csrss/drivers/usb/usbstor/disk.c branches/ros-csrss/lib/drivers/hidparser/api.c branches/ros-csrss/ntoskrnl/po/power.c branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/main.c branches/ros-csrss/win32ss/user/ntuser/ntuser.h branches/ros-csrss/win32ss/user/ntuser/object.c branches/ros-csrss/win32ss/user/ntuser/object.h branches/ros-csrss/win32ss/user/ntuser/win32.h branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 10:05:08 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-57599 +/trunk/reactos:57561-57629 Modified: branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… ============================================================================== --- branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -1,7 +1,8 @@ if(SEPARATE_DBG) # FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822 - set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") endif() spec2def(freeldr.sys freeldr.spec) @@ -171,6 +172,10 @@ if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) + if(SEPARATE_DBG) + set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + endif() else() add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) @@ -231,6 +236,10 @@ if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + if(SEPARATE_DBG) + set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + endif() else() add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) Modified: branches/ros-csrss/configure.sh URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/configure.sh?rev=5763… ============================================================================== --- branches/ros-csrss/configure.sh [iso-8859-1] (original) +++ branches/ros-csrss/configure.sh [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -9,6 +9,11 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH +if [ "$1" = "ninja" ]; then +CMAKE_GENERATOR="Ninja" +else +CMAKE_GENERATOR="Unix Makefiles" +fi if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then echo Creating directories in $REACTOS_OUTPUT_PATH @@ -23,12 +28,12 @@ rm -f CMakeCache.txt REACTOS_BUILD_TOOLS_DIR="$PWD" -cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" echo Preparing reactos... cd ../reactos rm -f CMakeCache.txt -cmake -G "Unix Makefiles" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands$ex: make, makex, etc...$. Modified: branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/3rdparty/libjpeg/… ============================================================================== --- branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -58,7 +58,7 @@ jmemmgr.c jmemnobs.c) -set_entrypoint(libjpeg 0) +set_module_type(libjpeg win32dll) add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk) add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all) Modified: branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/3rdparty/libpng/C… ============================================================================== --- branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -26,7 +26,7 @@ pngwtran.c pngwutil.c) -set_entrypoint(libpng 0) +set_module_type(libpng win32dll) target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32 ntdll) add_dependencies(libpng psdk) Modified: branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/3rdparty/libtiff/… ============================================================================== --- branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -50,7 +50,7 @@ tif_write.c tif_zip.c) -set_module_type(libtiff win32dll ENTRYPOINT 0) +set_module_type(libtiff win32dll) target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32 ntdll) add_dependencies(libtiff psdk) Modified: branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/3rdparty/libxslt/… ============================================================================== --- branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -33,7 +33,7 @@ xsltlocale.c xsltutils.c) -set_module_type(libxslt win32dll ENTRYPOINT 0) +set_module_type(libxslt win32dll) target_link_libraries(libxslt libxml2) add_importlibs(libxslt msvcrt ws2_32 kernel32) Modified: branches/ros-csrss/dll/opengl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/CMakeLists… ============================================================================== --- branches/ros-csrss/dll/opengl/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/opengl/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -1,2 +1,3 @@ +add_subdirectory(glu32) add_subdirectory(mesa) -add_subdirectory(opengl32) +add_subdirectory(opengl32) Modified: branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/mesa/src/C… ============================================================================== --- branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/dll/opengl/mesa/src/CMakeLists.txt [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -1,6 +1,5 @@ add_subdirectory(gallium) add_subdirectory(glsl) -add_subdirectory(glu/sgi) add_subdirectory(mapi/glapi) -add_subdirectory(mesa) +add_subdirectory(mesa) Modified: branches/ros-csrss/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advapi32/mi… ============================================================================== --- branches/ros-csrss/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -310,53 +310,72 @@ GetUserSid(LPCWSTR UserName, PSID *Sid) { - PSID AccountDomainSid = NULL; - ULONG ulUserRid; - DWORD dwLength; - HKEY hNamesKey = NULL; - BOOL bResult = TRUE; - - if (!GetAccountDomainSid(&AccountDomainSid)) - { - return FALSE; - } - - /* Open the Users\Names key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account\\Users\\Names", - 0, - KEY_READ, - &hNamesKey)) - { - ERR("Failed to open Users\\Names key! (Error %lu)\n", GetLastError()); - bResult = FALSE; + PSID SidBuffer = NULL; + PWSTR DomainBuffer = NULL; + DWORD cbSidSize = 0; + DWORD cchDomSize = 0; + SID_NAME_USE Use; + BOOL res = TRUE; + + *Sid = NULL; + + LookupAccountNameW(NULL, + UserName, + NULL, + &cbSidSize, + NULL, + &cchDomSize, + &Use); + + if (cbSidSize == 0 || cchDomSize == 0) + return FALSE; + + SidBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cbSidSize); + if (SidBuffer == NULL) + return FALSE; + + DomainBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cchDomSize * sizeof(WCHAR)); + if (DomainBuffer == NULL) + { + res = FALSE; goto done; } - /* Read the user RID */ - dwLength = sizeof(ULONG); - if (RegQueryValueExW(hNamesKey, - UserName, - NULL, - NULL, - (LPBYTE)&ulUserRid, - &dwLength)) - { - ERR("Failed to read the SID! (Error %ld)\n", GetLastError()); - bResult = FALSE; + if (!LookupAccountNameW(NULL, + UserName, + SidBuffer, + &cbSidSize, + DomainBuffer, + &cchDomSize, + &Use)) + { + res = FALSE; goto done; } - *Sid = AppendRidToSid(AccountDomainSid, ulUserRid); + if (Use != SidTypeUser) + { + res = FALSE; + goto done; + } + + *Sid = SidBuffer; done: - if (hNamesKey != NULL) - RegCloseKey(hNamesKey); - - if (AccountDomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); - - return bResult; + if (DomainBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainBuffer); + + if (res == FALSE) + { + if (SidBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, SidBuffer); + } + + return res; } @@ -593,8 +612,8 @@ TOKEN_USER TokenUser; TOKEN_OWNER TokenOwner; TOKEN_PRIMARY_GROUP TokenPrimaryGroup; - PTOKEN_GROUPS TokenGroups; - PTOKEN_PRIVILEGES TokenPrivileges; + PTOKEN_GROUPS TokenGroups = NULL; + PTOKEN_PRIVILEGES TokenPrivileges = NULL; TOKEN_DEFAULT_DACL TokenDefaultDacl; LARGE_INTEGER ExpirationTime; LUID AuthenticationId; @@ -603,10 +622,10 @@ PSID PrimaryGroupSid = NULL; PSID OwnerSid = NULL; PSID LocalSystemSid; - PACL Dacl; - NTSTATUS Status; + PACL Dacl = NULL; SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; unsigned i; + NTSTATUS Status = STATUS_SUCCESS; Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); Qos.ImpersonationLevel = SecurityAnonymous; @@ -641,11 +660,10 @@ /* Allocate and initialize token groups */ TokenGroups = AllocateGroupSids(&PrimaryGroupSid, &OwnerSid); - if (NULL == TokenGroups) - { - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + if (TokenGroups == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } /* Allocate and initialize token privileges */ @@ -653,12 +671,10 @@ sizeof(TOKEN_PRIVILEGES) + sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0]) * sizeof(LUID_AND_ATTRIBUTES)); - if (NULL == TokenPrivileges) - { - FreeGroupSids(TokenGroups); - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + if (TokenPrivileges == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } TokenPrivileges->PrivilegeCount = 0; @@ -683,21 +699,13 @@ Dacl = RtlAllocateHeap(GetProcessHeap(), 0, 1024); if (Dacl == NULL) { - FreeGroupSids(TokenGroups); - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } Status = RtlCreateAcl(Dacl, 1024, ACL_REVISION); if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(GetProcessHeap(), 0, Dacl); - FreeGroupSids(TokenGroups); - RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); - RtlFreeSid(UserSid); - return FALSE; - } + goto done; RtlAddAccessAllowedAce(Dacl, ACL_REVISION, @@ -754,10 +762,18 @@ &TokenDefaultDacl, &TokenSource); - RtlFreeHeap(GetProcessHeap(), 0, Dacl); - FreeGroupSids(TokenGroups); - RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); - RtlFreeSid(UserSid); +done: + if (Dacl != NULL) + RtlFreeHeap(GetProcessHeap(), 0, Dacl); + + if (TokenGroups != NULL) + FreeGroupSids(TokenGroups); + + if (TokenPrivileges != NULL) + RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); + + if (UserSid != NULL) + RtlFreeHeap(GetProcessHeap(), 0, UserSid); return NT_SUCCESS(Status); } Modified: branches/ros-csrss/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/data… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/database.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -764,8 +764,8 @@ goto done; } - String->Length = Length - sizeof(WCHAR); - String->MaximumLength = Length; + String->Length = (USHORT)(Length - sizeof(WCHAR)); + String->MaximumLength = (USHORT)Length; String->Buffer = midl_user_allocate(Length); if (String->Buffer == NULL) { Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -16,6 +16,7 @@ /* GLOBALS ********************************************************************/ static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; + /* FUNCTIONS ***************************************************************/ @@ -3051,6 +3052,8 @@ Use->Count = 0; } + TRACE("Returned Status %lx\n", Status); + return Status; } @@ -3145,8 +3148,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -3201,8 +3204,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -3259,8 +3262,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -4319,6 +4322,7 @@ return Status; } + /* Function 34 */ NTSTATUS NTAPI @@ -4366,6 +4370,7 @@ return STATUS_SUCCESS; } + /* Function 35 */ NTSTATUS @@ -4676,8 +4681,6 @@ return Status; } - - static @@ -6283,6 +6286,7 @@ return Status; } + /* Function 51 */ NTSTATUS NTAPI @@ -6299,15 +6303,34 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 52 */ NTSTATUS NTAPI SamrAddMultipleMembersToAlias(IN SAMPR_HANDLE AliasHandle, IN PSAMPR_PSID_ARRAY MembersBuffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("SamrAddMultipleMembersToAlias(%p %p)\n", + AliasHandle, MembersBuffer); + + for (i = 0; i < MembersBuffer->Count; i++) + { + Status = SamrAddMemberToAlias(AliasHandle, + ((PSID *)MembersBuffer->Sids)[i]); + + if (Status == STATUS_MEMBER_IN_ALIAS) + Status = STATUS_SUCCESS; + + if (!NT_SUCCESS(Status)) + break; + } + + return Status; +} + /* Function 53 */ NTSTATUS Modified: branches/ros-csrss/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/setu… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/setup.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -224,6 +224,7 @@ ULONG ulRelativeId) { SAM_USER_FIXED_DATA FixedUserData; + LPWSTR lpEmptyString = L""; DWORD dwDisposition; WCHAR szAccountKeyName[32]; HKEY hAccountKey = NULL; @@ -260,6 +261,62 @@ REG_SZ, (LPVOID)lpAccountName, (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"FullName", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"HomeDirectory", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"HomeDirectoryDrive", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"ScriptPath", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"ProfilePath", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"AdminComment", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"UserComment", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"WorkStations", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); RegCloseKey(hAccountKey); } Modified: branches/ros-csrss/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/ico… ============================================================================== --- branches/ros-csrss/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/shell32/iconcache.cpp [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -323,7 +323,7 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallIcon, HICON hBigIcon, DWORD dwFlags) { LPSIC_ENTRY lpsice; - INT ret, index, index1; + INT ret, index, index1, indexDPA; WCHAR path[MAX_PATH]; TRACE("%s %i %p %p\n", debugstr_w(sSourceFile), dwSourceIndex, hSmallIcon ,hBigIcon); @@ -338,8 +338,8 @@ EnterCriticalSection(&SHELL32_SicCS); - index = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice); - if ( INVALID_INDEX == index ) + indexDPA = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice); + if ( -1 == indexDPA ) { ret = INVALID_INDEX; goto leave; @@ -370,6 +370,7 @@ leave: if(ret == INVALID_INDEX) { + if(indexDPA != -1) DPA_DeletePtr(sic_hdpa, indexDPA); HeapFree(GetProcessHeap(), 0, lpsice->sSourceFile); SHFree(lpsice); } Modified: branches/ros-csrss/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/mouhid/mo… ============================================================================== --- branches/ros-csrss/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/ros-csrss/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -92,7 +92,8 @@ VOID MouHid_GetButtonFlags( IN PMOUHID_DEVICE_EXTENSION DeviceExtension, - OUT PUSHORT ButtonFlags) + OUT PUSHORT ButtonFlags, + OUT PUSHORT Flags) { NTSTATUS Status; USAGE Usage; @@ -102,6 +103,7 @@ /* init flags */ *ButtonFlags = 0; + *Flags = 0; /* get usages */ CurrentUsageListLength = DeviceExtension->UsageListLength; @@ -170,7 +172,7 @@ if (DeviceExtension->MouseAbsolute) { // mouse operates absolute - *ButtonFlags |= MOUSE_MOVE_ABSOLUTE; + *Flags |= MOUSE_MOVE_ABSOLUTE; } } @@ -212,6 +214,7 @@ NTSTATUS Status; LONG LastX, LastY; MOUSE_INPUT_DATA MouseInputData; + USHORT Flags; /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)Context; @@ -239,13 +242,14 @@ MouHid_GetButtonMove(DeviceExtension, &LastX, &LastY); /* get mouse change flags */ - MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags); + MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags, &Flags); /* init input data */ RtlZeroMemory(&MouseInputData, sizeof(MOUSE_INPUT_DATA)); /* init input data */ MouseInputData.ButtonFlags = ButtonFlags; + MouseInputData.Flags = Flags; MouseInputData.LastX = LastX; MouseInputData.LastY = LastY; Propchange: branches/ros-csrss/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 28 10:05:08 2012 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbhub:55524-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbhub:54809-54998 /branches/wlan-bringup/drivers/usb/usbhub_new:54809-54998 -/trunk/reactos/drivers/usb/usbhub:57561-57599 +/trunk/reactos/drivers/usb/usbhub:57561-57629 Modified: branches/ros-csrss/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/fd… ============================================================================== --- branches/ros-csrss/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/ros-csrss/drivers/usb/usbhub/fdo.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -1133,7 +1133,7 @@ ULONG ChildDeviceCount, UsbDeviceNumber = 0; WCHAR CharDeviceName[64]; UNICODE_STRING DeviceName; - ULONG ConfigDescSize, DeviceDescSize; + ULONG ConfigDescSize, DeviceDescSize, DeviceInfoSize; PVOID HubInterfaceBusContext; USB_CONFIGURATION_DESCRIPTOR ConfigDesc; @@ -1312,6 +1312,14 @@ DPRINT1("USBHUB: GetUsbDeviceDescriptor failed with status %x\n", Status); goto Cleanup; } + + // query device details + Status = HubInterface->QueryDeviceInformation(HubInterfaceBusContext, + UsbChildExtension->UsbDeviceHandle, + &UsbChildExtension->DeviceInformation, + sizeof(USB_DEVICE_INFORMATION_0), + &DeviceInfoSize); + //DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc); @@ -2047,8 +2055,183 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdoHandleDeviceControl\n"); - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSB_NODE_INFORMATION NodeInformation; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PUSB_NODE_CONNECTION_INFORMATION NodeConnectionInfo; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + PUSB_NODE_CONNECTION_DRIVERKEY_NAME NodeKey; + PUSB_NODE_CONNECTION_NAME ConnectionName; + ULONG Index, Length; + + // get stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_INFORMATION) + { + // is the buffer big enough + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get buffer + NodeInformation = (PUSB_NODE_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + // sanity check + ASSERT(NodeInformation); + + // init buffer + NodeInformation->NodeType = UsbHub; + RtlCopyMemory(&NodeInformation->u.HubInformation.HubDescriptor, &HubDeviceExtension->HubDescriptor, sizeof(USB_HUB_DESCRIPTOR)); + + // FIXME is hub powered + NodeInformation->u.HubInformation.HubIsBusPowered = TRUE; + + // done + Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); + Status = STATUS_SUCCESS; + } + + + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_INFORMATION) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get node connection info + NodeConnectionInfo = (PUSB_NODE_CONNECTION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + // sanity checks + ASSERT(NodeConnectionInfo); + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) + continue; + + // get child device extension + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + if (ChildDeviceExtension->PortNumber != NodeConnectionInfo->ConnectionIndex) + continue; + + // init node connection info + RtlCopyMemory(&NodeConnectionInfo->DeviceDescriptor, &ChildDeviceExtension->DeviceDesc, sizeof(USB_DEVICE_DESCRIPTOR)); + NodeConnectionInfo->CurrentConfigurationValue = ChildDeviceExtension->FullConfigDesc->bConfigurationValue; + NodeConnectionInfo->DeviceIsHub = FALSE; //FIXME support hubs + NodeConnectionInfo->LowSpeed = ChildDeviceExtension->DeviceInformation.DeviceSpeed == UsbLowSpeed; + NodeConnectionInfo->DeviceAddress = ChildDeviceExtension->DeviceInformation.DeviceAddress; + NodeConnectionInfo->NumberOfOpenPipes = ChildDeviceExtension->DeviceInformation.NumberOfOpenPipes; + NodeConnectionInfo->ConnectionStatus = DeviceConnected; //FIXME + + if (NodeConnectionInfo->NumberOfOpenPipes) + { + DPRINT1("Need to copy pipe information\n"); + } + break; + } + // done + Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); + Status = STATUS_SUCCESS; + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get node connection info + NodeKey = (PUSB_NODE_CONNECTION_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; + + // sanity checks + ASSERT(NodeKey); + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) + continue; + + // get child device extension + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + if (ChildDeviceExtension->PortNumber != NodeKey->ConnectionIndex) + continue; + + // get driver key + Status = IoGetDeviceProperty(HubDeviceExtension->ChildDeviceObject[Index], DevicePropertyDriverKeyName, + IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME), + NodeKey->DriverKeyName, + &Length); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + // normalize status + Status = STATUS_SUCCESS; + } + + if (Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + { + // terminate node key name + NodeKey->DriverKeyName[0] = UNICODE_NULL; + Irp->IoStatus.Information = sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + } + else + { + // result size + Irp->IoStatus.Information = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + } + + // length of driver name + NodeKey->ActualLength = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + break; + } + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_NAME) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_NAME)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // FIXME support hubs + ConnectionName = (PUSB_NODE_CONNECTION_NAME)Irp->AssociatedIrp.SystemBuffer; + ConnectionName->ActualLength = 0; + ConnectionName->NodeName[0] = UNICODE_NULL; + + // done + Irp->IoStatus.Information = sizeof(USB_NODE_CONNECTION_NAME); + Status = STATUS_SUCCESS; + } + } + else + { + DPRINT1("UNIMPLEMENTED FdoHandleDeviceControl IoCtl %x InputBufferLength %x OutputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, + IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); + } + + // finish irp + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } Modified: branches/ros-csrss/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/us… ============================================================================== --- branches/ros-csrss/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/ros-csrss/drivers/usb/usbhub/usbhub.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -184,8 +184,39 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; + PIO_STACK_LOCATION IoStack; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("Power Function %x\n", IoStack->MinorFunction); + + if (IoStack->MinorFunction == IRP_MN_SET_POWER) + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + } + else if (IoStack->MinorFunction == IRP_MN_WAIT_WAKE) + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } VOID Modified: branches/ros-csrss/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/us… ============================================================================== --- branches/ros-csrss/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ branches/ros-csrss/drivers/usb/usbhub/usbhub.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -68,6 +68,7 @@ PUSB_CONFIGURATION_DESCRIPTOR FullConfigDesc; UNICODE_STRING SymbolicLinkName; USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; + USB_DEVICE_INFORMATION_0 DeviceInformation; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION; typedef struct _HUB_DEVICE_EXTENSION Modified: branches/ros-csrss/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/d… ============================================================================== --- branches/ros-csrss/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/ros-csrss/drivers/usb/usbstor/disk.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -174,11 +174,13 @@ { DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE / SRB_FUNCTION_SHUTDOWN\n"); + // HACK: don't flush pending requests +#if 0 // we really need a proper storage stack // // wait for pending requests to finish // USBSTOR_QueueWaitForPendingRequests(PDODeviceExtension->LowerDeviceObject); - +#endif // // set status success // Modified: branches/ros-csrss/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/hidparser… ============================================================================== --- branches/ros-csrss/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ branches/ros-csrss/lib/drivers/hidparser/api.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -630,11 +630,10 @@ ASSERT(ReportItem->ByteOffset < ReportDescriptorLength); // - // one extra shift for skipping the prepended report id - // - Data = 0; - Parser->Copy(&Data, &ReportDescriptor[ReportItem->ByteOffset +1], min(sizeof(ULONG), ReportDescriptorLength - (ReportItem->ByteOffset + 1))); - //Data = ReportDescriptor[ReportItem->ByteOffset + 1]; + // FIXME: support items with variable bitlength + // + ASSERT(ReportItem->BitCount == 16); + Data = (ReportDescriptor[ReportItem->ByteOffset +1] & 0xFF) | (ReportDescriptor[ReportItem->ByteOffset +2] & 0xFF) << 8; // // shift data Modified: branches/ros-csrss/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/po/power.c?r… ============================================================================== --- branches/ros-csrss/ntoskrnl/po/power.c [iso-8859-1] (original) +++ branches/ros-csrss/ntoskrnl/po/power.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -21,6 +21,7 @@ PREQUEST_POWER_COMPLETE CompletionRoutine; POWER_STATE PowerState; PVOID Context; + PDEVICE_OBJECT TopDeviceObject; } REQUEST_POWER_ITEM, *PREQUEST_POWER_ITEM; typedef struct _POWER_STATE_TRAVERSE_CONTEXT @@ -56,10 +57,10 @@ RequestPowerItem->Context, &Irp->IoStatus); + IoFreeIrp(Irp); + + ObDereferenceObject(RequestPowerItem->TopDeviceObject); ExFreePool(Context); - - IoFreeIrp(Irp); - ObDereferenceObject(DeviceObject); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -573,6 +574,7 @@ RequestPowerItem->CompletionRoutine = CompletionFunction; RequestPowerItem->PowerState = PowerState; RequestPowerItem->Context = Context; + RequestPowerItem->TopDeviceObject = TopDeviceObject; if (pIrp != NULL) *pIrp = Irp; Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… ============================================================================== --- branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/include/ntuser.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -56,7 +56,8 @@ otHidData, otDeviceInfo, otTouchInput, - otGestureInfo + otGestureInfo, + USER_HANDLE_TYPE_COUNT } USER_OBJECT_TYPE; typedef enum _USERTHREADINFOCLASS Modified: branches/ros-csrss/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/main.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -26,6 +26,7 @@ SHORT gusLanguageID; PPROCESSINFO ppiScrnSaver; +PPROCESSINFO gppiList = NULL; extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; @@ -55,7 +56,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, BOOLEAN Create) { - PPROCESSINFO ppiCurrent; + PPROCESSINFO ppiCurrent, *pppi; DECLARE_RETURN(NTSTATUS); ASSERT(Process->Peb); @@ -160,6 +161,10 @@ ASSERT(ppiCurrent->pPoolDcAttr); ASSERT(ppiCurrent->pPoolBrushAttr); ASSERT(ppiCurrent->pPoolRgnAttr); + + /* Add the process to the global list */ + ppiCurrent->ppiNext = gppiList; + gppiList = ppiCurrent; } else { @@ -212,11 +217,25 @@ if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; + pppi = &gppiList; + while (*pppi != NULL && *pppi != ppiCurrent) + pppi = &(*pppi)->ppiNext; + + ASSERT(*pppi == ppiCurrent); + + *pppi = ppiCurrent->ppiNext; + TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); /* Ftee the PROCESSINFO */ PsSetProcessWin32Process(Process, NULL); ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + DbgUserDumpHandleTable(); + } +#endif } RETURN( STATUS_SUCCESS); Modified: branches/ros-csrss/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/n… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/ntuser.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -12,6 +12,7 @@ extern BOOL gbInitialized; extern PSERVERINFO gpsi; extern PTHREADINFO gptiCurrent; +extern PPROCESSINFO gppiList; extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; Modified: branches/ros-csrss/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/object.c [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -12,6 +12,66 @@ //int usedHandles=0; PUSER_HANDLE_TABLE gHandleTable = NULL; +#if DBG + +void DbgUserDumpHandleTable() +{ + int HandleCounts[USER_HANDLE_TYPE_COUNT]; + PPROCESSINFO ppiList; + int i; + PWCHAR TypeNames[] = {L"Free",L"Window",L"Menu", L"CursorIcon", L"SMWP", L"Hook", L"ClipBoardData", L"CallProc", + L"Accel", L"DDEaccess", L"DDEconv", L"DDExact", L"Monitor", L"KBDlayout", L"KBDfile", + L"Event", L"Timer", L"InputContext", L"HidData", L"DeviceInfo", L"TouchInput",L"GestureInfo"}; + + ERR("Total handles count: %d\n", gpsi->cHandleEntries); + + memset(HandleCounts, 0, sizeof(HandleCounts)); + + /* First of all count the number of handles per tpe */ + ppiList = gppiList; + while (ppiList) + { + ERR("Process %s (%d) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount); + + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + HandleCounts[i] += ppiList->DbgHandleCount[i]; + + DbgPrint("%S: %d, ", TypeNames[i], ppiList->DbgHandleCount[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); + + ppiList = ppiList->ppiNext; + } + + /* Print total type counts */ + ERR("Total handles of the running processes: \n\t"); + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); + + /* Now count the handle counts that are allocated from the handle table */ + memset(HandleCounts, 0, sizeof(HandleCounts)); + for (i = 0; i < gHandleTable->nb_handles; i++) + HandleCounts[gHandleTable->handles[i].type]++; + + ERR("Total handles count allocated: \n\t"); + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); +} + +#endif PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ) { @@ -51,55 +111,12 @@ if (ht->nb_handles >= ht->allocated_handles) /* Need to grow the array */ { -/**/ - int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, - iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0, iTimer = 0, iEvent = 0, iSMWP = 0; - /**/ - ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); -//#if 0 - for(i = 0; i < ht->nb_handles; i++) - { - switch (ht->handles[i].type) - { - case otFree: // Should be zero. - iFree++; - break; - case otWindow: - iWindow++; - break; - case otMenu: - iMenu++; - break; - case otCursorIcon: - iCursorIcon++; - break; - case otHook: - iHook++; - break; - case otCallProc: - iCallProc++; - break; - case otAccel: - iAccel++; - break; - case otMonitor: - iMonitor++; - break; - case otTimer: - iTimer++; - break; - case otEvent: - iEvent++; - break; - case otSMWP: - iSMWP++; - default: - break; - } - } - ERR("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d Timer = %d Event = %d SMWP = %d\n", - iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor, iTimer, iEvent, iSMWP ); -//#endif + ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); + +#if DBG + DbgUserDumpHandleTable(); +#endif + return NULL; #if 0 PUSER_HANDLE_ENTRY new_handles; @@ -138,6 +155,11 @@ { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); void *ret; + +#if DBG + ppi->DbgHandleCount[entry->type]--; +#endif + ret = entry->ptr; entry->ptr = ht->freelist; entry->type = 0; @@ -261,11 +283,11 @@ BOOL FASTCALL UserCreateHandleTable(VOID) { - PVOID mem; + INT HandleCount = 1024 * 4; // FIXME: Don't alloc all at once! Must be mapped into umode also... - mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * 1024*2); + mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * HandleCount); if (!mem) { ERR("Failed creating handle table\n"); @@ -281,7 +303,7 @@ } // FIXME: Make auto growable - UserInitHandleTable(gHandleTable, mem, sizeof(USER_HANDLE_ENTRY) * 1024*2); + UserInitHandleTable(gHandleTable, mem, sizeof(USER_HANDLE_ENTRY) * HandleCount); return TRUE; } @@ -339,6 +361,10 @@ return NULL; } +#if DBG + ppi->DbgHandleCount[type]++; +#endif + RtlZeroMemory(Object, size); switch (type) Modified: branches/ros-csrss/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/object.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -39,6 +39,7 @@ PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE, HANDLE, USER_OBJECT_TYPE); BOOL FASTCALL UserCreateHandleTable(VOID); BOOL FASTCALL UserObjectInDestroy(HANDLE); +void DbgUserDumpHandleTable(); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: branches/ros-csrss/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/win32.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -195,6 +195,7 @@ PTHREADINFO ptiList; PTHREADINFO ptiMainThread; struct _DESKTOP* rpdeskStartup; + PPROCESSINFO ppiNext; PCLS pclsPrivateList; PCLS pclsPublicList; INT cThreads; @@ -224,6 +225,7 @@ #if DBG BYTE DbgChannelLevel[DbgChCount]; + DWORD DbgHandleCount[USER_HANDLE_TYPE_COUNT]; #endif } PROCESSINFO; Modified: branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] Sun Oct 28 10:05:08 2012 @@ -125,7 +125,7 @@ #define DBG_ENABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] |= level) #define DBG_DISABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] &= ~level) - #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] & level) + #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) (((ppi)->DbgChannelLevel[ch] & level) == level) #define DBG_PRINT(ppi,ch,level,fmt, ...) do { \ if((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \

1 0

[jgardou] 57629: [FREELDR] - Use a better workaround for the objcopy bug
by jgardou＠svn.reactos.org 28 Oct '12

28 Oct '12

Author: jgardou Date: Sun Oct 28 01:58:36 2012 New Revision: 57629 URL: http://svn.reactos.org/svn/reactos?rev=57629&view=rev Log: [FREELDR] - Use a better workaround for the objcopy bug Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct 28 01:58:36 2012 @@ -1,7 +1,8 @@ if(SEPARATE_DBG) # FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822 - set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") endif() spec2def(freeldr.sys freeldr.spec) @@ -171,6 +172,10 @@ if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) + if(SEPARATE_DBG) + set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + endif() else() add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) @@ -231,6 +236,10 @@ if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + if(SEPARATE_DBG) + set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) + endif() else() add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})

1 0

[hbelusca] 57628: [WIN32SS/USER32] - Use the new subsystems header winmsg.h - Use the new USER_API_MESSAGE structure, and adapt co_CsrNotify in consequence. - Code formatting. [KERNEL32] - Use the ...
by hbelusca＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: hbelusca Date: Sat Oct 27 23:52:28 2012 New Revision: 57628 URL: http://svn.reactos.org/svn/reactos?rev=57628&view=rev Log: [WIN32SS/USER32] - Use the new subsystems header winmsg.h - Use the new USER_API_MESSAGE structure, and adapt co_CsrNotify in consequence. - Code formatting. [KERNEL32] - Use the new subsystems headers basemsg.h, conmsg.h, winmsg.h, etc... [NTDLL] - Code formatting only. Modified: branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/dll/win32/kernel32/k32.h branches/ros-csrss/win32ss/pch.h branches/ros-csrss/win32ss/user/ntuser/csr.c branches/ros-csrss/win32ss/user/ntuser/csr.h branches/ros-csrss/win32ss/user/ntuser/desktop.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/include/user32.h branches/ros-csrss/win32ss/user/user32/misc/exit.c branches/ros-csrss/win32ss/user/user32/misc/misc.c Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -60,7 +60,7 @@ ApiMessage->Header.u2.ZeroInit = 0; ApiMessage->Header.u1.s1.TotalLength = FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; - /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ + /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ ApiMessage->Header.u1.s1.DataLength = ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); Modified: branches/ros-csrss/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/k3… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -37,6 +37,10 @@ /* CSRSS Header */ #include <csr/csr.h> +#include <win/base.h> +#include <win/basemsg.h> +#include <win/conmsg.h> +#include <win/winmsg.h> //#include <csr/csrss.h> // FIXME: data header. /* C Headers */ Modified: branches/ros-csrss/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/pch.h?rev=576… ============================================================================== --- branches/ros-csrss/win32ss/pch.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/pch.h [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -71,8 +71,8 @@ #include <pseh/pseh2.h> /* CSRSS Header */ -#include <csrss/client.h> -#include <csrss/csrss.h> // FIXME: data header. +#include <csr/csr.h> +#include <csr/csrss.h> // FIXME: data header. /* Public Win32K headers */ #include <include/callback.h> Modified: branches/ros-csrss/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -46,46 +46,51 @@ NTSTATUS FASTCALL -co_CsrNotify(PCSR_API_MESSAGE Request) +co_CsrNotify(IN OUT PCSR_API_MESSAGE ApiMessage, + IN ULONG DataLength) { - NTSTATUS Status; - PEPROCESS OldProcess; + NTSTATUS Status; + PEPROCESS OldProcess; - if (NULL == CsrProcess) - { - return STATUS_INVALID_PORT_HANDLE; - } + if (NULL == CsrProcess) + { + return STATUS_INVALID_PORT_HANDLE; + } - Request->Header.u2.ZeroInit = 0; - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + /* Fill out the Port Message Header */ + ApiMessage->Header.u2.ZeroInit = 0; + ApiMessage->Header.u1.s1.TotalLength = + FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ + ApiMessage->Header.u1.s1.DataLength = + ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - /* Switch to the process in which the WindowsApiPort handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(&CsrProcess->Pcb); - } + /* Switch to the process in which the WindowsApiPort handle is valid */ + OldProcess = PsGetCurrentProcess(); + if (CsrProcess != OldProcess) + { + KeAttachProcess(&CsrProcess->Pcb); + } - UserLeaveCo(); + UserLeaveCo(); - Status = ZwRequestWaitReplyPort(WindowsApiPort, - &Request->Header, - &Request->Header); + Status = ZwRequestWaitReplyPort(WindowsApiPort, + &ApiMessage->Header, + &ApiMessage->Header); - UserEnterCo(); + UserEnterCo(); - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } + if (CsrProcess != OldProcess) + { + KeDetachProcess(); + } - if (NT_SUCCESS(Status)) - { - Status = Request->Status; - } + if (NT_SUCCESS(Status)) + { + Status = ApiMessage->Status; + } - return Status; + return Status; } Modified: branches/ros-csrss/win32ss/user/ntuser/csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/csr.h [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -12,7 +12,8 @@ extern PEPROCESS CsrProcess; NTSTATUS FASTCALL CsrInit(void); -NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); +NTSTATUS FASTCALL co_CsrNotify(IN OUT PCSR_API_MESSAGE ApiMessage, + IN ULONG DataLength); NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, ACCESS_MASK DesiredAccess, Modified: branches/ros-csrss/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/desktop.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -1220,7 +1220,8 @@ RETURN( NULL); } - Status = co_CsrNotify(&Request); + Status = co_CsrNotify((PCSR_API_MESSAGE)&Request, + sizeof(CSR_API_MESSAGE)); if (! NT_SUCCESS(Status)) { CsrCloseHandle(Request.Data.CreateDesktopRequest.DesktopHandle); Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… ============================================================================== --- branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -17,7 +17,7 @@ { PEPROCESS Process; NTSTATUS Status; - CSR_API_MESSAGE Request; + USER_API_MESSAGE Request; Status = PsLookupProcessByProcessId(ProcessId, &Process); @@ -52,12 +52,13 @@ ObDereferenceObject(Process); - Request.ApiNumber = CSR_CREATE_API_NUMBER(CSR_GUI, REGISTER_LOGON_PROCESS); + Request.ApiNumber = CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess); Request.Data.RegisterLogonProcessRequest.ProcessId = ProcessId; Request.Data.RegisterLogonProcessRequest.Register = Register; - Status = co_CsrNotify(&Request); - if (! NT_SUCCESS(Status)) + Status = co_CsrNotify((PCSR_API_MESSAGE)&Request, + sizeof(CSRSS_REGISTER_LOGON_PROCESS)); + if (!NT_SUCCESS(Status)) { ERR("Failed to register logon process with CSRSS\n"); return FALSE; Modified: branches/ros-csrss/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/i… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/include/user32.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/include/user32.h [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -30,8 +30,8 @@ #include <ndk/umfuncs.h> /* CSRSS Header */ -#include <csrss/client.h> -#include <csrss/csrss.h> // FIXME: data header. +#include <csr/csr.h> +#include <win/winmsg.h> /* Public Win32K Headers */ #include <ntusrtyp.h> Modified: branches/ros-csrss/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/exit.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -67,17 +67,17 @@ ExitWindowsEx(UINT uFlags, DWORD dwReserved) { - CSR_API_MESSAGE Request; + USER_API_MESSAGE ApiMessage; NTSTATUS Status; - Request.Data.ExitReactosRequest.Flags = uFlags; - Request.Data.ExitReactosRequest.Reserved = dwReserved; + ApiMessage.Data.ExitReactosRequest.Flags = uFlags; + ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved; - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSR_GUI, EXIT_REACTOS), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpExitWindowsEx), + sizeof(CSRSS_EXIT_REACTOS)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE; @@ -93,16 +93,16 @@ BOOL WINAPI RegisterServicesProcess(DWORD ServicesProcessId) { - CSR_API_MESSAGE Request; + USER_API_MESSAGE ApiMessage; NTSTATUS Status; - Request.Data.RegisterServicesProcessRequest.ProcessId = UlongToHandle(ServicesProcessId); + ApiMessage.Data.RegisterServicesProcessRequest.ProcessId = UlongToHandle(ServicesProcessId); - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_CREATE_API_NUMBER(CSR_GUI, REGISTER_SERVICES_PROCESS), - sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterServicesProcess), + sizeof(CSRSS_REGISTER_SERVICES_PROCESS)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE; Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… ============================================================================== --- branches/ros-csrss/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/user32/misc/misc.c [iso-8859-1] Sat Oct 27 23:52:28 2012 @@ -42,7 +42,7 @@ WINAPI RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister) { - return NtUserxRegisterLogonProcess(dwProcessId,bRegister); + return NtUserxRegisterLogonProcess(dwProcessId, bRegister); } /* @@ -50,7 +50,7 @@ */ BOOL WINAPI -SetLogonNotifyWindow (HWND Wnd, HWINSTA WinSta) +SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta) { /* Maybe we should call NtUserSetLogonNotifyWindow and let that one inform CSRSS??? */ CSR_API_MESSAGE Request;

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