Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 67241: [IEFRAME] Add French translation
by pschweitzer＠svn.reactos.org 18 Apr '15

18 Apr '15

Author: pschweitzer Date: Sat Apr 18 09:50:23 2015 New Revision: 67241 URL: http://svn.reactos.org/svn/reactos?rev=67241&view=rev Log: [IEFRAME] Add French translation Added: trunk/reactos/dll/win32/ieframe/lang/fr-FR.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] Sat Apr 18 09:50:23 2015 @@ -37,6 +37,9 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif Added: trunk/reactos/dll/win32/ieframe/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/ieframe/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/ieframe/lang/fr-FR.rc [iso-8859-1] Sat Apr 18 09:50:23 2015 @@ -0,0 +1,78 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Fichier" + { + POPUP "&Nouveau" + { + MENUITEM "&FenÃªtre", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Ouvrir...", ID_BROWSE_OPEN + MENUITEM "&Enregistrer", ID_BROWSE_SAVE + MENUITEM "Enregistrer &sous...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Format d'impression...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Imprimer...", ID_BROWSE_PRINT + MENUITEM "&AperÃ§u de l'impression", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&PropriÃ©tÃ©s", ID_BROWSE_PROPERTIES + MENUITEM "Fe&rmer", ID_BROWSE_QUIT + } + POPUP "&Affichage" + { + POPUP "&Barres d'outils" + { + MENUITEM "Barre &standard", ID_BROWSE_BAR_STD + MENUITEM "Barre d'a&dresse", ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favoris" + { + MENUITEM "&Ajouter aux favoris...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "A&ide" + { + MENUITEM "Ã propos d'&Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "PrÃ©cÃ©dent" + IDS_TB_FORWARD "Suivant" + IDS_TB_STOP "ArrÃªter" + IDS_TB_REFRESH "RafraÃ®chir" + IDS_TB_HOME "Accueil" + IDS_TB_PRINT "Imprimer..." +} + +STRINGTABLE +{ + IDS_ADDRESS "Adresse" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "Recherche de %s" + IDS_BEGINDOWNLOADDATA "DÃ©marrage du tÃ©lÃ©chargement de %s" + IDS_ENDDOWNLOADDATA "TÃ©lÃ©chargement de %s" + IDS_SENDINGREQUEST "Envoie d'une demande pour %s" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Ouvrir une URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "SpÃ©cifiez l'URL que vous dÃ©sirez ouvrir dans Internet Explorer",-1, 35,5,160,25 + LTEXT "Ouvrir :", -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 "Annuler", IDCANCEL, 145, 50, 50, 14 +} Propchange: trunk/reactos/dll/win32/ieframe/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 67240: Fixing some incorrectly written Reactos/ReactOs -> ReactOS by Raked Liska CORE-9536 #comment Even less of these now.
by dreimer＠svn.reactos.org 18 Apr '15

18 Apr '15

Author: dreimer Date: Sat Apr 18 09:21:51 2015 New Revision: 67240 URL: http://svn.reactos.org/svn/reactos?rev=67240&view=rev Log: Fixing some incorrectly written Reactos/ReactOs -> ReactOS by Raked Liska CORE-9536 #comment Even less of these now. Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/bootsup.h trunk/reactos/dll/win32/iphlpapi/merge-notes.txt trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/include/reactos/subsys/win/winmsg.h trunk/reactos/media/inf/kscaptur.inf trunk/reactos/win32ss/user/user32/misc/exit.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -24,7 +24,7 @@ [Section.0410] Name = Driver AC97 per VirtualBox License = Sconosciuta -Descrizione = Estrarre nella cartella "ReactOS" e poi riavviare ReactOs due volte. +Descrizione = Estrarre nella cartella "ReactOS" e poi riavviare ReactOS due volte. [Section.0a] Name = Controlador AC'97 para VirtualBox Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -452,7 +452,7 @@ } NTSTATUS -CreateFreeLoaderIniForReactos( +CreateFreeLoaderIniForReactOS( PWCHAR IniPath, PWCHAR ArcPath) { @@ -2068,11 +2068,11 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\freeldr.ini"); - Status = CreateFreeLoaderIniForReactos(DstPath, + Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status); + DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); return Status; } @@ -2267,11 +2267,11 @@ wcscat(DstPath, L"\\freeldr.ini"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = CreateFreeLoaderIniForReactos(DstPath, + Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status); + DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); return Status; } @@ -2409,10 +2409,10 @@ wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); DPRINT("Create new 'freeldr.ini'\n"); - Status = CreateFreeLoaderIniForReactos(DstPath, DestinationArcPath->Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status); + Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); return Status; } Modified: trunk/reactos/base/setup/usetup/bootsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -32,7 +32,7 @@ PWCHAR ArcPath); NTSTATUS -CreateFreeLoaderIniForReactos( +CreateFreeLoaderIniForReactOS( PWCHAR IniPath, PWCHAR ArcPath); Modified: trunk/reactos/dll/win32/iphlpapi/merge-notes.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/merge-n… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/merge-notes.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/merge-notes.txt [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -8,7 +8,7 @@ GetNetworkParams -- -- Make workable interface for _res -- Wine based on real _res - -- Reactos based on my enumerator funcs + -- ReactOS based on my enumerator funcs -- Done -- Prints route info on windows ROUTE PRINT: Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -1722,11 +1722,11 @@ IN OUT LPWSTR *ServiceBinary) { LPWSTR Buffer; - WCHAR ReactosDir[MAX_PATH]; + WCHAR ReactOSDir[MAX_PATH]; DWORD RosDirLength, ServiceLength, Win32Length; - GetWindowsDirectoryW(ReactosDir, MAX_PATH); - RosDirLength = strlenW(ReactosDir); + GetWindowsDirectoryW(ReactOSDir, MAX_PATH); + RosDirLength = strlenW(ReactOSDir); ServiceLength = strlenW(*ServiceBinary); /* Check and fix two things: @@ -1737,7 +1737,7 @@ if (ServiceLength < RosDirLength) return; - if (!wcsnicmp(*ServiceBinary, ReactosDir, RosDirLength)) + if (!wcsnicmp(*ServiceBinary, ReactOSDir, RosDirLength)) { /* Yes, the first part is the C:\ReactOS\, just skip it */ MoveMemory(*ServiceBinary, *ServiceBinary + RosDirLength + 1, @@ -2212,7 +2212,7 @@ if (RequiredSize) *RequiredSize = size; goto cleanup; } - + if (DestinationInfFileNameSize != 0) { if (WideCharToMultiByte(CP_ACP, 0, DestinationInfFileNameW, -1, Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -93,7 +93,7 @@ ULONG Reserved; union { - USER_EXIT_REACTOS ExitReactosRequest; + USER_EXIT_REACTOS ExitReactOSRequest; USER_END_TASK EndTaskRequest; USER_LOGON LogonRequest; USER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest; Modified: trunk/reactos/media/inf/kscaptur.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/kscaptur.inf?rev… ============================================================================== --- trunk/reactos/media/inf/kscaptur.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/kscaptur.inf [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -55,7 +55,7 @@ system.ini,drivers,,"MSVideo.VfWWDM=vfwwdm.drv" [VfWWDM32.DelFile] -vfwwdm32.dll +vfwwdm32.dll [VfWWDM.Files] vfwwdm.drv Modified: trunk/reactos/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/exit.c @@ -98,7 +98,7 @@ MSG msg; USER_API_MESSAGE ApiMessage; - PUSER_EXIT_REACTOS ExitReactosRequest = &ApiMessage.Data.ExitReactosRequest; + PUSER_EXIT_REACTOS ExitReactOSRequest = &ApiMessage.Data.ExitReactOSRequest; /* * 1- FIXME: Call NtUserCallOneParam(uFlags, ONEPARAM_ROUTINE_PREPAREFORLOGOFF); @@ -110,24 +110,24 @@ * We can shutdown synchronously or asynchronously. */ - // ExitReactosRequest->LastError = ERROR_SUCCESS; - ExitReactosRequest->Flags = uFlags; + // ExitReactOSRequest->LastError = ERROR_SUCCESS; + ExitReactOSRequest->Flags = uFlags; CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpExitWindowsEx), - sizeof(*ExitReactosRequest)); + sizeof(*ExitReactOSRequest)); /* Set the last error accordingly */ if (NT_SUCCESS(ApiMessage.Status) || ApiMessage.Status == STATUS_CANT_WAIT) { - if (ExitReactosRequest->LastError != ERROR_SUCCESS) - UserSetLastError(ExitReactosRequest->LastError); + if (ExitReactOSRequest->LastError != ERROR_SUCCESS) + UserSetLastError(ExitReactOSRequest->LastError); } else { UserSetLastNTError(ApiMessage.Status); - ExitReactosRequest->Success = FALSE; + ExitReactOSRequest->Success = FALSE; } /* @@ -136,7 +136,7 @@ * return the real state of the operation now. */ if (NT_SUCCESS(ApiMessage.Status)) - return ExitReactosRequest->Success; + return ExitReactOSRequest->Success; /* * In case something failed: we have a non-success status and: Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Sat Apr 18 09:21:51 2015 @@ -629,7 +629,7 @@ } static NTSTATUS FASTCALL -UserExitReactos(PCSR_THREAD CsrThread, UINT Flags) +UserExitReactOS(PCSR_THREAD CsrThread, UINT Flags) { NTSTATUS Status; LUID CallerLuid; @@ -805,11 +805,11 @@ CSR_API(SrvExitWindowsEx) { NTSTATUS Status; - PUSER_EXIT_REACTOS ExitReactosRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest; - - Status = UserExitReactos(CsrGetClientThread(), ExitReactosRequest->Flags); - ExitReactosRequest->Success = NT_SUCCESS(Status); - ExitReactosRequest->LastError = GetLastError(); + PUSER_EXIT_REACTOS ExitReactOSRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactOSRequest; + + Status = UserExitReactOS(CsrGetClientThread(), ExitReactOSRequest->Flags); + ExitReactOSRequest->Success = NT_SUCCESS(Status); + ExitReactOSRequest->LastError = GetLastError(); return Status; }

1 0

[dreimer] 67239: Fixing some incorrectly written Reactos -> ReactOS CORE-7524 #comment Some less of these now.
by dreimer＠svn.reactos.org 18 Apr '15

18 Apr '15

Author: dreimer Date: Sat Apr 18 09:01:23 2015 New Revision: 67239 URL: http://svn.reactos.org/svn/reactos?rev=67239&view=rev Log: Fixing some incorrectly written Reactos -> ReactOS CORE-7524 #comment Some less of these now. Modified: trunk/reactos/base/applications/osk/main.c trunk/reactos/hal/halppc/generic/display.c trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/audio.inf trunk/reactos/media/inf/battery.inf trunk/reactos/media/inf/bda.inf trunk/reactos/media/inf/bth.inf trunk/reactos/media/inf/c_image.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/disk.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/flpydisk.inf trunk/reactos/media/inf/hal.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/kscaptur.inf trunk/reactos/win32ss/include/ntgdityp.h trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/base/applications/osk/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/main… ============================================================================== --- trunk/reactos/base/applications/osk/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/main.c [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -145,7 +145,7 @@ */ int OSK_DlgTimer(void) { - /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */ + /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */ HWND hWndActiveWindow; hWndActiveWindow = GetForegroundWindow(); @@ -177,7 +177,7 @@ BOOL bKeyUp; LONG WindowStyle; - /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */ + /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */ if (Globals.hActiveWnd) { MSG msg; Modified: trunk/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/display… ============================================================================== --- trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -82,7 +82,7 @@ * Last but not least, HalDisplayString is used a lot more in ReactOS, * e.g. to print debug messages when the /DEBUGPORT=SCREEN boot option * is present. - * 3 Components are involved in Reactos: HAL, BLUE.SYS and VIDEOPRT.SYS. + * 3 Components are involved in ReactOS: HAL, BLUE.SYS and VIDEOPRT.SYS. * As in NT, on boot HAL owns the display. When entering the text mode * command interpreter, BLUE.SYS kicks in. It will write directly to the * screen, more or less behind HALs back. Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -19,7 +19,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* Reactos modifications */ +/* ReactOS modifications */ #include <asm.inc> #define ALIGNARG(log2) log2 Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=672… ============================================================================== --- trunk/reactos/media/inf/acpi.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/acpi.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -54,7 +54,7 @@ *PNP0C08.DeviceDesc = "ACPI Hardware" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" GenericMfg = "(Dispositivos del sistema estÃ¡ndar)" *PNP0C08.DeviceDesc = "Hardware ACPI" Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=67… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -76,7 +76,7 @@ AUDIOClassName = "Audio-, Video- und Gamecontroller" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" AUDIOClassName = "Dispositivos de sonido, vÃdeo y juegos" [Strings.0415] Modified: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/battery.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/battery.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -80,7 +80,7 @@ ACPI\ACPI0003.DeviceDesc = "Netzteil" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" BatteryClassName = "BaterÃas" GenericMfg = "(BaterÃas genÃ©ricas)" Modified: trunk/reactos/media/inf/bda.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bda.inf?rev=6723… ============================================================================== --- trunk/reactos/media/inf/bda.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/bda.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -192,7 +192,7 @@ Pin.Name.NABTS="NABTS" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" [Strings.0415] ReactOS = "Ekipa ReactOS" Modified: trunk/reactos/media/inf/bth.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bth.inf?rev=6723… ============================================================================== --- trunk/reactos/media/inf/bth.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/bth.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -61,7 +61,7 @@ BluetoothClassName="Bluetooth vysÃlaÄe" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" BTUSB.DeviceDesc="Radio Bluetooth USB genÃ©rica" BluetoothClassName="Radios Bluetooth" Modified: trunk/reactos/media/inf/c_image.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/c_image.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/c_image.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/c_image.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -28,7 +28,7 @@ ImageClassName = "Image" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" ImageClassName = "Imagen" [Strings.0415] Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=67… ============================================================================== --- trunk/reactos/media/inf/cdrom.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/cdrom.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -69,7 +69,7 @@ CDROMClassName = "ÎÎ´Î·Î³Î¿Î¯ DVD/CD-ROM" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" CDROMClassName = "Unidades de DVD/CD-ROM" GenCdRom.DeviceDesc = "Unidad CD-ROM" GenericMfg = "(Unidades de DVD/CD-ROM genÃ©ricas)" Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=6723… ============================================================================== --- trunk/reactos/media/inf/cpu.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/cpu.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -202,7 +202,7 @@ Standard = "Î ÏÏÏÏÏÎ¿Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" Processor.DeviceDesc = "Procesador" IntelProcessor.DeviceDesc = "Procesador Intel" AMDProcessor.DeviceDesc = "Procesador AMD" Modified: trunk/reactos/media/inf/disk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/disk.inf?rev=672… ============================================================================== --- trunk/reactos/media/inf/disk.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/disk.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -67,7 +67,7 @@ Disk.ServiceDesc = "OvladaÄ disku" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" GenericMfg = "(Unidades de disco genÃ©ricas)" DiskClassName = "Unidades de disco" Disk.DeviceDesc = "Unidad de disco" Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/display.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/display.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -92,7 +92,7 @@ VGA.DeviceDesc = "VGA-ÏÏÎ¼Î²Î±ÏÎ® ÎºÎ¬ÏÏÎ± Î³ÏÎ±ÏÎ¹ÎºÏÎ½" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" DisplayClassName = "Adaptadores de pantalla" StdMfg = "(Adaptador de pantalla estÃ¡ndar)" Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=6723… ============================================================================== --- trunk/reactos/media/inf/fdc.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/fdc.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -83,7 +83,7 @@ *PNP0700.DeviceDesc = "ÎÎµÎ½Î¹ÎºÏÏ ÎµÎ»ÎµÎ³ÎºÏÎ®Ï Î´Î¹ÏÎºÎÏÎ±Ï" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" FDCClassName = "Controladores de disquete" GenericMfg = "(Controlador estÃ¡ndar de disquetes)" Modified: trunk/reactos/media/inf/flpydisk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/flpydisk.inf?rev… ============================================================================== --- trunk/reactos/media/inf/flpydisk.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/flpydisk.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -72,7 +72,7 @@ Floppy.DeviceDesc = "ObecnÃ¡ disketovÃ¡ jednotka" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" FloppyClassName = "Disqueteras" GenericMfg = "(Disqueteras genÃ©ricas)" Modified: trunk/reactos/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hal.inf?rev=6723… ============================================================================== --- trunk/reactos/media/inf/hal.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/hal.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -53,7 +53,7 @@ e_isa_up.DeviceDesc = "StandardnÃ jednoprocesorovÃ© PC" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" ComputerClassName = "Equipo" GenericMfg = "(Equipos genÃ©ricos)" Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=6723… ============================================================================== --- trunk/reactos/media/inf/hdc.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/hdc.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -1023,7 +1023,7 @@ PCI\CC_0106.DeviceDesc = "Generischer Serial ATA Controller" [Strings.0a] -ReactOS = "Equipo de Reactos" +ReactOS = "Equipo de ReactOS" HDCClassName = "Controladores IDE ATA/ATAPI genÃ©ricos" GenericMfg = "(Controladores de disco duro genÃ©ricos)" Modified: trunk/reactos/media/inf/kscaptur.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/kscaptur.inf?rev… ============================================================================== --- trunk/reactos/media/inf/kscaptur.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/kscaptur.inf [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -38,13 +38,13 @@ tsbyuv.dll [VfWWDM] -HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Description",,"Reactos WDM Image Capture" -HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"FriendlyName",,"Reactos WDM Image Capture" +HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Description",,"ReactOS WDM Image Capture" +HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"FriendlyName",,"ReactOS WDM Image Capture" HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Driver",,"vfwwdm.drv" [VfWWDM.NT] -HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Description",,"Reactos WDM Image Capture (Win32)" -HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"FriendlyName",,"Reactos WDM Image Capture (Win32)" +HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Description",,"ReactOS WDM Image Capture (Win32)" +HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"FriendlyName",,"ReactOS WDM Image Capture (Win32)" HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Driver",,"vfwwdm32.dll" [VfWWDM.AddReg.NT] Modified: trunk/reactos/win32ss/include/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdityp.h… ============================================================================== --- trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -110,7 +110,7 @@ XFORM_FORMAT_LTOL = 0x20, XFORM_NO_TRANSLATION = 0x40, - /* Reactos specific */ + /* ReactOS specific */ XFORM_INTEGER = 0x1000, }; Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Apr 18 09:01:23 2015 @@ -109,7 +109,7 @@ RETURN(0); } - /* this is a Reactos only case and is needed for gui-on-demand */ + /* this is a ReactOS only case and is needed for gui-on-demand */ case NOPARAM_ROUTINE_ISCONSOLEMODE: RETURN( ScreenDeviceContext == NULL );

1 0

[aandrejevic] 67238: [NTVDM] Fix the range check in VgaReadMemory and VgaWriteMemory.
by aandrejevic＠svn.reactos.org 18 Apr '15

18 Apr '15

Author: aandrejevic Date: Sat Apr 18 04:21:28 2015 New Revision: 67238 URL: http://svn.reactos.org/svn/reactos?rev=67238&view=rev Log: [NTVDM] Fix the range check in VgaReadMemory and VgaWriteMemory. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c 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] Sat Apr 18 04:21:28 2015 @@ -1910,7 +1910,7 @@ PUCHAR BufPtr = (PUCHAR)Buffer; DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", Address, Size); - Address = max(min(Address, VgaGetVideoLimitAddress() - 1), VgaGetVideoBaseAddress()); + Address = min(max(Address, VgaGetVideoLimitAddress() - 1), VgaGetVideoBaseAddress()); Size = min(Size, VgaGetVideoLimitAddress() - Address + 1); /* Ignore if video RAM access is disabled */ @@ -1939,7 +1939,7 @@ PUCHAR BufPtr = (PUCHAR)Buffer; DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", Address, Size); - Address = max(min(Address, VgaGetVideoLimitAddress() - 1), VgaGetVideoBaseAddress()); + Address = min(max(Address, VgaGetVideoLimitAddress() - 1), VgaGetVideoBaseAddress()); Size = min(Size, VgaGetVideoLimitAddress() - Address + 1); /* Ignore if video RAM access is disabled */

1 0

[hbelusca] 67237: [NTVDM]: Minor code reorganization. StartTickCount is commented out because it's unused at the moment, but it can be useful later on...
by hbelusca＠svn.reactos.org 18 Apr '15

18 Apr '15

Author: hbelusca Date: Sat Apr 18 01:39:29 2015 New Revision: 67237 URL: http://svn.reactos.org/svn/reactos?rev=67237&view=rev Log: [NTVDM]: Minor code reorganization. StartTickCount is commented out because it's unused at the moment, but it can be useful later on... Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c 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] Sat Apr 18 01:39:29 2015 @@ -40,9 +40,12 @@ static LIST_ENTRY Timers; static LARGE_INTEGER StartPerfCount, Frequency; -static DWORD StartTickCount; - -#ifdef IPS_DISPLAY +// static ULONG StartTickCount; +static LARGE_INTEGER Counter; +static ULONG CurrentTickCount; + +#ifdef IPS_DISPLAY +static PHARDWARE_TIMER IpsTimer; static ULONGLONG Cycles = 0ULL; #endif @@ -63,15 +66,12 @@ extern BOOLEAN CpuRunning; UINT i; PLIST_ENTRY Entry; - LARGE_INTEGER Counter; while (VdmRunning && CpuRunning) { - /* Get the current number of ticks */ - DWORD CurrentTickCount = GetTickCount(); - - /* Get the current performance counter value */ + /* Get the current counters */ /// DWORD_PTR oldmask = SetThreadAffinityMask(GetCurrentThread(), 0); + CurrentTickCount = GetTickCount(); NtQueryPerformanceCounter(&Counter, NULL); /// SetThreadAffinityMask(GetCurrentThread(), oldmask); @@ -197,10 +197,6 @@ BOOLEAN ClockInitialize(VOID) { -#ifdef IPS_DISPLAY - PHARDWARE_TIMER IpsTimer; -#endif - InitializeListHead(&Timers); /* Initialize the performance counter (needed for hardware timers) */ @@ -213,7 +209,7 @@ } /* Find the starting tick count */ - StartTickCount = GetTickCount(); + // StartTickCount = GetTickCount(); #ifdef IPS_DISPLAY

1 0

[aandrejevic] 67236: [NTVDM] The "WORKING_TIMER" disabled code is so obsolete that it doesn't even compile anymore.
by aandrejevic＠svn.reactos.org 18 Apr '15

18 Apr '15

Author: aandrejevic Date: Sat Apr 18 00:57:50 2015 New Revision: 67236 URL: http://svn.reactos.org/svn/reactos?rev=67236&view=rev Log: [NTVDM] The "WORKING_TIMER" disabled code is so obsolete that it doesn't even compile anymore. Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c 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] Sat Apr 18 00:57:50 2015 @@ -33,11 +33,6 @@ */ // #define IPS_DISPLAY -/* - * Activate WORKING_TIMER when the PIT timing problem is fixed. - */ -// #define WORKING_TIMER - /* Processor speed */ #define STEPS_PER_CYCLE 1024 @@ -75,22 +70,10 @@ /* Get the current number of ticks */ DWORD 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; - } - else -#endif - { - /* Get the current performance counter value */ - /// DWORD_PTR oldmask = SetThreadAffinityMask(GetCurrentThread(), 0); - NtQueryPerformanceCounter(&Counter, NULL); - /// SetThreadAffinityMask(GetCurrentThread(), oldmask); - } + /* 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++)

1 0

[hbelusca] 67235: [NTVDM]: Partial revert to r67234: delays were in fact better than frequencies, in case one would like to define sub-frequency timers. Instead, always specify delays in nanosecond...
by hbelusca＠svn.reactos.org 18 Apr '15

18 Apr '15

Author: hbelusca Date: Sat Apr 18 00:29:14 2015 New Revision: 67235 URL: http://svn.reactos.org/svn/reactos?rev=67235&view=rev Log: [NTVDM]: Partial revert to r67234: delays were in fact better than frequencies, in case one would like to define sub-frequency timers. Instead, always specify delays in nanoseconds, and add a macro to convert from frequency in hertz to duration in nanoseconds. Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/clock.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c 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] Sat Apr 18 00:29:14 2015 @@ -141,7 +141,7 @@ } } -PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONG Frequency, PHARDWARE_TIMER_PROC Callback) +PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONGLONG Delay, PHARDWARE_TIMER_PROC Callback) { PHARDWARE_TIMER Timer; @@ -151,7 +151,7 @@ Timer->Flags = Flags & ~HARDWARE_TIMER_ENABLED; Timer->EnableCount = 0; Timer->Callback = Callback; - SetHardwareTimerDelay(Timer, 1000000000ULL / (ULONGLONG)Frequency); + SetHardwareTimerDelay(Timer, Delay); if (Flags & HARDWARE_TIMER_ENABLED) EnableHardwareTimer(Timer); return Timer; @@ -234,7 +234,7 @@ #ifdef IPS_DISPLAY - IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1, IpsDisplayCallback); + IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(1), IpsDisplayCallback); if (IpsTimer == NULL) { wprintf(L"FATAL: Cannot create IPS display timer.\n"); 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] Sat Apr 18 00:29:14 2015 @@ -18,6 +18,9 @@ #define HARDWARE_TIMER_ONESHOT (1 << 1) #define HARDWARE_TIMER_PRECISE (1 << 2) +/* Converts a frequency in Hertz into a duration in nanoseconds */ +#define HZ_TO_NS(Freq) (ULONGLONG)(1000000000ULL / (ULONGLONG)(Freq)) + typedef VOID (FASTCALL *PHARDWARE_TIMER_PROC)(ULONGLONG ElapsedTime); typedef struct _HARDWARE_TIMER @@ -35,7 +38,7 @@ PHARDWARE_TIMER CreateHardwareTimer ( ULONG Flags, - ULONG Frequency, // in Hz + ULONGLONG Delay, /* nanoseconds */ PHARDWARE_TIMER_PROC Callback ); VOID EnableHardwareTimer(PHARDWARE_TIMER Timer); 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] Sat Apr 18 00:29:14 2015 @@ -44,7 +44,7 @@ /* 1 and 2 act like 8 and 9 */ if (RateSelect <= 2) RateSelect += 7; - SetHardwareTimerDelay(PeriodicTimer, 1000000000ULL / (ULONGLONG)(1 << (16 - RateSelect))); + SetHardwareTimerDelay(PeriodicTimer, HZ_TO_NS(1 << (16 - RateSelect))); EnableHardwareTimer(PeriodicTimer); } @@ -501,9 +501,11 @@ RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort); RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort); - ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1, RtcTimeUpdate); + ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, + HZ_TO_NS(1), + RtcTimeUpdate); PeriodicTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, - 1000, + HZ_TO_NS(1000), RtcPeriodicTick); } 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] Sat Apr 18 00:29:14 2015 @@ -454,7 +454,9 @@ MouseMutex = CreateMutex(NULL, FALSE, NULL); if (MouseMutex == NULL) return FALSE; - StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 100, MouseStreamingCallback); + StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, + HZ_TO_NS(100), + MouseStreamingCallback); MouseReset(); return TRUE; 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] Sat Apr 18 00:29:14 2015 @@ -511,7 +511,7 @@ /* Register the hardware timer */ MasterClock = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, - PIT_BASE_FREQUENCY, + HZ_TO_NS(PIT_BASE_FREQUENCY), PitClock); } 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] Sat Apr 18 00:29:14 2015 @@ -405,7 +405,9 @@ RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); - IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 100, GeneratePS2Irq); + IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, + HZ_TO_NS(100), + GeneratePS2Irq); return TRUE; } 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] Sat Apr 18 00:29:14 2015 @@ -2127,8 +2127,8 @@ RegisterIoPort(0x3D8, VgaReadPort, VgaWritePort); // CGA_MODE_CTRL_REG RegisterIoPort(0x3D9, VgaReadPort, VgaWritePort); // CGA_PAL_CTRL_REG - HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 31469, VgaHorizontalRetrace); - VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 60, VgaVerticalRetrace); + HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(31469), VgaHorizontalRetrace); + VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(60), VgaVerticalRetrace); /* Return success */ return TRUE;

1 0

[hbelusca] 67234: [NTVDM]: For CreateHardwareTimer, use frequencies (in hertz) instead of using milliseconds or nanoseconds (depending on some additional flag to be specified). It's therefore easie...
by hbelusca＠svn.reactos.org 17 Apr '15

17 Apr '15

Author: hbelusca Date: Fri Apr 17 23:58:01 2015 New Revision: 67234 URL: http://svn.reactos.org/svn/reactos?rev=67234&view=rev Log: [NTVDM]: For CreateHardwareTimer, use frequencies (in hertz) instead of using milliseconds or nanoseconds (depending on some additional flag to be specified). It's therefore easier to specify what you want. Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/clock.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c 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 23:58:01 2015 @@ -141,7 +141,7 @@ } } -PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONG Delay, PHARDWARE_TIMER_PROC Callback) +PHARDWARE_TIMER CreateHardwareTimer(ULONG Flags, ULONG Frequency, PHARDWARE_TIMER_PROC Callback) { PHARDWARE_TIMER Timer; @@ -151,7 +151,7 @@ Timer->Flags = Flags & ~HARDWARE_TIMER_ENABLED; Timer->EnableCount = 0; Timer->Callback = Callback; - SetHardwareTimerDelay(Timer, (ULONGLONG)Delay); + SetHardwareTimerDelay(Timer, 1000000000ULL / (ULONGLONG)Frequency); if (Flags & HARDWARE_TIMER_ENABLED) EnableHardwareTimer(Timer); return Timer; @@ -202,7 +202,7 @@ } else { - Timer->Delay = NewDelay; + Timer->Delay = NewDelay / 1000000ULL; } } @@ -234,7 +234,7 @@ #ifdef IPS_DISPLAY - IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1000, IpsDisplayCallback); + IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1, IpsDisplayCallback); if (IpsTimer == NULL) { wprintf(L"FATAL: Cannot create IPS display timer.\n"); 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 23:58:01 2015 @@ -35,7 +35,7 @@ PHARDWARE_TIMER CreateHardwareTimer ( ULONG Flags, - ULONG Delay, /* milliseconds for normal timers, nanoseconds for precise timers */ + ULONG Frequency, // in Hz PHARDWARE_TIMER_PROC Callback ); VOID EnableHardwareTimer(PHARDWARE_TIMER Timer); 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 23:58:01 2015 @@ -501,9 +501,9 @@ RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort); RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort); - ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1000, RtcTimeUpdate); + ClockTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 1, RtcTimeUpdate); PeriodicTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, - 1000000, /* 1,000,000 ns = 1 ms */ + 1000, RtcPeriodicTick); } 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 23:58:01 2015 @@ -454,7 +454,7 @@ MouseMutex = CreateMutex(NULL, FALSE, NULL); if (MouseMutex == NULL) return FALSE; - StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 10, MouseStreamingCallback); + StreamTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 100, MouseStreamingCallback); MouseReset(); return TRUE; 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 23:58:01 2015 @@ -511,7 +511,7 @@ /* Register the hardware timer */ MasterClock = CreateHardwareTimer(HARDWARE_TIMER_ENABLED | HARDWARE_TIMER_PRECISE, - 1000000000ULL / PIT_BASE_FREQUENCY, + PIT_BASE_FREQUENCY, PitClock); } 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 23:58:01 2015 @@ -405,7 +405,7 @@ RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); - IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 10, GeneratePS2Irq); + IrqTimer = CreateHardwareTimer(HARDWARE_TIMER_ONESHOT, 100, GeneratePS2Irq); return TRUE; } 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 23:58:01 2015 @@ -2127,8 +2127,8 @@ 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); + HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 31469, VgaHorizontalRetrace); + VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, 60, VgaVerticalRetrace); /* Return success */ return TRUE;

1 0

[aandrejevic] 67233: [NTVDM] The DOS_MCB structure needs to be byte-aligned.
by aandrejevic＠svn.reactos.org 17 Apr '15

17 Apr '15

Author: aandrejevic Date: Fri Apr 17 21:59:41 2015 New Revision: 67233 URL: http://svn.reactos.org/svn/reactos?rev=67233&view=rev Log: [NTVDM] The DOS_MCB structure needs to be byte-aligned. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Fri Apr 17 21:59:41 2015 @@ -18,6 +18,7 @@ DOS_ALLOC_LAST_FIT }; +#pragma pack(push, 1) typedef struct _DOS_MCB { CHAR BlockType; @@ -26,6 +27,7 @@ BYTE Unused[3]; CHAR Name[8]; } DOS_MCB, *PDOS_MCB; +#pragma pack(pop) /* VARIABLES ******************************************************************/

1 0

[tfaber] 67232: [WINMM] - Sync MCI_SysInfo with Wine. CORE-8528 #resolve
by tfaber＠svn.reactos.org 17 Apr '15

17 Apr '15

Author: tfaber Date: Fri Apr 17 19:20:32 2015 New Revision: 67232 URL: http://svn.reactos.org/svn/reactos?rev=67232&view=rev Log: [WINMM] - Sync MCI_SysInfo with Wine. CORE-8528 #resolve Modified: trunk/reactos/dll/win32/winmm/mci.c Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Fri Apr 17 19:20:32 2015 @@ -35,11 +35,6 @@ * + only works on string interface, on regular devices (don't work on all * nor custom devices) * - command table handling isn't thread safe - */ - -/* to be cross checked: - * - heapalloc for *sizeof(WCHAR) when needed - * - size of string in WCHAR or bytes? (#chars for MCI_INFO, #bytes for MCI_SYSINFO) */ #include "winemm.h" @@ -1726,19 +1721,25 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParms) { DWORD ret = MCIERR_INVALID_DEVICE_ID, cnt = 0; - WCHAR buf[2048], *s = buf, *p; + WCHAR buf[2048], *s, *p; LPWINE_MCIDRIVER wmd; HKEY hKey; - if (lpParms == NULL || lpParms->lpstrReturn == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms->lpstrReturn == NULL) return MCIERR_PARAM_OVERFLOW; TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); - - switch (dwFlags & ~MCI_SYSINFO_OPEN) { + if ((WORD)MCI_ALL_DEVICE_ID == LOWORD(uDevID)) + uDevID = MCI_ALL_DEVICE_ID; /* Be compatible with Win9x */ + + switch (dwFlags & ~(MCI_SYSINFO_OPEN|MCI_NOTIFY|MCI_WAIT)) { case MCI_SYSINFO_QUANTITY: - if (lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) { + if (lpParms->dwRetSize < sizeof(DWORD)) + return MCIERR_PARAM_OVERFLOW; + /* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */ + if (uDevID == MCI_ALL_DEVICE_ID) { + /* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */ if (dwFlags & MCI_SYSINFO_OPEN) { TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers\n"); EnterCriticalSection(&WINMM_cs); @@ -1758,21 +1759,32 @@ } } else { if (dwFlags & MCI_SYSINFO_OPEN) { - TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %u\n", lpParms->wDeviceType); + TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %d\n", lpParms->wDeviceType); EnterCriticalSection(&WINMM_cs); for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { if (wmd->wType == lpParms->wDeviceType) cnt++; } LeaveCriticalSection(&WINMM_cs); } else { - TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %u\n", lpParms->wDeviceType); + TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %d\n", lpParms->wDeviceType); FIXME("Don't know how to get # of MCI devices of a given type\n"); - cnt = 1; + /* name = LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType)) + * then lookup registry and/or system.ini for name, ignoring digits suffix */ + switch (LOWORD(lpParms->wDeviceType)) { + case MCI_DEVTYPE_CD_AUDIO: + case MCI_DEVTYPE_WAVEFORM_AUDIO: + case MCI_DEVTYPE_SEQUENCER: + cnt = 1; + break; + default: /* "digitalvideo" gets 0 because it's not in the registry */ + cnt = 0; + } } } *(DWORD*)lpParms->lpstrReturn = cnt; TRACE("(%d) => '%d'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn); ret = MCI_INTEGER_RETURNED; + /* return ret; Only Win9x sends a notification in this case. */ break; case MCI_SYSINFO_INSTALLNAME: TRACE("MCI_SYSINFO_INSTALLNAME\n"); @@ -1780,18 +1792,33 @@ ret = MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, wmd->lpstrDeviceType); } else { - *lpParms->lpstrReturn = 0; - ret = MCIERR_INVALID_DEVICE_ID; + ret = (uDevID == MCI_ALL_DEVICE_ID) + ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; case MCI_SYSINFO_NAME: - TRACE("MCI_SYSINFO_NAME\n"); + s = NULL; if (dwFlags & MCI_SYSINFO_OPEN) { - FIXME("Don't handle MCI_SYSINFO_NAME|MCI_SYSINFO_OPEN (yet)\n"); - ret = MCIERR_UNRECOGNIZED_COMMAND; - } else { - s = NULL; + /* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */ + TRACE("MCI_SYSINFO_NAME: nth alias of type %d\n", + uDevID == MCI_ALL_DEVICE_ID ? MCI_ALL_DEVICE_ID : lpParms->wDeviceType); + EnterCriticalSection(&WINMM_cs); + for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { + /* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */ + if (uDevID == MCI_ALL_DEVICE_ID || + lpParms->wDeviceType == wmd->wType) { + cnt++; + if (cnt == lpParms->dwNumber) { + s = wmd->lpstrAlias; + break; + } + } + } + LeaveCriticalSection(&WINMM_cs); + ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE; + } else if (MCI_ALL_DEVICE_ID == uDevID) { + TRACE("MCI_SYSINFO_NAME: device #%d\n", lpParms->dwNumber); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0, KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) { if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, @@ -1815,14 +1842,27 @@ } } } - ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE; + ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE; + } else { + FIXME("MCI_SYSINFO_NAME: nth device of type %d\n", lpParms->wDeviceType); + /* Cheating: what is asked for is the nth device from the registry. */ + if (1 != lpParms->dwNumber || /* Handle only one of each kind. */ + lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) + ret = MCIERR_OUTOFRANGE; + else { + LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType), + lpParms->lpstrReturn, lpParms->dwRetSize); + ret = 0; + } } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; default: TRACE("Unsupported flag value=%08x\n", dwFlags); - ret = MCIERR_UNRECOGNIZED_COMMAND; - } + ret = MCIERR_UNRECOGNIZED_KEYWORD; + } + if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) + mciDriverNotify((HWND)lpParms->dwCallback, uDevID, MCI_NOTIFY_SUCCESSFUL); return ret; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs