Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gbrunmar] 33503: Hopefully fixes bug #1110. Requested fixed by amine48rz. See issue #1110 for more details.
by gbrunmar＠svn.reactos.org 13 May '08

13 May '08

Author: gbrunmar Date: Tue May 13 15:14:30 2008 New Revision: 33503 URL: http://svn.reactos.org/svn/reactos?rev=33503&view=rev Log: Hopefully fixes bug #1110. Requested fixed by amine48rz. See issue #1110 for more details. Modified: trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/misc/exticon.c trunk/reactos/dll/win32/user32/misc/wsprintf.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/mdi.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Tue May 13 15:14:30 2008 @@ -1847,7 +1847,8 @@ len = strlen(str); ret = HeapAlloc(GetProcessHeap(), 0, len + 1); - memcpy(ret, str, len + 1); + if (ret != NULL) + memcpy(ret, str, len + 1); return ret; } Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Tue May 13 15:14:30 2008 @@ -656,7 +656,7 @@ LPSTR textA = (LPSTR)lParam; INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE); @@ -930,9 +930,9 @@ LPWSTR nameW = NULL; if(nameA) { - INT countW = MultiByteToWideChar(CP_ACP, 0, nameA, -1, NULL, 0); - if((nameW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, countW); + INT countW = MultiByteToWideChar(CP_ACP, 0, nameA, -1, NULL, 0); + if((nameW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, countW); } result = EDIT_WM_Create(es, nameW); HeapFree(GetProcessHeap(), 0, nameW); @@ -1222,6 +1222,8 @@ /* The buffer has been expanded, create a new line and insert it into the link list */ LINEDEF *new_line = HeapAlloc(GetProcessHeap(), 0, sizeof(LINEDEF)); + if (new_line == NULL) + break; new_line->next = previous_line->next; previous_line->next = new_line; current_line = new_line; @@ -1517,6 +1519,8 @@ countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); textA = HeapAlloc(GetProcessHeap(), 0, countA); + if (textA == NULL) + return 0; WideCharToMultiByte(CP_ACP, 0, es->text + start, count, textA, countA, NULL, NULL); TRACE_(relay)("(ANSI wordbrk=%p,str=%s,idx=%d,cnt=%d,act=%d)\n", es->word_break_proc, debugstr_an(textA, countA), index, countA, action); @@ -1723,6 +1727,8 @@ if (es->style & ES_PASSWORD) { INT len = get_text_length(es); LPWSTR text = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + if (text == NULL) + return NULL; text[len] = '\0'; while(len) text[--len] = es->password_char; return text; @@ -3958,6 +3964,11 @@ es->tabs = NULL; else { es->tabs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)); + if (es->tabs == NULL) + { + es->tabs_count = 0; + return FALSE; + } memcpy(es->tabs, tabs, count * sizeof(INT)); } return TRUE; @@ -4051,6 +4062,8 @@ ulength = strlenW(es->undo_text); utext = HeapAlloc(GetProcessHeap(), 0, (ulength + 1) * sizeof(WCHAR)); + if (utext == NULL) + return FALSE; strcpyW(utext, es->undo_text); Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Tue May 13 15:14:30 2008 @@ -1620,8 +1620,15 @@ /* We need to grow the array */ max_items += LB_ARRAY_GRANULARITY; if (descr->items) + { item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); + if (!item) + { + SEND_NOTIFICATION( descr, LBN_ERRSPACE ); + return LB_ERRSPACE; + } + } else item = HeapAlloc( GetProcessHeap(), 0, max_items * sizeof(LB_ITEMDATA) ); Modified: trunk/reactos/dll/win32/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exti… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/exticon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/exticon.c [iso-8859-1] Tue May 13 15:14:30 2008 @@ -630,6 +630,8 @@ UINT ret; INT len = MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (lpwstrFile == NULL) + return 0; MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, lpwstrFile, len); ret = PrivateExtractIconsW(lpwstrFile, nIndex, sizeX, sizeY, phicon, piconid, nIcons, flags); @@ -709,6 +711,8 @@ UINT ret; INT len = MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (lpwstrFile == NULL) + return 0; TRACE("%s %d %p %p %d\n", lpstrFile, nIndex, phIconLarge, phIconSmall, nIcons); Modified: trunk/reactos/dll/win32/user32/misc/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wspr… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/wsprintf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/wsprintf.c [iso-8859-1] Tue May 13 15:14:30 2008 @@ -553,7 +553,10 @@ } if (Allocate) { - *MBString = RtlAllocateHeap(GetProcessHeap(), 0, MBSize); + LPSTR SafeString = RtlAllocateHeap(GetProcessHeap(), 0, MBSize); + if (SafeString == NULL) + return 0; + *MBString = SafeString; } if (CodePage == 0) { @@ -585,7 +588,10 @@ } if (Allocate) { - *UnicodeString = RtlAllocateHeap(GetProcessHeap(), 0, UnicodeSize); + LPWSTR SafeString = RtlAllocateHeap(GetProcessHeap(), 0, UnicodeSize); + if (SafeString == NULL) + return 0; + *UnicodeString = SafeString; } UnicodeSize *= sizeof(WCHAR); if (CodePage == 0) Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Tue May 13 15:14:30 2008 @@ -244,8 +244,15 @@ if (GET_WORD(p) == 0xffff) /* Is it an integer id? */ { info->windowName = HeapAlloc( GetProcessHeap(), 0, sizeof(L"#65535") ); - swprintf((LPWSTR)info->windowName, L"#%d", GET_WORD(p + 1)); - info->windowNameFree = TRUE; + if (info->windowName != NULL) + { + swprintf((LPWSTR)info->windowName, L"#%d", GET_WORD(p + 1)); + info->windowNameFree = TRUE; + } + else + { + info->windowNameFree = FALSE; + } p += 2; } else @@ -280,7 +287,7 @@ HWND hwndCtrl, hwndDefButton = 0; INT items = dlgTemplate->nbItems; - if (!(dlgInfo = GETDLGINFO(hwnd))) return -1; + if (!(dlgInfo = GETDLGINFO(hwnd))) return FALSE; while (items--) { @@ -313,22 +320,30 @@ { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.className, -1, NULL, 0, NULL, NULL ); class = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, info.className, -1, class, len, NULL, NULL ); + if (class != NULL) + WideCharToMultiByte( CP_ACP, 0, info.className, -1, class, len, NULL, NULL ); } if (HIWORD(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, NULL, 0, NULL, NULL ); caption = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, caption, len, NULL, NULL ); + if (caption != NULL) + WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, caption, len, NULL, NULL ); } - hwndCtrl = CreateWindowExA( info.exStyle | WS_EX_NOPARENTNOTIFY, - class, caption, info.style | WS_CHILD, - MulDiv(info.x, dlgInfo->xBaseUnit, 4), - MulDiv(info.y, dlgInfo->yBaseUnit, 8), - MulDiv(info.cx, dlgInfo->xBaseUnit, 4), - MulDiv(info.cy, dlgInfo->yBaseUnit, 8), - hwnd, (HMENU)info.id, - hInst, (LPVOID)info.data ); + + if (class != NULL && caption != NULL) + { + hwndCtrl = CreateWindowExA( info.exStyle | WS_EX_NOPARENTNOTIFY, + class, caption, info.style | WS_CHILD, + MulDiv(info.x, dlgInfo->xBaseUnit, 4), + MulDiv(info.y, dlgInfo->yBaseUnit, 8), + MulDiv(info.cx, dlgInfo->xBaseUnit, 4), + MulDiv(info.cy, dlgInfo->yBaseUnit, 8), + hwnd, (HMENU)info.id, + hInst, (LPVOID)info.data ); + } + else + hwndCtrl = NULL; if (HIWORD(class)) HeapFree( GetProcessHeap(), 0, class ); if (HIWORD(caption)) HeapFree( GetProcessHeap(), 0, caption ); } @@ -750,19 +765,27 @@ { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.className, -1, NULL, 0, NULL, NULL ); class = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, template.className, -1, class, len, NULL, NULL ); + if (class != NULL) + WideCharToMultiByte( CP_ACP, 0, template.className, -1, class, len, NULL, NULL ); } if (HIWORD(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.caption, -1, NULL, 0, NULL, NULL ); caption = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, template.caption, -1, caption, len, NULL, NULL ); - } - hwnd = User32CreateWindowEx(template.exStyle, class, caption, - template.style & ~WS_VISIBLE, - rect.left, rect.top, rect.right, rect.bottom, - owner, hMenu, hInst, NULL, - FALSE); + if (caption != NULL) + WideCharToMultiByte( CP_ACP, 0, template.caption, -1, caption, len, NULL, NULL ); + } + + if (class != NULL && caption != NULL) + { + hwnd = User32CreateWindowEx(template.exStyle, class, caption, + template.style & ~WS_VISIBLE, + rect.left, rect.top, rect.right, rect.bottom, + owner, hMenu, hInst, NULL, + FALSE); + } + else + hwnd = NULL; if (HIWORD(class)) HeapFree( GetProcessHeap(), 0, class ); if (HIWORD(caption)) HeapFree( GetProcessHeap(), 0, caption ); } @@ -1272,6 +1295,8 @@ { INT ret, len = MultiByteToWideChar( CP_ACP, 0, spec, -1, NULL, 0 ); LPWSTR specW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (specW == NULL) + return FALSE; MultiByteToWideChar( CP_ACP, 0, spec, -1, specW, len ); ret = DIALOG_DlgDirListW( hDlg, specW, idLBox, idStatic, attrib, combo ); WideCharToMultiByte( CP_ACP, 0, specW, -1, spec, 0x7fffffff, NULL, NULL ); Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Tue May 13 15:14:30 2008 @@ -592,11 +592,22 @@ if (ci->child[i] == child) { HWND *new_child = HeapAlloc(GetProcessHeap(), 0, (ci->nActiveChildren - 1) * sizeof(HWND)); - memcpy(new_child, ci->child, i * sizeof(HWND)); - if (i + 1 < ci->nActiveChildren) - memcpy(new_child + i, ci->child + i + 1, (ci->nActiveChildren - i - 1) * sizeof(HWND)); - HeapFree(GetProcessHeap(), 0, ci->child); - ci->child = new_child; + if (new_child != NULL) + { + memcpy(new_child, ci->child, i * sizeof(HWND)); + if (i + 1 < ci->nActiveChildren) + memcpy(new_child + i, ci->child + i + 1, (ci->nActiveChildren - i - 1) * sizeof(HWND)); + HeapFree(GetProcessHeap(), 0, ci->child); + ci->child = new_child; + } + else + { + UINT c; + for (c = i; c < ci->nActiveChildren - 1; c++) + { + ci->child[c] = ci->child[c+1]; + } + } ci->nActiveChildren--; break; @@ -1248,15 +1259,17 @@ case WM_CREATE: if (GetWindowLongW((HWND)lParam, GWL_EXSTYLE) & WS_EX_MDICHILD) { - ci->nTotalCreated++; - ci->nActiveChildren++; - if (!ci->child) ci->child = HeapAlloc(GetProcessHeap(), 0, sizeof(HWND)); else - ci->child = HeapReAlloc(GetProcessHeap(), 0, ci->child, sizeof(HWND) * ci->nActiveChildren); - - ci->child[ci->nActiveChildren - 1] = (HWND)lParam; + ci->child = HeapReAlloc(GetProcessHeap(), 0, ci->child, sizeof(HWND) * (ci->nActiveChildren + 1)); + + if (ci->child != NULL) + { + ci->child[ci->nActiveChildren] = (HWND)lParam; + ci->nTotalCreated++; + ci->nActiveChildren++; + } } break; @@ -1343,6 +1356,8 @@ { DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, NULL, 0 ); LPWSTR text = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (text == NULL) + return 0; MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, text, len ); MDI_UpdateFrameText( hwnd, hwndMDIClient, text ); HeapFree( GetProcessHeap(), 0, text );

1 0

[fireball] 33502: - Remove a leftover.
by fireball＠svn.reactos.org 13 May '08

13 May '08

Author: fireball Date: Tue May 13 14:29:20 2008 New Revision: 33502 URL: http://svn.reactos.org/svn/reactos?rev=33502&view=rev Log: - Remove a leftover. Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Tue May 13 14:29:20 2008 @@ -539,7 +539,6 @@ * IN ULONG Value) */ .global @Exfi386InterlockedExchangeUlong@8 -.global @InterlockedExchange@8 @Exfi386InterlockedExchangeUlong@8: #ifdef CONFIG_SMP

1 0

[gbrunmar] 33501: Fixed spelling mistake from previous checkin
by gbrunmar＠svn.reactos.org 13 May '08

13 May '08

Author: gbrunmar Date: Tue May 13 13:12:08 2008 New Revision: 33501 URL: http://svn.reactos.org/svn/reactos?rev=33501&view=rev Log: Fixed spelling mistake from previous checkin Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue May 13 13:12:08 2008 @@ -490,7 +490,7 @@ ULONG dwThreadId, ULONG lParam, HWND* pWnd, - ULONG* nBufSize); + ULONG* pBufSize); NTSTATUS NTAPI NtUserBuildNameList(

1 0

[gbrunmar] 33500: NtUserBuildHwndList() returns NTSTATUS, not ULONG. More correct fix than 33483 to some of the winetest problems. Pass return value as out parameter instead.
by gbrunmar＠svn.reactos.org 13 May '08

13 May '08

Author: gbrunmar Date: Tue May 13 13:09:08 2008 New Revision: 33500 URL: http://svn.reactos.org/svn/reactos?rev=33500&view=rev Log: NtUserBuildHwndList() returns NTSTATUS, not ULONG. More correct fix than 33483 to some of the winetest problems. Pass return value as out parameter instead. Modified: trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Tue May 13 13:09:08 2008 @@ -133,12 +133,11 @@ DWORD dwCount = 0; HWND* pHwnd = NULL; HANDLE hHeap; - - SetLastError(0); - - dwCount = NtUserBuildHwndList ( NULL, hWndparent, FALSE, 0, 0, NULL, 0 ); - - if ( !dwCount || GetLastError() ) + NTSTATUS Status; + + Status = NtUserBuildHwndList ( NULL, hWndparent, FALSE, 0, 0, NULL, &dwCount ); + + if ( !NT_SUCCESS( Status ) ) return 0; /* allocate buffer to receive HWND handles */ @@ -152,12 +151,12 @@ } /* now call kernel again to fill the buffer this time */ - dwCount = NtUserBuildHwndList (NULL, hWndparent, FALSE, 0, 0, pHwnd, dwCount ); - - if ( !dwCount || GetLastError() ) + Status = NtUserBuildHwndList (NULL, hWndparent, FALSE, 0, 0, pHwnd, &dwCount ); + + if ( !NT_SUCCESS( Status ) ) { if ( pHwnd ) - HeapFree ( hHeap, 0, pHwnd ); + HeapFree ( hHeap, 0, pHwnd ); return 0; } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue May 13 13:09:08 2008 @@ -558,6 +558,7 @@ DWORD i, dwCount = 0; HWND* pHwnd = NULL; HANDLE hHeap; + NTSTATUS Status; if ( !lpfn ) { @@ -569,9 +570,9 @@ sort of persistent buffer and only grow it ( requiring a 2nd call ) when the buffer wasn't already big enough? */ /* first get how many window entries there are */ - dwCount = NtUserBuildHwndList ( - hDesktop, hWndparent, bChildren, dwThreadId, lParam, NULL, 0 ); - if ( !dwCount ) + Status = NtUserBuildHwndList ( + hDesktop, hWndparent, bChildren, dwThreadId, lParam, NULL, &dwCount ); + if ( !NT_SUCCESS( Status ) ) return FALSE; /* allocate buffer to receive HWND handles */ @@ -584,9 +585,9 @@ } /* now call kernel again to fill the buffer this time */ - dwCount = NtUserBuildHwndList ( - hDesktop, hWndparent, bChildren, dwThreadId, lParam, pHwnd, dwCount ); - if ( !dwCount ) + Status = NtUserBuildHwndList ( + hDesktop, hWndparent, bChildren, dwThreadId, lParam, pHwnd, &dwCount ); + if ( !NT_SUCCESS( Status ) ) { if ( pHwnd ) HeapFree ( hHeap, 0, pHwnd ); Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue May 13 13:09:08 2008 @@ -481,7 +481,7 @@ NtUserBlockInput( BOOL BlockIt); -ULONG +NTSTATUS NTAPI NtUserBuildHwndList( HDESK hDesktop, @@ -490,7 +490,7 @@ ULONG dwThreadId, ULONG lParam, HWND* pWnd, - ULONG nBufSize); + ULONG* nBufSize); NTSTATUS NTAPI NtUserBuildNameList( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue May 13 13:09:08 2008 @@ -1212,7 +1212,7 @@ /* * @implemented */ -ULONG +NTSTATUS STDCALL NtUserBuildHwndList( HDESK hDesktop, @@ -1221,11 +1221,14 @@ ULONG dwThreadId, ULONG lParam, HWND* pWnd, - ULONG nBufSize) + ULONG* pBufSize) { NTSTATUS Status; ULONG dwCount = 0; + if (pBufSize == 0) + return ERROR_INVALID_PARAMETER; + if (hwndParent || !dwThreadId) { PDESKTOP_OBJECT Desktop; @@ -1235,8 +1238,7 @@ { if(hDesktop == NULL && !(Desktop = IntGetActiveDesktop())) { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; + return ERROR_INVALID_HANDLE; } if(hDesktop) @@ -1247,8 +1249,7 @@ &Desktop); if(!NT_SUCCESS(Status)) { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; + return ERROR_INVALID_HANDLE; } } hwndParent = Desktop->DesktopWindow; @@ -1268,7 +1269,7 @@ { if (bGoDown) { - if(dwCount++ < nBufSize && pWnd) + if(dwCount++ < *pBufSize && pWnd) { _SEH_TRY { @@ -1323,15 +1324,13 @@ Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); if(!NT_SUCCESS(Status)) { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; + return ERROR_INVALID_PARAMETER; } if(!(W32Thread = (PW32THREAD)Thread->Tcb.Win32Thread)) { ObDereferenceObject(Thread); DPRINT("Thread is not a GUI Thread!\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; + return ERROR_INVALID_PARAMETER; } Current = W32Thread->WindowListHead.Flink; @@ -1342,7 +1341,7 @@ if(bChildren || Window->hOwner != NULL) { - if(dwCount < nBufSize && pWnd) + if(dwCount < *pBufSize && pWnd) { Status = MmCopyToCaller(pWnd++, &Window->hSelf, sizeof(HWND)); if(!NT_SUCCESS(Status)) @@ -1359,7 +1358,8 @@ ObDereferenceObject(Thread); } - return dwCount; + *pBufSize = dwCount; + return STATUS_SUCCESS; }

1 0

[hyperion] 33499: Case-sensitivity fix for Linux build hosts. Spotted by Tushar S. (GreyGhost)
by hyperion＠svn.reactos.org 13 May '08

13 May '08

Author: hyperion Date: Tue May 13 12:32:19 2008 New Revision: 33499 URL: http://svn.reactos.org/svn/reactos?rev=33499&view=rev Log: Case-sensitivity fix for Linux build hosts. Spotted by Tushar S. (GreyGhost) Modified: trunk/rosapps/fraginator/Fraginator.h trunk/rosapps/fraginator/MainDialog.cpp trunk/rosapps/fraginator/ReportDialog.cpp Modified: trunk/rosapps/fraginator/Fraginator.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.h?re… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.h [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Fraginator.h [iso-8859-1] Tue May 13 12:32:19 2008 @@ -9,7 +9,7 @@ #define FRAGINATOR_H -#include "unfrag.h" +#include "Unfrag.h" #include <commctrl.h> Modified: trunk/rosapps/fraginator/MainDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/MainDialog.cpp?… ============================================================================== --- trunk/rosapps/fraginator/MainDialog.cpp [iso-8859-1] (original) +++ trunk/rosapps/fraginator/MainDialog.cpp [iso-8859-1] Tue May 13 12:32:19 2008 @@ -1,4 +1,4 @@ -#include "unfrag.h" +#include "Unfrag.h" #include "MainDialog.h" #include "resource.h" #include "Fraginator.h" Modified: trunk/rosapps/fraginator/ReportDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/ReportDialog.cp… ============================================================================== --- trunk/rosapps/fraginator/ReportDialog.cpp [iso-8859-1] (original) +++ trunk/rosapps/fraginator/ReportDialog.cpp [iso-8859-1] Tue May 13 12:32:19 2008 @@ -1,5 +1,5 @@ #include "ReportDialog.h" -#include "unfrag.h" +#include "Unfrag.h" #include "Fraginator.h" #include "DriveVolume.h" #include "Defragment.h"

1 0

[cwittich] 33498: add some info for xen to txtmode.cfg fix a bug rosboot_test.cpp
by cwittich＠svn.reactos.org 13 May '08

13 May '08

Author: cwittich Date: Tue May 13 12:30:29 2008 New Revision: 33498 URL: http://svn.reactos.org/svn/reactos?rev=33498&view=rev Log: add some info for xen to txtmode.cfg fix a bug rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Tue May 13 12:30:29 2008 @@ -678,6 +678,7 @@ m_Src = "xm console "; string xen_name = "reactos"; conf_parser.getStringValue(RosBootTest::XEN_CONFIG_NAME, xen_name); + m_Src += xen_name; m_DataSource = new PipeReader(); m_BootCmd = m_EmuPath + "/xm create " + m_XenConfig; Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg [iso-8859-1] Tue May 13 12:30:29 2008 @@ -8,7 +8,7 @@ ; ROS_EMU_PATH[LIN|WIN] ; -; This variable sets the path to the emulator +; This variable sets the path to the emulator (path to xm for xen [/usr/sbin]) ; ROS_EMU_PATH_WIN=E:\reactos\qemu\qemu.exe ROS_EMU_PATH_LIN=/usr/bin/qemu @@ -60,7 +60,7 @@ ; ; Note: set this value if you have problems with timeouts or cutoff debugging data ; -ROS_DELAY_READ=4 +ROS_DELAY_READ=1 ; ROS_CHECK_POINT ; @@ -107,4 +107,4 @@ ; XEN_CONFIG_NAME ; ; Set this variable to the name of xen station -; XEN_CONFIG_NAME= +; XEN_CONFIG_NAME=reactos

1 0

[cwittich] 33497: don't display all debug data 4 times when using PipeReader class (spotted by janderwald)
by cwittich＠svn.reactos.org 13 May '08

13 May '08

Author: cwittich Date: Tue May 13 12:17:31 2008 New Revision: 33497 URL: http://svn.reactos.org/svn/reactos?rev=33497&view=rev Log: don't display all debug data 4 times when using PipeReader class (spotted by janderwald) Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp [iso-8859-1] Tue May 13 12:17:31 2008 @@ -95,6 +95,7 @@ free(buf); return false; } + fflush(m_File); string line(buf); lines.push_back(line); return true;

1 0

[janderwald] 33496: - move hardcoded xen configuration name to config file
by janderwald＠svn.reactos.org 13 May '08

13 May '08

Author: janderwald Date: Tue May 13 11:22:31 2008 New Revision: 33496 URL: http://svn.reactos.org/svn/reactos?rev=33496&view=rev Log: - move hardcoded xen configuration name to config file Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Tue May 13 11:22:31 2008 @@ -66,6 +66,7 @@ string RosBootTest::ROS_EMU_MEM = "ROS_EMU_MEM"; string RosBootTest::ROS_BOOT_CMD = "ROS_BOOT_CMD"; string RosBootTest::XEN_CONFIG_FILE = "XEN_CONFIG_FILE"; + string RosBootTest::XEN_CONFIG_NAME = "XEN_CONFIG_NAME"; #ifdef __LINUX__ string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_LIN"; @@ -662,7 +663,7 @@ } //--------------------------------------------------------------------------------------- - bool RosBootTest::configureXen() + bool RosBootTest::configureXen(ConfigParser &conf_parser) { if (!xenGetCaps()) { @@ -674,8 +675,9 @@ cerr << "Xen configuration file missing" << endl; return false; } - - m_Src = "xm console reactos"; + m_Src = "xm console "; + string xen_name = "reactos"; + conf_parser.getStringValue(RosBootTest::XEN_CONFIG_NAME, xen_name); m_DataSource = new PipeReader(); m_BootCmd = m_EmuPath + "/xm create " + m_XenConfig; @@ -740,14 +742,17 @@ return true; } //--------------------------------------------------------------------------------------- - void RosBootTest::cleanup() + void RosBootTest::cleanup(ConfigParser &conf_parser) { m_DataSource->closeSource(); OsSupport::delayExecution(3); if (m_EmuType == EMU_TYPE_XEN) { - system("xm destroy reactos"); + string xen_name = "reactos"; + conf_parser.getStringValue(RosBootTest::XEN_CONFIG_NAME, xen_name); + string cmd = "xm destroy " + xen_name; + system(cmd.c_str ()); } else { @@ -791,7 +796,7 @@ } else if (m_EmuType == EMU_TYPE_XEN) { - if (!configureXen()) + if (!configureXen(conf_parser)) { cerr << "Error: failed to configure xen" << endl; return false; @@ -815,7 +820,7 @@ if (!m_DataSource->openSource(m_Src)) { cerr << "Error: failed to open data source with " << m_Src << endl; - cleanup(); + cleanup(conf_parser); return false; } #ifdef __LINUX__ @@ -832,7 +837,7 @@ if (!file) { cerr << "Error: failed to launch emulator" << endl; - cleanup(); + cleanup(conf_parser); return false; } char buffer[128]; @@ -840,7 +845,7 @@ { cerr << "Error: pid file w/o pid!!! " << endl; fclose(file); - cleanup(); + cleanup(conf_parser); return false; } m_Pid = atoi(buffer); @@ -856,10 +861,10 @@ OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); #endif - bool ret = analyzeDebugData(); - cleanup(); - - return ret; + bool ret = analyzeDebugData(); + cleanup(conf_parser); + + return ret; } //--------------------------------------------------------------------------------------- void RosBootTest::dumpCheckpoints() Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] Tue May 13 11:22:31 2008 @@ -57,6 +57,7 @@ static string ROS_EMU_MEM; static string ROS_BOOT_CMD; static string XEN_CONFIG_FILE; + static string XEN_CONFIG_NAME; //--------------------------------------------------------------------------------------- /// @@ -109,10 +110,10 @@ bool readConfigurationValues(ConfigParser & conf_parser); bool configureQemu(); bool configureVmWare(); - bool configureXen(); + bool configureXen(ConfigParser &conf_parser); bool hasQemuNoRebootOption(); - void cleanup(); - bool xenGetCaps(); + void cleanup(ConfigParser &conf_parser); + bool xenGetCaps(); //--------------------------------------------------------------------------------------- /// /// dumpCheckpoints Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg [iso-8859-1] Tue May 13 11:22:31 2008 @@ -2,7 +2,7 @@ ; ; This variable defines which emulator should be used to emulate ReactOS ; -;ROS_EMU_TYPE=[qemu|vmware] +;ROS_EMU_TYPE=[qemu|vmware|xen] ROS_EMU_TYPE=qemu @@ -98,3 +98,13 @@ ; ROS_BOOT_CMD=/usr/bin/qemu -serial stdio -m 64 -hda ~/reactos/qemu/ReactOS.hd -boot d -cdrom ~/reactos/qemu/bootcd.iso ; -no-reboot +; XEN_CONFIG_FILE +; +; Set this variable to path of xen config file when ROS_EMU_TYPE=xen is used +; XEN_CONFIG_FILE= + + +; XEN_CONFIG_NAME +; +; Set this variable to the name of xen station +; XEN_CONFIG_NAME=

1 0

[dchapyshev] 33495: - Update Russian translation - Small fix mstsc icon
by dchapyshev＠svn.reactos.org 13 May '08

13 May '08

Author: dchapyshev Date: Tue May 13 08:46:31 2008 New Revision: 33495 URL: http://svn.reactos.org/svn/reactos?rev=33495&view=rev Log: - Update Russian translation - Small fix mstsc icon Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/res/mstsc.ico Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Tue May 13 08:46:31 2008 @@ -240,7 +240,7 @@ LTEXT "Êàëüêóëÿòîð ReactOS",IDC_STATIC,120,12,132,8, SS_CENTERIMAGE LTEXT "Âåðñèÿ ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE - LTEXT "Íàïèñàíî Êàðëî Áðàìèíè",IDC_STATIC,120,32,132,8, + LTEXT "Àâòîð: Êàðëî Áðàìèíè",IDC_STATIC,120,32,132,8, SS_CENTERIMAGE GROUPBOX "",IDC_STATIC,112,0,148,52 GROUPBOX "",IDC_STATIC,4,56,256,88 Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc [iso-8859-1] Tue May 13 08:46:31 2008 @@ -7,8 +7,8 @@ STRINGTABLE BEGIN IDS_SECONDS, "ñåêóíä" - IDS_NOBODY, "Nobody" - IDS_ABOUT, "by Joshua Thielen and ReactOS developers" + IDS_NOBODY, "íåèçâåñòíûé" + IDS_ABOUT, "Joshua Thielen è ðàçðàáîò÷èêè ReactOS" END IDM_WINEMINE MENU DISCARDABLE @@ -50,7 +50,7 @@ LTEXT "", IDC_NAME2, 132, 30, 55, 8 LTEXT "", IDC_NAME3, 132, 40, 55, 8 DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 - PUSHBUTTON "&Ñáðîñèòü", IDRESET, 18, 57, 67, 15 + PUSHBUTTON "&Ñáðîñèòü", IDRESET, 18, 57, 67, 15 END IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] Tue May 13 08:46:31 2008 @@ -7,15 +7,15 @@ GROUPBOX "Íàñòðîéêè âõîäà",IDC_STATIC,7,7,228,89 GROUPBOX "Íàñòðîéêè ïîäêëþ÷åíèÿ",IDC_STATIC,7,103,228,65 ICON "", IDC_LOGONICON, 15,19,20,20 - LTEXT "Ââåäèòå àäðåñ ñåðâåðà",IDC_STATIC,47,24,81,8 - LTEXT "Ñåðâåð:",IDC_STATIC,47,41,25,8 - LTEXT "Èìÿ ïîëüçîâàòåëÿ:",IDC_STATIC,47,58,38,8 - COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ñîõðàíèòü",IDC_SAVE,67,139,50,14 - PUSHBUTTON "Ñîõðàíèòü êàê...",IDC_SAVEAS,123,139,50,14 + LTEXT "Ââåäèòå àäðåñ ñåðâåðà",IDC_STATIC,47,24,100,8 + LTEXT "Ñåðâåð:",IDC_STATIC,52,41,31,8 + LTEXT "Èìÿ ïîëüçîâàòåëÿ:",IDC_STATIC,15,58,67,8 + COMBOBOX IDC_SERVERCOMBO,86,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü",IDC_SAVE,49,139,50,14 + PUSHBUTTON "Ñîõðàíèòü êàê...",IDC_SAVEAS,103,139,70,14 PUSHBUTTON "Îòêðûòü...",IDC_OPEN,177,139,50,14 ICON "", IDC_CONNICON, 16,114,20,20 - LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòâóþùóþ êîíôèãóðàöèþ",IDC_STATIC,50,115,172,20 + LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòâóþùóþ êîíôèãóðàöèþ.",IDC_STATIC,50,115,172,20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 @@ -26,17 +26,17 @@ GROUPBOX "Öâåòà",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "Óñòàíîâèòü ðàçìåð ýêðàíà íà óäàëåííîì êîìïüþòåðå. Ïåðåòàùèòå ïîëçóíîê â êðàéíåå ïðàâîå ïîëîæåíèå äëÿ ïåðåõîäà â ïîëíîýêðàííûé ðåæèì.",IDC_STATIC,53,22,175,21 + LTEXT "Óñòàíîâèòü ðàçìåð ýêðàíà íà óäàëåííîì êîìïüþ-\nòåðå. Ïåðåòàùèòå ïîëçóíîê â êðàéíåå ïðàâîå ïîëîæåíèå äëÿ ïåðåõîäà â ïîëíîýêðàííûé ðåæèì.",IDC_STATIC,53,17,175,24 CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 LTEXT "Ïðèìå÷àíèå: Ýòè ïàðàìåòðû îïðåäåëÿþòñÿ íàñòðîéêàìè óäàëåííîãî êîìïüþòåðà.",IDC_STATIC,56,143,165,18 - LTEXT "Ìåíüøå",IDC_STATIC,35,52,15,8 - LTEXT "Áîëüøå",IDC_STATIC,189,51,17,8 + LTEXT "ìåíüøå",IDC_STATIC,20,52,30,8 + LTEXT "áîëüøå",IDC_STATIC,189,51,32,8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END -IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 275 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ïîäêëþ÷åíèå ê óäàëåííîìó ðàáî÷åìó ñòîëó" FONT 8, "MS Shell Dlg", 400, 0, 0x1 Modified: trunk/reactos/base/applications/mstsc/res/mstsc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== Binary files - no diff available.

1 0

[mpiulachs] 33494: - [FORMATTING] replace tabs by spaces - Modified keyboard layout listbox location to give usetup a more consistent look
by mpiulachs＠svn.reactos.org 13 May '08

13 May '08

Author: mpiulachs Date: Tue May 13 06:43:39 2008 New Revision: 33494 URL: http://svn.reactos.org/svn/reactos?rev=33494&view=rev Log: - [FORMATTING] replace tabs by spaces - Modified keyboard layout listbox location to give usetup a more consistent look Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Tue May 13 06:43:39 2008 @@ -288,45 +288,45 @@ DrawScrollBarGenericList(PGENERIC_LIST GenericList) { COORD coPos; - DWORD Written; + DWORD Written; coPos.X = GenericList->Right + 1; coPos.Y = GenericList->Top; - if (GenericList->FirstShown != GenericList->ListHead.Flink) - { + if (GenericList->FirstShown != GenericList->ListHead.Flink) + { FillConsoleOutputCharacterA (StdOutput, '\x18', 1, coPos, &Written); - } - else - { + } + else + { FillConsoleOutputCharacterA (StdOutput, ' ', 1, coPos, &Written); - } - - coPos.Y = GenericList->Bottom; - if (GenericList->LastShown != GenericList->ListHead.Blink) - { + } + + coPos.Y = GenericList->Bottom; + if (GenericList->LastShown != GenericList->ListHead.Blink) + { FillConsoleOutputCharacterA (StdOutput, '\x19', 1, coPos, &Written); - } - else - { + } + else + { FillConsoleOutputCharacterA (StdOutput, ' ', 1, coPos, &Written); - } + } } VOID @@ -348,7 +348,7 @@ return; DrawListEntries(List); - DrawScrollBarGenericList(List); + DrawScrollBarGenericList(List); } @@ -369,8 +369,9 @@ List->LastShown = List->LastShown->Flink; } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + DrawListEntries(List); - DrawScrollBarGenericList(List); + DrawScrollBarGenericList(List); } } @@ -392,8 +393,9 @@ List->LastShown = List->LastShown->Blink; } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + DrawListEntries(List); - DrawScrollBarGenericList(List); + DrawScrollBarGenericList(List); } } Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue May 13 06:43:39 2008 @@ -1249,7 +1249,7 @@ DrawGenericList(LayoutList, 2, - 15, + 18, xScreen - 3, yScreen - 3);

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