Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[cwittich] 67224: [RAPPS] free cached entries and some other improvements patch by Ismael Ferreras Morezuelas aka swyter CORE-9060

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 17 12:37:08 2015 New Revision: 67224 URL: http://svn.reactos.org/svn/reactos?rev=67224&view=rev Log: [RAPPS] free cached entries and some other improvements patch by Ismael Ferreras Morezuelas aka swyter CORE-9060 Modified: trunk/reactos/base/applications/rapps/CreateCabFile.sh trunk/reactos/base/applications/rapps/available.c trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/misc.c trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/CreateCabFile.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… ============================================================================== --- trunk/reactos/base/applications/rapps/CreateCabFile.sh [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CreateCabFile.sh [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -2,8 +2,8 @@ cd rapps mkdir utf16 for i in $(find -type f); do - ../../../../output-MinGW-i386/host-tools/tools/utf16le.exe $i utf16/$i + ../../../host-tools/tools/utf16le $i utf16/$i done cd .. -../../../output-MinGW-i386/host-tools/tools/cabman/cabman -M mszip -S rappmgr.cab rapps/utf16/*.txt +../../host-tools/tools/cabman/cabman -M mszip -S rappmgr.cab rapps/utf16/*.txt rm -r rapps/uft16 Modified: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… ============================================================================== --- trunk/reactos/base/applications/rapps/available.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/available.c [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -246,7 +246,7 @@ skip_if_cached: - if (Info->Category == -1) + if (Info->Category == FALSE) continue; if (EnumType != Info->Category && EnumType != ENUM_ALL_AVAILABLE) @@ -277,4 +277,22 @@ FindClose(hFind); return TRUE; +} + +VOID FreeCachedAvailableEntries(VOID) +{ + PAPPLICATION_INFO Info; + + /* loop and deallocate all the cached app infos in the list */ + for (pCachedEntry = CachedEntriesHead.Flink; pCachedEntry != &CachedEntriesHead;) + { + Info = CONTAINING_RECORD(pCachedEntry, APPLICATION_INFO, List); + + /* grab a reference to the next linked entry before getting rid of the current one */ + pCachedEntry = pCachedEntry->Flink; + + /* flush them down the toilet :D */ + RemoveEntryList(&Info->List); + HeapFree(GetProcessHeap(), 0, Info); + } } Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -194,10 +194,10 @@ IDS_AVAILABLEFORINST "Disponible para su instalaciÃ³n" IDS_UPDATES "Actualizaciones" IDS_APPLICATIONS "Aplicaciones" - IDS_CHOOSE_FOLDER_TEXT "Seleccione una carpeta donde se descargarÃ¡n los programas:" - IDS_CHOOSE_FOLDER_ERROR "Â¡La carpeta especificada no existe!" + IDS_CHOOSE_FOLDER_TEXT "Seleccione una carpeta de donde se descargarÃ¡n los programas:" + IDS_CHOOSE_FOLDER_ERROR "La carpeta especificada no existe." IDS_APP_REG_REMOVE "Â¿EstÃ¡ seguro de querer borrar del Registro los datos de instalaciÃ³n del programa?" IDS_INFORMATION "InformaciÃ³n" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" - IDS_UNABLE_TO_REMOVE "Â¡No se pudieron borrar del Registro los datos de instalaciÃ³n del programa!" -END + IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la direcciÃ³n de Internet." + IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalaciÃ³n del programa." +END Modified: trunk/reactos/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… ============================================================================== --- trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -414,11 +414,7 @@ UINT ParserGetString(LPCWSTR lpKeyName, LPWSTR lpReturnedString, UINT nSize, LPCWSTR lpFileName) { PWSTR lpFullFileName = GetINIFullPath(lpFileName); - LPSTR lpRequiredBuf = HeapAlloc(GetProcessHeap(), 0, nSize); DWORD dwResult; - - if (!lpRequiredBuf) - return FALSE; /* we don't have cached section strings for the current system language, create them */ if(bCachedSectionStatus == FALSE) @@ -457,7 +453,7 @@ lpFullFileName); if (dwResult != 0) - goto skip; + return TRUE; /* 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") */ dwResult = GetPrivateProfileStringW(szCachedINISectionLocaleNeutral, @@ -468,7 +464,7 @@ lpFullFileName); if (dwResult != 0) - goto skip; + return TRUE; /* 3rd - if they weren't present fallback to standard english strings (just "Section") */ dwResult = GetPrivateProfileStringW(L"Section", @@ -478,18 +474,7 @@ nSize, lpFullFileName); - if (dwResult == 0) - { - HeapFree(GetProcessHeap(), 0, lpRequiredBuf); - return FALSE; - } - -skip: - - /* get rid of the dynamically allocated ANSI buffer */ - HeapFree(GetProcessHeap(), 0, lpRequiredBuf); - - return TRUE; + return (dwResult != 0 ? TRUE : FALSE); } UINT ParserGetInt(LPCWSTR lpKeyName, LPCWSTR lpFileName) Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -125,6 +125,7 @@ BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); BOOL ShowAvailableAppInfo(INT Index); BOOL UpdateAppsDB(VOID); +VOID FreeCachedAvailableEntries(VOID); /* installdlg.c */ BOOL InstallApplication(INT Index); Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Fri Apr 17 12:37:08 2015 @@ -147,21 +147,6 @@ return TRUE; } -VOID -FreeAvailableAppList(VOID) -{ - INT Count = ListView_GetItemCount(hListView) - 1; - PVOID Info; - - while (Count >= 0) - { - Info = ListViewGetlParam(Count); - if (Info) - HeapFree(GetProcessHeap(), 0, Info); - Count--; - } -} - BOOL CALLBACK EnumAvailableAppProc(PAPPLICATION_INFO Info) @@ -202,9 +187,6 @@ if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); - /* FIXME: reenable when caching is fixed */ - /* else if (IS_AVAILABLE_ENUM(SelectedEnumType)) - FreeAvailableAppList(); */ (VOID) ListView_DeleteAllItems(hListView); @@ -887,11 +869,13 @@ FreeLogs(); - if (IS_AVAILABLE_ENUM(SelectedEnumType)) - FreeAvailableAppList(); + FreeCachedAvailableEntries(); + if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); - if (hImageTreeView) ImageList_Destroy(hImageTreeView); + + if (hImageTreeView) + ImageList_Destroy(hImageTreeView); PostQuitMessage(0); return 0;

9 years, 8 months

[hbelusca] 67223: [NTVDM]: Fix VgaGetDoubleVisionState definition (it was already correctly used in hardware/mouse.c).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Apr 17 12:13:49 2015 New Revision: 67223 URL: http://svn.reactos.org/svn/reactos?rev=67223&view=rev Log: [NTVDM]: Fix VgaGetDoubleVisionState definition (it was already correctly used in hardware/mouse.c). Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Fri Apr 17 12:13:49 2015 @@ -1890,11 +1890,11 @@ return Resolution; } -BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Vertical, PBOOLEAN Horizontal) +BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical) { if (GraphicsConsoleBuffer == NULL) return FALSE; - if (Vertical) *Vertical = DoubleWidth; - if (Horizontal) *Horizontal = DoubleHeight; + if (Horizontal) *Horizontal = DoubleWidth; + if (Vertical) *Vertical = DoubleHeight; return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] Fri Apr 17 12:13:49 2015 @@ -262,7 +262,7 @@ VOID VgaRefreshDisplay(VOID); VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); VOID VgaClearMemory(VOID); -BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Vertical, PBOOLEAN Horizontal); +BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical); BOOLEAN VgaInitialize(HANDLE TextHandle); VOID VgaCleanup(VOID);

9 years, 8 months

[tfaber] 67222: [KERNEL32_APITEST] - Make GetDriveType test succeed if the current directory is the drive root. Spotted by Edijs. - Use strsafe functions ROSTESTS-160 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 17 08:09:30 2015 New Revision: 67222 URL: http://svn.reactos.org/svn/reactos?rev=67222&view=rev Log: [KERNEL32_APITEST] - Make GetDriveType test succeed if the current directory is the drive root. Spotted by Edijs. - Use strsafe functions ROSTESTS-160 #resolve Modified: trunk/rostests/apitests/kernel32/GetDriveType.c Modified: trunk/rostests/apitests/kernel32/GetDriveType.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetDriv… ============================================================================== --- trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] Fri Apr 17 08:09:30 2015 @@ -1,4 +1,5 @@ #include <apitest.h> +#include <strsafe.h> #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR) @@ -6,45 +7,48 @@ { UINT Type, Type2, i; WCHAR Path[MAX_PATH]; - + /* Note: Successful calls can set last error to at least ERROR_NOT_A_REPARSE_POINT, we don't test it here */ SetLastError(0xdeadbeaf); - + Type = GetDriveTypeW(L""); ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type); - + Type = GetDriveTypeW(L"\nC:\\"); ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type); - + Type = GetDriveTypeW(L"Z:\\"); ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type); - + ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError()); - + /* Drive root is accepted without ending slash */ Type = GetDriveTypeW(L"C:"); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - + Type = GetDriveTypeW(L"C:\\"); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - + Type = GetDriveTypeW(NULL); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - + i = GetCurrentDirectoryW(sizeof(Path)/sizeof(Path[0]), Path); if (i) { - /* Note: there is no backslash at the end of Path */ - SetLastError(0xdeadbeaf); - Type2 = GetDriveTypeW(Path); - ok(Type2 == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type2); - ok(GetLastError() == 0xdeadbeaf, "Expected ERROR_NOT_A_REPARSE_POINT, got %lu\n", GetLastError()); - - wcscpy(Path+i, L"\\"); + /* No trailing backslash returned unless we're at the drive root */ + if (Path[i - 1] != L'\\') + { + SetLastError(0xdeadbeaf); + Type2 = GetDriveTypeW(Path); + ok(Type2 == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type2); + ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError()); + + StringCchCopyW(Path + i, MAX_PATH - i, L"\\"); + } Type2 = GetDriveTypeW(Path); ok(Type == Type2, "Types are not equal: %u != %u\n", Type, Type2); } - + i = GetSystemDirectoryW(Path, sizeof(Path)/sizeof(Path[0])); if (i) { @@ -53,16 +57,16 @@ Type = GetDriveTypeW(Path); ok(Type == DRIVE_NO_ROOT_DIR, "Expected DRIVE_NO_ROOT_DIR, got %u\n", Type); ok(GetLastError() == 0xdeadbeaf, "Expected no errors, got %lu\n", GetLastError()); - - wcscpy(Path+i, L"\\"); + + StringCchCopyW(Path + i, MAX_PATH - i, L"\\"); Type = GetDriveTypeW(Path); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - - wcscpy(Path+i, L"/"); + + StringCchCopyW(Path + i, MAX_PATH - i, L"/"); Type = GetDriveTypeW(Path); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); - - wcscpy(Path+i, L"\\\\"); + + StringCchCopyW(Path + i, MAX_PATH - i, L"\\\\"); Type = GetDriveTypeW(Path); ok(IS_DRIVE_TYPE_VALID(Type), "Expected valid drive type, got %u\n", Type); }

9 years, 8 months

[tfaber] 67221: [WIN32K:NTUSER] - Correctly check for WS_EX_NOPARENTNOTIFY in IntSendParentNotify. Patch by Andreas Maier. CORE-9538 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 17 07:03:37 2015 New Revision: 67221 URL: http://svn.reactos.org/svn/reactos?rev=67221&view=rev Log: [WIN32K:NTUSER] - Correctly check for WS_EX_NOPARENTNOTIFY in IntSendParentNotify. Patch by Andreas Maier. CORE-9538 #resolve Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Fri Apr 17 07:03:37 2015 @@ -1463,7 +1463,7 @@ static void IntSendParentNotify( PWND pWindow, UINT msg ) { if ( (pWindow->style & (WS_CHILD | WS_POPUP)) == WS_CHILD && - !(pWindow->style & WS_EX_NOPARENTNOTIFY)) + !(pWindow->ExStyle & WS_EX_NOPARENTNOTIFY)) { if (VerifyWnd(pWindow->spwndParent) && pWindow->spwndParent != UserGetDesktopWindow()) {

9 years, 8 months

[aandrejevic] 67220: [NTVDM] Fix several mouse range-related issues.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Apr 17 03:11:18 2015 New Revision: 67220 URL: http://svn.reactos.org/svn/reactos?rev=67220&view=rev Log: [NTVDM] Fix several mouse range-related issues. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Fri Apr 17 03:11:18 2015 @@ -42,11 +42,19 @@ static VOID PaintMouseCursor(VOID) { + COORD Position = DriverState.Position; + + /* Apply the clipping rectangle */ + if (Position.X < DriverState.MinX) Position.X = DriverState.MinX; + if (Position.X > DriverState.MaxX) Position.X = DriverState.MaxX; + if (Position.Y < DriverState.MinY) Position.Y = DriverState.MinY; + if (Position.Y > DriverState.MaxY) Position.Y = DriverState.MaxY; + if (Bda->VideoMode <= 3) { WORD Character; - WORD CellX = DriverState.Position.X / 8; - WORD CellY = DriverState.Position.Y / 8; + WORD CellX = Position.X / 8; + WORD CellY = Position.Y / 8; DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); EmulatorReadMemory(&EmulatorContext, @@ -74,10 +82,18 @@ static VOID EraseMouseCursor(VOID) { + COORD Position = DriverState.Position; + + /* Apply the clipping rectangle */ + if (Position.X < DriverState.MinX) Position.X = DriverState.MinX; + if (Position.X > DriverState.MaxX) Position.X = DriverState.MaxX; + if (Position.Y < DriverState.MinY) Position.Y = DriverState.MinY; + if (Position.Y > DriverState.MaxY) Position.Y = DriverState.MaxY; + if (Bda->VideoMode <= 3) { - WORD CellX = DriverState.Position.X / 8; - WORD CellY = DriverState.Position.Y / 8; + WORD CellX = Position.X / 8; + WORD CellY = Position.Y / 8; DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); EmulatorWriteMemory(&EmulatorContext, @@ -121,8 +137,8 @@ Resolution.Y *= 8; } - Position->X = (((Position->X - DriverState.MinX) * Resolution.X) / Width); - Position->Y = (((Position->Y - DriverState.MinY) * Resolution.Y) / Height); + Position->X = ((Position->X - DriverState.MinX) * Resolution.X) / Width; + Position->Y = ((Position->Y - DriverState.MinY) * Resolution.Y) / Height; } static VOID CallMouseUserHandlers(USHORT CallMask) @@ -231,13 +247,6 @@ if (DriverState.ShowCount > 0) EraseMouseCursor(); DriverState.Position = *NewPosition; - - /* Apply the clipping rectangle */ - if (DriverState.Position.X < DriverState.MinX) DriverState.Position.X = DriverState.MinX; - if (DriverState.Position.X > DriverState.MaxX) DriverState.Position.X = DriverState.MaxX; - if (DriverState.Position.Y < DriverState.MinY) DriverState.Position.Y = DriverState.MinY; - if (DriverState.Position.Y > DriverState.MaxY) DriverState.Position.Y = DriverState.MaxY; - if (DriverState.ShowCount > 0) PaintMouseCursor(); /* Call the mouse handlers */ @@ -494,18 +503,38 @@ /* Define Horizontal Cursor Range */ case 0x07: { - DPRINT("Setting mouse horizontal range: %u - %u\n", getCX(), getDX()); - DriverState.MinX = getCX(); - DriverState.MaxX = getDX(); + WORD Min = getCX(); + WORD Max = getDX(); + + if (!VgaGetDoubleVisionState(NULL, NULL)) + { + /* Text mode */ + Min &= ~0x07; + Max |= 0x07; + } + + DPRINT("Setting mouse horizontal range: %u - %u\n", Min, Max); + DriverState.MinX = Min; + DriverState.MaxX = Max; break; } /* Define Vertical Cursor Range */ case 0x08: { - DPRINT("Setting mouse vertical range: %u - %u\n", getCX(), getDX()); - DriverState.MinY = getCX(); - DriverState.MaxY = getDX(); + WORD Min = getCX(); + WORD Max = getDX(); + + if (!VgaGetDoubleVisionState(NULL, NULL)) + { + /* Text mode */ + Min &= ~0x07; + Max |= 0x07; + } + + DPRINT("Setting mouse vertical range: %u - %u\n", Min, Max); + DriverState.MinY = Min; + DriverState.MaxY = Max; break; }

9 years, 8 months

[aandrejevic] 67219: [NTVDM] - Completely rewrite the timing system. Replace hardcoded callbacks with dynamic hardware timers. - Finish implementing the PS/2 mouse. - Fix the DOS mouse driver. Insp...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Apr 17 00:20:39 2015 New Revision: 67219 URL: http://svn.reactos.org/svn/reactos?rev=67219&view=rev Log: [NTVDM] - Completely rewrite the timing system. Replace hardcoded callbacks with dynamic hardware timers. - Finish implementing the PS/2 mouse. - Fix the DOS mouse driver. Inspired by a patch by Stefano Toncich (Tonix) (see CORE-9166). CORE-9166 #comment A different fix was committed in r67219. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/clock.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h 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] Fri Apr 17 00:20:39 2015 @@ -17,6 +17,7 @@ #include "io.h" #include "hardware/mouse.h" +#include "hardware/ps2.h" // HACK: For the PS/2 bypass and MOUSE.COM driver direct call #include "dos/mouse32.h" @@ -28,13 +29,6 @@ // Mouse IRQ 12 static VOID WINAPI BiosMouseIrq(LPWORD Stack) { - // HACK!! Call directly the MOUSE.COM driver instead of going - // through the regular interfaces!! - extern COORD DosNewPosition; - extern WORD DosButtonState; - DosMouseUpdatePosition(&DosNewPosition); - DosMouseUpdateButtons(DosButtonState); - PicIRQComplete(Stack); } @@ -118,6 +112,7 @@ { /* Set up the HW vector interrupts */ EnableHwIRQ(12, BiosMouseIrq); + return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -14,12 +14,13 @@ #include "emulator.h" #include "cpu/cpu.h" -// #include "clock.h" +#include "clock.h" #include "hardware/cmos.h" #include "hardware/ps2.h" #include "hardware/pit.h" #include "hardware/video/vga.h" +#include "hardware/mouse.h" /* Extra PSDK/NDK Headers */ #include <ndk/kefuncs.h> @@ -28,8 +29,7 @@ /* * Activate IPS_DISPLAY if you want to display the - * number of instructions per second, as well as - * the computed number of ticks for the PIT. + * number of instructions per second. */ // #define IPS_DISPLAY @@ -38,27 +38,27 @@ */ // #define WORKING_TIMER - /* Processor speed */ #define STEPS_PER_CYCLE 256 -#define IRQ1_CYCLES 16 -#define IRQ12_CYCLES 16 /* VARIABLES ******************************************************************/ +static LIST_ENTRY Timers; static LARGE_INTEGER StartPerfCount, Frequency; - -static LARGE_INTEGER LastTimerTick, LastRtcTick, Counter; -static LONGLONG TimerTicks; -static DWORD StartTickCount, CurrentTickCount; -static DWORD LastClockUpdate; -static DWORD LastVerticalRefresh; - -static DWORD LastIrq1Tick = 0, LastIrq12Tick = 0; - -#ifdef IPS_DISPLAY - static DWORD LastCyclePrintout; - static ULONGLONG Cycles = 0; +static DWORD StartTickCount; + +#ifdef IPS_DISPLAY +static ULONGLONG Cycles = 0ULL; +#endif + +/* PRIVATE FUNCTIONS **********************************************************/ + +#ifdef IPS_DISPLAY +static VOID FASTCALL IpsDisplayCallback(ULONGLONG ElapsedTime) +{ + DPRINT1("NTVDM: %I64u Instructions Per Second\n", Cycles / ElapsedTime); + Cycles = 0ULL; +} #endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -67,112 +67,159 @@ { extern BOOLEAN CpuRunning; UINT i; - // LARGE_INTEGER Counter; + PLIST_ENTRY Entry; + LARGE_INTEGER Counter; + + while (VdmRunning && CpuRunning) + { + /* Get the current number of ticks */ + DWORD CurrentTickCount = GetTickCount(); #ifdef WORKING_TIMER - DWORD PitResolution; -#endif - DWORD RtcFrequency; - - while (VdmRunning && CpuRunning) - { - -#ifdef WORKING_TIMER - PitResolution = PitGetResolution(); -#endif - RtcFrequency = RtcGetTicksPerSecond(); - - /* Get the current number of ticks */ - CurrentTickCount = GetTickCount(); - -#ifdef WORKING_TIMER - if ((PitResolution <= 1000) && (RtcFrequency <= 1000)) - { - /* Calculate the approximate performance counter value instead */ - Counter.QuadPart = StartPerfCount.QuadPart - + (CurrentTickCount - StartTickCount) - * (Frequency.QuadPart / 1000); + if ((PitResolution <= 1000) && (RtcFrequency <= 1000)) + { + /* Calculate the approximate performance counter value instead */ + Counter.QuadPart = StartPerfCount.QuadPart + + ((CurrentTickCount - StartTickCount) + * Frequency.QuadPart) / 1000; + } + else +#endif + { + /* Get the current performance counter value */ + /// DWORD_PTR oldmask = SetThreadAffinityMask(GetCurrentThread(), 0); + NtQueryPerformanceCounter(&Counter, NULL); + /// SetThreadAffinityMask(GetCurrentThread(), oldmask); + } + + /* Continue CPU emulation */ + for (i = 0; VdmRunning && CpuRunning && (i < STEPS_PER_CYCLE); i++) + { + CpuStep(); + +#ifdef IPS_DISPLAY + ++Cycles; +#endif + } + + for (Entry = Timers.Flink; Entry != &Timers; Entry = Entry->Flink) + { + ULONGLONG Ticks = (ULONGLONG)-1; + PHARDWARE_TIMER Timer = CONTAINING_RECORD(Entry, HARDWARE_TIMER, Link); + + ASSERT((Timer->EnableCount > 0) && (Timer->Flags & HARDWARE_TIMER_ENABLED)); + + if (Timer->Delay) + { + if (Timer->Flags & HARDWARE_TIMER_PRECISE) + { + /* Use the performance counter for precise timers */ + if (Counter.QuadPart <= Timer->LastTick.QuadPart) continue; + Ticks = (Counter.QuadPart - Timer->LastTick.QuadPart) / Timer->Delay; + } + else + { + /* Use the regular tick count for normal timers */ + if (CurrentTickCount <= Timer->LastTick.LowPart) continue; + Ticks = (CurrentTickCount - Timer->LastTick.LowPart) / (ULONG)Timer->Delay; + } + + if (Ticks == 0) continue; + } + + Timer->Callback(Ticks); + + if (Timer->Flags & HARDWARE_TIMER_ONESHOT) + { + /* Disable this timer */ + DisableHardwareTimer(Timer); + } + + /* Update the time of the last timer tick */ + Timer->LastTick.QuadPart += Ticks * Timer->Delay; + } + } +} + +PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONG Delay, PHARDWARE_TIMER_PROC Callback) +{ + PHARDWARE_TIMER Timer; + + Timer = (PHARDWARE_TIMER)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(HARDWARE_TIMER)); + if (Timer == NULL) return NULL; + + Timer->Flags = Flags & ~HARDWARE_TIMER_ENABLED; + Timer->EnableCount = 0; + Timer->Callback = Callback; + SetHardwareTimerDelay(Timer, (ULONGLONG)Delay); + + if (Flags & HARDWARE_TIMER_ENABLED) EnableHardwareTimer(Timer); + return Timer; +} + +VOID EnableHardwareTimer(PHARDWARE_TIMER Timer) +{ + /* Increment the count */ + Timer->EnableCount++; + + /* Check if the count is above 0 but the timer isn't enabled */ + if ((Timer->EnableCount > 0) && !(Timer->Flags & HARDWARE_TIMER_ENABLED)) + { + if (Timer->Flags & HARDWARE_TIMER_PRECISE) + { + NtQueryPerformanceCounter(&Timer->LastTick, NULL); + } + else + { + Timer->LastTick.LowPart = GetTickCount(); + } + + Timer->Flags |= HARDWARE_TIMER_ENABLED; + InsertTailList(&Timers, &Timer->Link); + } +} + +VOID DisableHardwareTimer(PHARDWARE_TIMER Timer) +{ + /* Decrement the count */ + Timer->EnableCount--; + + /* Check if the count is 0 or less but the timer is enabled */ + if ((Timer->EnableCount <= 0) && (Timer->Flags & HARDWARE_TIMER_ENABLED)) + { + /* Disable the timer */ + Timer->Flags &= ~HARDWARE_TIMER_ENABLED; + RemoveEntryList(&Timer->Link); + } +} + +VOID SetHardwareTimerDelay(PHARDWARE_TIMER Timer, ULONGLONG NewDelay) +{ + if (Timer->Flags & HARDWARE_TIMER_PRECISE) + { + /* Convert the delay from nanoseconds to performance counter ticks */ + Timer->Delay = (NewDelay * Frequency.QuadPart + 500000000ULL) / 1000000000ULL; } else -#endif - { - /* Get the current performance counter value */ - /// DWORD_PTR oldmask = SetThreadAffinityMask(GetCurrentThread(), 0); - NtQueryPerformanceCounter(&Counter, NULL); - /// SetThreadAffinityMask(GetCurrentThread(), oldmask); - } - - /* Get the number of PIT ticks that have passed */ - TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) - * PIT_BASE_FREQUENCY) / Frequency.QuadPart; - - /* Update the PIT */ - if (TimerTicks > 0) - { - PitClock(TimerTicks); - LastTimerTick = Counter; - } - - /* Check for RTC update */ - if ((CurrentTickCount - LastClockUpdate) >= 1000) - { - RtcTimeUpdate(); - LastClockUpdate = CurrentTickCount; - } - - /* Check for RTC periodic tick */ - if ((Counter.QuadPart - LastRtcTick.QuadPart) - >= (Frequency.QuadPart / (LONGLONG)RtcFrequency)) - { - RtcPeriodicTick(); - LastRtcTick = Counter; - } - - /* Check for vertical retrace */ - if ((CurrentTickCount - LastVerticalRefresh) >= 15) - { - VgaRefreshDisplay(); - LastVerticalRefresh = CurrentTickCount; - } - - if ((CurrentTickCount - LastIrq1Tick) >= IRQ1_CYCLES) - { - GenerateIrq1(); - LastIrq1Tick = CurrentTickCount; - } - - if ((CurrentTickCount - LastIrq12Tick) >= IRQ12_CYCLES) - { - GenerateIrq12(); - LastIrq12Tick = CurrentTickCount; - } - - /* Horizontal retrace occurs as fast as possible */ - VgaHorizontalRetrace(); - - /* Continue CPU emulation */ - for (i = 0; VdmRunning && CpuRunning && (i < STEPS_PER_CYCLE); i++) - { - CpuStep(); -#ifdef IPS_DISPLAY - ++Cycles; -#endif - } - -#ifdef IPS_DISPLAY - if ((CurrentTickCount - LastCyclePrintout) >= 1000) - { - DPRINT1("NTVDM: %I64u Instructions Per Second; TimerTicks = %I64d\n", Cycles * 1000 / (CurrentTickCount - LastCyclePrintout), TimerTicks); - LastCyclePrintout = CurrentTickCount; - Cycles = 0; - } -#endif - - } + { + Timer->Delay = NewDelay; + } +} + +VOID DestroyHardwareTimer(PHARDWARE_TIMER Timer) +{ + if (Timer->Flags & HARDWARE_TIMER_ENABLED) RemoveEntryList(&Timer->Link); + RtlFreeHeap(RtlGetProcessHeap(), 0, Timer); } BOOLEAN ClockInitialize(VOID) { +#ifdef IPS_DISPLAY + PHARDWARE_TIMER IpsTimer; +#endif + + InitializeListHead(&Timers); + /* Initialize the performance counter (needed for hardware timers) */ /* Find the starting performance */ NtQueryPerformanceCounter(&StartPerfCount, &Frequency); @@ -185,15 +232,16 @@ /* Find the starting tick count */ StartTickCount = GetTickCount(); - /* Set the different last counts to the starting count */ - LastClockUpdate = LastVerticalRefresh = -#ifdef IPS_DISPLAY - LastCyclePrintout = -#endif - StartTickCount; - - /* Set the last timer ticks to the current time */ - LastTimerTick = LastRtcTick = StartPerfCount; +#ifdef IPS_DISPLAY + + IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1000, IpsDisplayCallback); + if (IpsTimer == NULL) + { + wprintf(L"FATAL: Cannot create IPS display timer.\n"); + return FALSE; + } + +#endif return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -10,7 +10,38 @@ #ifndef _CLOCK_H_ #define _CLOCK_H_ +#include <ndk/rtlfuncs.h> + +/* DEFINITIONS ****************************************************************/ + +#define HARDWARE_TIMER_ENABLED (1 << 0) +#define HARDWARE_TIMER_ONESHOT (1 << 1) +#define HARDWARE_TIMER_PRECISE (1 << 2) + +typedef VOID (FASTCALL *PHARDWARE_TIMER_PROC)(ULONGLONG ElapsedTime); + +typedef struct _HARDWARE_TIMER +{ + LIST_ENTRY Link; + ULONG Flags; + LONG EnableCount; + ULONGLONG Delay; + PHARDWARE_TIMER_PROC Callback; + LARGE_INTEGER LastTick; +} HARDWARE_TIMER, *PHARDWARE_TIMER; + /* FUNCTIONS ******************************************************************/ + +PHARDWARE_TIMER CreateHardwareTimer +( + ULONG Flags, + ULONG Delay, /* milliseconds for normal timers, nanoseconds for precise timers */ + PHARDWARE_TIMER_PROC Callback +); +VOID EnableHardwareTimer(PHARDWARE_TIMER Timer); +VOID DisableHardwareTimer(PHARDWARE_TIMER Timer); +VOID SetHardwareTimerDelay(PHARDWARE_TIMER Timer, ULONGLONG NewDelay); +VOID DestroyHardwareTimer(PHARDWARE_TIMER Timer); VOID ClockUpdate(VOID); BOOLEAN ClockInitialize(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -54,6 +54,8 @@ EMULATOR_EXCEPTION_PAGE_FAULT }; #endif + +extern BOOLEAN CpuRunning; extern FAST486_STATE EmulatorContext; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -423,7 +423,7 @@ RegisterBop(BOP_START_DOS, NULL); /* Load the mouse driver */ - // DosMouseInitialize(); + DosMouseInitialize(); #ifndef STANDALONE Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -13,36 +13,45 @@ #include "emulator.h" #include "cpu/cpu.h" #include "int32.h" +#include "hardware/mouse.h" +#include "hardware/ps2.h" +#include "hardware/pic.h" +#include "hardware/video/vga.h" #include "mouse32.h" #include "bios/bios.h" +#include "bios/bios32/bios32p.h" #include "io.h" #include "dos32krnl/dos.h" /* PRIVATE VARIABLES **********************************************************/ -static BOOLEAN DriverEnabled = TRUE; +#define MICKEYS_PER_CELL_HORIZ 8 +#define MICKEYS_PER_CELL_VERT 16 + +static MOUSE_PACKET Packet; +static INT ByteCounter = 0; +static BOOLEAN DriverEnabled = FALSE; static MOUSE_DRIVER_STATE DriverState; - -/**/ -COORD DosNewPosition; -WORD DosButtonState; -/**/ +static DWORD OldIrqHandler; /* PRIVATE FUNCTIONS **********************************************************/ +extern VOID WINAPI BiosMouseIrq(LPWORD Stack); + static VOID PaintMouseCursor(VOID) { if (Bda->VideoMode <= 3) { WORD Character; + WORD CellX = DriverState.Position.X / 8; + WORD CellY = DriverState.Position.Y / 8; DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); EmulatorReadMemory(&EmulatorContext, VideoAddress - + (DriverState.Position.Y * Bda->ScreenColumns - + DriverState.Position.X) * sizeof(WORD), + + (CellY * Bda->ScreenColumns + CellX) * sizeof(WORD), (LPVOID)&Character, sizeof(WORD)); @@ -52,8 +61,7 @@ EmulatorWriteMemory(&EmulatorContext, VideoAddress - + (DriverState.Position.Y * Bda->ScreenColumns - + DriverState.Position.X) * sizeof(WORD), + + (CellY * Bda->ScreenColumns + CellX) * sizeof(WORD), (LPVOID)&Character, sizeof(WORD)); } @@ -68,12 +76,13 @@ { if (Bda->VideoMode <= 3) { + WORD CellX = DriverState.Position.X / 8; + WORD CellY = DriverState.Position.Y / 8; DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); EmulatorWriteMemory(&EmulatorContext, VideoAddress - + (DriverState.Position.Y * Bda->ScreenColumns - + DriverState.Position.X) * sizeof(WORD), + + (CellY * Bda->ScreenColumns + CellX) * sizeof(WORD), (LPVOID)&DriverState.Character, sizeof(WORD)); } @@ -84,10 +93,45 @@ } } +static VOID ToMouseCoordinates(PCOORD Position) +{ + COORD Resolution = VgaGetDisplayResolution(); + WORD Width = DriverState.MaxX - DriverState.MinX + 1; + WORD Height = DriverState.MaxY - DriverState.MinY + 1; + + if (!VgaGetDoubleVisionState(NULL, NULL)) + { + Resolution.X *= 8; + Resolution.Y *= 8; + } + + Position->X = DriverState.MinX + ((Position->X * Width) / Resolution.X); + Position->Y = DriverState.MinY + ((Position->Y * Height) / Resolution.Y); +} + +static VOID FromMouseCoordinates(PCOORD Position) +{ + COORD Resolution = VgaGetDisplayResolution(); + WORD Width = DriverState.MaxX - DriverState.MinX + 1; + WORD Height = DriverState.MaxY - DriverState.MinY + 1; + + if (!VgaGetDoubleVisionState(NULL, NULL)) + { + Resolution.X *= 8; + Resolution.Y *= 8; + } + + Position->X = (((Position->X - DriverState.MinX) * Resolution.X) / Width); + Position->Y = (((Position->Y - DriverState.MinY) * Resolution.Y) / Height); +} + static VOID CallMouseUserHandlers(USHORT CallMask) { USHORT i; USHORT AX, BX, CX, DX, SI, DI; + COORD Position = DriverState.Position; + + ToMouseCoordinates(&Position); /* Call handler 0 */ if ((DriverState.Handler0.CallMask & CallMask) != 0 && @@ -108,10 +152,10 @@ setAX(CallMask); setBX(DriverState.ButtonState); - setCX(DriverState.Position.X); - setDX(DriverState.Position.Y); - setSI(DriverState.MickeysPerCellHoriz); - setDI(DriverState.MickeysPerCellVert); + setCX(Position.X); + setDX(Position.Y); + setSI(MICKEYS_PER_CELL_HORIZ); + setDI(MICKEYS_PER_CELL_VERT); DPRINT("Calling Handler0 %04X:%04X with CallMask 0x%04X\n", HIWORD(DriverState.Handler0.Callback), @@ -150,10 +194,10 @@ setAX(CallMask); setBX(DriverState.ButtonState); - setCX(DriverState.Position.X); - setDX(DriverState.Position.Y); - setSI(DriverState.MickeysPerCellHoriz); - setDI(DriverState.MickeysPerCellVert); + setCX(Position.X); + setDX(Position.Y); + setSI(MICKEYS_PER_CELL_HORIZ); + setDI(MICKEYS_PER_CELL_VERT); DPRINT1("Calling Handler[%d] %04X:%04X with CallMask 0x%04X\n", i, @@ -174,6 +218,127 @@ } } +static inline VOID DosUpdatePosition(PCOORD NewPosition) +{ + COORD Resolution = VgaGetDisplayResolution(); + + /* Check for text mode */ + if (!VgaGetDoubleVisionState(NULL, NULL)) + { + Resolution.X *= 8; + Resolution.Y *= 8; + } + + if (DriverState.ShowCount > 0) EraseMouseCursor(); + DriverState.Position = *NewPosition; + + /* Apply the clipping rectangle */ + if (DriverState.Position.X < DriverState.MinX) DriverState.Position.X = DriverState.MinX; + if (DriverState.Position.X > DriverState.MaxX) DriverState.Position.X = DriverState.MaxX; + if (DriverState.Position.Y < DriverState.MinY) DriverState.Position.Y = DriverState.MinY; + if (DriverState.Position.Y > DriverState.MaxY) DriverState.Position.Y = DriverState.MaxY; + + if (DriverState.ShowCount > 0) PaintMouseCursor(); + + /* Call the mouse handlers */ + CallMouseUserHandlers(0x0001); // We use MS MOUSE v1.0+ format +} + +static inline VOID DosUpdateButtons(BYTE ButtonState) +{ + USHORT i; + USHORT CallMask = 0x0000; // We use MS MOUSE v1.0+ format + + for (i = 0; i < NUM_MOUSE_BUTTONS; i++) + { + BOOLEAN OldState = (DriverState.ButtonState >> i) & 1; + BOOLEAN NewState = (ButtonState >> i) & 1; + + if (NewState > OldState) + { + /* Mouse press */ + DriverState.PressCount[i]++; + DriverState.LastPress[i] = DriverState.Position; + + CallMask |= (1 << (2 * i + 1)); + } + else if (NewState < OldState) + { + /* Mouse release */ + DriverState.ReleaseCount[i]++; + DriverState.LastRelease[i] = DriverState.Position; + + CallMask |= (1 << (2 * i + 2)); + } + } + + DriverState.ButtonState = ButtonState; + + /* Call the mouse handlers */ + CallMouseUserHandlers(CallMask); +} + +static VOID WINAPI DosMouseIrq(LPWORD Stack) +{ + COORD Position; + BYTE ButtonState; + + switch (ByteCounter) + { + case 0: + { + Packet.Flags = IOReadB(PS2_DATA_PORT); + break; + } + + case 1: + { + Packet.HorzCounter = IOReadB(PS2_DATA_PORT); + break; + } + + case 2: + { + Packet.VertCounter = IOReadB(PS2_DATA_PORT); + break; + } + + default: + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + } + + if (++ByteCounter == 3) + { + SHORT DeltaX = Packet.HorzCounter; + SHORT DeltaY = Packet.VertCounter; + + /* Adjust the sign */ + if (Packet.Flags & MOUSE_X_SIGN) DeltaX = -DeltaX; + if (Packet.Flags & MOUSE_Y_SIGN) DeltaY = -DeltaY; + + DriverState.HorizCount += DeltaX; + DriverState.VertCount += DeltaY; + + ByteCounter = 0; + } + + /* + * Get the absolute position directly from the mouse, this is the only + * way to perfectly synchronize the host and guest mouse pointer. + */ + MouseGetDataFast(&Position, &ButtonState); + + /* Call the update subroutines */ + DosUpdatePosition(&Position); + DosUpdateButtons(ButtonState); + + /* Complete the IRQ */ + PicIRQComplete(Stack); +} + static VOID WINAPI DosMouseService(LPWORD Stack) { switch (getAX()) @@ -183,9 +348,14 @@ { SHORT i; - DriverEnabled = TRUE; DriverState.ShowCount = 0; DriverState.ButtonState = 0; + + /* Initialize the default clipping range */ + DriverState.MinX = 0; + DriverState.MaxX = MOUSE_MAX_HORIZ - 1; + DriverState.MinY = 0; + DriverState.MaxY = MOUSE_MAX_VERT - 1; /* Set the default text cursor */ DriverState.TextCursor.ScreenMask = 0xFFFF; /* Display everything */ @@ -237,10 +407,6 @@ DriverState.PressCount[i] = DriverState.ReleaseCount[i] = 0; } - /* Initialize the resolution */ - DriverState.MickeysPerCellHoriz = 8; - DriverState.MickeysPerCellVert = 16; - /* Return mouse information */ setAX(0xFFFF); // Hardware & driver installed setBX(NUM_MOUSE_BUTTONS); @@ -252,7 +418,7 @@ case 0x01: { DriverState.ShowCount++; - if (DriverState.ShowCount > 0) PaintMouseCursor(); + if (DriverState.ShowCount == 1) PaintMouseCursor(); break; } @@ -261,7 +427,7 @@ case 0x02: { DriverState.ShowCount--; - if (DriverState.ShowCount <= 0) EraseMouseCursor(); + if (DriverState.ShowCount == 0) EraseMouseCursor(); break; } @@ -269,23 +435,22 @@ /* Return Position And Button Status */ case 0x03: { + COORD Position = DriverState.Position; + ToMouseCoordinates(&Position); + setBX(DriverState.ButtonState); - setCX(DriverState.Position.X); - setDX(DriverState.Position.Y); + setCX(Position.X); + setDX(Position.Y); break; } /* Position Mouse Cursor */ case 0x04: { - POINT Point; - - Point.x = getCX(); - Point.y = getDX(); - - ClientToScreen(GetConsoleWindow(), &Point); - SetCursorPos(Point.x, Point.y); - + COORD Position = { getCX(), getDX() }; + FromMouseCoordinates(&Position); + + DriverState.Position = Position; break; } @@ -293,11 +458,13 @@ case 0x05: { WORD Button = getBX(); + COORD LastPress = DriverState.LastPress[Button]; + ToMouseCoordinates(&LastPress); setAX(DriverState.ButtonState); setBX(DriverState.PressCount[Button]); - setCX(DriverState.LastPress[Button].X); - setDX(DriverState.LastPress[Button].Y); + setCX(LastPress.X); + setDX(LastPress.Y); /* Reset the counter */ DriverState.PressCount[Button] = 0; @@ -309,17 +476,37 @@ case 0x06: { WORD Button = getBX(); + COORD LastRelease = DriverState.LastRelease[Button]; + ToMouseCoordinates(&LastRelease); setAX(DriverState.ButtonState); setBX(DriverState.ReleaseCount[Button]); - setCX(DriverState.LastRelease[Button].X); - setDX(DriverState.LastRelease[Button].Y); + setCX(LastRelease.X); + setDX(LastRelease.Y); /* Reset the counter */ DriverState.ReleaseCount[Button] = 0; break; + } + + /* Define Horizontal Cursor Range */ + case 0x07: + { + DPRINT("Setting mouse horizontal range: %u - %u\n", getCX(), getDX()); + DriverState.MinX = getCX(); + DriverState.MaxX = getDX(); + break; + } + + /* Define Vertical Cursor Range */ + case 0x08: + { + DPRINT("Setting mouse vertical range: %u - %u\n", getCX(), getDX()); + DriverState.MinY = getCX(); + DriverState.MaxY = getDX(); + break; } /* Define Graphics Cursor */ @@ -395,8 +582,7 @@ /* Define Mickey/Pixel Ratio */ case 0x0F: { - DriverState.MickeysPerCellHoriz = getCX(); - DriverState.MickeysPerCellVert = getDX(); + /* This call should be completely ignored */ break; } @@ -588,14 +774,14 @@ setES(0x0000); setBX(0x0000); - DriverEnabled = FALSE; + DosMouseDisable(); break; } /* Enable Mouse Driver */ case 0x20: { - DriverEnabled = TRUE; + DosMouseEnable(); break; } @@ -607,6 +793,38 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +VOID DosMouseEnable(VOID) +{ + if (!DriverEnabled) + { + DriverEnabled = TRUE; + + /* Get the old IRQ handler */ + OldIrqHandler = ((PDWORD)BaseAddress)[MOUSE_IRQ_INT]; + + /* Set the IRQ handler */ + RegisterDosInt32(MOUSE_IRQ_INT, DosMouseIrq); + + /* Enable packet reporting */ + IOWriteB(PS2_CONTROL_PORT, 0xD4); + IOWriteB(PS2_DATA_PORT, 0xF4); + + /* Read the mouse ACK reply */ + PS2PortQueueRead(1); + } +} + +VOID DosMouseDisable(VOID) +{ + if (DriverEnabled) + { + /* Restore the old IRQ handler */ + ((PDWORD)BaseAddress)[MOUSE_IRQ_INT] = OldIrqHandler; + + DriverEnabled = FALSE; + } +} VOID DosMouseUpdatePosition(PCOORD NewPosition) { @@ -615,8 +833,8 @@ if (!DriverEnabled) return; - DriverState.HorizCount += (DeltaX * (SHORT)DriverState.MickeysPerCellHoriz) / 8; - DriverState.VertCount += (DeltaY * (SHORT)DriverState.MickeysPerCellVert ) / 8; + DriverState.HorizCount += (DeltaX * MICKEYS_PER_CELL_HORIZ) / 8; + DriverState.VertCount += (DeltaY * MICKEYS_PER_CELL_VERT) / 8; if (DriverState.ShowCount > 0) EraseMouseCursor(); DriverState.Position = *NewPosition; @@ -671,10 +889,12 @@ /* Initialize the interrupt handler */ RegisterDosInt32(DOS_MOUSE_INTERRUPT, DosMouseService); + DosMouseEnable(); return TRUE; } VOID DosMouseCleanup(VOID) { if (DriverState.ShowCount > 0) EraseMouseCursor(); -} + DosMouseDisable(); +} Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -16,6 +16,9 @@ /* DEFINES ********************************************************************/ #define DOS_MOUSE_INTERRUPT 0x33 +#define MOUSE_IRQ_INT 0x74 +#define MOUSE_MAX_HORIZ 640 +#define MOUSE_MAX_VERT 200 enum { @@ -47,8 +50,7 @@ COORD LastRelease[NUM_MOUSE_BUTTONS]; SHORT HorizCount; SHORT VertCount; - WORD MickeysPerCellHoriz; - WORD MickeysPerCellVert; + WORD MinX, MaxX, MinY, MaxY; /* * User Subroutine Handlers called on mouse events @@ -72,9 +74,8 @@ /* FUNCTIONS ******************************************************************/ -VOID DosMouseUpdatePosition(PCOORD NewPosition); -VOID DosMouseUpdateButtons(WORD ButtonStatus); - +VOID DosMouseEnable(VOID); +VOID DosMouseDisable(VOID); BOOLEAN DosMouseInitialize(VOID); VOID DosMouseCleanup(VOID); 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] Fri Apr 17 00:20:39 2015 @@ -15,6 +15,7 @@ #include "io.h" #include "pic.h" +#include "clock.h" /* PRIVATE VARIABLES **********************************************************/ @@ -24,14 +25,82 @@ static BOOLEAN NmiEnabled = TRUE; static CMOS_REGISTERS SelectedRegister = CMOS_REG_STATUS_D; -/* PUBLIC FUNCTIONS ***********************************************************/ - -BOOLEAN IsNmiEnabled(VOID) -{ - return NmiEnabled; -} - -VOID CmosWriteAddress(BYTE Value) +static PHARDWARE_TIMER ClockTimer; +static PHARDWARE_TIMER PeriodicTimer; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID RtcUpdatePeriodicTimer(VOID) +{ + BYTE RateSelect = CmosMemory.StatusRegA & 0x0F; + + if (RateSelect == 0) + { + /* No periodic interrupt */ + DisableHardwareTimer(PeriodicTimer); + return; + } + + /* 1 and 2 act like 8 and 9 */ + if (RateSelect <= 2) RateSelect += 7; + + SetHardwareTimerDelay(PeriodicTimer, 1000000000ULL / (ULONGLONG)(1 << (16 - RateSelect))); + EnableHardwareTimer(PeriodicTimer); +} + +static VOID FASTCALL RtcPeriodicTick(ULONGLONG ElapsedTime) +{ + UNREFERENCED_PARAMETER(ElapsedTime); + + /* Set PF */ + CmosMemory.StatusRegC |= CMOS_STC_PF; + + /* Check if there should be an interrupt on a periodic timer tick */ + if (CmosMemory.StatusRegB & CMOS_STB_INT_PERIODIC) + { + CmosMemory.StatusRegC |= CMOS_STC_IRQF; + + /* Interrupt! */ + PicInterruptRequest(RTC_IRQ_NUMBER); + } +} + +/* Should be called every second */ +static VOID FASTCALL RtcTimeUpdate(ULONGLONG ElapsedTime) +{ + SYSTEMTIME CurrentTime; + + UNREFERENCED_PARAMETER(ElapsedTime); + + /* Get the current time */ + GetLocalTime(&CurrentTime); + + /* Set UF */ + CmosMemory.StatusRegC |= CMOS_STC_UF; + + /* Check if the time matches the alarm time */ + if ((CurrentTime.wHour == CmosMemory.AlarmHour ) && + (CurrentTime.wMinute == CmosMemory.AlarmMinute) && + (CurrentTime.wSecond == CmosMemory.AlarmSecond)) + { + /* Set the alarm flag */ + CmosMemory.StatusRegC |= CMOS_STC_AF; + + /* Set IRQF if there should be an interrupt */ + if (CmosMemory.StatusRegB & CMOS_STB_INT_ON_ALARM) CmosMemory.StatusRegC |= CMOS_STC_IRQF; + } + + /* Check if there should be an interrupt on update */ + if (CmosMemory.StatusRegB & CMOS_STB_INT_ON_UPDATE) CmosMemory.StatusRegC |= CMOS_STC_IRQF; + + if (CmosMemory.StatusRegC & CMOS_STC_IRQF) + { + /* Interrupt! */ + PicInterruptRequest(RTC_IRQ_NUMBER); + } +} + +static VOID CmosWriteAddress(BYTE Value) { /* Update the NMI enabled flag */ NmiEnabled = !(Value & CMOS_DISABLE_NMI); @@ -51,7 +120,7 @@ } } -BYTE CmosReadData(VOID) +static BYTE CmosReadData(VOID) { BYTE Value; SYSTEMTIME CurrentTime; @@ -181,7 +250,7 @@ return Value; } -VOID CmosWriteData(BYTE Value) +static VOID CmosWriteData(BYTE Value) { BOOLEAN ChangeTime = FALSE; SYSTEMTIME CurrentTime; @@ -296,6 +365,7 @@ case CMOS_REG_STATUS_A: { CmosMemory.StatusRegA = Value & 0x7F; // Bit 7 is read-only + RtcUpdatePeriodicTimer(); break; } @@ -342,13 +412,13 @@ SelectedRegister = CMOS_REG_STATUS_D; } -BYTE WINAPI CmosReadPort(USHORT Port) +static BYTE WINAPI CmosReadPort(USHORT Port) { ASSERT(Port == CMOS_DATA_PORT); return CmosReadData(); } -VOID WINAPI CmosWritePort(USHORT Port, BYTE Data) +static VOID WINAPI CmosWritePort(USHORT Port, BYTE Data) { if (Port == CMOS_ADDRESS_PORT) CmosWriteAddress(Data); @@ -356,68 +426,12 @@ CmosWriteData(Data); } -DWORD RtcGetTicksPerSecond(VOID) -{ - BYTE RateSelect = CmosMemory.StatusRegB & 0x0F; - - if (RateSelect == 0) - { - /* No periodic interrupt */ - return 0; - } - - /* 1 and 2 act like 8 and 9 */ - if (RateSelect <= 2) RateSelect += 7; - - return 1 << (16 - RateSelect); -} - -VOID RtcPeriodicTick(VOID) -{ - /* Set PF */ - CmosMemory.StatusRegC |= CMOS_STC_PF; - - /* Check if there should be an interrupt on a periodic timer tick */ - if (CmosMemory.StatusRegB & CMOS_STB_INT_PERIODIC) - { - CmosMemory.StatusRegC |= CMOS_STC_IRQF; - - /* Interrupt! */ - PicInterruptRequest(RTC_IRQ_NUMBER); - } -} - -/* Should be called every second */ -VOID RtcTimeUpdate(VOID) -{ - SYSTEMTIME CurrentTime; - - /* Get the current time */ - GetLocalTime(&CurrentTime); - - /* Set UF */ - CmosMemory.StatusRegC |= CMOS_STC_UF; - - /* Check if the time matches the alarm time */ - if ((CurrentTime.wHour == CmosMemory.AlarmHour ) && - (CurrentTime.wMinute == CmosMemory.AlarmMinute) && - (CurrentTime.wSecond == CmosMemory.AlarmSecond)) - { - /* Set the alarm flag */ - CmosMemory.StatusRegC |= CMOS_STC_AF; - - /* Set IRQF if there should be an interrupt */ - if (CmosMemory.StatusRegB & CMOS_STB_INT_ON_ALARM) CmosMemory.StatusRegC |= CMOS_STC_IRQF; - } - - /* Check if there should be an interrupt on update */ - if (CmosMemory.StatusRegB & CMOS_STB_INT_ON_UPDATE) CmosMemory.StatusRegC |= CMOS_STC_IRQF; - - if (CmosMemory.StatusRegC & CMOS_STC_IRQF) - { - /* Interrupt! */ - PicInterruptRequest(RTC_IRQ_NUMBER); - } + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BOOLEAN IsNmiEnabled(VOID) +{ + return NmiEnabled; } VOID CmosInitialize(VOID) @@ -486,6 +500,11 @@ /* Register the I/O Ports */ RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort); RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort); + + ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1000, RtcTimeUpdate); + PeriodicTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, + 1000000, /* 1,000,000 ns = 1 ms */ + RtcPeriodicTick); } VOID CmosCleanup(VOID) @@ -493,6 +512,9 @@ DWORD CmosSize = sizeof(CmosMemory); if (hCmosRam == INVALID_HANDLE_VALUE) return; + + DestroyHardwareTimer(PeriodicTimer); + DestroyHardwareTimer(ClockTimer); /* Flush the CMOS memory back to the RAM file and close it */ SetFilePointer(hCmosRam, 0, NULL, FILE_BEGIN); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -128,8 +128,6 @@ BOOLEAN IsNmiEnabled(VOID); DWORD RtcGetTicksPerSecond(VOID); -VOID RtcPeriodicTick(VOID); -VOID RtcTimeUpdate(VOID); VOID CmosInitialize(VOID); VOID CmosCleanup(VOID); 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] Fri Apr 17 00:20:39 2015 @@ -12,31 +12,43 @@ #include "mouse.h" #include "ps2.h" -// #include "pic.h" +#include "clock.h" +#include "video/vga.h" /* PRIVATE VARIABLES **********************************************************/ +static const BYTE ScrollMagic[3] = { 200, 100, 80 }; +static const BYTE ExtraButtonMagic[3] = { 200, 200, 80 }; + +static HANDLE MouseMutex; +static PHARDWARE_TIMER StreamTimer; +static MOUSE_PACKET LastPacket; static MOUSE_MODE Mode, PreviousMode; static COORD Position; -static ULONG WidthMm, HeightMm, WidthPixels, HeightPixels; -static ULONG SampleRate; -static ULONG Resolution; -static BOOLEAN Scaling; +static BYTE Resolution; /* Completely ignored */ +static BOOLEAN Scaling; /* Completely ignored */ static BOOLEAN Reporting; static BYTE MouseId; static ULONG ButtonState; static SHORT HorzCounter; static SHORT VertCounter; static CHAR ScrollCounter; +static BOOLEAN EventsOccurred = FALSE; +static BYTE DataByteWait = 0; +static BYTE ScrollMagicCounter = 0, ExtraButtonMagicCounter = 0; static BYTE PS2Port = 1; +/* PUBLIC VARIABLES ***********************************************************/ + +UINT MouseCycles = 10; + /* PRIVATE FUNCTIONS **********************************************************/ static VOID MouseResetConfig(VOID) { /* Reset the configuration to defaults */ - SampleRate = 100; + MouseCycles = 10; Resolution = 4; Scaling = FALSE; Reporting = FALSE; @@ -45,7 +57,7 @@ static VOID MouseResetCounters(VOID) { /* Reset all flags and counters */ - ButtonState = HorzCounter = VertCounter = ScrollCounter = 0; + HorzCounter = VertCounter = ScrollCounter = 0; } static VOID MouseReset(VOID) @@ -57,41 +69,49 @@ /* Enter streaming mode and the reset the mouse ID */ Mode = MOUSE_STREAMING_MODE; MouseId = 0; + ScrollMagicCounter = ExtraButtonMagicCounter = 0; /* Send the Basic Assurance Test success code and the device ID */ PS2QueuePush(PS2Port, MOUSE_BAT_SUCCESS); PS2QueuePush(PS2Port, MouseId); } -#if 0 static VOID MouseGetPacket(PMOUSE_PACKET Packet) { /* Clear the packet */ RtlZeroMemory(Packet, sizeof(*Packet)); + /* Acquire the mutex */ + WaitForSingleObject(MouseMutex, INFINITE); + Packet->Flags |= MOUSE_ALWAYS_SET; + /* Set the sign flags */ + if (HorzCounter < 0) + { + Packet->Flags |= MOUSE_X_SIGN; + HorzCounter = -HorzCounter; + } + + if (VertCounter < 0) + { + Packet->Flags |= MOUSE_Y_SIGN; + VertCounter = -VertCounter; + } + /* Check for horizontal overflows */ - if ((HorzCounter < MOUSE_MIN) || (HorzCounter > MOUSE_MAX)) - { - if (HorzCounter > MOUSE_MAX) HorzCounter = MOUSE_MAX; - if (HorzCounter < MOUSE_MIN) HorzCounter = MOUSE_MIN; - + if (HorzCounter > MOUSE_MAX) + { + HorzCounter = MOUSE_MAX; Packet->Flags |= MOUSE_X_OVERFLOW; } /* Check for vertical overflows */ - if ((VertCounter < MOUSE_MIN) || (VertCounter > MOUSE_MAX)) - { - if (VertCounter > MOUSE_MIN) VertCounter = MOUSE_MIN; - if (VertCounter < MOUSE_MIN) VertCounter = MOUSE_MIN; - + if (VertCounter > MOUSE_MAX) + { + VertCounter = MOUSE_MAX; Packet->Flags |= MOUSE_Y_OVERFLOW; } - - /* Set the sign flags */ - if (HorzCounter & MOUSE_SIGN_BIT) Packet->Flags |= MOUSE_X_SIGN; - if (HorzCounter & MOUSE_SIGN_BIT) Packet->Flags |= MOUSE_Y_SIGN; /* Set the button flags */ if (ButtonState & FROM_LEFT_1ST_BUTTON_PRESSED) Packet->Flags |= MOUSE_LEFT_BUTTON; @@ -116,36 +136,94 @@ /* Reset the counters */ MouseResetCounters(); -} -#endif - -/*static*/ VOID MouseUpdatePosition(PCOORD NewPosition) -{ - /* Update the counters */ - HorzCounter += ((NewPosition->X - Position.X) * WidthMm * Resolution) / WidthPixels; - VertCounter += ((NewPosition->Y - Position.Y) * HeightMm * Resolution) / HeightPixels; - - /* Update the position */ - Position = *NewPosition; -} - -/*static*/ VOID MouseUpdateButtons(ULONG NewButtonState) -{ - ButtonState = NewButtonState; -} - -/*static*/ VOID MouseScroll(LONG Direction) -{ - ScrollCounter += Direction; -} - -/*static*/ COORD MouseGetPosition(VOID) -{ - return Position; + + /* Release the mutex */ + ReleaseMutex(MouseMutex); +} + +static VOID MouseDispatchPacket(PMOUSE_PACKET Packet) +{ + PS2QueuePush(PS2Port, Packet->Flags); + PS2QueuePush(PS2Port, Packet->HorzCounter); + PS2QueuePush(PS2Port, Packet->VertCounter); + if (MouseId >= 3) PS2QueuePush(PS2Port, Packet->Extra); } static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) { + /* Check if we were waiting for a data byte */ + if (DataByteWait) + { + PS2QueuePush(PS2Port, MOUSE_ACK); + + switch (DataByteWait) + { + /* Set Resolution */ + case 0xE8: + { + Resolution = Command; + break; + } + + /* Set Sample Rate */ + case 0xF3: + { + /* Check for the scroll wheel enabling sequence */ + if (MouseId == 0) + { + if (Command == ScrollMagic[ScrollMagicCounter]) + { + ScrollMagicCounter++; + if (ScrollMagicCounter == 3) MouseId = 3; + } + else + { + ScrollMagicCounter = 0; + } + } + + /* Check for the 5-button enabling sequence */ + if (MouseId == 3) + { + if (Command == ExtraButtonMagic[ExtraButtonMagicCounter]) + { + ExtraButtonMagicCounter++; + if (ExtraButtonMagicCounter == 3) MouseId = 4; + } + else + { + ExtraButtonMagicCounter = 0; + } + } + + MouseCycles = 1000 / (UINT)Command; + break; + } + + default: + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + } + + DataByteWait = 0; + } + + /* Check if we're in wrap mode */ + if (Mode == MOUSE_WRAP_MODE) + { + /* + * In this mode, we just echo whatever byte we get, + * except for the 0xEC and 0xFF commands. + */ + if (Command != 0xEC && Command != 0xFF) + { + PS2QueuePush(PS2Port, Command); + return; + } + } + switch (Command) { /* Set 1:1 Scaling */ @@ -166,17 +244,27 @@ /* Set Resolution */ case 0xE8: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + /* Set Sample Rate */ + case 0xF3: + { + PS2QueuePush(PS2Port, MOUSE_ACK); + DataByteWait = Command; break; } /* Read Status */ case 0xE9: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + BYTE Status = ButtonState & 7; + PS2QueuePush(PS2Port, MOUSE_ACK); + + if (Scaling) Status |= 1 << 4; + if (Reporting) Status |= 1 << 5; + if (Mode == MOUSE_REMOTE_MODE) Status |= 1 << 6; + + PS2QueuePush(PS2Port, Status); + PS2QueuePush(PS2Port, Resolution); + PS2QueuePush(PS2Port, (BYTE)(1000 / MouseCycles)); break; } @@ -193,8 +281,9 @@ /* Read Packet */ case 0xEB: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + PS2QueuePush(PS2Port, MOUSE_ACK); + MouseGetPacket(&LastPacket); + MouseDispatchPacket(&LastPacket); break; } @@ -247,14 +336,6 @@ break; } - /* Set Sample Rate */ - case 0xF3: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - break; - } - /* Enable Reporting */ case 0xF4: { @@ -283,8 +364,8 @@ /* Resend */ case 0xFE: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + PS2QueuePush(PS2Port, MOUSE_ACK); + MouseDispatchPacket(&LastPacket); break; } @@ -303,50 +384,77 @@ } } +static VOID FASTCALL MouseStreamingCallback(ULONGLONG ElapsedTime) +{ + UNREFERENCED_PARAMETER(ElapsedTime); + + /* Check if we're not in streaming mode, not reporting, or there's nothing to report */ + if (Mode != MOUSE_STREAMING_MODE || !Reporting || !EventsOccurred) return; + + MouseGetPacket(&LastPacket); + MouseDispatchPacket(&LastPacket); + + EventsOccurred = FALSE; +} + /* PUBLIC FUNCTIONS ***********************************************************/ +VOID MouseGetDataFast(PCOORD CurrentPosition, PBYTE CurrentButtonState) +{ + WaitForSingleObject(MouseMutex, INFINITE); + *CurrentPosition = Position; + *CurrentButtonState = LOBYTE(ButtonState); + ReleaseMutex(MouseMutex); +} + VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent) { -extern COORD DosNewPosition; -extern WORD DosButtonState; - - // FIXME: Sync our private data - MouseUpdatePosition(&MouseEvent->dwMousePosition); - MouseUpdateButtons(MouseEvent->dwButtonState); - - // HACK: Bypass PS/2 and instead, notify the MOUSE.COM driver directly - DosNewPosition = MouseEvent->dwMousePosition; - DosButtonState = LOWORD(MouseEvent->dwButtonState); - - // PS2QueuePush(PS2Port, Data); + COORD NewPosition = MouseEvent->dwMousePosition; + BOOLEAN DoubleWidth = FALSE, DoubleHeight = FALSE; + + if (!VgaGetDoubleVisionState(&DoubleWidth, &DoubleHeight)) + { + /* Text mode */ + NewPosition.X *= 8; + NewPosition.Y *= 8; + } + + /* Adjust for double vision */ + if (DoubleWidth) NewPosition.X /= 2; + if (DoubleHeight) NewPosition.Y /= 2; + + WaitForSingleObject(MouseMutex, INFINITE); + + /* Update the counters */ + HorzCounter += NewPosition.X - Position.X; + VertCounter += NewPosition.Y - Position.Y; + + /* Update the position */ + Position = NewPosition; + + /* Update the button state */ + ButtonState = MouseEvent->dwButtonState; + + if (MouseEvent->dwEventFlags & MOUSE_WHEELED) + { + ScrollCounter += (SHORT)HIWORD(MouseEvent->dwButtonState); + } + + EventsOccurred = TRUE; + ReleaseMutex(MouseMutex); } BOOLEAN MouseInit(BYTE PS2Connector) { - HWND hWnd; - HDC hDC; - - /* Get the console window */ - hWnd = GetConsoleWindow(); - if (hWnd == NULL) return FALSE; - - /* Get the console window's device context */ - hDC = GetWindowDC(hWnd); - if (hDC == NULL) return FALSE; - - /* Get the parameters */ - WidthMm = (ULONG)GetDeviceCaps(hDC, HORZSIZE); - HeightMm = (ULONG)GetDeviceCaps(hDC, VERTSIZE); - WidthPixels = (ULONG)GetDeviceCaps(hDC, HORZRES); - HeightPixels = (ULONG)GetDeviceCaps(hDC, VERTRES); - - /* Release the device context */ - ReleaseDC(hWnd, hDC); - /* Finish to plug the mouse to the specified PS/2 port */ PS2Port = PS2Connector; PS2SetDeviceCmdProc(PS2Port, NULL, MouseCommand); + MouseMutex = CreateMutex(NULL, FALSE, NULL); + if (MouseMutex == NULL) return FALSE; + + StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 10, MouseStreamingCallback); + MouseReset(); return TRUE; } 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] Fri Apr 17 00:20:39 2015 @@ -16,9 +16,7 @@ /* DEFINES ********************************************************************/ /* Mouse packet constants */ -#define MOUSE_MIN -256 #define MOUSE_MAX 255 -#define MOUSE_SIGN_BIT (1 << 8) /* Mouse packet flags */ #define MOUSE_LEFT_BUTTON (1 << 0) @@ -69,6 +67,7 @@ /* FUNCTIONS ******************************************************************/ VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent); +VOID MouseGetDataFast(PCOORD CurrentPosition, PBYTE CurrentButtonState); BOOLEAN MouseInit(BYTE PS2Connector); #endif // _MOUSE_H_ 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] Fri Apr 17 00:20:39 2015 @@ -16,10 +16,12 @@ #include "io.h" #include "pit.h" #include "pic.h" +#include "clock.h" /* PRIVATE VARIABLES **********************************************************/ static PIT_CHANNEL PitChannels[PIT_CHANNELS]; +static PHARDWARE_TIMER MasterClock; /* PRIVATE FUNCTIONS **********************************************************/ @@ -451,6 +453,17 @@ } } +static VOID FASTCALL PitClock(ULONGLONG Count) +{ + UCHAR i; + + for (i = 0; i < PIT_CHANNELS; i++) + { + // if (!PitChannels[i].Counting) continue; + PitDecrementCount(&PitChannels[i], Count); + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID PitSetOutFunction(BYTE Channel, LPVOID Param, PIT_OUT_FUNCTION OutFunction) @@ -478,38 +491,6 @@ return 0xFFFF; else return PitChannels[Channel].ReloadValue; -} - -DWORD PitGetResolution(VOID) -{ - UCHAR i; - DWORD MinReloadValue = 65536; - - for (i = 0; i < PIT_CHANNELS; i++) - { - DWORD ReloadValue = PitChannels[i].ReloadValue; - - /* 0 means 65536 */ - if (ReloadValue == 0) ReloadValue = 65536; - - if (ReloadValue < MinReloadValue) MinReloadValue = ReloadValue; - } - - /* Return the frequency resolution */ - return PIT_BASE_FREQUENCY / MinReloadValue; -} - -VOID PitClock(DWORD Count) -{ - UCHAR i; - - if (Count == 0) return; - - for (i = 0; i < PIT_CHANNELS; i++) - { - // if (!PitChannels[i].Counting) continue; - PitDecrementCount(&PitChannels[i], Count); - } } VOID PitInitialize(VOID) @@ -527,6 +508,11 @@ RegisterIoPort(PIT_DATA_PORT(0), PitReadPort, PitWritePort); RegisterIoPort(PIT_DATA_PORT(1), PitReadPort, PitWritePort); RegisterIoPort(PIT_DATA_PORT(2), PitReadPort, PitWritePort); + + /* Register the hardware timer */ + MasterClock = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, + 1000000000ULL / PIT_BASE_FREQUENCY, + PitClock); } /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -79,9 +79,6 @@ VOID PitSetGate(BYTE Channel, BOOLEAN State); WORD PitGetReloadValue(BYTE Channel); -DWORD PitGetResolution(VOID); -VOID PitClock(DWORD Count); - VOID PitInitialize(VOID); #endif // _PIT_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] Fri Apr 17 00:20:39 2015 @@ -15,6 +15,7 @@ #include "io.h" #include "ps2.h" #include "pic.h" +#include "clock.h" /* PRIVATE VARIABLES **********************************************************/ @@ -48,6 +49,8 @@ static BYTE StatusRegister = 0x00; // static BYTE InputBuffer = 0x00; // PS/2 Input Buffer static BYTE OutputBuffer = 0x00; // PS/2 Output Buffer + +static PHARDWARE_TIMER IrqTimer = NULL; /* PRIVATE FUNCTIONS **********************************************************/ @@ -262,7 +265,30 @@ } } -static BOOLEAN PS2PortQueueRead(BYTE PS2Port) +static VOID FASTCALL GeneratePS2Irq(ULONGLONG ElapsedTime) +{ + UNREFERENCED_PARAMETER(ElapsedTime); + + /* Generate an IRQ 1 if there is data ready in the output queue */ + if (PS2PortQueueRead(0)) + { + /* Generate an interrupt if interrupts for the first PS/2 port are enabled */ + if (ControllerConfig & 0x01) PicInterruptRequest(1); + return; + } + + /* Generate an IRQ 12 if there is data ready in the output queue */ + if (PS2PortQueueRead(1)) + { + /* Generate an interrupt if interrupts for the second PS/2 port are enabled */ + if (ControllerConfig & 0x02) PicInterruptRequest(12); + return; + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BOOLEAN PS2PortQueueRead(BYTE PS2Port) { BOOLEAN Result = TRUE; PPS2_PORT Port; @@ -316,8 +342,6 @@ return Result; } -/* PUBLIC FUNCTIONS ***********************************************************/ - VOID PS2SetDeviceCmdProc(BYTE PS2Port, LPVOID Param, PS2_DEVICE_CMDPROC DeviceCommand) { if (PS2Port >= PS2_PORTS) return; @@ -354,41 +378,12 @@ /* The queue is not empty anymore */ Port->QueueEmpty = FALSE; -/* - // Get the data - OutputBuffer = Port->Queue[Port->QueueStart]; - StatusRegister |= (1 << 0); // There is something to read - // FIXME: Sometimes StatusRegister |= (1 << 5); for the second PS/2 port - - if (PS2Port == 0) - PicInterruptRequest(1); - else if (PS2Port == 1) - PicInterruptRequest(12); -*/ + /* Schedule the IRQ */ + EnableHardwareTimer(IrqTimer); Done: ReleaseMutex(Port->QueueMutex); return Result; -} - -VOID GenerateIrq1(VOID) -{ - /* Generate an interrupt if interrupts for the first PS/2 port are enabled */ - if (ControllerConfig & 0x01) - { - /* Generate an IRQ 1 if there is data ready in the output queue */ - if (PS2PortQueueRead(0)) PicInterruptRequest(1); - } -} - -VOID GenerateIrq12(VOID) -{ - /* Generate an interrupt if interrupts for the second PS/2 port are enabled */ - if (ControllerConfig & 0x02) - { - /* Generate an IRQ 12 if there is data ready in the output queue */ - if (PS2PortQueueRead(1)) PicInterruptRequest(12); - } } BOOLEAN PS2Initialize(VOID) @@ -410,11 +405,15 @@ RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); + IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 20, GeneratePS2Irq); + return TRUE; } VOID PS2Cleanup(VOID) { + DestroyHardwareTimer(IrqTimer); + CloseHandle(Ports[1].QueueMutex); CloseHandle(Ports[0].QueueMutex); } 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] Fri Apr 17 00:20:39 2015 @@ -26,9 +26,7 @@ VOID PS2SetDeviceCmdProc(BYTE PS2Port, LPVOID Param, PS2_DEVICE_CMDPROC DeviceCommand); BOOLEAN PS2QueuePush(BYTE PS2Port, BYTE Data); - -VOID GenerateIrq1(VOID); -VOID GenerateIrq12(VOID); +BOOLEAN PS2PortQueueRead(BYTE PS2Port); BOOLEAN PS2Initialize(VOID); VOID PS2Cleanup(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -16,6 +16,7 @@ #include "memory.h" #include "io.h" +#include "clock.h" /* PRIVATE VARIABLES **********************************************************/ @@ -245,6 +246,9 @@ static BOOLEAN DoubleWidth = FALSE; static BOOLEAN DoubleHeight = FALSE; +static PHARDWARE_TIMER VSyncTimer; +static PHARDWARE_TIMER HSyncTimer; + /* * VGA Hardware */ @@ -1754,59 +1758,11 @@ } } -/* PUBLIC FUNCTIONS ***********************************************************/ - -COORD VgaGetDisplayResolution(VOID) -{ - COORD Resolution; - BYTE MaximumScanLine = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); - - /* The low 8 bits are in the display registers */ - Resolution.X = VgaCrtcRegisters[VGA_CRTC_END_HORZ_DISP_REG]; - Resolution.Y = VgaCrtcRegisters[VGA_CRTC_VERT_DISP_END_REG]; - - /* Set the top bits from the overflow register */ - if (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VDE8) - { - Resolution.Y |= 1 << 8; - } - if (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VDE9) - { - Resolution.Y |= 1 << 9; - } - - /* Increase the values by 1 */ - Resolution.X++; - Resolution.Y++; - - if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) - { - /* Multiply the horizontal resolution by the 9/8 dot mode */ - Resolution.X *= (VgaSeqRegisters[VGA_SEQ_CLOCK_REG] & VGA_SEQ_CLOCK_98DM) - ? 8 : 9; - - /* The horizontal resolution is halved in 8-bit mode */ - if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) Resolution.X /= 2; - } - - if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) - { - /* Halve the vertical resolution */ - Resolution.Y >>= 1; - } - else - { - /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ - Resolution.Y /= MaximumScanLine; - } - - /* Return the resolution */ - return Resolution; -} - -VOID VgaRefreshDisplay(VOID) +static VOID FASTCALL VgaVerticalRetrace(ULONGLONG ElapsedTime) { HANDLE ConsoleBufferHandle = NULL; + + UNREFERENCED_PARAMETER(ElapsedTime); /* Set the vertical retrace flag */ InVerticalRetrace = TRUE; @@ -1876,10 +1832,75 @@ NeedsUpdate = FALSE; } -VOID VgaHorizontalRetrace(VOID) -{ +static VOID FASTCALL VgaHorizontalRetrace(ULONGLONG ElapsedTime) +{ + UNREFERENCED_PARAMETER(ElapsedTime); + /* Set the flag */ InHorizontalRetrace = TRUE; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +COORD VgaGetDisplayResolution(VOID) +{ + COORD Resolution; + BYTE MaximumScanLine = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + + /* The low 8 bits are in the display registers */ + Resolution.X = VgaCrtcRegisters[VGA_CRTC_END_HORZ_DISP_REG]; + Resolution.Y = VgaCrtcRegisters[VGA_CRTC_VERT_DISP_END_REG]; + + /* Set the top bits from the overflow register */ + if (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VDE8) + { + Resolution.Y |= 1 << 8; + } + if (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VDE9) + { + Resolution.Y |= 1 << 9; + } + + /* Increase the values by 1 */ + Resolution.X++; + Resolution.Y++; + + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + /* Multiply the horizontal resolution by the 9/8 dot mode */ + Resolution.X *= (VgaSeqRegisters[VGA_SEQ_CLOCK_REG] & VGA_SEQ_CLOCK_98DM) + ? 8 : 9; + + /* The horizontal resolution is halved in 8-bit mode */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) Resolution.X /= 2; + } + + if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) + { + /* Halve the vertical resolution */ + Resolution.Y >>= 1; + } + else + { + /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ + Resolution.Y /= MaximumScanLine; + } + + /* Return the resolution */ + return Resolution; +} + +BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Vertical, PBOOLEAN Horizontal) +{ + if (GraphicsConsoleBuffer == NULL) return FALSE; + if (Vertical) *Vertical = DoubleWidth; + if (Horizontal) *Horizontal = DoubleHeight; + return TRUE; +} + +VOID VgaRefreshDisplay(VOID) +{ + VgaVerticalRetrace(0); } VOID NTAPI VgaReadMemory(ULONG Address, PVOID Buffer, ULONG Size) @@ -2106,12 +2127,18 @@ RegisterIoPort(0x3D8, VgaReadPort, VgaWritePort); // CGA_MODE_CTRL_REG RegisterIoPort(0x3D9, VgaReadPort, VgaWritePort); // CGA_PAL_CTRL_REG + HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 0, VgaHorizontalRetrace); + VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 16, VgaVerticalRetrace); + /* Return success */ return TRUE; } VOID VgaCleanup(VOID) { + DestroyHardwareTimer(VSyncTimer); + DestroyHardwareTimer(HSyncTimer); + if (ScreenMode == GRAPHICS_MODE) { /* Leave the current graphics mode */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] Fri Apr 17 00:20:39 2015 @@ -260,9 +260,9 @@ COORD VgaGetDisplayResolution(VOID); VOID VgaRefreshDisplay(VOID); -VOID VgaHorizontalRetrace(VOID); VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); VOID VgaClearMemory(VOID); +BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Vertical, PBOOLEAN Horizontal); BOOLEAN VgaInitialize(HANDLE TextHandle); VOID VgaCleanup(VOID);

9 years, 8 months

[hbelusca] 67218: [CONSRV]: Addendum to r63792: use a separate flag to filter the next-mouse-move event that MUST NOT appear before a button-up event (this appears to be somewhat VM-dependent). See...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Apr 17 00:01:37 2015 New Revision: 67218 URL: http://svn.reactos.org/svn/reactos?rev=67218&view=rev Log: [CONSRV]: Addendum to r63792: use a separate flag to filter the next-mouse-move event that MUST NOT appear before a button-up event (this appears to be somewhat VM-dependent). See code and CORE-8394 for more details. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h 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] Fri Apr 17 00:01:37 2015 @@ -1498,6 +1498,21 @@ BOOL Err = FALSE; PCONSRV_CONSOLE Console = GuiData->Console; + /* + * HACK FOR CORE-8394 (Part 2): + * + * Check whether we should ignore the next mouse move event. + * In either case we reset the HACK flag. + * + * See Part 1 of this hack below. + */ + if (GuiData->HackCORE8394IgnoreNextMove && msg == WM_MOUSEMOVE) + { + GuiData->HackCORE8394IgnoreNextMove = FALSE; + goto Quit; + } + GuiData->HackCORE8394IgnoreNextMove = FALSE; + // FIXME: It's here that we need to check whether we have focus or not // and whether we are or not in edit mode, in order to know if we need // to deal with the mouse. @@ -1784,8 +1799,17 @@ } /* - * HACK FOR CORE-8394: Ignore the next mouse move signal - * just after mouse down click actions. + * HACK FOR CORE-8394 (Part 1): + * + * It appears that depending on which VM ReactOS runs, the next mouse + * signal coming after a button-down action can be a mouse-move (e.g. + * on VBox, whereas on QEMU it is not the case). However it is NOT a + * rule, so that we cannot use the IgnoreNextMouseSignal flag to just + * "ignore" the next mouse event, thinking it would always be a mouse- + * move signal. + * + * To work around this problem (that should really be fixed in Win32k), + * we use a second flag to ignore this possible next mouse move signal. */ switch (msg) { @@ -1793,7 +1817,7 @@ case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: case WM_XBUTTONDOWN: - GuiData->IgnoreNextMouseSignal = TRUE; + GuiData->HackCORE8394IgnoreNextMove = TRUE; default: break; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h [iso-8859-1] Fri Apr 17 00:01:37 2015 @@ -65,7 +65,9 @@ /*** The following may be put per-screen-buffer !! ***/ HCURSOR hCursor; /* Handle to the mouse cursor */ INT MouseCursorRefCount; /* The reference counter associated with the mouse cursor. >= 0 and the cursor is shown; < 0 and the cursor is hidden. */ - BOOL IgnoreNextMouseSignal; /* Used in cases where we don't want to treat a mouse signal */ + BOOL IgnoreNextMouseSignal; /* Used when we need to not process a mouse signal */ + + BOOL HackCORE8394IgnoreNextMove; /* HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */ BOOL IsCloseButtonEnabled; /* TRUE if the Close button and the corresponding system menu item are enabled (default), FALSE otherwise */ UINT CmdIdLow ; /* Lowest menu id of the user-reserved menu id range */ 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] Fri Apr 17 00:01:37 2015 @@ -564,6 +564,8 @@ /* A priori don't ignore mouse signals */ GuiData->IgnoreNextMouseSignal = FALSE; + /* Initialize HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */ + GuiData->HackCORE8394IgnoreNextMove = FALSE; /* Close button and the corresponding system menu item are enabled by default */ GuiData->IsCloseButtonEnabled = TRUE;

9 years, 8 months

[hbelusca] 67217: [CONSRV]: GUI frontend: support the 3rd and 4th mouse button.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 16 23:08:19 2015 New Revision: 67217 URL: http://svn.reactos.org/svn/reactos?rev=67217&view=rev Log: [CONSRV]: GUI frontend: support the 3rd and 4th mouse button. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.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] Thu Apr 16 23:08:19 2015 @@ -1498,19 +1498,20 @@ BOOL Err = FALSE; PCONSRV_CONSOLE Console = GuiData->Console; - // FIXME: It's here that we need to check whether we has focus or not - // and whether we are in edit mode or not, to know if we need to deal - // with the mouse, or not. + // FIXME: It's here that we need to check whether we have focus or not + // and whether we are or not in edit mode, in order to know if we need + // to deal with the mouse. if (GuiData->IgnoreNextMouseSignal) { if (msg != WM_LBUTTONDOWN && msg != WM_MBUTTONDOWN && - msg != WM_RBUTTONDOWN) + msg != WM_RBUTTONDOWN && + msg != WM_XBUTTONDOWN) { /* * If this mouse signal is not a button-down action - * then it is the last signal being ignored. + * then this is the last one being ignored. */ GuiData->IgnoreNextMouseSignal = FALSE; } @@ -1672,6 +1673,26 @@ dwEventFlags = 0; break; + case WM_XBUTTONDOWN: + { + /* Get which X-button was pressed */ + WORD wButton = GET_XBUTTON_WPARAM(wParam); + + /* Check for X-button validity */ + if (wButton & ~(XBUTTON1 | XBUTTON2)) + { + DPRINT1("X-button 0x%04x invalid\n", wButton); + Err = TRUE; + break; + } + + SetCapture(GuiData->hWindow); + dwButtonState = (wButton == XBUTTON1 ? FROM_LEFT_3RD_BUTTON_PRESSED + : FROM_LEFT_4TH_BUTTON_PRESSED); + dwEventFlags = 0; + break; + } + case WM_LBUTTONUP: ReleaseCapture(); dwButtonState = 0; @@ -1690,6 +1711,24 @@ dwEventFlags = 0; break; + case WM_XBUTTONUP: + { + /* Get which X-button was released */ + WORD wButton = GET_XBUTTON_WPARAM(wParam); + + /* Check for X-button validity */ + if (wButton & ~(XBUTTON1 | XBUTTON2)) + { + DPRINT1("X-button 0x%04x invalid\n", wButton); + /* Ok, just release the button anyway... */ + } + + ReleaseCapture(); + dwButtonState = 0; + dwEventFlags = 0; + break; + } + case WM_LBUTTONDBLCLK: dwButtonState = FROM_LEFT_1ST_BUTTON_PRESSED; dwEventFlags = DOUBLE_CLICK; @@ -1704,6 +1743,25 @@ dwButtonState = RIGHTMOST_BUTTON_PRESSED; dwEventFlags = DOUBLE_CLICK; break; + + case WM_XBUTTONDBLCLK: + { + /* Get which X-button was double-clicked */ + WORD wButton = GET_XBUTTON_WPARAM(wParam); + + /* Check for X-button validity */ + if (wButton & ~(XBUTTON1 | XBUTTON2)) + { + DPRINT1("X-button 0x%04x invalid\n", wButton); + Err = TRUE; + break; + } + + dwButtonState = (wButton == XBUTTON1 ? FROM_LEFT_3RD_BUTTON_PRESSED + : FROM_LEFT_4TH_BUTTON_PRESSED); + dwEventFlags = DOUBLE_CLICK; + break; + } case WM_MOUSEMOVE: dwButtonState = 0; @@ -1734,6 +1792,7 @@ case WM_LBUTTONDOWN: case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: + case WM_XBUTTONDOWN: GuiData->IgnoreNextMouseSignal = TRUE; default: break; @@ -1747,6 +1806,10 @@ dwButtonState |= FROM_LEFT_2ND_BUTTON_PRESSED; if (wKeyState & MK_RBUTTON) dwButtonState |= RIGHTMOST_BUTTON_PRESSED; + if (wKeyState & MK_XBUTTON1) + dwButtonState |= FROM_LEFT_3RD_BUTTON_PRESSED; + if (wKeyState & MK_XBUTTON2) + dwButtonState |= FROM_LEFT_4TH_BUTTON_PRESSED; if (GetKeyState(VK_RMENU) & 0x8000) dwControlKeyState |= RIGHT_ALT_PRESSED; @@ -2263,12 +2326,15 @@ case WM_LBUTTONDOWN: case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: + case WM_XBUTTONDOWN: case WM_LBUTTONUP: case WM_MBUTTONUP: case WM_RBUTTONUP: + case WM_XBUTTONUP: case WM_LBUTTONDBLCLK: case WM_MBUTTONDBLCLK: case WM_RBUTTONDBLCLK: + case WM_XBUTTONDBLCLK: case WM_MOUSEMOVE: case WM_MOUSEWHEEL: case WM_MOUSEHWHEEL:

9 years, 8 months

[akhaldi] 67216: [RPCRT4_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 16 17:21:14 2015 New Revision: 67216 URL: http://svn.reactos.org/svn/reactos?rev=67216&view=rev Log: [RPCRT4_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/rpcrt4/cstub.c Modified: trunk/rostests/winetests/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/cstub.c?… ============================================================================== --- trunk/rostests/winetests/rpcrt4/cstub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/cstub.c [iso-8859-1] Thu Apr 16 17:21:14 2015 @@ -288,12 +288,6 @@ 0, 0}; - -static const PRPC_STUB_FUNCTION if3_table[] = -{ - if1_fn1_Stub -}; - static CInterfaceStubVtbl if3_stub_vtbl = { { @@ -337,15 +331,6 @@ 0, 0, 0}; - - -static const PRPC_STUB_FUNCTION if4_table[] = -{ - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, -}; static CInterfaceStubVtbl if4_stub_vtbl = {

9 years, 8 months

[akhaldi] 67215: [IEFRAME] Make ieframe translatable. Thanks to Jared Smudde, Radek Liska and all the other translators mentioned in CORE-9544

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 16 17:18:48 2015 New Revision: 67215 URL: http://svn.reactos.org/svn/reactos?rev=67215&view=rev Log: [IEFRAME] Make ieframe translatable. Thanks to Jared Smudde, Radek Liska and all the other translators mentioned in CORE-9544 Added: trunk/reactos/dll/win32/ieframe/lang/ trunk/reactos/dll/win32/ieframe/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/ieframe/lang/de-DE.rc (with props) trunk/reactos/dll/win32/ieframe/lang/en-US.rc (with props) trunk/reactos/dll/win32/ieframe/lang/es-ES.rc (with props) trunk/reactos/dll/win32/ieframe/lang/it-IT.rc (with props) trunk/reactos/dll/win32/ieframe/lang/ro-RO.rc (with props) Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Thu Apr 16 17:18:48 2015 @@ -21,84 +21,28 @@ #include "resource.h" -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -IDR_BROWSE_MAIN_MENU MENU -{ - POPUP "&File" - { - POPUP "&New" - { - MENUITEM "&Window", ID_BROWSE_NEW_WINDOW - } - MENUITEM "&Open...", ID_BROWSE_OPEN - MENUITEM "&Save", ID_BROWSE_SAVE - MENUITEM "Save &as...", ID_BROWSE_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Print &format...", ID_BROWSE_PRINT_FORMAT - MENUITEM "Pr&int...", ID_BROWSE_PRINT - MENUITEM "Print previe&w", ID_BROWSE_PRINT_PREVIEW - MENUITEM SEPARATOR - MENUITEM "&Properties", ID_BROWSE_PROPERTIES - MENUITEM "&Close", ID_BROWSE_QUIT - } - POPUP "&View" - { - POPUP "&Toolbars" - { - MENUITEM "&Standard bar", ID_BROWSE_BAR_STD - MENUITEM "&Address bar", ID_BROWSE_BAR_ADDR - } - } - POPUP "&Favorites" - { - MENUITEM "&Add to Favorites...", ID_BROWSE_ADDFAV - MENUITEM SEPARATOR - } - POPUP "&Help" - { - MENUITEM "&About Internet Explorer", ID_BROWSE_ABOUT - } -} +/* UTF-8 */ +#pragma code_page(65001) -STRINGTABLE -{ - IDS_TB_BACK "Back" - IDS_TB_FORWARD "Forward" - IDS_TB_STOP "Stop" - IDS_TB_REFRESH "Refresh" - IDS_TB_HOME "Home" - IDS_TB_PRINT "Print..." -} - -STRINGTABLE -{ - IDS_ADDRESS "Address" -} - -STRINGTABLE -{ - IDS_FINDINGRESOURCE "Searching for %s" - IDS_BEGINDOWNLOADDATA "Start downloading %s" - IDS_ENDDOWNLOADDATA "Downloading %s" - IDS_SENDINGREQUEST "Asking for %s" -} - - -IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 -STYLE DS_MODALFRAME | WS_CAPTION -CAPTION "Open URL" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Specify the URL you wish to open in Internet Explorer",-1, 35,5,160,25 - LTEXT "Open:", -1, 5, 32, 30, 15 -#ifdef __REACTOS__ - ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" #endif - EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 - DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 145, 50, 50, 14 -} +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Added: trunk/reactos/dll/win32/ieframe/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/ieframe/lang/cs-CZ.rc (added) +++ trunk/reactos/dll/win32/ieframe/lang/cs-CZ.rc [iso-8859-1] Thu Apr 16 17:18:48 2015 @@ -0,0 +1,83 @@ +/* FILE: dll/win32/ieframe/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2015-04-15 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Soubor" + { + POPUP "&NovÃ½" + { + MENUITEM "&Okno", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&OtevÅÃt...", ID_BROWSE_OPEN + MENUITEM "&UloÅ¾it", ID_BROWSE_SAVE + MENUITEM "UloÅ¾it j&ako...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&FormÃ¡t tisku...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Tisk...", ID_BROWSE_PRINT + MENUITEM "NÃ¡hle&d tisku", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Vlastnosti", ID_BROWSE_PROPERTIES + MENUITEM "&ZavÅÃt", ID_BROWSE_QUIT + } + POPUP "&Zobrazit" + { + POPUP "&Panely nÃ¡strojÅ¯" + { + MENUITEM "&StandardnÃ panel", ID_BROWSE_BAR_STD + MENUITEM "Panel &Adresa", ID_BROWSE_BAR_ADDR + } + } + POPUP "&OblÃbenÃ©" + { + MENUITEM "&PÅidat do OblÃbenÃ½ch...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&NÃ¡povÄda" + { + MENUITEM "&O programu Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "ZpÄt" + IDS_TB_FORWARD "VpÅed" + IDS_TB_STOP "Stop" + IDS_TB_REFRESH "Obnovit" + IDS_TB_HOME "DomÅ¯" + IDS_TB_PRINT "Tisk..." +} + +STRINGTABLE +{ + IDS_ADDRESS "Adresa" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "HledÃ¡nÃ %s" + IDS_BEGINDOWNLOADDATA "ZaÄÃ¡tek stahovÃ¡nÃ %s" + IDS_ENDDOWNLOADDATA "StahovÃ¡nÃ %s" + IDS_SENDINGREQUEST "PoÅ¾adavek na %s" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "OtevÅÃt URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Zvolte URL, kterou si pÅejete otevÅÃt v Internet Exploreru",-1, 35,5,160,25 + LTEXT "URL:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 145, 50, 50, 14 +} Propchange: trunk/reactos/dll/win32/ieframe/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ieframe/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/ieframe/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/ieframe/lang/de-DE.rc [iso-8859-1] Thu Apr 16 17:18:48 2015 @@ -0,0 +1,78 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Datei" + { + POPUP "&Neu" + { + MENUITEM "&Fenster", ID_BROWSE_NEW_WINDOW + } + MENUITEM "Ö&ffnen...", ID_BROWSE_OPEN + MENUITEM "Spe&ichern", ID_BROWSE_SAVE + MENUITEM "Speichern &unter...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Seite ein&richten...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Drucken...", ID_BROWSE_PRINT + MENUITEM "Druck&vorschau", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "Eigen&schaften", ID_BROWSE_PROPERTIES + MENUITEM "B&eenden", ID_BROWSE_QUIT + } + POPUP "&Ansicht" + { + POPUP "S&ymbolleisten" + { + MENUITEM "&Standardleiste", ID_BROWSE_BAR_STD + MENUITEM "&Adressleiste", ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favoriten" + { + MENUITEM "&Zu Favoriten hinzufügen...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Hilfe" + { + MENUITEM "&Über Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Zurück" + IDS_TB_FORWARD "Vorwärts" + IDS_TB_STOP "Stop" + IDS_TB_REFRESH "Aktualisieren" + IDS_TB_HOME "Startseite" + IDS_TB_PRINT "Drucken..." +} + +STRINGTABLE +{ + IDS_ADDRESS "Adresse" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "Suche nach %s" + IDS_BEGINDOWNLOADDATA "Beginne %s herunterzuladen" + IDS_ENDDOWNLOADDATA "Lade %s herunter" + IDS_SENDINGREQUEST "Frage %s an" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "URL öffnen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Geben Sie die URL an, die Sie im Internet Explorer öffnen möchten",-1, 35,5,160,25 + LTEXT "Öffnen:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 145, 50, 50, 14 +} Propchange: trunk/reactos/dll/win32/ieframe/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ieframe/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/ieframe/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/ieframe/lang/en-US.rc [iso-8859-1] Thu Apr 16 17:18:48 2015 @@ -0,0 +1,78 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&File" + { + POPUP "&New" + { + MENUITEM "&Window", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Open...", ID_BROWSE_OPEN + MENUITEM "&Save", ID_BROWSE_SAVE + MENUITEM "Save &as...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Print &Format...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Pr&int...", ID_BROWSE_PRINT + MENUITEM "Print Previe&w", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Properties", ID_BROWSE_PROPERTIES + MENUITEM "&Close", ID_BROWSE_QUIT + } + POPUP "&View" + { + POPUP "&Toolbars" + { + MENUITEM "&Standard bar", ID_BROWSE_BAR_STD + MENUITEM "&Address bar", ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favorites" + { + MENUITEM "&Add to Favorites...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Help" + { + MENUITEM "&About Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Back" + IDS_TB_FORWARD "Forward" + IDS_TB_STOP "Stop" + IDS_TB_REFRESH "Refresh" + IDS_TB_HOME "Home" + IDS_TB_PRINT "Print..." +} + +STRINGTABLE +{ + IDS_ADDRESS "Address" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "Searching for %s" + IDS_BEGINDOWNLOADDATA "Start downloading %s" + IDS_ENDDOWNLOADDATA "Downloading %s" + IDS_SENDINGREQUEST "Asking for %s" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Open URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Specify the URL you wish to open in Internet Explorer",-1, 35,5,160,25 + LTEXT "Open:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 145, 50, 50, 14 +} Propchange: trunk/reactos/dll/win32/ieframe/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ieframe/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/ieframe/lang/es-ES.rc (added) +++ trunk/reactos/dll/win32/ieframe/lang/es-ES.rc [iso-8859-1] Thu Apr 16 17:18:48 2015 @@ -0,0 +1,80 @@ +/* 2015-04-15: Translated to Spanish by Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Archivo" + { + POPUP "&Nueva" + { + MENUITEM "&Ventana", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Abrir...", ID_BROWSE_OPEN + MENUITEM "&Guardar", ID_BROWSE_SAVE + MENUITEM "Guardar &como...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Imprimir con &formato...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Imp&rimir...", ID_BROWSE_PRINT + MENUITEM "Imprimir &vista previa", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Propiedades", ID_BROWSE_PROPERTIES + MENUITEM "&Cerrar", ID_BROWSE_QUIT + } + POPUP "&Ver" + { + POPUP "&Barras" + { + MENUITEM "Barra de &navegaciÃ³n", ID_BROWSE_BAR_STD + MENUITEM "Barra de &direcciÃ³n", ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favoritos" + { + MENUITEM "&AÃ±adir a favoritos...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Ayuda" + { + MENUITEM "&Acerca de Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "AtrÃ¡s" + IDS_TB_FORWARD "Adelante" + IDS_TB_STOP "Detener" + IDS_TB_REFRESH "Recargar" + IDS_TB_HOME "Inicio" + IDS_TB_PRINT "Imprimir..." +} + +STRINGTABLE +{ + IDS_ADDRESS "DirecciÃ³n" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "Buscando %s" + IDS_BEGINDOWNLOADDATA "Comenzando la descarga de %s" + IDS_ENDDOWNLOADDATA "Descargando %s" + IDS_SENDINGREQUEST "Pidiendo %s" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Abrir URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "DirecciÃ³n URL a abrir en Internet Explorer",-1, 35,5,160,25 + LTEXT "Abrir:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "Aceptar", IDOK, 90, 50, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 145, 50, 50, 14 +} Propchange: trunk/reactos/dll/win32/ieframe/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ieframe/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/ieframe/lang/it-IT.rc (added) +++ trunk/reactos/dll/win32/ieframe/lang/it-IT.rc [iso-8859-1] Thu Apr 16 17:18:48 2015 @@ -0,0 +1,78 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&File" + { + POPUP "&Nuova" + { + MENUITEM "&Finestra", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Apri...", ID_BROWSE_OPEN + MENUITEM "&Salva", ID_BROWSE_SAVE + MENUITEM "Sal&va come...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Imposta pagina...", ID_BROWSE_PRINT_FORMAT + MENUITEM "S&tampa...", ID_BROWSE_PRINT + MENUITEM "A&nteprima di Stampa", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Propietà", ID_BROWSE_PROPERTIES + MENUITEM "&Chiudi", ID_BROWSE_QUIT + } + POPUP "&Visualizza" + { + POPUP "&Barre degli strumenti" + { + MENUITEM "&Pulsanti standard", ID_BROWSE_BAR_STD + MENUITEM "&Barra degli indirizzi", ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favoriti" + { + MENUITEM "&Aggiungi a Favoriti...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Help" + { + MENUITEM "&Informazioni su Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Indietro" + IDS_TB_FORWARD "Avanti" + IDS_TB_STOP "Interrompi" + IDS_TB_REFRESH "Aggiorna" + IDS_TB_HOME "Pagina iniziale" + IDS_TB_PRINT "Stampa..." +} + +STRINGTABLE +{ + IDS_ADDRESS "Indirizzo" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "Ricerca di %s" + IDS_BEGINDOWNLOADDATA "Inizio download %s" + IDS_ENDDOWNLOADDATA "Download %s completato" + IDS_SENDINGREQUEST "Richiesta di %s" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Apri Indirizzo" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Specificare l'indirizzo URL da aprire in Internet Explorer",-1, 35,5,160,25 + LTEXT "Apri:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "Apri", IDOK, 90, 50, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 145, 50, 50, 14 +} Propchange: trunk/reactos/dll/win32/ieframe/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ieframe/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/ieframe/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/ieframe/lang/ro-RO.rc [iso-8859-1] Thu Apr 16 17:18:48 2015 @@ -0,0 +1,78 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Dosar" + { + POPUP "&Nou" + { + MENUITEM "&FereastrÃ£", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Deschide...", ID_BROWSE_OPEN + MENUITEM "&SalveazÃ£", ID_BROWSE_SAVE + MENUITEM "SalveazÃ£ &ca...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Tipareate &formateazÃ£...", ID_BROWSE_PRINT_FORMAT + MENUITEM "TipÃ£&reste...", ID_BROWSE_PRINT + MENUITEM "Previzualizare tipÃ£ri&re", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&ProprietÃ£ti", ID_BROWSE_PROPERTIES + MENUITEM "&Inchide", ID_BROWSE_QUIT + } + POPUP "&View" + { + POPUP "&Toolbars" + { + MENUITEM "&Bara standard", ID_BROWSE_BAR_STD + MENUITEM "&Bara adresÃ£", ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favorites" + { + MENUITEM "&AdaugÃ£ la Favorite...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Ajutor" + { + MENUITEM "&Despre Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Inapoi" + IDS_TB_FORWARD "Inainte" + IDS_TB_STOP "Opreste" + IDS_TB_REFRESH "ImprospateazÃ£" + IDS_TB_HOME "AcasÃ£" + IDS_TB_PRINT "TipÃ£reste..." +} + +STRINGTABLE +{ + IDS_ADDRESS "AdresÃ£" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "CautÃ£ %s" + IDS_BEGINDOWNLOADDATA "Porneste descÃ£rcarea %s" + IDS_ENDDOWNLOADDATA "DescarcÃ£ %s" + IDS_SENDINGREQUEST "IntreabÃ£ de %s" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Deschide URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "SpecificÃ£ adresa URL pe care vrei s-o deschizi in Internet Explorer",-1, 35,5,160,25 + LTEXT "Deschide:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "Gata", IDOK, 90, 50, 50, 14 + PUSHBUTTON "RenuntÃ£", IDCANCEL, 145, 50, 50, 14 +} Propchange: trunk/reactos/dll/win32/ieframe/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 8 months

← Newer
1
...
24
25
26
27
28
29
30
...
49
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 April 2015