Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[hbelusca] 68715: [CSRSRV] - Don't use hardcoded structure types in sizeof's where possible. - Fix the parameters of NtSetInformationProcess calls in CsrSetBackground/ForegroundPriority. CORE-9911

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 15 16:34:21 2015 New Revision: 68715 URL: http://svn.reactos.org/svn/reactos?rev=68715&view=rev Log: [CSRSRV] - Don't use hardcoded structure types in sizeof's where possible. - Fix the parameters of NtSetInformationProcess calls in CsrSetBackground/ForegroundPriority. CORE-9911 Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrsrv/session.c trunk/reactos/subsystems/win32/csrsrv/thredsup.c Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/pr… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Sat Aug 15 16:34:21 2015 @@ -57,7 +57,7 @@ NtSetInformationProcess(NtCurrentProcess(), ProcessBasePriority, &BasePriority, - sizeof(KPRIORITY)); + sizeof(BasePriority)); } /*++ @@ -79,7 +79,7 @@ NTAPI CsrSetToShutdownPriority(VOID) { - KPRIORITY SetBasePriority = (8 + 1) + 6; + KPRIORITY BasePriority = (8 + 1) + 6; BOOLEAN Old; /* Get the shutdown privilege */ @@ -91,8 +91,8 @@ /* Set the Priority */ NtSetInformationProcess(NtCurrentProcess(), ProcessBasePriority, - &SetBasePriority, - sizeof(KPRIORITY)); + &BasePriority, + sizeof(BasePriority)); } } @@ -488,11 +488,11 @@ } } - /* Set the Exception port for us */ + /* Set the Exception Port for us */ Status = NtSetInformationProcess(hProcess, ProcessExceptionPort, &CsrApiPort, - sizeof(HANDLE)); + sizeof(CsrApiPort)); if (!NT_SUCCESS(Status)) { /* Failed */ @@ -549,7 +549,7 @@ Status = NtSetInformationProcess(hProcess, ProcessDebugPort, &CsrApiPort, - sizeof(HANDLE)); + sizeof(CsrApiPort)); ASSERT(NT_SUCCESS(Status)); if (!NT_SUCCESS(Status)) { @@ -563,7 +563,7 @@ /* Get the Thread Create Time */ Status = NtQueryInformationThread(hThread, ThreadTimes, - (PVOID)&KernelTimes, + &KernelTimes, sizeof(KernelTimes), NULL); if (!NT_SUCCESS(Status)) @@ -1072,7 +1072,7 @@ Status = NtSetInformationThread(NtCurrentThread(), ThreadImpersonationToken, &ImpersonationToken, - sizeof(HANDLE)); + sizeof(ImpersonationToken)); /* Return TRUE or FALSE */ return NT_SUCCESS(Status); @@ -1097,16 +1097,16 @@ NTAPI CsrSetBackgroundPriority(IN PCSR_PROCESS CsrProcess) { - PROCESS_PRIORITY_CLASS PriorityClass; + PROCESS_FOREGROUND_BACKGROUND ProcessPriority; /* Set the Foreground bit off */ - PriorityClass.Foreground = FALSE; - - /* Set the new Priority */ + ProcessPriority.Foreground = FALSE; + + /* Set the new priority */ NtSetInformationProcess(CsrProcess->ProcessHandle, - ProcessPriorityClass, - &PriorityClass, - sizeof(PriorityClass)); + ProcessForegroundInformation, + &ProcessPriority, + sizeof(ProcessPriority)); } /*++ @@ -1128,16 +1128,16 @@ NTAPI CsrSetForegroundPriority(IN PCSR_PROCESS CsrProcess) { - PROCESS_PRIORITY_CLASS PriorityClass; + PROCESS_FOREGROUND_BACKGROUND ProcessPriority; /* Set the Foreground bit on */ - PriorityClass.Foreground = TRUE; - - /* Set the new Priority */ + ProcessPriority.Foreground = TRUE; + + /* Set the new priority */ NtSetInformationProcess(CsrProcess->ProcessHandle, - ProcessPriorityClass, - &PriorityClass, - sizeof(PriorityClass)); + ProcessForegroundInformation, + &ProcessPriority, + sizeof(ProcessPriority)); } /*++ Modified: trunk/reactos/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] Sat Aug 15 16:34:21 2015 @@ -234,11 +234,11 @@ return TRUE; } - /* Set the exception port */ + /* Set the Exception Port for us */ Status = NtSetInformationProcess(hProcess, ProcessExceptionPort, &CsrApiPort, - sizeof(HANDLE)); + sizeof(CsrApiPort)); /* Check for success */ if (!NT_SUCCESS(Status)) @@ -255,7 +255,7 @@ Status = NtQueryInformationThread(hThread, ThreadTimes, &KernelTimes, - sizeof(KERNEL_USER_TIMES), + sizeof(KernelTimes), NULL); /* Check for success */ Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sat Aug 15 16:34:21 2015 @@ -714,7 +714,7 @@ /* Get the Thread Create Time */ Status = NtQueryInformationThread(hThread, ThreadTimes, - (PVOID)&KernelTimes, + &KernelTimes, sizeof(KernelTimes), NULL); if (!NT_SUCCESS(Status))

9 years, 4 months

[bfreisen] 68714: [MSPAINT_NEW] add (untested) printing code, fix mouse cursor bug

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sat Aug 15 10:13:28 2015 New Revision: 68714 URL: http://svn.reactos.org/svn/reactos?rev=68714&view=rev Log: [MSPAINT_NEW] add (untested) printing code, fix mouse cursor bug Modified: trunk/reactos/base/applications/mspaint_new/miniature.cpp trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/miniature.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] Sat Aug 15 10:13:28 2015 @@ -35,5 +35,6 @@ LRESULT CMiniatureWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SetCursor(LoadCursor(NULL, IDC_ARROW)); + bHandled = FALSE; return 0; } Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Sat Aug 15 10:13:28 2015 @@ -294,6 +294,7 @@ LRESULT CMainWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SetCursor(LoadCursor(NULL, IDC_ARROW)); + bHandled = FALSE; return 0; } @@ -403,12 +404,28 @@ PageSetupDlg(&psd); break; case IDM_FILEPRINT: - // DUMMY: Shows the dialog only, no functionality + // TODO: Test whether it actually works PRINTDLG pd; ZeroMemory(&pd, sizeof(pd)); pd.lStructSize = sizeof(pd); pd.hwndOwner = m_hWnd; - PrintDlg(&pd); + pd.hDevMode = NULL; // freed by user + pd.hDevNames = NULL; // freed by user + pd.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC; + pd.nCopies = 1; + pd.nFromPage = 0xffff; + pd.nToPage = 0xffff; + pd.nMinPage = 1; + pd.nMaxPage = 0xffff; + if (PrintDlg(&pd) == TRUE) + { + BitBlt(pd.hDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), imageModel.GetDC(), 0, 0, SRCCOPY); + DeleteDC(pd.hDC); + } + if (pd.hDevMode) + GlobalFree(pd.hDevMode); + if (pd.hDevNames) + GlobalFree(pd.hDevNames); break; case IDM_FILEASWALLPAPERPLANE: SetWallpaper(filepathname, 1, 1);

9 years, 4 months

[jimtabor] 68713: [RosApps|WineFile] Patch by Jared Smudde - Fix compiling warnings, see ROSAPPS-300.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 13 22:01:13 2015 New Revision: 68713 URL: http://svn.reactos.org/svn/reactos?rev=68713&view=rev Log: [RosApps|WineFile] Patch by Jared Smudde - Fix compiling warnings, see ROSAPPS-300. Modified: trunk/rosapps/applications/winfile/lang/cs-CZ.rc trunk/rosapps/applications/winfile/lang/da-DK.rc trunk/rosapps/applications/winfile/lang/de-DE.rc trunk/rosapps/applications/winfile/lang/en-US.rc trunk/rosapps/applications/winfile/lang/es-ES.rc trunk/rosapps/applications/winfile/lang/fr-FR.rc trunk/rosapps/applications/winfile/lang/hu-HU.rc trunk/rosapps/applications/winfile/lang/it-IT.rc trunk/rosapps/applications/winfile/lang/ja-JP.rc trunk/rosapps/applications/winfile/lang/ko-KR.rc trunk/rosapps/applications/winfile/lang/lt-LT.rc trunk/rosapps/applications/winfile/lang/nl-NL.rc trunk/rosapps/applications/winfile/lang/no-NO.rc trunk/rosapps/applications/winfile/lang/pl-PL.rc trunk/rosapps/applications/winfile/lang/pt-BR.rc trunk/rosapps/applications/winfile/lang/ro-RO.rc trunk/rosapps/applications/winfile/lang/ru-RU.rc trunk/rosapps/applications/winfile/lang/sl-SI.rc trunk/rosapps/applications/winfile/lang/sv-SE.rc trunk/rosapps/applications/winfile/lang/tr-TR.rc trunk/rosapps/applications/winfile/lang/uk-UA.rc trunk/rosapps/applications/winfile/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rosapps/applications/winfile/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/…

9 years, 4 months

[jimtabor] 68712: - Amending r68711.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 13 21:31:58 2015 New Revision: 68712 URL: http://svn.reactos.org/svn/reactos?rev=68712&view=rev Log: - Amending r68711. Added: trunk/rosapps/applications/winfile/resources/drivebar.bmp (with props) trunk/rosapps/applications/winfile/resources/images.bmp (with props) trunk/rosapps/applications/winfile/resources/toolbar.bmp (with props) trunk/rosapps/applications/winfile/resources/winefile.ico (with props) Added: trunk/rosapps/applications/winfile/resources/drivebar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/resou… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/winfile/resources/drivebar.bmp ------------------------------------------------------------------------------ svn:mime-type = image/x-ms-bmp Added: trunk/rosapps/applications/winfile/resources/images.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/resou… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/winfile/resources/images.bmp ------------------------------------------------------------------------------ svn:mime-type = image/x-ms-bmp Added: trunk/rosapps/applications/winfile/resources/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/resou… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/winfile/resources/toolbar.bmp ------------------------------------------------------------------------------ svn:mime-type = image/x-ms-bmp Added: trunk/rosapps/applications/winfile/resources/winefile.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/resou… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/winfile/resources/winefile.ico ------------------------------------------------------------------------------ svn:mime-type = image/x-icon

9 years, 4 months

[jimtabor] 68711: [RosApps|WineFile] Patch by Jared Smudde - Improvements to Wine File, see ROSAPPS-300.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 13 21:19:41 2015 New Revision: 68711 URL: http://svn.reactos.org/svn/reactos?rev=68711&view=rev Log: [RosApps|WineFile] Patch by Jared Smudde - Improvements to Wine File, see ROSAPPS-300. Added: trunk/rosapps/applications/winfile/lang/ trunk/rosapps/applications/winfile/lang/cs-CZ.rc (with props) trunk/rosapps/applications/winfile/lang/da-DK.rc (with props) trunk/rosapps/applications/winfile/lang/de-DE.rc (with props) trunk/rosapps/applications/winfile/lang/en-US.rc (with props) trunk/rosapps/applications/winfile/lang/es-ES.rc (with props) trunk/rosapps/applications/winfile/lang/fr-FR.rc (with props) trunk/rosapps/applications/winfile/lang/hu-HU.rc (with props) trunk/rosapps/applications/winfile/lang/it-IT.rc (with props) trunk/rosapps/applications/winfile/lang/ja-JP.rc (with props) trunk/rosapps/applications/winfile/lang/ko-KR.rc (with props) trunk/rosapps/applications/winfile/lang/lt-LT.rc (with props) trunk/rosapps/applications/winfile/lang/nl-NL.rc (with props) trunk/rosapps/applications/winfile/lang/no-NO.rc (with props) trunk/rosapps/applications/winfile/lang/pl-PL.rc (with props) trunk/rosapps/applications/winfile/lang/pt-BR.rc (with props) trunk/rosapps/applications/winfile/lang/ro-RO.rc (with props) trunk/rosapps/applications/winfile/lang/ru-RU.rc (with props) trunk/rosapps/applications/winfile/lang/sl-SI.rc (with props) trunk/rosapps/applications/winfile/lang/sv-SE.rc (with props) trunk/rosapps/applications/winfile/lang/tr-TR.rc (with props) trunk/rosapps/applications/winfile/lang/uk-UA.rc (with props) trunk/rosapps/applications/winfile/lang/zh-CN.rc (with props) trunk/rosapps/applications/winfile/resources/ Removed: trunk/rosapps/applications/winfile/Cs.rc trunk/rosapps/applications/winfile/Da.rc trunk/rosapps/applications/winfile/De.rc trunk/rosapps/applications/winfile/En.rc trunk/rosapps/applications/winfile/Es.rc trunk/rosapps/applications/winfile/Fr.rc trunk/rosapps/applications/winfile/Hu.rc trunk/rosapps/applications/winfile/It.rc trunk/rosapps/applications/winfile/Ja.rc trunk/rosapps/applications/winfile/Ko.rc trunk/rosapps/applications/winfile/Lt.rc trunk/rosapps/applications/winfile/Nl.rc trunk/rosapps/applications/winfile/No.rc trunk/rosapps/applications/winfile/Pl.rc trunk/rosapps/applications/winfile/Pt.rc trunk/rosapps/applications/winfile/Ro.rc trunk/rosapps/applications/winfile/Ru.rc trunk/rosapps/applications/winfile/Si.rc trunk/rosapps/applications/winfile/Sv.rc trunk/rosapps/applications/winfile/Tr.rc trunk/rosapps/applications/winfile/Uk.rc trunk/rosapps/applications/winfile/Zh.rc trunk/rosapps/applications/winfile/drivebar.bmp trunk/rosapps/applications/winfile/images.bmp trunk/rosapps/applications/winfile/toolbar.bmp trunk/rosapps/applications/winfile/winefile.ico Modified: trunk/rosapps/applications/winfile/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/rosapps/applications/winfile/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Cs.rc… Removed: trunk/rosapps/applications/winfile/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Da.rc… Removed: trunk/rosapps/applications/winfile/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/De.rc… Removed: trunk/rosapps/applications/winfile/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/En.rc… Removed: trunk/rosapps/applications/winfile/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Es.rc… Removed: trunk/rosapps/applications/winfile/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Fr.rc… Removed: trunk/rosapps/applications/winfile/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Hu.rc… Removed: trunk/rosapps/applications/winfile/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/It.rc… Removed: trunk/rosapps/applications/winfile/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ja.rc… Removed: trunk/rosapps/applications/winfile/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ko.rc… Removed: trunk/rosapps/applications/winfile/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Lt.rc… Removed: trunk/rosapps/applications/winfile/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Nl.rc… Removed: trunk/rosapps/applications/winfile/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/No.rc… Removed: trunk/rosapps/applications/winfile/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pl.rc… Removed: trunk/rosapps/applications/winfile/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pt.rc… Removed: trunk/rosapps/applications/winfile/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ro.rc… Removed: trunk/rosapps/applications/winfile/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ru.rc… Removed: trunk/rosapps/applications/winfile/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Si.rc… Removed: trunk/rosapps/applications/winfile/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Sv.rc… Removed: trunk/rosapps/applications/winfile/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Tr.rc… Removed: trunk/rosapps/applications/winfile/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Uk.rc… Removed: trunk/rosapps/applications/winfile/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Zh.rc… Removed: trunk/rosapps/applications/winfile/drivebar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/drive… Removed: trunk/rosapps/applications/winfile/images.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/image… Added: trunk/rosapps/applications/winfile/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Added: trunk/rosapps/applications/winfile/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… Modified: trunk/rosapps/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… Removed: trunk/rosapps/applications/winfile/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/toolb… Removed: trunk/rosapps/applications/winfile/winefile.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef…

9 years, 4 months

[hbelusca] 68710: [NTVDM] - When we have few R/W IO port handlers, just register them directly instead of using a wrap-up function. - Remove hardcoded bit flag values.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 13 19:34:16 2015 New Revision: 68710 URL: http://svn.reactos.org/svn/reactos?rev=68710&view=rev Log: [NTVDM] - When we have few R/W IO port handlers, just register them directly instead of using a wrap-up function. - Remove hardcoded bit flag values. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] Thu Aug 13 19:34:16 2015 @@ -5,6 +5,10 @@ * PURPOSE: PS/2 controller emulation * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * DOCUMENTATION: IBM Personal System/2 Hardware Interface Technical Reference, May 1988 (Section 10) + * http://wiki.osdev.org/%228042%22_PS/2_Controller + * http://www.computer-engineering.org/ps2keyboard/ */ /* INCLUDES *******************************************************************/ @@ -45,286 +49,362 @@ #define PS2_PORTS 2 static PS2_PORT Ports[PS2_PORTS]; -static BYTE ControllerConfig = 0x00; -static BYTE ControllerCommand = 0x00; - -static BYTE StatusRegister = 0x00; +static BYTE Memory[0x20]; // PS/2 Controller internal memory +#define ControllerConfig Memory[0] // The configuration byte is byte 0 + +static BYTE StatusRegister = 0x00; // Controller status register // static BYTE InputBuffer = 0x00; // PS/2 Input Buffer static BYTE OutputBuffer = 0x00; // PS/2 Output Buffer +static BYTE ControllerCommand = 0x00; + static PHARDWARE_TIMER IrqTimer = NULL; /* PRIVATE FUNCTIONS **********************************************************/ -static VOID PS2SendCommand(PPS2_PORT Port, BYTE Command) -{ - if (!Port->IsEnabled) return; +static VOID PS2SendCommand(BYTE PS2Port, BYTE Command) +{ + PPS2_PORT Port; + + ASSERT(PS2Port < PS2_PORTS); + Port = &Ports[PS2Port]; + + /* + * According to http://www.win.tue.nl/~aeb/linux/kbd/scancodes-11.html#kccad + * any PS/2 command sent reenables the corresponding port. + */ + if (PS2Port == 0) + ControllerConfig &= ~PS2_CONFIG_KBD_DISABLE; + else // if (PS2Port == 1) + ControllerConfig &= ~PS2_CONFIG_AUX_DISABLE; + + Port->IsEnabled = TRUE; /* Call the device command */ if (Port->DeviceCommand) Port->DeviceCommand(Port->Param, Command); } -static BYTE WINAPI PS2ReadPort(USHORT Port) -{ - if (Port == PS2_CONTROL_PORT) + +static BYTE WINAPI PS2ReadControl(USHORT Port) +{ + UNREFERENCED_PARAMETER(Port); + + /* + * Be sure the "Keyboard enable" flag is always set. + * On IBM PC-ATs this is the state of the hardware keyboard + * lock mechanism. It is not widely used, but some programs + * still use it, see for example: + * http://www.os2museum.com/wp/the-dos-4-0-shell-mouse-mystery/ + */ + StatusRegister |= PS2_STAT_KBD_ENABLE; + + /* We do not have any timeouts nor parity errors */ + StatusRegister &= ~(PS2_STAT_PARITY_ERROR | PS2_STAT_GEN_TIMEOUT); + + return StatusRegister; +} + +static BYTE WINAPI PS2ReadData(USHORT Port) +{ + UNREFERENCED_PARAMETER(Port); + + /* + * If there is something to read (response byte from the + * controller or data from a PS/2 device), read it. + */ + StatusRegister &= ~PS2_STAT_OUT_BUF_FULL; + + // Keep the state of the "Auxiliary output buffer full" flag + // in order to remember from where the data came from. + // StatusRegister &= ~PS2_STAT_AUX_OUT_BUF_FULL; + + // FIXME: We may check there whether there is data latched in + // PS2 ports 1 or 2 (keyboard or mouse) and retrieve it there... + + /* Always return the available byte stored in the output buffer */ + return OutputBuffer; +} + +static VOID WINAPI PS2WriteControl(USHORT Port, BYTE Data) +{ + UNREFERENCED_PARAMETER(Port); + + switch (Data) { - /* - * Be sure bit 4 "Keyboard enable flag" is always set. - * Keyboard enable (or keyboard lock) flag values are: - * 0: Locked; 1: Not locked. - * On IBM PC-ATs this is the state of the hardware keyboard - * lock mechanism. It is not widely used, but some programs - * still use it: see for example: - * http://www.os2museum.com/wp/the-dos-4-0-shell-mouse-mystery/ - */ - StatusRegister |= (1 << 4); - - // FIXME: Should clear bits 6 and 7 because there are - // no timeouts and no parity errors. - - return StatusRegister; + /* Read configuration byte (byte 0 from internal memory) */ + case 0x20: + /* Read byte N from internal memory */ + case 0x21: case 0x22: case 0x23: + case 0x24: case 0x25: case 0x26: case 0x27: + case 0x28: case 0x29: case 0x2A: case 0x2B: + case 0x2C: case 0x2D: case 0x2E: case 0x2F: + case 0x30: case 0x31: case 0x32: case 0x33: + case 0x34: case 0x35: case 0x36: case 0x37: + case 0x38: case 0x39: case 0x3A: case 0x3B: + case 0x3C: case 0x3D: case 0x3E: case 0x3F: + { + OutputBuffer = Memory[Data & 0x1F]; + StatusRegister |= PS2_STAT_OUT_BUF_FULL; + break; + } + + /* Write configuration byte (byte 0 from internal memory) */ + case 0x60: + /* Write to byte N of internal memory */ + case 0x61: case 0x62: case 0x63: + case 0x64: case 0x65: case 0x66: case 0x67: + case 0x68: case 0x69: case 0x6A: case 0x6B: + case 0x6C: case 0x6D: case 0x6E: case 0x6F: + case 0x70: case 0x71: case 0x72: case 0x73: + case 0x74: case 0x75: case 0x76: case 0x77: + case 0x78: case 0x79: case 0x7A: case 0x7B: + case 0x7C: case 0x7D: case 0x7E: case 0x7F: + + /* Write controller output port */ + case 0xD1: + /* Write to the first PS/2 port output buffer */ + case 0xD2: + /* Write to the second PS/2 port output buffer */ + case 0xD3: + /* Write to the second PS/2 port input buffer */ + case 0xD4: + { + /* These commands require a response */ + ControllerCommand = Data; + StatusRegister |= PS2_STAT_COMMAND; + break; + } + + /* Disable second PS/2 port */ + case 0xA7: + { + ControllerConfig |= PS2_CONFIG_AUX_DISABLE; + Ports[1].IsEnabled = FALSE; + break; + } + + /* Enable second PS/2 port */ + case 0xA8: + { + ControllerConfig &= ~PS2_CONFIG_AUX_DISABLE; + Ports[1].IsEnabled = TRUE; + break; + } + + /* Test second PS/2 port */ + case 0xA9: + { + OutputBuffer = 0x00; // Success code + StatusRegister |= PS2_STAT_OUT_BUF_FULL; + break; + } + + /* Test PS/2 controller */ + case 0xAA: + { + OutputBuffer = 0x55; // Success code + StatusRegister |= PS2_STAT_OUT_BUF_FULL; + break; + } + + /* Test first PS/2 port */ + case 0xAB: + { + OutputBuffer = 0x00; // Success code + StatusRegister |= PS2_STAT_OUT_BUF_FULL; + break; + } + + /* Disable first PS/2 port */ + case 0xAD: + { + ControllerConfig |= PS2_CONFIG_KBD_DISABLE; + Ports[0].IsEnabled = FALSE; + break; + } + + /* Enable first PS/2 port */ + case 0xAE: + { + ControllerConfig &= ~PS2_CONFIG_KBD_DISABLE; + Ports[0].IsEnabled = TRUE; + break; + } + + /* Read controller output port */ + case 0xD0: + { + /* Bit 0 always set, and bit 1 is the A20 gate state */ + OutputBuffer = (!!EmulatorGetA20() << 1) | PS2_OUT_CPU_NO_RESET; + + /* Set IRQ1 state */ + if (ControllerConfig & PS2_CONFIG_KBD_INT) + OutputBuffer |= PS2_OUT_IRQ01; + else + OutputBuffer &= ~PS2_OUT_IRQ01; + + /* Set IRQ12 state */ + if (ControllerConfig & PS2_CONFIG_AUX_INT) + OutputBuffer |= PS2_OUT_IRQ12; + else + OutputBuffer &= ~PS2_OUT_IRQ12; + + /* Check whether data is already present */ + if (StatusRegister & PS2_STAT_OUT_BUF_FULL) + { + if (StatusRegister & PS2_STAT_AUX_OUT_BUF_FULL) + OutputBuffer |= PS2_OUT_AUX_DATA; + else + OutputBuffer |= PS2_OUT_KBD_DATA; + } + + StatusRegister |= PS2_STAT_OUT_BUF_FULL; + break; + } + + /* CPU Reset */ + case 0xF0: case 0xF2: case 0xF4: case 0xF6: + case 0xF8: case 0xFA: case 0xFC: case 0xFE: + { + /* Stop the VDM */ + EmulatorTerminate(); + return; + } } - else if (Port == PS2_DATA_PORT) +} + +static VOID WINAPI PS2WriteData(USHORT Port, BYTE Data) +{ + /* Check if the controller is waiting for a response */ + if (StatusRegister & PS2_STAT_COMMAND) { - /* - * If there is something to read (response byte from the - * controller or data from a PS/2 device), read it. - */ - if (StatusRegister & (1 << 0)) // || StatusRegister & (1 << 5) for second PS/2 port - StatusRegister &= ~(1 << 0); // StatusRegister &= ~(1 << 5); - - // FIXME: We may check there whether there is data latched in - // PS2 ports 1 or 2 (keyboard or mouse) and retrieve it there... - - /* Always return the available byte stored in the output buffer */ - return OutputBuffer; + StatusRegister &= ~PS2_STAT_COMMAND; + + /* Check which command it was */ + switch (ControllerCommand) + { + /* Write configuration byte (byte 0 from internal memory) */ + case 0x60: + { + ControllerConfig = Data; + + /* + * Synchronize the enable state of the PS/2 ports + * with the flags in the configuration byte. + */ + Ports[0].IsEnabled = !(ControllerConfig & PS2_CONFIG_KBD_DISABLE); + Ports[1].IsEnabled = !(ControllerConfig & PS2_CONFIG_AUX_DISABLE); + + /* + * Update the "System enabled" flag of the status register + * with bit 2 of the controller configuration byte. + * See: http://www.win.tue.nl/~aeb/linux/kbd/scancodes-11.html#kccb2 + * for more details. + */ + if (ControllerConfig & PS2_CONFIG_SYSTEM) + StatusRegister |= PS2_STAT_SYSTEM; + else + StatusRegister &= ~PS2_STAT_SYSTEM; + + /* + * Update the "Keyboard enable" flag of the status register + * with the "Ignore keyboard lock" flag of the controller + * configuration byte (if set), then reset the latter one. + * See: http://www.win.tue.nl/~aeb/linux/kbd/scancodes-11.html#kccb3 + * for more details. + */ + if (ControllerConfig & PS2_CONFIG_NO_KEYLOCK) + { + ControllerConfig &= ~PS2_CONFIG_NO_KEYLOCK; + StatusRegister |= PS2_STAT_KBD_ENABLE; + } + + break; + } + + /* Write to byte N of internal memory */ + case 0x61: case 0x62: case 0x63: + case 0x64: case 0x65: case 0x66: case 0x67: + case 0x68: case 0x69: case 0x6A: case 0x6B: + case 0x6C: case 0x6D: case 0x6E: case 0x6F: + case 0x70: case 0x71: case 0x72: case 0x73: + case 0x74: case 0x75: case 0x76: case 0x77: + case 0x78: case 0x79: case 0x7A: case 0x7B: + case 0x7C: case 0x7D: case 0x7E: case 0x7F: + { + Memory[ControllerCommand & 0x1F] = Data; + break; + } + + /* Write controller output */ + case 0xD1: + { + /* Check if bit 0 is unset */ + if (!(Data & PS2_OUT_CPU_NO_RESET)) + { + /* CPU disabled - Stop the VDM */ + EmulatorTerminate(); + return; + } + + /* Update the A20 line setting */ + EmulatorSetA20(Data & PS2_OUT_A20_SET); + + // FIXME: Should we need to add the status of IRQ1 and IRQ12?? + + break; + } + + /* Push the data byte into the first PS/2 port queue */ + case 0xD2: + { + PS2QueuePush(0, Data); + break; + } + + /* Push the data byte into the second PS/2 port queue */ + case 0xD3: + { + PS2QueuePush(1, Data); + break; + } + + /* + * Send a command to the second PS/2 port (by default + * it is a command for the first PS/2 port) + */ + case 0xD4: + { + PS2SendCommand(1, Data); + break; + } + } + + return; } - return 0x00; -} - -static VOID WINAPI PS2WritePort(USHORT Port, BYTE Data) -{ - if (Port == PS2_CONTROL_PORT) - { - switch (Data) - { - /* Read configuration byte */ - case 0x20: - { - OutputBuffer = ControllerConfig; - StatusRegister |= (1 << 0); // There is something to read - break; - } - - /* Write configuration byte */ - case 0x60: - /* Write controller output port */ - case 0xD1: - /* Write to the first PS/2 port output buffer */ - case 0xD2: - /* Write to the second PS/2 port output buffer */ - case 0xD3: - /* Write to the second PS/2 port input buffer */ - case 0xD4: - { - /* These commands require a response */ - ControllerCommand = Data; - StatusRegister |= (1 << 3); // This is a controller command - break; - } - - /* Disable second PS/2 port */ - case 0xA7: - { - Ports[1].IsEnabled = FALSE; - break; - } - - /* Enable second PS/2 port */ - case 0xA8: - { - Ports[1].IsEnabled = TRUE; - break; - } - - /* Test second PS/2 port */ - case 0xA9: - { - OutputBuffer = 0x00; // Success code - StatusRegister |= (1 << 0); // There is something to read - break; - } - - /* Test PS/2 controller */ - case 0xAA: - { - OutputBuffer = 0x55; // Success code - StatusRegister |= (1 << 0); // There is something to read - break; - } - - /* Test first PS/2 port */ - case 0xAB: - { - OutputBuffer = 0x00; // Success code - StatusRegister |= (1 << 0); // There is something to read - break; - } - - /* Disable first PS/2 port */ - case 0xAD: - { - Ports[0].IsEnabled = FALSE; - break; - } - - /* Enable first PS/2 port */ - case 0xAE: - { - Ports[0].IsEnabled = TRUE; - break; - } - - /* Read controller output port */ - case 0xD0: - { - /* Bit 0 always set, and bit 1 is the A20 gate state */ - OutputBuffer = (!!EmulatorGetA20() << 1) | 0x01; - // FIXME: Set the status of IRQ1 and IRQ12 - - StatusRegister |= (1 << 0); // There is something to read - break; - } - - /* CPU Reset */ - case 0xF0: - case 0xF2: - case 0xF4: - case 0xF6: - case 0xF8: - case 0xFA: - case 0xFC: - case 0xFE: - { - /* Stop the VDM */ - EmulatorTerminate(); - return; - } - } - } - else if (Port == PS2_DATA_PORT) - { - /* Check if the controller is waiting for a response */ - if (StatusRegister & (1 << 3)) // If we have data for the controller - { - StatusRegister &= ~(1 << 3); - - /* Check which command it was */ - switch (ControllerCommand) - { - /* Write configuration byte */ - case 0x60: - { - ControllerConfig = Data; - - /* - * Update bit 2 "System flag" of the status register - * with bit 2 of the controller configuration byte. - * See: http://www.win.tue.nl/~aeb/linux/kbd/scancodes-11.html#kccb2 - * for more details. - */ - if (ControllerConfig & (1 << 2)) - StatusRegister |= (1 << 2); - else - StatusRegister &= ~(1 << 2); - - /* - * Update bit 4 "Keyboard enable flag" of the status register - * with bit 3 "Ignore keyboard lock" of the controller - * configuration byte (if set), then reset the latter one. - * See: http://www.win.tue.nl/~aeb/linux/kbd/scancodes-11.html#kccb3 - * for more details. - */ - if (ControllerConfig & (1 << 3)) - { - StatusRegister |= (1 << 4); - ControllerConfig &= ~(1 << 3); - } - - break; - } - - /* Write controller output */ - case 0xD1: - { - /* Check if bit 0 is unset */ - if (!(Data & (1 << 0))) - { - /* CPU disabled - Stop the VDM */ - EmulatorTerminate(); - return; - } - - /* Update the A20 line setting */ - EmulatorSetA20(Data & (1 << 1)); - - // FIXME: Add the status of IRQ1 and IRQ12 - - break; - } - - /* Push the data byte into the first PS/2 port queue */ - case 0xD2: - { - PS2QueuePush(0, Data); - break; - } - - /* Push the data byte into the second PS/2 port queue */ - case 0xD3: - { - PS2QueuePush(1, Data); - break; - } - - /* - * Send a command to the second PS/2 port (by default - * it is a command for the first PS/2 port) - */ - case 0xD4: - { - PS2SendCommand(&Ports[1], Data); - break; - } - } - - return; - } - - /* By default, send a command to the first PS/2 port */ - PS2SendCommand(&Ports[0], Data); - } + /* By default, send a command to the first PS/2 port */ + PS2SendCommand(0, Data); } static VOID FASTCALL GeneratePS2Irq(ULONGLONG ElapsedTime) { UNREFERENCED_PARAMETER(ElapsedTime); - /* Generate an IRQ 1 if there is data ready in the output queue */ + /* + * Pop out fresh new data from the PS/2 port output queues, and only + * in case there is data ready, generate an IRQ1 or IRQ12 depending + * on whether interrupts are enabled for the given port. + * + * NOTE: The first PS/2 port (keyboard) has priority over the second one (mouse). + */ if (PS2PortQueueRead(0)) { - /* Generate an interrupt if interrupts for the first PS/2 port are enabled */ - if (ControllerConfig & 0x01) PicInterruptRequest(1); - return; + if (ControllerConfig & PS2_CONFIG_KBD_INT) PicInterruptRequest(1); } - - /* Generate an IRQ 12 if there is data ready in the output queue */ - if (PS2PortQueueRead(1)) + else if (PS2PortQueueRead(1)) { - /* Generate an interrupt if interrupts for the second PS/2 port are enabled */ - if (ControllerConfig & 0x02) PicInterruptRequest(12); - return; + if (ControllerConfig & PS2_CONFIG_AUX_INT) PicInterruptRequest(12); } } @@ -332,10 +412,11 @@ BOOLEAN PS2PortQueueRead(BYTE PS2Port) { - BOOLEAN Result = TRUE; + BOOLEAN Result = FALSE; PPS2_PORT Port; - if (PS2Port >= PS2_PORTS) return FALSE; + // NOTE: The first PS/2 port (keyboard) has priority over the second one (mouse). + Port = &Ports[PS2Port]; if (!Port->IsEnabled) return FALSE; @@ -344,11 +425,12 @@ if (Port->QueueEmpty) { /* Only the keyboard should have its last data latched */ - // FIXME: Alternatively this can be done in PS2ReadPort when + // FIXME: Alternatively this can be done in PS2ReadData when // we read PS2_DATA_PORT. What is the best solution?? if (PS2Port == 0) { OutputBuffer = Port->Queue[(Port->QueueStart - 1) % BUFFER_SIZE]; + StatusRegister &= ~PS2_STAT_AUX_OUT_BUF_FULL; // Clear flag: keyboard data } return FALSE; @@ -360,16 +442,21 @@ * Recheck whether the queue is not empty (it may * have changed after having grabbed the mutex). */ - if (Port->QueueEmpty) - { - Result = FALSE; - goto Done; - } + if (Port->QueueEmpty) goto Done; /* Get the data */ OutputBuffer = Port->Queue[Port->QueueStart]; - StatusRegister |= (1 << 0); // There is something to read - // Sometimes StatusRegister |= (1 << 5); for the second PS/2 port + + // StatusRegister &= ~(PS2_STAT_AUX_OUT_BUF_FULL | PS2_STAT_OUT_BUF_FULL); + + /* Always set the "Output buffer full" flag */ + StatusRegister |= PS2_STAT_OUT_BUF_FULL; + + /* Set the "Auxiliary output buffer full" flag according to where the data came from */ + if (PS2Port == 0) + StatusRegister &= ~PS2_STAT_AUX_OUT_BUF_FULL; // Clear flag: keyboard data + else // if (PS2Port == 1) + StatusRegister |= PS2_STAT_AUX_OUT_BUF_FULL; // Set flag: mouse data /* Remove the value from the queue */ Port->QueueStart++; @@ -379,6 +466,8 @@ if (Port->QueueStart == Port->QueueEnd) Port->QueueEmpty = TRUE; + Result = TRUE; + Done: ReleaseMutex(Port->QueueMutex); return Result; @@ -386,8 +475,7 @@ VOID PS2SetDeviceCmdProc(BYTE PS2Port, LPVOID Param, PS2_DEVICE_CMDPROC DeviceCommand) { - if (PS2Port >= PS2_PORTS) return; - + ASSERT(PS2Port < PS2_PORTS); Ports[PS2Port].Param = Param; Ports[PS2Port].DeviceCommand = DeviceCommand; } @@ -395,10 +483,10 @@ // PS2SendToPort BOOLEAN PS2QueuePush(BYTE PS2Port, BYTE Data) { - BOOLEAN Result = TRUE; + BOOLEAN Result = FALSE; PPS2_PORT Port; - if (PS2Port >= PS2_PORTS) return FALSE; + ASSERT(PS2Port < PS2_PORTS); Port = &Ports[PS2Port]; if (!Port->IsEnabled) return FALSE; @@ -407,10 +495,7 @@ /* Check if the queue is full */ if (!Port->QueueEmpty && (Port->QueueStart == Port->QueueEnd)) - { - Result = FALSE; goto Done; - } /* Insert the value in the queue */ Port->Queue[Port->QueueEnd] = Data; @@ -422,6 +507,8 @@ /* Schedule the IRQ */ EnableHardwareTimer(IrqTimer); + + Result = TRUE; Done: ReleaseMutex(Port->QueueMutex); @@ -444,8 +531,8 @@ Ports[1].QueueMutex = CreateMutex(NULL, FALSE, NULL); /* Register the I/O Ports */ - RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); - RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); + RegisterIoPort(PS2_CONTROL_PORT, PS2ReadControl, PS2WriteControl); + RegisterIoPort(PS2_DATA_PORT , PS2ReadData , PS2WriteData ); IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, HZ_TO_NS(100), Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h [iso-8859-1] Thu Aug 13 19:34:16 2015 @@ -12,8 +12,38 @@ /* DEFINES ********************************************************************/ +/* I/O Ports */ #define PS2_DATA_PORT 0x60 #define PS2_CONTROL_PORT 0x64 + +/* Controller Status Register flags */ +#define PS2_STAT_OUT_BUF_FULL (1 << 0) +// #define PS2_STAT_IN_BUF_FULL (1 << 1) +#define PS2_STAT_SYSTEM (1 << 2) +#define PS2_STAT_COMMAND (1 << 3) +#define PS2_STAT_KBD_ENABLE (1 << 4) // 0: Locked; 1: Not locked +#define PS2_STAT_AUX_OUT_BUF_FULL (1 << 5) +#define PS2_STAT_GEN_TIMEOUT (1 << 6) +#define PS2_STAT_PARITY_ERROR (1 << 7) + +/* Controller Configuration Byte flags */ +#define PS2_CONFIG_KBD_INT (1 << 0) +#define PS2_CONFIG_AUX_INT (1 << 1) +#define PS2_CONFIG_SYSTEM (1 << 2) +#define PS2_CONFIG_NO_KEYLOCK (1 << 3) +#define PS2_CONFIG_KBD_DISABLE (1 << 4) +#define PS2_CONFIG_AUX_DISABLE (1 << 5) +// #define PS2_CONFIG_KBD_XLAT (1 << 6) + +/* Output Port flags */ +#define PS2_OUT_CPU_NO_RESET (1 << 0) +#define PS2_OUT_A20_SET (1 << 1) +#define PS2_OUT_AUX_DATA (1 << 2) +// #define PS2_OUT_AUX_CLOCK (1 << 3) +#define PS2_OUT_IRQ01 (1 << 4) +#define PS2_OUT_IRQ12 (1 << 5) +// #define PS2_OUT_KBD_CLOCK (1 << 6) +#define PS2_OUT_KBD_DATA (1 << 7) typedef VOID (WINAPI *PS2_DEVICE_CMDPROC)(LPVOID Param, BYTE Command);

9 years, 4 months

[hbelusca] 68709: [NTVDM] - Add some missing MouseResetCounters calls when enabling/disabling mouse reporting, and an ACKnowledge signal when we set mouse defaults. - When we have few R/W IO port h...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 13 17:20:04 2015 New Revision: 68709 URL: http://svn.reactos.org/svn/reactos?rev=68709&view=rev Log: [NTVDM] - Add some missing MouseResetCounters calls when enabling/disabling mouse reporting, and an ACKnowledge signal when we set mouse defaults. - When we have few R/W IO port handlers, just register them directly instead of using a wrap-up function. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] Thu Aug 13 17:20:04 2015 @@ -29,7 +29,7 @@ static COORD Position; static BYTE Resolution; /* Completely ignored */ static BOOLEAN Scaling; /* Completely ignored */ -static BOOLEAN Reporting; +static BOOLEAN Reporting = FALSE; static BYTE MouseId; static ULONG ButtonState; static SHORT HorzCounter; @@ -72,12 +72,6 @@ Mode = MOUSE_STREAMING_MODE; MouseId = 0; ScrollMagicCounter = ExtraButtonMagicCounter = 0; - - PS2QueuePush(PS2Port, MOUSE_ACK); - - /* Send the Basic Assurance Test success code and the device ID */ - PS2QueuePush(PS2Port, MOUSE_BAT_SUCCESS); - PS2QueuePush(PS2Port, MouseId); } static VOID MouseGetPacket(PMOUSE_PACKET Packet) @@ -131,7 +125,7 @@ if (MouseId >= 3) { /* Set the scroll counter */ - Packet->Extra |= (UCHAR)ScrollCounter & 0x0F; + Packet->Extra |= ((UCHAR)ScrollCounter & 0x0F); } /* Store the counters in the packet */ @@ -262,7 +256,7 @@ { BYTE Status = ButtonState & 7; - if (Scaling) Status |= 1 << 4; + if (Scaling) Status |= 1 << 4; if (Reporting) Status |= 1 << 5; if (Mode == MOUSE_REMOTE_MODE) Status |= 1 << 6; @@ -348,6 +342,7 @@ case 0xF4: { Reporting = TRUE; + MouseResetCounters(); PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -356,6 +351,7 @@ case 0xF5: { Reporting = FALSE; + MouseResetCounters(); PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -366,6 +362,7 @@ /* Reset the configuration and counters */ MouseResetConfig(); MouseResetCounters(); + PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -380,7 +377,14 @@ /* Reset */ case 0xFF: { + /* Send ACKnowledge */ + PS2QueuePush(PS2Port, MOUSE_ACK); + MouseReset(); + + /* Send the Basic Assurance Test success code and the device ID */ + PS2QueuePush(PS2Port, MOUSE_BAT_SUCCESS); + PS2QueuePush(PS2Port, MouseId); break; } @@ -428,7 +432,7 @@ } /* Adjust for double vision */ - if (DoubleWidth) NewPosition.X /= 2; + if (DoubleWidth) NewPosition.X /= 2; if (DoubleHeight) NewPosition.Y /= 2; WaitForSingleObject(MouseMutex, INFINITE); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h [iso-8859-1] Thu Aug 13 17:20:04 2015 @@ -41,9 +41,9 @@ * scroll wheels can't be used at the same time. */ #define MOUSE_SCROLL_UP 1 -#define MOUSE_SCROLL_DOWN -1 +#define MOUSE_SCROLL_DOWN -1 #define MOUSE_SCROLL_RIGHT 2 -#define MOUSE_SCROLL_LEFT -2 +#define MOUSE_SCROLL_LEFT -2 typedef enum _MOUSE_MODE { Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] Thu Aug 13 17:20:04 2015 @@ -19,17 +19,34 @@ /* PRIVATE VARIABLES **********************************************************/ +typedef struct _PIC +{ + BOOLEAN Initialization; + BYTE MaskRegister; + BYTE IntRequestRegister; + BYTE InServiceRegister; + BYTE IntOffset; + BYTE ConfigRegister; + BYTE CascadeRegister; + BOOLEAN CascadeRegisterSet; + BOOLEAN AutoEoi; + BOOLEAN Slave; + BOOLEAN ReadIsr; +} PIC, *PPIC; + static PIC MasterPic, SlavePic; /* PRIVATE FUNCTIONS **********************************************************/ -static BYTE PicReadCommand(BYTE Port) +static BYTE WINAPI PicReadCommand(USHORT Port) { PPIC Pic; /* Which PIC are we accessing? */ - if (Port == PIC_MASTER_CMD) Pic = &MasterPic; - else Pic = &SlavePic; + if (Port == PIC_MASTER_CMD) + Pic = &MasterPic; + else // if (Port == PIC_SLAVE_CMD) + Pic = &SlavePic; if (Pic->ReadIsr) { @@ -44,28 +61,30 @@ } } -static VOID PicWriteCommand(BYTE Port, BYTE Value) +static VOID WINAPI PicWriteCommand(USHORT Port, BYTE Data) { PPIC Pic; /* Which PIC are we accessing? */ - if (Port == PIC_MASTER_CMD) Pic = &MasterPic; - else Pic = &SlavePic; - - if (Value & PIC_ICW1) + if (Port == PIC_MASTER_CMD) + Pic = &MasterPic; + else // if (Port == PIC_SLAVE_CMD) + Pic = &SlavePic; + + if (Data & PIC_ICW1) { /* Start initialization */ Pic->Initialization = TRUE; Pic->IntOffset = 0xFF; Pic->CascadeRegisterSet = FALSE; - Pic->ConfigRegister = Value; - return; - } - - if (Value & PIC_OCW3) + Pic->ConfigRegister = Data; + return; + } + + if (Data & PIC_OCW3) { /* This is an OCR3 */ - if (Value == PIC_OCW3_READ_ISR) + if (Data == PIC_OCW3_READ_ISR) { /* Return the ISR on next read from command port */ Pic->ReadIsr = TRUE; @@ -75,12 +94,12 @@ } /* This is an OCW2 */ - if (Value & PIC_OCW2_EOI) - { - if (Value & PIC_OCW2_SL) + if (Data & PIC_OCW2_EOI) + { + if (Data & PIC_OCW2_SL) { /* If the SL bit is set, clear a specific IRQ */ - Pic->InServiceRegister &= ~(1 << (Value & PIC_OCW2_NUM_MASK)); + Pic->InServiceRegister &= ~(1 << (Data & PIC_OCW2_NUM_MASK)); } else { @@ -96,26 +115,30 @@ } } -static BYTE PicReadData(BYTE Port) +static BYTE WINAPI PicReadData(USHORT Port) { /* Read the mask register */ - if (Port == PIC_MASTER_DATA) return MasterPic.MaskRegister; - else return SlavePic.MaskRegister; -} - -static VOID PicWriteData(BYTE Port, BYTE Value) + if (Port == PIC_MASTER_DATA) + return MasterPic.MaskRegister; + else // if (Port == PIC_SLAVE_DATA) + return SlavePic.MaskRegister; +} + +static VOID WINAPI PicWriteData(USHORT Port, BYTE Data) { PPIC Pic; /* Which PIC are we accessing? */ - if (Port == PIC_MASTER_DATA) Pic = &MasterPic; - else Pic = &SlavePic; + if (Port == PIC_MASTER_DATA) + Pic = &MasterPic; + else // if (Port == PIC_SLAVE_DATA) + Pic = &SlavePic; /* Is the PIC ready? */ if (!Pic->Initialization) { /* Yes, this is an OCW1 */ - Pic->MaskRegister = Value; + Pic->MaskRegister = Data; return; } @@ -123,7 +146,7 @@ if (Pic->IntOffset == 0xFF) { /* This is an ICW2, set the offset (last three bits always zero) */ - Pic->IntOffset = Value & 0xF8; + Pic->IntOffset = Data & 0xF8; /* Check if we are in single mode and don't need an ICW4 */ if ((Pic->ConfigRegister & PIC_ICW1_SINGLE) @@ -139,7 +162,7 @@ if (!(Pic->ConfigRegister & PIC_ICW1_SINGLE) && !Pic->CascadeRegisterSet) { /* This is an ICW3 */ - Pic->CascadeRegister = Value; + Pic->CascadeRegister = Data; Pic->CascadeRegisterSet = TRUE; /* Check if we need an ICW4 */ @@ -152,7 +175,7 @@ } /* This must be an ICW4, we will ignore the 8086 bit (assume always set) */ - if (Value & PIC_ICW4_AEOI) + if (Data & PIC_ICW4_AEOI) { /* Use automatic end-of-interrupt */ Pic->AutoEoi = TRUE; @@ -160,46 +183,6 @@ /* Done initializing */ Pic->Initialization = FALSE; -} - -static BYTE WINAPI PicReadPort(USHORT Port) -{ - switch (Port) - { - case PIC_MASTER_CMD: - case PIC_SLAVE_CMD: - { - return PicReadCommand(Port); - } - - case PIC_MASTER_DATA: - case PIC_SLAVE_DATA: - { - return PicReadData(Port); - } - } - - return 0; -} - -static VOID WINAPI PicWritePort(USHORT Port, BYTE Data) -{ - switch (Port) - { - case PIC_MASTER_CMD: - case PIC_SLAVE_CMD: - { - PicWriteCommand(Port, Data); - break; - } - - case PIC_MASTER_DATA: - case PIC_SLAVE_DATA: - { - PicWriteData(Port, Data); - break; - } - } } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -301,17 +284,19 @@ } /* Spurious interrupt */ - if (MasterPic.InServiceRegister & (1 << 2)) return SlavePic.IntOffset + 7; - else return MasterPic.IntOffset + 7; + if (MasterPic.InServiceRegister & (1 << 2)) + return SlavePic.IntOffset + 7; + else + return MasterPic.IntOffset + 7; } VOID PicInitialize(VOID) { /* Register the I/O Ports */ - RegisterIoPort(PIC_MASTER_CMD , PicReadPort, PicWritePort); - RegisterIoPort(PIC_SLAVE_CMD , PicReadPort, PicWritePort); - RegisterIoPort(PIC_MASTER_DATA, PicReadPort, PicWritePort); - RegisterIoPort(PIC_SLAVE_DATA , PicReadPort, PicWritePort); + RegisterIoPort(PIC_MASTER_CMD , PicReadCommand, PicWriteCommand); + RegisterIoPort(PIC_SLAVE_CMD , PicReadCommand, PicWriteCommand); + RegisterIoPort(PIC_MASTER_DATA, PicReadData , PicWriteData ); + RegisterIoPort(PIC_SLAVE_DATA , PicReadData , PicWriteData ); } @@ -348,6 +333,14 @@ while (count-- > 0) { PicInterruptRequest(InterruptNumber); + /* + * FIXME: We should now restart 16-bit emulation and wait for its termination: + * + * "When the VDD calls VDDSimulateInterrupt, the address pointed to by + * the interrupt vector starts running in 16-bit mode. For an asynchronous + * interrupt, the VDD should create another thread and call VDDSimulateInterrupt + * from that thread." + */ } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h [iso-8859-1] Thu Aug 13 17:20:04 2015 @@ -30,21 +30,6 @@ #define PIC_OCW3 (1 << 3) #define PIC_OCW3_READ_ISR 0x0B -typedef struct _PIC -{ - BOOLEAN Initialization; - BYTE MaskRegister; - BYTE IntRequestRegister; - BYTE InServiceRegister; - BYTE IntOffset; - BYTE ConfigRegister; - BYTE CascadeRegister; - BOOLEAN CascadeRegisterSet; - BOOLEAN AutoEoi; - BOOLEAN Slave; - BOOLEAN ReadIsr; -} PIC, *PPIC; - /* FUNCTIONS ******************************************************************/ VOID PicInterruptRequest(BYTE Number); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] Thu Aug 13 17:20:04 2015 @@ -509,7 +509,7 @@ PitSetGate(2, FALSE); /* Register the I/O Ports */ - RegisterIoPort(PIT_COMMAND_PORT, NULL , PitWritePort); + RegisterIoPort(PIT_COMMAND_PORT, NULL, PitWritePort); RegisterIoPort(PIT_DATA_PORT(0), PitReadPort, PitWritePort); RegisterIoPort(PIT_DATA_PORT(1), PitReadPort, PitWritePort); RegisterIoPort(PIT_DATA_PORT(2), PitReadPort, PitWritePort); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Thu Aug 13 17:20:04 2015 @@ -1482,7 +1482,7 @@ static BYTE WINAPI VgaReadPort(USHORT Port) { DPRINT("VgaReadPort: Port 0x%X\n", Port); - + if (Port != VGA_DAC_MASK) SvgaHdrCounter = 0; switch (Port) @@ -2364,11 +2364,11 @@ VgaClearMemory(); /* Register the I/O Ports */ - RegisterIoPort(0x3CC, VgaReadPort, NULL); // VGA_MISC_READ + RegisterIoPort(0x3CC, VgaReadPort, NULL); // VGA_MISC_READ RegisterIoPort(0x3C2, VgaReadPort, VgaWritePort); // VGA_MISC_WRITE, VGA_INSTAT0_READ - RegisterIoPort(0x3CA, VgaReadPort, NULL); // VGA_FEATURE_READ + RegisterIoPort(0x3CA, VgaReadPort, NULL); // VGA_FEATURE_READ RegisterIoPort(0x3C0, VgaReadPort, VgaWritePort); // VGA_AC_INDEX, VGA_AC_WRITE - RegisterIoPort(0x3C1, VgaReadPort, NULL); // VGA_AC_READ + RegisterIoPort(0x3C1, VgaReadPort, NULL); // VGA_AC_READ RegisterIoPort(0x3C4, VgaReadPort, VgaWritePort); // VGA_SEQ_INDEX RegisterIoPort(0x3C5, VgaReadPort, VgaWritePort); // VGA_SEQ_DATA RegisterIoPort(0x3C6, VgaReadPort, VgaWritePort); // VGA_DAC_MASK

9 years, 4 months

[hbelusca] 68708: [NTVDM] - When we have few R/W IO port handlers, just register them directly instead of using a wrap-up function. - Start implementing the PS/2 keyboard command handler. - Report ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 13 17:11:17 2015 New Revision: 68708 URL: http://svn.reactos.org/svn/reactos?rev=68708&view=rev Log: [NTVDM] - When we have few R/W IO port handlers, just register them directly instead of using a wrap-up function. - Start implementing the PS/2 keyboard command handler. - Report scancodes only if the keyboard is enabled. See r68415. CORE-9920 Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Thu Aug 13 17:11:17 2015 @@ -46,6 +46,7 @@ if (RateSelect <= 2) RateSelect += 7; SetHardwareTimerDelay(PeriodicTimer, HZ_TO_NS(1 << (16 - RateSelect))); + // FIXME: This call keeps EnableCount increasing without compensating it! EnableHardwareTimer(PeriodicTimer); } @@ -101,18 +102,20 @@ } } -static VOID CmosWriteAddress(BYTE Value) -{ +static VOID WINAPI CmosWriteAddress(USHORT Port, BYTE Data) +{ + UNREFERENCED_PARAMETER(Port); + /* Update the NMI enabled flag */ - NmiEnabled = !(Value & CMOS_DISABLE_NMI); + NmiEnabled = !(Data & CMOS_DISABLE_NMI); /* Get the register number */ - Value &= ~CMOS_DISABLE_NMI; - - if (Value < CMOS_REG_MAX) + Data &= ~CMOS_DISABLE_NMI; + + if (Data < CMOS_REG_MAX) { /* Select the new register */ - SelectedRegister = Value; + SelectedRegister = Data; } else { @@ -121,10 +124,12 @@ } } -static BYTE CmosReadData(VOID) +static BYTE WINAPI CmosReadData(USHORT Port) { BYTE Value; SYSTEMTIME CurrentTime; + + UNREFERENCED_PARAMETER(Port); /* Get the current time */ GetLocalTime(&CurrentTime); @@ -257,11 +262,13 @@ return Value; } -static VOID CmosWriteData(BYTE Value) +static VOID WINAPI CmosWriteData(USHORT Port, BYTE Data) { BOOLEAN ChangeTime = FALSE; SYSTEMTIME CurrentTime; + UNREFERENCED_PARAMETER(Port); + /* Get the current time */ GetLocalTime(&CurrentTime); @@ -270,26 +277,26 @@ case CMOS_REG_SECONDS: { ChangeTime = TRUE; - CurrentTime.wSecond = WRITE_CMOS_DATA(CmosMemory, Value); + CurrentTime.wSecond = WRITE_CMOS_DATA(CmosMemory, Data); break; } case CMOS_REG_ALARM_SEC: { - CmosMemory.AlarmSecond = WRITE_CMOS_DATA(CmosMemory, Value); + CmosMemory.AlarmSecond = WRITE_CMOS_DATA(CmosMemory, Data); break; } case CMOS_REG_MINUTES: { ChangeTime = TRUE; - CurrentTime.wMinute = WRITE_CMOS_DATA(CmosMemory, Value); + CurrentTime.wMinute = WRITE_CMOS_DATA(CmosMemory, Data); break; } case CMOS_REG_ALARM_MIN: { - CmosMemory.AlarmMinute = WRITE_CMOS_DATA(CmosMemory, Value); + CmosMemory.AlarmMinute = WRITE_CMOS_DATA(CmosMemory, Data); break; } @@ -299,13 +306,13 @@ ChangeTime = TRUE; - if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Value & 0x80)) + if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Data & 0x80)) { - Value &= ~0x80; + Data &= ~0x80; Afternoon = TRUE; } - CurrentTime.wHour = WRITE_CMOS_DATA(CmosMemory, Value); + CurrentTime.wHour = WRITE_CMOS_DATA(CmosMemory, Data); /* Convert to 24-hour format */ if (Afternoon) CurrentTime.wHour += 12; @@ -317,13 +324,13 @@ { BOOLEAN Afternoon = FALSE; - if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Value & 0x80)) + if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Data & 0x80)) { - Value &= ~0x80; + Data &= ~0x80; Afternoon = TRUE; } - CmosMemory.AlarmHour = WRITE_CMOS_DATA(CmosMemory, Value); + CmosMemory.AlarmHour = WRITE_CMOS_DATA(CmosMemory, Data); /* Convert to 24-hour format */ if (Afternoon) CmosMemory.AlarmHour += 12; @@ -339,22 +346,22 @@ * SetLocalTime API value is 0-based. * Correct it. */ - Value -= 1; - CurrentTime.wDayOfWeek = WRITE_CMOS_DATA(CmosMemory, Value); + Data -= 1; + CurrentTime.wDayOfWeek = WRITE_CMOS_DATA(CmosMemory, Data); break; } case CMOS_REG_DAY: { ChangeTime = TRUE; - CurrentTime.wDay = WRITE_CMOS_DATA(CmosMemory, Value); + CurrentTime.wDay = WRITE_CMOS_DATA(CmosMemory, Data); break; } case CMOS_REG_MONTH: { ChangeTime = TRUE; - CurrentTime.wMonth = WRITE_CMOS_DATA(CmosMemory, Value); + CurrentTime.wMonth = WRITE_CMOS_DATA(CmosMemory, Data); break; } @@ -365,7 +372,7 @@ /* Clear everything except the century */ CurrentTime.wYear = (CurrentTime.wYear / 100) * 100; - CurrentTime.wYear += WRITE_CMOS_DATA(CmosMemory, Value); + CurrentTime.wYear += WRITE_CMOS_DATA(CmosMemory, Data); break; } @@ -377,14 +384,14 @@ case CMOS_REG_STATUS_A: { - CmosMemory.StatusRegA = Value & 0x7F; // Bit 7 is read-only + CmosMemory.StatusRegA = Data & 0x7F; // Bit 7 is read-only RtcUpdatePeriodicTimer(); break; } case CMOS_REG_STATUS_B: { - CmosMemory.StatusRegB = Value; + CmosMemory.StatusRegB = Data; break; } @@ -399,7 +406,7 @@ { /* Sync EMS and UMS */ CmosMemory.Regs[CMOS_REG_EXT_MEMORY_LOW] = - CmosMemory.Regs[CMOS_REG_ACTUAL_EXT_MEMORY_LOW] = Value; + CmosMemory.Regs[CMOS_REG_ACTUAL_EXT_MEMORY_LOW] = Data; break; } @@ -409,13 +416,13 @@ { /* Sync EMS and UMS */ CmosMemory.Regs[CMOS_REG_EXT_MEMORY_HIGH] = - CmosMemory.Regs[CMOS_REG_ACTUAL_EXT_MEMORY_HIGH] = Value; + CmosMemory.Regs[CMOS_REG_ACTUAL_EXT_MEMORY_HIGH] = Data; break; } default: { - CmosMemory.Regs[SelectedRegister] = Value; + CmosMemory.Regs[SelectedRegister] = Data; } } @@ -423,20 +430,6 @@ /* Return to Status Register D */ SelectedRegister = CMOS_REG_STATUS_D; -} - -static BYTE WINAPI CmosReadPort(USHORT Port) -{ - ASSERT(Port == CMOS_DATA_PORT); - return CmosReadData(); -} - -static VOID WINAPI CmosWritePort(USHORT Port, BYTE Data) -{ - if (Port == CMOS_ADDRESS_PORT) - CmosWriteAddress(Data); - else if (Port == CMOS_DATA_PORT) - CmosWriteData(Data); } @@ -511,8 +504,8 @@ CmosMemory.Regs[CMOS_REG_ACTUAL_EXT_MEMORY_HIGH] = HIBYTE((MAX_ADDRESS - 0x100000) / 1024); /* Register the I/O Ports */ - RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort); - RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort); + RegisterIoPort(CMOS_ADDRESS_PORT, NULL, CmosWriteAddress); + RegisterIoPort(CMOS_DATA_PORT , CmosReadData, CmosWriteData ); ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(1), Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] Thu Aug 13 17:11:17 2015 @@ -559,12 +559,12 @@ RegisterIoPort(0x07, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 3 */ RegisterIoPort(0x08, DmaReadPort, DmaWritePort); /* Status (Read) / Command (Write) Registers */ - RegisterIoPort(0x09, NULL, DmaWritePort); /* Request Register */ - RegisterIoPort(0x0A, NULL, DmaWritePort); /* Single Channel Mask Register */ - RegisterIoPort(0x0B, NULL, DmaWritePort); /* Mode Register */ - RegisterIoPort(0x0C, NULL, DmaWritePort); /* Flip-Flop Reset Register */ + RegisterIoPort(0x09, NULL, DmaWritePort); /* Request Register */ + RegisterIoPort(0x0A, NULL, DmaWritePort); /* Single Channel Mask Register */ + RegisterIoPort(0x0B, NULL, DmaWritePort); /* Mode Register */ + RegisterIoPort(0x0C, NULL, DmaWritePort); /* Flip-Flop Reset Register */ RegisterIoPort(0x0D, DmaReadPort, DmaWritePort); /* Intermediate (Read) / Master Reset (Write) Registers */ - RegisterIoPort(0x0E, NULL, DmaWritePort); /* Mask Reset Register */ + RegisterIoPort(0x0E, NULL, DmaWritePort); /* Mask Reset Register */ RegisterIoPort(0x0F, DmaReadPort, DmaWritePort); /* Multi-Channel Mask Register */ @@ -579,12 +579,12 @@ RegisterIoPort(0xCE, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 7 */ RegisterIoPort(0xD0, DmaReadPort, DmaWritePort); /* Status (Read) / Command (Write) Registers */ - RegisterIoPort(0xD2, NULL, DmaWritePort); /* Request Register */ - RegisterIoPort(0xD4, NULL, DmaWritePort); /* Single Channel Mask Register */ - RegisterIoPort(0xD6, NULL, DmaWritePort); /* Mode Register */ - RegisterIoPort(0xD8, NULL, DmaWritePort); /* Flip-Flop Reset Register */ + RegisterIoPort(0xD2, NULL, DmaWritePort); /* Request Register */ + RegisterIoPort(0xD4, NULL, DmaWritePort); /* Single Channel Mask Register */ + RegisterIoPort(0xD6, NULL, DmaWritePort); /* Mode Register */ + RegisterIoPort(0xD8, NULL, DmaWritePort); /* Flip-Flop Reset Register */ RegisterIoPort(0xDA, DmaReadPort, DmaWritePort); /* Intermediate (Read) / Master Reset (Write) Registers */ - RegisterIoPort(0xDC, NULL, DmaWritePort); /* Mask Reset Register */ + RegisterIoPort(0xDC, NULL, DmaWritePort); /* Mask Reset Register */ RegisterIoPort(0xDE, DmaReadPort, DmaWritePort); /* Multi-Channel Mask Register */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] Thu Aug 13 17:11:17 2015 @@ -16,19 +16,148 @@ /* PRIVATE VARIABLES **********************************************************/ +static BOOLEAN Reporting = FALSE; +static BYTE KeyboardId = 0; // We only support basic old-type keyboard +static BYTE DataByteWait = 0; + static BYTE PS2Port = 0; /* PRIVATE FUNCTIONS **********************************************************/ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) { - // FIXME: UNIMPLEMENTED; just return ACKnowledge. - // This unblocks some programs that want to initialize - // the keyboard by sending keyboard commands and then - // performing polling on the port until "valid" data - // comes out. - DPRINT1("KeyboardCommand(0x%02X) NOT IMPLEMENTED\n", Command); - PS2QueuePush(PS2Port, 0xFA); + /* Check if we were waiting for a data byte */ + if (DataByteWait) + { + PS2QueuePush(PS2Port, KEYBOARD_ACK); + + switch (DataByteWait) + { + /* Set/Reset Mode Indicators */ + case 0xED: + { + // Ignore setting the keyboard LEDs + break; + } + + /* PS/2 Select/Read Alternate Scan Code Sets */ + case 0xF0: + /* Set Typematic Rate/Delay */ + case 0xF3: + { + // FIXME: UNIMPLEMENTED; just return ACKnowledge. + // This unblocks some programs that want to initialize + // the keyboard by sending keyboard commands and then + // performing polling on the port until "valid" data + // comes out. + DPRINT1("KeyboardCommand(0x%02X) NOT IMPLEMENTED\n", DataByteWait); + break; + } + + default: + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + } + + DataByteWait = 0; + return; + } + + switch (Command) + { + /* Set/Reset Mode Indicators */ + case 0xED: + /* PS/2 Select/Read Alternate Scan Code Sets */ + case 0xF0: + /* Set Typematic Rate/Delay */ + case 0xF3: + { + DataByteWait = Command; + PS2QueuePush(PS2Port, KEYBOARD_ACK); + break; + } + + /* Echo test command */ + case 0xEE: + { + PS2QueuePush(PS2Port, 0xEE); + break; + } + + /* Get Keyboard ID */ + case 0xF2: + { + PS2QueuePush(PS2Port, KEYBOARD_ACK); + PS2QueuePush(PS2Port, KeyboardId); + break; + } + + /* Enable Reporting */ + case 0xF4: + { + Reporting = TRUE; + PS2QueuePush(PS2Port, KEYBOARD_ACK); + break; + } + + /* Disable Reporting */ + case 0xF5: + { + Reporting = FALSE; + PS2QueuePush(PS2Port, KEYBOARD_ACK); + break; + } + + /* Set Defaults */ + case 0xF6: + { + // So far, nothing to reset + PS2QueuePush(PS2Port, KEYBOARD_ACK); + break; + } + + /* PS/2 Typematic & Make/Break key modes */ + case 0xF7: case 0xF8: case 0xF9: + case 0xFA: case 0xFB: case 0xFC: case 0xFD: + { + /* + * Unsupported on PC-AT, they are just ignored + * and acknowledged as discussed in: + * http://stanislavs.org/helppc/keyboard_commands.html + */ + PS2QueuePush(PS2Port, KEYBOARD_ACK); + } + + /* Resend */ + case 0xFE: + { + PS2QueuePush(PS2Port, KEYBOARD_ACK); + UNIMPLEMENTED; + break; + } + + /* Reset */ + case 0xFF: + { + /* Send ACKnowledge */ + PS2QueuePush(PS2Port, KEYBOARD_ACK); + + // So far, nothing to reset + + /* Send the Basic Assurance Test success code and the device ID */ + PS2QueuePush(PS2Port, KEYBOARD_BAT_SUCCESS); + PS2QueuePush(PS2Port, KeyboardId); + break; + } + + /* Unknown command */ + default: + { + PS2QueuePush(PS2Port, KEYBOARD_ERROR); + } + } } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -37,6 +166,9 @@ { WORD i; BYTE ScanCode = (BYTE)KeyEvent->wVirtualScanCode; + + /* Check if we're not reporting */ + if (!Reporting) return; /* If this is a key release, set the highest bit in the scan code */ if (!KeyEvent->bKeyDown) ScanCode |= 0x80; @@ -56,6 +188,5 @@ /* Finish to plug the keyboard to the specified PS/2 port */ PS2Port = PS2Connector; PS2SetDeviceCmdProc(PS2Port, NULL, KeyboardCommand); - return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h [iso-8859-1] Thu Aug 13 17:11:17 2015 @@ -12,8 +12,10 @@ /* DEFINES ********************************************************************/ /* Command responses */ -#define KEYBOARD_ACK 0xFA -#define KEYBOARD_RESEND 0xFE +#define KEYBOARD_BAT_SUCCESS 0xAA +#define KEYBOARD_ACK 0xFA +#define KEYBOARD_ERROR 0xFC +#define KEYBOARD_RESEND 0xFE /* FUNCTIONS ******************************************************************/

9 years, 4 months

[hbelusca] 68707: [NTVDM] - Improve PS/2 keyboard initialization in BIOS POST. - Forgot two "breaks; " in error code paths.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 13 16:51:40 2015 New Revision: 68707 URL: http://svn.reactos.org/svn/reactos?rev=68707&view=rev Log: [NTVDM] - Improve PS/2 keyboard initialization in BIOS POST. - Forgot two "breaks;" in error code paths. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Thu Aug 13 16:51:40 2015 @@ -779,11 +779,13 @@ /* Initialize PS/2 keyboard port */ // Enable the port IOWriteB(PS2_CONTROL_PORT, 0xAE); - IOWriteB(PS2_CONTROL_PORT, 0x60); // Port interrupts and clock enabled, // enable keyboard scancode translation. // POST passed, force keyboard unlocking. - IOWriteB(PS2_DATA_PORT , 0x4D); + IOWriteB(PS2_CONTROL_PORT, 0x60); + IOWriteB(PS2_DATA_PORT , 0x6D); + // Enable data reporting + IOWriteB(PS2_DATA_PORT , 0xF4); EnableHwIRQ(0, BiosTimerIrq); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Thu Aug 13 16:51:40 2015 @@ -223,7 +223,7 @@ SendMouseCommand(0xFF); Answer = ReadMouseData(); - /* A "Resend" (0xFE) signal is sent if no mouse is attached */ + /* A "Resend" signal (0xFE) is sent if no mouse is attached */ if (Answer == 0xFE) { /* Resend */ @@ -376,6 +376,7 @@ /* Failure */ setAH(0x03); Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + break; } setBL(ReadMouseData()); // Status @@ -399,6 +400,7 @@ /* Failure */ setAH(0x03); Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + break; } /* Success */ @@ -490,7 +492,7 @@ /* Detect mouse presence by attempting a reset */ SendMouseCommand(0xFF); Answer = ReadMouseData(); - /* If no mouse attached, it will return RESEND (0xFE) */ + /* A "Resend" signal (0xFE) is sent if no mouse is attached */ if (Answer == 0xFE) { DPRINT1("No mouse present!\n");

9 years, 4 months

[pschweitzer] 68706: [SETUPAPI_WINETESTS] Partly sync with Wine 1.7.47: - Import tests for SetupLogError* functions CORE-9924

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Aug 13 09:38:46 2015 New Revision: 68706 URL: http://svn.reactos.org/svn/reactos?rev=68706&view=rev Log: [SETUPAPI_WINETESTS] Partly sync with Wine 1.7.47: - Import tests for SetupLogError* functions CORE-9924 Modified: trunk/rostests/winetests/setupapi/misc.c Modified: trunk/rostests/winetests/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/misc.c… ============================================================================== --- trunk/rostests/winetests/setupapi/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/misc.c [iso-8859-1] Thu Aug 13 09:38:46 2015 @@ -776,6 +776,46 @@ SetupTermDefaultQueueCallback(ctxt); } +static void test_SetupLogError(void) +{ + BOOL ret; + DWORD error; + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA("Test without opening\r\n", LogSevInformation); + error = GetLastError(); + ok(!ret, "SetupLogError succeeded\n"); + ok(error == ERROR_FILE_INVALID, "got wrong error: %d\n", error); + + SetLastError(0xdeadbeef); + ret = SetupOpenLog(FALSE); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("SetupOpenLog() failed on insufficient permissions\n"); + return; + } + ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA("Test with wrong log severity\r\n", LogSevMaximum); + error = GetLastError(); + ok(!ret, "SetupLogError succeeded\n"); + ok(error == 0xdeadbeef, "got wrong error: %d\n", error); + ret = SetupLogErrorA("Test without EOL", LogSevInformation); + ok(ret, "SetupLogError failed\n"); + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA(NULL, LogSevInformation); + ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER /* Win Vista+ */), + "SetupLogError failed: %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupOpenLog(FALSE); + ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); + + SetupCloseLog(); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -807,4 +847,6 @@ win_skip("SetupUninstallOEMInfA is not available\n"); test_defaultcallback(); -} + + test_SetupLogError(); +}

9 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

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 August 2015