Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[janderwald] 28908: - fix bug in GetCPFileNameFromRegistry spotted by Daniel Zimmermann ; )
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Fri Sep 7 00:18:15 2007 New Revision: 28908 URL: http://svn.reactos.org/svn/reactos?rev=28908&view=rev Log: - fix bug in GetCPFileNameFromRegistry spotted by Daniel Zimmermann ;) Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Fri Sep 7 00:18:15 2007 @@ -854,6 +854,7 @@ if (NT_SUCCESS(Status) && Kvpi->Type == REG_SZ && Kvpi->DataLength > sizeof(WCHAR)) { + bRetValue = TRUE; if (FileName != NULL) { lstrcpynW(FileName, (WCHAR*)Kvpi->Data,

1 0

[janderwald] 28907: - terminate comment by Marc Puilachs See issue #2611 for more details.
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Fri Sep 7 00:00:19 2007 New Revision: 28907 URL: http://svn.reactos.org/svn/reactos?rev=28907&view=rev Log: - terminate comment by Marc Puilachs See issue #2611 for more details. Modified: trunk/reactos/include/psdk/multimon.h Modified: trunk/reactos/include/psdk/multimon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/multimon.h?re… ============================================================================== --- trunk/reactos/include/psdk/multimon.h (original) +++ trunk/reactos/include/psdk/multimon.h Fri Sep 7 00:00:19 2007 @@ -13,4 +13,4 @@ } #endif -#endif /* __MULTIMON_H &/ +#endif /* __MULTIMON_H */

1 0

[janderwald] 28906: - fix memory leak in GetCPFileNameFromRegistry - bug report + patch by Daniel Zimmermann / netzimme@aol.com See issue #2637 for more details.
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Thu Sep 6 23:57:19 2007 New Revision: 28906 URL: http://svn.reactos.org/svn/reactos?rev=28906&view=rev Log: - fix memory leak in GetCPFileNameFromRegistry - bug report + patch by Daniel Zimmermann / netzimme(a)aol.com See issue #2637 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Thu Sep 6 23:57:19 2007 @@ -813,12 +813,15 @@ HANDLE KeyHandle; PKEY_VALUE_PARTIAL_INFORMATION Kvpi; DWORD KvpiSize; + BOOL bRetValue; + + bRetValue = FALSE; /* Convert the codepage number to string. */ ValueName.Buffer = ValueNameBuffer; ValueName.MaximumLength = sizeof(ValueNameBuffer); if (!NT_SUCCESS(RtlIntegerToUnicodeString(CodePage, 10, &ValueName))) - return FALSE; + return bRetValue; /* Open the registry key containing file name mappings. */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\System\\" @@ -828,17 +831,17 @@ Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return FALSE; + return bRetValue; } /* Allocate buffer that will be used to query the value data. */ KvpiSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + (MAX_PATH * sizeof(WCHAR)); - Kvpi = HeapAlloc(GetProcessHeap(), 0, KvpiSize); + Kvpi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, KvpiSize); if (Kvpi == NULL) { NtClose(KeyHandle); - return FALSE; + return bRetValue; } /* Query the file name for our code page. */ @@ -856,10 +859,11 @@ lstrcpynW(FileName, (WCHAR*)Kvpi->Data, min(Kvpi->DataLength / sizeof(WCHAR), FileNameSize)); } - return TRUE; - } - - return FALSE; + } + + /* free temporary buffer */ + HeapFree(GetProcessHeap(),0,Kvpi); + return bRetValue; } /**

1 0

[janderwald] 28905: - there can be only one instance of the device manager
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Thu Sep 6 23:45:26 2007 New Revision: 28905 URL: http://svn.reactos.org/svn/reactos?rev=28905&view=rev Log: - there can be only one instance of the device manager Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c Thu Sep 6 23:45:26 2007 @@ -11,6 +11,7 @@ HINSTANCE hInstance; HANDLE ProcessHeap; +HANDLE hMutex; int WINAPI _tWinMain(HINSTANCE hThisInstance, @@ -23,6 +24,18 @@ MSG Msg; int Ret = 1; INITCOMMONCONTROLSEX icex; + + hMutex = CreateMutex(NULL, TRUE, _T("devmgmt_mutex")); + if (hMutex == NULL || GetLastError() == ERROR_ALREADY_EXISTS) + { + if (hMutex) + { + CloseHandle(hMutex); + } + return 0; + } + + hInstance = hThisInstance; ProcessHeap = GetProcessHeap(); @@ -59,7 +72,7 @@ } LocalFree((HLOCAL)lpAppName); - + CloseHandle(hMutex); return Ret; }

1 0

[dreimer] 28904: Get ready for 0.3.8. (once more)
by dreimer＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: dreimer Date: Thu Sep 6 22:11:35 2007 New Revision: 28904 URL: http://svn.reactos.org/svn/reactos?rev=28904&view=rev Log: Get ready for 0.3.8. (once more) Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/readme.pdf Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Thu Sep 6 22:11:35 2007 @@ -7,7 +7,7 @@ - Other small Bugfixes (Daniel Reimer) - Updated to NSIS 2.30. (Daniel Reimer) - Updated Binutils 2.17.50 to Build 20070806 (Daniel Reimer) -- Updated: GCC 4.1.3 Build 20070826 (Daniel Reimer) +- Updated: GCC 4.1.3 Build 20070829 (Daniel Reimer) *** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Thu Sep 6 22:11:35 2007 @@ -16,7 +16,7 @@ w32api-3.10 mingw32-make-3.81-2 nasm-0.99.02-win32 -mingw-4.1.3-20070826-prerelease +mingw-4.1.3-20070829-prerelease - Patched to fix a GCC bug concerning decorating virtual methods with stdcall in C++, see GCC issue: Modified: trunk/tools/RosBE-Windows/Root/readme.pdf URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd… ============================================================================== Binary files - no diff available.

1 0

[fireball] 28903: - Fix LoaderPagesSpanned calculation.
by fireball＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: fireball Date: Thu Sep 6 21:18:42 2007 New Revision: 28903 URL: http://svn.reactos.org/svn/reactos?rev=28903&view=rev Log: - Fix LoaderPagesSpanned calculation. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Thu Sep 6 21:18:42 2007 @@ -1111,11 +1111,13 @@ LoaderBlock->Extension->MajorVersion = 5; LoaderBlock->Extension->MinorVersion = 2; - /* Save the number of pages the kernel images take */ - LoaderBlock->Extension->LoaderPagesSpanned = - PAGE_ROUND_UP(KeRosLoaderBlock-> - ModsAddr[KeRosLoaderBlock->ModsCount - 1].ModEnd) - - KeRosLoaderBlock->ModsAddr[0].ModStart; + /* FreeLDR hackllocates 1536 static pages for the initial boot images */ + LoaderBlock->Extension->LoaderPagesSpanned = 1536 * PAGE_SIZE; + + /* ReactOS always boots the kernel at 0x80800000 (just like NT 5.2) */ + LoaderBlock->Extension->LoaderPagesSpanned += 0x80800000 - KSEG0_BASE; + + /* Now convert to pages */ LoaderBlock->Extension->LoaderPagesSpanned /= PAGE_SIZE; /* Now setup the setup block if we have one */

1 0

[gedmurphy] 28902: - Shutdown services when the SCM is terminated - Add basic code for shutting down of the SCM - Fix the headers
by gedmurphy＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: gedmurphy Date: Thu Sep 6 18:51:38 2007 New Revision: 28902 URL: http://svn.reactos.org/svn/reactos?rev=28902&view=rev Log: - Shutdown services when the SCM is terminated - Add basic code for shutting down of the SCM - Fix the headers Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/driver.c trunk/reactos/base/system/services/groupdb.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c (original) +++ trunk/reactos/base/system/services/config.c Thu Sep 6 18:51:38 2007 @@ -1,5 +1,10 @@ /* - * config.c + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/config.c + * PURPOSE: Service configuration interface + * COPYRIGHT: Copyright 2005 Eric Kohl + * */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Thu Sep 6 18:51:38 2007 @@ -1,25 +1,11 @@ /* - * - * service control manager - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/database.c + * PURPOSE: Database control interface + * COPYRIGHT: Copyright 2002-2006 Eric Kohl + * Copyright 2006 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -439,6 +425,18 @@ } +VOID +ScmShutdownServiceDatabase(VOID) +{ + DPRINT("ScmShutdownServiceDatabase() called\n"); + + ScmDeleteMarkedServices(); + RtlDeleteResource(&DatabaseLock); + + DPRINT("ScmShutdownServiceDatabase() done\n"); +} + + static NTSTATUS ScmCheckDriver(PSERVICE Service) { @@ -1000,4 +998,32 @@ } } + +VOID +ScmAutoShutdownServices(VOID) +{ + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + SERVICE_STATUS ServiceStatus; + + DPRINT("ScmAutoShutdownServices() called\n"); + + ServiceEntry = ServiceListHead.Flink; + while (ServiceEntry != &ServiceListHead) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); + + if (CurrentService->Status.dwCurrentState == SERVICE_RUNNING || + CurrentService->Status.dwCurrentState == SERVICE_START_PENDING) + { + /* shutdown service */ + ScmControlService(CurrentService, SERVICE_CONTROL_STOP, &ServiceStatus); + } + + ServiceEntry = ServiceEntry->Flink; + } + + DPRINT("ScmGetBootAndSystemDriverState() done\n"); +} + /* EOF */ Modified: trunk/reactos/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/drive… ============================================================================== --- trunk/reactos/base/system/services/driver.c (original) +++ trunk/reactos/base/system/services/driver.c Thu Sep 6 18:51:38 2007 @@ -1,5 +1,10 @@ /* - * driver.c + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/driver.c + * PURPOSE: Driver control interface + * COPYRIGHT: Copyright 2005-2006 Eric Kohl + * */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/system/services/groupdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/group… ============================================================================== --- trunk/reactos/base/system/services/groupdb.c (original) +++ trunk/reactos/base/system/services/groupdb.c Thu Sep 6 18:51:38 2007 @@ -1,5 +1,10 @@ /* - * groupdb.c + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/groupdb.c + * PURPOSE: Service group control interface + * COPYRIGHT: Copyright 2005 Eric Kohl + * */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Thu Sep 6 18:51:38 2007 @@ -1,5 +1,12 @@ /* - + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/rpcserver.c + * PURPOSE: RPC server interface for the advapi32 calls + * COPYRIGHT: Copyright 2005-2006 Eric Kohl + * Copyright 2006-2007 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> + * */ /* INCLUDES ****************************************************************/ Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c (original) +++ trunk/reactos/base/system/services/services.c Thu Sep 6 18:51:38 2007 @@ -1,24 +1,10 @@ /* - * service control manager - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/services.c + * PURPOSE: Main SCM controller + * COPYRIGHT: Copyright 2001-2005 Eric Kohl + * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -298,7 +284,8 @@ DPRINT1("Shutdown event received!\n"); ScmShutdown = TRUE; - /* FIXME: Shut all services down */ + ScmAutoShutdownServices(); + ScmShutdownServiceDatabase(); } return TRUE; @@ -378,6 +365,8 @@ } #endif + CloseHandle(hScmStartEvent); + DPRINT("SERVICES: Finished.\n"); ExitThread(0); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Thu Sep 6 18:51:38 2007 @@ -94,8 +94,10 @@ /* database.c */ DWORD ScmCreateServiceDatabase(VOID); +VOID ScmShutdownServiceDatabase(VOID); VOID ScmGetBootAndSystemDriverState(VOID); VOID ScmAutoStartServices(VOID); +VOID ScmAutoShutdownServices(VOID); DWORD ScmStartService(PSERVICE Service, LPWSTR lpArgs);

1 0

[janderwald] 28901: - end the configuration commit war
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Thu Sep 6 17:57:55 2007 New Revision: 28901 URL: http://svn.reactos.org/svn/reactos?rev=28901&view=rev Log: - end the configuration commit war Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Thu Sep 6 17:57:55 2007 @@ -49,7 +49,6 @@ string RosBootTest::ROS_EMU_TYPE= _T("ROS_EMU_TYPE"); string RosBootTest::EMU_TYPE_QEMU = _T("qemu"); string RosBootTest::EMU_TYPE_VMWARE = _T("vmware"); - string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH"); string RosBootTest::ROS_HDD_IMAGE= _T("ROS_HDD_IMAGE"); string RosBootTest::ROS_CD_IMAGE = _T("ROS_CD_IMAGE"); string RosBootTest::ROS_MAX_TIME = _T("ROS_MAX_TIME"); @@ -61,6 +60,12 @@ string RosBootTest::ROS_EMU_KILL = _T("ROS_EMU_KILL"); string RosBootTest::ROS_EMU_MEM = _T("ROS_EMU_MEM"); string RosBootTest::ROS_BOOT_CMD = _T("ROS_BOOT_CMD"); + +#ifdef __LINUX__ + string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH_LIN"); +#else + string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH_WIN"); +#endif //--------------------------------------------------------------------------------------- RosBootTest::RosBootTest() : m_MaxTime(0.0), m_DelayRead(0) Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Thu Sep 6 17:57:55 2007 @@ -6,12 +6,12 @@ ROS_EMU_TYPE=qemu -; ROS_EMU_PATH +; ROS_EMU_PATH[LIN|WIN] ; ; This variable sets the path to the emulator ; -;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe -ROS_EMU_PATH=/usr/bin/qemu +ROS_EMU_PATH_WIN=E:\reactos\qemu\qemu.exe +ROS_EMU_PATH_LIN=/usr/bin/qemu ; ROS_HDD_IMAGE ;

1 0

[tkreuzer] 28900: - add the missing macro What the last change does and I missed last commit: - use individual pool tags for each gdi object type - allow object allocation w/o lookaside list - don't search for the lookaside list/cleanup proc, the index into the lists is now calculated from type
by tkreuzer＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: tkreuzer Date: Thu Sep 6 17:14:21 2007 New Revision: 28900 URL: http://svn.reactos.org/svn/reactos?rev=28900&view=rev Log: - add the missing macro What the last change does and I missed last commit: - use individual pool tags for each gdi object type - allow object allocation w/o lookaside list - don't search for the lookaside list/cleanup proc, the index into the lists is now calculated from type Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Sep 6 17:14:21 2007 @@ -28,6 +28,7 @@ #define GDI_HANDLE_REUSE_MASK 0xff000000 #define GDI_HANDLE_UPPER_MASK (GDI_HANDLE_TYPE_MASK|GDI_HANDLE_STOCK_MASK|GDI_HANDLE_REUSE_MASK) #define GDI_HANDLE_REUSECNT_SHIFT 24 +#define GDI_HANDLE_BASETYPE_SHIFT 16 #define GDI_ENTRY_STOCK_MASK 0x00000080 #define GDI_ENTRY_REUSE_MASK 0x0000ff00 @@ -116,6 +117,9 @@ #define GDI_ENTRY_GET_REUSECNT(e) \ ((((ULONG_PTR)(e)) & GDI_ENTRY_REUSE_MASK) >> GDI_ENTRY_REUSECNT_SHIFT) + +#define GDI_OBJECT_GET_TYPE_INDEX(t) \ + ((t & GDI_HANDLE_BASETYPE_MASK) >> GDI_HANDLE_BASETYPE_SHIFT) /* DC OBJ Types */ #define DC_TYPE_DIRECT 0 // normal device context Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Sep 6 17:14:21 2007 @@ -364,7 +364,7 @@ ASSERT(ObjectType != GDI_OBJECT_TYPE_DONTCARE); - TypeIndex = 0; //GDI_OBJECT_GET_TYPE_INDEX(ObjectType); + TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(ObjectType); if (ObjTypeInfo[TypeIndex].bUseLookaside) { LookasideList = FindLookasideList(HandleTable, TypeIndex); @@ -583,7 +583,7 @@ } /* call the cleanup routine. */ - TypeIndex = 0; //GDI_OBJECT_GET_TYPE_INDEX(HandleType); + TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(HandleType); Ret = RunCleanupCallback(GDIHdrToBdy(GdiHdr), TypeIndex); /* Now it's time to free the memory */

1 0

[amunger] 28899: Gracefully handle the case where the BIOS insists there is a floppy drive, but there is no controller. Patch by Cameron Gutman (aicommander at gmail dot com) from Bug 1508.
by amunger＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: amunger Date: Thu Sep 6 16:36:05 2007 New Revision: 28899 URL: http://svn.reactos.org/svn/reactos?rev=28899&view=rev Log: Gracefully handle the case where the BIOS insists there is a floppy drive, but there is no controller. Patch by Cameron Gutman (aicommander at gmail dot com) from Bug 1508. Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c Thu Sep 6 16:36:05 2007 @@ -687,6 +687,22 @@ return STATUS_IO_DEVICE_ERROR; } +/* Check if floppy drive exists */ + if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) + { + DPRINT("floppy: Floppy drive not detected! Returning STATUS_IO_DEVICE_ERROR\n"); + return STATUS_IO_DEVICE_ERROR; + } + +DPRINT("floppy: InitController: resetting the controller after floppy detection\n"); + + /* Reset the controller */ + if(HwReset(ControllerInfo) != STATUS_SUCCESS) + { + DPRINT("floppy: InitController: unable to reset controller\n"); + return STATUS_IO_DEVICE_ERROR; + } + DPRINT("floppy: InitController: setting data rate\n"); /* Set data rate */

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
59
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 September 2007