Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[bfreisen] 68584: [MSPAINT_NEW] - use optimal buffer size to load null terminated strings using LoadString - add printing-related menu entries and dialogs (no printing functionality yet)

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Fri Jul 31 17:33:21 2015 New Revision: 68584 URL: http://svn.reactos.org/svn/reactos?rev=68584&view=rev Log: [MSPAINT_NEW] - use optimal buffer size to load null terminated strings using LoadString - add printing-related menu entries and dialogs (no printing functionality yet) Modified: trunk/reactos/base/applications/mspaint_new/definitions.h trunk/reactos/base/applications/mspaint_new/lang/bg-BG.rc trunk/reactos/base/applications/mspaint_new/lang/cs-CZ.rc trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc trunk/reactos/base/applications/mspaint_new/lang/en-US.rc trunk/reactos/base/applications/mspaint_new/lang/es-ES.rc trunk/reactos/base/applications/mspaint_new/lang/eu-ES.rc trunk/reactos/base/applications/mspaint_new/lang/fr-FR.rc trunk/reactos/base/applications/mspaint_new/lang/he-IL.rc trunk/reactos/base/applications/mspaint_new/lang/hu-HU.rc trunk/reactos/base/applications/mspaint_new/lang/it-IT.rc trunk/reactos/base/applications/mspaint_new/lang/ja-JP.rc trunk/reactos/base/applications/mspaint_new/lang/nl-NL.rc trunk/reactos/base/applications/mspaint_new/lang/no-NO.rc trunk/reactos/base/applications/mspaint_new/lang/pl-PL.rc trunk/reactos/base/applications/mspaint_new/lang/pt-BR.rc trunk/reactos/base/applications/mspaint_new/lang/pt-PT.rc trunk/reactos/base/applications/mspaint_new/lang/ro-RO.rc trunk/reactos/base/applications/mspaint_new/lang/ru-RU.rc trunk/reactos/base/applications/mspaint_new/lang/sk-SK.rc trunk/reactos/base/applications/mspaint_new/lang/sq-AL.rc trunk/reactos/base/applications/mspaint_new/lang/sv-SE.rc trunk/reactos/base/applications/mspaint_new/lang/tr-TR.rc trunk/reactos/base/applications/mspaint_new/lang/uk-UA.rc trunk/reactos/base/applications/mspaint_new/lang/zh-CN.rc trunk/reactos/base/applications/mspaint_new/lang/zh-TW.rc trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -50,11 +50,15 @@ #define IDM_FILESAVE 203 #define IDM_FILESAVEAS 204 +#define IDM_FILEPAGEVIEW 206 +#define IDM_FILEPAGESETUP 207 +#define IDM_FILEPRINT 208 + #define IDM_FILEASWALLPAPERPLANE 210 #define IDM_FILEASWALLPAPERCENTERED 211 #define IDM_FILEASWALLPAPERSTRETCHED 212 -#define IDM_FILEEXIT 205 +#define IDM_FILEEXIT 215 #define IDM_EDITUNDO 220 #define IDM_EDITREDO 221 Modified: trunk/reactos/base/applications/mspaint_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/bg-BG.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&ÐÑÐ²Ð°ÑÑÐ½Ðµ...\tAlt+tCtrl+O", IDM_FILEOPEN MENUITEM "&ÐÐ°Ð¿Ð¸Ñ\tCtrl+S", IDM_FILESAVE MENUITEM "ÐÐ°Ð¿Ð¸Ñ &ÐºÐ°ÑÐ¾...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "ÐÐ¾ÑÑÐ°Ð²ÑÐ½Ðµ ÐºÐ°ÑÐ¾ ÑÐ°Ð¿ÐµÑ (Ð½Ð°ÑÑÐµÐ»ÐµÐ½Ð¾)", IDM_FILEASWALLPAPERPLANE MENUITEM "ÐÐ¾ÑÑÐ°Ð²ÑÐ½Ðµ ÐºÐ°ÑÐ¾ ÑÐ°Ð¿ÐµÑ (Ð² ÑÑÐµÐ´Ð°ÑÐ°)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/cs-CZ.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&OtevÅÃt...\tCtrl+O", IDM_FILEOPEN MENUITEM "UloÅ¾it\tCtrl+S", IDM_FILESAVE MENUITEM "UloÅ¾it jako...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Nastavit jako pozadÃ (vedle sebe)", IDM_FILEASWALLPAPERPLANE MENUITEM "Nastavit jako pozadÃ (na stÅed)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "Ãffnen...\tStrg+O", IDM_FILEOPEN MENUITEM "Speichern\tStrg+S", IDM_FILESAVE MENUITEM "Speichern unter...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Seitenansicht", IDM_FILEPAGEVIEW + MENUITEM "Seite einrichten...", IDM_FILEPAGESETUP + MENUITEM "Drucken...\tStrg+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Als Hintergrund (FlÃ¤che)", IDM_FILEASWALLPAPERPLANE MENUITEM "Als Hintergrund (Zentriert)", IDM_FILEASWALLPAPERCENTERED Modified: trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&Open...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Save\tCtrl+S", IDM_FILESAVE MENUITEM "Save &as...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Set as wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE MENUITEM "Set as wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED Modified: trunk/reactos/base/applications/mspaint_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/en-US.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&Open...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Save\tCtrl+S", IDM_FILESAVE MENUITEM "Save &as...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Set as wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE MENUITEM "Set as wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED Modified: trunk/reactos/base/applications/mspaint_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/es-ES.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -17,6 +17,10 @@ MENUITEM "Abrir...\tCtrl+O", IDM_FILEOPEN MENUITEM "Guardar\tCtrl+S", IDM_FILESAVE MENUITEM "Guardar como...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Fondo de pantalla (normal)", IDM_FILEASWALLPAPERPLANE MENUITEM "Fondo de pantalla (centrado)", IDM_FILEASWALLPAPERCENTERED @@ -215,4 +219,5 @@ IDS_PERCENTAGE "El porcentaje debe de estar entre 1 y 500." IDS_ANGLE "El Ã¡ngulo debe de estar entre -89 y 89." IDS_LOADERRORTEXT "No se pudo cargar el archivo %s." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/eu-ES.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -8,6 +8,10 @@ MENUITEM "Ireki...\tCtrl+O", IDM_FILEOPEN MENUITEM "Gorde\tCtrl+S", IDM_FILESAVE MENUITEM "Gorde honela...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Ezarri azteko plano gisa (Lauza moduan)", IDM_FILEASWALLPAPERPLANE MENUITEM "Ezarri azteko plano gisa (erdian)", IDM_FILEASWALLPAPERCENTERED @@ -206,4 +210,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/fr-FR.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -8,6 +8,10 @@ MENUITEM "&Ouvrir...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Enregistrer\tCtrl+S", IDM_FILESAVE MENUITEM "Enregistrer &sous...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Choisir comme image d'arriÃ¨re-plan (mosaÃ¯que)", IDM_FILEASWALLPAPERPLANE MENUITEM "Choisir comme image d'arriÃ¨re-plan (centrÃ©e)", IDM_FILEASWALLPAPERCENTERED @@ -206,4 +210,5 @@ IDS_PERCENTAGE "Le pourcentage doit Ãªtre entre 1 et 500." IDS_ANGLE "L'angle doit Ãªtre entre -89 et 89." IDS_LOADERRORTEXT "Le fichier %s n'a pas pu Ãªtre chargÃ©." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/he-IL.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -8,6 +8,10 @@ MENUITEM "&×¤×ª×\tCtrl+O", IDM_FILEOPEN MENUITEM "&×©×××¨\tCtrl+S", IDM_FILESAVE MENUITEM "×©×××¨ ××©&×...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "×§××¢ ××¨×§×¢ ×©×××× ××¢×××× (×¤×¨××©)", IDM_FILEASWALLPAPERPLANE MENUITEM "×§××¢ ××¨×§×¢ ×©×××× ××¢×××× (××¨××)", IDM_FILEASWALLPAPERCENTERED @@ -206,4 +210,5 @@ IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." IDS_LOADERRORTEXT, "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/hu-HU.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -8,6 +8,10 @@ MENUITEM "Meg&nyitÃ¡s...\tCtrl+O", IDM_FILEOPEN MENUITEM "&MentÃ©s\tCtrl+S", IDM_FILESAVE MENUITEM "MentÃ©s mÃ¡&skÃ©nt...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "BeÃ¡llÃtÃ¡s tapÃ©takÃ©nt (mozaik)", IDM_FILEASWALLPAPERPLANE MENUITEM "BeÃ¡llÃtÃ¡s tapÃ©takÃ©nt (kÃ¶zÃ©pre)", IDM_FILEASWALLPAPERCENTERED @@ -206,4 +210,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/it-IT.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "Apri...\tCtrl+F12", IDM_FILEOPEN MENUITEM "Salva\tMaiusc+F12", IDM_FILESAVE MENUITEM "Salva con nome...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Imposta come sfondo (normale)", IDM_FILEASWALLPAPERPLANE MENUITEM "Imposta come sfondo (centrata)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "La percentuale deve essere compresa tra 1 e 500." IDS_ANGLE "L'angolo deve essere compreso tra -89 e 89." IDS_LOADERRORTEXT "l file %s non puÃ² essere caricato." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/ja-JP.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "éã(&O)\tCtrl+O", IDM_FILEOPEN MENUITEM "ä¸æ¸ãä¿å(&S)\tCtrl+S", IDM_FILESAVE MENUITEM "ååãä»ãã¦ä¿å(&A)...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "èæ¯ã«è¨å® (ä¸¦ã¹ã¦è¡¨ç¤º)", IDM_FILEASWALLPAPERPLANE MENUITEM "èæ¯ã«è¨å® (ä¸å¤®ã«è¡¨ç¤º)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/nl-NL.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "Openen...\tCtrl+O", IDM_FILEOPEN MENUITEM "Opslaan\tCtrl+S", IDM_FILESAVE MENUITEM "Opslaan als...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Als achtergrond instellen (naast elkaar)", IDM_FILEASWALLPAPERPLANE MENUITEM "Als achtergrond instellen (gecentreerd)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/no-NO.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&Ãpne...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Lagre\tCtrl+S", IDM_FILESAVE MENUITEM "Lagre &som...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Bruk som bakgrunn (sidestilt)", IDM_FILEASWALLPAPERPLANE MENUITEM "Bruk som bakgrunn (midstilt)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/pl-PL.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -17,6 +17,10 @@ MENUITEM "&OtwÃ³rz...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Zapisz\tCtrl+S", IDM_FILESAVE MENUITEM "Zapisz &jako...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Ustaw jako tapetÄ (sÄsiadujÄce)", IDM_FILEASWALLPAPERPLANE MENUITEM "Ustaw jako tapetÄ (wyÅrodkowana)", IDM_FILEASWALLPAPERCENTERED @@ -215,4 +219,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/pt-BR.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "A&brir...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Salvar\tCtrl+S", IDM_FILESAVE MENUITEM "Salvar &como...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Definir como plano de fundo (Lado a lado)", IDM_FILEASWALLPAPERPLANE MENUITEM "Definir como plano de fundo (Centralizado)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/pt-PT.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&Abrir...\tCtrl+A", IDM_FILEOPEN MENUITEM "&Guardar\tCtrl+G", IDM_FILESAVE MENUITEM "Guardar &como...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Definir como fundo (Mosaico)", IDM_FILEASWALLPAPERPLANE MENUITEM "Definir como fundo (Centrado)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/ro-RO.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&Deschidereâ¦\tCtrl+O", IDM_FILEOPEN MENUITEM "&PÄstreazÄ\tCtrl+S", IDM_FILESAVE MENUITEM "PÄst&rare Ã®nâ¦", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Decor de birou (Ã®n c&arou)", IDM_FILEASWALLPAPERPLANE MENUITEM "Decor de birou (&centrat)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "Procentajul trebuie sÄ fie Ã®ntre 1 Èi 500." IDS_ANGLE "Unghiul trebuie sÄ fie Ã®ntre -89 Èi 89." IDS_LOADERRORTEXT "FiÈierul %s nu poate fi Ã®ncÄrcat." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/ru-RU.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -8,6 +8,10 @@ MENUITEM "&ÐÑÐºÑÑÑÑ...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ\tCtrl+S", IDM_FILESAVE MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ &ÐºÐ°Ðº...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÐ¾Ð½Ð¾Ð²ÑÐ¼ ÑÐ¸ÑÑÐ½ÐºÐ¾Ð¼ (&Ð·Ð°Ð¼Ð¾ÑÑÐ¸ÑÑ)", IDM_FILEASWALLPAPERPLANE MENUITEM "Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÐ¾Ð½Ð¾Ð²ÑÐ¼ ÑÐ¸ÑÑÐ½ÐºÐ¾Ð¼ (Ð¿Ð¾ Ñ&ÐµÐ½ÑÑÑ)", IDM_FILEASWALLPAPERCENTERED @@ -206,4 +210,5 @@ IDS_PERCENTAGE, "ÐÑÐ¾ÑÐµÐ½Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð² Ð¸Ð½ÑÐµÑÐ²Ð°Ð»Ðµ Ð¾Ñ 1 Ð´Ð¾ 500." IDS_ANGLE, "Ð£Ð³Ð¾Ð» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð² Ð¸Ð½ÑÐµÑÐ²Ð°Ð»Ðµ Ð¾Ñ -89 Ð´Ð¾ 89." IDS_LOADERRORTEXT, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ°Ð¹Ð» %s." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/sk-SK.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -17,6 +17,10 @@ MENUITEM "&OtvoriÅ¥...\tCtrl+O", IDM_FILEOPEN MENUITEM "&UloÅ¾iÅ¥\tCtrl+S", IDM_FILESAVE MENUITEM "UloÅ¾iÅ¥ &ako...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "NastaviÅ¥ ako pozadie (vydlÃ¡Å¾denÃ©)", IDM_FILEASWALLPAPERPLANE MENUITEM "NastaviÅ¥ ako pozadie (v strede)", IDM_FILEASWALLPAPERCENTERED @@ -215,4 +219,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/sq-AL.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&Hap...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Ruaj\tCtrl+S", IDM_FILESAVE MENUITEM "Ruaj &si...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Vere si wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE MENUITEM "Vere si wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "PÃ«rqindja duhet tÃ« jetÃ« nÃ« mes 1 dhe 500." IDS_ANGLE "KÃ«ndi duhet tÃ« jetÃ« nÃ« mes -89 dhe 89." IDS_LOADERRORTEXT "Dokumenti %s nuk mund te ngarkohej." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/sv-SE.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -8,6 +8,10 @@ MENUITEM "&Ãppna...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Spara\tCtrl+S", IDM_FILESAVE MENUITEM "Spara so&m...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Ange som skrivbordsbakgrund (kakelklÃ¤dd)", IDM_FILEASWALLPAPERPLANE MENUITEM "Ange som skrivbordsbakgrund (centrerad)", IDM_FILEASWALLPAPERCENTERED @@ -206,4 +210,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/tr-TR.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "&AÃ§...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Sakla\tCtrl+S", IDM_FILESAVE MENUITEM "Ay&rÄ± Sakla...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "&DÃ¶Åeyerek Duvar KaÄÄ±dÄ± Yap", IDM_FILEASWALLPAPERPLANE MENUITEM "&Ortalayarak Duvar KaÄÄ±dÄ± Yap", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "YÃ¼zde 1'den 500'e dek olmalÄ±dÄ±r." IDS_ANGLE "AÃ§Ä± -89'dan 89'a dek olmalÄ±dÄ±r." IDS_LOADERRORTEXT "%s kÃ¼tÃ¼ÄÃ¼ yÃ¼klenemedi." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/uk-UA.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "Ð&ÑÐ´ÐºÑÐ¸ÑÐ¸...\tCtrl+O", IDM_FILEOPEN MENUITEM "Ð&Ð±ÐµÑÐµÐ³ÑÐ¸\tCtrl+S", IDM_FILESAVE MENUITEM "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ &ÑÐº...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "&ÐÐ°Ð¼Ð¾ÑÑÐ¸ÑÐ¸ ÑÐ¾Ð±Ð¾ÑÐ¸Ð¹ ÑÑÑÐ» Windows", IDM_FILEASWALLPAPERPLANE MENUITEM "ÐÐ¾ Ñ&ÐµÐ½ÑÑÑ ÑÐ¾Ð±Ð¾ÑÐ¾Ð³Ð¾ ÑÑÐ¾Ð»Ð° Windows", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/zh-CN.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "æå¼... (&O)\tCtrl+O", IDM_FILEOPEN MENUITEM "ä¿å(&S)\tCtrl+S", IDM_FILESAVE MENUITEM "å¦åä¸º... (&A)", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "ä¿åä¸ºå£çº¸ (æ®é)", IDM_FILEASWALLPAPERPLANE MENUITEM "ä¿åä¸ºå£çº¸ (å±ä¸)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "ç¾åæ¯å¿é¡»å¨1è³500ä¹é´ã" IDS_ANGLE "è¯¥è§åº¦å¿é¡»å¨-89ä¸89ä¹é´ã" IDS_LOADERRORTEXT "è¯¥æä»¶ %s æ æ³å è½½ã" -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/lang/zh-TW.rc [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -16,6 +16,10 @@ MENUITEM "éå... (&O)\tCtrl+O", IDM_FILEOPEN MENUITEM "å²å(&S)\tCtrl+S", IDM_FILESAVE MENUITEM "å¦åçº... (&A)", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Page View", IDM_FILEPAGEVIEW + MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "å²åçºå£ç´ (æ®é)", IDM_FILEASWALLPAPERPLANE MENUITEM "å²åçºå£ç´ (å±ä¸)", IDM_FILEASWALLPAPERCENTERED @@ -214,4 +218,5 @@ IDS_PERCENTAGE "The percentage must be between 1 and 500." IDS_ANGLE "The angle must be between -89 and 89." IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" +END Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Fri Jul 31 17:33:21 2015 @@ -196,11 +196,14 @@ { if (!imageModel.IsImageSaved()) { - TCHAR programname[20]; - TCHAR saveprompttext[100]; - TCHAR temptext[500]; - LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); - LoadString(hProgInstance, IDS_SAVEPROMPTTEXT, saveprompttext, SIZEOF(saveprompttext)); + TCHAR* tempptr; + TCHAR programname[LoadString(hProgInstance, IDS_PROGRAMNAME, (LPTSTR)&tempptr, 0) + 1]; + CopyMemory(programname, tempptr, sizeof(programname) - sizeof(TCHAR)); + programname[SIZEOF(programname) - 1] = (TCHAR)'\0'; + TCHAR saveprompttext[LoadString(hProgInstance, IDS_SAVEPROMPTTEXT, (LPTSTR)&tempptr, 0) + 1]; + CopyMemory(saveprompttext, tempptr, sizeof(saveprompttext) - sizeof(TCHAR)); + saveprompttext[SIZEOF(saveprompttext) - 1] = (TCHAR)'\0'; + TCHAR temptext[SIZEOF(saveprompttext) + _tcslen(filename)]; _stprintf(temptext, saveprompttext, filename); switch (MessageBox(temptext, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { @@ -393,6 +396,22 @@ break; case IDM_FILESAVEAS: saveImage(FALSE); + break; + case IDM_FILEPAGESETUP: + // DUMMY: Shows the dialog only, no functionality + PAGESETUPDLG psd; + ZeroMemory(&psd, sizeof(psd)); + psd.lStructSize = sizeof(psd); + psd.hwndOwner = m_hWnd; + PageSetupDlg(&psd); + break; + case IDM_FILEPRINT: + // DUMMY: Shows the dialog only, no functionality + PRINTDLG pd; + ZeroMemory(&pd, sizeof(pd)); + pd.lStructSize = sizeof(pd); + pd.hwndOwner = m_hWnd; + PrintDlg(&pd); break; case IDM_FILEASWALLPAPERPLANE: SetWallpaper(filepathname, 1, 1);

9 years, 4 months

[jimtabor] 68583: [NtGdi] - Fix locking.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jul 31 06:55:22 2015 New Revision: 68583 URL: http://svn.reactos.org/svn/reactos?rev=68583&view=rev Log: [NtGdi] - Fix locking. Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Fri Jul 31 06:55:22 2015 @@ -60,13 +60,16 @@ INT y, LPPOINT pptOut) { + BOOL Ret; PDC dc; if (!(dc = DC_LockDc(hdc))) { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - return IntGdiMoveToEx(dc, x, y, pptOut, TRUE); + Ret = IntGdiMoveToEx(dc, x, y, pptOut, TRUE); + DC_UnlockDc(dc); + return Ret; } // Should use Fx in pt

9 years, 4 months

[jimtabor] 68582: [Win32SS] - Start ordering functions into separate files.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 30 07:49:09 2015 New Revision: 68582 URL: http://svn.reactos.org/svn/reactos?rev=68582&view=rev Log: [Win32SS] - Start ordering functions into separate files. Added: trunk/reactos/win32ss/user/ntuser/nonclient.c - copied, changed from r68579, trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/scrollex.c - copied, changed from r68579, trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/userfuncs.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… Copied: trunk/reactos/win32ss/user/ntuser/nonclient.c (from r68579, trunk/reactos/win32ss/user/ntuser/defwnd.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… Copied: trunk/reactos/win32ss/user/ntuser/scrollex.c (from r68579, trunk/reactos/win32ss/user/ntuser/painting.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu…

9 years, 4 months

[aandrejevic] 68581: [NTVDM] - Combine free blocks after resizing. - Fix the LastParagraph value in the PSP.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Jul 29 02:03:48 2015 New Revision: 68581 URL: http://svn.reactos.org/svn/reactos?rev=68581&view=rev Log: [NTVDM] - Combine free blocks after resizing. - Fix the LastParagraph value in the PSP. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Wed Jul 29 02:03:48 2015 @@ -292,7 +292,8 @@ NewSize); /* Just split the block */ - NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); + NextSegment = Segment + NewSize + 1; + NextMcb = SEGMENT_TO_MCB(NextSegment); NextMcb->BlockType = Mcb->BlockType; NextMcb->Size = Mcb->Size - NewSize - 1; NextMcb->OwnerPsp = 0; @@ -300,6 +301,9 @@ /* Update the MCB */ Mcb->BlockType = 'M'; Mcb->Size = NewSize; + + /* Combine this free block with adjoining free blocks */ + DosCombineFreeBlocks(NextSegment); } Done: Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Wed Jul 29 02:03:48 2015 @@ -198,7 +198,7 @@ PspBlock->Exit[1] = 0x20; /* Set the number of the last paragraph */ - PspBlock->LastParagraph = Segment + ProgramSize - 1; + PspBlock->LastParagraph = Segment + ProgramSize; /* Save the interrupt vectors */ PspBlock->TerminateAddress = IntVecTable[0x22];

9 years, 4 months

[dquintana] 68580: [EXPLORER] * Rework the WIN7_COMPAT_MODE into actually just disabling the incompatible functions, and introduce WIN7_DEBUG_MODE which does the rest of the "hacks" I used to ease ...

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Jul 29 01:29:29 2015 New Revision: 68580 URL: http://svn.reactos.org/svn/reactos?rev=68580&view=rev Log: [EXPLORER] * Rework the WIN7_COMPAT_MODE into actually just disabling the incompatible functions, and introduce WIN7_DEBUG_MODE which does the rest of the "hacks" I used to ease development. Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Wed Jul 29 01:29:29 2015 @@ -59,7 +59,7 @@ } } -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE static BOOL SetShellReadyEvent(IN LPCTSTR lpEventName) { @@ -95,7 +95,9 @@ if (!SystemParametersInfo(SPI_SETMINIMIZEDMETRICS, sizeof(mm), &mm, 0)) ERR("SystemParametersInfo failed with %lu\n", GetLastError()); } - +#endif + +#if !WIN7_COMPAT_MODE static INT StartWithCommandLine(IN HINSTANCE hInstance) { @@ -140,9 +142,11 @@ InitCommonControls(); OleInitialize(NULL); +#if !WIN7_DEBUG_MODE + ProcessStartupItems(); +#endif + #if !WIN7_COMPAT_MODE - ProcessStartupItems(); - /* Initialize shell dde support */ _ShellDDEInit(TRUE); #endif @@ -156,7 +160,7 @@ CComPtr<ITrayWindow> Tray; CreateTrayWindow(&Tray); -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE /* This not only hides the minimized window captions in the bottom left screen corner, but is also needed in order to receive HSHELL_* notification messages (which are required for taskbar @@ -175,12 +179,12 @@ if (Tray != NULL) { TrayMessageLoop(Tray); -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE HideMinimizedWindows(FALSE); #endif } -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE if (hShellDesktop != NULL) DesktopDestroyShellWindow(hShellDesktop); #endif @@ -201,17 +205,17 @@ IN LPTSTR lpCmdLine, IN INT nCmdShow) { -#if !WIN7_COMPAT_MODE - BOOL CreateShellDesktop = FALSE; - - TRACE("Explorer starting... Commandline: %S\n", lpCmdLine); - /* * Set our shutdown parameters: we want to shutdown the very last, * but before any TaskMgr instance (which has a shutdown level of 1). */ SetProcessShutdownParameters(2, 0); +#if !WIN7_COMPAT_MODE + BOOL CreateShellDesktop = FALSE; + + TRACE("Explorer starting... Commandline: %S\n", lpCmdLine); + if (GetShellWindow() == NULL) CreateShellDesktop = TRUE; Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Wed Jul 29 01:29:29 2015 @@ -2,6 +2,12 @@ #define _EXPLORER_PRECOMP__H_ #define WIN7_COMPAT_MODE 0 +#define WIN7_DEBUG_MODE 0 + +#if WIN7_DEBUG_MODE && !WIN7_COMPAT_MODE +#undef WIN7_COMPAT_MODE +#define WIN7_COMPAT_MODE 1 +#endif #include <stdio.h> #include <tchar.h> Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Wed Jul 29 01:29:29 2015 @@ -986,7 +986,7 @@ VOID ResizeWorkArea() { -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE RECT rcTray, rcWorkArea; /* If monitor has changed then fix the previous monitors work area */ @@ -1098,7 +1098,7 @@ /* FIXME: Are there more flags? */ -#if WIN7_COMPAT_MODE +#if WIN7_DEBUG_MODE m_Position = ABE_LEFT; #else if (sr.Position > ABE_BOTTOM)

9 years, 4 months

[ekohl] 68579: [PARPORT] Reduce the minimum I/O-Range size for parallel ports to 4. This fixes port detection on VMware. Found by Colin Finck.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 26 19:30:21 2015 New Revision: 68579 URL: http://svn.reactos.org/svn/reactos?rev=68579&view=rev Log: [PARPORT] Reduce the minimum I/O-Range size for parallel ports to 4. This fixes port detection on VMware. Found by Colin Finck. Modified: trunk/reactos/drivers/parallel/parport/fdo.c Modified: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Sun Jul 26 19:30:21 2015 @@ -161,7 +161,7 @@ if (DeviceExtension->BaseAddress == 0) { - if (PartialDescriptor->u.Port.Length < 8) + if (PartialDescriptor->u.Port.Length < 4) return STATUS_INSUFFICIENT_RESOURCES; DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart;

9 years, 5 months

[tfaber] 68578: [ROSAUTOTEST] - When directly submitting the results to the web service, make sure to URL-encode the test log, or & signs will terminate the log and make Testman see the test as cra...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 26 10:02:03 2015 New Revision: 68578 URL: http://svn.reactos.org/svn/reactos?rev=68578&view=rev Log: [ROSAUTOTEST] - When directly submitting the results to the web service, make sure to URL-encode the test log, or & signs will terminate the log and make Testman see the test as crashed (and have all other kinds of possible consequences) Modified: trunk/rostests/rosautotest/CWebService.cpp Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Sun Jul 26 10:02:03 2015 @@ -234,7 +234,7 @@ Data += "&suiteid="; Data += SuiteID; Data += "&log="; - Data += TestInfo->Log; + Data += EscapeString(TestInfo->Log); Response.reset(DoRequest(Data));

9 years, 5 months

[tfaber] 68577: [WS2_32_APITEST] - Apparently doesntexist.reactos.org... exists

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 26 09:26:29 2015 New Revision: 68577 URL: http://svn.reactos.org/svn/reactos?rev=68577&view=rev Log: [WS2_32_APITEST] - Apparently doesntexist.reactos.org... exists Modified: trunk/rostests/apitests/ws2_32/getaddrinfo.c Modified: trunk/rostests/apitests/ws2_32/getaddrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/getaddrin… ============================================================================== --- trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] Sun Jul 26 09:26:29 2015 @@ -54,7 +54,7 @@ { { "", LocalAddress }, { " ", NULL }, - { "doesntexist.reactos.org", NULL }, + { "doesntexist.example.com", NULL }, { "localhost", "127.0.0.1" }, { "localhost:80", NULL }, { "7.8.9.10", "7.8.9.10", AI_NUMERICHOST },

9 years, 5 months

[tfaber] 68576: [USER32_WINETEST] - Skip test_paintingloop instead of test_paint_messages? Grml ROSTESTS-18

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 26 09:11:08 2015 New Revision: 68576 URL: http://svn.reactos.org/svn/reactos?rev=68576&view=rev Log: [USER32_WINETEST] - Skip test_paintingloop instead of test_paint_messages? Grml ROSTESTS-18 Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sun Jul 26 09:11:08 2015 @@ -15035,15 +15035,15 @@ { init_tests(); test_scrollwindowex(); + test_paint_messages(); #ifdef __REACTOS__ if (!winetest_interactive && !strcmp(winetest_platform, "windows")) { - skip("ROSTESTS-184: Skipping user3232_winetest:msg_paint test_paint_messages because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n"); + skip("ROSTESTS-185: Skipping user32_winetest:msg_paint test_paintingloop because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n"); } else #endif - test_paint_messages(); test_paintingloop(); cleanup_tests(); }

9 years, 5 months

[tfaber] 68575: [USER32_WINETEST] - Skip user32:msg_paint test_paint_messages if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further ROSTESTS-185 ONLINE-4...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 26 08:41:13 2015 New Revision: 68575 URL: http://svn.reactos.org/svn/reactos?rev=68575&view=rev Log: [USER32_WINETEST] - Skip user32:msg_paint test_paint_messages if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further ROSTESTS-185 ONLINE-441 ROSTESTS-184 Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sun Jul 26 08:41:13 2015 @@ -15035,6 +15035,14 @@ { init_tests(); test_scrollwindowex(); +#ifdef __REACTOS__ + if (!winetest_interactive && + !strcmp(winetest_platform, "windows")) + { + skip("ROSTESTS-184: Skipping user3232_winetest:msg_paint test_paint_messages because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n"); + } + else +#endif test_paint_messages(); test_paintingloop(); cleanup_tests();

9 years, 5 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 July 2015