Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[akhaldi] 67964: [FTP] Fix array index use before limits check. By Kudratov Olimjon using Cppcheck. CORE-8978

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 30 10:21:48 2015 New Revision: 67964 URL: http://svn.reactos.org/svn/reactos?rev=67964&view=rev Log: [FTP] Fix array index use before limits check. By Kudratov Olimjon using Cppcheck. CORE-8978 Modified: trunk/reactos/base/applications/network/ftp/cmds.c Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Sat May 30 10:21:48 2015 @@ -1842,10 +1842,10 @@ char *cp2 = new; register int i, ostop, found; - for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++); + for (ostop = 0; ostop < 16 && *(ntout + ostop); ostop++); for (cp1 = name; *cp1; cp1++) { found = 0; - for (i = 0; *(ntin + i) && i < 16; i++) { + for (i = 0; i < 16 && *(ntin + i); i++) { if (*cp1 == *(ntin + i)) { found++; if (i < ostop) {

9 years, 3 months

[akhaldi] 67963: [NOTEPAD] Fix array index use before limits check. By Kudratov Olimjon using Cppcheck. CORE-8978

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 30 10:19:49 2015 New Revision: 67963 URL: http://svn.reactos.org/svn/reactos?rev=67963&view=rev Log: [NOTEPAD] Fix array index use before limits check. By Kudratov Olimjon using Cppcheck. CORE-8978 Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sat May 30 10:19:49 2015 @@ -1075,7 +1075,7 @@ SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM) &dwStart, (LPARAM) &dwEnd); nLine = 1; - for (i = 0; pszText[i] && (i < (int) dwStart); i++) + for (i = 0; (i < (int) dwStart) && pszText[i]; i++) { if (pszText[i] == '\n') nLine++;

9 years, 3 months

[akhaldi] 67962: [NOTEPAD] Fix loading font settings. By Lee Schroeder. CORE-9074

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 30 10:15:48 2015 New Revision: 67962 URL: http://svn.reactos.org/svn/reactos?rev=67962&view=rev Log: [NOTEPAD] Fix loading font settings. By Lee Schroeder. CORE-9074 Modified: trunk/reactos/base/applications/notepad/settings.c Modified: trunk/reactos/base/applications/notepad/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] Sat May 30 10:15:48 2015 @@ -162,11 +162,31 @@ if (dwPointSize != 0) Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); + else + Globals.lfFont.lfHeight = HeightFromPointSize(100); RegCloseKey(hKey); } + else + { + /* If no settings are found in the registry, then use default values */ + Globals.lfFont.lfCharSet = 163; + Globals.lfFont.lfClipPrecision = 2; + Globals.lfFont.lfEscapement = 0; + _tcscpy(Globals.lfFont.lfFaceName, _T("Arial")); + Globals.lfFont.lfItalic = 0; + Globals.lfFont.lfOrientation = 0; + Globals.lfFont.lfOutPrecision = 3; + Globals.lfFont.lfPitchAndFamily = 34; + Globals.lfFont.lfQuality = 1; + Globals.lfFont.lfStrikeOut = 0; + Globals.lfFont.lfUnderline = 0; + Globals.lfFont.lfWeight = 400; + Globals.lfFont.lfHeight = HeightFromPointSize(100); + } hFont = CreateFontIndirect(&Globals.lfFont); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)hFont, (LPARAM)TRUE); if (hFont) { if (Globals.hFont) @@ -199,7 +219,7 @@ GetWindowRect(Globals.hMainWnd, &Globals.main_rect); if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, - 0, NULL, 0, KEY_ALL_ACCESS, NULL, + 0, NULL, 0, KEY_SET_VALUE, NULL, &hKey, &dwDisposition) == ERROR_SUCCESS) { SaveDword(hKey, _T("lfCharSet"), Globals.lfFont.lfCharSet);

9 years, 3 months

[aandrejevic] 67961: [NTVDM][BASESRV] - When a DOS application is started by a process that has no console, the ConsoleHandle in the VDM_CONSOLE_RECORD is initially NULL. Fix that by making an init...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat May 30 02:23:44 2015 New Revision: 67961 URL: http://svn.reactos.org/svn/reactos?rev=67961&view=rev Log: [NTVDM][BASESRV] - When a DOS application is started by a process that has no console, the ConsoleHandle in the VDM_CONSOLE_RECORD is initially NULL. Fix that by making an initial VDM_GET_FIRST_COMMAND call in NTVDM and setting the ConsoleHandle to the handle of NTVDM's console in BaseSrvGetNextVDMCommand. - Fix a bug in BaseSrvGetVDMExitCode (VDM_READY means the task has exited). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/win/basesrv/vdm.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat May 30 02:23:44 2015 @@ -216,6 +216,14 @@ UNREFERENCED_PARAMETER(Parameter); ASSERT(Env); + + /* Clear the structure */ + RtlZeroMemory(&CommandInfo, sizeof(CommandInfo)); + + /* Get the initial information */ + CommandInfo.TaskId = SessionId; + CommandInfo.VDMState = VDM_GET_FIRST_COMMAND | VDM_FLAG_DOS; + GetNextVDMCommand(&CommandInfo); do { Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Sat May 30 02:23:44 2015 @@ -976,6 +976,13 @@ goto Cleanup; } + /* Check if the console handle hasn't been set yet */ + if (ConsoleRecord->ConsoleHandle == NULL) + { + /* Set it now */ + ConsoleRecord->ConsoleHandle = GetNextVdmCommandRequest->ConsoleHandle; + } + /* Fill the command information */ Status = BaseSrvFillCommandInfo(DosRecord->CommandInfo, GetNextVdmCommandRequest); goto Cleanup; @@ -1204,7 +1211,7 @@ } /* Check if this task is still running */ - if (DosRecord->State == VDM_READY) + if (DosRecord->State != VDM_READY) { GetVDMExitCodeRequest->ExitCode = STATUS_PENDING; goto Cleanup;

9 years, 3 months

[akhaldi] 67960: [USER32] Sync combo.c with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 29 22:06:52 2015 New Revision: 67960 URL: http://svn.reactos.org/svn/reactos?rev=67960&view=rev Log: [USER32] Sync combo.c with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/combo.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri May 29 22:06:52 2015 @@ -293,7 +293,7 @@ User32 - reactos/win32ss/user/user32/controls/button.c # Synced to WineStaging-1.7.37 - reactos/win32ss/user/user32/controls/combo.c # Synced to Wine-1.5.10 + reactos/win32ss/user/user32/controls/combo.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/edit.c # Synced to Wine-1_1_40 reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1_1_39 Modified: trunk/reactos/win32ss/user/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] Fri May 29 22:06:52 2015 @@ -49,8 +49,10 @@ #define CB_OWNERDRAWN( lphc ) ((lphc)->dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) #define CB_HASSTRINGS( lphc ) ((lphc)->dwStyle & CBS_HASSTRINGS) #define CB_HWND( lphc ) ((lphc)->self) -// ReactOS already define in include/controls.h We have it here as a sync note. -//#define CB_GETTYPE( lphc ) ((lphc)->dwStyle & (CBS_DROPDOWNLIST)) +#ifndef __REACTOS__ +/* ReactOS already define in include/controls.h We have it here as a sync note. */ +#define CB_GETTYPE( lphc ) ((lphc)->dwStyle & (CBS_DROPDOWNLIST)) +#endif #define ISWIN31 (LOWORD(GetVersion()) == 0x0a03) @@ -78,8 +80,12 @@ { comboboxW, /* name */ CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */ +#ifdef __REACTOS__ ComboWndProcA, /* procA */ ComboWndProcW, /* procW */ +#else + WINPROC_COMBO, /* proc */ +#endif sizeof(HEADCOMBO *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -123,7 +129,7 @@ return FALSE; } - +#ifdef __REACTOS__ /* Retrieve the UI state for the control */ static BOOL COMBO_update_uistate(LPHEADCOMBO lphc) { @@ -133,6 +139,7 @@ lphc->UIState = DefWindowProcW(lphc->self, WM_QUERYUISTATE, 0, 0); return prev_flags != lphc->UIState; } +#endif /*********************************************************************** * COMBO_NCCreate @@ -146,7 +153,9 @@ lphc->self = hwnd; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); +#ifdef __REACTOS__ COMBO_update_uistate(lphc); +#endif /* some braindead apps do try to use scrollbar/border flags */ @@ -717,7 +726,7 @@ dis.itemState = itemState; dis.hDC = hdc; dis.rcItem = rectEdit; - dis.itemData = SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, id, 0 ); + dis.itemData = SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, id, 0); /* * Clip the DC and have the parent draw the item. @@ -726,7 +735,7 @@ SendMessageW(lphc->owner, WM_DRAWITEM, ctlid, (LPARAM)&dis ); - SelectClipRgn( hdc, clipRegion); + SelectClipRgn( hdc, clipRegion ); if (clipRegion) DeleteObject( clipRegion ); } else @@ -749,15 +758,22 @@ &rectEdit, pText ? pText : empty_stringW , size, NULL ); - if(lphc->wState & CBF_FOCUSED && !(lphc->wState & CBF_DROPPED) && +#ifdef __REACTOS__ + if(lphc->wState & CBF_FOCUSED && + !(lphc->wState & CBF_DROPPED) && !(lphc->UIState & UISF_HIDEFOCUS)) +#else + if(lphc->wState & CBF_FOCUSED && !(lphc->wState & CBF_DROPPED)) +#endif DrawFocusRect( hdc, &rectEdit ); } if( hPrevFont ) SelectObject(hdc, hPrevFont ); } +#ifdef __REACTOS__ if (pText) +#endif HeapFree( GetProcessHeap(), 0, pText ); } @@ -805,7 +821,12 @@ */ if (CB_DISABLED(lphc)) { - hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLORSTATIC); +#ifdef __REACTOS__ + hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLORSTATIC); +#else + hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, + (WPARAM)hDC, (LPARAM)lphc->self ); +#endif /* * We have to change the text color since WM_CTLCOLORSTATIC will * set it to the "enabled" color. This is the same behavior as the @@ -816,7 +837,12 @@ else { /* FIXME: In which cases WM_CTLCOLORLISTBOX should be sent? */ - hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLOREDIT); +#ifdef __REACTOS__ + hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLOREDIT); +#else + hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, + (WPARAM)hDC, (LPARAM)lphc->self ); +#endif } /* @@ -910,8 +936,7 @@ if( pText ) { GetWindowTextW( lphc->hWndEdit, pText, length + 1); - idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, - (WPARAM)(-1), (LPARAM)pText ); + idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, (WPARAM)(-1), (LPARAM)pText); HeapFree( GetProcessHeap(), 0, pText ); } @@ -944,8 +969,7 @@ { if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) ) { - SendMessageW(lphc->hWndLBox, LB_GETTEXT, - (WPARAM)index, (LPARAM)pText ); + SendMessageW(lphc->hWndLBox, LB_GETTEXT, (WPARAM)index, (LPARAM)pText ); } } } @@ -996,7 +1020,7 @@ lphc->droppedIndex = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, - (WPARAM)(lphc->droppedIndex == LB_ERR ? 0 : lphc->droppedIndex), 0 ); + (WPARAM)(lphc->droppedIndex == LB_ERR ? 0 : lphc->droppedIndex), 0 ); SendMessageW(lphc->hWndLBox, LB_CARETON, 0, 0); } @@ -1052,14 +1076,14 @@ mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); - if (r.bottom > mon_info.rcWork.bottom ) + if (r.bottom > mon_info.rcWork.bottom) { r.top = max( rect.top - nDroppedHeight, mon_info.rcWork.top ); r.bottom = min( r.top + nDroppedHeight, mon_info.rcWork.bottom ); } - //// ReactOS : Use HWND_TOPMOST See Bug 5705 or CORE-5186.... + SetWindowPos( lphc->hWndLBox, HWND_TOPMOST, r.left, r.top, r.right - r.left, r.bottom - r.top, - SWP_NOACTIVATE | SWP_SHOWWINDOW); + SWP_NOACTIVATE | SWP_SHOWWINDOW ); if( !(lphc->wState & CBF_NOREDRAW) ) @@ -1297,7 +1321,7 @@ lphc->wState |= CBF_NOLBSELECT; CBUpdateEdit( lphc, index ); /* select text in edit, as Windows does */ - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); } else { @@ -1557,7 +1581,7 @@ &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1633,8 +1657,7 @@ } } else if ( CB_OWNERDRAWN(lphc) ) /* set listbox item height */ - lRet = SendMessageW(lphc->hWndLBox, LB_SETITEMHEIGHT, - (WPARAM)index, (LPARAM)height ); + lRet = SendMessageW(lphc->hWndLBox, LB_SETITEMHEIGHT, (WPARAM)index, (LPARAM)height); return lRet; } @@ -1799,7 +1822,9 @@ len = strlen(str); ret = HeapAlloc(GetProcessHeap(), 0, len + 1); +#ifdef __REACTOS__ if (ret != NULL) +#endif memcpy(ret, str, len + 1); return ret; } @@ -1807,8 +1832,7 @@ /*********************************************************************** * ComboWndProc_common */ -LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); #ifdef __REACTOS__ @@ -1829,11 +1853,15 @@ return 0; } } - } -#endif + } +#endif TRACE("[%p]: msg %s wp %08lx lp %08lx\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); + +#ifndef __REACTOS__ + if (!IsWindow(hwnd)) return 0; +#endif if( lphc || message == WM_NCCREATE ) switch(message) @@ -1850,7 +1878,7 @@ case WM_NCDESTROY: COMBO_NCDestroy(lphc); #ifdef __REACTOS__ - NtUserSetWindowFNID(hwnd, FNID_DESTROY); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); #endif break;/* -> DefWindowProc */ @@ -1911,8 +1939,8 @@ lphc->wState |= CBF_BEENFOCUSED; } } - else - COMBO_SetFocus( lphc ); + else + COMBO_SetFocus( lphc ); return TRUE; case WM_KILLFOCUS: { @@ -1981,7 +2009,11 @@ SendMessageW(lphc->hWndLBox, message, wParam, lParam); return 0; case WM_SYSKEYDOWN: - if( KF_ALTDOWN & HIWORD(lParam) ) // ReactOS (wine) KEYDATA_ALT +#ifdef __REACTOS__ + if( KF_ALTDOWN & HIWORD(lParam) ) +#else + if( KEYDATA_ALT & HIWORD(lParam) ) +#endif if( wParam == VK_UP || wParam == VK_DOWN ) COMBO_FlipListbox( lphc, FALSE, FALSE ); return 0; @@ -2001,7 +2033,7 @@ /* fall through */ case WM_CHAR: case WM_IME_CHAR: - { + { HWND hwndTarget; if( lphc->wState & CBF_EDIT ) @@ -2122,20 +2154,20 @@ return SendMessageW(lphc->hWndLBox, LB_GETLOCALE, 0, 0); case CB_SETLOCALE: return SendMessageW(lphc->hWndLBox, LB_SETLOCALE, wParam, 0); - case CB_SETDROPPEDWIDTH: - if( (CB_GETTYPE(lphc) == CBS_SIMPLE) || - (INT)wParam >= 32768 ) - return CB_ERR; - /* new value must be higher than combobox width */ - if((INT)wParam >= lphc->droppedRect.right - lphc->droppedRect.left) - lphc->droppedWidth = wParam; - else if(wParam) - lphc->droppedWidth = 0; - - /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); - - /* fall through */ + case CB_SETDROPPEDWIDTH: + if( (CB_GETTYPE(lphc) == CBS_SIMPLE) || + (INT)wParam >= 32768 ) + return CB_ERR; + /* new value must be higher than combobox width */ + if((INT)wParam >= lphc->droppedRect.right - lphc->droppedRect.left) + lphc->droppedWidth = wParam; + else if(wParam) + lphc->droppedWidth = 0; + + /* recalculate the combobox area */ + CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + + /* fall through */ case CB_GETDROPPEDWIDTH: if( lphc->droppedWidth ) return lphc->droppedWidth; @@ -2144,7 +2176,7 @@ if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam ); return CB_OKAY; case CB_GETDROPPEDSTATE: - return (lphc->wState & CBF_DROPPED) ? TRUE : FALSE; + return (lphc->wState & CBF_DROPPED) != 0; case CB_DIR: return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam); @@ -2206,14 +2238,15 @@ else lphc->wState &= ~CBF_EUI; return CB_OKAY; case CB_GETEXTENDEDUI: - return (lphc->wState & CBF_EUI) ? TRUE : FALSE; + return (lphc->wState & CBF_EUI) != 0; case CB_GETCOMBOBOXINFO: return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); case CB_LIMITTEXT: if( lphc->wState & CBF_EDIT ) return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); - return TRUE; - + return TRUE; + +#ifdef __REACTOS__ case WM_UPDATEUISTATE: if (unicode) DefWindowProcW(lphc->self, message, wParam, lParam); @@ -2227,6 +2260,7 @@ NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); } break; +#endif default: if (message >= WM_USER) @@ -2238,6 +2272,8 @@ DefWindowProcA(hwnd, message, wParam, lParam); } +#ifdef __REACTOS__ + /*********************************************************************** * ComboWndProcA * @@ -2259,6 +2295,8 @@ return ComboWndProc_common( hwnd, message, wParam, lParam, TRUE ); } +#endif /* __REACTOS__ */ + /************************************************************************* * GetComboBoxInfo (USER32.@) */ @@ -2266,9 +2304,9 @@ PCOMBOBOXINFO pcbi /* [in/out] combo box information */) { TRACE("(%p, %p)\n", hwndCombo, pcbi); -#ifndef __REACTOS__ +#ifdef __REACTOS__ + return NtUserGetComboBoxInfo(hwndCombo, pcbi); +#else return SendMessageW(hwndCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi); -#else - return NtUserGetComboBoxInfo(hwndCombo, pcbi); #endif }

9 years, 3 months

[akhaldi] 67959: [USER32] Sync button.c with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 29 21:48:55 2015 New Revision: 67959 URL: http://svn.reactos.org/svn/reactos?rev=67959&view=rev Log: [USER32] Sync button.c with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri May 29 21:48:55 2015 @@ -292,7 +292,7 @@ reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 User32 - - reactos/win32ss/user/user32/controls/button.c # Synced to Wine-1_1_39 + reactos/win32ss/user/user32/controls/button.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/combo.c # Synced to Wine-1.5.10 reactos/win32ss/user/user32/controls/edit.c # Synced to Wine-1_1_40 reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.37 Modified: trunk/reactos/win32ss/user/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Fri May 29 21:48:55 2015 @@ -74,12 +74,14 @@ #define UISTATE_GWL_OFFSET (HIMAGE_GWL_OFFSET+sizeof(HFONT)) #define NB_EXTRA_BYTES (UISTATE_GWL_OFFSET+sizeof(LONG)) - /* undocumented flags */ +/* undocumented flags */ #define BUTTON_NSTATES 0x0F #define BUTTON_BTNPRESSED 0x40 #define BUTTON_UNKNOWN2 0x20 #define BUTTON_UNKNOWN3 0x10 +#ifdef __REACTOS__ #define BUTTON_BMCLICK 0x100 // ReactOS Need to up to wine! +#endif #define BUTTON_NOTIFY_PARENT(hWnd, code) \ do { /* Notify parent which has created this button control */ \ @@ -145,8 +147,12 @@ { buttonW, /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ +#ifdef __REACTOS__ ButtonWndProcA, /* procA */ ButtonWndProcW, /* procW */ +#else + WINPROC_BUTTON, /* proc */ +#endif NB_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -163,6 +169,8 @@ SetWindowLongPtrW( hwnd, STATE_GWL_OFFSET, state ); } +#ifdef __REACTOS__ + static __inline void set_ui_state( HWND hwnd, LONG flags ) { SetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET, flags ); @@ -173,7 +181,9 @@ return GetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET ); } -__inline static HFONT get_button_font( HWND hwnd ) +#endif /* __REACTOS__ */ + +static inline HFONT get_button_font( HWND hwnd ) { return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); } @@ -208,6 +218,7 @@ return buffer; } +#ifdef __REACTOS__ /* Retrieve the UI state for the control */ static BOOL button_update_uistate(HWND hwnd, BOOL unicode) { @@ -228,6 +239,7 @@ return FALSE; } +#endif /*********************************************************************** * ButtonWndProc_common @@ -259,8 +271,11 @@ return 0; } } - } -#endif + } + +#else + if (!IsWindow( hWnd )) return 0; +#endif pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); @@ -306,7 +321,9 @@ #endif } set_button_state( hWnd, BST_UNCHECKED ); +#ifdef __REACTOS__ button_update_uistate( hWnd, unicode ); +#endif return 0; #ifdef __REACTOS__ @@ -324,7 +341,14 @@ HBRUSH hBrush; HWND parent = GetParent(hWnd); if (!parent) parent = hWnd; +#ifdef __REACTOS__ hBrush = GetControlColor( parent, hWnd, hdc, WM_CTLCOLORBTN); +#else + hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hdc, (LPARAM)hWnd); + if (!hBrush) /* did the app forget to call defwindowproc ? */ + hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORBTN, + (WPARAM)hdc, (LPARAM)hWnd); +#endif GetClientRect(hWnd, &rc); FillRect(hdc, &rc, hBrush); } @@ -433,22 +457,33 @@ // Patch: http://source.winehq.org/patches/data/70889 // By: Alexander LAW, Replicate Windows behavior of WM_SETTEXT handler regarding WM_CTLCOLOR* // +#ifdef __REACTOS__ if (style & WS_VISIBLE) { +#endif 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; +#ifdef __REACTOS__ + 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; +#endif if (!parent) parent = hWnd; - - hbrush = GetControlColor( parent, hWnd, hdc, ctlMessage); +#ifdef __REACTOS__ + hbrush = GetControlColor(parent, hWnd, hdc, ctlMessage); +#else + 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); +#endif GetClientRect(hWnd, &client); rc = client; @@ -458,8 +493,10 @@ if (rc.bottom > client.bottom) rc.bottom = client.bottom; FillRect(hdc, &rc, hbrush); ReleaseDC(hWnd, hdc); - } -//// +#ifdef __REACTOS__ + } +#endif + 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 */ @@ -508,9 +545,9 @@ btn_type = wParam & BS_TYPEMASK; style = (style & ~BS_TYPEMASK) | btn_type; #ifdef __REACTOS__ - NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style); #else - WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); + WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); #endif /* Only redraw if lParam flag is set.*/ @@ -520,20 +557,20 @@ break; case BM_CLICK: - //// ReactOS - state = get_button_state( hWnd ); +#ifdef __REACTOS__ + state = get_button_state(hWnd); if (state & BUTTON_BMCLICK) break; - set_button_state( hWnd, state | BUTTON_BMCLICK ); // Tracked in STATE_GWL_OFFSET. - //// + set_button_state(hWnd, state | BUTTON_BMCLICK); // Tracked in STATE_GWL_OFFSET. +#endif SendMessageW( hWnd, WM_LBUTTONDOWN, 0, 0 ); SendMessageW( hWnd, WM_LBUTTONUP, 0, 0 ); - //// - state = get_button_state( hWnd ); +#ifdef __REACTOS__ + state = get_button_state(hWnd); if (!(state & BUTTON_BMCLICK)) break; state &= ~BUTTON_BMCLICK; - set_button_state( hWnd, state ); - //// + set_button_state(hWnd, state); +#endif break; case BM_SETIMAGE: @@ -567,7 +604,7 @@ #ifdef __REACTOS__ if (wParam) style |= WS_TABSTOP; else style &= ~WS_TABSTOP; - NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style); #else if (wParam) WIN_SetStyle( hWnd, WS_TABSTOP, 0 ); else WIN_SetStyle( hWnd, 0, WS_TABSTOP ); @@ -595,6 +632,7 @@ paint_button( hWnd, btn_type, ODA_SELECT ); break; +#ifdef __REACTOS__ case WM_UPDATEUISTATE: if (unicode) DefWindowProcW(hWnd, uMsg, wParam, lParam); @@ -604,6 +642,7 @@ if (button_update_uistate(hWnd, unicode)) paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); break; +#endif case WM_NCHITTEST: if(btn_type == BS_GROUPBOX) return HTTRANSPARENT; @@ -615,28 +654,30 @@ return 0; } +#ifdef __REACTOS__ + /*********************************************************************** * ButtonWndProcW * The button window procedure. This is just a wrapper which locks * the passed HWND and calls the real window procedure (with a WND* * pointer pointing to the locked windowstructure). */ -LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow( hWnd )) return 0; - return ButtonWndProc_common( hWnd, uMsg, wParam, lParam, TRUE ); -} - +LRESULT WINAPI ButtonWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (!IsWindow(hWnd)) return 0; + return ButtonWndProc_common(hWnd, uMsg, wParam, lParam, TRUE); +} /*********************************************************************** * ButtonWndProcA */ -LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow( hWnd )) return 0; - return ButtonWndProc_common( hWnd, uMsg, wParam, lParam, FALSE ); -} - +LRESULT WINAPI ButtonWndProcA(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (!IsWindow(hWnd)) return 0; + return ButtonWndProc_common(hWnd, uMsg, wParam, lParam, FALSE); +} + +#endif /* __REACTOS__ */ /********************************************************************** * Convert button styles to flags used by DrawText. @@ -720,9 +761,10 @@ } DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); HeapFree( GetProcessHeap(), 0, text ); - - if (get_ui_state( hwnd ) & UISF_HIDEACCEL) +#ifdef __REACTOS__ + if (get_ui_state(hwnd) & UISF_HIDEACCEL) dtStyle |= DT_HIDEPREFIX; +#endif break; case BS_ICON: @@ -841,8 +883,10 @@ lp = (LPARAM)text; wp = (WPARAM)dtFlags; +#ifdef __REACTOS__ if (dtFlags & DT_HIDEPREFIX) flags |= DSS_HIDEPREFIX; +#endif break; case BS_ICON: @@ -888,7 +932,11 @@ if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); parent = GetParent(hwnd); if (!parent) parent = hwnd; +#ifdef __REACTOS__ GetControlColor( parent, hwnd, hDC, WM_CTLCOLORBTN); +#else + SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); +#endif hrgn = set_control_clipping( hDC, &rc ); #ifdef __REACTOS__ @@ -946,11 +994,15 @@ draw_focus: if (action == ODA_FOCUS || (state & BST_FOCUS)) { +#ifdef __REACTOS__ if (!(get_ui_state(hwnd) & UISF_HIDEFOCUS)) { +#endif InflateRect( &rc, -2, -2 ); DrawFocusRect( hDC, &rc ); - } +#ifdef __REACTOS__ + } +#endif } cleanup: @@ -990,7 +1042,15 @@ parent = GetParent(hwnd); if (!parent) parent = hwnd; - hBrush = GetControlColor( parent, hwnd, hDC, WM_CTLCOLORSTATIC); +#ifdef __REACTOS__ + hBrush = GetControlColor(parent, hwnd, hDC, WM_CTLCOLORSTATIC); +#else + 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 ); +#endif hrgn = set_control_clipping( hDC, &client ); if (style & BS_LEFTTEXT) @@ -1031,8 +1091,8 @@ else if (state & BST_INDETERMINATE) flags = DFCS_BUTTON3STATE; else flags = DFCS_BUTTONCHECK; - if (state & (BST_CHECKED | BST_INDETERMINATE)) flags |= DFCS_CHECKED; - if (state & BST_PUSHED) flags |= DFCS_PUSHED; + if (state & (BST_CHECKED | BST_INDETERMINATE)) flags |= DFCS_CHECKED; + if (state & BST_PUSHED) flags |= DFCS_PUSHED; if (style & WS_DISABLED) flags |= DFCS_INACTIVE; @@ -1077,13 +1137,17 @@ /* ... and focus */ if (action == ODA_FOCUS || (state & BST_FOCUS)) { +#ifdef __REACTOS__ if (!(get_ui_state(hwnd) & UISF_HIDEFOCUS)) { +#endif rtext.left--; rtext.right++; IntersectRect(&rtext, &rtext, &client); DrawFocusRect( hDC, &rtext ); - } +#ifdef __REACTOS__ + } +#endif } SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); @@ -1132,8 +1196,14 @@ /* GroupBox acts like static control, so it sends CTLCOLORSTATIC */ parent = GetParent(hwnd); if (!parent) parent = hwnd; - hbr = GetControlColor( parent, hwnd, hDC, WM_CTLCOLORSTATIC); - +#ifdef __REACTOS__ + hbr = GetControlColor(parent, hwnd, hDC, WM_CTLCOLORSTATIC); +#else + 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); +#endif GetClientRect( hwnd, &rc); rcFrame = rc; hrgn = set_control_clipping( hDC, &rc ); @@ -1182,14 +1252,25 @@ parent = GetParent(hwnd); if (!parent) parent = hwnd; +#ifdef __REACTOS__ hBrush = GetControlColor( parent, hwnd, hDC, WM_CTLCOLORBTN); +#else + hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd); + if (!hBrush) /* did the app forget to call defwindowproc ? */ + hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORBTN, + (WPARAM)hDC, (LPARAM)hwnd); +#endif FillRect( hDC, &rc, hBrush ); if (action == ODA_FOCUS || (state & BST_FOCUS)) +#ifdef __REACTOS__ { if (!(get_ui_state(hwnd) & UISF_HIDEFOCUS)) +#endif DrawFocusRect( hDC, &rc ); - } +#ifdef __REACTOS__ + } +#endif switch (action) { @@ -1236,7 +1317,11 @@ if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hDC, hFont ); parent = GetParent(hwnd); if (!parent) parent = hwnd; +#ifdef __REACTOS__ GetControlColor( parent, hwnd, hDC, WM_CTLCOLORBTN); +#else + SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); +#endif hrgn = set_control_clipping( hDC, &dis.rcItem );

9 years, 3 months

[akhaldi] 67958: [README.WINE] Mark some user32 source files as synced with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 29 21:30:01 2015 New Revision: 67958 URL: http://svn.reactos.org/svn/reactos?rev=67958&view=rev Log: [README.WINE] Mark some user32 source files as synced with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri May 29 21:30:01 2015 @@ -295,7 +295,7 @@ reactos/win32ss/user/user32/controls/button.c # Synced to Wine-1_1_39 reactos/win32ss/user/user32/controls/combo.c # Synced to Wine-1.5.10 reactos/win32ss/user/user32/controls/edit.c # Synced to Wine-1_1_40 - reactos/win32ss/user/user32/controls/icontitle.c # Synced to Wine-1_1_39 + reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1_1_39 reactos/win32ss/user/user32/controls/scrollbar.c # Forked reactos/win32ss/user/user32/controls/static.c # Synced to Wine-1_1_39 @@ -303,8 +303,8 @@ reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24 reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) - reactos/win32ss/user/user32/misc/ddeclient.c # Synced to Wine-1_1_23 - reactos/win32ss/user/user32/misc/ddeserver.c # Synced to Wine-1_1_23 + reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.37 + reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 reactos/win32ss/user/user32/misc/resources.c # Forked? reactos/win32ss/user/user32/misc/winhelp.c # Last sync date unknown @@ -317,7 +317,7 @@ reactos/win32ss/user/user32/windows/menu.c # Forked reactos/win32ss/user/user32/windows/messagebox.c # Forked reactos/win32ss/user/user32/windows/rect.c # Forked (uitools.c) - reactos/win32ss/user/user32/windows/spy.c # Synced to Wine-1_1_40 + reactos/win32ss/user/user32/windows/spy.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/windows/text.c # Forked (lstr.c) reactos/win32ss/user/user32/windows/winpos.c # Forked

9 years, 3 months

[akhaldi] 67957: [WIN32K] Sync bezier.c with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 29 20:57:23 2015 New Revision: 67957 URL: http://svn.reactos.org/svn/reactos?rev=67957&view=rev Log: [WIN32K] Sync bezier.c with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/gdi/ntgdi/bezier.c trunk/reactos/win32ss/gdi/ntgdi/intgdi.h Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri May 29 20:57:23 2015 @@ -331,5 +331,8 @@ reactos/dll/win32/secur32/thunks.c # Synced to WineStaging-1.7.37 reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.7.37 +win32k - + win32ss/gdi/ntgdi/bezier.c # Synced to WineStaging-1.7.37 + ws2_32 - reactos/dll/win32/ws2_32/misc/async.c # Synced to Wine-1.5.4 Modified: trunk/reactos/win32ss/gdi/ntgdi/bezier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bezier.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bezier.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bezier.c [iso-8859-1] Fri May 29 20:57:23 2015 @@ -1,9 +1,6 @@ /* - * COPYRIGHT: GNU GPL, See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Bezier functions - * FILE: subsys/win32k/objects/bezier.c - * PROGRAMER: Unknown + * COPYRIGHT: GNU LGPL + * PURPOSE: Bezier functions */ #include <win32k.h> @@ -11,12 +8,14 @@ #define NDEBUG #include <debug.h> +/* Based on Wine Staging 1.7.37 - dlls/gdi32/painting.c */ + /****************************************************************** * * *Very* simple bezier drawing code, * * It uses a recursive algorithm to divide the curve in a series - * of straight line segements. Not ideal but for me sufficient. + * of straight line segments. Not ideal but sufficient for me. * If you are in need for something better look for some incremental * algorithm. * @@ -24,14 +23,14 @@ */ /* - * Some macro definitions for bezier drawing. + * some macro definitions for bezier drawing * - * To avoid trucation errors the coordinates are + * to avoid truncation errors the coordinates are * shifted upwards. When used in drawing they are * shifted down again, including correct rounding - * and avoiding floating point arithmatic + * and avoiding floating point arithmetic * 4 bits should allow 27 bits coordinates which I saw - * somewere in the win32 doc's + * somewhere in the win32 doc's * */ @@ -39,20 +38,20 @@ #define BEZIERSHIFTUP(x) ((x)<<BEZIERSHIFTBITS) #define BEZIERPIXEL BEZIERSHIFTUP(1) #define BEZIERSHIFTDOWN(x) (((x)+(1<<(BEZIERSHIFTBITS-1)))>>BEZIERSHIFTBITS) -/* Maximum depth of recursion */ +/* maximum depth of recursion */ #define BEZIERMAXDEPTH 8 -/* Size of array to store points on */ +/* size of array to store points on */ /* enough for one curve */ #define BEZIER_INITBUFSIZE (150) -/* Calculate Bezier average, in this case the middle +/* calculate Bezier average, in this case the middle * correctly rounded... * */ #define BEZIERMIDDLE(Mid, P1, P2) \ - (Mid).x=((P1).x+(P2).x + 1) >> 1;\ - (Mid).y=((P1).y+(P2).y + 1) >> 1; + (Mid).x=((P1).x+(P2).x + 1)/2;\ + (Mid).y=((P1).y+(P2).y + 1)/2; /********************************************************** * BezierCheck helper function to check @@ -60,119 +59,108 @@ * Points[0] and Points[3] are begin and endpoint * Points[1] and Points[2] are control points * level is the recursion depth -* returns true if the recusion can be terminated +* returns true if the recursion can be terminated */ -static BOOL FASTCALL BezierCheck( int level, POINT *Points) +static BOOL BezierCheck( int level, POINT *Points) { - INT dx, dy; - - dx=Points[3].x-Points[0].x; - dy=Points[3].y-Points[0].y; - if ( abs(dy) <= abs(dx) ) /* Shallow line */ - { - /* Check that control points are between begin and end */ - if ( Points[1].x < Points[0].x ) - { - if ( Points[1].x < Points[3].x ) - return FALSE; - } - else if ( Points[1].x > Points[3].x ) - return FALSE; - if ( Points[2].x < Points[0].x) - { - if ( Points[2].x < Points[3].x ) - return FALSE; - } - else if ( Points[2].x > Points[3].x ) - return FALSE; - dx = BEZIERSHIFTDOWN(dx); - if ( !dx ) - return TRUE; - if ( abs(Points[1].y-Points[0].y-(dy/dx)* - BEZIERSHIFTDOWN(Points[1].x-Points[0].x)) > BEZIERPIXEL || - abs(Points[2].y-Points[0].y-(dy/dx)* - BEZIERSHIFTDOWN(Points[2].x-Points[0].x)) > BEZIERPIXEL - ) - return FALSE; - else - return TRUE; - } - else - { - /* Steep line */ - /* Check that control points are between begin and end */ - if(Points[1].y < Points[0].y) - { - if(Points[1].y < Points[3].y) - return FALSE; - } - else if(Points[1].y > Points[3].y) - return FALSE; - if ( Points[2].y < Points[0].y ) - { - if ( Points[2].y < Points[3].y ) - return FALSE; - } - else if ( Points[2].y > Points[3].y ) - return FALSE; - dy = BEZIERSHIFTDOWN(dy); - if ( !dy ) - return TRUE; - if ( abs(Points[1].x-Points[0].x-(dx/dy)* - BEZIERSHIFTDOWN(Points[1].y-Points[0].y)) > BEZIERPIXEL || - abs(Points[2].x-Points[0].x-(dx/dy)* - BEZIERSHIFTDOWN(Points[2].y-Points[0].y)) > BEZIERPIXEL - ) - return FALSE; - else - return TRUE; + INT dx, dy; + dx=Points[3].x-Points[0].x; + dy=Points[3].y-Points[0].y; + if(abs(dy)<=abs(dx)){/* shallow line */ + /* check that control points are between begin and end */ + if(Points[1].x < Points[0].x){ + if(Points[1].x < Points[3].x) + return FALSE; + }else + if(Points[1].x > Points[3].x) + return FALSE; + if(Points[2].x < Points[0].x){ + if(Points[2].x < Points[3].x) + return FALSE; + }else + if(Points[2].x > Points[3].x) + return FALSE; + dx=BEZIERSHIFTDOWN(dx); + if(!dx) return TRUE; + if(abs(Points[1].y-Points[0].y-(dy/dx)* + BEZIERSHIFTDOWN(Points[1].x-Points[0].x)) > BEZIERPIXEL || + abs(Points[2].y-Points[0].y-(dy/dx)* + BEZIERSHIFTDOWN(Points[2].x-Points[0].x)) > BEZIERPIXEL ) + return FALSE; + else + return TRUE; + }else{ /* steep line */ + /* check that control points are between begin and end */ + if(Points[1].y < Points[0].y){ + if(Points[1].y < Points[3].y) + return FALSE; + }else + if(Points[1].y > Points[3].y) + return FALSE; + if(Points[2].y < Points[0].y){ + if(Points[2].y < Points[3].y) + return FALSE; + }else + if(Points[2].y > Points[3].y) + return FALSE; + dy=BEZIERSHIFTDOWN(dy); + if(!dy) return TRUE; + if(abs(Points[1].x-Points[0].x-(dx/dy)* + BEZIERSHIFTDOWN(Points[1].y-Points[0].y)) > BEZIERPIXEL || + abs(Points[2].x-Points[0].x-(dx/dy)* + BEZIERSHIFTDOWN(Points[2].y-Points[0].y)) > BEZIERPIXEL ) + return FALSE; + else + return TRUE; } } /* Helper for GDI_Bezier. * Just handles one Bezier, so Points should point to four POINTs */ -static void APIENTRY GDI_InternalBezier( POINT *Points, POINT **PtsOut, INT *dwOut, +static void GDI_InternalBezier( POINT *Points, POINT **PtsOut, INT *dwOut, INT *nPtsOut, INT level ) { - if(*nPtsOut == *dwOut) { - *dwOut *= 2; - *PtsOut = ExAllocatePoolWithTag(PagedPool, *dwOut * sizeof(POINT), TAG_BEZIER); - if (*PtsOut == NULL) - { - /// \todo FIXME! - NT_ASSERT(FALSE); - return; - } - } - - if(!level || BezierCheck(level, Points)) { - if(*nPtsOut == 0) { - (*PtsOut)[0].x = BEZIERSHIFTDOWN(Points[0].x); - (*PtsOut)[0].y = BEZIERSHIFTDOWN(Points[0].y); - *nPtsOut = 1; - } - (*PtsOut)[*nPtsOut].x = BEZIERSHIFTDOWN(Points[3].x); - (*PtsOut)[*nPtsOut].y = BEZIERSHIFTDOWN(Points[3].y); - (*nPtsOut) ++; - } else { - POINT Points2[4]; /* For the second recursive call */ - Points2[3]=Points[3]; - BEZIERMIDDLE(Points2[2], Points[2], Points[3]); - BEZIERMIDDLE(Points2[0], Points[1], Points[2]); - BEZIERMIDDLE(Points2[1],Points2[0],Points2[2]); - - BEZIERMIDDLE(Points[1], Points[0], Points[1]); - BEZIERMIDDLE(Points[2], Points[1], Points2[0]); - BEZIERMIDDLE(Points[3], Points[2], Points2[1]); - - Points2[0]=Points[3]; - - /* Do the two halves */ - GDI_InternalBezier(Points, PtsOut, dwOut, nPtsOut, level-1); - GDI_InternalBezier(Points2, PtsOut, dwOut, nPtsOut, level-1); - } + if(*nPtsOut == *dwOut) { + *dwOut *= 2; + *PtsOut = ExAllocatePoolWithTag(PagedPool, *dwOut * sizeof(POINT), TAG_BEZIER); + if (*PtsOut == NULL) + { + /// \todo FIXME! + NT_ASSERT(FALSE); + return; + } + } + + if(!level || BezierCheck(level, Points)) { + if(*nPtsOut == 0) { + (*PtsOut)[0].x = BEZIERSHIFTDOWN(Points[0].x); + (*PtsOut)[0].y = BEZIERSHIFTDOWN(Points[0].y); + *nPtsOut = 1; + } + (*PtsOut)[*nPtsOut].x = BEZIERSHIFTDOWN(Points[3].x); + (*PtsOut)[*nPtsOut].y = BEZIERSHIFTDOWN(Points[3].y); + (*nPtsOut) ++; + } else { + POINT Points2[4]; /* for the second recursive call */ + Points2[3]=Points[3]; + BEZIERMIDDLE(Points2[2], Points[2], Points[3]); + BEZIERMIDDLE(Points2[0], Points[1], Points[2]); + BEZIERMIDDLE(Points2[1],Points2[0],Points2[2]); + + BEZIERMIDDLE(Points[1], Points[0], Points[1]); + BEZIERMIDDLE(Points[2], Points[1], Points2[0]); + BEZIERMIDDLE(Points[3], Points[2], Points2[1]); + + Points2[0]=Points[3]; + + /* do the two halves */ + GDI_InternalBezier(Points, PtsOut, dwOut, nPtsOut, level-1); + GDI_InternalBezier(Points2, PtsOut, dwOut, nPtsOut, level-1); + } } + + /*********************************************************************** * GDI_Bezier [INTERNAL] @@ -191,38 +179,37 @@ * * RETURNS * - * Ptr to an array of POINTs that contain the lines that approximinate the + * Ptr to an array of POINTs that contain the lines that approximate the * Beziers. The array is allocated on the process heap and it is the caller's * responsibility to HeapFree it. [this is not a particularly nice interface - * but since we can't know in advance how many points will generate, the + * but since we can't know in advance how many points we will generate, the * alternative would be to call the function twice, once to determine the size * and a second time to do the work - I decided this was too much of a pain]. */ -POINT * FASTCALL GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) +POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) { - POINT *out; - INT Bezier, dwOut = BEZIER_INITBUFSIZE, i; - - if((count - 1) % 3 != 0) { - return NULL; - } - *nPtsOut = 0; - - out = ExAllocatePoolWithTag(PagedPool, dwOut * sizeof(POINT), TAG_BEZIER); - if(!out) { - return NULL; - } - - for(Bezier = 0; Bezier < (count-1)/3; Bezier++) { - POINT ptBuf[4]; - memcpy(ptBuf, Points + Bezier * 3, sizeof(POINT) * 4); - for(i = 0; i < 4; i++) { - ptBuf[i].x = BEZIERSHIFTUP(ptBuf[i].x); - ptBuf[i].y = BEZIERSHIFTUP(ptBuf[i].y); - } - GDI_InternalBezier( ptBuf, &out, &dwOut, nPtsOut, BEZIERMAXDEPTH ); - } - - return out; + POINT *out; + INT Bezier, dwOut = BEZIER_INITBUFSIZE, i; + + if (count == 1 || (count - 1) % 3 != 0) { + DPRINT1("Invalid no. of points %d\n", count); + return NULL; + } + *nPtsOut = 0; + + out = ExAllocatePoolWithTag(PagedPool, dwOut * sizeof(POINT), TAG_BEZIER); + if (!out) return NULL; + + for(Bezier = 0; Bezier < (count-1)/3; Bezier++) { + POINT ptBuf[4]; + memcpy(ptBuf, Points + Bezier * 3, sizeof(POINT) * 4); + for(i = 0; i < 4; i++) { + ptBuf[i].x = BEZIERSHIFTUP(ptBuf[i].x); + ptBuf[i].y = BEZIERSHIFTUP(ptBuf[i].y); + } + GDI_InternalBezier( ptBuf, &out, &dwOut, nPtsOut, BEZIERMAXDEPTH ); + } + DPRINT("Produced %d points\n", *nPtsOut); + return out; } /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Fri May 29 20:57:23 2015 @@ -124,7 +124,7 @@ VOID FASTCALL CreateStockObjects (VOID); VOID FASTCALL CreateSysColorObjects (VOID); -PPOINT FASTCALL GDI_Bezier (const POINT *Points, INT count, PINT nPtsOut); +PPOINT GDI_Bezier (const POINT *Points, INT count, PINT nPtsOut); BOOL FASTCALL IntFillArc( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, double StartArc, double EndArc, ARCTYPE arctype); BOOL FASTCALL IntDrawArc( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, double StartArc, double EndArc, ARCTYPE arctype, PBRUSH pbrush);

9 years, 3 months

[tkreuzer] 67956: [CRT] Implement a portable version of sqrt. It's using an optimized combination of different algorithms, resulting in code that calculates the result in the maximum possible (when...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri May 29 20:10:48 2015 New Revision: 67956 URL: http://svn.reactos.org/svn/reactos?rev=67956&view=rev Log: [CRT] Implement a portable version of sqrt. It's using an optimized combination of different algorithms, resulting in code that calculates the result in the maximum possible (when internally using double) precision with only 11 multiplications and a single division. Added: trunk/reactos/lib/sdk/crt/math/sqrt.c (with props) Removed: trunk/reactos/lib/sdk/crt/math/arm/sqrt.s Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Fri May 29 20:10:48 2015 @@ -477,6 +477,7 @@ list(APPEND CRT_SOURCE except/arm/ehandler.c math/fabsf.c + math/sqrt.c math/arm/__rt_sdiv.c math/arm/__rt_sdiv64_worker.c math/arm/__rt_udiv.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Fri May 29 20:10:48 2015 @@ -165,7 +165,6 @@ math/arm/log.s math/arm/log10.s math/arm/pow.s - math/arm/sqrt.s math/arm/tan.s math/arm/__dtoi64.s math/arm/__dtou64.s Removed: trunk/reactos/lib/sdk/crt/math/arm/sqrt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/sqrt.… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/sqrt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/sqrt.s (removed) @@ -1,24 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of sqrt - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - - TEXTAREA - - LEAF_ENTRY sqrt - - __assertfail - bx lr - - LEAF_END sqrt - - END -/* EOF */ Added: trunk/reactos/lib/sdk/crt/math/sqrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sqrt.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sqrt.c (added) +++ trunk/reactos/lib/sdk/crt/math/sqrt.c [iso-8859-1] Fri May 29 20:10:48 2015 @@ -0,0 +1,70 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Portable implementation of sqrt + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <math.h> +#include <assert.h> + +double +__cdecl +sqrt( + double x) +{ + const double threehalfs = 1.5; + const double x2 = x * 0.5; + long long bits; + double inv, y; + + /* Handle special cases */ + if (x == 0.0) + { + return x; + } + else if (x < 0.0) + { + return -NAN; + } + + /* Convert into a 64 bit integer */ + bits = *(long long *)&x; + + /* Check for !finite(x) */ + if ((bits & 0x7ff7ffffffffffffLL) == 0x7ff0000000000000LL) + { + return x; + } + + /* Step 1: quick approximation of 1/sqrt(x) with bit magic + See http://en.wikipedia.org/wiki/Fast_inverse_square_root */ + bits = 0x5fe6eb50c7b537a9ll - (bits >> 1); + inv = *(double*)&bits; + + /* Step 2: 3 Newton iterations to approximate 1 / sqrt(x) */ + inv = inv * (threehalfs - (x2 * inv * inv)); + inv = inv * (threehalfs - (x2 * inv * inv)); + inv = inv * (threehalfs - (x2 * inv * inv)); + + /* Step 3: 1 additional Heron iteration has shown to maximize the precision. + Normally the formula would be: y = (y + (x / y)) * 0.5; + Instead we use the inverse sqrt directly */ + y = ((1 / inv) + (x * inv)) * 0.5; + + //assert(y == (double)((y + (x / y)) * 0.5)); + /* GCC BUG: While the C-Standard requires that an explicit cast to + double converts the result of a computation to the appropriate + 64 bit value, our GCC ignores this and uses an 80 bit FPU register + in an intermediate value, so we need to make sure it is stored in + a memory location before comparison */ +#if DBG + { + volatile double y1 = y, y2; + y2 = (y + (x / y)) * 0.5; + assert(y1 == y2); + } +#endif + + return y; +} Propchange: trunk/reactos/lib/sdk/crt/math/sqrt.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

[akhaldi] 67955: [README.WINE] Update user32 path.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 29 20:04:05 2015 New Revision: 67955 URL: http://svn.reactos.org/svn/reactos?rev=67955&view=rev Log: [README.WINE] Update user32 path. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri May 29 20:04:05 2015 @@ -292,34 +292,34 @@ reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 User32 - - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1.5.10 - reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_40 - reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/scrollbar.c # Forked - reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_39 - - reactos/dll/win32/user32/include/dde_private.h # Synced to Wine-1.1.24 - - reactos/dll/win32/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) - reactos/dll/win32/user32/misc/ddeclient.c # Synced to Wine-1_1_23 - reactos/dll/win32/user32/misc/ddeserver.c # Synced to Wine-1_1_23 - reactos/dll/win32/user32/misc/exticon.c # Synced to Wine-1_1_22 - reactos/dll/win32/user32/misc/resources.c # Forked? - reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown - reactos/dll/win32/user32/misc/wsprintf.c # Synced to Wine-1_1_23 - - reactos/dll/win32/user32/windows/cursoricon # Forked from Wine-1.2-rc7 - reactos/dll/win32/user32/windows/defwnd.c # Forked - reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) - reactos/dll/win32/user32/windows/mdi.c # Synced to Wine-1_1_40 - reactos/dll/win32/user32/windows/menu.c # Forked - reactos/dll/win32/user32/windows/messagebox.c # Forked - reactos/dll/win32/user32/windows/rect.c # Forked (uitools.c) - reactos/dll/win32/user32/windows/spy.c # Synced to Wine-1_1_40 - reactos/dll/win32/user32/windows/text.c # Forked (lstr.c) - reactos/dll/win32/user32/windows/winpos.c # Forked + reactos/win32ss/user/user32/controls/button.c # Synced to Wine-1_1_39 + reactos/win32ss/user/user32/controls/combo.c # Synced to Wine-1.5.10 + reactos/win32ss/user/user32/controls/edit.c # Synced to Wine-1_1_40 + reactos/win32ss/user/user32/controls/icontitle.c # Synced to Wine-1_1_39 + reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1_1_39 + reactos/win32ss/user/user32/controls/scrollbar.c # Forked + reactos/win32ss/user/user32/controls/static.c # Synced to Wine-1_1_39 + + reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24 + + reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) + reactos/win32ss/user/user32/misc/ddeclient.c # Synced to Wine-1_1_23 + reactos/win32ss/user/user32/misc/ddeserver.c # Synced to Wine-1_1_23 + reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 + reactos/win32ss/user/user32/misc/resources.c # Forked? + reactos/win32ss/user/user32/misc/winhelp.c # Last sync date unknown + reactos/win32ss/user/user32/misc/wsprintf.c # Synced to Wine-1_1_23 + + reactos/win32ss/user/user32/windows/cursoricon # Forked from Wine-1.2-rc7 + reactos/win32ss/user/user32/windows/defwnd.c # Forked + reactos/win32ss/user/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) + reactos/win32ss/user/user32/windows/mdi.c # Synced to Wine-1_1_40 + reactos/win32ss/user/user32/windows/menu.c # Forked + reactos/win32ss/user/user32/windows/messagebox.c # Forked + reactos/win32ss/user/user32/windows/rect.c # Forked (uitools.c) + reactos/win32ss/user/user32/windows/spy.c # Synced to Wine-1_1_40 + reactos/win32ss/user/user32/windows/text.c # Forked (lstr.c) + reactos/win32ss/user/user32/windows/winpos.c # Forked schannel.c reactos/dll/win32/schannel/schannel_wine.c # synced to wine-1.7.17 (secur32/schannel.c)

9 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015