Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[cgutman] 56124: [VIDEOPRT] - Don't add legacy resources twice in VideoPortGetAccessRanges - Fixes Cirrus driver initialization

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Mar 12 01:38:21 2012 New Revision: 56124 URL: http://svn.reactos.org/svn/reactos?rev=56124&view=rev Log: [VIDEOPRT] - Don't add legacy resources twice in VideoPortGetAccessRanges - Fixes Cirrus driver initialization Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Mon Mar 12 01:38:21 2012 @@ -567,7 +567,7 @@ PCI_COMMON_CONFIG Config; PCM_RESOURCE_LIST AllocatedResources; NTSTATUS Status; - UINT AssignedCount; + UINT AssignedCount = 0; CM_FULL_RESOURCE_DESCRIPTOR *FullList; CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor; PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; @@ -682,6 +682,21 @@ } DeviceExtension->AllocatedResources = AllocatedResources; DeviceExtension->SystemIoSlotNumber = PciSlotNumber.u.AsULONG; + + /* Add legacy resources to the resources from HAL */ + Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension, + &LegacyAccessRanges, &LegacyAccessRangeCount); + if (!NT_SUCCESS(Status)) + return ERROR_DEV_NOT_EXIST; + + if (NumAccessRanges < LegacyAccessRangeCount) + { + ERR_(VIDEOPRT, "Too many legacy access ranges found\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); + AssignedCount = LegacyAccessRangeCount; } } else @@ -725,18 +740,7 @@ /* Return the slot number if the caller wants it */ if (Slot != NULL) *Slot = DeviceExtension->SystemIoBusNumber; - - Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension, - &LegacyAccessRanges, &LegacyAccessRangeCount); - if (!NT_SUCCESS(Status)) - return ERROR_DEV_NOT_EXIST; - if (NumAccessRanges < LegacyAccessRangeCount) - { - ERR_(VIDEOPRT, "Too many legacy access ranges found\n"); - return ERROR_NOT_ENOUGH_MEMORY; - } - RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); - AssignedCount = LegacyAccessRangeCount; + for (FullList = AllocatedResources->List; FullList < AllocatedResources->List + AllocatedResources->Count; FullList++)

12 years, 6 months

[tfaber] 56123: [CLT2012] - Partly revert r53422 to allow hybrid CD booting again. Thanks to Giannis.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 11 21:09:16 2012 New Revision: 56123 URL: http://svn.reactos.org/svn/reactos?rev=56123&view=rev Log: [CLT2012] - Partly revert r53422 to allow hybrid CD booting again. Thanks to Giannis. Modified: branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini Modified: branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Mar 11 21:09:16 2012 @@ -231,15 +231,20 @@ IniOpenSection("Operating Systems", &SectionId); IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue)); +#ifndef _M_ARM // Install the drive mapper according to this sections drive mappings #if defined(_M_IX86) && !defined(_MSC_VER) DriveMapMapDrivesInSection(SectionName); #endif #ifdef FREELDR_REACTOS_SETUP - // WinLdr-style boot - LoadReactOSSetup(); -#elif defined(_M_IX86) + if (_stricmp(BootType, "ReactOSSetup") == 0) + { + LoadReactOSSetup(); + } + else +#endif +#ifdef _M_IX86 if (_stricmp(BootType, "Windows") == 0) { LoadAndBootWindows(SectionName, SettingValue, 0); @@ -268,6 +273,7 @@ { LoadAndBootDrive(SectionName); } +#endif #else LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); #endif Modified: branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/hybri… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini [iso-8859-1] Sun Mar 11 21:09:16 2012 @@ -24,7 +24,7 @@ Live="ReactOS Live-System starten" [Install] -BootType=ReactOSSetup2 +BootType=ReactOSSetup [Live] BootType=Windows2003

12 years, 6 months

[cgutman] 56122: [VIDEOPRT] - Add more debugging in resource code

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Mar 11 20:24:29 2012 New Revision: 56122 URL: http://svn.reactos.org/svn/reactos?rev=56122&view=rev Log: [VIDEOPRT] - Add more debugging in resource code Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sun Mar 11 20:24:29 2012 @@ -64,7 +64,9 @@ *AccessRanges = DriverExtension->InitializationData.HwLegacyResourceList; *AccessRangeCount = DriverExtension->InitializationData.HwLegacyResourceCount; } - + + INFO_(VIDEOPRT, "Got %d legacy access ranges\n", *AccessRangeCount); + return STATUS_SUCCESS; } @@ -580,7 +582,7 @@ PIO_RESOURCE_REQUIREMENTS_LIST ResReqList; BOOLEAN DeviceAndVendorFound = FALSE; - TRACE_(VIDEOPRT, "VideoPortGetAccessRanges\n"); + TRACE_(VIDEOPRT, "VideoPortGetAccessRanges(%d, %p, %d, %p)\n", NumRequestedResources, RequestedResources, NumAccessRanges, AccessRanges); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); DriverObject = DeviceExtension->DriverObject; @@ -729,7 +731,10 @@ if (!NT_SUCCESS(Status)) return ERROR_DEV_NOT_EXIST; if (NumAccessRanges < LegacyAccessRangeCount) + { + ERR_(VIDEOPRT, "Too many legacy access ranges found\n"); return ERROR_NOT_ENOUGH_MEMORY; + } RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); AssignedCount = LegacyAccessRangeCount; for (FullList = AllocatedResources->List; @@ -751,7 +756,7 @@ Descriptor->Type == CmResourceTypePort) && AssignedCount >= NumAccessRanges) { - WARN_(VIDEOPRT, "Too many access ranges found\n"); + ERR_(VIDEOPRT, "Too many access ranges found\n"); return ERROR_NOT_ENOUGH_MEMORY; } if (Descriptor->Type == CmResourceTypeMemory)

12 years, 6 months

[cwittich] 56121: [setup16] check if setup.lst file exists

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 11 19:04:07 2012 New Revision: 56121 URL: http://svn.reactos.org/svn/reactos?rev=56121&view=rev Log: [setup16] check if setup.lst file exists Modified: trunk/reactos/base/applications/setup16/main.c Modified: trunk/reactos/base/applications/setup16/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/… ============================================================================== --- trunk/reactos/base/applications/setup16/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/setup16/main.c [iso-8859-1] Sun Mar 11 19:04:07 2012 @@ -83,6 +83,12 @@ wcscpy(szFileName, szSetupPath); wcscat(szFileName, L"setup.lst"); + if (GetFileAttributes(szFileName) == INVALID_FILE_ATTRIBUTES) + { + MessageBoxW(0, L"Cannot find Setup.lst file", L"Error", MB_OK | MB_ICONERROR); + return 1; + } + /* read information from setup.lst */ GetPrivateProfileStringW(NT_PARAMS, L"CabinetFile", NULL, szCabFileName, MAX_PATH, szFileName); GetPrivateProfileStringW(NT_PARAMS, L"TmpDirName", NULL, szTempDirName, 50, szFileName);

12 years, 6 months

[akhaldi] 56120: [CMAKE] * Temporarily work around the cmake rc handling bug.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 11 19:01:39 2012 New Revision: 56120 URL: http://svn.reactos.org/svn/reactos?rev=56120&view=rev Log: [CMAKE] * Temporarily work around the cmake rc handling bug. Modified: trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt Modified: trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Sun Mar 11 19:01:39 2012 @@ -7,16 +7,20 @@ palette.c pointer.c screen.c - framebuf_new.rc ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def) -add_library(framebuf_new SHARED ${SOURCE}) +add_library(framebuf_new SHARED + ${SOURCE} + framebuf_new.rc) if(ARCH MATCHES i386) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - add_target_compile_flags(framebuf_new "/Gz") + #add_target_compile_flags(framebuf_new "/Gz") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") else() - add_target_compile_flags(framebuf_new "-mrtd -fno-builtin") + #add_target_compile_flags(framebuf_new "-mrtd -fno-builtin") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") endif() endif()

12 years, 6 months

[cgutman] 56119: [VBEMP] - Fix EDID reading using SCI

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Mar 11 17:20:39 2012 New Revision: 56119 URL: http://svn.reactos.org/svn/reactos?rev=56119&view=rev Log: [VBEMP] - Fix EDID reading using SCI Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] Sun Mar 11 17:20:39 2012 @@ -121,7 +121,7 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_REPORT_CAPABILITIES; - BiosRegisters.Ecx = VBEDeviceExtension->CurrentChildIndex; + BiosRegisters.Ecx = ChildIndex; VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters); @@ -137,7 +137,7 @@ VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_BEGIN_SCL_SDA_CONTROL; - BiosRegisters.Ecx = VBEDeviceExtension->CurrentChildIndex; + BiosRegisters.Ecx = ChildIndex; VBEDeviceExtension->Int10Interface.Int10CallBios( VBEDeviceExtension->Int10Interface.Context, &BiosRegisters);

12 years, 6 months

[cgutman] 56118: [NTOSKRNL] - Temporarily comment out the dereferencing

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Mar 11 14:12:28 2012 New Revision: 56118 URL: http://svn.reactos.org/svn/reactos?rev=56118&view=rev Log: [NTOSKRNL] - Temporarily comment out the dereferencing Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun Mar 11 14:12:28 2012 @@ -589,7 +589,7 @@ Status = IopInitializeDevice(DeviceNode, DriverObject); /* Remove extra reference */ - ObDereferenceObject(DriverObject); + //ObDereferenceObject(DriverObject); } return STATUS_SUCCESS; @@ -885,7 +885,7 @@ } /* Remove extra reference from IopInitializeDriverModule */ - ObDereferenceObject(DriverObject); + //ObDereferenceObject(DriverObject); return Status; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Mar 11 14:12:28 2012 @@ -2613,7 +2613,7 @@ Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject); /* Remove the extra reference */ - ObDereferenceObject(DriverObject); + //ObDereferenceObject(DriverObject); } else {

12 years, 6 months

[tkreuzer] 56117: [SETUP16] Fix MSVC build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 11 13:29:59 2012 New Revision: 56117 URL: http://svn.reactos.org/svn/reactos?rev=56117&view=rev Log: [SETUP16] Fix MSVC build Modified: trunk/reactos/base/applications/setup16/main.c Modified: trunk/reactos/base/applications/setup16/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/… ============================================================================== --- trunk/reactos/base/applications/setup16/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/setup16/main.c [iso-8859-1] Sun Mar 11 13:29:59 2012 @@ -26,13 +26,15 @@ BOOL DeleteDirectory(LPWSTR lpszDir) { + SHFILEOPSTRUCT fileop; DWORD len = wcslen(lpszDir); WCHAR *pszFrom = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + int ret; + wcscpy(pszFrom, lpszDir); pszFrom[len] = 0; pszFrom[len+1] = 0; - SHFILEOPSTRUCT fileop; fileop.hwnd = NULL; fileop.wFunc = FO_DELETE; fileop.pFrom = pszFrom; @@ -42,7 +44,7 @@ fileop.lpszProgressTitle = NULL; fileop.hNameMappings = NULL; - int ret = SHFileOperation(&fileop); + ret = SHFileOperation(&fileop); HeapFree(GetProcessHeap(), 0, &pszFrom); return (ret == 0); } @@ -60,9 +62,6 @@ LPWSTR lpCmdLine, int nCmdShow) { - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(nCmdShow); - WCHAR szSetupPath[MAX_PATH]; WCHAR szFileName[MAX_PATH]; WCHAR szCabFileName[MAX_PATH]; @@ -76,6 +75,8 @@ DWORD dwAttrib; PROCESS_INFORMATION processInfo; STARTUPINFO startupInfo; + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(nCmdShow); GetCurrentDirectory(MAX_PATH, szSetupPath); wcscat(szSetupPath, L"\\"); @@ -145,4 +146,4 @@ return 0; } -/* EOF */ +/* EOF */

12 years, 6 months

[pschweitzer] 56116: [ATL] Fix a bug in CComModule::UpdateRegistryFromResource that lead resources not to be unregistered

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 11 13:27:11 2012 New Revision: 56116 URL: http://svn.reactos.org/svn/reactos?rev=56116&view=rev Log: [ATL] Fix a bug in CComModule::UpdateRegistryFromResource that lead resources not to be unregistered Modified: trunk/reactos/lib/atl/atlbase.h Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=5611… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sun Mar 11 13:27:11 2012 @@ -378,7 +378,7 @@ if (bRegister != FALSE) hResult = registrar.ResourceRegister(modulePath, nResID, _T("REGISTRY")); else - hResult = registrar.ResourceRegister(modulePath, nResID, _T("REGISTRY")); + hResult = registrar.ResourceUnregister(modulePath, nResID, _T("REGISTRY")); return hResult; }

12 years, 6 months

[pschweitzer] 56115: [RSYM64] Remove extra coma Spotted by Cameron

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 11 11:20:07 2012 New Revision: 56115 URL: http://svn.reactos.org/svn/reactos?rev=56115&view=rev Log: [RSYM64] Remove extra coma Spotted by Cameron Modified: trunk/reactos/tools/rsym/rsym64.c Modified: trunk/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym64.c?rev=56… ============================================================================== --- trunk/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym64.c [iso-8859-1] Sun Mar 11 11:20:07 2012 @@ -557,7 +557,7 @@ /* Allocate .pdata buffer */ pdata = File->pdata.p = malloc(pshp->SizeOfRawData); - memset(File->pdata.p, 0, pshp->SizeOfRawData,); + memset(File->pdata.p, 0, pshp->SizeOfRawData); /* Init exception data dir */ Dir = &File->OptionalHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION];

12 years, 6 months

← Newer
1
...
15
16
17
18
19
20
21
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2012