Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[tkreuzer] 34918: fix ntoskrnl build
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Mon Jul 28 16:43:28 2008 New Revision: 34918 URL: http://svn.reactos.org/svn/reactos?rev=34918&view=rev Log: fix ntoskrnl build Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Mon Jul 28 16:43:28 2008 @@ -1,6 +1,7 @@ #define STUB(x) void x() {} +STUB(KdpEnableSafeMem) STUB(KfLowerIrql) STUB(KeRaiseIrql) STUB(KeLowerIrql) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Mon Jul 28 16:43:28 2008 @@ -13,7 +13,7 @@ <if property="_WINKD_" value="1"> <define name="_WINKD_" /> </if> - <if property="_ELF" value="1"> + <if property="_ELF_" value="1"> <define name="_ELF_" /> </if> <include base="cmlib">.</include>

1 0

[tkreuzer] 34917: fix hal build
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Mon Jul 28 16:42:32 2008 New Revision: 34917 URL: http://svn.reactos.org/svn/reactos?rev=34917&view=rev Log: fix hal build Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild [iso-8859-1] Mon Jul 28 16:42:32 2008 @@ -11,8 +11,8 @@ <file>hal.rc</file> <file>hal.spec</file> </module> - </if> - <if property="ARCH" value="i386"> + </if> + <if property="ARCH" value="i386"> <module name="hal" type="kernelmodedll"> <importlibrary definition="hal.spec.def" /> <include base="ntoskrnl">include</include> @@ -22,7 +22,7 @@ <file>hal.rc</file> <file>hal.spec</file> </module> - </if> + </if> <if property="ARCH" value="i386"> <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> </module> @@ -32,4 +32,15 @@ <if property="ARCH" value="powerpc"> <module name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halppc_up"/> </if> + <if property="ARCH" value="amd64"> + <module name="hal" type="kernelmodedll"> + <importlibrary definition="hal_amd64.def" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <define name="_NTHAL_" /> + <file>hal.c</file> + <file>hal.rc</file> + <file>hal.spec</file> + </module> + </if> </group>

1 0

[tkreuzer] 34916: - add missing 64 bit intrinsic Interlocked functions - readd Interlocked definitions to winddk.h that someone stole
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Mon Jul 28 16:39:55 2008 New Revision: 34916 URL: http://svn.reactos.org/svn/reactos?rev=34916&view=rev Log: - add missing 64 bit intrinsic Interlocked functions - readd Interlocked definitions to winddk.h that someone stole Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Mon Jul 28 16:39:55 2008 @@ -5796,6 +5796,17 @@ #define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer #define InterlockedExchangePointer _InterlockedExchangePointer +#define ExInterlockedPopEntrySList(Head, Lock) ExpInterlockedPopEntrySList(Head) +#define ExInterlockedPushEntrySList(Head, Entry, Lock) ExpInterlockedPushEntrySList(Head, Entry) +#define ExInterlockedFlushSList(Head) ExpInterlockedFlushSList(Head) + +#if !defined(_WINBASE_) +#define InterlockedPopEntrySList(Head) ExpInterlockedPopEntrySList(Head) +#define InterlockedPushEntrySList(Head, Entry) ExpInterlockedPushEntrySList(Head, Entry) +#define InterlockedFlushSList(Head) ExpInterlockedFlushSList(Head) +#define QueryDepthSList(Head) ExQueryDepthSList(Head) +#endif // !defined(_WINBASE_ + #endif // _M_AMD64 #endif /* !__INTERLOCKED_DECLARED */ Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Mon Jul 28 16:39:55 2008 @@ -147,6 +147,13 @@ return __sync_fetch_and_add(Addend, Value); } +#if defined(_M_AMD64) +static __inline__ __attribute__((always_inline)) long long _InterlockedExchangeAdd64(volatile long long * const Addend, const long long Value) +{ + return __sync_fetch_and_add(Addend, Value); +} +#endif + static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) { return __sync_fetch_and_and(value, mask); @@ -470,6 +477,18 @@ { return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } + +#if defined(_M_AMD64) +static __inline__ __attribute__((always_inline)) long long _InterlockedDecrement64(volatile long long * const lpAddend) +{ + return _InterlockedExchangeAdd(lpAddend, -1) - 1; +} + +static __inline__ __attribute__((always_inline)) long long _InterlockedIncrement64(volatile long long * const lpAddend) +{ + return _InterlockedExchangeAdd64(lpAddend, 1) + 1; +} +#endif static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset(volatile long * a, const long b) {

1 0

[janderwald] 34915: - display volume label for disk drives. If there is no label, load default label
by janderwald＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: janderwald Date: Mon Jul 28 14:47:19 2008 New Revision: 34915 URL: http://svn.reactos.org/svn/reactos?rev=34915&view=rev Log: - display volume label for disk drives. If there is no label, load default label Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.c [iso-8859-1] Mon Jul 28 14:47:19 2008 @@ -684,24 +684,59 @@ } else if (_ILIsDrive(pidl)) { + _ILSimpleGetTextW (pidl, pszPath, MAX_PATH); /* append my own path */ - /* long view "lw_name (C:)" */ if (!(dwFlags & SHGDN_FORPARSING)) { - DWORD dwVolumeSerialNumber, dwMaximumComponetLength, dwFileSystemFlags; WCHAR wszDrive[18] = {0}; + DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; static const WCHAR wszOpenBracket[] = {' ','(',0}; static const WCHAR wszCloseBracket[] = {')',0}; - GetVolumeInformationW (pszPath, wszDrive, - sizeof(wszDrive)/sizeof(wszDrive[0]) - 6, + lstrcpynW(wszDrive, pszPath, 4); + GetVolumeInformationW (wszDrive, pszPath, + MAX_PATH - 7, &dwVolumeSerialNumber, - &dwMaximumComponetLength, &dwFileSystemFlags, NULL, 0); - strcatW (wszDrive, wszOpenBracket); - lstrcpynW (wszDrive + strlenW(wszDrive), pszPath, 3); - strcatW (wszDrive, wszCloseBracket); - strcpyW (pszPath, wszDrive); + &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0); + pszPath[MAX_PATH-1] = L'\0'; + pszPath[0] = L'\0'; + + if (!wcslen(pszPath)) + { + UINT DriveType, ResourceId; + DriveType = GetDriveTypeW(wszDrive); + switch(DriveType) + { + case DRIVE_FIXED: + ResourceId = IDS_DRIVE_FIXED; + break; + case DRIVE_REMOTE: + ResourceId = IDS_DRIVE_NETWORK; + break; + case DRIVE_CDROM: + ResourceId = IDS_DRIVE_CDROM; + break; + default: + ResourceId = 0; + } + if (ResourceId) + { + dwFileSystemFlags = LoadStringW(shell32_hInstance, ResourceId, pszPath, MAX_PATH); + if (dwFileSystemFlags > MAX_PATH - 7) + pszPath[MAX_PATH-7] = L'\0'; + else if (dwFileSystemFlags == 0) + pszPath[0] = L'\0'; + } + else + { + pszPath[0] = L'\0'; + } + } + strcatW (pszPath, wszOpenBracket); + wszDrive[2] = L'\0'; + strcatW (pszPath, wszDrive); + strcatW (pszPath, wszCloseBracket); } } else

1 0

[fireball] 34914: - Don't strictly check NTDDI_VERSION to WINXP or WS03, since in case of e.g. NTDDI_WS03SP1 the define would work incorrectly (skipping a structure member).
by fireball＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: fireball Date: Mon Jul 28 13:38:11 2008 New Revision: 34914 URL: http://svn.reactos.org/svn/reactos?rev=34914&view=rev Log: - Don't strictly check NTDDI_VERSION to WINXP or WS03, since in case of e.g. NTDDI_WS03SP1 the define would work incorrectly (skipping a structure member). Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Mon Jul 28 13:38:11 2008 @@ -1426,9 +1426,9 @@ ULONG PeakProcessMemoryUsed; ULONG PeakJobMemoryUsed; ULONG CurrentJobMemoryUsed; -#if (NTDDI_VERSION == NTDDI_WINXP) +#if (NTDDI_VERSION >= NTDDI_WINXP) && (NTDDI_VERSION < NTDDI_WS03) FAST_MUTEX MemoryLimitsLock; -#elif (NTDDI_VERSION == NTDDI_WS03) +#elif (NTDDI_VERSION >= NTDDI_WS03) && (NTDDI_VERSION < NTDDI_LONGHORN) KGUARDED_MUTEX MemoryLimitsLock; #elif (NTDDI_VERSION >= NTDDI_LONGHORN) EX_PUSH_LOCK MemoryLimitsLock;

1 0

[janderwald] 34913: - reenable drive properties dialog
by janderwald＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: janderwald Date: Mon Jul 28 13:23:42 2008 New Revision: 34913 URL: http://svn.reactos.org/svn/reactos?rev=34913&view=rev Log: - reenable drive properties dialog Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] Mon Jul 28 13:23:42 2008 @@ -857,7 +857,6 @@ ShellExecuteA(hwnd, "open", "rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL); return; } -#if 0 else if (_ILIsDrive(This->apidl[0])) { WCHAR buffer[111]; @@ -865,7 +864,6 @@ SH_ShowDriveProperties(buffer); return; } -#endif else if (_ILIsBitBucket(This->apidl[0])) { ///FIXME

1 0

[arty] 34912: Should fix the release build (sorry).
by arty＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: arty Date: Mon Jul 28 13:21:35 2008 New Revision: 34912 URL: http://svn.reactos.org/svn/reactos?rev=34912&view=rev Log: Should fix the release build (sorry). Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Jul 28 13:21:35 2008 @@ -272,13 +272,11 @@ <file>pnproot.c</file> </directory> </directory> - <if property="DBG" value="1"> - <directory name="kd"> - <directory name="i386"> - <file>kdmemsup.c</file> - </directory> - </directory> - </if> + <directory name="kd"> + <directory name="i386"> + <file>kdmemsup.c</file> + </directory> + </directory> <if property="_WINKD_" value="0"> <directory name="kdbg"> <if property="ARCH" value="i386">

1 0

[jmorlan] 34911: - GuiConsoleInitScrollbar: Hide vertical scrollbar when not needed; use SB_VERT (not SB_HORZ) to set its information when it is; set sInfo.nPage according to window size in characters; calculate window pixel size, taking scrollbar width/height into account. - GuiConsoleHandleNcCreate: Remove window sizing (now done in GuiConsoleInitScrollbar) - GuiApplyUserSettings: Swap transposed min/max in cursor size calculation; don't assume that the physical top of the buffer is the same a
by jmorlan＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: jmorlan Date: Mon Jul 28 11:48:04 2008 New Revision: 34911 URL: http://svn.reactos.org/svn/reactos?rev=34911&view=rev Log: - GuiConsoleInitScrollbar: Hide vertical scrollbar when not needed; use SB_VERT (not SB_HORZ) to set its information when it is; set sInfo.nPage according to window size in characters; calculate window pixel size, taking scrollbar width/height into account. - GuiConsoleHandleNcCreate: Remove window sizing (now done in GuiConsoleInitScrollbar) - GuiApplyUserSettings: Swap transposed min/max in cursor size calculation; don't assume that the physical top of the buffer is the same as the logical top; fix broken code where HAVE_WMEMSET isn't defined (wrong loop counts, Offset wasn't incremented); fix typo in calculating height difference. If either buffer or window size has changed, call GuiConsoleInitScrollbar. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Mon Jul 28 11:48:04 2008 @@ -641,35 +641,50 @@ GuiConsoleInitScrollbar(PCSRSS_CONSOLE Console, HWND hwnd) { SCROLLINFO sInfo; + PGUI_CONSOLE_DATA GuiData = Console->PrivateData; + + DWORD Width = Console->Size.X * GuiData->CharWidth + 2 * GetSystemMetrics(SM_CXFIXEDFRAME); + DWORD Height = Console->Size.Y * GuiData->CharHeight + 2 * GetSystemMetrics(SM_CYFIXEDFRAME) + GetSystemMetrics(SM_CYCAPTION); /* set scrollbar sizes */ sInfo.cbSize = sizeof(SCROLLINFO); - sInfo.fMask = SIF_RANGE | SIF_POS; + sInfo.fMask = SIF_RANGE | SIF_PAGE | SIF_POS; sInfo.nMin = 0; - sInfo.nMax = Console->ActiveBuffer->MaxY; - sInfo.nPos = 0; - SetScrollInfo(hwnd, SB_HORZ, &sInfo, TRUE); - ShowScrollBar(hwnd, SB_VERT, TRUE); + if (Console->ActiveBuffer->MaxY > Console->Size.Y) + { + sInfo.nMax = Console->ActiveBuffer->MaxY - 1; + sInfo.nPage = Console->Size.Y; + sInfo.nPos = Console->ActiveBuffer->ShowY; + SetScrollInfo(hwnd, SB_VERT, &sInfo, TRUE); + Width += GetSystemMetrics(SM_CXVSCROLL); + ShowScrollBar(hwnd, SB_VERT, TRUE); + } + else + { + ShowScrollBar(hwnd, SB_VERT, FALSE); + } if (Console->ActiveBuffer->MaxX > Console->Size.X) { - sInfo.cbSize = sizeof(SCROLLINFO); - sInfo.fMask = SIF_RANGE | SIF_POS; - sInfo.nMin = 0; - sInfo.nPos = 0; - sInfo.nMax = Console->ActiveBuffer->MaxX; + sInfo.nMax = Console->ActiveBuffer->MaxX - 1; + sInfo.nPage = Console->Size.X; + sInfo.nPos = Console->ActiveBuffer->ShowX; SetScrollInfo(hwnd, SB_HORZ, &sInfo, TRUE); + Height += GetSystemMetrics(SM_CYHSCROLL); + ShowScrollBar(hwnd, SB_HORZ, TRUE); } else { - ShowScrollBar(hwnd, SB_HORZ, FALSE); - } + ShowScrollBar(hwnd, SB_HORZ, FALSE); + } + + SetWindowPos(hwnd, NULL, 0, 0, Width, Height, + SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); } static BOOL FASTCALL GuiConsoleHandleNcCreate(HWND hWnd, CREATESTRUCTW *Create) { - RECT Rect; PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Create->lpCreateParams; PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Console->PrivateData; HDC Dc; @@ -762,14 +777,6 @@ DPRINT("Console %p GuiData %p\n", Console, GuiData); Console->PrivateData = GuiData; SetWindowLongPtrW(hWnd, GWL_USERDATA, (DWORD_PTR) Console); - - GetWindowRect(hWnd, &Rect); - Rect.right = Rect.left + Console->Size.X * GuiData->CharWidth + - 2 * GetSystemMetrics(SM_CXFIXEDFRAME); - Rect.bottom = Rect.top + Console->Size.Y * GuiData->CharHeight + - 2 * GetSystemMetrics(SM_CYFIXEDFRAME) + GetSystemMetrics(SM_CYCAPTION); - MoveWindow(hWnd, Rect.left, Rect.top, Rect.right - Rect.left, - Rect.bottom - Rect.top, FALSE); SetTimer(hWnd, 1, CURSOR_BLINK_TIME, NULL); GuiConsoleCreateSysMenu(Console); @@ -1551,8 +1558,8 @@ GuiApplyUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PConsoleInfo pConInfo) { DWORD windx, windy; - RECT rect; PCSRSS_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer; + BOOL SizeChanged = FALSE; EnterCriticalSection(&ActiveBuffer->Header.Lock); @@ -1561,7 +1568,7 @@ GuiData->ScreenBackground = pConInfo->ScreenBackground; /* apply cursor size */ - ActiveBuffer->CursorInfo.dwSize = max(min(pConInfo->CursorSize, 1), 100); + ActiveBuffer->CursorInfo.dwSize = min(max(pConInfo->CursorSize, 1), 100); windx = LOWORD(pConInfo->ScreenBuffer); windy = HIWORD(pConInfo->ScreenBuffer); @@ -1573,7 +1580,7 @@ if (Buffer) { DWORD Offset = 0; - DWORD BufferOffset = 0; + BYTE * OldPtr; USHORT CurrentY; BYTE * OldBuffer; USHORT value; @@ -1587,17 +1594,17 @@ for (CurrentY = 0; CurrentY < min(ActiveBuffer->MaxY, windy); CurrentY++) { + OldPtr = ConioCoordToPointer(ActiveBuffer, 0, CurrentY); if (windx <= ActiveBuffer->MaxX) { /* reduce size */ - RtlCopyMemory(&Buffer[Offset], &OldBuffer[BufferOffset], windx * 2); + RtlCopyMemory(&Buffer[Offset], OldPtr, windx * 2); Offset += (windx * 2); - BufferOffset += (ActiveBuffer->MaxX * 2); } else { /* enlarge size */ - RtlCopyMemory(&Buffer[Offset], &OldBuffer[BufferOffset], ActiveBuffer->MaxX * 2); + RtlCopyMemory(&Buffer[Offset], OldPtr, ActiveBuffer->MaxX * 2); Offset += (ActiveBuffer->MaxX * 2); diff = windx - ActiveBuffer->MaxX; @@ -1605,27 +1612,25 @@ #if HAVE_WMEMSET wmemset((WCHAR*)&Buffer[Offset], value, diff); #else - for (i = 0; i < diff * 2; i++) + for (i = 0; i < diff; i++) { - Buffer[Offset * 2] = ' '; - Buffer[Offset * 2 + 1] = ActiveBuffer->DefaultAttrib; + Buffer[Offset++] = ' '; + Buffer[Offset++] = ActiveBuffer->DefaultAttrib; } #endif - Offset += (diff * 2); - BufferOffset += (ActiveBuffer->MaxX * 2); } } if (windy > ActiveBuffer->MaxY) { - diff = windy - ActiveBuffer->MaxX; + diff = windy - ActiveBuffer->MaxY; #if HAVE_WMEMSET wmemset((WCHAR*)&Buffer[Offset], value, diff * windx); #else - for (i = 0; i < diff * 2; i++) + for (i = 0; i < diff * windx; i++) { - Buffer[Offset * 2] = ' '; - Buffer[Offset * 2 + 1] = ActiveBuffer->DefaultAttrib; + Buffer[Offset++] = ' '; + Buffer[Offset++] = ActiveBuffer->DefaultAttrib; } #endif } @@ -1634,7 +1639,8 @@ HeapFree(Win32CsrApiHeap, 0, OldBuffer); ActiveBuffer->MaxX = windx; ActiveBuffer->MaxY = windy; - InvalidateRect(pConInfo->hConsoleWindow, NULL, TRUE); + ActiveBuffer->VirtualY = 0; + SizeChanged = TRUE; } else { @@ -1667,25 +1673,14 @@ /* resize window */ Console->Size.X = windx; Console->Size.Y = windy; - - GetWindowRect(pConInfo->hConsoleWindow, &rect); - - rect.right = rect.left + Console->Size.X * GuiData->CharWidth + 2 * GetSystemMetrics(SM_CXFIXEDFRAME); - rect.bottom = rect.top + Console->Size.Y * GuiData->CharHeight + 2 * GetSystemMetrics(SM_CYFIXEDFRAME) + GetSystemMetrics(SM_CYCAPTION); - - MoveWindow(pConInfo->hConsoleWindow, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, FALSE); - - if (Console->Size.X < ActiveBuffer->MaxX) - { - /* show scrollbar when window becomes smaller than active screen buffer */ - ShowScrollBar(pConInfo->hConsoleWindow, SB_CTL, TRUE); - } - else - { - /* hide scrollbar */ - ShowScrollBar(pConInfo->hConsoleWindow, SB_CTL, FALSE); - } - } + SizeChanged = TRUE; + } + + if (SizeChanged) + { + GuiConsoleInitScrollbar(Console, pConInfo->hConsoleWindow); + } + LeaveCriticalSection(&ActiveBuffer->Header.Lock); InvalidateRect(pConInfo->hConsoleWindow, NULL, TRUE); }

1 0

[tkreuzer] 34910: sync with trunk head (34904)
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Mon Jul 28 10:52:00 2008 New Revision: 34910 URL: http://svn.reactos.org/svn/reactos?rev=34910&view=rev Log: sync with trunk head (34904) Added: branches/ros-amd64-bringup/reactos/hal/hal/hal.spec (with props) branches/ros-amd64-bringup/reactos/include/reactos/msvctarget.h - copied unchanged from r34909, trunk/reactos/include/reactos/msvctarget.h branches/ros-amd64-bringup/reactos/ntoskrnl/kd/i386/ - copied from r34909, trunk/reactos/ntoskrnl/kd/i386/ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/alias.c - copied unchanged from r34909, trunk/reactos/subsystems/win32/csrss/win32csr/alias.c Removed: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/alias.c Modified: branches/ros-amd64-bringup/reactos/ReactOS-arm.rbuild branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/chargen.c branches/ros-amd64-bringup/reactos/base/shell/cmd/chcp.c branches/ros-amd64-bringup/reactos/base/shell/cmd/choice.c branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.h branches/ros-amd64-bringup/reactos/base/shell/cmd/color.c branches/ros-amd64-bringup/reactos/base/shell/cmd/console.c branches/ros-amd64-bringup/reactos/base/shell/cmd/copy.c branches/ros-amd64-bringup/reactos/base/shell/cmd/date.c branches/ros-amd64-bringup/reactos/base/shell/cmd/del.c branches/ros-amd64-bringup/reactos/base/shell/cmd/echo.c branches/ros-amd64-bringup/reactos/base/shell/cmd/error.c branches/ros-amd64-bringup/reactos/base/shell/cmd/free.c branches/ros-amd64-bringup/reactos/base/shell/cmd/goto.c branches/ros-amd64-bringup/reactos/base/shell/cmd/internal.c branches/ros-amd64-bringup/reactos/base/shell/cmd/label.c branches/ros-amd64-bringup/reactos/base/shell/cmd/memory.c branches/ros-amd64-bringup/reactos/base/shell/cmd/misc.c branches/ros-amd64-bringup/reactos/base/shell/cmd/move.c branches/ros-amd64-bringup/reactos/base/shell/cmd/path.c branches/ros-amd64-bringup/reactos/base/shell/cmd/ren.c branches/ros-amd64-bringup/reactos/base/shell/cmd/replace.c branches/ros-amd64-bringup/reactos/base/shell/cmd/set.c branches/ros-amd64-bringup/reactos/base/shell/cmd/timer.c branches/ros-amd64-bringup/reactos/base/shell/cmd/type.c branches/ros-amd64-bringup/reactos/base/shell/cmd/ver.c branches/ros-amd64-bringup/reactos/base/shell/cmd/verify.c branches/ros-amd64-bringup/reactos/base/shell/cmd/vol.c branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.h branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/arm/loader.c branches/ros-amd64-bringup/reactos/config-arm.template.rbuild branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild branches/ros-amd64-bringup/reactos/config.template.rbuild branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_arm.def branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/console.c branches/ros-amd64-bringup/reactos/dll/win32/msgina/gui.c branches/ros-amd64-bringup/reactos/dll/win32/msgina/msgina.h branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.def branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.rbuild branches/ros-amd64-bringup/reactos/drivers/bus/pci/pci.c branches/ros-amd64-bringup/reactos/drivers/filesystems/npfs/create.c branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/kbdclass.c branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/kbdclass.h branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/misc.c branches/ros-amd64-bringup/reactos/drivers/input/mouclass/misc.c branches/ros-amd64-bringup/reactos/drivers/input/mouclass/mouclass.c branches/ros-amd64-bringup/reactos/drivers/input/mouclass/mouclass.h branches/ros-amd64-bringup/reactos/drivers/storage/class/ramdisk/ramdisk.c branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.c branches/ros-amd64-bringup/reactos/hal/hal/hal.c branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/hal/hal.rc branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild branches/ros-amd64-bringup/reactos/include/ddk/hidclass.h branches/ros-amd64-bringup/reactos/include/psdk/windows.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin.h branches/ros-amd64-bringup/reactos/lib/rtl/process.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c branches/ros-amd64-bringup/reactos/lib/sdk/nt/entry_point.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ob_x.h branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd/wrappers/gdbstub.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/procobj.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/arm/stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/aspace.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/page.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/region.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ob/oblife.c branches/ros-amd64-bringup/reactos/ntoskrnl/ob/oblink.c branches/ros-amd64-bringup/reactos/ntoskrnl/vdm/vdmmain.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/process.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/csrss.rbuild branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/include/api.h branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/include/conio.h branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/init.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/conio.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/dllmain.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/guiconsole.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/hook.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/defwnd.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c branches/ros-amd64-bringup/reactos/tools/buildno/buildno.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msbuild/msbuild.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp branches/ros-amd64-bringup/reactos/tools/sysreg/namedpipe_reader.cpp branches/ros-amd64-bringup/reactos/tools/sysreg/os_support.cpp branches/ros-amd64-bringup/reactos/tools/sysreg/os_support.h branches/ros-amd64-bringup/reactos/tools/sysreg/rosboot_test.cpp branches/ros-amd64-bringup/reactos/tools/sysreg/rosboot_test.h branches/ros-amd64-bringup/reactos/tools/sysreg/sysreg.rbuild branches/ros-amd64-bringup/reactos/tools/sysreg/user_types.h branches/ros-amd64-bringup/reactos/tools/winebuild/build.h branches/ros-amd64-bringup/reactos/tools/winebuild/parser.c branches/ros-amd64-bringup/reactos/tools/winebuild/spec32.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/chargen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… Modified: branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… Modified: branches/ros-amd64-bringup/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_arm.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/input/mouclass/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Added: branches/ros-amd64-bringup/reactos/hal/hal/hal.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/lib/recyclebin/recyclebin.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… Modified: branches/ros-amd64-bringup/reactos/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/nt/entry_point.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Removed: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msbuild/msbuild.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/sysreg/sysreg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…

1 0

[tkreuzer] 34909: some more win32k 64 bit fixes
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Mon Jul 28 10:30:31 2008 New Revision: 34909 URL: http://svn.reactos.org/svn/reactos?rev=34909&view=rev Log: some more win32k 64 bit fixes Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Jul 28 10:30:31 2008 @@ -439,7 +439,7 @@ { RtlCopyMemory(Extra, ClassName->Buffer, ClassName->Length); CbtCreatewndExtra->Cs.lpszClass = - (LPCWSTR) MAKELONG(Extra - (PCHAR) CbtCreatewndExtra, 1); + (LPCWSTR)(ULONG_PTR) MAKELONG(Extra - (PCHAR) CbtCreatewndExtra, 1); Extra += ClassName->Length; *((WCHAR *) Extra) = L'\0'; } @@ -562,7 +562,7 @@ IntRestoreTebWndCallback (hWnd, pWnd); IntCbFreeMemory(Argument); - + if (!NT_SUCCESS(Status)) { return 0;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
77
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 July 2008