Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 47258: [NTOSKRNL] - Add KiGetSecondLevelDCacheSize (for all the available architectures) and MiGetPdeOffset macros. - Remove conflicting PDE_SIZE definitions (both aren't used anywhere). - Fix ValidKernelPde, PointerPte and PointerPde types and correct their use (mminit.c). - Thanks to the work that was done over the recent commits (in the header branch) and this one, the kernel now builds (but doesn't link yet) for ARM.
by akhaldi＠svn.reactos.org 17 May '10

17 May '10

Author: akhaldi Date: Mon May 17 23:26:51 2010 New Revision: 47258 URL: http://svn.reactos.org/svn/reactos?rev=47258&view=rev Log: [NTOSKRNL] - Add KiGetSecondLevelDCacheSize (for all the available architectures) and MiGetPdeOffset macros. - Remove conflicting PDE_SIZE definitions (both aren't used anywhere). - Fix ValidKernelPde, PointerPte and PointerPde types and correct their use (mminit.c). - Thanks to the work that was done over the recent commits (in the header branch) and this one, the kernel now builds (but doesn't link yet) for ARM. Modified: branches/header-work/ntoskrnl/include/internal/amd64/ke.h branches/header-work/ntoskrnl/include/internal/amd64/mm.h branches/header-work/ntoskrnl/include/internal/arm/ke.h branches/header-work/ntoskrnl/include/internal/arm/mm.h branches/header-work/ntoskrnl/include/internal/i386/ke.h branches/header-work/ntoskrnl/include/internal/i386/mm.h branches/header-work/ntoskrnl/include/internal/powerpc/ke.h branches/header-work/ntoskrnl/mm/ARM3/miarm.h branches/header-work/ntoskrnl/mm/ARM3/mminit.c Modified: branches/header-work/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… ============================================================================== --- branches/header-work/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Mon May 17 23:26:51 2010 @@ -115,6 +115,12 @@ // #define KeGetContextSwitches(Prcb) \ (Prcb->KeContextSwitches) + +// +// Macro to get the second level cache size field name which differs between +// CISC and RISC architectures, as the former has unified I/D cache +// +#define KiGetSecondLevelDCacheSize() ((PKIPCR)KeGetPcr())->SecondLevelCacheSize #define KeGetExceptionFrame(Thread) \ (PKEXCEPTION_FRAME)((ULONG_PTR)KeGetTrapFrame(Thread) - \ Modified: branches/header-work/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… ============================================================================== --- branches/header-work/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Mon May 17 23:26:51 2010 @@ -112,6 +112,8 @@ #define ADDR_TO_PDE_OFFSET(v) ((((ULONG_PTR)(v)) / (512 * PAGE_SIZE))) #define ADDR_TO_PTE_OFFSET(v) ((((ULONG_PTR)(v)) % (512 * PAGE_SIZE)) / PAGE_SIZE) +#define MiGetPdeOffset ADDR_TO_PDE_OFFSET + #define VAtoPXI(va) ((((ULONG64)va) >> PXI_SHIFT) & 0x1FF) #define VAtoPPI(va) ((((ULONG64)va) >> PPI_SHIFT) & 0x1FF) #define VAtoPDI(va) ((((ULONG64)va) >> PDI_SHIFT) & 0x1FF) Modified: branches/header-work/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… ============================================================================== --- branches/header-work/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Mon May 17 23:26:51 2010 @@ -54,6 +54,12 @@ // #define KeGetContextSwitches(Prcb) \ CONTAINING_RECORD(Prcb, KIPCR, PrcbData)->ContextSwitches + +// +// Macro to get the second level cache size field name which differs between +// CISC and RISC architectures, as the former has unified I/D cache +// +#define KiGetSecondLevelDCacheSize() ((PKIPCR)KeGetPcr())->SecondLevelDcacheSize // // Returns the Interrupt State from a Trap Frame. Modified: branches/header-work/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… ============================================================================== --- branches/header-work/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Mon May 17 23:26:51 2010 @@ -1,10 +1,6 @@ #pragma once -// -// Number of bits corresponding to the area that a PDE entry represents (1MB) -// #define PDE_SHIFT 20 -#define PDE_SIZE (1 << PDE_SHIFT) // // Number of bits corresponding to the area that a coarse page table entry represents (4KB) Modified: branches/header-work/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… ============================================================================== --- branches/header-work/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon May 17 23:26:51 2010 @@ -58,6 +58,12 @@ // #define KeGetContextSwitches(Prcb) \ CONTAINING_RECORD(Prcb, KIPCR, PrcbData)->ContextSwitches + +// +// Macro to get the second level cache size field name which differs between +// CISC and RISC architectures, as the former has unified I/D cache +// +#define KiGetSecondLevelDCacheSize() ((PKIPCR)KeGetPcr())->SecondLevelCacheSize // // Returns the Interrupt State from a Trap Frame. Modified: branches/header-work/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… ============================================================================== --- branches/header-work/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Mon May 17 23:26:51 2010 @@ -35,6 +35,8 @@ #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) #define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) #define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) + +#define MiGetPdeOffset ADDR_TO_PDE_OFFSET /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) Modified: branches/header-work/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… ============================================================================== --- branches/header-work/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Mon May 17 23:26:51 2010 @@ -40,6 +40,12 @@ //#define KD_BREAKPOINT_TYPE //#define KD_BREAKPOINT_SIZE //#define KD_BREAKPOINT_VALUE + +// +// Macro to get the second level cache size field name which differs between +// CISC and RISC architectures, as the former has unified I/D cache +// +#define KiGetSecondLevelDCacheSize() ((PKIPCR)KeGetPcr())->SecondLevelDcacheSize // // Macros for getting and setting special purpose registers in portable code Modified: branches/header-work/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/mm/ARM3/mi… ============================================================================== --- branches/header-work/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon May 17 23:26:51 2010 @@ -42,8 +42,7 @@ #define _1KB (1024) #define _1MB (1024 * _1KB) -/* Size of a PDE directory, and size of a page table */ -#define PDE_SIZE (PDE_COUNT * sizeof(MMPDE)) +/* Size of a page table */ #define PT_SIZE (PTE_COUNT * sizeof(MMPTE)) /* Architecture specific count of PDEs in a directory, and count of PTEs in a PT */ @@ -169,7 +168,7 @@ } MMCOLOR_TABLES, *PMMCOLOR_TABLES; extern MMPTE HyperTemplatePte; -extern MMPTE ValidKernelPde; +extern MMPDE ValidKernelPde; extern MMPTE ValidKernelPte; extern ULONG MmSizeOfNonPagedPoolInBytes; Modified: branches/header-work/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/mm/ARM3/mm… ============================================================================== --- branches/header-work/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Mon May 17 23:26:51 2010 @@ -314,13 +314,13 @@ // // Puerile piece of junk-grade carbonized horseshit puss sold to the lowest bidder // - ULONG Pde = ADDR_TO_PDE_OFFSET(AddressStart); - while (Pde <= ADDR_TO_PDE_OFFSET(AddressEnd)) + ULONG Pde = MiGetPdeOffset(AddressStart); + while (Pde <= MiGetPdeOffset(AddressEnd)) { // // This both odious and heinous // - extern ULONG MmGlobalKernelPageDirectory[1024]; + extern ULONG MmGlobalKernelPageDirectory[]; MmGlobalKernelPageDirectory[Pde] = ((PULONG)PDE_BASE)[Pde]; Pde++; } @@ -360,10 +360,10 @@ if (!MmSecondaryColors) { /* Get L2 cache information */ - L2Associativity = KeGetPcr()->SecondLevelCacheAssociativity; + L2Associativity = KiGetSecondLevelDCacheSize(); /* The number of colors is the number of cache bytes by set/way */ - MmSecondaryColors = KeGetPcr()->SecondLevelCacheSize; + MmSecondaryColors = KiGetSecondLevelDCacheSize(); if (L2Associativity) MmSecondaryColors /= L2Associativity; } @@ -681,7 +681,7 @@ /* Yes we do, set it up */ Pfn1 = MI_PFN_TO_PFNENTRY(PageFrameIndex); Pfn1->u4.PteFrame = StartupPdIndex; - Pfn1->PteAddress = PointerPde; + Pfn1->PteAddress = (PMMPTE)PointerPde; Pfn1->u2.ShareCount++; Pfn1->u3.e2.ReferenceCount = 1; Pfn1->u3.e1.PageLocation = ActiveAndValid; @@ -764,7 +764,7 @@ /* Make it a bogus page to catch errors */ PointerPde = MiAddressToPde(0xFFFFFFFF); Pfn1->u4.PteFrame = PFN_FROM_PTE(PointerPde); - Pfn1->PteAddress = PointerPde; + Pfn1->PteAddress = (PMMPTE)PointerPde; Pfn1->u2.ShareCount++; Pfn1->u3.e2.ReferenceCount = 0xFFF0; Pfn1->u3.e1.PageLocation = ActiveAndValid; @@ -1404,8 +1404,10 @@ NTAPI MiBuildPagedPool(VOID) { - PMMPTE PointerPte, PointerPde; + PMMPTE PointerPte; + PMMPDE PointerPde; MMPTE TempPte = ValidKernelPte; + MMPDE TempPde = ValidKernelPde; PFN_NUMBER PageFrameIndex; KIRQL OldIrql; ULONG Size, BitMapSize; @@ -1506,10 +1508,10 @@ // Allocate a page and map the first paged pool PDE // PageFrameIndex = MmAllocPage(MC_NPPOOL); - TempPte.u.Hard.PageFrameNumber = PageFrameIndex; + TempPde.u.Hard.PageFrameNumber = PageFrameIndex; ASSERT(PointerPde->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPde = TempPte; + ASSERT(TempPde.u.Hard.Valid == 1); + *PointerPde = TempPde; // // Release the PFN database lock @@ -1521,7 +1523,7 @@ // will be allocated to handle paged pool growth. This is where they'll have // to start. // - MmPagedPoolInfo.NextPdeForPagedPoolExpansion = PointerPde + 1; + MmPagedPoolInfo.NextPdeForPagedPoolExpansion = (PMMPTE)(PointerPde + 1); // // We keep track of each page via a bit, so check how big the bitmap will

1 0

[dreimer] 47257: Fix a typo in the German Translation. Thx goes to DosX
by dreimer＠svn.reactos.org 17 May '10

17 May '10

Author: dreimer Date: Mon May 17 22:22:15 2010 New Revision: 47257 URL: http://svn.reactos.org/svn/reactos?rev=47257&view=rev Log: Fix a typo in the German Translation. Thx goes to DosX Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc [iso-8859-1] Mon May 17 22:22:15 2010 @@ -21,10 +21,10 @@ CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Verzeichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + CONTROL "Verzeichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED @@ -53,10 +53,10 @@ CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Verzeichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + CONTROL "Verzeichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED @@ -85,10 +85,10 @@ CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Verzeichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + CONTROL "Verzeichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED

1 0

[ekohl] 47256: Assign remaining services to the LocalSystem account.
by ekohl＠svn.reactos.org 17 May '10

17 May '10

Author: ekohl Date: Mon May 17 22:21:27 2010 New Revision: 47256 URL: http://svn.reactos.org/svn/reactos?rev=47256&view=rev Log: Assign remaining services to the LocalSystem account. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon May 17 22:21:27 2010 @@ -973,6 +973,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Group",0x00000000,"Audio" HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010 @@ -1219,6 +1220,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Group",0x00000000,"Network" HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","ImagePath",0x00020000,"%SystemRoot%\system32\tcpsvcs.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Type",0x00010001,0x00000020 @@ -1228,6 +1230,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Group",0x00000000,"Network" HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ImagePath",0x00020000,"%SystemRoot%\system32\telnetd.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Type",0x00010001,0x00000020 @@ -1308,6 +1311,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ImagePath",0x00020000,"system32\msiexec.exe /V" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Type",0x00010001,0x00000020

1 0

[gschneider] 47255: [WIN32CSR] - Fix a FIXME: convert ASCII char to Unicode char with input codepage - Rename define parameters to make sense (prefix s - source, d - destination)
by gschneider＠svn.reactos.org 17 May '10

17 May '10

Author: gschneider Date: Mon May 17 20:43:21 2010 New Revision: 47255 URL: http://svn.reactos.org/svn/reactos?rev=47255&view=rev Log: [WIN32CSR] - Fix a FIXME: convert ASCII char to Unicode char with input codepage - Rename define parameters to make sense (prefix s - source, d - destination) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon May 17 20:43:21 2010 @@ -26,11 +26,14 @@ #define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ WideCharToMultiByte((Console)->CodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) +#define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ + MultiByteToWideChar((Console)->CodePage, 0, (sChar), 1, (dWChar), 1) + #define ConsoleUnicodeCharToAnsiChar(Console, dChar, sWChar) \ WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) -#define ConsoleAnsiCharToUnicodeChar(Console, sWChar, dChar) \ - MultiByteToWideChar((Console)->OutputCodePage, 0, (dChar), 1, (sWChar), 1) +#define ConsoleAnsiCharToUnicodeChar(Console, dWChar, sChar) \ + MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1) /* FUNCTIONS *****************************************************************/ @@ -616,7 +619,7 @@ else { if(Request->Data.ReadConsoleRequest.Unicode) - UnicodeBuffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; /* FIXME */ + ConsoleInputAnsiCharToUnicodeChar(Console, &UnicodeBuffer[i], &Input->InputEvent.Event.KeyEvent.uChar.AsciiChar); else Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; }

1 0

[tkreuzer] 47254: [HAL] comment out some amd64 specific stuff from rbuild files.
by tkreuzer＠svn.reactos.org 17 May '10

17 May '10

Author: tkreuzer Date: Mon May 17 16:52:00 2010 New Revision: 47254 URL: http://svn.reactos.org/svn/reactos?rev=47254&view=rev Log: [HAL] comment out some amd64 specific stuff from rbuild files. Modified: trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/halamd64.rbuild Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Mon May 17 16:52:00 2010 @@ -37,15 +37,15 @@ </if> <if property="ARCH" value="amd64"> <define name="_X86BIOS_" /> - <include base="x86emu">.</include> +  <directory name="amd64"> <file>x86bios.c</file> - <file>halinit.c</file> - <file>irq.S</file> - <file>misc.c</file> - <file>apic.c</file> +  +  +  +  <file>systimer.S</file> - <file>usage.c</file> +  </directory> </if> </directory> Modified: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Mon May 17 16:52:00 2010 @@ -13,7 +13,7 @@ <library>hal_generic</library> <library>hal_generic_acpi</library> <library>ntoskrnl</library> - <library>x86emu</library> +  <directory name="generic"> <file>spinlock.c</file>

1 0

[dreimer] 47253: fix a bug in ssvn batch version which always ran through the update function even if the 1st param was crap. Found by Crocodile
by dreimer＠svn.reactos.org 17 May '10

17 May '10

Author: dreimer Date: Mon May 17 15:55:04 2010 New Revision: 47253 URL: http://svn.reactos.org/svn/reactos?rev=47253&view=rev Log: fix a bug in ssvn batch version which always ran through the update function even if the 1st param was crap. Found by Crocodile Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Mon May 17 15:55:04 2010 @@ -184,6 +184,8 @@ echo Unknown parameter specified. Try 'help ssvn'. ) +goto EOC + :UP for /f "usebackq tokens=2" %%i in (`"svn.exe info | find "Revision:""`) do set OFFSVN=%%i if "%ROS_ARCH%" == "amd64" (

1 0

[mjmartin] 47252: [regedit] - Woops, forgot to change the messages to use resource files instead. Thanks Gregor Schneider.
by mjmartin＠svn.reactos.org 17 May '10

17 May '10

Author: mjmartin Date: Mon May 17 14:31:06 2010 New Revision: 47252 URL: http://svn.reactos.org/svn/reactos?rev=47252&view=rev Log: [regedit] - Woops, forgot to change the messages to use resource files instead. Thanks Gregor Schneider. Modified: trunk/reactos/base/applications/regedit/find.c Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Mon May 17 14:31:06 2010 @@ -808,8 +808,13 @@ hWnd, FindDialogProc, 0) != 0) { if (FindNext(hWnd) == FALSE) - MessageBoxW(NULL,L"Finished searching through the registry\n", - L"Registry Editor", MB_ICONINFORMATION); - } -} - + { + TCHAR msg[128], caption[128]; + + LoadString(hInst, IDS_FINISHEDFIND, msg, sizeof(msg)/sizeof(TCHAR)); + LoadString(hInst, IDS_APP_TITLE, caption, sizeof(caption)/sizeof(TCHAR)); + MessageBox(0, msg, caption, MB_ICONINFORMATION); + } + } +} +

1 0

[mjmartin] 47251: [regedit] - If a search was never done, show the find dialog when pressing F3. Patch by Radek Liska. See Bug #5391. - Return the result of the FindNext and if it is false inform the user that search is complete.
by mjmartin＠svn.reactos.org 17 May '10

17 May '10

Author: mjmartin Date: Mon May 17 04:15:50 2010 New Revision: 47251 URL: http://svn.reactos.org/svn/reactos?rev=47251&view=rev Log: [regedit] - If a search was never done, show the find dialog when pressing F3. Patch by Radek Liska. See Bug #5391. - Return the result of the FindNext and if it is false inform the user that search is complete. Modified: trunk/reactos/base/applications/regedit/find.c Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Mon May 17 04:15:50 2010 @@ -629,6 +629,12 @@ LPCTSTR pszValueName; LPTSTR pszFoundSubKey, pszFoundValueName; + if (_tcslen(s_szFindWhat) == 0) + { + FindDialog(hWnd); + return TRUE; + } + s_dwFlags = GetFindFlags(); pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); @@ -678,7 +684,7 @@ free(pszFoundValueName); SetFocus(g_pChildWnd->hListWnd); } - return TRUE; + return fSuccess; } static INT_PTR CALLBACK FindDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -801,7 +807,9 @@ if (DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_FIND), hWnd, FindDialogProc, 0) != 0) { - FindNext(hWnd); - } -} - + if (FindNext(hWnd) == FALSE) + MessageBoxW(NULL,L"Finished searching through the registry\n", + L"Registry Editor", MB_ICONINFORMATION); + } +} +

1 0

[cgutman] 47250: [USB] - Fix device interface activation - Add usbehci to build
by cgutman＠svn.reactos.org 17 May '10

17 May '10

Author: cgutman Date: Mon May 17 03:25:18 2010 New Revision: 47250 URL: http://svn.reactos.org/svn/reactos?rev=47250&view=rev Log: [USB] - Fix device interface activation - Add usbehci to build Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/directory.rbuild [iso-8859-1] Mon May 17 03:25:18 2010 @@ -6,6 +6,9 @@ </directory> <directory name="nt4compat"> <xi:include href="nt4compat/directory.rbuild" /> + </directory> + <directory name="usbehci"> + <xi:include href="usbehci/usbehci.rbuild" /> </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> Modified: branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c [iso-8859-1] Mon May 17 03:25:18 2010 @@ -218,6 +218,13 @@ } DPRINT("Busnumber %d\n", DeviceExtension->SystemIoBusNumber); + + Status = IoSetDeviceInterfaceState(&DeviceExtension->HcdInterfaceName, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoSetDeviceInterfaceState failed (0x%x)\n", Status); + return Status; + } /* Init wrapper with this object */ return InitLinuxWrapper(DeviceObject); Modified: branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c [iso-8859-1] Mon May 17 03:25:18 2010 @@ -268,6 +268,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + return Status; + } + + Status = IoSetDeviceInterfaceState(&DeviceExtension->HcdInterfaceName, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); return Status; }

1 0

[mjmartin] 47249: [win32k] - Check that the thread is not in cleanup before attempting to do anything related to it. Add a couple asserts for sanity.
by mjmartin＠svn.reactos.org 17 May '10

17 May '10

Author: mjmartin Date: Mon May 17 02:01:26 2010 New Revision: 47249 URL: http://svn.reactos.org/svn/reactos?rev=47249&view=rev Log: [win32k] - Check that the thread is not in cleanup before attempting to do anything related to it. Add a couple asserts for sanity. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Mon May 17 02:01:26 2010 @@ -368,7 +368,8 @@ { if (pTmr->cmsCountdown < 0) { - if (!(pTmr->flags & TMRF_READY)) + ASSERT(pTmr->pti); + if ((!(pTmr->flags & TMRF_READY)) && (!(pTmr->pti->TIF_flags & TIF_INCLEANUP))) { if (pTmr->flags & TMRF_ONESHOT) pTmr->flags |= TMRF_WAITING; @@ -384,8 +385,8 @@ // Set thread message queue for this timer. if (pTmr->pti->MessageQueue) { // Wakeup thread - if (pTmr->pti->MessageQueue->WakeMask & QS_POSTMESSAGE) - KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + ASSERT(pTmr->pti->MessageQueue->NewMessages != NULL); + KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); } } }

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