Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 63212: [KSECDD] Fix 64 bit compilation
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 09:16:50 2014 New Revision: 63212 URL: http://svn.reactos.org/svn/reactos?rev=63212&view=rev Log: [KSECDD] Fix 64 bit compilation Modified: trunk/reactos/drivers/crypto/ksecdd/random.c Modified: trunk/reactos/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/rand… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] Sat May 10 09:16:50 2014 @@ -31,11 +31,13 @@ PVOID Buffer, SIZE_T Length) { + LARGE_INTEGER TickCount; ULONG i, RandomValue; PULONG P; /* Try to generate a more random seed */ - KsecRandomSeed ^= _rotl(KeTickCount.LowPart, (KsecRandomSeed % 23)); + KeQueryTickCount(&TickCount); + KsecRandomSeed ^= _rotl(TickCount.LowPart, (KsecRandomSeed % 23)); P = Buffer; for (i = 0; i < Length / sizeof(ULONG); i++) @@ -94,7 +96,7 @@ PTEB Teb; PPEB Peb; PWSTR String; - ULONG ReturnLength; + SIZE_T ReturnLength; NTSTATUS Status; /* Query some generic values */ @@ -125,7 +127,7 @@ /* Update the MD4 context from the environment data */ MD4Update(&Md4Context, (PUCHAR)Peb->ProcessParameters->Environment, - (PUCHAR)String - (PUCHAR)Peb->ProcessParameters->Environment); + (ULONG)((PUCHAR)String - (PUCHAR)Peb->ProcessParameters->Environment)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[tkreuzer] 63211: [KERNEL32] Fix GetTickCount on 64 bit architecture [RTL] Implement RtlGetTickCount (currently a copy of GetTickCount from kernel32) [NTDLL] Export RtlGetTickCount as NtGetTickCoun...
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 08:37:45 2014 New Revision: 63211 URL: http://svn.reactos.org/svn/reactos?rev=63211&view=rev Log: [KERNEL32] Fix GetTickCount on 64 bit architecture [RTL] Implement RtlGetTickCount (currently a copy of GetTickCount from kernel32) [NTDLL] Export RtlGetTickCount as NtGetTickCount and ZwGetTickCount Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/dll/win32/kernel32/client/time.c trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat May 10 08:37:45 2014 @@ -175,7 +175,7 @@ @ stdcall NtGetCurrentProcessorNumber() ; 5.2 and higher @ stdcall NtGetDevicePowerState(ptr ptr) @ stdcall NtGetPlugPlayEvent(long long ptr long) -@ stdcall -stub NtGetTickCount() +@ stdcall NtGetTickCount() RtlGetTickCount @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall NtImpersonateAnonymousToken(ptr) @ stdcall NtImpersonateClientOfPort(ptr ptr) @@ -1051,7 +1051,7 @@ @ stdcall ZwGetCurrentProcessorNumber() @ stdcall ZwGetDevicePowerState(ptr ptr) @ stdcall ZwGetPlugPlayEvent(long long ptr long) -;@ stdcall ZwGetTickCount() NtGetTickCount +@ stdcall ZwGetTickCount() RtlGetTickCount @ stdcall ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall ZwImpersonateAnonymousToken(ptr) @ stdcall ZwImpersonateClientOfPort(ptr ptr) NtImpersonateClientOfPort Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Sat May 10 08:37:45 2014 @@ -613,4 +613,32 @@ return STATUS_SUCCESS; } +/* FIXME: code duplication with kernel32/client/time.c */ +ULONG +NTAPI +RtlGetTickCount(VOID) +{ + ULARGE_INTEGER TickCount; + +#ifdef _WIN64 + TickCount.QuadPart = *((volatile ULONG64*)&SharedUserData->TickCount); +#else + while (TRUE) + { + TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; + TickCount.LowPart = SharedUserData->TickCount.LowPart; + + if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) + break; + + YieldProcessor(); + } +#endif + + return (ULONG)((UInt32x32To64(TickCount.LowPart, + SharedUserData->TickCountMultiplier) >> 24) + + UInt32x32To64((TickCount.HighPart << 8) & 0xFFFFFFFF, + SharedUserData->TickCountMultiplier)); +} + /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/client/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] Sat May 10 08:37:45 2014 @@ -446,6 +446,9 @@ { ULARGE_INTEGER TickCount; +#ifdef _WIN64 + TickCount.QuadPart = *((volatile ULONG64*)&SharedUserData->TickCount); +#else while (TRUE) { TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; @@ -456,6 +459,7 @@ YieldProcessor(); } +#endif return (ULONG)((UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=63211&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Sat May 10 08:37:45 2014 @@ -125,6 +125,11 @@ #define RtlpAllocateStringMemory RtlpAllocateMemory #define RtlpFreeStringMemory RtlpFreeMemory +ULONG +NTAPI +RtlGetTickCount(VOID); +#define NtGetTickCount RtlGetTickCount + BOOLEAN NTAPI RtlpSetInDbgPrint(

1 0

[jimtabor] 63210: - Fix API see CORE-8107.
by jimtabor＠svn.reactos.org 10 May '14

10 May '14

Author: jimtabor Date: Fri May 9 23:08:56 2014 New Revision: 63210 URL: http://svn.reactos.org/svn/reactos?rev=63210&view=rev Log: - Fix API see CORE-8107. Modified: trunk/reactos/win32ss/user/user32/windows/accel.c Modified: trunk/reactos/win32ss/user/user32/windows/accel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/accel.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/accel.c [iso-8859-1] Fri May 9 23:08:56 2014 @@ -344,21 +344,26 @@ */ int WINAPI TranslateAcceleratorA(HWND hWnd, HACCEL hAccTable, LPMSG lpMsg) { - MSG mCopy = *lpMsg; - CHAR cChar; - WCHAR wChar; - NTSTATUS Status; - - if(!U32IsValidAccelMessage(lpMsg->message)) return 0; - - Status = RtlMultiByteToUnicodeN(&wChar, sizeof(wChar), NULL, &cChar, sizeof(cChar)); - if(!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return 0; - } - - return TranslateAcceleratorW(hWnd, hAccTable, &mCopy); + switch (lpMsg->message) + { + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + return TranslateAcceleratorW( hWnd, hAccTable, lpMsg ); + + case WM_CHAR: + case WM_SYSCHAR: + { + MSG msgW = *lpMsg; + char ch = LOWORD(lpMsg->wParam); + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &ch, 1, &wch, 1); + msgW.wParam = MAKEWPARAM(wch, HIWORD(lpMsg->wParam)); + return TranslateAcceleratorW( hWnd, hAccTable, &msgW ); + } + + default: + return 0; + } } /* EOF */

1 0

[hbelusca] 63209: [NTVDM] Factor the shift of the interlaced high bit out of the for(...) loop (since the interlaced high bit is not modified anymore after), and add extra parentheses.
by hbelusca＠svn.reactos.org 10 May '14

10 May '14

Author: hbelusca Date: Fri May 9 22:07:49 2014 New Revision: 63209 URL: http://svn.reactos.org/svn/reactos?rev=63209&view=rev Log: [NTVDM] Factor the shift of the interlaced high bit out of the for(...) loop (since the interlaced high bit is not modified anymore after), and add extra parentheses. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Fri May 9 22:07:49 2014 @@ -1136,6 +1136,7 @@ { /* Graphics mode */ PBYTE GraphicsBuffer = (PBYTE)ConsoleFramebuffer; + DWORD InterlaceHighBit = VGA_INTERLACE_HIGH_BIT; /* * Synchronize access to the graphics framebuffer @@ -1143,17 +1144,15 @@ */ WaitForSingleObject(ConsoleMutex, INFINITE); + /* Shift the high bit right by 1 in odd/even mode */ + if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) + { + InterlaceHighBit >>= 1; + } + /* Loop through the scanlines */ for (i = 0; i < Resolution.Y; i++) { - DWORD InterlaceHighBit = VGA_INTERLACE_HIGH_BIT; - - if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) - { - /* Shift the high bit right by 1 in odd/even mode */ - InterlaceHighBit >>= 1; - } - if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) && (i & 1)) { /* Odd-numbered line in interlaced mode - set the high bit */ @@ -1309,7 +1308,7 @@ } } - if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE && (i & 1)) + if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) && (i & 1)) { /* Clear the high bit */ Address &= ~InterlaceHighBit;

1 0

[aandrejevic] 63208: [NTVDM] Replace the temporary CGA hack with a working solution. CORE-8177 #comment CGA should work as of r63208.
by aandrejevic＠svn.reactos.org 09 May '14

09 May '14

Author: aandrejevic Date: Fri May 9 21:56:40 2014 New Revision: 63208 URL: http://svn.reactos.org/svn/reactos?rev=63208&view=rev Log: [NTVDM] Replace the temporary CGA hack with a working solution. CORE-8177 #comment CGA should work as of r63208. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c trunk/reactos/subsystems/ntvdm/hardware/vga.h Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Fri May 9 21:56:40 2014 @@ -1146,7 +1146,19 @@ /* Loop through the scanlines */ for (i = 0; i < Resolution.Y; i++) { - BOOL RepeatScanline = FALSE; + DWORD InterlaceHighBit = VGA_INTERLACE_HIGH_BIT; + + if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_OE) + { + /* Shift the high bit right by 1 in odd/even mode */ + InterlaceHighBit >>= 1; + } + + if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) && (i & 1)) + { + /* Odd-numbered line in interlaced mode - set the high bit */ + Address |= InterlaceHighBit; + } /* Loop through the pixels */ for (j = 0; j < Resolution.X; j++) @@ -1203,21 +1215,8 @@ */ DWORD BankNumber = (j / 4) % 2; DWORD Offset = Address + (j / 8); - BYTE LowPlaneData, HighPlaneData; - - if (i % 2 != 0) - { - /* Odd-numbered line - add the CGA emulation offset */ - Offset += VGA_CGA_ODD_LINE_OFFSET; - } - else - { - /* Even-numbered line - use the same scanline */ - RepeatScanline = TRUE; - } - - LowPlaneData = VgaMemory[BankNumber * VGA_BANK_SIZE + Offset * AddressSize]; - HighPlaneData = VgaMemory[(BankNumber + 2) * VGA_BANK_SIZE + Offset * AddressSize]; + BYTE LowPlaneData = VgaMemory[BankNumber * VGA_BANK_SIZE + Offset * AddressSize]; + BYTE HighPlaneData = VgaMemory[(BankNumber + 2) * VGA_BANK_SIZE + Offset * AddressSize]; /* Extract the two bits from each plane */ LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 3; @@ -1310,8 +1309,17 @@ } } - /* Move to the next scanline */ - if (!RepeatScanline) Address += ScanlineSize; + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE && (i & 1)) + { + /* Clear the high bit */ + Address &= ~InterlaceHighBit; + } + + if (!(VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) || (i & 1)) + { + /* Move to the next scanline */ + Address += ScanlineSize; + } } /* Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] Fri May 9 21:56:40 2014 @@ -24,7 +24,7 @@ #define VGA_MINIMUM_HEIGHT 300 #define VGA_DAC_TO_COLOR(x) (((x) << 2) | ((x) >> 4)) #define VGA_COLOR_TO_DAC(x) ((x) >> 2) -#define VGA_CGA_ODD_LINE_OFFSET 0x1000 +#define VGA_INTERLACE_HIGH_BIT (1 << 13) /* Register I/O ports */

1 0

[hbelusca] 63207: [NTVDM] Fix logic. Caught by Victor Martinez (private communication).
by hbelusca＠svn.reactos.org 09 May '14

09 May '14

Author: hbelusca Date: Fri May 9 20:47:31 2014 New Revision: 63207 URL: http://svn.reactos.org/svn/reactos?rev=63207&view=rev Log: [NTVDM] Fix logic. Caught by Victor Martinez (private communication). Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] Fri May 9 20:47:31 2014 @@ -313,7 +313,7 @@ BYTE InterruptNumber = line; /* Check for PIC validity */ - if (ms != ICA_MASTER || ms != ICA_SLAVE) return; + if (ms != ICA_MASTER && ms != ICA_SLAVE) return; /* * Adjust the interrupt request number according to the parameters,

1 0

[hbelusca] 63206: [CABMAN] In any case, we are returning the (!= success) status in case we failed to perform the file copy, so just test for != success just one time. Patch by Victor Martinez. COR...
by hbelusca＠svn.reactos.org 09 May '14

09 May '14

Author: hbelusca Date: Fri May 9 20:25:41 2014 New Revision: 63206 URL: http://svn.reactos.org/svn/reactos?rev=63206&view=rev Log: [CABMAN] In any case, we are returning the (!= success) status in case we failed to perform the file copy, so just test for != success just one time. Patch by Victor Martinez. CORE-8189 #resolve Modified: trunk/reactos/tools/cabman/dfp.cxx Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=6… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Fri May 9 20:25:41 2014 @@ -361,10 +361,8 @@ { printf("ERROR: Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Error while copying file.\n")); + return Status; } - - if (Status != CAB_STATUS_SUCCESS) - return Status; } break;

1 0

[hbelusca] 63205: [CDMAKE] Simplify the conditional checks; pointed by Victor Martinez. CORE-8190 #resolve
by hbelusca＠svn.reactos.org 09 May '14

09 May '14

Author: hbelusca Date: Fri May 9 19:58:27 2014 New Revision: 63205 URL: http://svn.reactos.org/svn/reactos?rev=63205&view=rev Log: [CDMAKE] Simplify the conditional checks; pointed by Victor Martinez. CORE-8190 #resolve Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Fri May 9 19:58:27 2014 @@ -1327,7 +1327,7 @@ // Boot Volume Descriptor - if (eltorito == TRUE) + if (eltorito) { write_byte(0); write_string("CD001\1"); @@ -1390,7 +1390,7 @@ fill_sector(); // Boot Catalog - if (eltorito == TRUE) + if (eltorito) { boot_catalog_sector = cd.sector; @@ -1416,7 +1416,7 @@ } // Boot Image - if (eltorito == TRUE) + if (eltorito) { boot_image_sector = cd.sector;

1 0

[cwittich] 63204: [ntdll] fix parameter check in RtlFindActivationContextSectionString
by cwittich＠svn.reactos.org 09 May '14

09 May '14

Author: cwittich Date: Fri May 9 05:07:51 2014 New Revision: 63204 URL: http://svn.reactos.org/svn/reactos?rev=63204&view=rev Log: [ntdll] fix parameter check in RtlFindActivationContextSectionString Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=63204… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Fri May 9 05:07:51 2014 @@ -5130,7 +5130,7 @@ const UNICODE_STRING *section_name, PACTCTX_SECTION_KEYED_DATA data ) { /* Check general parameter combinations */ - if (!section_name || + if (!section_name || !section_name->Buffer || (flags & ~FIND_ACTCTX_VALID_MASK) || ((flags & FIND_ACTCTX_VALID_MASK) && !data) || (data && data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex)))

1 0

[cwittich] 63203: [kernel32_winetest] don't skip test_typelib_section anymore
by cwittich＠svn.reactos.org 09 May '14

09 May '14

Author: cwittich Date: Fri May 9 04:46:18 2014 New Revision: 63203 URL: http://svn.reactos.org/svn/reactos?rev=63203&view=rev Log: [kernel32_winetest] don't skip test_typelib_section anymore Modified: trunk/rostests/winetests/kernel32/actctx.c Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… ============================================================================== --- trunk/rostests/winetests/kernel32/actctx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/actctx.c [iso-8859-1] Fri May 9 04:46:18 2014 @@ -1670,9 +1670,6 @@ HANDLE handle; BOOL ret; - skip("test_typelib_section\n"); - return; - /* use two dependent manifests, 4 'files' total */ create_manifest_file("testdep1.manifest", manifest_wndcls1, -1, NULL, NULL); create_manifest_file("testdep2.manifest", manifest_wndcls2, -1, NULL, NULL);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs