Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[janderwald] 51353: [USBEHCI_NEW] - Define tag for allocations - Fixes assert hit in ReactOS - Fix typo in IHubController interface declaration
by janderwald＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: janderwald Date: Fri Apr 15 15:45:09 2011 New Revision: 51353 URL: http://svn.reactos.org/svn/reactos?rev=51353&view=rev Log: [USBEHCI_NEW] - Define tag for allocations - Fixes assert hit in ReactOS - Fix typo in IHubController interface declaration Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Fri Apr 15 15:45:09 2011 @@ -952,7 +952,7 @@ // // allocate controller // - This = new(NonPagedPool, 0) CHCDController(0); + This = new(NonPagedPool, TAG_USBEHCI) CHCDController(0); if (!This) { // 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] Fri Apr 15 15:45:09 2011 @@ -454,7 +454,7 @@ virtual NTSTATUS Initialize(IN PHCDCONTROLLER Controller, IN PUSBHARDWAREDEVICE Device, IN BOOLEAN IsRootHubDevice, - IN ULONG DeviceAddress); + IN ULONG DeviceAddress) = 0; //----------------------------------------------------------------------------------------- // Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Fri Apr 15 15:45:09 2011 @@ -32,6 +32,10 @@ }; }COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; +// +// tag for allocations +// +#define TAG_USBEHCI 'ICHE' // // assert for c++ - taken from portcls @@ -55,4 +59,9 @@ // NTSTATUS NTAPI SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp); +// +// root_hub_controller.cpp +// +NTSTATUS CreateRootHubController(PHUBCONTROLLER * OutHubController); + #endif

1 0

[tkreuzer] 51352: [WIN32K] - Use shared locks for surfaces and palettes
by tkreuzer＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: tkreuzer Date: Fri Apr 15 15:29:08 2011 New Revision: 51352 URL: http://svn.reactos.org/svn/reactos?rev=51352&view=rev Log: [WIN32K] - Use shared locks for surfaces and palettes Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/palette.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Fri Apr 15 15:29:08 2011 @@ -743,7 +743,7 @@ if (pDC) { if (SetType == 1) - { + { if ( Set ) pDC->fs |= DC_FLAG_FULLSCREEN; else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Apr 15 15:29:08 2011 @@ -934,24 +934,24 @@ /* Copy new IconInfo field */ CurIcon->IconInfo = IconInfo; - psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); + psurfBmp = SURFACE_ShareLockSurface(CurIcon->IconInfo.hbmColor); if (psurfBmp) { CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); + SURFACE_ShareUnlockSurface(psurfBmp); GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); } else { - psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask); + psurfBmp = SURFACE_ShareLockSurface(CurIcon->IconInfo.hbmMask); if (!psurfBmp) goto done; CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy / 2; - SURFACE_UnlockSurface(psurfBmp); + SURFACE_ShareUnlockSurface(psurfBmp); } GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Apr 15 15:29:08 2011 @@ -119,7 +119,7 @@ } DecompressBitmap(sizl, pvCompressedBits, pvBits, lDelta, iFormat); fjBitmap |= BMF_RLE_HACK; - + iFormat = iFormat == BMF_4RLE ? BMF_4BPP : BMF_8BPP; psurf->SurfObj.iBitmapFormat = iFormat; } @@ -201,7 +201,7 @@ if (pUnsafeBits && hbmp) { - PSURFACE psurf = SURFACE_LockSurface(hbmp); + PSURFACE psurf = SURFACE_ShareLockSurface(hbmp); _SEH2_TRY { ProbeForRead(pUnsafeBits, cjSize, 1); @@ -215,7 +215,7 @@ } _SEH2_END - SURFACE_UnlockSurface(psurf); + SURFACE_ShareUnlockSurface(psurf); } return hbmp; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Fri Apr 15 15:29:08 2011 @@ -514,7 +514,7 @@ } /* Lock the DIB palette */ - ppalDIB = PALETTE_LockPalette(hpalDIB); + ppalDIB = PALETTE_ShareLockPalette(hpalDIB); if (!ppalDIB) { EngSetLastError(ERROR_INVALID_HANDLE); @@ -555,7 +555,7 @@ ret = ScanLines; } - if (ppalDIB) PALETTE_UnlockPalette(ppalDIB); + if (ppalDIB) PALETTE_ShareUnlockPalette(ppalDIB); if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); @@ -1590,7 +1590,7 @@ EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); goto cleanup; } - bmp = SURFACE_LockSurface(res); + bmp = SURFACE_ShareLockSurface(res); // HACK if (NULL == bmp) { DPRINT1("SURFACE_LockSurface failed\n"); @@ -1646,7 +1646,7 @@ if (bmp) { - SURFACE_UnlockSurface(bmp); + SURFACE_ShareUnlockSurface(bmp); } // Return BITMAP handle and storage location Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Fri Apr 15 15:29:08 2011 @@ -469,11 +469,11 @@ return NULL; } - PalGDI = (PPALETTE) PALETTE_LockPalette(NewPalette); + PalGDI = (PPALETTE) PALETTE_ShareLockPalette(NewPalette); if (PalGDI != NULL) { PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); - PALETTE_UnlockPalette(PalGDI); + PALETTE_ShareUnlockPalette(PalGDI); } else { @@ -664,7 +664,7 @@ if (NULL != dc) { HPALETTE hpal = dc->dclevel.hpal; - palGDI = (PPALETTE) PALETTE_LockPalette(hpal); + palGDI = PALETTE_ShareLockPalette(hpal); if (!palGDI) { DC_UnlockDc(dc); @@ -691,7 +691,7 @@ (GetGValue(Color) >> GBits) << GBits, (GetBValue(Color) >> BBits) << BBits); } - PALETTE_UnlockPalette(palGDI); + PALETTE_ShareUnlockPalette(palGDI); DC_UnlockDc(dc); } @@ -704,7 +704,7 @@ HPALETTE hpal, COLORREF crColor) { - PPALETTE ppal = (PPALETTE) PALETTE_LockPalette(hpal); + PPALETTE ppal = PALETTE_ShareLockPalette(hpal); UINT index = 0; if (ppal) @@ -715,7 +715,7 @@ index = PALETTE_ulGetNearestPaletteIndex(ppal, crColor); } // else SetLastError ? - PALETTE_UnlockPalette(ppal); + PALETTE_ShareUnlockPalette(ppal); } return index; @@ -777,13 +777,13 @@ PWND Wnd; const PALETTEENTRY *pptr = PaletteColors; - palPtr = (PPALETTE)PALETTE_LockPalette(hPal); + palPtr = PALETTE_ShareLockPalette(hPal); if (!palPtr) return FALSE; pal_entries = palPtr->NumColors; if (StartIndex >= pal_entries) { - PALETTE_UnlockPalette(palPtr); + PALETTE_ShareUnlockPalette(palPtr); return FALSE; } if (StartIndex+NumEntries > pal_entries) NumEntries = pal_entries - StartIndex; @@ -800,7 +800,7 @@ } } - PALETTE_UnlockPalette(palPtr); + PALETTE_ShareUnlockPalette(palPtr); /* Immediately apply the new palette if current window uses it */ Wnd = UserGetDesktopWindow(); @@ -831,7 +831,7 @@ PPALETTE palGDI; UINT numEntries; - palGDI = (PPALETTE) PALETTE_LockPalette(hpal); + palGDI = (PPALETTE) PALETTE_ShareLockPalette(hpal); if (NULL == palGDI) { return 0; @@ -846,7 +846,7 @@ } if (numEntries <= StartIndex) { - PALETTE_UnlockPalette(palGDI); + PALETTE_ShareUnlockPalette(palGDI); return 0; } memcpy(pe, palGDI->IndexedColors + StartIndex, Entries * sizeof(PALETTEENTRY)); @@ -856,7 +856,7 @@ Entries = numEntries; } - PALETTE_UnlockPalette(palGDI); + PALETTE_ShareUnlockPalette(palGDI); return Entries; } @@ -894,7 +894,7 @@ return 0; } - palGDI = PALETTE_LockPalette(dc->dclevel.hpal); + palGDI = PALETTE_ShareLockPalette(dc->dclevel.hpal); if (palGDI != NULL) { if (pe != NULL) @@ -917,7 +917,7 @@ } if (palGDI != NULL) - PALETTE_UnlockPalette(palGDI); + PALETTE_ShareUnlockPalette(palGDI); if (dc != NULL) DC_UnlockDc(dc); @@ -941,13 +941,13 @@ return 0; } - palGDI = PALETTE_LockPalette(hpal); + palGDI = PALETTE_ShareLockPalette(hpal); if (!palGDI) return 0; numEntries = palGDI->NumColors; if (Start >= numEntries) { - PALETTE_UnlockPalette(palGDI); + PALETTE_ShareUnlockPalette(palGDI); return 0; } if (numEntries < Start + Entries) @@ -955,7 +955,7 @@ Entries = numEntries - Start; } memcpy(palGDI->IndexedColors + Start, pe, Entries * sizeof(PALETTEENTRY)); - PALETTE_UnlockPalette(palGDI); + PALETTE_ShareUnlockPalette(palGDI); return Entries; } @@ -1138,7 +1138,7 @@ !GDI_HANDLE_IS_TYPE(hgdiobj, GDI_OBJECT_TYPE_PALETTE) ) return Ret; - palGDI = PALETTE_LockPalette(hgdiobj); + palGDI = PALETTE_ShareLockPalette(hgdiobj); if (!palGDI) return FALSE; // FIXME!! @@ -1146,7 +1146,7 @@ // Zero out Current and Old Translated pointers? // Ret = TRUE; - PALETTE_UnlockPalette(palGDI); + PALETTE_ShareUnlockPalette(palGDI); return Ret; }

1 0

[tkreuzer] 51351: [WIN32K] - Use shared locks for surfaces and palettes - Unimplement NtGdiEngUnlockSurface, it was wrong
by tkreuzer＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: tkreuzer Date: Fri Apr 15 15:20:17 2011 New Revision: 51351 URL: http://svn.reactos.org/svn/reactos?rev=51351&view=rev Log: [WIN32K] - Use shared locks for surfaces and palettes - Unimplement NtGdiEngUnlockSurface, it was wrong Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Fri Apr 15 15:20:17 2011 @@ -390,7 +390,7 @@ if (!psurfMask) goto failure; /* Initialize an EXLATEOBJ */ - ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault); + ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); EXLATEOBJ_vInitialize(&exlo, &gpalMono, ppal, @@ -409,7 +409,7 @@ /* Cleanup */ EXLATEOBJ_vCleanup(&exlo); - if (ppal) PALETTE_UnlockPalette(ppal); + if (ppal) PALETTE_ShareUnlockPalette(ppal); } /* Hide mouse pointer */ Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Fri Apr 15 15:20:17 2011 @@ -376,7 +376,7 @@ ppdev = (PDEVOBJ*)hdev; /* Lock the surface */ - psurf = SURFACE_LockSurface(hsurf); + psurf = SURFACE_ShareLockSurface(hsurf); if (!psurf) { return FALSE; @@ -394,7 +394,7 @@ /* Get palette */ psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); - SURFACE_UnlockSurface(psurf); + SURFACE_ShareUnlockSurface(psurf); return TRUE; } @@ -415,7 +415,7 @@ PSURFACE psurf; PDEVOBJ* ppdev; - psurf = SURFACE_LockSurface(hsurf); + psurf = SURFACE_ShareLockSurface(hsurf); if (psurf == NULL) { return FALSE; @@ -438,7 +438,7 @@ /* Get palette */ psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); - SURFACE_UnlockSurface(psurf); + SURFACE_ShareUnlockSurface(psurf); return TRUE; } @@ -479,19 +479,17 @@ APIENTRY EngLockSurface(IN HSURF hsurf) { - SURFACE *psurf = GDIOBJ_ShareLockObj(hsurf, GDI_OBJECT_TYPE_BITMAP); - - if (psurf != NULL) - return &psurf->SurfObj; - - return NULL; + SURFACE *psurf = SURFACE_ShareLockSurface(hsurf); + + return psurf ? &psurf->SurfObj : NULL; } VOID APIENTRY NtGdiEngUnlockSurface(IN SURFOBJ *pso) { - EngUnlockSurface(pso); + UNIMPLEMENTED; + ASSERT(FALSE); } VOID @@ -501,7 +499,7 @@ if (pso != NULL) { SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); - GDIOBJ_ShareUnlockObjByPtr((POBJ)psurf); + SURFACE_ShareUnlockSurface(psurf); } }

1 0

[janderwald] 51350: [USBEHCI_NEW] - Fix IOCTL_GET_HCD_DRIVERKEY_NAME implementation - Now needs IOCTL_USB_GET_ROOT_HUB_NAME to get further in usbview - Tested in Windows XP SP2
by janderwald＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: janderwald Date: Fri Apr 15 14:58:50 2011 New Revision: 51350 URL: http://svn.reactos.org/svn/reactos?rev=51350&view=rev Log: [USBEHCI_NEW] - Fix IOCTL_GET_HCD_DRIVERKEY_NAME implementation - Now needs IOCTL_USB_GET_ROOT_HUB_NAME to get further in usbview - Tested in Windows XP SP2 Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Fri Apr 15 14:58:50 2011 @@ -241,7 +241,7 @@ DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - DPRINT1("HandleDeviceControl>Type: FDO %u IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", + DPRINT1("HandleDeviceControl>Type: FDO %u IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", DeviceExtension->IsFDO, IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, @@ -282,21 +282,23 @@ // // it does // - Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength, DriverKey->DriverKeyName, &ResultLength); - - //DPRINT1("Result %S\n", DriverKey->DriverKeyName); + Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG), DriverKey->DriverKeyName, &ResultLength); + + if (NT_SUCCESS(Status)) + { + // + // informal debug print + // + DPRINT1("Result %S\n", DriverKey->DriverKeyName); + } } - // - // FIXME - // - // // store result // - DriverKey->ActualLength = ResultLength; + DriverKey->ActualLength = ResultLength + FIELD_OFFSET(USB_HCD_DRIVERKEY_NAME, DriverKeyName) + sizeof(WCHAR); Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; - Status = STATUS_BUFFER_OVERFLOW; + Status = STATUS_SUCCESS; } } else @@ -308,13 +310,28 @@ Irp->IoStatus.Information = sizeof(USB_HCD_DRIVERKEY_NAME); } } - } - -// - + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_ROOT_HUB_NAME) + { + DPRINT1("IOCTL_USB_GET_ROOT_HUB_NAME is not implemented yet\n"); + } + } + else + { + // + // the PDO does not support any device IOCTLs + // + Status = STATUS_SUCCESS; + } + + // + // complete the request + // Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + // + // done + // return Status; }

1 0

[rharabien] 51349: [SYSSETUP] * Computer name length is limited to 15 characters, not 63. Fixes possible buffer overflow * Spotted by Victor Martinez
by rharabien＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: rharabien Date: Fri Apr 15 14:29:14 2011 New Revision: 51349 URL: http://svn.reactos.org/svn/reactos?rev=51349&view=rev Log: [SYSSETUP] * Computer name length is limited to 15 characters, not 63. Fixes possible buffer overflow * Spotted by Victor Martinez Modified: trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Fri Apr 15 14:29:14 2011 @@ -43,7 +43,7 @@ WCHAR OwnerName[51]; WCHAR OwnerOrganization[51]; - WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 63 characters */ + WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 15 characters */ WCHAR AdminPassword[15]; /* max. 14 characters */ BOOL UnattendSetup; BOOL DisableVmwInst; Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri Apr 15 14:29:14 2011 @@ -596,7 +596,7 @@ SetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName); /* Set text limits */ - SendDlgItemMessage(hwndDlg, IDC_COMPUTERNAME, EM_LIMITTEXT, 64, 0); + SendDlgItemMessage(hwndDlg, IDC_COMPUTERNAME, EM_LIMITTEXT, MAX_COMPUTERNAME_LENGTH, 0); SendDlgItemMessage(hwndDlg, IDC_ADMINPASSWORD1, EM_LIMITTEXT, 14, 0); SendDlgItemMessage(hwndDlg, IDC_ADMINPASSWORD2, EM_LIMITTEXT, 14, 0); @@ -630,7 +630,7 @@ break; case PSN_WIZNEXT: - if (GetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName, 64) == 0) + if (0 == GetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName, MAX_COMPUTERNAME_LENGTH + 1)) { if (0 == LoadStringW(hDllInstance, IDS_WZD_COMPUTERNAME, EmptyComputerName, sizeof(EmptyComputerName) / sizeof(EmptyComputerName[0])))

1 0

[janderwald] 51348: [USBEHCI_NEW] - Build fix #1 for mingw - Define cxa_pure_virtual which is required that gcc is aware that it should really use the libc++ instead of falling back to libc
by janderwald＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: janderwald Date: Fri Apr 15 14:13:24 2011 New Revision: 51348 URL: http://svn.reactos.org/svn/reactos?rev=51348&view=rev Log: [USBEHCI_NEW] - Build fix #1 for mingw - Define cxa_pure_virtual which is required that gcc is aware that it should really use the libc++ instead of falling back to libc Added: branches/usb-bringup/drivers/usb/usbehci_new/purecall.cpp (with props) Modified: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt Modified: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Fri Apr 15 14:13:24 2011 @@ -9,6 +9,7 @@ hcd_controller.cpp hardware.cpp misc.cpp + purecall.cpp usbehci.rc) target_link_libraries(usbehci Added: branches/usb-bringup/drivers/usb/usbehci_new/purecall.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/purecall.cpp (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/purecall.cpp [iso-8859-1] Fri Apr 15 14:13:24 2011 @@ -1,0 +1,24 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci_new/purecall.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + + +extern "C" { + void + __cxa_pure_virtual() + { + // put error handling here + + DbgBreakPoint(); + + } +} + Propchange: branches/usb-bringup/drivers/usb/usbehci_new/purecall.cpp ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mkupfer] 51347: property svn:executable removed
by mkupfer＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: mkupfer Date: Fri Apr 15 12:17:50 2011 New Revision: 51347 URL: http://svn.reactos.org/svn/reactos?rev=51347&view=rev Log: property svn:executable removed Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c (props changed) Propchange: trunk/reactos/subsystems/win32/win32k/objects/drawing.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -*

1 0

[mkupfer] 51346: potential memory problem fixed, obsolete assignment removed
by mkupfer＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: mkupfer Date: Fri Apr 15 12:16:26 2011 New Revision: 51346 URL: http://svn.reactos.org/svn/reactos?rev=51346&view=rev Log: potential memory problem fixed, obsolete assignment removed Modified: trunk/reactos/base/applications/taskmgr/trayicon.c Modified: trunk/reactos/base/applications/taskmgr/trayicon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/trayicon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/trayicon.c [iso-8859-1] Fri Apr 15 12:16:26 2011 @@ -100,8 +100,6 @@ hOldBitmap = NULL; iconInfo.fIcon = TRUE; - iconInfo.xHotspot = 0; - iconInfo.yHotspot = 0; iconInfo.hbmMask = hBitmapMask; iconInfo.hbmColor = hBitmap; @@ -133,7 +131,7 @@ NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; - WCHAR szMsg[256]; + WCHAR szMsg[64]; memset(&nid, 0, sizeof(NOTIFYICONDATAW)); @@ -181,7 +179,7 @@ NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; - WCHAR szTemp[256]; + WCHAR szTemp[64]; memset(&nid, 0, sizeof(NOTIFYICONDATAW)); @@ -193,7 +191,7 @@ nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, sizeof(szTemp)/sizeof(szTemp[0])); wsprintfW(nid.szTip, szTemp, PerfDataGetProcessorUsage()); bRetVal = Shell_NotifyIconW(NIM_MODIFY, &nid);

1 0

[mjmartin] 51345: [win32k] - Move dereferencing of the MessageQueue from co_UserDestroyWindow to co_UserFreeWindow. A reference is added to the MessageQueue for all windows created.co_UserFreeWindo...
by mjmartin＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: mjmartin Date: Fri Apr 15 07:10:00 2011 New Revision: 51345 URL: http://svn.reactos.org/svn/reactos?rev=51345&view=rev Log: [win32k] - Move dereferencing of the MessageQueue from co_UserDestroyWindow to co_UserFreeWindow. A reference is added to the MessageQueue for all windows created.co_UserFreeWindow is called for all windows and needs to be where the dereferencing of MessageQueue occurs. This fixes NonPagedPool memory leak. See bug 6112 for more info. 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] Fri Apr 15 07:10:00 2011 @@ -447,6 +447,8 @@ /* flush the message queue */ MsqRemoveWindowMessagesFromQueue(Window); + + IntDereferenceMessageQueue(Window->head.pti->MessageQueue); /* from now on no messages can be sent to this window anymore */ Window->state |= WNDS_DESTROYED; @@ -2507,8 +2509,6 @@ ti->pDeskInfo->hShellWindow = NULL; } } - - IntDereferenceMessageQueue(Window->head.pti->MessageQueue); IntEngWindowChanged(Window, WOC_DELETE);

1 0

[mjmartin] 51344: [usbdriver] - KbdDispatch: Set Status vice IoStatus.Status for all branches of switch. Use break instead of goto intcontfailure. The previous code would set Status to what ever wa...
by mjmartin＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: mjmartin Date: Fri Apr 15 06:44:13 2011 New Revision: 51344 URL: http://svn.reactos.org/svn/reactos?rev=51344&view=rev Log: [usbdriver] - KbdDispatch: Set Status vice IoStatus.Status for all branches of switch. Use break instead of goto intcontfailure. The previous code would set Status to what ever was in the IoStatus.Status of the IRP and return that Status. Some times this would be STATUS_PENDING, which IIRC is a no-no. This caused the kbdclass to enter into a wait that would never be satisifed hence blocking the keyboard thread. This should fix the failure of keyboard input bugs. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Fri Apr 15 06:44:13 2011 @@ -392,8 +392,8 @@ if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_INTERNAL_KEYBOARD_CONNECT " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - goto intcontfailure; + Status = STATUS_INVALID_PARAMETER; + break; } RtlCopyMemory(&DeviceExtension->ConnectData, @@ -408,14 +408,14 @@ sizeof(KEYBOARD_ATTRIBUTES)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_ATTRIBUTES: " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; + Status = STATUS_BUFFER_TOO_SMALL; + break; } /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DevExt->KeyboardAttributes, sizeof(KEYBOARD_ATTRIBUTES));*/ - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; case IOCTL_KEYBOARD_QUERY_INDICATORS: usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_QUERY_INDICATORS\n")); @@ -439,8 +439,8 @@ sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_TYPEMATIC: " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; + Status = STATUS_BUFFER_TOO_SMALL; + break; } /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DevExt->KeyboardTypematic, @@ -454,8 +454,8 @@ sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_SET_INDICTATORS: " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; + Status = STATUS_BUFFER_TOO_SMALL; + break; } RtlCopyMemory(&DeviceExtension->KeyboardIndicators, @@ -472,8 +472,8 @@ sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_SET_TYPEMATIC " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; + Status = STATUS_BUFFER_TOO_SMALL; + break; } /*RtlCopyMemory(&DevExt->KeyboardTypematic, @@ -501,10 +501,7 @@ Status = STATUS_SUCCESS;//STATUS_INVALID_DEVICE_REQUEST; break; } -intcontfailure: - Status = Irp->IoStatus.Status; - } - + } if (Status == STATUS_INVALID_DEVICE_REQUEST) {

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
30
Older →

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 April 2011