Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[weiden] 25712: Fix the code to read the SystemDrive environment variable
by weiden＠svn.reactos.org 04 Feb '07

04 Feb '07

Author: weiden Date: Sun Feb 4 19:06:08 2007 New Revision: 25712 URL: http://svn.reactos.org/svn/reactos?rev=25712&view=rev Log: Fix the code to read the SystemDrive environment variable Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Sun Feb 4 19:06:08 2007 @@ -45,22 +45,49 @@ { case WM_INITDIALOG: { + DWORD dwBufSize; + /* get Path to freeldr.ini or boot.ini */ - szSystemDrive = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH); + szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); if (szSystemDrive != NULL) { - szSystemDrive = _tgetenv(_T("SystemDrive")); - if (m_szFreeldrIni != NULL && szSystemDrive != NULL) - { - _tcscpy(m_szFreeldrIni, szSystemDrive); - _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); - if (!PathFileExists(m_szFreeldrIni)) + dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, MAX_PATH); + if (dwBufSize > MAX_PATH) + { + TCHAR *szTmp; + DWORD dwBufSize2; + + szTmp = HeapReAlloc(GetProcessHeap(), 0, szSystemDrive, dwBufSize * sizeof(TCHAR)); + if (szTmp == NULL) + goto FailGetSysDrive; + + szSystemDrive = szTmp; + + dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, dwBufSize); + if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) + goto FailGetSysDrive; + } + else if (dwBufSize == 0) + { +FailGetSysDrive: + HeapFree(GetProcessHeap(), 0, szSystemDrive); + szSystemDrive = NULL; + } + + if (szSystemDrive != NULL) + { + if (m_szFreeldrIni != NULL) { _tcscpy(m_szFreeldrIni, szSystemDrive); - _tcscat(m_szFreeldrIni, _T("\\boot.ini")); + _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); + if (!PathFileExists(m_szFreeldrIni)) + { + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\boot.ini")); + } } + HeapFree(GetProcessHeap(), 0, szSystemDrive); } - HeapFree(GetProcessHeap(), 0, szSystemDrive); } SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump"));

1 0

[greatlrd] 25711: merge down 25710 change from trunk : implement NtUserGetKeyboardLayoutName tested in 0.3.1 and works fine, it is one step closer to fix ibrowers typing bug
by greatlrd＠svn.reactos.org 04 Feb '07

04 Feb '07

Author: greatlrd Date: Sun Feb 4 19:01:25 2007 New Revision: 25711 URL: http://svn.reactos.org/svn/reactos?rev=25711&view=rev Log: merge down 25710 change from trunk : implement NtUserGetKeyboardLayoutName tested in 0.3.1 and works fine, it is one step closer to fix ibrowers typing bug Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/keyboard.c Sun Feb 4 19:01:25 2007 @@ -1263,10 +1263,38 @@ NtUserGetKeyboardLayoutName( LPWSTR lpszName) { - UNIMPLEMENTED - - return 0; -} + BOOL ret = FALSE; + LCID LocaleId; + WCHAR LocaleBuffer[16]; + NTSTATUS Status; + + + UserEnterExclusive(); + + DPRINT("Enter NtUserGetKeyboardLayoutName\n"); + + Status = ZwQueryDefaultLocale(FALSE, &LocaleId); + if (NT_SUCCESS(Status)) + { + swprintf(LocaleBuffer, L"%08lx", LocaleId); + DPRINT("LocaleId : %08lx\n",LocaleId); + _SEH_TRY + { + ProbeForWrite(lpszName, 16, 1); + RtlCopyMemory(lpszName,LocaleBuffer,16); + ret = TRUE; + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + ret = FALSE; + } + _SEH_END; + } + UserLeave(); + return ret; +} + HKL FASTCALL UserGetKeyboardLayout(

1 0

[greatlrd] 25710: implement NtUserGetKeyboardLayoutName tested in 0.3.1 and works fine
by greatlrd＠svn.reactos.org 04 Feb '07

04 Feb '07

Author: greatlrd Date: Sun Feb 4 18:54:14 2007 New Revision: 25710 URL: http://svn.reactos.org/svn/reactos?rev=25710&view=rev Log: implement NtUserGetKeyboardLayoutName tested in 0.3.1 and works fine Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Sun Feb 4 18:54:14 2007 @@ -1263,10 +1263,38 @@ NtUserGetKeyboardLayoutName( LPWSTR lpszName) { - UNIMPLEMENTED - - return 0; -} + BOOL ret = FALSE; + LCID LocaleId; + WCHAR LocaleBuffer[16]; + NTSTATUS Status; + + + UserEnterExclusive(); + + DPRINT("Enter NtUserGetKeyboardLayoutName\n"); + + Status = ZwQueryDefaultLocale(FALSE, &LocaleId); + if (NT_SUCCESS(Status)) + { + swprintf(LocaleBuffer, L"%08lx", LocaleId); + DPRINT("LocaleId : %08lx\n",LocaleId); + _SEH_TRY + { + ProbeForWrite(lpszName, 16, 1); + RtlCopyMemory(lpszName,LocaleBuffer,16); + ret = TRUE; + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + ret = FALSE; + } + _SEH_END; + } + UserLeave(); + return ret; +} + HKL FASTCALL UserGetKeyboardLayout(

1 0

[spetreolle] 25709: changed wrong line in previous commit, thanks to jjkola
by spetreolle＠svn.reactos.org 04 Feb '07

04 Feb '07

Author: spetreolle Date: Sun Feb 4 17:50:47 2007 New Revision: 25709 URL: http://svn.reactos.org/svn/reactos?rev=25709&view=rev Log: changed wrong line in previous commit, thanks to jjkola Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Sun Feb 4 17:50:47 2007 @@ -47,10 +47,10 @@ { /* get Path to freeldr.ini or boot.ini */ szSystemDrive = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH); - if (szSystemDrive != NULL && szSystemDrive != NULL) + if (szSystemDrive != NULL) { szSystemDrive = _tgetenv(_T("SystemDrive")); - if (m_szFreeldrIni != NULL) + if (m_szFreeldrIni != NULL && szSystemDrive != NULL) { _tcscpy(m_szFreeldrIni, szSystemDrive); _tcscat(m_szFreeldrIni, _T("\\freeldr.ini"));

1 0

[ion] 25708: - Temporarily disable referencing and dereferencing the LPC mapping process since the dereference never seems to happen, thus causing processes never to die. Now they die again when killed/closing.
by ion＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: ion Date: Sun Feb 4 00:10:08 2007 New Revision: 25708 URL: http://svn.reactos.org/svn/reactos?rev=25708&view=rev Log: - Temporarily disable referencing and dereferencing the LPC mapping process since the dereference never seems to happen, thus causing processes never to die. Now they die again when killed/closing. Modified: trunk/reactos/ntoskrnl/lpc/close.c trunk/reactos/ntoskrnl/lpc/connect.c Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c (original) +++ trunk/reactos/ntoskrnl/lpc/close.c Sun Feb 4 00:10:08 2007 @@ -374,7 +374,7 @@ } /* Dereference the mapping process */ - ObDereferenceObject(Port->MappingProcess); + //ObDereferenceObject(Port->MappingProcess); Port->MappingProcess = NULL; } Modified: trunk/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/connect.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/connect.c (original) +++ trunk/reactos/ntoskrnl/lpc/connect.c Sun Feb 4 00:10:08 2007 @@ -299,7 +299,7 @@ /* Reference and remember the process */ ClientPort->MappingProcess = PsGetCurrentProcess(); - ObReferenceObject(ClientPort->MappingProcess); + //ObReferenceObject(ClientPort->MappingProcess); } else {

1 0

[ion] 25707: - Update kernel fun.
by ion＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: ion Date: Sat Feb 3 23:35:37 2007 New Revision: 25707 URL: http://svn.reactos.org/svn/reactos?rev=25707&view=rev Log: - Update kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=257… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sat Feb 3 23:35:37 2007 @@ -14,8 +14,7 @@ // // Global: // - TODO: Complete the list of bufxies -// - Fix hang/slowdown during boot -> New scheduler -// - Fix freelist.c errors with new scheduler enabled. +// - Fix DPCs interrupting code at DISPATCH_LEVEL // - Fix process reference count leak. // - Fix atapi.sys or serial.sys loading one more time at each boot. // - Fix LiveCD.

1 0

[ion] 25706: - Replace broken bootvid by a new bootvid based on TinyKRNL's version. It is a .DLL instead of a .SYS and takes advantage of my patch to FreeLDR which allows us to load DLLs that drivers/the kernel load. - This new version is also binary compatible, so Windows's bootvid can be dropped instead and our kernel can talk to it. It has been tested under Windows/TinyKRNL. - Write 90% of the Inbv component in the kernel. Displaying the boot bitmap hasn't yet been coded. - The HAL is missing
by ion＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: ion Date: Sat Feb 3 23:30:32 2007 New Revision: 25706 URL: http://svn.reactos.org/svn/reactos?rev=25706&view=rev Log: - Replace broken bootvid by a new bootvid based on TinyKRNL's version. It is a .DLL instead of a .SYS and takes advantage of my patch to FreeLDR which allows us to load DLLs that drivers/the kernel load. - This new version is also binary compatible, so Windows's bootvid can be dropped instead and our kernel can talk to it. It has been tested under Windows/TinyKRNL. - Write 90% of the Inbv component in the kernel. Displaying the boot bitmap hasn't yet been coded. - The HAL is missing required routines for bootvid.dll, so it doesn't work yet. - .BMP resources haven't yet been added to the kernel. I will add them soon. Added: trunk/reactos/drivers/base/bootvid/bootdata.c trunk/reactos/drivers/base/bootvid/precomp.h trunk/reactos/drivers/base/bootvid/vga.c trunk/reactos/include/ndk/inbvtypes.h trunk/reactos/include/reactos/drivers/bootvid/ trunk/reactos/include/reactos/drivers/bootvid/bootvid.h Removed: trunk/reactos/drivers/base/bootvid/bar.bmp trunk/reactos/drivers/base/bootvid/bootimage.bmp trunk/reactos/drivers/base/bootvid/bootvid.h trunk/reactos/drivers/base/bootvid/resource.h trunk/reactos/drivers/base/bootvid/vid.c trunk/reactos/drivers/base/bootvid/vid_vga.c trunk/reactos/drivers/base/bootvid/vid_vgatext.c trunk/reactos/drivers/base/bootvid/vid_xbox.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/dll/win32/kernel32/ (props changed) trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/drivers/base/bootvid/bootvid.def trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/bootvid/bootvid.rc trunk/reactos/include/ndk/inbvfuncs.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/include/internal/inbv.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/drivers/base/bootvid/bar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bar.b… Added: trunk/reactos/drivers/base/bootvid/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootd… Removed: trunk/reactos/drivers/base/bootvid/bootimage.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/booti… Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Removed: trunk/reactos/drivers/base/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Added: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… Removed: trunk/reactos/drivers/base/bootvid/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/resou… Added: trunk/reactos/drivers/base/bootvid/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vga.c… Removed: trunk/reactos/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid.c… Removed: trunk/reactos/drivers/base/bootvid/vid_vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… Removed: trunk/reactos/drivers/base/bootvid/vid_vgatext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… Removed: trunk/reactos/drivers/base/bootvid/vid_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_x… Modified: trunk/reactos/include/ndk/inbvfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/inbvfuncs.h?re… Added: trunk/reactos/include/ndk/inbvtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/inbvtypes.h?re… Added: trunk/reactos/include/reactos/drivers/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/bo… Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=257… Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[ion] 25705: - Disgusting* hack by hto to temporarily work around Mm/DPC Interrupt bug in trunk after applying new scheduler. We both tested it and it makes trunk not crash anymore (but I do see a noticeable slowdown during bootup). Reminder: explorer will take 30-60 seconds to startup after GUI boot. Be patient. * This doesn't refer to hto's programming skills or code, but to the hackyness of the patch itself, which is a temporary solution.
by ion＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: ion Date: Sat Feb 3 23:28:24 2007 New Revision: 25705 URL: http://svn.reactos.org/svn/reactos?rev=25705&view=rev Log: - Disgusting* hack by hto to temporarily work around Mm/DPC Interrupt bug in trunk after applying new scheduler. We both tested it and it makes trunk not crash anymore (but I do see a noticeable slowdown during bootup). Reminder: explorer will take 30-60 seconds to startup after GUI boot. Be patient. * This doesn't refer to hto's programming skills or code, but to the hackyness of the patch itself, which is a temporary solution. Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mdl.c trunk/reactos/ntoskrnl/mm/npool.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c (original) +++ trunk/reactos/ntoskrnl/mm/balance.c Sat Feb 3 23:28:24 2007 @@ -13,6 +13,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeBalancer) Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sat Feb 3 23:28:24 2007 @@ -14,6 +14,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageList) Modified: trunk/reactos/ntoskrnl/mm/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdl.c?rev=2570… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdl.c (original) +++ trunk/reactos/ntoskrnl/mm/mdl.c Sat Feb 3 23:28:24 2007 @@ -13,6 +13,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeMdlImplementation) @@ -965,3 +968,4 @@ + Modified: trunk/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/mm/npool.c (original) +++ trunk/reactos/ntoskrnl/mm/npool.c Sat Feb 3 23:28:24 2007 @@ -15,6 +15,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MiInitializeNonPagedPool) Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c Sat Feb 3 23:28:24 2007 @@ -31,6 +31,9 @@ #define NDEBUG #include <internal/debug.h> +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } + #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitPagingFile) #endif Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c Sat Feb 3 23:28:24 2007 @@ -13,6 +13,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageOp) @@ -274,3 +277,4 @@ +

1 0

[greatlrd] 25704: patch from : Paolo Devoti <devotip at gmail.com> fix issue : (Clean up patch) Removed variables formerly in use to handle pagination. Pagination belongs to ConOutPrintfPaging. Removed already commented out code of old pagination See issue #2016 for more details.
by greatlrd＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: greatlrd Date: Sat Feb 3 20:38:20 2007 New Revision: 25704 URL: http://svn.reactos.org/svn/reactos?rev=25704&view=rev Log: patch from : Paolo Devoti <devotip at gmail.com> fix issue : (Clean up patch) Removed variables formerly in use to handle pagination. Pagination belongs to ConOutPrintfPaging. Removed already commented out code of old pagination See issue #2016 for more details. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Sat Feb 3 20:38:20 2007 @@ -127,6 +127,11 @@ * * 1-Jul-2004 (Brandon Turner <turnerb7(a)msu.edu>) * Added /p back in using ConOutPrintfPaging + * + * 3-feb-2007 (Paolo Devoti devotip at gmail) + * Removed variables formerly in use to handle pagination + * Pagination belongs to ConOutPrintfPaging + * Removed already commented out code of old pagination */ #include <precomp.h> @@ -802,54 +807,12 @@ /* - * incline - * - * increment our line if paginating, display message at end of screen - */ -#if 0 -static BOOL -IncLine (LPINT pLine, LPDIRSWITCHFLAGS lpFlags) -{ - BOOL bError; - CONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo; - LONG WindowHeight; - - bError = GetConsoleScreenBufferInfo(hConsole, &lpConsoleScreenBufferInfo); - - WindowHeight = lpConsoleScreenBufferInfo.srWindow.Bottom - lpConsoleScreenBufferInfo.srWindow.Top; - - /* That prevents bad behiour if WindowHeight could not be calculated */ - if (!WindowHeight) - { - WindowHeight= 1000000; - } - - if (!(lpFlags->bPause)) - return FALSE; - - (*pLine)++; - - /* - * Because I don't know if WindowsHeight work in all cases, - * perhaps then maxy is the right value - */ - if (*pLine >= (int)maxy - 2 || *pLine >= WindowHeight) - { - *pLine = 0; - return (PagePrompt () == PROMPT_BREAK); - } - - return FALSE; -} -#endif - -/* * PrintDirectoryHeader * * print the header for the dir command */ static BOOL -PrintDirectoryHeader(LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags) +PrintDirectoryHeader(LPTSTR szPath, LPDIRSWITCHFLAGS lpFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szRootName[MAX_PATH]; @@ -1114,7 +1077,6 @@ ULONG ulFiles, ULONG ulDirs, ULARGE_INTEGER u64Bytes, - LPINT pLine, LPDIRSWITCHFLAGS lpFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -1768,7 +1730,6 @@ static INT DirList(LPTSTR szPath, /* [IN] The path that dir starts */ LPTSTR szFilespec, /* [IN] The type of file that we are looking for */ - LPINT pLine, /* FIXME: Maybe used for paginating */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ { HANDLE hSearch; /* The handle of the search */ @@ -1950,7 +1911,7 @@ _tcscpy(szFullFileSpec, szFullPath); _tcscat(szFullFileSpec, wfdFileInfo.cFileName); /* We do the same for tha folder */ - if (DirList(szFullFileSpec, szFilespec, pLine,lpFlags) != 0) + if (DirList(szFullFileSpec, szFilespec, lpFlags) != 0) { return 1; } @@ -1988,7 +1949,6 @@ TCHAR szFilespec[MAX_PATH]; LPTSTR* params; INT entries = 0; - INT nLine = 0; UINT loop = 0; DIRSWITCHFLAGS stFlags; @@ -2078,7 +2038,7 @@ /* Print the drive header if the drive changed */ if(cDrive != szPath[0] && !stFlags.bBareFormat) { - if (!PrintDirectoryHeader (szPath, &nLine, &stFlags)) { + if (!PrintDirectoryHeader (szPath, &stFlags)) { nErrorLevel = 1; return 1; } @@ -2088,7 +2048,7 @@ /* do the actual dir */ - if (DirList (szPath, szFilespec, &nLine, &stFlags)) + if (DirList (szPath, szFilespec, &stFlags)) { nErrorLevel = 1; return 1; @@ -2100,7 +2060,6 @@ recurse_file_cnt, recurse_dir_cnt, recurse_bytes, - &nLine, &stFlags); return 0;

1 0

[greatlrd] 25703: patch from : Paolo Devoti <devotip at gmail.com> fix issue : The fix does a WriteFile per line insted of one per char. See issue #2015 for more details.
by greatlrd＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: greatlrd Date: Sat Feb 3 19:03:37 2007 New Revision: 25703 URL: http://svn.reactos.org/svn/reactos?rev=25703&view=rev Log: patch from : Paolo Devoti <devotip at gmail.com> fix issue : The fix does a WriteFile per line insted of one per char. See issue #2015 for more details. Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Sat Feb 3 19:03:37 2007 @@ -12,6 +12,9 @@ * * 01-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) * Added ConPrintfPaging and ConOutPrintfPaging + * + * 02-Feb-2007 (Paolo Devoti) <devotip at gmail.com>) + * Fixed ConPrintfPaging */ @@ -252,8 +255,8 @@ /* the number of chars in a roow */ int ScreenCol = 0; - /* chars since end of line */ - int CharEL = 0; + /* chars since start of line */ + int CharSL = 0; int i = 0; @@ -261,67 +264,54 @@ LineCount = 0; /* rest LineCount and return if no string have been given */ - if (szFormat == NULL) - return 0; + if (szFormat == NULL) + return 0; //get the size of the visual screen that can be printed too if (!GetConsoleScreenBufferInfo(hConsole, &csbi)) - { - // we assuming its a file handle - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } + { + // we assuming its a file handle + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; //make sure they didnt make the screen to small if(ScreenLines<4) - { - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } + { + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } len = _vstprintf (szOut, szFormat, arg_ptr); pBuf = szOut; for(i = 0; i < len; i++) - { - - if(pBuf[i] == _T('\n')) - { - LineCount++; - CharEL=0; - } - else - { - CharEL++; - if (CharEL>=ScreenCol) - { - if (i+1<len) - { - if(pBuf[i+1] != _T('\n')) LineCount++; - } - CharEL=0; - } - } - - /* FIXME : write more that one char at time */ - WriteFile (GetStdHandle (nStdHandle),&pBuf[i],sizeof(CHAR),&dwWritten,NULL); - if(LineCount >= ScreenLines) - { - if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) - WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); - - if(PagePrompt() != PROMPT_YES) - { - return 1; - } - //reset the number of lines being printed - LineCount = 0; - CharEL=0; - } + { + // search 'end of string' '\n' or 'end of screen line' + for(; (i < len) && (pBuf[i] != _T('\n') && (CharSL<ScreenCol)) ; i++) + CharSL++; + + WriteFile (GetStdHandle (nStdHandle),&pBuf[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); + LineCount++; + CharSL=0; + + if(LineCount >= ScreenLines) + { + if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) + WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); + + if(PagePrompt() != PROMPT_YES) + { + return 1; + } + //reset the number of lines being printed + LineCount = 0; + CharSL=0; + } }

1 0

← Newer
1
...
20
21
22
23
24
25
26
27
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 February 2007