Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[jgardou] 72468: [NTDLL_APITEST] - Add some tests which show how Windows handles the ZeroBits argument
by jgardou＠svn.reactos.org 26 Aug '16

26 Aug '16

Author: jgardou Date: Fri Aug 26 21:08:24 2016 New Revision: 72468 URL: http://svn.reactos.org/svn/reactos?rev=72468&view=rev Log: [NTDLL_APITEST] - Add some tests which show how Windows handles the ZeroBits argument Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Fri Aug 26 21:08:24 2016 @@ -81,6 +81,88 @@ MEM_COMMIT, PAGE_READWRITE); ok_ntstatus(Status, STATUS_INVALID_PARAMETER_9); + + /* Try to map 1 page, with free base address and zero bits compatible with 64k granularity */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = 0x1000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 10, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + +{ + ULONG_PTR gran = 64 * 1024; + ULONG_PTR ZeroBits = 11; + + ok_hex(gran, 0x10000); + gran <<= ZeroBits; + ok_hex(gran, 0x8000000); + gran >>= ZeroBits; + ok_hex(gran, 0x10000); + + ok_hex((gran << ZeroBits) >> ZeroBits, gran); + +} + + /* Try to map 1 page, with free base address and zero bits incompatible with 64k granularity */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = 0x1000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 11, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_NO_MEMORY); + + /* Try to map 1 page, with base address and zero bits being compatible */ + BaseAddress = (PVOID)0x30000000; + SectionOffset.QuadPart = 0; + ViewSize = 0x1000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 2, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Try to map 1 page, with base address and zero bits being incompatible */ + BaseAddress = (PVOID)0x30000000; + SectionOffset.QuadPart = 0; + ViewSize = 0x1000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 3, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_4); /* Map 2 pages, without MEM_COMMIT */ BaseAddress = (PVOID)0x30000000;

1 0

[jgardou] 72467: [KDGDB] - Add a ugly and grotesque hack to give "o" back to RtlAssert so that we actually break on ASSERTs - Check for the breakpoint instruction for deciding when to move forward ...
by jgardou＠svn.reactos.org 26 Aug '16

26 Aug '16

Author: jgardou Date: Fri Aug 26 21:07:27 2016 New Revision: 72467 URL: http://svn.reactos.org/svn/reactos?rev=72467&view=rev Log: [KDGDB] - Add a ugly and grotesque hack to give "o" back to RtlAssert so that we actually break on ASSERTs - Check for the breakpoint instruction for deciding when to move forward the ProgramCounter. This is OK since KD removes all breakpoints set when hitting a soft BP Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c trunk/reactos/drivers/base/kdgdb/kdgdb.h trunk/reactos/drivers/base/kdgdb/kdpacket.c Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_inp… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] Fri Aug 26 21:07:27 2016 @@ -830,7 +830,7 @@ /* See if we should update the program counter */ if (Exception && (Exception->ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) - && ProgramCounter == KdDebuggerDataBlock->BreakpointWithStatus.Pointer) + && ((*(KD_BREAKPOINT_TYPE*)ProgramCounter) == KD_BREAKPOINT_VALUE)) { /* We must get past the breakpoint instruction */ KdpSetContextPc(&CurrentContext, ProgramCounter + KD_BREAKPOINT_SIZE); Modified: trunk/reactos/drivers/base/kdgdb/kdgdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdgdb.h… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] Fri Aug 26 21:07:27 2016 @@ -121,7 +121,9 @@ ((Context)->Eip) # define KdpSetContextPc(Context, ProgramCounter) \ ((Context)->Eip = (ProgramCounter)) +# define KD_BREAKPOINT_TYPE UCHAR # define KD_BREAKPOINT_SIZE sizeof(UCHAR) +# define KD_BREAKPOINT_VALUE 0xCC /* Single step mode */ # define KdpSetSingleStep(Context) \ ((Context)->EFlags |= EFLAGS_TF) Modified: trunk/reactos/drivers/base/kdgdb/kdpacket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdpacke… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] Fri Aug 26 21:07:27 2016 @@ -183,6 +183,7 @@ switch (DebugIO->ApiNumber) { case DbgKdPrintStringApi: + case DbgKdGetStringApi: gdb_send_debug_io(String, TRUE); break; default: @@ -362,28 +363,34 @@ _Out_ PULONG DataLength, _Inout_ PKD_CONTEXT KdContext) { - DBGKD_MANIPULATE_STATE64* State; - - /* Special handling for breakin packet */ if (PacketType == PACKET_TYPE_KD_POLL_BREAKIN) { return KdpPollBreakIn(); } - if (PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) - { - /* What should we do ? */ - while (1); - } - - State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; - - /* Maybe we are in a send<->receive loop that GDB doesn't need to know about */ - if (KdpManipulateStateHandler != NULL) - return KdpManipulateStateHandler(State, MessageData, DataLength, KdContext); - - /* Receive data from GDB and interpret it */ - return gdb_receive_and_interpret_packet(State, MessageData, DataLength, KdContext); + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + /* HACK ! RtlAssert asks for (boipt), always say "o" --> break once. */ + MessageData->Length = 1; + MessageData->Buffer[0] = 'o'; + return KdPacketReceived; + } + + if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) + { + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + + /* Maybe we are in a send<->receive loop that GDB doesn't need to know about */ + if (KdpManipulateStateHandler != NULL) + return KdpManipulateStateHandler(State, MessageData, DataLength, KdContext); + + /* Receive data from GDB and interpret it */ + return gdb_receive_and_interpret_packet(State, MessageData, DataLength, KdContext); + } + + /* What should we do ? */ + while (1); + return KdPacketNeedsResend; } VOID

1 0

[hbelusca] 72466: Fix translation (cf. r72465) CORE-11763
by hbelusca＠svn.reactos.org 26 Aug '16

26 Aug '16

Author: hbelusca Date: Fri Aug 26 11:09:34 2016 New Revision: 72466 URL: http://svn.reactos.org/svn/reactos?rev=72466&view=rev Log: Fix translation (cf. r72465) CORE-11763 Modified: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc Modified: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] Fri Aug 26 11:09:34 2016 @@ -7,7 +7,7 @@ CAPTION "Compatibility" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ÐÑÐ»Ð¸ Ñ Ð²Ð°Ñ ÐµÑÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ Ð·Ð°Ð¿ÑÑÐºÐ¾Ð¼ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² ReactOS, Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ, ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ ReactOS Ð±ÑÐ´ÐµÑ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ.\nNÐ£ÑÑÐ¸ÑÐµ, ÑÐ°Ð±Ð¾ÑÐ° Ð½Ð°Ð´ ÑÑÐ¸Ð¼ Ð¼Ð¾Ð´ÑÐ»ÐµÐ¼ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑÑÑ, Ð¸ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÑÑÐ°Ð¿Ðµ Ð¾Ð½ Ð½Ð¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð´ÐµÐ»Ð°ÑÑ.", IDC_EXPLANATION, 7, 7 , 210, 31 + LTEXT "ÐÑÐ»Ð¸ Ñ Ð²Ð°Ñ ÐµÑÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ Ð·Ð°Ð¿ÑÑÐºÐ¾Ð¼ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² ReactOS, Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ, ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ ReactOS Ð±ÑÐ´ÐµÑ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ.\nÐ£ÑÑÐ¸ÑÐµ, ÑÐ°Ð±Ð¾ÑÐ° Ð½Ð°Ð´ ÑÑÐ¸Ð¼ Ð¼Ð¾Ð´ÑÐ»ÐµÐ¼ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑÑÑ, Ð¸ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÑÑÐ°Ð¿Ðµ Ð¾Ð½ Ð½Ð¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð´ÐµÐ»Ð°ÑÑ.", IDC_EXPLANATION, 7, 7 , 210, 31 GROUPBOX "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ñ:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED

1 0

[akhaldi] 72465: * Please at least compile before committing patches. CORE-11763
by akhaldi＠svn.reactos.org 26 Aug '16

26 Aug '16

Author: akhaldi Date: Fri Aug 26 10:53:33 2016 New Revision: 72465 URL: http://svn.reactos.org/svn/reactos?rev=72465&view=rev Log: * Please at least compile before committing patches. CORE-11763 Modified: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc Modified: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] Fri Aug 26 10:53:33 2016 @@ -7,7 +7,7 @@ CAPTION "Compatibility" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ÐÑÐ»Ð¸ Ñ Ð²Ð°Ñ ÐµÑÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ Ð·Ð°Ð¿ÑÑÐºÐ¾Ð¼ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² ReactOS, Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ, ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ ReactOS Ð±ÑÐ´ÐµÑ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ. \ NÐ£ÑÑÐ¸ÑÐµ, ÑÐ°Ð±Ð¾ÑÐ° Ð½Ð°Ð´ ÑÑÐ¸Ð¼ Ð¼Ð¾Ð´ÑÐ»ÐµÐ¼ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑÑÑ, Ð¸ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÑÑÐ°Ð¿Ðµ Ð¾Ð½ Ð½Ð¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð´ÐµÐ»Ð°ÑÑ." IDC_EXPLANATION, 7, 7 , 210, 31 + LTEXT "ÐÑÐ»Ð¸ Ñ Ð²Ð°Ñ ÐµÑÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ Ð·Ð°Ð¿ÑÑÐºÐ¾Ð¼ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² ReactOS, Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ, ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ ReactOS Ð±ÑÐ´ÐµÑ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ.\nNÐ£ÑÑÐ¸ÑÐµ, ÑÐ°Ð±Ð¾ÑÐ° Ð½Ð°Ð´ ÑÑÐ¸Ð¼ Ð¼Ð¾Ð´ÑÐ»ÐµÐ¼ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑÑÑ, Ð¸ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÑÑÐ°Ð¿Ðµ Ð¾Ð½ Ð½Ð¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð´ÐµÐ»Ð°ÑÑ.", IDC_EXPLANATION, 7, 7 , 210, 31 GROUPBOX "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ñ:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED

1 0

[aandrejevic] 72464: [NTVDM:SVGA] Implement the extended wrapping control (64 KB / 1 MB). Transpose the video memory so that it corresponds to chain-4 and packed-pixel modes. This allows us to opti...
by aandrejevic＠svn.reactos.org 26 Aug '16

26 Aug '16

Author: aandrejevic Date: Fri Aug 26 01:22:00 2016 New Revision: 72464 URL: http://svn.reactos.org/svn/reactos?rev=72464&view=rev Log: [NTVDM:SVGA] Implement the extended wrapping control (64 KB / 1 MB). Transpose the video memory so that it corresponds to chain-4 and packed-pixel modes. This allows us to optimize video memory access, since the majority of all SVGA modes are packed-pixel. Only VgaReadMemory has been optimized so far. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Fri Aug 26 01:22:00 2016 @@ -24,6 +24,9 @@ #include "../../console/video.h" /* PRIVATE VARIABLES **********************************************************/ + +#define WRAP_OFFSET(x) ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_WRAP) \ + ? ((x) & 0xFFFFF) : LOWORD(x)) static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; static CONST DWORD MemorySize[] = { 0x20000, 0x10000, 0x08000, 0x08000 }; @@ -330,45 +333,7 @@ } } -static inline DWORD VgaTranslateReadAddress(DWORD Address) -{ - DWORD Offset = LOWORD(Address - VgaGetVideoBaseAddress()); - DWORD ExtOffset = ((VgaGcRegisters[SVGA_GC_EXT_MODE_REG] & SVGA_GC_EXT_MODE_WND_B) && (Offset & (1 << 15))) - ? VgaGcRegisters[SVGA_GC_OFFSET_1_REG] - : VgaGcRegisters[SVGA_GC_OFFSET_0_REG]; - BYTE Plane; - - /* Check for chain-4 and odd-even mode */ - if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) - { - /* The lowest two bits are the plane number */ - Plane = Offset & 0x03; - Offset &= ~3; - } - else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) - { - /* The LSB is the plane number */ - Plane = Offset & 0x01; - Offset &= ~1; - } - else - { - /* Use the read mode */ - Plane = VgaGcRegisters[VGA_GC_READ_MAP_SEL_REG] & 0x03; - } - - if (ExtOffset) - { - /* Add the extended offset */ - Offset += ExtOffset << ((VgaGcRegisters[SVGA_GC_EXT_MODE_REG] & SVGA_GC_EXT_MODE_GRAN) ? 14 : 12); - } - - /* Return the offset on plane 0 for read mode 1 */ - if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_READ) return Offset; - else return Offset + Plane * SVGA_BANK_SIZE; -} - -static inline DWORD VgaTranslateWriteAddress(DWORD Address) +static inline DWORD VgaTranslateAddress(DWORD Address) { DWORD Offset = LOWORD(Address - VgaGetVideoBaseAddress()); DWORD ExtOffset = ((VgaGcRegisters[SVGA_GC_EXT_MODE_REG] & SVGA_GC_EXT_MODE_WND_B) && (Offset & (1 << 15))) @@ -867,17 +832,15 @@ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { /* One byte per pixel */ - PixelData = VgaMemory[(X % VGA_NUM_BANKS) * SVGA_BANK_SIZE - + LOWORD((Address + (X / VGA_NUM_BANKS)) - * AddressSize)]; + PixelData = VgaMemory[WRAP_OFFSET((Address + (X / VGA_NUM_BANKS)) * AddressSize) + * VGA_NUM_BANKS + (X % VGA_NUM_BANKS)]; } else { /* 4-bits per pixel */ - PixelData = VgaMemory[(X % VGA_NUM_BANKS) * SVGA_BANK_SIZE - + LOWORD((Address + (X / (VGA_NUM_BANKS * 2))) - * AddressSize)]; + PixelData = VgaMemory[WRAP_OFFSET((Address + (X / (VGA_NUM_BANKS * 2))) * AddressSize) + * VGA_NUM_BANKS + (X % VGA_NUM_BANKS)]; /* Check if we should use the highest 4 bits or lowest 4 */ if (((X / VGA_NUM_BANKS) % 2) == 0) @@ -908,8 +871,8 @@ */ DWORD BankNumber = (X / 4) % 2; DWORD Offset = Address + (X / 8); - BYTE LowPlaneData = VgaMemory[BankNumber * SVGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; - BYTE HighPlaneData = VgaMemory[(BankNumber + 2) * SVGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; + BYTE LowPlaneData = VgaMemory[WRAP_OFFSET(Offset * AddressSize) * VGA_NUM_BANKS + BankNumber]; + BYTE HighPlaneData = VgaMemory[WRAP_OFFSET(Offset * AddressSize) * VGA_NUM_BANKS + (BankNumber + 2)]; /* Extract the two bits from each plane */ LowPlaneData = (LowPlaneData >> (6 - ((X % 4) * 2))) & 0x03; @@ -931,9 +894,7 @@ for (k = 0; k < VGA_NUM_BANKS; k++) { /* The data is on plane k, 4 pixels per byte */ - BYTE PlaneData = VgaMemory[k * SVGA_BANK_SIZE - + LOWORD((Address + (X / VGA_NUM_BANKS)) - * AddressSize)]; + BYTE PlaneData = VgaMemory[WRAP_OFFSET((Address + (X >> 2)) * AddressSize) * VGA_NUM_BANKS + k]; /* The mask of the first bit in the pair */ BYTE BitMask = 1 << (((3 - (X % VGA_NUM_BANKS)) * 2) + 1); @@ -951,9 +912,7 @@ for (k = 0; k < VGA_NUM_BANKS; k++) { - BYTE PlaneData = VgaMemory[k * SVGA_BANK_SIZE - + LOWORD((Address + (X / (VGA_NUM_BANKS * 2))) - * AddressSize)]; + BYTE PlaneData = VgaMemory[WRAP_OFFSET((Address + (X >> 3)) * AddressSize) * VGA_NUM_BANKS + k]; /* If the bit on that plane is set, set it */ if (PlaneData & (1 << (7 - (X % 8)))) PixelData |= 1 << k; @@ -1084,13 +1043,13 @@ /* Loop through the characters */ for (j = 0; j < CurrResolution.X; j++) { - CurrentAddr = LOWORD((Address + j) * AddressSize); + CurrentAddr = WRAP_OFFSET((Address + j) * AddressSize); /* Plane 0 holds the character itself */ - CharInfo.Char = VgaMemory[CurrentAddr]; + CharInfo.Char = VgaMemory[CurrentAddr * VGA_NUM_BANKS]; /* Plane 1 holds the attribute */ - CharInfo.Attributes = VgaMemory[CurrentAddr + SVGA_BANK_SIZE]; + CharInfo.Attributes = VgaMemory[CurrentAddr * VGA_NUM_BANKS + 1]; /* Now check if the resulting character data has changed */ if ((CharBuffer[i * CurrResolution.X + j].Char != CharInfo.Char) || @@ -1752,71 +1711,142 @@ VOID FASTCALL VgaReadMemory(ULONG Address, PVOID Buffer, ULONG Size) { + DWORD i; + DWORD VideoAddress; + PUCHAR BufPtr = (PUCHAR)Buffer; + + DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", Address, Size); + + /* Ignore if video RAM access is disabled */ + if (!Size) return; + if ((VgaMiscRegister & VGA_MISC_RAM_ENABLED) == 0) return; + + if (!(VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_READ)) + { + VideoAddress = VgaTranslateAddress(Address); + + /* Check for chain-4 and odd-even mode */ + if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) + { + /* Just copy from the video memory */ + PVOID VideoMemory = &VgaMemory[VideoAddress * VGA_NUM_BANKS + (Address & 3)]; + + switch (Size) + { + case sizeof(UCHAR): + *(PUCHAR)Buffer = *(PUCHAR)VideoMemory; + return; + + case sizeof(USHORT): + *(PUSHORT)Buffer = *(PUSHORT)VideoMemory; + return; + + case sizeof(ULONG): + *(PULONG)Buffer = *(PULONG)VideoMemory; + return; + + case sizeof(ULONGLONG): + *(PULONGLONG)Buffer = *(PULONGLONG)VideoMemory; + return; + + default: +#if defined(__GNUC__) + __builtin_memcpy(Buffer, VideoMemory, Size); +#else + RtlCopyMemory(Buffer, VideoMemory, Size); +#endif + } + } + else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) + { + i = 0; + + /* Check if the starting address is odd */ + if (Address & 1) BufPtr[i++] = VgaMemory[(VideoAddress++) * VGA_NUM_BANKS + 1]; + + while (i < (Size - 1)) + { + *(PUSHORT)&BufPtr[i] = *(PUSHORT)&VgaMemory[VideoAddress * VGA_NUM_BANKS]; + + i += 2; + VideoAddress += 2; + } + + /* Check if there is one more byte to read */ + if (i == Size - 1) BufPtr[i] = VgaMemory[VideoAddress * VGA_NUM_BANKS + ((Address + i) & 1)]; + } + else + { + /* Use the selected map */ + BYTE Plane = VgaGcRegisters[VGA_GC_READ_MAP_SEL_REG] & 0x03; + + for (i = 0; i < Size; i++) + { + /* Copy the value to the buffer */ + BufPtr[i] = VgaMemory[(VideoAddress++) * VGA_NUM_BANKS + Plane]; + } + } + } + else + { + const ULONG BitExpandTable[] = + { + 0x00000000, 0x000000FF, 0x0000FF00, 0x0000FFFF, + 0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00FFFFFF, + 0xFF000000, 0xFF0000FF, 0xFF00FF00, 0xFF00FFFF, + 0xFFFF0000, 0xFFFF00FF, 0xFFFFFF00, 0xFFFFFFFF + }; + + ULONG ColorCompareBytes = BitExpandTable[VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG] & 0x0F]; + ULONG ColorIgnoreBytes = BitExpandTable[VgaGcRegisters[VGA_GC_COLOR_IGNORE_REG] & 0x0F]; + + /* + * These values can also be computed in the following way, but using the table seems to be faster: + * + * ColorCompareBytes = VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG]; + * ColorCompareBytes |= (ColorCompareBytes << 7) | (ColorCompareBytes << 14) | (ColorCompareBytes << 21); + * ColorCompareBytes &= 0x01010101; + * ColorCompareBytes = (ColorCompareBytes << 8) - ColorCompareBytes; + * + * ColorIgnoreBytes = VgaGcRegisters[VGA_GC_COLOR_IGNORE_REG]; + * ColorIgnoreBytes |= (ColorIgnoreBytes << 7) | (ColorIgnoreBytes << 14) | (ColorIgnoreBytes << 21); + * ColorIgnoreBytes &= 0x01010101; + * ColorIgnoreBytes = (ColorIgnoreBytes << 8) - ColorIgnoreBytes; + */ + + /* Loop through each byte */ + for (i = 0; i < Size; i++) + { + ULONG PlaneData; + + /* This should always return a plane 0 address */ + VideoAddress = VgaTranslateAddress(Address + i); + + /* Read all 4 planes */ + PlaneData = *(PULONG)&VgaMemory[VideoAddress * VGA_NUM_BANKS]; + + /* Reverse the bytes for which the color compare register is zero */ + PlaneData ^= ~ColorCompareBytes; + + /* Apply the color ignore register */ + PlaneData |= ColorIgnoreBytes; + + /* Store the value in the buffer */ + BufPtr[i] = (PlaneData | (PlaneData >> 8) | (PlaneData >> 16) | (PlaneData >> 24)) & 0xFF; + } + } + + /* Load the latch registers */ + VideoAddress = VgaTranslateAddress(Address + Size - 1); + *(PULONG)VgaLatchRegisters = *(PULONG)&VgaMemory[WRAP_OFFSET(VideoAddress) * VGA_NUM_BANKS]; +} + +BOOLEAN FASTCALL VgaWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) +{ DWORD i, j; DWORD VideoAddress; PUCHAR BufPtr = (PUCHAR)Buffer; - DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", Address, Size); - - /* Ignore if video RAM access is disabled */ - if ((VgaMiscRegister & VGA_MISC_RAM_ENABLED) == 0) return; - - if (!(VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_READ)) - { - /* Loop through each byte */ - for (i = 0; i < Size; i++) - { - VideoAddress = VgaTranslateReadAddress(Address + i); - - /* Copy the value to the buffer */ - BufPtr[i] = VgaMemory[VideoAddress]; - } - } - else - { - /* Loop through each byte */ - for (i = 0; i < Size; i++) - { - BYTE Result = 0xFF; - - /* This should always return a plane 0 address for read mode 1 */ - VideoAddress = VgaTranslateReadAddress(Address + i); - - for (j = 0; j < VGA_NUM_BANKS; j++) - { - /* Don't consider ignored banks */ - if (!(VgaGcRegisters[VGA_GC_COLOR_IGNORE_REG] & (1 << j))) continue; - - if (VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG] & (1 << j)) - { - /* Comparing with 11111111 */ - Result &= VgaMemory[j * SVGA_BANK_SIZE + LOWORD(VideoAddress)]; - } - else - { - /* Comparing with 00000000 */ - Result &= ~(VgaMemory[j * SVGA_BANK_SIZE + LOWORD(VideoAddress)]); - } - } - - /* Copy the value to the buffer */ - BufPtr[i] = Result; - } - } - - /* Load the latch registers */ - VgaLatchRegisters[0] = VgaMemory[LOWORD(VideoAddress)]; - VgaLatchRegisters[1] = VgaMemory[SVGA_BANK_SIZE + LOWORD(VideoAddress)]; - VgaLatchRegisters[2] = VgaMemory[(2 * SVGA_BANK_SIZE) + LOWORD(VideoAddress)]; - VgaLatchRegisters[3] = VgaMemory[(3 * SVGA_BANK_SIZE) + LOWORD(VideoAddress)]; -} - -BOOLEAN FASTCALL VgaWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) -{ - DWORD i, j; - DWORD VideoAddress; - PUCHAR BufPtr = (PUCHAR)Buffer; - DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", Address, Size); /* Ignore if video RAM access is disabled */ @@ -1828,7 +1858,7 @@ /* Loop through each byte */ for (i = 0; i < Size; i++) { - VideoAddress = VgaTranslateWriteAddress(Address + i); + VideoAddress = VgaTranslateAddress(Address + i); for (j = 0; j < VGA_NUM_BANKS; j++) { @@ -1856,7 +1886,7 @@ } /* Copy the value to the VGA memory */ - VgaMemory[VideoAddress + j * SVGA_BANK_SIZE] = VgaTranslateByteForWriting(BufPtr[i], j); + VgaMemory[VideoAddress * VGA_NUM_BANKS + j] = VgaTranslateByteForWriting(BufPtr[i], j); } } @@ -1871,8 +1901,6 @@ VOID VgaWriteTextModeFont(UINT FontNumber, CONST UCHAR* FontData, UINT Height) { UINT i, j; - PUCHAR FontMemory = (PUCHAR)&VgaMemory[SVGA_BANK_SIZE * VGA_FONT_BANK + (FontNumber * VGA_FONT_SIZE)]; - ASSERT(Height <= VGA_MAX_FONT_HEIGHT); for (i = 0 ; i < VGA_FONT_CHARACTERS; i++) @@ -1880,13 +1908,13 @@ /* Write the character */ for (j = 0; j < Height; j++) { - FontMemory[i * VGA_MAX_FONT_HEIGHT + j] = FontData[i * Height + j]; + VgaMemory[(i * VGA_MAX_FONT_HEIGHT + j) * VGA_NUM_BANKS + VGA_FONT_BANK] = FontData[i * Height + j]; } /* Clear the unused part */ for (j = Height; j < VGA_MAX_FONT_HEIGHT; j++) { - FontMemory[i * VGA_MAX_FONT_HEIGHT + j] = 0; + VgaMemory[(i * VGA_MAX_FONT_HEIGHT + j) * VGA_NUM_BANKS + VGA_FONT_BANK] = 0; } } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] Fri Aug 26 01:22:00 2016 @@ -190,6 +190,7 @@ /* CRTC extended display register bits */ #define SVGA_CRTC_EXT_ADDR_BIT16 (1 << 0) +#define SVGA_CRTC_EXT_ADDR_WRAP (1 << 1) #define SVGA_CRTC_EXT_ADDR_BITS1718 ((1 << 2) | (1 << 3)) #define SVGA_CRTC_EXT_OFFSET_BIT8 (1 << 4)

1 0

[hbelusca] 72463: [CMAKE]: Update baseaddress_msvc.cmake with the updated scripts from CORE-11382 , with RTC1 enabled so that we get a bit of space margin. Dedicated to Thomas Faber :)
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 18:26:13 2016 New Revision: 72463 URL: http://svn.reactos.org/svn/reactos?rev=72463&view=rev Log: [CMAKE]: Update baseaddress_msvc.cmake with the updated scripts from CORE-11382 , with RTC1 enabled so that we get a bit of space margin. Dedicated to Thomas Faber :) Modified: trunk/reactos/sdk/cmake/baseaddress_msvc.cmake Modified: trunk/reactos/sdk/cmake/baseaddress_msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/baseaddress_msvc… ============================================================================== --- trunk/reactos/sdk/cmake/baseaddress_msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/baseaddress_msvc.cmake [iso-8859-1] Thu Aug 25 18:26:13 2016 @@ -1,358 +1,359 @@ -set(baseaddress_ntdll 0x7c920000) -set(baseaddress_kernel32 0x7c790000) -set(baseaddress_msvcrt 0x7c720000) -set(baseaddress_advapi32 0x7c6b0000) -set(baseaddress_gdi32 0x7c660000) -set(baseaddress_user32 0x7c560000) -set(baseaddress_dhcpcsvc 0x7c520000) -set(baseaddress_dnsapi 0x7c4e0000) -set(baseaddress_icmp 0x7c4c0000) -set(baseaddress_iphlpapi 0x7c490000) -set(baseaddress_ws2_32 0x7c460000) -set(baseaddress_ws2help 0x7c440000) -set(baseaddress_shlwapi 0x7c3e0000) -set(baseaddress_rpcrt4 0x7c350000) -set(baseaddress_comctl32 0x7c240000) -set(baseaddress_ole32 0x7c130000) -set(baseaddress_winspool.drv 0x7c110000) -set(baseaddress_winmm 0x7c070000) -set(baseaddress_comdlg32 0x7bfa0000) -set(baseaddress_shell32 0x7b6d0000) -set(baseaddress_lz32 0x7b6b0000) -set(baseaddress_version 0x7b690000) -set(baseaddress_oleaut32 0x7b580000) -set(baseaddress_setupapi 0x7b460000) -set(baseaddress_mpr 0x7b430000) -set(baseaddress_crypt32 0x7b370000) -set(baseaddress_wininet 0x7b2f0000) -set(baseaddress_urlmon 0x7b250000) -set(baseaddress_psapi 0x7b230000) -set(baseaddress_imm32 0x7b200000) -set(baseaddress_msvfw32 0x7b1c0000) -set(baseaddress_dbghelp 0x7b150000) -set(baseaddress_devmgr 0x7b0b0000) -set(baseaddress_msacm32 0x7b080000) -set(baseaddress_netapi32 0x7b030000) -set(baseaddress_powrprof 0x7b010000) -set(baseaddress_secur32 0x7afe0000) -set(baseaddress_wintrust 0x7afa0000) -set(baseaddress_avicap32 0x7af80000) -set(baseaddress_cabinet 0x7af40000) -set(baseaddress_dsound 0x7aee0000) -set(baseaddress_glu32 0x7ae70000) -set(baseaddress_opengl32 0x7ad20000) -set(baseaddress_riched20 0x7aca0000) -set(baseaddress_smdll 0x7ac80000) -set(baseaddress_userenv 0x7ac40000) -set(baseaddress_uxtheme 0x7ac00000) -set(baseaddress_cryptui 0x7ab70000) -set(baseaddress_csrsrv 0x7ab40000) -set(baseaddress_basesrv 0x7ab20000) -set(baseaddress_winsrv 0x7aac0000) -set(baseaddress_dplayx 0x7aa70000) -set(baseaddress_gdiplus 0x7a9f0000) -set(baseaddress_msimg32 0x7a9d0000) -set(baseaddress_mswsock 0x7a9b0000) -set(baseaddress_oledlg 0x7a970000) -set(baseaddress_rasapi32 0x7a950000) -set(baseaddress_rsaenh 0x7a900000) -set(baseaddress_samlib 0x7a8d0000) -set(baseaddress_sensapi 0x7a8b0000) -set(baseaddress_sfc_os 0x7a890000) -set(baseaddress_snmpapi 0x7a870000) -set(baseaddress_spoolss 0x7a840000) -set(baseaddress_usp10 0x7a7e0000) -set(baseaddress_aclayers 0x7a7c0000) -set(baseaddress_acledit 0x7a7a0000) -set(baseaddress_aclui 0x7a770000) -set(baseaddress_acppage 0x7a740000) -set(baseaddress_activeds 0x7a720000) -set(baseaddress_actxprxy 0x7a610000) -set(baseaddress_advapi32_vista 0x7a5f0000) -set(baseaddress_advpack 0x7a5c0000) -set(baseaddress_amstream 0x7a590000) -set(baseaddress_apphelp 0x7a560000) -set(baseaddress_atl 0x7a530000) -set(baseaddress_atl100 0x7a500000) -set(baseaddress_atl80 0x7a4d0000) -set(baseaddress_authz 0x7a4b0000) -set(baseaddress_avifil32 0x7a460000) -set(baseaddress_batt 0x7a440000) -set(baseaddress_bcrypt 0x7a420000) -set(baseaddress_beepmidi 0x7a400000) -set(baseaddress_browseui 0x7a380000) -set(baseaddress_cards 0x7a2c0000) -set(baseaddress_cfgmgr32 0x7a2a0000) -set(baseaddress_clusapi 0x7a280000) -set(baseaddress_comcat 0x7a260000) -set(baseaddress_compstui 0x7a240000) -set(baseaddress_console 0x7a200000) -set(baseaddress_credui 0x7a1c0000) -set(baseaddress_crtdll 0x7a180000) -set(baseaddress_cryptdlg 0x7a150000) -set(baseaddress_cryptdll 0x7a130000) -set(baseaddress_cryptnet 0x7a110000) -set(baseaddress_d3d8 0x7a0d0000) -set(baseaddress_d3d8thk 0x7a0b0000) -set(baseaddress_d3d9 0x7a060000) -set(baseaddress_d3dcompiler_43 0x79fd0000) -set(baseaddress_d3drm 0x79f70000) -set(baseaddress_d3dwine 0x79d90000) -set(baseaddress_d3dx9_24 0x79d70000) -set(baseaddress_d3dx9_25 0x79d40000) -set(baseaddress_d3dx9_26 0x79d20000) -set(baseaddress_d3dx9_27 0x79d00000) -set(baseaddress_d3dx9_28 0x79ce0000) -set(baseaddress_d3dx9_29 0x79cc0000) -set(baseaddress_d3dx9_30 0x79ca0000) -set(baseaddress_d3dx9_31 0x79c80000) -set(baseaddress_d3dx9_32 0x79c60000) -set(baseaddress_d3dx9_33 0x79c40000) -set(baseaddress_d3dx9_34 0x79c20000) -set(baseaddress_d3dx9_35 0x79c00000) -set(baseaddress_d3dx9_36 0x79b60000) -set(baseaddress_d3dx9_37 0x79b40000) -set(baseaddress_d3dx9_38 0x79b20000) -set(baseaddress_d3dx9_39 0x79b00000) -set(baseaddress_d3dx9_40 0x79ae0000) -set(baseaddress_d3dx9_41 0x79ac0000) -set(baseaddress_d3dx9_42 0x79aa0000) -set(baseaddress_d3dx9_43 0x79a80000) -set(baseaddress_d3dxof 0x79a50000) -set(baseaddress_dciman32 0x79a30000) -set(baseaddress_ddraw 0x799b0000) -set(baseaddress_deskadp 0x79980000) -set(baseaddress_deskmon 0x79960000) -set(baseaddress_devcpux 0x79940000) -set(baseaddress_devenum 0x79910000) -set(baseaddress_dinput 0x798d0000) -set(baseaddress_dinput8 0x798b0000) -set(baseaddress_dmusic 0x79880000) -set(baseaddress_dplay 0x79860000) -set(baseaddress_dxdiagn 0x79830000) -set(baseaddress_esent 0x79810000) -set(baseaddress_faultrep 0x797f0000) -set(baseaddress_fltlib 0x797d0000) -set(baseaddress_fmifs 0x797b0000) -set(baseaddress_fontext 0x79790000) -set(baseaddress_fontsub 0x79770000) -set(baseaddress_framebuf 0x79750000) -set(baseaddress_framebuf_new 0x79730000) -set(baseaddress_framedyn 0x79710000) -set(baseaddress_genincdata 0x796e0000) -set(baseaddress_getuname 0x79410000) -set(baseaddress_hid 0x793f0000) -set(baseaddress_hlink 0x793c0000) -set(baseaddress_hnetcfg 0x79390000) -set(baseaddress_httpapi 0x79370000) -set(baseaddress_iccvid 0x79350000) -set(baseaddress_ieframe 0x792d0000) -set(baseaddress_iernonce 0x792a0000) -set(baseaddress_imagehlp 0x79280000) -set(baseaddress_inetcomm 0x79240000) -set(baseaddress_inetmib1 0x79220000) -set(baseaddress_initpki 0x79200000) -set(baseaddress_input 0x791a0000) -set(baseaddress_inseng 0x79180000) -set(baseaddress_iologmsg 0x79160000) -set(baseaddress_itircl 0x79140000) -set(baseaddress_itss 0x79110000) -set(baseaddress_jscript 0x79080000) -set(baseaddress_jsproxy 0x79060000) -set(baseaddress_kbsdll 0x79040000) -set(baseaddress_kernel32_vista 0x79020000) -set(baseaddress_ksuser 0x79000000) -set(baseaddress_libjpeg 0x78fa0000) -set(baseaddress_libpng 0x78f40000) -set(baseaddress_libtiff 0x78ed0000) -set(baseaddress_libxslt 0x78da0000) -set(baseaddress_loadperf 0x78d80000) -set(baseaddress_localspl 0x78d50000) -set(baseaddress_localui 0x78d20000) -set(baseaddress_lpk 0x78d00000) -set(baseaddress_lsasrv 0x78cb0000) -set(baseaddress_mapi32 0x78c80000) -set(baseaddress_mciavi32 0x78c50000) -set(baseaddress_mcicda 0x78c30000) -set(baseaddress_mciqtz32 0x78c00000) -set(baseaddress_mciseq 0x78bd0000) -set(baseaddress_mciwave 0x78ba0000) -set(baseaddress_mgmtapi 0x78b80000) -set(baseaddress_midimap 0x78b60000) -set(baseaddress_mlang 0x78b30000) -set(baseaddress_mmdrv 0x78b10000) -set(baseaddress_modemui 0x78aa0000) -set(baseaddress_mprapi 0x78a80000) -set(baseaddress_msafd 0x78a50000) -set(baseaddress_mscat32 0x78a30000) -set(baseaddress_mscms 0x78a00000) -set(baseaddress_mscoree 0x789c0000) -set(baseaddress_msctf 0x78980000) -set(baseaddress_msdmo 0x78960000) -set(baseaddress_msftedit 0x78940000) -set(baseaddress_msgina 0x788c0000) -set(baseaddress_mshtml 0x78740000) -set(baseaddress_msi 0x78660000) -set(baseaddress_msimtf 0x78640000) -set(baseaddress_msisip 0x78620000) -set(baseaddress_mspatcha 0x78600000) -set(baseaddress_msports 0x785d0000) -set(baseaddress_msrle32 0x785a0000) -set(baseaddress_mssign32 0x78580000) -set(baseaddress_mssip32 0x78560000) -set(baseaddress_mstask 0x78530000) -set(baseaddress_msv1_0 0x78510000) -set(baseaddress_msvcrt_crt_dll_startup 0x784f0000) -set(baseaddress_msvcrt20 0x78470000) -set(baseaddress_msvcrt40 0x783f0000) -set(baseaddress_msvidc32 0x783d0000) -set(baseaddress_msxml 0x783a0000) -set(baseaddress_msxml2 0x78370000) -set(baseaddress_msxml3 0x78190000) -set(baseaddress_msxml4 0x78150000) -set(baseaddress_msxml6 0x78110000) -set(baseaddress_mycomput 0x780f0000) -set(baseaddress_nddeapi 0x780d0000) -set(baseaddress_netcfgx 0x78060000) -set(baseaddress_netevent 0x78040000) -set(baseaddress_netid 0x78000000) -set(baseaddress_netshell 0x77f90000) -set(baseaddress_newdev 0x77f40000) -set(baseaddress_normaliz 0x77f20000) -set(baseaddress_notifyhook 0x77f00000) -set(baseaddress_npptools 0x77ee0000) -set(baseaddress_ntdsapi 0x77ec0000) -set(baseaddress_ntlanman 0x77ea0000) -set(baseaddress_ntmarta 0x77e80000) -set(baseaddress_ntobjshex 0x77e20000) -set(baseaddress_ntprint 0x77e00000) -set(baseaddress_objsel 0x77de0000) -set(baseaddress_odbc32 0x77db0000) -set(baseaddress_odbccp32 0x77d90000) -set(baseaddress_oleacc 0x77d40000) -set(baseaddress_olecli32 0x77d20000) -set(baseaddress_olepro32 0x77d00000) -set(baseaddress_olesvr32 0x77ce0000) -set(baseaddress_olethk32 0x77cc0000) -set(baseaddress_pdh 0x77c90000) -set(baseaddress_pidgen 0x77c70000) -set(baseaddress_pifmgr 0x77bf0000) -set(baseaddress_printui 0x77bd0000) -set(baseaddress_propsys 0x77ba0000) -set(baseaddress_pstorec 0x77b80000) -set(baseaddress_qedit 0x77b50000) -set(baseaddress_qmgr 0x77b20000) -set(baseaddress_qmgrprxy 0x77ae0000) -set(baseaddress_quartz 0x779f0000) -set(baseaddress_query 0x779d0000) -set(baseaddress_rasadhlp 0x779b0000) -set(baseaddress_rasdlg 0x777e0000) -set(baseaddress_rasman 0x777b0000) -set(baseaddress_resutils 0x77790000) -set(baseaddress_riched32 0x77770000) -set(baseaddress_rsabase 0x77750000) -set(baseaddress_rshell 0x77700000) -set(baseaddress_samsrv 0x776b0000) -set(baseaddress_sccbase 0x77690000) -set(baseaddress_schannel 0x77660000) -set(baseaddress_schedsvc 0x77640000) -set(baseaddress_scrrun 0x77600000) -set(baseaddress_security 0x775e0000) -set(baseaddress_serialui 0x775c0000) -set(baseaddress_sfc 0x775a0000) -set(baseaddress_shdoclc 0x77560000) -set(baseaddress_shdocvw 0x77530000) -set(baseaddress_shfolder 0x77510000) -set(baseaddress_shimgvw 0x774d0000) -set(baseaddress_slayer 0x774a0000) -set(baseaddress_slbcsp 0x77480000) -set(baseaddress_sndblst 0x77460000) -set(baseaddress_softpub 0x77440000) -set(baseaddress_srclient 0x77420000) -set(baseaddress_srvsvc 0x773f0000) -set(baseaddress_sti 0x773c0000) -set(baseaddress_stobject 0x77380000) -set(baseaddress_streamci 0x77360000) -set(baseaddress_sxs 0x77340000) -set(baseaddress_syssetup 0x772a0000) -set(baseaddress_t2embed 0x77280000) -set(baseaddress_tapi32 0x77250000) -set(baseaddress_tapiui 0x771d0000) -set(baseaddress_testvdd 0x771b0000) -set(baseaddress_themeui 0x77190000) -set(baseaddress_traffic 0x77170000) -set(baseaddress_twain_32 0x77150000) -set(baseaddress_ubtrfs 0x77130000) -set(baseaddress_uext2 0x77100000) -set(baseaddress_ufat 0x770d0000) -set(baseaddress_ufatx 0x770b0000) -set(baseaddress_uffs 0x77090000) -set(baseaddress_umpnpmgr 0x77060000) -set(baseaddress_untfs 0x77040000) -set(baseaddress_updspapi 0x77020000) -set(baseaddress_ureiserfs 0x77000000) -set(baseaddress_url 0x76fe0000) -set(baseaddress_vbscript 0x76f80000) -set(baseaddress_vdmdbg 0x76f60000) -set(baseaddress_vssapi 0x76f40000) -set(baseaddress_wbemdisp 0x76f10000) -set(baseaddress_wbemprox 0x76ed0000) -set(baseaddress_win32kdll 0x76eb0000) -set(baseaddress_win32kdll_2k3sp2 0x76e90000) -set(baseaddress_win32kdll_xpsp2 0x76e70000) -set(baseaddress_windowscodecs 0x76dc0000) -set(baseaddress_windowscodecsext 0x76da0000) -set(baseaddress_winfax 0x76d80000) -set(baseaddress_wing32 0x76d60000) -set(baseaddress_winhttp 0x76d20000) -set(baseaddress_winscard 0x76d00000) -set(baseaddress_winsta 0x76cd0000) -set(baseaddress_wkssvc 0x76cb0000) -set(baseaddress_wlanapi 0x76c90000) -set(baseaddress_wldap32 0x76c60000) -set(baseaddress_wmi 0x76c40000) -set(baseaddress_wmisvc 0x76c20000) -set(baseaddress_wmiutils 0x76bf0000) -set(baseaddress_wmvcore 0x76bc0000) -set(baseaddress_ws2_32_new 0x76b90000) -set(baseaddress_wshirda 0x76b70000) -set(baseaddress_wshtcpip 0x76b50000) -set(baseaddress_wsock32 0x76b30000) -set(baseaddress_wtsapi32 0x76b10000) -set(baseaddress_wuapi 0x76ae0000) -set(baseaddress_xinput1_1 0x76ac0000) -set(baseaddress_xinput1_2 0x76aa0000) -set(baseaddress_xinput1_3 0x76a80000) -set(baseaddress_xinput9_1_0 0x76a60000) -set(baseaddress_xmllite 0x76a30000) -set(baseaddress_access 0x769c0000) -set(baseaddress_appwiz 0x76950000) -set(baseaddress_cmicpl 0x76920000) -set(baseaddress_desk 0x768a0000) -set(baseaddress_hdwwiz 0x76830000) -set(baseaddress_hhctrl 0x767f0000) -set(baseaddress_imaadp32.acm 0x767d0000) -set(baseaddress_inetcpl 0x76780000) -set(baseaddress_intl 0x76720000) -set(baseaddress_joy 0x766f0000) -set(baseaddress_main 0x76670000) -set(baseaddress_mmsys 0x765b0000) -set(baseaddress_msacm32.drv 0x76580000) -set(baseaddress_msadp32.acm 0x76560000) -set(baseaddress_msg711.acm 0x76540000) -set(baseaddress_msgsm32.acm 0x76520000) -set(baseaddress_msisys 0x76500000) -set(baseaddress_ncpa 0x764e0000) -set(baseaddress_odbccp32i 0x764c0000) -set(baseaddress_powercfg 0x76460000) -set(baseaddress_sysdm 0x76390000) -set(baseaddress_telephon 0x76370000) -set(baseaddress_timedate 0x76300000) -set(baseaddress_usrmgr 0x762c0000) -set(baseaddress_wdmaud.drv 0x76130000) -set(baseaddress_wined3dcfg 0x76100000) -set(baseaddress_winemp3.acm 0x760a0000) -set(baseaddress_wshom 0x76070000) +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x7c760000) +set(baseaddress_msvcrt 0x7c6e0000) +set(baseaddress_advapi32 0x7c660000) +set(baseaddress_gdi32 0x7c600000) +set(baseaddress_user32 0x7c4f0000) +set(baseaddress_dhcpcsvc 0x7c4b0000) +set(baseaddress_dnsapi 0x7c470000) +set(baseaddress_icmp 0x7c450000) +set(baseaddress_iphlpapi 0x7c410000) +set(baseaddress_ws2_32 0x7c3e0000) +set(baseaddress_ws2help 0x7c3c0000) +set(baseaddress_shlwapi 0x7c350000) +set(baseaddress_rpcrt4 0x7c2c0000) +set(baseaddress_comctl32 0x7c1a0000) +set(baseaddress_ole32 0x7c060000) +set(baseaddress_winspool.drv 0x7c030000) +set(baseaddress_winmm 0x7bf90000) +set(baseaddress_comdlg32 0x7bec0000) +set(baseaddress_shell32 0x7b5d0000) +set(baseaddress_lz32 0x7b5b0000) +set(baseaddress_version 0x7b580000) +set(baseaddress_oleaut32 0x7b440000) +set(baseaddress_setupapi 0x7b310000) +set(baseaddress_mpr 0x7b2e0000) +set(baseaddress_crypt32 0x7b210000) +set(baseaddress_wininet 0x7b180000) +set(baseaddress_urlmon 0x7b0d0000) +set(baseaddress_psapi 0x7b0b0000) +set(baseaddress_imm32 0x7b080000) +set(baseaddress_msvfw32 0x7b040000) +set(baseaddress_dbghelp 0x7afc0000) +set(baseaddress_devmgr 0x7af20000) +set(baseaddress_msacm32 0x7aee0000) +set(baseaddress_netapi32 0x7ae80000) +set(baseaddress_powrprof 0x7ae60000) +set(baseaddress_secur32 0x7ae30000) +set(baseaddress_wintrust 0x7adf0000) +set(baseaddress_avicap32 0x7add0000) +set(baseaddress_cabinet 0x7ad90000) +set(baseaddress_dsound 0x7ad30000) +set(baseaddress_glu32 0x7acb0000) +set(baseaddress_opengl32 0x7ab40000) +set(baseaddress_riched20 0x7aab0000) +set(baseaddress_smdll 0x7aa90000) +set(baseaddress_userenv 0x7aa50000) +set(baseaddress_uxtheme 0x7aa00000) +set(baseaddress_cryptui 0x7a960000) +set(baseaddress_csrsrv 0x7a930000) +set(baseaddress_basesrv 0x7a900000) +set(baseaddress_winsrv 0x7a890000) +set(baseaddress_dplayx 0x7a840000) +set(baseaddress_gdiplus 0x7a7b0000) +set(baseaddress_msimg32 0x7a790000) +set(baseaddress_mswsock 0x7a770000) +set(baseaddress_oledlg 0x7a730000) +set(baseaddress_rasapi32 0x7a700000) +set(baseaddress_rsaenh 0x7a6b0000) +set(baseaddress_samlib 0x7a680000) +set(baseaddress_sensapi 0x7a660000) +set(baseaddress_sfc_os 0x7a640000) +set(baseaddress_snmpapi 0x7a620000) +set(baseaddress_spoolss 0x7a5f0000) +set(baseaddress_usp10 0x7a590000) +set(baseaddress_aclayers 0x7a570000) +set(baseaddress_acledit 0x7a550000) +set(baseaddress_aclui 0x7a520000) +set(baseaddress_acppage 0x7a4f0000) +set(baseaddress_activeds 0x7a4d0000) +set(baseaddress_actxprxy 0x7a370000) +set(baseaddress_advapi32_vista 0x7a350000) +set(baseaddress_advpack 0x7a320000) +set(baseaddress_amstream 0x7a2f0000) +set(baseaddress_apphelp 0x7a2c0000) +set(baseaddress_atl 0x7a290000) +set(baseaddress_atl100 0x7a260000) +set(baseaddress_atl80 0x7a230000) +set(baseaddress_authz 0x7a210000) +set(baseaddress_avifil32 0x7a1b0000) +set(baseaddress_batt 0x7a190000) +set(baseaddress_bcrypt 0x7a160000) +set(baseaddress_beepmidi 0x7a140000) +set(baseaddress_browseui 0x7a0b0000) +set(baseaddress_cards 0x79ff0000) +set(baseaddress_cfgmgr32 0x79fd0000) +set(baseaddress_clusapi 0x79fa0000) +set(baseaddress_comcat 0x79f80000) +set(baseaddress_compstui 0x79f60000) +set(baseaddress_console 0x79f10000) +set(baseaddress_credui 0x79ed0000) +set(baseaddress_crtdll 0x79e90000) +set(baseaddress_cryptdlg 0x79e60000) +set(baseaddress_cryptdll 0x79e40000) +set(baseaddress_cryptnet 0x79e10000) +set(baseaddress_d3d8 0x79dd0000) +set(baseaddress_d3d8thk 0x79db0000) +set(baseaddress_d3d9 0x79d60000) +set(baseaddress_d3dcompiler_43 0x79cd0000) +set(baseaddress_d3drm 0x79c60000) +set(baseaddress_d3dwine 0x79a70000) +set(baseaddress_d3dx9_24 0x79a50000) +set(baseaddress_d3dx9_25 0x79a20000) +set(baseaddress_d3dx9_26 0x79a00000) +set(baseaddress_d3dx9_27 0x799e0000) +set(baseaddress_d3dx9_28 0x799c0000) +set(baseaddress_d3dx9_29 0x799a0000) +set(baseaddress_d3dx9_30 0x79970000) +set(baseaddress_d3dx9_31 0x79950000) +set(baseaddress_d3dx9_32 0x79930000) +set(baseaddress_d3dx9_33 0x79910000) +set(baseaddress_d3dx9_34 0x798f0000) +set(baseaddress_d3dx9_35 0x798d0000) +set(baseaddress_d3dx9_36 0x79820000) +set(baseaddress_d3dx9_37 0x79800000) +set(baseaddress_d3dx9_38 0x797e0000) +set(baseaddress_d3dx9_39 0x797c0000) +set(baseaddress_d3dx9_40 0x797a0000) +set(baseaddress_d3dx9_41 0x79780000) +set(baseaddress_d3dx9_42 0x79760000) +set(baseaddress_d3dx9_43 0x79740000) +set(baseaddress_d3dxof 0x79710000) +set(baseaddress_dciman32 0x796f0000) +set(baseaddress_ddraw 0x79660000) +set(baseaddress_deskadp 0x79630000) +set(baseaddress_deskmon 0x79600000) +set(baseaddress_devcpux 0x795e0000) +set(baseaddress_devenum 0x795b0000) +set(baseaddress_dinput 0x79570000) +set(baseaddress_dinput8 0x79550000) +set(baseaddress_dmusic 0x79510000) +set(baseaddress_dplay 0x794f0000) +set(baseaddress_dxdiagn 0x794c0000) +set(baseaddress_esent 0x79490000) +set(baseaddress_faultrep 0x79470000) +set(baseaddress_fltlib 0x79450000) +set(baseaddress_fmifs 0x79430000) +set(baseaddress_fontext 0x79410000) +set(baseaddress_fontsub 0x793f0000) +set(baseaddress_framebuf 0x793d0000) +set(baseaddress_framebuf_new 0x793b0000) +set(baseaddress_framedyn 0x79390000) +set(baseaddress_genincdata 0x79360000) +set(baseaddress_getuname 0x79090000) +set(baseaddress_hid 0x79070000) +set(baseaddress_hlink 0x79040000) +set(baseaddress_hnetcfg 0x79010000) +set(baseaddress_httpapi 0x78ff0000) +set(baseaddress_iccvid 0x78fc0000) +set(baseaddress_ieframe 0x78f30000) +set(baseaddress_iernonce 0x78f00000) +set(baseaddress_imagehlp 0x78ed0000) +set(baseaddress_inetcomm 0x78e80000) +set(baseaddress_inetmib1 0x78e60000) +set(baseaddress_initpki 0x78e40000) +set(baseaddress_input 0x78de0000) +set(baseaddress_inseng 0x78dc0000) +set(baseaddress_iologmsg 0x78da0000) +set(baseaddress_itircl 0x78d80000) +set(baseaddress_itss 0x78d50000) +set(baseaddress_jscript 0x78cb0000) +set(baseaddress_jsproxy 0x78c90000) +set(baseaddress_kbsdll 0x78c70000) +set(baseaddress_kernel32_vista 0x78c50000) +set(baseaddress_ksuser 0x78c30000) +set(baseaddress_libjpeg 0x78bd0000) +set(baseaddress_libpng 0x78b70000) +set(baseaddress_libtiff 0x78b00000) +set(baseaddress_libxslt 0x789c0000) +set(baseaddress_loadperf 0x789a0000) +set(baseaddress_localspl 0x78970000) +set(baseaddress_localui 0x78940000) +set(baseaddress_lpk 0x78920000) +set(baseaddress_lsasrv 0x788d0000) +set(baseaddress_mapi32 0x788a0000) +set(baseaddress_mbedtls 0x78840000) +set(baseaddress_mciavi32 0x78810000) +set(baseaddress_mcicda 0x787e0000) +set(baseaddress_mciqtz32 0x787b0000) +set(baseaddress_mciseq 0x78780000) +set(baseaddress_mciwave 0x78750000) +set(baseaddress_mgmtapi 0x78730000) +set(baseaddress_midimap 0x78710000) +set(baseaddress_mlang 0x786e0000) +set(baseaddress_mmdrv 0x786c0000) +set(baseaddress_modemui 0x78650000) +set(baseaddress_mprapi 0x78620000) +set(baseaddress_msafd 0x785f0000) +set(baseaddress_mscat32 0x785d0000) +set(baseaddress_mscms 0x785a0000) +set(baseaddress_mscoree 0x78560000) +set(baseaddress_msctf 0x78520000) +set(baseaddress_msdmo 0x78500000) +set(baseaddress_msftedit 0x784e0000) +set(baseaddress_msgina 0x78460000) +set(baseaddress_mshtml 0x782c0000) +set(baseaddress_msi 0x781d0000) +set(baseaddress_msimtf 0x781b0000) +set(baseaddress_msisip 0x78190000) +set(baseaddress_mspatcha 0x78170000) +set(baseaddress_msports 0x78140000) +set(baseaddress_msrle32 0x78110000) +set(baseaddress_mssign32 0x780f0000) +set(baseaddress_mssip32 0x780d0000) +set(baseaddress_mstask 0x780a0000) +set(baseaddress_msv1_0 0x78080000) +set(baseaddress_msvcrt_crt_dll_startup 0x78060000) +set(baseaddress_msvcrt20 0x77fd0000) +set(baseaddress_msvcrt40 0x77f40000) +set(baseaddress_msvidc32 0x77f20000) +set(baseaddress_msxml 0x77ef0000) +set(baseaddress_msxml2 0x77ec0000) +set(baseaddress_msxml3 0x77cc0000) +set(baseaddress_msxml4 0x77c80000) +set(baseaddress_msxml6 0x77c40000) +set(baseaddress_mycomput 0x77c20000) +set(baseaddress_nddeapi 0x77c00000) +set(baseaddress_netcfgx 0x77b90000) +set(baseaddress_netevent 0x77b70000) +set(baseaddress_netid 0x77b30000) +set(baseaddress_netshell 0x77ab0000) +set(baseaddress_newdev 0x77a60000) +set(baseaddress_normaliz 0x77a40000) +set(baseaddress_notifyhook 0x77a20000) +set(baseaddress_npptools 0x77a00000) +set(baseaddress_ntdsapi 0x779d0000) +set(baseaddress_ntlanman 0x779b0000) +set(baseaddress_ntmarta 0x77990000) +set(baseaddress_ntobjshex 0x77930000) +set(baseaddress_ntprint 0x77910000) +set(baseaddress_objsel 0x778f0000) +set(baseaddress_odbc32 0x778b0000) +set(baseaddress_odbccp32 0x77880000) +set(baseaddress_oleacc 0x77830000) +set(baseaddress_olecli32 0x77810000) +set(baseaddress_olepro32 0x777f0000) +set(baseaddress_olesvr32 0x777d0000) +set(baseaddress_olethk32 0x777b0000) +set(baseaddress_pdh 0x77780000) +set(baseaddress_pidgen 0x77760000) +set(baseaddress_pifmgr 0x776e0000) +set(baseaddress_printui 0x776c0000) +set(baseaddress_propsys 0x77690000) +set(baseaddress_pstorec 0x77670000) +set(baseaddress_qedit 0x77640000) +set(baseaddress_qmgr 0x77610000) +set(baseaddress_qmgrprxy 0x775d0000) +set(baseaddress_quartz 0x774c0000) +set(baseaddress_query 0x774a0000) +set(baseaddress_rasadhlp 0x77480000) +set(baseaddress_rasdlg 0x772b0000) +set(baseaddress_rasman 0x77280000) +set(baseaddress_resutils 0x77260000) +set(baseaddress_riched32 0x77240000) +set(baseaddress_rsabase 0x77220000) +set(baseaddress_rshell 0x771c0000) +set(baseaddress_samsrv 0x77160000) +set(baseaddress_sccbase 0x77140000) +set(baseaddress_schannel 0x77110000) +set(baseaddress_schedsvc 0x770f0000) +set(baseaddress_scrrun 0x770b0000) +set(baseaddress_security 0x77090000) +set(baseaddress_serialui 0x77070000) +set(baseaddress_sfc 0x77050000) +set(baseaddress_shdoclc 0x77010000) +set(baseaddress_shdocvw 0x76fd0000) +set(baseaddress_shfolder 0x76fb0000) +set(baseaddress_shimgvw 0x76f70000) +set(baseaddress_slayer 0x76f40000) +set(baseaddress_slbcsp 0x76f20000) +set(baseaddress_sndblst 0x76ef0000) +set(baseaddress_softpub 0x76ed0000) +set(baseaddress_srclient 0x76eb0000) +set(baseaddress_srvsvc 0x76e80000) +set(baseaddress_sti 0x76e50000) +set(baseaddress_stobject 0x76e00000) +set(baseaddress_streamci 0x76de0000) +set(baseaddress_sxs 0x76db0000) +set(baseaddress_syssetup 0x76d10000) +set(baseaddress_t2embed 0x76cf0000) +set(baseaddress_tapi32 0x76cc0000) +set(baseaddress_tapiui 0x76c40000) +set(baseaddress_testvdd 0x76c20000) +set(baseaddress_themeui 0x76c00000) +set(baseaddress_traffic 0x76be0000) +set(baseaddress_twain_32 0x76bc0000) +set(baseaddress_ubtrfs 0x76ba0000) +set(baseaddress_uext2 0x76b70000) +set(baseaddress_ufat 0x76b40000) +set(baseaddress_ufatx 0x76b20000) +set(baseaddress_uffs 0x76b00000) +set(baseaddress_umpnpmgr 0x76ad0000) +set(baseaddress_untfs 0x76ab0000) +set(baseaddress_updspapi 0x76a90000) +set(baseaddress_ureiserfs 0x76a70000) +set(baseaddress_url 0x76a50000) +set(baseaddress_vbscript 0x769e0000) +set(baseaddress_vdmdbg 0x769c0000) +set(baseaddress_vssapi 0x76990000) +set(baseaddress_wbemdisp 0x76960000) +set(baseaddress_wbemprox 0x76920000) +set(baseaddress_win32kdll 0x76900000) +set(baseaddress_win32kdll_2k3sp2 0x768e0000) +set(baseaddress_win32kdll_xpsp2 0x768c0000) +set(baseaddress_windowscodecs 0x767f0000) +set(baseaddress_windowscodecsext 0x767d0000) +set(baseaddress_winfax 0x767b0000) +set(baseaddress_wing32 0x76790000) +set(baseaddress_winhttp 0x76750000) +set(baseaddress_winscard 0x76730000) +set(baseaddress_winsta 0x76700000) +set(baseaddress_wkssvc 0x766e0000) +set(baseaddress_wlanapi 0x766c0000) +set(baseaddress_wldap32 0x76690000) +set(baseaddress_wmi 0x76670000) +set(baseaddress_wmisvc 0x76650000) +set(baseaddress_wmiutils 0x76620000) +set(baseaddress_wmvcore 0x765f0000) +set(baseaddress_ws2_32_new 0x765c0000) +set(baseaddress_wshirda 0x765a0000) +set(baseaddress_wshtcpip 0x76580000) +set(baseaddress_wsock32 0x76560000) +set(baseaddress_wtsapi32 0x76540000) +set(baseaddress_wuapi 0x76510000) +set(baseaddress_xinput1_1 0x764f0000) +set(baseaddress_xinput1_2 0x764d0000) +set(baseaddress_xinput1_3 0x764b0000) +set(baseaddress_xinput9_1_0 0x76490000) +set(baseaddress_xmllite 0x76460000) +set(baseaddress_access 0x763e0000) +set(baseaddress_appwiz 0x76370000) +set(baseaddress_cmicpl 0x76340000) +set(baseaddress_desk 0x762c0000) +set(baseaddress_hdwwiz 0x76250000) +set(baseaddress_hhctrl 0x76210000) +set(baseaddress_imaadp32.acm 0x761f0000) +set(baseaddress_inetcpl 0x761a0000) +set(baseaddress_intl 0x76140000) +set(baseaddress_joy 0x76100000) +set(baseaddress_main 0x76080000) +set(baseaddress_mmsys 0x75fb0000) +set(baseaddress_msacm32.drv 0x75f80000) +set(baseaddress_msadp32.acm 0x75f60000) +set(baseaddress_msg711.acm 0x75f40000) +set(baseaddress_msgsm32.acm 0x75f20000) +set(baseaddress_msisys 0x75f00000) +set(baseaddress_ncpa 0x75ee0000) +set(baseaddress_odbccp32i 0x75ec0000) +set(baseaddress_powercfg 0x75e60000) +set(baseaddress_sysdm 0x75d80000) +set(baseaddress_telephon 0x75d60000) +set(baseaddress_timedate 0x75cf0000) +set(baseaddress_usrmgr 0x75ca0000) +set(baseaddress_wdmaud.drv 0x75b10000) +set(baseaddress_wined3dcfg 0x75ae0000) +set(baseaddress_winemp3.acm 0x75a70000) +set(baseaddress_wshom 0x75a40000) ## From baseaddress.cmake (GCC) set(baseaddress_fusion 0x73830000)

1 0

[vmikayelyan] 72462: revert r72459 (there were difference between blocks which I assumed as identical)
by vmikayelyan＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: vmikayelyan Date: Thu Aug 25 18:17:44 2016 New Revision: 72462 URL: http://svn.reactos.org/svn/reactos?rev=72462&view=rev Log: revert r72459 (there were difference between blocks which I assumed as identical) Modified: branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c Modified: branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/filesyste… ============================================================================== --- branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c [iso-8859-1] Thu Aug 25 18:17:44 2016 @@ -64,6 +64,25 @@ Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); ListEntry = ListEntry->Flink; if (!vfatFCBIsDirectory(Fcb)) + { + ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); + Status = VfatFlushFile(DeviceExt, Fcb); + ExReleaseResourceLite (&Fcb->MainResource); + if (!NT_SUCCESS(Status)) + { + DPRINT1("VfatFlushFile failed, status = %x\n", Status); + ReturnStatus = Status; + } + } + /* FIXME: Stop flushing if this is a removable media and the media was removed */ + } + + ListEntry = DeviceExt->FcbListHead.Flink; + while (ListEntry != &DeviceExt->FcbListHead) + { + Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); + ListEntry = ListEntry->Flink; + if (vfatFCBIsDirectory(Fcb)) { ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); Status = VfatFlushFile(DeviceExt, Fcb);

1 0

[hbelusca] 72461: [IERUNONCE]: CORE-11763 #comment Addendum to r72456 : comment out one of the IDS_INCORRECTFORMAT strings (since only one can exist at a time!). Somebody (Sergey?) should choose th...
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 17:13:24 2016 New Revision: 72461 URL: http://svn.reactos.org/svn/reactos?rev=72461&view=rev Log: [IERUNONCE]: CORE-11763 #comment Addendum to r72456 : comment out one of the IDS_INCORRECTFORMAT strings (since only one can exist at a time!). Somebody (Sergey?) should choose the best translation between the two. Also re-add the original IDS_NOEXPORT string that just vanished out. Modified: trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iernonce/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 17:13:24 2016 @@ -8,7 +8,8 @@ IDS_LOADERROR "ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ %1. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, ÑÐ°Ð¹Ð» Ð½Ðµ Ð±ÑÐ» ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸Ð»Ð¸ Ð¾Ð½ Ð±ÑÐ» Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½." IDS_CALLERROR "ÐÑÐ¸ Ð²ÑÐ·Ð¾Ð²Ðµ ÑÑÐ½ÐºÑÐ¸Ð¸ %1 Ð¸Ð· %2 Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¸Ð»Ð¸ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." IDS_INCORRECTFORMAT "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." - IDS_INCORRECTFORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." + // IDS_INCORRECTFORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ RunEx Ð¸Ð»Ð¸ RunOnceEx: %1. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ ||." + IDS_NOEXPORT "Unable to call the function %1 in the file %2 because that function does not exist or is not exported." IDS_EXECUTEERROR "ÐÐ¾ Ð²ÑÐµÐ¼Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ %1 Ð¿ÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¸Ð»Ð¸ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ." IDS_NOFUNCTION "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÑÐ½ÐºÑÐ¸Ñ %1 Ð² ÑÐ°Ð¹Ð»Ðµ %2." IDS_NODEPENDENCY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÑÐµÐ±ÑÐµÐ¼ÑÐ¹ ÑÐ°Ð¹Ð» %1."

1 0

[hbelusca] 72460: [TRANSLATIONS]: Update russian translation, by 'amber'. CORE-11510 #comment Only the translations that did not collide with existing ones were committed! Please recheck :)
by hbelusca＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: hbelusca Date: Thu Aug 25 14:32:50 2016 New Revision: 72460 URL: http://svn.reactos.org/svn/reactos?rev=72460&view=rev Log: [TRANSLATIONS]: Update russian translation, by 'amber'. CORE-11510 #comment Only the translations that did not collide with existing ones were committed! Please recheck :) Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 14:32:50 2016 @@ -46,7 +46,7 @@ BEGIN IDS_MODE_UNKNOWN "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾" IDS_MODE_OPEN "ÐÑÐºÑÑÑ" - IDS_MODE_STOP "ÐÑÑÐ½Ð¾Ð²Ð»ÐµÐ½" + IDS_MODE_STOP "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½" IDS_MODE_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÑÑ" IDS_MODE_PAUSE "ÐÑÐ¸Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½" IDS_MODE_RECORD "ÐÐ°Ð¿Ð¸ÑÑÐ²Ð°ÐµÑ" Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 14:32:50 2016 @@ -66,8 +66,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð²ÐµÑÑÐ¸Ð¸", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "ÐÑÐµÐ´ÑÑÐ°Ð²Ð»ÑÑÑÑÑ ÐºÐ°Ðº ÑÐ°Ð±Ð¾ÑÐ°Ñ ÑÑÐ°Ð½ÑÐ¸Ñ", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 + LTEXT "ReactOS ÑÐ¾Ð±ÑÐ°Ð½ ÐºÐ°Ðº ÑÐµÑÐ²ÐµÑÐ½Ð°Ñ ÐÐ¡ Ð¸ ÑÐ¾Ð¾Ð±ÑÐ°ÐµÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÐ¼ Ð¾Ð± ÑÑÐ¾Ð¼. Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ÑÐ»Ð°Ð¶ÐºÐ° Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ ÑÑÐ¾ (ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹).", IDC_STATIC, 15, 15, 183, 55 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END @@ -105,15 +105,15 @@ BEGIN ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 - LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 - LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 - LTEXT "Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ:", IDC_STATIC, 10, 55, 52, 8 - LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + LTEXT "Ð¡ÑÑÐºÐ¾Ð²Ð¾ÑÐ½ÑÐ¹ ÑÐ·ÐµÐ»:", IDC_STATIC, 10, 42, 100, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 104, 42, 95, 8 + LTEXT "Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ:", IDC_STATIC, 10, 55, 100, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 104, 55, 95, 8 GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 AUTOCHECKBOX "ÐÑÐ¾ &Ð¿ÐµÑÐµÐ½Ð¾ÑÐ½Ð¾Ð¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ", IDC_HWPPROP_PORTABLE, 17, 68, 115, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 - AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + AUTORADIOBUTTON "ÐÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÑÐ½Ð½Ð¾Ðµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐºÐ¾Ð²Ð°Ð½", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¾ÑÑÑÑÐºÐ¾Ð²Ð°Ð½", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 GROUPBOX "ÐÑÐ±Ð¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»ÐµÐ¹ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ", IDC_STATIC, 10, 138, 192, 42 AUTOCHECKBOX "ÐÑÐµÐ³Ð´Ð° &Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð¿ÑÐ¸ Ð·Ð°Ð¿ÑÑÐºÐµ ReactOS", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END Modified: trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 14:32:50 2016 @@ -19,11 +19,11 @@ STRINGTABLE BEGIN //Power related strings - IDS_PWR_PROPERTIES "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" + IDS_PWR_PROPERTIES "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐ»ÐµÐºÑÑÐ¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" IDS_PWR_METER "&ÐÑÐºÑÑÑÑ Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÐµÐ»Ð¸ Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ" IDS_PWR_PERCENT_REMAINING "%1!u!%% Ð¾ÑÑÐ°Ð»Ð¾ÑÑ" - IDS_PWR_CHARGING " (Ð·Ð°ÑÑÐ¶Ð°ÐµÑÑÑ)" - IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" + IDS_PWR_CHARGING " (Ð·Ð°ÑÑÐ´ÐºÐ°)" + IDS_PWR_UNKNOWN_REMAINING "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾" IDS_PWR_AC "ÐÑ ÑÐµÑÐ¸ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¾ÐºÐ°" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! ÑÐ°ÑÐ¾Ð² (%3!u!%%) Ð¾ÑÑÐ°Ð»Ð¾ÑÑ" IDS_PWR_MINUTES_REMAINING "%1!u! Ð¼Ð¸Ð½ÑÑ (%2!u!%%) Ð¾ÑÑÐ°Ð»Ð¾ÑÑ" @@ -37,7 +37,7 @@ IDS_HOTPLUG_DRIVES " - ÐÐ¸ÑÐºÐ¸(%s)" IDS_HOTPLUG_A "A:" IDS_HOTPLUG_REQUIERES "ÐÑÐ¾ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÑÐµÐ±ÑÐµÑ ""ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ñ""" - IDS_HOTPLUG_CLICK "ÐÐµÑÐµÐ´ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸ÐµÐ¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, ÐºÐ»Ð¸ÐºÐ½Ð¸ÑÐµ ÑÑÑ Ð¸ÐºÐ¾Ð½ÐºÑ Ð¸ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾, ÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²Ñ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐºÐ»ÑÑÐ¸ÑÑ" + IDS_HOTPLUG_CLICK "ÐÐµÑÐµÐ´ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸ÐµÐ¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, ÐºÐ»Ð¸ÐºÐ½Ð¸ÑÐµ ÑÑÑ Ð¸ÐºÐ¾Ð½ÐºÑ Ð¸ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾, ÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²Ñ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐºÐ»ÑÑÐ¸ÑÑ." //Volume related strings IDS_VOL_VOLUME "ÐÑÐ¾Ð¼ÐºÐ¾ÑÑÑ" Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Thu Aug 25 14:32:50 2016 @@ -47,14 +47,14 @@ IDS_DEV_LACKED_ARBITRATOR "ÐÑÐ°Ð¹Ð²ÐµÑ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° ÑÑÐµÐ±ÑÐµÑ ÑÐµÑÑÑÑÐ¾Ð², ÐºÐ¾ÑÐ¾ÑÑÐµ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑÑÑ ReactOS." IDS_DEV_BOOT_CONFIG_CONFLICT "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÑÐµÑ Ñ Ð´ÑÑÐ³Ð¸Ð¼Ð¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°Ð¼Ð¸." IDS_DEV_FAILED_FILTER "ÐÑÐ°Ð¹Ð²ÐµÑÑ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿ÐµÑÐµÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ." - IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file %1 that loads the drivers for the device." - IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file %1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." - IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." - IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " - IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." - IDS_DEV_LIAR "ReactOS stopped responding while attempting to start this device, and therefore will never attempt to start this device again." - IDS_DEV_NORMAL_CONFLICT "This device cannot find any free %1 resources to use." + IDS_DEV_DEVLOADER_NOT_FOUND "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ Ð² ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ°Ð¹Ð» %1, Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑÐ¸Ð¹ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ Ð´Ð»Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." + IDS_DEV_DEVLOADER_NOT_FOUND2 "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ ÑÐ°Ð¹Ð» %1, Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑÐ¸Ð¹ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ Ð´Ð»Ñ Ð½ÐµÐ³Ð¾, Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Ð¡Ð±Ð¾Ð¹ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°: Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ. ÐÑÐ»Ð¸ ÑÑÐ¾ Ð½Ðµ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ, Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµÑÑ Ðº Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ." + IDS_DEV_INVALID_DATA "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ BIOS ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ð½Ð°Ð·Ð½Ð°ÑÐ¸Ð» ÑÐµÑÑÑÑÑ Ð´Ð»Ñ Ð½ÐµÐ³Ð¾." + IDS_DEV_INVALID_DATA2 "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ BIOS ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ð½Ð°Ð·Ð½Ð°ÑÐ¸Ð» ÑÐµÑÑÑÑÑ Ð´Ð»Ñ Ð½ÐµÐ³Ð¾. " + IDS_DEV_FAILED_START "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ, ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ Ð¸Ð»Ð¸ Ð½Ðµ Ð²ÑÐµ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ." + IDS_DEV_LIAR "ReactOS Ð¿ÐµÑÐµÑÑÐ°Ð»Ð° Ð¾ÑÐ²ÐµÑÐ°ÑÑ Ð¿ÑÐ¸ Ð¿Ð¾Ð¿ÑÑÐºÐµ Ð·Ð°Ð¿ÑÑÐºÐ° ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°. Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð±Ð¾Ð»ÑÑÐµ Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð¿ÑÑÐ°ÑÑÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ ÐµÐ³Ð¾ ÑÐ½Ð¾Ð²Ð°." + IDS_DEV_NORMAL_CONFLICT "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ %1 ÑÐµÑÑÑÑÑ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ" IDS_DEV_NOT_VERIFIED "ÐÐ°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ²Ð»ÑÐµÑÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¼, ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾ Ð¸Ð»Ð¸ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð²." IDS_DEV_NEED_RESTART "ÐÐ°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ ÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð´Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ¸." IDS_DEV_REENUMERATION "ÐÐ°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð²ÑÐ·Ð²Ð°Ð»Ð¾ ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ ÑÐµÑÑÑÑÐ¾Ð²."

1 0

[vmikayelyan] 72459: fastfat: Remove code dublication, which has added r6279
by vmikayelyan＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: vmikayelyan Date: Thu Aug 25 14:08:19 2016 New Revision: 72459 URL: http://svn.reactos.org/svn/reactos?rev=72459&view=rev Log: fastfat: Remove code dublication, which has added r6279 Modified: branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c Modified: branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/filesyste… ============================================================================== --- branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/filesystems/fastfat/flush.c [iso-8859-1] Thu Aug 25 14:08:19 2016 @@ -64,25 +64,6 @@ Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); ListEntry = ListEntry->Flink; if (!vfatFCBIsDirectory(Fcb)) - { - ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); - Status = VfatFlushFile(DeviceExt, Fcb); - ExReleaseResourceLite (&Fcb->MainResource); - if (!NT_SUCCESS(Status)) - { - DPRINT1("VfatFlushFile failed, status = %x\n", Status); - ReturnStatus = Status; - } - } - /* FIXME: Stop flushing if this is a removable media and the media was removed */ - } - - ListEntry = DeviceExt->FcbListHead.Flink; - while (ListEntry != &DeviceExt->FcbListHead) - { - Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); - ListEntry = ListEntry->Flink; - if (vfatFCBIsDirectory(Fcb)) { ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); Status = VfatFlushFile(DeviceExt, Fcb);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016