Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57787: [NTOSKRNL] - Skip other spaces preceding a command option instead of increasing the reading pointer of a constant (should fix KDSERIAL). - Use a macro for representing length in c...
by hbelusca＠svn.reactos.org 02 Dec '12

02 Dec '12

Author: hbelusca Date: Sun Dec 2 15:30:59 2012 New Revision: 57787 URL: http://svn.reactos.org/svn/reactos?rev=57787&view=rev Log: [NTOSKRNL] - Skip other spaces preceding a command option instead of increasing the reading pointer of a constant (should fix KDSERIAL). - Use a macro for representing length in chars of constant strings instead of putting magic values. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sun Dec 2 15:30:59 2012 @@ -1705,30 +1705,29 @@ KdbpGetCommandLineSettings( PCHAR p1) { - PCHAR p2; - - while (p1 && (p2 = strchr(p1, ' '))) - { - p2 += 2; - - if (!_strnicmp(p2, "KDSERIAL", 8)) - { - p2 += 8; +#define CONST_STR_LEN(x) (sizeof(x)/sizeof(x[0])) + + while (p1 && (p1 = strchr(p1, ' '))) + { + /* Skip other spaces */ + while (*p1 == ' ') ++p1; + + if (!_strnicmp(p1, "KDSERIAL", CONST_STR_LEN("KDSERIAL"))) + { + p1 += CONST_STR_LEN("KDSERIAL"); KdbDebugState |= KD_DEBUG_KDSERIAL; KdpDebugMode.Serial = TRUE; } - else if (!_strnicmp(p2, "KDNOECHO", 8)) - { - p2 += 8; + else if (!_strnicmp(p1, "KDNOECHO", CONST_STR_LEN("KDNOECHO"))) + { + p1 += CONST_STR_LEN("KDNOECHO"); KdbDebugState |= KD_DEBUG_KDNOECHO; } - else if (!_strnicmp(p2, "FIRSTCHANCE", 11)) - { - p2 += 11; + else if (!_strnicmp(p1, "FIRSTCHANCE", CONST_STR_LEN("FIRSTCHANCE"))) + { + p1 += CONST_STR_LEN("FIRSTCHANCE"); KdbpSetEnterCondition(-1, TRUE, KdbEnterAlways); } - - p1 = p2; } }

1 0

[tkreuzer] 57786: [VGA/VGA_NEW] Fix MSVC warnings
by tkreuzer＠svn.reactos.org 01 Dec '12

01 Dec '12

Author: tkreuzer Date: Sat Dec 1 11:49:59 2012 New Revision: 57786 URL: http://svn.reactos.org/svn/reactos?rev=57786&view=rev Log: [VGA/VGA_NEW] Fix MSVC warnings Modified: trunk/reactos/win32ss/drivers/miniport/vga/initvga.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c Modified: trunk/reactos/win32ss/drivers/miniport/vga/initvga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/initvga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/initvga.c [iso-8859-1] Sat Dec 1 11:49:59 2012 @@ -21,7 +21,7 @@ static VOID FASTCALL vgaSaveRegisters(PVGA_REGISTERS Registers) { - SIZE_T i; + UCHAR i; for (i = 0; i < sizeof(Registers->CRT); i++) { @@ -54,7 +54,7 @@ static VOID FASTCALL vgaSetRegisters(PVGA_REGISTERS Registers) { - SIZE_T i; + UCHAR i; /* Update misc output register */ VideoPortWritePortUchar(MISC, Registers->Misc); Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] Sat Dec 1 11:49:59 2012 @@ -168,7 +168,7 @@ ULONG Size, ScreenSize; PVIDEOMODE VgaMode; PVOID BaseAddress; - ULONG ScreenStride = 0; + ULONG ScreenStride; PHYSICAL_ADDRESS PhysicalAddress; /* Enable only default vga modes if no vesa */ @@ -345,7 +345,8 @@ { /* Read the screen stride (scanline size) */ ScreenStride = RaiseToPower2(VbeModeInfo->BytesPerScanLine); - VgaMode->wbytes = ScreenStride; + //ASSERT(ScreenStride <= MAX_USHORT); + VgaMode->wbytes = (USHORT)ScreenStride; //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride); /* Size of frame buffer is Height X ScanLine, align to bank/page size */ @@ -372,7 +373,8 @@ //VideoPortDebugPrint(0, "LINEAR MODE!!!\n"); ScreenStride = (VbeVersion >= 0x300) ? VbeModeInfo->LinBytesPerScanLine : 0; if (!ScreenStride) ScreenStride = VbeModeInfo->BytesPerScanLine; - VgaMode->wbytes = ScreenStride; + //ASSERT(ScreenStride <= MAX_USHORT); + VgaMode->wbytes = (USHORT)ScreenStride; //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride); /* Size of frame buffer is Height X ScanLine, align to page size */

1 0

[hbelusca] 57785: Synchronize up to trunk's revision r57784.
by hbelusca＠svn.reactos.org 30 Nov '12

30 Nov '12

Author: hbelusca Date: Fri Nov 30 21:32:42 2012 New Revision: 57785 URL: http://svn.reactos.org/svn/reactos?rev=57785&view=rev Log: Synchronize up to trunk's revision r57784. Added: branches/ros-csrss/dll/win32/lsasrv/registry.c - copied unchanged from r57784, trunk/reactos/dll/win32/lsasrv/registry.c Removed: branches/ros-csrss/drivers/base/kddll/kdcom.h Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/regedit/lang/bg-BG.rc branches/ros-csrss/base/applications/regedit/lang/cs-CZ.rc branches/ros-csrss/base/applications/regedit/lang/de-DE.rc branches/ros-csrss/base/applications/regedit/lang/el-GR.rc branches/ros-csrss/base/applications/regedit/lang/en-US.rc branches/ros-csrss/base/applications/regedit/lang/es-ES.rc branches/ros-csrss/base/applications/regedit/lang/fr-FR.rc branches/ros-csrss/base/applications/regedit/lang/hu-HU.rc branches/ros-csrss/base/applications/regedit/lang/id-ID.rc branches/ros-csrss/base/applications/regedit/lang/it-IT.rc branches/ros-csrss/base/applications/regedit/lang/ja-JP.rc branches/ros-csrss/base/applications/regedit/lang/ko-KR.rc branches/ros-csrss/base/applications/regedit/lang/nl-NL.rc branches/ros-csrss/base/applications/regedit/lang/no-NO.rc branches/ros-csrss/base/applications/regedit/lang/pl-PL.rc branches/ros-csrss/base/applications/regedit/lang/pt-BR.rc branches/ros-csrss/base/applications/regedit/lang/pt-PT.rc branches/ros-csrss/base/applications/regedit/lang/ro-RO.rc branches/ros-csrss/base/applications/regedit/lang/ru-RU.rc branches/ros-csrss/base/applications/regedit/lang/sk-SK.rc branches/ros-csrss/base/applications/regedit/lang/sl-SI.rc branches/ros-csrss/base/applications/regedit/lang/sv-SE.rc branches/ros-csrss/base/applications/regedit/lang/th-TH.rc branches/ros-csrss/base/applications/regedit/lang/uk-UA.rc branches/ros-csrss/base/applications/regedit/lang/zh-CN.rc branches/ros-csrss/base/applications/regedit/lang/zh-TW.rc branches/ros-csrss/base/applications/regedit/main.c branches/ros-csrss/base/applications/regedit/regedit.c branches/ros-csrss/boot/bootdata/CMakeLists.txt branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hardware.c branches/ros-csrss/boot/freeldr/freeldr/comm/rs232.c branches/ros-csrss/boot/freeldr/freeldr/include/comm.h branches/ros-csrss/boot/freeldr/freeldr/windows/headless.c branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt branches/ros-csrss/dll/win32/lsasrv/database.c branches/ros-csrss/dll/win32/lsasrv/lsarpc.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.h branches/ros-csrss/dll/win32/lsasrv/privileges.c branches/ros-csrss/drivers/base/kdcom/CMakeLists.txt branches/ros-csrss/drivers/base/kdcom/i386/kdbg.c branches/ros-csrss/drivers/base/kddll/CMakeLists.txt branches/ros-csrss/drivers/base/kddll/kdcom.c branches/ros-csrss/drivers/base/kddll/kddll.h branches/ros-csrss/drivers/serial/serial/serial.h branches/ros-csrss/include/reactos/drivers/serial/ns16550.h branches/ros-csrss/include/reactos/libs/cportlib/cportlib.h branches/ros-csrss/lib/cportlib/cport.c branches/ros-csrss/ntoskrnl/inbv/inbvport.c branches/ros-csrss/ntoskrnl/kd/wrappers/gdbstub_powerpc.c branches/ros-csrss/ntoskrnl/kd64/kdinit.c branches/ros-csrss/win32ss/user/ntuser/painting.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/CMakeLi… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/comm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/CMak… Modified: branches/ros-csrss/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/data… Modified: branches/ros-csrss/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsar… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/priv… Modified: branches/ros-csrss/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kdcom/CM… Modified: branches/ros-csrss/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kdcom/i3… Modified: branches/ros-csrss/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kddll/CM… Modified: branches/ros-csrss/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kddll/kd… Removed: branches/ros-csrss/drivers/base/kddll/kdcom.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kddll/kd… Modified: branches/ros-csrss/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kddll/kd… Modified: branches/ros-csrss/drivers/serial/serial/serial.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/serial/serial… Modified: branches/ros-csrss/include/reactos/drivers/serial/ns16550.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/drive… Modified: branches/ros-csrss/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/libs/… Modified: branches/ros-csrss/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/cportlib/cport.c?… Modified: branches/ros-csrss/ntoskrnl/inbv/inbvport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/inbv/inbvpor… Modified: branches/ros-csrss/ntoskrnl/kd/wrappers/gdbstub_powerpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd/wrappers/… Modified: branches/ros-csrss/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd64/kdinit.… Modified: branches/ros-csrss/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/p…

1 0

[ekohl] 57784: [LSASRV] - Fix object deletion. - Add a registry wrapper function that enables us to delete registry keys which have already been opened. - Make LsarDelete call LsarDeleteObject beca...
by ekohl＠svn.reactos.org 29 Nov '12

29 Nov '12

Author: ekohl Date: Thu Nov 29 22:02:22 2012 New Revision: 57784 URL: http://svn.reactos.org/svn/reactos?rev=57784&view=rev Log: [LSASRV] - Fix object deletion. - Add a registry wrapper function that enables us to delete registry keys which have already been opened. - Make LsarDelete call LsarDeleteObject because otherwise object deletion would not be possible. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/registry.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Thu Nov 29 22:02:22 2012 @@ -796,7 +796,6 @@ NewObject = RtlAllocateHeap(RtlGetProcessHeap(), 0, -// sizeof(LSA_DB_OBJECT) + wcslen(ObjectName) + sizeof(WCHAR)); sizeof(LSA_DB_OBJECT)); if (NewObject == NULL) { @@ -810,7 +809,6 @@ NewObject->Access = DesiredAccess; NewObject->KeyHandle = ObjectKeyHandle; NewObject->ParentObject = ParentObject; -// wcscpy(NewObject->Name, ObjectName); if (ParentObject != NULL) ParentObject->RefCount++; @@ -901,10 +899,8 @@ LsapDeleteDbObject(IN PLSA_DB_OBJECT DbObject) { PLSA_DB_OBJECT ParentObject = NULL; -#if 0 WCHAR KeyName[64]; - ULONG EnumIndex; -#endif + ULONG Index; NTSTATUS Status = STATUS_SUCCESS; DbObject->RefCount--; @@ -914,40 +910,36 @@ if (DbObject->KeyHandle != NULL) { -#if 0 - EnumIndex = 0; + Index = 0; while (TRUE) { Status = LsapRegEnumerateSubKey(DbObject->KeyHandle, - EnumIndex, + Index, 64 * sizeof(WCHAR), KeyName); if (!NT_SUCCESS(Status)) break; - TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Index: %lu\n", Index); TRACE("Key name: %S\n", KeyName); - Status = LsapRegDeleteKey(DbObject->KeyHandle, - KeyName); + Status = LsapRegDeleteSubKey(DbObject->KeyHandle, + KeyName); if (!NT_SUCCESS(Status)) break; - -// EnumIndex++; - } -#endif + } + + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + + LsapRegDeleteKey(DbObject->KeyHandle); + NtClose(DbObject->KeyHandle); } if (DbObject->ParentObject != NULL) - { ParentObject = DbObject->ParentObject; -#if 0 - LsapRegDeleteKey(ParentObject->KeyHandle, - DbObject->Name); -#endif - } RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject); Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Thu Nov 29 22:02:22 2012 @@ -97,8 +97,7 @@ NTSTATUS WINAPI LsarDelete( LSAPR_HANDLE ObjectHandle) { - /* Deprecated */ - return STATUS_NOT_SUPPORTED; + return LsarDeleteObject(&ObjectHandle); } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Thu Nov 29 22:02:22 2012 @@ -48,7 +48,6 @@ ACCESS_MASK Access; HANDLE KeyHandle; struct _LSA_DB_OBJECT *ParentObject; - WCHAR Name[0]; } LSA_DB_OBJECT, *PLSA_DB_OBJECT; #define LSAP_DB_SIGNATURE 0x12345678 @@ -282,8 +281,11 @@ OUT HANDLE KeyHandle); NTSTATUS -LsapRegDeleteKey(IN HANDLE ParentKeyHandle, - IN LPCWSTR KeyName); +LsapRegDeleteSubKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName); + +NTSTATUS +LsapRegDeleteKey(IN HANDLE KeyHandle); NTSTATUS LsapRegEnumerateSubKey(IN HANDLE KeyHandle, Modified: trunk/reactos/dll/win32/lsasrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] Thu Nov 29 22:02:22 2012 @@ -60,8 +60,8 @@ NTSTATUS -LsapRegDeleteKey(IN HANDLE ParentKeyHandle, - IN LPCWSTR KeyName) +LsapRegDeleteSubKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING SubKeyName; @@ -86,6 +86,13 @@ NtClose(TargetKey); return Status; +} + + +NTSTATUS +LsapRegDeleteKey(IN HANDLE KeyHandle) +{ + return NtDeleteKey(KeyHandle); }

1 0

[fireball] 57783: [WINENT] - Don't skip rendering clipboard data. ARWINSS-84 #comment This issue is resolved by r57783.
by fireball＠svn.reactos.org 29 Nov '12

29 Nov '12

Author: fireball Date: Thu Nov 29 13:08:29 2012 New Revision: 57783 URL: http://svn.reactos.org/svn/reactos?rev=57783&view=rev Log: [WINENT] - Don't skip rendering clipboard data. ARWINSS-84 #comment This issue is resolved by r57783. Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] Thu Nov 29 13:08:29 2012 @@ -107,7 +107,9 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA lpData); static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, unsigned char** data, unsigned long* datasize); -static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpData); +#endif +static BOOL NTDRV_CLIPBOARD_RenderFormat(LPWINE_CLIPDATA lpData); +#if 0 static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDWORD lpcbytes, BOOL out); #endif static BOOL NTDRV_CLIPBOARD_SynthesizeData(UINT wFormatID); @@ -659,11 +661,10 @@ return bret; } -#if 0 /************************************************************************** * X11DRV_CLIPBOARD_RenderFormat */ -static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpData) +static BOOL NTDRV_CLIPBOARD_RenderFormat(LPWINE_CLIPDATA lpData) { BOOL bret = TRUE; @@ -671,9 +672,9 @@ if (lpData->hData) return bret; /* Already rendered */ - if (lpData->wFlags & CF_FLAG_SYNTHESIZED) + /*if (lpData->wFlags & CF_FLAG_SYNTHESIZED) bret = X11DRV_CLIPBOARD_RenderSynthesizedFormat(display, lpData); - else if (!X11DRV_CLIPBOARD_IsSelectionOwner()) + else if (!NTDRV_CLIPBOARD_IsSelectionOwner()) { if (!X11DRV_CLIPBOARD_ReadSelectionData(display, lpData)) { @@ -682,11 +683,11 @@ bret = FALSE; } } - else + else*/ { CLIPBOARDINFO cbInfo; - if (X11DRV_CLIPBOARD_GetClipboardInfo(&cbInfo) && cbInfo.hWndOwner) + if (NTDRV_CLIPBOARD_GetClipboardInfo(&cbInfo) && cbInfo.hWndOwner) { /* Send a WM_RENDERFORMAT message to notify the owner to render the * data requested into the clipboard. @@ -706,7 +707,7 @@ return bret; } - +#if 0 /************************************************************************** * CLIPBOARD_ConvertText * Returns number of required/converted characters - not bytes! @@ -2739,8 +2740,8 @@ if ((lpRender = NTDRV_CLIPBOARD_LookupData(wFormat))) { - //if ( !lpRender->hData ) - // NTDRV_CLIPBOARD_RenderFormat(thread_init_display(), lpRender); + if ( !lpRender->hData ) + NTDRV_CLIPBOARD_RenderFormat(lpRender); TRACE(" returning %p (type %04x)\n", lpRender->hData, lpRender->wFormatID); return lpRender->hData;

1 0

[hbelusca] 57782: [KDCOM] Fixes COM port debugging output with Virtual PC 2007. See r57781 for more details. CORE-4247 #comment Fixed also in r57782.
by hbelusca＠svn.reactos.org 29 Nov '12

29 Nov '12

Author: hbelusca Date: Thu Nov 29 10:26:00 2012 New Revision: 57782 URL: http://svn.reactos.org/svn/reactos?rev=57782&view=rev Log: [KDCOM] Fixes COM port debugging output with Virtual PC 2007. See r57781 for more details. CORE-4247 #comment Fixed also in r57782. Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt trunk/reactos/drivers/base/kdcom/i386/kdbg.c Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/CMakeLi… ============================================================================== --- trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Thu Nov 29 10:26:00 2012 @@ -2,11 +2,11 @@ spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) if(ARCH STREQUAL "i386") -list(APPEND SOURCE i386/kdbg.c) + list(APPEND SOURCE i386/kdbg.c) elseif(ARCH STREQUAL "amd64") -list(APPEND SOURCE i386/kdbg.c) + list(APPEND SOURCE i386/kdbg.c) elseif(ARCH STREQUAL "arm") -list(APPEND SOURCE arm/kdbg.c) + list(APPEND SOURCE arm/kdbg.c) endif(ARCH STREQUAL "i386") list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) @@ -17,7 +17,7 @@ set_image_base(kdcom 0x00010000) add_importlibs(kdcom ntoskrnl hal) +target_link_libraries(kdcom cportlib) +add_dependencies(kdcom psdk bugcodes) -add_dependencies(kdcom psdk bugcodes) add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) - Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/i386/kd… ============================================================================== --- trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Thu Nov 29 10:26:00 2012 @@ -11,14 +11,17 @@ #define NOEXTAPI #include <ntifs.h> -#define NDEBUG #include <halfuncs.h> #include <stdio.h> -#include <debug.h> #include "arc/arc.h" #include "windbgkd.h" #include <kddll.h> #include <ioaccess.h> /* port intrinsics */ +#include <cportlib/cportlib.h> + +#define NDEBUG +#include <debug.h> + typedef struct _KD_PORT_INFORMATION { @@ -54,14 +57,14 @@ #define DEFAULT_BAUD_RATE 19200 -#ifdef _M_IX86 -const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +#if defined(_M_IX86) || defined(_M_AMD64) +const ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; #elif defined(_M_PPC) -const ULONG BaseArray[2] = {0, 0x800003f8}; +const ULONG BaseArray[] = {0, 0x800003F8}; #elif defined(_M_MIPS) -const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; +const ULONG BaseArray[] = {0, 0x80006000, 0x80007000}; #elif defined(_M_ARM) -const ULONG BaseArray[2] = {0, 0xF1012000}; +const ULONG BaseArray[] = {0, 0xF1012000}; #else #error Unknown architecture #endif @@ -122,68 +125,6 @@ static BOOLEAN PortInitialized = FALSE; -/* STATIC FUNCTIONS *********************************************************/ - -static BOOLEAN -KdpDoesComPortExist( - IN ULONG BaseAddress) -{ - BOOLEAN found; - UCHAR mcr; - UCHAR msr; - - found = FALSE; - - /* save Modem Control Register (MCR) */ - mcr = READ_PORT_UCHAR(SER_MCR(BaseAddress)); - - /* enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_LOOP); - - /* clear all modem output bits */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_LOOP); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0x00) - { - /* set all modem output bits */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_DTR | SR_MCR_RTS | SR_MCR_OUT1 | SR_MCR_OUT2 | SR_MCR_LOOP); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0xF0) - { - /* - * setup a resonable state for the port: - * enable fifo and clear recieve/transmit buffers - */ - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), - (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); - READ_PORT_UCHAR(SER_RBR(BaseAddress)); - WRITE_PORT_UCHAR(SER_IER(BaseAddress), 0); - found = TRUE; - } - } - - /* restore MCR */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), mcr); - - return found; -} - - /* FUNCTIONS ****************************************************************/ /* HAL.KdPortInitialize */ @@ -203,14 +144,18 @@ if (PortInformation->ComPort == 0) { + /* + * Start enumerating COM ports from the last one to the first one, + * and break when we find a valid port. + * If we reach the first element of the list, the invalid COM port, + * then it means that no valid port was found. + */ for (i = sizeof(BaseArray) / sizeof(BaseArray[0]) - 1; i > 0; i--) { - if (KdpDoesComPortExist(BaseArray[i])) + if (CpDoesPortExist(UlongToPtr(BaseArray[i]))) { - DefaultPort.BaseAddress = BaseArray[i]; - DefaultPort.ComPort = i; - PortInformation->BaseAddress = DefaultPort.BaseAddress; - PortInformation->ComPort = DefaultPort.ComPort; + PortInformation->BaseAddress = DefaultPort.BaseAddress = BaseArray[i]; + PortInformation->ComPort = DefaultPort.ComPort = i; break; } } @@ -237,7 +182,7 @@ } -/* HAL.KdPortInitializeEx */ +/* HAL.KdPortInitializeEx ; ReactOS-specific */ BOOLEAN NTAPI KdPortInitializeEx( @@ -260,7 +205,7 @@ if (PortInformation->ComPort != 0) { - if (!KdpDoesComPortExist(BaseArray[PortInformation->ComPort])) + if (!CpDoesPortExist(UlongToPtr(BaseArray[PortInformation->ComPort]))) { sprintf(buffer, "\nKernel Debugger: Serial port not found!\n\n"); @@ -335,7 +280,7 @@ } -/* HAL.KdPortGetByteEx */ +/* HAL.KdPortGetByteEx ; ReactOS-specific */ BOOLEAN NTAPI KdPortGetByteEx( @@ -366,7 +311,7 @@ } -/* HAL.KdPortPollByteEx */ +/* HAL.KdPortPollByteEx ; ReactOS-specific */ BOOLEAN NTAPI KdPortPollByteEx( @@ -395,7 +340,7 @@ KdPortPutByteEx(&DefaultPort, ByteToSend); } -/* HAL.KdPortPutByteEx */ +/* HAL.KdPortPutByteEx ; ReactOS-specific */ VOID NTAPI KdPortPutByteEx(

1 0

[hbelusca] 57781: [KDDLL] - Use cportlib for COM port facilities. Fixes COM port debugging output with Virtual PC 2007. - Remove now unneeded header file. CORE-4247 #comment Fixed in r57776, r57777...
by hbelusca＠svn.reactos.org 28 Nov '12

28 Nov '12

Author: hbelusca Date: Wed Nov 28 23:23:54 2012 New Revision: 57781 URL: http://svn.reactos.org/svn/reactos?rev=57781&view=rev Log: [KDDLL] - Use cportlib for COM port facilities. Fixes COM port debugging output with Virtual PC 2007. - Remove now unneeded header file. CORE-4247 #comment Fixed in r57776, r57777, r57780 and r57781. #resolve Removed: trunk/reactos/drivers/base/kddll/kdcom.h Modified: trunk/reactos/drivers/base/kddll/CMakeLists.txt trunk/reactos/drivers/base/kddll/kdcom.c trunk/reactos/drivers/base/kddll/kddll.h Modified: trunk/reactos/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/CMakeLi… ============================================================================== --- trunk/reactos/drivers/base/kddll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/CMakeLists.txt [iso-8859-1] Wed Nov 28 23:23:54 2012 @@ -10,7 +10,9 @@ set_entrypoint(kdcom 0) set_subsystem(kdcom native) set_image_base(kdcom 0x00010000) + add_importlibs(kdcom ntoskrnl hal) +target_link_libraries(kdcom cportlib) add_dependencies(kdcom psdk bugcodes) add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) Modified: trunk/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Wed Nov 28 23:23:54 2012 @@ -7,9 +7,9 @@ */ #include "kddll.h" -#include "kdcom.h" - -/* serial debug connection */ +#include <cportlib/cportlib.h> + +/* Serial debug connection */ #define DEFAULT_DEBUG_PORT 2 /* COM2 */ #define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ #define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ @@ -19,91 +19,46 @@ #if defined(_M_IX86) || defined(_M_AMD64) -const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +const ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; #elif defined(_M_PPC) -const ULONG BaseArray[2] = {0, 0x800003f8}; +const ULONG BaseArray[] = {0, 0x800003F8}; #elif defined(_M_MIPS) -const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; +const ULONG BaseArray[] = {0, 0x80006000, 0x80007000}; #elif defined(_M_ARM) -const ULONG BaseArray[2] = {0, 0xF1012000}; +const ULONG BaseArray[] = {0, 0xF1012000}; #else #error Unknown architecture #endif /* GLOBALS ********************************************************************/ -PUCHAR ComPortBase; -ULONG ComPortNumber = DEFAULT_DEBUG_PORT; -ULONG ComPortBaudRate = DEFAULT_DEBUG_BAUD_RATE; -ULONG ComPortIrq = 0; - - -NTSTATUS -NTAPI -KdpPortInitialize() -{ - ULONG Mode; +CPPORT KdDebugComPort; +ULONG KdDebugComPortIrq = 0; // Not used at the moment. + + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +KdpPortInitialize(IN ULONG ComPortNumber, + IN ULONG ComPortBaudRate) +{ + NTSTATUS Status; KDDBGPRINT("KdpPortInitialize, Port = COM%ld\n", ComPortNumber); - /* Enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_LOOP); - - /* Clear all modem output bits */ - WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_LOOP); - - /* The upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) */ - if ((READ_PORT_UCHAR(ComPortBase + COM_MSR) & 0xF0) != 0x00) + Status = CpInitialize(&KdDebugComPort, + UlongToPtr(BaseArray[ComPortNumber]), + ComPortBaudRate); + if (!NT_SUCCESS(Status)) { return STATUS_INVALID_PARAMETER; } - - /* Set all modem output bits */ - WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_ALL); - - /* The upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) */ - if ((READ_PORT_UCHAR(ComPortBase + COM_MSR) & 0xF0) != 0xF0) - { - return STATUS_INVALID_PARAMETER; - } - - /* Enable FIFO */ - WRITE_PORT_UCHAR(ComPortBase + COM_FCR, - FCR_ENABLE_FIFO | FCR_CLEAR_RCVR | FCR_CLEAR_XMIT); - - /* Disable interrupts */ - WRITE_PORT_UCHAR(ComPortBase + COM_LCR, 0); - WRITE_PORT_UCHAR(ComPortBase + COM_IEN, 0); - - /* Enable on DTR and RTS */ - WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_DTR | MCR_RTS); - - /* Set DLAB */ - WRITE_PORT_UCHAR(ComPortBase + COM_LCR, LCR_DLAB); - - /* Set baud rate */ - Mode = 115200 / ComPortBaudRate; - WRITE_PORT_UCHAR(ComPortBase + COM_DLL, (UCHAR)(Mode & 0xff)); - WRITE_PORT_UCHAR(ComPortBase + COM_DLM, (UCHAR)((Mode >> 8) & 0xff)); - - /* Reset DLAB and set 8 data bits, 1 stop bit, no parity, no break */ - WRITE_PORT_UCHAR(ComPortBase + COM_LCR, LCR_CS8 | LCR_ST1 | LCR_PNO); - - /* Check for 16450/16550 scratch register */ - WRITE_PORT_UCHAR(ComPortBase + COM_SCR, 0xff); - if (READ_PORT_UCHAR(ComPortBase + COM_SCR) != 0xff) - { - return STATUS_INVALID_PARAMETER; - } - WRITE_PORT_UCHAR(ComPortBase + COM_SCR, 0x00); - if (READ_PORT_UCHAR(ComPortBase + COM_SCR) != 0x00) - { - return STATUS_INVALID_PARAMETER; - } - - return STATUS_SUCCESS; + else + { + KdComPortInUse = KdDebugComPort.Address; + return STATUS_SUCCESS; + } } /****************************************************************************** @@ -114,9 +69,11 @@ */ NTSTATUS NTAPI -KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ +KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + ULONG ComPortNumber = DEFAULT_DEBUG_PORT; + ULONG ComPortBaudRate = DEFAULT_DEBUG_BAUD_RATE; + PCHAR CommandLine, PortString, BaudString, IrqString; ULONG Value; @@ -136,7 +93,7 @@ /* Get the port and baud rate */ PortString = strstr(CommandLine, "DEBUGPORT"); BaudString = strstr(CommandLine, "BAUDRATE"); - IrqString = strstr(CommandLine, "IRQ"); + IrqString = strstr(CommandLine, "IRQ"); /* Check if we got the /DEBUGPORT parameter */ if (PortString) @@ -154,10 +111,10 @@ return STATUS_INVALID_PARAMETER; } - /* Gheck for a valid Serial Port */ + /* Check for a valid Serial Port */ PortString += 3; Value = atol(PortString); - if (Value > 4) + if (Value >= sizeof(BaseArray) / sizeof(BaseArray[0])) { return STATUS_INVALID_PARAMETER; } @@ -198,47 +155,56 @@ { /* Read and set it */ Value = atol(IrqString + 1); - if (Value) ComPortIrq = Value; - } - } - } - - /* Get base address */ - ComPortBase = UlongToPtr(BaseArray[ComPortNumber]); - KdComPortInUse = ComPortBase; + if (Value) KdDebugComPortIrq = Value; + } + } + } /* Initialize the port */ - return KdpPortInitialize(); + return KdpPortInitialize(ComPortNumber, ComPortBaudRate); } VOID NTAPI KdpSendByte(IN BYTE Byte) { - /* Wait for the port to be ready */ - while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); - - /* This is needed due to subtle timing issues */ - READ_PORT_UCHAR(ComPortBase + COM_MSR); - while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); - READ_PORT_UCHAR(ComPortBase + COM_MSR); - /* Send the byte */ - WRITE_PORT_UCHAR(ComPortBase + COM_DAT, Byte); + CpPutByte(&KdDebugComPort, Byte); } KDP_STATUS NTAPI KdpPollByte(OUT PBYTE OutByte) { - READ_PORT_UCHAR(ComPortBase + COM_MSR); // Timing - - /* Check if data is available */ - if ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_DR)) + /* Get the byte */ + if (CpGetByte(&KdDebugComPort, OutByte, FALSE) == CP_GET_SUCCESS) { /* Yes, return the byte */ - *OutByte = READ_PORT_UCHAR(ComPortBase + COM_DAT); return KDP_PACKET_RECEIVED; + } + else + { + /* Timed out */ + return KDP_PACKET_TIMEOUT; + } +} + +KDP_STATUS +NTAPI +KdpReceiveByte(OUT PBYTE OutByte) +{ + // TODO: Use CpGetByte(&KdDebugComPort, OutByte, TRUE); + + ULONG Repeats = KdpStallScaleFactor * 100; + + while (Repeats--) + { + /* Check if data is available */ + if (KdpPollByte(OutByte) == KDP_PACKET_RECEIVED) + { + /* We successfully got a byte */ + return KDP_PACKET_RECEIVED; + } } /* Timed out */ @@ -247,27 +213,7 @@ KDP_STATUS NTAPI -KdpReceiveByte(OUT PBYTE OutByte) -{ - ULONG Repeats = KdpStallScaleFactor * 100; - - while (Repeats--) - { - /* Check if data is available */ - if (KdpPollByte(OutByte) == KDP_PACKET_RECEIVED) - { - /* We successfully got a byte */ - return KDP_PACKET_RECEIVED; - } - } - - /* Timed out */ - return KDP_PACKET_TIMEOUT; -} - -KDP_STATUS -NTAPI -KdpPollBreakIn() +KdpPollBreakIn(VOID) { UCHAR Byte; if (KdpPollByte(&Byte) == KDP_PACKET_RECEIVED) @@ -282,8 +228,7 @@ NTSTATUS NTAPI -KdSave( - IN BOOLEAN SleepTransition) +KdSave(IN BOOLEAN SleepTransition) { /* Nothing to do on COM ports */ return STATUS_SUCCESS; @@ -291,10 +236,10 @@ NTSTATUS NTAPI -KdRestore( - IN BOOLEAN SleepTransition) +KdRestore(IN BOOLEAN SleepTransition) { /* Nothing to do on COM ports */ return STATUS_SUCCESS; } +/* EOF */ Removed: trunk/reactos/drivers/base/kddll/kdcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.h… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.h (removed) @@ -1,54 +1,0 @@ -/* - * COPYRIGHT: GPL, see COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/base/kddll/kdcom.h - * PURPOSE: COM port definitions for the kernel debugger. - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) - */ - -#pragma once - -#define COM_DAT 0x00 -#define COM_IEN 0x01 /* interrupt enable register */ -#define COM_FCR 0x02 /* FIFO Control Register */ -#define COM_LCR 0x03 /* line control registers */ -#define COM_MCR 0x04 /* modem control reg */ -#define COM_LSR 0x05 /* line status register */ -#define COM_MSR 0x06 /* modem status register */ -#define COM_SCR 0x07 /* scratch register */ -#define COM_DLL 0x00 /* divisor latch least sig */ -#define COM_DLM 0x01 /* divisor latch most sig */ - -#define IEN_ERDA 0x01 -#define IEN_ETHRE 0x02 -#define IEN_ERLSI 0x04 -#define IEN_EMS 0x08 -#define IEN_ALL 0x0F -#define FCR_ENABLE_FIFO 0x01 -#define FCR_CLEAR_RCVR 0x02 -#define FCR_CLEAR_XMIT 0x04 -#define LCR_CS5 0x00 -#define LCR_CS6 0x01 -#define LCR_CS7 0x02 -#define LCR_CS8 0x03 -#define LCR_ST1 0x00 -#define LCR_ST2 0x04 -#define LCR_PNO 0x00 -#define LCR_POD 0x08 -#define LCR_PEV 0x18 -#define LCR_PMK 0x28 -#define LCR_PSP 0x38 -#define LCR_BRK 0x40 -#define LCR_DLAB 0x80 -#define MCR_DTR 0x01 -#define MCR_RTS 0x02 -#define MCR_OUT1 0x04 /* general purpose output */ -#define MCR_OUT2 0x08 -#define MCR_LOOP 0x10 /* loopback testing mode */ -#define MCR_ALL (MCR_DTR | MCR_RTS | MCR_OUT1 | MCR_OUT2 | MCR_LOOP) -#define LSR_DR 0x01 -#define LSR_TBE 0x20 -#define MSR_CTS 0x10 /* (complemented) state of clear to send (CTS). */ -#define MSR_DSR 0x20 /* (complemented) state of data set ready (DSR). */ -#define MSR_RI 0x40 /* (complemented) state of ring indicator (RI). */ -#define MSR_DCD 0x80 /* (complemented) state of data carrier detect (DCD). */ Modified: trunk/reactos/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Wed Nov 28 23:23:54 2012 @@ -12,14 +12,15 @@ #define NOEXTAPI #include <ntifs.h> -#define NDEBUG #include <halfuncs.h> -#include <debug.h> #include "arc/arc.h" #include "windbgkd.h" #include <wdbgexts.h> #include <ioaccess.h> /* port intrinsics */ + +#define NDEBUG +#include <debug.h> long atol(const char *str);

1 0

[hbelusca] 57780: [CPORTLIB/FREELDR] GetByte --> Wait for data (with timeout) and get it if available. PollByte --> Check for data, get it if available, and return immediately.
by hbelusca＠svn.reactos.org 28 Nov '12

28 Nov '12

Author: hbelusca Date: Wed Nov 28 23:16:01 2012 New Revision: 57780 URL: http://svn.reactos.org/svn/reactos?rev=57780&view=rev Log: [CPORTLIB/FREELDR] GetByte --> Wait for data (with timeout) and get it if available. PollByte --> Check for data, get it if available, and return immediately. Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/windows/headless.c trunk/reactos/include/reactos/libs/cportlib/cportlib.h trunk/reactos/lib/cportlib/cport.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Nov 28 23:16:01 2012 @@ -100,7 +100,7 @@ if (PortInitialized == FALSE) return FALSE; - return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); + return (CpGetByte(&Rs232ComPort, ByteReceived, TRUE) == CP_GET_SUCCESS); } /* @@ -109,12 +109,7 @@ if (PortInitialized == FALSE) return FALSE; - while ((READ_PORT_UCHAR (SER_LSR(Rs232PortBase)) & SR_LSR_DR) == 0) - ; - - *ByteReceived = READ_PORT_UCHAR (SER_RBR(Rs232PortBase)); - - return TRUE; + return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE) == CP_GET_SUCCESS); } */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Wed Nov 28 23:16:01 2012 @@ -143,7 +143,7 @@ WinLdrPortGetByte(IN ULONG PortId, OUT PUCHAR Data) { - return CpGetByte(&Port[PortId], Data, TRUE, FALSE) == CP_GET_SUCCESS; + return CpGetByte(&Port[PortId], Data, TRUE) == CP_GET_SUCCESS; } BOOLEAN @@ -151,7 +151,7 @@ { UCHAR Dummy; - return CpGetByte(&Port[PortId], &Dummy, FALSE, TRUE) == CP_GET_SUCCESS; + return CpGetByte(&Port[PortId], &Dummy, FALSE) == CP_GET_SUCCESS; } VOID Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Wed Nov 28 23:16:01 2012 @@ -69,8 +69,7 @@ CpGetByte( IN PCPPORT Port, OUT PUCHAR Byte, - IN BOOLEAN Wait, - IN BOOLEAN Poll + IN BOOLEAN Wait ); VOID Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Wed Nov 28 23:16:01 2012 @@ -255,8 +255,7 @@ NTAPI CpGetByte(IN PCPPORT Port, OUT PUCHAR Byte, - IN BOOLEAN Wait, - IN BOOLEAN Poll) + IN BOOLEAN Wait) { UCHAR Lsr; ULONG LimitCount = Wait ? TIMEOUT_COUNT : 1; @@ -278,9 +277,6 @@ return CP_GET_ERROR; } - /* If only polling was requested by caller, return now */ - if (Poll) return CP_GET_SUCCESS; - /* Otherwise read the byte and return it */ *Byte = READ_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER);

1 0

[jimtabor] 57779: [Win32k] - Fix crash when the exception is thrown.
by jimtabor＠svn.reactos.org 28 Nov '12

28 Nov '12

Author: jimtabor Date: Wed Nov 28 23:05:57 2012 New Revision: 57779 URL: http://svn.reactos.org/svn/reactos?rev=57779&view=rev Log: [Win32k] - Fix crash when the exception is thrown. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Nov 28 23:05:57 2012 @@ -1088,6 +1088,8 @@ RETURN(FALSE); } + UserRefObjectCo(Window, &Ref); // Here for the exception. + _SEH2_TRY { ProbeForRead(pUnsafePs, sizeof(*pUnsafePs), 1); @@ -1102,8 +1104,6 @@ { RETURN(FALSE); } - - UserRefObjectCo(Window, &Ref); RETURN(IntEndPaint(Window, &Ps));

1 0

[hbelusca] 57778: [FREELDR] Remove unuseful defines, now.
by hbelusca＠svn.reactos.org 28 Nov '12

28 Nov '12

Author: hbelusca Date: Wed Nov 28 22:25:07 2012 New Revision: 57778 URL: http://svn.reactos.org/svn/reactos?rev=57778&view=rev Log: [FREELDR] Remove unuseful defines, now. Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Nov 28 22:25:07 2012 @@ -28,38 +28,8 @@ #if DBG -#define DEFAULT_BAUD_RATE 19200 +#define DEFAULT_BAUD_RATE 19200 -#define SER_RBR(x) ((x)+0) -#define SER_THR(x) ((x)+0) -#define SER_DLL(x) ((x)+0) -#define SER_IER(x) ((x)+1) -#define SER_DLM(x) ((x)+1) -#define SER_IIR(x) ((x)+2) -#define SER_LCR(x) ((x)+3) -#define SR_LCR_CS5 0x00 -#define SR_LCR_CS6 0x01 -#define SR_LCR_CS7 0x02 -#define SR_LCR_CS8 0x03 -#define SR_LCR_ST1 0x00 -#define SR_LCR_ST2 0x04 -#define SR_LCR_PNO 0x00 -#define SR_LCR_POD 0x08 -#define SR_LCR_PEV 0x18 -#define SR_LCR_PMK 0x28 -#define SR_LCR_PSP 0x38 -#define SR_LCR_BRK 0x40 -#define SR_LCR_DLAB 0x80 -#define SER_MCR(x) ((x)+4) -#define SR_MCR_DTR 0x01 -#define SR_MCR_RTS 0x02 -#define SER_LSR(x) ((x)+5) -#define SR_LSR_DR 0x01 -#define SR_LSR_TBE 0x20 -#define SER_MSR(x) ((x)+6) -#define SR_MSR_CTS 0x10 -#define SR_MSR_DSR 0x20 -#define SER_SCR(x) ((x)+7) /* STATIC VARIABLES *********************************************************/

1 0

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