Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[dreimer] 32789: Bug 3098: Italian fixes to mstsc by Carlo Bramini (carlo.bramix@libero.it) Bug 3161: Greek patch update by Apostolos Alexiadis (djapal@gmail.com)
by dreimer＠svn.reactos.org 31 Mar '08

31 Mar '08

Author: dreimer Date: Mon Mar 31 07:02:52 2008 New Revision: 32789 URL: http://svn.reactos.org/svn/reactos?rev=32789&view=rev Log: Bug 3098: Italian fixes to mstsc by Carlo Bramini (carlo.bramix(a)libero.it) Bug 3161: Greek patch update by Apostolos Alexiadis (djapal(a)gmail.com) Modified: trunk/reactos/base/applications/mstsc/lang/it-IT.rc trunk/reactos/dll/cpl/joy/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc Modified: trunk/reactos/base/applications/mstsc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/it-IT.rc [iso-8859-1] Mon Mar 31 07:02:52 2008 @@ -7,13 +7,13 @@ GROUPBOX "Impostazioni di accesso",IDC_STATIC,7,7,228,89 GROUPBOX "Impostazioni di connessione",IDC_STATIC,7,103,228,65 ICON "", IDC_LOGONICON, 15,19,20,20 - LTEXT "Digitare il nome o indirizzo del computer",IDC_STATIC,47,24,81,8 - LTEXT "Computer:",IDC_STATIC,47,41,25,8 - LTEXT "Nome utente:",IDC_STATIC,47,58,38,8 - COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Salva",IDC_SAVE,67,139,50,14 - PUSHBUTTON "Salva con nome...",IDC_SAVEAS,123,139,50,14 - PUSHBUTTON "Apri...",IDC_OPEN,177,139,50,14 + LTEXT "Digitare il nome o indirizzo del computer",IDC_STATIC,47,24,150,8 + LTEXT "Computer:",IDC_STATIC,47,41,35,8 + LTEXT "Nome utente:",IDC_STATIC,47,58,68,8 + COMBOBOX IDC_SERVERCOMBO,90,39,136,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Salva",IDC_SAVE,43,139,58,14 + PUSHBUTTON "Salva con nome",IDC_SAVEAS,107,139,58,14 + PUSHBUTTON "Apri",IDC_OPEN,169,139,58,14 ICON "", IDC_CONNICON, 16,114,20,20 LTEXT "Salvare le impostazioni correnti o aprire una configurazione salvata",IDC_STATIC,50,115,172,20 END @@ -22,18 +22,18 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Dimensioni desktop remoto",IDC_STATIC,7,7,228,68 - GROUPBOX "Colori",IDC_STATIC,7,83,228,85 + GROUPBOX "Dimensioni desktop remoto",IDC_STATIC,7,7,228,72 + GROUPBOX "Colori",IDC_STATIC,7,83,228,82 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "Scegliere la dimensione del desktop remoto. Trascinare verso destra per ottenere la visualizzazione a schermo intero",IDC_STATIC,53,22,175,21 - CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + LTEXT "Scegliere la dimensione del desktop remoto.\rTrascinare verso destra per ottenere la visualizzazione a schermo intero.",IDC_STATIC,53,22,175,25 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 48, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 - LTEXT "Nota: Le impostazioni del computer remoto potrebbereo avere la precedenza su questa impostazione.",IDC_STATIC,56,143,165,18 - LTEXT "Min",IDC_STATIC,35,42,15,8 - LTEXT "Max",IDC_STATIC,189,42,17,8 - LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,120,127,10 + LTEXT "Nota: Le impostazioni del computer remoto potrebbero avere la precedenza su questa impostazione.",IDC_STATIC,56,136,165,26 + LTEXT "Min",IDC_STATIC,35,48,15,8 + LTEXT "Max",IDC_STATIC,189,48,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 66, 120, 10, SS_CENTER END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 Modified: trunk/reactos/dll/cpl/joy/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/el-GR.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/lang/el-GR.rc [iso-8859-1] Mon Mar 31 07:02:52 2008 @@ -13,8 +13,8 @@ PUSHBUTTON "&ÐñïóèÞêç...", IDC_ADD_BUTTON, 35, 129, 65, 14 PUSHBUTTON "&ÊáôÜñãçóç", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED PUSHBUTTON "&Éäéüôçôåò", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED - PUSHBUTTON "Ãéá Ð&ñï÷ùñçìÝíïõò...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 - PUSHBUTTON "&Áíôéìåôþðéóç ðñïâëçìÜôùí...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "Ãéá Ð&ñï÷ùñçìÝíïõò...", IDC_ADVANCED_BUTTON, 56, 157, 85, 14 + PUSHBUTTON "&Áíôéìåôþðéóç ðñïâëçìÜôùí", IDC_TROUBLESHOOT_BUTTON, 145, 157, 100, 14 PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 END @@ -28,10 +28,10 @@ LTEXT "ÅðéëÝîôå Ýíáí åëåãêÞ ðáé÷íéäéþí áðü ôçí ðáñáêÜôù ëßóôá êáé êÜíôå êëéê óôï êïõìðß ÏÊ. ÅÜí ï åëåãêôÞò óáò äåí åìöáíßæåôáé óôç ëßóôá, êÜíôå êëéê óôï êïõìðß ÐñïóáñìïãÞ.", -1, 35, 7, 210, 33 LTEXT "&ÅëåãêôÝò ðáé÷íéäéþí:", -1, 8, 45, 126, 8 LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP - AUTOCHECKBOX "&Åíåñãïðïßçóç ðçäáëßïõ êáé ðåíôÜë", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + AUTOCHECKBOX "&Åíåñãïðïßçóç ðçäáëßïõ êáé ðåíôÜë", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 135, 10, WS_GROUP LTEXT "&Game Port:", -1, 7, 134, 38, 8, NOT WS_VISIBLE COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL - PUSHBUTTON "&ÐñïóáñìïãÞ...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + PUSHBUTTON "&ÐñïóáñìïãÞ...", IDC_CUSTOM_BUTTON, 204, 147, 55, 14 CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 PUSHBUTTON "¢êõñï", IDCANCEL, 208, 179, 50, 14 @@ -46,7 +46,7 @@ GROUPBOX "ÅéäéêÜ ÷áñáêôçñéóôéêÜ", -1, 7, 7, 245, 52 AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 AUTORADIOBUTTON "&×åéñéóôÞñéï ðôÞóçò", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 - AUTORADIOBUTTON "&×åéñéóôÞñéï ðáé÷íéäéþí", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "&×åéñéóôÞñéï ðáé÷íéäéþí", IDC_GAME_PAD_RADIO, 17, 40, 70, 10 AUTORADIOBUTTON "&×åéñéóôÞñéï áãùíéóôéêïý áõôïêéíÞôïõ", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 GROUPBOX "&Axes", -1, 7, 67, 116, 44, WS_GROUP COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL @@ -54,7 +54,7 @@ AUTORADIOBUTTON "Z Üîïíáò", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE GROUPBOX "&ÊïõìðéÜ", -1, 137, 67, 116, 44 COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE - AUTOCHECKBOX "ÓõìðåñéëáìâÜíåé ÷åéñéóôÞñéï ñýèìéóçò ïðôéêÞò ãùíßáò", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + AUTOCHECKBOX "ÓõìðåñéëáìâÜíåé ÷åéñéóôÞñéï ñýèìéóçò ïðôéêÞò ãùíßáò", IDC_INC_POINT_CHECKBOX, 7, 123, 190, 10 LTEXT "¼&íïìá åëåãêôÞ:", -1, 7, 139, 200, 9 EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 @@ -64,7 +64,7 @@ IDD_ADVANCED DIALOGEX 0, 0, 220, 86 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Ñõèìßóåéò ãéá ðñï÷ñçìÝíïõò" +CAPTION "Ñõèìßóåéò ãéá ðñï÷ùñçìÝíïõò" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 @@ -79,6 +79,6 @@ BEGIN IDS_CPLSYSTEMNAME "ÅëåãêôÝò ðáé÷íéäéþí" IDS_CPLSYSTEMDESCRIPTION "ÐñïóèÞêç, êáôÜñãçóç êáé ñýèìéóç ôïõ õëéêïý åëåãêôþí ðáé÷íéäéþí üðùò joystick êáé ÷åéñéóôÞñéá ðáé÷íéäéþí." - IDS_CONTROLLER "Controller" - IDS_STATUS "Status" + IDS_CONTROLLER "ÅëåãêôÞò" + IDS_STATUS "ÊáôÜóôáóç" END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Mon Mar 31 07:02:52 2008 @@ -11,13 +11,13 @@ LTEXT "¸êäïóç ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 - LTEXT "ÕðïëïãéóôÞò:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "ÕðïëïãéóôÞò:", IDC_STATIC, 124, 132, 44, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Åðéóêåõôåßôå ôçí <A HREF=""http://www.reactos.org/"">Éóôïóåëßäá ôïõ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8 + CONTROL "Åðéóêåõôåßôå ôçí <A HREF=""http://www.reactos.org/"">Éóôïóåëßäá ôïõ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 180, 93, 8 PUSHBUTTON "&ÐñïâïëÞ Üäåéáò...", IDC_LICENCE, 170, 199, 78, 13 END @@ -88,8 +88,8 @@ //RADIOBUTTON "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, 14, 158, 133, 8 //RADIOBUTTON "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, 14, 173, 190, 8 CONTROL "Á&íáìïíÞ üóðïõ íá åðéëÝîù ðñïößë õëéêïý", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 200, 8 - CONTROL "ÅðéëïãÞ ôïõ ðñþôïõ ðñïößë óôç ëßóôá åÜí äåí åðé&ëÝîù Ýíá óå", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 200, 8 - LTEXT "äåõôåñüëåðôá", IDC_STATIC, 65, 187, 45, 8 + CONTROL "ÅðéëïãÞ ôïõ ðñþôïõ ðñïößë óôç ëßóôá åÜí äåí åðé&ëÝîù Ýíá óå", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 213, 8 + LTEXT "äåõôåñüëåðôá", IDC_STATIC, 65, 187, 47, 8 EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 @@ -156,7 +156,7 @@ PUSHBUTTON "Åðå&îåñãáóßá", IDC_STRRECEDIT, 188, 87, 50, 14 GROUPBOX "Áðïôõ÷ßá óõóôÞìáôïò", IDC_STATIC, 7, 111, 238, 140 - CONTROL "ÅããñáöÞ ôïõ óõìâÜíôïò óôï áñ÷åßï &êáôáãñáöÞò óõóôÞìáôïò", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 148, 10 + CONTROL "ÅããñáöÞ ôïõ óõìâÜíôïò óôï áñ÷åßï &êáôáãñáöÞò óõóôÞìáôïò", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 158, 10 CONTROL "&ÁðïóôïëÞ åéäïðïßçóçò äéá÷åéñéóôÞ", IDC_STRRECSENDALERT, "button", BS_AUTOCHECKBOX, 14, 138, 148, 10 CONTROL "Á&õôüìáôç åðáíåêêßíçóç", IDC_STRRECRESTART, "button", BS_AUTOCHECKBOX, 14, 152, 145, 10 @@ -177,29 +177,29 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ÌïíÜäá [ÅôéêÝôá ôüìïõ]", IDC_STATIC, 12, 5, 96, 9 - LTEXT "ÌÝãåèïò áñ÷åßïõ óåëéäïðïßçóçò (óå MB)", IDC_STATIC, 115, 5, 96, 9 + LTEXT "ÌÝãåèïò áñ÷åßïõ óåëéäïðïßçóçò (óå MB)", IDC_STATIC, 105, 5, 106, 9 CONTROL "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP, 10, 16, 204, 52, WS_EX_CLIENTEDGE GROUPBOX "ÌÝãåèïò áñ÷åßïõ óåëéäïðïßçóçò ìíÞìçò", IDC_DRIVEGROUP, 10, 70, 204, 104 - LTEXT "ÌïíÜäá äßóêïõ:", IDC_STATIC, 20, 80, 20, 8 - LTEXT "", IDC_DRIVE, 88, 81, 100, 9 - LTEXT "ÄéáèÝóéìïò ÷þñïò:", IDC_STATIC, 20, 92, 56, 9 - LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 - LTEXT "&Áñ÷éêü ìÝãåèïò (MB):", -1, 22, 118, 54, 9 - LTEXT "ÌÝãéóôï ìÝ&ãåèïò (MB):", -1, 22, 131, 64, 9 + LTEXT "ÌïíÜäá äßóêïõ:", IDC_STATIC, 20, 80, 35, 8 + LTEXT "", IDC_DRIVE, 90, 81, 100, 9 + LTEXT "ÄéáèÝóéìïò ÷þñïò:", IDC_STATIC, 20, 92, 66, 9 + LTEXT "", IDC_SPACEAVAIL, 90, 92, 104, 9 + LTEXT "&Áñ÷éêü ìÝãåèïò (MB):", -1, 22, 118, 68, 9 + LTEXT "ÌÝãéóôï ìÝ&ãåèïò (MB):", -1, 22, 131, 68, 9 CONTROL "&ÐñïóáñìïãÞ ìåãÝ&èïõò", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 54, 9 CONTROL "Äéá&÷åßñéóç ìåãÝèïõò áðü ôï óýóôçìá", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 100, 9 - CONTROL "×ùñßò áñ÷åßï óå&ëéäïðïßçóçò", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 86,9 + CONTROL "×ùñßò áñ÷åßï óå&ëéäïðïßçóçò", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 106,9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE PUSHBUTTON "&Ïñéóìüò", IDC_SET, 158, 155, 50, 13 GROUPBOX "Óõíïëéêü ìÝãåèïò áñ÷åßïõ óåëéäïðïßçóçò", IDC_TOTALGROUP, 10, 177, 204, 46 - LTEXT "ÅëÜ÷éóôï åðéôñåðüìåíï:", IDC_STATIC, 18, 188, 58, 9 - LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "ÅëÜ÷éóôï åðéôñåðüìåíï:", IDC_STATIC, 18, 188, 68, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 110, 9 LTEXT "Ðñïôåßíåôáé:", IDC_STATIC, 18, 199, 52, 9 - LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 + LTEXT "", IDC_RECOMMENDED, 88, 197, 110, 9 LTEXT "ÔñÝ÷ïí ìÝãåèïò:", IDC_STATIC, 18, 210, 66, 9 - LTEXT "", IDC_CURRENT, 88, 208, 100, 9 + LTEXT "", IDC_CURRENT, 88, 208, 110, 9 DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 PUSHBUTTON "¢êõñï", IDCANCEL, 168, 232, 48, 13 @@ -237,12 +237,12 @@ CAPTION "Åðåîåñãáóßá ìåôáâëçôÞò" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "¼íïìá ìåôáâëçôÞò:", IDC_STATIC, 7, 14, 50, 8 + LTEXT "¼íïìá ìåôáâëçôÞò:", IDC_STATIC, 5, 14, 65, 8 EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "ÔéìÞ ìåôáâëçôÞò:", IDC_STATIC, 7, 32, 50, 8 + LTEXT "ÔéìÞ ìåôáâëçôÞò:", IDC_STATIC, 5, 32, 60, 8 EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "¢êôñï", IDCANCEL, 170, 50, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 170, 50, 50, 14 END @@ -268,11 +268,11 @@ IDS_VALUE "ÔéìÞ" IDS_NO_DUMP "(ÊáíÝíá)" IDS_MINI_DUMP "¸íäåéîç ìåéùìÝíçò ìíÞìçò(64KB)" - IDS_KERNEL_DUMP "¸íäåéîç ìíÞìçò ðõñßíá" + IDS_KERNEL_DUMP "¸íäåéîç ìíÞìçò ðõñÞíá" IDS_FULL_DUMP "¸íäåéîç ðëÞñïõò ìíÞìçò" - IDS_USERPROFILE_NAME "Name" - IDS_USERPROFILE_SIZE "Size" - IDS_USERPROFILE_TYPE "Type" - IDS_USERPROFILE_STATUS "Status" - IDS_USERPROFILE_MODIFIED "Modified" -END + IDS_USERPROFILE_NAME "¼íïìá" + IDS_USERPROFILE_SIZE "ÌÝãåèïò" + IDS_USERPROFILE_TYPE "Ôýðïò" + IDS_USERPROFILE_STATUS "ÊáôÜóôáóç" + IDS_USERPROFILE_MODIFIED "ÔñïðïðïéÞèçêå" +END

1 0

[jimtabor] 32788: Update to Wine. Need winesynced. Tested with Qemu.
by jimtabor＠svn.reactos.org 31 Mar '08

31 Mar '08

Author: jimtabor Date: Sun Mar 30 23:55:20 2008 New Revision: 32788 URL: http://svn.reactos.org/svn/reactos?rev=32788&view=rev Log: Update to Wine. Need winesynced. Tested with Qemu. Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/clipboard.c trunk/reactos/dll/win32/riched20/context.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/list.c trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/run.c trunk/reactos/dll/win32/riched20/style.c trunk/reactos/dll/win32/riched20/undo.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/dll/win32/riched20/writer.c Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -202,19 +202,21 @@ pSizeRun = run = tmp; assert(run); assert(run->type == diRun); - sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, ME_StrLen(run->member.run.strText)); + sz = ME_GetRunSize(&c, &para->member.para, + &run->member.run, ME_StrLen(run->member.run.strText), + row->member.row.nLMargin); } } if (pCursor->nOffset && !(run->member.run.nFlags & MERF_SKIPPED)) { - sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, pCursor->nOffset); + sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, pCursor->nOffset, + row->member.row.nLMargin); } *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; *x = run->member.run.pt.x + sz.cx; *y = para->member.para.nYPos + row->member.row.nBaseline + pSizeRun->member.run.pt.y - pSizeRun->member.run.nAscent - ME_GetYScrollPos(editor); - - ME_DestroyContext(&c); - ReleaseDC(editor->hWnd, hDC); + + ME_DestroyContext(&c, editor->hWnd); return; } } @@ -393,21 +395,38 @@ } -/* FIXME this is temporary, just to have something to test how bad graphics handler is */ -void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor) -{ - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - WCHAR space = ' '; +void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) +{ + ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); + ME_DisplayItem *di; + WCHAR space = ' '; /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_GRAPHICS); + di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, + MERF_GRAPHICS); + di->member.run.ole_obj = ALLOC_OBJ(*reo); + ME_CopyReObject(di->member.run.ole_obj, reo); ME_SendSelChange(editor); } + +void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) +{ + ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); + ME_DisplayItem *di; + WCHAR space = ' '; + + /* FIXME no no no */ + if (ME_IsSelection(editor)) + ME_DeleteSelection(editor); + + di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, + MERF_ENDROW); + ME_SendSelChange(editor); +} void ME_InsertTableCellFromCursor(ME_TextEditor *editor, int nCursor) Modified: trunk/reactos/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/clipboa… ============================================================================== --- trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -252,14 +252,14 @@ return foundFormat?DV_E_FORMATETC:DV_E_TYMED; } -static HRESULT WINAPI DataObjectImpl_GetCanonicalFormatEtc(IDataObject* iface, FORMATETC *pformatectIn, +static HRESULT WINAPI DataObjectImpl_GetCanonicalFormatEtc(IDataObject* iface, FORMATETC *pformatetcIn, FORMATETC *pformatetcOut) { DataObjectImpl *This = (DataObjectImpl*)iface; - TRACE("(%p)->(%p,%p)\n", This, pformatectIn, pformatetcOut); + TRACE("(%p)->(%p,%p)\n", This, pformatetcIn, pformatetcOut); if(pformatetcOut) { - memcpy(pformatetcOut, pformatectIn, sizeof(FORMATETC)); + *pformatetcOut = *pformatetcIn; pformatetcOut->ptd = NULL; } return DATA_S_SAMEFORMATETC; Modified: trunk/reactos/dll/win32/riched20/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/context… ============================================================================== --- trunk/reactos/dll/win32/riched20/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/context.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -33,7 +33,8 @@ c->dpi.cy = GetDeviceCaps(hDC, LOGPIXELSY); } -void ME_DestroyContext(ME_Context *c) +void ME_DestroyContext(ME_Context *c, HWND hWnd) { + if (hWnd) ReleaseDC(hWnd, c->hDC); DeleteObject(c->hbrMargin); } Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -4,6 +4,7 @@ * Copyright 2004 by Krzysztof Foltman * Copyright 2005 by Cihan Altinay * Copyright 2005 by Phil Krylov + * Copyright 2008 Eric Pouech * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -113,7 +114,7 @@ + EM_SETSEL + EM_SETSCROLLPOS 3.0 - EM_SETTABSTOPS 3.0 - - EM_SETTARGETDEVICE + - EM_SETTARGETDEVICE (partial) + EM_SETTEXTEX 3.0 (no rich text insertion handling, proper style?) - EM_SETTEXTMODE 2.0 - EM_SETTYPOGRAPHYOPTIONS 3.0 @@ -244,7 +245,6 @@ static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; static HCURSOR hLeft; -static HCURSOR hBeam; int me_debug = 0; HANDLE me_heap = NULL; @@ -335,12 +335,13 @@ fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINETYPE | CFM_STRIKEOUT | CFM_COLOR | CFM_BACKCOLOR | CFM_SIZE | CFM_WEIGHT; fmt.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; fmt.yHeight = 12*20; /* 12pt */ - fmt.wWeight = 400; + fmt.wWeight = FW_NORMAL; fmt.bUnderlineType = CFU_UNDERLINENONE; break; case rtfBold: - fmt.dwMask = CFM_BOLD; - fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + fmt.dwMask = CFM_BOLD | CFM_WEIGHT; + fmt.dwEffects = info->rtfParam ? CFE_BOLD : 0; + fmt.wWeight = info->rtfParam ? FW_BOLD : FW_NORMAL; break; case rtfItalic: fmt.dwMask = CFM_ITALIC; @@ -419,7 +420,7 @@ fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; fmt.bCharSet = f->rtfFCharSet; fmt.dwMask = CFM_FACE | CFM_CHARSET; - fmt.bPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; + fmt.bPitchAndFamily = f->rtfFPitch | (f->rtfFFamily << 4); } } break; @@ -451,10 +452,17 @@ switch(info->rtfMinor) { case rtfParDef: /* restores default paragraph attributes */ - fmt.dwMask = PFM_ALIGNMENT | PFM_TABSTOPS | PFM_OFFSET | PFM_STARTINDENT; + fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | PFM_OFFSET | + PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | PFM_STARTINDENT; + /* TODO: numbering, shading */ fmt.wAlignment = PFA_LEFT; fmt.cTabCount = 0; - fmt.dxOffset = fmt.dxStartIndent = 0; + fmt.dxOffset = fmt.dxStartIndent = fmt.dxRightIndent = 0; + fmt.wBorderWidth = fmt.wBorders = 0; + fmt.wBorderSpace = 0; + fmt.bLineSpacingRule = 0; + fmt.dySpaceBefore = fmt.dySpaceAfter = 0; + fmt.dyLineSpacing = 0; RTFFlushOutputBuffer(info); ME_GetParagraph(info->editor->pCursors[0].pRun)->member.para.bTable = FALSE; break; @@ -470,14 +478,16 @@ } case rtfFirstIndent: ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET; - fmt.dxStartIndent += info->rtfParam + fmt.dxOffset; + fmt.dwMask |= PFM_STARTINDENT | PFM_OFFSET; + fmt.dxStartIndent += info->rtfParam; fmt.dxOffset = -info->rtfParam; break; case rtfLeftIndent: + /* we assume rtfLeftIndent is always specified before rtfFirstIndent */ ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT; - fmt.dxStartIndent = -fmt.dxOffset + info->rtfParam; + fmt.dwMask |= PFM_STARTINDENT; + fmt.dxStartIndent = info->rtfParam; + fmt.dxOffset = 0; break; case rtfRightIndent: fmt.dwMask = PFM_RIGHTINDENT; @@ -505,6 +515,147 @@ } if (fmt.cTabCount < MAX_TAB_STOPS) fmt.rgxTabs[fmt.cTabCount++] = info->rtfParam; + break; + case rtfKeep: + fmt.dwMask = PFM_KEEP; + fmt.wEffects = PFE_KEEP; + break; + case rtfNoWidowControl: + fmt.dwMask = PFM_NOWIDOWCONTROL; + fmt.wEffects = PFE_NOWIDOWCONTROL; + break; + case rtfKeepNext: + fmt.dwMask = PFM_KEEPNEXT; + fmt.wEffects = PFE_KEEPNEXT; + break; + case rtfSpaceAfter: + fmt.dwMask = PFM_SPACEAFTER; + fmt.dySpaceAfter = info->rtfParam; + break; + case rtfSpaceBefore: + fmt.dwMask = PFM_SPACEBEFORE; + fmt.dySpaceBefore = info->rtfParam; + break; + case rtfSpaceBetween: + fmt.dwMask = PFM_LINESPACING; + if ((int)info->rtfParam > 0) + { + fmt.dyLineSpacing = info->rtfParam; + fmt.bLineSpacingRule = 3; + } + else + { + fmt.dyLineSpacing = info->rtfParam; + fmt.bLineSpacingRule = 4; + } + case rtfSpaceMultiply: + fmt.dwMask = PFM_LINESPACING; + fmt.dyLineSpacing = info->rtfParam * 20; + fmt.bLineSpacingRule = 5; + break; + case rtfParBullet: + fmt.dwMask = PFM_NUMBERING; + fmt.wNumbering = PFN_BULLET; + break; + case rtfParSimple: + fmt.dwMask = PFM_NUMBERING; + fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ + break; + case rtfParNumDecimal: + fmt.dwMask = PFM_NUMBERING; + fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ + break; + case rtfParNumIndent: + fmt.dwMask = PFM_NUMBERINGTAB; + fmt.wNumberingTab = info->rtfParam; + break; + case rtfParNumStartAt: + fmt.dwMask = PFM_NUMBERINGSTART; + fmt.wNumberingStart = info->rtfParam; + break; + case rtfBorderLeft: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_BORDER)) + { + fmt.dwMask |= PFM_BORDER; + fmt.wBorderSpace = 0; + fmt.wBorderWidth = 1; + fmt.wBorders = 0; + } + fmt.wBorders |= 1; + break; + case rtfBorderRight: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_BORDER)) + { + fmt.dwMask |= PFM_BORDER; + fmt.wBorderSpace = 0; + fmt.wBorderWidth = 1; + fmt.wBorders = 0; + } + fmt.wBorders |= 2; + break; + case rtfBorderTop: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_BORDER)) + { + fmt.dwMask |= PFM_BORDER; + fmt.wBorderSpace = 0; + fmt.wBorderWidth = 1; + fmt.wBorders = 0; + } + fmt.wBorders |= 4; + break; + case rtfBorderBottom: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_BORDER)) + { + fmt.dwMask |= PFM_BORDER; + fmt.wBorderSpace = 0; + fmt.wBorderWidth = 1; + fmt.wBorders = 0; + } + fmt.wBorders |= 8; + break; + case rtfBorderSingle: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 1 << 8; + break; + case rtfBorderThick: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 2 << 8; + break; + case rtfBorderShadow: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 10 << 8; + break; + case rtfBorderDouble: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 7 << 8; + break; + case rtfBorderDot: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 11 << 8; + break; + case rtfBorderWidth: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorderWidth |= ((info->rtfParam / 15) & 7) << 8; + break; + case rtfBorderSpace: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorderSpace = info->rtfParam; break; } if (fmt.dwMask) { @@ -549,6 +700,257 @@ } } +static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbmp, + const SIZEL* sz) +{ + LPOLEOBJECT lpObject = NULL; + LPSTORAGE lpStorage = NULL; + LPOLECLIENTSITE lpClientSite = NULL; + LPDATAOBJECT lpDataObject = NULL; + LPOLECACHE lpOleCache = NULL; + STGMEDIUM stgm; + FORMATETC fm; + CLSID clsid; + BOOL ret = FALSE; + DWORD conn; + + if (hemf) + { + stgm.tymed = TYMED_ENHMF; + stgm.u.hEnhMetaFile = hemf; + fm.cfFormat = CF_ENHMETAFILE; + } + else if (hbmp) + { + stgm.tymed = TYMED_GDI; + stgm.u.hBitmap = hbmp; + fm.cfFormat = CF_BITMAP; + } + stgm.pUnkForRelease = NULL; + + fm.ptd = NULL; + fm.dwAspect = DVASPECT_CONTENT; + fm.lindex = -1; + fm.tymed = stgm.tymed; + + if (!info->lpRichEditOle) + { + CreateIRichEditOle(info->editor, (VOID**)&info->lpRichEditOle); + } + + if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && +#if 0 + /* FIXME: enable it when rich-edit properly implements this method */ + IRichEditOle_GetClientSite(info->lpRichEditOle, &lpClientSite) == S_OK && + IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && +#endif + IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && + IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && + IOleCache_Cache(lpOleCache, &fm, 0, &conn) == S_OK && + IOleObject_QueryInterface(lpObject, &IID_IDataObject, (void**)&lpDataObject) == S_OK && + IDataObject_SetData(lpDataObject, &fm, &stgm, TRUE) == S_OK) + { + REOBJECT reobject; + + reobject.cbStruct = sizeof(reobject); + reobject.cp = REO_CP_SELECTION; + reobject.clsid = clsid; + reobject.poleobj = lpObject; + reobject.pstg = lpStorage; + reobject.polesite = lpClientSite; + /* convert from twips to .01 mm */ + reobject.sizel.cx = MulDiv(sz->cx, 254, 144); + reobject.sizel.cy = MulDiv(sz->cy, 254, 144); + reobject.dvaspect = DVASPECT_CONTENT; + reobject.dwFlags = 0; /* FIXME */ + reobject.dwUser = 0; + + /* FIXME: could be simpler */ + ret = IRichEditOle_InsertObject(info->lpRichEditOle, &reobject) == S_OK; + } + + if (lpObject) IOleObject_Release(lpObject); + if (lpClientSite) IOleClientSite_Release(lpClientSite); + if (lpStorage) IStorage_Release(lpStorage); + if (lpDataObject) IDataObject_Release(lpDataObject); + if (lpOleCache) IOleCache_Release(lpOleCache); + + return ret; +} + +static void ME_RTFReadPictGroup(RTF_Info *info) +{ + SIZEL sz; + BYTE* buffer = NULL; + unsigned bufsz, bufidx; + BOOL flip; + BYTE val; + METAFILEPICT mfp; + HENHMETAFILE hemf; + HBITMAP hbmp; + enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_metafile, gfx_dib} gfx = gfx_unknown; + + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + return; + mfp.mm = MM_TEXT; + /* fetch picture type */ + if (RTFCheckMM (info, rtfPictAttr, rtfWinMetafile)) + { + mfp.mm = info->rtfParam; + gfx = gfx_metafile; + } + else if (RTFCheckMM (info, rtfPictAttr, rtfDevIndBitmap)) + { + if (info->rtfParam != 0) FIXME("dibitmap should be 0 (%d)\n", info->rtfParam); + gfx = gfx_dib; + } + else if (RTFCheckMM (info, rtfPictAttr, rtfEmfBlip)) + { + gfx = gfx_enhmetafile; + } + else + { + FIXME("%d %d\n", info->rtfMajor, info->rtfMinor); + goto skip_group; + } + sz.cx = sz.cy = 0; + /* fetch picture attributes */ + for (;;) + { + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + return; + if (info->rtfClass == rtfText) + break; + if (!RTFCheckCM (info, rtfControl, rtfPictAttr)) + { + ERR("Expected picture attribute (%d %d)\n", + info->rtfClass, info->rtfMajor); + goto skip_group; + } + else if (RTFCheckMM (info, rtfPictAttr, rtfPicWid)) + { + if (gfx == gfx_metafile) mfp.xExt = info->rtfParam; + } + else if (RTFCheckMM (info, rtfPictAttr, rtfPicHt)) + { + if (gfx == gfx_metafile) mfp.yExt = info->rtfParam; + } + else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalWid)) + sz.cx = info->rtfParam; + else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalHt)) + sz.cy = info->rtfParam; + else + FIXME("Non supported attribute: %d %d %d\n", info->rtfClass, info->rtfMajor, info->rtfMinor); + } + /* fetch picture data */ + bufsz = 1024; + bufidx = 0; + buffer = HeapAlloc(GetProcessHeap(), 0, bufsz); + val = info->rtfMajor; + for (flip = TRUE;; flip = !flip) + { + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + { + HeapFree(GetProcessHeap(), 0, buffer); + return; /* Warn ?? */ + } + if (RTFCheckCM(info, rtfGroup, rtfEndGroup)) + break; + if (info->rtfClass != rtfText) goto skip_group; + if (flip) + { + if (bufidx >= bufsz && + !(buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, bufsz += 1024))) + goto skip_group; + buffer[bufidx++] = RTFCharToHex(val) * 16 + RTFCharToHex(info->rtfMajor); + } + else + val = info->rtfMajor; + } + if (flip) FIXME("wrong hex string\n"); + + switch (gfx) + { + case gfx_enhmetafile: + if ((hemf = SetEnhMetaFileBits(bufidx, buffer))) + ME_RTFInsertOleObject(info, hemf, NULL, &sz); + break; + case gfx_metafile: + if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) + ME_RTFInsertOleObject(info, hemf, NULL, &sz); + break; + case gfx_dib: + { + BITMAPINFO* bi = (BITMAPINFO*)buffer; + HDC hdc = GetDC(0); + unsigned nc = bi->bmiHeader.biClrUsed; + + /* not quite right, especially for bitfields type of compression */ + if (!nc && bi->bmiHeader.biBitCount <= 8) + nc = 1 << bi->bmiHeader.biBitCount; + if ((hbmp = CreateDIBitmap(hdc, &bi->bmiHeader, + CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), + bi, DIB_RGB_COLORS))) + ME_RTFInsertOleObject(info, NULL, hbmp, &sz); + ReleaseDC(0, hdc); + } + break; + default: + break; + } + HeapFree(GetProcessHeap(), 0, buffer); + RTFRouteToken (info); /* feed "}" back to router */ + return; +skip_group: + HeapFree(GetProcessHeap(), 0, buffer); + RTFSkipGroup(info); + RTFRouteToken(info); /* feed "}" back to router */ +} + +/* for now, lookup the \result part and use it, whatever the object */ +static void ME_RTFReadObjectGroup(RTF_Info *info) +{ + for (;;) + { + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + return; + if (RTFCheckCM(info, rtfGroup, rtfEndGroup)) + break; + if (RTFCheckCM(info, rtfGroup, rtfBeginGroup)) + { + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + return; + if (RTFCheckCMM(info, rtfControl, rtfDestination, rtfObjResult)) + { + int level = 1; + + while (RTFGetToken (info) != rtfEOF) + { + if (info->rtfClass == rtfGroup) + { + if (info->rtfMajor == rtfBeginGroup) level++; + else if (info->rtfMajor == rtfEndGroup && --level < 0) break; + } + RTFRouteToken(info); + } + } + else RTFSkipGroup(info); + continue; + } + if (!RTFCheckCM (info, rtfControl, rtfObjAttr)) + { + FIXME("Non supported attribute: %d %d %d\n", info->rtfClass, info->rtfMajor, info->rtfMinor); + return; + } + } + RTFRouteToken(info); /* feed "}" back to router */ +} + static void ME_RTFReadHook(RTF_Info *info) { switch(info->rtfClass) { @@ -557,7 +959,7 @@ { case rtfBeginGroup: if (info->stackTop < maxStack) { - memcpy(&info->stack[info->stackTop].fmt, &info->style->fmt, sizeof(CHARFORMAT2W)); + info->stack[info->stackTop].fmt = info->style->fmt; info->stack[info->stackTop].codePage = info->codePage; info->stack[info->stackTop].unicodeLength = info->unicodeLength; } @@ -628,9 +1030,9 @@ int nEventMask = editor->nEventMask; ME_InStream inStream; - TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, (UINT)format); + TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, format); editor->nEventMask = 0; - + ME_GetSelection(editor, &from, &to); if ((format & SFF_SELECTION) && (editor->mode & TM_RICHTEXT)) { style = ME_GetSelectionInsertStyle(editor); @@ -687,12 +1089,16 @@ WriterInit(&parser); RTFInit(&parser); RTFSetReadHook(&parser, ME_RTFReadHook); + RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup); + RTFSetDestinationCallback(&parser, rtfObject, ME_RTFReadObjectGroup); BeginFile(&parser); - + /* do the parsing */ RTFRead(&parser); RTFFlushOutputBuffer(&parser); RTFDestroy(&parser); + if (parser.lpRichEditOle) + IRichEditOle_Release(parser.lpRichEditOle); style = parser.style; } @@ -1125,12 +1531,15 @@ return FALSE; } -static void ME_SetCursor(ME_TextEditor *editor, int x) -{ - if (x < editor->selofs || editor->linesel) +static BOOL ME_SetCursor(ME_TextEditor *editor, int x) +{ + if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_SELECTIONBAR) && + (x < editor->selofs || editor->linesel)) + { SetCursor(hLeft); - else - SetCursor(hBeam); + return TRUE; + } + return FALSE; } static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) @@ -1140,7 +1549,7 @@ int seltype = 0; if(!editor->lpOleCallback) return FALSE; - ME_GetSelection(editor, (int *)&selrange.cpMin, (int *)&selrange.cpMax); + ME_GetSelection(editor, &selrange.cpMin, &selrange.cpMax); if(selrange.cpMin == selrange.cpMax) seltype |= SEL_EMPTY; else @@ -1193,6 +1602,7 @@ ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->bRedraw = TRUE; + ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & WS_HSCROLL) ? FALSE : TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; @@ -1305,7 +1715,6 @@ me_heap = HeapCreate (0, 0x10000, 0); if (!ME_RegisterEditorClass(hinstDLL)) return FALSE; hLeft = LoadCursorW(hinstDLL, MAKEINTRESOURCEW(OCR_REVERSE)); - hBeam = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); LookupInit(); break; @@ -1504,7 +1913,6 @@ UNSUPPORTED_MSG(EM_SETLANGOPTIONS) UNSUPPORTED_MSG(EM_SETPALETTE) UNSUPPORTED_MSG(EM_SETTABSTOPS) - UNSUPPORTED_MSG(EM_SETTARGETDEVICE) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) UNSUPPORTED_MSG(WM_STYLECHANGING) @@ -1561,7 +1969,7 @@ case EM_EXGETSEL: { CHARRANGE *pRange = (CHARRANGE *)lParam; - ME_GetSelection(editor, (int *)&pRange->cpMin, (int *)&pRange->cpMax); + ME_GetSelection(editor, &pRange->cpMin, &pRange->cpMax); TRACE("EM_EXGETSEL = (%d,%d)\n", pRange->cpMin, pRange->cpMax); return 0; } @@ -2034,11 +2442,11 @@ LPDATAOBJECT dataObj = NULL; CHARRANGE range; HRESULT hr = S_OK; - + if (editor->cPasswordMask) return 0; /* Copying or Cutting masked text isn't allowed */ - - ME_GetSelection(editor, (int*)&range.cpMin, (int*)&range.cpMax); + + ME_GetSelection(editor, &range.cpMin, &range.cpMax); if(editor->lpOleCallback) hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); if(FAILED(hr) || !dataObj) @@ -2077,17 +2485,17 @@ else bufferA = heap_alloc(wParam + 2); - ex.cb = wParam + (unicode ? 2*sizeof(WCHAR) : 2); + ex.cb = (wParam + 2) * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); ex.flags = GT_USECRLF; ex.codepage = unicode ? 1200 : CP_ACP; ex.lpDefaultChar = NULL; - ex.lpUsedDefaultChar = NULL; + ex.lpUsedDefChar = NULL; rc = RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, unicode ? (LPARAM)bufferW : (LPARAM)bufferA, unicode); if (unicode) { - memcpy((LPWSTR)lParam, bufferW, wParam); - if (lstrlenW(bufferW) >= wParam / sizeof(WCHAR)) rc = 0; + memcpy((LPWSTR)lParam, bufferW, wParam * sizeof(WCHAR)); + if (lstrlenW(bufferW) >= wParam) rc = 0; } else { @@ -2101,7 +2509,7 @@ case EM_GETTEXTEX: { GETTEXTEX *ex = (GETTEXTEX*)wParam; - int nStart, nCount; + int nStart, nCount; /* in chars */ if (ex->flags & ~(GT_SELECTION | GT_USECRLF)) FIXME("GETTEXTEX flags 0x%08x not supported\n", ex->flags & ~(GT_SELECTION | GT_USECRLF)); @@ -2110,12 +2518,11 @@ { ME_GetSelection(editor, &nStart, &nCount); nCount -= nStart; - nCount = min(nCount, ex->cb - 1); } else { nStart = 0; - nCount = ex->cb - 1; + nCount = 0x7fffffff; } if (ex->codepage == 1200) { @@ -2127,13 +2534,16 @@ /* potentially each char may be a CR, why calculate the exact value with O(N) when we can just take a bigger buffer? :) */ int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; - LPWSTR buffer = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); + LPWSTR buffer; DWORD buflen = ex->cb; LRESULT rc; DWORD flags = 0; + nCount = min(nCount, ex->cb - 1); + buffer = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); + buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); - rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); + rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefChar); if (rc) rc--; /* do not count 0 terminator */ heap_free(buffer); @@ -2393,6 +2803,7 @@ pt.x = 0; pt.y = editor->pBuffer->pLast->member.para.nYPos; } + pt.x += editor->selofs; if (wParam >= 0x40000) { *(POINTL *)wParam = pt; } @@ -2419,7 +2830,7 @@ ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); SetCapture(hWnd); ME_LinkNotify(editor,msg,wParam,lParam); - ME_SetCursor(editor, LOWORD(lParam)); + if (!ME_SetCursor(editor, LOWORD(lParam))) goto do_default; break; case WM_MOUSEMOVE: if ((editor->nEventMask & ENM_MOUSEEVENTS) && @@ -2428,7 +2839,7 @@ if (GetCapture() == hWnd) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); - ME_SetCursor(editor, LOWORD(lParam)); + if (!ME_SetCursor(editor, LOWORD(lParam))) goto do_default; break; case WM_LBUTTONUP: if (GetCapture() == hWnd) @@ -2436,9 +2847,14 @@ if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; - editor->linesel = 0; - ME_SetCursor(editor, LOWORD(lParam)); - ME_LinkNotify(editor,msg,wParam,lParam); + else + { + BOOL ret; + editor->linesel = 0; + ret = ME_SetCursor(editor, LOWORD(lParam)); + ME_LinkNotify(editor,msg,wParam,lParam); + if (!ret) goto do_default; + } break; case WM_LBUTTONDBLCLK: if ((editor->nEventMask & ENM_MOUSEEVENTS) && @@ -2561,7 +2977,10 @@ { ME_Style *style = ME_GetInsertStyle(editor, 0); ME_SaveTempStyle(editor); - ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); + if (wstr == '\r' && (GetKeyState(VK_SHIFT) & 0x8000)) + ME_InsertEndRowFromCursor(editor, 0); + else + ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); ME_CommitUndo(editor); } @@ -2785,6 +3204,13 @@ ME_RewrapRepaint(editor); return 0; } + case EM_SETTARGETDEVICE: + if (wParam == 0) + { + editor->bWordWrap = (lParam == 0); + } + else FIXME("Unsupported yet non NULL device in EM_SETTARGETDEVICE\n"); + break; default: do_default: return DefWindowProcW(hWnd, msg, wParam, lParam); @@ -2973,7 +3399,7 @@ wcW.cbWndExtra = sizeof(ME_TextEditor *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; - wcW.hCursor = hBeam; + wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); wcW.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); wcW.lpszMenuName = NULL; Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -149,7 +149,6 @@ ME_Style *style, const WCHAR *str, int len, int flags); void ME_CheckCharOffsets(ME_TextEditor *editor); void ME_PropagateCharOffset(ME_DisplayItem *p, int shift); -void ME_GetGraphicsSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize); int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run); /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run); @@ -157,13 +156,13 @@ int ME_GetLastSplittablePlace(ME_Context *c, ME_Run *run); int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2); void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p); -ME_DisplayItem *ME_SplitRun(ME_Context *c, ME_DisplayItem *item, int nChar); +ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nChar); ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_DisplayItem *item, int nChar); int ME_FindSplitPoint(ME_Context *c, POINT *pt, ME_Run *run, int desperate); void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run); ME_DisplayItem *ME_SplitFurther(ME_TextEditor *editor, ME_DisplayItem *run); -void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, ME_Run *run); -SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen); +void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run); +SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx); void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor); void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem **ppRun, int *pOfs); int ME_CharOfsFromRunOfs(ME_TextEditor *editor, ME_DisplayItem *pRun, int nOfs); @@ -187,10 +186,11 @@ void ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars); void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style); +void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC); -void ME_DestroyContext(ME_Context *c); +void ME_DestroyContext(ME_Context *c, HWND release); ME_Style *GetInsertStyle(ME_TextEditor *editor, int nCursor); void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para); void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, @@ -201,7 +201,7 @@ BOOL ME_IsSelection(ME_TextEditor *editor); void ME_DeleteSelection(ME_TextEditor *editor); void ME_SendSelChange(ME_TextEditor *editor); -void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor); +void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor); void ME_InsertTableCellFromCursor(ME_TextEditor *editor, int nCursor); void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars); int ME_GetTextLength(ME_TextEditor *editor); @@ -259,7 +259,11 @@ int ME_GetParaLineSpace(ME_Context *c, ME_Paragraph*); /* richole.c */ -extern LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); +LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected); +void ME_GetOLEObjectSize(ME_Context *c, ME_Run *run, SIZE *pSize); +void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src); +void ME_DeleteReObject(REOBJECT* reo); /* wintest.c */ Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… ============================================================================== --- trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -92,11 +92,11 @@ /******************************** run flags *************************/ #define MERF_STYLEFLAGS 0x0FFF /* run contains non-text content, which has its own rules for wrapping, sizing etc */ -#define MERF_GRAPHICS 1 +#define MERF_GRAPHICS 0x001 /* run is a tab (or, in future, any kind of content whose size is dependent on run position) */ -#define MERF_TAB 2 +#define MERF_TAB 0x002 /* run is a cell boundary */ -#define MERF_CELL 4 +#define MERF_CELL 0x004 #define MERF_NONTEXT (MERF_GRAPHICS | MERF_TAB | MERF_CELL) @@ -114,13 +114,15 @@ #define MERF_CALCBYWRAP 0x0F0000 /* the "end of paragraph" run, contains 1 character */ #define MERF_ENDPARA 0x100000 +/* forcing the "end of row" run, contains 1 character */ +#define MERF_ENDROW 0x200000 /* run is hidden */ -#define MERF_HIDDEN 0x200000 +#define MERF_HIDDEN 0x400000 /* runs with any of these flags set cannot be joined */ -#define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA) +#define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA|MERF_ENDROW) /* runs that don't contain real text */ -#define MERF_NOTEXT (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA) +#define MERF_NOTEXT (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA|MERF_ENDROW) /* those flags are kept when the row is split */ #define MERF_SPLITMASK (~(0)) @@ -145,6 +147,7 @@ int nAscent, nDescent; /* pixels above/below baseline */ POINT pt; /* relative to para's position */ struct tagME_TableCell *pCell; /* for MERF_CELL: points to respective cell in ME_Paragraph */ + REOBJECT *ole_obj; /* FIXME: should be a union with strText (at least) */ } ME_Run; typedef struct tagME_Document { @@ -309,6 +312,7 @@ int nZoomNumerator, nZoomDenominator; RECT rcFormat; BOOL bRedraw; + BOOL bWordWrap; int nInvalidOfs; int nTextLimit; EDITWORDBREAKPROCW pfnWordBreak; @@ -347,7 +351,7 @@ ME_Style *style; ME_Context *context; int nLeftMargin, nRightMargin, nFirstMargin; - int nTotalWidth, nAvailWidth; + int nAvailWidth; int nRow; POINT pt; BOOL bOverflown; Modified: trunk/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/list.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/list.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/list.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -115,6 +115,7 @@ ME_DestroyTableCellList(item); } if (item->type==diRun || item->type == diUndoInsertRun) { + if (item->member.run.ole_obj) ME_DeleteReObject(item->member.run.ole_obj); ME_ReleaseStyle(item->member.run.style); ME_DestroyString(item->member.run.strText); } Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -91,7 +91,7 @@ if (editor->nTotalLength != editor->nLastTotalLength) ME_SendRequestResize(editor, FALSE); editor->nLastTotalLength = editor->nTotalLength; - ME_DestroyContext(&c); + ME_DestroyContext(&c, NULL); } void ME_Repaint(ME_TextEditor *editor) @@ -246,34 +246,6 @@ SetTextColor(hDC, color); } -static void ME_DrawGraphics(ME_Context *c, int x, int y, ME_Run *run, - ME_Paragraph *para, BOOL selected) { - SIZE sz; - int xs, ys, xe, ye, h, ym, width, eyes; - ME_GetGraphicsSize(c->editor, run, &sz); - xs = run->pt.x; - ys = y-sz.cy; - xe = xs+sz.cx; - ye = y; - h = ye-ys; - ym = ys+h/4; - width = sz.cx; - eyes = width/8; - /* draw a smiling face :) */ - Ellipse(c->hDC, xs, ys, xe, ye); - Ellipse(c->hDC, xs+width/8, ym, x+width/8+eyes, ym+eyes); - Ellipse(c->hDC, xs+7*width/8-eyes, ym, xs+7*width/8, ym+eyes); - MoveToEx(c->hDC, xs+width/8, ys+3*h/4-eyes, NULL); - LineTo(c->hDC, xs+width/8, ys+3*h/4); - LineTo(c->hDC, xs+7*width/8, ys+3*h/4); - LineTo(c->hDC, xs+7*width/8, ys+3*h/4-eyes); - if (selected) - { - /* descent is usually (always?) 0 for graphics */ - PatBlt(c->hDC, x, y-run->nAscent, sz.cx, run->nAscent+run->nDescent, DSTINVERT); - } -} - static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para) { ME_Run *run = &rundi->member.run; @@ -299,7 +271,7 @@ return; if (run->nFlags & MERF_GRAPHICS) - ME_DrawGraphics(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); + ME_DrawOLE(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); else { if (c->editor->cPasswordMask) @@ -318,7 +290,7 @@ } static struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} border_details[] = { - /* none */ {0, 0, PS_SOLID, FALSE}, + /* none */ {0, 1, PS_SOLID, FALSE}, /* 3/4 */ {3, 4, PS_SOLID, FALSE}, /* 1 1/2 */ {3, 2, PS_SOLID, FALSE}, /* 2 1/4 */ {9, 4, PS_SOLID, FALSE}, Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -28,7 +28,6 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; - HDC hDC; PARAFORMAT2 fmt; CHARFORMAT2W cf; LOGFONTW lf; @@ -38,9 +37,8 @@ ME_DisplayItem *run; ME_Style *style; - hDC = GetDC(editor->hWnd); - - ME_InitContext(&c, editor, hDC); + ME_InitContext(&c, editor, GetDC(editor->hWnd)); + hf = (HFONT)GetStockObject(SYSTEM_FONT); assert(hf); GetObjectW(hf, sizeof(LOGFONTW), &lf); @@ -55,7 +53,7 @@ cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; lstrcpyW(cf.szFaceName, lf.lfFaceName); cf.yHeight = ME_twips2pointsY(&c, lf.lfHeight); - if (lf.lfWeight >= 700) cf.dwEffects |= CFE_BOLD; + if (lf.lfWeight > FW_NORMAL) cf.dwEffects |= CFE_BOLD; cf.wWeight = lf.lfWeight; if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC; cf.bUnderlineType = (lf.lfUnderline) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; @@ -68,8 +66,8 @@ fmt.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_STARTINDENT | PFM_RIGHTINDENT | PFM_TABSTOPS; fmt.wAlignment = PFA_LEFT; - CopyMemory(para->member.para.pFmt, &fmt, sizeof(PARAFORMAT2)); - + *para->member.para.pFmt = fmt; + style = ME_MakeStyle(&cf); text->pDefaultStyle = style; @@ -85,8 +83,7 @@ text->pLast->member.para.nCharOfs = 1; - ME_DestroyContext(&c); - ReleaseDC(editor->hWnd, hDC); + ME_DestroyContext(&c, editor->hWnd); } void ME_MarkAllForWrapping(ME_TextEditor *editor) @@ -148,7 +145,7 @@ new_para->member.para.nFlags = MEPF_REWRAP; /* FIXME copy flags (if applicable) */ /* FIXME initialize format style and call ME_SetParaFormat blah blah */ - CopyMemory(new_para->member.para.pFmt, run_para->member.para.pFmt, sizeof(PARAFORMAT2)); + *new_para->member.para.pFmt = *run_para->member.para.pFmt; new_para->member.para.bTable = run_para->member.para.bTable; @@ -226,7 +223,7 @@ { undo->nStart = pNext->member.para.nCharOfs - end_len; assert(pNext->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); - CopyMemory(undo->di.member.para.pFmt, pNext->member.para.pFmt, sizeof(PARAFORMAT2)); + *undo->di.member.para.pFmt = *pNext->member.para.pFmt; } shift = pNext->member.para.nCharOfs - tp->member.para.nCharOfs - end_len; @@ -352,7 +349,7 @@ assert(sizeof(*para->member.para.pFmt) == sizeof(PARAFORMAT2)); ME_AddUndoItem(editor, diUndoSetParagraphFormat, para); - CopyMemory(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2)); + copy = *para->member.para.pFmt; #define COPY_FIELD(m, f) \ if (pFmt->dwMask & (m)) { \ @@ -447,7 +444,7 @@ { if (pFmt->cbSize >= sizeof(PARAFORMAT2)) { - CopyMemory(pFmt, para->member.para.pFmt, sizeof(PARAFORMAT2)); + *pFmt = *para->member.para.pFmt; return; } CopyMemory(pFmt, para->member.para.pFmt, pFmt->cbSize); Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -857,9 +857,9 @@ fp->rtfFName = NULL; fp->rtfFAltName = NULL; fp->rtfFNum = -1; - fp->rtfFFamily = 0; + fp->rtfFFamily = FF_DONTCARE; fp->rtfFCharSet = DEFAULT_CHARSET; /* 1 */ - fp->rtfFPitch = 0; + fp->rtfFPitch = DEFAULT_PITCH; fp->rtfFType = 0; fp->rtfFCodePage = CP_ACP; @@ -1788,6 +1788,7 @@ { rtfPictAttr, rtfWinMetafile, "wmetafile", 0 }, { rtfPictAttr, rtfDevIndBitmap, "dibitmap", 0 }, { rtfPictAttr, rtfWinBitmap, "wbitmap", 0 }, + { rtfPictAttr, rtfEmfBlip, "emfblip", 0 }, { rtfPictAttr, rtfPixelBits, "wbmbitspixel", 0 }, { rtfPictAttr, rtfBitmapPlanes, "wbmplanes", 0 }, { rtfPictAttr, rtfBitmapWid, "wbmwidthbytes", 0 }, @@ -2596,10 +2597,13 @@ } break; } + case rtfLine: + RTFFlushOutputBuffer(info); + ME_InsertEndRowFromCursor(info->editor, 0); + break; case rtfPage: case rtfSect: case rtfRow: - case rtfLine: case rtfPar: RTFPutUnicodeChar (info, '\n'); break; @@ -2648,6 +2652,7 @@ } } + static void RTFPutUnicodeString(RTF_Info *info, const WCHAR *string, int length) { Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… ============================================================================== --- trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -162,7 +162,7 @@ if(!lplpdataobj) return E_INVALIDARG; if(!lpchrg) { - ME_GetSelection(This->editor, (int*)&tmpchrg.cpMin, (int*)&tmpchrg.cpMax); + ME_GetSelection(This->editor, &tmpchrg.cpMin, &tmpchrg.cpMax); lpchrg = &tmpchrg; } return ME_GetDataObject(This->editor, lpchrg, lplpdataobj); @@ -218,11 +218,18 @@ } static HRESULT WINAPI -IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *lpreobject) -{ - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); - return E_NOTIMPL; +IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) +{ + IRichEditOleImpl *This = impl_from_IRichEditOle(me); + TRACE("(%p,%p)\n", This, reo); + + if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; + if (reo->poleobj) IOleObject_AddRef(reo->poleobj); + if (reo->pstg) IStorage_AddRef(reo->pstg); + if (reo->polesite) IOleClientSite_AddRef(reo->polesite); + + ME_InsertOLEFromCursor(This->editor, reo, 0); + return S_OK; } static HRESULT WINAPI IRichEditOle_fnSaveCompleted(IRichEditOle *me, LONG iob, @@ -542,3 +549,204 @@ return 1; } + +static void convert_sizel(ME_Context *c, const SIZEL* szl, SIZE* sz) +{ + /* sizel is in .01 millimeters, sz in pixels */ + sz->cx = MulDiv(szl->cx, c->dpi.cx, 2540); + sz->cy = MulDiv(szl->cy, c->dpi.cy, 2540); +} + +/****************************************************************************** + * ME_GetOLEObjectSize + * + * Sets run extent for OLE objects. + */ +void ME_GetOLEObjectSize(ME_Context *c, ME_Run *run, SIZE *pSize) +{ + IDataObject* ido; + FORMATETC fmt; + STGMEDIUM stgm; + DIBSECTION dibsect; + ENHMETAHEADER emh; + + assert(run->nFlags & MERF_GRAPHICS); + assert(run->ole_obj); + + if (run->ole_obj->sizel.cx != 0 || run->ole_obj->sizel.cy != 0) + { + convert_sizel(c, &run->ole_obj->sizel, pSize); + return; + } + + IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido); + fmt.cfFormat = CF_BITMAP; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_GDI; + if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) + { + fmt.cfFormat = CF_ENHMETAFILE; + fmt.tymed = TYMED_ENHMF; + if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) + { + FIXME("unsupported format\n"); + pSize->cx = pSize->cy = 0; + IDataObject_Release(ido); + return; + } + } + + switch (stgm.tymed) + { + case TYMED_GDI: + GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); + pSize->cx = dibsect.dsBm.bmWidth; + pSize->cy = dibsect.dsBm.bmHeight; + if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); + break; + case TYMED_ENHMF: + GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); + pSize->cx = emh.rclBounds.right - emh.rclBounds.left; + pSize->cy = emh.rclBounds.bottom - emh.rclBounds.top; + if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); + break; + default: + FIXME("Unsupported tymed %d\n", stgm.tymed); + break; + } + IDataObject_Release(ido); + if (c->editor->nZoomNumerator != 0) + { + pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + pSize->cy = MulDiv(pSize->cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } +} + +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, + ME_Paragraph *para, BOOL selected) +{ + IDataObject* ido; + FORMATETC fmt; + STGMEDIUM stgm; + DIBSECTION dibsect; + ENHMETAHEADER emh; + HDC hMemDC; + SIZE sz; + BOOL has_size; + + assert(run->nFlags & MERF_GRAPHICS); + assert(run->ole_obj); + if (IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido) != S_OK) + { + FIXME("Couldn't get interface\n"); + return; + } + has_size = run->ole_obj->sizel.cx != 0 || run->ole_obj->sizel.cy != 0; + fmt.cfFormat = CF_BITMAP; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_GDI; + if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) + { + fmt.cfFormat = CF_ENHMETAFILE; + fmt.tymed = TYMED_ENHMF; + if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) + { + FIXME("Couldn't get storage medium\n"); + IDataObject_Release(ido); + return; + } + } + switch (stgm.tymed) + { + case TYMED_GDI: + GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); + hMemDC = CreateCompatibleDC(c->hDC); + SelectObject(hMemDC, stgm.u.hBitmap); + if (!has_size && c->editor->nZoomNumerator == 0) + { + sz.cx = dibsect.dsBm.bmWidth; + sz.cy = dibsect.dsBm.bmHeight; + BitBlt(c->hDC, x, y - dibsect.dsBm.bmHeight, + dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, + hMemDC, 0, 0, SRCCOPY); + } + else + { + if (has_size) + { + convert_sizel(c, &run->ole_obj->sizel, &sz); + } + else + { + sz.cx = MulDiv(dibsect.dsBm.bmWidth, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cy = MulDiv(dibsect.dsBm.bmHeight, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, + hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); + } + if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); + break; + case TYMED_ENHMF: + GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); + if (!has_size && c->editor->nZoomNumerator == 0) + { + sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; + sz.cx = emh.rclBounds.right - emh.rclBounds.left; + } + else + { + if (has_size) + { + convert_sizel(c, &run->ole_obj->sizel, &sz); + } + else + { + sz.cy = MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cx = MulDiv(emh.rclBounds.right - emh.rclBounds.left, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + } + { + RECT rc; + + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); + } + if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); + break; + default: + FIXME("Unsupported tymed %d\n", stgm.tymed); + selected = FALSE; + break; + } + if (selected && !c->editor->bHideSelection) + PatBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, DSTINVERT); + IDataObject_Release(ido); +} + +void ME_DeleteReObject(REOBJECT* reo) +{ + if (reo->poleobj) IOleObject_Release(reo->poleobj); + if (reo->pstg) IStorage_Release(reo->pstg); + if (reo->polesite) IOleClientSite_Release(reo->polesite); + FREE_OBJ(reo); +} + +void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) +{ + *dst = *src; + + if (dst->poleobj) IOleObject_AddRef(dst->poleobj); + if (dst->pstg) IStorage_AddRef(dst->pstg); + if (dst->polesite) IOleClientSite_AddRef(dst->polesite); +} Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -597,23 +597,24 @@ # define rtfWinMetafile 2 # define rtfDevIndBitmap 3 # define rtfWinBitmap 4 -# define rtfPixelBits 5 -# define rtfBitmapPlanes 6 -# define rtfBitmapWid 7 -# define rtfPicWid 8 -# define rtfPicHt 9 -# define rtfPicGoalWid 10 -# define rtfPicGoalHt 11 -# define rtfPicScaleX 12 -# define rtfPicScaleY 13 -# define rtfPicScaled 14 -# define rtfPicCropTop 15 -# define rtfPicCropBottom 16 -# define rtfPicCropLeft 17 -# define rtfPicCropRight 18 -# define rtfPicMFHasBitmap 19 /* new in 1.10 */ -# define rtfPicMFBitsPerPixel 20 /* new in 1.10 */ -# define rtfPicBinary 21 +# define rtfEmfBlip 5 +# define rtfPixelBits 6 +# define rtfBitmapPlanes 7 +# define rtfBitmapWid 8 +# define rtfPicWid 9 +# define rtfPicHt 10 +# define rtfPicGoalWid 11 +# define rtfPicGoalHt 12 +# define rtfPicScaleX 13 +# define rtfPicScaleY 14 +# define rtfPicScaled 15 +# define rtfPicCropTop 16 +# define rtfPicCropBottom 17 +# define rtfPicCropLeft 18 +# define rtfPicCropRight 19 +# define rtfPicMFHasBitmap 20 /* new in 1.10 */ +# define rtfPicMFBitsPerPixel 21 /* new in 1.10 */ +# define rtfPicBinary 22 # define rtfBookmarkAttr 14 # define rtfBookmarkFirstCol 0 @@ -1103,6 +1104,7 @@ RTFState stack[maxStack]; int stackTop; BOOL styleChanged; + LPRICHEDITOLE lpRichEditOle; }; Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -267,9 +267,9 @@ * Splits a run into two in a given place. It also updates the screen position * and size (extent) of the newly generated runs. */ -ME_DisplayItem *ME_SplitRun(ME_Context *c, ME_DisplayItem *item, int nVChar) -{ - ME_TextEditor *editor = c->editor; +ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar) +{ + ME_TextEditor *editor = wc->context->editor; ME_DisplayItem *item2 = NULL; ME_Run *run, *run2; ME_Paragraph *para = &ME_GetParagraph(item)->member.para; @@ -291,8 +291,8 @@ run2 = &item2->member.run; - ME_CalcRunExtent(c, para, run); - ME_CalcRunExtent(c, para, run2); + ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); + ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run2); run2->pt.x = run->pt.x+run->nWidth; run2->pt.y = run->pt.y; @@ -359,6 +359,7 @@ { ME_DisplayItem *item = ME_MakeDI(diRun); item->member.run.style = s; + item->member.run.ole_obj = NULL; item->member.run.strText = strData; item->member.run.nFlags = nFlags; item->member.run.nCharOfs = -1; @@ -468,19 +469,6 @@ } /****************************************************************************** - * ME_GetGraphicsSize - * - * Sets run extent for graphics runs. This functionality is just a placeholder - * for future OLE object support, and will be removed. - */ -void ME_GetGraphicsSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize) -{ - assert(run->nFlags & MERF_GRAPHICS); - pSize->cx = 64; - pSize->cy = 64; -} - -/****************************************************************************** * ME_CharFromPoint * * Returns a character position inside the run given a run-relative @@ -504,7 +492,7 @@ if (run->nFlags & MERF_GRAPHICS) { SIZE sz; - ME_GetGraphicsSize(c->editor, run, &sz); + ME_GetOLEObjectSize(c, run, &sz); if (cx < sz.cx) return 0; return 1; @@ -558,21 +546,22 @@ return 0; return 1; } + ME_InitContext(&c, editor, GetDC(editor->hWnd)); if (run->nFlags & MERF_GRAPHICS) { SIZE sz; - ME_GetGraphicsSize(editor, run, &sz); + ME_GetOLEObjectSize(&c, run, &sz); + ME_DestroyContext(&c, editor->hWnd); if (cx < sz.cx/2) return 0; return 1; } - + if (editor->cPasswordMask) strRunText = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(run->strText)); else strRunText = run->strText; - ME_InitContext(&c, editor, GetDC(editor->hWnd)); hOldFont = ME_SelectStyleFont(&c, run->style); GetTextExtentExPointW(c.hDC, strRunText->szData, strRunText->nLen, cx, &fit, NULL, &sz); @@ -591,7 +580,7 @@ ME_DestroyString(strRunText); ME_UnselectStyleFont(&c, run->style, hOldFont); - ReleaseDC(editor->hWnd, c.hDC); + ME_DestroyContext(&c, editor->hWnd); return fit; } @@ -621,19 +610,20 @@ ME_String *strRunText; /* This could point to either the run's real text, or it's masked form in a password control */ + ME_InitContext(&c, editor, GetDC(editor->hWnd)); if (pRun->nFlags & MERF_GRAPHICS) { - if (!nOffset) return 0; - ME_GetGraphicsSize(editor, pRun, &size); - return 1; + if (nOffset) + ME_GetOLEObjectSize(&c, pRun, &size); + ReleaseDC(editor->hWnd, c.hDC); + return nOffset != 0; } if (editor->cPasswordMask) strRunText = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(pRun->strText)); else strRunText = pRun->strText; - - ME_InitContext(&c, editor, GetDC(editor->hWnd)); + ME_GetTextExtent(&c, strRunText->szData, nOffset, pRun->style, &size); ReleaseDC(editor->hWnd, c.hDC); if (editor->cPasswordMask) @@ -648,7 +638,7 @@ * (nLen). */ static SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, - int *pAscent, int *pDescent) + int startx, int *pAscent, int *pDescent) { SIZE size; int nMaxLen = ME_StrVLen(run->strText); @@ -678,8 +668,8 @@ if (run->nFlags & MERF_TAB) { int pos = 0, i = 0, ppos; - PARAFORMAT2 *pFmt = para->pFmt; + do { if (i < pFmt->cTabCount) { @@ -691,8 +681,8 @@ pos += 720-(pos%720); } ppos = ME_twips2pointsX(c, pos); - if (ppos>run->pt.x) { - size.cx = ppos - run->pt.x; + if (ppos > startx + run->pt.x) { + size.cx = ppos - startx - run->pt.x; break; } } while(1); @@ -701,7 +691,7 @@ } if (run->nFlags & MERF_GRAPHICS) { - ME_GetGraphicsSize(c->editor, run, &size); + ME_GetOLEObjectSize(c, run, &size); if (size.cy > *pAscent) *pAscent = size.cy; /* descent is unchanged */ @@ -721,10 +711,11 @@ * Finds width and height (but not ascent and descent) of a part of the run * up to given character. */ -SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen) +SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, + ME_Run *run, int nLen, int startx) { int asc, desc; - return ME_GetRunSizeCommon(c, para, run, nLen, &asc, &desc); + return ME_GetRunSizeCommon(c, para, run, nLen, startx, &asc, &desc); } /****************************************************************************** @@ -734,14 +725,15 @@ * is calculated based on whole row's ascent and descent anyway, so no need * to use it here. */ -void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, ME_Run *run) +void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) { if (run->nFlags & MERF_HIDDEN) run->nWidth = 0; else { int nEnd = ME_StrVLen(run->strText); - SIZE size = ME_GetRunSizeCommon(c, para, run, nEnd, &run->nAscent, &run->nDescent); + SIZE size = ME_GetRunSizeCommon(c, para, run, nEnd, startx, + &run->nAscent, &run->nDescent); run->nWidth = size.cx; if (!size.cx) WARN("size.cx == 0\n"); Modified: trunk/reactos/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/style.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/style.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/style.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -74,7 +74,7 @@ void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) { if (ME_ToCF2W(to, from) == from) - CopyMemory(to, from, sizeof(*from)); + *to = *from; } CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) @@ -154,7 +154,7 @@ if (style->cbSize <= sizeof(CHARFORMAT2W)) CopyMemory(&s->fmt, style, style->cbSize); else - CopyMemory(&s->fmt, style, sizeof(CHARFORMAT2W)); + s->fmt = *style; s->fmt.cbSize = sizeof(CHARFORMAT2W); s->nSequence = -2; @@ -218,7 +218,6 @@ if (style->dwMask & CFM_UNDERLINE) { s->fmt.dwMask |= CFM_UNDERLINETYPE; - s->fmt.dwMask &= ~CFM_UNDERLINE; s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; } @@ -230,7 +229,7 @@ /* using this with non-2W structs is forbidden */ assert(pSrc->cbSize == sizeof(CHARFORMAT2W)); assert(pDest->cbSize == sizeof(CHARFORMAT2W)); - CopyMemory(pDest, pSrc, sizeof(CHARFORMAT2W)); + *pDest = *pSrc; } static void ME_DumpStyleEffect(char **p, const char *name, const CHARFORMAT2W *fmt, int mask) @@ -262,12 +261,12 @@ p += sprintf(p, "N/A"); if (pFmt->dwMask & CFM_SIZE) - p += sprintf(p, "\nFont size: %d\n", (int)pFmt->yHeight); + p += sprintf(p, "\nFont size: %d\n", pFmt->yHeight); else p += sprintf(p, "\nFont size: N/A\n"); - + if (pFmt->dwMask & CFM_OFFSET) - p += sprintf(p, "Char offset: %d\n", (int)pFmt->yOffset); + p += sprintf(p, "Char offset: %d\n", pFmt->yOffset); else p += sprintf(p, "Char offset: N/A\n"); @@ -304,9 +303,9 @@ lf->lfHeight = ME_twips2pointsY(c, -s->fmt.yHeight); - lf->lfWeight = 400; + lf->lfWeight = FW_NORMAL; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_BOLD) - lf->lfWeight = 700; + lf->lfWeight = FW_BOLD; if (s->fmt.dwMask & CFM_WEIGHT) lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) @@ -338,7 +337,7 @@ fmt->dwMask = CFM_WEIGHT|CFM_BOLD|CFM_ITALIC|CFM_UNDERLINE|CFM_STRIKEOUT|CFM_SIZE|CFM_FACE|CFM_CHARSET; fmt->wWeight = lf->lfWeight; fmt->yHeight = -lf->lfHeight*1440/ry; - if (lf->lfWeight>400) fmt->dwEffects |= CFM_BOLD; + if (lf->lfWeight > FW_NORMAL) fmt->dwEffects |= CFM_BOLD; if (lf->lfItalic) fmt->dwEffects |= CFM_ITALIC; if (lf->lfUnderline) fmt->dwEffects |= CFM_UNDERLINE; /* notice that if a logfont was created with underline due to CFM_LINK, this @@ -404,7 +403,7 @@ TRACE_(richedit_style)("font created %d\n", nEmpty); item->hFont = s->hFont; item->nRefs = 1; - memcpy(&item->lfSpecs, &lf, sizeof(LOGFONTW)); + item->lfSpecs = lf; } hOldFont = SelectObject(c->hDC, s->hFont); /* should be cached too, maybe ? */ Modified: trunk/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/undo.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/undo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/undo.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -62,15 +62,21 @@ break; case diUndoSetParagraphFormat: assert(pdi); - CopyMemory(&pItem->member.para, &pdi->member.para, sizeof(ME_Paragraph)); + pItem->member.para = pdi->member.para; pItem->member.para.pFmt = ALLOC_OBJ(PARAFORMAT2); - CopyMemory(pItem->member.para.pFmt, pdi->member.para.pFmt, sizeof(PARAFORMAT2)); + *pItem->member.para.pFmt = *pdi->member.para.pFmt; break; case diUndoInsertRun: assert(pdi); - CopyMemory(&pItem->member.run, &pdi->member.run, sizeof(ME_Run)); + pItem->member.run = pdi->member.run; pItem->member.run.strText = ME_StrDup(pItem->member.run.strText); ME_AddRefStyle(pItem->member.run.style); + if (pdi->member.run.ole_obj) + { + pItem->member.run.ole_obj = ALLOC_OBJ(*pItem->member.run.ole_obj); + ME_CopyReObject(pItem->member.run.ole_obj, pdi->member.run.ole_obj); + } + else pItem->member.run.ole_obj = NULL; break; case diUndoSetCharFormat: case diUndoSetDefaultCharFormat: @@ -221,7 +227,7 @@ tmp.pRun = ME_SplitRunSimple(editor, tmp.pRun, tmp.nOffset); new_para = ME_SplitParagraph(editor, tmp.pRun, tmp.pRun->member.run.style); assert(pItem->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); - CopyMemory(new_para->member.para.pFmt, pItem->member.para.pFmt, sizeof(PARAFORMAT2)); + *new_para->member.para.pFmt = *pItem->member.para.pFmt; break; } default: Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -47,7 +47,11 @@ wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; - wc->nAvailWidth = wc->nTotalWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; + if (wc->context->editor->bWordWrap) + wc->nAvailWidth = wc->context->rcView.right - wc->context->rcView.left - + (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; + else + wc->nAvailWidth = ~0u >> 1; wc->pt.x = 0; } @@ -117,7 +121,8 @@ ME_UpdateRunFlags(wc->context->editor, &p->member.run); - ME_CalcRunExtent(wc->context, &ME_GetParagraph(p)->member.para, &p->member.run); + ME_CalcRunExtent(wc->context, &ME_GetParagraph(p)->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); } static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, int i) @@ -128,7 +133,7 @@ return NULL; j = ME_ReverseFindNonWhitespaceV(p->member.run.strText, i); if (j>0) { - pp = ME_SplitRun(wc->context, piter, j); + pp = ME_SplitRun(wc, piter, j); wc->pt.x += piter->member.run.nWidth; return pp; } @@ -147,7 +152,7 @@ if (piter->member.run.nFlags & MERF_ENDWHITE) { j = ME_ReverseFindNonWhitespaceV(piter->member.run.strText, i); - pp = ME_SplitRun(wc->context, piter, i); + pp = ME_SplitRun(wc, piter, i); wc->pt = pp->member.run.pt; return pp; } @@ -202,7 +207,7 @@ if (i == len) i = ME_ReverseFindNonWhitespaceV(run->strText, len); if (i) { - ME_DisplayItem *piter2 = ME_SplitRun(wc->context, piter, i); + ME_DisplayItem *piter2 = ME_SplitRun(wc, piter, i); wc->pt = piter2->member.run.pt; return piter2; } @@ -219,7 +224,7 @@ TRACE("Backtracking failed, trying desperate: %s\n", debugstr_w(p->member.run.strText->szData)); /* OK, no better idea, so assume we MAY split words if we can split at all*/ if (idesp) - return ME_SplitRun(wc->context, piter, idesp); + return ME_SplitRun(wc, piter, idesp); else if (wc->pRowStart && piter != wc->pRowStart) { @@ -235,7 +240,7 @@ int pos2 = ME_StrRelPos(run->strText, 0, &chars); if (pos2 != len) { /* the run is more than 1 char, so we may split */ - return ME_SplitRun(wc->context, piter, pos2); + return ME_SplitRun(wc, piter, pos2); } /* the run is one char, can't split it */ return piter; @@ -272,7 +277,7 @@ black = ME_FindNonWhitespaceV(run->strText, 0); if (black) { wc->bOverflown = FALSE; - pp = ME_SplitRun(wc->context, p, black); + pp = ME_SplitRun(wc, p, black); p->member.run.nFlags |= MERF_SKIPPED; ME_InsertRowStart(wc, pp); return pp; @@ -282,7 +287,20 @@ ME_InsertRowStart(wc, p); return p; } + /* simply end the current row and move on to next one */ + if (run->nFlags & MERF_ENDROW) + { + p = p->next; + ME_InsertRowStart(wc, p); + return p; + } /* we're not at the end of the row */ + if (run->nFlags & MERF_TAB) { + /* force recomputation of tabs' size as it depends on position */ + ME_CalcRunExtent(wc->context, &ME_GetParagraph(p)->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); + } + /* will current run fit? */ if (wc->pt.x + run->nWidth > wc->nAvailWidth) { @@ -293,17 +311,22 @@ wc->bOverflown = TRUE; return p; } - /* graphics or TAB - we can split before */ - if (run->nFlags & (MERF_GRAPHICS|MERF_TAB)) { + /* TAB: we can split before */ + if (run->nFlags & MERF_TAB) { wc->bOverflown = TRUE; return p; } + /* graphics: we can split before, if run's width is smaller than row's width */ + if ((run->nFlags & MERF_GRAPHICS) && run->nWidth <= wc->nAvailWidth) { + wc->bOverflown = TRUE; + return p; + } /* can we separate out the last spaces ? (to use overflow logic later) */ if (run->nFlags & MERF_ENDWHITE) { /* we aren't sure if it's *really* necessary, it's a good start however */ int black = ME_ReverseFindNonWhitespaceV(run->strText, len); - ME_SplitRun(wc->context, p, black); + ME_SplitRun(wc, p, black); /* handle both parts again */ return p; } @@ -354,7 +377,7 @@ /* wc.para_style = tp->member.para.style; */ wc.style = NULL; wc.nFirstMargin = ME_twips2pointsX(c, tp->member.para.pFmt->dxStartIndent) + beginofs; - wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, tp->member.para.pFmt->dxOffset) + beginofs; + wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, tp->member.para.pFmt->dxOffset); wc.nRightMargin = ME_twips2pointsX(c, tp->member.para.pFmt->dxRightIndent); wc.nRow = 0; wc.pt.x = 0; @@ -374,8 +397,10 @@ wc.pt.y += border; } - wc.nTotalWidth = c->rcView.right - c->rcView.left; - wc.nAvailWidth = wc.nTotalWidth - wc.nFirstMargin - wc.nRightMargin; + if (c->editor->bWordWrap) + wc.nAvailWidth = c->rcView.right - c->rcView.left - wc.nFirstMargin - wc.nRightMargin; + else + wc.nAvailWidth = ~0u >> 1; wc.pRowStart = NULL; linespace = ME_GetParaLineSpace(c, &tp->member.para); @@ -442,14 +467,12 @@ } BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { - HWND hWnd = editor->hWnd; - HDC hDC = GetDC(hWnd); ME_DisplayItem *item; ME_Context c; BOOL bModified = FALSE; int yStart = -1, yEnd = -1; - ME_InitContext(&c, editor, hDC); + ME_InitContext(&c, editor, GetDC(editor->hWnd)); c.pt.x = 0; c.pt.y = 0; editor->nHeight = 0; @@ -485,9 +508,8 @@ editor->nTotalLength = c.pt.y; - ME_DestroyContext(&c); - ReleaseDC(hWnd, hDC); - + ME_DestroyContext(&c, editor->hWnd); + if (bModified || editor->nTotalLength < editor->nLastTotalLength) ME_InvalidateMarkedParagraphs(editor); return bModified; @@ -495,9 +517,8 @@ void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) { ME_Context c; - HDC hDC = GetDC(editor->hWnd); - - ME_InitContext(&c, editor, hDC); + + ME_InitContext(&c, editor, GetDC(editor->hWnd)); if (editor->bRedraw) { RECT rc = c.rcView; @@ -519,8 +540,7 @@ InvalidateRect(editor->hWnd, &rc, TRUE); } } - ME_DestroyContext(&c); - ReleaseDC(editor->hWnd, hDC); + ME_DestroyContext(&c, editor->hWnd); } Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.… ============================================================================== --- trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] Sun Mar 30 23:55:20 2008 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "config.h" +#include "wine/port.h" #include "editor.h" #include "rtf.h" @@ -711,6 +714,10 @@ nChars--; if (editor->bEmulateVersion10 && nChars) nChars--; + } else if (p->member.run.nFlags & MERF_ENDROW) { + if (!ME_StreamOutPrint(pStream, "\\line \r\n")) + return FALSE; + nChars--; } else { int nEnd;

1 0

[jimtabor] 32787: Fix GETTEXTEX update it to current sdk and web info.
by jimtabor＠svn.reactos.org 31 Mar '08

31 Mar '08

Author: jimtabor Date: Sun Mar 30 23:49:35 2008 New Revision: 32787 URL: http://svn.reactos.org/svn/reactos?rev=32787&view=rev Log: Fix GETTEXTEX update it to current sdk and web info. Modified: trunk/reactos/include/psdk/richedit.h Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/richedit.h [iso-8859-1] Sun Mar 30 23:49:35 2008 @@ -521,7 +521,7 @@ DWORD flags; UINT codepage; LPCSTR lpDefaultChar; - LPBOOL lpUsedDefaultChar; + LPBOOL lpUsedDefChar; } GETTEXTEX; #define SF_TEXT 0x00000001

1 0

[jimtabor] 32786: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - Remove NtGdiCreateDIBitmap, update all related files. - Rewrite CreateDIBitmap. - Tested with Qemu.
by jimtabor＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: jimtabor Date: Sun Mar 30 17:37:42 2008 New Revision: 32786 URL: http://svn.reactos.org/svn/reactos?rev=32786&view=rev Log: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - Remove NtGdiCreateDIBitmap, update all related files. - Rewrite CreateDIBitmap. - Tested with Qemu. Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c [iso-8859-1] Sun Mar 30 17:37:42 2008 @@ -25,17 +25,6 @@ { /* FIXME share memory */ return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); -} - -HBITMAP -STDCALL -CreateDIBitmap(HDC hDc, - const BITMAPINFOHEADER *Header, - DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, - UINT ColorUse) -{ - /* FIMXE we need do more thing in user mode */ - return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); } /* Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Sun Mar 30 17:37:42 2008 @@ -1,7 +1,7 @@ #include "precomp.h" -//#define NDEBUG -//#include <debug.h> +#define NDEBUG +#include <debug.h> /* * Return the full scan size for a bitmap. @@ -28,6 +28,72 @@ } MaxBits = ((MaxBits + 31) & ~31 ) / 8; // From Yuan, ScanLineSize = (Width * bitcount + 31)/32 return (MaxBits * ScanLines); // ret the full Size. +} + +/* + * DIB_GetBitmapInfo is complete copy of wine cvs 2/9-2006 + * from file dib.c from gdi32.dll or orginal version + * did not calc the info right for some headers. + */ +INT +STDCALL +DIB_GetBitmapInfo(const BITMAPINFOHEADER *header, + PLONG width, + PLONG height, + PWORD planes, + PWORD bpp, + PLONG compr, + PLONG size ) +{ + + if (header->biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; + *width = core->bcWidth; + *height = core->bcHeight; + *planes = core->bcPlanes; + *bpp = core->bcBitCount; + *compr = 0; + *size = 0; + return 0; + } + + if (header->biSize == sizeof(BITMAPINFOHEADER)) + { + *width = header->biWidth; + *height = header->biHeight; + *planes = header->biPlanes; + *bpp = header->biBitCount; + *compr = header->biCompression; + *size = header->biSizeImage; + return 1; + } + + if (header->biSize == sizeof(BITMAPV4HEADER)) + { + BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header; + *width = v4hdr->bV4Width; + *height = v4hdr->bV4Height; + *planes = v4hdr->bV4Planes; + *bpp = v4hdr->bV4BitCount; + *compr = v4hdr->bV4V4Compression; + *size = v4hdr->bV4SizeImage; + return 4; + } + + if (header->biSize == sizeof(BITMAPV5HEADER)) + { + BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header; + *width = v5hdr->bV5Width; + *height = v5hdr->bV5Height; + *planes = v5hdr->bV5Planes; + *bpp = v5hdr->bV5BitCount; + *compr = v5hdr->bV5Compression; + *size = v5hdr->bV5SizeImage; + return 5; + } + DPRINT("(%ld): wrong size for header\n", header->biSize ); + return -1; } /* @@ -194,3 +260,38 @@ return ret; } + +/* + * @implemented + */ +HBITMAP +STDCALL +CreateDIBitmap( HDC hDC, + const BITMAPINFOHEADER *Header, + DWORD Init, + LPCVOID Bits, + const BITMAPINFO *Data, + UINT ColorUse) +{ + LONG width, height, compr, dibsize; + WORD planes, bpp; + + if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + return NtGdiCreateDIBitmapInternal(hDC, + width, + height, + Init, + (LPBYTE)Bits, + (PBITMAPINFO)Data, + ColorUse, + bpp, + dibsize, + 0, + 0); +} + Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] Sun Mar 30 17:37:42 2008 @@ -58,18 +58,6 @@ PFONTFAMILYINFO Info, DWORD Size ); - -/* Use NtGdiCreateDIBitmapInternal */ -HBITMAP -STDCALL -NtGdiCreateDIBitmap ( - HDC hDC, - CONST BITMAPINFOHEADER * bmih, - DWORD Init, - CONST VOID * bInit, - CONST BITMAPINFO * bmi, - UINT Usage - ); /* Use NtGdiGetDCPoint with GdiGetViewPortExt */ BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Sun Mar 30 17:37:42 2008 @@ -273,8 +273,17 @@ offset = sizeof(BITMAPINFOHEADER) + ((ih->biBitCount <= 8) ? (sizeof(RGBQUAD) * (1 << ih->biBitCount)) : 0); - hbitmap = NtGdiCreateDIBitmap(hdc, ih, CBM_INIT, (LPBYTE)ih + offset, (LPBITMAPINFO)ih, DIB_RGB_COLORS); - + hbitmap = NtGdiCreateDIBitmapInternal(hdc, + ih->biWidth, + ih->biHeight, + CBM_INIT, + (LPBYTE)ih+offset, + (LPBITMAPINFO)ih, + DIB_RGB_COLORS, + ih->biBitCount, + ih->biSizeImage, + 0, + 0); //UserReleaseDC(NULL, hdc, FALSE); UserReleaseDC(ClipboardWindow, hdc, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Mar 30 17:37:42 2008 @@ -300,7 +300,18 @@ static const BITMAPINFOHEADER bih = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0 }; BITMAPINFO bi; RtlMoveMemory ( &(bi.bmiHeader), &bih, sizeof(bih) ); - hBmpTmp = NtGdiCreateDIBitmap ( hDC, &bi.bmiHeader, 0, NULL, &bi, DIB_RGB_COLORS ); + hBmpTmp = NtGdiCreateDIBitmapInternal(hDC, + bi.bmiHeader.biWidth, + bi.bmiHeader.biHeight, + 0, + NULL, + &bi, + DIB_RGB_COLORS, + bi.bmiHeader.biBitCount, + bi.bmiHeader.biSizeImage, + 0, + 0); + //HBITMAP hBmpTmp = IntGdiCreateBitmap ( 1, 1, 1, 32, NULL); if ( hBmpTmp ) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Mar 30 17:37:42 2008 @@ -801,29 +801,25 @@ } -HBITMAP FASTCALL -IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header, - DWORD init, LPCVOID bits, const BITMAPINFO *data, - UINT coloruse) +HBITMAP +FASTCALL +IntCreateDIBitmap(PDC Dc, + INT width, + INT height, + UINT bpp, + DWORD init, + LPBYTE bits, + PBITMAPINFO data, + DWORD coloruse) { HBITMAP handle; - - LONG width; - LONG height; - WORD planes; - WORD bpp; - LONG compr; - LONG dibsize; BOOL fColor; - - if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &dibsize ) == -1) return 0; // Check if we should create a monochrome or color bitmap. We create a monochrome bitmap only if it has exactly 2 // colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap. if (bpp != 1) fColor = TRUE; - else if ((coloruse != DIB_RGB_COLORS) || - (init != CBM_INIT) || !data) fColor = FALSE; + else if ((coloruse != DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE; else { if (data->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) @@ -845,7 +841,7 @@ else if (data->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { RGBTRIPLE *rgb = ((BITMAPCOREINFO *)data)->bmciColors; - DWORD col = RGB( rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue); + DWORD col = RGB( rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue); if ((col == RGB(0,0,0))) { @@ -875,7 +871,7 @@ 1, NULL); } - + if (height < 0) height = -height; @@ -889,63 +885,61 @@ // The CreateDIBitmap function creates a device-dependent bitmap (DDB) from a DIB and, optionally, sets the bitmap bits // The DDB that is created will be whatever bit depth your reference DC is -HBITMAP STDCALL NtGdiCreateDIBitmap(HDC hDc, const BITMAPINFOHEADER *Header, - DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, - UINT ColorUse) +HBITMAP +APIENTRY +NtGdiCreateDIBitmapInternal(IN HDC hDc, + IN INT cx, + IN INT cy, + IN DWORD fInit, + IN OPTIONAL LPBYTE pjInit, + IN OPTIONAL LPBITMAPINFO pbmi, + IN DWORD iUsage, + IN UINT cjMaxInitInfo, + IN UINT cjMaxBits, + IN FLONG fl, + IN HANDLE hcmXform) { PDC Dc; HBITMAP Bmp; - if (Header == NULL) - { - return NULL; - } - - if (Header->biSize == 0) - { - return NULL; - } - - if (NULL == hDc) - { - BITMAPINFOHEADER *change_Header = (BITMAPINFOHEADER *)Header; - hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); - if (hDc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - Dc = DC_LockDc(hDc); - if (Dc == NULL) - { - NtGdiDeleteObjectApp(hDc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - - change_Header->biBitCount = 1; - change_Header->biPlanes = 1; - - Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse); - DC_UnlockDc(Dc); - NtGdiDeleteObjectApp(hDc); - } - else - { - Dc = DC_LockDc(hDc); - if (Dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse); - DC_UnlockDc(Dc); - } - - - + if (!hDc) + { + hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); + if (!hDc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + Dc = DC_LockDc(hDc); + if (!Dc) + { + NtGdiDeleteObjectApp(hDc); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + cjMaxInitInfo = 1; + Bmp = IntCreateDIBitmap(Dc, cx, cy, cjMaxInitInfo, fInit, pjInit, pbmi, iUsage); + + DC_UnlockDc(Dc); + NtGdiDeleteObjectApp(hDc); + } + else + { + Dc = DC_LockDc(hDc); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + Bmp = IntCreateDIBitmap(Dc, cx, cy, cjMaxInitInfo, fInit, pjInit, pbmi, iUsage); + DC_UnlockDc(Dc); + } return Bmp; } + HBITMAP STDCALL NtGdiCreateDIBSection(HDC hDC, IN OPTIONAL HANDLE hSection, @@ -1218,100 +1212,6 @@ } } -/* - * DIB_GetBitmapInfo is complete copy of wine cvs 2/9-2006 - * from file dib.c from gdi32.dll or orginal version - * did not calc the info right for some headers. - */ - -INT STDCALL -DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, - PLONG width, - PLONG height, - PWORD planes, - PWORD bpp, - PLONG compr, - PLONG size ) -{ - - if (header->biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; - *width = core->bcWidth; - *height = core->bcHeight; - *planes = core->bcPlanes; - *bpp = core->bcBitCount; - *compr = 0; - *size = 0; - return 0; - } - - if (header->biSize == sizeof(BITMAPINFOHEADER)) - { - *width = header->biWidth; - *height = header->biHeight; - *planes = header->biPlanes; - *bpp = header->biBitCount; - *compr = header->biCompression; - *size = header->biSizeImage; - return 1; - } - - if (header->biSize == sizeof(BITMAPV4HEADER)) - { - BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header; - *width = v4hdr->bV4Width; - *height = v4hdr->bV4Height; - *planes = v4hdr->bV4Planes; - *bpp = v4hdr->bV4BitCount; - *compr = v4hdr->bV4V4Compression; - *size = v4hdr->bV4SizeImage; - return 4; - } - - if (header->biSize == sizeof(BITMAPV5HEADER)) - { - BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header; - *width = v5hdr->bV5Width; - *height = v5hdr->bV5Height; - *planes = v5hdr->bV5Planes; - *bpp = v5hdr->bV5BitCount; - *compr = v5hdr->bV5Compression; - *size = v5hdr->bV5SizeImage; - return 5; - } - DPRINT("(%ld): wrong size for header\n", header->biSize ); - return -1; -} - -// Converts a Device Independent Bitmap (DIB) to a Device Dependant Bitmap (DDB) -// The specified Device Context (DC) defines what the DIB should be converted to -PBITMAPOBJ FASTCALL DIBtoDDB(HGLOBAL hPackedDIB, HDC hdc) // FIXME: This should be removed. All references to this function should - // change to NtGdiSetDIBits -{ - HBITMAP hBmp = 0; - PBITMAPOBJ pBmp = NULL; - DIBSECTION *dib; - LPBYTE pbits = NULL; - - // Get a pointer to the packed DIB's data - // pPackedDIB = (LPBYTE)GlobalLock(hPackedDIB); - dib = hPackedDIB; - - pbits = (LPBYTE)(dib + DIB_BitmapInfoSize((BITMAPINFO*)&dib->dsBmih, DIB_RGB_COLORS)); - - // Create a DDB from the DIB - hBmp = NtGdiCreateDIBitmap ( hdc, &dib->dsBmih, CBM_INIT, - (LPVOID)pbits, (BITMAPINFO*)&dib->dsBmih, DIB_RGB_COLORS); - - // GlobalUnlock(hPackedDIB); - - // Retrieve the internal Pixmap from the DDB - pBmp = BITMAPOBJ_LockBitmap(hBmp); - - return pBmp; -} - RGBQUAD * FASTCALL DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi) { Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun Mar 30 17:37:42 2008 @@ -1682,30 +1682,6 @@ /* * @unimplemented */ - -HBITMAP -APIENTRY -NtGdiCreateDIBitmapInternal( - IN HDC hdc, - IN INT cx, - IN INT cy, - IN DWORD fInit, - IN OPTIONAL LPBYTE pjInit, - IN OPTIONAL LPBITMAPINFO pbmi, - IN DWORD iUsage, - IN UINT cjMaxInitInfo, - IN UINT cjMaxBits, - IN FLONG f, - IN HANDLE hcmXform) -{ - UNIMPLEMENTED; - return NULL; -} - - - /* - * @unimplemented - */ HBITMAP APIENTRY NtGdiClearBitmapAttributes( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun Mar 30 17:37:42 2008 @@ -716,7 +716,6 @@ NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 -NtGdiCreateDIBitmap 6 NtGdiGetFontFamilyInfo 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4

1 0

[janderwald] 32785: - enumerate additional client protocols - retrieve description with RegLoadMUIString
by janderwald＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: janderwald Date: Sun Mar 30 17:07:49 2008 New Revision: 32785 URL: http://svn.reactos.org/svn/reactos?rev=32785&view=rev Log: - enumerate additional client protocols - retrieve description with RegLoadMUIString Modified: trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc trunk/reactos/dll/cpl/ncpa/lang/en-US.rc trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/ncpa.rbuild Modified: trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ìðåæîâè óñòðîéñòâà",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Äîáàâÿíå",IDC_ADD,9,100,60,14 PUSHBUTTON "&Ïðåìàõâàíå",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Ñâîéñòâà",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "Íà&ñòðîéêà", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Îòìåòíàòèòå ñúñòàâêè ñå èçïîëçâàò îò òîâà ñâúðçâàíå:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Ñëàãàíå", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "Ïðåìàõâàíå&", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Síové adaptéry",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Pøidat",IDC_ADD,9,100,60,14 PUSHBUTTON "&Odebrat",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Vlastnosti",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Nastavit", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Vybrané komponenty jsou pouívány tímto pøipojením:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalovat", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Odstranit", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Dine Netwærks Adaptere:",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Tilføj",IDC_ADD,9,100,60,14 PUSHBUTTON "&Fjern",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Egenskaber",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Komponeter mærkeret med et flueben er brugt af den forbindelse:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installere", IDC_INSTALL, 9, 133, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Afinstallere", IDC_UNINSTALL, 90, 133, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 174, 133, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Netzwerkkarten",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Hinzufügen",IDC_ADD,9,100,60,14 PUSHBUTTON "&Entfernen",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Eigenschaften",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ðñïóáñìïãåßò Äéêôýïõ",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&ÐñïóèÞêç",IDC_ADD,9,100,60,14 PUSHBUTTON "&Áöáßñåóç",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Éäéüôçôåò",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Äéáìüñöùóç", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Ôá óôïé÷åßá ðïõ åßíáé åðéëåãìÝíá, ÷ñçóéìïðïéïýíôáé áðü áõôÞ ôç óýíäåóç:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&ÅãêáôÜóôáóç", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&ÁðåãêáôÜóôáóç", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Éäéüôçôåò", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/en-US.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Network Adapters",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Add",IDC_ADD,9,100,60,14 PUSHBUTTON "&Remove",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Properties",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -11,7 +11,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Adaptadores de red",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Instalar",IDC_ADD,9,100,60,14 PUSHBUTTON "&Desinstalar",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Propiedades",IDC_PROPERTIES,179,100,60,14 @@ -26,7 +26,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configurar", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Los componentes marcados son utilizados por esta conexión:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Cartes réseau",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ajouter",IDC_ADD,9,100,60,14 PUSHBUTTON "&Enlever",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Propriétés",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configurer", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Les composants cochés sont utilisés par cette connexion :", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installer", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Désinstaller", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Hálózati kártyák",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Hozzáadás",IDC_ADD,9,100,60,14 PUSHBUTTON "&Eltávolítás",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Tulajdonságok",IDC_PROPERTIES,179,100,60,14 @@ -22,7 +22,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Beállítás", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "A megjelölt alkotóelemek vannak használatban ennél a kapcsolatnál:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Telepítés", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eltávolítás", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Adapter Jaringan",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Tambah",IDC_ADD,9,100,60,14 PUSHBUTTON "&Hapus",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Properti",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigurasi", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Komponen yang dicentang digunakan oleh sambungan ini:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalasi", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Deinstalasi", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Properti", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Adattatori di rete",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Aggiungi",IDC_ADD,9,100,60,14 PUSHBUTTON "&Togli",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Proprietà",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configura", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "I componenti marcati sono usati da questa connessione:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installa", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Disinstalla", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Proprietà", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "lbg[N A_v^",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "ÇÁ(&A)",IDC_ADD,9,100,60,14 PUSHBUTTON "í(&R)",IDC_REMOVE,72,100,60,14 PUSHBUTTON "vpeB(&P)",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "Ýè(&C)", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "±ÌÚ±Í`FbN }[NªIÉÈÁÄ¢éR|[lgðgpµÄ¢Ü·:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "CXg[(&I)", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "í(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Network Adapters",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Add",IDC_ADD,9,100,60,14 PUSHBUTTON "&Remove",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Properties",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Netwerkkaarten",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Toevoegen",IDC_ADD,9,100,60,14 PUSHBUTTON "&Verwijderen",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Eigenschappen",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configureren", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installeren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Verwijderen", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Urz¹dzenia sieciowe",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Dodaj",IDC_ADD,9,100,60,14 PUSHBUTTON "&Usuñ",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&W³aciwoci",IDC_PROPERTIES,179,100,60,14 @@ -30,7 +30,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfiguruj", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Zaznaczone komponenty bior¹ udzia³ w tym po³¹czeniu:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Zainstaluj", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Odinstaluj", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&W³aciwoci", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ñåòåâûå àäàïòåðû",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Äîáàâèòü",IDC_ADD,9,100,60,14 PUSHBUTTON "&Óäàëèòü",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Ñâîéñòâà",IDC_PROPERTIES,179,100,60,14 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Íàñòðîèòü", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Îòìå÷åííûå êîìïîíåíòû èñïîëüçóþòñÿ ýòèì ïîäêëþ÷åíèåì:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Óñòàíîâèòü", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Óäàëèòü", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nätverksanslutningar",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Lägg till",IDC_ADD,9,100,60,14 PUSHBUTTON "&Ta bort",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Egenskaper",IDC_PROPERTIES,179,100,60,14 @@ -23,7 +23,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigurera", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Markerade komponenter används av denna anslutning:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installera", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Avinstallera", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ìåðåæåâ³ àäàïòåðè",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Äîäàòè",IDC_ADD,9,100,60,14 PUSHBUTTON "Â&èäàëèòè",IDC_REMOVE,72,100,60,14 PUSHBUTTON "&Âëàñòèâîñò³",IDC_PROPERTIES,179,100,60,14 @@ -29,7 +29,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Íàëàøòóâàòè", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Â³äì³÷åí³ êîìïîíåíòè âèêîðèñòîâóþòüñÿ öèì ï³äêëþ÷åííÿì:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "Âñò&àíîâèòè", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "Â&èäàëèòè", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Âëàñòèâîñò³", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=32… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -285,6 +285,8 @@ EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIGURE),FALSE); //SetDlgItemTextA(hwndDlg,IDC_NETCARDNAME,Info[pPage->lParam].Description); + EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e973-e325-11ce-bfc1-08002be10318}")); + EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e974-e325-11ce-bfc1-08002be10318}")); EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}")); SendDlgItemMessage(hwndDlg, IDC_COMPONENTSLIST, LB_SETCURSEL, 0, 0); @@ -311,8 +313,18 @@ RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszHelpKey,0,KEY_QUERY_VALUE,&hNDIKey); dwType = REG_SZ; dwSize = sizeof(tpszHelpText); - if(RegQueryValueEx(hNDIKey,_T("HelpText"),NULL,&dwType,(BYTE*)tpszHelpText,&dwSize)!= ERROR_SUCCESS) - ;//return; + + tpszHelpText[0] = _T('\0'); + if (RegLoadMUIString(hNDIKey, _T("HelpText"),tpszHelpText,dwSize,&dwSize,0,NULL) !=ERROR_SUCCESS) + { + DWORD dwResult; + dwResult = GetSystemDirectory(tpszHelpKey, dwSize / sizeof(TCHAR)); + if (dwResult < dwSize && dwResult != 0) + { + if (RegLoadMUIString(hNDIKey, _T("HelpText"),tpszHelpText,dwSize,&dwSize,0,tpszHelpKey) !=ERROR_SUCCESS) + tpszHelpText[0] = _T('\0'); + } + } RegCloseKey(hNDIKey); SetDlgItemText(hwndDlg,IDC_DESCRIPTION,tpszHelpText); Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rbuild [iso-8859-1] Sun Mar 30 17:07:49 2008 @@ -4,7 +4,7 @@ <importlibrary definition="ncpa.def" /> <include base="ncpa">.</include> <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> + <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>kernel32</library> <library>advapi32</library>

1 0

[cfinck] 32784: Set svn:ignore to "GNUmakefile *.vcproj *.user *.cbp *.ncb *.suo *.sln" where needed
by cfinck＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: cfinck Date: Sun Mar 30 15:00:17 2008 New Revision: 32784 URL: http://svn.reactos.org/svn/reactos?rev=32784&view=rev Log: Set svn:ignore to "GNUmakefile *.vcproj *.user *.cbp *.ncb *.suo *.sln" where needed Modified: trunk/reactos/base/applications/cmdutils/doskey/ (props changed) trunk/reactos/base/services/svchost/ (props changed) trunk/reactos/base/setup/usetup/lang/ (props changed) trunk/reactos/dll/cpl/appwiz-new/ (props changed) trunk/reactos/dll/cpl/appwiz-new/lang/ (props changed) trunk/reactos/dll/cpl/appwiz-new/resources/ (props changed) trunk/reactos/dll/directx/ddraw/d3d/ (props changed) trunk/reactos/dll/keyboard/kbdbga/ (props changed) trunk/reactos/dll/keyboard/kbdbgm/ (props changed) trunk/reactos/dll/keyboard/kbdbgt/ (props changed) trunk/reactos/dll/win32/atl/ (props changed) trunk/reactos/dll/win32/hlink/ (props changed) trunk/reactos/dll/win32/kernel32/lang/ (props changed) trunk/reactos/dll/win32/msxml3/ (props changed) trunk/reactos/dll/win32/rasman/ (props changed) trunk/reactos/dll/win32/schannel/ (props changed) trunk/reactos/dll/win32/setupapi/lang/ (props changed) trunk/reactos/dll/win32/setupapi/res/Icon_Licence/ (props changed) trunk/reactos/dll/win32/tapi32/ (props changed) trunk/reactos/dll/win32/user32/lang/ (props changed) trunk/reactos/dll/win32/winhttp/ (props changed) trunk/reactos/drivers/directx/ (props changed) trunk/reactos/drivers/directx/dxapi/ (props changed) trunk/reactos/drivers/directx/dxg/ (props changed) trunk/reactos/drivers/directx/dxgthk/ (props changed) trunk/reactos/drivers/filesystems/ext2/ (props changed) trunk/reactos/drivers/filesystems/ext2/inc/ (props changed) trunk/reactos/drivers/filesystems/ext2/src/ (props changed) trunk/reactos/drivers/storage/ide/uniata/ros_glue/ (props changed) trunk/reactos/lib/fslib/ext2lib/ (props changed) trunk/reactos/lib/ppcdevtree/ (props changed) trunk/reactos/lib/pseh/powerpc/ (props changed) trunk/reactos/lib/rtl/arm/ (props changed) trunk/reactos/lib/sdk/crt/except/powerpc/ (props changed) trunk/reactos/lib/sdk/crt/mem/ (props changed) trunk/reactos/lib/sdk/crt/mem/i386/ (props changed) trunk/reactos/lib/sdk/scrnsave/ (props changed) trunk/reactos/lib/sdk/strsafe/ (props changed) trunk/reactos/tools/cabman/ (props changed) trunk/reactos/tools/cdmake/ (props changed) trunk/reactos/tools/mkhive/ (props changed) trunk/reactos/tools/rgenstat/ (props changed) trunk/reactos/tools/sysreg/ (props changed) trunk/reactos/tools/unicode/ (props changed) trunk/reactos/tools/widl/ (props changed) trunk/reactos/tools/winebuild/ (props changed) trunk/reactos/tools/wmc/ (props changed) trunk/reactos/tools/wpp/ (props changed) trunk/reactos/tools/wrc/ (props changed) Propchange: trunk/reactos/base/applications/cmdutils/doskey/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/base/services/svchost/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/base/setup/usetup/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/cpl/appwiz-new/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/directx/ddraw/d3d/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/keyboard/kbdbga/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/keyboard/kbdbgm/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/keyboard/kbdbgt/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/atl/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/hlink/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/kernel32/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/msxml3/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/rasman/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/schannel/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/setupapi/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/setupapi/res/Icon_Licence/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/tapi32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/user32/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/winhttp/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/directx/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/directx/dxapi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/directx/dxg/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/directx/dxgthk/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/filesystems/ext2/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/filesystems/ext2/inc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/filesystems/ext2/src/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/storage/ide/uniata/ros_glue/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/fslib/ext2lib/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/ppcdevtree/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/pseh/powerpc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/rtl/arm/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/crt/except/powerpc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/crt/mem/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/crt/mem/i386/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/scrnsave/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/lib/sdk/strsafe/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/tools/cabman/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/cdmake/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/mkhive/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/rgenstat/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/sysreg/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/unicode/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/widl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/winebuild/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/wmc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/wpp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln Propchange: trunk/reactos/tools/wrc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Mar 30 15:00:17 2008 @@ -1,4 +1,7 @@ GNUmakefile +*.vcproj *.user +*.cbp *.ncb *.suo +*.sln

1 0

[cfinck] 32783: - Reenable the DejaVu font and use it for all purposes except substitudes for "Arial" and "Times New Roman". Keep using the Liberation fonts for these cases. - Finally remove the Bitstream Vera fonts and substitude them by the DejaVu fonts. The DejaVu fonts were derived from the Bitstream Vera fonts, so they look similar.
by cfinck＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: cfinck Date: Sun Mar 30 13:18:53 2008 New Revision: 32783 URL: http://svn.reactos.org/svn/reactos?rev=32783&view=rev Log: - Reenable the DejaVu font and use it for all purposes except substitudes for "Arial" and "Times New Roman". Keep using the Liberation fonts for these cases. - Finally remove the Bitstream Vera fonts and substitude them by the DejaVu fonts. The DejaVu fonts were derived from the Bitstream Vera fonts, so they look similar. Removed: trunk/reactos/media/fonts/Vera.ttf trunk/reactos/media/fonts/VeraBI.ttf trunk/reactos/media/fonts/VeraBd.ttf trunk/reactos/media/fonts/VeraIt.ttf trunk/reactos/media/fonts/VeraMoBI.ttf trunk/reactos/media/fonts/VeraMoBd.ttf trunk/reactos/media/fonts/VeraMoIt.ttf trunk/reactos/media/fonts/VeraMono.ttf trunk/reactos/media/fonts/VeraSe.ttf trunk/reactos/media/fonts/VeraSeBd.ttf trunk/reactos/media/fonts/doc/Copyright.Bitstream trunk/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT trunk/reactos/media/fonts/doc/VERA-README.TXT trunk/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/fonts/fonts.rbuild Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Mar 30 13:18:53 2008 @@ -72,22 +72,16 @@ ; Font substitutes ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Sans Mono" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"DejaVu Sans" - HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"Liberation Mono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Sans",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Sans Mono",0x00000000,"DejaVu Sans Mono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Bitstream Vera Serif",0x00000000,"DejaVu Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Liberation Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Liberation Sans" ; Time zone settings Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Mar 30 13:18:53 2008 @@ -336,26 +336,27 @@ drivers\wmi\wmilib.sys 2 ; Media -;media\fonts\DejaVuSans.ttf 3 -;media\fonts\DejaVuSans-Bold.ttf 3 -;media\fonts\DejaVuSans-BoldOblique.ttf 3 -;media\fonts\DejaVuSansCondensed.ttf 3 -;media\fonts\DejaVuSansCondensed-Bold.ttf 3 -;media\fonts\DejaVuSansCondensed-Oblique.ttf 3 -;media\fonts\DejaVuSans-ExtraLight.ttf 3 -;media\fonts\DejaVuSansMono.ttf 3 -;media\fonts\DejaVuSansMono-Bold.ttf 3 -;media\fonts\DejaVuSansMono-BoldOblique.ttf 3 -;media\fonts\DejaVuSansMono-Oblique.ttf 3 -;media\fonts\DejaVuSans-Oblique.ttf 3 -;media\fonts\DejaVuSerif.ttf 3 -;media\fonts\DejaVuSerif-Bold.ttf 3 -;media\fonts\DejaVuSerif-BoldOblique.ttf 3 -;media\fonts\DejaVuSerifCondensed.ttf 3 -;media\fonts\DejaVuSerifCondensed-Bold.ttf 3 -;media\fonts\DejaVuSerifCondensed-BoldOblique.ttf 3 -;media\fonts\DejaVuSerifCondensed-Oblique.ttf 3 -;media\fonts\DejaVuSerif-Oblique.ttf 3 +media\fonts\DejaVuSans.ttf 3 +media\fonts\DejaVuSans-Bold.ttf 3 +media\fonts\DejaVuSans-BoldOblique.ttf 3 +media\fonts\DejaVuSansCondensed.ttf 3 +media\fonts\DejaVuSansCondensed-Bold.ttf 3 +media\fonts\DejaVuSansCondensed-BoldOblique.ttf 3 +media\fonts\DejaVuSansCondensed-Oblique.ttf 3 +media\fonts\DejaVuSans-ExtraLight.ttf 3 +media\fonts\DejaVuSansMono.ttf 3 +media\fonts\DejaVuSansMono-Bold.ttf 3 +media\fonts\DejaVuSansMono-BoldOblique.ttf 3 +media\fonts\DejaVuSansMono-Oblique.ttf 3 +media\fonts\DejaVuSans-Oblique.ttf 3 +media\fonts\DejaVuSerif.ttf 3 +media\fonts\DejaVuSerif-Bold.ttf 3 +media\fonts\DejaVuSerif-BoldItalic.ttf 3 +media\fonts\DejaVuSerifCondensed.ttf 3 +media\fonts\DejaVuSerifCondensed-Bold.ttf 3 +media\fonts\DejaVuSerifCondensed-BoldItalic.ttf 3 +media\fonts\DejaVuSerifCondensed-Italic.ttf 3 +media\fonts\DejaVuSerif-Italic.ttf 3 media\fonts\LiberationMono-Bold.ttf 3 media\fonts\LiberationMono-BoldItalic.ttf 3 @@ -388,16 +389,6 @@ media\fonts\UTB_____.ttf 3 media\fonts\UTI_____.ttf 3 media\fonts\UTRG____.ttf 3 -media\fonts\VeraBd.ttf 3 -media\fonts\VeraBI.ttf 3 -media\fonts\VeraIt.ttf 3 -media\fonts\VeraMoBd.ttf 3 -media\fonts\VeraMoBI.ttf 3 -media\fonts\VeraMoIt.ttf 3 -media\fonts\VeraMono.ttf 3 -media\fonts\VeraSeBd.ttf 3 -media\fonts\VeraSe.ttf 3 -media\fonts\Vera.ttf 3 media\nls\c_037.nls 1 media\nls\c_500.nls 1 media\nls\c_737.nls 1 Removed: trunk/reactos/media/fonts/Vera.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Vera.ttf?rev=3… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraBI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraBI.ttf?rev… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraBd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraBd.ttf?rev… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraIt.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraIt.ttf?rev… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraMoBI.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraMoBI.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraMoBd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraMoBd.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraMoIt.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraMoIt.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraMono.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraSe.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraSe.ttf?rev… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/VeraSeBd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/VeraSeBd.ttf?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/media/fonts/doc/Copyright.Bitstream URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Copyright.… ============================================================================== --- trunk/reactos/media/fonts/doc/Copyright.Bitstream [iso-8859-1] (original) +++ trunk/reactos/media/fonts/doc/Copyright.Bitstream (removed) @@ -1,11 +1,0 @@ -(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA. - -You are hereby granted permission under all Bitstream propriety rights -to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream -Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts -for any purpose and without restriction; provided, that this notice is -left intact on all copies of such fonts and that Bitstream's trademark -is acknowledged as shown below on all unmodified copies of the 4 Charter -Type 1 fonts. - -BITSTREAM CHARTER is a registered trademark of Bitstream Inc. Removed: trunk/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/VERA-COPYR… ============================================================================== --- trunk/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT [iso-8859-1] (original) +++ trunk/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT (removed) @@ -1,124 +1,0 @@ -Bitstream Vera Fonts Copyright - -The fonts have a generous copyright, allowing derivative works (as -long as "Bitstream" or "Vera" are not in the names), and full -redistribution (so long as they are not *sold* by themselves). They -can be be bundled, redistributed and sold with any software. - -The fonts are distributed under the following copyright: - -Copyright -========= - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream -Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the fonts accompanying this license ("Fonts") and associated -documentation files (the "Font Software"), to reproduce and distribute -the Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, and/or sell copies of the Font -Software, and to permit persons to whom the Font Software is furnished -to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces. - -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the -Fonts, only if the fonts are renamed to names not containing either -the words "Bitstream" or the word "Vera". - -This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the -"Bitstream Vera" names. - -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, -OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT -SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font -Software without prior written authorization from the Gnome Foundation -or Bitstream Inc., respectively. For further information, contact: -fonts at gnome dot org. - -Copyright FAQ -============= - - 1. I don't understand the resale restriction... What gives? - - Bitstream is giving away these fonts, but wishes to ensure its - competitors can't just drop the fonts as is into a font sale system - and sell them as is. It seems fair that if Bitstream can't make money - from the Bitstream Vera fonts, their competitors should not be able to - do so either. You can sell the fonts as part of any software package, - however. - - 2. I want to package these fonts separately for distribution and - sale as part of a larger software package or system. Can I do so? - - Yes. A RPM or Debian package is a "larger software package" to begin - with, and you aren't selling them independently by themselves. - See 1. above. - - 3. Are derivative works allowed? - Yes! - - 4. Can I change or add to the font(s)? - Yes, but you must change the name(s) of the font(s). - - 5. Under what terms are derivative works allowed? - - You must change the name(s) of the fonts. This is to ensure the - quality of the fonts, both to protect Bitstream and Gnome. We want to - ensure that if an application has opened a font specifically of these - names, it gets what it expects (though of course, using fontconfig, - substitutions could still could have occurred during font - opening). You must include the Bitstream copyright. Additional - copyrights can be added, as per copyright law. Happy Font Hacking! - - 6. If I have improvements for Bitstream Vera, is it possible they might get - adopted in future versions? - - Yes. The contract between the Gnome Foundation and Bitstream has - provisions for working with Bitstream to ensure quality additions to - the Bitstream Vera font family. Please contact us if you have such - additions. Note, that in general, we will want such additions for the - entire family, not just a single font, and that you'll have to keep - both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add - glyphs to the font, they must be stylistically in keeping with Vera's - design. Vera cannot become a "ransom note" font. Jim Lyles will be - providing a document describing the design elements used in Vera, as a - guide and aid for people interested in contributing to Vera. - - 7. I want to sell a software package that uses these fonts: Can I do so? - - Sure. Bundle the fonts with your software and sell your software - with the fonts. That is the intent of the copyright. - - 8. If applications have built the names "Bitstream Vera" into them, - can I override this somehow to use fonts of my choosing? - - This depends on exact details of the software. Most open source - systems and software (e.g., Gnome, KDE, etc.) are now converting to - use fontconfig (see www.fontconfig.org) to handle font configuration, - selection and substitution; it has provisions for overriding font - names and subsituting alternatives. An example is provided by the - supplied local.conf file, which chooses the family Bitstream Vera for - "sans", "serif" and "monospace". Other software (e.g., the XFree86 - core server) has other mechanisms for font substitution. - Removed: trunk/reactos/media/fonts/doc/VERA-README.TXT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/VERA-READM… ============================================================================== --- trunk/reactos/media/fonts/doc/VERA-README.TXT [iso-8859-1] (original) +++ trunk/reactos/media/fonts/doc/VERA-README.TXT (removed) @@ -1,11 +1,0 @@ -Contained herin is the Bitstream Vera font family. - -The Copyright information is found in the COPYRIGHT.TXT file (along -with being incoporated into the fonts themselves). - -The releases notes are found in the file "RELEASENOTES.TXT". - -We hope you enjoy Vera! - - Bitstream, Inc. - The Gnome Project Removed: trunk/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/VERA-RELEA… ============================================================================== --- trunk/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT [iso-8859-1] (original) +++ trunk/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT (removed) @@ -1,162 +1,0 @@ -Bitstream Vera Fonts - April 16, 2003 -===================================== - -The version number of these fonts is 1.10 to distinguish them from the -beta test fonts. - -Note that the Vera copyright is incorporated in the fonts themselves. -The License field in the fonts contains the copyright license as it -appears below. The TrueType copyright field is not large enough to -contain the full license, so the license is incorporated (as you might -think if you thought about it) into the license field, which -unfortunately can be obscure to find. (In pfaedit, see: Element->Font -Info->TTFNames->License). - -Our apologies for it taking longer to complete the fonts than planned. -Beta testers requested a tighter line spacing (less leading) and Jim -Lyles redesigned Vera's accents to bring its line spacing to more -typical of other fonts. This took additional time and effort. Our -thanks to Jim for this effort above and beyond the call of duty. - -There are four monospace and sans faces (normal, oblique, bold, bold -oblique) and two serif faces (normal and bold). Fontconfig/Xft2 (see -www.fontconfig.org) can artificially oblique the serif faces for you: -this loses hinting and distorts the faces slightly, but is visibly -different than normal and bold, and reasonably pleasing. - -On systems with fontconfig 2.0 or 2.1 installed, making your sans, -serif and monospace fonts default to these fonts is very easy. Just -drop the file local.conf into your /etc/fonts directory. This will -make the Bitstream fonts your default fonts for all applications using -fontconfig (if sans, serif, or monospace names are used, as they often -are as default values in many desktops). The XML in local.conf may -need modification to enable subpixel decimation, if appropriate, -however, the commented out phrase does so for XFree86 4.3, in the case -that the server does not have sufficient information to identify the -use of a flat panel. Fontconfig 2.2 adds Vera to the list of font -families and will, by default use it as the default sans, serif and -monospace fonts. - -During the testing of the final Vera fonts, we learned that screen -fonts in general are only typically hinted to work correctly at -integer pixel sizes. Vera is coded internally for integer sizes only. -We need to investigate further to see if there are commonly used fonts -that are hinted to be rounded but are not rounded to integer sizes due -to oversights in their coding. - -Most fonts work best at 8 pixels and below if anti-aliased only, as -the amount of work required to hint well at smaller and smaller sizes -becomes astronomical. GASP tables are typically used to control -whether hinting is used or not, but Freetype/Xft does not currently -support GASP tables (which are present in Vera). - -To mitigate this problem, both for Vera and other fonts, there will be -(very shortly) a new fontconfig 2.2 release that will, by default not -apply hints if the size is below 8 pixels. if you should have a font -that in fact has been hinted more agressively, you can use fontconfig -to note this exception. We believe this should improve many hinted -fonts in addition to Vera, though implemeting GASP support is likely -the right long term solution. - -Font rendering in Gnome or KDE is the combination of algorithms in -Xft2 and Freetype, along with hinting in the fonts themselves. It is -vital to have sufficient information to disentangle problems that you -may observe. - -Note that having your font rendering system set up correctly is vital -to proper judgement of problems of the fonts: - - * Freetype may or may not be configured to in ways that may - implement execution of possibly patented (in some parts of the world) - TrueType hinting algorithms, particularly at small sizes. Best - results are obtained while using these algorithms. - - * The freetype autohinter (used when the possibly patented - algorithms are not used) continues to improve with each release. If - you are using the autohinter, please ensure you are using an up to - date version of freetype before reporting problems. - - * Please identify what version of freetype you are using in any - bug reports, and how your freetype is configured. - - * Make sure you are not using the freetype version included in - XFree86 4.3, as it has bugs that significantly degrade most fonts, - including Vera. if you build XFree86 4.3 from source yourself, you may - have installed this broken version without intending it (as I - did). Vera was verified with the recently released Freetype 2.1.4. On - many systems, 'ldd" can be used to see which freetype shared library - is actually being used. - - * Xft/X Render does not (yet) implement gamma correction. This - causes significant problems rendering white text on a black background - (causing partial pixels to be insufficiently shaded) if the gamma of - your monitor has not been compensated for, and minor problems with - black text on a while background. The program "xgamma" can be used to - set a gamma correction value in the X server's color pallette. Most - monitors have a gamma near 2. - - * Note that the Vera family uses minimal delta hinting. Your - results on other systems when not used anti-aliased may not be - entirely satisfying. We are primarily interested in reports of - problems on open source systems implementing Xft2/fontconfig/freetype - (which implements antialiasing and hinting adjustements, and - sophisticated subpixel decimation on flatpanels). Also, the - algorithms used by Xft2 adjust the hints to integer widths and the - results are crisper on open source systems than on Windows or - MacIntosh. - - * Your fontconfig may (probably does) predate the release of - fontconfig 2.2, and you may see artifacts not present when the font is - used at very small sizes with hinting enabled. "vc-list -V" can be - used to see what version you have installed. - -We believe and hope that these fonts will resolve the problems -reported during beta test. The largest change is the reduction of -leading (interline spacing), which had annoyed a number of people, and -reduced Vera's utility for some applcations. The Vera monospace font -should also now make '0' and 'O' and '1' and 'l' more clearly -distinguishable. - -The version of these fonts is version 1.10. Fontconfig should be -choosing the new version of the fonts if both the released fonts and -beta test fonts are installed (though please discard them: they have -names of form tt20[1-12]gn.ttf). Note that older versions of -fontconfig sometimes did not rebuild their cache correctly when new -fonts are installed: please upgrade to fontconfig 2.2. "fc-cache -f" -can be used to force rebuilding fontconfig's cache files. - -If you note problems, please send them to fonts at gnome dot org, with -exactly which face and size and unicode point you observe the problem -at. The xfd utility from XFree86 CVS may be useful for this (e.g. "xfd --fa sans"). A possibly more useful program to examine fonts at a -variety of sizes is the "waterfall" program found in Keith Packard's -CVS. - - $ cvs -d :pserver:anoncvs@keithp.com:/local/src/CVS login - Logging in to :pserver:anoncvs@keithp.com:2401/local/src/CVS - CVS password: <hit return> - $ cvs -d :pserver:anoncvs@keithp.com:/local/src/CVS co waterfall - $ cd waterfall - $ xmkmf -a - $ make - # make install - # make install.man - -Again, please make sure you are running an up-to-date freetype, and -that you are only examining integer sizes. - -Reporting Problems -================== - -Please send problem reports to fonts at gnome org, with the following -information: - - 1. Version of Freetype, Xft2 and fontconfig - 2. Whether TT hinting is being used, or the autohinter - 3. Application being used - 4. Character/Unicode code point that has problems (if applicable) - 5. Version of which operating system - 6. Please include a screenshot, when possible. - -Please check the fonts list archives before reporting problems to cut -down on duplication. Modified: trunk/reactos/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/fonts.rbuild?r… ============================================================================== --- trunk/reactos/media/fonts/fonts.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/fonts/fonts.rbuild [iso-8859-1] Sun Mar 30 13:18:53 2008 @@ -17,11 +17,11 @@ <installfile installbase="media/fonts">DejaVuSerif.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile> - <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile> <installfile installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile> <installfile installbase="media/fonts">c0419bt_.ttf</installfile> <installfile installbase="media/fonts">c0582bt_.ttf</installfile> <installfile installbase="media/fonts">c0583bt_.ttf</installfile> @@ -34,20 +34,22 @@ <installfile installbase="media/fonts">courb.ttf</installfile> <installfile installbase="media/fonts">courbi.ttf</installfile> <installfile installbase="media/fonts">helb____.ttf</installfile> + <installfile installbase="media/fonts">LiberationMono-Bold.ttf</installfile> + <installfile installbase="media/fonts">LiberationMono-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">LiberationMono-Italic.ttf</installfile> + <installfile installbase="media/fonts">LiberationMono-Regular.ttf</installfile> + <installfile installbase="media/fonts">LiberationSans-Bold.ttf</installfile> + <installfile installbase="media/fonts">LiberationSans-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">LiberationSans-Italic.ttf</installfile> + <installfile installbase="media/fonts">LiberationSans-Regular.ttf</installfile> + <installfile installbase="media/fonts">LiberationSerif-Bold.ttf</installfile> + <installfile installbase="media/fonts">LiberationSerif-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">LiberationSerif-Italic.ttf</installfile> + <installfile installbase="media/fonts">LiberationSerif-Regular.ttf</installfile> <installfile installbase="media/fonts">Marlett.ttf</installfile> <installfile installbase="media/fonts">timr____.ttf</installfile> <installfile installbase="media/fonts">UTB_____.ttf</installfile> <installfile installbase="media/fonts">UTBI____.ttf</installfile> <installfile installbase="media/fonts">UTI_____.ttf</installfile> <installfile installbase="media/fonts">UTRG____.ttf</installfile> - <installfile installbase="media/fonts">Vera.ttf</installfile> - <installfile installbase="media/fonts">VeraBd.ttf</installfile> - <installfile installbase="media/fonts">VeraBI.ttf</installfile> - <installfile installbase="media/fonts">VeraIt.ttf</installfile> - <installfile installbase="media/fonts">VeraMoBd.ttf</installfile> - <installfile installbase="media/fonts">VeraMoBI.ttf</installfile> - <installfile installbase="media/fonts">VeraMoIt.ttf</installfile> - <installfile installbase="media/fonts">VeraMono.ttf</installfile> - <installfile installbase="media/fonts">VeraSe.ttf</installfile> - <installfile installbase="media/fonts">VeraSeBd.ttf</installfile> </group>

1 0

[janderwald] 32782: - fix compilation with msvc8
by janderwald＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: janderwald Date: Sun Mar 30 05:01:37 2008 New Revision: 32782 URL: http://svn.reactos.org/svn/reactos?rev=32782&view=rev Log: - fix compilation with msvc8 Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/ver.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Mar 30 05:01:37 2008 @@ -1850,7 +1850,7 @@ _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); - ConOutPuts (_T("(C) Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team.\n")); + ConOutPuts (_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); } ExecuteAutoRunFile (); Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Sun Mar 30 05:01:37 2008 @@ -78,7 +78,7 @@ { ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others.")); - ConOutPuts (_T("Copyright (C) 1998-" COPYRIGHT_YEAR " ReactOS Team")); + ConOutPuts (_T("Copyright (C) 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team")); for (i = 0; param[i]; i++) {

1 0

[fireball] 32781: - Convert to wmilib.def to wmilib.spec (so far stdcall-fixup was not really working).
by fireball＠svn.reactos.org 30 Mar '08

30 Mar '08

Author: fireball Date: Sun Mar 30 05:00:18 2008 New Revision: 32781 URL: http://svn.reactos.org/svn/reactos?rev=32781&view=rev Log: - Convert to wmilib.def to wmilib.spec (so far stdcall-fixup was not really working). Added: trunk/reactos/drivers/wmi/wmilib.spec - copied, changed from r32779, trunk/reactos/drivers/wmi/wmilib.def Removed: trunk/reactos/drivers/wmi/wmilib.def Modified: trunk/reactos/drivers/wmi/wmilib.rbuild Removed: trunk/reactos/drivers/wmi/wmilib.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.def?rev… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.def [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.def (removed) @@ -1,7 +1,0 @@ -; -; wmilib.def - export definition file for ReactOS -; -EXPORTS -WmiCompleteRequest -WmiFireEvent -WmiSystemControl Modified: trunk/reactos/drivers/wmi/wmilib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.rbuild?… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.rbuild [iso-8859-1] Sun Mar 30 05:00:18 2008 @@ -1,9 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="wmilib" type="kernelmodedriver" installbase="system32/drivers" installname="wmilib.sys"> - <importlibrary definition="wmilib.def" /> + <importlibrary definition="wmilib.spec.def" /> <include base="wmilib">.</include> <library>ntoskrnl</library> <file>wmilib.c</file> + <file>wmilib.spec</file> <file>wmilib.rc</file> </module> Copied: trunk/reactos/drivers/wmi/wmilib.spec (from r32779, trunk/reactos/drivers/wmi/wmilib.def) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.spec?p2… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.def [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.spec [iso-8859-1] Sun Mar 30 05:00:18 2008 @@ -1,7 +1,6 @@ ; ; wmilib.def - export definition file for ReactOS ; -EXPORTS -WmiCompleteRequest -WmiFireEvent -WmiSystemControl +@ stdcall WmiCompleteRequest(ptr ptr long long long) +@ stdcall WmiFireEvent(ptr ptr long long ptr) +@ stdcall WmiSystemControl(ptr ptr ptr ptr)

1 0

[pschweitzer] 32780: Set all FSD (except fastfat.sys) start to 0x4 to let fs_rec.sys doing his job (and matching with Windows...). It will silent ext2 driver.
by pschweitzer＠svn.reactos.org 29 Mar '08

29 Mar '08

Author: pschweitzer Date: Sat Mar 29 08:40:28 2008 New Revision: 32780 URL: http://svn.reactos.org/svn/reactos?rev=32780&view=rev Log: Set all FSD (except fastfat.sys) start to 0x4 to let fs_rec.sys doing his job (and matching with Windows...). It will silent ext2 driver. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Mar 29 08:40:28 2008 @@ -522,7 +522,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 ; Cdrom class driver @@ -681,7 +681,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Type",0x00010001,0x00000002 ; Null device driver @@ -743,7 +743,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 ; VBE SVGA driver

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2008