Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 39942: - fix the bitmap and memdc issue for menu items (popup arrow, check and radio symbols)
by mkupfer＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: mkupfer Date: Wed Mar 11 02:48:21 2009 New Revision: 39942 URL: http://svn.reactos.org/svn/reactos?rev=39942&view=rev Log: - fix the bitmap and memdc issue for menu items (popup arrow, check and radio symbols) Modified: trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Wed Mar 11 02:48:21 2009 @@ -1048,8 +1048,6 @@ { LOGFONT lf; HFONT hFont, hOldFont; - COLORREF clrsave; - INT bkmode; TCHAR Symbol; switch(uFlags & 0xff) { @@ -1079,20 +1077,12 @@ lf.lfCharSet = DEFAULT_CHARSET; lstrcpy(lf.lfFaceName, TEXT("Marlett")); hFont = CreateFontIndirect(&lf); - /* save font and text color */ + /* save font */ hOldFont = SelectObject(dc, hFont); - clrsave = GetTextColor(dc); - bkmode = GetBkMode(dc); - /* set color and drawing mode */ - SetBkMode(dc, TRANSPARENT); - SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH)); /* draw selected symbol */ TextOut(dc, r->left, r->top, &Symbol, 1); /* restore previous settings */ - SetTextColor(dc, clrsave); SelectObject(dc, hOldFont); - SetBkMode(dc, bkmode); DeleteObject(hFont); return TRUE; } Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Mar 11 02:48:21 2009 @@ -605,22 +605,10 @@ /* Draw the popup-menu arrow */ if (0 != (Item->fType & MF_POPUP)) { - INT y = Rect.top + Rect.bottom; - UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); - UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK); - RECT r; - HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); - HDC DcMem = CreateCompatibleDC(Dc); - SelectObject(DcMem, bm); - SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); - DrawFrameControl(DcMem, &r, DFC_MENU, DFCS_MENUARROW); - BitBlt(Dc, Rect.right - CheckBitmapWidth, (y - r.bottom) / 2, r.right, r.bottom, DcMem, 0, 0, SRCCOPY ); - DeleteDC(DcMem); - DeleteObject(bm); - /* - SetRect(&r,Rect.right - CheckBitmapWidth, (y - CheckBitmapHeight) / 2, Rect.right, Rect.bottom); - DrawFrameControl(Dc, &r, DFC_MENU, DFCS_MENUARROW); - */ + RECT rectTemp; + CopyRect(&rectTemp, &Rect); + rectTemp.left = rectTemp.right - GetSystemMetrics(SM_CXMENUCHECK); + DrawFrameControl(Dc, &rectTemp, DFC_MENU, DFCS_MENUARROW); } return; } @@ -736,18 +724,12 @@ } else if (0 != (Item->fState & MF_CHECKED)) /* standard bitmaps */ { - RECT r; - HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); - HDC DcMem = CreateCompatibleDC(Dc); - SelectObject(DcMem, bm); - SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); - DrawFrameControl(DcMem, &r, DFC_MENU, + RECT rectTemp; + CopyRect(&rectTemp, &Rect); + rectTemp.right = rectTemp.left + GetSystemMetrics(SM_CXMENUCHECK); + DrawFrameControl(Dc, &rectTemp, DFC_MENU, 0 != (Item->fType & MFT_RADIOCHECK) ? DFCS_MENUBULLET : DFCS_MENUCHECK); - BitBlt(Dc, Rc.left, (y - r.bottom) / 2, r.right, r.bottom, - DcMem, 0, 0, SRCCOPY ); - DeleteDC(DcMem); - DeleteObject(bm); checked = TRUE; } } @@ -758,19 +740,10 @@ /* Draw the popup-menu arrow */ if (0 != (Item->fType & MF_POPUP)) { - RECT r; - HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); - HDC DcMem = CreateCompatibleDC(Dc); - SelectObject(DcMem, bm); - SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); - DrawFrameControl(DcMem, &r, DFC_MENU, DFCS_MENUARROW); - BitBlt(Dc, Rect.right - CheckBitmapWidth, (y - r.bottom) / 2, r.right, r.bottom, DcMem, 0, 0, SRCCOPY ); - DeleteDC(DcMem); - DeleteObject(bm); - /* - SetRect(&r,Rect.right - CheckBitmapWidth, (y - CheckBitmapHeight) / 2, Rect.right, Rect.bottom); - DrawFrameControl(Dc, &r, DFC_MENU, DFCS_MENUARROW); - */ + RECT rectTemp; + CopyRect(&rectTemp, &Rect); + rectTemp.left = rectTemp.right - GetSystemMetrics(SM_CXMENUCHECK); + DrawFrameControl(Dc, &rectTemp, DFC_MENU, DFCS_MENUARROW); } Rect.left += 4; if( !(MenuInfo->dwStyle & MNS_NOCHECK))

1 0

[cgutman] 39941: - Fix NdisReadNetworkAddress - This should increase compatibility with third-party NIC drivers
by cgutman＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: cgutman Date: Wed Mar 11 00:43:21 2009 New Revision: 39941 URL: http://svn.reactos.org/svn/reactos?rev=39941&view=rev Log: - Fix NdisReadNetworkAddress - This should increase compatibility with third-party NIC drivers Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] Wed Mar 11 00:43:21 2009 @@ -699,16 +699,7 @@ PNDIS_CONFIGURATION_PARAMETER ParameterValue = NULL; NDIS_STRING Keyword; UINT *IntArray = 0; - int i; - - /* FIXME - We don't quite support this yet due to buggy code below */ - { - *Status = NDIS_STATUS_FAILURE; - return; - } - - *NetworkAddress = NULL; - *NetworkAddressLength = 6;/* XXX magic constant */ + UINT i,j = 0; NdisInitUnicodeString(&Keyword, L"NetworkAddress"); NdisReadConfiguration(Status, &ParameterValue, ConfigurationHandle, &Keyword, NdisParameterString); @@ -718,8 +709,11 @@ return; } - /* 6 bytes for ethernet, tokenring, fddi, everything else? */ - IntArray = ExAllocatePool(PagedPool, 6*sizeof(UINT)); + while (ParameterValue->ParameterData.StringData.Buffer[j] != '\0') j++; + + *NetworkAddressLength = (UINT)((j/2)+0.5); + + IntArray = ExAllocatePool(PagedPool, (*NetworkAddressLength)*sizeof(UINT)); if(!IntArray) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); @@ -742,7 +736,7 @@ ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); /* convert from string to bytes */ - for(i=0; i<6; i++) + for(i=0; i<(*NetworkAddressLength); i++) { IntArray[i] = (UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i]) << 4) + UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i+1]);

1 0

[mkupfer] 39940: - due to minor differences (marletting related) combine drawing routines for check box and radio button - initial version for popup arrows, maybe someone know how to remove the bitmap and memory-dc stuff properly
by mkupfer＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: mkupfer Date: Wed Mar 11 00:39:22 2009 New Revision: 39940 URL: http://svn.reactos.org/svn/reactos?rev=39940&view=rev Log: - due to minor differences (marletting related) combine drawing routines for check box and radio button - initial version for popup arrows, maybe someone know how to remove the bitmap and memory-dc stuff properly Modified: trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Wed Mar 11 00:39:22 2009 @@ -690,18 +690,29 @@ return TRUE; } -static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags) +static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL Radio) { RECT rc; LOGFONT lf; HFONT hFont, hOldFont; int SmallDiam, i; - - LPCTSTR OutRight = TEXT("c"); // Outer right - LPCTSTR OutLeft = TEXT("d"); // Outer left - LPCTSTR InRight = TEXT("e"); // inner left - LPCTSTR InLeft = TEXT("f"); // inner right - LPCTSTR Center = TEXT("g"); // center + TCHAR OutRight, OutLeft, InRight, InLeft, Center; + + if (Radio) + { + OutRight = 'j'; // Outer right + OutLeft = 'k'; // Outer left + InRight = 'l'; // inner left + InLeft = 'm'; // inner right + Center = 'n'; // center + } else + { + OutRight = 'c'; // Outer right + OutLeft = 'd'; // Outer left + InRight = 'e'; // inner left + InLeft = 'f'; // inner right + Center = 'g'; // center + } SmallDiam = UITOOLS_MakeSquareRect(r, &rc); @@ -714,82 +725,16 @@ hFont = CreateFontIndirect(&lf); hOldFont = SelectObject(dc, hFont); - SetBkMode(dc, TRANSPARENT); - - /* Center section, white for active, grey for inactive */ - i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; - SetTextColor(dc, GetSysColor(i)); - TextOut(dc, rc.left, rc.top, Center, 1); - - if(uFlags & (DFCS_FLAT | DFCS_MONO)) - { - SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, OutRight, 1); - TextOut(dc, rc.left, rc.top, OutLeft, 1); - TextOut(dc, rc.left, rc.top, InRight, 1); - TextOut(dc, rc.left, rc.top, InLeft, 1); - } - else - { - SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); - TextOut(dc, rc.left, rc.top, OutRight, 1); - SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); - TextOut(dc, rc.left, rc.top, OutLeft, 1); - SetTextColor(dc, GetSysColor(COLOR_3DDKSHADOW)); - TextOut(dc, rc.left, rc.top, InRight, 1); - SetTextColor(dc, GetSysColor(COLOR_3DLIGHT)); - TextOut(dc, rc.left, rc.top, InLeft, 1); - } - - if(uFlags & DFCS_CHECKED) - { - LPCTSTR Check = TEXT("b"); - - SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - TextOut(dc, rc.left, rc.top, Check, 1); - } - - SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - SelectObject(dc, hOldFont); - DeleteObject(hFont); - - return TRUE; -} - -static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags) -{ - RECT rc; - LOGFONT lf; - HFONT hFont, hOldFont; - int SmallDiam, i; - - LPCTSTR OutRight = TEXT("j"); // Outer right - LPCTSTR OutLeft = TEXT("k"); // Outer left - LPCTSTR InRight = TEXT("l"); // inner left - LPCTSTR InLeft = TEXT("m"); // inner right - LPCTSTR Center = TEXT("n"); // center - - SmallDiam = UITOOLS_MakeSquareRect(r, &rc); - - ZeroMemory(&lf, sizeof(LOGFONT)); - lf.lfHeight = SmallDiam; - lf.lfWidth = 0; - lf.lfWeight = FW_NORMAL; - lf.lfCharSet = DEFAULT_CHARSET; - lstrcpy(lf.lfFaceName, TEXT("Marlett")); - hFont = CreateFontIndirect(&lf); - hOldFont = SelectObject(dc, hFont); - - if((uFlags & 0xff) == DFCS_BUTTONRADIOMASK) + if(Radio && ((uFlags & 0xff) == DFCS_BUTTONRADIOMASK)) { SetBkMode(dc, OPAQUE); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, Center, 1); + TextOut(dc, rc.left, rc.top, &Center, 1); SetBkMode(dc, TRANSPARENT); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, OutRight, 1); + TextOut(dc, rc.left, rc.top, &OutRight, 1); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, OutLeft, 1); + TextOut(dc, rc.left, rc.top, &OutLeft, 1); } else { @@ -798,35 +743,35 @@ /* Center section, white for active, grey for inactive */ i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; SetTextColor(dc, GetSysColor(i)); - TextOut(dc, rc.left, rc.top, Center, 1); + TextOut(dc, rc.left, rc.top, &Center, 1); if(uFlags & (DFCS_FLAT | DFCS_MONO)) { SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, rc.left, rc.top, OutRight, 1); - TextOut(dc, rc.left, rc.top, OutLeft, 1); - TextOut(dc, rc.left, rc.top, InRight, 1); - TextOut(dc, rc.left, rc.top, InLeft, 1); + TextOut(dc, rc.left, rc.top, &OutRight, 1); + TextOut(dc, rc.left, rc.top, &OutLeft, 1); + TextOut(dc, rc.left, rc.top, &InRight, 1); + TextOut(dc, rc.left, rc.top, &InLeft, 1); } else { SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); - TextOut(dc, rc.left, rc.top, OutRight, 1); + TextOut(dc, rc.left, rc.top, &OutRight, 1); SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); - TextOut(dc, rc.left, rc.top, OutLeft, 1); + TextOut(dc, rc.left, rc.top, &OutLeft, 1); SetTextColor(dc, GetSysColor(COLOR_3DDKSHADOW)); - TextOut(dc, rc.left, rc.top, InRight, 1); + TextOut(dc, rc.left, rc.top, &InRight, 1); SetTextColor(dc, GetSysColor(COLOR_3DLIGHT)); - TextOut(dc, rc.left, rc.top, InLeft, 1); + TextOut(dc, rc.left, rc.top, &InLeft, 1); } } if(uFlags & DFCS_CHECKED) { - LPCTSTR Check = TEXT("i"); + TCHAR Check = (Radio) ? 'i' : 'b'; SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - TextOut(dc, rc.left, rc.top, Check, 1); + TextOut(dc, rc.left, rc.top, &Check, 1); } SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); @@ -846,12 +791,12 @@ case DFCS_BUTTONCHECK: case DFCS_BUTTON3STATE: - return UITOOLS95_DFC_ButtonCheck(hdc, rc, uState); + return UITOOLS95_DFC_ButtonCheckRadio(hdc, rc, uState, FALSE); case DFCS_BUTTONRADIOIMAGE: case DFCS_BUTTONRADIOMASK: case DFCS_BUTTONRADIO: - return UITOOLS95_DFC_ButtonRadio(hdc, rc, uState); + return UITOOLS95_DFC_ButtonCheckRadio(hdc, rc, uState, TRUE); /* default: Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Mar 11 00:39:22 2009 @@ -115,9 +115,6 @@ static HWND TopPopup; /* Dimension of the menu bitmaps */ -static WORD ArrowBitmapWidth = 0, ArrowBitmapHeight = 0; - -static HBITMAP StdMnArrow = NULL; static HBITMAP BmpSysMenu = NULL; static SIZE MenuCharSize; @@ -289,20 +286,6 @@ static void FASTCALL MenuLoadBitmaps(VOID) { - /* Load menu bitmaps */ - if (NULL == StdMnArrow) - { - StdMnArrow = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_MNARROW)); - - if (NULL != StdMnArrow) - { - BITMAP bm; - GetObjectW(StdMnArrow, sizeof(BITMAP), &bm); - ArrowBitmapWidth = bm.bmWidth; - ArrowBitmapHeight = bm.bmHeight; - } - } - /* Load system buttons bitmaps */ if (NULL == BmpSysMenu) { @@ -621,18 +604,24 @@ SendMessageW(WndOwner, WM_DRAWITEM, 0, (LPARAM) &dis); /* Draw the popup-menu arrow */ if (0 != (Item->fType & MF_POPUP)) - { - HDC DcMem = CreateCompatibleDC(Dc); - HBITMAP OrigBitmap; - - OrigBitmap = SelectObject(DcMem, StdMnArrow); - BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1, - ((Rect.top + Rect.bottom) - ArrowBitmapHeight) / 2, - ArrowBitmapWidth, ArrowBitmapHeight, - DcMem, 0, 0, SRCCOPY); - SelectObject(DcMem, OrigBitmap); - DeleteDC(DcMem); - } + { + INT y = Rect.top + Rect.bottom; + UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); + UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK); + RECT r; + HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); + HDC DcMem = CreateCompatibleDC(Dc); + SelectObject(DcMem, bm); + SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); + DrawFrameControl(DcMem, &r, DFC_MENU, DFCS_MENUARROW); + BitBlt(Dc, Rect.right - CheckBitmapWidth, (y - r.bottom) / 2, r.right, r.bottom, DcMem, 0, 0, SRCCOPY ); + DeleteDC(DcMem); + DeleteObject(bm); + /* + SetRect(&r,Rect.right - CheckBitmapWidth, (y - CheckBitmapHeight) / 2, Rect.right, Rect.bottom); + DrawFrameControl(Dc, &r, DFC_MENU, DFCS_MENUARROW); + */ + } return; } @@ -769,21 +758,24 @@ /* Draw the popup-menu arrow */ if (0 != (Item->fType & MF_POPUP)) { - HDC DcMem = CreateCompatibleDC(Dc); - HBITMAP OrigBitmap; - - OrigBitmap = SelectObject(DcMem, StdMnArrow); - BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1, - (y - ArrowBitmapHeight) / 2, - ArrowBitmapWidth, ArrowBitmapHeight, - DcMem, 0, 0, SRCCOPY); - SelectObject(DcMem, OrigBitmap); - DeleteDC(DcMem); + RECT r; + HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); + HDC DcMem = CreateCompatibleDC(Dc); + SelectObject(DcMem, bm); + SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); + DrawFrameControl(DcMem, &r, DFC_MENU, DFCS_MENUARROW); + BitBlt(Dc, Rect.right - CheckBitmapWidth, (y - r.bottom) / 2, r.right, r.bottom, DcMem, 0, 0, SRCCOPY ); + DeleteDC(DcMem); + DeleteObject(bm); + /* + SetRect(&r,Rect.right - CheckBitmapWidth, (y - CheckBitmapHeight) / 2, Rect.right, Rect.bottom); + DrawFrameControl(Dc, &r, DFC_MENU, DFCS_MENUARROW); + */ } Rect.left += 4; if( !(MenuInfo->dwStyle & MNS_NOCHECK)) Rect.left += CheckBitmapWidth; - Rect.right -= ArrowBitmapWidth; + Rect.right -= CheckBitmapWidth; } else if (Item->hbmpItem) /* Draw the bitmap */ { @@ -1256,7 +1248,7 @@ { ItemInfo->Rect.bottom += SEPARATOR_HEIGHT; if( !MenuBar) - ItemInfo->Rect.right += ArrowBitmapWidth + MenuCharSize.cx; + ItemInfo->Rect.right += CheckBitmapWidth + MenuCharSize.cx; return; } @@ -1286,7 +1278,7 @@ ItemInfo->Rect.right += 2 * CheckBitmapWidth; ItemInfo->Rect.right += 4 + MenuCharSize.cx; ItemInfo->XTab = ItemInfo->Rect.right; - ItemInfo->Rect.right += ArrowBitmapWidth; + ItemInfo->Rect.right += CheckBitmapWidth; } else /* hbmpItem & MenuBar */ { @@ -1307,7 +1299,7 @@ ItemInfo->Rect.right += CheckBitmapWidth; ItemInfo->Rect.right += 4 + MenuCharSize.cx; ItemInfo->XTab = ItemInfo->Rect.right; - ItemInfo->Rect.right += ArrowBitmapWidth; + ItemInfo->Rect.right += CheckBitmapWidth; } /* it must be a text item - unless it's the system menu */

1 0

[cgutman] 39939: - Read the network address in all cases
by cgutman＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: cgutman Date: Wed Mar 11 00:33:36 2009 New Revision: 39939 URL: http://svn.reactos.org/svn/reactos?rev=39939&view=rev Log: - Read the network address in all cases Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Wed Mar 11 00:33:36 2009 @@ -238,6 +238,9 @@ UINT i; NDIS_STATUS Status; PNIC_ADAPTER Adapter; + NDIS_HANDLE ConfigurationHandle; + UINT *RegNetworkAddress = 0; + UINT RegNetworkAddressLength = 0; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -284,10 +287,7 @@ if (Status != NDIS_STATUS_SUCCESS) { PNDIS_CONFIGURATION_PARAMETER ConfigurationParameter; - NDIS_HANDLE ConfigurationHandle; UNICODE_STRING Keyword; - UINT *RegNetworkAddress = 0; - UINT RegNetworkAddressLength = 0; NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); if (Status == NDIS_STATUS_SUCCESS) @@ -328,6 +328,23 @@ else { NDIS_DbgPrint(MIN_TRACE,("NdisOpenConfiguration returned error 0x%x\n", Status)); + } + } else { + NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); + if (Status == NDIS_STATUS_SUCCESS) + { + NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); + if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) + { + int i; + NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", + RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], + RegNetworkAddress[4], RegNetworkAddress[5])); + for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) + Adapter->StationAddress[i] = RegNetworkAddress[i]; + } + + NdisCloseConfiguration(ConfigurationHandle); } }

1 0

[ros-arm-bringup] 39938: - Rework Hyperspace Mapping Interface for Page zeroing. It is now more efficient and adapted to ReactOS. - This also fixes some race conditions. - There was a lot of difficulty getting this patch through because of everyone else adding their 2 cents to the code. Next time, wait.
by ros-arm-bringup＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: ros-arm-bringup Date: Tue Mar 10 23:52:39 2009 New Revision: 39938 URL: http://svn.reactos.org/svn/reactos?rev=39938&view=rev Log: - Rework Hyperspace Mapping Interface for Page zeroing. It is now more efficient and adapted to ReactOS. - This also fixes some race conditions. - There was a lot of difficulty getting this patch through because of everyone else adding their 2 cents to the code. Next time, wait. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/hypermap.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/kmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Mar 10 23:52:39 2009 @@ -65,6 +65,8 @@ #define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE #define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ MI_HYPERSPACE_PTES * PAGE_SIZE) +#define MI_ZERO_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) /* Signature of free pool blocks */ #define MM_FREE_POOL_TAG TAG('F', 'r', 'p', 'l') @@ -1086,11 +1088,7 @@ PVOID NTAPI -MiMapPagesToZeroInHyperSpace(IN PFN_NUMBER Page); - -VOID -NTAPI -MiUnmapPagesInZeroSpace(IN PVOID Address); +MiMapPageToZeroInHyperSpace(IN PFN_NUMBER Page); // // ReactOS Compatibility Layer Modified: trunk/reactos/ntoskrnl/mm/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/hypermap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] Tue Mar 10 23:52:39 2009 @@ -130,11 +130,10 @@ PVOID NTAPI -MiMapPagesToZeroInHyperSpace(IN PFN_NUMBER Page) +MiMapPageToZeroInHyperSpace(IN PFN_NUMBER Page) { MMPTE TempPte; PMMPTE PointerPte; - PFN_NUMBER Offset; PVOID Address; // @@ -149,49 +148,24 @@ TempPte.u.Hard.PageFrameNumber = Page; // - // Pick the first hyperspace PTE + // Get the Zero PTE and its address // - PointerPte = MmFirstReservedMappingPte; - - // - // Now get the first free PTE - // - Offset = PFN_FROM_PTE(PointerPte); - if (!Offset) - { - // - // Reset the PTEs - // - Offset = MI_HYPERSPACE_PTES; - KeFlushProcessTb(); - } + PointerPte = MiAddressToPte(MI_ZERO_PTE); + Address = (PVOID)((ULONG_PTR)PointerPte << 10); // - // Prepare the next PTE + // Invalidate the old address // - PointerPte->u.Hard.PageFrameNumber = Offset - 1; + __invlpg(Address); // // Write the current PTE // - PointerPte += Offset; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); + TempPte.u.Hard.PageFrameNumber = Page; *PointerPte = TempPte; // // Return the address // - Address = (PVOID)((ULONG_PTR)PointerPte << 10); return Address; } - -VOID -NTAPI -MiUnmapPagesInZeroSpace(IN PVOID Address) -{ - // - // Blow away the mapping - // - MiAddressToPte(Address)->u.Long = 0; -} Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Mar 10 23:52:39 2009 @@ -783,6 +783,7 @@ DPRINT1("Setting kernel address with process context\n"); KeBugCheck(MEMORY_MANAGEMENT); } + if (SwapEntry & (1 << 31)) { KeBugCheck(MEMORY_MANAGEMENT); @@ -1086,7 +1087,7 @@ if (Process != NULL && Process != PsGetCurrentProcess()) { - Pde = MiMapPagesToZeroInHyperSpace(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + Pde = MiMapPageToZeroInHyperSpace(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); } else { @@ -1098,10 +1099,6 @@ { InterlockedCompareExchangePte(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); } - } - if (Pde != (PULONG)PAGEDIRECTORY_MAP) - { - MiUnmapPagesInZeroSpace(Pde); } } Modified: trunk/reactos/ntoskrnl/mm/kmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/kmap.c?rev=399… ============================================================================== --- trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] Tue Mar 10 23:52:39 2009 @@ -22,13 +22,12 @@ { PVOID TempAddress; - TempAddress = MiMapPagesToZeroInHyperSpace(Page); + TempAddress = MiMapPageToZeroInHyperSpace(Page); if (TempAddress == NULL) { return(STATUS_NO_MEMORY); } memset(TempAddress, 0, PAGE_SIZE); - MiUnmapPagesInZeroSpace(TempAddress); return(STATUS_SUCCESS); } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Mar 10 23:52:39 2009 @@ -691,7 +691,7 @@ return Status; } } - PageAddr = MiMapPagesToZeroInHyperSpace(*Page); + PageAddr = MiMapPageToZeroInHyperSpace(*Page); CacheSegOffset = BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset; Length = RawLength - SegOffset; if (Length <= CacheSegOffset && Length <= PAGE_SIZE) @@ -714,7 +714,6 @@ &CacheSeg); if (!NT_SUCCESS(Status)) { - MiUnmapPagesInZeroSpace(PageAddr); return(Status); } if (!UptoDate) @@ -727,7 +726,6 @@ if (!NT_SUCCESS(Status)) { CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); - MiUnmapPagesInZeroSpace(PageAddr); return Status; } } @@ -741,7 +739,6 @@ } } CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); - MiUnmapPagesInZeroSpace(PageAddr); } return(STATUS_SUCCESS); }

1 0

[fireball] 39937: - Fix a typo: set a value, not a bit.
by fireball＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: fireball Date: Tue Mar 10 23:33:18 2009 New Revision: 39937 URL: http://svn.reactos.org/svn/reactos?rev=39937&view=rev Log: - Fix a typo: set a value, not a bit. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Mar 10 23:33:18 2009 @@ -1121,7 +1121,7 @@ // Setup template // HyperTemplatePte.u.Long = (PA_PRESENT | PA_READWRITE | PA_DIRTY | PA_ACCESSED); - if (Ke386GlobalPagesEnabled) HyperTemplatePte.u.Long |= PA_BIT_GLOBAL; + if (Ke386GlobalPagesEnabled) HyperTemplatePte.u.Long |= PA_GLOBAL; for (i = ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i < 1024; i++) {

1 0

[fireball] 39936: - Initialize hyperspace before page lists. Fixes boot problem (spotted by Alex).
by fireball＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: fireball Date: Tue Mar 10 23:26:46 2009 New Revision: 39936 URL: http://svn.reactos.org/svn/reactos?rev=39936&view=rev Log: - Initialize hyperspace before page lists. Fixes boot problem (spotted by Alex). Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Mar 10 23:26:46 2009 @@ -433,15 +433,15 @@ /* Dump kernel memory layout */ MiDbgKernelLayout(); - + + /* Initialize hyperspace */ + MiInitHyperSpace(); + /* Initialize the page list */ MmInitializePageList(); - + /* Unmap low memory */ MmDeletePageTable(NULL, 0); - - /* Initialize hyperspace */ - MiInitHyperSpace(); /* Intialize memory areas */ MmInitVirtualMemory();

1 0

[cgutman] 39935: - Implement the MiniportReset handler
by cgutman＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: cgutman Date: Tue Mar 10 22:54:08 2009 New Revision: 39935 URL: http://svn.reactos.org/svn/reactos?rev=39935&view=rev Log: - Implement the MiniportReset handler Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Tue Mar 10 22:54:08 2009 @@ -662,11 +662,19 @@ * Status of operation */ { + NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS; + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - return NDIS_STATUS_FAILURE; +#ifndef NOCARD + NdisStatus = NICReset((PNIC_ADAPTER)MiniportAdapterContext); +#endif + + *AddressingReset = TRUE; + + return NdisStatus; }

1 0

[dgorbachev] 39934: Fix bug #4249 and crash in QEMU. Alex Ionescu, bug #4249.
by dgorbachev＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: dgorbachev Date: Tue Mar 10 20:47:11 2009 New Revision: 39934 URL: http://svn.reactos.org/svn/reactos?rev=39934&view=rev Log: Fix bug #4249 and crash in QEMU. Alex Ionescu, bug #4249. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Mar 10 20:47:11 2009 @@ -1086,7 +1086,7 @@ if (Process != NULL && Process != PsGetCurrentProcess()) { - Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + Pde = MiMapPagesToZeroInHyperSpace(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); } else { @@ -1101,7 +1101,7 @@ } if (Pde != (PULONG)PAGEDIRECTORY_MAP) { - MmDeleteHyperspaceMapping(Pde); + MiUnmapPagesInZeroSpace(Pde); } } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Mar 10 20:47:11 2009 @@ -691,7 +691,7 @@ return Status; } } - PageAddr = MmCreateHyperspaceMapping(*Page); + PageAddr = MiMapPagesToZeroInHyperSpace(*Page); CacheSegOffset = BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset; Length = RawLength - SegOffset; if (Length <= CacheSegOffset && Length <= PAGE_SIZE) @@ -714,7 +714,7 @@ &CacheSeg); if (!NT_SUCCESS(Status)) { - MmDeleteHyperspaceMapping(PageAddr); + MiUnmapPagesInZeroSpace(PageAddr); return(Status); } if (!UptoDate) @@ -727,7 +727,7 @@ if (!NT_SUCCESS(Status)) { CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); - MmDeleteHyperspaceMapping(PageAddr); + MiUnmapPagesInZeroSpace(PageAddr); return Status; } } @@ -741,7 +741,7 @@ } } CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); - MmDeleteHyperspaceMapping(PageAddr); + MiUnmapPagesInZeroSpace(PageAddr); } return(STATUS_SUCCESS); }

1 0

[dgorbachev] 39933: Silence compiler warning.
by dgorbachev＠svn.reactos.org 10 Mar '09

10 Mar '09

Author: dgorbachev Date: Tue Mar 10 15:41:23 2009 New Revision: 39933 URL: http://svn.reactos.org/svn/reactos?rev=39933&view=rev Log: Silence compiler warning. Modified: trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Tue Mar 10 15:41:23 2009 @@ -114,6 +114,8 @@ Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); SND_ASSERT( MMSUCCESS(Result) ); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); PreviousInstance = NULL; CurrentInstance = SoundDevice->HeadInstance;

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