Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[akhaldi] 70357: [TRANSLATIONS] Romanian translation update by Ștefan Fulea. CORE-10676
by akhaldi＠svn.reactos.org 16 Dec '15

16 Dec '15

Author: akhaldi Date: Wed Dec 16 10:22:00 2015 New Revision: 70357 URL: http://svn.reactos.org/svn/reactos?rev=70357&view=rev Log: [TRANSLATIONS] Romanian translation update by Ștefan Fulea. CORE-10676 Added: trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc (with props) trunk/reactos/base/applications/cmdutils/clip/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/cmdutils/clip/clip.rc trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/shell/explorer/lang/ro-RO.rc trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc trunk/reactos/media/rapps/air.txt trunk/reactos/media/rapps/dilinuxreader.txt trunk/reactos/media/rapps/everythingse.txt trunk/reactos/media/rapps/freestopwatch.txt trunk/reactos/media/rapps/opera9.txt trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc trunk/reactos/win32ss/user/user32/lang/ro-RO.rc Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -27,6 +27,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif Added: trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -0,0 +1,65 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +ID_ACCEL ACCELERATORS +BEGIN + VK_DELETE, CMD_DELETE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&FiÈier" + BEGIN + MENUITEM "&Deschidereâ¦", CMD_OPEN + MENUITEM "PÄst&rare caâ¦", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "I&eÈire", CMD_EXIT + END + POPUP "&Editare" + BEGIN + MENUITEM "Èt&erge\tDel", CMD_DELETE + END + POPUP "&AfiÈare" + BEGIN + MENUITEM "&AutomatÄ", CMD_AUTOMATIC + END + POPUP "Aj&utor" + BEGIN + MENUITEM "&Manualâ¦", CMD_HELP + MENUITEM SEPARATOR + MENUITEM "&Despreâ¦", CMD_ABOUT + END +END + +STRINGTABLE +BEGIN + STRING_CLIPBOARD "Clipboard" + STRING_DELETE_MSG "EliminÄ conÈinutul din Clipboard?" + STRING_DELETE_TITLE "CurÄÈÄ Clipboard" + STRING_FORMAT_NT "FiÈiere clipboard pentru ReactOS (*.clp)" + STRING_FORMAT_GEN "FiÈiere clipboard (*.clp)" +END + +STRINGTABLE +BEGIN + STRING_CF_UNKNOWN "Format nespecificat" + STRING_CF_TEXT "Text" + STRING_CF_BITMAP "Bitmap" + STRING_CF_OEMTEXT "Text OEM" + STRING_CF_UNICODETEXT "Text unicode" + STRING_CF_DIB "Bitmap DIB" + STRING_CF_LOCALE "Date locale" + STRING_CF_ENHMETAFILE "MetafiÈier Ã®mbunÄtÄÈit" + STRING_CF_METAFILEPICT "MetafiÈier" + STRING_CF_PALETTE "PaletÄ de culori" + STRING_CF_DIBV5 "Bitmap DIB (versiune 5)" + STRING_CF_SYLK "Format de legÄturÄ simbolicÄ" + STRING_CF_DIF "Format de transfer al datelor" + STRING_CF_HDROP "Abandon date" +END + +STRINGTABLE +BEGIN + ERROR_UNSUPPORTED_FORMAT "Ãn clipboard sunt date Ã®ntr-un format care nu poate fi afiÈat." + ERROR_INVALID_FILE_FORMAT "The selected file is not a valid clipboard file." +END Propchange: trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/clip/clip.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -22,6 +22,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif Added: trunk/reactos/base/applications/cmdutils/clip/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/cmdutils/clip/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -0,0 +1,9 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nTastaÈi ""CLIP /?"" pentru informaÈiile de utilizare.\n" + IDS_HELP "\nRedirecÈioneazÄ Ã®n clipboard ieÈirea programelor linie-de-comandÄ.\n\n\ +CLIP [/?]\n\n\ + /? AfiÈeazÄ acest mesaj.\n" +END Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -143,20 +143,20 @@ IDD_FIND_DIALOG DIALOGEX 30, 73, 236, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Find" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Find what:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP +CAPTION "GÄsire" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&GÄseÈte:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP EDITTEXT IDC_TXT_FIND_TEXT, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_GROUP - CONTROL "Match &whole word only", IDC_CBX_FIND_WHOLE_WORD_ONLY, + CONTROL "&Doar pentru Ã®ntreg cuvÃ¢ntul", IDC_CBX_FIND_WHOLE_WORD_ONLY, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12 - CONTROL "Match &case", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 - GROUPBOX "Direction", IDC_STATIC, 107, 26, 68, 28 - CONTROL "&Up", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 - CONTROL "&Down", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 - DEFPUSHBUTTON "Find &Next", IDOK, 182, 5, 50, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 182, 23, 50, 14, WS_GROUP - CONTROL "&Search from the beginning (Direction: Down) or end (Direction: Up)", IDC_CBX_FIND_FROM_BEGINNING, + CONTROL "Distinge &MAJ/min", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 + GROUPBOX "DirecÈie", IDC_STATIC, 107, 26, 68, 28 + CONTROL "S&us", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 + CONTROL "J&os", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 + DEFPUSHBUTTON "GÄseÈte &urmÄtorul", IDOK, 182, 5, 50, 14, WS_GROUP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 182, 23, 50, 14, WS_GROUP + CONTROL "&CautÄ de la Ã®nceput (DirecÈie: Sus) sau sfÃ¢rÈit (DirecÈie: Jos)", IDC_CBX_FIND_FROM_BEGINNING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 58, 231, 12 END Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -56,7 +56,7 @@ END POPUP "F&ormatare" BEGIN - MENUITEM "Mod te&xt Ã®ncadrat", CMD_WRAP + MENUITEM "Ãn&cadreazÄ liniile lungi", CMD_WRAP MENUITEM "&Fontâ¦", CMD_FONT END POPUP "&AfiÈare" @@ -187,5 +187,5 @@ STRING_LINE_COLUMN "Linia %d, coloana %d" STRING_PRINTERROR "Nu se poate imprima fiÈierul '%s'.\n\nAsiguraÈi-vÄ cÄ imprimanta este pornitÄ Èi configuratÄ corespunzÄtor." - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "Document text" END Modified: trunk/reactos/base/shell/explorer/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/r… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -102,50 +102,50 @@ IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 - LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 +CAPTION "Particularizare notificÄri" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS afiÈeazÄ pictograme pentru notificÄri active Èi urgente Èi le ascunde pe cele inactive. PuteÈi altera acest comportament pentru elementele din lista de mai jos.", IDC_STATIC, 6, 6, 220, 30 + LTEXT "SelectaÈi un element apoi alegeÈi comportamentul de notificare:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS - PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "&Valori implicite", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 122, 220, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 +CAPTION "Particularizare meniu de Pornire clasic" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Meniul âPornireâ", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "PuteÈi particulariza meniul âPornireâ prin adÄugarea sau eliminarea de elemente.", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "A&dÄugareâ¦", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "&Eliminareâ¦", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "A&vansate", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "&Ordonare", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 + LTEXT "Pentru a elimina Ã®nregistrÄri ale documentelor, programelor, Èi siturilor Web recent accesate, apÄsaÈi âCurÄÈÄâ.", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "&CurÄÈÄ", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "OpÈiuni avansate ale meniului âPornireâ:", IDC_STATIC, 8, 129, 150, 8 CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 122, 220, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 176, 220, 50, 14 } IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 +CAPTION "Avertisment nume fiÈier" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Ign&orÄ", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "&RedenumeÈte", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "N&u efectua aceastÄ verificare la pornire", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Ãn calculator existÄ un fiÈier sau dosar numit %s care poate cauza probleme Ã®n funcÈionarea corectÄ a anumitor aplicaÈii. Redenumirea sa Ã®n %s ar rezolva aceastÄ problemÄ. DoriÈi sÄ-l redenumiÈi acum?", IDC_STATIC, 34, 7, 224, 37 } IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 @@ -153,15 +153,15 @@ CAPTION "Advanced" FONT 8, "MS Shell Dlg" { - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 - AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 + GROUPBOX "OpÈiuni ale meniului âPornireâ ", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "&Deschide submeniurile cÃ¢nd mÄ opresc la ele cu indicatorul Èoricelului", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "&EvidenÈiazÄ programele nou instalate", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "Elemente ale meniului âPornireâ:", IDC_STATIC, 7, 53, 238, 8 CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE - GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 - LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 - AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 + GROUPBOX "Documente recente ", IDC_STATIC, 7, 133, 238, 56 + LTEXT "SelectaÈi aceastÄ opÈiune pentru a oferi un acces rapid la documentele recent accesate. CurÄÈarea acestei liste nu va Èterge documentele.", IDC_STATIC, 14, 144, 224, 21 + AUTOCHECKBOX "AfiÈeazÄ cele mai &recent accesate documente", IDC_RECENTLY, 14, 168, 147, 10 + PUSHBUTTON "&CurÄÈÄ lista", IDC_CLEAR, 182, 168, 55, 14 } IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 @@ -169,18 +169,18 @@ CAPTION "General" FONT 8, "MS Shell Dlg" { - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 + GROUPBOX "SelectaÈi o dimensiune de pictogramÄ pentru programe ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 + AUTORADIOBUTTON "Pictograme m&ari", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "Pictograme &mici", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "Programe ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "Meniul âPornireâ conÈine scurtÄturi la programele cele mai utilizate. CurÄÈÃ¢nd lista de scurtÄturi nu va Èterge programele.", IDC_STATIC, 14, 63, 224, 20 + LTEXT "N&umÄrul de programe Ã®n meniul âPornireâ:", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 + PUSHBUTTON "&CurÄÈÄ lista", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "AfiÈare Ã®n meniul âPornireâ ", IDC_STATIC, 7, 126, 238, 63 AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 Modified: trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "FreeLoader Debugger" + IDS_APP_TITLE "Program de depanare FreeLoader" IDS_HELLO "Salut, lume!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -119,7 +119,7 @@ LTEXT "NumÄr serial:", IDC_STATIC, 10, 55, 52, 8 LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 - AUTOCHECKBOX "Acesta este un calculator porta&bil", IDC_HWPPROP_PORTABLE, 17, 68, 115, 10, WS_GROUP | WS_TABSTOP + AUTOCHECKBOX "Acesta este un calculator porta&bil", IDC_HWPPROP_PORTABLE, 17, 68, 120, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Sta&rea de andocare este nespecificatÄ", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Calculatorul &este andocat", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 AUTORADIOBUTTON "Calculatorul n&u este andocat", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 Modified: trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -3,6 +3,6 @@ STRINGTABLE BEGIN - IDS_NTOBJFLD_NAME "SpaÈiu de nume Obiect NT" + IDS_NTOBJFLD_NAME "SpaÈiul de nume Obiect NT" IDS_REGISTRY_NAME "Registrul de sistem" END Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -268,10 +268,10 @@ STRINGTABLE BEGIN IDS_BACK "Ãnapoi la %s" - IDS_FORWARD "Forward to %s" -END - -STRINGTABLE -BEGIN - IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" -END + IDS_FORWARD "Ãnainte la %s" +END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|Ãnapoi|Ãnainte|Sus|CÄutare|Dosare|Mutare Ã®n|Copiere Ã®n|Ètergere|Desfacere|AfiÈÄri|Oprire|ÃmprospÄtare|AcasÄ|Conectare unitate de stocare|Deconectare|Favorite|Istoric|Pe tot ecranul|ProprietÄÈi|Decupare|Copiere|Lipire|OpÈiuni de dosar||" +END Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… ============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -31,9 +31,9 @@ IDS_NOTOLEMOD "FiÈierul nu pare a fi un modul OLE valid. Nu se poate Ã®nregistra controlul OLE." IDS_NOTOLEMODCAPTION "AdaugÄ un control" IDS_VERBMENU_OBJECT "&Obiect" - IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object" + IDS_VERBMENU_OBJECT_WITH_NAME "&Obiect %1" IDS_VERBMENU_CONVERT "&Convertireâ¦" - IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object" + IDS_VERBMENU_SINGLEVERB_OBJECT "&Obiect %1 %2" } STRINGTABLE Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -791,11 +791,11 @@ IDS_TTF_FILE "Font TrueType" IDS_OTF_FILE "Font OpenType" IDS_HLP_FILE "Manual de utilizare" - IDS_ICO_FILE "Icon" + IDS_ICO_FILE "PictogramÄ" IDS_INI_FILE "FiÈier de iniÈializare" IDS_LNK_FILE "ScurtÄturÄ" - IDS_PIF_FILE "NT VDM Program Information File" - IDS_SCR_FILE "Screen Saver" + IDS_PIF_FILE "FiÈier de informaÈii program NT VDM" + IDS_SCR_FILE "AnimaÈie regim de inactivitate" IDS_SYS_FILE "FiÈier de sistem" IDS_VXD_FILE "Pilot dispozitiv virtual" Modified: trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -25,11 +25,11 @@ STRINGTABLE BEGIN - // IDS_EMF_FILE "EMF Image" - IDS_GIF_FILE "GIF Image" - IDS_JPG_FILE "JPEG Image" - IDS_BMP_FILE "Bitmap Image" - IDS_PNG_FILE "PNG Image" - // IDS_TIF_FILE "TIF Image" - // IDS_WMF_FILE "WMF Image" + // IDS_EMF_FILE "Imagine EMF" + IDS_GIF_FILE "Imagine GIF" + IDS_JPG_FILE "Imagine JPEG" + IDS_BMP_FILE "Imagine bitmap" + IDS_PNG_FILE "Imagine PNG" + // IDS_TIF_FILE "Imagine TIF" + // IDS_WMF_FILE "Imagine WMF" END Modified: trunk/reactos/media/rapps/air.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/air.txt?rev=70… ============================================================================== --- trunk/reactos/media/rapps/air.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/air.txt [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -16,6 +16,11 @@ [Section.0407] Description = Mithilfe der Adobe AIR-Laufzeit kÃ¶nnen Entwickler den gleichen Code in native Anwendungen und Spiele einbinden. +[Section.0418] +License = Acord de licenÈiere Adobe Software +Description = Adobe AIR oferÄ programatorilor posibilitatea de a Ã®ncorpora Ã®n acelaÈi pachet aplicaÈii native Èi jocuri. +Size = 17,3 Mo + [Section.041f] License = Adobe YazÄ±lÄ±m Ruhsatlama AnlaÅmasÄ± Description = Adobe AIR yÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ geliÅtiricilere aynÄ± kodu Ã¶zgÃ¼n uygulamalara ve oyunlara paketlemeye olanak saÄlar. Modified: trunk/reactos/media/rapps/dilinuxreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dilinuxreader.… ============================================================================== --- trunk/reactos/media/rapps/dilinuxreader.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/dilinuxreader.txt [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -16,6 +16,11 @@ [Section.0407] Description = Eine einfache MÃ¶glichkeit zwischen Windows/ReactOS und Ext2/Ext3/Ext4, HFS und ReiserFS-Dateisystemen zu Ã¼berbrÃ¼cken. +[Section.0418] +License = GratuitÄ +Description = Un mod facil de acces Ã®ntre Windows/ReactOS Èi sistemele de fiÈiere Ext2/Ext3/Ext4, HFS Èi ReiserFS. +Size = 19,9 Mo + [Section.041f] Name = DiskInternals Linux Okuyucu License = Ãcretsiz Modified: trunk/reactos/media/rapps/everythingse.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/everythingse.t… ============================================================================== --- trunk/reactos/media/rapps/everythingse.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/everythingse.txt [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -16,6 +16,11 @@ [Section.0407] Description = Finde schnell Dateien und Ordner durch den Namen. +[Section.0418] +License = GratuitÄ +Description = LocalizeazÄ automat dupÄ nume fiÈiere Èi dosare. +Size = 907 ko + [Section.041f] Name = TÃ¼m Åeyler Arama Motoru License = Ãcretsiz Modified: trunk/reactos/media/rapps/freestopwatch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freestopwatch.… ============================================================================== --- trunk/reactos/media/rapps/freestopwatch.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/freestopwatch.txt [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -16,6 +16,11 @@ [Section.0407] Description = Eine flexible digitale Stoppuhr-Software. +[Section.0418] +License = GratuitÄ +Description = AplicaÈie flexibilÄ de cronometru digital. +Size = 1,0 Mo + [Section.041f] Name = Ãcretsiz SÃ¼reÃ¶lÃ§er License = Ãcretsiz Modified: trunk/reactos/media/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera9.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/opera9.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/opera9.txt [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -38,7 +38,7 @@ [Section.0418] License = GratuitÄ -Description = Navigatorul popular Opera cu multe funcÈionalitÄÈi avansate, incluzÃ¢nd poÈtÄ electronicÄ Èi un client de BitTorrent. +Description = Navigator popular cu multe funcÈionalitÄÈi avansate, incluzÃ¢nd poÈtÄ electronicÄ Èi client de BitTorrent. Size = 7,21 Mo [Section.0419] Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -3,8 +3,8 @@ STRINGTABLE BEGIN - IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" - IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_CAPTURE_MOUSE, "&CapteazÄ indicatorul de Èoricel" + IDS_RELEASE_MOUSE, "&ElibereazÄ indicatorul de Èoricel" IDS_VDM_MENU , "ReactOS &VDM" END Modified: trunk/reactos/win32ss/user/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/ro-RO.rc [iso-8859-1] Wed Dec 16 10:22:00 2015 @@ -71,7 +71,7 @@ IDS_YES "D&a" IDS_NO "N&u" IDS_CLOSE "Ã&nchide" - IDS_HELP "Manual" + IDS_HELP "&Manual" IDS_TRYAGAIN "&ReÃ®ncearcÄ" IDS_CONTINUE "&ContinuÄ" END

1 0

[tfaber] 70356: [NTOS:PNP] - Don't free NULL buffers returned from IopCaptureUnicodeString. CORE-10706 #resolve
by tfaber＠svn.reactos.org 16 Dec '15

16 Dec '15

Author: tfaber Date: Wed Dec 16 10:05:15 2015 New Revision: 70356 URL: http://svn.reactos.org/svn/reactos?rev=70356&view=rev Log: [NTOS:PNP] - Don't free NULL buffers returned from IopCaptureUnicodeString. CORE-10706 #resolve Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Wed Dec 16 10:05:15 2015 @@ -247,7 +247,10 @@ { /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); - ExFreePool(DeviceInstance.Buffer); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } } Status = IoGetDeviceInterfaces(&FilterGuid, DeviceObject, StackList.Flags, &SymbolicLinkList); @@ -317,14 +320,20 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePool(DeviceInstance.Buffer); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); - ExFreePool(DeviceInstance.Buffer); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } if (DeviceObject == NULL) { return STATUS_NO_SUCH_DEVICE; @@ -394,7 +403,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePool(TargetDeviceInstance.Buffer); + if (TargetDeviceInstance.Buffer != NULL) + { + ExFreePool(TargetDeviceInstance.Buffer); + } _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -406,13 +418,19 @@ TRUE)) { DeviceNode = IopRootDeviceNode; - ExFreePool(TargetDeviceInstance.Buffer); + if (TargetDeviceInstance.Buffer != NULL) + { + ExFreePool(TargetDeviceInstance.Buffer); + } } else { /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&TargetDeviceInstance); - ExFreePool(TargetDeviceInstance.Buffer); + if (TargetDeviceInstance.Buffer != NULL) + { + ExFreePool(TargetDeviceInstance.Buffer); + } if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; @@ -566,14 +584,20 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePool(DeviceInstance.Buffer); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); - ExFreePool(DeviceInstance.Buffer); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } if (DeviceObject == NULL) { return STATUS_NO_SUCH_DEVICE; @@ -647,7 +671,10 @@ /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); - ExFreePool(DeviceInstance.Buffer); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } if (DeviceObject == NULL) { return STATUS_NO_SUCH_DEVICE; @@ -689,7 +716,10 @@ /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); - ExFreePool(DeviceInstance.Buffer); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } if (DeviceObject == NULL) { return STATUS_NO_SUCH_DEVICE;

1 0

[hbelusca] 70355: [WIN32K:CLIPBOARD] - When cleaning the clipboard, cancel any pending delayed rendering and increment all the sequence&serial numbers. - Fix the clipboard access check when perform...
by hbelusca＠svn.reactos.org 16 Dec '15

16 Dec '15

Author: hbelusca Date: Wed Dec 16 00:26:27 2015 New Revision: 70355 URL: http://svn.reactos.org/svn/reactos?rev=70355&view=rev Log: [WIN32K:CLIPBOARD] - When cleaning the clipboard, cancel any pending delayed rendering and increment all the sequence&serial numbers. - Fix the clipboard access check when performing a delay rendering. This fixes VBox host <-> guest copy/paste amongst others... CORE-5512 CORE-9620 CORE-8367 CORE-8627 #comment Please retest with revision >= 70355. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed Dec 16 00:26:27 2015 @@ -628,10 +628,12 @@ co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); } - pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen; - - pWinStaObj->iClipSequenceNumber++; - pWinStaObj->fClipboardChanged = TRUE; + pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen; + + pWinStaObj->iClipSerialNumber++; + pWinStaObj->iClipSequenceNumber++; + pWinStaObj->fClipboardChanged = TRUE; + pWinStaObj->fInDelayedRendering = FALSE; bRet = TRUE; @@ -930,10 +932,15 @@ if (!pWinStaObj) goto cleanup; - /* If it's delayed rendering we don't have to open clipboard */ - if ((pWinStaObj->fInDelayedRendering && - pWinStaObj->spwndClipOwner->head.pti != PsGetCurrentThreadWin32Thread()) || - !IntIsClipboardOpenByMe(pWinStaObj)) + /* + * Check if the clipboard is correctly opened: + * - in case of normal rendering, we must have opened the clipboard; + * - in case of delayed rendering, the clipboard must be already opened + * by another application, but we need to be the clipboard owner. + */ + if ((!pWinStaObj->fInDelayedRendering && !IntIsClipboardOpenByMe(pWinStaObj)) || + (pWinStaObj->fInDelayedRendering && !(pWinStaObj->ptiClipLock && + pWinStaObj->spwndClipOwner->head.pti == PsGetCurrentThreadWin32Thread()))) { ERR("Access denied!\n"); EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); @@ -957,7 +964,10 @@ IntAddFormatedData(pWinStaObj, fmt, hData, scd->fGlobalHandle, FALSE); TRACE("hData stored\n"); - pWinStaObj->iClipSequenceNumber++; + /* If the serial number was increased, increase also the sequence number */ + if (scd->fIncSerialNumber) + pWinStaObj->iClipSequenceNumber++; + pWinStaObj->fClipboardChanged = TRUE; /* Note: Synthesized formats are added in NtUserCloseClipboard */

1 0

[hbelusca] 70354: [WIN32SS:CLIPBOARD] - Reduce indentation level of some code. - No need to initialize pWinStaObj when it is reinitialized just after. - Fix some comments.
by hbelusca＠svn.reactos.org 16 Dec '15

16 Dec '15

Author: hbelusca Date: Wed Dec 16 00:10:58 2015 New Revision: 70354 URL: http://svn.reactos.org/svn/reactos?rev=70354&view=rev Log: [WIN32SS:CLIPBOARD] - Reduce indentation level of some code. - No need to initialize pWinStaObj when it is reinitialized just after. - Fix some comments. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/user32/windows/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed Dec 16 00:10:58 2015 @@ -125,13 +125,8 @@ IntIsClipboardOpenByMe(PWINSTATION_OBJECT pWinSta) { /* Check if current thread has opened the clipboard */ - if (pWinSta->ptiClipLock && - pWinSta->ptiClipLock == PsGetCurrentThreadWin32Thread()) - { - return TRUE; - } - - return FALSE; + return (pWinSta->ptiClipLock && + pWinSta->ptiClipLock == PsGetCurrentThreadWin32Thread()); } static VOID NTAPI @@ -385,7 +380,7 @@ { UINT Ret = 0; PCLIP pElement; - PWINSTATION_OBJECT pWinStaObj = NULL; + PWINSTATION_OBJECT pWinStaObj; pWinStaObj = IntGetWinStaForCbAccess(); if (!pWinStaObj) @@ -440,11 +435,11 @@ if (pWinStaObj->ptiClipLock) { - /* Clipboard is already open */ + /* Clipboard is already opened */ if (pWinStaObj->spwndClipOpen != pWindow) { + ERR("Access denied!\n"); EngSetLastError(ERROR_ACCESS_DENIED); - ERR("Access denied!\n"); goto cleanup; } } @@ -477,12 +472,13 @@ UserCloseClipboard(VOID) { BOOL bRet = FALSE; - PWINSTATION_OBJECT pWinStaObj = NULL; - - pWinStaObj = IntGetWinStaForCbAccess(); - if (!pWinStaObj) - goto cleanup; - + PWINSTATION_OBJECT pWinStaObj; + + pWinStaObj = IntGetWinStaForCbAccess(); + if (!pWinStaObj) + goto cleanup; + + /* Check if clipboard has been opened */ if (!IntIsClipboardOpenByMe(pWinStaObj)) { EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); @@ -589,7 +585,7 @@ NtUserCountClipboardFormats(VOID) { DWORD cFormats = 0; - PWINSTATION_OBJECT pWinStaObj = NULL; + PWINSTATION_OBJECT pWinStaObj; UserEnterShared(); @@ -617,30 +613,31 @@ if (!pWinStaObj) return FALSE; - if (IntIsClipboardOpenByMe(pWinStaObj)) - { - UserEmptyClipboardData(pWinStaObj); - - if (pWinStaObj->spwndClipOwner) - { - TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p\n", pWinStaObj->spwndClipOwner->head.h); - co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); - } + /* Check if clipboard has been opened */ + if (!IntIsClipboardOpenByMe(pWinStaObj)) + { + EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); + goto cleanup; + } + + UserEmptyClipboardData(pWinStaObj); + + if (pWinStaObj->spwndClipOwner) + { + TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p\n", pWinStaObj->spwndClipOwner->head.h); + co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); + } pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen; pWinStaObj->iClipSequenceNumber++; pWinStaObj->fClipboardChanged = TRUE; - bRet = TRUE; - } - else - { - EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); - ERR("Access denied!\n"); - } - - ObDereferenceObject(pWinStaObj); + bRet = TRUE; + +cleanup: + if (pWinStaObj) + ObDereferenceObject(pWinStaObj); return bRet; } @@ -825,7 +822,7 @@ { HANDLE hRet = NULL; PCLIP pElement; - PWINSTATION_OBJECT pWinStaObj = NULL; + PWINSTATION_OBJECT pWinStaObj; TRACE("NtUserGetClipboardData(%x, %p)\n", fmt, pgcd); @@ -835,6 +832,7 @@ if (!pWinStaObj) goto cleanup; + /* Check if clipboard has been opened */ if (!IntIsClipboardOpenByMe(pWinStaObj)) { EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); @@ -855,7 +853,6 @@ if (!pElement || IS_DATA_DELAYED(pElement)) goto cleanup; - if (IS_DATA_SYNTHESIZED(pElement)) { @@ -927,7 +924,7 @@ UserSetClipboardData(UINT fmt, HANDLE hData, PSETCLIPBDATA scd) { HANDLE hRet = NULL; - PWINSTATION_OBJECT pWinStaObj = NULL; + PWINSTATION_OBJECT pWinStaObj; pWinStaObj = IntGetWinStaForCbAccess(); if (!pWinStaObj) @@ -946,7 +943,7 @@ if (scd->fIncSerialNumber) pWinStaObj->iClipSerialNumber++; - /* Is it a delayed render? */ + /* Is it a delayed rendering? */ if (hData) { /* Is it a bitmap? */ @@ -967,7 +964,7 @@ } else { - /* This is a delayed render */ + /* This is a delayed rendering */ IntAddFormatedData(pWinStaObj, fmt, DATA_DELAYED, FALSE, FALSE); TRACE("SetClipboardData delayed format: %u\n", fmt); } @@ -1018,7 +1015,7 @@ NtUserSetClipboardViewer(HWND hWndNewViewer) { HWND hWndNext = NULL; - PWINSTATION_OBJECT pWinStaObj = NULL; + PWINSTATION_OBJECT pWinStaObj; PWND pWindow; UserEnterExclusive(); Modified: trunk/reactos/win32ss/user/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/clipboard.c [iso-8859-1] Wed Dec 16 00:10:58 2015 @@ -17,8 +17,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -#define QUERY_SIZE 0 /* FUNCTIONS *****************************************************************/ @@ -263,7 +261,7 @@ pData = pNewData; } - /* Save synthesized format in clibboard */ + /* Save synthesized format in clipboard */ if (pData) { HANDLE hMem; @@ -296,7 +294,7 @@ HANDLE hRet = NULL; SETCLIPBDATA scd = {FALSE, FALSE}; - /* Check if this is delayed render */ + /* Check if this is a delayed rendering */ if (hMem == NULL) return NtUserSetClipboardData(uFormat, NULL, &scd); @@ -308,7 +306,10 @@ /* Meta files are probably checked for validity */ else if (uFormat == CF_DSPMETAFILEPICT || uFormat == CF_METAFILEPICT || uFormat == CF_DSPENHMETAFILE || uFormat == CF_ENHMETAFILE) + { + UNIMPLEMENTED; hRet = NULL; // not supported yet + } else { /* Some formats accept only global handles, other accept global handles or integer values */

1 0

[akhaldi] 70353: [0.4.0] * Merge iphlpapi_apitest:SendARP tests fix by Pierre Schweitzer in r70323.
by akhaldi＠svn.reactos.org 15 Dec '15

15 Dec '15

Author: akhaldi Date: Tue Dec 15 23:11:49 2015 New Revision: 70353 URL: http://svn.reactos.org/svn/reactos?rev=70353&view=rev Log: [0.4.0] * Merge iphlpapi_apitest:SendARP tests fix by Pierre Schweitzer in r70323. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/drivers/network/tcpip/tcpip/dispatch.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 15 23:11:49 2015 @@ -1 +1 @@ -/trunk:70000-70321,70324,70335-70337 +/trunk:70000-70321,70323-70324,70335-70337 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 15 23:11:49 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70324,70335-70337 +/trunk/reactos:70000-70321,70323-70324,70335-70337 Modified: branches/ros-branch-0_4_0/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_4_0/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Tue Dec 15 23:11:49 2015 @@ -1645,7 +1645,7 @@ PVOID OutputBuffer; if (NCE->LinkAddressLength > WorkItem->IrpSp->Parameters.DeviceIoControl.OutputBufferLength) { - Status = STATUS_INVALID_BUFFER_SIZE; + Status = STATUS_INSUFFICIENT_RESOURCES; } else { OutputBuffer = Irp->AssociatedIrp.SystemBuffer; RtlCopyMemory(OutputBuffer, NCE->LinkAddress, NCE->LinkAddressLength); @@ -1691,13 +1691,8 @@ if (Interface) { PVOID OutputBuffer; - if (!AddrIsUnspecified(&Local) && IPs[0] != IPs[1]) { - Status = STATUS_UNSUCCESSFUL; - goto Exit; - } - if (Interface->AddressLength > IrpSp->Parameters.DeviceIoControl.OutputBufferLength) { - Status = STATUS_INVALID_BUFFER_SIZE; + Status = STATUS_INSUFFICIENT_RESOURCES; goto Exit; } @@ -1720,8 +1715,11 @@ else { Interface = AddrLocateInterface(&Local); if (Interface == NULL) { - Status = STATUS_NETWORK_UNREACHABLE; - goto Exit; + Interface = GetDefaultInterface(); + if (Interface == NULL) { + Status = STATUS_NETWORK_UNREACHABLE; + goto Exit; + } } }

1 0

[akhaldi] 70352: [0.4.0] * Merge magnifier improvements by David Quintana in revisions 70335 => 70337. CORE-10691
by akhaldi＠svn.reactos.org 15 Dec '15

15 Dec '15

Author: akhaldi Date: Tue Dec 15 22:53:08 2015 New Revision: 70352 URL: http://svn.reactos.org/svn/reactos?rev=70352&view=rev Log: [0.4.0] * Merge magnifier improvements by David Quintana in revisions 70335 => 70337. CORE-10691 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/en-US.rc branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/es-ES.rc branches/ros-branch-0_4_0/reactos/base/applications/magnify/magnifier.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 15 22:53:08 2015 @@ -1 +1 @@ -/trunk:70000-70321,70324 +/trunk:70000-70321,70324,70335-70337 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 15 22:53:08 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70324 +/trunk/reactos:70000-70321,70324,70335-70337 Modified: branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/en-US.rc [iso-8859-1] Tue Dec 15 22:53:08 2015 @@ -33,7 +33,7 @@ CAPTION "Magnifier Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Exit", IDOK, 96, 161, 50, 14 + DEFPUSHBUTTON "Ok", IDOK, 96, 161, 50, 14 PUSHBUTTON "Help", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "Magnification level:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/magnify/lang/es-ES.rc [iso-8859-1] Tue Dec 15 22:53:08 2015 @@ -37,7 +37,7 @@ CAPTION "Configurar lupa" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Salir", IDOK, 96, 161, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 96, 161, 50, 14 PUSHBUTTON "Ayuda", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "Niveles de aumento:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 76, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: branches/ros-branch-0_4_0/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Tue Dec 15 22:53:08 2015 @@ -3,8 +3,9 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/magnify/magnifier.c * PURPOSE: Magnification of parts of the screen. - * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> - * + * AUTHORS: + * Marc Piulachs <marc.piulachs(a)codexchange.net> + * David Quintana <gigaherz(a)gmail.com> */ /* TODO: AppBar */ @@ -14,6 +15,8 @@ #include <winuser.h> #include <wingdi.h> #include <winnls.h> +#include <shellapi.h> +#include <windowsx.h> #include "resource.h" @@ -27,9 +30,26 @@ TCHAR szTitle[MAX_LOADSTRING]; -#define REPAINT_SPEED 100 +#define TIMER_SPEED 1 +#define REPAINT_SPEED 100 + +DWORD lastTicks = 0; HWND hDesktopWindow = NULL; + +#define APPMSG_NOTIFYICON (WM_APP+1) +HICON notifyIcon; +NOTIFYICONDATA nid; +HMENU notifyMenu; +HWND hOptionsDialog; +BOOL bOptionsDialog = FALSE; + +BOOL bRecreateOffscreenDC = TRUE; +LONG sourceWidth = 0; +LONG sourceHeight = 0; +HDC hdcOffscreen = NULL; +HANDLE hbmpOld; +HBITMAP hbmpOffscreen = NULL; /* Current magnified area */ POINT cp; @@ -38,6 +58,8 @@ POINT pMouse; POINT pCaret; POINT pFocus; +HWND pCaretWnd; +HWND pFocusWnd; ATOM MyRegisterClass(HINSTANCE hInstance); BOOL InitInstance(HINSTANCE, int); @@ -83,6 +105,11 @@ DispatchMessage(&msg); } } + + + SelectObject(hdcOffscreen, hbmpOld); + DeleteObject (hbmpOffscreen); + DeleteDC(hdcOffscreen); return (int) msg.wParam; } @@ -99,7 +126,7 @@ wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wc.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER); + wc.lpszMenuName = NULL; //MAKEINTRESOURCE(IDC_MAGNIFIER); wc.lpszClassName = szWindowClass; return RegisterClass(&wc); @@ -133,6 +160,10 @@ ShowWindow(hMainWnd, bStartMinimized ? SW_MINIMIZE : nCmdShow); UpdateWindow(hMainWnd); + // Windows 2003's Magnifier always shows this dialog, and exits when the dialog isclosed. + // Should we add a custom means to prevent opening it? + hOptionsDialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hMainWnd, OptionsProc); + if (bShowWarning) DialogBox(hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, WarningProc); @@ -148,26 +179,59 @@ } } +void GetBestOverlapWithMonitors(LPRECT rect) +{ + int rcLeft, rcTop; + int rcWidth, rcHeight; + RECT rcMon; + HMONITOR hMon = MonitorFromRect(rect, MONITOR_DEFAULTTONEAREST); + MONITORINFO info; + info.cbSize = sizeof(info); + + GetMonitorInfo(hMon, &info); + + rcMon = info.rcMonitor; + + rcLeft = rect->left; + rcTop = rect->top; + rcWidth = (rect->right - rect->left); + rcHeight = (rect->bottom - rect->top); + + if (rcLeft < rcMon.left) + rcLeft = rcMon.left; + + if (rcTop < rcMon.top) + rcTop = rcMon.top; + + if (rcLeft > (rcMon.right - rcWidth)) + rcLeft = (rcMon.right - rcWidth); + + if (rcTop > (rcMon.bottom - rcHeight)) + rcTop = (rcMon.bottom - rcHeight); + + OffsetRect(rect, (rcLeft-rect->left), (rcTop-rect->top)); +} + void Draw(HDC aDc) { HDC desktopHdc = NULL; - HDC HdcStrech; - HANDLE hOld; - HBITMAP HbmpStrech; - - RECT R; - RECT appRect; + + RECT sourceRect, intersectedRect; + RECT targetRect, appRect; DWORD rop = SRCCOPY; CURSORINFO cinfo; ICONINFO iinfo; - int Width, Height, AppWidth, AppHeight; - LONG blitAreaWidth, blitAreaHeight, blitAreaX, blitAreaY; - - desktopHdc = GetWindowDC(hDesktopWindow); + int AppWidth, AppHeight; + + if (bInvertColors) + rop = NOTSRCCOPY; + + desktopHdc = GetDC(0); GetClientRect(hMainWnd, &appRect); - GetWindowRect(hDesktopWindow, &R); + AppWidth = (appRect.right - appRect.left); + AppHeight = (appRect.bottom - appRect.top); ZeroMemory(&cinfo, sizeof(cinfo)); ZeroMemory(&iinfo, sizeof(iinfo)); @@ -175,63 +239,69 @@ GetCursorInfo(&cinfo); GetIconInfo(cinfo.hCursor, &iinfo); - /* Create a memory DC compatible with client area DC */ - HdcStrech = CreateCompatibleDC(desktopHdc); - - /* Create a bitmap compatible with the client area DC */ - HbmpStrech = CreateCompatibleBitmap( - desktopHdc, - R.right, - R.bottom); - - /* Select our bitmap in memory DC and save the old one */ - hOld = SelectObject(HdcStrech , HbmpStrech); - + targetRect = appRect; + ClientToScreen(hMainWnd, (POINT*)&targetRect.left); + ClientToScreen(hMainWnd, (POINT*)&targetRect.right); + + if (bRecreateOffscreenDC || !hdcOffscreen) + { + bRecreateOffscreenDC = FALSE; + + if(hdcOffscreen) + { + SelectObject(hdcOffscreen, hbmpOld); + DeleteObject (hbmpOffscreen); + DeleteDC(hdcOffscreen); + } + + sourceWidth = AppWidth / iZoom; + sourceHeight = AppHeight / iZoom; + + /* Create a memory DC compatible with client area DC */ + hdcOffscreen = CreateCompatibleDC(desktopHdc); + + /* Create a bitmap compatible with the client area DC */ + hbmpOffscreen = CreateCompatibleBitmap( + desktopHdc, + sourceWidth, + sourceHeight); + + /* Select our bitmap in memory DC and save the old one */ + hbmpOld = SelectObject(hdcOffscreen , hbmpOffscreen); + } + + GetWindowRect(hDesktopWindow, &sourceRect); + sourceRect.left = (cp.x) - (sourceWidth /2); + sourceRect.top = (cp.y) - (sourceHeight /2); + sourceRect.right = sourceRect.left + sourceWidth; + sourceRect.bottom = sourceRect.top + sourceHeight; + + GetBestOverlapWithMonitors(&sourceRect); + /* Paint the screen bitmap to our in memory DC */ BitBlt( - HdcStrech, + hdcOffscreen, 0, 0, - R.right, - R.bottom, + sourceWidth, + sourceHeight, desktopHdc, - 0, - 0, - SRCCOPY); - + sourceRect.left, + sourceRect.top, + rop); + + if (IntersectRect(&intersectedRect, &sourceRect, &targetRect)) + { + OffsetRect(&intersectedRect, -sourceRect.left, -sourceRect.top); + FillRect(hdcOffscreen, &intersectedRect, GetStockObject(DC_BRUSH)); + } + /* Draw the mouse pointer in the right position */ DrawIcon( - HdcStrech , - pMouse.x - iinfo.xHotspot, // - 10, - pMouse.y - iinfo.yHotspot, // - 10, + hdcOffscreen , + pMouse.x - iinfo.xHotspot - sourceRect.left, // - 10, + pMouse.y - iinfo.yHotspot - sourceRect.top, // - 10, cinfo.hCursor); - - Width = (R.right - R.left); - Height = (R.bottom - R.top); - - AppWidth = (appRect.right - appRect.left); - AppHeight = (appRect.bottom - appRect.top); - - blitAreaWidth = AppWidth / iZoom; - blitAreaHeight = AppHeight / iZoom; - - blitAreaX = (cp.x) - (blitAreaWidth /2); - blitAreaY = (cp.y) - (blitAreaHeight /2); - - if (blitAreaX < 0) - blitAreaX = 0; - - if (blitAreaY < 0) - blitAreaY = 0; - - if (blitAreaX > (Width - blitAreaWidth)) - blitAreaX = (Width - blitAreaWidth); - - if (blitAreaY > (Height - blitAreaHeight)) - blitAreaY = (Height - blitAreaHeight); - - if (bInvertColors) - rop = NOTSRCCOPY; /* Blast the stretched image from memory DC to window DC */ StretchBlt( @@ -240,25 +310,37 @@ 0, AppWidth, AppHeight, - HdcStrech, - blitAreaX, - blitAreaY, - blitAreaWidth, - blitAreaHeight, - rop | NOMIRRORBITMAP); - - + hdcOffscreen, + 0, + 0, + sourceWidth, + sourceHeight, + SRCCOPY | NOMIRRORBITMAP); + /* Cleanup */ if (iinfo.hbmMask) DeleteObject(iinfo.hbmMask); if (iinfo.hbmColor) DeleteObject(iinfo.hbmColor); - SelectObject(HdcStrech, hOld); - DeleteObject (HbmpStrech); - DeleteDC(HdcStrech); ReleaseDC(hDesktopWindow, desktopHdc); } +void HandleNotifyIconMessage(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + POINT pt; + + switch(lParam) + { + case WM_LBUTTONUP: + PostMessage(hMainWnd, WM_COMMAND, IDM_OPTIONS, 0); + break; + case WM_RBUTTONUP: + GetCursorPos (&pt); + TrackPopupMenu(notifyMenu, 0, pt.x, pt.y, 0, hWnd, NULL); + break; + } +} + LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { int wmId; @@ -267,53 +349,87 @@ { case WM_TIMER: { - POINT pNewMouse; - POINT pNewCaret; - POINT pNewFocus; - HWND hwnd1, hwnd2, hwnd3; - DWORD a, b; - RECT controlRect; - - //Get current mouse position - GetCursorPos (&pNewMouse); - - //Get caret position - hwnd1 = GetForegroundWindow (); - a = GetWindowThreadProcessId(hwnd1, NULL); - b = GetCurrentThreadId(); - AttachThreadInput (a, b, TRUE); - hwnd2 = GetFocus(); - - GetCaretPos( &pNewCaret); - ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); - AttachThreadInput (a, b, FALSE); - - //Get current control focus - hwnd3 = GetFocus (); - GetWindowRect (hwnd3 , &controlRect); - pNewFocus.x = controlRect.left; - pNewFocus.y = controlRect.top; - - //If mouse has moved .... - if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y)) && bFollowMouse) - { - //Update to new position - pMouse = pNewMouse; - cp = pNewMouse; - } - else if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y)) && bFollowCaret) - { - //Update to new position - pCaret = pNewCaret; - cp = pNewCaret; - } - else if (((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y)) && bFollowFocus) - { - //Update to new position - pFocus = pNewFocus; - cp = pNewFocus; - } - Refresh(); + BOOL hasMoved = FALSE; + HWND hwndForeground = GetForegroundWindow (); + DWORD threadId = GetWindowThreadProcessId(hwndForeground, NULL); + GUITHREADINFO guiInfo; + guiInfo.cbSize = sizeof(guiInfo); + + GetGUIThreadInfo(threadId, &guiInfo); + + if (bFollowMouse) + { + POINT pNewMouse; + + //Get current mouse position + GetCursorPos (&pNewMouse); + + //If mouse has moved ... + if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y))) + { + //Update to new position + pMouse = pNewMouse; + cp = pNewMouse; + hasMoved = TRUE; + } + } + + if (bFollowCaret && hwndForeground && guiInfo.hwndCaret) + { + POINT ptCaret; + ptCaret.x = (guiInfo.rcCaret.left + guiInfo.rcCaret.right) / 2; + ptCaret.y = (guiInfo.rcCaret.top + guiInfo.rcCaret.bottom) / 2; + + if (guiInfo.hwndCaret && ((pCaretWnd != guiInfo.hwndCaret) || (pCaret.x != ptCaret.x) || (pCaret.y != ptCaret.y))) + { + //Update to new position + pCaret = ptCaret; + pCaretWnd = guiInfo.hwndCaret; + if(!hasMoved) + { + ClientToScreen (guiInfo.hwndCaret, (LPPOINT) &ptCaret); + cp = ptCaret; + } + hasMoved = TRUE; + } + } + + if (bFollowFocus && hwndForeground && guiInfo.hwndFocus) + { + POINT ptFocus; + RECT activeRect; + + //Get current control focus + GetWindowRect (guiInfo.hwndFocus, &activeRect); + ptFocus.x = (activeRect.left + activeRect.right) / 2; + ptFocus.y = (activeRect.top + activeRect.bottom) / 2; + + if(guiInfo.hwndFocus && ((guiInfo.hwndFocus != pFocusWnd) || (pFocus.x != ptFocus.x) || (pFocus.y != ptFocus.y))) + { + //Update to new position + pFocus = ptFocus; + pFocusWnd = guiInfo.hwndFocus; + if(!hasMoved) + cp = ptFocus; + hasMoved = TRUE; + } + } + + if(!hasMoved) + { + DWORD newTicks = GetTickCount(); + DWORD elapsed = (newTicks - lastTicks); + if(elapsed > REPAINT_SPEED) + { + hasMoved = TRUE; + } + } + + if(hasMoved) + { + lastTicks = GetTickCount(); + Refresh(); + } } break; @@ -324,7 +440,14 @@ switch (wmId) { case IDM_OPTIONS: - DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, OptionsProc); + if(bOptionsDialog) + { + ShowWindow(hOptionsDialog, SW_HIDE); + } + else + { + ShowWindow(hOptionsDialog, SW_SHOW); + } break; case IDM_ABOUT: DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutProc); @@ -348,6 +471,16 @@ break; } + case WM_CONTEXTMENU: + TrackPopupMenu(notifyMenu, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, hWnd, NULL); + break; + + case WM_SIZE: + case WM_DISPLAYCHANGE: + bRecreateOffscreenDC = TRUE; + Refresh(); + return DefWindowProc(hWnd, message, wParam, lParam); + case WM_ERASEBKGND: // handle WM_ERASEBKGND by simply returning non-zero because we did all the drawing in WM_PAINT. break; @@ -357,9 +490,24 @@ SaveSettings(); KillTimer(hWnd , 1); PostQuitMessage(0); + + /* Cleanup notification icon */ + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uFlags = NIF_MESSAGE; + nid.hWnd = hWnd; + nid.uCallbackMessage = APPMSG_NOTIFYICON; + Shell_NotifyIcon(NIM_DELETE, &nid); + + DestroyIcon(notifyIcon); + + DestroyWindow(hOptionsDialog); break; case WM_CREATE: + { + HMENU tempMenu; + /* Load settings from registry */ LoadSettings(); @@ -367,7 +515,30 @@ hDesktopWindow = GetDesktopWindow(); /* Set the timer */ - SetTimer (hWnd , 1, REPAINT_SPEED , NULL); + SetTimer (hWnd , 1, TIMER_SPEED , NULL); + + /* Notification icon */ + notifyIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); + + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uFlags = NIF_ICON | NIF_MESSAGE; + nid.hWnd = hWnd; + nid.uCallbackMessage = APPMSG_NOTIFYICON; + nid.hIcon = notifyIcon; + Shell_NotifyIcon(NIM_ADD, &nid); + + tempMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDC_MAGNIFIER)); + notifyMenu = GetSubMenu(tempMenu, 0); + RemoveMenu(tempMenu, 0, MF_BYPOSITION); + DestroyMenu(tempMenu); + + break; + } + + case APPMSG_NOTIFYICON: + HandleNotifyIconMessage(hWnd, wParam, lParam); + break; default: @@ -402,6 +573,9 @@ UNREFERENCED_PARAMETER(lParam); switch (message) { + case WM_SHOWWINDOW: + bOptionsDialog = wParam; + break; case WM_INITDIALOG: { // Add the zoom items... @@ -442,7 +616,7 @@ { case IDOK: case IDCANCEL: - EndDialog(hDlg, LOWORD(wParam)); + ShowWindow(hDlg, SW_HIDE); return (INT_PTR)TRUE; case IDC_BUTTON_HELP:

1 0

[akhaldi] 70351: [0.4.0] * Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742
by akhaldi＠svn.reactos.org 15 Dec '15

15 Dec '15

Author: akhaldi Date: Tue Dec 15 22:41:59 2015 New Revision: 70351 URL: http://svn.reactos.org/svn/reactos?rev=70351&view=rev Log: [0.4.0] * Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742 Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/device.h branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/pdevobj.c branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/display.c Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/device.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/device.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/device.h [iso-8859-1] Tue Dec 15 22:41:59 2015 @@ -2,6 +2,11 @@ #pragma once #define TAG_GDEV 'gdev' + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev); extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; extern PGRAPHICS_DEVICE gpVgaGraphicsDevice; Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Tue Dec 15 22:41:59 2015 @@ -9,6 +9,8 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + +DBG_DEFAULT_CHANNEL(UserDisplay); PPDEVOBJ gppdevPrimary = NULL; @@ -247,8 +249,109 @@ /* Increment reference count */ GDIOBJ_vReferenceObjectByPointer(&ppdev->pSurface->BaseObject); - DPRINT("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); + TRACE("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); return ppdev->pSurface; +} + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVMODEENTRY pTmpDevModeList, pOldDevModeList; + PDEVMODEINFO pdminfo; + PDEVMODEW pdm, pdmEnd; + UINT cModes = 0; + UINT j = 0; + + /* Lock the PDEV */ + EngAcquireSemaphore(ppdev->hsemDevLock); + + pGraphicsDevice = ppdev->pGraphicsDevice; + + TRACE("Enter PDEVOBJ_vRefreshModeList('%ws'/'%ws')\n", + pGraphicsDevice->szNtDeviceName, + pGraphicsDevice->szWinDeviceName); + + pdminfo = LDEVOBJ_pdmiGetModes(ppdev->pldev, pGraphicsDevice->DeviceObject); + + if (!pdminfo || pdminfo->cbdevmode == 0) + { + ERR("Could not get an updated mode list for '%ls'\n", pGraphicsDevice->szWinDeviceName); + } + else + { + TRACE("Bingo! We've just got some (%lu) new modes for '%ls'.\n", pdminfo->cbdevmode/sizeof(DEVMODEW), pGraphicsDevice->szWinDeviceName); + + /* Loop all DEVMODEs */ + pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode); + for (pdm = pdminfo->adevmode; + (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0); + pdm = (DEVMODEW*)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) + { + TRACE("mode %lu -- %lux%lux%lu (%lu hz)\n", cModes, pdminfo->adevmode[cModes].dmPelsWidth, + pdminfo->adevmode[cModes].dmPelsHeight, + pdminfo->adevmode[cModes].dmBitsPerPel, + pdminfo->adevmode[cModes].dmDisplayFrequency); + + /* Some drivers like the VBox driver don't fill the dmDeviceName + with the name of the display driver. So fix that here. */ + wcsncpy(pdminfo->adevmode[cModes].dmDeviceName, pGraphicsDevice->pDiplayDrivers, CCHDEVICENAME); + pdminfo->adevmode[cModes].dmDeviceName[CCHDEVICENAME - 1] = 0; + + /* Count this DEVMODE */ + cModes++; + } + + if (cModes == 0) + { + ERR("No valid devmodes returned by the driver on mode list refresh!\n"); + ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); + return; + } + + /* Allocate an index buffer early on, even before trying to change the graphics device struct */ + pTmpDevModeList = ExAllocatePoolWithTag(PagedPool, + cModes * sizeof(DEVMODEENTRY), + GDITAG_GDEVICE); + + if (!pTmpDevModeList) + { + ERR("Bummer! Not enough memory to alloc a new DevModeList\n"); + return; + } + + /* Save a reference to the old thing */ + pOldDevModeList = pGraphicsDevice->pDevModeList; + + /* Attach the new mode info and company to the device, + the GraphicsDevice could potentially use additional synchonisation mechanisms */ + pdminfo->pdmiNext = pGraphicsDevice->pdevmodeInfo; + pGraphicsDevice->pdevmodeInfo = pdminfo; + + pGraphicsDevice->cDevModes = cModes; + pGraphicsDevice->pDevModeList = pTmpDevModeList; + + /* Don't leak the previous DevModeList, please! */ + ExFreePoolWithTag(pOldDevModeList, GDITAG_GDEVICE); + + /* Loop through the DEVMODEs */ + for (pdm = pdminfo->adevmode; + (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0); + pdm = (PDEVMODEW)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) + { + /* Initialize the entry */ + pGraphicsDevice->pDevModeList[j].dwFlags = 0; + pGraphicsDevice->pDevModeList[j].pdm = &pdminfo->adevmode[j]; + + j++; + } + + } + + /* Unlock PDEV */ + EngReleaseSemaphore(ppdev->hsemDevLock); } PDEVMODEW @@ -264,13 +367,32 @@ pGraphicsDevice = ppdev->pGraphicsDevice; + TRACE("looking for mode -- %lux%lux%lu (%lu hz) (%ls)\n", pdm->dmPelsWidth, + pdm->dmPelsHeight, + pdm->dmBitsPerPel, + pdm->dmDisplayFrequency, + pdm->dmDeviceName); + + for (i = 0; i < pGraphicsDevice->cDevModes; i++) + { + pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; + + TRACE("mode %lu -- %lux%lux%lu (%lu hz) (%ls)\n", i, pdmCurrent->dmPelsWidth, + pdmCurrent->dmPelsHeight, + pdmCurrent->dmBitsPerPel, + pdmCurrent->dmDisplayFrequency, + pdmCurrent->dmDeviceName); + } + + TRACE("---\n"); + for (i = 0; i < pGraphicsDevice->cDevModes; i++) { pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; /* Compare asked DEVMODE fields * Only compare those that are valid in both DEVMODE structs */ - dwFields = pdmCurrent->dmFields & pdm->dmFields ; + dwFields = pdmCurrent->dmFields & pdm->dmFields; /* For now, we only need those */ if ((dwFields & DM_BITSPERPEL) && @@ -282,6 +404,12 @@ if ((dwFields & DM_DISPLAYFREQUENCY) && (pdmCurrent->dmDisplayFrequency != pdm->dmDisplayFrequency)) continue; + TRACE("chosen mode %lu -- %lux%lux%lu (%lu hz) (%ls)\n", i, pdmCurrent->dmPelsWidth, + pdmCurrent->dmPelsHeight, + pdmCurrent->dmBitsPerPel, + pdmCurrent->dmDisplayFrequency, + pdmCurrent->dmDeviceName); + /* Match! Return the DEVMODE */ return pdmCurrent; } @@ -352,8 +480,8 @@ ppdev->pfnMovePointer = EngMovePointer; ppdev->pGraphicsDevice = pGraphicsDevice; - // Should we change the ative mode of pGraphicsDevice ? - ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm) ; + // Should we change the active mode of pGraphicsDevice ? + ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm); /* FIXME! */ ppdev->flFlags = PDEV_DISPLAY; Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Tue Dec 15 22:41:59 2015 @@ -462,22 +462,34 @@ PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; + PPDEVOBJ ppdev; TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", pustrDevice, iModeNum); /* Ask GDI for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); - - if (!pGraphicsDevice) + ppdev = EngpGetPDEV(pustrDevice); + + if (!pGraphicsDevice || !ppdev) { /* No device found */ ERR("No device found!\n"); return STATUS_UNSUCCESSFUL; } + /* let's politely ask the driver for an updated mode list, + just in case there's something new in there (vbox) */ + + PDEVOBJ_vRefreshModeList(ppdev); + PDEVOBJ_vRelease(ppdev); + + /* FIXME: maybe only refresh when iModeNum is bigger than cDevModes? */ if (iModeNum >= pGraphicsDevice->cDevModes) + { + ERR("STATUS_NO_MORE_ENTRIES!\n"); return STATUS_NO_MORE_ENTRIES; + } iFoundMode = 0; for (i = 0; i < pGraphicsDevice->cDevModes; i++)

1 0

[ekohl] 70350: [WINSRV] Do not kill system processes when a user is logging off. Fixes user logoff. #CORE-2391 #resolve
by ekohl＠svn.reactos.org 15 Dec '15

15 Dec '15

Author: ekohl Date: Tue Dec 15 21:38:36 2015 New Revision: 70350 URL: http://svn.reactos.org/svn/reactos?rev=70350&view=rev Log: [WINSRV] Do not kill system processes when a user is logging off. Fixes user logoff. #CORE-2391 #resolve Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Tue Dec 15 21:38:36 2015 @@ -763,6 +763,14 @@ * Check for process validity */ + /* Do not kill system processes when a user is logging off */ + if ((Flags & EWX_SHUTDOWN) == EWX_LOGOFF && + (CsrProcess->ShutdownFlags & (SHUTDOWN_OTHERCONTEXT | SHUTDOWN_SYSTEMCONTEXT))) + { + DPRINT1("Do not kill a system process in a logoff request!\n"); + return CsrShutdownNonCsrProcess; + } + /* Do not kill Winlogon or CSRSS */ if (CsrProcess->ClientId.UniqueProcess == NtCurrentProcess() || CsrProcess->ClientId.UniqueProcess == UlongToHandle(LogonProcessId))

1 0

[hbelusca] 70349: [CLIPBRD] Fix the computation of where bitmap pixels start, depending on whether we are dealing with DIBs or DIBs version 5+ (depending on the header BITMAPINFOHEADER or BITMAPV5H...
by hbelusca＠svn.reactos.org 15 Dec '15

15 Dec '15

Author: hbelusca Date: Tue Dec 15 02:54:24 2015 New Revision: 70349 URL: http://svn.reactos.org/svn/reactos?rev=70349&view=rev Log: [CLIPBRD] Fix the computation of where bitmap pixels start, depending on whether we are dealing with DIBs or DIBs version 5+ (depending on the header BITMAPINFOHEADER or BITMAPV5HEADER etc...). I also noticed a bug in Windows that few other people already discovered, related to the automatic conversion of CF_DIBV5/CF_BITMAP to CF_DIB clipboard format. See the comment in the code. CORE-10679 Modified: trunk/reactos/base/applications/clipbrd/winutils.c Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Tue Dec 15 02:54:24 2015 @@ -16,7 +16,7 @@ dwError = GetLastError(); FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL); + NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL); MessageBoxW(hwndParent, lpMsgBuf, NULL, MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } @@ -102,8 +102,9 @@ { LPBITMAPINFOHEADER lpInfoHeader; LPBYTE lpBits; + LONG bmWidth, bmHeight; + DWORD dwPalSize = 0; HGLOBAL hGlobal; - INT iPalSize; hGlobal = GetClipboardData(uFormat); if (!hGlobal) @@ -113,18 +114,96 @@ if (!lpInfoHeader) return; - if (lpInfoHeader->biBitCount < 16) - { - iPalSize = (1 << lpInfoHeader->biBitCount) * 4; + if (lpInfoHeader->biSize == sizeof(BITMAPCOREHEADER)) + { + LPBITMAPCOREHEADER lpCoreHeader = (LPBITMAPCOREHEADER)lpInfoHeader; + + dwPalSize = 0; + + if (lpCoreHeader->bcBitCount <= 8) + { + dwPalSize = (1 << lpCoreHeader->bcBitCount); + + if (fuColorUse == DIB_RGB_COLORS) + dwPalSize *= sizeof(RGBTRIPLE); + else + dwPalSize *= sizeof(WORD); + } + + bmWidth = lpCoreHeader->bcWidth; + bmHeight = lpCoreHeader->bcHeight; + } + else if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) || + (lpInfoHeader->biSize == sizeof(BITMAPV4HEADER)) || + (lpInfoHeader->biSize == sizeof(BITMAPV5HEADER))) + { + dwPalSize = lpInfoHeader->biClrUsed; + + if ((dwPalSize == 0) && (lpInfoHeader->biBitCount <= 8)) + dwPalSize = (1 << lpInfoHeader->biBitCount); + + if (fuColorUse == DIB_RGB_COLORS) + dwPalSize *= sizeof(RGBQUAD); + else + dwPalSize *= sizeof(WORD); + + if (/*(lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) &&*/ + (lpInfoHeader->biCompression == BI_BITFIELDS)) + { + dwPalSize += 3 * sizeof(DWORD); + } + + /* + * This is a (disabled) hack for Windows, when uFormat == CF_DIB + * it needs yet another extra 3 DWORDs, in addition to the + * ones already taken into account in via the compression. + * This problem doesn't happen when uFormat == CF_DIBV5 + * (in that case, when compression is taken into account, + * everything is nice). + * + * NOTE 1: This fix is only for us, because when one pastes DIBs + * directly in apps, the bitmap offset problem is still present. + * + * NOTE 2: The problem can be seen with Windows' clipbrd.exe if + * one copies a CF_DIB image in the clipboard. By default Windows' + * clipbrd.exe works with CF_DIBV5 and CF_BITMAP, so the problem + * is unseen, and the clipboard doesn't have to convert to CF_DIB. + * + * FIXME: investigate!! + * ANSWER: this is a Windows bug; part of the answer is there: + * http://go4answers.webhost4life.com/Help/bug-clipboard-format-conversions-28… + * May be related: + * http://blog.talosintel.com/2015/10/dangerous-clipboard.html + */ +#if 0 + if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) && + (lpInfoHeader->biCompression == BI_BITFIELDS)) + { + dwPalSize += 3 * sizeof(DWORD); + } +#endif + + bmWidth = lpInfoHeader->biWidth; + bmHeight = lpInfoHeader->biHeight; } else { - iPalSize = 0; - } - - lpBits = (LPBYTE)lpInfoHeader + lpInfoHeader->biSize + iPalSize; - - SetDIBitsToDevice(hdc, XDest, YDest, lpInfoHeader->biWidth, lpInfoHeader->biHeight, XSrc, YSrc, uStartScan, lpInfoHeader->biHeight, lpBits, (LPBITMAPINFO)lpInfoHeader, fuColorUse); + /* Invalid format */ + GlobalUnlock(hGlobal); + return; + } + + lpBits = (LPBYTE)lpInfoHeader + lpInfoHeader->biSize + dwPalSize; + + SetDIBitsToDevice(hdc, + XDest, YDest, + bmWidth, bmHeight, + XSrc, YSrc, + uStartScan, + bmHeight, + lpBits, + (LPBITMAPINFO)lpInfoHeader, + fuColorUse); GlobalUnlock(hGlobal); }

1 0

[fireball] 70348: [NTOS] - Fix copypasta in the comments
by fireball＠svn.reactos.org 14 Dec '15

14 Dec '15

Author: fireball Date: Mon Dec 14 23:20:10 2015 New Revision: 70348 URL: http://svn.reactos.org/svn/reactos?rev=70348&view=rev Log: [NTOS] - Fix copypasta in the comments Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Mon Dec 14 23:20:10 2015 @@ -654,10 +654,10 @@ CidEntry = ExMapHandleToPointer(PspCidTable, ThreadId); if (CidEntry) { - /* Get the Process */ + /* Get the Thread */ FoundThread = CidEntry->Object; - /* Make sure it's really a process */ + /* Make sure it's really a thread */ if (FoundThread->Tcb.Header.Type == ThreadObject) { /* Safe Reference and return it */

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2015