Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[janderwald] 51473: [USBEHCI_NEW] - Cache port status & port change settings because it appears that some ehci controllers do not store the status reset register bit correctly - This commit is a te...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Apr 28 12:41:16 2011 New Revision: 51473 URL: http://svn.reactos.org/svn/reactos?rev=51473&view=rev Log: [USBEHCI_NEW] - Cache port status & port change settings because it appears that some ehci controllers do not store the status reset register bit correctly - This commit is a temporary solutions, needs to be reworked - Return correct status from HandleClassOther - Handle IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION to return status success Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hardware.h branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Apr 28 12:41:16 2011 @@ -109,6 +109,7 @@ HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine PVOID m_SCEContext; // status change callback routine context BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress + EHCI_PORT_STATUS m_PortStatus[16]; // port status // set command VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); @@ -681,6 +682,7 @@ DPRINT1("Port did not reset\n"); return STATUS_RETRY; } + return STATUS_SUCCESS; } @@ -690,10 +692,9 @@ OUT USHORT *PortStatus, OUT USHORT *PortChange) { +#if 0 ULONG Value; USHORT Status = 0, Change = 0; - - DPRINT1("CUSBHardwareDevice::GetPortStatus\n"); if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; @@ -755,11 +756,10 @@ *PortStatus = Status; *PortChange = Change; - - //HACK: Maybe - if (Status == (USB_PORT_STATUS_HIGH_SPEED | USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_POWER)) - *PortChange = USB_PORT_STATUS_CONNECT; - +#else + *PortStatus = m_PortStatus[PortId].PortStatus; + *PortChange = m_PortStatus[PortId].PortChange; +#endif return STATUS_SUCCESS; } @@ -784,6 +784,12 @@ Value &= ~EHCI_PRT_RESET; EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); KeStallExecutionProcessor(100); + + // + // update port status + // + m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_RESET; + m_PortStatus[PortId].PortStatus |= USB_PORT_STATUS_ENABLE; } } @@ -793,6 +799,8 @@ Value |= EHCI_PRT_CONNECTSTATUSCHANGE; Value |= EHCI_PRT_ENABLEDSTATUSCHANGE; EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); + + m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_CONNECT; } return STATUS_SUCCESS; @@ -827,14 +835,25 @@ { DPRINT1("Non HighSpeed device. Releasing Ownership\n"); } - // - // Reset and clean enable - // - Value |= EHCI_PRT_RESET; - Value &= ~EHCI_PRT_ENABLED; - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); - - KeStallExecutionProcessor(100); + + ResetPort(PortId); + + // + // update cached settings + // + m_PortStatus[PortId].PortChange |= USB_PORT_STATUS_RESET; + m_PortStatus[PortId].PortStatus &= ~USB_PORT_STATUS_ENABLE; + + // + // is there a status change callback + // + if (m_SCECallBack != NULL) + { + // + // issue callback + // + m_SCECallBack(m_SCEContext); + } } if (Feature == PORT_POWER) @@ -1069,16 +1088,29 @@ if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) { - DPRINT1("Non HighSeped device connected. Release ownership\n"); + DPRINT1("Non HighSpeed device connected. Release ownership\n"); This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), EHCI_PRT_RELEASEOWNERSHIP); continue; } - + } + + // + // update port status flags + // + This->m_PortStatus[i].PortStatus |= USB_PORT_STATUS_HIGH_SPEED; + This->m_PortStatus[i].PortStatus |= USB_PORT_STATUS_CONNECT; + This->m_PortStatus[i].PortChange |= USB_PORT_STATUS_CONNECT; + + // + // is there a status change callback + // + if (This->m_SCECallBack != NULL) + { // - // FIXME: Is a port reset needed, or does hub driver request this? + // issue callback // + This->m_SCECallBack(This->m_SCEContext); } - This->m_SCECallBack(This->m_SCEContext); } else { Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Thu Apr 28 12:41:16 2011 @@ -58,6 +58,7 @@ #define EHCI_PRT_POWER 0x1000 #define EHCI_PRT_RELEASEOWNERSHIP 0x2000 +#define EHCI_PORTSC_DATAMASK 0xffffffd1 // // Terminate Pointer used for QueueHeads and Element Transfer Descriptors to mark Pointers as the end // @@ -280,3 +281,10 @@ KSPIN_LOCK Lock; LPDMA_MEMORY_ALLOCATOR DmaMemAllocator; } EHCI_HOST_CONTROLLER, *PEHCI_HOST_CONTROLLER; + +typedef struct +{ + ULONG PortStatus; + ULONG PortChange; +}EHCI_PORT_STATUS; + Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Thu Apr 28 12:41:16 2011 @@ -913,7 +913,7 @@ // // reset port feature // - Status = m_Hardware->ResetPort(PortId); + Status = m_Hardware->SetPortFeature(PortId, PORT_RESET); PC_ASSERT(Status == STATUS_SUCCESS); break; } @@ -928,9 +928,7 @@ PC_ASSERT(0); Status = STATUS_INVALID_DEVICE_REQUEST; } - - - return STATUS_SUCCESS; + return Status; } //----------------------------------------------------------------------------------------- @@ -1313,6 +1311,12 @@ Irp->IoStatus.Information = sizeof(ULONG); break; } + case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION: + { + DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION UNIMPLEMENTED\n"); + Status = STATUS_SUCCESS; + break; + } default: { DPRINT1("HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n",

13 years, 8 months

[tkreuzer] 51472: Fix release build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Apr 28 08:50:27 2011 New Revision: 51472 URL: http://svn.reactos.org/svn/reactos?rev=51472&view=rev Log: Fix release build Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Apr 28 08:50:27 2011 @@ -452,7 +452,7 @@ /* Register our per-process and per-thread structures. */ PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); -#if 1 // DBG +#if DBG_ENABLE_SERVICE_HOOKS /* Register service hook callbacks */ KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0); KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0);

13 years, 8 months

[ilardig] 51471: [mshtml] Revert associations for ie, we can't use them. Spotted by encoded. See issue #6158 for more details.

by ilardig＠svn.reactos.org

Author: ilardig Date: Thu Apr 28 08:26:49 2011 New Revision: 51471 URL: http://svn.reactos.org/svn/reactos?rev=51471&view=rev Log: [mshtml] Revert associations for ie, we can't use them. Spotted by encoded. See issue #6158 for more details. Modified: trunk/reactos/dll/win32/mshtml/mshtml.inf Modified: trunk/reactos/dll/win32/mshtml/mshtml.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.in… ============================================================================== --- trunk/reactos/dll/win32/mshtml/mshtml.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/mshtml.inf [iso-8859-1] Thu Apr 28 08:26:49 2011 @@ -91,7 +91,7 @@ ;; CrSource HKCR,"CLSID\%CLSID_CrSource%",,,"Microsoft CrSource 4.0" HKCR,"CLSID\%CLSID_CrSource%\BrowseInPlace",,16 -HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" +;;HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"CLSID\%CLSID_CrSource%\EnablePlugin\.css",,,"PointPlus plugin" HKCR,"CLSID\%CLSID_CrSource%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_CrSource%\InProcServer32","ThreadingModel",,"Apartment" @@ -122,7 +122,7 @@ ;; HTMLDocument HKCR,"CLSID\%CLSID_HTMLDocument%",,,"HTML Document" HKCR,"CLSID\%CLSID_HTMLDocument%\BrowseInPlace",,16 -HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" +;;HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_HTMLDocument%\MiscStatus",,,"2228625" @@ -215,7 +215,7 @@ ;; MHTMLDocument HKCR,"CLSID\%CLSID_MHTMLDocument%",,,"MHTML Document" HKCR,"CLSID\%CLSID_MHTMLDocument%\BrowseInPlace",,16 -HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" +;;HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_MHTMLDocument%\MiscStatus",,,"2228625" @@ -236,7 +236,7 @@ HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus\1",,,"131473" HKCR,"CLSID\%CLSID_Scriptlet%\ProgID",,,"ScriptBridge.ScriptBridge.1" HKCR,"CLSID\%CLSID_Scriptlet%\Programmable",,16 -HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%16422%\Internet Explorer\iexplore.exe,1" +;;HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"CLSID\%CLSID_Scriptlet%\TypeLib",,,"%LIBID_MSHTML%" HKCR,"CLSID\%CLSID_Scriptlet%\Version",,,"4.0" HKCR,"CLSID\%CLSID_Scriptlet%\VersionIndependentProgID",,,"ScriptBridge.ScriptBridge" @@ -312,9 +312,9 @@ HKCR,".gif","Content Type",,"image/gif" HKCR,"giffile",,,"GIF Image" HKCR,"giffile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"giffile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" +;;HKCR,"giffile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" +;;HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" @@ -339,7 +339,7 @@ HKCR,"htmlfile",,,"HTML Document" HKCR,"htmlfile\BrowseInPlace",,16 HKCR,"htmlfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"htmlfile\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" +;;HKCR,"htmlfile\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"htmlfile_FullWindowEmbed",,,"HTML Plugin Document" HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,16 HKCR,"htmlfile_FullWindowEmbed\CLSID",,,"%CLSID_HTMLPluginDocument%" @@ -359,9 +359,9 @@ HKCR,".jpe","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" +;;HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" +;;HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" @@ -374,9 +374,9 @@ HKCR,".jpeg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" +;;HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" +;;HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" @@ -385,9 +385,9 @@ HKCR,".jpg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" +;;HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" +;;HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" @@ -422,9 +422,9 @@ HKCR,".jfif","Content Type",,"image/jpeg" HKCR,"pjpegfile",,,"JPEG Image" HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"pjpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" +;;HKCR,"pjpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" +;;HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pjpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" @@ -435,9 +435,9 @@ HKCR,".png","Content Type",,"image/png" HKCR,"pngfile",,,"PNG Image" HKCR,"pngfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"pngfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe""" -nohome" +;;HKCR,"pngfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe""" -nohome" HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" +;;HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" @@ -478,9 +478,9 @@ HKCR,".xbm","Content Type",,"image/x-xbitmap" HKCR,"xbmfile",,,"XBM Image" HKCR,"xbmfile\CLSID",,,"%CLSID_HTMLDocument%" -HKCR,"xbmfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" +;;HKCR,"xbmfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" +;;HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9"

13 years, 8 months

[tkreuzer] 51470: [WIN32K] Rewrite of the GDI handle manager - The old handle manager used a completely retarded spinlock in combination with KeDelayExecutionThread() for both exclusive and shared ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Apr 28 08:26:46 2011 New Revision: 51470 URL: http://svn.reactos.org/svn/reactos?rev=51470&view=rev Log: [WIN32K] Rewrite of the GDI handle manager - The old handle manager used a completely retarded spinlock in combination with KeDelayExecutionThread() for both exclusive and shared locks. This is probably the most uneffective algorithm possible. It was also duplicating code everywhere and it was a overall mess It is now replaced with a lock-free reference counter for shared locks and a pushlock for exclusive locks. -> Better performance and scalability. - Allocate user mode object attributes from the new gdi pool. This way, we don't need any caching, since the pool serves as a cache. Its also much faster and uses much less memory. - Allow object allocations of different size, instead of fixed size from a table. This way a single allocation can take care of actual needs. - Allow allcoating objects without a handle and insert them into the handle table later - Properly synchronize the process GDIHandleCount. Now gdiview and taskmanager show the correct number of gdi handles. - Implement a new event tracking system, that is capable of tracking all reverences and locks of objects and pool allocations to help track possible leaks - Make sure that all objects of a process are deleted in cleanup - Make sure all usermode memory allocations are freed, when cleaning up the process pool. - Make sure that each object type is using the correct type of lock (either shared or exclusive, not a mixture) - Fix some object / reference leaks - Lots of inferface improvements - Use global variables for certain things instead of members in the mapped gdi handle table - Make IntSysCreateRectpRgn create a region without a handle - Fix detection od source and mask use in GreStretchBltMask - Use GDIOBJ_bLockMultipleObjects in NtGdiCombineRegion to avoid possible deadlocks - Fix NtGdiAbortPath to reset DCPATH_ACTIVE flag in the dc and only bail out on error, instead of always - Replace DC_AllocateDcAttr and DC_AllocDcAttr with DC_bAllocDcAttr using the new user mode pool - Remove DCU_SyncDcAttrtoUser and DCU_SynchDcAttrtoUser. Those functions were unused and didn't do anything useful anyway, - Replace IntGdiSetDCOwnerEx and DC_SetOwnership with GreSetDCOwner, remove unused NoSetBrush parameter - Replace GDIOBJ_bValidateHandle and IsObjectDead with GreIsHandleValid - Chage GDIOBJ_bLockMultipleObjects: pass object type, return a BOOL, whether all objects could be locked, cleanup on failure Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/color.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/dib.h trunk/reactos/subsystems/win32/win32k/include/driverobj.h trunk/reactos/subsystems/win32/win32k/include/gdidebug.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/surface.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dcattr.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dcstate.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/gdipool.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/palette.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/color.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/driverobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdipool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

13 years, 8 months

[tkreuzer] 51469: [WIN32K] Don't send messages from or to a thread in cleanup. Fixes possible deadlock.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 27 23:49:09 2011 New Revision: 51469 URL: http://svn.reactos.org/svn/reactos?rev=51469&view=rev Log: [WIN32K] Don't send messages from or to a thread in cleanup. Fixes possible deadlock. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Apr 27 23:49:09 2011 @@ -64,7 +64,7 @@ { if (down) { - if (!(MessageQueue->KeyState[key] & KS_DOWN_BIT)) + if (!(MessageQueue->KeyState[key] & KS_DOWN_BIT)) { MessageQueue->KeyState[key] ^= KS_LOCK_BIT; } @@ -106,9 +106,9 @@ down = 1; /* fall through */ case WM_XBUTTONUP: - if (msg->wParam == XBUTTON1) + if (msg->wParam == XBUTTON1) set_input_key_state( MessageQueue, VK_XBUTTON1, down ); - else if (msg->wParam == XBUTTON2) + else if (msg->wParam == XBUTTON2) set_input_key_state( MessageQueue, VK_XBUTTON2, down ); break; case WM_KEYDOWN: @@ -223,7 +223,7 @@ pti = Queue->Thread->Tcb.Win32Thread; if (MessageBits & QS_KEY) - { + { if (--Queue->nCntsQBits[QSRosKey] == 0) ClrMask |= QS_KEY; } if (MessageBits & QS_MOUSEMOVE) // ReactOS hard coded. @@ -347,7 +347,7 @@ if(Msg->hwnd != NULL) { pwnd = UserGetWindowObject(Msg->hwnd); - if ((pwnd->style & WS_VISIBLE) && + if ((pwnd->style & WS_VISIBLE) && IntPtInWindow(pwnd, Msg->pt.x, Msg->pt.y)) { pDesk->htEx = HTCLIENT; @@ -367,7 +367,7 @@ continue; } - if((pwnd->style & WS_VISIBLE) && + if((pwnd->style & WS_VISIBLE) && IntPtInWindow(pwnd, Msg->pt.x, Msg->pt.y)) { Msg->hwnd = pwnd->head.h; @@ -817,7 +817,14 @@ ptirec = MessageQueue->Thread->Tcb.Win32Thread; ASSERT(ThreadQueue != MessageQueue); ASSERT(ptirec->pcti); // Send must have a client side to receive it!!!! - + + /* Don't send from or to a dying thread */ + if (pti->TIF_flags & TIF_INCLEANUP || ptirec->TIF_flags & TIF_INCLEANUP) + { + *uResult = -1; + return STATUS_TIMEOUT; + } + Timeout.QuadPart = (LONGLONG) uTimeout * (LONGLONG) -10000; /* FIXME - increase reference counter of sender's message queue here */ @@ -1034,7 +1041,7 @@ if (pwndParent == pwndDesktop) break; pt.x += pwnd->rcClient.left - pwndParent->rcClient.left; pt.y += pwnd->rcClient.top - pwndParent->rcClient.top; - + pwnd = pwndParent; co_IntSendMessage( UserHMGetHandle(pwnd), WM_PARENTNOTIFY, MAKEWPARAM( event, idChild ), MAKELPARAM( pt.x, pt.y ) ); @@ -1076,7 +1083,7 @@ } DPRINT("Got mouse message for 0x%x, hittest: 0x%x\n", msg->hwnd, hittest ); - + if (pwndMsg == NULL || pwndMsg->head.pti != pti) { /* Remove and ignore the message */ @@ -1146,7 +1153,7 @@ } } - if (!((first == 0 && last == 0) || (message >= first || message <= last))) + if (!((first == 0 && last == 0) || (message >= first || message <= last))) { DPRINT("Message out of range!!!\n"); RETURN(FALSE); @@ -1267,8 +1274,8 @@ if (pwndTop && pwndTop != pwndDesktop) { - LONG ret = co_IntSendMessage( msg->hwnd, - WM_MOUSEACTIVATE, + LONG ret = co_IntSendMessage( msg->hwnd, + WM_MOUSEACTIVATE, (WPARAM)UserHMGetHandle(pwndTop), MAKELONG( hittest, msg->message)); switch(ret) @@ -1443,7 +1450,7 @@ CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); - do + do { if (IsListEmpty(CurrentEntry)) break; if (!CurrentMessage) break; @@ -1490,7 +1497,7 @@ PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; PLIST_ENTRY ListHead; - + CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; ListHead = &MessageQueue->PostedMessagesListHead; @@ -1542,7 +1549,7 @@ ret = KeWaitForSingleObject( MessageQueue->NewMessages, UserRequest, UserMode, - FALSE, + FALSE, NULL ); UserEnterCo(); return ret; @@ -1614,7 +1621,7 @@ PUSER_MESSAGE CurrentMessage; PUSER_SENT_MESSAGE CurrentSentMessage; PTHREADINFO pti; - + pti = MessageQueue->Thread->Tcb.Win32Thread; @@ -1642,7 +1649,7 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); /* Only if the message has a sender was the message in the DispatchingList */ - if ((CurrentSentMessage->SenderQueue) + if ((CurrentSentMessage->SenderQueue) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry);

13 years, 8 months

[jimtabor] 51468: [Win32k] - Fix KsStudios actions with Hooks.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Apr 27 23:09:45 2011 New Revision: 51468 URL: http://svn.reactos.org/svn/reactos?rev=51468&view=rev Log: [Win32k] - Fix KsStudios actions with Hooks. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Wed Apr 27 23:09:45 2011 @@ -118,8 +118,8 @@ break; default: - UNIMPLEMENTED; - break; + // We do not support anything else here so we should return normal even when sending a hook. + return 0; } return(Hook ? 1 : 0); // Don't call us again from user space.

13 years, 8 months

[akhaldi] 51467: [CMAKE] * msc.cmake: Apply a consistent formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 27 21:48:41 2011 New Revision: 51467 URL: http://svn.reactos.org/svn/reactos?rev=51467&view=rev Log: [CMAKE] * msc.cmake: Apply a consistent formatting. Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=514… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Wed Apr 27 21:48:41 2011 @@ -17,9 +17,9 @@ add_definitions(-Dinline=__inline -D__STDC__=1) if(${_MACHINE_ARCH_FLAG} MATCHES X86) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") endif() if(${ARCH} MATCHES amd64)

13 years, 8 months

[janderwald] 51466: [USBEHCI_NEW] - Return the physical address of the async queue head in CUSBHardwareDevice::GetAsyncListRegister - Remove superflous entries from queue head structure, they are p...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Apr 27 16:23:42 2011 New Revision: 51466 URL: http://svn.reactos.org/svn/reactos?rev=51466&view=rev Log: [USBEHCI_NEW] - Return the physical address of the async queue head in CUSBHardwareDevice::GetAsyncListRegister - Remove superflous entries from queue head structure, they are processed within IUSBRequest class - Remove USBHI_GetPortHackFlags, this function has been deprecated - Add interface functions for IUSBRequest / IUSBQueue - Callback into IUSBQueue when a hardware interrupt arrives - Implement callback function to check for completed queue heads / free completed queue head depending on the Async Advance interrupt bit Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hardware.h branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Wed Apr 27 16:23:42 2011 @@ -87,30 +87,39 @@ virtual ~CUSBHardwareDevice(){} protected: - LONG m_Ref; - PDRIVER_OBJECT m_DriverObject; - PDEVICE_OBJECT m_PhysicalDeviceObject; - PDEVICE_OBJECT m_FunctionalDeviceObject; - PDEVICE_OBJECT m_NextDeviceObject; - KSPIN_LOCK m_Lock; - PKINTERRUPT m_Interrupt; - KDPC m_IntDpcObject; - PVOID VirtualBase; - PHYSICAL_ADDRESS PhysicalAddress; - PULONG m_Base; - PDMA_ADAPTER m_Adapter; - ULONG m_MapRegisters; - EHCI_CAPS m_Capabilities; - USHORT m_VendorID; - USHORT m_DeviceID; - PQUEUE_HEAD AsyncQueueHead; - PUSBQUEUE m_UsbQueue; - PDMAMEMORYMANAGER m_MemoryManager; - HD_INIT_CALLBACK* m_SCECallBack; - PVOID m_SCEContext; + LONG m_Ref; // reference count + PDRIVER_OBJECT m_DriverObject; // driver object + PDEVICE_OBJECT m_PhysicalDeviceObject; // pdo + PDEVICE_OBJECT m_FunctionalDeviceObject; // fdo (hcd controller) + PDEVICE_OBJECT m_NextDeviceObject; // lower device object + KSPIN_LOCK m_Lock; // hardware lock + PKINTERRUPT m_Interrupt; // interrupt object + KDPC m_IntDpcObject; // dpc object for deferred isr processing + PVOID VirtualBase; // virtual base for memory manager + PHYSICAL_ADDRESS PhysicalAddress; // physical base for memory manager + PULONG m_Base; // EHCI operational port base registers + PDMA_ADAPTER m_Adapter; // dma adapter object + ULONG m_MapRegisters; // map registers count + EHCI_CAPS m_Capabilities; // EHCI caps + USHORT m_VendorID; // vendor id + USHORT m_DeviceID; // device id + PQUEUE_HEAD AsyncQueueHead; // async queue head terminator + PUSBQUEUE m_UsbQueue; // usb request queue + PDMAMEMORYMANAGER m_MemoryManager; // memory manager + HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine + PVOID m_SCEContext; // status change callback routine context + BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress + + // set command VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + + // get command VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + + // read register ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); + + // write register VOID EHCI_WRITE_REGISTER_ULONG(ULONG Offset, ULONG Value); }; @@ -315,6 +324,7 @@ m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 8)); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); + DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); if (m_Capabilities.HCSParams.PortRouteRules) { for (Count = 0; Count < m_Capabilities.HCSParams.PortCount; Count++) @@ -850,7 +860,7 @@ ULONG CUSBHardwareDevice::GetAsyncListRegister() { - return PhysicalAddress.LowPart; + return AsyncQueueHead->PhysicalAddr; } ULONG CUSBHardwareDevice::GetPeriodicListRegister() @@ -946,10 +956,85 @@ IN PVOID SystemArgument2) { CUSBHardwareDevice *This; - ULONG CStatus, PortStatus, PortCount, i; + ULONG CStatus, PortStatus, PortCount, i, ShouldRingDoorBell; + NTSTATUS Status = STATUS_SUCCESS; + EHCI_USBCMD_CONTENT UsbCmd; This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; + + + // + // check for completion of async schedule + // + if (CStatus & (EHCI_STS_RECL| EHCI_STS_INT | EHCI_ERROR_INT)) + { + if (CStatus & EHCI_ERROR_INT) + { + // + // controller reported error + // + Status = STATUS_UNSUCCESSFUL; + } + + // + // check if there is a door bell ring in progress + // + if (This->m_DoorBellRingInProgress == FALSE) + { + // + // inform IUSBQueue of a completed queue head + // + This->m_UsbQueue->InterruptCallback(Status, &ShouldRingDoorBell); + + // + // was a queue head completed? + // + if (ShouldRingDoorBell) + { + // + // set door ring bell in progress status flag + // + This->m_DoorBellRingInProgress = TRUE; + + // + // get command register + // + This->GetCommandRegister(&UsbCmd); + + // + // set door rang bell bit + // + UsbCmd.DoorBell = TRUE; + + // + // update command status + // + This->SetCommandRegister(&UsbCmd); + } + } + } + + // + // check if the controller has acknowledged the door bell + // + if (CStatus & EHCI_STS_IAA) + { + // + // controller has acknowledged, assert we rang the bell + // + PC_ASSERT(This->m_DoorBellRingInProgress == TRUE); + + // + // now notify IUSBQueue that it can free completed requests + // + This->m_UsbQueue->CompleteAsyncRequests(); + + // + // door ring bell completed + // + This->m_DoorBellRingInProgress = FALSE; + } This->GetDeviceDetails(NULL, NULL, &PortCount, NULL); if (CStatus & EHCI_STS_PCD) Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Wed Apr 27 16:23:42 2011 @@ -190,10 +190,6 @@ //Software ULONG PhysicalAddr; LIST_ENTRY LinkedQueueHeads; - PQUEUE_TRANSFER_DESCRIPTOR TransferDescriptor; - PIRP IrpToComplete; - PMDL Mdl; - PKEVENT Event; PVOID Request; } QUEUE_HEAD, *PQUEUE_HEAD; Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Wed Apr 27 16:23:42 2011 @@ -1988,16 +1988,6 @@ NTSTATUS USB_BUSIFFN -USBHI_GetPortHackFlags( - PVOID BusContext, - PULONG Flags) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -USB_BUSIFFN USBHI_QueryDeviceInformation( PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle, @@ -2565,7 +2555,6 @@ InterfaceHub->GetUsbDescriptors = USBHI_GetUsbDescriptors; InterfaceHub->RemoveUsbDevice = USBHI_RemoveUsbDevice; InterfaceHub->RestoreUsbDevice = USBHI_RestoreUsbDevice; - InterfaceHub->GetPortHackFlags = USBHI_GetPortHackFlags; InterfaceHub->QueryDeviceInformation = USBHI_QueryDeviceInformation; } Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Wed Apr 27 16:23:42 2011 @@ -482,7 +482,26 @@ // Description: frees the queue head with the associated transfer descriptors virtual VOID FreeQueueHead(struct _QUEUE_HEAD * QueueHead) = 0; + +//--------------------------------------------------------------------------------------- +// +// GetTransferBuffer +// +// Description: this function returns the transfer buffer mdl and length +// Used by IUSBQueue for mapping buffer contents with DMA + + virtual VOID GetTransferBuffer(OUT PMDL * OutMDL, + OUT PULONG TransferLength) = 0; + +//-------------------------------------------------------------------------------------- +// +// IsQueueHeadComplete +// +// Description: returns true when the queue head which was passed as a parameter has been completed + + virtual BOOLEAN IsQueueHeadComplete(struct _QUEUE_HEAD * QueueHead) = 0; }; + typedef IUSBRequest *PUSBREQUEST; @@ -539,6 +558,24 @@ // Description: creates an usb request virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest) = 0; + +//-------------------------------------------------------------------------------------- +// +// InterruptCallback +// +// Description: callback when the periodic / asynchronous queue has been completed / queue head been completed + + virtual VOID InterruptCallback(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell) = 0; + +//-------------------------------------------------------------------------------------- +// +// CompleteAsyncRequests +// +// Description: once a request has been completed it is moved to pending queue. Since a queue head should only be freed +// after a door bell ring, this needs some synchronization. +// This function gets called by IUSBHardware after it the Interrupt on Async Advance bit has been set + + virtual VOID CompleteAsyncRequests() = 0; }; typedef IUSBQueue *PUSBQUEUE; Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Wed Apr 27 16:23:42 2011 @@ -33,12 +33,14 @@ return m_Ref; } - NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN OPTIONAL PKSPIN_LOCK Lock); - ULONG GetPendingRequestCount(); - NTSTATUS AddUSBRequest(PURB Urb); - NTSTATUS AddUSBRequest(IUSBRequest * Request); - NTSTATUS CancelRequests(); - NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN OPTIONAL PKSPIN_LOCK Lock); + virtual ULONG GetPendingRequestCount(); + virtual NTSTATUS AddUSBRequest(PURB Urb); + virtual NTSTATUS AddUSBRequest(IUSBRequest * Request); + virtual NTSTATUS CancelRequests(); + virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); + virtual VOID InterruptCallback(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); + virtual VOID CompleteAsyncRequests(); // constructor / destructor CUSBQueue(IUnknown *OuterUnknown){} @@ -50,6 +52,7 @@ PDMA_ADAPTER m_Adapter; PQUEUE_HEAD AsyncListQueueHead; PQUEUE_HEAD PendingListQueueHead; + LIST_ENTRY m_CompletedRequestAsyncList; // queue head manipulation functions VOID LinkQueueHead(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); @@ -57,8 +60,11 @@ VOID LinkQueueHeadChain(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); PQUEUE_HEAD UnlinkQueueHeadChain(PQUEUE_HEAD HeadQueueHead, ULONG Count); + // processes the async list + VOID ProcessAsyncList(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); + // called for each completed queue head - NTSTATUS QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); + VOID QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); // called when the completion queue is cleaned up VOID QueueHeadCleanup(PQUEUE_HEAD QueueHead); @@ -120,6 +126,17 @@ // InitializeListHead(&PendingListQueueHead->LinkedQueueHeads); + // + // fake the queue head as the first queue head + // + PendingListQueueHead->PhysicalAddr = ((ULONG_PTR)AsyncListQueueHead | QH_TYPE_QH); + + // + // Initialize completed async list head + // + InitializeListHead(&m_CompletedRequestAsyncList); + + return Status; } @@ -234,13 +251,44 @@ PQUEUE_HEAD PreviousQH, NextQH; PLIST_ENTRY Entry; + // + // sanity check: there must be at least one queue head with halted bit set + // + PC_ASSERT(QueueHead->Token.Bits.Halted == 0); + + // + // get previous link + // Entry = QueueHead->LinkedQueueHeads.Blink; + + // + // get queue head structure + // PreviousQH = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // get next link + // Entry = QueueHead->LinkedQueueHeads.Flink; + + // + // get queue head structure + // NextQH = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // sanity check + // ASSERT(QueueHead->HorizontalLinkPointer == (NextQH->PhysicalAddr | QH_TYPE_QH)); + + // + // remove queue head from linked list + // PreviousQH->HorizontalLinkPointer = NextQH->PhysicalAddr | QH_TYPE_QH; + // + // remove software link + // RemoveEntryList(&QueueHead->LinkedQueueHeads); } @@ -326,7 +374,7 @@ return FirstQueueHead; } -NTSTATUS +VOID CUSBQueue::QueueHeadCompletion( PQUEUE_HEAD CurrentQH, NTSTATUS Status) @@ -415,14 +463,94 @@ else { // - // FIXME: put queue head into completed queue head list - // - } - - // - // done - // - return STATUS_SUCCESS; + // put queue head into completed queue head list + // + InsertTailList(&m_CompletedRequestAsyncList, &CurrentQH->LinkedQueueHeads); + } +} + +VOID +CUSBQueue::ProcessAsyncList( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + KIRQL OldLevel; + PLIST_ENTRY Entry; + PQUEUE_HEAD QueueHead; + IUSBRequest * Request; + + // + // lock completed async list + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // walk async list + // + Entry = PendingListQueueHead->LinkedQueueHeads.Flink; + + while(Entry != &PendingListQueueHead->LinkedQueueHeads) + { + // + // get queue head structure + // + QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // sanity check + // + PC_ASSERT(QueueHead->Request); + + // + // get IUSBRequest interface + // + Request = (IUSBRequest*)QueueHead->Request; + + + // + // move to next entry + // + Entry = Entry->Flink; + + // + // check if queue head is complete + // + if (Request->IsQueueHeadComplete(QueueHead)) + { + // + // current queue head is complete + // + QueueHeadCompletion(QueueHead, Status); + + // + // ring door bell is going to be necessary + // + *ShouldRingDoorBell = TRUE; + } + } + + // + // release lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); + +} + + +VOID +CUSBQueue::InterruptCallback( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + // + // iterate asynchronous list + // + *ShouldRingDoorBell = FALSE; + ProcessAsyncList(Status, ShouldRingDoorBell); + + // + // TODO: implement periodic schedule processing + // } VOID @@ -472,6 +600,47 @@ // // request is now released // +} + +VOID +CUSBQueue::CompleteAsyncRequests() +{ + KIRQL OldLevel; + PLIST_ENTRY Entry; + PQUEUE_HEAD CurrentQH; + + // + // first acquire request lock + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // the list should not be empty + // + PC_ASSERT(!IsListEmpty(&m_CompletedRequestAsyncList)); + + while(!IsListEmpty(&m_CompletedRequestAsyncList)) + { + // + // remove first entry + // + Entry = RemoveHeadList(&m_CompletedRequestAsyncList); + + // + // get queue head structure + // + CurrentQH = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // complete request now + // + QueueHeadCleanup(CurrentQH); + } + + // + // release lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); } NTSTATUS Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Wed Apr 27 16:23:42 2011 @@ -47,6 +47,9 @@ virtual BOOLEAN IsRequestInitialized(); virtual BOOLEAN ShouldReleaseRequestAfterCompletion(); virtual VOID FreeQueueHead(struct _QUEUE_HEAD * QueueHead); + virtual VOID GetTransferBuffer(OUT PMDL * OutMDL, OUT PULONG TransferLength); + virtual BOOLEAN IsQueueHeadComplete(struct _QUEUE_HEAD * QueueHead); + // local functions ULONG InternalGetTransferType(); @@ -641,12 +644,6 @@ } // - // Control Transfers have only one in or out buffer if one at all. Put in the QueueHead the - // same as BulkTransfers. USBQueue will use the Mdl to fill in the BufferPointers - // - QueueHead->Mdl = m_TransferBufferMDL; - - // // link setup packet into buffer - Physical Address!!! // m_TransferDescriptors[0]->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorSetupPacket.LowPart); @@ -1149,6 +1146,64 @@ } } +//----------------------------------------------------------------------------------------- +BOOLEAN +CUSBRequest::IsQueueHeadComplete( + struct _QUEUE_HEAD * QueueHead) +{ + ULONG Index; + + // + // first check - is the queue head currently active + // + if (QueueHead->Token.Bits.Active) + { + // + // queue head is active (currently processed) + // + return FALSE; + } + + // + // FIXME: support chained queue heads + // + for(Index = 0; Index < 3; Index++) + { + // + // check transfer descriptors for completion + // + if (m_TransferDescriptors[Index]) + { + // + // check for serious error + // + PC_ASSERT(m_TransferDescriptors[Index]->Token.Bits.Halted == 0); + + // + // the transfer descriptor should be in the same state as the queue head + // + PC_ASSERT(m_TransferDescriptors[Index]->Token.Bits.Active == 0); + } + } + + return TRUE; +} + +//----------------------------------------------------------------------------------------- +VOID +CUSBRequest::GetTransferBuffer( + OUT PMDL * OutMDL, + OUT PULONG TransferLength) +{ + // sanity checks + PC_ASSERT(OutMDL); + PC_ASSERT(TransferLength); + + *OutMDL = m_TransferBufferMDL; + *TransferLength = m_TransferBufferLength; +} + +//----------------------------------------------------------------------------------------- NTSTATUS InternalCreateUSBRequest( PUSBREQUEST *OutRequest)

13 years, 8 months

[rharabien] 51465: [CMAKE] Add idndl to build

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Apr 27 14:05:18 2011 New Revision: 51465 URL: http://svn.reactos.org/svn/reactos?rev=51465&view=rev Log: [CMAKE] Add idndl to build Modified: branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt branches/cmake-bringup/dll/nls/CMakeLists.txt branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Wed Apr 27 14:05:18 2011 @@ -1,6 +1,6 @@ add_subdirectory(dbgprint) add_subdirectory(doskey) -add_subdirectory(find) # FIXME : lang/pt-BR.rc:6: use "" to put " in a string +add_subdirectory(find) add_subdirectory(hostname) add_subdirectory(lodctr) add_subdirectory(more) Modified: branches/cmake-bringup/dll/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/CMakeList… ============================================================================== --- branches/cmake-bringup/dll/nls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/nls/CMakeLists.txt [iso-8859-1] Wed Apr 27 14:05:18 2011 @@ -1,3 +1,3 @@ -#add_subdirectory(idndl)#FIXME: idndl.cpp:20: error: 'GetLocaleInfoEx' was not declared in this scope +add_subdirectory(idndl) add_subdirectory(normaliz) Modified: branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/idndl/CMa… ============================================================================== --- branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt [iso-8859-1] Wed Apr 27 14:05:18 2011 @@ -1,6 +1,6 @@ -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +remove_definitions(-DWINVER=0x502) +add_definitions(-DWINVER=0x600) spec2def(idndl.dll idndl.spec)

13 years, 8 months

[gadamopoulos] 51464: [win32k] -Fix a case when a window is created and we don't have a monitor created yet. (This can happen when we may attempt to use gui on demand)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Apr 27 12:33:16 2011 New Revision: 51464 URL: http://svn.reactos.org/svn/reactos?rev=51464&view=rev Log: [win32k] -Fix a case when a window is created and we don't have a monitor created yet. (This can happen when we may attempt to use gui on demand) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Apr 27 12:33:16 2011 @@ -1555,7 +1555,15 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParams; pMonitor = IntGetPrimaryMonitor(); - ASSERT(pMonitor); + + /* Check if we don't have a monitor attached yet */ + if(pMonitor == NULL) + { + Cs->x = Cs->y = 0; + Cs->cx = 800; + Cs->cy = 600; + return; + } ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters;

13 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2011