Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 47148: [NTOS]: At times, pages may be removed from the zero or free page list, but without being initialized as part of the PFN database, such that their PageLocation has not changed. However, we can detect these pages because their link pointers will be NULL, meaning they're not _really_ free or zeroed. Use this enhanced check when verifying if a page is in use or not, and additionally triple-check by making sure the reference count is zero. This now matches the Windows checks. We
by sir_richard＠svn.reactos.org 09 May '10

09 May '10

Author: sir_richard Date: Sun May 9 20:06:38 2010 New Revision: 47148 URL: http://svn.reactos.org/svn/reactos?rev=47148&view=rev Log: [NTOS]: At times, pages may be removed from the zero or free page list, but without being initialized as part of the PFN database, such that their PageLocation has not changed. However, we can detect these pages because their link pointers will be NULL, meaning they're not _really_ free or zeroed. Use this enhanced check when verifying if a page is in use or not, and additionally triple-check by making sure the reference count is zero. This now matches the Windows checks. We also consider Standby pages (not yet implemented) as usable, since we can always steal them. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sun May 9 20:06:38 2010 @@ -130,10 +130,21 @@ BOOLEAN NTAPI +MiIsPfnFree(IN PMMPFN Pfn1) +{ + /* Must be a free or zero page, with no references, linked */ + return ((Pfn1->u3.e1.PageLocation <= StandbyPageList) && + (Pfn1->u1.Flink) && + (Pfn1->u2.Blink) && + !(Pfn1->u3.e2.ReferenceCount)); +} + +BOOLEAN +NTAPI MiIsPfnInUse(IN PMMPFN Pfn1) { - return ((Pfn1->u3.e1.PageLocation != FreePageList) && - (Pfn1->u3.e1.PageLocation != ZeroedPageList)); + /* Standby list or higher, unlinked, and with references */ + return !MiIsPfnFree(Pfn1); } PFN_NUMBER

1 0

[gschneider] 47147: [INPUT] - Reorder keyboard layouts in the registry after one was deleted - Fixes changing keyboard layouts from regional options See issue #3317 for more details.
by gschneider＠svn.reactos.org 09 May '10

09 May '10

Author: gschneider Date: Sun May 9 17:02:58 2010 New Revision: 47147 URL: http://svn.reactos.org/svn/reactos?rev=47147&view=rev Log: [INPUT] - Reorder keyboard layouts in the registry after one was deleted - Fixes changing keyboard layouts from regional options See issue #3317 for more details. Modified: trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Sun May 9 17:02:58 2010 @@ -5,6 +5,7 @@ * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) * Colin Finck + * Gregor Schneider * UPDATE HISTORY: * 06-09-2007 Created */ @@ -376,6 +377,59 @@ (VOID) ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); } +typedef struct _REG_KB_ENTRY_ +{ + TCHAR szLayoutID[3]; + DWORD dwType; + TCHAR szData[CCH_LAYOUT_ID + 1]; + DWORD dwDataSize; +} REG_KB_ENTRY; + +/* Layouts were deleted so we have to order the existing ones */ +static VOID +UpdateRegValueNames(HKEY hKey) +{ + DWORD dwIndex = 0, dwGot = 0, dwLayoutSize; + DWORD dwSets = 5; + REG_KB_ENTRY* data = HeapAlloc(GetProcessHeap(), 0, dwSets * sizeof(REG_KB_ENTRY)); + + /* Get all existing entries and delete them */ + dwLayoutSize = sizeof(data[0].szLayoutID); + while (RegEnumValue(hKey, + dwIndex, + data[dwGot].szLayoutID, + &dwLayoutSize, + NULL, + &data[dwGot].dwType, + (PBYTE)data[dwGot].szData, + &data[dwGot].dwDataSize) != ERROR_NO_MORE_ITEMS) + { + if (_tcslen(data[dwGot].szLayoutID) <= 2 && _tcslen(data[dwGot].szData) == CCH_LAYOUT_ID) + { + RegDeleteValue(hKey, data[dwGot].szLayoutID); + dwGot++; + if (dwGot == dwSets) + { + dwSets += 5; + data = HeapReAlloc(GetProcessHeap(), 0, data, dwSets * sizeof(REG_KB_ENTRY)); + } + } + dwIndex++; + dwLayoutSize = sizeof(data[0].szLayoutID); + } + + /* Set all entries with an updated value name */ + for (dwIndex = 0; dwIndex < dwGot; dwIndex++) + { + TCHAR szNewLayoutID[3]; + + _stprintf(szNewLayoutID, TEXT("%u"), dwIndex + 1); + RegSetValueEx(hKey, szNewLayoutID, 0, data[dwIndex].dwType, + (PBYTE)data[dwIndex].szData, data[dwIndex].dwDataSize); + } + HeapFree(GetProcessHeap(), 0, data); +} + static VOID DeleteLayout(VOID) { @@ -430,6 +484,7 @@ if (RegDeleteValue(hKey, szLayoutNum) == ERROR_SUCCESS) { UpdateLayoutsList(); + UpdateRegValueNames(hKey); } } RegCloseKey(hKey);

1 0

[janderwald] 47146: [WIN32CSR] - Add primitive resizing support and automatic scrolling support - Patch by Adam Kachwalla (IRC:Crocodile) See issue #2622 for more details.
by janderwald＠svn.reactos.org 09 May '10

09 May '10

Author: janderwald Date: Sun May 9 15:39:48 2010 New Revision: 47146 URL: http://svn.reactos.org/svn/reactos?rev=47146&view=rev Log: [WIN32CSR] - Add primitive resizing support and automatic scrolling support - Patch by Adam Kachwalla (IRC:Crocodile) See issue #2622 for more details. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.h 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] Sun May 9 15:39:48 2010 @@ -48,6 +48,8 @@ COLORREF PopupText; COLORREF Colors[16]; WCHAR szProcessName[MAX_PATH]; + BOOL WindowSizeLock; + POINT OldCursor; } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; #ifndef WM_APP @@ -625,7 +627,7 @@ if (Buffer) { Buffer->MaxX = 80; - Buffer->MaxY = 25; + Buffer->MaxY = 300; Buffer->CursorInfo.bVisible = TRUE; Buffer->CursorInfo.dwSize = CSR_DEFAULT_CURSOR_SIZE; } @@ -638,8 +640,8 @@ 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); + DWORD Width = Console->Size.X * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); + DWORD Height = Console->Size.Y * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); /* set scrollbar sizes */ sInfo.cbSize = sizeof(SCROLLINFO); @@ -667,6 +669,7 @@ SetScrollInfo(hwnd, SB_HORZ, &sInfo, TRUE); Height += GetSystemMetrics(SM_CYHSCROLL); ShowScrollBar(hwnd, SB_HORZ, TRUE); + } else { @@ -779,9 +782,13 @@ Console->PrivateData = GuiData; SetWindowLongPtrW(hWnd, GWL_USERDATA, (DWORD_PTR) Console); - SetTimer(hWnd, 1, CURSOR_BLINK_TIME, NULL); + SetTimer(hWnd, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); GuiConsoleCreateSysMenu(Console); + + GuiData->WindowSizeLock = TRUE; GuiConsoleInitScrollbar(Console, hWnd); + GuiData->WindowSizeLock = FALSE; + SetEvent(GuiData->hGuiInitEvent); return (BOOL) DefWindowProcW(hWnd, WM_NCCREATE, 0, (LPARAM) Create); @@ -1157,6 +1164,11 @@ { GuiInvalidateCell(Buff, GuiData, Console->hWindow, CursorEndX, CursorEndY); } + + // Set up the update timer (very short interval) - this is a "hack" for getting the OS to + // repaint the window without having it just freeze up and stay on the screen permanently. + GuiData->CursorBlinkOn = TRUE; + SetTimer(Console->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); } static BOOL WINAPI @@ -1219,16 +1231,93 @@ { PCSRSS_CONSOLE Console; PGUI_CONSOLE_DATA GuiData; + PCSRSS_SCREEN_BUFFER Buff; RECT CursorRect; + SetTimer(hWnd, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL); + GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); - GuiData->CursorBlinkOn = ! GuiData->CursorBlinkOn; - - CursorRect.left = Console->ActiveBuffer->CurrentX; - CursorRect.top = Console->ActiveBuffer->CurrentY; + + Buff = Console->ActiveBuffer; + CursorRect.left = Buff->CurrentX; + CursorRect.top = Buff->CurrentY; CursorRect.right = CursorRect.left; CursorRect.bottom = CursorRect.top; GuiDrawRegion(Console, &CursorRect); + GuiData->CursorBlinkOn = ! GuiData->CursorBlinkOn; + + if((GuiData->OldCursor.x != Buff->CurrentX) || (GuiData->OldCursor.y != Buff->CurrentY)) + { + SCROLLINFO xScroll; + int OldScrollX = -1, OldScrollY = -1; + int NewScrollX = -1, NewScrollY = -1; + + xScroll.cbSize = sizeof(SCROLLINFO); + xScroll.fMask = SIF_POS; + // Capture the original position of the scroll bars and save them. + if(GetScrollInfo(hWnd, SB_HORZ, &xScroll))OldScrollX = xScroll.nPos; + if(GetScrollInfo(hWnd, SB_VERT, &xScroll))OldScrollY = xScroll.nPos; + + // If we successfully got the info for the horizontal scrollbar + if(OldScrollX >= 0) + { + if((Buff->CurrentX < Buff->ShowX)||(Buff->CurrentX >= (Buff->ShowX + Console->Size.X))) + { + // Handle the horizontal scroll bar + if(Buff->CurrentX >= Console->Size.X) NewScrollX = Buff->CurrentX - Console->Size.X + 1; + else NewScrollX = 0; + } + else + { + NewScrollX = OldScrollX; + } + } + // If we successfully got the info for the vertical scrollbar + if(OldScrollY >= 0) + { + if((Buff->CurrentY < Buff->ShowY) || (Buff->CurrentY >= (Buff->ShowY + Console->Size.Y))) + { + // Handle the vertical scroll bar + if(Buff->CurrentY >= Console->Size.Y) NewScrollY = Buff->CurrentY - Console->Size.Y + 1; + else NewScrollY = 0; + } + else + { + NewScrollY = OldScrollY; + } + } + + // Adjust scroll bars and refresh the window if the cursor has moved outside the visible area + // NOTE: OldScroll# and NewScroll# will both be -1 (initial value) if the info for the respective scrollbar + // was not obtained successfully in the previous steps. This means their difference is 0 (no scrolling) + // and their associated scrollbar is left alone. + if((OldScrollX != NewScrollX) || (OldScrollY != NewScrollY)) + { + Buff->ShowX = NewScrollX; + Buff->ShowY = NewScrollY; + ScrollWindowEx(hWnd, + (OldScrollX - NewScrollX) * GuiData->CharWidth, + (OldScrollY - NewScrollY) * GuiData->CharHeight, + NULL, + NULL, + NULL, + NULL, + SW_INVALIDATE); + if(NewScrollX >= 0) + { + xScroll.nPos = NewScrollX; + SetScrollInfo(hWnd, SB_HORZ, &xScroll, TRUE); + } + if(NewScrollY >= 0) + { + xScroll.nPos = NewScrollY; + SetScrollInfo(hWnd, SB_VERT, &xScroll, TRUE); + } + UpdateWindow(hWnd); + GuiData->OldCursor.x = Buff->CurrentX; + GuiData->OldCursor.y = Buff->CurrentY; + } + } } static VOID FASTCALL @@ -1519,15 +1608,82 @@ } static VOID FASTCALL -GuiConsoleResize(HWND hWnd, WPARAM wParam, LPARAM lParam) +GuiConsoleGetMinMaxInfo(HWND hWnd, PMINMAXINFO minMaxInfo) { PCSRSS_CONSOLE Console; PGUI_CONSOLE_DATA GuiData; - GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); - if (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED) - { - DPRINT1("GuiConsoleResize X %d Y %d\n", LOWORD(lParam), HIWORD(lParam)); + if((Console == NULL)|| (GuiData == NULL)) return; + + DWORD windx = CONGUI_MIN_WIDTH * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); + DWORD windy = CONGUI_MIN_HEIGHT * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); + + minMaxInfo->ptMinTrackSize.x = windx; + minMaxInfo->ptMinTrackSize.y = windy; + + windx = (Console->ActiveBuffer->MaxX) * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); + windy = (Console->ActiveBuffer->MaxY) * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); + + if(Console->Size.X < Console->ActiveBuffer->MaxX) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar + if(Console->Size.Y < Console->ActiveBuffer->MaxY) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar + + minMaxInfo->ptMaxTrackSize.x = windx; + minMaxInfo->ptMaxTrackSize.y = windy; +} +static VOID FASTCALL +GuiConsoleResize(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + PCSRSS_CONSOLE Console; + PGUI_CONSOLE_DATA GuiData; + GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); + if((Console == NULL) || (GuiData == NULL)) return; + + if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) + { + PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer; + + GuiData->WindowSizeLock = TRUE; + + DWORD windx = LOWORD(lParam); + DWORD windy = HIWORD(lParam); + + // Compensate for existing scroll bars (because lParam values do not accommodate scroll bar) + if(Console->Size.X < Buff->MaxX) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar + if(Console->Size.Y < Buff->MaxY) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar + + DWORD charx = windx / GuiData->CharWidth; + DWORD chary = windy / GuiData->CharHeight; + + // Character alignment (round size up or down) + if((windx % GuiData->CharWidth) >= (GuiData->CharWidth / 2)) ++charx; + if((windy % GuiData->CharHeight) >= (GuiData->CharHeight / 2)) ++chary; + + // Compensate for added scroll bars in new window + if(charx < Buff->MaxX)windy -= GetSystemMetrics(SM_CYHSCROLL); // new window will have a horizontal scroll bar + if(chary < Buff->MaxY)windx -= GetSystemMetrics(SM_CXVSCROLL); // new window will have a vertical scroll bar + + charx = windx / GuiData->CharWidth; + chary = windy / GuiData->CharHeight; + + // Character alignment (round size up or down) + if((windx % GuiData->CharWidth) >= (GuiData->CharWidth / 2)) ++charx; + if((windy % GuiData->CharHeight) >= (GuiData->CharHeight / 2)) ++chary; + + // Resize window + if((charx != Console->Size.X) || (chary != Console->Size.Y)) + { + Console->Size.X = (charx <= Buff->MaxX) ? charx : Buff->MaxX; + Console->Size.Y = (chary <= Buff->MaxY) ? chary : Buff->MaxY; + } + + GuiConsoleInitScrollbar(Console, hWnd); + + // Adjust the start of the visible area if we are attempting to show nonexistent areas + if((Buff->MaxX - Buff->ShowX) < Console->Size.X) Buff->ShowX = Buff->MaxX - Console->Size.X; + if((Buff->MaxY - Buff->ShowY) < Console->Size.Y) Buff->ShowY = Buff->MaxY - Console->Size.Y; + InvalidateRect(hWnd, NULL, TRUE); + + GuiData->WindowSizeLock = FALSE; } } VOID @@ -1679,7 +1835,9 @@ if (SizeChanged) { + GuiData->WindowSizeLock = TRUE; GuiConsoleInitScrollbar(Console, pConInfo->hConsoleWindow); + GuiData->WindowSizeLock = FALSE; } LeaveCriticalSection(&ActiveBuffer->Header.Lock); @@ -1839,6 +1997,9 @@ case WM_VSCROLL: Result = GuiConsoleHandleScroll(hWnd, msg, wParam); break; + case WM_GETMINMAXINFO: + GuiConsoleGetMinMaxInfo(hWnd, (PMINMAXINFO)lParam); + break; case WM_SIZE: GuiConsoleResize(hWnd, wParam, lParam); break; @@ -1886,17 +2047,18 @@ { Title = L""; } - NewWindow = CreateWindowW(L"ConsoleWindowClass", - Title, - WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_HSCROLL | WS_VSCROLL, //WS_OVERLAPPEDWINDOW - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - NULL, - NULL, - (HINSTANCE) GetModuleHandleW(NULL), - (PVOID) Console); + NewWindow = CreateWindowExW(WS_EX_CLIENTEDGE, + L"ConsoleWindowClass", + Title, + WS_OVERLAPPEDWINDOW | WS_HSCROLL | WS_VSCROLL, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + NULL, + NULL, + (HINSTANCE) GetModuleHandleW(NULL), + (PVOID) Console); if (NULL != Buffer) { HeapFree(Win32CsrApiHeap, 0, Buffer); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.h [iso-8859-1] Sun May 9 15:39:48 2010 @@ -8,6 +8,11 @@ #include "api.h" +#define CONGUI_MIN_WIDTH 10 +#define CONGUI_MIN_HEIGHT 10 +#define CONGUI_UPDATE_TIME 0 +#define CONGUI_UPDATE_TIMER 1 + NTSTATUS FASTCALL GuiInitConsole(PCSRSS_CONSOLE Console); /*EOF*/

1 0

[dreimer] 47145: Bug 5369: Patch and Enhancements for RosBE: Wrong SSVN update behavior. Partially applied: - The EOC to skip rosapps and rostests was not applied, because it might be possible that rosapps or rostests need a update anyway. - Fixed a logical error in %_BUILDBOT_SVNSKIPMAINTRUNK% if condition.
by dreimer＠svn.reactos.org 09 May '10

09 May '10

Author: dreimer Date: Sun May 9 15:15:33 2010 New Revision: 47145 URL: http://svn.reactos.org/svn/reactos?rev=47145&view=rev Log: Bug 5369: Patch and Enhancements for RosBE: Wrong SSVN update behavior. Partially applied: - The EOC to skip rosapps and rostests was not applied, because it might be possible that rosapps or rostests need a update anyway. - Fixed a logical error in %_BUILDBOT_SVNSKIPMAINTRUNK% if condition. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sun May 9 15:15:33 2010 @@ -30,11 +30,27 @@ $_ROSBE_SSVN_JOB = "update" } } + if ($OFFSVN -eq $ONSVN) { + "Your tree is up to date." + } + if ("$_ROSBE_SSVN_JOB" -eq "update") { if ("$($arg[1])" -ne "") { $temparg = $arg[1] + + if ($temparg -eq $OFFSVN) { + "Your Local Repository is currently $temparg" + } + if ($temparg -lt $OFFSVN) { + "Downgrading to $temparg ..." + } + if ($temparg -gt $OFFSVN) { + "Updating to $temparg ..." + } if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { IEX "& svn.exe update -r $temparg" + } else { + "Skipping ReactOS Trunk update." } if (Test-Path "modules\rosapps\.") { Set-Location "modules\rosapps" @@ -72,9 +88,6 @@ IEX "& svn.exe log -r $range" } } - } - if ($OFFSVN -eq $ONSVN) { - "Your tree is up to date." } } Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Sun May 9 15:15:33 2010 @@ -28,7 +28,7 @@ echo This might take a while, so please be patient. echo. set _ROSBE_SSVN_JOB=update - goto :UP + goto :UP ) if /i "%1" == "cleanup" ( @@ -202,10 +202,27 @@ set /p UP="Please enter 'yes' or 'no': " if /i "!UP!" == "yes" set _ROSBE_SSVN_JOB=update ) - if "!_ROSBE_SSVN_JOB!" == "update" ( + ) + if !OFFSVN! equ !ONSVN! ( + echo Your tree is up to date. + ) + + if "!_ROSBE_SSVN_JOB!" == "update" ( if not "%2" == "" ( + + if "%2" == "!OFFSVN!" ( + echo Your Local Repository is currently %2 + ) + if "%2" LSS "!OFFSVN!" ( + echo Downgrading to %2 ... + ) + if "%2" GTR "!OFFSVN!" ( + echo Updating to %2 ... + ) if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( svn.exe update -r %2 + ) else ( + echo Skipping ReactOS Trunk update. ) if exist "modules\rosapps\." ( cd "modules\rosapps" @@ -243,9 +260,6 @@ svn.exe log -r !OFFSVN!:!ONSVN! ) ) - if !OFFSVN! equ !ONSVN! ( - echo Your tree is up to date. - ) goto EOC

1 0

[janderwald] 47144: [CONSOLE] - Store console changes when screen buffer / window size changes - Mark property sheet as changed when color control changes
by janderwald＠svn.reactos.org 09 May '10

09 May '10

Author: janderwald Date: Sun May 9 15:12:21 2010 New Revision: 47144 URL: http://svn.reactos.org/svn/reactos?rev=47144&view=rev Log: [CONSOLE] - Store console changes when screen buffer / window size changes - Mark property sheet as changed when color control changes Modified: trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/layout.c Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Sun May 9 15:12:21 2010 @@ -231,6 +231,7 @@ InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); pConInfo->ActiveStaticControl = index; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } } Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Sun May 9 15:12:21 2010 @@ -294,6 +294,52 @@ { switch(LOWORD(wParam)) { + case IDC_EDIT_SCREEN_BUFFER_WIDTH: + case IDC_EDIT_SCREEN_BUFFER_HEIGHT: + case IDC_EDIT_WINDOW_SIZE_WIDTH: + case IDC_UPDOWN_WINDOW_SIZE_HEIGHT: + case IDC_EDIT_WINDOW_POS_LEFT: + case IDC_EDIT_WINDOW_POS_TOP: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD wheight, wwidth; + DWORD sheight, swidth; + DWORD left, top; + + wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, NULL, FALSE); + wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, NULL, FALSE); + swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); + sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); + + swidth = max(swidth, 1); + sheight = max(sheight, 1); + + /* automatically adjust window size when screen buffer decreases */ + if (wwidth > swidth) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); + wwidth = swidth; + } + + if (wheight > sheight) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); + wheight = sheight; + } + + + pConInfo->ScreenBuffer = MAKELONG(swidth, sheight); + pConInfo->WindowSize = MAKELONG(wwidth, wheight); + pConInfo->WindowPosition = MAKELONG(left, top); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + case IDC_CHECK_SYSTEM_POS_WINDOW: { LONG res = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0);

1 0

[jgardou] 47143: [WIN32K] - remove a comment which is not true anymore [USER32] - Create a bitmap which is compatible with the bitmap'we are copying in CreateSmallIcon Icons are back in taskbar
by jgardou＠svn.reactos.org 09 May '10

09 May '10

Author: jgardou Date: Sun May 9 15:07:47 2010 New Revision: 47143 URL: http://svn.reactos.org/svn/reactos?rev=47143&view=rev Log: [WIN32K] - remove a comment which is not true anymore [USER32] - Create a bitmap which is compatible with the bitmap'we are copying in CreateSmallIcon Icons are back in taskbar Modified: branches/reactos-yarotows/dll/win32/user32/windows/class.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c Modified: branches/reactos-yarotows/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… ============================================================================== --- branches/reactos-yarotows/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/user32/windows/class.c [iso-8859-1] Sun May 9 15:07:47 2010 @@ -289,7 +289,7 @@ } return Ret; } - // Wine Class tests: + // Wine Class tests: /* Edit controls are special - they return a wndproc handle when GetWindowLongPtr is called with a different A/W. On the other hand there is no W->A->W conversion so this control @@ -809,7 +809,6 @@ int SmallIconWidth; int SmallIconHeight; BITMAP StdBitmapInfo; - HDC hInfoDc = NULL; HDC hSourceDc = NULL; HDC hDestDc = NULL; ICONINFO SmallInfo; @@ -845,15 +844,6 @@ return StdIcon; } - /* Get a handle to a info DC and handles to DCs which can be used to - select a bitmap into. This is done to avoid triggering a switch to - graphics mode (if we're currently in text/blue screen mode) */ - hInfoDc = CreateICW(NULL, NULL, NULL, NULL); - if (NULL == hInfoDc) - { - ERR("Failed to create info DC\n"); - goto cleanup; - } hSourceDc = CreateCompatibleDC(NULL); if (NULL == hSourceDc) { @@ -873,7 +863,7 @@ ERR("Failed to select source color bitmap\n"); goto cleanup; } - SmallInfo.hbmColor = CreateCompatibleBitmap(hInfoDc, SmallIconWidth, + SmallInfo.hbmColor = CreateCompatibleBitmap(hSourceDc, SmallIconWidth, SmallIconHeight); if (NULL == SmallInfo.hbmColor) { @@ -899,8 +889,7 @@ ERR("Failed to select source mask bitmap\n"); goto cleanup; } - SmallInfo.hbmMask = CreateBitmap(SmallIconWidth, SmallIconHeight, 1, 1, - NULL); + SmallInfo.hbmMask = CreateCompatibleBitmap(hSourceDc, SmallIconWidth, SmallIconHeight); if (NULL == SmallInfo.hbmMask) { ERR("Failed to create mask bitmap\n"); @@ -953,10 +942,6 @@ if (NULL != hSourceDc) { DeleteDC(hSourceDc); - } - if (NULL != hInfoDc) - { - DeleteDC(hInfoDc); } return SmallIcon; @@ -1048,9 +1033,9 @@ clsMenuName.pszClientAnsiMenuName = AnsiMenuName.Buffer; clsMenuName.pwszClientUnicodeMenuName = MenuName.Buffer; clsMenuName.pusMenuName = &MenuName; - + Atom = NtUserRegisterClassExWOW( &WndClass, - &ClassName, + &ClassName, NULL, //PUNICODE_STRING ClsNVersion, &clsMenuName, fnID, Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun May 9 15:07:47 2010 @@ -166,19 +166,6 @@ { if (Count == sizeof(BITMAP)) { - /* We have a bitmap bug!!! W/O the HACK, we have white icons. - - MSDN Note: When a memory device context is created, it initially - has a 1-by-1 monochrome bitmap selected into it. If this memory - device context is used in CreateCompatibleBitmap, the bitmap that - is created is a monochrome bitmap. To create a color bitmap, use - the hDC that was used to create the memory device context, as - shown in the following code: - - HDC memDC = CreateCompatibleDC(hDC); - HBITMAP memBM = CreateCompatibleBitmap(hDC, nWidth, nHeight); - SelectObject(memDC, memBM); - */ Bmp = IntGdiCreateBitmap(abs(Width), abs(Height), dibs.dsBm.bmPlanes,

1 0

[mjmartin] 47142: [win32k] - When message are sent without waiting a reply (non-queued messages) the message queues are referenced and dereferenced in the call. Message removal and cleanup functions for queues expected a reference on the queue. Add checks to determine if the message is a non-queued message and if so release memory for those that had pointers and more importantly skip dereferencing the queues. Possibly fixes random crashes and memory leaks.
by mjmartin＠svn.reactos.org 09 May '10

09 May '10

Author: mjmartin Date: Sun May 9 14:27:57 2010 New Revision: 47142 URL: http://svn.reactos.org/svn/reactos?rev=47142&view=rev Log: [win32k] - When message are sent without waiting a reply (non-queued messages) the message queues are referenced and dereferenced in the call. Message removal and cleanup functions for queues expected a reference on the queue. Add checks to determine if the message is a non-queued message and if so release memory for those that had pointers and more importantly skip dereferencing the queues. Possibly fixes random crashes and memory leaks. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun May 9 14:27:57 2010 @@ -1072,7 +1072,7 @@ { DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); - RemoveEntryList(&SentMessage->ListEntry); + RemoveEntryList(&SentMessage->ListEntry); /* remove the message from the dispatching list */ if(SentMessage->DispatchingListEntry.Flink != NULL) @@ -1086,9 +1086,19 @@ KeSetEvent(SentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* dereference our and the sender's message queue */ - IntDereferenceMessageQueue(MessageQueue); - IntDereferenceMessageQueue(SentMessage->SenderQueue); + if (SentMessage->HasPackedLParam == TRUE) + { + if (SentMessage->Msg.lParam) + ExFreePool((PVOID)SentMessage->Msg.lParam); + } + + /* Only if it is not a no wait message */ + if (!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) + { + /* dereference our and the sender's message queue */ + IntDereferenceMessageQueue(MessageQueue); + IntDereferenceMessageQueue(SentMessage->SenderQueue); + } /* free the message */ ExFreePool(SentMessage); @@ -1509,9 +1519,19 @@ KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* dereference our and the sender's message queue */ - IntDereferenceMessageQueue(MessageQueue); - IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue); + if (CurrentSentMessage->HasPackedLParam == TRUE) + { + if (CurrentSentMessage->Msg.lParam) + ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); + } + + /* Only if it is not a no wait message */ + if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + { + /* dereference our and the sender's message queue */ + IntDereferenceMessageQueue(MessageQueue); + IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue); + } /* free the message */ ExFreePool(CurrentSentMessage); @@ -1547,10 +1567,19 @@ KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* dereference our and the sender's message queue */ - IntDereferenceMessageQueue(MessageQueue); - IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue); - + if (CurrentSentMessage->HasPackedLParam == TRUE) + { + if (CurrentSentMessage->Msg.lParam) + ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); + } + + /* Only if it is not a no wait message */ + if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + { + /* dereference our and the sender's message queue */ + IntDereferenceMessageQueue(MessageQueue); + IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue); + } /* free the message */ ExFreePool(CurrentSentMessage); }

1 0

[dreimer] 47141: Bug 5355: [PATCH] cacls: Add Japanese resource by Katayama Hirofumi Bug 5371: TRANSLATION: Italian translation updates by Paolo Devoti Bug 5337: PATCH: Some kernel32 lang updates (de-DE updated, others fixed) by forenkrams@tuxproject.de Bug 5366: TRANSLATION: Czech translation update by Radek Liska
by dreimer＠svn.reactos.org 09 May '10

09 May '10

Author: dreimer Date: Sun May 9 14:14:25 2010 New Revision: 47141 URL: http://svn.reactos.org/svn/reactos?rev=47141&view=rev Log: Bug 5355: [PATCH] cacls: Add Japanese resource by Katayama Hirofumi Bug 5371: TRANSLATION: Italian translation updates by Paolo Devoti Bug 5337: PATCH: Some kernel32 lang updates (de-DE updated, others fixed) by forenkrams(a)tuxproject.de Bug 5366: TRANSLATION: Czech translation update by Radek Liska Added: trunk/reactos/base/applications/cacls/lang/ja-JP.rc (with props) trunk/reactos/base/applications/rapps/lang/it-IT.rc (with props) Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/win32/kernel32/lang/bg-BG.mc trunk/reactos/dll/win32/kernel32/lang/de-DE.mc trunk/reactos/dll/win32/kernel32/lang/pl-PL.mc trunk/reactos/dll/win32/kernel32/lang/ru-RU.mc trunk/reactos/dll/win32/netshell/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/media/inf/cpu.inf [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/cacls/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… Added: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… Modified: trunk/reactos/dll/win32/kernel32/lang/bg-BG.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/bg… Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de… Modified: trunk/reactos/dll/win32/kernel32/lang/pl-PL.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/pl… Modified: trunk/reactos/dll/win32/kernel32/lang/ru-RU.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/ru… Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=4714…

1 0

[jgardou] 47140: [WIN32K] - Set NULL owner to copied bitmap when creating indirect icons - Rewrite UserDrawIconEx, inspired from wine code - fix palette creation for 16 bits DIB - Always assign a palette to bitmap created with BITMAP_CopyBitmap and IntCreateCompatibeBitmap. [USER32] - Use DIB section when creating icons - Use something called "header" Now mode switching is almost glitchless.
by jgardou＠svn.reactos.org 09 May '10

09 May '10

Author: jgardou Date: Sun May 9 13:35:36 2010 New Revision: 47140 URL: http://svn.reactos.org/svn/reactos?rev=47140&view=rev Log: [WIN32K] - Set NULL owner to copied bitmap when creating indirect icons - Rewrite UserDrawIconEx, inspired from wine code - fix palette creation for 16 bits DIB - Always assign a palette to bitmap created with BITMAP_CopyBitmap and IntCreateCompatibeBitmap. [USER32] - Use DIB section when creating icons - Use something called "header" Now mode switching is almost glitchless. Modified: branches/reactos-yarotows/dll/win32/user32/include/cursor.h branches/reactos-yarotows/dll/win32/user32/windows/bitmap.c branches/reactos-yarotows/dll/win32/user32/windows/icon.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/dll/win32/user32/include/cursor.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… ============================================================================== --- branches/reactos-yarotows/dll/win32/user32/include/cursor.h [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/user32/include/cursor.h [iso-8859-1] Sun May 9 13:35:36 2010 @@ -1,2 +1,32 @@ HCURSOR -CursorIconToCursor(HICON hIcon, BOOL SemiTransparent); +CursorIconToCursor(HICON hIcon, + BOOL SemiTransparent); + +HICON CreateCursorIconFromData(PVOID ImageData, + ICONIMAGE* IconImage, + int cxDesired, + int cyDesired, + int xHotspot, + int yHotspot, + BOOL fIcon); + +/* + * The following macro function accounts for the irregularities of + * accessing cursor and icon resources in files and resource entries. + */ +typedef BOOL +(*fnGetCIEntry)(LPVOID dir, int n, int *width, int *height, int *bits ); + +int +CURSORICON_FindBestCursor(LPVOID dir, + fnGetCIEntry get_entry, + int Width, + int Height, + int ColorBits); +int +CURSORICON_FindBestIcon(LPVOID dir, + fnGetCIEntry get_entry, + int Width, + int Height, + int ColorBits); + Modified: branches/reactos-yarotows/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… ============================================================================== --- branches/reactos-yarotows/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/user32/windows/bitmap.c [iso-8859-1] Sun May 9 13:35:36 2010 @@ -56,11 +56,6 @@ #include "poppack.h" -/* forward declarations... actually in user32\windows\icon.c but useful here */ -HICON CreateCursorIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot, BOOL fIcon); -CURSORICONDIRENTRY *CURSORICON_FindBestIcon( CURSORICONDIR *dir, int width, int height, int colors); -CURSORICONDIRENTRY *CURSORICON_FindBestCursor( CURSORICONDIR *dir, int width, int height, int colors); - /* FUNCTIONS *****************************************************************/ /* @@ -95,13 +90,6 @@ return Handle; } - -/* - * The following macro functions account for the irregularities of - * accessing cursor and icon resources in files and resource entries. - */ -typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, - int *width, int *height, int *bits ); /********************************************************************** * CURSORICON_FindBestCursor2 @@ -311,16 +299,6 @@ return NULL; } - /* Get a handle to the screen dc, the icon we create is going to be - * compatable with this. */ - hScreenDc = CreateDCW(NULL, NULL, NULL, NULL); - if (hScreenDc == NULL) - { - UnmapViewOfFile(IconDIR); - RtlFreeHeap(GetProcessHeap(), 0, SafeIconImage); - return NULL; - } - if (fuLoad & LR_MONOCHROME) { ColorBits = 1; @@ -334,14 +312,12 @@ dirEntry = CURSORICON_FindBestCursorFile( IconDIR, width, height, ColorBits ); if (!dirEntry) { - DeleteDC(hScreenDc); UnmapViewOfFile(IconDIR); return NULL; } if ( dirEntry->dwDIBOffset > filesize ) { - DeleteDC(hScreenDc); UnmapViewOfFile(IconDIR); return NULL; } @@ -355,7 +331,6 @@ SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwDIBSize); if (SafeIconImage == NULL) { - DeleteDC(hScreenDc); UnmapViewOfFile(IconDIR); return NULL; } @@ -384,9 +359,8 @@ /* Make data point to the start of the XOR image data. */ Data = (PBYTE)SafeIconImage + HeaderSize; - hIcon = CreateCursorIconFromData(hScreenDc, Data, SafeIconImage, width, height, width/2, height/2, Icon); + hIcon = CreateCursorIconFromData(Data, SafeIconImage, width, height, width/2, height/2, Icon); RtlFreeHeap(GetProcessHeap(), 0, SafeIconImage); - DeleteDC(hScreenDc); return hIcon; } Modified: branches/reactos-yarotows/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… ============================================================================== --- branches/reactos-yarotows/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/user32/windows/icon.c [iso-8859-1] Sun May 9 13:35:36 2010 @@ -36,11 +36,11 @@ HICON -CreateCursorIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot, BOOL fIcon) -{ - BYTE BitmapInfoBuffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD)]; - BITMAPINFO *bwBIH = (BITMAPINFO *)BitmapInfoBuffer; +CreateCursorIconFromData(PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot, BOOL fIcon) +{ ICONINFO IconInfo; + PVOID pBits ; + HICON res; IconInfo.fIcon = fIcon; IconInfo.xHotspot = xHotspot; @@ -50,16 +50,40 @@ { IconInfo.hbmColor = (HBITMAP)0; IconImage->icHeader.biHeight *= 2; - IconInfo.hbmMask = CreateDIBitmap(hDC, &IconImage->icHeader, CBM_INIT, - ImageData, (BITMAPINFO*)IconImage, - DIB_RGB_COLORS); + IconInfo.hbmMask = CreateDIBSection(0, + (BITMAPINFO*)IconImage, + DIB_RGB_COLORS, + &pBits, + NULL, + 0); + if(!pBits) + { + ERR("Could not create a DIB section\n"); + return NULL; + } + CopyMemory(pBits, + ImageData, + (((IconImage->icHeader.biWidth + 31) & ~31 ) >> 3) * IconImage->icHeader.biHeight) ; } else { + BYTE BitmapInfoBuffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD)]; + BITMAPINFO *bwBIH = (BITMAPINFO *)BitmapInfoBuffer; /* Create the XOR bitmap */ - IconInfo.hbmColor = CreateDIBitmap(hDC, &IconImage->icHeader, CBM_INIT, - ImageData, (BITMAPINFO*)IconImage, - DIB_RGB_COLORS); + IconInfo.hbmColor = CreateDIBSection(0, + (BITMAPINFO*)IconImage, + DIB_RGB_COLORS, + &pBits, + NULL, + 0); + if(!pBits) + { + ERR("Could not create a DIB section\n"); + return NULL; + } + CopyMemory(pBits, + ImageData, + (((IconImage->icHeader.biWidth * IconImage->icHeader.biBitCount+ 31) & ~31 ) >> 3) * IconImage->icHeader.biHeight) ; /* Make ImageData point to the start of the AND image data. */ ImageData = ((PBYTE)ImageData) + (((IconImage->icHeader.biWidth * @@ -89,17 +113,30 @@ bwBIH->bmiColors[1].rgbRed = 0xff; bwBIH->bmiColors[1].rgbReserved = 0; - /* Create the AND bitmap. */ - IconInfo.hbmMask = CreateDIBitmap(hDC, &bwBIH->bmiHeader, 0, - ImageData, bwBIH, DIB_RGB_COLORS); - - SetDIBits(hDC, IconInfo.hbmMask, 0, IconImage->icHeader.biHeight, - ImageData, bwBIH, DIB_RGB_COLORS); + IconInfo.hbmMask = CreateDIBSection(0, + bwBIH, + DIB_RGB_COLORS, + &pBits, + NULL, + 0); + if(!pBits) + { + ERR("Could not create a DIB section\n"); + DeleteObject(IconInfo.hbmColor); + return NULL; + } + CopyMemory(pBits, + ImageData, + (((IconImage->icHeader.biWidth + 31) & ~31 ) >> 3) * IconImage->icHeader.biHeight) ; } - /* Create the icon based on everything we have so far */ - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); + /* Use indirect creation, as DIBSection can't be shared between processes */ + res = NtUserCreateCursorIconHandle(&IconInfo, TRUE); + DeleteObject(IconInfo.hbmMask); + if(IconInfo.hbmColor) DeleteObject(IconInfo.hbmColor); + + return res; } /* @@ -203,7 +240,6 @@ ULONG HeaderSize; ULONG ColourCount; PVOID Data; - HDC hScreenDc; WORD wXHotspot; WORD wYHotspot; @@ -259,17 +295,8 @@ /* make data point to the start of the XOR image data */ Data = (PBYTE)SafeIconImage + HeaderSize; - /* get a handle to the screen dc, the icon we create is going to be compatable with this */ - hScreenDc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); - if (hScreenDc == NULL) - { + hIcon = CreateCursorIconFromData(Data, SafeIconImage, cxDesired, cyDesired, wXHotspot, wYHotspot, fIcon); RtlFreeHeap(GetProcessHeap(), 0, SafeIconImage); - return(NULL); - } - - hIcon = CreateCursorIconFromData(hScreenDc, Data, SafeIconImage, cxDesired, cyDesired, wXHotspot, wYHotspot, fIcon); - RtlFreeHeap(GetProcessHeap(), 0, SafeIconImage); - DeleteDC(hScreenDc); return hIcon; } @@ -427,19 +454,12 @@ -/* - * The following macro function accounts for the irregularities of - * accessing cursor and icon resources in files and resource entries. - */ -typedef BOOL -(*fnGetCIEntry)(LPVOID dir, int n, int *width, int *height, int *bits ); - /********************************************************************** * CURSORICON_FindBestIcon * * Find the icon closest to the requested size and number of colors. */ -static int +int CURSORICON_FindBestIcon(LPVOID dir, fnGetCIEntry get_entry, int Width, @@ -495,7 +515,7 @@ * FIXME: parameter 'color' ignored and entries with more than 1 bpp * ignored too */ -static int +int CURSORICON_FindBestCursor(LPVOID dir, fnGetCIEntry get_entry, int Width, Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun May 9 13:35:36 2010 @@ -110,7 +110,7 @@ HCURSOR hOldCursor = (HCURSOR)0; HDC hdcScreen; BOOL bResult; - + CurInfo = IntGetSysCursorInfo(); OldCursor = CurInfo->CurrentCursorObject; @@ -522,26 +522,34 @@ { // FIXME: WTF? CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); - CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); + if(CurIcon->IconInfo.hbmColor) + { + CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); + } } - if (CurIcon->IconInfo.hbmColor && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) + else { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); - } - if (CurIcon->IconInfo.hbmMask && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) - { - if (CurIcon->IconInfo.hbmColor == NULL) + if (CurIcon->IconInfo.hbmColor && + (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) { CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy >> 1; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); } - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); + if (CurIcon->IconInfo.hbmMask && + (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) + { + if(!CurIcon->IconInfo.hbmColor) + { + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy*2; + } + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); + } } /* Calculate icon hotspot */ @@ -789,8 +797,8 @@ DesktopWindow = UserGetDesktopWindow(); - if (prcl != NULL && - (prcl->right > prcl->left) && + if (prcl != NULL && + (prcl->right > prcl->left) && (prcl->bottom > prcl->top) && DesktopWindow != NULL) { @@ -1268,6 +1276,7 @@ return FALSE; } +/* Mostly inspired from wine code */ BOOL UserDrawIconEx( HDC hDc, @@ -1282,18 +1291,15 @@ { BOOL Ret = FALSE; HBITMAP hbmMask, hbmColor; - BITMAP bmpMask, bmpColor; + BITMAP bmpColor, bm; BOOL DoFlickerFree; SIZE IconSize; - - HDC hdcOff; + INT iOldBkColor = 0, iOldTxtColor = 0; + + HDC hMemDC, hOffDC = NULL; HGDIOBJ hOldOffBrush = 0; HGDIOBJ hOldOffBmp = 0; - HBITMAP hbmOff = 0; - HDC hdcMask = 0; - HGDIOBJ hOldMask = NULL; - HDC hdcImage = 0; - HGDIOBJ hOldImage = NULL; + HBITMAP hTmpBmp = 0, hOffBmp = 0; BOOL bAlpha = FALSE; hbmMask = pIcon->IconInfo.hbmMask; @@ -1302,13 +1308,19 @@ if (istepIfAniCur) DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), (PVOID)&bmpMask)) + if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), (PVOID)&bm)) { return FALSE; } if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), (PVOID)&bmpColor)) { + return FALSE; + } + + if(!(hMemDC = NtGdiCreateCompatibleDC(hDc))) + { + DPRINT1("NtGdiCreateCompatibleDC failed!\n"); return FALSE; } @@ -1317,15 +1329,22 @@ IconSize.cx = bmpColor.bmWidth; IconSize.cy = bmpColor.bmHeight; } - else - { - IconSize.cx = bmpMask.bmWidth; - IconSize.cy = bmpMask.bmHeight / 2; - } + else /* take it from mask */ + { + IconSize.cx = bm.bmWidth; + IconSize.cy = bm.bmHeight/2; + } + + if (!diFlags) + diFlags = DI_NORMAL; /* NtGdiCreateCompatibleBitmap will create a monochrome bitmap when cxWidth or cyHeight is 0 */ - if ((bmpColor.bmBitsPixel == 32) && (cxWidth != 0) && (cyHeight != 0)) + if (hbmColor + && (bmpColor.bmBitsPixel == 32) + && (cxWidth != 0) + && (cyHeight != 0) + && (diFlags & DI_IMAGE)) { SURFACE *psurfOff = NULL; PFN_DIB_GetPixel fnSource_GetPixel = NULL; @@ -1333,7 +1352,7 @@ /* In order to correctly display 32 bit icons Windows first scans the image, because information about transparency is not stored in any image's headers */ - psurfOff = SURFACE_LockSurface(hbmColor ? hbmColor : hbmMask); + psurfOff = SURFACE_LockSurface(hbmColor); if (psurfOff) { fnSource_GetPixel = DibFunctionsForBitmapFormat[psurfOff->SurfObj.iBitmapFormat].DIB_GetPixel; @@ -1355,9 +1374,6 @@ } } - if (!diFlags) - diFlags = DI_NORMAL; - if (!cxWidth) cxWidth = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CXICON) : IconSize.cx); @@ -1369,203 +1385,173 @@ DoFlickerFree = (hbrFlickerFreeDraw && (GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH)); - if (DoFlickerFree || bAlpha) - { - RECTL r; - BITMAP bm; - SURFACE *psurfOff = NULL; - - r.right = cxWidth; - r.bottom = cyHeight; - - hdcOff = NtGdiCreateCompatibleDC(hDc); - if (!hdcOff) - { - DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); - return FALSE; - } - - hbmOff = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); - if (!hbmOff) - { - DPRINT1("NtGdiCreateCompatibleBitmap() failed!\n"); - goto cleanup; - } - - /* make sure we have a 32 bit offscreen bitmap - otherwise we can't do alpha blending */ - psurfOff = SURFACE_LockSurface(hbmOff); - if (psurfOff == NULL) - { - DPRINT1("BITMAPOBJ_LockBitmap() failed!\n"); - goto cleanup; - } - BITMAP_GetObject(psurfOff, sizeof(BITMAP), (PVOID)&bm); - - if (bm.bmBitsPixel != 32) - bAlpha = FALSE; - - SURFACE_UnlockSurface(psurfOff); - - hOldOffBmp = NtGdiSelectBitmap(hdcOff, hbmOff); - if (!hOldOffBmp) - { - DPRINT1("NtGdiSelectBitmap() failed!\n"); - goto cleanup; - } - - if (DoFlickerFree) - { - hOldOffBrush = NtGdiSelectBrush(hdcOff, hbrFlickerFreeDraw); - if (!hOldOffBrush) + if (DoFlickerFree) + { + hOffDC = NtGdiCreateCompatibleDC(hDc); + if(!hOffDC) + { + DPRINT1("NtGdiCreateCompatibleBitmap failed!\n"); + Ret = FALSE; + goto Cleanup ; + } + hOffBmp = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); + if(!hOffBmp) + { + DPRINT1("NtGdiCreateCompatibleBitmap failed!\n"); + goto Cleanup ; + } + hOldOffBmp = NtGdiSelectBitmap(hOffDC, hOffBmp); + hOldOffBrush = NtGdiSelectBrush(hOffDC, hbrFlickerFreeDraw); + NtGdiPatBlt(hOffDC, 0, 0, cxWidth, cyHeight, PATCOPY); + NtGdiSelectBrush(hOffDC, hOldOffBrush); + } + else + { + /* Set Background/foreground colors */ + iOldTxtColor = IntGdiSetTextColor(hDc, 0); //black + iOldBkColor = IntGdiSetBkColor(hDc, 0x00FFFFFF); //white + } + + + if (hbmMask && (diFlags & DI_MASK) && !bAlpha) + { + hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmMask); + NtGdiStretchBlt(hOffDC ? hOffDC : hDc, + hOffDC ? 0 : xLeft, + hOffDC ? 0 : yTop, + cxWidth, + cyHeight, + hMemDC, + 0, + 0, + IconSize.cx, + IconSize.cy, + SRCAND, + 0); + NtGdiSelectBitmap(hMemDC, hTmpBmp); + } + + if(diFlags & DI_IMAGE) + { + if (bAlpha) + { + BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + DWORD Pixel; + BYTE Red, Green, Blue, Alpha; + DWORD Count = 0; + INT i, j; + PSURFACE psurf; + PBYTE pBits ; + HBITMAP hMemBmp = NULL; + + pBits = ExAllocatePoolWithTag(PagedPool, + bmpColor.bmWidthBytes * abs(bmpColor.bmHeight), + TAG_BITMAP); + if (pBits == NULL) { - DPRINT1("NtGdiSelectBrush() failed!\n"); - goto cleanup; + Ret = FALSE; + goto CleanupAlpha; } - NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); - } + hMemBmp = BITMAP_CopyBitmap(hbmColor); + if(!hMemBmp) + { + DPRINT1("BITMAP_CopyBitmap failed!"); + goto CleanupAlpha; + } + + psurf = SURFACE_LockSurface(hMemBmp); + if(!psurf) + { + DPRINT1("SURFACE_LockSurface failed!\n"); + goto CleanupAlpha; + } + /* get color bits */ + IntGetBitmapBits(psurf, + bmpColor.bmWidthBytes * abs(bmpColor.bmHeight), + pBits); + + /* premultiply with the alpha channel value */ + for (i = 0; i < cyHeight; i++) + { + for (j = 0; j < cxWidth; j++) + { + Pixel = *(DWORD *)(pBits + Count); + + Alpha = ((BYTE)(Pixel >> 24) & 0xff); + + Red = (((BYTE)(Pixel >> 0)) * Alpha) / 0xff; + Green = (((BYTE)(Pixel >> 8)) * Alpha) / 0xff; + Blue = (((BYTE)(Pixel >> 16)) * Alpha) / 0xff; + + *(DWORD *)(pBits + Count) = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); + + Count += sizeof(DWORD); + } + } + + /* set mem bits */ + IntSetBitmapBits(psurf, + bmpColor.bmWidthBytes * abs(bmpColor.bmHeight), + pBits); + SURFACE_UnlockSurface(psurf); + + hTmpBmp = NtGdiSelectBitmap(hMemDC, hMemBmp); + + NtGdiAlphaBlend(hOffDC ? hOffDC : hDc, + hOffDC ? 0 : xLeft, + hOffDC ? 0 : yTop, + cxWidth, + cyHeight, + hMemDC, + 0, + 0, + IconSize.cx, + IconSize.cy, + pixelblend, + NULL); + NtGdiSelectBitmap(hMemDC, hTmpBmp); + CleanupAlpha: + if(pBits) ExFreePoolWithTag(pBits, TAG_BITMAP); + if(hMemBmp) NtGdiDeleteObjectApp(hMemBmp); + } + else if (hbmColor) + { + DWORD rop = (diFlags & DI_MASK) ? SRCINVERT : SRCCOPY ; + hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmColor); + NtGdiStretchBlt(hOffDC ? hOffDC : hDc, + hOffDC ? 0 : xLeft, + hOffDC ? 0 : yTop, + cxWidth, + cyHeight, + hMemDC, + 0, + 0, + IconSize.cx, + IconSize.cy, + rop, + 0); + NtGdiSelectBitmap(hMemDC, hTmpBmp); + } + } + + if(hOffDC) + { + NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, cyHeight, hOffDC, 0, 0, SRCCOPY, 0, 0); } else - hdcOff = hDc; - - if (diFlags & DI_IMAGE) - { - hdcImage = NtGdiCreateCompatibleDC(hDc); - if (!hdcImage) - { - DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); - goto cleanup; - } - hOldImage = NtGdiSelectBitmap(hdcImage, (hbmColor ? hbmColor : hbmMask)); - if (!hOldImage) - { - DPRINT("NtGdiSelectBitmap() failed!\n"); - goto cleanup; - } - } - - /* If DI_IMAGE flag is specified and hbmMask exists, then always use mask for drawing */ - if (diFlags & DI_MASK || (diFlags & DI_IMAGE && hbmMask)) - { - hdcMask = NtGdiCreateCompatibleDC(hDc); - if (!hdcMask) - { - DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); - goto cleanup; - } - - hOldMask = NtGdiSelectBitmap(hdcMask, hbmMask); - if (!hOldMask) - { - DPRINT("NtGdiSelectBitmap() failed!\n"); - goto cleanup; - } - } - - if (hdcMask || hdcImage) - { - GreStretchBltMask(hdcOff, - (DoFlickerFree || bAlpha) ? 0 : xLeft, - (DoFlickerFree || bAlpha) ? 0 : yTop, - cxWidth, - cyHeight, - hdcImage ? hdcImage : hdcMask, - 0, - 0, - IconSize.cx, - IconSize.cy, - SRCCOPY, - 0, - hdcMask, - 0, - hdcImage ? 0 : IconSize.cy); - } - - if (hOldMask) NtGdiSelectBitmap(hdcMask, hOldMask); - if (hOldImage) NtGdiSelectBitmap(hdcImage, hOldImage); - if (hdcImage) NtGdiDeleteObjectApp(hdcImage); - if (hdcMask) NtGdiDeleteObjectApp(hdcMask); - - if (bAlpha) - { - BITMAP bm; - SURFACE *psurfOff = NULL; - PBYTE pBits = NULL; - BLENDFUNCTION BlendFunc; - DWORD Pixel; - BYTE Red, Green, Blue, Alpha; - DWORD Count = 0; - INT i, j; - - psurfOff = SURFACE_LockSurface(hbmOff); - if (psurfOff == NULL) - { - DPRINT1("BITMAPOBJ_LockBitmap() failed!\n"); - goto cleanup; - } - BITMAP_GetObject(psurfOff, sizeof(BITMAP), (PVOID)&bm); - - pBits = ExAllocatePoolWithTag(PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); - if (pBits == NULL) - { - DPRINT1("ExAllocatePoolWithTag() failed!\n"); - SURFACE_UnlockSurface(psurfOff); - goto cleanup; - } - - /* get icon bits */ - IntGetBitmapBits(psurfOff, bm.bmWidthBytes * abs(bm.bmHeight), pBits); - - /* premultiply with the alpha channel value */ - for (i = 0; i < cyHeight; i++) - { - for (j = 0; j < cxWidth; j++) - { - Pixel = *(DWORD *)(pBits + Count); - - Alpha = ((BYTE)(Pixel >> 24) & 0xff); - - Red = (((BYTE)(Pixel >> 0)) * Alpha) / 0xff; - Green = (((BYTE)(Pixel >> 8)) * Alpha) / 0xff; - Blue = (((BYTE)(Pixel >> 16)) * Alpha) / 0xff; - - *(DWORD *)(pBits + Count) = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); - - Count += sizeof(DWORD); - } - } - - /* set icon bits */ - IntSetBitmapBits(psurfOff, bm.bmWidthBytes * abs(bm.bmHeight), pBits); - ExFreePoolWithTag(pBits, TAG_BITMAP); - - SURFACE_UnlockSurface(psurfOff); - - BlendFunc.BlendOp = AC_SRC_OVER; - BlendFunc.BlendFlags = 0; - BlendFunc.SourceConstantAlpha = 255; - BlendFunc.AlphaFormat = AC_SRC_ALPHA; - - NtGdiAlphaBlend(hDc, xLeft, yTop, cxWidth, cyHeight, - hdcOff, 0, 0, cxWidth, cyHeight, BlendFunc, 0); - } - else if (DoFlickerFree) - { - NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, - cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); - } - - Ret = TRUE; - -cleanup: - if (DoFlickerFree || bAlpha) - { - if (hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp); - if (hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush); - if (hbmOff) GreDeleteObject(hbmOff); - if (hdcOff) NtGdiDeleteObjectApp(hdcOff); - } + { + IntGdiSetBkColor(hDc, iOldBkColor); + IntGdiSetTextColor(hDc, iOldTxtColor); + } + + Ret = TRUE ; + +Cleanup: + NtGdiDeleteObjectApp(hMemDC); + if(hOldOffBmp) NtGdiSelectBitmap(hOffDC, hOldOffBmp); + if(hOffDC) NtGdiDeleteObjectApp(hOffDC); + if(hOffBmp) NtGdiDeleteObjectApp(hOffBmp); return Ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun May 9 13:35:36 2010 @@ -151,15 +151,9 @@ NULL); /* Set palette */ psurf = SURFACE_LockSurface(Bmp); - if(!psurf) - { - DPRINT1("Could not lock surface?\n"); - } - else - { - psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); - SURFACE_UnlockSurface(psurf); - } + ASSERT(psurf); + psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + SURFACE_UnlockSurface(psurf); } else { @@ -190,6 +184,15 @@ dibs.dsBm.bmPlanes, dibs.dsBm.bmBitsPixel, NULL); + /* Assign palette */ + if(Bmp && psurf->ppal) + { + PSURFACE psurfBmp = SURFACE_LockSurface(Bmp); + ASSERT(psurfBmp); + psurfBmp->ppal = psurf->ppal; + GDIOBJ_IncrementShareCount((POBJ)psurf->ppal); + SURFACE_UnlockSurface(psurfBmp); + } } else { @@ -890,6 +893,14 @@ IntSetBitmapBits(resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); ExFreePoolWithTag(buf,TAG_BITMAP); resBitmap->flFlags = Bitmap->flFlags; + /* Copy palette */ + if(Bitmap->hDIBPalette) + resBitmap->ppal = PALETTE_ShareLockPalette(Bitmap->hDIBPalette); + else if (Bitmap->ppal) + { + resBitmap->ppal = Bitmap->ppal ; + GDIOBJ_IncrementShareCount(&Bitmap->ppal->BaseObject); + } GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); } else Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun May 9 13:35:36 2010 @@ -1473,17 +1473,22 @@ switch (bi->biBitCount) { case 15: + dsBitfields[0] = 0x7c00; + dsBitfields[1] = 0x03e0; + dsBitfields[2] = 0x001f; + break; + case 16: - dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; - dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; - dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; + dsBitfields[0] = 0xF800; + dsBitfields[1] = 0x07e0; + dsBitfields[2] = 0x001f; break; case 24: case 32: - dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; - dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x00ff00; - dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x0000ff; + dsBitfields[0] = 0xff0000; + dsBitfields[1] = 0x00ff00; + dsBitfields[2] = 0x0000ff; break; } } @@ -1741,13 +1746,20 @@ GreenMask = ((ULONG *)bmi->bmiColors)[1]; BlueMask = ((ULONG *)bmi->bmiColors)[2]; } - else if (bits < 24) + else if (bits == 15) { *paletteType = PAL_BITFIELDS; RedMask = 0x7c00; GreenMask = 0x03e0; BlueMask = 0x001f; } + else if (bits == 16) + { + *paletteType = PAL_BITFIELDS; + RedMask = 0xF800; + GreenMask = 0x07e0; + BlueMask = 0x001f; + } else { *paletteType = PAL_BGR;

1 0

[cgutman] 47139: [USBDRIVER] - Register the device with the device manager only after it has been successfully allocated to avoid a crash - A device that failed in xhci_alloc would never get deregistered from the device manager so it would crash when it entered xhci_start with a partially set up device extension - Define release_adapter to HalPutDmaAdapter to fix a DMA adapter leak [HAL] - Export HalPutDmaAdapter
by cgutman＠svn.reactos.org 09 May '10

09 May '10

Author: cgutman Date: Sun May 9 13:18:16 2010 New Revision: 47139 URL: http://svn.reactos.org/svn/reactos?rev=47139&view=rev Log: [USBDRIVER] - Register the device with the device manager only after it has been successfully allocated to avoid a crash - A device that failed in xhci_alloc would never get deregistered from the device manager so it would crash when it entered xhci_start with a partially set up device extension - Define release_adapter to HalPutDmaAdapter to fix a DMA adapter leak [HAL] - Export HalPutDmaAdapter Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/hal/hal.pspec Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Sun May 9 13:18:16 2010 @@ -58,15 +58,7 @@ #define endp_mult_count( endp ) ( ( ( endp->pusb_endp_desc->wMaxPacketSize & 0x1800 ) >> 11 ) + 1 ) -#if 0 -/* WTF?! */ -#define release_adapter( padapTER ) \ -{\ - ( ( padapTER ) ); \ -} -#else -#define release_adapter( padapTER ) (void)(padapTER) -#endif +#define release_adapter( padapTER ) HalPutDmaAdapter(padapTER) #define get_int_idx( _urb, _idx ) \ {\ @@ -3538,6 +3530,7 @@ CM_PARTIAL_RESOURCE_DESCRIPTOR *pprd; PCI_SLOT_NUMBER slot_num; NTSTATUS status; + UCHAR hcd_id; pdev = ehci_create_device(drvr_obj, dev_mgr); @@ -3704,6 +3697,13 @@ return NULL; } + //register with dev_mgr + ehci_init_hcd_interface(pdev_ext->ehci); + hcd_id = dev_mgr_register_hcd(dev_mgr, &pdev_ext->ehci->hcd_interf); + + pdev_ext->ehci->hcd_interf.hcd_set_id(&pdev_ext->ehci->hcd_interf, hcd_id); + pdev_ext->ehci->hcd_interf.hcd_set_dev_mgr(&pdev_ext->ehci->hcd_interf, dev_mgr); + return pdev; } @@ -3719,7 +3719,6 @@ STRING string, another_string; CHAR str_dev_name[64], str_symb_name[64]; - UCHAR hcd_id; if (drvr_obj == NULL) return NULL; @@ -3768,13 +3767,6 @@ RtlFreeUnicodeString(&dev_name); RtlFreeUnicodeString(&symb_name); - - //register with dev_mgr though it is not initilized - ehci_init_hcd_interface(pdev_ext->ehci); - hcd_id = dev_mgr_register_hcd(dev_mgr, &pdev_ext->ehci->hcd_interf); - - pdev_ext->ehci->hcd_interf.hcd_set_id(&pdev_ext->ehci->hcd_interf, hcd_id); - pdev_ext->ehci->hcd_interf.hcd_set_dev_mgr(&pdev_ext->ehci->hcd_interf, dev_mgr); return pdev; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Sun May 9 13:18:16 2010 @@ -65,15 +65,8 @@ : enDP->pusb_endp_desc->wMaxPacketSize ) -#if 0 -/* WTF?! */ -#define release_adapter( padapTER ) \ -{\ - ( ( padapTER ) ); \ -} -#else -#define release_adapter( padapTER ) (void)(padapTER) -#endif +#define release_adapter( padapTER ) HalPutDmaAdapter(padapTER) + #define get_int_idx( _urb, _idx ) \ {\ @@ -413,7 +406,6 @@ STRING string, another_string; CHAR str_dev_name[64], str_symb_name[64]; - UCHAR hcd_id; if (drvr_obj == NULL) return NULL; @@ -463,12 +455,6 @@ RtlFreeUnicodeString(&dev_name); RtlFreeUnicodeString(&symb_name); - //register with dev_mgr though it is not initilized - uhci_init_hcd_interface(pdev_ext->uhci); - hcd_id = dev_mgr_register_hcd(dev_mgr, &pdev_ext->uhci->hcd_interf); - - pdev_ext->uhci->hcd_interf.hcd_set_id(&pdev_ext->uhci->hcd_interf, hcd_id); - pdev_ext->uhci->hcd_interf.hcd_set_dev_mgr(&pdev_ext->uhci->hcd_interf, dev_mgr); return pdev; } @@ -695,6 +681,7 @@ CM_PARTIAL_RESOURCE_DESCRIPTOR *pprd; PCI_SLOT_NUMBER slot_num; NTSTATUS status; + UCHAR hcd_id; pdev = uhci_create_device(drvr_obj, dev_mgr); @@ -859,6 +846,13 @@ uhci_release(pdev); return NULL; } + + //register with dev_mgr + uhci_init_hcd_interface(pdev_ext->uhci); + hcd_id = dev_mgr_register_hcd(dev_mgr, &pdev_ext->uhci->hcd_interf); + + pdev_ext->uhci->hcd_interf.hcd_set_id(&pdev_ext->uhci->hcd_interf, hcd_id); + pdev_ext->uhci->hcd_interf.hcd_set_dev_mgr(&pdev_ext->uhci->hcd_interf, dev_mgr); return pdev; } Modified: trunk/reactos/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.pspec?rev=47139&r1… ============================================================================== --- trunk/reactos/hal/hal.pspec [iso-8859-1] (original) +++ trunk/reactos/hal/hal.pspec [iso-8859-1] Sun May 9 13:18:16 2010 @@ -51,6 +51,7 @@ @ stdcall HalInitializeProcessor(long ptr) @ stdcall HalMakeBeep(long) @ stdcall HalProcessorIdle() +@ stdcall HalPutDmaAdapter(ptr) @ stdcall HalQueryDisplayParameters(ptr ptr ptr ptr) @ stdcall HalQueryRealTimeClock(ptr) @ stdcall HalReadDmaCounter(ptr)

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