Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[cgutman] 54260: [FREELDR] - Check VESA BIOS signature before reporting VESA extensions are present
by cgutman＠svn.reactos.org 27 Oct '11

27 Oct '11

Author: cgutman Date: Thu Oct 27 19:11:22 2011 New Revision: 54260 URL: http://svn.reactos.org/svn/reactos?rev=54260&view=rev Log: [FREELDR] - Check VESA BIOS signature before reporting VESA extensions are present Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] Thu Oct 27 19:11:22 2011 @@ -205,7 +205,7 @@ if (Regs.w.ax != 0x004F) { - TRACE("Failed.\n"); + ERR("VESA BIOS call failed\n"); return 0x0000; } @@ -222,22 +222,18 @@ TRACE("SvgaInfo->ProductRevisionStringPtr = 0x%x\n", SvgaInfo->ProductRevisionStringPtr); TRACE("SvgaInfo->VBE/AF Version = 0x%x (BCD WORD)\n", SvgaInfo->VBE_AF_Version); - //TRACE("\nSupported VESA and OEM video modes:\n"); - //VideoModes = (USHORT*)SvgaInfo->SupportedModeListPtr; - //for (Index=0; VideoModes[Index]!=0xFFFF; Index++) - //{ - // TRACE("Mode %d: 0x%x\n", Index, VideoModes[Index]); - //} - - //if (SvgaInfo->VesaVersion >= 0x0200) - //{ - // TRACE("\nSupported accelerated video modes (VESA v2.0):\n"); - // VideoModes = (USHORT*)SvgaInfo->AcceleratedModeListPtr; - // for (Index=0; VideoModes[Index]!=0xFFFF; Index++) - // { - // TRACE("Mode %d: 0x%x\n", Index, VideoModes[Index]); - // } - //} + if (SvgaInfo->Signature[0] != 'V' || + SvgaInfo->Signature[1] != 'E' || + SvgaInfo->Signature[2] != 'S' || + SvgaInfo->Signature[3] != 'A') + { + ERR("Bad signature in VESA information (%c%c%c%c)\n", + SvgaInfo->Signature[0], + SvgaInfo->Signature[1], + SvgaInfo->Signature[2], + SvgaInfo->Signature[3]); + return 0x0000; + } return SvgaInfo->VesaVersion; }

1 0

[jimtabor] 54259: [User32] - Fix function ids, setting of the death bit when in NC destroy. - Implement get control brush and color. - Patch by Alexander LAW, Replicate Windows behavior of WM_SETTE...
by jimtabor＠svn.reactos.org 27 Oct '11

27 Oct '11

Author: jimtabor Date: Thu Oct 27 12:17:44 2011 New Revision: 54259 URL: http://svn.reactos.org/svn/reactos?rev=54259&view=rev Log: [User32] - Fix function ids, setting of the death bit when in NC destroy. - Implement get control brush and color. - Patch by Alexander LAW, Replicate Windows behavior of WM_SETTEXT handler regarding WM_CTLCOLOR* Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -270,7 +270,7 @@ { if (pWnd->fnid != FNID_BUTTON) { - ERR("Wrong window class for Button!\n"); + ERR("Wrong window class for Button! fnId 0x%x\n",pWnd->fnid); return 0; } } @@ -321,9 +321,9 @@ return 0; #ifdef __REACTOS__ - case WM_DESTROY: case WM_NCDESTROY: NtUserSetWindowFNID(hWnd, FNID_DESTROY); + case WM_DESTROY: break; #endif @@ -442,27 +442,38 @@ case WM_SETTEXT: { /* Clear an old text here as Windows does */ - HDC hdc = GetDC(hWnd); - HBRUSH hbrush; - RECT client, rc; - HWND parent = GetParent(hWnd); - - if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); - if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); - - GetClientRect(hWnd, &client); - rc = client; - BUTTON_CalcLabelRect(hWnd, hdc, &rc); - /* Clip by client rect bounds */ - if (rc.right > client.right) rc.right = client.right; - if (rc.bottom > client.bottom) rc.bottom = client.bottom; - FillRect(hdc, &rc, hbrush); - ReleaseDC(hWnd, hdc); - +// +// wine Bug: http://bugs.winehq.org/show_bug.cgi?id=25790 +// Patch: http://source.winehq.org/patches/data/70889 +// By: Alexander LAW, Replicate Windows behavior of WM_SETTEXT handler regarding WM_CTLCOLOR* +// + if (style & WS_VISIBLE) + { + HDC hdc = GetDC(hWnd); + HBRUSH hbrush; + RECT client, rc; + HWND parent = GetParent(hWnd); + UINT ctlMessage=(btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_PUSHLIKE || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; + + if (!parent) parent = hWnd; + + hbrush = GetControlColor( parent, hWnd, hdc, ctlMessage); + + GetClientRect(hWnd, &client); + rc = client; + BUTTON_CalcLabelRect(hWnd, hdc, &rc); + /* Clip by client rect bounds */ + if (rc.right > client.right) rc.right = client.right; + if (rc.bottom > client.bottom) rc.bottom = client.bottom; + FillRect(hdc, &rc, hbrush); + ReleaseDC(hWnd, hdc); + } +//// if (unicode) DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); else DefWindowProcA( hWnd, WM_SETTEXT, wParam, lParam ); if (btn_type == BS_GROUPBOX) /* Yes, only for BS_GROUPBOX */ @@ -974,11 +985,7 @@ parent = GetParent(hwnd); if (!parent) parent = hwnd; - hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)hwnd); - if (!hBrush) /* did the app forget to call defwindowproc ? */ - hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)hwnd ); + hBrush = GetControlColor( parent, hwnd, hDC, WM_CTLCOLORSTATIC); setup_clipping( hwnd, hDC ); if (style & BS_LEFTTEXT) @@ -1118,10 +1125,7 @@ /* GroupBox acts like static control, so it sends CTLCOLORSTATIC */ parent = GetParent(hwnd); if (!parent) parent = hwnd; - hbr = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hwnd); - if (!hbr) /* did the app forget to call defwindowproc ? */ - hbr = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)hwnd); + hbr = GetControlColor( parent, hwnd, hDC, WM_CTLCOLORSTATIC); setup_clipping( hwnd, hDC ); GetClientRect( hwnd, &rc); Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -867,9 +867,7 @@ */ if (CB_DISABLED(lphc)) { - hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)lphc->self ); - + hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLORSTATIC); /* * We have to change the text color since WM_CTLCOLORSTATIC will * set it to the "enabled" color. This is the same behavior as the @@ -880,8 +878,7 @@ else { /* FIXME: In which cases WM_CTLCOLORLISTBOX should be sent? */ - hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, - (WPARAM)hDC, (LPARAM)lphc->self ); + hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLOREDIT); } /* @@ -1847,7 +1844,7 @@ { if (pWnd->fnid != FNID_COMBOBOX) { - ERR("Wrong window class for ComboBox!\n"); + ERR("Wrong window class for ComboBox! fnId 0x%x\n",pWnd->fnid); return 0; } } Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -228,9 +228,7 @@ msg = WM_CTLCOLOREDIT; /* why do we notify to es->hwndParent, and we send this one to GetParent()? */ - hbrush = (HBRUSH)SendMessageW(GetParent(es->hwndSelf), msg, (WPARAM)hdc, (LPARAM)es->hwndSelf); - if (!hbrush) - hbrush = (HBRUSH)DefWindowProcW(GetParent(es->hwndSelf), msg, (WPARAM)hdc, (LPARAM)es->hwndSelf); + hbrush = GetControlBrush(es->hwndSelf, hdc, msg); return hbrush; } @@ -4481,7 +4479,7 @@ { if (pWnd->fnid != FNID_EDIT) { - ERR("Wrong window class for Edit!\n"); + ERR("Wrong window class for Edit! fnId 0x%x\n",pWnd->fnid); return 0; } } Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -224,8 +224,9 @@ } return (hIconTitleFont ? 0 : -1); #ifdef __REACTOS__ + case WM_NCDESTROY: + NtUserSetWindowFNID(hWnd, FNID_DESTROY); case WM_DESTROY: - NtUserSetWindowFNID(hWnd, FNID_DESTROY); break; #endif case WM_NCHITTEST: Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -2588,7 +2588,7 @@ { if (pWnd->fnid != FNID_LISTBOX) { - ERR("Wrong window class for listbox!\n"); + ERR("Wrong window class for listbox! fnId 0x%x\n",pWnd->fnid); return 0; } } @@ -3008,9 +3008,6 @@ return 0; case WM_DESTROY: -#ifdef __REACTOS__ - NtUserSetWindowFNID(hwnd, FNID_DESTROY); -#endif return LISTBOX_Destroy( descr ); case WM_ENABLE: @@ -3185,6 +3182,9 @@ case WM_NCDESTROY: if( lphc && (lphc->dwStyle & CBS_DROPDOWNLIST) != CBS_SIMPLE ) lphc->hWndLBox = 0; +#ifdef __REACTOS__ + NtUserSetWindowFNID(hwnd, FNID_DESTROY); +#endif break; case WM_NCACTIVATE: Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -1277,8 +1277,11 @@ #ifdef __REACTOS__ case WM_DESTROY: + return DefWindowProc(Wnd, Msg, wParam, lParam ); + + case WM_NCDESTROY: NtUserSetWindowFNID(Wnd, FNID_DESTROY); - return DefWindowProc(Wnd, Msg, wParam, lParam ); + break; #endif //#if 0 /* FIXME */ Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -324,33 +324,9 @@ } } -BOOL WINAPI GdiValidateHandle(HGDIOBJ hobj); - static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) { - PWND pwnd; - HBRUSH hBrush; - HWND parent = GetParent(hwnd); - - if (!parent) parent = hwnd; - // ReactOS - pwnd = ValidateHwnd(parent); - if (pwnd && !TestWindowProcess(pwnd)) - { - return (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - } - //// - hBrush = (HBRUSH) SendMessageW( parent, - WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); - if (!hBrush || /* did the app forget to call DefWindowProc ? */ - !GdiValidateHandle(hBrush)) // ReactOS - { - /* FIXME: DefWindowProc should return different colors if a - manifest is present */ - hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hwnd); - } - return hBrush; + return GetControlBrush( hwnd, hdc, WM_CTLCOLORSTATIC); } static VOID STATIC_InitColours(void) @@ -403,7 +379,7 @@ { if (pWnd->fnid != FNID_STATIC) { - ERR("Wrong window class for Static!\n"); + ERR("Wrong window class for Static! fnId 0x%x\n",pWnd->fnid); return 0; } } @@ -642,6 +618,7 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) { DRAWITEMSTRUCT dis; + HBRUSH hBrush; HFONT font, oldFont = NULL; UINT id = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID ); @@ -657,7 +634,7 @@ font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); if (font) oldFont = SelectObject( hdc, font ); - SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (font) SelectObject( hdc, oldFont ); } Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -99,5 +99,8 @@ BOOL UserDrawSysMenuButton( HWND hWnd, HDC hDC, LPRECT, BOOL down ); HWND* WIN_ListChildren (HWND hWndparent); VOID DeleteFrameBrushes(VOID); +BOOL WINAPI GdiValidateHandle(HGDIOBJ); +HBRUSH FASTCALL GetControlColor(HWND,HWND,HDC,UINT); +HBRUSH FASTCALL GetControlBrush(HWND,HDC,UINT); /* EOF */ Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -481,6 +481,45 @@ return ValidateHwnd(hwnd); } +HBRUSH +FASTCALL +GetControlColor( + HWND hwndParent, + HWND hwnd, + HDC hdc, + UINT CtlMsg) +{ + PWND pwnd; + HBRUSH hBrush; + + if (!hwndParent) hwndParent = hwnd; + + pwnd = ValidateHwnd(hwndParent); + if (pwnd && !TestWindowProcess(pwnd)) + { + return (HBRUSH)DefWindowProcW( hwndParent, CtlMsg, (WPARAM)hdc, (LPARAM)hwnd); + } + + hBrush = (HBRUSH)SendMessageW( hwndParent, CtlMsg, (WPARAM)hdc, (LPARAM)hwnd); + + if (!hBrush || !GdiValidateHandle(hBrush)) + { + hBrush = (HBRUSH)DefWindowProcW( hwndParent, CtlMsg, (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +} + +HBRUSH +FASTCALL +GetControlBrush( + HWND hwnd, + HDC hdc, + UINT ctlType) +{ + HWND hwndParent = GetParent(hwnd); + return GetControlColor( hwndParent, hwnd, hdc, ctlType); +} + /* * @implemented */ Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -1901,6 +1901,15 @@ LRESULT Result = 0; PWND Wnd; + Wnd = ValidateHwnd(hWnd); + + if ( !Wnd && + Msg != WM_CTLCOLORMSGBOX && + Msg != WM_CTLCOLORBTN && + Msg != WM_CTLCOLORDLG && + Msg != WM_CTLCOLORSTATIC ) + return 0; + SPY_EnterMessage(SPY_DEFWNDPROC, hWnd, Msg, wParam, lParam); switch (Msg) { @@ -1925,7 +1934,6 @@ PWSTR buf; ULONG len; - Wnd = ValidateHwnd(hWnd); if (Wnd != NULL && Wnd->strName.Length != 0) { buf = DesktopPtrToUser(Wnd->strName.Buffer); @@ -1948,7 +1956,6 @@ PSTR outbuf = (PSTR)lParam; UINT copy; - Wnd = ValidateHwnd(hWnd); if (Wnd != NULL && wParam != 0) { if (Wnd->strName.Buffer != NULL) @@ -2061,6 +2068,15 @@ LRESULT Result = 0; PWND Wnd; + Wnd = ValidateHwnd(hWnd); + + if ( !Wnd && + Msg != WM_CTLCOLORMSGBOX && + Msg != WM_CTLCOLORBTN && + Msg != WM_CTLCOLORDLG && + Msg != WM_CTLCOLORSTATIC ) + return 0; + SPY_EnterMessage(SPY_DEFWNDPROC, hWnd, Msg, wParam, lParam); switch (Msg) { @@ -2085,7 +2101,6 @@ PWSTR buf; ULONG len; - Wnd = ValidateHwnd(hWnd); if (Wnd != NULL && Wnd->strName.Length != 0) { buf = DesktopPtrToUser(Wnd->strName.Buffer); @@ -2107,7 +2122,6 @@ PWSTR buf = NULL; PWSTR outbuf = (PWSTR)lParam; - Wnd = ValidateHwnd(hWnd); if (Wnd != NULL && wParam != 0) { if (Wnd->strName.Buffer != NULL) Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Thu Oct 27 12:17:44 2011 @@ -1161,10 +1161,17 @@ #ifdef __REACTOS__ HeapFree( GetProcessHeap(), 0, ci ); SetWindowLongPtrW( hwnd, 0, 0 ); - NtUserSetWindowFNID(hwnd, FNID_DESTROY); #endif return 0; } + +#ifdef __REACTOS__ + case WM_NCDESTROY: + { + NtUserSetWindowFNID(hwnd, FNID_DESTROY); + return 0; + } +#endif case WM_MDIACTIVATE: { 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] Thu Oct 27 12:17:44 2011 @@ -1852,10 +1852,13 @@ top_popup = NULL; top_popup_hmenu = NULL; } + break; + #ifdef __REACTOS__ + case WM_NCDESTROY: NtUserSetWindowFNID(Wnd, FNID_DESTROY); + break; #endif - break; case WM_SHOWWINDOW: if (0 != wParam) @@ -1949,10 +1952,13 @@ top_popup = NULL; top_popup_hmenu = NULL; } + break; + #ifdef __REACTOS__ + case WM_NCDESTROY: NtUserSetWindowFNID(Wnd, FNID_DESTROY); + break; #endif - break; case WM_SHOWWINDOW: if (0 != wParam)

1 0

[spetreolle] 54258: [KERNEL32] Use ERROR_SUCCESS instead of 0. Dedicated to Pierre.
by spetreolle＠svn.reactos.org 27 Oct '11

27 Oct '11

Author: spetreolle Date: Thu Oct 27 09:38:14 2011 New Revision: 54258 URL: http://svn.reactos.org/svn/reactos?rev=54258&view=rev Log: [KERNEL32] Use ERROR_SUCCESS instead of 0. Dedicated to Pierre. Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Thu Oct 27 09:38:14 2011 @@ -361,15 +361,15 @@ */ if (dwCreationDisposition == FILE_OPEN_IF) { - SetLastError(IoStatusBlock.Information == FILE_OPENED ? ERROR_ALREADY_EXISTS : 0); + SetLastError(IoStatusBlock.Information == FILE_OPENED ? ERROR_ALREADY_EXISTS : ERROR_SUCCESS); } else if (dwCreationDisposition == FILE_OVERWRITE_IF) { - SetLastError(IoStatusBlock.Information == FILE_OVERWRITTEN ? ERROR_ALREADY_EXISTS : 0); + SetLastError(IoStatusBlock.Information == FILE_OVERWRITTEN ? ERROR_ALREADY_EXISTS : ERROR_SUCCESS); } else { - SetLastError(0); + SetLastError(ERROR_SUCCESS); } return FileHandle;

1 0

[spetreolle] 54257: [KERNEL32] CreateFile has to set last error on success. Fixes kernel32:file test cancellation.
by spetreolle＠svn.reactos.org 26 Oct '11

26 Oct '11

Author: spetreolle Date: Wed Oct 26 19:02:32 2011 New Revision: 54257 URL: http://svn.reactos.org/svn/reactos?rev=54257&view=rev Log: [KERNEL32] CreateFile has to set last error on success. Fixes kernel32:file test cancellation. Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Wed Oct 26 19:02:32 2011 @@ -146,7 +146,7 @@ || 0 == _wcsicmp(L"CONIN$", lpFileName)) { return OpenConsoleW(lpFileName, - dwDesiredAccess, + dwDesiredAccess, lpSecurityAttributes ? lpSecurityAttributes->bInheritHandle : FALSE, FILE_SHARE_READ | FILE_SHARE_WRITE); } @@ -367,6 +367,10 @@ { SetLastError(IoStatusBlock.Information == FILE_OVERWRITTEN ? ERROR_ALREADY_EXISTS : 0); } + else + { + SetLastError(0); + } return FileHandle; }

1 0

[cgutman] 54256: [NTOSKRNL] - Pass a placeholder trap information, indicating that we are unlocked, to MmAccessFault in MmProbeAndLockPages as temporary hack until Mm locking is fixed - Fixes "Asse...
by cgutman＠svn.reactos.org 26 Oct '11

26 Oct '11

Author: cgutman Date: Wed Oct 26 14:38:57 2011 New Revision: 54256 URL: http://svn.reactos.org/svn/reactos?rev=54256&view=rev Log: [NTOSKRNL] - Pass a placeholder trap information, indicating that we are unlocked, to MmAccessFault in MmProbeAndLockPages as temporary hack until Mm locking is fixed - Fixes "Assertion 'GuardedMutex->Owner == KeGetCurrentThread()' failed" when faulting in pages via MmProbeAndLockPages - Dedicated to Jim :) Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Wed Oct 26 14:38:57 2011 @@ -861,7 +861,9 @@ // Access the page // Address = MiPteToAddress(PointerPte); - Status = MmAccessFault(FALSE, Address, KernelMode, NULL); + + //HACK: Pass a placeholder TrapInformation so the fault handler knows we're unlocked + Status = MmAccessFault(FALSE, Address, KernelMode, (PVOID)0xBADBADA3); if (!NT_SUCCESS(Status)) { // @@ -928,7 +930,9 @@ // // Access the page // - Status = MmAccessFault(TRUE, Address, KernelMode, NULL); + + //HACK: Pass a placeholder TrapInformation so the fault handler knows we're unlocked + Status = MmAccessFault(TRUE, Address, KernelMode, (PVOID)0xBADBADA3); if (!NT_SUCCESS(Status)) { //

1 0

[jimtabor] 54255: [User32] - Up Dialog.c to 1.3.31, sync port and minimized differences. - Sync Information: Alexandre Julliard <julliard@winehq.org> : Don't overwrite the default button id when cr...
by jimtabor＠svn.reactos.org 26 Oct '11

26 Oct '11

Author: jimtabor Date: Wed Oct 26 02:17:02 2011 New Revision: 54255 URL: http://svn.reactos.org/svn/reactos?rev=54255&view=rev Log: [User32] - Up Dialog.c to 1.3.31, sync port and minimized differences. - Sync Information: Alexandre Julliard <julliard(a)winehq.org> : Don't overwrite the default button id when creating the dialog structure. Michael Stefaniuc <mstefani(a)redhat.de>: Avoid using long. Avoid using HIWORD() on atoms/resources. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Wed Oct 26 02:17:02 2011 @@ -133,10 +133,10 @@ * * ReactOS */ -DIALOGINFO * DIALOG_get_info( HWND hWnd, BOOL create ) +DIALOGINFO *DIALOG_get_info( HWND hWnd, BOOL create ) { PWND pWindow; - DIALOGINFO* dlgInfo = (DIALOGINFO *)GetWindowLongPtrW( hWnd, DWLP_ROS_DIALOGINFO ); + DIALOGINFO* dlgInfo; pWindow = ValidateHwnd( hWnd ); if (!pWindow) @@ -144,14 +144,17 @@ return NULL; } + dlgInfo = (DIALOGINFO *)GetWindowLongPtrW( hWnd, DWLP_ROS_DIALOGINFO ); + if (!dlgInfo && create) { - if (pWindow && pWindow->cbwndExtra >= DLGWINDOWEXTRA && hWnd != GetDesktopWindow()) - { - if (!(dlgInfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dlgInfo) ))) - return NULL; - - SETDLGINFO( hWnd, dlgInfo ); + if (pWindow && pWindow->cbwndExtra >= DLGWINDOWEXTRA) + { + if (!(dlgInfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dlgInfo) ))) + return NULL; + + dlgInfo->idResult = IDOK; + SETDLGINFO( hWnd, dlgInfo ); NtUserxSetDialogPointer( hWnd, dlgInfo ); } @@ -353,14 +356,14 @@ LPSTR class = (LPSTR)info.className; LPSTR caption = (LPSTR)info.windowName; - if (HIWORD(class)) + if (!IS_INTRESOURCE(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.className, -1, NULL, 0, NULL, NULL ); class = HeapAlloc( GetProcessHeap(), 0, len ); if (class != NULL) WideCharToMultiByte( CP_ACP, 0, info.className, -1, class, len, NULL, NULL ); } - if (HIWORD(caption)) + if (!IS_INTRESOURCE(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, NULL, 0, NULL, NULL ); caption = HeapAlloc( GetProcessHeap(), 0, len ); @@ -381,8 +384,8 @@ } else hwndCtrl = NULL; - if (HIWORD(class)) HeapFree( GetProcessHeap(), 0, class ); - if (HIWORD(caption)) HeapFree( GetProcessHeap(), 0, caption ); + if (!IS_INTRESOURCE(class)) HeapFree( GetProcessHeap(), 0, class ); + if (!IS_INTRESOURCE(caption)) HeapFree( GetProcessHeap(), 0, caption ); } if (info.windowNameFree) @@ -511,7 +514,7 @@ pWnd = ValidateHwnd(hParent); // FIXME: Use pWnd->fnid == FNID_DESKTOP - if (!pWnd || hParent == GetDesktopWindow()) break; + if (!pWnd || !TestWindowProcess(pWnd) || hParent == GetDesktopWindow()) break; if (!(pWnd->state & WNDS_DIALOGWINDOW)) { @@ -934,14 +937,14 @@ LPSTR class_tmp = NULL; LPSTR caption_tmp = NULL; - if (HIWORD(class)) + if (!IS_INTRESOURCE(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.className, -1, NULL, 0, NULL, NULL ); class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); WideCharToMultiByte( CP_ACP, 0, template.className, -1, class_tmp, len, NULL, NULL ); class = class_tmp; } - if (HIWORD(caption)) + if (!IS_INTRESOURCE(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.caption, -1, NULL, 0, NULL, NULL ); caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); @@ -967,6 +970,7 @@ will be valid only after WM_CREATE message has been handled in DefDlgProc All the members of the structure get filled here using temp variables */ dlgInfo = DIALOG_get_info( hwnd, TRUE ); + // ReactOS if (dlgInfo == NULL) { if (hUserFont) DeleteObject( hUserFont ); @@ -974,13 +978,12 @@ if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); return 0; } - + // dlgInfo->hwndFocus = 0; dlgInfo->hUserFont = hUserFont; dlgInfo->hMenu = hMenu; dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId ); @@ -1973,7 +1976,11 @@ DIALOGINFO * dlgInfo; HWND owner; - if (!(dlgInfo = GETDLGINFO(hDlg))) return FALSE; + if (!(dlgInfo = GETDLGINFO(hDlg))) + { + ERR("got invalid window handle (%p); buggy app !?\n", hDlg); + return FALSE; + } dlgInfo->idResult = nResult; dlgInfo->flags |= DF_END; @@ -2073,7 +2080,7 @@ { char str[30]; char * endptr; - long result = 0; + LONG_PTR result = 0; if (lpTranslated) *lpTranslated = FALSE; if (!SendDlgItemMessageA(hDlg, nIDDlgItem, WM_GETTEXT, sizeof(str), (LPARAM)str)) @@ -2259,16 +2266,26 @@ HWND hCtl, BOOL bPrevious) { - /* Undocumented but tested under Win2000 and WinME */ - if (hDlg == hCtl) hCtl = NULL; - - /* Contrary to MSDN documentation, tested under Win2000 and WinME - * NB GetLastError returns whatever was set before the function was - * called. - */ - if (!hCtl && bPrevious) return 0; - - return DIALOG_GetNextTabItem(hDlg, hDlg, hCtl, bPrevious); + PWND pWindow; + + pWindow = ValidateHwnd( hDlg ); + if (!pWindow) return NULL; + if (hCtl) + { + pWindow = ValidateHwnd( hCtl ); + if (!pWindow) return NULL; + } + + /* Undocumented but tested under Win2000 and WinME */ + if (hDlg == hCtl) hCtl = NULL; + + /* Contrary to MSDN documentation, tested under Win2000 and WinME + * NB GetLastError returns whatever was set before the function was + * called. + */ + if (!hCtl && bPrevious) return 0; + + return DIALOG_GetNextTabItem(hDlg, hDlg, hCtl, bPrevious); } @@ -2409,6 +2426,14 @@ case VK_TAB: if (!(dlgCode & DLGC_WANTTAB)) { + BOOL fIsDialog = TRUE; + WND *pWnd = ValidateHwnd(hDlg); + + if (pWnd && TestWindowProcess(pWnd)) + { + fIsDialog = (GETDLGINFO(hDlg) != NULL); + } + SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEFOCUS), 0); /* I am not sure under which circumstances the TAB is handled @@ -2416,7 +2441,7 @@ * send WM_NEXTDLGCTL. (Personally I have never yet seen it * do so but I presume someone has) */ - if (GETDLGINFO(hDlg)) + if (fIsDialog) SendMessageW( hDlg, WM_NEXTDLGCTL, (GetKeyState(VK_SHIFT) & 0x8000), 0 ); else { @@ -2517,7 +2542,7 @@ //// ReactOS case WM_SYSKEYDOWN: /* If the ALT key is being pressed display the keyboard cues */ - if (lpMsg->lParam & (1 << 29)) + if (HIWORD(lpMsg->lParam) & KF_ALTDOWN) SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEACCEL | UISF_HIDEFOCUS), 0); break;

1 0

[jimtabor] 54254: - Port wine right.
by jimtabor＠svn.reactos.org 25 Oct '11

25 Oct '11

Author: jimtabor Date: Tue Oct 25 02:53:44 2011 New Revision: 54254 URL: http://svn.reactos.org/svn/reactos?rev=54254&view=rev Log: - Port wine right. Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Tue Oct 25 02:53:44 2011 @@ -241,7 +241,9 @@ *compr = 0; return 0; } - else if (header->biSize >= sizeof(BITMAPINFOHEADER)) + else if (header->biSize == sizeof(BITMAPINFOHEADER) || + header->biSize == sizeof(BITMAPV4HEADER) || + header->biSize == sizeof(BITMAPV5HEADER)) { *width = header->biWidth; *height = header->biHeight;

1 0

[jimtabor] 54253: - Fix crash in cursoricon test.
by jimtabor＠svn.reactos.org 25 Oct '11

25 Oct '11

Author: jimtabor Date: Tue Oct 25 02:14:38 2011 New Revision: 54253 URL: http://svn.reactos.org/svn/reactos?rev=54253&view=rev Log: - Fix crash in cursoricon test. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.pspec trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Tue Oct 25 02:14:38 2011 @@ -554,6 +554,7 @@ CreateSystemThreads(DWORD dwUnknown) { NtUserxCreateSystemThreads(dwUnknown); + ExitThread(0); } BOOL @@ -572,12 +573,13 @@ return FALSE; } -BOOL -WINAPI -GetCursorFrameInfo(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5) -{ - UNIMPLEMENTED; - return FALSE; +HCURSOR +WINAPI +GetCursorFrameInfo(HCURSOR hCursor, LPCWSTR name, DWORD istep, PDWORD rate_jiffies, INT *num_steps) +{ + if (hCursor) return NtUserGetCursorFrameInfo(hCursor, istep, rate_jiffies, num_steps); + + return LoadImageW( NULL, name, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ); } BOOL Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Tue Oct 25 02:14:38 2011 @@ -268,7 +268,7 @@ @ stdcall GetClipboardViewer() NtUserGetClipboardViewer @ stdcall GetComboBoxInfo(long ptr) ; Direct call NtUserGetComboBoxInfo @ stdcall GetCursor() -@ stub GetCursorFrameInfo +@ stdcall GetCursorFrameInfo(long long long ptr ptr) @ stdcall GetCursorInfo(ptr) NtUserGetCursorInfo @ stdcall GetCursorPos(ptr) @ stdcall GetDC(long) NtUserGetDC Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Oct 25 02:14:38 2011 @@ -1907,13 +1907,13 @@ GETCPD Flags, ULONG_PTR Proc); -DWORD +HCURSOR NTAPI NtUserGetCursorFrameInfo( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HCURSOR hCursor, + DWORD istep, + PDWORD rate_jiffies, + INT *num_steps); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Oct 25 02:14:38 2011 @@ -1242,13 +1242,13 @@ /* * @unimplemented */ -DWORD -APIENTRY +HCURSOR +NTAPI NtUserGetCursorFrameInfo( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) + HCURSOR hCursor, + DWORD istep, + PDWORD rate_jiffies, + INT *num_steps) { STUB

1 0

[cgutman] 54252: [NTOSKRNL] - Fix debug prints for 64-bit values
by cgutman＠svn.reactos.org 24 Oct '11

24 Oct '11

Author: cgutman Date: Mon Oct 24 21:09:58 2011 New Revision: 54252 URL: http://svn.reactos.org/svn/reactos?rev=54252&view=rev Log: [NTOSKRNL] - Fix debug prints for 64-bit values Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Mon Oct 24 21:09:58 2011 @@ -256,7 +256,7 @@ case CmResourceTypePort: if (!IopFindPortResource(ReqDesc, ResDesc)) { - DPRINT1("Failed to find an available port resource (0x%x to 0x%x length: 0x%x)\n", + DPRINT1("Failed to find an available port resource (0x%I64x to 0x%I64x length: 0x%x)\n", ReqDesc->u.Port.MinimumAddress.QuadPart, ReqDesc->u.Port.MaximumAddress.QuadPart, ReqDesc->u.Port.Length); @@ -274,7 +274,7 @@ case CmResourceTypeMemory: if (!IopFindMemoryResource(ReqDesc, ResDesc)) { - DPRINT1("Failed to find an available memory resource (0x%x to 0x%x length: 0x%x)\n", + DPRINT1("Failed to find an available memory resource (0x%I64x to 0x%I64x length: 0x%x)\n", ReqDesc->u.Memory.MinimumAddress.QuadPart, ReqDesc->u.Memory.MaximumAddress.QuadPart, ReqDesc->u.Memory.Length); @@ -379,7 +379,7 @@ { if (!Silent) { - DPRINT1("Resource conflict: Memory (0x%x to 0x%x vs. 0x%x to 0x%x)\n", + DPRINT1("Resource conflict: Memory (0x%I64x to 0x%I64x vs. 0x%I64x to 0x%I64x)\n", ResDesc->u.Memory.Start.QuadPart, ResDesc->u.Memory.Start.QuadPart + ResDesc->u.Memory.Length, ResDesc2->u.Memory.Start.QuadPart, ResDesc2->u.Memory.Start.QuadPart + ResDesc2->u.Memory.Length); @@ -400,7 +400,7 @@ { if (!Silent) { - DPRINT1("Resource conflict: Port (0x%x to 0x%x vs. 0x%x to 0x%x)\n", + DPRINT1("Resource conflict: Port (0x%I64x to 0x%I64x vs. 0x%I64x to 0x%I64x)\n", ResDesc->u.Port.Start.QuadPart, ResDesc->u.Port.Start.QuadPart + ResDesc->u.Port.Length, ResDesc2->u.Port.Start.QuadPart, ResDesc2->u.Port.Start.QuadPart + ResDesc2->u.Port.Length); @@ -819,7 +819,7 @@ &DescriptorTranslated->u.Memory.Start)) { Status = STATUS_UNSUCCESSFUL; - DPRINT1("Failed to translate memory resource (Start: 0xI64x)\n", DescriptorRaw->u.Memory.Start.QuadPart); + DPRINT1("Failed to translate memory resource (Start: 0x%I64x)\n", DescriptorRaw->u.Memory.Start.QuadPart); goto cleanup; }

1 0

[cgutman] 54251: [NDIS] - Implement NdisMSetupDmaTransfer, NdisMCompleteDmaTransfer, NdisSetupDmaTransfer, NdisCompleteDmaTransfer, and NdisAllocateDmaChannel
by cgutman＠svn.reactos.org 24 Oct '11

24 Oct '11

Author: cgutman Date: Mon Oct 24 20:38:36 2011 New Revision: 54251 URL: http://svn.reactos.org/svn/reactos?rev=54251&view=rev Log: [NDIS] - Implement NdisMSetupDmaTransfer, NdisMCompleteDmaTransfer, NdisSetupDmaTransfer, NdisCompleteDmaTransfer, and NdisAllocateDmaChannel Modified: trunk/reactos/drivers/network/ndis/ndis/30stubs.c trunk/reactos/drivers/network/ndis/ndis/40stubs.c trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/30stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/30stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/30stubs.c [iso-8859-1] Mon Oct 24 20:38:36 2011 @@ -9,23 +9,6 @@ */ #include "ndissys.h" - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisCompleteDmaTransfer( - OUT PNDIS_STATUS Status, - IN PNDIS_HANDLE NdisDmaHandle, - IN PNDIS_BUFFER Buffer, - IN ULONG Offset, - IN ULONG Length, - IN BOOLEAN WriteToDevice) -{ - UNIMPLEMENTED -} /* @@ -90,21 +73,6 @@ /* * @unimplemented */ -VOID -EXPORT -NdisAllocateDmaChannel( - OUT PNDIS_STATUS Status, - OUT PNDIS_HANDLE NdisDmaHandle, - IN NDIS_HANDLE NdisAdapterHandle, - IN PNDIS_DMA_DESCRIPTION DmaDescription, - IN ULONG MaximumLength) -{ - UNIMPLEMENTED -} - -/* - * @unimplemented - */ NDIS_STATUS EXPORT NdisPciAssignResources( Modified: trunk/reactos/drivers/network/ndis/ndis/40stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] Mon Oct 24 20:38:36 2011 @@ -242,29 +242,6 @@ /* - * @unimplemented - */ -VOID -EXPORT -NdisSetupDmaTransfer( - OUT PNDIS_STATUS Status, - IN PNDIS_HANDLE NdisDmaHandle, - IN PNDIS_BUFFER Buffer, - IN ULONG Offset, - IN ULONG Length, - IN BOOLEAN WriteToDevice) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* * @implemented */ #undef NdisUpdateSharedMemory Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Mon Oct 24 20:38:36 2011 @@ -184,8 +184,36 @@ WRITE_PORT_USHORT(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext? } - -IO_ALLOCATION_ACTION NTAPI NdisMapRegisterCallback ( +IO_ALLOCATION_ACTION NTAPI NdisSubordinateMapRegisterCallback ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID MapRegisterBase, + IN PVOID Context) +/* + * FUNCTION: Called back during reservation of map registers + * ARGUMENTS: + * DeviceObject: Device object of the deivce setting up DMA + * Irp: Reserved; must be ignored + * MapRegisterBase: Map registers assigned for transfer + * Context: LOGICAL_ADAPTER object of the requesting miniport + * NOTES: + * - Called at IRQL = DISPATCH_LEVEL + */ +{ + PNDIS_DMA_BLOCK DmaBlock = Context; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + DmaBlock->MapRegisterBase = MapRegisterBase; + + NDIS_DbgPrint(MAX_TRACE, ("setting event and leaving.\n")); + + KeSetEvent(&DmaBlock->AllocationEvent, 0, FALSE); + + /* We have to hold the object open to keep our lock on the system DMA controller */ + return KeepObject; +} +IO_ALLOCATION_ACTION NTAPI NdisBusMasterMapRegisterCallback ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, @@ -212,11 +240,9 @@ KeSetEvent(Adapter->NdisMiniportBlock.AllocationEvent, 0, FALSE); - /* this is only the thing to do for busmaster NICs */ + /* We're a bus master so we can go ahead and deallocate the object now */ return DeallocateObjectKeepRegisters; -} - - +} /* * @implemented */ @@ -359,7 +385,7 @@ { NtStatus = AdapterObject->DmaOperations->AllocateAdapterChannel( AdapterObject, DeviceObject, MapRegistersPerBaseRegister, - NdisMapRegisterCallback, Adapter); + NdisBusMasterMapRegisterCallback, Adapter); } KeLowerIrql(OldIrql); @@ -398,7 +424,7 @@ /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -409,12 +435,87 @@ IN ULONG Length, IN BOOLEAN WriteToDevice) { - UNIMPLEMENTED - *Status = NDIS_STATUS_FAILURE; -} - -/* - * @unimplemented + PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; + NTSTATUS NtStatus; + PLOGICAL_ADAPTER Adapter; + KIRQL OldIrql; + PDMA_ADAPTER AdapterObject; + ULONG MapRegistersNeeded; + + NDIS_DbgPrint(MAX_TRACE, ("called: Handle 0x%x, Buffer 0x%x, Offset 0x%x, Length 0x%x, WriteToDevice 0x%x\n", + MiniportDmaHandle, Buffer, Offset, Length, WriteToDevice)); + + Adapter = (PLOGICAL_ADAPTER)DmaBlock->Miniport; + AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + + MapRegistersNeeded = (Length + (PAGE_SIZE - 1)) / PAGE_SIZE; + + KeFlushIoBuffers(Buffer, !WriteToDevice, TRUE); + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + { + NtStatus = AdapterObject->DmaOperations->AllocateAdapterChannel(AdapterObject, + Adapter->NdisMiniportBlock.PhysicalDeviceObject, + MapRegistersNeeded, + NdisSubordinateMapRegisterCallback, Adapter); + } + KeLowerIrql(OldIrql); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("AllocateAdapterChannel failed: 0x%x\n", NtStatus)); + AdapterObject->DmaOperations->FreeAdapterChannel(AdapterObject); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + NtStatus = KeWaitForSingleObject(&DmaBlock->AllocationEvent, Executive, KernelMode, FALSE, 0); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("KeWaitForSingleObject failed: 0x%x\n", NtStatus)); + AdapterObject->DmaOperations->FreeAdapterChannel(AdapterObject); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + /* We must throw away the return value of MapTransfer for a system DMA device */ + AdapterObject->DmaOperations->MapTransfer(AdapterObject, Buffer, + DmaBlock->MapRegisterBase, + (PUCHAR)MmGetMdlVirtualAddress(Buffer) + Offset, &Length, WriteToDevice); + + NDIS_DbgPrint(MAX_TRACE, ("returning success\n")); + *Status = NDIS_STATUS_SUCCESS; +} + +/* + * @implemented + */ +VOID +EXPORT +NdisSetupDmaTransfer(OUT PNDIS_STATUS Status, + IN PNDIS_HANDLE NdisDmaHandle, + IN PNDIS_BUFFER Buffer, + IN ULONG Offset, + IN ULONG Length, + IN BOOLEAN WriteToDevice) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 4.0 + */ +{ + NdisMSetupDmaTransfer(Status, + NdisDmaHandle, + Buffer, + Offset, + Length, + WriteToDevice); +} + +/* + * @implemented */ VOID EXPORT @@ -425,10 +526,50 @@ IN ULONG Length, IN BOOLEAN WriteToDevice) { - UNIMPLEMENTED - *Status = NDIS_STATUS_FAILURE; -} - + PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; + PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + + NDIS_DbgPrint(MAX_TRACE, ("called: Handle 0x%x, Buffer 0x%x, Offset 0x%x, Length 0x%x, WriteToDevice 0x%x\n", + MiniportDmaHandle, Buffer, Offset, Length, WriteToDevice)); + + if (!AdapterObject->DmaOperations->FlushAdapterBuffers(AdapterObject, + Buffer, + DmaBlock->MapRegisterBase, + (PUCHAR)MmGetMdlVirtualAddress(Buffer) + Offset, + Length, + WriteToDevice)) + { + NDIS_DbgPrint(MIN_TRACE, ("FlushAdapterBuffers failed\n")); + *Status = NDIS_STATUS_FAILURE; + return; + } + + AdapterObject->DmaOperations->FreeAdapterChannel(AdapterObject); + + NDIS_DbgPrint(MAX_TRACE, ("returning success\n")); + *Status = NDIS_STATUS_SUCCESS; +} + +/* + * @implemented + */ +VOID +EXPORT +NdisCompleteDmaTransfer(OUT PNDIS_STATUS Status, + IN PNDIS_HANDLE NdisDmaHandle, + IN PNDIS_BUFFER Buffer, + IN ULONG Offset, + IN ULONG Length, + IN BOOLEAN WriteToDevice) +{ + NdisMCompleteDmaTransfer(Status, + NdisDmaHandle, + Buffer, + Offset, + Length, + WriteToDevice); +} + /* * @implemented */ @@ -768,6 +909,8 @@ } Adapter->NdisMiniportBlock.SystemAdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + + KeInitializeEvent(&DmaBlock->AllocationEvent, NotificationEvent, FALSE); DmaBlock->Miniport = Adapter; @@ -776,7 +919,24 @@ return NDIS_STATUS_SUCCESS; } - +/* + * @implemented + */ +VOID +EXPORT +NdisAllocateDmaChannel(OUT PNDIS_STATUS Status, + OUT PNDIS_HANDLE NdisDmaHandle, + IN NDIS_HANDLE NdisAdapterHandle, + IN PNDIS_DMA_DESCRIPTION DmaDescription, + IN ULONG MaximumLength) +{ + *Status = NdisMRegisterDmaChannel(NdisDmaHandle, + NdisAdapterHandle, + 0, + FALSE, + DmaDescription, + MaximumLength); +} /* * @implemented */

1 0

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 October 2011