Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[sir_richard] 45266: [NTOS]: Implement a C/Extended ASM macro for generating trap stubs, removing the need to do this in ASM. The macro covers all possible entries, from SYSENTER to a fake sotware interrupt (needed for HAL changes later). By being somewhat in C, it makes the code cleaner to read and uses C expressions to make its decisions, making the code more maintanable as well. It also removes the need for separate assembly files. [NTOS]: Modify the semantics of how a fast system call (SYSEN

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 26 16:43:13 2010 New Revision: 45266 URL: http://svn.reactos.org/svn/reactos?rev=45266&view=rev Log: [NTOS]: Implement a C/Extended ASM macro for generating trap stubs, removing the need to do this in ASM. The macro covers all possible entries, from SYSENTER to a fake sotware interrupt (needed for HAL changes later). By being somewhat in C, it makes the code cleaner to read and uses C expressions to make its decisions, making the code more maintanable as well. It also removes the need for separate assembly files. [NTOS]: Modify the semantics of how a fast system call (SYSENTER) is processed in the stub, by moving more work in the C handler, such as setting up FS and getting the correct argument stack. Saves us some cycles too (and allows the trap stub macro to be more generic). Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Jan 26 16:43:13 2010 @@ -1100,13 +1100,6 @@ ); VOID -KiSystemService( - IN PKTHREAD Thread, - IN PKTRAP_FRAME TrapFrame, - IN ULONG Instruction -); - -VOID FASTCALL KiIdleLoop( VOID Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Tue Jan 26 16:43:13 2010 @@ -670,4 +670,120 @@ /* Set debug header */ KiFillTrapFrameDebug(TrapFrame); } + +// +// Generates a Trap Prolog Stub for the given name +// +#define KI_PUSH_FAKE_ERROR_CODE 0x1 +#define KI_FAST_V86_TRAP 0x2 +#define KI_NONVOLATILES_ONLY 0x4 +#define KI_FAST_SYSTEM_CALL 0x8 +#define KI_SOFTWARE_TRAP 0x10 +#define KiTrap(x, y) VOID DECLSPEC_NORETURN x(VOID) { KiTrapStub(y, x##Handler); } + +// +// Trap Prolog Stub +// +VOID +DECLSPEC_NORETURN +FORCEINLINE +KiTrapStub(IN ULONG Flags, + IN PVOID Handler) +{ + ULONG FrameSize; + + /* Is this a fast system call? They don't have a stack! */ + if (Flags & KI_FAST_SYSTEM_CALL) __asm__ __volatile__ + ( + "movl %%ss:%c[t], %%esp\n" + "movl %c[e](%%esp), %%esp\n" + : + : [e] "i"(FIELD_OFFSET(KTSS, Esp0)), + [t] "i"(&PCR->TSS) + : "%esp" + ); + + /* Check what kind of trap frame this trap requires */ + if (Flags & KI_SOFTWARE_TRAP) + { + /* Software traps need a complete non-ring transition trap frame */ + FrameSize = FIELD_OFFSET(KTRAP_FRAME, HardwareEsp); + } + else if (Flags & KI_FAST_SYSTEM_CALL) + { + /* SYSENTER requires us to build a complete ring transition trap frame */ + FrameSize = FIELD_OFFSET(KTRAP_FRAME, V86Es); + + /* And it only preserves nonvolatile registers */ + Flags |= KI_NONVOLATILES_ONLY; + } + else if (Flags & KI_PUSH_FAKE_ERROR_CODE) + { + /* If the trap doesn't have an error code, we'll make space for it */ + FrameSize = FIELD_OFFSET(KTRAP_FRAME, Eip); + } + else + { + /* The trap already has an error code, so just make space for the rest */ + FrameSize = FIELD_OFFSET(KTRAP_FRAME, ErrCode); + } + + /* Software traps need to get their EIP from the caller's frame */ + if (Flags & KI_SOFTWARE_TRAP) __asm__ __volatile__ ("popl %%eax\n":::"%esp"); + + /* Now go ahead and make space for this frame */ + __asm__ __volatile__ ("subl $%c[e],%%esp\n":: [e] "i"(FrameSize) : "%esp"); + + /* Does the caller want volatiles only? */ + if (Flags & KI_NONVOLATILES_ONLY) __asm__ __volatile__ + ( + /* Then only EBX, ESI, EDI and EBP are saved */ + "movl %%ebx, %c[b](%%esp)\n" + "movl %%esi, %c[s](%%esp)\n" + "movl %%edi, %c[i](%%esp)\n" + "movl %%ebp, %c[p](%%esp)\n" + : + : [b] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebx)), + [s] "i"(FIELD_OFFSET(KTRAP_FRAME, Esi)), + [i] "i"(FIELD_OFFSET(KTRAP_FRAME, Edi)), + [p] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebp)) + : "%esp" + ); + else __asm__ __volatile__ + ( + /* Otherwise, we save all the registers (except ESP) */ + "movl %%eax, %c[a](%%esp)\n" + "movl %%ebx, %c[b](%%esp)\n" + "movl %%ecx, %c[c](%%esp)\n" + "movl %%edx, %c[d](%%esp)\n" + "movl %%esi, %c[s](%%esp)\n" + "movl %%edi, %c[i](%%esp)\n" + "movl %%ebp, %c[p](%%esp)\n" + : + : [a] "i"(FIELD_OFFSET(KTRAP_FRAME, Eax)), + [b] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebx)), + [c] "i"(FIELD_OFFSET(KTRAP_FRAME, Ecx)), + [d] "i"(FIELD_OFFSET(KTRAP_FRAME, Edx)), + [s] "i"(FIELD_OFFSET(KTRAP_FRAME, Esi)), + [i] "i"(FIELD_OFFSET(KTRAP_FRAME, Edi)), + [p] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebp)) + : "%esp" + ); + + /* Now set parameter 1 (ECX) to point to the frame */ + __asm__ __volatile__ ("movl %%esp, %%ecx\n":::"%esp"); + + /* For Fast-V86 traps, move set parameter 2 (EDX) to hold EFlags */ + if (Flags & KI_FAST_V86_TRAP) __asm__ __volatile__ + ( + "movl %c[f](%%esp), %%edx\n" + : + : [f] "i"(FIELD_OFFSET(KTRAP_FRAME, EFlags)) + ); + + /* Now jump to the C handler */ + __asm__ __volatile__ ("jmp %c[x]\n":: [x] "i"(Handler)); + UNREACHABLE; +} + #endif Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Jan 26 16:43:13 2010 @@ -53,14 +53,6 @@ idt _KiTrap0F, INT_32_DPL0 /* INT 2F: RESERVED */ GENERATE_IDT_STUBS /* INT 30-FF: UNEXPECTED INTERRUPTS */ -/* Trap handlers referenced from C code */ -.globl _KiTrap08 -.globl _KiTrap13 - -/* System call code referenced from C code */ -.globl _CopyParams -.globl _ReadBatch - /* System call entrypoints: */ .globl _KiFastCallEntry .globl _KiSystemService @@ -111,49 +103,6 @@ /* SOFTWARE INTERRUPT SERVICES ***********************************************/ .text -.func KiSystemService -_KiSystemService: - - /* Make space for trap frame on the stack */ - sub esp, KTRAP_FRAME_EIP - - /* Save EBP, EBX, ESI, EDI only! */ - mov [esp+KTRAP_FRAME_EBX], ebx - mov [esp+KTRAP_FRAME_ESI], esi - mov [esp+KTRAP_FRAME_EDI], edi - mov [esp+KTRAP_FRAME_EBP], ebp - - /* Call C handler -- note that EDX is the caller stack, EAX is the ID */ - mov ecx, esp - jmp _KiSystemServiceHandler -.endfunc - -.func KiFastCallEntry -_KiFastCallEntry: - - /* Sane FS segment */ - mov ecx, KGDT_R0_PCR - mov fs, cx - - /* Sane stack and frame */ - mov esp, PCR[KPCR_TSS] - mov esp, [esp+KTSS_ESP0] - - /* Make space for trap frame on the stack */ - sub esp, KTRAP_FRAME_V86_ES - - /* Save EBP, EBX, ESI, EDI only! */ - mov [esp+KTRAP_FRAME_EBX], ebx - mov [esp+KTRAP_FRAME_ESI], esi - mov [esp+KTRAP_FRAME_EDI], edi - mov [esp+KTRAP_FRAME_EBP], ebp - - /* Call C handler -- note that EDX is the user stack, and EAX the syscall */ - mov ecx, esp - add edx, 8 - jmp _KiFastCallEntryHandler -.endfunc - .func Kei386EoiHelper@0 _Kei386EoiHelper@0: @@ -191,32 +140,6 @@ AbiosExit: /* FIXME: TODO */ UNHANDLED_PATH - -GENERATE_TRAP_HANDLER KiGetTickCount, 1 -GENERATE_TRAP_HANDLER KiCallbackReturn, 1 -GENERATE_TRAP_HANDLER KiRaiseAssertion, 1 -GENERATE_TRAP_HANDLER KiDebugService, 1 - -/* HARDWARE TRAP HANDLERS ****************************************************/ - -GENERATE_TRAP_HANDLER KiTrap00 -GENERATE_TRAP_HANDLER KiTrap01 -GENERATE_TRAP_HANDLER KiTrap03 -GENERATE_TRAP_HANDLER KiTrap04 -GENERATE_TRAP_HANDLER KiTrap05 -GENERATE_TRAP_HANDLER KiTrap06 -GENERATE_TRAP_HANDLER KiTrap07 -GENERATE_TRAP_HANDLER KiTrap08, 0 -GENERATE_TRAP_HANDLER KiTrap09 -GENERATE_TRAP_HANDLER KiTrap0A, 0 -GENERATE_TRAP_HANDLER KiTrap0B, 0 -GENERATE_TRAP_HANDLER KiTrap0C, 0 -GENERATE_TRAP_HANDLER KiTrap0D, 0, 1 -GENERATE_TRAP_HANDLER KiTrap0E, 0 -GENERATE_TRAP_HANDLER KiTrap0F -GENERATE_TRAP_HANDLER KiTrap10 -GENERATE_TRAP_HANDLER KiTrap11 -GENERATE_TRAP_HANDLER KiTrap13 /* UNEXPECTED INTERRUPT HANDLERS **********************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Jan 26 16:43:13 2010 @@ -1489,12 +1489,13 @@ PKTHREAD Thread; /* Fixup segments */ + Ke386SetFs(KGDT_R0_PCR); Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); /* Set up a fake INT Stack and enable interrupts */ TrapFrame->HardwareSegSs = KGDT_R3_DATA | RPL_MASK; - TrapFrame->HardwareEsp = (ULONG_PTR)Arguments - 8; // Stack is 2 frames down + TrapFrame->HardwareEsp = (ULONG_PTR)Arguments; TrapFrame->EFlags = __readeflags() | EFLAGS_INTERRUPT_MASK; TrapFrame->SegCs = KGDT_R3_CODE | RPL_MASK; TrapFrame->Eip = SharedUserData->SystemCallReturn; @@ -1502,6 +1503,9 @@ /* Get the current thread */ Thread = KeGetCurrentThread(); + + /* Arguments are actually 2 frames down (because of the double indirection) */ + Arguments = (PVOID)(TrapFrame->HardwareEsp + 8); /* Call the shared handler (inline) */ KiSystemCallHandler(TrapFrame, @@ -1545,6 +1549,33 @@ Thread->PreviousMode, SegFs); } + +/* CPU AND SOFTWARE TRAPS *****************************************************/ + +KiTrap(KiTrap00, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap01, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap03, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap04, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap05, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap06, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap07, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap08, 0); +KiTrap(KiTrap09, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap0A, 0); +KiTrap(KiTrap0B, 0); +KiTrap(KiTrap0C, 0); +KiTrap(KiTrap0D, KI_FAST_V86_TRAP); +KiTrap(KiTrap0E, 0); +KiTrap(KiTrap0F, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap10, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap11, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiTrap13, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiGetTickCount, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiCallbackReturn, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiRaiseAssertion, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiDebugService, KI_PUSH_FAKE_ERROR_CODE); +KiTrap(KiSystemService, KI_PUSH_FAKE_ERROR_CODE | KI_NONVOLATILES_ONLY); +KiTrap(KiFastCallEntry, KI_FAST_SYSTEM_CALL); /* HARDWARE INTERRUPTS ********************************************************/

14 years, 7 months

[jcatena] 45265: [MSC] rules files for MSVC to assemble as, nasm and msmasm

by jcatena＠svn.reactos.org

Author: jcatena Date: Tue Jan 26 13:12:10 2010 New Revision: 45265 URL: http://svn.reactos.org/svn/reactos?rev=45265&view=rev Log: [MSC] rules files for MSVC to assemble as, nasm and msmasm Added: branches/jcatena-branch/tools/msc/ (with props) branches/jcatena-branch/tools/msc/masm.rules branches/jcatena-branch/tools/msc/nasm.rules branches/jcatena-branch/tools/msc/s_as_mscpp.rules Propchange: branches/jcatena-branch/tools/msc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jan 26 13:12:10 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/jcatena-branch/tools/msc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/jcatena-branch/tools/msc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/jcatena-branch/tools/msc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/jcatena-branch/tools/msc/masm.rules URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/tools/msc/masm.r… ============================================================================== --- branches/jcatena-branch/tools/msc/masm.rules (added) +++ branches/jcatena-branch/tools/msc/masm.rules [iso-8859-1] Tue Jan 26 13:12:10 2010 @@ -1,0 +1,362 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<VisualStudioToolFile + Name="Microsoft Macro Assembler" + Version="8.00" + > + <Rules> + <CustomBuildRule + Name="MASM" + DisplayName="Microsoft Macro Assembler" + CommandLine="ml.exe /c [AllOptions] [AdditionalOptions] /Ta[inputs]" + Outputs="[$ObjectFileName]" + FileExtensions="*.asm" + ExecutionDescription="Assembling..." + > + <Properties> + <BooleanProperty + Name="NoLogo" + DisplayName="Suppress Startup Banner" + Description="Suppress the display of the startup banner and information messages. (/nologo)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/nologo" + DefaultValue="true" + /> + <BooleanProperty + Name="TinyMemoryModelSupport" + DisplayName="Tiny Memory Model Support" + PropertyPageName="Advanced" + Description="Enables tiny-memory-model support. Note that this is not equivalent to the .MODEL TINY directive. (/AT)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/AT" + /> + <StringProperty + Name="ObjectFileName" + DisplayName="Object File Name" + PropertyPageName="Object File" + Description="Specifies the name of the output object file. (/Fo:[file])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Fo"[value]"" + DefaultValue="$(IntDir)\$(InputName).obj" + /> + <EnumProperty + Name="PreserveIdentifierCase" + DisplayName="Preserve Identifier Case" + Description="Specifies preservation of case of user identifiers. (/Cp, /Cu, /Cx)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + DefaultValue="0" + > + <Values> + <EnumValue + Value="0" + DisplayName="Default" + /> + <EnumValue + Value="1" + Switch="/Cp" + DisplayName="Preserves Identifier Case (/Cp)" + /> + <EnumValue + Value="2" + Switch="/Cu" + DisplayName="Maps all identifiers to upper case. (/Cu)" + /> + <EnumValue + Value="3" + Switch="/Cx" + DisplayName="Preserves case in public and extern symbols. (/Cx)" + /> + </Values> + </EnumProperty> + <StringProperty + Name="PreprocessorDefinitions" + DisplayName="Preprocessor Definitions" + Description="Defines a text macro with the given name. (/D[symbol])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/D"[value]"" + Delimited="true" + Inheritable="true" + /> + <BooleanProperty + Name="GeneratePreprocessedSourceListing" + DisplayName="Generate Preprocessed Source Listing" + PropertyPageName="Listing File" + Description="Generates a preprocessed source listing to the Output Window. (/EP)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/EP" + /> + <StringProperty + Name="AssembledCodeListingFile" + DisplayName="Assembled Code Listing File" + PropertyPageName="Listing File" + Description="Generates an assembled code listing file. (/Fl[file])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Fl"[value]"" + /> + <StringProperty + Name="SourceListingLineWidth" + DisplayName="Source Listing Line Width" + PropertyPageName="Listing File" + Description="Sets the line width of source listing in characters per line. Range is 60 to 255. Same as PAGE width. (/Sl [width])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Sl [value]" + /> + <StringProperty + Name="SourceListingPageLength" + DisplayName="Source Listing Page Length" + PropertyPageName="Listing File" + Description="Sets the page length of source listing in lines per page. Range is 10 to 255. Same as PAGE length. (/Sp [length])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Sp [value]" + /> + <StringProperty + Name="IncludePaths" + DisplayName="Include Paths" + Description="Sets path for include file. A maximum of 10 /I options is allowed. (/I [path])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/I "[value]"" + Delimited="true" + Inheritable="true" + /> + <BooleanProperty + Name="ListAllAvailableInformation" + DisplayName="List All Available Information" + PropertyPageName="Listing File" + Description="Turns on listing of all available information. (/Sa)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Sa" + /> + <BooleanProperty + Name="UseSafeExceptionHandlers" + DisplayName="Use Safe Exception Handlers" + PropertyPageName="Advanced" + Description="Marks the object as either containing no exception handlers or containing exception handlers that are all declared with .SAFESEH. (/safeseh)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/safeseh" + /> + <BooleanProperty + Name="AddFirstPassListing" + DisplayName="Add First Pass Listing" + PropertyPageName="Listing File" + Description="Adds first-pass listing to listing file. (/Sf)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Sf" + /> + <BooleanProperty + Name="EnableAssemblyGeneratedCodeListing" + DisplayName="Enable Assembly Generated Code Listing" + PropertyPageName="Listing File" + Description="Turns on listing of assembly-generated code. (/Sg)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Sg" + /> + <BooleanProperty + Name="DisableSymbolTable" + DisplayName="Disable Symbol Table" + PropertyPageName="Listing File" + Description="Turns off symbol table when producing a listing. (/Sn)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Sn" + /> + <StringProperty + Name="SourceListingSubTitle" + DisplayName="Source Listing Subtitle" + PropertyPageName="Listing File" + Description="Specifies subtitle text for source listing. Same as SUBTITLE text. (/Ss [subtitle])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Ss [value]" + /> + <StringProperty + Name="SourceListingTitle" + DisplayName="Source Listing Title" + PropertyPageName="Listing File" + Description="Specifies title for source listing. Same as TITLE text. (/St [title])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/St [value]" + /> + <BooleanProperty + Name="EnableFalseConditionalsInListing" + DisplayName="Enable False Conditionals In Listing" + PropertyPageName="Listing File" + Description="Turns on false conditionals in listing. (/Sx)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Sx" + /> + <EnumProperty + Name="WarningLevel" + DisplayName="Warning Level" + Description="Sets the warning level, where level = 0, 1, 2, or 3. (/W0, /W1, /W2, /W3)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + DefaultValue="3" + > + <Values> + <EnumValue + Value="0" + Switch="/W0" + DisplayName="Warning Level 0 (/W0)" + /> + <EnumValue + Value="1" + Switch="/W1" + DisplayName="Warning Level 1 (/W1)" + /> + <EnumValue + Value="2" + Switch="/W2" + DisplayName="Warning Level 2 (/W2)" + /> + <EnumValue + Value="3" + Switch="/W3" + DisplayName="Warning Level 3 (/W3)" + /> + </Values> + </EnumProperty> + <BooleanProperty + Name="TreatWarningsAsErrors" + DisplayName="Treat Warnings As Errors" + Description="Returns an error code if warnings are generated. (/WX)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/WX" + /> + <BooleanProperty + Name="MakeAllSymbolsPublic" + DisplayName="Make All Symbols Public" + PropertyPageName="Object File" + Description="Makes all symbols public. (/Zf)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Zf" + /> + <BooleanProperty + Name="GenerateDebugInformation" + DisplayName="Generate Debug Information" + Description="Generates Debug Information. (/Zi)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Zi" + DefaultValue="true" + /> + <BooleanProperty + Name="EnableMASM51Compatibility" + DisplayName="Enable MASM 5.1 Compatibility" + Description="Enables M510 option for maximum compatibility with MASM 5.1. (/Zm)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Zm" + /> + <EnumProperty + Name="PackAlignmentBoundary" + DisplayName="Pack Alignment Boundary" + PropertyPageName="Advanced" + Description="Packs structures on the specified byte boundary. The alignment can be 1, 2, 4, 8 or 16. (/Zp1, /Zp2, /Zp4, /Zp8, /Zp16)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + > + <Values> + <EnumValue + Value="0" + DisplayName="Default" + /> + <EnumValue + Value="1" + Switch="/Zp1" + DisplayName="One Byte Boundary (/Zp1)" + /> + <EnumValue + Value="2" + Switch="/Zp2" + DisplayName="Two Byte Boundary (/Zp2)" + /> + <EnumValue + Value="3" + Switch="/Zp4" + DisplayName="Four Byte Boundary (/Zp4)" + /> + <EnumValue + Value="4" + Switch="/Zp8" + DisplayName="Eight Byte Boundary (/Zp8)" + /> + <EnumValue + Value="5" + Switch="/Zp16" + DisplayName="Sixteen Byte Boundary (/Zp16)" + /> + </Values> + </EnumProperty> + <BooleanProperty + Name="PerformSyntaxCheckOnly" + DisplayName="Perform Syntax Check Only" + Description="Performs a syntax check only. (/Zs)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/Zs" + /> + <EnumProperty + Name="CallingConvention" + DisplayName="Calling Convention" + PropertyPageName="Advanced" + Description="Selects calling convention for your application. (/Gc, /Gd. /Gz)" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + > + <Values> + <EnumValue + Value="0" + DisplayName="Default" + /> + <EnumValue + Value="1" + Switch="/Gd" + DisplayName="Use C-style Calling Convention (/Gd)" + /> + <EnumValue + Value="2" + Switch="/Gz" + DisplayName="Use stdcall Calling Convention (/Gz)" + /> + <EnumValue + Value="3" + Switch="/Gc" + DisplayName="Use Pascal Calling Convention (/Gc)" + /> + </Values> + </EnumProperty> + <EnumProperty + Name="ErrorReporting" + DisplayName="Error Reporting" + PropertyPageName="Advanced" + Description="Reports internal assembler errors to Microsoft. (/errorReport:[method])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + > + <Values> + <EnumValue + Value="0" + Switch="/errorReport:prompt" + DisplayName="Prompt to send report immediately (/errorReport:prompt)" + /> + <EnumValue + Value="1" + Switch="/errorReport:queue" + DisplayName="Prompt to send report at the next logon (/errorReport:queue)" + /> + <EnumValue + Value="2" + Switch="/errorReport:send" + DisplayName="Automatically send report (/errorReport:send)" + /> + <EnumValue + Value="3" + Switch="/errorReport:none" + DisplayName="Do not send report (/errorReport:none)" + /> + </Values> + </EnumProperty> + <StringProperty + Name="BrowseFile" + DisplayName="Generate Browse Information File" + PropertyPageName="Advanced" + Description="Specifies whether to generate browse information file and its optional name or location of the browse information file. (/FR[name])" + HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/htm…" + Switch="/FR"[value]"" + Delimited="true" + Inheritable="true" + /> + </Properties> + </CustomBuildRule> + </Rules> +</VisualStudioToolFile> Added: branches/jcatena-branch/tools/msc/nasm.rules URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/tools/msc/nasm.r… ============================================================================== --- branches/jcatena-branch/tools/msc/nasm.rules (added) +++ branches/jcatena-branch/tools/msc/nasm.rules [iso-8859-1] Tue Jan 26 13:12:10 2010 @@ -1,0 +1,42 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<VisualStudioToolFile + Name="nasm" + Version="8.00" + > + <Rules> + <CustomBuildRule + Name="nasm" + DisplayName="nasm" + CommandLine="nasm -f coff -Xvc [AllOptions] $(InputPath)" + Outputs="[$nasmOutF]" + FileExtensions="*.asm" + ExecutionDescription="Assembling " + > + <Properties> + <StringProperty + Name="nasmOutF" + DisplayName="Obj File" + Description="Obj File (-o [file])" + Switch=""[value]"" + DefaultValue="$(IntDir)\$(InputName).obj" + /> + <StringProperty + Name="nasmIncPaths" + DisplayName="Inc Paths" + Description="Include serach paths (/I [path])" + Switch="-I "[value]"" + Delimited="true" + Inheritable="true" + /> + <StringProperty + Name="nasmPPDefs" + DisplayName="Preproc Defs" + Description="Preprocessor Definitions (/D [symbol])" + Switch="-D "[value]"" + Delimited="true" + Inheritable="true" + /> + </Properties> + </CustomBuildRule> + </Rules> +</VisualStudioToolFile> Added: branches/jcatena-branch/tools/msc/s_as_mscpp.rules URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/tools/msc/s_as_m… ============================================================================== --- branches/jcatena-branch/tools/msc/s_as_mscpp.rules (added) +++ branches/jcatena-branch/tools/msc/s_as_mscpp.rules [iso-8859-1] Tue Jan 26 13:12:10 2010 @@ -1,0 +1,42 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<VisualStudioToolFile + Name="s as (gnu_as mscpp)" + Version="8.00" + > + <Rules> + <CustomBuildRule + Name="s_as_mscpp" + DisplayName="s (gnu_as mscpp)" + CommandLine="cl /E [sIncPaths] [sPPDefs] $(InputPath) | as -o [sOutF]" + Outputs="[$sOutF]" + FileExtensions="*.s" + ExecutionDescription="Assembling " + > + <Properties> + <StringProperty + Name="sOutF" + DisplayName="Obj File" + Description="Obj File (-o [file])" + Switch=""[value]"" + DefaultValue="$(IntDir)\$(InputName).obj" + /> + <StringProperty + Name="sIncPaths" + DisplayName="Inc Paths" + Description="Include serach paths (/I [path])" + Switch="/I "[value]"" + Delimited="true" + Inheritable="true" + /> + <StringProperty + Name="sPPDefs" + DisplayName="Preproc Defs" + Description="Preprocessor Definitions (/D [symbol])" + Switch="/D "[value]"" + Delimited="true" + Inheritable="true" + /> + </Properties> + </CustomBuildRule> + </Rules> +</VisualStudioToolFile>

14 years, 7 months

[jcatena] 45264: [REACTOS] added includes to improve compiler and platform portability check specally platf.h, and use its macros instead of specific compiler directives cpu.h and cpu_c.h contain defs, macros and inlines specific to the cpu_c there are different versions of these files in <arch> and <compiler> subdirectories, and the right subdirectories must be added to the search path according to compiler and architecture

by jcatena＠svn.reactos.org

Author: jcatena Date: Tue Jan 26 12:50:40 2010 New Revision: 45264 URL: http://svn.reactos.org/svn/reactos?rev=45264&view=rev Log: [REACTOS] added includes to improve compiler and platform portability check specally platf.h, and use its macros instead of specific compiler directives cpu.h and cpu_c.h contain defs, macros and inlines specific to the cpu_c there are different versions of these files in <arch> and <compiler> subdirectories, and the right subdirectories must be added to the search path according to compiler and architecture Added: branches/jcatena-branch/include/reactos/gnuc/ (with props) branches/jcatena-branch/include/reactos/gnuc/i386/ (with props) branches/jcatena-branch/include/reactos/gnuc/i386/cpu_c.h (with props) branches/jcatena-branch/include/reactos/gnuc/i386/platf.h (with props) branches/jcatena-branch/include/reactos/i386/ (with props) branches/jcatena-branch/include/reactos/i386/cpu.h (with props) branches/jcatena-branch/include/reactos/i386/reactos_cfg.h (with props) branches/jcatena-branch/include/reactos/msc/ (with props) branches/jcatena-branch/include/reactos/msc/i386/ (with props) branches/jcatena-branch/include/reactos/msc/i386/cpu_c.h (with props) branches/jcatena-branch/include/reactos/msc/i386/msc.h (with props) branches/jcatena-branch/include/reactos/msc/i386/platf.h (with props) branches/jcatena-branch/include/reactos/osver.h (with props) Propchange: branches/jcatena-branch/include/reactos/gnuc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jan 26 12:50:40 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/jcatena-branch/include/reactos/gnuc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/jcatena-branch/include/reactos/gnuc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/jcatena-branch/include/reactos/gnuc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/jcatena-branch/include/reactos/gnuc/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jan 26 12:50:40 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/jcatena-branch/include/reactos/gnuc/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/jcatena-branch/include/reactos/gnuc/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/jcatena-branch/include/reactos/gnuc/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/jcatena-branch/include/reactos/gnuc/i386/cpu_c.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/gnuc/i386/cpu_c.h (added) +++ branches/jcatena-branch/include/reactos/gnuc/i386/cpu_c.h [iso-8859-1] Tue Jan 26 12:50:40 2010 @@ -1,0 +1,98 @@ +#ifndef _CASM_INC +#define _CASM_INC + +#define Ke386SetGlobalDescriptorTable(X) \ + __asm__("lgdt %0\n\t" \ + : /* no outputs */ \ + : "m" (*X)); + +#define Ke386GetGlobalDescriptorTable(X) \ + __asm__("sgdt %0\n\t" \ + : "=m" (*X) \ + : /* no input */ \ + : "memory"); + +FORCEINLINE +USHORT +Ke386GetLocalDescriptorTable() +{ + USHORT Ldt; + __asm__("sldt %0\n\t" + : "=m" (Ldt) + : /* no input */ + : "memory"); + return Ldt; +} + +#define Ke386SetLocalDescriptorTable(X) \ + __asm__("lldt %w0\n\t" \ + : /* no outputs */ \ + : "q" (X)); + +#define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); + +FORCEINLINE +USHORT +Ke386GetTr(VOID) +{ + USHORT Tr; + __asm__("str %0\n\t" + : "=m" (Tr)); + return Tr; +} + +#define _Ke386GetSeg(N) ({ \ + unsigned int __d; \ + __asm__("movl %%" #N ",%0\n\t" :"=r" (__d)); \ + __d; \ + }) + +#define _Ke386SetSeg(N,X) __asm__ __volatile__("movl %0,%%" #N : :"r" (X)); + +#define Ke386FnInit() __asm__("fninit\n\t"); + +// +// CR Macros +// +#define Ke386SetCr2(X) __asm__ __volatile__("movl %0,%%cr2" : :"r" (X)); + +// +// Segment Macros +// +#define Ke386GetSs() _Ke386GetSeg(ss) +#define Ke386GetFs() _Ke386GetSeg(fs) +#define Ke386SetFs(X) _Ke386SetSeg(fs, X) +#define Ke386SetDs(X) _Ke386SetSeg(ds, X) +#define Ke386SetEs(X) _Ke386SetSeg(es, X) +#define Ke386SetSs(X) _Ke386SetSeg(ss, X) +#define Ke386SetGs(X) _Ke386SetSeg(gs, X) + +#define FPU_DOUBLE(var) double var; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) + +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) + +// gcc bug workaround +#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40300) || \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40303) +#define DEFINE_WAIT_BLOCK(x) \ + struct _AlignHack \ + { \ + UCHAR Hack[15]; \ + EX_PUSH_LOCK_WAIT_BLOCK UnalignedBlock; \ + } WaitBlockBuffer; \ + PEX_PUSH_LOCK_WAIT_BLOCK x = (PEX_PUSH_LOCK_WAIT_BLOCK) \ + ((ULONG_PTR)&WaitBlockBuffer.UnalignedBlock &~ 0xF); +#else +// This is only for compatibility; the compiler will optimize the extra +// local variable (the actual pointer) away, so we don't take any perf hit +// by doing this. +#define DEFINE_WAIT_BLOCK(x) \ + EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ + PEX_PUSH_LOCK_WAIT_BLOCK x = &WaitBlockBuffer; +#endif + + +#endif // #ifndef _CASM_INC Propchange: branches/jcatena-branch/include/reactos/gnuc/i386/cpu_c.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/jcatena-branch/include/reactos/gnuc/i386/platf.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/gnuc/i386/platf.h (added) +++ branches/jcatena-branch/include/reactos/gnuc/i386/platf.h [iso-8859-1] Tue Jan 26 12:50:40 2010 @@ -1,0 +1,201 @@ +#pragma once + +/* platf.h gnuc i32 +platform dependent basic types and macros +(c) Jose M. Catena Gomez, diwaves.com +*/ + +/* this must produce a compiler error */ +#define _ERR_UNSUPPORTED #error + +/* attribues */ +#define __declspec(x) __attribute__((x)) +#define _CDECL __declspec(cdecl) +#define _THISCALL +#define _STDCALL __declspec(stdcall) +#define _FASTCALL __declspec(regparm(3)) +#define _CLRCALL +#define _INLINE __inline__ +#define _INLINEF __inline__ __declspec(always_inline) +#define _NAKED +#define _INTERRUPT _ERR_UNSUPPORTED +#define _SAVEREGS _ERR_UNSUPPORTED +#define _LOADDS _ERR_UNSUPPORTED +#define _DLLEXPORT __declspec(dllexport) +#define _DLLIMPORT __declspec(dllimport) +#define _ALIGN(x) __declspec(aligned(x)) + +#define _PACK(x) __pragma(pack(push, x)) +#define _PACK_POP __pragma(pack(pop)) +#define _RESTRICT __restrict__ +#define _ONCE +#define _OPTIMIZE_DFT +#define _OPTIMIZE_OFF_ALL +#define _OPTIMIZE_OFF_GLOBAL +#define _OPTIMIZE_OFF_STKF +#define _INTRINSIC(x, subst) \ +#define x subst +#define _NOINTRINSIC(x) \ +#undef x +#define _NOWARN_PUSH +#define _NOWARN_POP +#define _NOWARN_MSC(x) +#define _NOWARN_GNUC(x) + +#define _SECTION(x) __declspec((section(sectn))) +#define _SECTION_FN(sectn, fn) __declspec((section(sectn))) +#define _SECTION_FND(sectn) __declspec((section(sectn))) +#define _SECTION_CODE(x) +#define _SECTION_CODE_END +#define _SECTION_DATA(x) +#define _SECTION_DATA_END +#define _SECTION_BSS(x) +#define _SECTION_BSS_END +#define _SECTION_CONST(x) +#define _SECTION_CONST_END + +#define _ASM_BEGIN __asm__ { +#define _ASM_END } +#define _ASM __asm__ + +#define IN +#define OUT + +/* ptr size */ +#define PTRSIZ 4 +#define PTRSIZMIN 4 +#define PTRSIZMAX 4 +#define _NEAR +#define _FAR +#define _FARH +#define _BASED +#define _BASED1 __based +#define _SEGMENT _UNSUPPORTED +#define _SEGNAME _UNSUPPORTED + +/************************************************************************* +basic types +*************************************************************************/ +typedef void *pvoid, _NEAR *npvoid, _FAR *lpvoid, _FARH *hpvoid; + +/* chars */ +#define CHRSIZMIN 1 +#define CHRSIZMAX 2 +#define CHRSIZ 1 +#define CHRWSIZ 2 +#define CHRXSIZ 2 +#define CHRSIGN 1 +#define CHRWSIGN 0 + +typedef char chr8, *pchr8p, _NEAR *npchr8, _FAR *lpchr8, _FARH *hpchr8; +typedef signed char chr8s, *pchr8s, _NEAR *npchr8s, _FAR *lpchr8s, _FARH *hpchr8s; +typedef unsigned char chr8u, *pchr8u, _NEAR *npchr8u, _FAR *lpchr8u, _FARH *hpchr8u; + +/* chars unicode 16 bits */ +#ifdef _NATIVE_WCHAR_T_DEFINED +typedef wchar_t chr16; +typedef signed short chr16s; +typedef unsigned short chr16u; +#else +typedef unsigned short chr16; +typedef signed short chr16s; +typedef unsigned short chr16u; +#endif + +typedef chr16 *pchr16, _NEAR *npchr16, _FAR *lpchr16, _FARH *hpchr16; +typedef chr16s *pchr16s, _NEAR *npchr16s, _FAR *lpchr16s, _FARH *hpchr16s; +typedef chr16u *pchr16u, _NEAR *npchr16u, _FAR *lpchr16u, _FARH *hpchr16u; + +#ifdef _UNICODE +typedef chr16 chr; +typedef chr16s chrs; +typedef chr16u chru; +#else +typedef chr8 chr; +typedef chr8s chrs; +typedef chr8u chru; +#endif + +typedef chr *pchr, _NEAR *npchr, _FAR *lpchr, _FARH hpchr; +typedef chrs *pchrs, _NEAR *npchrs, _FAR *lpchrs, _FARH hpchrs; +typedef chru *pchru, _NEAR *npchru, _FAR *lpchru, _FARH hpchru; + +// string literal macros +// double definitions here are necessary because preprocessor behavior +#define _T16(x) L ## x +#define T16(x) _T16(x) +#define _T8(x) x +#define T8(x) _T8(x) +#ifdef _UNICODE +#define TX(x) _T16(x) +#else +#define TX(x) _T8(x) +#endif +// stringfy +#define _sfy(x) #x +#define sfy(x) _sfy(x) + +/* integers */ +#define INTSIZMIN 1 +#define INTSIZMAX 8 +#define INTSIZ 4 +#define INTSMIN -2147483648 +#define INTSMAX 0x7FFFFFFF + +typedef int *pint, _NEAR *npint, _FAR *lpint, _FARH *hpint; +typedef signed int ints, *pints, _NEAR *npints, _FAR *lpints, _FARH *hpints; +typedef unsigned int intu, *pintu, _NEAR *npintu, _FAR *lpintu, _FARH *hpintu; + +typedef __int8 i8, *pi8, _NEAR *npi8, _FAR *lpi8, _FARH *hpi8; +typedef signed __int8 i8s, *pi8s, _NEAR *npi8s, _FAR *lpi8s, _FARH *hpi8s; +typedef unsigned __int8 i8u, *pi8u, _NEAR *npi8u, _FAR *lpi8u, _FARH *hpi8u; + +typedef short i16, *pi16, _NEAR *npi16, _FAR *lpi16, _FARH *hpi16; +typedef signed short i16s, *pi16s, _NEAR *npi16s, _FAR *lpi16s, _FARH *hpi16s; +typedef unsigned short i16u, *pi16u, _NEAR *npi16u, _FAR *lpi16u, _FARH *hpi16u; + +typedef long i32, *pi32, _NEAR *npi32, _FAR *lpi32, _FARH *hpi32; +typedef signed long i32s, *pi32s, _NEAR *npi32s, _FAR *lpi32s, _FARH *hpi32s; +typedef unsigned long i32u, *pi32u, _NEAR *npi32u, _FAR *lpi32u, _FARH *hpi32u; // = unsigned long DWORD + +typedef __int64 i64, *i64p, _NEAR *npi64, _FAR *lpi64, _FARH *hpi64; +typedef signed __int64 i64s, *pi64s, _NEAR *npi64s, _FAR *lpi64s, _FARH *hpi64s; +typedef unsigned __int64 i64u, *pi64u, _NEAR *npi64u, _FAR *lpi64u, _FARH *hpi64u; + +typedef union {i64 x; struct {i32u l; i32 h;}} i64x, *pi64x, _NEAR *npi64x, _FAR *lpi64x, _FARH *hpi64x; +typedef union {i64s x; struct {i32u l; i32s h;}} i64xs, *pi64xs, _NEAR *npi64xs, _FAR *lpi64xs, _FARH *hpi64xs; +typedef union {i64u x; struct {i32u l; i32u h;}} i64xu, *pi64xu, _NEAR *npi64xu, _FAR *lpi64xu, _FARH *hpi64xu; + +typedef struct {i64u l; i64 h;} i128, *pi128, _NEAR *npi128, _FAR *lpi128, _FARH *hpi128; +typedef struct {i64u l; i64s h;} i128s, *pi128s, _NEAR *npi128s, _FAR *lpi128s, _FARH *hpi128s; +typedef struct {i64u l; i64u h;} i128u, *pi128u, _NEAR *npi128u, _FAR *lpi128u, _FARH *hpi128u; + +// this int must be the same size of a pointer +typedef long iptr, *piptr, _NEAR *npiptr, _FAR *lpiptr, _FARH *hpiptr; +typedef signed long iptrs, *piptrs, _NEAR *npiptrs, _FAR *lpiptrs, _FARH *hpiptrs; +typedef unsigned long iptru, *piptru, _NEAR *npiptru, _FAR *lpiptru, _FARH *hpiptru; + +/* floats */ +typedef float f32, *pf32, _NEAR *npf32, _FAR *lpf32, _FARH *hpf32; +typedef double f64, *pf64p, _NEAR *npf64, _FAR *lpf64, _FARH *hpf64; +typedef struct {i64u l; i64u h;} f128, *pf128, _NEAR *npf128, _FAR *lpf128, _FARH *hpf128; + +/* size */ +#define SIZTSIZ 4 +#define SIZTMAX 0xFFFFFFFF +typedef i32u sizt, *psizt, _NEAR *npsizt, _FAR *npsizt, _FARH *hpsizt; + +/************************************************************************* + +*************************************************************************/ +// debug +#if _DEBUG +#define dbgref TX("(") TX(__FILE__) TX(":") TX(sfy(__LINE__)) TX(":") TX(__FUNCTION__) TX(")") +#else +#define dbgref 0 +#endif + +#define _ReturnAddress() (__builtin_return_address(0)) +#define ReturnAddress _ReturnAddress +#define _ReturnAddressn(x) (__builtin_return_address(x)) +#define ReturnAddressn(x) _ReturnAddressn(x) Propchange: branches/jcatena-branch/include/reactos/gnuc/i386/platf.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/jcatena-branch/include/reactos/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jan 26 12:50:40 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/jcatena-branch/include/reactos/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/jcatena-branch/include/reactos/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/jcatena-branch/include/reactos/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/jcatena-branch/include/reactos/i386/cpu.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/i386/cpu.h (added) +++ branches/jcatena-branch/include/reactos/i386/cpu.h [iso-8859-1] Tue Jan 26 12:50:40 2010 @@ -1,0 +1,192 @@ +#pragma once + +/* cpu.h + definitions for intel ia-32 cpu and cpu.lib + (c) 2010 Jose M. Catena Gomez +*/ + +#include <cpu_c.h> // compiler specific + +#pragma pack(push, 1) + +// GDT Global Descriptor Table Entry +typedef struct +{ + i16u limit0; // 0 + i16u base0; // 2 + i8u base16; // 4 + i8u type:5; // 5.0 + i8u dpl:2; // 5.5 privilege + i8u p:1; // 5.7 47 present + i8u limit16:4; // 6.0 + i8u avl:1; // 6.4 available (ros sys) + i8u siz:2; // 6.5 default size: 0=16 bits, 2=32 bits, 1=64 bits + i8u g:1; // 6.7 granularity + i8u base24; // 7 +} CPU_GDTE; // 8 bytes + +// IDT Interrupt Descriptor Table Entry +typedef struct +{ + i16u offset0; // 0 + i16u sel; // 2 + i8u rsv20; // 4 + i8u type:2; // 5.0 type: 1=task, 2=interrupt, 3=trap + i8u rsv2a:1; // 5.2 1 + i8u siz:1; // 5.3 size: 0=16, 1=32 + i8u rsv2c:1; // 5.4 0 + i8u dpl:2; // 5.5 privilege + i8u p; // 5.7 present + i16u offset16; // 6 +} CPU_IDTE; // 8 bytes + +// descriptor table reg (gdtr / idtr) +typedef struct +{ + i16u rsv00; + i16u limit; + i32u base; +} CPUR_DT; + +// eflags +typedef struct +{ + union + { + i32u f; + struct + { + i32u c:1; // 0.0 carry + i32u rsv01:1; // 0.1 1 + i32u p:1; // 0.2 parity + i32u rsv03:1; // 0.3 0 + i32u a:1; // 0.4 aux + i32u rsv05:1; // 0.5 0 + i32u z:1; // 0.6 zero + i32u s:1; // 0.7 sign + i32u trap:1; // 1.0 trap + i32u ie:1; // 1.1 interrupt enable + i32u d:1; // 1.2 direction + i32u o:1; // 1.3 overflow + i32u iopl:2; // 1.4 io privilege + i32u nt:1; // 1.6 nested task + i32u rsv0f:1; // 1.7 0 + i32u r:1; // 2.0 resume + i32u vm:1; // 2.1 virtual 8086 mode + i32u ac:1; // 2.2 alignment check + i32u vif:1; // 2.3 virtual interrupt flag + i32u vip:1; // 2.4 virtual interrupt pending + i32u id:1; // 2.5 id + i32u rsv16:10; // 2.6 0 + }; + }; +} CPUR_F; + +typedef struct +{ + i32u eax; + i32u ecx; + i32u edx; + i32u ebx; + i32u esp; + i32u ebp; + i32u esi; + i32u edi; +} CPUR_GP; + +typedef struct +{ + i16u cs; + i16u ss; + i16u ds; + i16u es; + i16u fs; + i16u gs; +} CPUR_SEG; + +typedef struct +{ + i32u cr0; + i32u cr2; // page fault linear address + i32u cr3; // cr3 page directory + i32u cr4; + i32u cr8; + CPUR_DT gdtr; // global descriptor table + CPUR_DT idtr; // interrupt descriptor table + i16u ldtr; // local descriptor table + i16u tr; // task +} CPUR_C; + +typedef struct +{ + i32u dr0; + i32u dr1; + i32u dr2; + i32u dr3; + i32u dr4; + i32u dr5; + i32u dr6; + i32u dr7; + i32u dr8; +} CPUR_DBG; + +typedef struct +{ + CPUR_F f; + CPUR_GP gp; + CPUR_SEG seg; + CPUR_C c; +} CPUR_ALL; + +// task state segment +// must be aligned to 0x80, no page boundary allowed +typedef struct _ALIGN(0x80) +{ + i16u PrevTask; // 00 + i16u rsv02; // 02 + i32u esp0; // 04 + i16u ss0; // 08 + i16u rsv0a; // 0a + i32u esp1; // 0c + i16u ss1; // 10 + i16u rsv12; // 12 + i32u esp2; // 14 + i16u ss2; // 18 + i16u rsv1e; // 1a + i32u cr3; // 1c + i32u eip; // 20 + i32u eflags; // 24 + i32u eax; // 28 + i32u ecx; // 2c + i32u edx; // 30 + i32u ebx; // 34 + i32u esp; // 38 + i32u ebp; // 3c + i32u esi; // 40 + i32u edi; // 44 + i16u es; // 48 + i16u rsv4a; // 4a + i16u cs; // 4c + i16u rsv4e; // 4e + i16u ss; // 50 + i16u rsv52; // 52 + i16u ds; // 54 + i16u rsv56; // 56 + i16u fs; // 58 + i16u rsv5a; // 5a + i16u gs; // 5c + i16u rsv5e; // 5e + i16u ldtr; // 60 + i16u rsv62; // 62 + i16u DbgTrap; // 64 + i16u IoMap; // 66 +} CPU_TSS; // 68 + +#define CPUREGSAVE_GP 1 // always saved anyway +#define CPUREGSAVE_SEG 2 +#define CPUREGSAVE_C 4 +#define CPUREGSAVE_FPU 8 // unimplemented + +#pragma pack(pop) + +void _CDECL CpuRegSave(CPUR_ALL *p, i32 flags); Propchange: branches/jcatena-branch/include/reactos/i386/cpu.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/jcatena-branch/include/reactos/i386/reactos_cfg.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/i386/reactos_cfg.h (added) +++ branches/jcatena-branch/include/reactos/i386/reactos_cfg.h [iso-8859-1] Tue Jan 26 12:50:40 2010 @@ -1,0 +1,19 @@ +#pragma once + +#define DBG 1 +// #define DBG 1 +// #define KDBG +#define _WINKD_ +// #define AUTO_ENABLE_BOCHS +// #define CONFIG_SMP + +#define __REACTOS__ + +#if defined(_M_IX86) +#define KERNEL_STACK_SIZE 0x6000 +#define KERNEL_LARGE_STACK_SIZE 0xf000 +#define KERNEL_LARGE_STACK_COMMIT 0x6000 +#endif + +#include <osver.h> +#include <platf.h> Propchange: branches/jcatena-branch/include/reactos/i386/reactos_cfg.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/jcatena-branch/include/reactos/msc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jan 26 12:50:40 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/jcatena-branch/include/reactos/msc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/jcatena-branch/include/reactos/msc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/jcatena-branch/include/reactos/msc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/jcatena-branch/include/reactos/msc/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jan 26 12:50:40 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/jcatena-branch/include/reactos/msc/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/jcatena-branch/include/reactos/msc/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/jcatena-branch/include/reactos/msc/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/jcatena-branch/include/reactos/msc/i386/cpu_c.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/msc/i386/cpu_c.h (added) +++ branches/jcatena-branch/include/reactos/msc/i386/cpu_c.h [iso-8859-1] Tue Jan 26 12:50:40 2010 @@ -1,0 +1,178 @@ +#pragma once + +// not recognized by inline assembler: +// mov eax, cr4 +#define mov_eax_cr4 _ASM _emit 0x0f _ASM _emit 0x20 _ASM _emit 0xe0 +// sysexit +#define sysexit _ASM _emit 0x0f _ASM _emit 0x35 + +#define CpuCld() __asm cld +#define CpuStd() __asm std + +void __wbinvd(void); +_INTRINSIC(__wbinvd, __wbinvd) +#define CpuWbinvd __wbinvd + +#define CpuGetGdt_m(x) _ASM sgdt x +_INLINEF void CpuGetGdt(pvoid Descriptor) {_ASM_BEGIN + mov eax, Descriptor + sgdt [eax] +_ASM_END} + +#define CpuSetGdt_m(x) _ASM lgdt x +_INLINEF void CpuSetGdt(pvoid Descriptor) {_ASM_BEGIN + mov eax, Descriptor + lgdt [eax] +_ASM_END} + +#if 1 // select implementation +void __sidt(void *x); // msc intrinsic +_INTRINSIC(__sidt, __sidt) +#define CpuGetIdt __sidt +#else +_INLINEF void CpuGetIdt(void *x) {_ASM_BEGIN + mov eax, x + sidt [eax] +_ASM_END} +#endif +#define CpuGetIdt_m(x) _ASM sidt x + +#if 1 // select implementation +void __lidt(void *x); // msc intrinic +_INTRINSIC(__lidt, __lidt) +#define CpuSetIdt __lidt +#else +_INLINEF void CpuSetIdt(void *x) {_ASM_BEGIN + mov eax, x + lidt [eax] +_ASM_END} +#endif +#define CpuSetIdt_m(x) _ASM lidt x + +_INLINEF i16u CpuGetLdt(void) {_ASM_BEGIN + sldt ax +_ASM_END} + +_INLINEF void CpuSetLdt(IN i16u x) {_ASM_BEGIN + lldt x +_ASM_END} + +_INLINEF i16u CpuGetTr(void) {_ASM_BEGIN + str ax +_ASM_END} + +_INLINEF void CpuSetTr(IN i16u x) {_ASM_BEGIN + ltr x +_ASM_END} + +_INLINEF void CpuSetCr2(i32u x) {_ASM_BEGIN + mov eax, x + mov cr2, eax +_ASM_END} + +_INLINEF i16u CpuGetSs(void) {_ASM_BEGIN + mov ax, ss +_ASM_END} + +_INLINEF void CpuSetSs(i16u x) {_ASM_BEGIN + mov ax, x + mov ss, ax +_ASM_END} + +_INLINEF i16u CpuGetFs(void) {_ASM_BEGIN + mov ax, fs +_ASM_END} + +_INLINEF void CpuSetFs(i16u x) {_ASM_BEGIN + mov ax, x + mov fs, ax +_ASM_END} + +_INLINEF i16u CpuGetDs(void) {_ASM_BEGIN + mov ax, ds +_ASM_END} + +_INLINEF void CpuSetDs(i16u x) {_ASM_BEGIN + mov ax, x + mov ds, ax +_ASM_END} + +_INLINEF i16u CpuGetEs(void) {_ASM_BEGIN + mov ax, es; +_ASM_END} + +_INLINEF void CpuSetEs(i16u x) {_ASM_BEGIN + mov ax, x + mov es, ax +_ASM_END} + +_INLINEF i16u CpuGetGs(void) {_ASM_BEGIN + mov ax, gs +_ASM_END} + +_INLINEF void CpuSetGs(i16u x) {_ASM_BEGIN + mov ax, x + mov gs, ax +_ASM_END} + +_INLINEF void CpuGetEbp(void) {_ASM_BEGIN + mov eax, ebp +_ASM_END} +#define CpuGetEbp_m(x) _ASM mov x, ebp + +_INLINEF void CpuSetEbp(i32 x) {_ASM_BEGIN + mov ebp, x +_ASM_END} + +#define CpuIret() _ASM iret + +_INLINEF void CpuTrapReturn(IN iptru Stack) {_ASM_BEGIN + mov esp, Stack + popa + ret +_ASM_END} + +// FPU +#define CpuFinit() _ASM finit +#define CpuFninit() _ASM fninit +#define CpuFnclex() _ASM fnclex +_INLINEF void CpuFstcw(void *x) {_ASM_BEGIN + mov eax, x + fstcw [eax] +_ASM_END} +#define CpuFstcw_m(x) _ASM fstcw x +_INLINEF void CpuFSetCw(i32 x) {_ASM_BEGIN + fldcw x +_ASM_END} +_INLINEF void CpuFnsave(void *x) {_ASM_BEGIN + mov eax, x + fnsave [eax] +_ASM_END} +#define CpuFnsave_m(x) _ASM fnsave x +_INLINEF void CpuFrstor(void *x) {_ASM_BEGIN + mov eax, x + frstor [eax] +_ASM_END} +#define CpuFrstor_m(x) _ASM frstor x +_INLINEF void CpuFxsave(void *x) {_ASM_BEGIN + mov eax, x + fxsave [eax] +_ASM_END} +#define CpuFxsave_m(x) _ASM fxsave x +_INLINEF void CpuFxrstor(void *x) {_ASM_BEGIN + mov eax, x + fxrstor [eax] +_ASM_END} +#define CpuFxrstor(x) _ASM fxrstor x + +#define FPU_DOUBLE(var) \ + double var; \ + _ASM fstp var \ + _ASM fwait +#define FPU_DOUBLES(var1,var2) \ + double var1,var2; \ + _ASM fstp var1 \ + _ASM fwait \ + _ASM fstp var2 \ + _ASM fwait + Propchange: branches/jcatena-branch/include/reactos/msc/i386/cpu_c.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/jcatena-branch/include/reactos/msc/i386/msc.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/msc/i386/msc.h (added) +++ branches/jcatena-branch/include/reactos/msc/i386/msc.h [iso-8859-1] Tue Jan 26 12:50:40 2010 @@ -1,0 +1,20 @@ +#pragma once + +/* msc.h + portability definitions for msc (microsof c or vc compilers) + 20091216 jcatena + This shouldn't be necessary if code uses plaf.h macros instead of hardwired compiler specific directives +*/ + +#if defined(_MSC_VER) +#if 1 +#if !defined(__cplusplus) +#define inline _INLINE +#endif + +#define __inline__ _INLINE +#define FORCEINLINE _INLINEF +#define __attribute__(packed) + +#endif +#endif // #if defined(_MSC_VER) Propchange: branches/jcatena-branch/include/reactos/msc/i386/msc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/jcatena-branch/include/reactos/msc/i386/platf.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/msc/i386/platf.h (added) +++ branches/jcatena-branch/include/reactos/msc/i386/platf.h [iso-8859-1] Tue Jan 26 12:50:40 2010 @@ -1,0 +1,203 @@ +#pragma once + +/* platf.h msvc i32 +platform dependent basic types and macros +(c) Jose M. Catena Gomez, diwaves.com +*/ + +/* this must produce a compiler error */ +#define _ERR_UNSUPPORTED #error + +/* attribues */ +#define _CDECL __cdecl +#define _THISCALL __thiscall +#define _STDCALL __stdcall +#define _FASTCALL __fastcall +#define _CLRCALL __clrcall +#define _INLINE __inline +#define _INLINEF __forceinline +#define _NAKED __declspec(naked) +#define _INTERRUPT _ERR_UNSUPPORTED +#define _SAVEREGS _ERR_UNSUPPORTED +#define _LOADDS _ERR_UNSUPPORTED +#define _DLLEXPORT __declspec(dllexport) +#define _DLLIMPORT __declspec(dllimport) +#define _ALIGN(x) __declspec(align(x)) + +#define _PACKN(x) __pragma(pack(push, x)) +#define _PACK_POP __pragma(pack(pop)) +#define _RESTRICT __restrict +#define _ONCE __pragma(once) +#define _OPTIMIZE_DFT __pragma(optimize("", on)) +#define _OPTIMIZE_OFF_ALL __pragma(optimize("", off)) +#define _OPTIMIZE_OFF_GLOBAL __pragma(optimize("g", off)) +#define _OPTIMIZE_OFF_STKF __pragma(optimize("y", off)) +#define _INTRINSIC(x, subst) __pragma(intrinsic(x)) +#define _NOINTRINSIC(x) __pragma(function(x)) +#define _NOWARN_PUSH __pragma(warning(push)) +#define _NOWARN_POP __pragma(warning(pop)) +#define _NOWARN_MSC(x) __pragma(warning(disable: x)) +#define _NOWARN_GNUC(x) + +#define _SECTION(x) __declspec(allocate(x)) +#define _SECTION_FN(sectn, fn) __pragma(alloc_text(sectn, fn)) +#define _SECTION_FND(sectn) +#define _SECTION_CODE(x) __pragma(code_seg(push, x)) +#define _SECTION_CODE_END __pragma(code_seg(pop)) +#define _SECTION_DATA(x) __pragma(data_seg(push, x)) +#define _SECTION_DATA_END __pragma(data_seg(pop)) +#define _SECTION_BSS(x) __pragma(bss_seg(push, x)) +#define _SECTION_BSS_END __pragma(bss_seg(pop)) +#define _SECTION_CONST(x) __pragma(const_seg(push, x)) +#define _SECTION_CONST_END __pragma(const_seg(pop)) + +#define _ASM_BEGIN __asm { +#define _ASM_END } +#define _ASM __asm + +#define IN +#define OUT + +/* ptr size */ +#define PTRSIZ 4 +#define PTRSIZMIN 4 +#define PTRSIZMAX 4 +#define _NEAR +#define _FAR +#define _FARH +#define _BASED +#define _BASED1 __based +#define _SEGMENT _UNSUPPORTED +#define _SEGNAME _UNSUPPORTED + +/************************************************************************* +basic types +*************************************************************************/ +typedef void *pvoid, _NEAR *npvoid, _FAR *lpvoid, _FARH *hpvoid; + +/* chars */ +#define CHRSIZMIN 1 +#define CHRSIZMAX 2 +#define CHRSIZ 1 +#define CHRWSIZ 2 +#define CHRXSIZ 2 +#define CHRSIGN 1 +#define CHRWSIGN 0 + +typedef char chr8, *pchr8p, _NEAR *npchr8, _FAR *lpchr8, _FARH *hpchr8; +typedef signed char chr8s, *pchr8s, _NEAR *npchr8s, _FAR *lpchr8s, _FARH *hpchr8s; +typedef unsigned char chr8u, *pchr8u, _NEAR *npchr8u, _FAR *lpchr8u, _FARH *hpchr8u; + +/* chars unicode 16 bits */ +#ifdef _NATIVE_WCHAR_T_DEFINED +typedef wchar_t chr16; +typedef signed short chr16s; +typedef unsigned short chr16u; +#else +typedef unsigned short chr16; +typedef signed short chr16s; +typedef unsigned short chr16u; +#endif + +typedef chr16 *pchr16, _NEAR *npchr16, _FAR *lpchr16, _FARH *hpchr16; +typedef chr16s *pchr16s, _NEAR *npchr16s, _FAR *lpchr16s, _FARH *hpchr16s; +typedef chr16u *pchr16u, _NEAR *npchr16u, _FAR *lpchr16u, _FARH *hpchr16u; + +#ifdef _UNICODE +typedef chr16 chr; +typedef chr16s chrs; +typedef chr16u chru; +#else +typedef chr8 chr; +typedef chr8s chrs; +typedef chr8u chru; +#endif + +typedef chr *pchr, _NEAR *npchr, _FAR *lpchr, _FARH hpchr; +typedef chrs *pchrs, _NEAR *npchrs, _FAR *lpchrs, _FARH hpchrs; +typedef chru *pchru, _NEAR *npchru, _FAR *lpchru, _FARH hpchru; + +// string literal macros +// double definitions here are necessary because preprocessor behavior +#define _T16(x) L ## x +#define T16(x) _T16(x) +#define _T8(x) x +#define T8(x) _T8(x) +#ifdef _UNICODE +#define TX(x) _T16(x) +#else +#define TX(x) _T8(x) +#endif +// stringfy +#define _sfy(x) #x +#define sfy(x) _sfy(x) + +/* integers */ +#define INTSIZMIN 1 +#define INTSIZMAX 8 +#define INTSIZ 4 +#define INTSMIN -2147483648 +#define INTSMAX 0x7FFFFFFF + +typedef int *pint, _NEAR *npint, _FAR *lpint, _FARH *hpint; +typedef signed int ints, *pints, _NEAR *npints, _FAR *lpints, _FARH *hpints; +typedef unsigned int intu, *pintu, _NEAR *npintu, _FAR *lpintu, _FARH *hpintu; + +typedef __int8 i8, *pi8, _NEAR *npi8, _FAR *lpi8, _FARH *hpi8; +typedef signed __int8 i8s, *pi8s, _NEAR *npi8s, _FAR *lpi8s, _FARH *hpi8s; +typedef unsigned __int8 i8u, *pi8u, _NEAR *npi8u, _FAR *lpi8u, _FARH *hpi8u; + +typedef short i16, *pi16, _NEAR *npi16, _FAR *lpi16, _FARH *hpi16; +typedef signed short i16s, *pi16s, _NEAR *npi16s, _FAR *lpi16s, _FARH *hpi16s; +typedef unsigned short i16u, *pi16u, _NEAR *npi16u, _FAR *lpi16u, _FARH *hpi16u; + +typedef long i32, *pi32, _NEAR *npi32, _FAR *lpi32, _FARH *hpi32; +typedef signed long i32s, *pi32s, _NEAR *npi32s, _FAR *lpi32s, _FARH *hpi32s; +typedef unsigned long i32u, *pi32u, _NEAR *npi32u, _FAR *lpi32u, _FARH *hpi32u; // = unsigned long DWORD + +typedef __int64 i64, *i64p, _NEAR *npi64, _FAR *lpi64, _FARH *hpi64; +typedef signed __int64 i64s, *pi64s, _NEAR *npi64s, _FAR *lpi64s, _FARH *hpi64s; +typedef unsigned __int64 i64u, *pi64u, _NEAR *npi64u, _FAR *lpi64u, _FARH *hpi64u; + +typedef union {i64 x; struct {i32u l; i32 h;};} i64x, *pi64x, _NEAR *npi64x, _FAR *lpi64x, _FARH *hpi64x; +typedef union {i64s x; struct {i32u l; i32s h;};} i64xs, *pi64xs, _NEAR *npi64xs, _FAR *lpi64xs, _FARH *hpi64xs; +typedef union {i64u x; struct {i32u l; i32u h;};} i64xu, *pi64xu, _NEAR *npi64xu, _FAR *lpi64xu, _FARH *hpi64xu; + +typedef struct {i64u l; i64 h;} i128, *pi128, _NEAR *npi128, _FAR *lpi128, _FARH *hpi128; +typedef struct {i64u l; i64s h;} i128s, *pi128s, _NEAR *npi128s, _FAR *lpi128s, _FARH *hpi128s; +typedef struct {i64u l; i64u h;} i128u, *pi128u, _NEAR *npi128u, _FAR *lpi128u, _FARH *hpi128u; + +// this int must be the same size of a pointer +typedef long iptr, *piptr, _NEAR *npiptr, _FAR *lpiptr, _FARH *hpiptr; +typedef signed long iptrs, *piptrs, _NEAR *npiptrs, _FAR *lpiptrs, _FARH *hpiptrs; +typedef unsigned long iptru, *piptru, _NEAR *npiptru, _FAR *lpiptru, _FARH *hpiptru; + +/* floats */ +typedef float f32, *pf32, _NEAR *npf32, _FAR *lpf32, _FARH *hpf32; +typedef double f64, *pf64p, _NEAR *npf64, _FAR *lpf64, _FARH *hpf64; +typedef struct {i64u l; i64u h;} f128, *pf128, _NEAR *npf128, _FAR *lpf128, _FARH *hpf128; + +/* size */ +#define SIZTSIZ 4 +#define SIZTMAX 0xFFFFFFFF +typedef i32u sizt, *psizt, _NEAR *npsizt, _FAR *lpsizt, _FARH *hpsizt; + +/************************************************************************* + +*************************************************************************/ +// debug +#if _DEBUG +#define dbgref TX("(") TX(__FILE__) TX(":") TX(sfy(__LINE__)) TX(":") TX(__FUNCTION__) TX(")") +#else +#define dbgref 0 +#endif + +pvoid _ReturnAddress(void); +#pragma intrinsic(_ReturnAddress) +#define ReturnAddress _ReturnAddress +#define _ReturnAddressn(x) _ReturnAddress() +#define ReturnAddressn _ReturnAddressn +#define __builtin_expect(x, v) (x) + +#include <msc.h> // additional compatibility defs that would not be needed if code uses macros defined here instead of compiler specific directives + Propchange: branches/jcatena-branch/include/reactos/msc/i386/platf.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/jcatena-branch/include/reactos/osver.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… ============================================================================== --- branches/jcatena-branch/include/reactos/osver.h (added) +++ branches/jcatena-branch/include/reactos/osver.h [iso-8859-1] Tue Jan 26 12:50:40 2010 @@ -1,0 +1,26 @@ +#pragma once + +// minimum supported platforms +// see sdkddkver.h + +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0502 +#endif + +// wdk +// LATEST_NTDDI_VERSION +#ifndef NTDDI_VERSION +#define NTDDI_VERSION 0x05020000 +#endif + +#ifndef _WIN32_IE +#define _WIN32_IE 0x600 +#endif + +#ifndef WINVER +#define WINVER _WIN32_WINNT +#endif + +#ifndef _WIN32_WINDOWS +#define _WIN32_WINDOWS _WIN32_WINNT +#endif Propchange: branches/jcatena-branch/include/reactos/osver.h ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 7 months

[jcatena] 45263: [reactos] merge from trunk 45257

by jcatena＠svn.reactos.org

Author: jcatena Date: Tue Jan 26 12:08:46 2010 New Revision: 45263 URL: http://svn.reactos.org/svn/reactos?rev=45263&view=rev Log: [reactos] merge from trunk 45257 Added: branches/jcatena-branch/base/applications/dxdiag/lang/ua-UA.rc - copied unchanged from r45258, trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc branches/jcatena-branch/base/applications/dxdiag/rsrc.aps (with props) branches/jcatena-branch/base/applications/games/spider/lang/uk-UA.rc - copied unchanged from r45258, trunk/reactos/base/applications/games/spider/lang/uk-UA.rc branches/jcatena-branch/base/applications/rapps/rapps/remood.txt - copied unchanged from r45258, trunk/reactos/base/applications/rapps/rapps/remood.txt branches/jcatena-branch/base/applications/sndrec32/lang/uk-UA.rc - copied unchanged from r45258, trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc branches/jcatena-branch/base/system/runonce/lang/uk-UA.rc - copied unchanged from r45258, trunk/reactos/base/system/runonce/lang/uk-UA.rc branches/jcatena-branch/dll/directx/quartz/quartz_strmif.idl - copied unchanged from r45258, trunk/reactos/dll/directx/quartz/quartz_strmif.idl branches/jcatena-branch/dll/directx/wine/d3dx9_42/ (props changed) - copied from r45258, trunk/reactos/dll/directx/wine/d3dx9_42/ branches/jcatena-branch/dll/win32/mshtml/htmlform.c - copied unchanged from r45258, trunk/reactos/dll/win32/mshtml/htmlform.c branches/jcatena-branch/dll/win32/mshtml/htmlscreen.c - copied unchanged from r45258, trunk/reactos/dll/win32/mshtml/htmlscreen.c branches/jcatena-branch/dll/win32/shimgvw/lang/uk-UA.rc - copied unchanged from r45258, trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc branches/jcatena-branch/drivers/network/tcpip/include/tags.h - copied unchanged from r45258, trunk/reactos/drivers/network/tcpip/include/tags.h branches/jcatena-branch/hal/hal.pspec - copied unchanged from r45258, trunk/reactos/hal/hal.pspec branches/jcatena-branch/hal/halx86/directory.rbuild - copied unchanged from r45258, trunk/reactos/hal/halx86/directory.rbuild branches/jcatena-branch/hal/halx86/generic/pic.c - copied unchanged from r45258, trunk/reactos/hal/halx86/generic/pic.c branches/jcatena-branch/hal/halx86/hal.rbuild - copied unchanged from r45258, trunk/reactos/hal/halx86/hal.rbuild branches/jcatena-branch/hal/halx86/hal_generic_mp.rbuild - copied unchanged from r45258, trunk/reactos/hal/halx86/hal_generic_mp.rbuild branches/jcatena-branch/hal/halx86/halamd64.rbuild - copied unchanged from r45258, trunk/reactos/hal/halx86/halamd64.rbuild branches/jcatena-branch/hal/halx86/halmps.rbuild - copied unchanged from r45258, trunk/reactos/hal/halx86/halmps.rbuild branches/jcatena-branch/include/psdk/commoncontrols.idl - copied unchanged from r45258, trunk/reactos/include/psdk/commoncontrols.idl branches/jcatena-branch/lib/tdilib/ - copied from r45258, trunk/reactos/lib/tdilib/ branches/jcatena-branch/ntoskrnl/include/internal/spinlock.h - copied unchanged from r45258, trunk/reactos/ntoskrnl/include/internal/spinlock.h branches/jcatena-branch/ntoskrnl/ke/i386/context.c - copied unchanged from r45258, trunk/reactos/ntoskrnl/ke/i386/context.c branches/jcatena-branch/ntoskrnl/ke/time.c - copied unchanged from r45258, trunk/reactos/ntoskrnl/ke/time.c Removed: branches/jcatena-branch/drivers/network/tcpip/include/irp.h branches/jcatena-branch/drivers/network/tcpip/include/memtrack.h branches/jcatena-branch/drivers/network/tcpip/recmutex/ branches/jcatena-branch/drivers/network/tcpip/tcpip/irp.c branches/jcatena-branch/hal/hal/ branches/jcatena-branch/hal/halamd64/ branches/jcatena-branch/hal/halx86/hal_generic_amd64.rbuild branches/jcatena-branch/hal/halx86/hal_generic_pc.rbuild branches/jcatena-branch/hal/halx86/halmp.rbuild branches/jcatena-branch/hal/halx86/halup.rbuild branches/jcatena-branch/lib/drivers/ip/network/memtrack.c branches/jcatena-branch/lib/drivers/oskittcp/include/memtrack.h branches/jcatena-branch/ntoskrnl/ke/arm/time.c branches/jcatena-branch/ntoskrnl/ke/i386/boot.S branches/jcatena-branch/ntoskrnl/ke/i386/systimer.S Modified: branches/jcatena-branch/ (props changed) branches/jcatena-branch/base/applications/charmap/lang/uk-UA.rc branches/jcatena-branch/base/applications/dxdiag/rsrc.rc branches/jcatena-branch/base/applications/games/solitaire/lang/uk-UA.rc branches/jcatena-branch/base/applications/games/spider/lang/ru-RU.rc branches/jcatena-branch/base/applications/games/spider/rsrc.rc branches/jcatena-branch/base/applications/games/spider/spigame.cpp branches/jcatena-branch/base/applications/games/winemine/lang/uk-UA.rc branches/jcatena-branch/base/applications/mscutils/devmgmt/lang/uk-UA.rc branches/jcatena-branch/base/applications/mscutils/servman/lang/uk-UA.rc branches/jcatena-branch/base/applications/network/ping/ping.c branches/jcatena-branch/base/applications/network/tracert/tracert.c branches/jcatena-branch/base/applications/network/tracert/tracert.h branches/jcatena-branch/base/applications/notepad/lang/uk-UA.rc branches/jcatena-branch/base/applications/paint/globalvar.h branches/jcatena-branch/base/applications/paint/lang/uk-UA.rc branches/jcatena-branch/base/applications/paint/main.c branches/jcatena-branch/base/applications/paint/mouse.c branches/jcatena-branch/base/applications/paint/selection.c branches/jcatena-branch/base/applications/paint/winproc.c branches/jcatena-branch/base/applications/rapps/lang/en-US.rc branches/jcatena-branch/base/applications/rapps/lang/uk-UA.rc branches/jcatena-branch/base/applications/rapps/rapps/7zip.txt branches/jcatena-branch/base/applications/rapps/rapps/abiword.txt branches/jcatena-branch/base/applications/rapps/rapps/abyss.txt branches/jcatena-branch/base/applications/rapps/rapps/ac97forvirtualbox.txt branches/jcatena-branch/base/applications/rapps/rapps/audiograbber.txt branches/jcatena-branch/base/applications/rapps/rapps/diablo2.txt branches/jcatena-branch/base/applications/rapps/rapps/dosblaster.txt branches/jcatena-branch/base/applications/rapps/rapps/dosbox.txt branches/jcatena-branch/base/applications/rapps/rapps/firefox2.txt branches/jcatena-branch/base/applications/rapps/rapps/firefox3.txt branches/jcatena-branch/base/applications/rapps/rapps/freebasic.txt branches/jcatena-branch/base/applications/rapps/rapps/glidewrapzbag.txt branches/jcatena-branch/base/applications/rapps/rapps/irfanview.txt branches/jcatena-branch/base/applications/rapps/rapps/irfanviewplugins.txt branches/jcatena-branch/base/applications/rapps/rapps/lbreakout2.txt branches/jcatena-branch/base/applications/rapps/rapps/lgeneral.txt branches/jcatena-branch/base/applications/rapps/rapps/lmarbles.txt branches/jcatena-branch/base/applications/rapps/rapps/mfc40.txt branches/jcatena-branch/base/applications/rapps/rapps/mingw.txt branches/jcatena-branch/base/applications/rapps/rapps/mirandaim.txt branches/jcatena-branch/base/applications/rapps/rapps/mirc.txt branches/jcatena-branch/base/applications/rapps/rapps/msxml3.txt branches/jcatena-branch/base/applications/rapps/rapps/offbyone.txt branches/jcatena-branch/base/applications/rapps/rapps/openoffice2.4.txt branches/jcatena-branch/base/applications/rapps/rapps/openoffice3.0.txt branches/jcatena-branch/base/applications/rapps/rapps/openttd.txt branches/jcatena-branch/base/applications/rapps/rapps/opera.txt branches/jcatena-branch/base/applications/rapps/rapps/putty.txt branches/jcatena-branch/base/applications/rapps/rapps/rosbe.txt branches/jcatena-branch/base/applications/rapps/rapps/sambatng.txt branches/jcatena-branch/base/applications/rapps/rapps/scite.txt branches/jcatena-branch/base/applications/rapps/rapps/scummvm.txt branches/jcatena-branch/base/applications/rapps/rapps/sdl_mixer.txt branches/jcatena-branch/base/applications/rapps/rapps/sdl_runtime.txt branches/jcatena-branch/base/applications/rapps/rapps/seamonkey.txt branches/jcatena-branch/base/applications/rapps/rapps/smplayer.txt branches/jcatena-branch/base/applications/rapps/rapps/thunderbird.txt branches/jcatena-branch/base/applications/rapps/rapps/tileworld.txt branches/jcatena-branch/base/applications/rapps/rapps/tuxpaint.txt branches/jcatena-branch/base/applications/rapps/rapps/ultravnc.txt branches/jcatena-branch/base/applications/rapps/rapps/utorrent.txt branches/jcatena-branch/base/applications/rapps/rapps/vb5run.txt branches/jcatena-branch/base/applications/rapps/rapps/vb6run.txt branches/jcatena-branch/base/applications/rapps/rapps/vc2005run.txt branches/jcatena-branch/base/applications/rapps/rapps/vc2005sp1run.txt branches/jcatena-branch/base/applications/rapps/rapps/vc2008run.txt branches/jcatena-branch/base/applications/rapps/rapps/vc6run.txt branches/jcatena-branch/base/applications/rapps/rapps/vlc.txt branches/jcatena-branch/base/applications/rapps/rapps/winboard.txt branches/jcatena-branch/base/applications/regedit/lang/uk-UA.rc branches/jcatena-branch/base/applications/sndrec32/rsrc.rc branches/jcatena-branch/base/applications/sndvol32/lang/uk-UA.rc branches/jcatena-branch/base/applications/taskmgr/lang/uk-UA.rc branches/jcatena-branch/base/services/eventlog/rpc.c branches/jcatena-branch/base/services/umpnpmgr/umpnpmgr.c branches/jcatena-branch/base/setup/reactos/lang/de-DE.rc branches/jcatena-branch/base/setup/reactos/lang/en-US.rc branches/jcatena-branch/base/setup/reactos/lang/uk-UA.rc branches/jcatena-branch/base/setup/reactos/reactos.c branches/jcatena-branch/base/setup/usetup/lang/uk-UA.h branches/jcatena-branch/base/shell/explorer-new/lang/uk-UA.rc branches/jcatena-branch/base/system/runonce/rsrc.rc branches/jcatena-branch/boot/bootdata/hivesys_i386.inf branches/jcatena-branch/boot/freeldr/fdebug/lang/uk-UA.rc branches/jcatena-branch/boot/freeldr/freeldr/arch/i386/loader.c branches/jcatena-branch/boot/freeldr/freeldr/include/reactos.h branches/jcatena-branch/dll/3rdparty/mesa32/mesa32.rbuild branches/jcatena-branch/dll/cpl/desk/lang/uk-UA.rc branches/jcatena-branch/dll/cpl/input/lang/uk-UA.rc branches/jcatena-branch/dll/cpl/sysdm/lang/ru-RU.rc branches/jcatena-branch/dll/cpl/sysdm/lang/uk-UA.rc branches/jcatena-branch/dll/directx/d3d8/d3d8.spec (props changed) branches/jcatena-branch/dll/directx/dsound_new/classfactory.c (props changed) branches/jcatena-branch/dll/directx/dsound_new/dsound.spec (props changed) branches/jcatena-branch/dll/directx/dsound_new/regsvr.c (props changed) branches/jcatena-branch/dll/directx/quartz/filtergraph.c branches/jcatena-branch/dll/directx/quartz/main.c branches/jcatena-branch/dll/directx/quartz/mpegsplit.c branches/jcatena-branch/dll/directx/quartz/nullrenderer.c branches/jcatena-branch/dll/directx/quartz/quartz.rbuild branches/jcatena-branch/dll/directx/quartz/regsvr.c branches/jcatena-branch/dll/directx/wine/d3dx9_36/d3dx9_36.spec branches/jcatena-branch/dll/directx/wine/d3dx9_36/d3dx9_36_private.h branches/jcatena-branch/dll/directx/wine/d3dx9_36/mesh.c branches/jcatena-branch/dll/directx/wine/d3dx9_36/shader.c branches/jcatena-branch/dll/directx/wine/d3dx9_36/surface.c branches/jcatena-branch/dll/directx/wine/d3dx9_36/util.c branches/jcatena-branch/dll/directx/wine/wine.rbuild branches/jcatena-branch/dll/shellext/devcpux/devcpux.spec (props changed) branches/jcatena-branch/dll/shellext/slayer/slayer.spec (props changed) branches/jcatena-branch/dll/win32/advapi32/service/eventlog.c branches/jcatena-branch/dll/win32/advpack/files.c branches/jcatena-branch/dll/win32/devmgr/advprop.c branches/jcatena-branch/dll/win32/gdi32/misc/misc.c branches/jcatena-branch/dll/win32/iphlpapi/ifenum_reactos.c branches/jcatena-branch/dll/win32/iphlpapi/iphlpapi.rbuild branches/jcatena-branch/dll/win32/iphlpapi/iphlpapi_private.h branches/jcatena-branch/dll/win32/msafd/misc/dllmain.c branches/jcatena-branch/dll/win32/msafd/misc/stubs.c branches/jcatena-branch/dll/win32/msgina/lang/uk-UA.rc branches/jcatena-branch/dll/win32/mshtml/De.rc branches/jcatena-branch/dll/win32/mshtml/Lt.rc branches/jcatena-branch/dll/win32/mshtml/Ru.rc branches/jcatena-branch/dll/win32/mshtml/Sv.rc branches/jcatena-branch/dll/win32/mshtml/conpoint.c branches/jcatena-branch/dll/win32/mshtml/dispex.c branches/jcatena-branch/dll/win32/mshtml/htmlanchor.c branches/jcatena-branch/dll/win32/mshtml/htmlbody.c branches/jcatena-branch/dll/win32/mshtml/htmldoc.c branches/jcatena-branch/dll/win32/mshtml/htmldoc3.c branches/jcatena-branch/dll/win32/mshtml/htmlelem.c branches/jcatena-branch/dll/win32/mshtml/htmlelem2.c branches/jcatena-branch/dll/win32/mshtml/htmlelemcol.c branches/jcatena-branch/dll/win32/mshtml/htmlevent.c branches/jcatena-branch/dll/win32/mshtml/htmlevent.h branches/jcatena-branch/dll/win32/mshtml/htmlframebase.c branches/jcatena-branch/dll/win32/mshtml/htmliframe.c branches/jcatena-branch/dll/win32/mshtml/htmlimg.c branches/jcatena-branch/dll/win32/mshtml/htmllocation.c branches/jcatena-branch/dll/win32/mshtml/htmlscript.c branches/jcatena-branch/dll/win32/mshtml/htmlstyle.c branches/jcatena-branch/dll/win32/mshtml/htmlstyle.h branches/jcatena-branch/dll/win32/mshtml/htmlstyle2.c branches/jcatena-branch/dll/win32/mshtml/htmlstyle3.c branches/jcatena-branch/dll/win32/mshtml/htmltable.c branches/jcatena-branch/dll/win32/mshtml/htmltextcont.c branches/jcatena-branch/dll/win32/mshtml/htmltextnode.c branches/jcatena-branch/dll/win32/mshtml/htmlwindow.c branches/jcatena-branch/dll/win32/mshtml/install.c branches/jcatena-branch/dll/win32/mshtml/main.c branches/jcatena-branch/dll/win32/mshtml/mshtml.rbuild branches/jcatena-branch/dll/win32/mshtml/mshtml_private.h branches/jcatena-branch/dll/win32/mshtml/mutation.c branches/jcatena-branch/dll/win32/mshtml/navigate.c branches/jcatena-branch/dll/win32/mshtml/nsembed.c branches/jcatena-branch/dll/win32/mshtml/nsevents.c branches/jcatena-branch/dll/win32/mshtml/nsiface.idl branches/jcatena-branch/dll/win32/mshtml/nsio.c branches/jcatena-branch/dll/win32/mshtml/oleobj.c branches/jcatena-branch/dll/win32/mshtml/persist.c branches/jcatena-branch/dll/win32/mshtml/script.c branches/jcatena-branch/dll/win32/mshtml/secmgr.c branches/jcatena-branch/dll/win32/mshtml/service.c branches/jcatena-branch/dll/win32/mshtml/task.c branches/jcatena-branch/dll/win32/mshtml/txtrange.c branches/jcatena-branch/dll/win32/mshtml/view.c branches/jcatena-branch/dll/win32/msxml3/main.c branches/jcatena-branch/dll/win32/msxml3/node.c branches/jcatena-branch/dll/win32/netid/lang/de-DE.rc branches/jcatena-branch/dll/win32/setupapi/cfgmgr.c branches/jcatena-branch/dll/win32/setupapi/setupapi.spec branches/jcatena-branch/dll/win32/shimgvw/rsrc.rc branches/jcatena-branch/dll/win32/user32/include/user32p.h branches/jcatena-branch/dll/win32/user32/misc/misc.c branches/jcatena-branch/dll/win32/user32/windows/defwnd.c branches/jcatena-branch/dll/win32/user32/windows/input.c branches/jcatena-branch/dll/win32/user32/windows/mdi.c branches/jcatena-branch/dll/win32/wdmaud.drv/wdmaud.rbuild branches/jcatena-branch/dll/win32/windowscodecs/bmpencode.c branches/jcatena-branch/dll/win32/windowscodecs/clsfactory.c branches/jcatena-branch/dll/win32/windowscodecs/pngformat.c branches/jcatena-branch/dll/win32/windowscodecs/regsvr.c branches/jcatena-branch/dll/win32/windowscodecs/ungif.c branches/jcatena-branch/dll/win32/windowscodecs/wincodecs_private.h branches/jcatena-branch/dll/win32/wshirda/wshirda.c branches/jcatena-branch/dll/win32/wshtcpip/wshtcpip.c branches/jcatena-branch/dll/win32/wshtcpip/wshtcpip.h branches/jcatena-branch/dll/win32/wshtcpip/wshtcpip.rbuild branches/jcatena-branch/drivers/network/afd/afd/bind.c branches/jcatena-branch/drivers/network/afd/afd/connect.c branches/jcatena-branch/drivers/network/afd/afd/listen.c branches/jcatena-branch/drivers/network/afd/afd/lock.c branches/jcatena-branch/drivers/network/afd/afd/main.c branches/jcatena-branch/drivers/network/afd/afd/read.c branches/jcatena-branch/drivers/network/afd/afd/tdi.c branches/jcatena-branch/drivers/network/afd/afd/write.c branches/jcatena-branch/drivers/network/afd/include/afd.h branches/jcatena-branch/drivers/network/afd/include/debug.h branches/jcatena-branch/drivers/network/afd/include/tdi_proto.h branches/jcatena-branch/drivers/network/dd/ne2000/ne2000/main.c branches/jcatena-branch/drivers/network/dd/pcnet/pcnet.c branches/jcatena-branch/drivers/network/dd/pcnet/requests.c branches/jcatena-branch/drivers/network/tcpip/datalink/lan.c branches/jcatena-branch/drivers/network/tcpip/include/address.h branches/jcatena-branch/drivers/network/tcpip/include/datagram.h branches/jcatena-branch/drivers/network/tcpip/include/debug.h branches/jcatena-branch/drivers/network/tcpip/include/dispatch.h branches/jcatena-branch/drivers/network/tcpip/include/fileobjs.h branches/jcatena-branch/drivers/network/tcpip/include/ip.h branches/jcatena-branch/drivers/network/tcpip/include/lock.h branches/jcatena-branch/drivers/network/tcpip/include/neighbor.h branches/jcatena-branch/drivers/network/tcpip/include/ports.h branches/jcatena-branch/drivers/network/tcpip/include/precomp.h branches/jcatena-branch/drivers/network/tcpip/include/routines.h branches/jcatena-branch/drivers/network/tcpip/include/tcp.h branches/jcatena-branch/drivers/network/tcpip/include/titypes.h branches/jcatena-branch/drivers/network/tcpip/tcpip.rbuild branches/jcatena-branch/drivers/network/tcpip/tcpip/ainfo.c branches/jcatena-branch/drivers/network/tcpip/tcpip/buffer.c branches/jcatena-branch/drivers/network/tcpip/tcpip/dispatch.c branches/jcatena-branch/drivers/network/tcpip/tcpip/fileobjs.c branches/jcatena-branch/drivers/network/tcpip/tcpip/iinfo.c branches/jcatena-branch/drivers/network/tcpip/tcpip/info.c branches/jcatena-branch/drivers/network/tcpip/tcpip/lock.c branches/jcatena-branch/drivers/network/tcpip/tcpip/main.c branches/jcatena-branch/drivers/network/tcpip/tcpip/mocklock.c branches/jcatena-branch/drivers/network/tcpip/tcpip/ninfo.c branches/jcatena-branch/hal/hal.rbuild branches/jcatena-branch/hal/halarm/up/halup.rbuild branches/jcatena-branch/hal/halppc/up/halup.rbuild branches/jcatena-branch/hal/halx86/generic/cmos.c branches/jcatena-branch/hal/halx86/generic/halinit.c branches/jcatena-branch/hal/halx86/generic/irq.S branches/jcatena-branch/hal/halx86/generic/spinlock.c branches/jcatena-branch/hal/halx86/generic/systimer.S branches/jcatena-branch/hal/halx86/hal_generic.rbuild branches/jcatena-branch/hal/halx86/hal_generic_up.rbuild branches/jcatena-branch/hal/halx86/halxbox.rbuild branches/jcatena-branch/hal/halx86/include/halp.h branches/jcatena-branch/hal/halx86/mp/apic.c branches/jcatena-branch/hal/halx86/mp/halinit_mp.c branches/jcatena-branch/hal/halx86/mp/ioapic.c branches/jcatena-branch/hal/halx86/mp/mpconfig.c branches/jcatena-branch/hal/halx86/mp/mps.S branches/jcatena-branch/hal/halx86/mp/mpsboot.asm branches/jcatena-branch/hal/halx86/mp/mpsirql.c branches/jcatena-branch/hal/halx86/mp/spinlock.c branches/jcatena-branch/include/ddk/cfgmgr32.h branches/jcatena-branch/include/dxsdk/axextend.idl branches/jcatena-branch/include/dxsdk/d3dx9shader.h branches/jcatena-branch/include/ndk/amd64/ (props changed) branches/jcatena-branch/include/ndk/amd64/asmmacro.S (props changed) branches/jcatena-branch/include/ndk/halfuncs.h branches/jcatena-branch/include/ndk/i386/ketypes.h branches/jcatena-branch/include/ndk/kefuncs.h branches/jcatena-branch/include/psdk/commctrl.h branches/jcatena-branch/include/psdk/mshtmdid.h branches/jcatena-branch/include/psdk/mshtml.idl branches/jcatena-branch/include/psdk/psdk.rbuild branches/jcatena-branch/include/psdk/tcpioctl.h branches/jcatena-branch/include/psdk/wincodec.idl branches/jcatena-branch/include/psdk/winuser.h branches/jcatena-branch/include/psdk/wsahelp.h branches/jcatena-branch/include/reactos/idl/pnp.idl branches/jcatena-branch/include/reactos/rosldr.h branches/jcatena-branch/include/reactos/win32k/ntuser.h branches/jcatena-branch/include/reactos/wine/cfgmgr32.h branches/jcatena-branch/lib/drivers/ip/ip.rbuild branches/jcatena-branch/lib/drivers/ip/network/address.c branches/jcatena-branch/lib/drivers/ip/network/icmp.c branches/jcatena-branch/lib/drivers/ip/network/ip.c branches/jcatena-branch/lib/drivers/ip/network/loopback.c branches/jcatena-branch/lib/drivers/ip/network/neighbor.c branches/jcatena-branch/lib/drivers/ip/network/ports.c branches/jcatena-branch/lib/drivers/ip/network/receive.c branches/jcatena-branch/lib/drivers/ip/network/router.c branches/jcatena-branch/lib/drivers/ip/network/routines.c branches/jcatena-branch/lib/drivers/ip/network/transmit.c branches/jcatena-branch/lib/drivers/ip/transport/datagram/datagram.c branches/jcatena-branch/lib/drivers/ip/transport/rawip/rawip.c branches/jcatena-branch/lib/drivers/ip/transport/tcp/accept.c branches/jcatena-branch/lib/drivers/ip/transport/tcp/event.c branches/jcatena-branch/lib/drivers/ip/transport/tcp/if.c branches/jcatena-branch/lib/drivers/ip/transport/tcp/tcp.c branches/jcatena-branch/lib/drivers/ip/transport/udp/udp.c branches/jcatena-branch/lib/drivers/oskittcp/include/oskittcp.h branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/interface.c branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/ip_output.c branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/sleep.c branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/tcp_input.c branches/jcatena-branch/lib/lib.rbuild branches/jcatena-branch/lib/rtl/bitmap.c branches/jcatena-branch/lib/rtl/sprintf.c branches/jcatena-branch/lib/rtl/swprintf.c branches/jcatena-branch/lib/sdk/crt/math/i386/allmul_asm.s branches/jcatena-branch/lib/sdk/crt/math/i386/aulldvrm_asm.s branches/jcatena-branch/lib/sdk/crt/mbstring/mbscspn.c branches/jcatena-branch/lib/sdk/crt/mbstring/mbsspn.c branches/jcatena-branch/lib/sdk/crt/mbstring/mbsspnp.c branches/jcatena-branch/lib/sdk/crt/time/ (props changed) branches/jcatena-branch/lib/sdk/uuid/uuid.c branches/jcatena-branch/ntoskrnl/cc/copy.c branches/jcatena-branch/ntoskrnl/config/cminit.c branches/jcatena-branch/ntoskrnl/config/cmkcbncb.c branches/jcatena-branch/ntoskrnl/config/cmsysini.c branches/jcatena-branch/ntoskrnl/config/cmwraprs.c branches/jcatena-branch/ntoskrnl/ex/event.c branches/jcatena-branch/ntoskrnl/ex/handle.c branches/jcatena-branch/ntoskrnl/ex/harderr.c branches/jcatena-branch/ntoskrnl/ex/init.c branches/jcatena-branch/ntoskrnl/ex/lookas.c branches/jcatena-branch/ntoskrnl/ex/mutant.c branches/jcatena-branch/ntoskrnl/ex/pushlock.c branches/jcatena-branch/ntoskrnl/ex/resource.c branches/jcatena-branch/ntoskrnl/ex/sem.c branches/jcatena-branch/ntoskrnl/ex/sysinfo.c branches/jcatena-branch/ntoskrnl/ex/timer.c branches/jcatena-branch/ntoskrnl/ex/work.c branches/jcatena-branch/ntoskrnl/include/internal/cm.h branches/jcatena-branch/ntoskrnl/include/internal/i386/asmmacro.S branches/jcatena-branch/ntoskrnl/include/internal/i386/intrin_i.h branches/jcatena-branch/ntoskrnl/include/internal/i386/ke.h branches/jcatena-branch/ntoskrnl/include/internal/ke.h branches/jcatena-branch/ntoskrnl/include/internal/ke_x.h branches/jcatena-branch/ntoskrnl/include/internal/ntoskrnl.h branches/jcatena-branch/ntoskrnl/include/internal/probe.h branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h branches/jcatena-branch/ntoskrnl/io/iomgr/iocomp.c branches/jcatena-branch/ntoskrnl/io/iomgr/iofunc.c branches/jcatena-branch/ntoskrnl/io/iomgr/irp.c branches/jcatena-branch/ntoskrnl/kd/kdmain.c branches/jcatena-branch/ntoskrnl/kd/wrappers/bochs.c branches/jcatena-branch/ntoskrnl/kdbg/ (props changed) branches/jcatena-branch/ntoskrnl/kdbg/kdb.c branches/jcatena-branch/ntoskrnl/kdbg/kdb_symbols.c branches/jcatena-branch/ntoskrnl/ke/clock.c branches/jcatena-branch/ntoskrnl/ke/except.c branches/jcatena-branch/ntoskrnl/ke/freeldr.c branches/jcatena-branch/ntoskrnl/ke/i386/cpu.c branches/jcatena-branch/ntoskrnl/ke/i386/ctxswitch.S branches/jcatena-branch/ntoskrnl/ke/i386/exp.c branches/jcatena-branch/ntoskrnl/ke/i386/kiinit.c branches/jcatena-branch/ntoskrnl/ke/i386/thrdini.c branches/jcatena-branch/ntoskrnl/ke/i386/trap.s branches/jcatena-branch/ntoskrnl/ke/i386/traphdlr.c branches/jcatena-branch/ntoskrnl/ke/i386/usercall_asm.S branches/jcatena-branch/ntoskrnl/ke/i386/v86vdm.c branches/jcatena-branch/ntoskrnl/ke/queue.c branches/jcatena-branch/ntoskrnl/ke/spinlock.c branches/jcatena-branch/ntoskrnl/ke/thrdobj.c branches/jcatena-branch/ntoskrnl/ke/thrdschd.c branches/jcatena-branch/ntoskrnl/ke/wait.c branches/jcatena-branch/ntoskrnl/mm/ARM3/contmem.c branches/jcatena-branch/ntoskrnl/mm/ARM3/expool.c branches/jcatena-branch/ntoskrnl/mm/section.c branches/jcatena-branch/ntoskrnl/ntoskrnl-generic.rbuild branches/jcatena-branch/ntoskrnl/ntoskrnl.pspec branches/jcatena-branch/ntoskrnl/ps/psmgr.c branches/jcatena-branch/ntoskrnl/ps/security.c branches/jcatena-branch/ntoskrnl/se/audit.c branches/jcatena-branch/ntoskrnl/se/lsa.c branches/jcatena-branch/ntoskrnl/se/token.c branches/jcatena-branch/subsystems/win32/win32k/include/accelerator.h branches/jcatena-branch/subsystems/win32/win32k/include/brush.h branches/jcatena-branch/subsystems/win32/win32k/include/class.h branches/jcatena-branch/subsystems/win32/win32k/include/cursoricon.h branches/jcatena-branch/subsystems/win32/win32k/include/dc.h branches/jcatena-branch/subsystems/win32/win32k/include/desktop.h branches/jcatena-branch/subsystems/win32/win32k/include/engobjects.h (contents, props changed) branches/jcatena-branch/subsystems/win32/win32k/include/gdiobj.h branches/jcatena-branch/subsystems/win32/win32k/include/menu.h branches/jcatena-branch/subsystems/win32/win32k/include/object.h branches/jcatena-branch/subsystems/win32/win32k/include/region.h branches/jcatena-branch/subsystems/win32/win32k/include/timer.h branches/jcatena-branch/subsystems/win32/win32k/include/userfuncs.h branches/jcatena-branch/subsystems/win32/win32k/include/win32.h branches/jcatena-branch/subsystems/win32/win32k/include/window.h branches/jcatena-branch/subsystems/win32/win32k/main/dllmain.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/accelerator.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/callproc.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/caret.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/class.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/clipboard.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/cursoricon.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/desktop.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/event.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/hook.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/input.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/menu.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/message.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/misc.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/monitor.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/msgqueue.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/object.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/painting.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/simplecall.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/sysparams.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/timer.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/useratom.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/vis.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/windc.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/window.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/winpos.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/winsta.c branches/jcatena-branch/subsystems/win32/win32k/objects/cliprgn.c branches/jcatena-branch/subsystems/win32/win32k/objects/dcattr.c branches/jcatena-branch/subsystems/win32/win32k/objects/dclife.c branches/jcatena-branch/subsystems/win32/win32k/objects/dcobjs.c branches/jcatena-branch/subsystems/win32/win32k/objects/dcstate.c branches/jcatena-branch/subsystems/win32/win32k/objects/gdiobj.c branches/jcatena-branch/subsystems/win32/win32k/objects/region.c branches/jcatena-branch/tools/rbuild/module.cpp branches/jcatena-branch/tools/rsym/log2lines.c (props changed) branches/jcatena-branch/tools/rsym/log2lines.mak (props changed) branches/jcatena-branch/tools/rsym/rsym.c (props changed) branches/jcatena-branch/tools/rsym/rsym.h (props changed) branches/jcatena-branch/tools/rsym/rsym.mak (props changed) branches/jcatena-branch/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/jcatena-branch/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Added: branches/jcatena-branch/base/applications/dxdiag/rsrc.aps URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/games/spider/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/games/winemine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/mscutils/devmgmt/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/mscutils/servman/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/network/tracert/tracert.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/paint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/paint/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/paint/selection.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/application… Modified: branches/jcatena-branch/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/services/ev… Modified: branches/jcatena-branch/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/services/um… Modified: branches/jcatena-branch/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/setup/react… Modified: branches/jcatena-branch/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/setup/react… Modified: branches/jcatena-branch/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/setup/react… Modified: branches/jcatena-branch/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/setup/react… Modified: branches/jcatena-branch/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/setup/usetu… Modified: branches/jcatena-branch/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/shell/explo… Modified: branches/jcatena-branch/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/system/runo… Modified: branches/jcatena-branch/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/boot/bootdata/hi… Modified: branches/jcatena-branch/boot/freeldr/fdebug/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/boot/freeldr/fde… Modified: branches/jcatena-branch/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/boot/freeldr/fre… Modified: branches/jcatena-branch/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/boot/freeldr/fre… Modified: branches/jcatena-branch/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/3rdparty/mes… Modified: branches/jcatena-branch/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/cpl/desk/lan… Modified: branches/jcatena-branch/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/cpl/input/la… Modified: branches/jcatena-branch/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/cpl/sysdm/la… Modified: branches/jcatena-branch/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/cpl/sysdm/la… Modified: branches/jcatena-branch/dll/directx/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/quar… Modified: branches/jcatena-branch/dll/directx/quartz/main.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/quar… Modified: branches/jcatena-branch/dll/directx/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/quar… Modified: branches/jcatena-branch/dll/directx/quartz/nullrenderer.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/quar… Modified: branches/jcatena-branch/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/quar… Modified: branches/jcatena-branch/dll/directx/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/quar… Modified: branches/jcatena-branch/dll/directx/wine/d3dx9_36/d3dx9_36.spec URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/wine… Modified: branches/jcatena-branch/dll/directx/wine/d3dx9_36/d3dx9_36_private.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/wine… Modified: branches/jcatena-branch/dll/directx/wine/d3dx9_36/mesh.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/wine… Modified: branches/jcatena-branch/dll/directx/wine/d3dx9_36/shader.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/wine… Modified: branches/jcatena-branch/dll/directx/wine/d3dx9_36/surface.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/wine… Modified: branches/jcatena-branch/dll/directx/wine/d3dx9_36/util.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/wine… Modified: branches/jcatena-branch/dll/directx/wine/wine.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/directx/wine… Modified: branches/jcatena-branch/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/advapi… Modified: branches/jcatena-branch/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/advpac… Modified: branches/jcatena-branch/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/devmgr… Modified: branches/jcatena-branch/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/gdi32/… Modified: branches/jcatena-branch/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/iphlpa… Modified: branches/jcatena-branch/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/iphlpa… Modified: branches/jcatena-branch/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/iphlpa… Modified: branches/jcatena-branch/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/msafd/… Modified: branches/jcatena-branch/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/msafd/… Modified: branches/jcatena-branch/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/msgina… Modified: branches/jcatena-branch/dll/win32/mshtml/De.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/conpoint.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/dispex.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlbody.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmldoc3.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlelem.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlelemcol.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlevent.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlevent.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlframebase.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmliframe.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlimg.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlscript.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlstyle.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlstyle2.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlstyle3.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmltextcont.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmltextnode.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/nsevents.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/secmgr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/service.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/task.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/txtrange.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/mshtml/view.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/mshtml… Modified: branches/jcatena-branch/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/msxml3… Modified: branches/jcatena-branch/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/msxml3… Modified: branches/jcatena-branch/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/netid/… Modified: branches/jcatena-branch/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/setupa… Modified: branches/jcatena-branch/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/setupa… Modified: branches/jcatena-branch/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/shimgv… Modified: branches/jcatena-branch/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/wdmaud… Modified: branches/jcatena-branch/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/window… Modified: branches/jcatena-branch/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/window… Modified: branches/jcatena-branch/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/window… Modified: branches/jcatena-branch/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/window… Modified: branches/jcatena-branch/dll/win32/windowscodecs/ungif.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/window… Modified: branches/jcatena-branch/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/window… Modified: branches/jcatena-branch/dll/win32/wshirda/wshirda.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/wshird… Modified: branches/jcatena-branch/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/wshtcp… Modified: branches/jcatena-branch/dll/win32/wshtcpip/wshtcpip.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/wshtcp… Modified: branches/jcatena-branch/dll/win32/wshtcpip/wshtcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/wshtcp… Modified: branches/jcatena-branch/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/afd/include/tdi_proto.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/datagram.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/dispatch.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Removed: branches/jcatena-branch/drivers/network/tcpip/include/irp.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/lock.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Removed: branches/jcatena-branch/drivers/network/tcpip/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/routines.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Removed: branches/jcatena-branch/drivers/network/tcpip/tcpip/irp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/mocklock.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/network/… Modified: branches/jcatena-branch/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/hal.rbuild?r… Modified: branches/jcatena-branch/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halarm/up/ha… Modified: branches/jcatena-branch/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halppc/up/ha… Modified: branches/jcatena-branch/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/hal_g… Removed: branches/jcatena-branch/hal/halx86/hal_generic_amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/hal_g… Removed: branches/jcatena-branch/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/hal_g… Modified: branches/jcatena-branch/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/hal_g… Removed: branches/jcatena-branch/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/halmp… Removed: branches/jcatena-branch/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/halup… Modified: branches/jcatena-branch/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/halxb… Modified: branches/jcatena-branch/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/inclu… Modified: branches/jcatena-branch/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/ap… Modified: branches/jcatena-branch/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/ha… Modified: branches/jcatena-branch/hal/halx86/mp/ioapic.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/io… Modified: branches/jcatena-branch/hal/halx86/mp/mpconfig.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/mp… Modified: branches/jcatena-branch/hal/halx86/mp/mps.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/mp… Modified: branches/jcatena-branch/hal/halx86/mp/mpsboot.asm URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/mp… Modified: branches/jcatena-branch/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/mp… Modified: branches/jcatena-branch/hal/halx86/mp/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/sp… Modified: branches/jcatena-branch/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ddk/cfgm… Modified: branches/jcatena-branch/include/dxsdk/axextend.idl URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/dxsdk/ax… Modified: branches/jcatena-branch/include/dxsdk/d3dx9shader.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/dxsdk/d3… Modified: branches/jcatena-branch/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ndk/half… Modified: branches/jcatena-branch/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ndk/i386… Modified: branches/jcatena-branch/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ndk/kefu… Modified: branches/jcatena-branch/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/psdk/com… Modified: branches/jcatena-branch/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/psdk/msh… Modified: branches/jcatena-branch/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/psdk/msh… Modified: branches/jcatena-branch/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/psdk/psd… Modified: branches/jcatena-branch/include/psdk/tcpioctl.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/psdk/tcp… Modified: branches/jcatena-branch/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/psdk/win… Modified: branches/jcatena-branch/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/psdk/win… Modified: branches/jcatena-branch/include/psdk/wsahelp.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/psdk/wsa… Modified: branches/jcatena-branch/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… Modified: branches/jcatena-branch/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… Modified: branches/jcatena-branch/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… Modified: branches/jcatena-branch/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… Modified: branches/jcatena-branch/lib/drivers/ip/ip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/i… Modified: branches/jcatena-branch/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Removed: branches/jcatena-branch/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/n… Modified: branches/jcatena-branch/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/t… Modified: branches/jcatena-branch/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/t… Modified: branches/jcatena-branch/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/t… Modified: branches/jcatena-branch/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/t… Modified: branches/jcatena-branch/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/t… Modified: branches/jcatena-branch/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/t… Modified: branches/jcatena-branch/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/t… Removed: branches/jcatena-branch/lib/drivers/oskittcp/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/sleep.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/tcp_input.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/lib.rbuild?r… Modified: branches/jcatena-branch/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/rtl/bitmap.c… Modified: branches/jcatena-branch/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/rtl/sprintf.… Modified: branches/jcatena-branch/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/rtl/swprintf… Modified: branches/jcatena-branch/lib/sdk/crt/math/i386/allmul_asm.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt/math… Modified: branches/jcatena-branch/lib/sdk/crt/math/i386/aulldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt/math… Modified: branches/jcatena-branch/lib/sdk/crt/mbstring/mbscspn.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt/mbst… Modified: branches/jcatena-branch/lib/sdk/crt/mbstring/mbsspn.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt/mbst… Modified: branches/jcatena-branch/lib/sdk/crt/mbstring/mbsspnp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt/mbst… Modified: branches/jcatena-branch/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/uuid/uui… Modified: branches/jcatena-branch/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/cc/copy… Modified: branches/jcatena-branch/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/config/… Modified: branches/jcatena-branch/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/config/… Modified: branches/jcatena-branch/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/config/… Modified: branches/jcatena-branch/ntoskrnl/config/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/config/… Modified: branches/jcatena-branch/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/even… Modified: branches/jcatena-branch/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/hand… Modified: branches/jcatena-branch/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/hard… Modified: branches/jcatena-branch/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/init… Modified: branches/jcatena-branch/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/look… Modified: branches/jcatena-branch/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/muta… Modified: branches/jcatena-branch/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/push… Modified: branches/jcatena-branch/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/reso… Modified: branches/jcatena-branch/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/sem.… Modified: branches/jcatena-branch/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/sysi… Modified: branches/jcatena-branch/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/time… Modified: branches/jcatena-branch/ntoskrnl/ex/work.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/work… Modified: branches/jcatena-branch/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/probe.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/io/iomg… Modified: branches/jcatena-branch/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/io/iomg… Modified: branches/jcatena-branch/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/io/iomg… Modified: branches/jcatena-branch/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/kd/kdma… Modified: branches/jcatena-branch/ntoskrnl/kd/wrappers/bochs.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/kd/wrap… Modified: branches/jcatena-branch/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/kdbg/kd… Modified: branches/jcatena-branch/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/kdbg/kd… Removed: branches/jcatena-branch/ntoskrnl/ke/arm/time.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/arm/… Modified: branches/jcatena-branch/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/cloc… Modified: branches/jcatena-branch/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/exce… Modified: branches/jcatena-branch/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/free… Removed: branches/jcatena-branch/ntoskrnl/ke/i386/boot.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Removed: branches/jcatena-branch/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/queu… Modified: branches/jcatena-branch/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/spin… Modified: branches/jcatena-branch/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/thrd… Modified: branches/jcatena-branch/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/thrd… Modified: branches/jcatena-branch/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/wait… Modified: branches/jcatena-branch/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/mm/ARM3… Modified: branches/jcatena-branch/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/mm/ARM3… Modified: branches/jcatena-branch/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/mm/sect… Modified: branches/jcatena-branch/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ntoskrn… Modified: branches/jcatena-branch/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ntoskrn… Modified: branches/jcatena-branch/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ps/psmg… Modified: branches/jcatena-branch/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ps/secu… Modified: branches/jcatena-branch/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/se/audi… Modified: branches/jcatena-branch/ntoskrnl/se/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/se/lsa.… Modified: branches/jcatena-branch/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/se/toke… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/accelerator.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/engobjects.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/objects/dcattr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/tools/rbuild/mod…

14 years, 7 months

[gedmurphy] 45262: Inform rbuild of the sdks. Building now gets much further

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 26 11:46:39 2010 New Revision: 45262 URL: http://svn.reactos.org/svn/reactos?rev=45262&view=rev Log: Inform rbuild of the sdks. Building now gets much further Added: branches/Tree-restructure-test/sdk/include/include.rbuild - copied unchanged from r45261, branches/Tree-restructure-test/sdk/include/directory.rbuild Removed: branches/Tree-restructure-test/sdk/include/directory.rbuild Modified: branches/Tree-restructure-test/sdk/sdk.rbuild Removed: branches/Tree-restructure-test/sdk/include/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/inclu… ============================================================================== --- branches/Tree-restructure-test/sdk/include/directory.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/include/directory.rbuild (removed) @@ -1,15 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="reactos"> - <xi:include href="reactos/reactos.rbuild" /> - </directory> - - <directory name="psdk"> - <xi:include href="psdk/psdk.rbuild" /> - </directory> -</group> Modified: branches/Tree-restructure-test/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/sdk.r… ============================================================================== --- branches/Tree-restructure-test/sdk/sdk.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/sdk.rbuild [iso-8859-1] Tue Jan 26 11:46:39 2010 @@ -4,6 +4,9 @@ <directory name="libs"> <xi:include href="libs/libs.rbuild" /> </directory> +<directory name="include"> + <xi:include href="include/include.rbuild" /> +</directory> <directory name="tools"> <xi:include href="tools/tools.rbuild" /> </directory>

14 years, 7 months

[gedmurphy] 45261: Add the crt and psdk headers

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 26 11:42:19 2010 New Revision: 45261 URL: http://svn.reactos.org/svn/reactos?rev=45261&view=rev Log: Add the crt and psdk headers Added: branches/Tree-restructure-test/sdk/include/crt/ - copied from r44923, trunk/reactos/include/crt/ branches/Tree-restructure-test/sdk/include/crt/crtdefs.h - copied unchanged from r44926, trunk/reactos/include/crt/crtdefs.h branches/Tree-restructure-test/sdk/include/crt/string.h - copied unchanged from r44927, trunk/reactos/include/crt/string.h branches/Tree-restructure-test/sdk/include/directory.rbuild - copied, changed from r44923, trunk/reactos/include/directory.rbuild branches/Tree-restructure-test/sdk/include/psdk/ - copied from r44923, trunk/reactos/include/psdk/ Copied: branches/Tree-restructure-test/sdk/include/directory.rbuild (from r44923, trunk/reactos/include/directory.rbuild) URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/inclu… ============================================================================== --- trunk/reactos/include/directory.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/include/directory.rbuild [iso-8859-1] Tue Jan 26 11:42:19 2010 @@ -4,9 +4,11 @@ <directory name="reactos"> <xi:include href="reactos/reactos.rbuild" /> </directory> + <directory name="psdk"> <xi:include href="psdk/psdk.rbuild" /> </directory>

14 years, 7 months

[dchapyshev] 45260: - Update Ukrainian translation by Igor Paliychuk (igor-hkr[at]mail[dot]ru)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Jan 26 11:23:30 2010 New Revision: 45260 URL: http://svn.reactos.org/svn/reactos?rev=45260&view=rev Log: - Update Ukrainian translation by Igor Paliychuk (igor-hkr[at]mail[dot]ru) Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Tue Jan 26 11:23:30 2010 @@ -18,37 +18,37 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ì·¢á ÒÖë·", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¨¡ià ¬®¢¨", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 £ç¦í-Ð ãÆ , ë·¢¨áåí ÒÖëç, ÞÆ ¢ç¦¨ ë·ÆÖá·ãå Ô Ø¦ û ã ëãå ÔÖëÐ¨ÔÔÞ.", + "\x07 ã¤ì-« áª , ¢¨¡¥àiâì ¬®¢ã, ïª ¡ã¤¥ ¢¨ª®à¨áâ ¯i¤ ç á ¢áâ ®¢«¥ï.", TEXT_STYLE_NORMAL }, { 8, 11, - " Ô å·ãÔåí ENTER.", + " i â¨áiâì ENTER.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 ¥Þ ÒÖë ¢ç¦¨ ë·ÆÖá·ãåÖëçë å·ãí ØÖ ó ÒÖëûçë ÔÔ ç ëãå ÔÖëÐ¨Ô½ ã·ãå¨Ò.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· F3 = ì·½å·", + "\x07 ï ¬®¢ ¡ã¤¥ ¢¨ª®à¨áâ®¢ã¢ â¨áì ¯® § ¬®¢çã¢ î ã ¢áâ ®¢«¥i© á¨áâ¥¬i.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -64,55 +64,55 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Ñ ãÆ ëÖ ØáÖã·ÒÖ ¦Ö ØáÖ¬á Ò· ëãå ÔÖëÐ¨ÔÔÞ ReactOS", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " áª ¢® ¯à®á¨¬® ¤® ¯à®£à ¬¨ ¢áâ ®¢«¥ï ReactOS", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "Õ ¤íÖÒç ¨å Ø ëãå ÔÖëÐ¨ÔÔÞ ë¦¢ç¦¨åíãÞ ÆÖØë ÔÔÞ ReactOS Ô ì õ", + " æì®¬ã ¥â ¯i ¢áâ ®¢«¥ï ¢i¤¡ã¤¥âìáï ª®¯iî¢ ï ReactOS è", TEXT_STYLE_NORMAL }, { 6, 12, - "ÆÖÒØ'å¨á Ø¦¬ÖåÖëÆ ¦Ö ¦áç¬Ö¬Ö ¨å Øç ëãå ÔÖëÐ¨ÔÔÞ.", + "ª®¬¯'îâ¥à i ¯i¤£®â®¢ª ¤® ¤àã£®£® ¥â ¯ã ¢áâ ®¢«¥ï.", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Õ å·ãÔåí ENTER ùÖ¢ ëãå ÔÖë·å· ReactOS.", + "\x07 â¨áiâì ENTER é®¡ ¢áâ ®¢¨â¨ ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Õ å·ãÔåí R ¦ÐÞ ÖÔÖëÐ¨ÔÔÞ ReactOS.", + "\x07 â¨áiâì R ¤«ï ®®¢«¥ï ReactOS.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Ô å·ãÔåí L ¦ÐÞ Ø¨á¨¬ÐÞ¦ç Ð¤¨Ôó½Ô·µ çÒÖë ReactOS", + "\x07 â¨áiâì L ¤«ï ¯¥à¥£«ï¤ã «iæ¥§i©¨å ã¬®¢ ReactOS", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Õ å·ãÔåí F3 ùÖ¢ ë·½å·. Ô¨ ëãå ÔÖëÐû· ReactOS.", + "\x07 â¨áiâì F3 é®¡ ¢¨©â¨. ¥ ¢áâ ®¢«îîç¨ ReactOS.", TEXT_STYLE_NORMAL }, { 6, 23, - "§ÐÞ Öåá·Ò ÔÔÞ ¦¨å ÐíÔõÖ ÔªÖáÒ ¤ ØáÖ ReactOS, ¢ç¦í-Ð ãÆ ë¦ë¦ ½å¨:", + "«ï ®âà¨¬ ï ¤¥â «ìiè®õ iä®à¬ æiõ ¯à® ReactOS, ¡ã¤ì-« áª ¢i¤¢i¤ ©â¥:", TEXT_STYLE_NORMAL }, { @@ -124,7 +124,7 @@ { 0, 0, - "ENTER = ÝáÖ¦Öëé·å· R = ì¦ÔÖë·å· L = Ñ¤¨ÔóÞ F3 = ì·½å·", + "ENTER = à®¤®¢¦¨â¨ R = i¤®¢¨â¨ L = iæ¥§iï F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -140,85 +140,85 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ìãå ÔÖëÐë û ReactOS óÔ µÖ¦·åíãÞ ë á ÔÔ½ ãå ¦ áÖóáÖ¢Æ· ù¨ Ô¨", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "áâ ®¢«î¢ ç ReactOS § å®¤¨âìáï ¢ à i© áâ ¤iõ à®§à®¡ª¨ i é¥ ¥", TEXT_STYLE_NORMAL }, { 6, 9, - "Ø¦åá·Òç ëã ªçÔÆ¤ ØÖëÔÖ¤ÔÔÖ ØáÖ¬á Ò· ëãå ÔÖëÐ¨ÔÔÞ.", + "¯i¤âà¨¬ãó ¢ái äãªæiõ ¯®¢®æi®õ ¯à®£à ¬¨ ¢áâ ®¢«¥ï.", TEXT_STYLE_NORMAL }, { 6, 12, - "Ýá·ãçåÔ Ô ãåçØÔ Ö¢Ò¨é¨ÔÔÞ:", + "à¨áãâi áâã¯i ®¡¬¥¦¥ï:", TEXT_STYLE_NORMAL }, { 8, 13, - "- ìãå ÔÖëÐë û Ô¨ Ø¦åá·Òç ¢Ðíõ¨ Ôé Ö¦·Ô Ø¨áë·ÔÔ·½ áÖó¦Ð Ô ¦·ãÆ.", + "- áâ ®¢«î¢ ç ¥ ¯i¤âà¨¬ãó ¡i«ìè¥ i¦ ®¤¨ ¯¥à¢¨¨© à®§¤i« ¤¨áª.", TEXT_STYLE_NORMAL }, { 8, 14, - "- ìãå ÔÖëÐë û Ô¨ ÒÖé¨ ë·¦ Ð·å· Ø¨áë·ÔÔ·½ áÖó¦Ð ó ¦·ãÆç", + "- áâ ®¢«î¢ ç ¥ ¬®¦¥ ¢¨¤ «¨â¨ ¯¥à¢¨¨© à®§¤i« § ¤¨áªã", TEXT_STYLE_NORMAL }, { 8, 15, - " ØÖÆ· Ô ¦·ãÆç Ô ÞëÔ·½ áÖóõ·á¨Ô·½ áÖó¦Ð.", + " ¯®ª¨ ¤¨áªã ï¢¨© à®§è¨à¥¨© à®§¤i«.", TEXT_STYLE_NORMAL }, { 8, 16, - "- ìãå ÔÖëÐë û Ô¨ ÒÖé¨ ë·¦ Ð·å· Ø¨áõ·½ áÖóõ·á¨Ô·½ áÖó¦Ð ó ¦·ãÆç", + "- áâ ®¢«î¢ ç ¥ ¬®¦¥ ¢¨¤ «¨â¨ ¯¥àè¨© à®§è¨à¥¨© à®§¤i« § ¤¨áªã", TEXT_STYLE_NORMAL }, { 8, 17, - " ØÖÆ· Ô ¦·ãÆç ãÔçåí Ôõ áÖóõ·á¨Ô áÖó¦Ð·.", + " ¯®ª¨ ¤¨áªã iáãîâì ièi à®§è¨à¥i à®§¤i«¨.", TEXT_STYLE_NORMAL }, { 8, 18, - "- ìãå ÔÖëÐë û Ø¦åá·Òç Ð·õ¨ ª ½ÐÖëç ã·ãå¨Òç FAT.", + "- áâ ®¢«î¢ ç ¯i¤âà¨¬ãó «¨è¥ ä ©«®¢ã á¨áâ¥¬ã FAT.", TEXT_STYLE_NORMAL }, { 8, 19, - "- Ý¨á¨ëáÆ ª ½ÐÖëÖ ã·ãå¨Ò· ù¨ Ô¨ ëØáÖë ¦é¨Ô .", + "- ¥à¥¢iàª ä ©«®¢®õ á¨áâ¥¬¨ é¥ ¥ ¢¯à®¢ ¤¦¥ .", TEXT_STYLE_NORMAL }, { 8, 23, - "\x07 Õ å·ãÔåí ENTER ùÖ¢ ëãå ÔÖë·å· ReactOS.", + "\x07 â¨áiâì ENTER é®¡ ¢áâ ®¢¨â¨ ReactOS.", TEXT_STYLE_NORMAL }, { 8, 25, - "\x07 Õ å·ãÔåí F3 ùÖ¢ ë·½å·, Ô¨ ëãå ÔÖëÐû· ReactOS.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· F3 = ì·½å·", + "\x07 â¨áiâì F3 é®¡ ¢¨©â¨, ¥ ¢áâ ®¢«îîç¨ ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { @@ -234,79 +234,79 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 6, - "Ñ¤¨ÔóÞ:", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "iæ¥§iï:", TEXT_STYLE_HIGHLIGHT }, { 8, 8, - "ReactOS Ð¤¨ÔóÖë ÔÖ ë¦ØÖë¦ÔÖ ¦Ö çÒÖë", + "ReactOS «iæ¥§®¢ ® ¢i¤¯®¢i¤® ¤® ã¬®¢", TEXT_STYLE_NORMAL }, { 8, 9, - "GNU GPL. æ ÆÖé ReactOS Òãå·åí ÆÖÒØÖÔ¨Ôå·, ÞÆ Ð¤¨ÔóÖë ÔÖ", + "GNU GPL. ª®¦ ReactOS ¬iáâ¨âì ª®¬¯®¥â¨, ïªi «iæ¥§®¢ ®", TEXT_STYLE_NORMAL }, { 8, 10, - "ó ãçÒãÔ·Ò· Ð¤¨ÔóÞÒ·: X11, BSD, GNU LGPL.", + "§ áã¬iá¨¬¨ «iæ¥§iï¬¨: X11, BSD, GNU LGPL.", TEXT_STYLE_NORMAL }, { 8, 11, - "ìã¨ ØáÖ¬á ÒÔ¨ ó ¢¨óØ¨û¨ÔÔÞ, ÞÆ¨ ëµÖ¦·åí ë ã·ãå¨Òç ReactOS, ë·Øçù¨ÔÖ", + "á¥ ¯à®£à ¬¥ § ¡¥§¯¥ç¥ï, ïª¥ ¢å®¤¨âì ¢ á¨áâ¥¬ã ReactOS, ¢¨¯ãé¥®", TEXT_STYLE_NORMAL }, { 8, 12, - "Øi¦ ìi¦Æá·åÖ Ði¤¨Ôói½ÔÖ ç¬Ö¦Ö GNU GPL ió ó¢¨á¨é¨ÔÔÞÒ", + "¯i¤ i¤ªà¨â®î «iæ¥§i©®î ã£®¤®î GNU GPL i§ §¡¥à¥¦¥ï¬", TEXT_STYLE_NORMAL }, { 8, 13, - "Ø¨áë·ÔÔ·µ Ði¤¨Ôói.", + "¯¥à¢¨¨å «iæ¥§iõ.", TEXT_STYLE_NORMAL }, { 8, 15, - "§ Ô¨ ØáÖ¬á ÒÔ¨ ó ¢¨óØ¨û¨ÔÔÞ ØÖãå ëÐÞåíãÞ £©ô ¡â¡Õæi i ¢¨ó Ö¢Ò¨é¨Ôí", + " ¥ ¯à®£à ¬¥ § ¡¥§¯¥ç¥ï ¯®áâ ¢«ïóâìáï Iô i ¡¥§ ®¡¬¥¦¥ì", TEXT_STYLE_NORMAL }, { 8, 16, - "ç ë·ÆÖá·ãå ÔÔi, ÞÆ ó Òiã¤¨ë·Ò, å Æ i ÒiéÔ áÖ¦Ô·Ò Øá ëÖÒ", + "ã ¢¨ª®à¨áâ i, ïª § ¬iáæ¥¢¨¬, â ª i ¬i¦ à®¤¨¬ ¯à ¢®¬", TEXT_STYLE_NORMAL }, { 8, 17, - "Ñi¤¨ÔóiÞ ReactOS ¦ÖóëÖÐÞ Ø¨á¨¦ ûç ØáÖ¦çÆåç åá¨åiÒ ÖãÖ¢ Ò.", + "iæ¥§iï ReactOS ¤®§¢®«ïó ¯¥à¥¤ çã ¯à®¤ãªâã âà¥âi¬ ®á®¡ ¬.", TEXT_STYLE_NORMAL }, { 8, 18, - "àÆùÖ û¨á¨ó ¢ç¦í-ÞÆi Øá·û·Ô· ì· Ô¨ Öåá·Ò Ð· ÆÖØi ìi¦Æá·åÖ", + "ªé® ç¥à¥§ ¡ã¤ì-ïªi ¯à¨ç¨¨ ¨ ¥ ®âà¨¬ «¨ ª®¯iî i¤ªà¨â®õ", TEXT_STYLE_NORMAL }, { 8, 19, - "Ði¤¨Ôói½ÔÖ ç¬Ö¦· GNU á óÖÒ ó ReactOS, ëi¦ëi¦ å¨", + "«iæ¥§i©®õ ã£®¤¨ GNU à §®¬ § ReactOS, ¢i¤¢i¤ óâ¥", TEXT_STYLE_NORMAL }, { @@ -318,31 +318,31 @@ { 8, 22, - " á Ôå:", + " à âiõ:", TEXT_STYLE_HIGHLIGHT }, { 8, 24, - "¥¨ ëiÐíÔ¨ ØáÖ¬á ÒÔ¨ ó ¢¨óØ¨û¨ÔÔÞ; ¦·ë. ¦é¨á¨ÐÖ ¦ÐÞ Ø¨á¨¬ÐÞ¦ç Øá ë.", + "¥ ó ¢i«ì¥ ¯à®£à ¬¥ § ¡¥§¯¥ç¥ï; ¤¨¢. ¤¦¥à¥«® ¤«ï ¯¥à¥£«ï¤ã ¯à ¢.", TEXT_STYLE_NORMAL }, { 8, 25, - "Õ¨ ¦ åíãÞ ÕàÇ ¬ á Ôå; Ô ¬ á Ôåi æ×ì¡âÕ×× äæ¡Õè, Ô ", + "¥ ¤ îâìáï II £ à âiõ; i £ à âiõ , i ", TEXT_STYLE_NORMAL }, { 8, 26, - "Ýâ¸§¡æÕ×äæi §Ñà Ç×ÕÇâ©æÕ¸¶ ¥iÑ©¾", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝÖë¨áÔçå·ãí", + "I I", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ®¢¥àãâ¨áì", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -358,84 +358,84 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "è ãØ·ãÆç Ô·éû¨ Øá·ë¨¦¨Ôi ØÖåÖûÔ Ø á Ò¨åá· Øá·ãåáÖë.", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " á¯¨áªã ¨¦ç¥ ¯à¨¢¥¤¥i ¯®â®çi ¯ à ¬¥âà¨ ¯à¨áâà®õ¢.", TEXT_STYLE_NORMAL }, { 24, 11, - "ÇÖÒØ'å¨á:", + "®¬¯'îâ¥à:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 12, - "©Æá Ô:", + "ªà :", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 13, - "ÇÐ ëi åçá :", + "« ¢i âãà :", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 14, - "ÇÐ ë. áÖóÆÐ ¦Æ :", + "« ¢. à®§ª« ¤ª :", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 16, - "Ýá·½ÔÞå·:", + "à¨©ïâ¨:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, - 16, "ô ãåÖãçë å· ¦ Ôi Ø á Ò¨åá· Øá·ãåáÖë", + 16, " áâ®áã¢ â¨ ¤ i ¯ à ¬¥âà¨ ¯à¨áâà®õ¢", TEXT_STYLE_NORMAL }, { 6, 19, - "ì· ÒÖé¨å¨ óÒiÔ·å· Ø á Ò¨åá· Øá·ãåáÖë Ô å·ãÆ û· ÆÐ ëiõi ì×âè i ìÕ¸ô", + "¨ ¬®¦¥â¥ §¬i¨â¨ ¯ à ¬¥âà¨ ¯à¨áâà®õ¢ â¨áª îç¨ ª« ¢ièi i ", TEXT_STYLE_NORMAL }, { 6, 20, - "¦ÐÞ ë·¦iÐ¨ÔÔÞ ¨Ð¨Ò¨Ôåç i ÆÐ ëiõç ENTER ¦ÐÞ ë·¢Öáç iÔõ·µ ë ái Ôåië", + "¤«ï ¢¨¤i«¥ï ¥«¥¬¥âã i ª« ¢ièã ENTER ¤«ï ¢¨¡®àã iè¨å ¢ ài âi¢", TEXT_STYLE_NORMAL }, { 6, 21, - "Ø á Ò¨åáië.", + "¯ à ¬¥âài¢.", TEXT_STYLE_NORMAL }, { 6, 23, - "ÇÖÐ· ëãi Ø á Ò¨åá· ¢ç¦çåí ë·óÔ û¨Ôi, ë·¢¨áiåí \"ô ãåÖãçë å· ¦ Ôi Ø á Ò¨åá· Øá·ãåáÖë\"", + "®«¨ ¢ái ¯ à ¬¥âà¨ ¡ã¤ãâì ¢¨§ ç¥i, ¢¨¡¥àiâì \" áâ®áã¢ â¨ ¤ i ¯ à ¬¥âà¨ ¯à¨áâà®õ¢\"", TEXT_STYLE_NORMAL }, { 6, 24, - "i Ô å·ãÔiåí ENTER.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· F3 = ì·½å·", + "i â¨áiâì ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -451,55 +451,55 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ìãå ÔÖëÐë û ReactOS óÔ µÖ¦·åíãÞ ë á ÔÔ½ ãå ¦ áÖóáÖ¢Æ· ù¨ Ô¨", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "áâ ®¢«î¢ ç ReactOS § å®¤¨âìáï ¢ à i© áâ ¤iõ à®§à®¡ª¨ i é¥ ¥", TEXT_STYLE_NORMAL }, { 6, 9, - "Ø¦åá·Òç ëã ªçÔÆ¤ ØÖëÔÖ¤ÔÔÖ ØáÖ¬á Ò· ëãå ÔÖëÐ¨ÔÔÞ.", + "¯i¤âà¨¬ãó ¢ái äãªæiõ ¯®¢®æi®õ ¯à®£à ¬¨ ¢áâ ®¢«¥ï.", TEXT_STYLE_NORMAL }, { 6, 12, - "«çÔÆ¤ ë¦ÔÖëÐ¨ÔÔÞ ù¨ Ô¨ ëØáÖë ¦é¨Ô.", + "ãªæiõ ¢i¤®¢«¥ï é¥ ¥ ¢¯à®¢ ¤¦¥i.", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Õ å·ãÔåí U ùÖ¢ ÖÔÖë·å· OS.", + "\x07 â¨áiâì U é®¡ ®®¢¨â¨ OS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Õ å·ãÔåí R ¦ÐÞ ó ØçãÆç ÇÖÔãÖÐ ì¦ÔÖëÐ¨ÔÔÞ.", + "\x07 â¨áiâì R ¤«ï § ¯ãáªã ®á®«i i¤®¢«¥ï.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Õ å·ãÔåí ESC ¦ÐÞ ØÖë¨áÔ¨ÔÔÞ ¦Ö ¬ÖÐÖëÔÖ ãåÖáÔÆ·.", + "\x07 â¨áiâì ESC ¤«ï ¯®¢¥à¥ï ¤® £®«®¢®õ áâ®àiª¨.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Õ å·ãÔåí ENTER ùÖ¢ Ø¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = ÖÐÖëÔ äåÖáÔÆ U = ×ÔÖë·å· R = ì¦ÔÖë·å· ENTER = Ý¨á¨ó ë Ôå é·å·", + "\x07 â¨áiâì ENTER é®¡ ¯¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC = ®«®¢ â®àiª U = ®¢¨â¨ R = i¤®¢¨â¨ ENTER = ¥à¥§ ¢ â ¦¨â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -514,43 +514,43 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "æçå ì· ÒÖé¨å¨ óÒÔ·å· å·Ø ì õÖ¬Ö ÆÖÒØ'å¨á .", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ãâ ¨ ¬®¦¥â¥ §¬i¨â¨ â¨¯ è®£® ª®¬¯'îâ¥à .", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Õ å·ãÆ ½å¨ ÆÐ ëõ ìì©â¶ å ìÕ¸ô ¦ÐÞ ë·¢Öáç å·Øç ì õÖ¬Ö ÆÖÒØ'å¨á .", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã â¨¯ã è®£® ª®¬¯'îâ¥à .", TEXT_STYLE_NORMAL }, { 8, 11, - " Ô å·ãÔåí ENTER.", + " i â¨áiâì ENTER.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Õ å·ãÔåí ESC ¦ÐÞ ØÖë¨áÔ¨ÔÔÞ ¦Ö ØÖØ¨á¨¦ÔíÖ ãåÖáÔÆ· ¢¨ó óÒÔ·", + "\x07 â¨áiâì ESC ¤«ï ¯®¢¥à¥ï ¤® ¯®¯¥à¥¤ì®õ áâ®àiª¨ ¡¥§ §¬i¨", TEXT_STYLE_NORMAL }, { 8, 14, - " å·Øç ÆÖÒØ'å¨á .", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ØáÖ¦Öëé·å· ESC = ì¦ÒÔ·å· F3 = ì·½å·", + " â¨¯ã ª®¬¯'îâ¥à .", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ ESC = ª áã¢ â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -566,31 +566,31 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { 10, 6, - "ä·ãå¨Ò Ø¨á¨ëáÞ û· ëã ¦ Ô ó¢¨á¨é¨ÔÖ Ô ¦·ãÆ", + "¨áâ¥¬ ¯¥à¥¢iàïó ç¨ ¢ái ¤ i §¡¥à¥¦¥® ¤¨áª", TEXT_STYLE_NORMAL }, { 10, 8, - "¥¨ ÒÖé¨ ó ½ÔÞå· ¦¨ÆÐíÆ µë·Ð·Ô", + "¥ ¬®¦¥ § ©ïâ¨ ¤¥ªi«ìª å¢¨«¨", TEXT_STYLE_NORMAL }, { 10, 9, - "ÝãÐÞ ó ë¨áõ¨ÔÔÞ ÆÖÒØ'å¨á ¢ç¦¨ ëåÖÒ å·ûÔÖ Ø¨á¨ó ë Ôå é¨ÔÖ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "×û·ùç Æ¨õ", + "iá«ï § ¢¥àè¥ï ª®¬¯'îâ¥à ¡ã¤¥ ¢â®¬ â¨ç® ¯¥à¥§ ¢ â ¦¥®", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ç¨éãî ª¥è", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -606,37 +606,37 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { 10, 6, - "ReactOS Ô¨ ëãå ÔÖëÐ¨ÔÖ ØÖëÔãå", + "ReactOS ¥ ¢áâ ®¢«¥® ¯®¢iáâî", TEXT_STYLE_NORMAL }, { 10, 8, - "ì·åÞ¬Ôåí ¦·ãÆçåç ó ¦·ãÆÖëÖ¦ç A: å ", + "¨âï£iâì ¤¨áªãâã § ¤¨áª®¢®¤ã A: â ", TEXT_STYLE_NORMAL }, { 10, 9, - "ëã CD-ROM ó CD-Øá·ëÖ¦ë.", + "¢ái CD-ROM § CD-¯à¨¢®¤i¢.", TEXT_STYLE_NORMAL }, { 10, 11, - "Õ å·ãÔåí ENTER ùÖ¢ Ø¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "£ç¦í-Ð ãÆ ó û¨Æ ½å¨ ...", + " â¨áiâì ENTER é®¡ ¯¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ã¤ì-« áª § ç¥ª ©â¥ ...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -652,42 +652,42 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "æçå ë· ÒÖé¨å¨ óÒÔ·å· å·Ø ¨Æá Ôç.", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ãâ ¢¨ ¬®¦¥â¥ §¬i¨â¨ â¨¯ ¥ªà ã.", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Õ å·ãÆ ½å¨ ÆÐ ëõ ìì©â¶ å ìÕ¸ô ¦ÐÞ ë·¢Öáç ØÖåá¢ÔÖ¬Ö å·Øç ÒÖÔåÖáç.", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ¯®âài¡®£® â¨¯ã ¬®iâ®àã.", TEXT_STYLE_NORMAL }, { 8, 11, - " Ô å·ãÔåí ENTER.", + " i â¨áiâì ENTER.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Õ å·ãÔåí ESC ¦ÐÞ ØÖë¨áÔ¨ÔÔÞ ¦Ö ØÖØ¨á¨¦ÔíÖ ãåÖáÔÆ· ¢¨ó óÒÔ·", + "\x07 â¨áiâì ESC ¤«ï ¯®¢¥à¥ï ¤® ¯®¯¥à¥¤ì®õ áâ®àiª¨ ¡¥§ §¬i¨", TEXT_STYLE_NORMAL }, { 8, 14, - " å·Øç ÒÖÔåÖá .", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· ESC = ì¦ÒÔ·å· F3 = ì·½å·", + " â¨¯ã ¬®iâ®à .", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ ESC = ª áã¢ â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -703,37 +703,37 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { 10, 6, - "×ãÔÖëÔ ÆÖÒØÖÔ¨Ôå· ReactOS ¢çÐ· çãØõÔÖ ëãå ÔÖëÐ¨Ô.", + "á®¢i ª®¬¯®¥â¨ ReactOS ¡ã«¨ ãá¯iè® ¢áâ ®¢«¥i.", TEXT_STYLE_NORMAL }, { 10, 8, - "ì·åÞ¬Ôåí ¦·ãÆ¨åç ó ¦·ãÆÖëÖ¦ç A: å ", + "¨âï£iâì ¤¨áª¥âã § ¤¨áª®¢®¤ã A: â ", TEXT_STYLE_NORMAL }, { 10, 9, - "ëãµ CD-ROM ó CD-Øá·ëÖ¦ë.", + "¢áiå CD-ROM § CD-¯à¨¢®¤i¢.", TEXT_STYLE_NORMAL }, { 10, 11, - "Õ å·ãÔåí ENTER ùÖ¢ Ø¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á", + " â¨áiâì ENTER é®¡ ¯¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -749,37 +749,37 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ìãå ÔÖëÐë û Ô¨ ÒÖé¨ ëãå ÔÖë·å· bootloader Ô éÖáãåÆ·½ ¦·ãÆ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "áâ ®¢«î¢ ç ¥ ¬®¦¥ ¢áâ ®¢¨â¨ bootloader ¦®àáâª¨© ¤¨áª", TEXT_STYLE_NORMAL }, { 6, 9, - "ì õÖ¬Ö ÆÖÒØ'å¨á ", + " è®£® ª®¬¯'îâ¥à ", TEXT_STYLE_NORMAL }, { 6, 13, - "£ç¦í-Ð ãÆ ëãå ëå¨ ë¦ªÖáÒ åÖë Ôç ¦·ãÆ¨åç ë ¦·ëÆÖëÖ¦ A: å ", + "ã¤ì-« áª ¢áâ ¢â¥ ¢i¤ä®à¬ â®¢ ã ¤¨áª¥âã ¢ ¤¨¢ª®¢®¤ A: â ", TEXT_STYLE_NORMAL }, { 6, 14, - "Ô å·ãÔåí ENTER.", + " â¨áiâì ENTER.", TEXT_STYLE_NORMAL, }, { 0, 0, - "ENTER = ÝáÖ¦Öëé·å· F3 = ì·½å·", + "ENTER = à®¤®¢¦¨â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -796,49 +796,49 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Õ·éû¨ Øá·ë¨¦¨Ô·½ ãØ·ãÖÆ ãÔçû·µ áÖó¦Ðë å Ô¨ó ½ÔÞåÖ¬Ö Òã¤Þ, ¦¨ ÒÖéÔ ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¨¦ç¥ ¯à¨¢¥¤¥¨© á¯¨á®ª iáãîç¨å à®§¤i«i¢ â ¥§ ©ïâ®£® ¬iáæï, ¤¥ ¬®¦ ", TEXT_STYLE_NORMAL }, { 6, 9, - "ãåëÖá·å· ÔÖë áÖó¦Ð·.", + "áâ¢®à¨â¨ ®¢i à®§¤i«¨.", TEXT_STYLE_NORMAL }, { 8, 11, - "\x07 Õ å·ãÆ ½å¨ ÆÐ ëõ ìì©â¶ å ìÕ¸ô ¦ÐÞ ë·¢Öáç ØçÔÆåç.", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ¯ãªâã.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Õ å·ãÔåí ENTER ùÖ¢ ëãå ÔÖë·å· ReactOS Ô ë·¢á Ô·½ áÖó¦Ð.", + "\x07 â¨áiâì ENTER é®¡ ¢áâ ®¢¨â¨ ReactOS ¢¨¡à ¨© à®§¤i«.", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Õ å·ãÔåí C ùÖ¢ ãåëÖá·å· ÔÖë·½ áÖó¦Ð.", + "\x07 â¨áiâì C é®¡ áâ¢®à¨â¨ ®¢¨© à®§¤i«.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Õ å·ãÔåí D ùÖ¢ ë·¦ Ð·å· ãÔçû·½ áÖó¦Ð.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "£ç¦í-Ð ãÆ ó û¨Æ ½å¨...", + "\x07 â¨áiâì D é®¡ ¢¨¤ «¨â¨ iáãîç¨© à®§¤i«.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ã¤ì-« áª § ç¥ª ©â¥...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -854,25 +854,25 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "«ÖáÒ åçë ÔÔÞ áÖó¦Ðç", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "®à¬ âã¢ ï à®§¤i«ã", TEXT_STYLE_NORMAL }, { 6, 10, - "ô á ó ëãå ÔÖëÐë û ë¦ªÖáÒ åç áÖó¦Ð. Õ å·ãÔåí ENTER ¦ÐÞ ØáÖ¦Öëé¨ÔÔÞ.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· F3 = ì·½å·", + " à § ¢áâ ®¢«î¢ ç ¢i¤ä®à¬ âãó à®§¤i«. â¨áiâì ENTER ¤«ï ¯à®¤®¢¦¥ï.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -888,43 +888,43 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ìãå ÔÖëÐë û ëãå ÔÖë·åí ª ½Ð· ReactOS Ô ë·¢á Ô·½ áÖó¦Ð. ì·¢¨áåí", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "áâ ®¢«î¢ ç ¢áâ ®¢¨âì ä ©«¨ ReactOS ¢¨¡à ¨© à®§¤i«. ¨¡¥àiâì", TEXT_STYLE_NORMAL }, { 6, 9, - "¦·á¨ÆåÖá, ë ÞÆç ì· µÖû¨å¨ ëãå ÔÖë·å· ReactOS:", + "¤¨à¥ªâ®àiî, ¢ ïªã ¨ å®ç¥â¥ ¢áâ ®¢¨â¨ ReactOS:", TEXT_STYLE_NORMAL }, { 6, 14, - "úÖ¢ óÒÔ·å· ¦·á¨ÆåÖá Ô å·ãÔåí BACKSPACE ¦ÐÞ ë·¦ Ð¨ÔÔÞ", + "®¡ §¬i¨â¨ ¤¨à¥ªâ®àiî â¨áiâì BACKSPACE ¤«ï ¢¨¤ «¥ï", TEXT_STYLE_NORMAL }, { 6, 15, - "ã·ÒëÖÐë ØãÐÞ ûÖ¬Ö ëë¨¦åí Ô óëç ¦·á¨ÆåÖá ¦ÐÞ", + "á¨¬¢®«i¢ ¯iá«ï ç®£® ¢¢¥¤iâì §¢ã ¤¨à¥ªâ®àiõ ¤«ï", TEXT_STYLE_NORMAL }, { 6, 16, - "ëãå ÔÖëÐ¨ÔÔÞ ReactOS.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· F3 = ì·½å·", + "¢áâ ®¢«¥ï ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -940,31 +940,31 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { 0, 12, - "£ç¦í-Ð ãÆ , ó û¨Æ ½å¨ ØÖÆ· ëãå ÔÖëÐë û ReactOS ÆÖØ ª ½Ð· ¦Ö", + "ã¤ì-« áª , § ç¥ª ©â¥ ¯®ª¨ ¢áâ ®¢«î¢ ç ReactOS ª®¯iîó ä ©«¨ ¤®", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 13, - "Ø ØÆ· Øá·óÔ û¨ÔÔÞ.", + "¯ ¯ª¨ ¯à¨§ ç¥ï.", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 14, - "¥¨ ÒÖé¨ ó ½ÔÞå· ¦¨ÆÐíÆ µë·Ð·Ô.", + "¥ ¬®¦¥ § ©ïâ¨ ¤¥ªi«ìª å¢¨«¨.", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 50, 0, - "\xB3 £ç¦í-Ð ãÆ ó û¨Æ ½å¨... ", + "\xB3 ã¤ì-« áª § ç¥ª ©â¥... ", TEXT_TYPE_STATUS }, { @@ -980,37 +980,37 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ìãå ÔÖëÐë û ëãå ÔÖëÐ boot loader", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "áâ ®¢«î¢ ç ¢áâ ®¢«îó boot loader", TEXT_STYLE_NORMAL }, { 8, 12, - "ìãå ÔÖë·å· bootloader Ô éÖáãåÆ·½ ¦·ãÆ (bootsector).", + "áâ ®¢¨â¨ bootloader ¦®àáâª¨© ¤¨áª (bootsector).", TEXT_STYLE_NORMAL }, { 8, 13, - "ìãå ÔÖë·å· bootloader Ô ¦·ãÆ¨åç.", + "áâ ®¢¨â¨ bootloader ¤¨áª¥âã.", TEXT_STYLE_NORMAL }, { 8, 14, - "Õ¨ ëãå ÔÖëÐë å· bootloader.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· F3 = ì·½å·", + "¥ ¢áâ ®¢«î¢ â¨ bootloader.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1026,43 +1026,43 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "æçå ì· ÒÖé¨å¨ óÒÔ·å· å·Ø ÆÐ ë åçá·.", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ãâ ¨ ¬®¦¥â¥ §¬i¨â¨ â¨¯ ª« ¢i âãà¨.", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Õ å·ãÆ ½å¨ ÆÐ ëõ ìì©â¶ å ìÕ¸ô ¦ÐÞ ë·¢Öáç ØÖåá¢ÔÖ¬Ö å·Øç ÆÐ ë åçá·.", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ¯®âài¡®£® â¨¯ã ª« ¢i âãà¨.", TEXT_STYLE_NORMAL }, { 8, 11, - " Ô å·ãÔåí ENTER.", + " i â¨áiâì ENTER.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Õ å·ãÔåí ESC ¦ÐÞ ØÖë¨áÔ¨ÔÔÞ Ô ØÖØ¨á¨¦Ô ãåÖáÔÆç ¢¨ó óÒÔ·", + "\x07 â¨áiâì ESC ¤«ï ¯®¢¥à¥ï ¯®¯¥à¥¤î áâ®àiªã ¡¥§ §¬i¨", TEXT_STYLE_NORMAL }, { 8, 14, - " å·Øç ÆÐ ë åçá·.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· ESC = ì¦ÒÔ·å· F3 = ì·½å·", + " â¨¯ã ª« ¢i âãà¨.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ ESC = ª áã¢ â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1078,43 +1078,43 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ì·¢¨áåí áÖóÆÐ ¦Æç, ÞÆ ¢ç¦¨ ëãå ÔÖëÐ¨Ô ÞÆ ãå Ô¦ áåÔ .", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¨¡¥àiâì à®§ª« ¤ªã, ïª ¡ã¤¥ ¢áâ ®¢«¥ ïª áâ ¤ àâ .", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Õ å·ãÆ ½å¨ ÆÐ ëõ ìì©â¶ å ìÕ¸ô ¦ÐÞ ë·¢Öáç ØÖåá¢ÔÖ áÖóÆÐ ¦Æ·", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ¯®âài¡®õ à®§ª« ¤ª¨", TEXT_STYLE_NORMAL }, { 8, 11, - " ÆÐ ë åçá· Ô å·ãÔåí ENTER.", + " ª« ¢i âãà¨ i â¨áiâì ENTER.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Õ å·ãÔåí ESC ¦ÐÞ ØÖë¨áÔ¨ÔÔÞ Ô ØÖØ¨á¨¦Ô ãåÖáÔÆç ¢¨ó óÒÔ·", + "\x07 â¨áiâì ESC ¤«ï ¯®¢¥à¥ï ¯®¯¥à¥¤î áâ®àiªã ¡¥§ §¬i¨", TEXT_STYLE_NORMAL }, { 8, 14, - " áÖóÆÐ ¦Æ· ÆÐ ë åçá·.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· ESC = ì¦ÒÔ·å· F3 = ì·½å·", + " à®§ª« ¤ª¨ ª« ¢i âãà¨.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ ESC = ª áã¢ â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1131,19 +1131,19 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ìãå ÔÖëÐë û ¬Öåç ì õ ÆÖÒØ'å¨á ¦ÐÞ ÆÖØë ÔÔÞ ª ½Ðë ReactOS. ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "¨Ô¨áç ãØ·ãÖÆ ª ½Ðë...", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "áâ ®¢«î¢ ç £®âãó è ª®¬¯'îâ¥à ¤«ï ª®¯iî¢ ï ä ©«i¢ ReactOS. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "¥¥àãî á¯¨á®ª ä ©«i¢...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1160,37 +1160,37 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { 6, 17, - "ì·¢¨áåí ª ½ÐÖëç ã·ãå¨Òç ó ãØ·ãÆç Ô·éû¨.", + "¨¡¥àiâì ä ©«®¢ã á¨áâ¥¬ã §i á¯¨áªã ¨¦ç¥.", 0 }, { 8, 19, - "\x07 Õ å·ãÆ ½å¨ ÆÐ ëõ ìì©â¶ å ìÕ¸ô ¦ÐÞ ë·¢Öáç ª ½ÐÖëÖ ã·ãå¨Ò·.", + "\x07 â¨áª ©â¥ ª« ¢ièi â ¤«ï ¢¨¡®àã ä ©«®¢®õ á¨áâ¥¬¨.", 0 }, { 8, 21, - "\x07 Õ å·ãÔåí ENTER ùÖ¢ ë¦ªÖáÒ åçë å· áÖó¦Ð.", + "\x07 â¨áiâì ENTER é®¡ ¢i¤ä®à¬ âã¢ â¨ à®§¤i«.", 0 }, { 8, 23, - "\x07 Õ å·ãÔåí ESC ¦ÐÞ ë·¢Öáç ÔõÖ¬Ö áÖó¦Ðç.", - 0 - }, - { - 0, - 0, - "ENTER = ÝáÖ¦Öëé·å· ESC = ì¦ÒÔ·å· F3 = ì·½å·", + "\x07 â¨áiâì ESC ¤«ï ¢¨¡®àã iè®£® à®§¤i«ã.", + 0 + }, + { + 0, + 0, + "ENTER = à®¤®¢¦¨â¨ ESC = ª áã¢ â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, @@ -1207,37 +1207,37 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ì· ë·¢á Ð· ë·¦ Ð¨ÔÔÞ áÖó¦Ðç", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¨ ¢¨¡à «¨ ¢¨¤ «¥ï à®§¤i«ã", TEXT_STYLE_NORMAL }, { 8, 18, - "\x07 Õ å·ãÔåí D ¦ÐÞ ë·¦ Ð¨ÔÔÞ áÖó¦Ðç.", + "\x07 â¨áiâì D ¤«ï ¢¨¤ «¥ï à®§¤i«ã.", TEXT_STYLE_NORMAL }, { 11, 19, - "èì¡¡: ìã ¦ Ô Ô ¤íÖÒç áÖó¦Ð ¢ç¦çåí ëåá û¨Ô!", + ": ái ¤ i æì®¬ã à®§¤i«i ¡ã¤ãâì ¢âà ç¥i!", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Õ å·ãÔåí ESC ¦ÐÞ ë¦ÒÔ·.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "D = ì·¦ Ð·å· âÖó¦Ð ESC = ì¦ÒÔ·å· F3 = ì·½å·", + "\x07 â¨áiâì ESC ¤«ï áª áã¢ ï.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = ¨¤ «¨â¨ ®§¤i« ESC = ª áã¢ â¨ F3 = ¨©â¨", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1253,19 +1253,19 @@ { 4, 3, - " ìãå ÔÖëÐ¨ÔÔÞ ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ìãå ÔÖëÐë û ÖÔÖëÐ ÆÖÔª¬çá ¤ ã·ãå¨Ò·. ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "äåëÖá ãåáçÆåçáç á¨ãåáç...", + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "áâ ®¢«î¢ ç ®®¢«îó ª®äi£ãà æiî á¨áâ¥¬¨. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "â¢®àîî áâàãªâãàã à¥óáâàã...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1281,208 +1281,208 @@ { { //ERROR_NOT_INSTALLED - "ReactOS Ô¨ ¢çë ØÖëÔãå ëãå ÔÖëÐ¨Ô·½ Ô ì õ\n" - "ÆÖÒØ'å¨á. àÆùÖ ë· ë·½¦¨å¨ ó ëãå ÔÖëÐë û ó á ó,\n" - "åÖ ì Ò ¢ç¦¨ Ô¨Ö¢µ¦ÔÖ ó Øçãå·å· ØáÖ¬á Òç ëãå ÔÖëÐ¨ÔÔÞ\n" - "óÔÖëç, ÞÆùÖ ì· µÖû¨å¨ ëãå ÔÖë·å· ReactOS,\n" + "ReactOS ¥ ¡ã¢ ¯®¢iáâî ¢áâ ®¢«¥¨© è\n" + "ª®¬¯'îâ¥à. ªé® ¢¨ ¢¨©¤¥â¥ § ¢áâ ®¢«î¢ ç § à §,\n" + "â® ¬ ¡ã¤¥ ¥®¡åi¤® § ¯ãáâ¨â¨ ¯à®£à ¬ã ¢áâ ®¢«¥ï\n" + "§®¢ã, ïªé® ¨ å®ç¥â¥ ¢áâ ®¢¨â¨ ReactOS,\n" "\n" - " \x07 Õ å·ãÔåí ENTER ùÖ¢ ØáÖ¦Öëé·å· ëãå ÔÖëÐ¨ÔÔÞ.\n" - " \x07 Õ å·ãÔåí F3 ¦ÐÞ ë·µÖ¦ç ó ëãå ÔÖëÐë û .", - "F3 = ì·½å· ENTER = ÝáÖ¦Öëé·å·" + " \x07 â¨áiâì ENTER é®¡ ¯à®¤®¢¦¨â¨ ¢áâ ®¢«¥ï.\n" + " \x07 â¨áiâì F3 ¤«ï ¢¨å®¤ã § ¢áâ ®¢«î¢ ç .", + "F3 = ¨©â¨ ENTER = à®¤®¢¦¨â¨" }, { //ERROR_NO_HDD - "Õ¨ ë¦ ÐÖãí óÔ ½å· éÖáãåÆ·½ ¦·ãÆ.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ©â¨ ¦®àáâª¨© ¤¨áª.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_NO_SOURCE_DRIVE - "Õ¨ ë¦ ÐÖãí óÔ ½å· çãå ÔÖëÖûÔ·½ ¦·ãÆ.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ©â¨ ãáâ ®¢®ç¨© ¤¨áª.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_LOAD_TXTSETUPSIF - "Õ¨ ë¦ ÐÖãí ó ë Ôå é·å· ª ½Ð TXTSETUP.SIF.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ¢ â ¦¨â¨ ä ©« TXTSETUP.SIF.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_CORRUPT_TXTSETUPSIF - "« ½Ð TXTSETUP.SIF ØÖõÆÖ¦é¨Ô·½.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + " ©« TXTSETUP.SIF ¯®èª®¤¦¥¨©.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_SIGNATURE_TXTSETUPSIF, - "ì·ÞëÐ¨ÔÖ Ô¨ÆÖá¨ÆåÔ·½ Ø¦Ø·ã ë TXTSETUP.SIF.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¨ï¢«¥® ¥ª®à¥ªâ¨© ¯i¤¯¨á ¢ TXTSETUP.SIF.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_DRIVE_INFORMATION - "Õ¨ ë¦ ÐÖãí Öåá·Ò å· ¦ Ô ØáÖ ã·ãå¨ÒÔ·½ ¦·ãÆ.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ®âà¨¬ â¨ ¤ i ¯à® á¨áâ¥¬¨© ¤¨áª.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_WRITE_BOOT, - "Õ¨ ë¦ ÐÖãí ëãå ÔÖë·å· ó ë Ôå éçë ÐíÔ·½ ÆÖ¦ FAT Ô ã·å¨ÒÔ·½ áÖó¦Ð.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ¢áâ ®¢¨â¨ § ¢ â ¦ã¢ «ì¨© ª®¤ FAT á¨â¥¬¨© à®§¤i«.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_LOAD_COMPUTER, - "Õ¨ ë¦ ÐÖãí ó ë Ôå é·å· ãØ·ãÖÆ å·Øë ÆÖÒØ'å¨á .\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ¢ â ¦¨â¨ á¯¨á®ª â¨¯i¢ ª®¬¯'îâ¥à .\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_LOAD_DISPLAY, - "Õ¨ ë¦ ÐÖãí ó ë Ôå é·å· ãØ·ãÖÆ á¨é·Òë ¨Æá Ôç.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ¢ â ¦¨â¨ á¯¨á®ª à¥¦¨¬i¢ ¥ªà ã.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_LOAD_KEYBOARD, - "Õ¨ ë¦ ÐÖãí ó ë Ôå é·å· ãØ·ãÖÆ å·Øë ÆÐ ë åçá·.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ¢ â ¦¨â¨ á¯¨á®ª â¨¯i¢ ª« ¢i âãà¨.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_LOAD_KBLAYOUT, - "Õ¨ ë¦ ÐÖãí ó ë Ôå é·å· ãØ·ãÖÆ áÖóÆÐ ¦ÖÆ ÆÐ ë åçá·.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ¢ â ¦¨â¨ á¯¨á®ª à®§ª« ¤®ª ª« ¢i âãà¨.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_WARN_PARTITION, - "ôÔ ½¦¨ÔÖ ÞÆ ÒÔÒçÒ Ö¦·Ô éÖáãåÆ·½ ¦·ãÆ, ùÖ Òãå·åí áÖó¦Ð,\n" - "ÞÆ·½ Ô¨ Ø¦åá·ÒçåíãÞ ReactOS!\n" + " ©¤¥® ïª ¬ii¬ã¬ ®¤¨ ¦®àáâª¨© ¤¨áª, é® ¬iáâ¨âì à®§¤i«,\n" + "ïª¨© ¥ ¯i¤âà¨¬ãóâìáï ReactOS!\n" "\n" - "äåëÖá¨ÔÔÞ û· ë·¦ Ð¨ÔÔÞ áÖó¦Ðë ÒÖé¨ óáç½Ôçë å· å ¢Ð·¤ áÖó¦Ðë.\n" + "â¢®à¥ï ç¨ ¢¨¤ «¥ï à®§¤i«i¢ ¬®¦¥ §àã©ã¢ â¨ â ¡«¨æî à®§¤i«i¢.\n" "\n" - " \x07 Õ å·ãÔåí F3 ¦ÐÞ ë·µÖ¦ç ó ëãå ÔÖëÐë û .\n" - " \x07 Õ å·ãÔåí ENTER ùÖ¢ ØáÖ¦Öëé·å·.", - "F3= ì·½å· ENTER = ÝáÖ¦Öëé·å·" + " \x07 â¨áiâì F3 ¤«ï ¢¨å®¤ã § ¢áâ ®¢«î¢ ç .\n" + " \x07 â¨áiâì ENTER é®¡ ¯à®¤®¢¦¨â¨.", + "F3= ¨©â¨ ENTER = à®¤®¢¦¨â¨" }, { //ERROR_NEW_PARTITION, - "ì· Ô¨ ÒÖé¨å¨ ãåëÖá·å· ÔÖë·½ áÖó¦Ð Ô \n" - "ëé¨ ãÔçûÖÒç áÖó¦Ð!\n" + "¨ ¥ ¬®¦¥â¥ áâ¢®à¨â¨ ®¢¨© à®§¤i« \n" + "¢¦¥ iáãîç®¬ã à®§¤i«i!\n" "\n" - " * Õ å·ãÔåí ¢ç¦í-ÞÆç ÆÐ ëõç ùÖ¢ ØáÖ¦Öëé·å·.", + " * â¨áiâì ¡ã¤ì-ïªã ª« ¢ièã é®¡ ¯à®¤®¢¦¨â¨.", NULL }, { //ERROR_DELETE_SPACE, - "Õ¨ ÒÖéÔ ë·¦ Ð·å· Ô¨áÖóÒû¨Ôç Ö¢Ð ãåí Ô ¦·ãÆç!\n" + "¥ ¬®¦ ¢¨¤ «¨â¨ ¥à®§¬iç¥ã ®¡« áâì ¤¨áªã!\n" "\n" - " * Õ å·ãÔåí ¢ç¦í-ÞÆç ÆÐ ëõç ùÖ¢ ØáÖ¦Öëé·å·.", + " * â¨áiâì ¡ã¤ì-ïªã ª« ¢ièã é®¡ ¯à®¤®¢¦¨â¨.", NULL }, { //ERROR_INSTALL_BOOTCODE, - "Õ¨ ë¦ ÐÖãí ëãå ÔÖë·å· ó ë Ôå éçë ÐíÔ·½ ÆÖ¦ FAT Ô ã·å¨ÒÔ·½ áÖó¦Ð.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ¢áâ ®¢¨â¨ § ¢ â ¦ã¢ «ì¨© ª®¤ FAT á¨â¥¬¨© à®§¤i«.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_NO_FLOPPY, - "ì¦ãçåÔÞ ¦·ãÆ¨å ë ¦·ãÆÖëÖ¦ A:.", - "ENTER = ÝáÖ¦Öëé·å·" + "i¤áãâï ¤¨áª¥â ¢ ¤¨áª®¢®¤i A:.", + "ENTER = à®¤®¢¦¨â¨" }, { //ERROR_UPDATE_KBSETTINGS, - "Õ¨ ë¦ ÐÖãí ÖÔÖë·å· Ø á Ò¨åá· áÖóÆÐ ¦Æ· ÆÐ ë åçá·.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ®®¢¨â¨ ¯ à ¬¥âà¨ à®§ª« ¤ª¨ ª« ¢i âãà¨.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, - "Õ¨ ë¦ ÐÖãí ÖÔÖë·å· Ø á Ò¨åá· ¨Æá Ôç ë á¨ãåá.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ®®¢¨â¨ ¯ à ¬¥âà¨ ¥ªà ã ¢ à¥óáâài.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_IMPORT_HIVE, - "Õ¨ ë¦ ÐÖãí ÒØÖáåçë å· ª ½Ð Æçùë á¨ãåáç.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì i¬¯®àâã¢ â¨ ä ©« ªãéi¢ à¥óáâàã.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_FIND_REGISTRY - "Õ¨ ë¦ ÐÖãí óÔ ½å· ª ½Ð· ¦ Ô·µ á¨ãåáç.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ©â¨ ä ©«¨ ¤ ¨å à¥óáâàã.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_CREATE_HIVE, - "Õ¨ ë¦ ÐÖãí ãåëÖá·å· Æçù á¨ãåáç.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì áâ¢®à¨â¨ ªãéi à¥óáâàã.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_INITIALIZE_REGISTRY, - "Õ¨ ë¦ ÐÖãí Ô¤ Ðóçë å· á¨ãåá.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì iiæi «i§ã¢ â¨ à¥óáâà.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_INVALID_CABINET_INF, - "Cabinet Ò Ô¨ÆÖá¨ÆåÔ·½ inf-ª ½Ð.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "Cabinet ¬ ó ¥ª®à¥ªâ¨© inf-ä ©«.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_CABINET_MISSING, - "Cabinet Ô¨ óÔ ½¦¨ÔÖ.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "Cabinet ¥ § ©¤¥®.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_CABINET_SCRIPT, - "Cabinet Ô¨ Ò çãå ÔÖëÖûÔÖ¬Ö ã¤¨Ô á.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "Cabinet ¥ ¬ ó ãáâ ®¢®ç®£® áæ¥ àiî.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_COPY_QUEUE, - "Õ¨ ë¦ ÐÖãí ë¦Æá·å· û¨á¬ç ÆÖØë ÔÔÞ ª ½Ðë.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ¢i¤ªà¨â¨ ç¥à£ã ª®¯iî¢ ï ä ©«i¢.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_CREATE_DIR, - "Õ¨ ë¦ ÐÖãí ãåëÖá·å· ¦·á¨ÆåÖá ¦ÐÞ ëãå ÔÖëÐ¨ÔÔÞ.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì áâ¢®à¨â¨ ¤¨à¥ªâ®àiõ ¤«ï ¢áâ ®¢«¥ï.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_TXTSETUP_SECTION, - "Õ¨ ë¦ ÐÖãí óÔ ½å· ã¨Æ¤ 'Directories'\n" - "ë ª ½Ð TXTSETUP.SIF.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ©â¨ á¥ªæiî 'Directories'\n" + "¢ ä ©«i TXTSETUP.SIF.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_CABINET_SECTION, - "Õ¨ ë¦ ÐÖãí óÔ ½å· ã¨Æ¤ 'Directories'\n" - "ë cabinet.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ©â¨ á¥ªæiî 'Directories'\n" + "¢ cabinet.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_CREATE_INSTALL_DIR - "Õ¨ ë¦ ÐÖãí ãåëÖá·å· ¦·á¨ÆåÖá ¦ÐÞ ëãå ÔÖëÐÔÔÞ.", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì áâ¢®à¨â¨ ¤¨à¥ªâ®àiî ¤«ï ¢áâ ®¢«ï.", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_FIND_SETUPDATA, - "Õ¨ ë¦ ÐÖãí óÔ ½å· ã¨Æ¤ 'SetupData'\n" - "ë ª ½Ð TXTSETUP.SIF.\n", - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ©â¨ á¥ªæiî 'SetupData'\n" + "¢ ä ©«i TXTSETUP.SIF.\n", + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_WRITE_PTABLE, - "Õ¨ ë¦ ÐÖãí ó Ø·ã å· å ¢Ð·¤ áÖó¦Ðë.\n" - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì § ¯¨á â¨ â ¡«¨æi à®§¤i«i¢.\n" + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_ADDING_CODEPAGE, - "Õ¨ ë¦ ÐÖãí ¦Ö¦ å· Ø á Ò¨åá· ÆÖ¦çë ÔÔÞ ë á¨ãåá.\n" - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ¤®¤ â¨ ¯ à ¬¥âà¨ ª®¤ã¢ ï ¢ à¥óáâà.\n" + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_UPDATE_LOCALESETTINGS, - "Õ¨ ë¦ ÐÖãí ëãå ÔÖë·å· ÐÖÆ Ðí ã·ãå¨Ò·.\n" - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ¢áâ ®¢¨â¨ «®ª «ì á¨áâ¥¬¨.\n" + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_ADDING_KBLAYOUTS, - "Õ¨ ë¦ ÐÖãí ¦Ö¦ å· áÖóÆÐ ¦Æ· ÆÐ ë åçá· ¦Ö á¨ãåáç.\n" - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ¤®¤ â¨ à®§ª« ¤ª¨ ª« ¢i âãà¨ ¤® à¥óáâàã.\n" + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { //ERROR_UPDATE_GEOID, - "Õ¨ ë¦ ÐÖãí ëãå ÔÖë·å· geo id.\n" - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á" + "¥ ¢¤ «®áì ¢áâ ®¢¨â¨ geo id.\n" + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { NULL, @@ -1593,103 +1593,103 @@ MUI_STRING ukUAStrings[] = { {STRING_PLEASEWAIT, - " £ç¦í-Ð ãÆ , ó û¨Æ ½å¨..."}, + " ã¤ì-« áª , § ç¥ª ©â¥..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = ìãå ÔÖë·å· C = äåëÖá·å· âÖó¦Ð F3 = ì·½å·"}, + " ENTER = áâ ®¢¨â¨ C = â¢®à¨â¨ ®§¤i« F3 = ¨©â¨"}, {STRING_INSTALLDELETEPARTITION, - " ENTER = ìãå ÔÖë·å· D = ì·¦ Ð·å· âÖó¦Ð F3 = ì·½å·"}, + " ENTER = áâ ®¢¨â¨ D = ¨¤ «¨â¨ ®§¤i« F3 = ¨©â¨"}, {STRING_PARTITIONSIZE, - "âÖóÒá ÔÖëÖ¬Ö áÖó¦Ðç:"}, + "®§¬ià ®¢®£® à®§¤i«ã:"}, {STRING_CHOOSENEWPARTITION, - "ì· µÖû¨å¨ ãåëÖá·å· ÔÖë·½ áÖó¦Ð Ô "}, + "¨ å®ç¥â¥ áâ¢®à¨â¨ ®¢¨© à®§¤i« "}, {STRING_HDDSIZE, - "£ç¦í-Ð ãÆ , ëë¨¦åí áÖóÒá ÔÖëÖ¬Ö áÖó¦Ðç ë Ò¨¬ ¢ ½å µ."}, + "ã¤ì-« áª , ¢¢¥¤iâì à®§¬ià ®¢®£® à®§¤i«ã ¢ ¬¥£ ¡ ©â å."}, {STRING_CREATEPARTITION, - " ENTER = äåëÖá·å· âÖó¦Ð ESC = ì¦ÒÔ·å· F3 = ì·½å·"}, + " ENTER = â¢®à¨â¨ ®§¤i« ESC = ª áã¢ â¨ F3 = ¨©â¨"}, {STRING_PARTFORMAT, - "¥¨½ áÖó¦Ð ¢ç¦¨ ë¦ªÖáÒ åÖë ÔÖ."}, + "¥© à®§¤i« ¡ã¤¥ ¢i¤ä®à¬ â®¢ ®."}, {STRING_NONFORMATTEDPART, - "ì· ë·¢á Ð· ëãå ÔÖëÐ¨ÔÔÞ ReactOS Ô ÔÖë·½ ¢Ö Ô¨ªÖáÒ åÖë Ô·½ áÖó¦Ð."}, + "¨ ¢¨¡à «¨ ¢áâ ®¢«¥ï ReactOS ®¢¨© ¡® ¥ä®à¬ â®¢ ¨© à®§¤i«."}, {STRING_INSTALLONPART, - "ReactOS ëãå ÔÖëÐåíãÞ Ô áÖó¦Ð"}, + "ReactOS ¢áâ ®¢«îóâìáï à®§¤i«"}, {STRING_CHECKINGPART, - "ìãå ÔÖëÐë û Ø¨á¨ëáÞ ë·¢á Ô·½ áÖó¦Ð."}, + "áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© à®§¤i«."}, {STRING_QUITCONTINUE, - "F3= ì·½å· ENTER = ÝáÖ¦Öëé·å·"}, + "F3= ¨©â¨ ENTER = à®¤®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER, - "ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á"}, + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à"}, {STRING_TXTSETUPFAILED, - "ìãå ÔÖëÐë û Ô¨ óÒ¬ óÔ ½å· ã¨Æ¤ '%S' \në ª ½Ð TXTSETUP.SIF.\n"}, + "áâ ®¢«î¢ ç ¥ §¬i£ § ©â¨ á¥ªæiî '%S' \n¢ ä ©«i TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 ÇÖØë ÔÔÞ: %S"}, + "\xB3 ®¯iî¢ ï: %S"}, {STRING_SETUPCOPYINGFILES, - "ìãå ÔÖëÐë û ÆÖØ ª ½Ð·..."}, + "áâ ®¢«î¢ ç ª®¯iîó ä ©«¨..."}, {STRING_REGHIVEUPDATE, - " ×ÔÖëÐ¨ÔÔÞ Æçùë á¨ãåáç..."}, + " ®¢«¥ï ªãéi¢ à¥óáâàã..."}, {STRING_IMPORTFILE, - " ÒØÖáåçë ÔÔÞ %S..."}, + " I¬¯®àâã¢ ï %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " ×ÔÖëÐ¨ÔÔÞ Ø á Ò¨åáë ¨Æá Ôç ë á¨ãåá..."}, + " ®¢«¥ï ¯ à ¬¥âài¢ ¥ªà ã ¢ à¥óáâài..."}, {STRING_LOCALESETTINGSUPDATE, - " ×ÔÖëÐ¨ÔÔÞ Ø á Ò¨åáë ÐÖÆ Ð..."}, + " ®¢«¥ï ¯ à ¬¥âài¢ «®ª «i..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " ×ÔÖëÐ¨ÔÔÞ Ø á Ò¨åáë áÖóÆÐ ¦Æ· ÆÐ ë åçá·..."}, + " ®¢«¥ï ¯ à ¬¥âài¢ à®§ª« ¤ª¨ ª« ¢i âãà¨..."}, {STRING_CODEPAGEINFOUPDATE, - " §Ö¦ ë ÔÔÞ ¦ Ô·µ ØáÖ ÆÖ¦Öëç ãåÖáÔÆç ë á¨ãåá..."}, + " ®¤ ¢ ï ¤ ¨å ¯à® ª®¤®¢ã áâ®àiªã ¢ à¥óáâà..."}, {STRING_DONE, - " ÖåÖëÖ..."}, + " ®â®¢®..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Ý¨á¨ó ë Ôå é·å· ÆÖÒØ'å¨á"}, + " ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à"}, {STRING_CONSOLEFAIL1, - "Õ¨ ë¦ ÐÖãí ë¦Æá·å· ÆÖÔãÖÐí\n\n"}, + "¥ ¢¤ «®áì ¢i¤ªà¨â¨ ª®á®«ì\n\n"}, {STRING_CONSOLEFAIL2, - "Õ ½¢Ðíõ ½ÒÖëáÔ Øá·û·Ô ¤íÖ¬Ö - ë·ÆÖá·ãå ÔÔÞ USB ÆÐ ë åçá·\n"}, + " ©¡i«ìè ©¬®¢ià ¯à¨ç¨ æì®£® - ¢¨ª®à¨áâ ï USB ª« ¢i âãà¨\n"}, {STRING_CONSOLEFAIL3, - "USB ÆÐ ë åçá· ù¨ Ô¨ Ø¦åá·ÒçåíãÞ ØÖëÔãå\n"}, + "USB ª« ¢i âãà¨ é¥ ¥ ¯i¤âà¨¬ãîâìáï ¯®¢iáâî\n"}, {STRING_FORMATTINGDISK, - "ìãå ÔÖëÐë û ªÖáÒ åç ë õ ¦·ãÆ"}, + "áâ ®¢«î¢ ç ä®à¬ âãó ¢ è ¤¨áª"}, {STRING_CHECKINGDISK, - "ìãå ÔÖëÐë û Ø¨á¨ëáÞ ë õ ¦·ãÆ"}, + "áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢ è ¤¨áª"}, {STRING_FORMATDISK1, - " «ÖáÒ åçë å· áÖó¦Ð ë ª ½ÐÖë½ ã·ãå¨Ò %S (õë·¦Æ¨ ªÖáÒ åçë ÔÔÞ) "}, + " ®à¬ âã¢ â¨ à®§¤i« ¢ ä ©«®¢i© á¨áâ¥¬i %S (è¢¨¤ª¥ ä®à¬ âã¢ ï) "}, {STRING_FORMATDISK2, - " «ÖáÒ åçë å· áÖó¦Ð ë ª ½ÐÖë½ ã·ãå¨Ò %S "}, + " ®à¬ âã¢ â¨ à®§¤i« ¢ ä ©«®¢i© á¨áâ¥¬i %S "}, {STRING_KEEPFORMAT, - " ô Ð·õ·å· ãÔçûç ª ½ÐÖëç ã·ãå¨Òç (¢¨ó óÒÔ) "}, + " «¨è¨â¨ iáãîçã ä ©«®¢ã á¨áâ¥¬ã (¡¥§ §¬i) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s êÖáãåÆ·½ ¦·ãÆ %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s ®àáâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu) on %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s êÖáãåÆ·½ ¦·ãÆ %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s ®àáâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "Ô %I64u %s êÖáãåÆ·½ ¦·ãÆ %lu (ÝÖáå=%hu, ö·Ô =%hu, Id=%hu) on %wZ."}, + " %I64u %s ®àáâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu) on %wZ."}, {STRING_HDDINFOUNK3, - "Ô %I64u %s êÖáãåÆ·½ ¦·ãÆ %lu (ÝÖáå=%hu, ö·Ô =%hu, Id=%hu)."}, + " %I64u %s ®àáâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "êÖáãåÆ·½ ¦·ãÆ %lu (%I64u %s), ÝÖáå=%hu, ö·Ô =%hu, Id=%hu (%wZ)."}, + "®àáâª¨© ¤¨áª %lu (%I64u %s), ®àâ=%hu, ¨ =%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "Ô êÖáãåÆÖÒç ¦·ãÆç %lu (%I64u %s), ÝÖáå=%hu, ö·Ô =%hu, Id=%hu (%wZ)."}, + " ®àáâª®¬ã ¤¨áªã %lu (%I64u %s), ®àâ=%hu, ¨ =%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s êÖáãåÆ·½ ¦·ãÆ %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s ®àáâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu) on %S"}, {STRING_HDDINFOUNK6, - "%6lu %s êÖáãåÆ·½ ¦·ãÆ %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s ®àáâª¨© ¤¨áª %lu (®àâ=%hu, ¨ =%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "ìãå ÔÖëÐë û ãåëÖá·ë ÔÖë·½ áÖó¦Ð Ô "}, + "áâ ®¢«î¢ ç áâ¢®à¨¢ ®¢¨© à®§¤i« "}, {STRING_UNPSPACE, - " Õ¨áÖóÒû¨Ô Ö¢Ð ãåí %6lu %s"}, + " ¥à®§¬iç¥ ®¡« áâì %6lu %s"}, {STRING_MAXSIZE, - "MB (Ò Æã. %lu MB)"}, + "MB (¬ ªá. %lu MB)"}, {STRING_UNFORMATTED, - "ÕÖë·½ (Õ¨ªÖáÒ åÖë Ô·½)"}, + "®¢¨© (¥ä®à¬ â®¢ ¨©)"}, {STRING_FORMATUNUSED, - "Õ¨ ë·ÆÖá·ãå ÔÖ"}, + "¥ ¢¨ª®à¨áâ ®"}, {STRING_FORMATUNKNOWN, - "Õ¨ë¦ÖÒÖ"}, + "¥¢i¤®¬®"}, {STRING_KB, "KB"}, {STRING_MB, @@ -1697,8 +1697,8 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "§Ö¦ ë ÔÔÞ áÖóÆÐ ¦ÖÆ ÆÐ ë åçá·"}, + "®¤ ¢ ï à®§ª« ¤®ª ª« ¢i âãà¨"}, {0, 0} }; -#endif +#endif

14 years, 7 months

[dreimer] 45259: PS Port of the kdbg command. Not working yet, because PS seems to dislike the < operator in the log2lines line

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 26 10:49:57 2010 New Revision: 45259 URL: http://svn.reactos.org/svn/reactos?rev=45259&view=rev Log: PS Port of the kdbg command. Not working yet, because PS seems to dislike the < operator in the log2lines line Added: trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Tue Jan 26 10:49:57 2010 @@ -44,6 +44,11 @@ " help [COMMAND] - Display the available commands or give help on a" " specific command." + if (Test-Path "$_ROSBE_BASEDIR\kdbg.ps1") { + " kdbg [OPTIONS] - Outputs KDBG Debug Output and lets you give" + " debug commands to it." + } + if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { " raddr2line [OPTIONS] - Translates program addresses into file names and" " line numbers to assist developers with finding" @@ -170,6 +175,15 @@ } elseif ("$args" -eq "help") { " Usage: help [COMMAND]" " Shows help for the specified command or lists all available commands." + +} elseif ("$args" -eq "kdbg") { + if (Test-Path "$_ROSBE_BASEDIR\kdbg.ps1") { + " Usage: kdbg [LOGFILE] [PIPE]" + " Outputs KDBG Debug Output and lets you give debug commands to it." + "" + " WRITELOG - Outputs the Log File to "".\DBG-%DATE%-%TIME%.txt""." + "" + } } elseif ("$args" -eq "raddr2line") { if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { " Usage: raddr2line [FILE] [ADDRESS]" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Jan 26 10:49:57 2010 @@ -117,6 +117,10 @@ set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global } + if (Test-Path "$_ROSBE_BASEDIR\kdbg.ps1") { + set-alias KDBG "$_ROSBE_BASEDIR\kdbg.ps1" -scope Global + } + if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global } Added: trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 [iso-8859-1] Tue Jan 26 10:49:57 2010 @@ -1,0 +1,29 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/kdbg.ps1 +# PURPOSE: Displays a KDBG Session Interactively. +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> +# + +$DATENAME = get-date -f dyMMyyyy +$TIMENAME = get-date -f HHmm + +$host.ui.RawUI.WindowTitle = "kdbg Session..." + +if ("$($args[0])" -eq "writelog") { + if ("$($args[1])" -eq "") { + $LOGFILE = "-l DBG-$datename-$timename.txt" + } else { + $LOGFILE = "-l ""$($args[1])""" + } +} else { + $LOGFILE = $null +} + +"Now Start your VM with COM1 set to \\.\pipe\kdbg" +read-host 'Press any key to continue . . .' + +log2lines -c $LOGFILE < \\.\pipe\kdbg + +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/kdbg.ps1 ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 7 months

[gedmurphy] 45258: Fix rbuild paths and try to improve the hardcoded mess by using the preprocessor instead

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 26 10:30:52 2010 New Revision: 45258 URL: http://svn.reactos.org/svn/reactos?rev=45258&view=rev Log: Fix rbuild paths and try to improve the hardcoded mess by using the preprocessor instead Modified: branches/Tree-restructure-test/sdk/tools/rbuild/backend/codeblocks/codeblocks.cpp branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.vcproj branches/Tree-restructure-test/sdk/tools/rbuild/test.h Modified: branches/Tree-restructure-test/sdk/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Tue Jan 26 10:30:52 2010 @@ -682,9 +682,9 @@ if ( dll ) { if (IsSpecDefinitionFile( module )) - fprintf ( OUT, "\t\t\t\t\t<Add before=\"%s%stools%swinebuild%swinebuild.exe -o %s --def -E %s.spec\" />\r\n", outdir.c_str(), sSep, sSep, sSep, module.importLibrary->definition.c_str(), module.name.c_str()); + fprintf ( OUT, "\t\t\t\t\t<Add before=\"%s%s%swinebuild%swinebuild.exe -o %s --def -E %s.spec\" />\r\n", outdir.c_str(), sSep, TOOLS_BASE, sSep, module.importLibrary->definition.c_str(), module.name.c_str()); fprintf ( OUT, "\t\t\t\t\t<Add before=\"dlltool --dllname %s --def %s --output-exp %s.temp.exp %s\" />\r\n", module.GetTargetName ().c_str(), module.importLibrary->definition.c_str(), module.name.c_str(), module.mangledSymbols ? "" : "--kill-at" ); - fprintf ( OUT, "\t\t\t\t\t<Add after=\"%s%stools%spefixup $exe_output -exports\" />\r\n", outdir.c_str(), sSep, sSep ); + fprintf ( OUT, "\t\t\t\t\t<Add after=\"%s%s%spefixup $exe_output -exports\" />\r\n", outdir.c_str(), sSep, TOOLS_BASE); #ifdef WIN32 fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del %s.temp.exp 2>NUL\" />\r\n", module.name.c_str() ); #else @@ -760,13 +760,13 @@ else if ( extension == ".idl" || extension == ".IDL" ) { fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); - fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s%stools%swidl%swidl.exe %s %s -h -H "$(TARGET_OUTPUT_DIR)$filetitle_c.h" -c -C "$(TARGET_OUTPUT_DIR)$filetitle_c.c" $file%sngcc %s -c "$(TARGET_OUTPUT_DIR)$filetitle_c.c" -o "$(TARGET_OUTPUT_DIR)$file_c.o"\" />\r\n", outdir.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str(), widl_options.c_str(), windres_defines.c_str(), sSep.c_str(), widl_options.c_str() ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s%s%swidl%swidl.exe %s %s -h -H "$(TARGET_OUTPUT_DIR)$filetitle_c.h" -c -C "$(TARGET_OUTPUT_DIR)$filetitle_c.c" $file%sngcc %s -c "$(TARGET_OUTPUT_DIR)$filetitle_c.c" -o "$(TARGET_OUTPUT_DIR)$file_c.o"\" />\r\n", outdir.c_str(), sSep.c_str(), TOOLS_BASE, sSep.c_str(), widl_options.c_str(), windres_defines.c_str(), sSep.c_str(), widl_options.c_str() ); } else if ( extension == ".spec" || extension == ".SPEC" ) { fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); fprintf ( OUT, "\t\t\t<Option link=\"1\" />\r\n" ); - fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s%stools%swinebuild%swinebuild.exe -o $file.stubs.c --pedll $file\\n$compiler -c $options $includes $file.stubs.c -o $(TARGET_OBJECT_DIR)%s$file.o\" />\r\n", outdir.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str() ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s%s%swinebuild%swinebuild.exe -o $file.stubs.c --pedll $file\\n$compiler -c $options $includes $file.stubs.c -o $(TARGET_OBJECT_DIR)%s$file.o\" />\r\n", outdir.c_str(), sSep.c_str(), TOOLS_BASE, sSep.c_str(), sSep.c_str() ); } for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) @@ -784,7 +784,9 @@ fprintf ( OUT, "\t\t<Unit filename=\"%s\">\r\n", resource_file.c_str() ); fprintf ( OUT, "\t\t\t<Option compilerVar=\"WINDRES\" />\r\n" ); string extension = GetExtension ( resource_file ); - fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o $(TARGET_OBJECT_DIR)%s$file.rci.tmp\\n%s%stools%swrc%swrc.exe $includes %s $(TARGET_OBJECT_DIR)%s$file.rci.tmp $(TARGET_OBJECT_DIR)%s$file.res.tmp\\n$rescomp --output-format=coff $(TARGET_OBJECT_DIR)%s$file.res.tmp -o $resource_output\" />\r\n" , windres_defines.c_str(), sSep.c_str(), outdir.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str(), windres_defines.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str() ); + // FIXME: Sort out this param mess. This backend is probably gonna be deleted, so I couldn't be arsed ... Ged. + //fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o $(TARGET_OBJECT_DIR)%s$file.rci.tmp\\n%swrc%swrc.exe $includes %s $(TARGET_OBJECT_DIR)%s$file.rci.tmp $(TARGET_OBJECT_DIR)%s$file.res.tmp\\n$rescomp --output-format=coff $(TARGET_OBJECT_DIR)%s$file.res.tmp -o $resource_output\" />\r\n" , + // windres_defines.c_str(), sSep.c_str(), TOOLS_BASE, sSep.c_str(), outdir.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str(), windres_defines.c_str(), sSep.c_str(), sSep.c_str() ); for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) { const CBConfiguration& cfg = *m_configurations[icfg]; Modified: branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Jan 26 10:30:52 2010 @@ -429,9 +429,9 @@ void MingwBackend::GenerateGlobalVariables () const { - fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", ProjectNode.GetLinkerSet ().c_str () ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", ProjectNode.GetCompilerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)rules.mak\n", RBUILD_BASE ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetLinkerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetCompilerSet ().c_str () ); if ( mscPath.length() ) fprintf ( fMakefile, "export RBUILD_CL_PATH=%s\n", mscPath.c_str () ); @@ -1089,7 +1089,8 @@ { printf ( "Detecting compiler -pipe support..." ); - string pipe_detection = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; + string rbuild_base = RBUILD_BASE; + string pipe_detection = rbuild_base + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection, ".o" ); string command = ssprintf ( @@ -1126,7 +1127,7 @@ if ( configuration.PrecompiledHeadersEnabled && ProjectNode.configuration.Compiler == GnuGcc ) { - string path = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; + string path = "sdk" + sSep + "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; string cmd = ssprintf ( "%s -c %s 1>%s 2>%s", FixSeparatorForSystemCommand(compilerCommand).c_str (), Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] Tue Jan 26 10:30:52 2010 @@ -67,6 +67,10 @@ #define DEF_SSEP "/" #define DEF_SBAD_SEP "\\" #endif + +#define SSEP DEF_SSEP +#define TOOLS_BASE "sdk" SSEP "tools" SSEP +#define RBUILD_BASE TOOLS_BASE "rbuild" SSEP #define MS_VS_DEF_VERSION "9.00" Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.vcproj [iso-8859-1] Tue Jan 26 10:30:52 2010 @@ -132,7 +132,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include" + AdditionalIncludeDirectories="..;../../libs/inflib;../../include/reactos;../../include" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS;_CRT_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1064,147 +1064,147 @@ Name="inflib" > <File - RelativePath="..\..\lib\inflib\builddep.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infcommon.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infcore.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infget.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhost.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infhostgen.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostget.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostput.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\inflib.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infpriv.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infput.c" + RelativePath="..\..\libs\inflib\builddep.h" + > + </File> + <File + RelativePath="..\..\libs\inflib\infcommon.h" + > + </File> + <File + RelativePath="..\..\libs\inflib\infcore.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\inflib\infget.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\inflib\infhost.h" + > + </File> + <File + RelativePath="..\..\libs\inflib\infhostgen.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\inflib\infhostget.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\inflib\infhostput.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libs\inflib\inflib.h" + > + </File> + <File + RelativePath="..\..\libs\inflib\infpriv.h" + > + </File> + <File + RelativePath="..\..\libs\inflib\infput.c" > <FileConfiguration Name="Release|Win32" Modified: branches/Tree-restructure-test/sdk/tools/rbuild/test.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] Tue Jan 26 10:30:52 2010 @@ -21,9 +21,6 @@ #include "rbuild.h" #include "backend/mingw/mingw.h" -#define SSEP DEF_SSEP - -#define RBUILD_BASE "tools" SSEP "rbuild" SSEP class BaseTest {

14 years, 7 months

[cgutman] 45257: - Define OSKIT so we can use special oskit functions - Implement oskit buffer functions to track references and allocate buffers - Remove unneeded mbuf freeing hacks now that we track references (fixes random crashes would occur when an mbuf was freed inside ip_output) - Remove the "ACK hack" that we used to hack around our loopback implementation - Remove unneeded mbuf pool initialization - Remove unused code in sleep.c

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jan 26 05:20:06 2010 New Revision: 45257 URL: http://svn.reactos.org/svn/reactos?rev=45257&view=rev Log: - Define OSKIT so we can use special oskit functions - Implement oskit buffer functions to track references and allocate buffers - Remove unneeded mbuf freeing hacks now that we track references (fixes random crashes would occur when an mbuf was freed inside ip_output) - Remove the "ACK hack" that we used to hack around our loopback implementation - Remove unneeded mbuf pool initialization - Remove unused code in sleep.c Added: branches/aicom-network-branch/lib/drivers/oskittcp/include/osenv.h (with props) branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/osenv.c (with props) Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp.rbuild branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/ip_output.c branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/sleep.c branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_output.c branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_subr.c branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -36,7 +36,7 @@ #ifndef _SYS_MALLOC_H_ #define _SYS_MALLOC_H_ -#ifndef OSKIT +#if !defined(OSKIT) || defined(__REACTOS__) #define KMEMSTATS #endif @@ -288,7 +288,6 @@ #define MALLOC(space, cast, size, type, flags) \ (space) = (cast)fbsd_malloc((u_long)(size), __FILE__, __LINE__, type, flags) #define FREE(addr, type) fbsd_free((caddr_t)(addr), __FILE__, __LINE__, type) - #else /* do not collect statistics */ #define MALLOC(space, cast, size, type, flags) { \ register struct kmembuckets *kbp = &bucket[BUCKETINDX(size)]; \ Modified: branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -65,7 +65,11 @@ #include <sys/socketvar.h> #ifdef OSKIT +#ifndef __REACTOS__ #include <oskit/dev/dev.h> +#else +#include <osenv.h> +#endif #endif /* Added: branches/aicom-network-branch/lib/drivers/oskittcp/include/osenv.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/include/osenv.h (added) +++ branches/aicom-network-branch/lib/drivers/oskittcp/include/osenv.h [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -1,0 +1,14 @@ +#ifndef OSENV_H +#define OSENV_H + +static __inline void osenv_intr_enable(void) {} +static __inline void osenv_intr_disable(void) {} + +void oskit_bufio_addref(void *buf); +void oskit_bufio_release(void *buf); +void* oskit_bufio_create(int len); +void oskit_bufio_map(void *srcbuf, void**dstbuf, int off, int len); + +#define osenv_sleeprec_t void* + +#endif Propchange: branches/aicom-network-branch/lib/drivers/oskittcp/include/osenv.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -3,6 +3,7 @@ <module name="oskittcp" type="staticlibrary"> <define name="__NTDRIVER__"/> <define name="KERNEL"/> + <define name="OSKIT"/> <include base="oskittcp">include/freebsd</include> <include base="oskittcp">include/freebsd/sys/include</include> <include base="oskittcp">include/freebsd/src/sys</include> @@ -22,6 +23,7 @@ <file>ip_output.c</file> <file>kern_clock.c</file> <file>kern_subr.c</file> + <file>osenv.c</file> <file>param.c</file> <file>radix.c</file> <file>random.c</file> Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -48,8 +48,6 @@ void InitOskitTCP() { OS_DbgPrint(OSK_MID_TRACE,("Init Called\n")); KeInitializeSpinLock(&OSKLock); - OS_DbgPrint(OSK_MID_TRACE,("MB Init\n")); - mbinit(); OS_DbgPrint(OSK_MID_TRACE,("Rawip Init\n")); rip_init(); raw_init(); Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -393,6 +393,7 @@ error = OtcpEvent.PacketSend( OtcpEvent.ClientData, (OSK_PCHAR)new_m->m_data, new_m->m_len ); m_free( new_m ); + m_freem( m ); goto done; } #else @@ -532,6 +533,7 @@ error = OtcpEvent.PacketSend( OtcpEvent.ClientData, (OSK_PCHAR)new_m->m_data, new_m->m_len ); m_free( new_m ); + m_freem( m ); } OS_DbgPrint(OSK_MID_TRACE,("Error from upper layer: %d\n", error)); Added: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/osenv.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/osenv.c (added) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/osenv.c [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -1,0 +1,45 @@ +#include "oskittcp.h" + +unsigned oskit_freebsd_cpl; + +/* We have to store a reference count somewhere so we + * don't free a buffer being referenced in another mbuf. + * I just decided to add an extra char to the beginning of + * the buffer and store the reference count there. I doubt the ref count + * will ever even get close to 0xFF so we should be ok. Remember that + * only one thread can ever be inside oskit due to OSKLock so this should + * be safe. + */ + +void oskit_bufio_addref(void *buf) +{ + unsigned char* fullbuf = ((unsigned char*)buf) - sizeof(char); + +#if DBG + if (fullbuf[0] == 0xFF) + panic("oskit_bufio_addref: ref count overflow"); +#endif + + fullbuf[0]++; +} +void oskit_bufio_release(void *buf) +{ + unsigned char* fullbuf = ((unsigned char*)buf) - sizeof(char); + + if (--fullbuf[0] == 0) + free(fullbuf, 0); +} +void* oskit_bufio_create(int len) +{ + unsigned char* fullbuf = malloc(len + sizeof(char), __FILE__, __LINE__); + if (fullbuf == NULL) + return NULL; + + fullbuf[0] = 1; + + return (void*)(fullbuf + sizeof(char)); +} +void oskit_bufio_map(void *srcbuf, void**dstbuf, int off, int len) +{ + *dstbuf = srcbuf; +} Propchange: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/osenv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/sleep.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -91,53 +91,3 @@ /* Start a clock we can use for timeouts */ } - -extern unsigned bio_imask; /* group of interrupts masked with splbio() */ -extern unsigned cpl; /* current priority level mask */ -extern volatile unsigned idelayed; /* interrupts to become pending */ -extern volatile unsigned ipending; /* active interrupts masked by cpl */ -extern unsigned net_imask; /* group of interrupts masked with splimp() */ -extern unsigned stat_imask; /* interrupts masked with splstatclock() */ -extern unsigned tty_imask; /* group of interrupts masked with spltty() */ - -/* - * ipending has to be volatile so that it is read every time it is accessed - * in splx() and spl0(), but we don't want it to be read nonatomically when - * it is changed. Pretending that ipending is a plain int happens to give - * suitable atomic code for "ipending |= constant;". - */ -#define setdelayed() (*(unsigned *)&ipending |= loadandclear(&idelayed)) -#define setsoftast() (*(unsigned *)&ipending |= SWI_AST_PENDING) -#define setsoftclock() (*(unsigned *)&ipending |= SWI_CLOCK_PENDING) -#define setsoftnet() (*(unsigned *)&ipending |= SWI_NET_PENDING) -#define setsofttty() (*(unsigned *)&ipending |= SWI_TTY_PENDING) - -#define schedsofttty() (*(unsigned *)&idelayed |= SWI_TTY_PENDING) - -#define GENSPL(name, set_cpl) \ -static __inline int name(void) \ -{ \ - unsigned x; \ - \ - __asm __volatile("" : : : "memory"); \ - x = cpl; \ - set_cpl; \ - return (x); \ -} - -void splz(void) { - OS_DbgPrint(OSK_MID_TRACE,("Called SPLZ\n")); -} - -/* - * functions to save and restore the current cpl - */ -void save_cpl(unsigned *x) -{ - *x = cpl; -} - -void restore_cpl(unsigned x) -{ - cpl = x; -} Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_output.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_output.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_output.c [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -708,38 +708,8 @@ ((struct ip *)ti)->ip_off |= IP_DF; } #endif - /* - * XXX: It seems that osktittcp expects that packets are - * synchronously processed. The current implementation feeds - * oskittcp with the packets asynchronously. That's not a - * problem normally when the packets are transfered over - * network, but it starts to be a problem when it comes to - * loopback packets. - * The ACK bits are set in tcp_input which calls tcp_output and - * expects them to be cleared before further processing. - * Instead tcp_output calls ip_output which produces a packet - * and ends up in tcp_input and we're stuck in infinite loop. - * Normally the flags are masked out at the end of this function - * and the incomming packets are processed then, but since - * currently the loopback packet is delivered during the - * ip_output call, the function end is never reached... - */ -#ifdef __REACTOS__ - tp->t_flags &= ~(TF_ACKNOW|TF_DELACK); -#endif error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route, so->so_options & SO_DONTROUTE, 0); -#ifdef __REACTOS__ - /* We allocated m, so we are responsible for freeing it. If the mbuf - contains a pointer to an external datablock, we (or rather, m_copy) - didn't allocate it but pointed it to the data to send. So we have - to cheat a little bit and keep M_FREE from freeing the external - data block */ - while (NULL != m) { - m->m_flags &= ~M_EXT; - m = m_free(m); - } -#endif } if (error) { out: Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_subr.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_subr.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_subr.c [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -163,7 +163,6 @@ tcp_seq ack, seq; int flags; { - struct mbuf *n; register int tlen; int win = 0; struct route *ro = 0; @@ -222,18 +221,6 @@ tcp_trace(TA_OUTPUT, 0, tp, ti, 0); #endif (void) ip_output(m, NULL, ro, 0, NULL); -#ifdef __REACTOS__ - /* We allocated m, so we are responsible for freeing it. If the mbuf - contains a pointer to an external datablock, we (or rather, m_copy) - didn't allocate it but pointed it to the data to send. So we have - to cheat a little bit and keep M_FREE from freeing the external - data block */ - while (NULL != m) { - m->m_flags &= ~M_EXT; - MFREE(m, n); - m = n; - } -#endif } /* Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c [iso-8859-1] Tue Jan 26 05:20:06 2010 @@ -663,7 +663,7 @@ return (n); } -#ifndef OSKIT +#if !defined(OSKIT) || defined(__REACTOS__) /* currently not OS Kit approved, and shouldn't be needed in the first place */ /*

14 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010