Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[pschweitzer] 67244: [NTOBJSHEX] Add French translation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 18 10:02:19 2015 New Revision: 67244 URL: http://svn.reactos.org/svn/reactos?rev=67244&view=rev Log: [NTOBJSHEX] Add French translation Added: trunk/reactos/dll/shellext/ntobjshex/lang/fr-FR.rc (with props) Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc Added: trunk/reactos/dll/shellext/ntobjshex/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/lang/fr-FR.rc (added) +++ trunk/reactos/dll/shellext/ntobjshex/lang/fr-FR.rc [iso-8859-1] Sat Apr 18 10:02:19 2015 @@ -0,0 +1,7 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_NTOBJFLD_NAME "Espace de noms des objets NT" + IDS_REGISTRY_NAME "Registre systÃ¨me" +END Propchange: trunk/reactos/dll/shellext/ntobjshex/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] Sat Apr 18 10:02:19 2015 @@ -31,6 +31,10 @@ #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_EN_US + #include "lang/fr-FR.rc" +#endif + #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

9 years, 5 months

[dreimer] 67243: [CPL] Add manifest to telephon.cpl. [SHELLEXT] Add manifest to netshell, stobject and ntobjshex. Translate ntobjshex to German.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Apr 18 09:57:21 2015 New Revision: 67243 URL: http://svn.reactos.org/svn/reactos?rev=67243&view=rev Log: [CPL] Add manifest to telephon.cpl. [SHELLEXT] Add manifest to netshell, stobject and ntobjshex. Translate ntobjshex to German. Added: trunk/reactos/dll/shellext/ntobjshex/lang/de-DE.rc (with props) Modified: trunk/reactos/dll/cpl/telephon/telephon.rc trunk/reactos/dll/shellext/netshell/netshell.rc trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc trunk/reactos/dll/shellext/stobject/stobject.rc Modified: trunk/reactos/dll/cpl/telephon/telephon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/telephon.rc [iso-8859-1] Sat Apr 18 09:57:21 2015 @@ -11,6 +11,8 @@ #include <reactos/version.rc> IDI_CPLSYSTEM ICON "resources/applet.ico" + +#include <reactos/manifest_dll.rc> /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/shellext/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… ============================================================================== --- trunk/reactos/dll/shellext/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/netshell.rc [iso-8859-1] Sat Apr 18 09:57:21 2015 @@ -23,6 +23,8 @@ IDI_NET_TRANSREC ICON "res/nettrrec.ico" IDR_NETSHELL WINE_REGISTRY "res/netshell.rgs" + +#include <reactos/manifest_dll.rc> /* UTF-8 */ #pragma code_page(65001) Added: trunk/reactos/dll/shellext/ntobjshex/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/lang/de-DE.rc (added) +++ trunk/reactos/dll/shellext/ntobjshex/lang/de-DE.rc [iso-8859-1] Sat Apr 18 09:57:21 2015 @@ -0,0 +1,7 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_NTOBJFLD_NAME "NT-Objekt-Namespace" + IDS_REGISTRY_NAME "Systemregistry" +END Propchange: trunk/reactos/dll/shellext/ntobjshex/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] Sat Apr 18 09:57:21 2015 @@ -18,8 +18,14 @@ IDR_NTOBJECTFOLDER REGISTRY "resources/rgs/ntobjectfolder.rgs" IDR_REGISTRYFOLDER REGISTRY "resources/rgs/regfolder.rgs" +#include <reactos/manifest_dll.rc> + /* UTF-8 */ #pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Sat Apr 18 09:57:21 2015 @@ -12,6 +12,8 @@ IDI_VOLMUTE ICON "resources/4.ico" IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" + +#include <reactos/manifest_dll.rc> /* UTF-8 */ #pragma code_page(65001)

9 years, 5 months

[akhaldi] 67242: [THEMEUI] Add this module for .msstyle file type association. By Lee Schroeder. CORE-5984

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 18 09:52:23 2015 New Revision: 67242 URL: http://svn.reactos.org/svn/reactos?rev=67242&view=rev Log: [THEMEUI] Add this module for .msstyle file type association. By Lee Schroeder. CORE-5984 Added: trunk/reactos/dll/win32/themeui/ trunk/reactos/dll/win32/themeui/CMakeLists.txt (with props) trunk/reactos/dll/win32/themeui/themeui.ico (with props) trunk/reactos/dll/win32/themeui/themeui.rc (with props) Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Apr 18 09:52:23 2015 @@ -265,6 +265,18 @@ HKCR,"sysfile","NoOpen",0x00000000,"" HKCR,"sysfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; MS Styles (Themes) +HKCR,".msstyles","",0x00000000,"msstylesfile" +HKCR,"msstylesfile","",0x00000000,"Visual Style File" +HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" +HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" + +; Theme File +HKCR,".theme","",0x00000000,"themefile" +HKCR,"themefile","",0x00000000,"Theme File" +HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" +HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" ; URL shortcuts (e.g. used in favorites folder of IExplorer) HKCR,".url","",0x00000000,"InternetShortcut" Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Apr 18 09:52:23 2015 @@ -203,6 +203,7 @@ add_subdirectory(t2embed) add_subdirectory(tapi32) add_subdirectory(tapiui) +add_subdirectory(themeui) add_subdirectory(traffic) add_subdirectory(twain_32) add_subdirectory(uext2) Added: trunk/reactos/dll/win32/themeui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/themeui/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/themeui/CMakeLists.txt [iso-8859-1] Sat Apr 18 09:52:23 2015 @@ -0,0 +1,4 @@ + +add_library(themeui SHARED themeui.rc) +set_module_type(themeui win32dll ENTRYPOINT 0) +add_cd_file(TARGET themeui DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/themeui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/themeui/themeui.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/themeui.… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/themeui/themeui.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/themeui/themeui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/themeui.… ============================================================================== --- trunk/reactos/dll/win32/themeui/themeui.rc (added) +++ trunk/reactos/dll/win32/themeui/themeui.rc [iso-8859-1] Sat Apr 18 09:52:23 2015 @@ -0,0 +1,8 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Theme UI Library\0" +#define REACTOS_STR_INTERNAL_NAME "themeui\0" +#define REACTOS_STR_ORIGINAL_FILENAME "themeui.dll\0" + +#include <reactos/version.rc> + +1 ICON "themeui.ico" Propchange: trunk/reactos/dll/win32/themeui/themeui.rc ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 5 months

[pschweitzer] 67241: [IEFRAME] Add French translation

by pschweitzer＠svn.reactos.org

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

9 years, 5 months

[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

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; }

9 years, 5 months

[dreimer] 67239: Fixing some incorrectly written Reactos -> ReactOS CORE-7524 #comment Some less of these now.

by dreimer＠svn.reactos.org

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 );

9 years, 5 months

[aandrejevic] 67238: [NTVDM] Fix the range check in VgaReadMemory and VgaWriteMemory.

by aandrejevic＠svn.reactos.org

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 */

9 years, 5 months

[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

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

9 years, 5 months

[aandrejevic] 67236: [NTVDM] The "WORKING_TIMER" disabled code is so obsolete that it doesn't even compile anymore.

by aandrejevic＠svn.reactos.org

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++)

9 years, 5 months

[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

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;

9 years, 5 months

← Newer
1
...
22
23
24
25
26
27
28
...
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