Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 28952: - Remove intl_new.cpl
by fireball＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: fireball Date: Sat Sep 8 21:42:23 2007 New Revision: 28952 URL: http://svn.reactos.org/svn/reactos?rev=28952&view=rev Log: - Remove intl_new.cpl Removed: trunk/reactos/dll/cpl/intl_new/ Modified: trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=289… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Sat Sep 8 21:42:23 2007 @@ -15,9 +15,6 @@ </directory> <directory name="intl"> <xi:include href="intl/intl.rbuild" /> -</directory> -<directory name="intl_new"> - <xi:include href="intl_new/intl.rbuild" /> </directory> <directory name="main"> <xi:include href="main/main.rbuild" />

1 0

[cfinck] 28951: Merge french translation for syssetup from r28646
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 20:47:21 2007 New Revision: 28951 URL: http://svn.reactos.org/svn/reactos?rev=28951&view=rev Log: Merge french translation for syssetup from r28646 Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc Sat Sep 8 20:47:21 2007 @@ -217,8 +217,8 @@ STRINGTABLE BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" + IDS_SYS_TOOLS "Outils système" + IDS_CMT_CHARMAP "Table des Caractères" END STRINGTABLE

1 0

[ekohl] 28950: - Update language samples upon selection of a new language. - Add a workaround for a special case: "Spanish (Spain)" uses two sorting methods but two sublang ids are used to distinguish them instead of two sort ids. Ensure they don't appear twice in the language list. - Add "Spanish (Spain)" as a translatable string resource.
by ekohl＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: ekohl Date: Sat Sep 8 19:43:19 2007 New Revision: 28950 URL: http://svn.reactos.org/svn/reactos?rev=28950&view=rev Log: - Update language samples upon selection of a new language. - Add a workaround for a special case: "Spanish (Spain)" uses two sorting methods but two sublang ids are used to distinguish them instead of two sort ids. Ensure they don't appear twice in the language list. - Add "Spanish (Spain)" as a translatable string resource. Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/resource.h Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Sat Sep 8 19:43:19 2007 @@ -40,6 +40,7 @@ HWND hList; HWND hLocaleList, hGeoList; +BOOL bSpain = FALSE; static BOOL CALLBACK LocalesEnumProc(LPTSTR lpLocale) @@ -47,12 +48,30 @@ LCID lcid; TCHAR lang[255]; INT index; - - //swscanf(lpLocale, L"%lx", &lcid); // maybe use wcstoul? + BOOL bNoShow = FALSE; + lcid = _tcstoul(lpLocale, NULL, 16); - GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); - + if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || + lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) + { + if (bSpain == FALSE) + { + LoadString(hApplet, IDS_SPAIN, lang, 255); + bSpain = TRUE; + } + else + { + bNoShow = TRUE; + } + } + else + { + GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); + } + + if (bNoShow == FALSE) + { index = SendMessage(hList, CB_ADDSTRING, 0, @@ -62,6 +81,7 @@ CB_SETITEMDATA, index, (LPARAM)lcid); + } return TRUE; } @@ -110,6 +130,7 @@ TCHAR langSel[255]; hList = hwnd; + bSpain = FALSE; EnumSystemLocales(LocalesEnumProc, LCID_SUPPORTED); /* Select current locale */ @@ -322,6 +343,25 @@ case IDC_LANGUAGELIST: if (HIWORD(wParam) == CBN_SELCHANGE) { + LCID NewLcid; + INT iCurSel; + + iCurSel = SendMessage(hList, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendMessage(hList, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + UpdateLocaleSample(hwndDlg, NewLcid); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Sat Sep 8 19:43:19 2007 @@ -175,11 +175,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Regionale Einstellungen bearbeiten" + IDS_CUSTOMIZE_TITLE "Regionale Einstellungen bearbeiten" + IDS_SPAIN "Spanisch (Spanien)" END STRINGTABLE BEGIN - IDS_CPLNAME "Regionale Einstellungen" - IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus." + IDS_CPLNAME "Regionale Einstellungen" + IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus." END Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc Sat Sep 8 19:43:19 2007 @@ -178,11 +178,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Customize Regional Options" + IDS_CUSTOMIZE_TITLE "Customize Regional Options" + IDS_SPAIN "Spanish (Spain)" END STRINGTABLE BEGIN - IDS_CPLNAME "Regional Options" - IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." + IDS_CPLNAME "Regional Options" + IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." END Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc Sat Sep 8 19:43:19 2007 @@ -179,11 +179,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Opzioni internazionali e della lingua" + IDS_CUSTOMIZE_TITLE "Opzioni internazionali e della lingua" + IDS_SPAIN "Spanish (Spain)" END STRINGTABLE BEGIN - IDS_CPLNAME "Opzioni internazionali e della lingua" - IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data." + IDS_CPLNAME "Opzioni internazionali e della lingua" + IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data." END Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Sat Sep 8 19:43:19 2007 @@ -178,11 +178,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåãèîíàëüíûõ ïàðàìåòðîâ" + IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåãèîíàëüíûõ ïàðàìåòðîâ" + IDS_SPAIN "Spanish (Spain)" END STRINGTABLE BEGIN - IDS_CPLNAME "ßçûê è ðåãèîíàëüíûå ñòàíäàðòû" - IDS_CPLDESCRIPTION "Âûáîð ÿçûêà, ôîðìàòà ÷èñåë, äåíåæíûõ åäèíèö, âðåìåíè è äàòû." + IDS_CPLNAME "ßçûê è ðåãèîíàëüíûå ñòàíäàðòû" + IDS_CPLDESCRIPTION "Âûáîð ÿçûêà, ôîðìàòà ÷èñåë, äåíåæíûõ åäèíèö, âðåìåíè è äàòû." END Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Sat Sep 8 19:43:19 2007 @@ -184,11 +184,12 @@ STRINGTABLE BEGIN - IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåã³îíàëüíèõ ïàðàìåòð³â" + IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåã³îíàëüíèõ ïàðàìåòð³â" + IDS_SPAIN "Spanish (Spain)" END STRINGTABLE BEGIN - IDS_CPLNAME "Ðåã³îíàëüí³ ñòàíäàðòè" - IDS_CPLDESCRIPTION "Íàñòðîéêà ìîâíèõ ïàðàìåòð³â ³ ôîðìàòó ÷èñåë, ãðîøîâèõ îäèíèöü, ÷àñó é äàò." + IDS_CPLNAME "Ðåã³îíàëüí³ ñòàíäàðòè" + IDS_CPLDESCRIPTION "Íàñòðîéêà ìîâíèõ ïàðàìåòð³â ³ ôîðìàòó ÷èñåë, ãðîøîâèõ îäèíèöü, ÷àñó é äàò." END Modified: trunk/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/resource.h (original) +++ trunk/reactos/dll/cpl/intl/resource.h Sat Sep 8 19:43:19 2007 @@ -74,7 +74,7 @@ #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 #define IDS_CUSTOMIZE_TITLE 1002 - +#define IDS_SPAIN 1003 #endif /* __CPL_RESOURCE_H */

1 0

[jimtabor] 28949: Reset DC if MemoryDC or SaveLevelDC.
by jimtabor＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: jimtabor Date: Sat Sep 8 18:30:39 2007 New Revision: 28949 URL: http://svn.reactos.org/svn/reactos?rev=28949&view=rev Log: Reset DC if MemoryDC or SaveLevelDC. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 8 18:30:39 2007 @@ -1448,7 +1448,8 @@ IntGdiExtSelectClipRgn(dc, dcs->w.hClipRgn, RGN_COPY); DC_UnlockDc ( dc ); #endif - + if(!hDC) return; // Not a MemoryDC or SaveLevel DC, return. + NtGdiSelectObject( hDC, dcs->w.hBitmap ); NtGdiSelectObject( hDC, dcs->Dc_Attr.hbrush ); NtGdiSelectObject( hDC, dcs->Dc_Attr.hlfntNew );

1 0

[cfinck] 28948: Merge 28463, 28946 and 28947 (Character Map shortcut in the start menu)
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 18:24:22 2007 New Revision: 28948 URL: http://svn.reactos.org/svn/reactos?rev=28948&view=rev Log: Merge 28463, 28946 and 28947 (Character Map shortcut in the start menu) Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/cs-CZ.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/el-GR.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/en-US.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/es-ES.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/hu-HU.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/id-ID.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/it-IT.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ja-JP.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nb-NO.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nl-NL.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/pl-PL.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/uk-UA.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/zh-CN.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/resource.h Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Sat Sep 8 18:24:22 2007 @@ -611,6 +611,12 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); } + /* Creacte System Tools subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_TOOLS, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) + { + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, FALSE); + } + /* Create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/cs-CZ.rc Sat Sep 8 18:24:22 2007 @@ -215,6 +215,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Instalátor" IDS_UNKNOWN_ERROR "Neznámá chyba" IDS_REGISTERING_COMPONENTS "Registruji souèásti..." @@ -240,6 +246,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/de-DE.rc Sat Sep 8 18:24:22 2007 @@ -216,6 +216,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "Systemprogramme" + IDS_CMT_CHARMAP "Zeichentabelle" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unbekannter Fehler" IDS_REGISTERING_COMPONENTS "Registriere Komponenten..." @@ -241,6 +247,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "Zeichentabelle.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/el-GR.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/el-GR.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ÅãêáôÜóôáóç ôïõ ReactOS" IDS_UNKNOWN_ERROR "¢ãíùóôï óöÜëìá" IDS_REGISTERING_COMPONENTS "Êáôá÷þñçóç óôïé÷åßùí óôï ìçôñþï..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/en-US.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "Character Map" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/es-ES.rc Sat Sep 8 18:24:22 2007 @@ -237,6 +237,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -262,6 +268,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/fr-FR.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installation de ReactOS" IDS_UNKNOWN_ERROR "Erreur inconnue" IDS_REGISTERING_COMPONENTS "Enregistrement des composants..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "Capture d'écran.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "Table des Caractères.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/hu-HU.rc Sat Sep 8 18:24:22 2007 @@ -229,6 +229,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Telepítõ" IDS_UNKNOWN_ERROR "Hiba lépett fel, de nemtudni annak okát" IDS_REGISTERING_COMPONENTS "Komponensek regisztrációja..." @@ -254,6 +260,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/id-ID.rc Sat Sep 8 18:24:22 2007 @@ -215,6 +215,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Setup ReactOS" IDS_UNKNOWN_ERROR "Kesalahan tidak dikenal" IDS_REGISTERING_COMPONENTS "Meregister komponen..." @@ -240,6 +246,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/it-IT.rc Sat Sep 8 18:24:22 2007 @@ -208,6 +208,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installazione di ReactOS" IDS_UNKNOWN_ERROR "Errore sconosciuto" IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." @@ -233,6 +239,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ja-JP.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nb-NO.rc Sat Sep 8 18:24:22 2007 @@ -220,6 +220,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS installasjon" IDS_UNKNOWN_ERROR "Ukjent feil" IDS_REGISTERING_COMPONENTS "Registrerer komponenter..." @@ -245,6 +251,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/nl-NL.rc Sat Sep 8 18:24:22 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/pl-PL.rc Sat Sep 8 18:24:22 2007 @@ -220,6 +220,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Ustawienia ReactOS" IDS_UNKNOWN_ERROR "Nieznany b³¹d" IDS_REGISTERING_COMPONENTS "Rejestracja sk³adników..." @@ -245,6 +251,7 @@ IDS_SHORT_SNAP "Zrzut ekranu.lnk" IDS_SHORT_SOLITAIRE "RosPasjans.lnk" IDS_SHORT_WINEMINE "ROSaper.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/ru-RU.rc Sat Sep 8 18:24:22 2007 @@ -198,6 +198,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "Ñëóæåáíûå" + IDS_CMT_CHARMAP "Òàáëèöà ñèìâîëîâ" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" IDS_UNKNOWN_ERROR "Íåèçâåñòíàÿ îøèáêà" IDS_REGISTERING_COMPONENTS "Ðåãèñòðàöèÿ êîìïîíåíòîâ..." @@ -223,6 +229,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Ïàñüÿíñ.lnk" IDS_SHORT_WINEMINE "Ñàïåð.lnk" + IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/uk-UA.rc Sat Sep 8 18:24:22 2007 @@ -206,6 +206,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" IDS_UNKNOWN_ERROR "Íåâ³äîìà ïîìèëêà" IDS_REGISTERING_COMPONENTS "Ðåºñòðàö³ÿ êîìïîíåíò³â..." @@ -231,6 +237,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/zh-CN.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/lang/zh-CN.rc Sat Sep 8 18:24:22 2007 @@ -205,6 +205,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -230,6 +236,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/resource.h (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/resource.h Sat Sep 8 18:24:22 2007 @@ -89,6 +89,7 @@ #define IDS_ACCESSORIES 3200 #define IDS_GAMES 3201 +#define IDS_SYS_TOOLS 3202 #define IDS_CMT_CMD 3210 #define IDS_CMT_EXPLORER 3211 @@ -102,6 +103,7 @@ #define IDS_CMT_SCREENSHOT 3221 #define IDS_CMT_DOWNLOADER 3222 #define IDS_CMT_DEVMGMT 3223 +#define IDS_CMT_CHARMAP 3224 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -125,6 +127,7 @@ #define IDS_SHORT_SNAP 3410 #define IDS_SHORT_SOLITAIRE 3411 #define IDS_SHORT_WINEMINE 3412 +#define IDS_SHORT_CHARMAP 3413 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

1 0

[cfinck] 28947: Forgot to change the names of the actual .lnk files
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 18:17:36 2007 New Revision: 28947 URL: http://svn.reactos.org/svn/reactos?rev=28947&view=rev Log: Forgot to change the names of the actual .lnk files Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Sat Sep 8 18:17:36 2007 @@ -247,7 +247,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_CHARMAP "Zeichentabelle.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Sat Sep 8 18:17:36 2007 @@ -248,7 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Sat Sep 8 18:17:36 2007 @@ -248,7 +248,7 @@ IDS_SHORT_SNAP "Capture d'écran.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_CHARMAP "Table des Caractères.lnk" END STRINGTABLE

1 0

[cfinck] 28946: - Change "CharMap" to "Character Map" in the english translation - Translate "System Tools" and "Character Map" to german
by cfinck＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cfinck Date: Sat Sep 8 18:10:01 2007 New Revision: 28946 URL: http://svn.reactos.org/svn/reactos?rev=28946&view=rev Log: - Change "CharMap" to "Character Map" in the english translation - Translate "System Tools" and "Character Map" to german Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Sat Sep 8 18:10:01 2007 @@ -216,8 +216,8 @@ STRINGTABLE BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" + IDS_SYS_TOOLS "Systemprogramme" + IDS_CMT_CHARMAP "Zeichentabelle" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Sat Sep 8 18:10:01 2007 @@ -218,7 +218,7 @@ STRINGTABLE BEGIN IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" + IDS_CMT_CHARMAP "Character Map" END STRINGTABLE

1 0

[janderwald] 28945: - add input.dll baseaddress
by janderwald＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: janderwald Date: Sat Sep 8 17:27:10 2007 New Revision: 28945 URL: http://svn.reactos.org/svn/reactos?rev=28945&view=rev Log: - add input.dll baseaddress Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=289… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sat Sep 8 17:27:10 2007 @@ -14,6 +14,7 @@ <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> + <property name="BASEADDRESS_INPUT" value ="0x5e400000" /> <property name="BASEADDRESS_DINPUT" value="0x5f580000" /> <property name="BASEADDRESS_NETID" value="0x5f660000" /> <property name="BASEADDRESS_MAPI32" value="0x62250000" />

1 0

[janderwald] 28944: - add input.dll baseaddress
by janderwald＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: janderwald Date: Sat Sep 8 17:27:09 2007 New Revision: 28944 URL: http://svn.reactos.org/svn/reactos?rev=28944&view=rev Log: - add input.dll baseaddress Modified: trunk/reactos/dll/cpl/input/input.rbuild Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Sat Sep 8 17:27:09 2007 @@ -1,4 +1,4 @@ -<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="input.dll"> +<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll"> <importlibrary definition="input.def" /> <include base="input">.</include> <define name="UNICODE" />

1 0

[cwittich] 28943: handle CachedMode->dmSize
by cwittich＠svn.reactos.org 08 Sep '07

08 Sep '07

Author: cwittich Date: Sat Sep 8 16:13:49 2007 New Revision: 28943 URL: http://svn.reactos.org/svn/reactos?rev=28943&view=rev Log: handle CachedMode->dmSize Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 8 16:13:49 2007 @@ -2998,9 +2998,9 @@ ASSERT(CachedMode != NULL); - RtlCopyMemory(pDevMode, CachedMode, pDevMode->dmSize); + RtlCopyMemory(pDevMode, CachedMode, min(pDevMode->dmSize, CachedMode->dmSize)); RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra); - RtlCopyMemory(pDevMode + pDevMode->dmSize, CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); + RtlCopyMemory(pDevMode + min(pDevMode->dmSize, CachedMode->dmSize), CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); return TRUE; }

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