Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[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

[gschneider] 47138: [WIN32K] - Check the supplied scancode instead of the state buffer whether a key is up - Fixes the calculator keyboard input regression introduced with r35117 - Ref: http://www.osronline.com/ddkx/w98ddk/keycnt_4ilz.htm and wine implementation See issue #3727 for more details.
by gschneider＠svn.reactos.org 08 May '10

08 May '10

Author: gschneider Date: Sun May 9 00:26:48 2010 New Revision: 47138 URL: http://svn.reactos.org/svn/reactos?rev=47138&view=rev Log: [WIN32K] - Check the supplied scancode instead of the state buffer whether a key is up - Fixes the calculator keyboard input regression introduced with r35117 - Ref: http://www.osronline.com/ddkx/w98ddk/keycnt_4ilz.htm and wine implementation See issue #3727 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun May 9 00:26:48 2010 @@ -42,7 +42,9 @@ /* Key States */ #define KS_DOWN_MASK 0xc0 #define KS_DOWN_BIT 0x80 -#define KS_LOCK_BIT 0x01 +#define KS_LOCK_BIT 0x01 +/* Scan Codes */ +#define SC_KEY_UP 0x8000 /* lParam bits */ #define LP_EXT_BIT (1<<24) /* From kbdxx.c -- Key changes with numlock */ @@ -720,6 +722,11 @@ DPRINT("Enter NtUserSetKeyboardState\n"); UserEnterShared();//fixme: this syscall doesnt seem to need any locking... + /* Key up? */ + if (wScanCode & SC_KEY_UP) + { + RETURN(0); + } if( !NT_SUCCESS(MmCopyFromCaller(KeyStateBuf, lpKeyState, @@ -729,8 +736,8 @@ RETURN(0); } - /* Virtual code is correct and key is pressed currently? */ - if (wVirtKey < 0x100 && KeyStateBuf[wVirtKey] & KS_DOWN_BIT) + /* Virtual code is correct? */ + if (wVirtKey < 0x100) { OutPwszBuff = ExAllocatePoolWithTag(NonPagedPool,sizeof(WCHAR) * cchBuff, TAG_STRING); if( !OutPwszBuff ) @@ -752,8 +759,6 @@ MmCopyToCaller(pwszBuff,OutPwszBuff,sizeof(WCHAR)*cchBuff); ExFreePoolWithTag(OutPwszBuff, TAG_STRING); } - else - ret = 0; RETURN(ret);

1 0

[jgardou] 47137: [WIN32K] - attach devinfo->hpalDefault to the pdevobj after enabling it - attach this palette to surfaces attached to this pdevobj through EngModifySurface - use this palette in several place Partially fixes icon drawing after mode switch
by jgardou＠svn.reactos.org 08 May '10

08 May '10

Author: jgardou Date: Sun May 9 00:10:41 2010 New Revision: 47137 URL: http://svn.reactos.org/svn/reactos?rev=47137&view=rev Log: [WIN32K] - attach devinfo->hpalDefault to the pdevobj after enabling it - attach this palette to surfaces attached to this pdevobj through EngModifySurface - use this palette in several place Partially fixes icon drawing after mode switch Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -18,8 +18,6 @@ NTAPI EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) { - HPALETTE hpal = NULL; - ASSERT(pebo); ASSERT(pbrush); ASSERT(pdc); @@ -35,12 +33,20 @@ pebo->crCurrentText = pdc->pdcattr->crForegroundClr; pebo->psurfTrg = pdc->dclevel.pSurface; -// ASSERT(pebo->psurfTrg); // FIXME: some dcs don't have a surface - - if (pebo->psurfTrg) - hpal = pebo->psurfTrg->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; - pebo->ppalSurf = PALETTE_ShareLockPalette(hpal); + ASSERT(pebo->psurfTrg); + + if (pebo->psurfTrg->hDIBPalette) + { + pebo->ppalSurf = PALETTE_ShareLockPalette(pebo->psurfTrg->hDIBPalette); + } + else if (pebo->psurfTrg->ppal) + { + pebo->ppalSurf = pebo->psurfTrg->ppal; + GDIOBJ_IncrementShareCount(&pebo->ppalSurf->BaseObject); + } + else + pebo->ppalSurf = PALETTE_ShareLockPalette(pdc->ppdev->devinfo.hpalDefault); + if (!pebo->ppalSurf) pebo->ppalSurf = &gpalRGB; Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -63,6 +63,12 @@ /* Release the surface and let the driver free it */ SURFACE_ShareUnlockSurface(ppdev->pSurface); ppdev->pfn.DisableSurface(ppdev->dhpdev); + } + + /* Do we have a palette? */ + if(ppdev->ppalSurf) + { + PALETTE_ShareUnlockPalette(ppdev->ppalSurf); } /* Disable PDEV */ @@ -132,6 +138,10 @@ if (ppdev->gdiinfo.ulLogPixelsY == 0) ppdev->gdiinfo.ulLogPixelsY = 96; + + /* Setup Palette */ + GDIOBJ_SetOwnership(ppdev->devinfo.hpalDefault, NULL); + ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); DPRINT1("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -134,6 +134,12 @@ { GreDeleteObject(psurf->hDIBPalette); } + } + + /* Free palette */ + if(psurf->ppal) + { + PALETTE_ShareUnlockPalette(psurf->ppal); } return TRUE; @@ -731,6 +737,9 @@ /* Hook up specified functions */ psurf->flHooks = flHooks; + /* Get palette */ + psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + SURFACE_UnlockSurface(psurf); return TRUE; @@ -773,6 +782,9 @@ /* Hook up specified functions */ psurf->flHooks = flHooks; + /* Get palette */ + psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); + SURFACE_UnlockSurface(psurf); return TRUE; Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -603,7 +603,6 @@ PDC pdcDst) { PSURFACE psurfDst, psurfSrc; - HPALETTE hpalSrc, hpalDst; PPALETTE ppalSrc, ppalDst, ppalDstDc; DPRINT("Enter EXLATEOBJ_vInitXlateFromDCs\n"); @@ -619,18 +618,33 @@ return; } - hpalSrc = psurfSrc->hDIBPalette; - if (!hpalSrc) - hpalSrc = pPrimarySurface->devinfo.hpalDefault; - - ppalSrc = PALETTE_ShareLockPalette(hpalSrc); - if (!ppalSrc) + if (psurfSrc->hDIBPalette) + { + ppalSrc = PALETTE_ShareLockPalette(psurfSrc->hDIBPalette); + } + else if (psurfSrc->ppal) + { + ppalSrc = psurfSrc->ppal; + GDIOBJ_IncrementShareCount(&ppalSrc->BaseObject); + } + else + ppalSrc = PALETTE_ShareLockPalette(pdcSrc->ppdev->devinfo.hpalDefault); + + if(!ppalSrc) return; - hpalDst = psurfDst->hDIBPalette; - if (!hpalDst) hpalDst = pPrimarySurface->devinfo.hpalDefault; - - ppalDst = PALETTE_ShareLockPalette(hpalDst); + if (psurfDst->hDIBPalette) + { + ppalDst = PALETTE_ShareLockPalette(psurfDst->hDIBPalette); + } + else if (psurfDst->ppal) + { + ppalDst = psurfDst->ppal; + GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); + } + else + ppalDst = PALETTE_ShareLockPalette(pdcDst->ppdev->devinfo.hpalDefault); + if (!ppalDst) { PALETTE_ShareUnlockPalette(ppalSrc); @@ -683,7 +697,6 @@ COLORREF crForegroundClr, COLORREF crBackgroundClr) { - HPALETTE hpalDst = NULL; PPALETTE ppalDst, ppalPattern; SURFACE *psurfPattern; @@ -694,9 +707,18 @@ EXLATEOBJ_vInitTrivial(pexlo); - hpalDst = psurfDst->hDIBPalette; - if (!hpalDst) hpalDst = pPrimarySurface->devinfo.hpalDefault; - ppalDst = PALETTE_ShareLockPalette(hpalDst); + if (psurfDst->hDIBPalette) + { + ppalDst = PALETTE_ShareLockPalette(psurfDst->hDIBPalette); + } + else if (psurfDst->ppal) + { + ppalDst = psurfDst->ppal; + GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); + } + else + ppalDst = PALETTE_ShareLockPalette(pPrimarySurface->devinfo.hpalDefault); + if (!ppalDst) { DPRINT1("No ppalDst!\n"); Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Sun May 9 00:10:41 2010 @@ -116,7 +116,7 @@ // ULONG TagSig; struct _LDEVOBJ * pldev; DHPDEV dhpdev; /* DHPDEV for device. */ - PVOID ppalSurf; /* PEPALOBJ/PPALETTE for this device. */ + struct _PALETTE* ppalSurf; /* PEPALOBJ/PPALETTE for this device. */ DEVINFO devinfo; GDIINFO gdiinfo; PSURFACE pSurface; /* SURFACE for this device. */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -328,9 +328,7 @@ PGDIOBJ apObj[2]; RECTL rcDest, rcSrc; SURFACE *BitmapDest, *BitmapSrc = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PPALETTE PalDestGDI, PalSourceGDI; - USHORT PalDestMode, PalSrcMode; + PPALETTE PalSourceGDI; ULONG TransparentColor = 0; BOOL Ret = FALSE; EXLATEOBJ exlo; @@ -396,42 +394,29 @@ goto done; } - DestPalette = BitmapDest->hDIBPalette; - if (!DestPalette) DestPalette = pPrimarySurface->devinfo.hpalDefault; - - SourcePalette = BitmapSrc->hDIBPalette; - if (!SourcePalette) SourcePalette = pPrimarySurface->devinfo.hpalDefault; - - if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) + if (BitmapSrc->hDIBPalette) + PalSourceGDI = PALETTE_ShareLockPalette(BitmapSrc->hDIBPalette); + else if (BitmapSrc->ppal) + { + GDIOBJ_IncrementShareCount(&BitmapSrc->ppal->BaseObject); + PalSourceGDI = BitmapSrc->ppal ; + } + else + PalSourceGDI = PALETTE_ShareLockPalette(pPrimarySurface->devinfo.hpalDefault) ; + + if(!PalSourceGDI) { SetLastWin32Error(ERROR_INVALID_HANDLE); goto done; - } - PalSrcMode = PalSourceGDI->Mode; - PALETTE_UnlockPalette(PalSourceGDI); - - if(DestPalette != SourcePalette) - { - if (!(PalDestGDI = PALETTE_LockPalette(DestPalette))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - goto done; - } - PalDestMode = PalDestGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - } - else - { - PalDestMode = PalSrcMode; - PalDestGDI = PalSourceGDI; } /* Translate Transparent (RGB) Color to the source palette */ EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalSourceGDI, 0, 0, 0); TransparentColor = XLATEOBJ_iXlate(&exlo.xlo, (ULONG)TransColor); EXLATEOBJ_vCleanup(&exlo); - - EXLATEOBJ_vInitialize(&exlo, PalSourceGDI, PalDestGDI, 0, 0, 0); + PALETTE_ShareUnlockPalette(PalSourceGDI); + + EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, DCDest->rosdc.CombinedClip, &exlo.xlo, &rcDest, &rcSrc, 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 00:10:41 2010 @@ -143,11 +143,23 @@ { if (Dc->dctype != DC_TYPE_MEMORY) { + PSURFACE psurf; Bmp = IntGdiCreateBitmap(abs(Width), abs(Height), Dc->ppdev->gdiinfo.cPlanes, Dc->ppdev->gdiinfo.cBitsPixel, 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); + } } else { @@ -334,7 +346,6 @@ BOOL bInRect = FALSE; SURFACE *psurf; SURFOBJ *pso; - HPALETTE hpal = 0; PPALETTE ppal; EXLATEOBJ exlo; HBITMAP hBmpTmp; @@ -362,9 +373,15 @@ if (psurf) { pso = &psurf->SurfObj; - hpal = psurf->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; - ppal = PALETTE_ShareLockPalette(hpal); + if(psurf->hDIBPalette) + ppal = PALETTE_ShareLockPalette(psurf->hDIBPalette); + else if (psurf->ppal) + { + ppal = psurf->ppal; + GDIOBJ_IncrementShareCount(&ppal->BaseObject); + } + else + ppal = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); if (psurf->SurfObj.iBitmapFormat == BMF_1BPP && !psurf->hSecure) { 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 00:10:41 2010 @@ -230,7 +230,7 @@ EXLATEOBJ exlo; PPALETTE ppalDDB, ppalDIB; //RGBQUAD *lpRGB; - HPALETTE DDB_Palette, DIB_Palette; + HPALETTE DIB_Palette; ULONG DIB_Palette_Type; INT DIBWidth; @@ -279,15 +279,17 @@ // Use hDIBPalette if it exists if (bitmap->hDIBPalette) { - DDB_Palette = bitmap->hDIBPalette; + ppalDDB = PALETTE_ShareLockPalette(bitmap->hDIBPalette); + } + else if (bitmap->ppal) + { + ppalDDB = bitmap->ppal; + GDIOBJ_IncrementShareCount(&ppalDDB->BaseObject); } else - { // Destination palette obtained from the hDC - DDB_Palette = DC->ppdev->devinfo.hpalDefault; - } - - ppalDDB = PALETTE_LockPalette(DDB_Palette); + ppalDDB = PALETTE_ShareLockPalette(DC->ppdev->devinfo.hpalDefault); + if (NULL == ppalDDB) { EngUnlockSurface(SourceSurf); @@ -304,6 +306,7 @@ EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); SURFACE_UnlockSurface(bitmap); + PALETTE_ShareUnlockPalette(ppalDDB); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return 0; } @@ -336,7 +339,7 @@ // Clean up EXLATEOBJ_vCleanup(&exlo); PALETTE_UnlockPalette(ppalDIB); - PALETTE_UnlockPalette(ppalDDB); + PALETTE_ShareUnlockPalette(ppalDDB); PALETTE_FreePaletteByHandle(DIB_Palette); EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); @@ -441,7 +444,7 @@ SIZEL SourceSize; EXLATEOBJ exlo; PPALETTE ppalDDB = NULL, ppalDIB = NULL; - HPALETTE hpalDDB, hpalDIB = NULL; + HPALETTE hpalDIB = NULL; ULONG DIBPaletteType; if (!Bits) return 0; @@ -474,15 +477,7 @@ return 0; } - /* Use destination palette obtained from the DC by default */ - hpalDDB = pDC->ppdev->devinfo.hpalDefault; - - /* Try to use hDIBPalette if it exists */ pSurf = pDC->dclevel.pSurface; - if (pSurf && pSurf->hDIBPalette) - { - hpalDDB = pSurf->hDIBPalette; - } pDestSurf = pSurf ? &pSurf->SurfObj : NULL; @@ -528,7 +523,18 @@ } /* Obtain destination palette */ - ppalDDB = PALETTE_LockPalette(hpalDDB); + if (pSurf && pSurf->hDIBPalette) + { + ppalDDB = PALETTE_ShareLockPalette(pSurf->hDIBPalette); + } + else if (pSurf && pSurf->ppal) + { + ppalDDB = pSurf->ppal; + GDIOBJ_IncrementShareCount(&ppalDDB->BaseObject); + } + else + ppalDDB = PALETTE_ShareLockPalette(pDC->ppdev->devinfo.hpalDefault); + if (!ppalDDB) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -547,7 +553,7 @@ /* Lock the DIB palette */ ppalDIB = PALETTE_LockPalette(hpalDIB); - if (!ppalDDB) + if (!ppalDIB) { SetLastWin32Error(ERROR_INVALID_HANDLE); Status = STATUS_UNSUCCESSFUL; @@ -558,7 +564,7 @@ EXLATEOBJ_vInitialize(&exlo, ppalDIB, ppalDDB, 0, 0, 0); /* Copy the bits */ - DPRINT("BitsToDev with dstsurf=(%d|%d) (%d|%d), src=(%d|%d) w=%d h=%d\n", + DPRINT("BitsToDev with dstsurf=(%d|%d) (%d|%d), src=(%d|%d) w=%d h=%d\n", rcDest.left, rcDest.top, rcDest.right, rcDest.bottom, ptSource.x, ptSource.y, SourceSize.cx, SourceSize.cy); Status = IntEngBitBlt(pDestSurf, @@ -583,7 +589,7 @@ } if (ppalDIB) PALETTE_UnlockPalette(ppalDIB); - if (ppalDDB) PALETTE_UnlockPalette(ppalDDB); + if (ppalDDB) PALETTE_ShareUnlockPalette(ppalDDB); if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); @@ -611,7 +617,6 @@ PDC Dc; SURFACE *psurf = NULL; HBITMAP hDestBitmap = NULL; - HPALETTE hSourcePalette = NULL; HPALETTE hDestPalette = NULL; PPALETTE ppalSrc = NULL; PPALETTE ppalDst = NULL; @@ -636,7 +641,7 @@ _SEH2_TRY { ProbeForRead(&Info->bmiHeader.biSize, sizeof(DWORD), 1); - + ProbeForWrite(Info, Info->bmiHeader.biSize, 1); // Comp for Core. if (ChkBits) ProbeForWrite(ChkBits, MaxBits, 1); } @@ -658,18 +663,30 @@ DC_UnlockDc(Dc); return 0; } - DC_UnlockDc(Dc); /* Get a pointer to the source bitmap object */ psurf = SURFACE_LockSurface(hBitmap); if (psurf == NULL) - return 0; - - hSourcePalette = psurf->hDIBPalette; - if (!hSourcePalette) - { - hSourcePalette = pPrimarySurface->devinfo.hpalDefault; - } + { + DC_UnlockDc(Dc); + return 0; + } + + if (psurf->hDIBPalette) + { + ppalSrc = PALETTE_ShareLockPalette(psurf->hDIBPalette); + } + else if (psurf->ppal) + { + ppalSrc = psurf->ppal; + GDIOBJ_IncrementShareCount(&ppalSrc->BaseObject); + } + else + ppalSrc = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + + DC_UnlockDc(Dc); + + ASSERT(ppalSrc != NULL); ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize); rgbQuads = (RGBQUAD *)ColorPtr; @@ -680,15 +697,11 @@ Info->bmiHeader.biBitCount != 15 && Info->bmiHeader.biBitCount != 16) || !ChkBits) { - hDestPalette = hSourcePalette; + ppalDst = ppalSrc; bPaletteMatch = TRUE; } else hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; - - ppalSrc = PALETTE_LockPalette(hSourcePalette); - /* FIXME - ppalSrc can be NULL!!! Don't assert here! */ - ASSERT(ppalSrc); if (!bPaletteMatch) { @@ -696,10 +709,6 @@ /* FIXME - ppalDst can be NULL!!!! Don't assert here!!! */ DPRINT("ppalDst : %p\n", ppalDst); ASSERT(ppalDst); - } - else - { - ppalDst = ppalSrc; } /* Copy palette. */ @@ -970,7 +979,7 @@ } } cleanup: - PALETTE_UnlockPalette(ppalSrc); + PALETTE_ShareUnlockPalette(ppalSrc); if (hDestBitmap != NULL) EngDeleteSurface((HSURF)hDestBitmap); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -872,7 +872,6 @@ POINTL DitherOrg; ULONG i; BOOL Ret; - HPALETTE hDestPalette; ASSERT(dc); ASSERT(pVertex); @@ -936,10 +935,19 @@ /* FIXME - psurf can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(psurf); - hDestPalette = psurf->hDIBPalette; - if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault; - - PalDestGDI = PALETTE_LockPalette(hDestPalette); + if (psurf->hDIBPalette) + { + PalDestGDI = PALETTE_ShareLockPalette(psurf->hDIBPalette); + } + else if (psurf->ppal) + { + PalDestGDI = psurf->ppal; + GDIOBJ_IncrementShareCount(&PalDestGDI->BaseObject); + } + else + // Destination palette obtained from the hDC + PalDestGDI = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalDestGDI, 0, 0, 0); Ret = IntEngGradientFill(&psurf->SurfObj, @@ -956,7 +964,7 @@ EXLATEOBJ_vCleanup(&exlo); if (PalDestGDI) - PALETTE_UnlockPalette(PalDestGDI); + PALETTE_ShareUnlockPalette(PalDestGDI); return Ret; } @@ -1089,7 +1097,6 @@ PDC dc; PDC_ATTR pdcattr; SURFACE *psurf = NULL; - HPALETTE hpal; PPALETTE ppal; EXLATEOBJ exlo; BOOL Ret = FALSE; @@ -1135,9 +1142,18 @@ goto cleanup; } - hpal = dc->dclevel.pSurface->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; - ppal = PALETTE_ShareLockPalette(hpal); + if (psurf->hDIBPalette) + { + ppal = PALETTE_ShareLockPalette(psurf->hDIBPalette); + } + else if (psurf->ppal) + { + ppal = psurf->ppal; + GDIOBJ_IncrementShareCount(&ppal->BaseObject); + } + else + // Destination palette obtained from the hDC + ppal = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppal, 0, 0xffffff, 0); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun May 9 00:10:41 2010 @@ -3168,7 +3168,6 @@ BOOLEAN Render; POINT Start; BOOL DoBreak = FALSE; - HPALETTE hDestPalette; PPALETTE ppalDst; USHORT DxShift; @@ -3440,14 +3439,22 @@ SurfObj = &psurf->SurfObj ; /* Create the xlateobj */ - hDestPalette = psurf->hDIBPalette; - if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault; - //if (!hDestPalette) hDestPalette = StockObjects[DEFAULT_PALETTE];//pPrimarySurface->devinfo.hpalDefault; - ppalDst = PALETTE_LockPalette(hDestPalette); + if (psurf->hDIBPalette) + { + ppalDst = PALETTE_ShareLockPalette(psurf->hDIBPalette); + } + else if (psurf->ppal) + { + ppalDst = psurf->ppal; + GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); + } + else + // Destination palette obtained from the hDC + ppalDst = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); ASSERT(ppalDst); EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, ppalDst, 0, 0, 0); EXLATEOBJ_vInitialize(&exloDst2RGB, ppalDst, &gpalRGB, 0, 0, 0); - PALETTE_UnlockPalette(ppalDst); + PALETTE_ShareUnlockPalette(ppalDst); if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ;

1 0

[cgutman] 47136: [USBDRIVER] - Fix an off-by-one error in the probing code - Scan all PCI buses instead of just the first two - Fix a horrible bug that resulted in reinitializing EHCI controllers as UHCI controllers which caused a crash on VirtualBox (with _MULTI_UHCI) - Implement support for multiple EHCI controllers and enable support for multiple UHCI controllers (greatly increases compatibility with real hardware because the first controller detected is often internal)
by cgutman＠svn.reactos.org 08 May '10

08 May '10

Author: cgutman Date: Sat May 8 23:53:57 2010 New Revision: 47136 URL: http://svn.reactos.org/svn/reactos?rev=47136&view=rev Log: [USBDRIVER] - Fix an off-by-one error in the probing code - Scan all PCI buses instead of just the first two - Fix a horrible bug that resulted in reinitializing EHCI controllers as UHCI controllers which caused a crash on VirtualBox (with _MULTI_UHCI) - Implement support for multiple EHCI controllers and enable support for multiple UHCI controllers (greatly increases compatibility with real hardware because the first controller detected is often internal) Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild 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] Sat May 8 23:53:57 2010 @@ -3461,18 +3461,19 @@ PDEVICE_OBJECT pdev; BYTE buffer[sizeof(PCI_COMMON_CONFIG)]; PEHCI_DEVICE_EXTENSION pdev_ext; + LONG count = 0; slot_num.u.AsULONG = 0; pci_config = (PPCI_COMMON_CONFIG) buffer; pdev = NULL; - //scan the bus to find ehci controller - for(bus = 0; bus < 3; bus++) /* enum bus0-bus2 */ - { - for(i = 0; i < PCI_MAX_DEVICES; i++) + //scan the PCI buses to find ehci controller + for (bus = 0; bus <= PCI_MAX_BRIDGE_NUMBER; bus++) //Yes, it should be <= + { + for(i = 0; i <= PCI_MAX_DEVICES; i++) { slot_num.u.bits.DeviceNumber = i; - for(j = 0; j < PCI_MAX_FUNCTIONS; j++) + for(j = 0; j <= PCI_MAX_FUNCTION; j++) { slot_num.u.bits.FunctionNumber = j; @@ -3490,9 +3491,12 @@ { //well, we find our usb host controller( EHCI ), create device pdev = ehci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr); - - if (!pdev) - continue; + if (pdev) +#ifdef _MULTI_EHCI + count++; +#else + goto LBL_LOOPOUT; +#endif } } @@ -3500,6 +3504,11 @@ break; } } + +#ifndef _MULTI_EHCI +LBL_LOOPOUT: +#endif + DbgPrint("Found %d EHCI controllers\n", count); if (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] Sat May 8 23:53:57 2010 @@ -626,13 +626,13 @@ count = 0; pdev = NULL; - //scan the bus to find uhci controller - for(bus = 0; bus < 3; bus++) /* enum bus0-bus2 */ - { - for(i = 0; i < PCI_MAX_DEVICES; i++) + //scan the PCI buses to find uhci controller + for (bus = 0; bus <= PCI_MAX_BRIDGE_NUMBER; bus++) + { + for(i = 0; i <= PCI_MAX_DEVICES; i++) { slot_num.u.bits.DeviceNumber = i; - for(j = 0; j < PCI_MAX_FUNCTIONS; j++) + for(j = 0; j <= PCI_MAX_FUNCTION; j++) { slot_num.u.bits.FunctionNumber = j; @@ -645,18 +645,15 @@ if (ret == 2) /*no device on the slot */ break; - if (pci_config->BaseClass == 0x0c && pci_config->SubClass == 0x03) + if (pci_config->BaseClass == 0x0c && pci_config->SubClass == 0x03 && + pci_config->ProgIf == 0x00) { // well, we find our usb host controller, create device -#ifdef _MULTI_UHCI - { - pdev = uhci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr); - if (pdev) - count++; - } -#else pdev = uhci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr); if (pdev) +#ifdef _MULTI_UHCI + count++; +#else goto LBL_LOOPOUT; #endif } @@ -669,6 +666,8 @@ #ifndef _MULTI_UHCI LBL_LOOPOUT: #endif + DbgPrint("Found %d UHCI controllers\n", count); + if (pdev) { pdev_ext = pdev->DeviceExtension; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [iso-8859-1] Sat May 8 23:53:57 2010 @@ -2,6 +2,8 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="usbdriver" type="kernelmodedriver" installbase="system32/drivers" installname="usbdriver.sys"> <define name="INCLUDE_EHCI" /> + <define name="_MULTI_UHCI" /> + <define name="_MULTI_EHCI" /> <define name="_X86" /> <include base="usbdriver">.</include> <library>ntoskrnl</library>

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010