Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 64663: [APPLICATIONS] - Remove broken casts
by tfaber＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tfaber Date: Sat Oct 11 12:39:50 2014 New Revision: 64663 URL: http://svn.reactos.org/svn/reactos?rev=64663&view=rev Log: [APPLICATIONS] - Remove broken casts Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -541,7 +541,7 @@ hProcessHeap = GetProcessHeap(); WndClass.style = 0; - WndClass.lpfnWndProc = (WNDPROC)WndProc; + WndClass.lpfnWndProc = WndProc; WndClass.cbClsExtra = 0; WndClass.cbWndExtra = 0; WndClass.hInstance = hInstance; Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -321,7 +321,7 @@ break; } } - return CallWindowProc( (WNDPROC)Globals.EditProc, hWnd, msg, wParam, lParam); + return CallWindowProc( Globals.EditProc, hWnd, msg, wParam, lParam); } /*********************************************************************** Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -286,7 +286,7 @@ { WNDPROC oldwndproc; static WCHAR s_szNode[256]; - oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWLP_USERDATA); + oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA); switch (uMsg) { @@ -406,7 +406,7 @@ 0); } /* Subclass the AddressBar */ - oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC); + oldproc = (WNDPROC)GetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC); SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_USERDATA, (DWORD_PTR)oldproc); SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC, (DWORD_PTR)AddressBarProc); break; Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -233,7 +233,7 @@ { WNDPROC oldwndproc; - oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWLP_USERDATA); + oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA); switch (uMsg) { @@ -288,7 +288,7 @@ /* subclass the edit control */ hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); - oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwndValue, GWLP_WNDPROC); + oldproc = (WNDPROC)GetWindowLongPtr(hwndValue, GWLP_WNDPROC); SetWindowLongPtr(hwndValue, GWLP_USERDATA, (DWORD_PTR)oldproc); SetWindowLongPtr(hwndValue, GWLP_WNDPROC, (DWORD_PTR)DwordEditSubclassProc); Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -62,7 +62,7 @@ #define HEHT_ASCIIDUMP (0x6) #define HEHT_RIGHTMARGIN (0x7) -INT_PTR CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); ATOM WINAPI @@ -75,7 +75,7 @@ ZeroMemory(&WndClass, sizeof(WNDCLASSEXW)); WndClass.cbSize = sizeof(WNDCLASSEXW); WndClass.style = CS_DBLCLKS; - WndClass.lpfnWndProc = (WNDPROC)HexEditWndProc; + WndClass.lpfnWndProc = HexEditWndProc; WndClass.cbWndExtra = sizeof(PHEXEDIT_DATA); WndClass.hInstance = hInstance; WndClass.hCursor = LoadCursorW(NULL, IDC_IBEAM); @@ -1415,13 +1415,13 @@ PostMessageW(hed->hWndSelf, WM_NULL, 0, 0); } -INT_PTR CALLBACK +LRESULT CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PHEXEDIT_DATA hed; POINTS p; - hed = (PHEXEDIT_DATA)(LONG_PTR)GetWindowLongPtr(hWnd, (DWORD_PTR)0); + hed = (PHEXEDIT_DATA)GetWindowLongPtr(hWnd, (DWORD_PTR)0); switch(uMsg) { case WM_ERASEBKGND: Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -126,7 +126,7 @@ /* * We pass on all non-handled messages */ - return CallWindowProcW((WNDPROC)OldGraphWndProc, hWnd, message, wParam, lParam); + return CallWindowProcW(OldGraphWndProc, hWnd, message, wParam, lParam); } void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -636,5 +636,5 @@ /* * We pass on all non-handled messages */ - return CallWindowProcW((WNDPROC)OldGraphCtrlWndProc, hWnd, message, wParam, lParam); -} + return CallWindowProcW(OldGraphCtrlWndProc, hWnd, message, wParam, lParam); +} Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -197,9 +197,9 @@ /* * Subclass graph buttons */ - OldGraphWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hPerformancePageCpuUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); + OldGraphWndProc = (WNDPROC)SetWindowLongPtrW(hPerformancePageCpuUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); SetWindowLongPtrW(hPerformancePageMemUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); - OldGraphCtrlWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); + OldGraphCtrlWndProc = (WNDPROC)SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); return TRUE; Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sat Oct 11 12:39:50 2014 @@ -141,7 +141,7 @@ /* * Subclass the process list control so we can intercept WM_ERASEBKGND */ - OldProcessListWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hProcessPageListCtrl, GWLP_WNDPROC, (LONG_PTR)ProcessListWndProc); + OldProcessListWndProc = (WNDPROC)SetWindowLongPtrW(hProcessPageListCtrl, GWLP_WNDPROC, (LONG_PTR)ProcessListWndProc); #ifdef RUN_PROC_PAGE /* Start our refresh thread */

1 0

[tfaber] 64662: [USER32][SCRNSAVE] - Remove broken casts
by tfaber＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tfaber Date: Sat Oct 11 12:34:25 2014 New Revision: 64662 URL: http://svn.reactos.org/svn/reactos?rev=64662&view=rev Log: [USER32][SCRNSAVE] - Remove broken casts Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c trunk/reactos/win32ss/user/user32/misc/desktop.c trunk/reactos/win32ss/user/user32/windows/dialog.c trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] Sat Oct 11 12:34:25 2014 @@ -144,7 +144,7 @@ cls.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); cls.hInstance = hMainInstance; cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC; - cls.lpfnWndProc = (WNDPROC)SysScreenSaverProc; + cls.lpfnWndProc = SysScreenSaverProc; return RegisterClass(&cls) != 0; } Modified: trunk/reactos/win32ss/user/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] Sat Oct 11 12:34:25 2014 @@ -22,7 +22,7 @@ WC_DESKTOP, /* name */ CS_DBLCLKS, /* style */ NULL, /* procA (winproc is Unicode only) */ - (WNDPROC) DesktopWndProc, /* procW */ + DesktopWndProc, /* procW */ 0, /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_BACKGROUND+1) /* brush */ Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Sat Oct 11 12:34:25 2014 @@ -115,8 +115,8 @@ { WC_DIALOG, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ - (WNDPROC) DefDlgProcA, /* procA */ - (WNDPROC) DefDlgProcW, /* procW */ + DefDlgProcA, /* procA */ + DefDlgProcW, /* procW */ DLGWINDOWEXTRA, /* extra */ (LPCWSTR) IDC_ARROW, /* cursor */ 0 /* brush */ Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Sat Oct 11 12:34:25 2014 @@ -107,8 +107,8 @@ { WC_MENU, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ - (WNDPROC) NULL, /* FIXME - procA */ - (WNDPROC) PopupMenuWndProcW, /* FIXME - procW */ + NULL, /* FIXME - procA */ + PopupMenuWndProcW, /* FIXME - procW */ sizeof(MENUINFO *), /* extra */ (LPCWSTR) IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_MENU + 1) /* brush */

1 0

[tfaber] 64661: [CONSRV] - Fix buffer overflows
by tfaber＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tfaber Date: Sat Oct 11 12:13:27 2014 New Revision: 64661 URL: http://svn.reactos.org/svn/reactos?rev=64661&view=rev Log: [CONSRV] - Fix buffer overflows Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sat Oct 11 12:13:27 2014 @@ -627,9 +627,8 @@ */ if (FaceName != GuiData->GuiInfo.FaceName) { - SIZE_T Length = min(wcslen(FaceName) + 1, LF_FACESIZE); // wcsnlen wcsncpy(GuiData->GuiInfo.FaceName, FaceName, LF_FACESIZE); - GuiData->GuiInfo.FaceName[Length] = L'\0'; // NULL-terminate + GuiData->GuiInfo.FaceName[LF_FACESIZE - 1] = UNICODE_NULL; } GuiData->GuiInfo.FontFamily = FontFamily; GuiData->GuiInfo.FontSize = FontSize; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Sat Oct 11 12:13:27 2014 @@ -83,9 +83,8 @@ if (!wcscmp(szValueName, L"FaceName")) { - SIZE_T Length = min(wcslen(szValue) + 1, LF_FACESIZE); // wcsnlen wcsncpy(TermInfo->FaceName, szValue, LF_FACESIZE); - TermInfo->FaceName[Length] = L'\0'; + TermInfo->FaceName[LF_FACESIZE - 1] = UNICODE_NULL; RetVal = TRUE; } else if (!wcscmp(szValueName, L"FontFamily")) @@ -323,9 +322,8 @@ /* GUI Information */ pSharedInfo->TerminalInfo.Size = sizeof(GUI_CONSOLE_INFO); GuiInfo = pSharedInfo->TerminalInfo.TermInfo = (PGUI_CONSOLE_INFO)(pSharedInfo + 1); - Length = min(wcslen(GuiData->GuiInfo.FaceName) + 1, LF_FACESIZE); // wcsnlen wcsncpy(GuiInfo->FaceName, GuiData->GuiInfo.FaceName, LF_FACESIZE); - GuiInfo->FaceName[Length] = L'\0'; + GuiInfo->FaceName[LF_FACESIZE - 1] = UNICODE_NULL; GuiInfo->FontFamily = GuiData->GuiInfo.FontFamily; GuiInfo->FontSize = GuiData->GuiInfo.FontSize; GuiInfo->FontWeight = GuiData->GuiInfo.FontWeight; @@ -573,7 +571,9 @@ PCONSOLE_STATE_INFO pConInfo = NULL; CONSOLE_INFO ConInfo; GUI_CONSOLE_INFO GuiInfo; +#if 0 SIZE_T Length; +#endif if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; @@ -649,9 +649,8 @@ // Terminal information - Length = min(wcslen(pConInfo->FaceName) + 1, LF_FACESIZE); // wcsnlen wcsncpy(GuiInfo.FaceName, pConInfo->FaceName, LF_FACESIZE); - GuiInfo.FaceName[Length] = L'\0'; + GuiInfo.FaceName[LF_FACESIZE - 1] = UNICODE_NULL; GuiInfo.FontFamily = pConInfo->FontFamily; GuiInfo.FontSize = pConInfo->FontSize; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Oct 11 12:13:27 2014 @@ -340,8 +340,6 @@ PGUI_CONSOLE_DATA GuiData; GUI_CONSOLE_INFO TermInfo; - - SIZE_T Length = 0; if (This == NULL || Console == NULL || This->OldData == NULL) return STATUS_INVALID_PARAMETER; @@ -417,9 +415,8 @@ */ // Font data - Length = min(wcslen(TermInfo.FaceName) + 1, LF_FACESIZE); // wcsnlen wcsncpy(GuiData->GuiInfo.FaceName, TermInfo.FaceName, LF_FACESIZE); - GuiData->GuiInfo.FaceName[Length] = L'\0'; + GuiData->GuiInfo.FaceName[LF_FACESIZE - 1] = UNICODE_NULL; GuiData->GuiInfo.FontFamily = TermInfo.FontFamily; GuiData->GuiInfo.FontSize = TermInfo.FontSize; GuiData->GuiInfo.FontWeight = TermInfo.FontWeight;

1 0

[tfaber] 64660: [MPLAY32] - Fix broken casts
by tfaber＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tfaber Date: Sat Oct 11 11:14:33 2014 New Revision: 64660 URL: http://svn.reactos.org/svn/reactos?rev=64660&view=rev Log: [MPLAY32] - Fix broken casts Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sat Oct 11 11:14:33 2014 @@ -54,10 +54,10 @@ mciVideoWindow.hWnd = hwnd; - dwError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow); + dwError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); if (!dwError) { - dwError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect); + dwError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); if (!dwError) { EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_ENABLED); @@ -260,13 +260,13 @@ mciVideoWindow.hWnd = hwnd; - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow); + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); if (mciError) { return; } - mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect); + mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); if (mciError) { return; @@ -278,7 +278,7 @@ SetParent(hTrackBar, hToolBar); - mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD)(LPSTR)&mciVideoRect); + mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD_PTR)&mciVideoRect); if (mciError) { ShowMCIError(hwnd, mciError); @@ -288,7 +288,7 @@ GetWindowRect(hToolBar, &rcToolbarRect); ResizeClientArea(hwnd, mciVideoRect.rc.right, mciVideoRect.rc.bottom + (rcToolbarRect.bottom - rcToolbarRect.top)); - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow); + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); if (mciError) { ShowMCIError(hwnd, mciError); @@ -307,7 +307,7 @@ CheckMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_UNCHECKED); mciVideoWindow.hWnd = MCI_DGV_WINDOW_DEFAULT; - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow); + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); if (mciError) { ShowMCIError(hwnd, mciError); @@ -780,7 +780,7 @@ mciPut.rc.right = Rect.right; mciPut.rc.bottom = Rect.bottom - (ToolbarRect.bottom - ToolbarRect.top) - 2; - mciSendCommand(wDeviceId, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT | MCI_WAIT, (DWORD)&mciPut); + mciSendCommand(wDeviceId, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT | MCI_WAIT, (DWORD_PTR)&mciPut); } } return 0L;

1 0

[tkreuzer] 64659: [WSHTCPIP] Fix a bug that manifests in an ASSERT on MSVC builds
by tkreuzer＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tkreuzer Date: Sat Oct 11 10:26:45 2014 New Revision: 64659 URL: http://svn.reactos.org/svn/reactos?rev=64659&view=rev Log: [WSHTCPIP] Fix a bug that manifests in an ASSERT on MSVC builds Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Sat Oct 11 10:26:45 2014 @@ -207,9 +207,9 @@ break; case IPPROTO_TCP: + *TdiType = INFO_TYPE_CONNECTION; switch (OptionName) { - *TdiType = INFO_TYPE_CONNECTION; case TCP_NODELAY: *TdiId = TCP_SOCKET_NODELAY; return;

1 0

[tkreuzer] 64658: [NTDLL] Don't assert that the caller of exported APIs passes correct parameters.
by tkreuzer＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tkreuzer Date: Sat Oct 11 08:52:33 2014 New Revision: 64658 URL: http://svn.reactos.org/svn/reactos?rev=64658&view=rev Log: [NTDLL] Don't assert that the caller of exported APIs passes correct parameters. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sat Oct 11 08:52:33 2014 @@ -209,9 +209,6 @@ /* A normal failure */ return STATUS_INVALID_PARAMETER_3; } - - /* Do or Do Not. There is no Try */ - ASSERT((Disposition != NULL) || !(Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY)); /* If the flag is set, make sure we have a valid pointer to use */ if ((Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) && !(Disposition))

1 0

[jimtabor] 64657: [Win32k] - Patch by Matteo Bruni : Don't overflow the buffer in GetGlyphOutline.
by jimtabor＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: jimtabor Date: Sat Oct 11 05:34:30 2014 New Revision: 64657 URL: http://svn.reactos.org/svn/reactos?rev=64657&view=rev Log: [Win32k] - Patch by Matteo Bruni : Don't overflow the buffer in GetGlyphOutline. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Oct 11 05:34:30 2014 @@ -1497,6 +1497,203 @@ return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); } +static unsigned int get_native_glyph_outline(FT_Outline *outline, unsigned int buflen, char *buf) +{ + TTPOLYGONHEADER *pph; + TTPOLYCURVE *ppc; + unsigned int needed = 0, point = 0, contour, first_pt; + unsigned int pph_start, cpfx; + DWORD type; + + for (contour = 0; contour < outline->n_contours; contour++) + { + /* Ignore contours containing one point */ + if (point == outline->contours[contour]) + { + point++; + continue; + } + + pph_start = needed; + pph = (TTPOLYGONHEADER *)(buf + needed); + first_pt = point; + if (buf) + { + pph->dwType = TT_POLYGON_TYPE; + FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); + } + needed += sizeof(*pph); + point++; + while (point <= outline->contours[contour]) + { + ppc = (TTPOLYCURVE *)(buf + needed); + type = outline->tags[point] & FT_Curve_Tag_On ? + TT_PRIM_LINE : TT_PRIM_QSPLINE; + cpfx = 0; + do + { + if (buf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } while (point <= outline->contours[contour] && + (outline->tags[point] & FT_Curve_Tag_On) == + (outline->tags[point-1] & FT_Curve_Tag_On)); + /* At the end of a contour Windows adds the start point, but + only for Beziers */ + if (point > outline->contours[contour] && + !(outline->tags[point-1] & FT_Curve_Tag_On)) + { + if (buf) + FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]); + cpfx++; + } + else if (point <= outline->contours[contour] && + outline->tags[point] & FT_Curve_Tag_On) + { + /* add closing pt for bezier */ + if (buf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } + if (buf) + { + ppc->wType = type; + ppc->cpfx = cpfx; + } + needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); + } + if (buf) + pph->cb = needed - pph_start; + } + return needed; +} + +static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int buflen, char *buf) +{ + /* Convert the quadratic Beziers to cubic Beziers. + The parametric eqn for a cubic Bezier is, from PLRM: + r(t) = at^3 + bt^2 + ct + r0 + with the control points: + r1 = r0 + c/3 + r2 = r1 + (c + b)/3 + r3 = r0 + c + b + a + + A quadratic Bezier has the form: + p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2 + + So equating powers of t leads to: + r1 = 2/3 p1 + 1/3 p0 + r2 = 2/3 p1 + 1/3 p2 + and of course r0 = p0, r3 = p2 + */ + int contour, point = 0, first_pt; + TTPOLYGONHEADER *pph; + TTPOLYCURVE *ppc; + DWORD pph_start, cpfx, type; + FT_Vector cubic_control[4]; + unsigned int needed = 0; + + for (contour = 0; contour < outline->n_contours; contour++) + { + pph_start = needed; + pph = (TTPOLYGONHEADER *)(buf + needed); + first_pt = point; + if (buf) + { + pph->dwType = TT_POLYGON_TYPE; + FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); + } + needed += sizeof(*pph); + point++; + while (point <= outline->contours[contour]) + { + ppc = (TTPOLYCURVE *)(buf + needed); + type = outline->tags[point] & FT_Curve_Tag_On ? + TT_PRIM_LINE : TT_PRIM_CSPLINE; + cpfx = 0; + do + { + if (type == TT_PRIM_LINE) + { + if (buf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } + else + { + /* Unlike QSPLINEs, CSPLINEs always have their endpoint + so cpfx = 3n */ + + /* FIXME: Possible optimization in endpoint calculation + if there are two consecutive curves */ + cubic_control[0] = outline->points[point-1]; + if (!(outline->tags[point-1] & FT_Curve_Tag_On)) + { + cubic_control[0].x += outline->points[point].x + 1; + cubic_control[0].y += outline->points[point].y + 1; + cubic_control[0].x >>= 1; + cubic_control[0].y >>= 1; + } + if (point+1 > outline->contours[contour]) + cubic_control[3] = outline->points[first_pt]; + else + { + cubic_control[3] = outline->points[point+1]; + if (!(outline->tags[point+1] & FT_Curve_Tag_On)) + { + cubic_control[3].x += outline->points[point].x + 1; + cubic_control[3].y += outline->points[point].y + 1; + cubic_control[3].x >>= 1; + cubic_control[3].y >>= 1; + } + } + /* r1 = 1/3 p0 + 2/3 p1 + r2 = 1/3 p2 + 2/3 p1 */ + cubic_control[1].x = (2 * outline->points[point].x + 1) / 3; + cubic_control[1].y = (2 * outline->points[point].y + 1) / 3; + cubic_control[2] = cubic_control[1]; + cubic_control[1].x += (cubic_control[0].x + 1) / 3; + cubic_control[1].y += (cubic_control[0].y + 1) / 3; + cubic_control[2].x += (cubic_control[3].x + 1) / 3; + cubic_control[2].y += (cubic_control[3].y + 1) / 3; + if (buf) + { + FTVectorToPOINTFX(&cubic_control[1], &ppc->apfx[cpfx]); + FTVectorToPOINTFX(&cubic_control[2], &ppc->apfx[cpfx+1]); + FTVectorToPOINTFX(&cubic_control[3], &ppc->apfx[cpfx+2]); + } + cpfx += 3; + point++; + } + } while (point <= outline->contours[contour] && + (outline->tags[point] & FT_Curve_Tag_On) == + (outline->tags[point-1] & FT_Curve_Tag_On)); + /* At the end of a contour Windows adds the start point, + but only for Beziers and we've already done that. + */ + if (point <= outline->contours[contour] && + outline->tags[point] & FT_Curve_Tag_On) + { + /* This is the closing pt of a bezier, but we've already + added it, so just inc point and carry on */ + point++; + } + if (buf) + { + ppc->wType = type; + ppc->cpfx = cpfx; + } + needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); + } + if (buf) + pph->cb = needed - pph_start; + } + return needed; +} + /* * Based on WineEngGetGlyphOutline * @@ -1936,101 +2133,32 @@ case GGO_NATIVE: { - int contour, point = 0, first_pt; FT_Outline *outline = &ft_face->glyph->outline; - TTPOLYGONHEADER *pph; - TTPOLYCURVE *ppc; - DWORD pph_start, cpfx, type; if (cjBuf == 0) pvBuf = NULL; /* This is okay, need cjBuf to allocate. */ IntLockFreeType; if (needsTransform && pvBuf) FT_Outline_Transform(outline, &transMat); - for (contour = 0; contour < outline->n_contours; contour++) - { - pph_start = needed; - pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); - first_pt = point; - if (pvBuf) - { - pph->dwType = TT_POLYGON_TYPE; - FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); - } - needed += sizeof(*pph); - point++; - while (point <= outline->contours[contour]) - { - ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); - type = (outline->tags[point] & FT_Curve_Tag_On) ? - TT_PRIM_LINE : TT_PRIM_QSPLINE; - cpfx = 0; - do - { - if (pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } - while (point <= outline->contours[contour] && - (outline->tags[point] & FT_Curve_Tag_On) == - (outline->tags[point-1] & FT_Curve_Tag_On)); - - /* At the end of a contour Windows adds the start point, but - only for Beziers */ - if (point > outline->contours[contour] && - !(outline->tags[point-1] & FT_Curve_Tag_On)) - { - if (pvBuf) - FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]); - cpfx++; - } - else if (point <= outline->contours[contour] && - outline->tags[point] & FT_Curve_Tag_On) - { - /* Add closing pt for bezier */ - if (pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } - if (pvBuf) - { - ppc->wType = type; - ppc->cpfx = cpfx; - } - needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); - } - if (pvBuf) pph->cb = needed - pph_start; - } + needed = get_native_glyph_outline(outline, cjBuf, NULL); + + if (!pvBuf || !cjBuf) + { + IntUnLockFreeType; + break; + } + if (needed > cjBuf) + { + IntUnLockFreeType; + return GDI_ERROR; + } + get_native_glyph_outline(outline, cjBuf, pvBuf); IntUnLockFreeType; break; } case GGO_BEZIER: { - /* Convert the quadratic Beziers to cubic Beziers. - The parametric eqn for a cubic Bezier is, from PLRM: - r(t) = at^3 + bt^2 + ct + r0 - with the control points: - r1 = r0 + c/3 - r2 = r1 + (c + b)/3 - r3 = r0 + c + b + a - - A quadratic Beizer has the form: - p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2 - - So equating powers of t leads to: - r1 = 2/3 p1 + 1/3 p0 - r2 = 2/3 p1 + 1/3 p2 - and of course r0 = p0, r3 = p2 - */ - - int contour, point = 0, first_pt; FT_Outline *outline = &ft_face->glyph->outline; - TTPOLYGONHEADER *pph; - TTPOLYCURVE *ppc; - DWORD pph_start, cpfx, type; - FT_Vector cubic_control[4]; if (cjBuf == 0) pvBuf = NULL; if (needsTransform && pvBuf) @@ -2039,102 +2167,14 @@ FT_Outline_Transform(outline, &transMat); IntUnLockFreeType; } - - for (contour = 0; contour < outline->n_contours; contour++) - { - pph_start = needed; - pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); - first_pt = point; - if (pvBuf) - { - pph->dwType = TT_POLYGON_TYPE; - FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); - } - needed += sizeof(*pph); - point++; - while (point <= outline->contours[contour]) - { - ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); - type = (outline->tags[point] & FT_Curve_Tag_On) ? - TT_PRIM_LINE : TT_PRIM_CSPLINE; - cpfx = 0; - do - { - if (type == TT_PRIM_LINE) - { - if (pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } - else - { - /* Unlike QSPLINEs, CSPLINEs always have their endpoint - so cpfx = 3n */ - - /* FIXME: Possible optimization in endpoint calculation - if there are two consecutive curves */ - cubic_control[0] = outline->points[point-1]; - if (!(outline->tags[point-1] & FT_Curve_Tag_On)) - { - cubic_control[0].x += outline->points[point].x + 1; - cubic_control[0].y += outline->points[point].y + 1; - cubic_control[0].x >>= 1; - cubic_control[0].y >>= 1; - } - if (point+1 > outline->contours[contour]) - cubic_control[3] = outline->points[first_pt]; - else - { - cubic_control[3] = outline->points[point+1]; - if (!(outline->tags[point+1] & FT_Curve_Tag_On)) - { - cubic_control[3].x += outline->points[point].x + 1; - cubic_control[3].y += outline->points[point].y + 1; - cubic_control[3].x >>= 1; - cubic_control[3].y >>= 1; - } - } - /* r1 = 1/3 p0 + 2/3 p1 - r2 = 1/3 p2 + 2/3 p1 */ - cubic_control[1].x = (2 * outline->points[point].x + 1) / 3; - cubic_control[1].y = (2 * outline->points[point].y + 1) / 3; - cubic_control[2] = cubic_control[1]; - cubic_control[1].x += (cubic_control[0].x + 1) / 3; - cubic_control[1].y += (cubic_control[0].y + 1) / 3; - cubic_control[2].x += (cubic_control[3].x + 1) / 3; - cubic_control[2].y += (cubic_control[3].y + 1) / 3; - if (pvBuf) - { - FTVectorToPOINTFX(&cubic_control[1], &ppc->apfx[cpfx]); - FTVectorToPOINTFX(&cubic_control[2], &ppc->apfx[cpfx+1]); - FTVectorToPOINTFX(&cubic_control[3], &ppc->apfx[cpfx+2]); - } - cpfx += 3; - point++; - } - } - while (point <= outline->contours[contour] && - (outline->tags[point] & FT_Curve_Tag_On) == - (outline->tags[point-1] & FT_Curve_Tag_On)); - /* At the end of a contour Windows adds the start point, - but only for Beziers and we've already done that. */ - if (point <= outline->contours[contour] && - outline->tags[point] & FT_Curve_Tag_On) - { - /* This is the closing pt of a bezier, but we've already - added it, so just inc point and carry on */ - point++; - } - if (pvBuf) - { - ppc->wType = type; - ppc->cpfx = cpfx; - } - needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); - } - if (pvBuf) pph->cb = needed - pph_start; - } + needed = get_bezier_glyph_outline(outline, cjBuf, NULL); + + if (!pvBuf || !cjBuf) + break; + if (needed > cjBuf) + return GDI_ERROR; + + get_bezier_glyph_outline(outline, cjBuf, pvBuf); break; }

1 0

[aandrejevic] 64656: [FAST486] Update the copyright year. Implement the first batch of FPU instructions. These are still experimental.
by aandrejevic＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: aandrejevic Date: Fri Oct 10 23:07:14 2014 New Revision: 64656 URL: http://svn.reactos.org/svn/reactos?rev=64656&view=rev Log: [FAST486] Update the copyright year. Implement the first batch of FPU instructions. These are still experimental. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/extraops.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opcodes.h trunk/reactos/lib/fast486/opgroups.c trunk/reactos/lib/fast486/opgroups.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * fast486.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -90,6 +90,8 @@ #define FAST486_PREFIX_LOCK (1 << 3) #define FAST486_PREFIX_REPNZ (1 << 4) #define FAST486_PREFIX_REP (1 << 5) + +#define FAST486_FPU_DEFAULT_CONTROL 0x037F struct _FAST486_STATE; typedef struct _FAST486_STATE FAST486_STATE, *PFAST486_STATE; @@ -420,6 +422,7 @@ { ULONGLONG Mantissa; USHORT Exponent; + UCHAR Sign; } FAST486_FPU_DATA_REG, *PFAST486_FPU_DATA_REG; typedef union _FAST486_FPU_STATUS_REG @@ -490,10 +493,12 @@ FAST486_INT_STATUS IntStatus; UCHAR PendingIntNum; PULONG Tlb; +#ifndef FAST486_NO_FPU FAST486_FPU_DATA_REG FpuRegisters[FAST486_NUM_FPU_REGS]; FAST486_FPU_STATUS_REG FpuStatus; FAST486_FPU_CONTROL_REG FpuControl; USHORT FpuTag; +#endif }; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * common.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * common.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * common.inl * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ */ #include "common.h" +#include "fpu.h" /* PUBLIC FUNCTIONS ***********************************************************/ @@ -1330,4 +1331,76 @@ return TRUE; } +#ifndef FAST486_NO_FPU + +FORCEINLINE +VOID +Fast486FpuNormalize(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) +{ + UINT LeadingZeros = 0; + + if (FPU_IS_NORMALIZED(Data)) return; + if (FPU_IS_ZERO(Data)) + { + Data->Exponent = 0; + return; + } + + /* Count the leading zeros */ + while (!(Data->Mantissa & (1 << (63 - LeadingZeros)))) LeadingZeros++; + + if (LeadingZeros < Data->Exponent) + { + Data->Mantissa <<= LeadingZeros; + Data->Exponent -= LeadingZeros; + } + else + { + /* Make it denormalized */ + Data->Mantissa <<= Data->Exponent - 1; + Data->Exponent = 1; + + /* Underflow */ + State->FpuStatus.Ue = TRUE; + } +} + +FORCEINLINE +USHORT +Fast486GetValueTag(PFAST486_FPU_DATA_REG Data) +{ + if (FPU_IS_ZERO(Data)) return FPU_TAG_ZERO; + else if (FPU_IS_NAN(Data)) return FPU_TAG_SPECIAL; + else return FPU_TAG_VALID; +} + +FORCEINLINE +VOID +Fast486FpuPush(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Data) +{ + State->FpuStatus.Top--; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + FPU_ST(0) = *Data; + FPU_SET_TAG(0, Fast486GetValueTag(Data)); + } + else State->FpuStatus.Ie = TRUE; +} + +FORCEINLINE +VOID +Fast486FpuPop(PFAST486_STATE State) +{ + if (FPU_GET_TAG(0) != FPU_TAG_EMPTY) + { + FPU_SET_TAG(0, FPU_TAG_EMPTY); + State->FpuStatus.Top++; + } + else State->FpuStatus.Ie = TRUE; +} + +#endif + /* EOF */ Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * extraops.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * extraops.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * fast486.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -282,6 +282,11 @@ #ifndef FAST486_NO_FPU /* Initialize CR0 */ State->ControlRegisters[FAST486_REG_CR0] |= FAST486_CR0_ET; + + /* Initialize the FPU control and tag registers */ + State->FpuControl.Value = FAST486_FPU_DEFAULT_CONTROL; + State->FpuStatus.Value = 0; + State->FpuTag = 0xFFFF; #endif /* Restore the callbacks and TLB */ Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6465… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * fpu.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -28,12 +28,416 @@ #include <fast486.h> #include "common.h" -#include "opcodes.h" #include "fpu.h" +/* PRIVATE FUNCTIONS **********************************************************/ + +static ULONGLONG UnsignedMult128(ULONGLONG Multiplicand, + ULONGLONG Multiplier, + ULONGLONG *HighProduct) +{ + ULONG MultiplicandLow, MultiplicandHigh, MultiplierLow, MultiplierHigh; + ULONG IntermediateLow, IntermediateHigh; + ULONGLONG LowProduct, Intermediate, Intermediate1, Intermediate2; + + MultiplicandLow = (ULONG)(Multiplicand & 0xFFFFFFFFULL); + MultiplicandHigh = (ULONG)(Multiplicand >> 32); + MultiplierLow = (ULONG)(Multiplier & 0xFFFFFFFFULL); + MultiplierHigh = (ULONG)(Multiplier >> 32); + + LowProduct = (ULONGLONG)MultiplicandLow * (ULONGLONG)MultiplierLow; + Intermediate1 = (ULONGLONG)MultiplicandLow * (ULONGLONG)MultiplierHigh; + Intermediate2 = (ULONGLONG)MultiplicandHigh * (ULONGLONG)MultiplierLow; + *HighProduct = (ULONGLONG)MultiplicandHigh * (ULONGLONG)MultiplierHigh; + + Intermediate = Intermediate1 + Intermediate2; + if (Intermediate < Intermediate1) *HighProduct += 1ULL << 32; + + IntermediateLow = (ULONG)(Intermediate & 0xFFFFFFFFULL); + IntermediateHigh = (ULONG)(Intermediate >> 32); + + LowProduct += (ULONGLONG)IntermediateLow << 32; + if ((ULONG)(LowProduct >> 32) < IntermediateLow) (*HighProduct)++; + + *HighProduct += IntermediateHigh; + return LowProduct; +} + +static VOID Fast486FpuGetSingleReal(PFAST486_STATE State, + ULONG Value, + PFAST486_FPU_DATA_REG Result) +{ + /* Extract the sign, exponent and mantissa */ + Result->Sign = (UCHAR)(Value >> 31); + Result->Exponent = (USHORT)((Value >> 23) & 0xFF); + Result->Mantissa = (((ULONGLONG)Value & 0x7FFFFFULL) | 0x800000ULL) << 40; + + /* If this is a zero, we're done */ + if (Value == 0) return; + + if (Result->Exponent == 0xFF) Result->Exponent = FPU_MAX_EXPONENT + 1; + else + { + /* Adjust the exponent bias */ + Result->Exponent += (FPU_REAL10_BIAS - FPU_REAL4_BIAS); + } +} + +static VOID Fast486FpuGetDoubleReal(PFAST486_STATE State, + ULONGLONG Value, + PFAST486_FPU_DATA_REG Result) +{ + /* Extract the sign, exponent and mantissa */ + Result->Sign = (UCHAR)(Value >> 63); + Result->Exponent = (USHORT)((Value >> 52) & 0x7FF); + Result->Mantissa = (((ULONGLONG)Value & 0xFFFFFFFFFFFFFULL) | 0x10000000000000ULL) << 11; + + /* If this is a zero, we're done */ + if (Value == 0) return; + + if (Result->Exponent == 0x3FF) Result->Exponent = FPU_MAX_EXPONENT + 1; + else + { + /* Adjust the exponent bias */ + Result->Exponent += (FPU_REAL10_BIAS - FPU_REAL8_BIAS); + } +} + +static VOID Fast486FpuAdd(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) +{ + FAST486_FPU_DATA_REG FirstAdjusted = *FirstOperand; + FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; + FAST486_FPU_DATA_REG TempResult; + + if (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand)) + { + /* Denormalized */ + State->FpuStatus.De = TRUE; + } + + /* Find the largest exponent */ + TempResult.Exponent = max(FirstOperand->Exponent, SecondOperand->Exponent); + + /* Adjust the first operand to it */ + if (FirstAdjusted.Exponent < TempResult.Exponent) + { + FirstAdjusted.Mantissa >>= (TempResult.Exponent - FirstAdjusted.Exponent); + FirstAdjusted.Exponent = TempResult.Exponent; + } + + /* ... and the second one too */ + if (SecondAdjusted.Exponent < TempResult.Exponent) + { + SecondAdjusted.Mantissa >>= (TempResult.Exponent - SecondAdjusted.Exponent); + SecondAdjusted.Exponent = TempResult.Exponent; + } + + if (FirstAdjusted.Sign == SecondAdjusted.Sign) + { + /* Calculate the mantissa and sign of the result */ + TempResult.Mantissa = FirstAdjusted.Mantissa + SecondAdjusted.Mantissa; + TempResult.Sign = FirstAdjusted.Sign; + } + else + { + /* Calculate the sign of the result */ + if (FirstAdjusted.Mantissa > SecondAdjusted.Mantissa) TempResult.Sign = FirstAdjusted.Sign; + else if (FirstAdjusted.Mantissa < SecondAdjusted.Mantissa) TempResult.Sign = SecondAdjusted.Sign; + else TempResult.Sign = FALSE; + + /* Invert the negative mantissa */ + if (FirstAdjusted.Sign) FirstAdjusted.Mantissa = -FirstAdjusted.Mantissa; + if (SecondAdjusted.Sign) SecondAdjusted.Mantissa = -SecondAdjusted.Mantissa; + + /* Calculate the mantissa of the result */ + TempResult.Mantissa = FirstAdjusted.Mantissa + SecondAdjusted.Mantissa; + } + + /* Did it overflow? */ + if (FPU_IS_NORMALIZED(&FirstAdjusted) && FPU_IS_NORMALIZED(&SecondAdjusted)) + { + if (TempResult.Exponent == FPU_MAX_EXPONENT) + { + /* Total overflow, return infinity */ + TempResult.Mantissa = FPU_MANTISSA_HIGH_BIT; + TempResult.Exponent = FPU_MAX_EXPONENT + 1; + + /* Update flags */ + State->FpuStatus.Oe = TRUE; + } + else + { + /* Lose the LSB in favor of the carry */ + TempResult.Mantissa >>= 1; + TempResult.Mantissa |= FPU_MANTISSA_HIGH_BIT; + TempResult.Exponent++; + } + } + + /* Normalize the result and return it */ + Fast486FpuNormalize(State, &TempResult); + *Result = TempResult; +} + +static VOID Fast486FpuSubtract(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) +{ + FAST486_FPU_DATA_REG NegativeSecondOperand = *SecondOperand; + + /* Invert the sign */ + NegativeSecondOperand.Sign = !NegativeSecondOperand.Sign; + + /* And perform an addition instead */ + Fast486FpuAdd(State, Result, FirstOperand, &NegativeSecondOperand); +} + +static VOID Fast486FpuCompare(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand) +{ + if (FPU_IS_NAN(FirstOperand) || FPU_IS_NAN(SecondOperand)) + { + if (FPU_IS_POS_INF(FirstOperand) && FPU_IS_NEG_INF(SecondOperand)) + { + State->FpuStatus.Code0 = FALSE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = FALSE; + } + else if (FPU_IS_NEG_INF(FirstOperand) && FPU_IS_POS_INF(SecondOperand)) + { + State->FpuStatus.Code0 = TRUE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = FALSE; + } + else + { + State->FpuStatus.Code0 = TRUE; + State->FpuStatus.Code2 = TRUE; + State->FpuStatus.Code3 = TRUE; + } + } + else + { + FAST486_FPU_DATA_REG TempResult; + + Fast486FpuSubtract(State, FirstOperand, SecondOperand, &TempResult); + + if (FPU_IS_ZERO(&TempResult)) + { + State->FpuStatus.Code0 = FALSE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = TRUE; + } + else if (TempResult.Sign) + { + State->FpuStatus.Code0 = TRUE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = FALSE; + } + else + { + State->FpuStatus.Code0 = FALSE; + State->FpuStatus.Code2 = FALSE; + State->FpuStatus.Code3 = FALSE; + } + } +} + +static VOID Fast486FpuMultiply(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) +{ + FAST486_FPU_DATA_REG TempResult; + + if (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand)) + { + /* Denormalized */ + State->FpuStatus.De = TRUE; + } + + UnsignedMult128(FirstOperand->Mantissa, + SecondOperand->Mantissa, + &TempResult.Mantissa); + + TempResult.Exponent = FirstOperand->Exponent + SecondOperand->Exponent; + TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; + + /* Normalize the result */ + Fast486FpuNormalize(State, &TempResult); + *Result = TempResult; +} + +static VOID Fast486FpuDivide(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) +{ + FAST486_FPU_DATA_REG TempResult; + + if (FPU_IS_ZERO(SecondOperand)) + { + /* Division by zero */ + State->FpuStatus.Ze = TRUE; + return; + } + + TempResult.Exponent = FirstOperand->Exponent - SecondOperand->Exponent; + TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; + + // TODO: NOT IMPLEMENTED + UNREFERENCED_PARAMETER(TempResult); + UNIMPLEMENTED; +} + /* PUBLIC FUNCTIONS ***********************************************************/ -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8DC) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + FAST486_FPU_DATA_REG MemoryData; + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + FPU_CHECK(); + +#ifndef FAST486_NO_FPU + + if (ModRegRm.Memory) + { + /* Load the source operand from memory */ + + if (Opcode == 0xDC) + { + ULONGLONG Value; + + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + &Value, + sizeof(ULONGLONG))) + { + /* Exception occurred */ + return FALSE; + } + + Fast486FpuGetDoubleReal(State, Value, &MemoryData); + } + else + { + ULONG Value; + + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + Fast486FpuGetSingleReal(State, Value, &MemoryData); + } + + SourceOperand = &MemoryData; + } + else + { + /* Load the source operand from an FPU register */ + SourceOperand = &FPU_ST(ModRegRm.SecondRegister); + + if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return FALSE; + } + } + + /* The destination operand is always ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return FALSE; + } + + /* Check the operation */ + switch (ModRegRm.Register) + { + /* FADD */ + case 0: + { + Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FMUL */ + case 1: + { + Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FCOM */ + case 2: + /* FCOMP */ + case 3: + { + Fast486FpuCompare(State, DestOperand, SourceOperand); + if (ModRegRm.Register == 3) Fast486FpuPop(State); + + break; + } + + /* FSUB */ + case 4: + { + Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FSUBR */ + case 5: + { + Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); + break; + } + + /* FDIV */ + case 6: + { + Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FDIVR */ + case 7: + { + Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); + break; + } + } + +#endif + + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -58,7 +462,7 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDA) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -83,7 +487,84 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDA) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDB) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + FPU_CHECK(); + +#ifndef FAST486_NO_FPU + + if (ModRegRm.Memory) + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + } + else + { + /* Only a few of these instructions have any meaning on a 487 */ + switch ((ModRegRm.SecondRegister << 3) | ModRegRm.Register) + { + /* FCLEX */ + case 0x22: + { + /* Clear exception data */ + State->FpuStatus.Ie = + State->FpuStatus.De = + State->FpuStatus.Ze = + State->FpuStatus.Oe = + State->FpuStatus.Ue = + State->FpuStatus.Pe = + State->FpuStatus.Sf = + State->FpuStatus.Es = + State->FpuStatus.Busy = FALSE; + + break; + } + + /* FINIT */ + case 0x23: + { + /* Restore the state */ + State->FpuControl.Value = FAST486_FPU_DEFAULT_CONTROL; + State->FpuStatus.Value = 0; + State->FpuTag = 0xFFFF; + + break; + } + + /* FENI */ + case 0x20: + /* FDISI */ + case 0x21: + { + /* These do nothing */ + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + } + } + +#endif + + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -108,7 +589,7 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDB) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDE) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -133,7 +614,7 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDC) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -158,79 +639,4 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD) -{ - FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - - /* Get the operands */ - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return FALSE; - } - - FPU_CHECK(); - -#ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -#else - /* Do nothing */ - return TRUE; -#endif -} - -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDE) -{ - FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - - /* Get the operands */ - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return FALSE; - } - - FPU_CHECK(); - -#ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -#else - /* Do nothing */ - return TRUE; -#endif -} - -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF) -{ - FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - - /* Get the operands */ - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return FALSE; - } - - FPU_CHECK(); - -#ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -#else - /* Do nothing */ - return TRUE; -#endif -} - /* EOF */ Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6465… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * fpu.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,6 +24,8 @@ #pragma once +#include "opcodes.h" + /* DEFINES ********************************************************************/ #define FPU_CHECK() if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_EM) \ @@ -32,6 +34,24 @@ return FALSE; \ } #define FPU_ST(i) State->FpuRegisters[(State->FpuStatus.Top + (i)) % FAST486_NUM_FPU_REGS] +#define FPU_GET_TAG(i) ((State->FpuTag >> ((i) * 2)) & 3) +#define FPU_SET_TAG(i, t) { \ + State->FpuTag &= ~((1 << ((i) * 2)) | (1 << (((i) * 2) + 1))); \ + State->FpuTag |= ((t) & 3) << ((i) * 2); \ + } + +#define FPU_REAL4_BIAS 0x7F +#define FPU_REAL8_BIAS 0x3FF +#define FPU_REAL10_BIAS 0x3FFF +#define FPU_MAX_EXPONENT 0x7FFE +#define FPU_MANTISSA_HIGH_BIT 0x8000000000000000ULL + +#define FPU_IS_NORMALIZED(x) (!FPU_IS_ZERO(x) && (((x)->Mantissa & FPU_MANTISSA_HIGH_BIT) != 0ULL)) +#define FPU_IS_ZERO(x) ((x)->Mantissa == 0ULL) +#define FPU_IS_NAN(x) ((x)->Exponent == (FPU_MAX_EXPONENT + 1)) +#define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && (x)->Mantissa & FPU_MANTISSA_HIGH_BIT) +#define FPU_IS_POS_INF(x) (FPU_IS_INFINITY(x) && !(x)->Sign) +#define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) enum { @@ -48,11 +68,10 @@ FPU_TAG_EMPTY = 3 }; -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8); +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8DC); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDA); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDB); -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDC); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDE); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF); Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * opcodes.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -254,11 +254,11 @@ Fast486OpcodeAad, Fast486OpcodeSalc, Fast486OpcodeXlat, - Fast486FpuOpcodeD8, + Fast486FpuOpcodeD8DC, Fast486FpuOpcodeD9, Fast486FpuOpcodeDA, Fast486FpuOpcodeDB, - Fast486FpuOpcodeDC, + Fast486FpuOpcodeD8DC, Fast486FpuOpcodeDD, Fast486FpuOpcodeDE, Fast486FpuOpcodeDF, Modified: trunk/reactos/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.h?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * opcodes.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * opgroups.c * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/reactos/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] Fri Oct 10 23:07:14 2014 @@ -2,7 +2,7 @@ * Fast486 386/486 CPU Emulation Library * opgroups.h * - * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License

1 0

[akhaldi] 64655: [MSIEXEC] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: akhaldi Date: Fri Oct 10 11:41:31 2014 New Revision: 64655 URL: http://svn.reactos.org/svn/reactos?rev=64655&view=rev Log: [MSIEXEC] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/base/system/msiexec/msiexec.c trunk/reactos/base/system/msiexec/service.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Fri Oct 10 11:41:31 2014 @@ -418,11 +418,12 @@ { enum chomp_state state = cs_token; WCHAR *p, *out; - int count = 1, ignore; + int count = 1; + BOOL ignore; for( p = str, out = str; *p; p++ ) { - ignore = 1; + ignore = TRUE; switch( state ) { case cs_whitespace: @@ -436,7 +437,7 @@ break; default: count++; - ignore = 0; + ignore = FALSE; state = cs_token; } break; @@ -452,7 +453,7 @@ *out++ = 0; break; default: - ignore = 0; + ignore = FALSE; } break; @@ -463,7 +464,7 @@ state = cs_token; break; default: - ignore = 0; + ignore = FALSE; } break; } @@ -626,6 +627,7 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); + WINE_FIXME("Administrative installs are not currently supported\n"); } else if(msi_option_prefix(argvW[i], "f")) { @@ -906,13 +908,18 @@ } else if(msi_strequal(argvW[i]+2, "b+!")) { - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; - WINE_FIXME("Unknown modifier: !\n"); + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL; + } + else if(msi_strequal(argvW[i]+2, "b-!")) + { + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; } else if(msi_strequal(argvW[i]+2, "b!")) { - InstallUILevel = INSTALLUILEVEL_BASIC; - WINE_FIXME("Unknown modifier: !\n"); + WINE_FIXME("Unhandled modifier: !\n"); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL; } else { Modified: trunk/reactos/base/system/msiexec/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/servic… ============================================================================== --- trunk/reactos/base/system/msiexec/service.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/service.c [iso-8859-1] Fri Oct 10 11:41:31 2014 @@ -73,6 +73,8 @@ static void WINAPI ServiceCtrlHandler(DWORD code) { + DWORD state = SERVICE_RUNNING; + WINE_TRACE("%u\n", code); switch (code) @@ -81,21 +83,19 @@ case SERVICE_CONTROL_STOP: UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); - return; + state = SERVICE_STOPPED; + break; default: fprintf(stderr, "Unhandled service control code: %u\n", code); break; } - UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); + UpdateSCMStatus(state, NO_ERROR, 0); } static DWORD WINAPI ServiceExecutionThread(LPVOID param) { - while (TRUE) - { - /* do nothing */ - } + WaitForSingleObject(kill_event, INFINITE); return 0; } @@ -130,12 +130,14 @@ { fprintf(stderr, "Failed to create event\n"); KillService(); + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; } if (!StartServiceThread()) { KillService(); + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; } @@ -143,6 +145,8 @@ WaitForSingleObject(kill_event, INFINITE); KillService(); + + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); } DWORD DoService(void) 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 Oct 10 11:41:31 2014 @@ -246,7 +246,7 @@ reactos/base/applications/wordpad # Synced to Wine-1.7.9 reactos/base/services/rpcss # Synced to Wine-1.7.27 reactos/base/system/expand # Synced to Wine-1.7.1 -reactos/base/system/msiexec # Synced to Wine-1.7.1 +reactos/base/system/msiexec # Synced to Wine-1.7.27 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

1 0

[akhaldi] 64654: [RPCSS] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 10 Oct '14

10 Oct '14

Author: akhaldi Date: Fri Oct 10 11:38:00 2014 New Revision: 64654 URL: http://svn.reactos.org/svn/reactos?rev=64654&view=rev Log: [RPCSS] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/base/services/rpcss/epm.idl trunk/reactos/base/services/rpcss/irot.idl trunk/reactos/base/services/rpcss/rpcss_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/services/rpcss/epm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epm.id… ============================================================================== --- trunk/reactos/base/services/rpcss/epm.idl [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/epm.idl [iso-8859-1] Fri Oct 10 11:38:00 2014 @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep server + #include "wine/epm.idl" Modified: trunk/reactos/base/services/rpcss/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irot.i… ============================================================================== --- trunk/reactos/base/services/rpcss/irot.idl [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irot.idl [iso-8859-1] Fri Oct 10 11:38:00 2014 @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep server + #include "wine/irot.idl" Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Fri Oct 10 11:38:00 2014 @@ -94,8 +94,11 @@ if (status != RPC_S_OK) goto fail; - //exit_event = __wine_make_process_system(); +#ifndef __REACTOS__ + exit_event = __wine_make_process_system(); +#else exit_event = CreateEventW(NULL, FALSE, FALSE, NULL); // never fires +#endif return TRUE; 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 Oct 10 11:38:00 2014 @@ -244,7 +244,7 @@ reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.7.27 reactos/base/applications/wordpad # Synced to Wine-1.7.9 -reactos/base/services/rpcss # Synced to Wine-1.7.1 +reactos/base/services/rpcss # Synced to Wine-1.7.27 reactos/base/system/expand # Synced to Wine-1.7.1 reactos/base/system/msiexec # Synced to Wine-1.7.1 reactos/modules/rosapps/winfile # Autosync

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