Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 55996: [NTOSKRNL] Comment out two overzealous ASSERTs
by pschweitzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: pschweitzer Date: Sun Mar 4 12:52:02 2012 New Revision: 55996 URL: http://svn.reactos.org/svn/reactos?rev=55996&view=rev Log: [NTOSKRNL] Comment out two overzealous ASSERTs Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Sun Mar 4 12:52:02 2012 @@ -251,7 +251,9 @@ BOOLEAN InsertedNew; DPRINT1("FsRtlPrivateLock() is stubplemented!\n"); - ASSERT(AlreadySynchronized); + /* Windows 2003 ignores that parameter + ASSERT(AlreadySynchronized); + */ /* Initialize the lock, if necessary */ if (!FileLock->LockInformation) @@ -502,7 +504,8 @@ PLOCK_INFORMATION InternalInfo = FileLock->LockInformation; // The region to unlock must correspond exactly to a previously locked region // -- msdn - ASSERT(AlreadySynchronized); + // But Windows 2003 doesn't assert on it and simply ignores that parameter + // ASSERT(AlreadySynchronized); Find.Exclusive.FileLock.StartingByte = *FileOffset; Find.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart;

1 0

[tkreuzer] 55995: [WIN32K] Fix build 2
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 12:01:59 2012 New Revision: 55995 URL: http://svn.reactos.org/svn/reactos?rev=55995&view=rev Log: [WIN32K] Fix build 2 Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Sun Mar 4 12:01:59 2012 @@ -419,7 +419,8 @@ PDC dc; PDC_ATTR pdcattr; POINT *line_pts = NULL, *line_pts_old, *bzr_pts = NULL, bzr[4]; - ULONG i, num_pts, num_bzr_pts, space, space_old, size; + INT num_pts, num_bzr_pts, space, space_old, size; + ULONG i; BOOL result = FALSE; dc = DC_LockDc(hdc);

1 0

[tkreuzer] 55994: [WIN32K] Fix build
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 11:43:08 2012 New Revision: 55994 URL: http://svn.reactos.org/svn/reactos?rev=55994&view=rev Log: [WIN32K] Fix build Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun Mar 4 11:43:08 2012 @@ -1634,8 +1634,8 @@ TRACE("SetClassLong(%d, %x)\n", Index, NewLong); - if ((Index + (INT)sizeof(ULONG_PTR)) < Index || - (Index + (INT)sizeof(ULONG_PTR)) > Class->cbclsExtra) + if (((ULONG)Index + sizeof(ULONG_PTR)) < (ULONG)Index || + ((ULONG)Index + sizeof(ULONG_PTR)) > (ULONG)Class->cbclsExtra) { EngSetLastError(ERROR_INVALID_PARAMETER); return 0;

1 0

[tkreuzer] 55993: [WIN32K] - Fix a possible integer overflow in NtGdiCreateBitmap - Don't cast length of LARGE_STRING (ULONG) to USHORT, instead truncate to MAXUSHORT. This is still hacky, but bett...
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 11:32:43 2012 New Revision: 55993 URL: http://svn.reactos.org/svn/reactos?rev=55993&view=rev Log: [WIN32K] - Fix a possible integer overflow in NtGdiCreateBitmap - Don't cast length of LARGE_STRING (ULONG) to USHORT, instead truncate to MAXUSHORT. This is still hacky, but better than before. - Fix MSVC warnings Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/palette.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/pen.c 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] Sun Mar 4 11:32:43 2012 @@ -2038,7 +2038,7 @@ UINT NTAPI NtUserGetKeyboardLayoutList( - INT nItems, + ULONG nItems, HKL *pHklBuff); BOOL Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -62,8 +62,8 @@ /*************** METRIC.C ***************/ -BOOL FASTCALL InitMetrics(VOID); -ULONG FASTCALL UserGetSystemMetrics(ULONG Index); +BOOL NTAPI InitMetrics(VOID); +LONG NTAPI UserGetSystemMetrics(ULONG Index); /*************** KEYBOARD.C ***************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -64,7 +64,7 @@ NULL, FNID_MESSAGEWND, ICLS_HWNDMESSAGE - } + } }; static struct @@ -82,8 +82,8 @@ { FNID_BUTTON, ICLS_BUTTON}, { FNID_COMBOBOX, ICLS_COMBOBOX}, { FNID_COMBOLBOX, ICLS_COMBOLBOX}, - { FNID_DIALOG, ICLS_DIALOG}, - { FNID_EDIT, ICLS_EDIT}, + { FNID_DIALOG, ICLS_DIALOG}, + { FNID_EDIT, ICLS_EDIT}, { FNID_LISTBOX, ICLS_LISTBOX}, { FNID_MDICLIENT, ICLS_MDICLIENT}, { FNID_STATIC, ICLS_STATIC}, @@ -97,7 +97,7 @@ LookupFnIdToiCls(int FnId, int *iCls ) { int i; - + for ( i = 0; i < ARRAYSIZE(FnidToiCls); i++) { if (FnidToiCls[i].FnId == FnId) @@ -178,7 +178,7 @@ { PCLS Class; PPROCESSINFO pi = (PPROCESSINFO)Process; - + if (pi != NULL) { /* Free all local classes */ @@ -413,7 +413,7 @@ Class->lpfnWndProc = chWndProc; Class->Unicode = TRUE; Class->CSF_flags &= ~CSF_ANSIPROC; - Class->CSF_flags |= CSF_SERVERSIDEPROC; + Class->CSF_flags |= CSF_SERVERSIDEPROC; } else { @@ -433,7 +433,7 @@ { Class->Unicode = !Ansi; Class->lpfnWndProc = chWndProc; - + Class = Class->pclsNext; } @@ -936,7 +936,7 @@ ANSI_STRING AnsiString; Class->lpszClientAnsiMenuName = (PSTR)pszMenuNameBuffer; - AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(MenuName); + AnsiString.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(MenuName); AnsiString.Buffer = Class->lpszClientAnsiMenuName; Status = RtlUnicodeStringToAnsiString(&AnsiString, MenuName, @@ -1525,7 +1525,7 @@ ANSI_STRING AnsiString; PWSTR strBufW; - AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(MenuName); + AnsiString.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(MenuName); strBufW = UserHeapAlloc(MenuName->Length + sizeof(UNICODE_NULL) + AnsiString.MaximumLength); @@ -1634,8 +1634,8 @@ TRACE("SetClassLong(%d, %x)\n", Index, NewLong); - if (Index + sizeof(ULONG_PTR) < Index || - Index + sizeof(ULONG_PTR) > Class->cbclsExtra) + if ((Index + (INT)sizeof(ULONG_PTR)) < Index || + (Index + (INT)sizeof(ULONG_PTR)) > Class->cbclsExtra) { EngSetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -1822,7 +1822,7 @@ lpwcx->style &= ~CS_GLOBALCLASS; lpwcx->lpfnWndProc = IntGetClassWndProc(Class, Ansi); - + lpwcx->cbClsExtra = Class->cbclsExtra; lpwcx->cbWndExtra = Class->cbwndExtra; lpwcx->hIcon = Class->hIcon; /* FIXME: Get handle from pointer */ @@ -1840,7 +1840,7 @@ * lpszClientXxxMenuName should already be mapped to user space. */ /* Copy string ptr to user. */ - if ( Class->lpszClientUnicodeMenuName != NULL && + if ( Class->lpszClientUnicodeMenuName != NULL && Class->MenuNameIsString) { lpwcx->lpszMenuName = UserHeapAddressToUser(Ansi ? @@ -1897,7 +1897,7 @@ ClassName.Length = 0; ClassName.MaximumLength = 0; } - + wc.cbSize = sizeof(wc); wc.style = DefaultServerClasses[i].Style; @@ -2016,15 +2016,14 @@ CapturedMenuName = ProbeForReadUnicodeString(pClassMenuName->pusMenuName); - if ( CapturedName.Length & 1 || - CapturedMenuName.Length & 1 || - CapturedClassInfo.cbClsExtra < 0 || - CapturedClassInfo.cbClsExtra + - CapturedName.Length + - CapturedMenuName.Length + - sizeof(CLS) < CapturedClassInfo.cbClsExtra || - CapturedClassInfo.cbWndExtra < 0 || - CapturedClassInfo.hInstance == NULL) + if ( (CapturedName.Length & 1) || + (CapturedMenuName.Length & 1) || + (CapturedClassInfo.cbClsExtra < 0) || + ((CapturedClassInfo.cbClsExtra + CapturedName.Length + + CapturedMenuName.Length + sizeof(CLS)) + < (ULONG)CapturedClassInfo.cbClsExtra) || + (CapturedClassInfo.cbWndExtra < 0) || + (CapturedClassInfo.hInstance == NULL) ) { ERR("NtUserRegisterClassExWOW Invalid Parameter Error!\n"); goto InvalidParameter; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -59,7 +59,7 @@ break; } } - else + else { co_IntSendMessage(WndChild->head.h, WM_ENDSESSION, KillTimers, lParams); if (KillTimers) @@ -82,7 +82,7 @@ lResult = MCSR_DONOTSHUTDOWN; } } - else + else { co_IntSendMessage(pWindow->head.h, WM_ENDSESSION, KillTimers, lParams); if (KillTimers) @@ -141,7 +141,7 @@ { Hook = TRUE; lResult = co_HOOK_CallHooks(WH_CBT, HCBT_SYSCOMMAND, wParam, lParam); - + if (lResult) return lResult; } @@ -218,7 +218,7 @@ return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); case WM_GETHOTKEY: - return DefWndGetHotKey(UserHMGetHandle(Wnd)); + return DefWndGetHotKey(UserHMGetHandle(Wnd)); case WM_SETHOTKEY: return DefWndSetHotKey(Wnd, wParam); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -102,8 +102,8 @@ /* Initialize the UNICODE_STRING */ ustrDisplayDrivers.Buffer = awcBuffer; - ustrDisplayDrivers.MaximumLength = cbSize; - ustrDisplayDrivers.Length = cbSize; + ustrDisplayDrivers.MaximumLength = (USHORT)cbSize; + ustrDisplayDrivers.Length = (USHORT)cbSize; /* Set Buffer for description and size of remaining buffer */ ustrDescription.Buffer = awcBuffer + (cbSize / sizeof(WCHAR)); @@ -117,8 +117,8 @@ &cbSize); if (NT_SUCCESS(Status)) { - ustrDescription.MaximumLength = cbSize; - ustrDescription.Length = cbSize; + ustrDescription.MaximumLength = (USHORT)cbSize; + ustrDescription.Length = (USHORT)cbSize; } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -137,7 +137,7 @@ ULONG cWaitObjects = 0, cMaxWaitObjects = 1; MOUSE_INPUT_DATA MouseInput; KEYBOARD_INPUT_DATA KeyInput; - + ByteOffset.QuadPart = (LONGLONG)0; //WaitTimeout.QuadPart = (LONGLONG)(-10000000); @@ -196,7 +196,7 @@ &ByteOffset, NULL); } - + if (MouStatus == STATUS_PENDING) WaitObjects[cWaitObjects++] = &pMouDevice->Event; } @@ -215,7 +215,7 @@ sizeof(KEYBOARD_INPUT_DATA), &ByteOffset, NULL); - + } if (KbdStatus == STATUS_PENDING) WaitObjects[cWaitObjects++] = &pKbdDevice->Event; @@ -233,7 +233,8 @@ NULL,//&WaitTimeout, NULL); - if (Status >= STATUS_WAIT_0 && Status < STATUS_WAIT_0 + cWaitObjects) + if ((Status >= STATUS_WAIT_0) && + (Status < (STATUS_WAIT_0 + (LONG)cWaitObjects))) { /* Some device has finished reading */ pSignaledObject = WaitObjects[Status - STATUS_WAIT_0]; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -440,7 +440,7 @@ UINT APIENTRY NtUserGetKeyboardLayoutList( - INT nBuff, + ULONG nBuff, HKL *pHklBuff) { UINT uRet = 0; @@ -600,7 +600,7 @@ pklLast = gspklBaseLayout->pklPrev; while (pklLast != gspklBaseLayout && pklLast->dwKL_Flags & KLF_UNLOAD) pklLast = pklLast->pklPrev; - + /* Add new layout to the list */ pKl->pklNext = pklLast->pklNext; pKl->pklPrev = pklLast; 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 Mar 4 11:32:43 2012 @@ -876,8 +876,8 @@ Msg.lParam |= KF_REPEAT << 16; if (!bIsDown) Msg.lParam |= KF_UP << 16; - /* FIXME: Set KF_DLGMODE and KF_MENUMODE when needed */ - if (pFocusQueue->QF_flags & QF_DIALOGACTIVE) + /* FIXME: Set KF_DLGMODE and KF_MENUMODE when needed */ + if (pFocusQueue->QF_flags & QF_DIALOGACTIVE) Msg.lParam |= KF_DLGMODE << 16; if (pFocusQueue->MenuOwner) // pFocusQueue->MenuState) // MenuState needs a start flag... Msg.lParam |= KF_MENUMODE << 16; @@ -967,7 +967,7 @@ return ProcessKeyEvent(wVk, wScanCode, pKbdInput->dwFlags, bInjected, dwTime, pKbdInput->dwExtraInfo); } -/* +/* * UserProcessKeyboardInput * * Process raw keyboard input data @@ -1045,7 +1045,7 @@ } } -/* +/* * IntTranslateKbdMessage * * Addes WM_(SYS)CHAR messages to message queue if message @@ -1408,8 +1408,8 @@ if (pKeyName) { cchKeyName = wcslen(pKeyName); - if (cchKeyName > cchSize - 1) - cchKeyName = cchSize - 1; // Don't count '\0' + if (cchKeyName > (cchSize - 1UL)) + cchKeyName = cchSize - 1UL; // Don't count '\0' _SEH2_TRY { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -804,7 +804,7 @@ IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition, PROSMENUITEMINFO ItemInfo) { - int pos = (int)uItem; + int pos; PMENU_ITEM MenuItem; PMENU_OBJECT SubMenu = NULL; @@ -818,7 +818,8 @@ { SubMenu = MenuObject; /* calculate position */ - if(MenuObject->MenuInfo.MenuItemCount < pos) + pos = (int)uItem; + if(uItem > MenuObject->MenuInfo.MenuItemCount) { pos = MenuObject->MenuInfo.MenuItemCount; } @@ -1254,7 +1255,7 @@ bti->rcTitleBar.right = pWindowObject->rcWindow.right - pWindowObject->rcWindow.left; bti->rcTitleBar.bottom = pWindowObject->rcWindow.bottom - pWindowObject->rcWindow.top; - /* Is it iconiced ? */ + /* Is it iconiced ? */ if ((dwStyle & WS_ICONIC)!=WS_ICONIC) { /* Remove frame from rectangle */ @@ -1303,24 +1304,24 @@ /* FIXME: Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CYSMCAPTION) */ bti->rcTitleBar.bottom += UserGetSystemMetrics(SM_CYSMCAPTION); } - else + else { /* FIXME: Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CYCAPTION) and UserGetSystemMetrics(SM_CXSIZE) */ bti->rcTitleBar.bottom += UserGetSystemMetrics(SM_CYCAPTION); bti->rcTitleBar.left += UserGetSystemMetrics(SM_CXSIZE); } - if (dwStyle & WS_CAPTION) + if (dwStyle & WS_CAPTION) { bti->rgstate[1] = STATE_SYSTEM_INVISIBLE; - if (dwStyle & WS_SYSMENU) + if (dwStyle & WS_SYSMENU) { - if (!(dwStyle & (WS_MINIMIZEBOX|WS_MAXIMIZEBOX))) + if (!(dwStyle & (WS_MINIMIZEBOX|WS_MAXIMIZEBOX))) { bti->rgstate[2] = STATE_SYSTEM_INVISIBLE; bti->rgstate[3] = STATE_SYSTEM_INVISIBLE; } - else + else { if (!(dwStyle & WS_MINIMIZEBOX)) { @@ -1341,7 +1342,7 @@ bti->rgstate[5] = STATE_SYSTEM_UNAVAILABLE; } } - else + else { bti->rgstate[2] = STATE_SYSTEM_INVISIBLE; bti->rgstate[3] = STATE_SYSTEM_INVISIBLE; @@ -1609,13 +1610,13 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Fail copy the data */ + /* Fail copy the data */ EngSetLastError(ERROR_INVALID_PARAMETER); retValue = FALSE; } _SEH2_END - /* Get the tile bar info */ + /* Get the tile bar info */ if (retValue) { retValue = intGetTitleBarInfo(WindowObject, &bartitleinfo); @@ -1629,7 +1630,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Fail copy the data */ + /* Fail copy the data */ EngSetLastError(ERROR_INVALID_PARAMETER); retValue = FALSE; } @@ -2240,7 +2241,7 @@ { EngSetLastError(ERROR_INVALID_PARAMETER); // This will crash menu (line 80) correct_behavior test! -// "NT4 and below can't handle a bigger MENUITEMINFO struct" +// "NT4 and below can't handle a bigger MENUITEMINFO struct" //EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND); return( FALSE); } @@ -2445,7 +2446,7 @@ ERR("Failed to capture MenuItem Caption (status 0x%08x)\n",Status); SetLastNtError(Status); RETURN(FALSE); - } + } } if (bInsert) RETURN( UserInsertMenuItem(Menu, uItem, fByPosition, lpmii)); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -1844,7 +1844,7 @@ { MSG msg; RECT rect; - WORD wDragWidth, wDragHeight; + ULONG wDragWidth, wDragHeight; DECLARE_RETURN(BOOL); TRACE("Enter NtUserDragDetect(%x)\n", hWnd); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -15,7 +15,7 @@ /* FUNCTIONS *****************************************************************/ BOOL -FASTCALL +NTAPI InitMetrics(VOID) { INT *piSysMet = gpsi->aiSysMet; @@ -175,7 +175,8 @@ return TRUE; } -ULONG FASTCALL +LONG +NTAPI UserGetSystemMetrics(ULONG Index) { ASSERT(gpsi); 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 Mar 4 11:32:43 2012 @@ -94,7 +94,7 @@ if ((pWnd->style & WS_VISIBLE) && IntPtInWindow(pWnd, x, y)) return pWnd; } - + /* Window has not been found */ return NULL; } @@ -177,10 +177,10 @@ pti = PsGetCurrentThreadWin32Thread(); MessageQueue = pti->MessageQueue; - + /* Update counter */ MessageQueue->ShowingCursor += bShow ? 1 : -1; - + /* Check for trivial cases */ if ((bShow && MessageQueue->ShowingCursor != 0) || (!bShow && MessageQueue->ShowingCursor != -1)) @@ -189,7 +189,7 @@ internally to check if cursor is visible */ return MessageQueue->ShowingCursor; } - + /* Check if cursor is above window owned by this MessageQueue */ pWnd = IntTopLevelWindowFromPoint(gpsi->ptCursor.x, gpsi->ptCursor.y); if (pWnd && pWnd->head.pti->MessageQueue == MessageQueue) @@ -206,7 +206,7 @@ GreMovePointer(hdcScreen, -1, -1); TRACE("Removing pointer!\n"); } - + /* Update global info */ IntGetSysCursorInfo()->ShowingCursor = MessageQueue->ShowingCursor; } @@ -1382,7 +1382,7 @@ if ((msg->message == clk_msg.message) && (msg->hwnd == clk_msg.hwnd) && (msg->wParam == clk_msg.wParam) && - (msg->time - clk_msg.time < gspv.iDblClickTime) && + ((msg->time - clk_msg.time) < (ULONG)gspv.iDblClickTime) && (abs(msg->pt.x - clk_msg.pt.x) < UserGetSystemMetrics(SM_CXDOUBLECLK)/2) && (abs(msg->pt.y - clk_msg.pt.y) < UserGetSystemMetrics(SM_CYDOUBLECLK)/2)) { @@ -1999,7 +1999,7 @@ MessageQueue->nCntsQBits[QSRosPostMessage] = 0; MessageQueue->nCntsQBits[QSRosSendMessage] = 0; MessageQueue->nCntsQBits[QSRosHotKey] = 0; - + if (MessageQueue->CursorObject) { PCURICON_OBJECT pCursor = MessageQueue->CursorObject; @@ -2020,7 +2020,7 @@ UserDereferenceObject(pCursor); } - + } PUSER_MESSAGE_QUEUE FASTCALL @@ -2183,7 +2183,7 @@ UserLeave(); - return Ret; + return (SHORT)Ret; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -777,7 +777,7 @@ } BOOL -FASTCALL +FASTCALL IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi) { PPROPERTY pprop; @@ -1831,9 +1831,9 @@ else if (pWnd != NULL) // FIXME: Windows does not do that { UNICODE_STRING ustr; - ustr.Buffer = pWnd->strName.Buffer; - ustr.Length = pWnd->strName.Length; - ustr.MaximumLength = pWnd->strName.MaximumLength; + ustr.Buffer = pWnd->strName.Buffer; // FIXME: LARGE_STRING truncated! + ustr.Length = (USHORT)min(pWnd->strName.Length, MAXUSHORT); + ustr.MaximumLength = (USHORT)min(pWnd->strName.MaximumLength, MAXUSHORT); UserDrawCaptionText(hDc, &ustr, &Rect, uFlags, hFont); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -361,7 +361,7 @@ /* Make sure the page size is valid */ if (Info->nPage < 0) Info->nPage = 0; - else if (Info->nMax - Info->nMin + 1 < Info->nPage) + else if ((Info->nMax - Info->nMin + 1UL) < Info->nPage) { Info->nPage = Info->nMax - Info->nMin + 1; } @@ -371,7 +371,7 @@ { Info->nPos = Info->nMin; } - else if (Info->nPos > Info->nMax - max(Info->nPage - 1, 0)) + else if (Info->nPos > (Info->nMax - max((int)Info->nPage - 1, 0))) { Info->nPos = Info->nMax - max(Info->nPage - 1, 0); } @@ -421,7 +421,7 @@ done: if ( action & SA_SSI_HIDE ) - { + { co_UserShowScrollBar(Window, nBar, FALSE, FALSE); } else @@ -616,7 +616,7 @@ case SB_HORZ: if (fShowH) set_bits |= WS_HSCROLL; else clear_bits |= WS_HSCROLL; - if( nBar == SB_HORZ ) break; + if( nBar == SB_HORZ ) break; /* Fall through */ case SB_VERT: if (fShowV) set_bits |= WS_VSCROLL; @@ -701,8 +701,8 @@ BOOL APIENTRY NtUserSBGetParms( - HWND hWnd, - int fnBar, + HWND hWnd, + int fnBar, PSBDATA pSBData, LPSCROLLINFO lpsi) { @@ -822,11 +822,11 @@ if(InfoH) Chg = (IntEnableScrollBar(TRUE, InfoH, wArrows) || Chg); - + ERR("FIXME: EnableScrollBar wSBflags %d wArrows %d Chg %d\n",wSBflags,wArrows, Chg); // Done in user32: // SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); - + if (OrigArrows == wArrows) RETURN( FALSE); RETURN( TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -727,7 +727,7 @@ UserRefObjectCo(pwndCurrent, &Ref); co_WinPosSetWindowPos(pwndCurrent, 0, pwndCurrent->rcWindow.left,pwndCurrent->rcWindow.top, pwndCurrent->rcWindow.right-pwndCurrent->rcWindow.left - ,pwndCurrent->rcWindow.bottom - pwndCurrent->rcWindow.top, + ,pwndCurrent->rcWindow.bottom - pwndCurrent->rcWindow.top, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS| SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW); UserDerefObjectCo(pwndCurrent); @@ -800,7 +800,7 @@ return SpiSetInt(&gspv.uiGridGranularity, uiParam, KEY_DESKTOP, VAL_GRID, fl); case SPI_GETDESKWALLPAPER: - uiParam = min(uiParam, gspv.ustrWallpaper.Length + 1); + uiParam = min(uiParam, gspv.ustrWallpaper.Length + 1UL); return SpiGet(pvParam, gspv.awcWallpaper, uiParam, fl); case SPI_SETDESKWALLPAPER: @@ -1590,7 +1590,7 @@ } ulResult = 1; } - + return ulResult; } @@ -1616,7 +1616,7 @@ TRACE("Leave NtUserSystemParametersInfo, returning %d\n", bResult); UserLeave(); - + return bResult; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -795,7 +795,7 @@ Rect->bottom = UserGetSystemMetrics(SM_CYMINIMIZED); return; } - if ( Wnd != UserGetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) + if ( Wnd != UserGetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) { *Rect = Wnd->rcClient; RECTL_vOffsetRect(Rect, -Wnd->rcClient.left, -Wnd->rcClient.top); @@ -1953,7 +1953,7 @@ if (Window->state & WNDS_ANSICREATOR) { ANSI_STRING AnsiString; - AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(ClassName)+sizeof(CHAR); + AnsiString.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(ClassName)+sizeof(CHAR); pszClass = UserHeapAlloc(AnsiString.MaximumLength); if (!pszClass) { @@ -1984,13 +1984,13 @@ { UNICODE_STRING Name; Name.Buffer = WindowName->Buffer; - Name.Length = WindowName->Length; - Name.MaximumLength = WindowName->MaximumLength; + Name.Length = (USHORT)min(WindowName->Length, MAXUSHORT); // FIXME: LARGE_STRING truncated + Name.MaximumLength = (USHORT)min(WindowName->MaximumLength, MAXUSHORT); if (Window->state & WNDS_ANSICREATOR) { ANSI_STRING AnsiString; - AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(&Name) + sizeof(CHAR); + AnsiString.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(&Name) + sizeof(CHAR); pszName = UserHeapAlloc(AnsiString.MaximumLength); if (!pszName) { @@ -2325,8 +2325,8 @@ /* We pass it on as a UNICODE_STRING */ ustrClassName.Buffer = lstrClassName.Buffer; - ustrClassName.Length = lstrClassName.Length; - ustrClassName.MaximumLength = lstrClassName.MaximumLength; + ustrClassName.Length = (USHORT)min(lstrClassName.Length, MAXUSHORT); // FIXME: LARGE_STRING truncated + ustrClassName.MaximumLength = (USHORT)min(lstrClassName.MaximumLength, MAXUSHORT); } /* Fill the CREATESTRUCTW */ @@ -2593,10 +2593,10 @@ send WM_GETTEXT messages to windows belonging to its processes */ if (!ClassAtom || Child->pcls->atomClassName == ClassAtom) { - // HACK: use UNICODE_STRING instead of LARGE_STRING + // FIXME: LARGE_STRING truncated CurrentWindowName.Buffer = Child->strName.Buffer; - CurrentWindowName.Length = Child->strName.Length; - CurrentWindowName.MaximumLength = Child->strName.MaximumLength; + CurrentWindowName.Length = (USHORT)min(Child->strName.Length, MAXUSHORT); + CurrentWindowName.MaximumLength = (USHORT)min(Child->strName.MaximumLength, MAXUSHORT); if(!CheckWindowName || (Child->strName.Length < 0xFFFF && !RtlCompareUnicodeString(WindowName, &CurrentWindowName, TRUE))) @@ -2772,8 +2772,8 @@ The user mode version however calls GetWindowText() which will send WM_GETTEXT messages to windows belonging to its processes */ ustr.Buffer = TopLevelWindow->strName.Buffer; - ustr.Length = TopLevelWindow->strName.Length; - ustr.MaximumLength = TopLevelWindow->strName.MaximumLength; + ustr.Length = (USHORT)min(TopLevelWindow->strName.Length, MAXUSHORT); // FIXME:LARGE_STRING truncated + ustr.MaximumLength = (USHORT)min(TopLevelWindow->strName.MaximumLength, MAXUSHORT); WindowMatches = !CheckWindowName || (TopLevelWindow->strName.Length < 0xFFFF && !RtlCompareUnicodeString(&WindowName, &ustr, TRUE)); @@ -3158,7 +3158,7 @@ WinStaObject->ShellListView = hwndListView; ti = GetW32ThreadInfo(); - if (ti->pDeskInfo) + if (ti->pDeskInfo) { ti->pDeskInfo->hShellWindow = hwndShell; ti->pDeskInfo->ppiShellProcess = ti->ppi; @@ -3450,7 +3450,7 @@ case GWL_ID: case GWL_HINSTANCE: case GWL_HWNDPARENT: - RETURN( co_UserSetWindowLong(Window->head.h, Index, (UINT)NewValue, TRUE)); + RETURN( (WORD)co_UserSetWindowLong(Window->head.h, Index, (UINT)NewValue, TRUE)); default: if (Index < 0) { @@ -3459,7 +3459,7 @@ } } - if (Index > Window->cbwndExtra - sizeof(WORD)) + if ((ULONG)Index > (Window->cbwndExtra - sizeof(WORD))) { EngSetLastError(ERROR_INVALID_PARAMETER); RETURN( 0); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -173,7 +173,7 @@ TRACE("X:%d Y:%d XS:%d YS:%d\n",x,y,xspacing,yspacing); - for( i = 0; List[i]; i++) + for(i = 0; List[i]; i++) { PWND Child; @@ -197,7 +197,7 @@ UserDerefObjectCo(Child); - if (x <= rectParent.right - UserGetSystemMetrics(SM_CXMINSPACING)) + if (x <= (rectParent.right - UserGetSystemMetrics(SM_CXMINSPACING))) x += xspacing; else { @@ -228,8 +228,8 @@ } IntGetClientRect( pwndParent, &rectParent ); - if ((Pos->x >= rectParent.left) && (Pos->x + UserGetSystemMetrics(SM_CXICON) < rectParent.right) && - (Pos->y >= rectParent.top) && (Pos->y + UserGetSystemMetrics(SM_CYICON) < rectParent.bottom)) + if ((Pos->x >= rectParent.left) && ((Pos->x + UserGetSystemMetrics(SM_CXICON)) < rectParent.right) && + (Pos->y >= rectParent.top) && ((Pos->y + UserGetSystemMetrics(SM_CYICON)) < rectParent.bottom)) return; /* The icon already has a suitable position */ xspacing = UserGetSystemMetrics(SM_CXICONSPACING); @@ -318,7 +318,7 @@ if (Wnd->state & WNDS_MAXIMIZESTOMONITOR) { Wnd->InternalPos.flags &= ~WPF_MAXINIT; - Wnd->InternalPos.MaxPos.x = Wnd->InternalPos.MaxPos.y = -1; + Wnd->InternalPos.MaxPos.x = Wnd->InternalPos.MaxPos.y = -1; } else { @@ -1893,8 +1893,8 @@ } } - *HitTest = co_IntSendMessage(ScopeWin->head.h, WM_NCHITTEST, 0, - MAKELONG(Point->x, Point->y)); + *HitTest = (USHORT)co_IntSendMessage(ScopeWin->head.h, WM_NCHITTEST, 0, + MAKELONG(Point->x, Point->y)); if ((*HitTest) == (USHORT)HTTRANSPARENT) { UserDereferenceObject(ScopeWin); @@ -2046,7 +2046,7 @@ TRACE("hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", winpos->pos.hwnd, winpos->pos.hwndInsertAfter, winpos->pos.x, winpos->pos.y, winpos->pos.cx, winpos->pos.cy, winpos->pos.flags); - + pwnd = UserGetWindowObject(winpos->pos.hwnd); if (!pwnd) continue; Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -126,10 +126,10 @@ AngleEnd = atan2((RectSEpts.bottom - CenterY), RectSEpts.right - CenterX)*(360.0/(M_PI*2)); AngleStart = atan2((RectSEpts.top - CenterY), RectSEpts.left - CenterX)*(360.0/(M_PI*2)); - SfCx = (Rcos(AngleStart) * RadiusX); - SfCy = (Rsin(AngleStart) * RadiusY); - EfCx = (Rcos(AngleEnd) * RadiusX); - EfCy = (Rsin(AngleEnd) * RadiusY); + SfCx = (LONG)(Rcos(AngleStart) * RadiusX); + SfCy = (LONG)(Rsin(AngleStart) * RadiusY); + EfCx = (LONG)(Rcos(AngleEnd) * RadiusX); + EfCy = (LONG)(Rsin(AngleEnd) * RadiusY); if ((arctype == GdiTypePie) || (arctype == GdiTypeChord)) { Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -158,11 +158,11 @@ /* Calculate width and image size in bytes */ cjWidthBytes = WIDTH_BYTES_ALIGN16(nWidth, cRealBpp); - cjSize = cjWidthBytes * nHeight; - - /* Check parameters (possible overflow of cjWidthBytes!) */ - if (iFormat == 0 || nWidth <= 0 || nWidth >= 0x8000000 || nHeight <= 0 || - cBitsPixel > 32 || cPlanes > 32 || cjSize >= 0x100000000ULL) + cjSize = (ULONGLONG)cjWidthBytes * nHeight; + + /* Check parameters (possible overflow of cjSize!) */ + if ((iFormat == 0) || (nWidth <= 0) || (nWidth >= 0x8000000) || (nHeight <= 0) || + (cBitsPixel > 32) || (cPlanes > 32) || (cjSize >= 0x100000000ULL)) { DPRINT1("Invalid bitmap format! Width=%d, Height=%d, Bpp=%d, Planes=%d\n", nWidth, nHeight, cBitsPixel, cPlanes); @@ -178,7 +178,7 @@ PSURFACE psurf = SURFACE_ShareLockSurface(hbmp); _SEH2_TRY { - ProbeForRead(pUnsafeBits, cjSize, 1); + ProbeForRead(pUnsafeBits, (SIZE_T)cjSize, 1); UnsafeSetBitmapBits(psurf, 0, pUnsafeBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -141,9 +141,9 @@ } biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - if (biBitCount <= 8 && StartIndex < (1 << biBitCount)) - { - if (StartIndex + Entries > (1 << biBitCount)) + if ((biBitCount <= 8) && (StartIndex < (1UL << biBitCount))) + { + if (StartIndex + Entries > (1UL << biBitCount)) Entries = (1 << biBitCount) - StartIndex; if (psurf->ppal == NULL) @@ -537,7 +537,8 @@ LONG width, height; WORD planes, bpp; DWORD compr, size ; - int i, bitmap_type; + USHORT i; + int bitmap_type; RGBTRIPLE* rgbTriples; RGBQUAD* rgbQuads; VOID* colorPtr; @@ -618,10 +619,10 @@ case 0: /* Only info */ if(pbmci) { - pbmci->bmciHeader.bcWidth = psurf->SurfObj.sizlBitmap.cx; - pbmci->bmciHeader.bcHeight = (psurf->SurfObj.fjBitmap & BMF_TOPDOWN) ? + pbmci->bmciHeader.bcWidth = (WORD)psurf->SurfObj.sizlBitmap.cx; + pbmci->bmciHeader.bcHeight = (WORD)((psurf->SurfObj.fjBitmap & BMF_TOPDOWN) ? -psurf->SurfObj.sizlBitmap.cy : - psurf->SurfObj.sizlBitmap.cy; + psurf->SurfObj.sizlBitmap.cy); pbmci->bmciHeader.bcPlanes = 1; pbmci->bmciHeader.bcBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); } @@ -674,19 +675,19 @@ { if(Usage == DIB_RGB_COLORS) { - unsigned int colors = min(psurf->ppal->NumColors, 1 << bpp); + ULONG colors = min(psurf->ppal->NumColors, 256); if(pbmci) { - for(i=0; i < colors; i++) + for(i = 0; i < colors; i++) { rgbTriples[i].rgbtRed = psurf->ppal->IndexedColors[i].peRed; rgbTriples[i].rgbtGreen = psurf->ppal->IndexedColors[i].peGreen; rgbTriples[i].rgbtBlue = psurf->ppal->IndexedColors[i].peBlue; } } - if(colors != 1 << bpp) Info->bmiHeader.biClrUsed = colors; - for(i=0; i < colors; i++) + if(colors != 256) Info->bmiHeader.biClrUsed = colors; + for(i = 0; i < colors; i++) { rgbQuads[i].rgbRed = psurf->ppal->IndexedColors[i].peRed; rgbQuads[i].rgbGreen = psurf->ppal->IndexedColors[i].peGreen; @@ -695,7 +696,7 @@ } else { - for(i=0; i < 1 << bpp; i++) + for(i = 0; i < 256; i++) { if(pbmci) ((WORD*)rgbTriples)[i] = i; ((WORD*)rgbQuads)[i] = i; @@ -706,7 +707,7 @@ { if(Usage == DIB_PAL_COLORS) { - for(i=0; i < 1 << bpp; i++) + for(i = 0; i < 256; i++) { if(pbmci) ((WORD*)rgbTriples)[i] = i; ((WORD*)rgbQuads)[i] = i; @@ -877,7 +878,7 @@ POINTL srcPoint; BOOL ret ; - if (StartScan > psurf->SurfObj.sizlBitmap.cy) + if (StartScan > (ULONG)psurf->SurfObj.sizlBitmap.cy) { ScanLines = 0; goto done; @@ -889,8 +890,8 @@ /* Fixup values */ Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx; - Info->bmiHeader.biHeight = height < 0 ? - -ScanLines : ScanLines; + Info->bmiHeader.biHeight = (height < 0) ? + -(LONG)ScanLines : ScanLines; /* Create the DIB */ hBmpDest = DIB_CreateDIBSection(pDC, Info, Usage, &pDIBits, NULL, 0, 0); /* Restore them */ @@ -1379,7 +1380,7 @@ { ProbeForRead(&bmi->bmiHeader.biSize, sizeof(DWORD), 1); ProbeForRead(bmi, bmi->bmiHeader.biSize, 1); - ProbeForRead(bmi, DIB_BitmapInfoSize(bmi, Usage), 1); + ProbeForRead(bmi, DIB_BitmapInfoSize(bmi, (WORD)Usage), 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1783,7 +1784,7 @@ FASTCALL BuildDIBPalette(CONST BITMAPINFO *bmi) { - BYTE bits; + WORD bits; ULONG ColorCount; HPALETTE hPal; ULONG RedMask = 0, GreenMask = 0, BlueMask = 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -1315,14 +1315,14 @@ INT YLeft, INT Width, INT Height, - double StartArc, + double StartArc, // FIXME: don't use floating point! double EndArc, ARCTYPE arctype) { PDC_ATTR pdcattr; PBRUSH pbrush; - int Start = ceil(StartArc); - int End = ceil(EndArc); + int Start = (int)ceil(StartArc); + int End = (int)ceil(EndArc); BOOL Chord = (arctype == GdiTypeChord), ret; pdcattr = dc->pdcattr; @@ -1351,13 +1351,13 @@ INT YLeft, INT Width, INT Height, - double StartArc, + double StartArc, // FIXME: don't use floating point! double EndArc, ARCTYPE arctype, PBRUSH pbrush) { - int Start = ceil(StartArc); - int End = ceil(EndArc); + int Start = (int)ceil(StartArc); + int End = (int)ceil(EndArc); BOOL Chord = (arctype == GdiTypeChord); // Sort out alignment here. return app_draw_arc(dc, rect( XLeft, YLeft, Width, Height), Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -355,7 +355,7 @@ PULONG SafeCounts; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = TRUE; - INT nPoints = 0, nMaxPoints = 0, nInvalid = 0, i; + ULONG nPoints = 0, nMaxPoints = 0, nInvalid = 0, i; if (!UnsafePoints || !UnsafeCounts || Count == 0 || iFunc == 0 || iFunc > GdiPolyPolyRgn) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -1227,7 +1227,7 @@ { POBJ pobj; FLONG fl = 0; - UCHAR objt = ObjectType >> 16; + UCHAR objt = (ObjectType >> 16) & 0xFF; if ((objt == GDIObjType_DC_TYPE && cjSize == sizeof(DC)) || (objt == GDIObjType_PAL_TYPE && cjSize == sizeof(PALETTE)) || Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -334,7 +334,7 @@ PULONG PolyPoints, DWORD Count) { - int i; + ULONG i; LPPOINT pts; PULONG pc; BOOL ret = FALSE; // Default to failure @@ -419,7 +419,7 @@ PDC dc; PDC_ATTR pdcattr; POINT *line_pts = NULL, *line_pts_old, *bzr_pts = NULL, bzr[4]; - INT i, num_pts, num_bzr_pts, space, space_old, size; + ULONG i, num_pts, num_bzr_pts, space, space_old, size; BOOL result = FALSE; dc = DC_LockDc(hdc); Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -404,7 +404,7 @@ if (ppdev->flFlags & PDEV_GAMMARAMP_TABLE) { - INT i; + ULONG i; PGAMMARAMP GammaRamp = (PGAMMARAMP)ppdev->pvGammaRamp; for ( i = 0; i < Colors; i++) { @@ -980,7 +980,7 @@ CONST LPPALETTEENTRY pe) { PPALETTE palGDI; - WORD numEntries; + ULONG numEntries; if ((UINT)hpal & GDI_HANDLE_STOCK_MASK) { Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -13,6 +13,10 @@ #define NDEBUG #include <debug.h> +#ifdef _MSC_VER +#pragma warning(disable:4244) +#endif + #define NUM_ENTRIES_INITIAL 16 /* Initial size of points / flags arrays */ #define GROW_FACTOR_NUMER 2 /* Numerator of grow factor for the array */ #define GROW_FACTOR_DENOM 1 /* Denominator of grow factor */ @@ -20,7 +24,7 @@ /*********************************************************************** * Internal functions */ - + /* PATH_DestroyGdiPath * * Destroys a GdiPath structure (frees the memory in the arrays). @@ -71,7 +75,7 @@ GdiPathDPtoLP(PDC pdc, PPOINT ppt, INT count) { XFORMOBJ xo; - + XFORMOBJ_vInit(&xo, &pdc->dclevel.mxDeviceToWorld); return XFORMOBJ_bApplyXform(&xo, XF_LTOL, count, (PPOINTL)ppt, (PPOINTL)ppt); } @@ -738,7 +742,7 @@ { PPATH pPath; POINT lastmove, orig_pos; - INT i; + ULONG i; PDC_ATTR pdcattr; BOOL State = FALSE, Ret = FALSE; @@ -751,7 +755,7 @@ return FALSE; } - pdcattr = dc->pdcattr; + pdcattr = dc->pdcattr; lastmove.x = orig_pos.x = pdcattr->ptlCurrent.x; lastmove.y = orig_pos.y = pdcattr->ptlCurrent.y; Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Sun Mar 4 11:32:43 2012 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * PURPOSE: Pen functiona * FILE: subsys/win32k/objects/pen.c - * PROGRAMER: + * PROGRAMER: */ #include <win32k.h> @@ -230,7 +230,7 @@ cbRetCount = sizeof(EXTLOGPEN) - sizeof(DWORD) + pbrushPen->dwStyleCount * sizeof(DWORD); if (pBuffer) { - INT i; + ULONG i; if (cbCount < cbRetCount) return 0; pExtLogPen = (PEXTLOGPEN)pBuffer;

1 0

[janderwald] 55992: [LIBUSB] - Fix bug while scanning endpoint descriptors - Do not assume interface info has the correct number of pipes set - Fix alternate interface handling - Tested in VBox + U...
by janderwald＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: janderwald Date: Sun Mar 4 11:07:13 2012 New Revision: 55992 URL: http://svn.reactos.org/svn/reactos?rev=55992&view=rev Log: [LIBUSB] - Fix bug while scanning endpoint descriptors - Do not assume interface info has the correct number of pipes set - Fix alternate interface handling - Tested in VBox + USB Audio Device Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/lib/drivers/libusb/libusb.h trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sun Mar 4 11:07:13 2012 @@ -798,6 +798,7 @@ // sanity checks // ASSERT(EndPointDesc); + DPRINT("HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes %x\n", EndPointDesc, EndPointDesc->bEndpointAddress, EndPointDesc->bmAttributes); ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_ISOCHRONOUS); // Modified: trunk/reactos/lib/drivers/libusb/libusb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/libusb.… ============================================================================== --- trunk/reactos/lib/drivers/libusb/libusb.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/libusb.h [iso-8859-1] Sun Mar 4 11:07:13 2012 @@ -12,7 +12,6 @@ { #include <usbdlib.h> } - // // FIXME: Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev… ============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Sun Mar 4 11:07:13 2012 @@ -65,6 +65,8 @@ virtual VOID DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); virtual VOID DumpConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); virtual NTSTATUS GetConfigurationDescriptor(UCHAR ConfigurationIndex, USHORT BufferSize, PVOID Buffer); + virtual NTSTATUS BuildInterfaceDescriptor(IN ULONG ConfigurationIndex, IN PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo, OUT PUSB_INTERFACE *OutUsbInterface); + // constructor / destructor CUSBDevice(IUnknown *OuterUnknown){} @@ -916,6 +918,92 @@ // return Status; } +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::BuildInterfaceDescriptor( + IN ULONG ConfigurationIndex, + IN PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, + OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo, + OUT PUSB_INTERFACE *OutUsbInterface) +{ + PUSB_INTERFACE UsbInterface; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + ULONG PipeIndex; + + // allocate interface handle + UsbInterface = (PUSB_INTERFACE)ExAllocatePool(NonPagedPool, sizeof(USB_INTERFACE) + (InterfaceDescriptor->bNumEndpoints - 1) * sizeof(USB_ENDPOINT)); + if (!UsbInterface) + { + // failed to allocate memory + return STATUS_INSUFFICIENT_RESOURCES; + } + + // zero descriptor + RtlZeroMemory(UsbInterface, sizeof(USB_INTERFACE) + (InterfaceDescriptor->bNumEndpoints - 1) * sizeof(USB_ENDPOINT)); + + // store handle + InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)UsbInterface; + InterfaceInfo->Class = InterfaceDescriptor->bInterfaceClass; + InterfaceInfo->SubClass = InterfaceDescriptor->bInterfaceSubClass; + InterfaceInfo->Protocol = InterfaceDescriptor->bInterfaceProtocol; + InterfaceInfo->Reserved = 0; + + + // init interface handle + UsbInterface->InterfaceDescriptor = InterfaceDescriptor; + InsertTailList(&m_ConfigurationDescriptors[ConfigurationIndex].InterfaceList, &UsbInterface->ListEntry); + + // grab first endpoint descriptor + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) (InterfaceDescriptor + 1); + + // now copy all endpoint information + for(PipeIndex = 0; PipeIndex < InterfaceDescriptor->bNumEndpoints; PipeIndex++) + { + while(EndpointDescriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE) + { + // skip intermediate descriptors + if (EndpointDescriptor->bLength == 0 || EndpointDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) + { + // bogus configuration descriptor + DPRINT1("[USBEHCI] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, + EndpointDescriptor->bLength, EndpointDescriptor->bDescriptorType); + + // failed + return STATUS_UNSUCCESSFUL; + } + + // move to next descriptor + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndpointDescriptor + EndpointDescriptor->bLength); + } + + // store in interface info + RtlCopyMemory(&UsbInterface->EndPoints[PipeIndex].EndPointDescriptor, EndpointDescriptor, sizeof(USB_ENDPOINT_DESCRIPTOR)); + + DPRINT("Configuration Descriptor %p Length %lu\n", m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor, m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor->wTotalLength); + DPRINT("EndpointDescriptor %p DescriptorType %x bLength %x\n", EndpointDescriptor, EndpointDescriptor->bDescriptorType, EndpointDescriptor->bLength); + DPRINT("EndpointDescriptorHandle %p bAddress %x bmAttributes %x\n",&UsbInterface->EndPoints[PipeIndex], UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress, + UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.bmAttributes); + + // copy pipe info + InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.wMaxPacketSize; + InterfaceInfo->Pipes[PipeIndex].EndpointAddress = UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress; + InterfaceInfo->Pipes[PipeIndex].Interval = UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.bInterval; + InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.bmAttributes; + InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)&UsbInterface->EndPoints[PipeIndex]; + + // move to next descriptor + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndpointDescriptor + EndpointDescriptor->bLength); + } + + if (OutUsbInterface) + { + // output result + *OutUsbInterface = UsbInterface; + } + return STATUS_SUCCESS; + +} + //---------------------------------------------------------------------------------------- NTSTATUS @@ -924,7 +1012,7 @@ IN PUSBD_INTERFACE_INFORMATION InterfaceInfo, OUT USBD_CONFIGURATION_HANDLE *ConfigurationHandle) { - ULONG InterfaceIndex, PipeIndex; + ULONG InterfaceIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; UCHAR bConfigurationValue = 0; @@ -932,7 +1020,6 @@ UCHAR Found = FALSE; PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; PUSB_INTERFACE UsbInterface; - PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; PLIST_ENTRY Entry; if (ConfigurationDescriptor) @@ -1029,61 +1116,11 @@ ASSERT(InterfaceInfo->NumberOfPipes == InterfaceDescriptor->bNumEndpoints); // copy interface info - InterfaceInfo->Class = InterfaceDescriptor->bInterfaceClass; - InterfaceInfo->SubClass = InterfaceDescriptor->bInterfaceSubClass; - InterfaceInfo->Protocol = InterfaceDescriptor->bInterfaceProtocol; - InterfaceInfo->Reserved = 0; - - // allocate interface handle - UsbInterface = (PUSB_INTERFACE)ExAllocatePool(NonPagedPool, sizeof(USB_INTERFACE) + (InterfaceInfo->NumberOfPipes - 1) * sizeof(USB_ENDPOINT)); - if (!UsbInterface) + Status = BuildInterfaceDescriptor(ConfigurationIndex, InterfaceDescriptor, InterfaceInfo, NULL); + if (!NT_SUCCESS(Status)) { - // failed to allocate memory - return STATUS_INSUFFICIENT_RESOURCES; - } - - // store handle - InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)UsbInterface; - - // init interface handle - UsbInterface->InterfaceDescriptor = InterfaceDescriptor; - InsertTailList(&m_ConfigurationDescriptors[ConfigurationIndex].InterfaceList, &UsbInterface->ListEntry); - - // grab first endpoint descriptor - EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) (InterfaceDescriptor + 1); - - // now copy all endpoint information - for(PipeIndex = 0; PipeIndex < InterfaceInfo->NumberOfPipes; PipeIndex++) - { - while(EndpointDescriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE && EndpointDescriptor->bLength != sizeof(USB_ENDPOINT_DESCRIPTOR)) - { - // skip intermediate descriptors - if (EndpointDescriptor->bLength == 0 || EndpointDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) - { - // bogus configuration descriptor - DPRINT1("[USBEHCI] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, - EndpointDescriptor->bLength, EndpointDescriptor->bDescriptorType); - - // failed - return STATUS_UNSUCCESSFUL; - } - - // move to next descriptor - EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndpointDescriptor + EndpointDescriptor->bLength); - } - - // store in interface info - RtlCopyMemory(&UsbInterface->EndPoints[PipeIndex].EndPointDescriptor, EndpointDescriptor, sizeof(USB_ENDPOINT_DESCRIPTOR)); - - // copy pipe info - InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.wMaxPacketSize; - InterfaceInfo->Pipes[PipeIndex].EndpointAddress = UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress; - InterfaceInfo->Pipes[PipeIndex].Interval = UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.bInterval; - InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)UsbInterface->EndPoints[PipeIndex].EndPointDescriptor.bmAttributes; - InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)&UsbInterface->EndPoints[PipeIndex]; - - // move to next descriptor - EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndpointDescriptor + EndpointDescriptor->bLength); + // failed + break; } // move offset @@ -1108,6 +1145,7 @@ ULONG Index, ConfigurationIndex = 0, Found = FALSE; PUSB_INTERFACE UsbInterface; PLIST_ENTRY Entry; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; // check if handle is valid for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++) @@ -1171,17 +1209,35 @@ if (!Found) { - // selected interface but interface not found - // something is really wrong - DPRINT1("[USBEHCI] Error: interface not found!!!\n"); - return STATUS_UNSUCCESSFUL; + // find interface descriptor + InterfaceDescriptor = USBD_ParseConfigurationDescriptor(m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting); + if (!InterfaceDescriptor) + { + DPRINT1("[LIBUSB] No such interface Alternate %x InterfaceNumber %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber); + return STATUS_UNSUCCESSFUL; + } + + // build interface descriptor + Status = BuildInterfaceDescriptor(ConfigurationIndex, InterfaceDescriptor, InterfaceInfo, &UsbInterface); + if (!NT_SUCCESS(Status)) + { + // failed + DPRINT1("[LIBUSB] Failed to build interface descriptor Status %x\n", Status); + return Status; + } } // assert on pipe length mismatch - ASSERT(InterfaceInfo->NumberOfPipes == UsbInterface->InterfaceDescriptor->bNumEndpoints); + DPRINT1("NumberOfPipes %lu Endpoints %lu Length %lu\n", InterfaceInfo->NumberOfPipes, UsbInterface->InterfaceDescriptor->bNumEndpoints, InterfaceInfo->Length); + + // sanity check + ASSERT(GET_USBD_INTERFACE_SIZE(UsbInterface->InterfaceDescriptor->bNumEndpoints) == InterfaceInfo->Length); + + // store number of pipes + InterfaceInfo->NumberOfPipes = UsbInterface->InterfaceDescriptor->bNumEndpoints; // copy pipe handles - for(PipeIndex = 0; PipeIndex < min(InterfaceInfo->NumberOfPipes, UsbInterface->InterfaceDescriptor->bNumEndpoints); PipeIndex++) + for(PipeIndex = 0; PipeIndex < UsbInterface->InterfaceDescriptor->bNumEndpoints; PipeIndex++) { // copy pipe handle DPRINT1("PipeIndex %lu\n", PipeIndex);

1 0

[sir_richard] 55991: [NTOS]: If the address space is exhausted, don't ASSERT, simply return failure just as Windows does. Should fix the last of the ASSERTions on TestBot. Next step is to support V...
by sir_richard＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: sir_richard Date: Sun Mar 4 07:04:42 2012 New Revision: 55991 URL: http://svn.reactos.org/svn/reactos?rev=55991&view=rev Log: [NTOS]: If the address space is exhausted, don't ASSERT, simply return failure just as Windows does. Should fix the last of the ASSERTions on TestBot. Next step is to support VirtualProtect/Query correctly. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Mar 4 07:04:42 2012 @@ -3345,7 +3345,7 @@ &Process->VadRoot, (PMMADDRESS_NODE*)&Process->VadFreeHint, &StartingAddress); - ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) goto FailPath; // // Now we know where the allocation ends. Make sure it doesn't end up

1 0

[sir_richard] 55990: [NTOS]: Blimey this was a hard one. When using the reserved flag to request 1MB in a new process (which is used for starting SMSS and CSRSS), we must request 1MB - 256 bytes (o...
by sir_richard＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: sir_richard Date: Sun Mar 4 06:42:49 2012 New Revision: 55990 URL: http://svn.reactos.org/svn/reactos?rev=55990&view=rev Log: [NTOS]: Blimey this was a hard one. When using the reserved flag to request 1MB in a new process (which is used for starting SMSS and CSRSS), we must request 1MB - 256 bytes (or any number, actually) to offset the fact that with a base address of 0x4, a 1MB region gets us at 0x100FFF, and not 0xFFFF, because Windows computes ending address *before* alignment, and then returns a new region size for you (so if you pass in 1MB, you get 1MB + 4096KB). In Win32csr, when the code is trying to release 1MB, this ended up in our "Case A", because it would still leave a page in the VAD. Fixed rtl to request just shy off a MB. Verified on Windows as well. [NTOS]: The fix above was due to fixing "EndingAddress" which was being initialized to zero too late (after writing to it!). This caused allocations with a fixed base address that were already on top of another allocation not to be seen as a conflict, then we tried inserting a VAD and received an ASSERT saying we've already found a VAD there. After fixing the sizing code, the bug above creeped up. Whoever wrote the NtFreeVirtualMemory test is a godsend. It has been nailing bug after bug in the VAD implementation. Thank you. Modified: trunk/reactos/lib/rtl/process.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/process.c?rev=5599… ============================================================================== --- trunk/reactos/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/process.c [iso-8859-1] Sun Mar 4 06:42:49 2012 @@ -84,7 +84,7 @@ { /* Give 1MB starting at 0x4 */ BaseAddress = (PVOID)4; - EnviroSize = 1024 * 1024; + EnviroSize = (1024 * 1024) - 256; Status = ZwAllocateVirtualMemory(ProcessHandle, &BaseAddress, 0, Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Mar 4 06:42:49 2012 @@ -3295,6 +3295,8 @@ // PRegionSize = ROUND_TO_PAGES(PRegionSize); PageCount = BYTES_TO_PAGES(PRegionSize); + EndingAddress = 0; + StartingAddress = 0; } else { @@ -3336,7 +3338,6 @@ // which was passed in isn't already conflicting with an existing address // range. // - EndingAddress = 0; if (!PBaseAddress) { Status = MiFindEmptyAddressRangeInTree(PRegionSize, @@ -3345,6 +3346,17 @@ (PMMADDRESS_NODE*)&Process->VadFreeHint, &StartingAddress); ASSERT(NT_SUCCESS(Status)); + + // + // Now we know where the allocation ends. Make sure it doesn't end up + // somewhere in kernel mode. + // + EndingAddress = ((ULONG_PTR)StartingAddress + PRegionSize - 1) | (PAGE_SIZE - 1); + if ((PVOID)EndingAddress > MM_HIGHEST_VAD_ADDRESS) + { + Status = STATUS_NO_MEMORY; + goto FailPath; + } } else if (MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, EndingAddress >> PAGE_SHIFT, @@ -3354,17 +3366,6 @@ // The address specified is in conflict! // Status = STATUS_CONFLICTING_ADDRESSES; - goto FailPath; - } - - // - // Now we know where the allocation ends. Make sure it doesn't end up - // somewhere in kernel mode. - // - EndingAddress = ((ULONG_PTR)StartingAddress + PRegionSize - 1) | (PAGE_SIZE - 1); - if ((PVOID)EndingAddress > MM_HIGHEST_VAD_ADDRESS) - { - Status = STATUS_NO_MEMORY; goto FailPath; }

1 0

[janderwald] 55989: [KS] - Fix property item merge in KsMergeAutomationTable
by janderwald＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: janderwald Date: Sun Mar 4 04:44:48 2012 New Revision: 55989 URL: http://svn.reactos.org/svn/reactos?rev=55989&view=rev Log: [KS] - Fix property item merge in KsMergeAutomationTable Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/filter.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sun Mar 4 04:44:48 2012 @@ -2087,15 +2087,100 @@ return STATUS_SUCCESS; } +VOID +KspAddPropertyItem( + OUT PKSPROPERTY_SET OutPropertySet, + IN PKSPROPERTY_ITEM PropertyItem, + IN ULONG PropertyItemSize) +{ + PKSPROPERTY_ITEM CurrentPropertyItem; + ULONG Index; + + // check if the property item is already present + CurrentPropertyItem = (PKSPROPERTY_ITEM)OutPropertySet->PropertyItem; + for(Index = 0; Index < OutPropertySet->PropertiesCount; Index++) + { + if (CurrentPropertyItem->PropertyId == PropertyItem->PropertyId) + { + // item already present + return; + } + + // next item + CurrentPropertyItem = (PKSPROPERTY_ITEM)((ULONG_PTR)CurrentPropertyItem + PropertyItemSize); + } + // add item + RtlCopyMemory(CurrentPropertyItem, PropertyItem, PropertyItemSize); + OutPropertySet->PropertiesCount++; +} + +NTSTATUS +KspMergePropertySet( + OUT PKSAUTOMATION_TABLE Table, + OUT PKSPROPERTY_SET OutPropertySet, + IN PKSPROPERTY_SET PropertySetA, + IN PKSPROPERTY_SET PropertySetB, + IN KSOBJECT_BAG Bag OPTIONAL) +{ + ULONG PropertyCount, Index; + PKSPROPERTY_ITEM PropertyItem, CurrentPropertyItem; + NTSTATUS Status; + + // max properties + PropertyCount = PropertySetA->PropertiesCount + PropertySetB->PropertiesCount; + + // allocate items + PropertyItem = AllocateItem(NonPagedPool, Table->PropertyItemSize * PropertyCount); + if (!PropertyItem) + return STATUS_INSUFFICIENT_RESOURCES; + + if (Bag) + { + /* add table to object bag */ + Status = KsAddItemToObjectBag(Bag, PropertyItem, NULL); + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* free table */ + FreeItem(Table); + return Status; + } + } + + // copy entries from dominant table + RtlCopyMemory(PropertyItem, PropertySetA->PropertyItem, Table->PropertyItemSize * PropertySetA->PropertiesCount); + + // init property set + OutPropertySet->PropertiesCount = PropertySetA->PropertiesCount; + OutPropertySet->PropertyItem = PropertyItem; + + // copy other entries + CurrentPropertyItem = (PKSPROPERTY_ITEM)PropertySetB->PropertyItem; + for(Index = 0; Index < PropertySetB->PropertiesCount; Index++) + { + + // add entries + KspAddPropertyItem(OutPropertySet, CurrentPropertyItem, Table->PropertyItemSize); + + // next entry + CurrentPropertyItem = (PKSPROPERTY_ITEM)((ULONG_PTR)CurrentPropertyItem + Table->PropertyItemSize); + } + + // done + return STATUS_SUCCESS; +} + NTSTATUS KspCopyPropertySets( OUT PKSAUTOMATION_TABLE Table, IN PKSAUTOMATION_TABLE AutomationTableA OPTIONAL, - IN PKSAUTOMATION_TABLE AutomationTableB OPTIONAL) + IN PKSAUTOMATION_TABLE AutomationTableB OPTIONAL, + IN KSOBJECT_BAG Bag OPTIONAL) { ULONG Index, SubIndex, Count; BOOL bFound; + NTSTATUS Status; if (!AutomationTableA) { @@ -2137,6 +2222,17 @@ RtlMoveMemory((PVOID)&Table->PropertySets[Count], &AutomationTableB->PropertySets[Index], sizeof(KSPROPERTY_SET)); Count++; } + else + { + // merge property sets + Status = KspMergePropertySet(Table, (PKSPROPERTY_SET)&Table->PropertySets[SubIndex], (PKSPROPERTY_SET)&AutomationTableA->PropertySets[SubIndex], (PKSPROPERTY_SET)&AutomationTableB->PropertySets[Index], Bag); + if (!NT_SUCCESS(Status)) + { + // failed to merge + DPRINT1("[KS] Failed to merge %x\n", Status); + return Status; + } + } } return STATUS_SUCCESS; @@ -2249,6 +2345,12 @@ { /* use item size from 2nd automation table */ Table->PropertyItemSize = AutomationTableB->PropertyItemSize; + } + + if (AutomationTableA && AutomationTableB) + { + // FIXME handle different propery item sizes + ASSERT(AutomationTableA->PropertyItemSize == AutomationTableB->PropertyItemSize); } /* now allocate the property sets */ @@ -2272,7 +2374,7 @@ } } /* now copy the property sets */ - Status = KspCopyPropertySets(Table, AutomationTableA, AutomationTableB); + Status = KspCopyPropertySets(Table, AutomationTableA, AutomationTableB, Bag); if(!NT_SUCCESS(Status)) goto cleanup; Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Sun Mar 4 04:44:48 2012 @@ -955,7 +955,7 @@ UNIMPLEMENTED Status = STATUS_NOT_FOUND; } - //DPRINT("KspPinPropertyHandler Pins %lu Request->Id %lu Status %lx\n", This->PinDescriptorCount, Request->Id, Status); + DPRINT("KspPinPropertyHandler Pins %lu Request->Id %lu Status %lx\n", This->Filter.Descriptor->PinDescriptorsCount, Request->Id, Status); return Status; @@ -1029,6 +1029,9 @@ SetCount = FilterInstance->Descriptor->AutomationTable->PropertySetsCount; PropertySet = FilterInstance->Descriptor->AutomationTable->PropertySets; PropertyItemSize = FilterInstance->Descriptor->AutomationTable->PropertyItemSize; + // FIXME: handle variable sized property items + ASSERT(PropertyItemSize == sizeof(KSPROPERTY_ITEM)); + PropertyItemSize = 0; } /* needed for our property handlers */ @@ -1063,6 +1066,7 @@ } RtlStringFromGUID(&Property->Set, &GuidString); + DPRINT("IKsFilter_DispatchDeviceIoControl property PinCount %x\n", FilterInstance->Descriptor->PinDescriptorsCount); DPRINT("IKsFilter_DispatchDeviceIoControl property Set |%S| Id %u Flags %x Status %lx ResultLength %lu\n", GuidString.Buffer, Property->Id, Property->Flags, Status, Irp->IoStatus.Information); RtlFreeUnicodeString(&GuidString);

1 0

[sir_richard] 55988: [NTOS]: Release the *right* lock. "Fix the fix" as the yuppies say.
by sir_richard＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: sir_richard Date: Sun Mar 4 03:18:47 2012 New Revision: 55988 URL: http://svn.reactos.org/svn/reactos?rev=55988&view=rev Log: [NTOS]: Release the *right* lock. "Fix the fix" as the yuppies say. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Mar 4 03:18:47 2012 @@ -4068,7 +4068,7 @@ // return whatever failure code was sent. // FailPath: - MiUnlockWorkingSet(CurrentThread, AddressSpace); + MmUnlockAddressSpace(AddressSpace); if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); return Status;

1 0

[ion] 55987: [WIN32K]: Should fix usb/livecd failure reported by igorko. bug 6696..or something?
by ion＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: ion Date: Sun Mar 4 03:06:20 2012 New Revision: 55987 URL: http://svn.reactos.org/svn/reactos?rev=55987&view=rev Log: [WIN32K]: Should fix usb/livecd failure reported by igorko. bug 6696..or something? Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sun Mar 4 03:06:20 2012 @@ -10,9 +10,13 @@ #pragma once +#if 0 #ifndef _MSC_VER #define PLACE_IN_SECTION(s) __attribute__((section(s))) #define INIT_FUNCTION PLACE_IN_SECTION("INIT") +#else +#define INIT_FUNCTION +#endif #else #define INIT_FUNCTION #endif

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