Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[hbelusca] 65926: [REACTOS]: Versioning for 2015, and... ... Happy New Year 2015 for everybody! ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´ ⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰ ░░░░░░█░█ █▀█ █▀█ █▀█ █░█░░░░░...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 31 23:00:30 2014 New Revision: 65926 URL: http://svn.reactos.org/svn/reactos?rev=65926&view=rev Log: [REACTOS]: Versioning for 2015, and... ... Happy New Year 2015 for everybody! ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´ ⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰ ░░░░░░█░█ █▀█ █▀█ █▀█ █░█░░░░░░ ░░░░░░█▀█ █▀█ █▀▀ █▀▀ ▀█▀░░░░░░ ░░░░░░▀░▀ ▀░▀ ▀░░ ▀░░ ░▀░░░░░░░ █▄░█ █▀▀ █░█░█░░█░█ █▀▀ █▀█ █▀█ █░██ █▀▀ █░█░█░░▀█▀ █▀▀ █▀█ ██▀ ▀░░▀ ▀▀▀ ░▀▀▀░░░░▀░ ▀▀▀ ▀░▀ ▀░▀ ⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰ ░░░▄████▄░▄███▄░░▄██░██████░░░ ░░░▀▀░▄██░██░██░████░██▄▄▄░░░░ ░░░░▄██▀░░██░██░░░██░▄▄░▀██░░░ ░░░██████░▀███▀░░░██░▀████▀░░░ ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´ Added: trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp - copied, changed from r65904, trunk/reactos/dll/win32/msgina/resources/reactos.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp trunk/reactos/dll/win32/msgina/resources/reactos.svg trunk/reactos/include/reactos/version.cmake trunk/reactos/ntoskrnl/inbv/logo/1.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msgina/resources/reactos.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== --- trunk/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] Wed Dec 31 23:00:30 2014 @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright Â© 1996-2014 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright Â© 1996-2015 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> Copied: trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp (from r65904, trunk/reactos/dll/win32/msgina/resources/reactos.bmp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Wed Dec 31 23:00:30 2014 @@ -34,7 +34,7 @@ set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") -set(COPYRIGHT_YEAR "2014") +set(COPYRIGHT_YEAR "2015") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "SVN") Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available.

9 years, 8 months

[hbelusca] 65925: [ICONS] - Use a better icon for the bootcd. - Replace the GUI ReactOS Setup program icon with a better one, copied from msiexec (just to note, the "setup" icon from shell32 and ap...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 31 22:26:19 2014 New Revision: 65925 URL: http://svn.reactos.org/svn/reactos?rev=65925&view=rev Log: [ICONS] - Use a better icon for the bootcd. - Replace the GUI ReactOS Setup program icon with a better one, copied from msiexec (just to note, the "setup" icon from shell32 and appwiz are the same as msiexec one). Inspired from CORE-8971. Added: trunk/reactos/base/setup/reactos/res/setup.ico - copied unchanged from r65924, trunk/reactos/base/system/msiexec/msiexec.ico trunk/reactos/boot/bootdata/icon.ico - copied unchanged from r65924, trunk/reactos/win32ss/user/user32/resources/oic_reactos.ico Removed: trunk/reactos/base/setup/reactos/res/reactos.ico Modified: trunk/reactos/base/setup/reactos/reactos.rc Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] Wed Dec 31 22:26:19 2014 @@ -12,7 +12,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Icons */ -IDI_MAIN ICON "res/reactos.ico" +IDI_MAIN ICON "res/setup.ico" /* Bitmaps */ IDB_WATERMARK BITMAP "res/watermark.bmp" Removed: trunk/reactos/base/setup/reactos/res/reactos.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/rea… ============================================================================== Binary file - no diff available.

9 years, 8 months

[hbelusca] 65924: Maybe the last committed patch of year 2014! [CMD] Enhance the "ver" command, specifying the OS on which cmd.exe runs (that can be different from ReactOS!) and the reported OS ver...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 31 21:22:49 2014 New Revision: 65924 URL: http://svn.reactos.org/svn/reactos?rev=65924&view=rev Log: Maybe the last committed patch of year 2014! [CMD] Enhance the "ver" command, specifying the OS on which cmd.exe runs (that can be different from ReactOS!) and the reported OS version when using the $V prompt format specifier. Patch by Lee Schroeder, with modifications by me, see the report for more details. CORE-8970 #resolve #comment Committed in revision 65924, thanks! Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sq-AL.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/prompt.c trunk/reactos/base/shell/cmd/resource.h trunk/reactos/base/shell/cmd/ver.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -163,7 +163,6 @@ BOOL bDisableBatchEcho = FALSE; BOOL bDelayedExpansion = FALSE; DWORD dwChildProcessId = 0; -OSVERSIONINFO osvi; HANDLE hIn; HANDLE hOut; LPTSTR lpOriginalEnvironment; @@ -1622,9 +1621,8 @@ BOOL AlwaysStrip = FALSE; BOOL AutoRun = TRUE; - /* get version information */ - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx (&osvi); + /* Get version information */ + InitOSVersion(); /* Some people like to run ReactOS cmd.exe on Win98, it helps in the * build process. So don't link implicitly against ntdll.dll, load it Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -65,7 +65,6 @@ extern INT nErrorLevel; extern SHORT maxx; extern SHORT maxy; -extern OSVERSIONINFO osvi; extern BOOL bUnicodeOutput; @@ -472,7 +471,8 @@ /* Prototypes for VER.C */ -VOID ShortVersion (VOID); +VOID InitOSVersion(VOID); +VOID PrintOSVersion(VOID); INT cmd_ver (LPTSTR); Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -522,7 +522,8 @@ STRING_REPLACE_ERROR7 "Erweiterter Fehler 32\n" STRING_REACTOS_VERSION "ReactOS Betriebssystem [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS-Befehlszeileninterpreter\nVersion %s %s" - STRING_VERSION_RUNVER " lÃ¤uft in %s" + STRING_VERSION_RUNNING_ON "LÃ¤uft in: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d Datei(en) kopiert\n" STRING_DELETE_WIPE "sicher gelÃ¶scht" STRING_FOR_ERROR "ungÃ¼ltige Variablenangabe." Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -527,7 +527,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" - STRING_VERSION_RUNVER " running on %s" + STRING_VERSION_RUNNING_ON "Running on: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "wiped" STRING_FOR_ERROR "bad variable specification." Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -523,7 +523,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" - STRING_VERSION_RUNVER " running on %s" + STRING_VERSION_RUNNING_ON "Running on: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "wiped" STRING_FOR_ERROR "bad variable specification." Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -525,7 +525,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nIntÃ©rprete de comandos de ReactOS\nVersion %s %s" - STRING_VERSION_RUNVER " corriendo en %s" + STRING_VERSION_RUNNING_ON "Corriendo en: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d archivo(s) copado(s)\n" STRING_DELETE_WIPE "Limpiado" STRING_FOR_ERROR "EspeciciÃ³n de variable errÃ³nea." Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -537,7 +537,8 @@ STRING_REPLACE_ERROR7 "Erreur Ã©tendue 32\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nInterprÃ©teur de ligne de commandes ReactOS\nVersion %s %s" - STRING_VERSION_RUNVER " tournant sur %s" + STRING_VERSION_RUNNING_ON "Fonctionnant sous: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d fichier(s) copiÃ©(s)\n" STRING_DELETE_WIPE "effacÃ©(s)" STRING_FOR_ERROR "mauvaise variable spÃ©cifiÃ©e." Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -507,7 +507,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Parancssor Ã©rtelmezÃµ\nVersion %s %s" - STRING_VERSION_RUNVER " running on %s" + STRING_VERSION_RUNNING_ON "Running on: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d Ã¡llomÃ¡ny mÃ¡solva\n" STRING_DELETE_WIPE "wiped" STRING_FOR_ERROR "HibÃ¡s vÃ¡ltozÃ³." Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -522,7 +522,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nInterpreter Baris Perintah ReactOS\nVersion %s %s" - STRING_VERSION_RUNVER " berjalan pada %s" + STRING_VERSION_RUNNING_ON "Berjalan pada: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file di-copy\n" STRING_DELETE_WIPE "dihapus" STRING_FOR_ERROR "spesifikasi variabel tidak baik." Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -533,7 +533,8 @@ STRING_REPLACE_ERROR7 "Errore esteso 32\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nInterprete di linea di comando di ReactOS\nVersion %s %s" - STRING_VERSION_RUNVER " in esecuzione su %s" + STRING_VERSION_RUNNING_ON "In esecuzione su: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file copiati\n" STRING_DELETE_WIPE "resi illeggibili" STRING_FOR_ERROR "variabile non valida." Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -530,7 +530,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" - STRING_VERSION_RUNVER " running on %s" + STRING_VERSION_RUNNING_ON "Running on: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d åã®ãã¡ã¤ã«ãã³ãã¼ããã¾ãã\n" STRING_DELETE_WIPE "å®å¨ã«æ¶å»ããã¾ããã" STRING_FOR_ERROR "ç¡å¹ãªå¤æ°ãæå®ããã¾ããã" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -521,7 +521,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s" - STRING_VERSION_RUNVER " kjÃ¸rer pÃ¥ %s" + STRING_VERSION_RUNNING_ON "KjÃ¸rer pÃ¥: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(r) kopiert\n" STRING_DELETE_WIPE "slettet" STRING_FOR_ERROR "ugyldig variabel spesifikasjon." Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -527,7 +527,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32 - BÅÄd wspÃ³Ådzielenia\n" STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" STRING_CMD_SHELLINFO "\nInterpreter linii poleceÅ ReactOS\nVersion %s %s" - STRING_VERSION_RUNVER " dziaÅajÄcy na %s" + STRING_VERSION_RUNNING_ON "DziaÅajÄcy na: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d plik(Ã³w) skopiowano\n" STRING_DELETE_WIPE "skasowano" STRING_FOR_ERROR "zÅe okreÅlenie zmiennej." Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -560,7 +560,8 @@ STRING_REPLACE_ERROR7 "Eroare ExtinsÄ 32\n" STRING_REACTOS_VERSION "ReactOS [Versiunea %s-%s]\n" STRING_CMD_SHELLINFO "\nInterpretorul de comenzi ReactOS\nVersiunea %s %s" - STRING_VERSION_RUNVER " operÃ¢nd pe %s" + STRING_VERSION_RUNNING_ON "OperÃ¢nd pe: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d fiÈier(e) copiat(e)\n" STRING_DELETE_WIPE "Èters" STRING_FOR_ERROR "specificaÈie de variabilÄ eronatÄ." Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -532,7 +532,8 @@ STRING_REPLACE_ERROR7 "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ° 32\n" STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑÐ¸Ñ %s-%s]\n" STRING_CMD_SHELLINFO "\nÐÐ½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸ ReactOS\nÐÐµÑÑÐ¸Ñ %s %s" - STRING_VERSION_RUNVER " Ð·Ð°Ð¿ÑÑÐµÐ½ Ð½Ð° %s" + STRING_VERSION_RUNNING_ON "ÐÐ°Ð¿ÑÑÐµÐ½ Ð½Ð°: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾\n" STRING_DELETE_WIPE "Ð¾ÑÐ¸ÑÐµÐ½Ð¾" STRING_FOR_ERROR "Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð·Ð°Ð´Ð°Ð½Ð¸Ðµ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹." Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -529,7 +529,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "OperaÄnÃ½ systÃ©m ReactOS [Verzia %s-%s]\n" STRING_CMD_SHELLINFO "\nInterprÃ©ter prÃkazovÃ©ho riadku systÃ©mu ReactOS\nVerzia %s %s" - STRING_VERSION_RUNVER " running on %s" + STRING_VERSION_RUNNING_ON "Running on: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d sÃºbor(ov) skopÃrovanÃ½(ch)\n" STRING_DELETE_WIPE "wiped" STRING_FOR_ERROR "bad variable specification." Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -527,7 +527,8 @@ STRING_REPLACE_ERROR7 "Error i zgjatur 32\n" STRING_REACTOS_VERSION "Sistemi Operativ ReactOS [Versioni %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Interpretuesi i komandave\nVersioni %s %s" - STRING_VERSION_RUNVER " funksionon nÃ« %s" + STRING_VERSION_RUNNING_ON "Funksionon nÃ«: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(s) copied\n" STRING_DELETE_WIPE "spastruar" STRING_FOR_ERROR "specifikimi i varibleve i keq." Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -521,7 +521,8 @@ STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s" - STRING_VERSION_RUNVER " kÃ¶rs pÃ¥ %s" + STRING_VERSION_RUNNING_ON "KÃ¶rs pÃ¥: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d file(r) kopiert\n" STRING_DELETE_WIPE "slettet" STRING_FOR_ERROR "ugyldig variabel spesifikasjon." Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -533,7 +533,8 @@ STRING_REPLACE_ERROR7 "Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° 32\n" STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑiÐ¹Ð½Ð° Ð¡Ð¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑiÑ %s-%s]\n" STRING_CMD_SHELLINFO "\nIÐ½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑÐ´ÐºÐ° ReactOS\nVersion %s %s" - STRING_VERSION_RUNVER " Ð·Ð°Ð¿ÑÑÐµÐ½Ð¸Ð¹ Ð½Ð° %s" + STRING_VERSION_RUNNING_ON "ÐÐ°Ð¿ÑÑÐµÐ½Ð¸Ð¹ Ð½Ð°: " + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d ÑÐ°Ð¹Ð»(iÐ²) ÑÐºÐ¾Ð¿iÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" STRING_DELETE_WIPE "Ð²Ð¸ÑÐµÑÑÐ¾" STRING_FOR_ERROR "Ð½ÐµÐ²iÑÐ½Ð° ÑÐ¿ÐµÑÐ¸ÑiÐºÐ°ÑiÑ Ð·Ð¼iÐ½Ð½Ð¾Ñ." Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -492,7 +492,8 @@ STRING_REPLACE_ERROR7 "æ©å±éè¯¯ 32\n" STRING_REACTOS_VERSION "ReactOS æä½ç³»ç» [çæ¬ %s-%s]\n" STRING_CMD_SHELLINFO "\nReactOS å½ä»¤è¡è§£éå¨\nçæ¬ %s %s" - STRING_VERSION_RUNVER " å¨ %s ä¸è¿è¡" + STRING_VERSION_RUNNING_ON "å¨ ä¸è¿è¡" + STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d ä¸ªæä»¶å·²å¤å¶\n" STRING_DELETE_WIPE "å·²æ¦é¤" STRING_FOR_ERROR "æ æçåéæå®ã" Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -198,22 +198,7 @@ break; case _T('V'): - switch (osvi.dwPlatformId) - { - case VER_PLATFORM_WIN32_WINDOWS: - if (osvi.dwMajorVersion == 4 && - osvi.dwMinorVersion == 1) - ConOutPrintf(_T("Windows 98")); - else - ConOutPrintf(_T("Windows 95")); - break; - - - case VER_PLATFORM_WIN32_NT: - ConOutPrintf(_T("Windows NT Version %lu.%lu"), - osvi.dwMajorVersion, osvi.dwMinorVersion); - break; - } + PrintOSVersion(); break; case _T('_'): Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -196,14 +196,15 @@ #define STRING_VERIFY_HELP2 696 #define STRING_VERIFY_HELP3 697 -#define STRING_VERSION_HELP1 698 -#define STRING_VERSION_HELP2 699 -#define STRING_VERSION_HELP3 700 -#define STRING_VERSION_HELP4 701 -#define STRING_VERSION_HELP5 702 -#define STRING_VERSION_HELP6 703 -#define STRING_VERSION_HELP7 704 -#define STRING_VERSION_RUNVER 705 +#define STRING_VERSION_HELP1 698 +#define STRING_VERSION_HELP2 699 +#define STRING_VERSION_HELP3 700 +#define STRING_VERSION_HELP4 701 +#define STRING_VERSION_HELP5 702 +#define STRING_VERSION_HELP6 703 +#define STRING_VERSION_HELP7 704 +#define STRING_VERSION_RUNNING_ON 705 +#define STRING_VERSION_RUNVER 706 #define STRING_VOL_HELP1 706 #define STRING_VOL_HELP2 707 Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Wed Dec 31 21:22:49 2014 @@ -25,30 +25,98 @@ #include <reactos/buildno.h> #include <reactos/version.h> -VOID ShortVersion (VOID) +OSVERSIONINFO osvi; +TCHAR szOSName[50] = _T(""); + + +VOID InitOSVersion(VOID) { - OSVERSIONINFO VersionInfo; - - ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); - VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - - memset(VersionInfo.szCSDVersion, 0, sizeof(VersionInfo.szCSDVersion)); - if (GetVersionEx(&VersionInfo)) - { - LPTSTR RosVersion; - SIZE_T RosVersionLen; - - RosVersion = VersionInfo.szCSDVersion + _tcslen(VersionInfo.szCSDVersion) + 1; - RosVersionLen = sizeof(VersionInfo.szCSDVersion) / sizeof(VersionInfo.szCSDVersion[0]) - - (RosVersion - VersionInfo.szCSDVersion); - if (7 <= RosVersionLen && 0 == _tcsnicmp(RosVersion, _T("ReactOS"), 7)) + LONG lResult; + HKEY hKey; + + /* Get version information */ + ZeroMemory(&osvi, sizeof(osvi)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + + /* Build OS version string */ + + /* Open registry key */ + lResult = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + 0, + KEY_QUERY_VALUE, + &hKey); + if (lResult == ERROR_SUCCESS) + { + DWORD dwSize, dwType; + + /* Retrieve the ProductName value */ + dwSize = sizeof(szOSName); + lResult = RegQueryValueEx(hKey, + _T("ProductName"), + NULL, + &dwType, + (LPBYTE)szOSName, + &dwSize); + + /* If we have failed or the data type is unsupported... */ + if (lResult != ERROR_SUCCESS || dwType != REG_SZ) { - ConOutResPrintf(STRING_VERSION_RUNVER, RosVersion); + /* ... reserve size for one NULL character only! */ + dwSize = sizeof(TCHAR); + + /* Set an error code (anything != ERROR_SUCCESS) */ + lResult = ERROR_INVALID_PARAMETER; } - } - ConOutChar(_T('\n')); + + /* NULL-terminate the string */ + szOSName[(dwSize / sizeof(TCHAR)) - 1] = _T('\0'); + + /* Close the key */ + RegCloseKey(hKey); + } + + /* + * If the registry key somehow doesn't exist or cannot be loaded, then + * determine at least whether the version of Windows is either 9x or NT. + */ + if (lResult != ERROR_SUCCESS) + { + switch (osvi.dwPlatformId) + { + case VER_PLATFORM_WIN32_WINDOWS: + { + if (osvi.dwMajorVersion == 4) + { + if (osvi.dwMinorVersion == 0) + _tcscpy(szOSName, _T("Windows 95")); + else if (osvi.dwMinorVersion == 1) + _tcscpy(szOSName, _T("Windows 98")); + else if (osvi.dwMinorVersion == 9) + _tcscpy(szOSName, _T("Windows ME")); + else + _tcscpy(szOSName, _T("Windows 9x")); + } + break; + } + + case VER_PLATFORM_WIN32_NT: + { + _tcscpy(szOSName, _T("Windows NT")); + break; + } + } + } } +/* Print the current OS version, suitable for VER command and PROMPT $V format */ +VOID PrintOSVersion(VOID) +{ + ConOutResPrintf(STRING_VERSION_RUNVER, szOSName, + osvi.dwMajorVersion, osvi.dwMinorVersion, + osvi.dwBuildNumber, osvi.szCSDVersion); +} #ifdef INCLUDE_CMD_VER @@ -61,48 +129,52 @@ nErrorLevel = 0; - if (_tcsstr (param, _T("/?")) != NULL) + if (_tcsstr(param, _T("/?")) != NULL) { ConOutResPaging(TRUE,STRING_VERSION_HELP1); return 0; } - ShortVersion(); + ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); + ConOutChar(_T('\n')); + ConOutResPuts(STRING_VERSION_RUNNING_ON); + PrintOSVersion(); /* Basic copyright notice */ if (param[0] != _T('\0')) { + ConOutPuts(_T("\n\n")); ConOutPuts(_T("Copyright (C) 1994-1998 Tim Norman and others.\n")); ConOutPuts(_T("Copyright (C) 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team\n")); for (i = 0; param[i]; i++) { - /* skip spaces */ + /* Skip spaces */ if (param[i] == _T(' ')) continue; if (param[i] == _T('/')) { - /* is this a lone '/' ? */ + /* Is this a lone '/' ? */ if (param[i + 1] == 0) { - error_invalid_switch (_T(' ')); + error_invalid_switch(_T(' ')); return 1; } continue; } - if (_totupper (param[i]) == _T('W')) + if (_totupper(param[i]) == _T('W')) { /* Warranty notice */ ConOutResPuts(STRING_VERSION_HELP3); } - else if (_totupper (param[i]) == _T('R')) + else if (_totupper(param[i]) == _T('R')) { /* Redistribution notice */ ConOutResPuts(STRING_VERSION_HELP4); } - else if (_totupper (param[i]) == _T('C')) + else if (_totupper(param[i]) == _T('C')) { /* Developer listing */ ConOutResPuts(STRING_VERSION_HELP6); @@ -112,12 +184,17 @@ } else { - error_invalid_switch ((TCHAR)_totupper (param[i])); + error_invalid_switch(_totupper(param[i])); return 1; } } + + /* Bug report notice */ ConOutResPuts(STRING_VERSION_HELP5); } + + ConOutChar(_T('\n')); + return 0; }

9 years, 8 months

[ekohl] 65923: [USETUP] You can install ReactOS on 'unpartitioned space' again. Usetup will create a primary partition that spans the whole unpartitioned space, format the partition and install Rea...

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Dec 31 20:51:56 2014 New Revision: 65923 URL: http://svn.reactos.org/svn/reactos?rev=65923&view=rev Log: [USETUP] You can install ReactOS on 'unpartitioned space' again. Usetup will create a primary partition that spans the whole unpartitioned space, format the partition and install ReactOS on that partition. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Dec 31 20:51:56 2014 @@ -46,6 +46,7 @@ UNICODE_STRING SourceRootDir; UNICODE_STRING SourcePath; BOOLEAN IsUnattendedSetup = FALSE; +BOOLEAN InstallShortcut = FALSE; LONG UnattendDestinationDiskNumber; LONG UnattendDestinationPartitionNumber; LONG UnattendMBRInstallType = -1; @@ -1601,19 +1602,22 @@ if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) continue; //return SELECT_PARTITION_PAGE; + if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); + continue; //return SELECT_PARTITION_PAGE; /* let the user select another partition */ + } + if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->IsPartitioned == FALSE) { CreatePrimaryPartition(PartitionList, 0ULL, TRUE); - } - - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) - { - MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, - RequiredPartitionDiskSpace); - return SELECT_PARTITION_PAGE; /* let the user select another partition */ + InstallShortcut = TRUE; + + return SELECT_FILE_SYSTEM_PAGE; } DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; @@ -2875,7 +2879,7 @@ DestroyFileSystemList(FileSystemList); FileSystemList = NULL; - if (IsUnattendedSetup) + if (IsUnattendedSetup || InstallShortcut) return INSTALL_DIRECTORY_PAGE; else return SELECT_PARTITION_PAGE;

9 years, 8 months

[akhaldi] 65922: [TRANSLATIONS] Spanish translation update by Ismael Ferreras Morezuelas. CORE-8991

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 31 19:16:03 2014 New Revision: 65922 URL: http://svn.reactos.org/svn/reactos?rev=65922&view=rev Log: [TRANSLATIONS] Spanish translation update by Ismael Ferreras Morezuelas. CORE-8991 Added: trunk/reactos/dll/cpl/inetcpl/lang/es-ES.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/es-ES.rc (with props) trunk/reactos/dll/shellext/stobject/lang/es-ES.rc (with props) trunk/reactos/dll/win32/samsrv/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/vmwinst/lang/es-ES.rc trunk/reactos/base/shell/explorer/lang/es-ES.rc trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/telephon/lang/es-ES.rc trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc trunk/reactos/dll/shellext/netshell/lang/es-ES.rc trunk/reactos/dll/shellext/slayer/lang/es-ES.rc trunk/reactos/dll/shellext/stobject/stobject.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc trunk/reactos/dll/win32/devmgr/lang/es-ES.rc trunk/reactos/dll/win32/modemui/lang/es-ES.rc trunk/reactos/dll/win32/newdev/lang/es-ES.rc trunk/reactos/dll/win32/samsrv/samsrv.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/userenv/lang/es-ES.rc trunk/reactos/media/inf/NET_NIC.inf 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/input.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/ks.inf trunk/reactos/media/inf/kscaptur.inf trunk/reactos/media/inf/legcydrv.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/monitor.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/netrtl.inf trunk/reactos/media/inf/netrtpnt.inf trunk/reactos/media/inf/nettcpip.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/shortcuts.inf trunk/reactos/media/inf/unknown.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf trunk/reactos/media/inf/xboxdisp.inf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… Modified: trunk/reactos/base/setup/vmwinst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/es… Modified: trunk/reactos/base/shell/explorer/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/e… Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… Modified: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.… Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… Added: trunk/reactos/dll/cpl/inetcpl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/es-ES… Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/es-E… Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/telephon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/es-E… Modified: trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/es-ES.… Added: trunk/reactos/dll/cpl/wined3dcfg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/es… Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… Modified: trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/slayer/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/e… Added: trunk/reactos/dll/shellext/stobject/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/es-E… Modified: trunk/reactos/dll/win32/modemui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/es-… Modified: trunk/reactos/dll/win32/newdev/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/es-E… Added: trunk/reactos/dll/win32/samsrv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/es-E… Modified: trunk/reactos/dll/win32/samsrv/samsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rc… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… Modified: trunk/reactos/dll/win32/userenv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/es-… Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=659… Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=65… Modified: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… Modified: trunk/reactos/media/inf/bda.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bda.inf?rev=6592… Modified: trunk/reactos/media/inf/bth.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bth.inf?rev=6592… Modified: trunk/reactos/media/inf/c_image.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/c_image.inf?rev=… Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=65… Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=6592… Modified: trunk/reactos/media/inf/disk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/disk.inf?rev=659… Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=6592… Modified: trunk/reactos/media/inf/flpydisk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/flpydisk.inf?rev… Modified: trunk/reactos/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hal.inf?rev=6592… Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=6592… Modified: trunk/reactos/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/input.inf?rev=65… Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… Modified: trunk/reactos/media/inf/ks.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ks.inf?rev=65922… Modified: trunk/reactos/media/inf/kscaptur.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/kscaptur.inf?rev… Modified: trunk/reactos/media/inf/legcydrv.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/legcydrv.inf?rev… Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… Modified: trunk/reactos/media/inf/monitor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/monitor.inf?rev=… Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=6… Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=6… Modified: trunk/reactos/media/inf/netrtl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtl.inf?rev=6… Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=65… Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=659… Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… Modified: trunk/reactos/media/inf/unknown.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/unknown.inf?rev=… Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=6592… Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… Modified: trunk/reactos/media/inf/xboxdisp.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/xboxdisp.inf?rev…

9 years, 8 months

[tkreuzer] 65921: [WIN32K] Use the correct flags member in the DC to mark the RAO region dirty.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 31 17:10:59 2014 New Revision: 65921 URL: http://svn.reactos.org/svn/reactos?rev=65921&view=rev Log: [WIN32K] Use the correct flags member in the DC to mark the RAO region dirty. Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Wed Dec 31 17:10:59 2014 @@ -470,8 +470,9 @@ SURFACE_ShareUnlockSurface(psurfOld); } - /* Mark the DC brushes invalid */ - pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE | DC_FLAG_DIRTY_RAO; + /* Mark the DC brushes and the RAO region invalid */ + pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; + pdc->fs |= DC_FLAG_DIRTY_RAO; /* Update the system region */ REGION_SetRectRgn(pdc->prgnVis,

9 years, 8 months

[tkreuzer] 65920: [WIN32K] Mark RAO region as dirty in NtGdiSelectBitmap, hopefully fixes CORE-8989

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 31 16:22:23 2014 New Revision: 65920 URL: http://svn.reactos.org/svn/reactos?rev=65920&view=rev Log: [WIN32K] Mark RAO region as dirty in NtGdiSelectBitmap, hopefully fixes CORE-8989 Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Wed Dec 31 16:22:23 2014 @@ -471,7 +471,7 @@ } /* Mark the DC brushes invalid */ - pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; + pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE | DC_FLAG_DIRTY_RAO; /* Update the system region */ REGION_SetRectRgn(pdc->prgnVis,

9 years, 8 months

[tkreuzer] 65919: [WIN32K] Rewrite IntEngMaskBlt to work with device managed surfaces. Should fix CORE-7821 and CORE-8711

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 31 15:15:44 2014 New Revision: 65919 URL: http://svn.reactos.org/svn/reactos?rev=65919&view=rev Log: [WIN32K] Rewrite IntEngMaskBlt to work with device managed surfaces. Should fix CORE-7821 and CORE-8711 Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/inteng.h Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Wed Dec 31 15:15:44 2014 @@ -65,6 +65,7 @@ DWORD fgndRop, bkgndRop; ASSERT(IS_VALID_ROP4(Rop4)); + ASSERT(psoMask->iBitmapFormat == BMF_1BPP); if (!psoMask) return FALSE; @@ -984,64 +985,141 @@ return Ret; } -BOOL APIENTRY -IntEngMaskBlt(SURFOBJ *psoDest, - SURFOBJ *psoMask, - CLIPOBJ *ClipRegion, - XLATEOBJ *DestColorTranslation, - XLATEOBJ *SourceColorTranslation, - RECTL *DestRect, - POINTL *pptlMask, - BRUSHOBJ *pbo, - POINTL *BrushOrigin) +BOOL +APIENTRY +IntEngMaskBlt( + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxloDest, + _In_ XLATEOBJ *pxloSource, + _In_ RECTL *prclDest, + _In_ POINTL *pptlMask, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg) { BOOLEAN ret; - RECTL OutputRect; - POINTL InputPoint = {0,0}; - //SURFACE *psurfDest; - + RECTL rcDest; + POINTL ptMask = {0,0}; + PSURFACE psurfTemp; + RECTL rcTemp; + + ASSERT(psoDest); ASSERT(psoMask); + /* Is this a 1 BPP mask? */ + if (psoMask->iBitmapFormat == BMF_1BPP) + { + /* Use IntEngBitBlt with an appropriate ROP4 */ + return IntEngBitBlt(psoDest, + NULL, + psoMask, + pco, + pxloDest, + prclDest, + NULL, + pptlMask, + pbo, + pptlBrushOrg, + ROP4_MASKPAINT); + } + + ASSERT(psoMask->iBitmapFormat == BMF_8BPP); + if (pptlMask) { - InputPoint = *pptlMask; + ptMask = *pptlMask; } /* Clip against the bounds of the clipping region so we won't try to write * outside the surface */ - if (NULL != ClipRegion) - { - if (!RECTL_bIntersectRect(&OutputRect, DestRect, &ClipRegion->rclBounds)) + if (pco != NULL) + { + /* Intersect with the clip bounds and check if everything was clipped */ + if (!RECTL_bIntersectRect(&rcDest, prclDest, &pco->rclBounds)) { return TRUE; } - InputPoint.x += OutputRect.left - DestRect->left; - InputPoint.y += OutputRect.top - DestRect->top; - } - else - { - OutputRect = *DestRect; - } - - /* No success yet */ - ret = FALSE; - ASSERT(psoDest); - //psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); - - /* Dummy BitBlt to let driver know that it should flush its changes. - This should really be done using a call to DrvSynchronizeSurface, - but the VMware driver doesn't hook that call. */ - IntEngBitBlt(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, - DestRect, pptlMask, pptlMask, pbo, BrushOrigin, - ROP4_NOOP); - - ret = EngMaskBitBlt(psoDest, psoMask, ClipRegion, DestColorTranslation, SourceColorTranslation, - &OutputRect, &InputPoint, pbo, BrushOrigin); - - /* Dummy BitBlt to let driver know that something has changed. */ - IntEngBitBlt(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, - DestRect, pptlMask, pptlMask, pbo, BrushOrigin, - ROP4_NOOP); + + /* Adjust the mask point */ + ptMask.x += rcDest.left - prclDest->left; + ptMask.y += rcDest.top - prclDest->top; + } + else + { + rcDest = *prclDest; + } + + /* Check if the target surface is device managed */ + if (psoDest->iType != STYPE_BITMAP) + { + rcTemp.left = 0; + rcTemp.top = 0; + rcTemp.right = rcDest.right - rcDest.left; + rcTemp.bottom = rcDest.bottom - rcDest.top; + + /* Allocate a temporary surface */ + psurfTemp = SURFACE_AllocSurface(STYPE_BITMAP, + rcTemp.right, + rcTemp.bottom, + psoDest->iBitmapFormat, + 0, + 0, + NULL); + if (psurfTemp == NULL) + { + return FALSE; + } + + /* Copy the current target surface bits to the temp surface */ + ret = EngCopyBits(&psurfTemp->SurfObj, + psoDest, + NULL, // pco + NULL, // pxlo + &rcTemp, + (PPOINTL)&rcDest); + + if (ret) + { + /* Do the operation on the temp surface */ + ret = EngMaskBitBlt(&psurfTemp->SurfObj, + psoMask, + NULL, + pxloDest, + pxloSource, + &rcTemp, + &ptMask, + pbo, + pptlBrushOrg); + } + + if (ret) + { + /* Copy the result back to the dest surface */ + ret = EngCopyBits(psoDest, + &psurfTemp->SurfObj, + pco, + NULL, + &rcDest, + (PPOINTL)&rcTemp); + } + + /* Delete the temp surface */ + GDIOBJ_vDeleteObject(&psurfTemp->BaseObject); + } + else + { + /* Do the operation on the target surface */ + ret = EngMaskBitBlt(psoDest, + psoMask, + pco, + pxloDest, + pxloSource, + &rcDest, + &ptMask, + pbo, + pptlBrushOrg); + } return ret; } Modified: trunk/reactos/win32ss/gdi/eng/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/inteng.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] Wed Dec 31 15:15:44 2014 @@ -53,6 +53,7 @@ #define ROP4_NOOP (R3_OPINDEX_NOOP | (R3_OPINDEX_NOOP << 8)) #define ROP4_MASK (R3_OPINDEX_SRCCOPY | (R3_OPINDEX_NOOP << 8)) +#define ROP4_MASKPAINT (R3_OPINDEX_PATCOPY | (R3_OPINDEX_NOOP << 8)) /* Definitions of IntEngXxx functions */

9 years, 8 months

[tkreuzer] 65918: [WIN32K] Fix calculation of the source point in EngCopyBits for complex clipping regions. One might assume that this function is so essential, that it would do at least the most b...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 31 15:15:39 2014 New Revision: 65918 URL: http://svn.reactos.org/svn/reactos?rev=65918&view=rev Log: [WIN32K] Fix calculation of the source point in EngCopyBits for complex clipping regions. One might assume that this function is so essential, that it would do at least the most basic stuff correctly, but ... Modified: trunk/reactos/win32ss/gdi/eng/copybits.c Modified: trunk/reactos/win32ss/gdi/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/copybits.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/copybits.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/copybits.c [iso-8859-1] Wed Dec 31 15:15:39 2014 @@ -146,8 +146,8 @@ { RECTL_bIntersectRect(&BltInfo.DestRect, prcl, DestRect); - BltInfo.SourcePoint.x = SourcePoint->x + prcl->left - DestRect->left; - BltInfo.SourcePoint.y = SourcePoint->y + prcl->top - DestRect->top; + BltInfo.SourcePoint.x = SourcePoint->x + BltInfo.DestRect.left - DestRect->left; + BltInfo.SourcePoint.y = SourcePoint->y + BltInfo.DestRect.top - DestRect->top; if (!DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo)) {

9 years, 8 months

[pschweitzer] 65917: [FREELDR] Display an error message with the file name in case we cannot get a file size over PXE. This makes the error message "(../../boot/freeldr/freeldr/fs/pxe.c:107) err: P...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Dec 31 13:04:04 2014 New Revision: 65917 URL: http://svn.reactos.org/svn/reactos?rev=65917&view=rev Log: [FREELDR] Display an error message with the file name in case we cannot get a file size over PXE. This makes the error message "(../../boot/freeldr/freeldr/fs/pxe.c:107) err: PxeCall(0x25, 0000E8DE) failed with exit=1 status=0x1" in case of PXE boot less dramatic: it is expected not to find NTBOOTDD.SYS Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Wed Dec 31 13:04:04 2014 @@ -162,7 +162,11 @@ sizeData.ServerIPAddress = _ServerIP; strncpy((CHAR*)sizeData.FileName, Path, sizeof(sizeData.FileName)); if (!CallPxe(PXENV_TFTP_GET_FSIZE, &sizeData)) + { + ERR("Failed to get '%s' size\n", Path); return EIO; + } + _FileSize = sizeData.FileSize; if (_FileSize < 1024 * 1024) {

9 years, 8 months

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 December 2014