Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[fireball] 40786: - Ditto as r40781, but for ohci. Spotted by Cameron Gutman.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 4 21:07:05 2009 New Revision: 40786 URL: http://svn.reactos.org/svn/reactos?rev=40786&view=rev Log: - Ditto as r40781, but for ohci. Spotted by Cameron Gutman. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Mon May 4 21:07:05 2009 @@ -1342,7 +1342,7 @@ LBL_OUT2: pdev->ref_count--; - RemoveEntryList((PLIST_ENTRY) purb); + RemoveEntryList(&purb->urb_link); LBL_OUT: unlock_dev(pdev, TRUE);

15 years, 8 months

[tkreuzer] 40785: Fix asm implementations of RtlInterlockedPopEntrySList, RtlInterlockedPushEntrySList and RtlInterlockedFlushSList, by correcting the stack offset for the parameters. Thanks to Pigglesworth for the hint.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 4 19:27:37 2009 New Revision: 40785 URL: http://svn.reactos.org/svn/reactos?rev=40785&view=rev Log: Fix asm implementations of RtlInterlockedPopEntrySList, RtlInterlockedPushEntrySList and RtlInterlockedFlushSList, by correcting the stack offset for the parameters. Thanks to Pigglesworth for the hint. Modified: trunk/reactos/lib/rtl/i386/interlck.S Modified: trunk/reactos/lib/rtl/i386/interlck.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/interlck.S?re… ============================================================================== --- trunk/reactos/lib/rtl/i386/interlck.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/interlck.S [iso-8859-1] Mon May 4 19:27:37 2009 @@ -24,13 +24,13 @@ push ebp /* Load ListHead into ebp */ - mov ebp, [esp + 8] + mov ebp, [esp + 12] /* Load ListHead->Next into eax */ mov eax, [ebp] /* Load ListHead->Depth and ListHead->Sequence into edx */ - mov edx, [ebp+4] + mov edx, [ebp + 4] 1: /* Check if ListHead->Next is NULL */ @@ -70,10 +70,10 @@ push ebp /* Load ListHead into ebp */ - mov ebp, [esp + 4] + mov ebp, [esp + 12] /* Load ListEntry into ebx */ - mov ebx, [esp + 12] + mov ebx, [esp + 16] /* Load ListHead->Next into eax */ mov eax, [ebp] @@ -116,7 +116,7 @@ xor ebx, ebx /* Load ListHead into ebp */ - mov ebp, [esp + 4] + mov ebp, [esp + 12] /* Load ListHead->Next into eax */ mov eax, [ebp]

15 years, 8 months

[dreimer] 40784: Bug 4449: Italian translation updates by Paolo Devoti Bug 4445: Language resource update by Jingjing Fu

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon May 4 17:41:40 2009 New Revision: 40784 URL: http://svn.reactos.org/svn/reactos?rev=40784&view=rev Log: Bug 4449: Italian translation updates by Paolo Devoti Bug 4445: Language resource update by Jingjing Fu Added: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc (with props) trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc (with props) trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc (with props) Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/liccpa/lang/zh-CN.rc trunk/reactos/dll/cpl/main/lang/zh-CN.rc trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc trunk/reactos/dll/cpl/powercfg/lang/en-US.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/userenv/lang/it-IT.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -147,6 +147,19 @@ DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 END +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "Ferma altri servizi" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL + LTEXT "Volete fermare questi servizi?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Si", IDOK, 60, 129, 54, 14 + PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 +END + IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Opzioni" FONT 8, "MS Shell Dlg",0,0 @@ -191,6 +204,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Numero Servizi: %d" + IDS_STOP_DEPENDS "Quando %s si ferma, Questi altri sevizi si fermeranno" IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." END Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -147,7 +147,7 @@ IDS_RESTARTTITLE "Prima fase della installazione completata" IDS_RESTARTSUBTITLE "La prima fase della installazione è stata completata, riavviare il computer per procedere alla seconda fase" IDS_SUMMARYTITLE "Sintesi della installazione" - IDS_SUMMARYSUBTITLE "Elencare le proprietà della installazione da controllare prima che siano eseguite sul dispositivo di installazione" + IDS_SUMMARYSUBTITLE "Lista delle proprietà della installazione da controllare prima che siano eseguite sul dispositivo di installazione" IDS_ABORTSETUP "ReactOS non è installato completamente sul computer. Se interropete l'installazione ora sarà necessario eseguire l'installazione di nuovo. Volete procedere?" IDS_ABORTSETUP2 "Volete interrompere l'installazione?" END Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -98,24 +98,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Effetti" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Usare il seguente effetto per le transizioni in menu e tooltip:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "U&sare il seguente metodo per arrotondare i bordi dei font per lo schermo:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Usare le icone grandi",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "&Ombreggiatura sotto i menu",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Mostrare il contenuto delle finestr mentre le si trascina",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Nascondere la sottolineatura delle lettere di navigazione finche non è premuto il tasto Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -178,8 +178,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" + IDS_SLIDEEFFECT "Effetto Slide" + IDS_FADEEFFECT "Effetto dissolvenza" END STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -39,7 +39,7 @@ BEGIN LTEXT "&Lingua:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - LTEXT "&Disposizione/IME tastiera:", -1, 7, 36, 110, 10 + LTEXT "&Layout/IME tastiera:", -1, 7, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 169, 68, 50, 14 @@ -56,7 +56,7 @@ CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 AUTORADIOBUTTON "&ALT sinistro", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 - AUTOCHECKBOX "Cambia &disposizione di tastiera", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + AUTOCHECKBOX "Cambia &layout di tastiera", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 LTEXT "Shift", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 @@ -72,7 +72,7 @@ BEGIN LTEXT "Lingua:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 - LTEXT "&Disposizione/IME tastiera:", -1, 7, 21, 110, 10 + LTEXT "&Layout/IME tastiera:", -1, 7, 21, 110, 10 COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Annulla", IDCANCEL, 169, 53, 52, 14 @@ -88,11 +88,11 @@ IDS_RESTART "Volete riavviare il computer adesso?" IDS_WHATS_THIS "Cosa è questo?" IDS_LANGUAGE "Lingua" - IDS_LAYOUT "Disposizione tastiera" - IDS_REM_QUESTION "Volete rimuovere la disposizione di tastiera selezionata?" + IDS_LAYOUT "Layout di tastiera" + IDS_REM_QUESTION "Volete rimuovere il Layout di tastiera selezionato?" IDS_CONFIRMATION "Conferma" - IDS_LAYOUT_EXISTS "Questa disposizione esite già." - IDS_LAYOUT_EXISTS2 "Questa disposizione esite già e non può essere aggiunta." + IDS_LAYOUT_EXISTS "Questo Layout di tastiera esite già." + IDS_LAYOUT_EXISTS2 "Questo Layout di tastiera esite già e non può essere aggiunto." IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt sinistro+Shift" IDS_SWITCH_BET_INLANG "Cambia lingua di digitazione" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -67,11 +67,11 @@ EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Decimal symbol:", -1, 8, 67, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "No. of digits a&fter decimal:", -1, 8, 83, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "No. of digi&ts after decimal:", -1, 8, 83, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "Digit &grouping symbol:", -1, 8, 100, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Di&git grouping:", -1, 8, 117, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "D&igit grouping:", -1, 8, 117, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "N&egative sign symbol:", -1, 8, 134, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -108,7 +108,7 @@ COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "&Grouping symbol:", -1, 10, 156, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPSEP, 134, 154, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Digit grouping:", -1, 10, 173, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "D&igit grouping:", -1, 10, 173, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPNUM, 134, 171, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Added: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -1,0 +1,203 @@ +/* + * Simplified Chinese Resource for Intl (dll/cpl/intl/lang/zh-CN.rc) + * CREATED: Jingjing Fu (jingjingf AT 188.com) 2009-05-02 + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÇøÓòÑ¡Ïî" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "±ê×¼ºÍ¸ñÊ½", -1, 5, 5, 234, 162 + LTEXT "Õâ¸öÑ¡ÏîÓ°Ïìµ½Ä³Ð©³ÌÐòÈçºÎ¸ñÊ½»¯Êý×Ö¡¢»õ±Ò¡¢Ê±¼äºÍÈÕÆÚ¡£", -1, 14, 17, 220, 25 + LTEXT "Ñ¡ÔñÒ»¸öÓëÆäÊ×Ñ¡ÏîÆ¥ÅäµÄÏî»òµ¥»÷¡°×Ô¶¨Òå¡±Ñ¡ÔñÄú×Ô¼ºµÄ¸ñÊ½(&S):", -1, 14, 37, 220, 22 + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "×Ô¶¨Òå(&Z)...", IDC_SETUP_BUTTON, 178, 56, 52, 13 + LTEXT "Ê¾Àý", -1, 14, 73, 70, 10 + LTEXT "Êý×Ö:", -1, 16, 86, 48, 10 + LTEXT "»õ±Ò:", -1, 16, 101, 48, 10 + LTEXT "Ê±¼ä:", -1, 16, 116, 48, 10 + LTEXT "¶ÌÈÕÆÚ:", -1, 16, 131, 48, 10 + LTEXT "³¤ÈÕÆÚ:", -1, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 89, 101, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Î»ÖÃ", -1, 5, 172, 234, 55 + LTEXT "ÎªÁË±ãÓÚÎªÄúÌá¹©µ±µØÐÅÏ¢ÈçÐÂÎÅºÍÌìÆø£¬ÇëÑ¡ÔñÄúµÄËùÔÚµØ(&T):", -1, 14, 184, 210, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT +END + +IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÓïÑÔ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÎÄ×Ö·þÎñºÍÊäÈëÓïÑÔ", -1, 5, 5, 234, 52 + LTEXT "Òª²é¿´ÓÃÀ´ÊäÈëÎÄ×ÖµÄÓïÑÔºÍ·½·¨£¬Çëµ¥»÷¡°ÏêÏ¸ÐÅÏ¢¡±¡£", -1, 12, 15, 220, 18 + PUSHBUTTON "ÏêÏ¸ÐÅÏ¢(&T)...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 + GROUPBOX "¸½¼ÓµÄÓïÑÔÖ§³Ö", -1, 5, 62, 234, 82 + LTEXT "´ó¶àÊýÓïÑÔ¶¼»áÔÚÄ¬ÈÏÇé¿öÏÂµÃµ½°²×°¡£Òª°²×°ÆäËûÓïÑÔ£¬Ñ¡ÔñÏÂÃæÏàÓ¦µÄ¸´Ñ¡¿ò¡£", -1, 12, 72, 220, 18 + CHECKBOX "Îª¸´ÔÓÎÄ×ÖºÍ´ÓÓÒµ½×óµÄÓïÑÔ°²×°ÎÄ¼þ(°üÀ¨Ì©ÎÄ)(&N)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE + CHECKBOX "Îª¶«ÑÇÓïÑÔ°²×°ÎÄ¼þ(&S)", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE +END + +IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¸ß¼¶" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "·Ç Unicode ³ÌÐòµÄÓïÑÔ", -1, 5, 5, 234, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Õâ¸öÉèÖÃÆô¶¯Ä³Ð©·Ç Unicode ³ÌÐòÒÔ±ãÓÃÄ¸ÓïÏÔÊ¾²Ëµ¥ºÍ¶Ô»°¡£Õâ²»»áÓ°Ïìµ½ Unicode µÄ³ÌÐò£¬µ«ÊÇ»áÓ¦ÓÃÔÚÕâÌ¨¼ÆËã»úÉÏµÄËùÓÐÓÃ»§¡£", -1, 14, 18, 223, 33 + LTEXT "Ñ¡ÔñÒ»ÖÖÓïÑÔ£¬Ê¹Ö®ÓëÄúÏëÊ¹ÓÃµÄ·Ç Unicode ³ÌÐòµÄÓïÑÔ°æ±¾ÏàÆ¥Åä(&S):", -1, 14, 55, 223, 18 + GROUPBOX "´úÂëÒ³×ª»»±í(&C)", -1, 5, 101, 234, 88 + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 + GROUPBOX "Ä¬ÈÏÓÃ»§ÕÊ»§ÉèÖÃ", -1, 5, 193, 234, 30 + CHECKBOX "½«ËùÓÐÉèÖÃÓ¦ÓÃÓÚµ±Ç°ÓÃ»§ÕÊ»§ºÍÄ¬ÈÏÓÃ»§ÅäÖÃÎÄ¼þ(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE +END + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Êý×Ö" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ê¾Àý", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE + LTEXT "Õý:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "¸º:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ð¡Êýµã(&D):", -1, 8, 67, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Ð¡ÊýÎ»Êý(&T):", -1, 8, 83, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Êý×Ö·Ö×é·ûºÅ(&G):", -1, 8, 100, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Êý×Ö·Ö×é(&I):", -1, 8, 117, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "¸ººÅ(&E):", -1, 8, 134, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "¸ºÊý¸ñÊ½(&F):", -1, 8, 149, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "ÁãÆðÊ¼ÏÔÊ¾(&Z):", -1, 8, 166, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "ÁÐ±í·Ö¸ô·û(&L):", -1, 8, 181, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "¶ÈÁ¿ºâÏµÍ³(&M):", -1, 8, 197, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "»õ±Ò" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ê¾Àý", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE + LTEXT "Õý:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "¸º:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "»õ±Ò·ûºÅ(&S):", -1, 10, 51, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "»õ±ÒÕýÊý¸ñÊ½(&P):", -1, 10, 68, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "»õ±Ò¸ºÊý¸ñÊ½(&N):", -1, 10, 85, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 134, 83, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Ð¡Êýµã(&D):", -1, 10, 111, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 134, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Ð¡ÊýÎ»Êý(&T):", -1, 10, 128, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Êý×Ö·Ö×é·ûºÅ(&G):", -1, 10, 156, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 134, 154, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Êý×Ö·Ö×é(&I):", -1, 10, 173, 121, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 134, 171, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ê±¼ä" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ê¾Àý", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE + LTEXT "Ê±¼äÊ¾Àý:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ê±¼ä¸ñÊ½(&T):", -1, 13, 52, 130, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 149, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Ê±¼ä·Ö¸ô·û(&S):", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 149, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "AM ·ûºÅ(&M):", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 149, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "PM ·ûºÅ(&P):", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 149, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE + LTEXT "Ê±¼ä¸ñÊ½±ê¼Ç\n\ + h = Ð¡Ê± m = ·ÖÖÓ s = Ãë t = ÉÏÎç»òÏÂÎç\n\ + h = 12 Ð¡Ê±\ + H = 24 Ð¡Ê±\n\ + hh, mm, ss = ÁãÆðÊ¼\ + h, m, s = ·ÇÁãÆðÊ¼", -1, 13, 150, 214, 50, WS_CHILD |WS_VISIBLE | WS_GROUP +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÈÕÆÚ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÈÕÀú", -1, 7, 7, 230, 74 + LTEXT "µ±¼üÈëµÄÄê·ÝÊÇÁ½Î»Êý×ÖÊ±£¬½«ÆäÏÔÊ¾ÎªÔÚÕâÐ©ÄêÖ®¼ä(&Y):", -1, 13, 18, 215, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "ºÍ", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "ÈÕÀúÀàÐÍ(&C):", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + LTEXT "ÄÂË¹ÁÖÈÕÀú:", -1, 13, 65, 60, 12 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + GROUPBOX "¶ÌÈÕÆÚÊ¾Àý:", -1, 7, 83, 230, 81 + LTEXT "Ê¾Àý", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "´ÓÓÒµ½×óµÄÊ¾Àý:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "¶Ì¸ñÊ½", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "ÈÕÆÚ·Ö¸ô·û:", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "³¤ÈÕÆÚ¸ñÊ½", -1, 7, 167, 230, 64 + LTEXT "Ê¾Àý:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "´ÓÓÒµ½×óµÄÊ¾Àý:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "³¤¸ñÊ½:", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅÅÐò" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÅÅÐò", -1, 7, 7, 230, 74 + LTEXT "ÅÅÐò·½·¨¸Ä±ä³ÌÐòÅÅÐò×Ö·û¡¢×Ö´Ê¡¢ÎÄ¼þºÍÎÄ¼þ¼ÐµÄ·½Ê½¡£", -1, 14, 17, 220, 25 + LTEXT "Ñ¡ÔñÒªÓÃÓÚÕâ¸öÓïÑÔµÄÅÅÐò·½·¨(&S):", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CUSTOMIZE_TITLE "×Ô¶¨ÒåÇøÓòÑ¡Ïî" + IDS_SPAIN "Î÷°àÑÀÓï (Î÷°àÑÀ)" +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "ÇøÓòÑ¡Ïî" + IDS_CPLDESCRIPTION "Ñ¡ÔñÓïÑÔ¡¢Êý×Ö¡¢»õ±Ò¡¢Ê±¼äºÍÈÕÆÚµÄÏÔÊ¾ÉèÖÃ¡£" +END Propchange: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/intl/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/rsrc.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -12,3 +12,4 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" Modified: trunk/reactos/dll/cpl/liccpa/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/liccpa/lang/zh-CN.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -2,13 +2,14 @@ * (Simplified Chinese resources) * (¼òÌåÖÐÎÄ×ÊÔ´) * by zhangbing 2008 <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + * Updated: 2009-05-02 Jingjing Fu <jingjingf AT 188.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_PROPPAGE1 DIALOGEX DISCARDABLE 20, 40, 315, 104 STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU -CAPTION "Chose Licensing Mode" +CAPTION "Ñ¡ÔñÐÒéÄ£Ê½" FONT 9, "MS Shell Dlg" BEGIN CONTROL "¿Í»§ÐÒéÀàÐÍ", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 Modified: trunk/reactos/dll/cpl/main/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/zh-CN.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -2,6 +2,7 @@ * (Simplified Chinese resources) * (¼òÌåÖÐÎÄ×ÊÔ´) * by zhangbing 2008 <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + * Updated: 2009-05-02 Jingjing Fu <jingjingf AT 188.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -43,8 +44,8 @@ CAPTION "µ¥»÷Ëø¶¨µÄÉèÖÃ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Short", -1, 50, 35, 27, 10 - LTEXT "Long", -1, 157, 35, 27, 10 + LTEXT "¶Ì", -1, 50, 35, 27, 10 + LTEXT "³¤", -1, 157, 35, 27, 10 CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 78, 35, 70, 17 PUSHBUTTON "È·¶¨(&O)", IDOK, 110, 59, 60, 14 PUSHBUTTON "È¡Ïû(&C)", IDCANCEL, 174, 59, 60, 14 Modified: trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -2,6 +2,7 @@ * (Simplified Chinese resources) * (¼òÌåÖÐÎÄ×ÊÔ´) * by zhangbing 2008 <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + * Updated: 2009-05-02 Jingjing Fu <jingjingf AT 188.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -184,7 +185,7 @@ IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Multichannel" +CAPTION "¶àÉùµÀ" FONT 9, "MS Shell Dlg" BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 @@ -220,7 +221,7 @@ LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 LTEXT "¸ß", 9502, 202, 164, 17, 8 - AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 + AUTOCHECKBOX "Í¬Ê±ÒÆ¶¯ËùÓÐ»¬¶¯Ö¸Ê¾Æ÷(&M)", 9504, 5, 185, 216, 9 PUSHBUTTON "»Ö¸´Ä¬ÈÏÖµ(&D)", 9505, 110, 199, 110, 14 END Modified: trunk/reactos/dll/cpl/powercfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/en-US.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -1,4 +1,5 @@ // English (en) resources by Lohegrim (Lohnegrim at gmx dot net) +// Updated: 2009-05-02 Jingjing Fu (jingjingf AT 188.com) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -56,7 +57,7 @@ LTEXT "Unknown",IDC_ALARMPROG1, 154, 95, 84, 10 GROUPBOX "Critical battery alarm",-1, 6, 120, 239, 106 - CONTROL "Activate &low battery alarm when power level reaches:",IDC_ALARM2, + CONTROL "Activate &critical battery alarm when power level reaches:",IDC_ALARM2, "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 LTEXT "unknown",IDC_ALARMVALUE2, 209, 133, 33, 10 LTEXT "0%",-1, 28, 154, 15, 10 Added: trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/zh-C… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -1,0 +1,169 @@ +/* + * Simplified Chinese Resource for Powercfg (dll/cpl/powercfg/lang/zh-CN.rc) + * CREATED: Jingjing Fu (jingjingf AT 188.com) 2009-05-02 + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "µçÔ´Ê¹ÓÃ·½°¸" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "ÇëÑ¡¶¨¶ÔÓÚÄúÊ¹ÓÃ¼ÆËã»ú·½Ê½×îÊÊºÏµÄµçÔ´Ê¹ÓÃ·½°¸¡£Çë×¢Òâ£¬¸ü¸ÄÏÂÃæµÄÉèÖÃ½«ÐÞ¸ÄÑ¡¶¨µÄ·½°¸¡£", + -1,37, 6, 209, 36 + GROUPBOX "µçÔ´Ê¹ÓÃ·½°¸(&O)", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "Áí´æÎª(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "É¾³ý(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Î´Öª", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "µ±¼ÆËã»ú:",IDC_SAT, 12, 109, 60, 12 + LTEXT "½ÓÍ¨µçÔ´",IDC_SAC, 123, 110, 45, 15 + ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 + LTEXT "Ê¹ÓÃµç³Ø",IDC_SDC, 195, 110, 45, 15 + ICON IDI_DC, IDC_IDC, 170, 108, 21, 20 + LTEXT "¹Ø±Õ¼àÊÓÆ÷(&M):",IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "¹Ø±ÕÓ²ÅÌ(&I):",IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "ÏµÍ³´ý»ú(&T):",IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "ÏµÍ³ÐÝÃß(&H):",IDC_HYBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¾¯±¨" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "µç³Ø²»×ã¾¯±¨",-1, 6, 7, 239, 104 + CONTROL "µ±µçÁ¿½µµÍµ½ÒÔÏÂË®Æ½Ê±£¬·¢³öµç³Ø²»×ã¾¯±¨(&L):",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 + LTEXT "Î´Öª",IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "0%",-1, 28, 43, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 + LTEXT "100%", -1, 214, 43, 25, 10 + PUSHBUTTON "¾¯±¨²Ù×÷(&M)...",-1, 17, 69, 70, 14,WS_DISABLED + LTEXT "Í¨Öª:",-1, 95, 71, 57, 10 + LTEXT "Î´Öª",IDC_ALARMMSG1, 154, 71, 84, 10 + LTEXT "²Ù×÷:",-1, 95, 83, 55, 10 + LTEXT "Î´Öª",IDC_ALARMAKTION1, 154, 83, 84, 10 + LTEXT "ÔËÐÐ³ÌÐò:",-1, 95, 95, 55, 10 + LTEXT "Î´Öª",IDC_ALARMPROG1, 154, 95, 84, 10 + + GROUPBOX "µç³ØÑÏÖØ¶ÌÈ±¾¯±¨",-1, 6, 120, 239, 106 + CONTROL "µ±µçÁ¦½µµÍµ½ÒÔÏÂË®Æ½Ê±£¬·¢³öµç³ØÑÏÖØ¶ÌÈ±¾¯±¨(&C):",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 + LTEXT "Î´Öª",IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "0%",-1, 28, 154, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 + LTEXT "100%",-1, 214, 154, 25, 10 + PUSHBUTTON "¾¯±¨²Ù×÷(&M)...",-1, 17, 183, 70, 14, WS_DISABLED + LTEXT "Í¨Öª:",-1, 95, 185, 50, 10 + LTEXT "Î´Öª",IDC_ALARMMSG2, 154, 185, 84, 10 + LTEXT "²Ù×÷:",-1, 95, 198, 45, 10 + LTEXT "Î´Öª",IDC_ALARMAKTION2, 154, 198, 84, 10 + LTEXT "ÔËÐÐ³ÌÐò:",-1, 95, 211, 50, 10 + LTEXT "Î´Öª",IDC_ALARMPROG2, 154, 211, 84, 10 +END + +IDD_PROPPAGEADVANCED DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¸ß¼¶" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC,IDI_ACDC, 7, 7, 20, 20 + LTEXT "ÇëÑ¡ÔñÒªÊ¹ÓÃµÄ½ÚÄÜÉèÖÃ¡£",-1, 37, 6, 207, 20 + GROUPBOX "Ñ¡Ïî",-1, 6, 30, 240, 65 + CONTROL "×ÜÊÇÔÚÈÎÎñÀ¸ÉÏÏÔÊ¾Í¼±ê(&S)",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 43, 220, 10 + CONTROL "ÔÚ¼ÆËã»ú´Ó´ý»ú×´Ì¬»Ö¸´Ê±£¬ÌáÊ¾ÊäÈëÃÜÂë(&P)",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 60, 220, 10 + CONTROL "ÔÚÊ¹ÓÃµç³ØÊ±ÈõÏÔÊ¾(&D)¡£",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 78, 220, 10 + GROUPBOX "µçÔ´°´Å¥",-1, 6, 101, 240, 127 + LTEXT "ÔÚºÏÉÏ±ãÐ¯Ê½¼ÆËã»úÊ±(&W):", IDC_SLIDCLOSE, 15, 115, 222, 10 + COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "ÔÚ°´ÏÂ¼ÆËã»úµçÔ´°´Å¥Ê±(&E):", IDC_SPOWERBUTTON, 15, 153, 222, 10 + COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "ÔÚ°´ÏÂ¼ÆËã»úË¯Ãß°´Å¥Ê±(&N):", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÝÃß" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HIBERNATE,IDI_HIBERNATE, 7, 7, 20, 20 + LTEXT "ÔÚ¼ÆËã»úÐÝÃßÊ±£¬Ëü½«ÄÚ´æÖÐËùÓÐÐÅÏ¢±£´æµ½Ó²ÅÌÉÏ£¬È»ºó¹Ø±Õ¼ÆËã»ú¡£ÔÚÍË³öÐÝÃß×´Ì¬Ê±£¬¼ÆËã»ú»á»Ö¸´µ½ÔÀ´µÄ×´Ì¬¡£", + -1, 37, 6, 210, 35 + GROUPBOX "ÐÝÃß",-1, 6, 41, 240, 32 + CONTROL "ÆôÓÃÐÝÃß(&H)",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 55, 210, 10 + GROUPBOX "ÓÃÓÚÐÝÃßµÄ´ÅÅÌ¿Õ¼ä",-1, 6, 80, 240, 76 + LTEXT "¿ÕÏÐµÄ´ÅÅÌ¿Õ¼ä:",-1, 15, 95, 140, 10 + LTEXT "Î´Öª",IDC_FREESPACE, 160, 95, 80, 10 + LTEXT "ÐÝÃßËùÐèµÄ´ÅÅÌ¿Õ¼ä:",-1, 15, 115, 140, 10 + LTEXT "Î´Öª",IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 + LTEXT "ÔÚ¼ÆËã»ú½øÈëÐÝÃßÖ®Ç°£¬Äú±ØÐëÊÍ·ÅÒ»Ð©´ÅÅÌ¿Õ¼ä¡£",IDC_TOLESSFREESPACE, 15, 135, 224, 20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "µçÔ´Ñ¡Ïî" + IDS_CPLDESCRIPTION_1 "ÅäÖÃ¼ÆËã»úµÄ½ÚÄÜÉèÖÃ¡£" + IDS_PROCENT "%i%%" + IDS_SOUND "ÉùÒô" + IDS_TEXT "ÎÄ±¾" + IDS_CONFIG1 "Îª %i ÉèÖÃµçÔ´Ê¹ÓÃ·½°¸" + IDS_CONFIG2 "%i µÄ¸ß¼¶ÉèÖÃ" + + IDS_SIZEBYTS "%i ×Ö½Ú" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "ÎÞ²Ù×÷" + + IDS_PowerActionNone1 "ÎÞ¶¯×÷" + IDS_PowerActionUnknown "Î´Öª" + IDS_PowerActionSleep "´ý»ú" + IDS_PowerActionHibernate "ÐÝÃß" + IDS_PowerActionShutdown "¹Ø»ú" + IDS_PowerActionRestart "ÖØÐÂÆô¶¯" + IDS_PowerActionShutdownOff "¹Ø»ú²¢ÇÐ¶ÏµçÔ´" + IDS_PowerActionWarmEject "ÎÊÎÒÒª×öÊ²Ã´" + IDS_PowerActionNone2 "ÎÞ" + + IDS_TIMEOUT1 "1 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT2 "2 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT3 "3 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT4 "5 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT5 "10 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT6 "15 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT7 "20 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT8 "25 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT9 "30 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT10 "45 ·ÖÖÓÖ®ºó" + IDS_TIMEOUT11 "1 Ð¡Ê±Ö®ºó" + IDS_TIMEOUT12 "2 Ð¡Ê±Ö®ºó" + IDS_TIMEOUT13 "3 Ð¡Ê±Ö®ºó" + IDS_TIMEOUT14 "4 Ð¡Ê±Ö®ºó" + IDS_TIMEOUT15 "5 Ð¡Ê±Ö®ºó" + IDS_TIMEOUT16 "´Ó²»" + + IDS_DEL_SCHEME "ÄúÈ·¶¨ÒªÉ¾³ýµçÔ´Ê¹ÓÃ·½°¸Âð?" + IDS_DEL_SCHEME_TITLE "É¾³ý·½°¸" +END + + Propchange: trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/rsrc.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -17,3 +17,4 @@ #include "lang/sk-SK.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" Added: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -1,0 +1,280 @@ +/* + * Simplified Chinese Resource for Sysdm (dll/cpl/sysdm/lang/zh-CN.rc) + * CREATED: Jingjing Fu (jingjingf AT 188.com) 2009-05-02 + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "³£¹æ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "ÏµÍ³:", IDC_STATIC, 4, 132, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + 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_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, 140, 8 + PUSHBUTTON "²é¿´°æÈ¨ÐÅÏ¢(&L)...", IDC_LICENCE, 170, 199, 78, 13 +END + + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ó²¼þ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Éè±¸¹ÜÀíÆ÷", IDC_STATIC, 6, 7, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "Éè±¸¹ÜÀíÆ÷ÁÐ³öËùÓÐ°²×°ÔÚ¼ÆËã»úÉÏµÄÓ²¼þÉè±¸¡£ÇëÊ¹ÓÃÉè±¸¹ÜÀíÆ÷À´¸ü¸ÄÉè±¸µÄÊôÐÔ¡£", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "Éè±¸¹ÜÀíÆ÷(&D)...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 + + GROUPBOX "Ìí¼ÓÓ²¼þÏòµ¼", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "¡°Ìí¼ÓÓ²¼þÏòµ¼¡±°ïÖúÄú°²×°ÐÂµÄÓ²¼þ¡£", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "Ìí¼ÓÓ²¼þÏòµ¼(&H)", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 + + GROUPBOX "Ó²¼þÅäÖÃÎÄ¼þ", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "Ó²¼þÅäÖÃÎÄ¼þÏòÄúÌá¹©½¨Á¢ºÍ±£´æ²»Í¬Ó²¼þÅäÖÃµÄ·½·¨¡£", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "Ó²¼þÅäÖÃÎÄ¼þ(&W)...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¸ß¼¶" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Òª½øÐÐ´ó¶àÊý¸Ä¶¯£¬Äú±ØÐë×÷Îª¹ÜÀíÔ±µÇÂ¼¡£", IDC_STATIC, 12, 5, 236, 8 + GROUPBOX "ÐÔÄÜ", IDC_STATIC, 6, 18, 244, 50 + LTEXT "ÐÔÄÜÑ¡Ïî¿ØÖÆÓ¦ÓÃ³ÌÐòÈçºÎÊ¹ÓÃÄÚ´æ¡£Õâ½«»áÓ°Ïìµ½¼ÆËã»úÔËÐÐËÙ¶È¡£", IDC_STATIC, 16, 29, 228, 17 + PUSHBUTTON "ÉèÖÃ", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "ÓÃ»§ÅäÖÃÎÄ¼þ", IDC_STATIC, 6,75,244,48 + LTEXT "ÓëÄúµÇÂ½Ïà¹ØµÄ×ÀÃæÉèÖÃ", IDC_STATIC, 16, 88, 228, 20 + PUSHBUTTON "ÉèÖÃ", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "Æô¶¯ºÍ¹ÊÕÏ»Ö¸´", IDC_STATIC, 6, 131, 244, 52 + LTEXT "Æô¶¯ºÍ¹ÊÕÏ»Ö¸´Ñ¡ÏîÖ¸¶¨¼ÆËã»úÈçºÎÆô¶¯²¢Éè¶¨ÏµÍ³Ê§°ÜÊ±ËùÐèÒª²ÉÈ¡µÄ¶¯×÷¡£", IDC_STATIC, 16, 144, 228, 19 + PUSHBUTTON "ÉèÖÃ", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "»·¾³±äÁ¿", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "´íÎó±¨¸æ", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ó²¼þÅäÖÃÎÄ¼þ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "¿ÉÒÔÎª²»Í¬µÄÓ²¼þÅäÖÃ´´½¨Ó²¼þÅäÖÃÎÄ¼þ¡£ÔÚÆô¶¯Ê±£¬¿ÉÒÔÑ¡ÔñÏ£ÍûÊ¹ÓÃµÄÅäÖÃÎÄ¼þ¡£", IDC_STATIC, 46, 11, 188, 25 + LTEXT "¿ÉÓÃµÄÓ²¼þÅäÖÃÎÄ¼þ:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON + PUSHBUTTON "ÊôÐÔ(&P)", IDC_HRDPROFPROP, 8, 106, 50, 14 + PUSHBUTTON "¸´ÖÆ(&C)", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "ÖØÃüÃû(&R)", IDC_HRDPROFRENAME, 118, 106, 50, 14 + PUSHBUTTON "É¾³ý(&D)", IDC_HRDPROFDEL, 173, 106, 50, 14 + + GROUPBOX "Ó²¼þÅäÖÃÎÄ¼þÑ¡Ôñ", IDC_STATIC, 7, 130, 240, 75 + LTEXT "Æô¶¯ ReactOS Ê±:", IDC_STATIC, 14, 142, 210, 8 + AUTORADIOBUTTON "µÈ´ýÓÃ»§Ñ¡¶¨Ó²¼þÅäÖÃÎÄ¼þ(&W)", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP + AUTORADIOBUTTON "ÃëÄÚ»¹Ã»ÓÐÑ¡¶¨ÅäÖÃÎÄ¼þ£¬¾ÍÇë´ÓÁÐ³öµÄÎÄ¼þÖÐÑ¡ÔñµÚÒ»¸ö(&S)", IDC_HRDPROFSELECT, 14, 173, 190, 8 + LTEXT "Ãë", IDC_STATIC, 65, 187, 35, 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 + + DEFPUSHBUTTON "È·¶¨", IDOK, 143, 213, 50, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÖØÃüÃûÅäÖÃÎÄ¼þ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "´Ó:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "µ½:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "È·¶¨", IDOK, 199, 9, 50, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 199, 30, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÓÃ»§ÅäÖÃÎÄ¼þ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "ÓÃ»§ÅäÖÃÎÄ¼þ±£´æ×ÀÃæÉèÖÃºÍÆäËûÓëÄúµÄÓÃ»§ÕÊ»§ÓÐ¹ØµÄÐÅÏ¢¡£¿ÉÔÚÄúÊ¹ÓÃµÄÃ¿Ì¨¼ÆËã»úÉÏ´´½¨²»Í¬µÄÅäÖÃÎÄ¼þ£¬»òÑ¡¶¨Ò»¸öÂþÓÎÅäÖÃÎÄ¼þÓÃÔÚÄúÊ¹ÓÃµÄÃ¿Ì¨¼ÆËã»úÉÏ¡£", + IDC_STATIC, 40, 11, 211, 35 + LTEXT "´¢´æÔÚ±¾»úÉÏµÄÅäÖÃÎÄ¼þ:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "¸ü¸ÄÀàÐÍ", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "É¾³ý", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "¸´ÖÆµ½", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + + CONTROL "Òª´´½¨Ò»¸öÐÂµÄÓÃ»§ÕÊ»§£¬ÔÚ¿ØÖÆÃæ°åÖÐ´ò¿ª<A>ÓÃ»§ÕÊ»§</A> ¡£", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 + + DEFPUSHBUTTON "È·¶¨", IDOK, 134, 200, 54, 13 + PUSHBUTTON "È¡Ïû", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Æô¶¯ºÍ¹ÊÕÏ»Ö¸´" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÏµÍ³Æô¶¯", IDC_STATIC, 7, 12, 238, 95 + LTEXT "Ä¬ÈÏ²Ù×÷ÏµÍ³(&S):", IDC_STATIC, 14, 26, 100, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + AUTOCHECKBOX "ÏÔÊ¾²Ù×÷ÏµÍ³ÁÐ±íµÄÊ±¼ä(&T):", IDC_STRECLIST, 14, 56, 160, 8 + EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "Ãë", IDC_STATIC, 223, 56, 18, 8 + AUTOCHECKBOX "ÔÚÐèÒªÊ±ÏÔÊ¾»Ö¸´Ñ¡ÏîµÄÊ±¼ä(&D):", IDC_STRRECREC, 14, 70, 170, 8 + EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "Ãë", IDC_STATIC, 223, 70, 18, 8 + LTEXT "ÒªÊÖ¶¯±à¼Æô¶¯Ñ¡Ïî£¬Çëµ¥»÷¡°±à¼¡±¡£", IDC_STATIC, 14, 89, 187, 8 + PUSHBUTTON "Ãë", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "ÏµÍ³Ê§°Ü", IDC_STATIC, 7, 111, 238, 140 + AUTOCHECKBOX "½«ÊÂ¼þÐ´ÈëÏµÍ³ÈÕÖ¾(&W)", IDC_STRRECWRITEEVENT, 14, 124, 148, 10 + AUTOCHECKBOX "·¢ËÍ¹ÜÀí¾¯±¨(&N)", IDC_STRRECSENDALERT, 14, 138, 148, 10 + AUTOCHECKBOX "×Ô¶¯ÖØÐÂÆô¶¯(&R)", IDC_STRRECRESTART, 14, 152, 145, 10 + + GROUPBOX "Ð´Èëµ÷ÊÔÐÅÏ¢", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "×ª´¢ÎÄ¼þ(&F):", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + AUTOCHECKBOX "¸²¸ÇÈÎºÎÏÖÓÐÎÄ¼þ(&O)", IDC_STRRECOVERWRITE, 17, 228, 125, 10 + + DEFPUSHBUTTON "È·¶¨", IDOK, 141, 259, 50, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 195, 259, 50, 14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÐéÄâÄÚ´æ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Çý¶¯Æ÷ [¾í±ê]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "Ò³ÃæÎÄ¼þ´óÐ¡(MB)", IDC_STATIC, 115, 5, 96, 9 + LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS + 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)(&I):", -1, 22, 118, 75, 9 + LTEXT "×î´óÖµ(MB)(&X):", -1, 22, 131, 75, 9 + AUTORADIOBUTTON "×Ô¶¨Òå´óÐ¡(&C):", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP + AUTORADIOBUTTON "ÏµÍ³¹ÜÀíµÄ´óÐ¡(&Y)", IDC_SYSMANSIZE, 20, 145, 88, 9 + AUTORADIOBUTTON "ÎÞ·ÖÒ³ÎÄ¼þ(&N)", IDC_NOPAGEFILE, 20, 158, 78,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 "ÉèÖÃ(&S)", 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, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 199, 100, 9 + LTEXT "µ±Ç°ÒÑ·ÖÅä:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 210, 100, 9 + + DEFPUSHBUTTON "È·¶¨", IDOK, 114, 232, 48, 13 + PUSHBUTTON "È¡Ïû", IDCANCEL, 168, 232, 48, 13 +END + + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "»·¾³±äÁ¿" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "ÓÃ»§±äÁ¿", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "ÐÂ½¨(&N)", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "±à¼(&E)", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "É¾³ý(&D)", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "ÏµÍ³±äÁ¿", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "ÐÂ½¨(&W)", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "±à¼(&I)", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "É¾³ý(&L)", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "È·¶¨", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "È¡Ïû", IDCANCEL, 195, 224, 50, 14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "±à¼±äÁ¿" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "±äÁ¿Ãû³Æ(&N):", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "±äÁ¿Öµ(&V):", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "È·¶¨", IDOK, 116, 50, 50, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "°æÈ¨" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "È·¶¨", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "ÏµÍ³" + IDS_CPLSYSTEMDESCRIPTION "²é¿´ÄúµÄ¼ÆËã»úÏµÍ³µÄÐÅÏ¢²¢¸ü¸Ä¸÷ÖÖÏµÍ³¼°Ó²¼þÉèÖÃ" + IDS_MEGABYTE "MBÄÚ´æ" + IDS_GIGABYTE "GBÄÚ´æ" + IDS_TERABYTE "TBÄÚ´æ" + IDS_PETABYTE "PBÄÚ´æ" + IDS_VARIABLE "±äÁ¿" + IDS_VALUE "Öµ" + IDS_NO_DUMP "(ÎÞ)" + IDS_MINI_DUMP "Ð¡ÄÚ´æ×ª´¢(64KB)" + IDS_KERNEL_DUMP "ºËÐÄÄÚ´æ×ª´¢" + IDS_FULL_DUMP "ÍêÈ«ÄÚ´æ×ª´¢" + IDS_USERPROFILE_NAME "Ãû³Æ" + IDS_USERPROFILE_SIZE "´óÐ¡" + IDS_USERPROFILE_TYPE "ÀàÐÍ" + IDS_USERPROFILE_STATUS "×´Ì¬" + IDS_USERPROFILE_MODIFIED "ÐÞ¸Ä" +END Propchange: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/rsrc.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -17,6 +17,7 @@ #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" /* #include "lang/da-DK.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -213,7 +213,7 @@ BEGIN IDS_SYS_TOOLS "Strumenti di sistema" IDS_CMT_CHARMAP "Mappa dei caratteri" - IDS_CMT_KBSWITCH "Cambia la disposizione della tastiera" + IDS_CMT_KBSWITCH "Cambia il layout di tastiera" IDS_CMT_DXDIAG "Esegui il programma di diagnostica ReactX-" END @@ -227,7 +227,7 @@ BEGIN IDS_SYS_ENTERTAINMENT "Divertimento" IDS_CMT_MPLAY32 "Esegui Multimedia Player" - IDS_CMT_SNDVOL32 "Esegui Conrollo Volume" + IDS_CMT_SNDVOL32 "Esegui Controllo Volume" END STRINGTABLE @@ -261,7 +261,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" - IDS_SHORT_KBSWITCH "Disposizione della tastiera.lnk" + IDS_SHORT_KBSWITCH "Layout di tastiera.lnk" IDS_SHORT_EVENTVIEW "Visualizzatore Eventi.lnk" IDS_SHORT_MSCONFIG "Configuratione del sistema.lnk" IDS_SHORT_SNDVOL32 "Controllo Volume.lnk" Modified: trunk/reactos/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] Mon May 4 17:41:40 2009 @@ -38,5 +38,5 @@ IDS_HISTORY "Impostazioni locali\\Cronologia" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Programmi" - IDS_COMMONFILES "Common Files" + IDS_COMMONFILES "File condivisi" END

15 years, 8 months

[fireball] 40783: - Implement RtlDecodePointer and remove respective redefining hack from vectoreh.c.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 4 17:26:24 2009 New Revision: 40783 URL: http://svn.reactos.org/svn/reactos?rev=40783&view=rev Log: - Implement RtlDecodePointer and remove respective redefining hack from vectoreh.c. Modified: trunk/reactos/lib/rtl/process.c trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/process.c?rev=4078… ============================================================================== --- trunk/reactos/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/process.c [iso-8859-1] Mon May 4 17:26:24 2009 @@ -330,6 +330,16 @@ } /* + * @implemented + */ +PVOID +NTAPI +RtlDecodePointer(IN PVOID Pointer) +{ + return RtlEncodePointer(Pointer); +} + +/* * @unimplemented */ PVOID Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=407… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Mon May 4 17:26:24 2009 @@ -21,10 +21,6 @@ LIST_ENTRY ListEntry; PVECTORED_EXCEPTION_HANDLER VectoredHandler; } RTL_VECTORED_EXCEPTION_HANDLER, *PRTL_VECTORED_EXCEPTION_HANDLER; - -/* FIXME - stupid ld won't resolve RtlDecodePointer! Since their implementation - is the same just use RtlEncodePointer for now! */ -#define RtlDecodePointer RtlEncodePointer /* FUNCTIONS ***************************************************************/

15 years, 8 months

[dgoette] 401: * some cleanup * changes in the db layout * more things implemented in the app listing

by dgoette＠svn.reactos.org

Author: dgoette Date: Mon May 4 17:25:30 2009 New Revision: 401 URL: http://svn.reactos.org/svn/reactos?rev=401&view=rev Log: * some cleanup * changes in the db layout * more things implemented in the app listing Added: branches/compat/lib/view/HTML_Entry.class.php - copied, changed from r395, branches/compat/lib/view/HTML_Version.class.php Removed: branches/compat/lib/om/Star.class.php branches/compat/lib/view/HTML_Version.class.php branches/compat/rsdb_config.php Modified: branches/compat/config.php branches/compat/convert1to2.sql branches/compat/index.php branches/compat/js/submit.js branches/compat/lib/HTML.class.php branches/compat/lib/get/List_Suggestions.class.php branches/compat/lib/om/Category.class.php branches/compat/lib/om/Entry.class.php branches/compat/lib/view/Breadcrumb.class.php branches/compat/lib/view/HTML_Home.class.php branches/compat/lib/view/HTML_List.class.php branches/compat/lib/view/HTML_Submit.class.php Modified: branches/compat/config.php URL: http://svn.reactos.org/svn/reactos/branches/compat/config.php?rev=401&r1=40… ============================================================================== --- branches/compat/config.php [iso-8859-1] (original) +++ branches/compat/config.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -1,4 +1,23 @@ <?php + /* + RSDB - ReactOS Support Database + Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> + 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ define('CDBT_ATTACHMENTS', 'cdb_attachments'); define('CDBT_CATEGORIES' , 'cdb_categories'); @@ -7,7 +26,47 @@ define('CDBT_REPORTS' , 'cdb_entries_reports'); define('CDBT_LANGUAGES' , 'cdb_languages'); define('CDBT_LOGS' , 'cdb_logs'); +define('CDBT_TAGGED' , 'cdb_rel_entries_tags'); define('CDBT_TAGS' , 'cdb_tags'); -define('CDBT_VERSIONS' , 'cdb_entries_tags'); +define('CDBT_VERTAGS' , 'cdb_entries_tags'); +define('CDBT_VERSIONS' , 'cdb_entries_versions'); + + + + // Config: (please sync this with the database) + $RSDB_intern_version = "RSDB 0.1 - http://www.reactos.org/"; // RSDB version info + $RSDB_intern_path_server = "/reactos/"; // complete server path + $RSDB_intern_path = "compat/"; // the dirs after http://www.reactos.org + + // script file fix (for Safari browser) + $RSDB_intern_index_php = $RSDB_intern_path_server.$RSDB_intern_path."index.php"; + + // Global Login System + $RSDB_intern_loginsystem_path = "roscms/"; // RosCMS dir + $RSDB_intern_loginsystem_fullpath = $RSDB_intern_path_server.$RSDB_intern_loginsystem_path; // RosCMS dir + + // Items per Page + $RSDB_intern_items_per_page = 25; + + // User ID + require_once(ROSCMS_PATH.'lib/RosCMS_Autoloader.class.php'); + $RSDB_intern_user_id = Subsystem::in(Login::OPTIONAL, '/'.$RSDB_intern_path); + + if($RSDB_intern_user_id !== false) { + + // Name + $RSDB_USER_name = Subsystem::getUserName($RSDB_intern_user_id); + + + // RSDB user settings + + // Items per page + $RSDB_USER_setting_itemsperpage = 30; //$result_roscms_user['user_setting_itemsperpage']; + $RSDB_intern_items_per_page = $RSDB_USER_setting_itemsperpage; + + } + else { + $RSDB_USER_name = "Anonymous"; + } ?> Modified: branches/compat/convert1to2.sql URL: http://svn.reactos.org/svn/reactos/branches/compat/convert1to2.sql?rev=401&… ============================================================================== --- branches/compat/convert1to2.sql [iso-8859-1] (original) +++ branches/compat/convert1to2.sql [iso-8859-1] Mon May 4 17:25:30 2009 @@ -3,7 +3,7 @@ -- ----------------------------------------------------------------- -- Drop obsolete tables -- ----------------------------------------------------------------- -DROP TABLE rsdb_item_devnet; +/*DROP TABLE rsdb_item_devnet; DROP TABLE rsdb_item_pack; DROP TABLE rsdb_urls; DROP TABLE _rsdb_users; @@ -12,7 +12,7 @@ DROP TABLE _rsdb_item_comp_votes; DROP TABLE rsdb_object_description; DROP TABLE rsdb_group_bundles; - +*/ -- ----------------------------------------------------------------- @@ -40,8 +40,8 @@ WHERE cat_visible = '1' AND cat_comp = '1'; ALTER TABLE cdb_categories ORDER BY id; -DROP TABLE rsdb_categories; - +/*DROP TABLE rsdb_categories; +*/ -- ----------------------------------------------------------------- -- Convert comments @@ -58,57 +58,19 @@ ) ENGINE = MYISAM COMMENT = 'parent xor entry_id has to be NULL'; INSERT INTO cdb_comments - SELECT - fmsg_id, - NULL, - fmsg_parent, - fmsg_user_id, - fmsg_subject, - fmsg_body, - fmsg_date, - TRUE - FROM rsdb_item_comp_forum - WHERE fmsg_visible='1' AND fmsg_parent > 0 -UNION - SELECT - fmsg_id, - NULL, - fmsg_parent, - fmsg_user_id, - fmsg_subject, - fmsg_body, - fmsg_date, - FALSE - FROM rsdb_item_comp_forum - WHERE fmsg_visible='0' AND fmsg_parent > 0 -UNION - SELECT - fmsg_id, - fmsg_comp_id, - NULL, - fmsg_user_id, - fmsg_subject, - fmsg_body, - fmsg_date, - TRUE - FROM rsdb_item_comp_forum - WHERE fmsg_visible='1' AND fmsg_parent = 0 -UNION - SELECT - fmsg_id, - fmsg_comp_id, - NULL, - fmsg_user_id, - fmsg_subject, - fmsg_body, - fmsg_date, - FALSE - FROM rsdb_item_comp_forum - WHERE fmsg_visible='0' AND fmsg_parent = 0; - -ALTER TABLE cdb_comments ORDER BY id; -DROP TABLE rsdb_item_comp_forum; - +SELECT + fmsg_id, + fmsg_comp_id, + fmsg_parent, + fmsg_user_id, + fmsg_subject, + fmsg_body, + fmsg_date, + TRUE + FROM rsdb_item_comp_forum; + +/*DROP TABLE rsdb_item_comp_forum; +*/ INSERT INTO cdb_comments SELECT @@ -121,21 +83,21 @@ >>> What works: -',test_whatworks,' + ',test_whatworks,' >>> What doesn''t work -',test_whatdoesntwork,' + ',test_whatdoesntwork,' >>> What I''ve not tested -',test_whatnottested,' + ',test_whatnottested,' >>> Conclusion -',test_conclusion), + ',test_conclusion), test_date, TRUE FROM rsdb_item_comp_testresults; -DROP TABLE rsdb_item_comp_testresults; - +/*DROP TABLE rsdb_item_comp_testresults; +*/ @@ -179,8 +141,8 @@ WHERE media_visible = '0'; ALTER TABLE cdb_attachments ORDER BY id; -DROP TABLE rsdb_object_media; - +/*DROP TABLE rsdb_object_media; +*/ @@ -202,8 +164,8 @@ '' FROM rsdb_languages; -DROP TABLE rsdb_languages; - +/*DROP TABLE rsdb_languages; +*/ -- ----------------------------------------------------------------- @@ -212,12 +174,13 @@ CREATE TABLE cdb_entries_reports ( id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, entry_id BIGINT UNSIGNED NOT NULL COMMENT '->entries(id)', + version_id BIGINT UNSIGNED NOT NULL Comment '->version', revision BIGINT UNSIGNED NOT NULL, old_name VARCHAR( 100 ) NOT NULL, old_version VARCHAR( 100 ) NOT NULL, old_description TEXT NOT NULL, user_id BIGINT UNSIGNED NOT NULL COMMENT '->roscms.users(id)', - works BOOL DEFAULT FALSE, + works ENUM( 'full', 'part', 'not' ) NULL, checked BOOL NOT NULL DEFAULT FALSE, created DATETIME NOT NULL, visible BOOL NOT NULL DEFAULT FALSE, @@ -229,6 +192,7 @@ INSERT INTO cdb_entries_reports SELECT DISTINCT comp_id, + 0, 0, 0, comp_name, @@ -245,6 +209,11 @@ FROM rsdb_item_comp WHERE comp_date != '0000-00-00 00:00:00'; +UPDATE cdb_entries_reports r +SET works = IF((SELECT SUM(test_result_function)/COUNT(*) FROM rsdb_item_comp_testresults WHERE test_comp_id=r.id) = 5, 'full', IF((SELECT SUM(test_result_function)/COUNT(*) FROM rsdb_item_comp_testresults WHERE test_comp_id=r.id) = 1, 'not', 'part')); + +ALTER TABLE cdb_entries_reports CHANGE works works ENUM( 'full', 'part', 'not' ) NOT NULL DEFAULT 'not'; + @@ -254,43 +223,36 @@ CREATE TABLE cdb_entries ( id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR( 100 ) NOT NULL, - version VARCHAR( 100 ) NOT NULL, category_id BIGINT NOT NULL, description TEXT NOT NULL, created DATETIME NOT NULL, modified DATETIME NOT NULL, visible BOOL NOT NULL DEFAULT FALSE, + old_version VARCHAR( 100 ) NOT NULL, old_groupid BIGINT NOT NULL DEFAULT '0', old_vendorid BIGINT NOT NULL DEFAULT '0', - UNIQUE KEY(name, version) + old_name varchar(100) NOT NULL ) ENGINE = MyISAM; INSERT INTO cdb_entries SELECT DISTINCT NULL, - old_name, - old_version, - 0, - old_description, - created, - modified, + grpentr_name, + g.grpentr_category, + (SELECT i.old_description FROM cdb_entries_reports i WHERE i.old_groupid=o.old_groupid ORDER BY i.created ASC LIMIT 1) AS old_description, + (SELECT i.created FROM cdb_entries_reports i WHERE i.old_groupid=o.old_groupid ORDER BY i.created ASC LIMIT 1) AS created, + (SELECT i.created FROM cdb_entries_reports i WHERE i.old_groupid=o.old_groupid ORDER BY i.created DESC LIMIT 1) AS modified, TRUE, - old_groupid, - grpentr_vendor -FROM ( - SELECT DISTINCT - o.old_name, - o.old_version, - (SELECT i.old_description FROM cdb_entries_reports i WHERE i.old_name=o.old_name AND i.old_version=o.old_version ORDER BY i.created ASC LIMIT 1) AS old_description, - (SELECT i.created FROM cdb_entries_reports i WHERE i.old_name=o.old_name AND i.old_version=o.old_version ORDER BY i.created ASC LIMIT 1) AS created, - (SELECT i.created FROM cdb_entries_reports i WHERE i.old_name=o.old_name AND i.old_version=o.old_version ORDER BY i.created DESC LIMIT 1) AS modified, - o.old_groupid, - g.grpentr_vendor - FROM cdb_entries_reports o - JOIN rsdb_groups g ON g.grpentr_id=o.old_groupid) k; + TRIM(REPLACE(old_name, grpentr_name, '')), + o.old_groupid, + g.grpentr_vendor, + old_name +FROM cdb_entries_reports o +JOIN rsdb_groups g ON g.grpentr_id=o.old_groupid; + UPDATE cdb_entries_reports r -SET entry_id = (SELECT e.id FROM cdb_entries e WHERE r.old_name=e.name LIMIT 1); +SET entry_id = (SELECT e.id FROM cdb_entries e WHERE r.old_name=e.old_name LIMIT 1); ALTER TABLE cdb_entries_reports DROP old_name, @@ -298,8 +260,34 @@ DROP old_groupid, DROP old_version; -DROP TABLE rsdb_item_comp; - + +-- ----------------------------------------------------------------- +-- Convert versions +-- ----------------------------------------------------------------- +CREATE TABLE cdb_entries_versions ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , + entry_id BIGINT UNSIGNED NOT NULL COMMENT '->entry', + version VARCHAR( 20 ) NOT NULL, + UNIQUE KEY(entry_id, version) +) ENGINE = MYISAM; + +INSERT INTO cdb_entries_versions +SELECT + NULL, + id, + old_version +FROM cdb_entries; + +UPDATE cdb_entries_reports r +SET version_id = (SELECT v.id FROM cdb_entries_versions v WHERE v.entry_id=r.entry_id LIMIT 1); + +ALTER TABLE cdb_entries + DROP old_name, + DROP old_version; + + +/*DROP TABLE rsdb_item_comp; +*/ -- ----------------------------------------------------------------- @@ -321,7 +309,6 @@ INSERT INTO cdb_tags SELECT DISTINCT NULL, - NULL, vendor_name, CONCAT(vendor_fullname,' @@ -334,9 +321,9 @@ NULL FROM rsdb_item_vendor; -DROP TABLE rsdb_groups; +/*DROP TABLE rsdb_groups; DROP TABLE rsdb_item_vendor; - +*/ -- ----------------------------------------------------------------- @@ -359,8 +346,8 @@ log_date FROM rsdb_logs; -DROP TABLE rsdb_logs; - +/*DROP TABLE rsdb_logs; +*/ -- ----------------------------------------------------------------- @@ -383,6 +370,34 @@ ALTER TABLE cdb_entries DROP old_vendorid; ALTER TABLE cdb_tags DROP old_groupid; ALTER TABLE cdb_tags DROP old_vendor; + + + +-- ----------------------------------------------------------------- +-- remove double entries +-- ----------------------------------------------------------------- +CREATE TABLE cdb_entries2 SELECT * FROM cdb_entries; +TRUNCATE TABLE cdb_entries2; +INSERT INTO cdb_entries2 +SELECT DISTINCT + (SELECT id FROM cdb_entries WHERE name = g.name ORDER BY created DESC LIMIT 1), + name, + (SELECT category_id FROM cdb_entries WHERE name = g.name ORDER BY created DESC LIMIT 1), + (SELECT description FROM cdb_entries WHERE name = g.name ORDER BY created DESC LIMIT 1), + (SELECT created FROM cdb_entries WHERE name = g.name ORDER BY created ASC LIMIT 1), + (SELECT modified FROM cdb_entries WHERE name = g.name ORDER BY created DESC LIMIT 1), + TRUE +FROM cdb_entries g; + +UPDATE cdb_entries_reports r +SET entry_id=(SELECT e.id FROM cdb_entries2 e JOIN cdb_entries x ON x.name=e.name WHERE x.id=r.entry_id); + +UPDATE cdb_entries_versions v +SET entry_id=(SELECT e.id FROM cdb_entries2 e JOIN cdb_entries x ON x.name=e.name WHERE x.id=v.entry_id); + + +DROP TABLE cdb_entries; +RENAME TABLE cdb_entries2 TO cdb_entries; Modified: branches/compat/index.php URL: http://svn.reactos.org/svn/reactos/branches/compat/index.php?rev=401&r1=400… ============================================================================== --- branches/compat/index.php [iso-8859-1] (original) +++ branches/compat/index.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -25,36 +25,18 @@ die("ERROR: Disable 'magic quotes' in php.ini (=Off)"); } +define('ROSCMS_PATH', '../roscms/'); define('CDB_PATH', ''); require_once("lib/Compat_Autoloader.class.php"); require_once('config.php'); - +$RSDB_intern_link_db_sec = 'index.php?page='; if ( !defined('RSDB') ) { define ("RSDB", "rossupportdb"); // to prevent hacking activity } - define('ROSCMS_PATH', '../roscms/'); - - - - // Environment Vars: - $RSDB_intern_selected=""; - - - // Forum bar settings: - if (isset($_POST['forumsave']) && $_POST['forumsave'] == 1) { - Cookie::write('rsdb_threshold', (isset($_POST['threshold']) ? htmlspecialchars($_POST['threshold']) : '?'), time() + 24 * 3600 * 30 * 5, '/'); - Cookie::write('rsdb_fstyle', (isset($_POST['fstyle']) ? htmlspecialchars($_POST['fstyle']) : '?'), time() + 24 * 3600 * 30 * 5, '/'); - Cookie::write('rsdb_order', (isset($_POST['order']) ? htmlspecialchars($_POST['order']) : '?'), time() + 24 * 3600 * 30 * 5, '/'); - } - - // Test report bar settings: - if (isset($_POST['testsave']) && $_POST['testsave'] == 1) { - Cookie::write('rsdb_threshold', (isset($_POST['threshold']) ? htmlspecialchars($_POST['threshold']) : '?'), time() + 24 * 3600 * 30 * 5, '/'); - Cookie::write('rsdb_order', (isset($_POST['order']) ? htmlspecialchars($_POST['order']) : '?'), time() + 24 * 3600 * 30 * 5, '/'); - } + @@ -62,22 +44,10 @@ $RSDB_SET_letter=""; // Browse by Name: Letter: All, A, B, C, ..., X, Y, Z $RSDB_SET_group=""; // Group ID - - $RSDB_SET_threshold="3"; - $RSDB_SET_fstyle="nested"; - $RSDB_SET_order="new"; - $RSDB_SET_save=""; - $RSDB_SET_msg=""; - $RSDB_SET_filter="cur"; - $RSDB_SET_filter2=""; - $rpm_lang=""; - if (isset($_COOKIE['rsdb_threshold'])) { - $RSDB_SET_threshold = $_COOKIE['rsdb_threshold']; - } if (isset($_COOKIE['rsdb_fstyle'])) { $RSDB_SET_fstyle = $_COOKIE['rsdb_fstyle']; } @@ -86,26 +56,7 @@ } if (array_key_exists("letter", $_GET)) $RSDB_SET_letter=htmlspecialchars($_GET["letter"]); - if (array_key_exists("group", $_GET)) $RSDB_SET_group=htmlspecialchars($_GET["group"]); - - if (array_key_exists("threshold", $_GET)) $RSDB_SET_threshold=htmlspecialchars($_GET["threshold"]); - if (array_key_exists("fstyle", $_GET)) $RSDB_SET_fstyle=htmlspecialchars($_GET["fstyle"]); - if (array_key_exists("order", $_GET)) $RSDB_SET_order=htmlspecialchars($_GET["order"]); - if (array_key_exists("save", $_GET)) $RSDB_SET_save=htmlspecialchars($_GET["save"]); - if (array_key_exists("msg", $_GET)) $RSDB_SET_msg=htmlspecialchars($_GET["msg"]); - if (array_key_exists("filter", $_GET)) $RSDB_SET_filter=htmlspecialchars($_GET["filter"]); - if (array_key_exists("filter2", $_GET)) $RSDB_SET_filter2=htmlspecialchars($_GET["filter2"]); - - if (array_key_exists("threshold", $_POST)) $RSDB_SET_threshold=htmlspecialchars($_POST["threshold"]); - if (array_key_exists("fstyle", $_POST)) $RSDB_SET_fstyle=htmlspecialchars($_POST["fstyle"]); - if (array_key_exists("order", $_POST)) $RSDB_SET_order=htmlspecialchars($_POST["order"]); - if (array_key_exists("save", $_POST)) $RSDB_SET_save=htmlspecialchars($_POST["save"]); - if (array_key_exists("msg", $_POST)) $RSDB_SET_msg=htmlspecialchars($_POST["msg"]); - if (array_key_exists("filter", $_POST)) $RSDB_SET_filter=htmlspecialchars($_POST["filter"]); - if (array_key_exists("filter2", $_POST)) $RSDB_SET_filter2=htmlspecialchars($_POST["filter2"]); - - session_start(); if(isset($_COOKIE['roscms_usrset_lang'])) { $roscms_usrsetting_lang=$_COOKIE["roscms_usrset_lang"]; @@ -117,17 +68,27 @@ require_once('lang.php'); - // Config - require_once('rsdb_setting.php'); - - // URI building - require_once('rsdb_config.php'); - switch (@$_GET['page']) { - // Frontpage + default: + // AJAX requests + if (isset($_GET['get']) && $_SERVER['QUERY_STRING'] != '') { + switch (@$_GET['get']) { + + // Suggestions + case 'suggestions': + new List_Suggestions(); + break; + + } // end switch get + break; + } + case 'home': new HTML_Home(); + break; + + // Frontpage break; // RSDB About Page @@ -143,12 +104,19 @@ // Browse by name case 'list': $filter = ''; - if (isset($_GET['letter'])) { + if (isset($_GET['letter']) && $_GET['letter'] != '*') { $filter .= 's_w_'.$_GET['letter']; } if (isset($_GET['cat'])) { if ($filter !== '') $filter .= '|'; $filter .= 'c_is_'.$_GET['cat']; + } + if (isset($_GET['tag']) && $_GET['tag'] != '*') { + if ($filter !== '') $filter .= '|'; + $filter .= 't_is_'.$_GET['tag']; + } + if (isset($_GET['filter']) && $_GET['filter'] != '') { + $filter = $_GET['filter']; } new HTML_List($filter); break; @@ -180,7 +148,7 @@ // Details case 'details': default: - new HTML_Version(); + new HTML_Entry(); break; // Screenshots @@ -207,20 +175,6 @@ new Help(); break; - default: - // just show 404, if no request for 'get=' is given - if (!isset($_GET['get'])) { - echo '404'; - } - break; } // end switch page -switch (@$_GET['get']) { - - // Suggestions - case 'suggestions': - new List_Suggestions(); - break; - -} // end switch get ?> Modified: branches/compat/js/submit.js URL: http://svn.reactos.org/svn/reactos/branches/compat/js/submit.js?rev=401&r1=… ============================================================================== --- branches/compat/js/submit.js [iso-8859-1] (original) +++ branches/compat/js/submit.js [iso-8859-1] Mon May 4 17:25:30 2009 @@ -124,6 +124,17 @@ document.getElementById('suggestedVersions').style.display='block'; document.getElementById('suggestedVersions').innerHTML='<ul>'+show+'</ul>'; + + var tags = entries[index].getElementsByTagName('tag'); + show = ''; + for (var i=0; i < tags.length; i++) { + if (show != '') show += ','; + show += tags[i].firstChild.nodeValue; + } + document.getElementById('tags').value=show; + + document.getElementById('description').value=entries[index].getAttribute('description'); + document.getElementById('cat').value=entries[index].getAttribute('category'); } else if (type == 'version') { id = 'version'; Modified: branches/compat/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/HTML.class.php?rev=4… ============================================================================== --- branches/compat/lib/HTML.class.php [iso-8859-1] (original) +++ branches/compat/lib/HTML.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -141,10 +141,10 @@ */ protected function navigation( ) { - include('rsdb_setting.php'); - include('rsdb_config.php'); global $RSDB_intern_link_db_sec; + global $RSDB_intern_path_server; + global $RSDB_intern_link_language; echo ' <table style="border: none; width:100%;" cellpadding="0" cellspacing="0"> @@ -162,10 +162,10 @@ <div class="navTitle">Browse Database</div> <ol> - <li><a href="'.$RSDB_intern_link_db_sec.'list">By Name</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'list&letter=*">By Name</a></li> <li><a href="'.$RSDB_intern_link_db_sec.'list&cat=0">By Category</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'list">By Tag</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'list">By Rank</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'list&tag=*">By Tag</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'list&filter=">Custom</a></li> </ol> <br /> @@ -208,7 +208,7 @@ $language_name = $stmt->fetchColumn(); echo ' - <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.open(this.options[this.selectedIndex].value,'_main');".'"> + <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.open('".$RSDB_intern_link_language."'+this.options[this.selectedIndex].value,'_main');".'"> <optgroup label="current language"> <option value="#">'.$language_name.'</option> </optgroup> @@ -218,7 +218,7 @@ $stmt->execute(); while ($language=$stmt->fetch(PDO::FETCH_ASSOC)) { echo ' - <option value="'.$RSDB_intern_link_language.$language['short'].'">'.$language['name'].'</option>'; + <option value="'.$language['short'].'">'.$language['name'].'</option>'; } echo ' Modified: branches/compat/lib/get/List_Suggestions.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/get/List_Suggestions… ============================================================================== --- branches/compat/lib/get/List_Suggestions.class.php [iso-8859-1] (original) +++ branches/compat/lib/get/List_Suggestions.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -30,35 +30,39 @@ switch (@$_GET['for']) { case 'name': default: - $stmt=CDBConnection::getInstance()->prepare("SELECT name, version FROM ".CDBT_ENTRIES." WHERE name LIKE :search ORDER BY name ASC, version DESC"); + $stmt=CDBConnection::getInstance()->prepare("SELECT name, id, description, category_id FROM ".CDBT_ENTRIES." WHERE name LIKE :search ORDER BY name ASC"); } $stmt->bindValue('search',@$_GET['search'].'%',PDO::PARAM_STR); $stmt->execute(); - $oldname = null; - + + // prepare for usage in loop + $stmt_ver=CDBConnection::getInstance()->prepare("SELECT version FROM ".CDBT_VERSIONS." WHERE entry_id=:entry_id ORDER BY version DESC"); + $stmt_tag=CDBConnection::getInstance()->prepare("SELECT t.name FROM ".CDBT_TAGS." t JOIN ".CDBT_TAGGED." r ON r.tag_id=t.id WHERE r.entry_id=:entry_id ORDER BY name ASC"); + // build list of entries and their versions while ($entry=$stmt->fetch(PDO::FETCH_ASSOC)) { - - // open / close entry - if ($oldname === null || $oldname != $entry['name']) { - if ($oldname !== null) { - echo '</entry>'; - } - echo '<entry name="'.htmlspecialchars($entry['name']).'">'; + + echo '<entry name="'.htmlspecialchars($entry['name']).'" description="'.htmlspecialchars($entry['description']).'" category="'.$entry['category_id'].'">'; + + // versions + $stmt_ver->bindParam('entry_id',$entry['id'],PDO::PARAM_INT); + $stmt_ver->execute(); + while ($version=$stmt_ver->fetch(PDO::FETCH_ASSOC)) { + // version + echo '<version>'.htmlspecialchars($version['version']).'</version>'; } - - // version - echo '<version>'.htmlspecialchars($entry['version']).'</version>'; - - // update last entry name - $oldname = $entry['name']; + + // tags + $stmt_tag->bindParam('entry_id',$entry['id'],PDO::PARAM_INT); + $stmt_tag->execute(); + while ($tag=$stmt_tag->fetch(PDO::FETCH_ASSOC)) { + // version + echo '<tag>'.htmlspecialchars($tag['name']).'</tag>'; + } + + echo '</entry>'; } // end while entry - - // close entry - if ($oldname !== null) { - echo '</entry>'; - } echo '</root>'; } // end of constructor Modified: branches/compat/lib/om/Category.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/om/Category.class.ph… ============================================================================== --- branches/compat/lib/om/Category.class.php [iso-8859-1] (original) +++ branches/compat/lib/om/Category.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -66,132 +66,6 @@ } - /** - * @FILLME - * - * @access public - */ - public static function showLeafAsOption($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) - { - global $RSDB_intern_selected; - - global $cellcolor2; - $cellcolor=$cellcolor2; - - - - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM ".CDBT_CATEGORIES." WHERE id = :cat_id AND visible IS TRUE"); - $stmt->bindParam('cat_id',$RSDB_TEMP_entry_id,PDO::PARAM_STR); - $stmt->execute(); - - $result_create_tree_entry=$stmt->fetchOnce(PDO::FETCH_ASSOC); - - - - - $RSDB_TEMP_cat_current_id_guess = $result_create_tree_entry['id']; - - for ($guesslevel=1; ; $guesslevel++) { - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM ".CDBT_CATEGORIES." WHERE id = :cat_id AND visible IS TRUE"); - $stmt->bindParam('cat_id',$RSDB_TEMP_cat_current_id_guess,PDO::PARAM_STR); - $stmt->execute(); - $result_category_tree_guesslevel=$stmt->fetchOnce(PDO::FETCH_ASSOC); - $RSDB_TEMP_cat_current_id_guess = $result_category_tree_guesslevel['parent']; - - if (!$result_category_tree_guesslevel['name']) { - $RSDB_intern_catlevel = ($guesslevel-1); - break; - } - } - - echo "<option value=\"". $result_create_tree_entry['id']. "\""; - if ($RSDB_intern_selected != "" && $RSDB_intern_selected == $result_create_tree_entry['id']) { - echo " selected "; - } - echo ">\n\n"; - - for ($n=$RSDB_TEMP_cat_level_newmain;$n<$RSDB_intern_catlevel;$n++) { - echo "    "; - } - - echo $result_create_tree_entry['name']; - - //echo "     (".$result_create_tree_entry['cat_description'] .")"; - - echo "</option>"; - } // end of member function showLeafAsOption - - - - /** - * @FILLME - * - * @access public - */ - public static function showLeafAsRow($RSDB_TEMP_entry_id, $RSDB_TEMP_cat_level_newmain) - { - - global $RSDB_intern_link_category_cat; - global $cellcolor2; - $cellcolor=$cellcolor2; - -// global $RSDB_TEMP_cat_icon; - - - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM ".CDBT_CATEGORIES." WHERE id = :cat_id AND visible IS TRUE"); - $stmt->bindParam('cat_id',$RSDB_TEMP_entry_id,PDO::PARAM_STR); - $stmt->execute(); - - $result_create_tree_entry=$stmt->fetch(PDO::FETCH_ASSOC); - -/* if ($result_create_tree_entry['cat_icon'] != "") { - $RSDB_TEMP_cat_icon = $result_create_tree_entry['cat_icon']; - } -*/ - - echo "<tr><td width='45%' valign='top' bgcolor='".$cellcolor."'>"; - echo "<div align='left'><font size='2' face='Arial, Helvetica, sans-serif'> "; - - - $RSDB_TEMP_cat_current_id_guess = $result_create_tree_entry['id']; - - // count the levels -> current category level - for ($guesslevel=1; ; $guesslevel++) { -// echo $guesslevel."#"; - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM ".CDBT_CATEGORIES." WHERE id = :cat_id AND visible IS TRUE"); - $stmt->bindParam('cat_id',$RSDB_TEMP_cat_current_id_guess,PDO::PARAM_STR); - $stmt->execute(); - $result_category_tree_guesslevel=$stmt->fetch(PDO::FETCH_ASSOC); -// echo $result_category_tree_guesslevel['cat_name']; - $RSDB_TEMP_cat_current_id_guess = $result_category_tree_guesslevel['parent']; - - if (!$result_category_tree_guesslevel['name']) { -// echo "ENDE:".($guesslevel-1); - $RSDB_intern_catlevel = ($guesslevel-1); - break; - } - } - - - - for ($n=$RSDB_TEMP_cat_level_newmain;$n<$RSDB_intern_catlevel;$n++) { - echo "    "; - } - -// echo "<img src='media/icons/categories/".$RSDB_TEMP_cat_icon."' width='16' height='16'> "; - - echo "<a href='".$RSDB_intern_link_category_cat.$result_create_tree_entry['id']."'>".$result_create_tree_entry['name']."</a>"; - - echo "</font></div></td>"; - echo "<td width='45%' valign='top' bgcolor='".$cellcolor."'>"; - echo "<div align='left'><font face='Arial, Helvetica, sans-serif'>"; - - echo "<font size='2' face='Arial, Helvetica, sans-serif'>".$result_create_tree_entry['description']."</font>"; - - echo "</font></div></td><td width='10%' valign='top' bgcolor='".$cellcolor."'><font size='2'>".Count::entriesInGroup($result_create_tree_entry['id'])."</font></td></tr>"; - - } // end of member function showLeafAsRow - } // end of Category Modified: branches/compat/lib/om/Entry.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/om/Entry.class.php?r… ============================================================================== --- branches/compat/lib/om/Entry.class.php [iso-8859-1] (original) +++ branches/compat/lib/om/Entry.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -96,7 +96,7 @@ $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_INT); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_INT); $stmt->bindParam('revision',$revision,PDO::PARAM_INT); - $stmt->bindParam('status',$status,PDO::PARAM_BOOL); + $stmt->bindParam('status',$status,PDO::PARAM_STR); return $stmt->execute(); } // end of member function addReport @@ -122,7 +122,7 @@ $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_INT); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_INT); $stmt->bindParam('title',$title,PDO::PARAM_STR); - $stmt->bindParam('status',$content,PDO::PARAM_STR); + $stmt->bindParam('content',$content,PDO::PARAM_STR); return $stmt->execute(); } // end of member function add Removed: branches/compat/lib/om/Star.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/om/Star.class.php?re… ============================================================================== --- branches/compat/lib/om/Star.class.php [iso-8859-1] (original) +++ branches/compat/lib/om/Star.class.php (removed) @@ -1,284 +1,0 @@ -<?php - /* - CompatDB - ReactOS Compatability Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -/** - * class Star - * - */ -class Star -{ - - - - /** - * @FILLME - * - * @access public - */ - private static function draw($number, $user, $mask, $votetext, $votelink, $iconsize) { // intern function, don't call this function directly - $draw_stars_result = ''; - - - /* - if ($user < 7 && $user != 1) { - $result_stars = 0; - } - else { - $result_stars = @($number / $user); - } - */ - - $result_stars = @($number / $user); - - $result_round_stars = round($result_stars, 0); - - if ($iconsize == "default") { - $iconsize_ext = ""; - $iconsize_height = "15"; - $iconsize_width = "15"; - } - elseif ($iconsize == "small") { - $iconsize_ext = "_small"; - $iconsize_height = "13"; - $iconsize_width = "13"; - } - - if ($result_round_stars <= $mask) { - - for ($goldstar=0; $goldstar < $result_round_stars; $goldstar++) { - if ($votelink != "") { - $draw_stars_result .= '<a href="'.$votelink.($goldstar+1).'">'; - } - $draw_stars_result .= '<img src="media/icons/stars/star_gold'.$iconsize_ext.'.gif" width="'.$iconsize_width.'" height="'.$iconsize_height.'" '; - if ($votelink != "") { - if (($goldstar+1) == "1") { - $draw_stars_result .= 'alt="Click here to vote '.($goldstar+1).' star!" '; - } - else { - $draw_stars_result .= 'alt="Click here to vote '.($goldstar+1).' stars!" '; - } - } - else { - $draw_stars_result .= 'alt="*" '; - } - $draw_stars_result .= 'border="0" />'; - if ($votelink != "") { - $draw_stars_result .= '</a>'; - } - } - - for ($graystar=0; $graystar < ($mask-$result_round_stars); $graystar++) { - if ($votelink != "") { - $draw_stars_result .= '<a href="'.$votelink.($result_round_stars+$graystar+1).'">'; - } - $draw_stars_result .= '<img src="media/icons/stars/star_gray'.$iconsize_ext.'.gif" width="'.$iconsize_width.'" height="'.$iconsize_height.'" '; - if ($votelink != "") { - if (($result_round_stars+$graystar+1) == "1") { - $draw_stars_result .= 'alt="Click here to vote '.($result_round_stars+$graystar+1).' star!" '; - } - else { - $draw_stars_result .= 'alt="Click here to vote '.($result_round_stars+$graystar+1).' stars!" '; - } - } - else { - $draw_stars_result .= 'alt="_" '; - } - $draw_stars_result .= 'border="0" />'; - if ($votelink != "") { - $draw_stars_result .= '</a>'; - } - } - - $draw_stars_result .= ' '.round($result_stars, 2).'/'.$mask; - - if ($votetext) { - $draw_stars_result .= ' ('.$user.' '.$votetext.')'; - } - /*if ($user < 7 && $user != "") { - $draw_stars_result .= ' (rating is hidden)'; - }*/ - } - else { - $draw_stars_result .= $votetext.' data corrupted :-('; - } - - return $draw_stars_result; -} // end of member function icon - - - - /** - * @FILLME - * - * @access public - */ - public static function drawNormal($number, $user, $mask, $votetext) { // draw the stars; "vote"/"test" text is optional - return self::draw($number, $user, $mask, $votetext, "", "default"); - } // end of member function icon - - - - /** - * @FILLME - * - * @access public - */ - public static function drawSmall($number, $user, $mask, $votetext) { // draw the stars; "vote"/"test" text is optional - return self::draw($number, $user, $mask, $votetext, "", "small"); - } // end of member function icon - - - - /** - * @FILLME - * - * @access public - */ - public static function drawVoteable($number, $user, $mask, $votetext, $votelink) { // for voting only - return self::draw($number, $user, $mask, $votetext, $votelink, "default"); - - } // end of member function icon - - - - /** - * @FILLME - * - * @access public - */ - public static function addVote($entry_id, $star_nr, $tblname, $fieldname) { // for voting only - global $RSDB_intern_user_id; - - if ($entry_id != "" && $star_nr != "" && ($star_nr >= 1 && $star_nr <= 5)) { - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM ".$tblname." WHERE ".$fieldname."_id = :entry_id"); - $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_STR); - $stmt->execute(); - $result_star_vote1=$stmt->fetchOnce(PDO::FETCH_ASSOC); - - $RSDB_TEMP_voting_history1 = strchr($result_star_vote1[$fieldname.'_useful_vote_user_history'],("|".$RSDB_intern_user_id."=")); - - if ($RSDB_TEMP_voting_history1 == false) { - $RSDB_TEMP_voting_history2 = $result_star_vote1[$fieldname.'_useful_vote_user_history']."|". $RSDB_intern_user_id ."=". $star_nr; - $stmt=CDBConnection::getInstance()->prepare("UPDATE ".$tblname." SET ".$fieldname."_useful_vote_value = ".$fieldname."_useful_vote_value+:star_nr, ".$fieldname."_useful_vote_user = ".$fieldname."_useful_vote_user+1, ".$fieldname."_useful_vote_user_history = :history WHERE ".$fieldname."_id = :entry_id"); - $stmt->bindParam('star_nr',$star_nr,PDO::PARAM_INT); - $stmt->bindParam('history',$RSDB_TEMP_voting_history2,PDO::PARAM_STR); - $stmt->bindParam('entry_id',$entry_id,PDO::PARAM_STR); - $stmt->execute(); - - Message::show("<b>Your rating/vote has been casted!</b>"); - echo "<br />"; - - } - else { - Message::show("<b>You have already rated/voted this entry!</b>"); - echo "<br />"; - } - } - else { - Message::show("<b>Invalid rating/vote!</b>"); - echo "<br />"; - } - - } // end of member function icon - - - - /** - * @FILLME - * - * @access public - */ - public static function thresholdForum($RSDB_TEMP_msgid, $RSDB_TEMP_threshold, $RSDB_TEMP_threshold_new, $RSDB_TEMP_tablename, $RSDB_TEMP_fieldname) { - global $RSDB_TEMP_order; - global $RSDB_intern_link_item_item2_forum_msg; - global $RSDB_SET_fstyle; - global $RSDB_intern_user_id; - global $RSDB_intern_link_item_item2_vote; - global $RSDB_TEMP_counter_threshold; - - if ($RSDB_TEMP_threshold_new == true) { - $RSDB_TEMP_counter_threshold = 0; - } - - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_".$RSDB_TEMP_tablename." WHERE ".$RSDB_TEMP_fieldname."_visible = '1' AND ".$RSDB_TEMP_fieldname."_comp_id = :item_id AND ".$RSDB_TEMP_fieldname."_parent = :parent ORDER BY ".$RSDB_TEMP_fieldname."_date ".$RSDB_TEMP_order.""); - $stmt->bindParam('item_id',@$_GET['item'],PDO::PARAM_STR); - $stmt->bindParam('parent',$RSDB_TEMP_msgid,PDO::PARAM_STR); - $stmt->execute(); - - while($result_fmsgreports = $stmt->fetch(PDO::FETCH_ASSOC)) { - - $number = $result_fmsgreports[$RSDB_TEMP_fieldname.'_useful_vote_value']; - $user = $result_fmsgreports[$RSDB_TEMP_fieldname.'_useful_vote_user']; - $result_stars = @($number / $user); - $result_round_stars = round($result_stars, 0); - - if ($result_round_stars >= $RSDB_TEMP_threshold) { - $RSDB_TEMP_counter_threshold++; - } - calc_threshold_stars_forum($result_fmsgreports[$RSDB_TEMP_fieldname.'_id'], $RSDB_TEMP_threshold, "", $RSDB_TEMP_tablename, $RSDB_TEMP_fieldname); - } - return $RSDB_TEMP_counter_threshold; - - } // end of member function icon - - - - /** - * @FILLME - * - * @access public - */ - public static function thresholdTests($RSDB_TEMP_msgid, $RSDB_TEMP_threshold, $RSDB_TEMP_threshold_new, $RSDB_TEMP_tablename, $RSDB_TEMP_fieldname) { - global $RSDB_TEMP_order; - global $RSDB_intern_link_item_item2_forum_msg; - global $RSDB_SET_fstyle; - global $RSDB_intern_user_id; - global $RSDB_intern_link_item_item2_vote; - global $RSDB_TEMP_counter_threshold; - - if ($RSDB_TEMP_threshold_new == true) { - $RSDB_TEMP_counter_threshold = 0; - } - - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_".$RSDB_TEMP_tablename." WHERE ".$RSDB_TEMP_fieldname."_visible = '1' AND ".$RSDB_TEMP_fieldname."_comp_id = :item_id ORDER BY ".$RSDB_TEMP_fieldname."_date " . $RSDB_TEMP_order . ""); - $stmt->bindParam('item_id',@$_GET['item'],PDO::PARAM_STR); - $stmt->execute(); - - while($result_fmsgreports = $stmt->fetch(PDO::FETCH_ASSOC)) { - - $number = $result_fmsgreports[$RSDB_TEMP_fieldname.'_useful_vote_value']; - $user = $result_fmsgreports[$RSDB_TEMP_fieldname.'_useful_vote_user']; - $result_stars = @($number / $user); - $result_round_stars = round($result_stars, 0); - - if ($result_round_stars >= $RSDB_TEMP_threshold) { - $RSDB_TEMP_counter_threshold++; - } - - } - return $RSDB_TEMP_counter_threshold; - - } // end of member function icon - - - -} // end of Award -?> Modified: branches/compat/lib/view/Breadcrumb.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/Breadcrumb.clas… ============================================================================== --- branches/compat/lib/view/Breadcrumb.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/Breadcrumb.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -169,107 +169,6 @@ - private static function vendor( $param, $param_type ) - { - - if ($param > 0 && $param_type === self::PARAM_ENTRY) { - $stmt=CDBConnection::getInstance()->prepare("SELECT grpentr_vendor, grpentr_name FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id") ; - $stmt->bindParam('group_id',$param,PDO::PARAM_INT); - $stmt->execute(); - $vendor_id = $stmt->fetchColumn(); - - if ($vendor_id === false) { - echo 'Unknown Group'; - return; - } - } - - // check if entry version exists and is visible - elseif ($param > 0 && $param_type === self::PARAM_VERSION) { - //@TODO - } - - // no valid params - else { - echo 'Unknown parameter'; - return; - } - - if ($vendor_id) { - $stmt=CDBConnection::getInstance()->prepare("SELECT vendor_name FROM rsdb_item_vendor WHERE vendor_id = :vendor_id ORDER BY vendor_name ASC"); - $stmt->bindParam('vendor_id',$_GET['vendor'],PDO::PARAM_STR); - $stmt->execute(); - $vendor_name = $stmt->fetchColumn(); - if ($vendor === false) { - echo 'Unknown Vendor'; - return; - } - } - else { - echo 'Can\'t find Vendor'; - } - - echo '<li>'.$vendor_name.'</li>'; - } // end of member function vendor - - - - private static function initial( $param, $param_type ) - { - global $RSDB_intern_link_db_sec; - - // get entry by version - if ($param > 0 && $param_type === self::PARAM_VERSION) { - $stmt=CDBConnection::getInstance()->prepare("SELECT comp_groupid FROM rsdb_item_comp WHERE comp_visible = '1' AND comp_id = :item_id") ; - $stmt->bindParam('item_id',$_GET['item'],PDO::PARAM_INT); - $stmt->execute(); - $group_id = $stmt->fetchColumn(); - - if ($group_id === false) { - echo 'Unknown Item'; - return; - } - $group_id = $result_itempid['comp_groupid']; - } - - // get first letter by entry - elseif ($param > 0 && $param_type === self::PARAM_ENTRY) { - $group_id = $param; - } - - // we need an entry to get the first char - if (isset($group_id)) { - $stmt=CDBConnection::getInstance()->prepare("SELECT UPPER(SUBSTRING(LTRIM(grpentr_name), 1, 1)) AS letter, grpentr_name FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id"); - $stmt->bindParam('group_id',$group_id,PDO::PARAM_INT); - $stmt->execute(); - $group = $stmt->fetchOnce(PDO::FETCH_ASSOC); - $letter = $group['letter']; - } - else { - echo 'Unknown Entry'; - return; - } - - // number - if ($letter > 0) { - echo ' - <li style="float: left;"><a href="'.$RSDB_intern_link_db_sec.'name&letter='.strtolower($letter).'">#</a></li>'; - } - - // letter - elseif ($letter != '') { - echo ' - <li style="float: left;"><a href="'.$RSDB_intern_link_db_sec.'name&letter='.strtolower($letter).'">'.$letter.'</a></li>'; - } - - // Unknown letter - else { - echo ' - <li style="float: left;">Unknown</li>'; - } - } // end of member function initial - - } // end of Breadcrumb Copied: branches/compat/lib/view/HTML_Entry.class.php (from r395, branches/compat/lib/view/HTML_Version.class.php) URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/HTML_Entry.clas… ============================================================================== --- branches/compat/lib/view/HTML_Version.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/HTML_Entry.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -19,7 +19,7 @@ */ -class Entry_Details extends HTML +class HTML_Entry extends HTML { const MODE_NORMAL = 1; @@ -29,14 +29,21 @@ { $mode = self::MODE_NORMAL; - $stmt=CDBConnection::getInstance()->prepare("SELECT e.id, e.name, e.version, e.description, c.name AS category, e.category_id FROM ".CDBT_ENTRIES." e LEFT JOIN ".CDBT_CATEGORIES." c ON c.id=e.category_id WHERE e.id=:entry_id"); - $stmt->bindParam('entry_id',$_GET['item'],PDO::PARAM_INT); + // version info + $stmt=CDBConnection::getInstance()->prepare("SELECT version, entry_id FROM ".CDBT_VERSIONS." WHERE id=:version_id"); + $stmt->bindParam('version_id',$_GET['ver'],PDO::PARAM_INT); + $stmt->execute(); + $version = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + // entry info + $stmt=CDBConnection::getInstance()->prepare("SELECT e.id, e.name, e.description, c.name AS category, e.category_id FROM ".CDBT_ENTRIES." e LEFT JOIN ".CDBT_CATEGORIES." c ON c.id=e.category_id WHERE e.id=:entry_id"); + $stmt->bindParam('entry_id',$version['entry_id'],PDO::PARAM_INT); $stmt->execute(); $entry = $stmt->fetchOnce(PDO::FETCH_ASSOC); // tagged versions if ($mode == self::MODE_NORMAL) { - $stmt=CDBConnection::getInstance()->prepare("SELECT r.revision, v.name FROM ".CDBT_REPORTS." r LEFT JOIN ".CDBT_VERSIONS." v ON r.revision=v.revision WHERE r.entry_id=:entry_id AND works IS TRUE ORDER BY v.revision DESC"); + $stmt=CDBConnection::getInstance()->prepare("SELECT r.revision, v.name FROM ".CDBT_REPORTS." r LEFT JOIN ".CDBT_VERTAGS." v ON r.revision=v.revision WHERE r.entry_id=:entry_id AND works IS TRUE ORDER BY v.revision DESC"); $stmt->bindParam('entry_id',$entry['id'],PDO::PARAM_INT); $stmt->execute(); $report = $stmt->fetchOnce(PDO::FETCH_ASSOC); @@ -44,7 +51,7 @@ // untagged revisions elseif ($mode == self::MODE_DEV) { - $stmt=CDBConnection::getInstance()->prepare("SELECT r.works, r.revision FROM ".CDBT_REPORTS." r LEFT JOIN ".CDBT_VERSIONS." v ON r.revision=v.revision WHERE r.entry_id=:entry_id AND v.revision IS NULL ORDER BY r.revision DESC"); + $stmt=CDBConnection::getInstance()->prepare("SELECT r.works, r.revision FROM ".CDBT_REPORTS." r LEFT JOIN ".CDBT_VERTAGS." v ON r.revision=v.revision WHERE r.entry_id=:entry_id AND v.revision IS NULL ORDER BY r.revision DESC"); $stmt->bindParam('entry_id',$entry['id'],PDO::PARAM_INT); $stmt->execute(); $reports = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -60,7 +67,7 @@ <th style="width:100px;">Name</th> <td style="width:200px;"><a href="">'.htmlspecialchars($entry['name']).'</a></td> <th style="width:100px;">Version</th> - <td style="width:200px;">'.($entry['version'] != '0' ? htmlspecialchars($entry['version']) : '').'</td> + <td style="width:200px;">'.htmlspecialchars($version['version']).'</td> </tr> <tr> <th style="width:100px;">Category</th> @@ -119,5 +126,7 @@ echo '</div>'; } } // end of member function body -} + + +} // end of HTML_Entry ?> Modified: branches/compat/lib/view/HTML_Home.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/HTML_Home.class… ============================================================================== --- branches/compat/lib/view/HTML_Home.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/HTML_Home.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -55,7 +55,18 @@ <tbody>'; // show latest tests - $stmt=CDBConnection::getInstance()->prepare("SELECT e.name, r.created, r.works, e.id FROM ".CDBT_REPORTS." r JOIN ".CDBT_ENTRIES." e ON e.id=r.entry_id JOIN ".CDBT_VERSIONS." v ON v.revision=r.revision ORDER BY v.revision DESC, r.created DESC LIMIT 10"); + if (1) { + $stmt=CDBConnection::getInstance()->prepare("SELECT revision FROM ".CDBT_VERTAGS." t WHERE visible IS TRUE AND 5<(SELECT COUNT(*) FROM ".CDBT_REPORTS." WHERE revision=t.revision) ORDER BY revision DESC LIMIT 1"); + $stmt->execute(); + $latest_version = $stmt->fetchColumn(); + + $stmt=CDBConnection::getInstance()->prepare("SELECT e.name, r.created, r.works, e.id FROM ".CDBT_REPORTS." r JOIN ".CDBT_ENTRIES." e ON e.id=r.entry_id WHERE r.revision = :revision ORDER BY r.created DESC LIMIT 10"); + $stmt->bindParam('revision',$latest_version,PDO::PARAM_INT); + } + else { + $stmt=CDBConnection::getInstance()->prepare("SELECT e.name, r.created, r.works, e.id FROM ".CDBT_REPORTS." r JOIN ".CDBT_ENTRIES." e ON e.id=r.entry_id ORDER BY r.created DESC LIMIT 10"); + + } $stmt->execute(); $x=0; while ($entry = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -63,8 +74,8 @@ echo ' <tr class="row'.($x%2+1).'"> - <td><a href="'.$RSDB_intern_link_item_comp.$entry['id'].'">'.$entry['name'].'</a></td> - <td>'.($entry['works']?'yep':'doesn\'t').'</td> + <td><a href="?page=item&item='.$entry['id'].'">'.$entry['name'].'</a></td> + <td>'.$entry['works'].'</td> <td style="text-align: center;">'.$entry['created'].'</td> </tr>'; } Modified: branches/compat/lib/view/HTML_List.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/HTML_List.class… ============================================================================== --- branches/compat/lib/view/HTML_List.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/HTML_List.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -44,86 +44,210 @@ else { $offset = 0; } + + echo ' + <h1>Compatability Database > browse by name</h1>'; + - if (isset($_GET['letter']) && $_GET['letter'] != 'all') { - $letter = $_GET['letter']; - } - - echo ' - <h1>Compatability Database > browse by name</h1>'; + if (isset($_GET['letter'])) { + $this->naviLetter($_GET['letter']); + } + elseif (isset($_GET['cat'])) { + $this->naviCategory($_GET['cat']); + } + elseif (isset($_GET['tag']) && $_GET['tag'] == '*') { + $this->naviTags(); + } + + elseif (isset($_GET['filter'])) { + $this->naviCustom(); + } + + if (!isset($_GET['tag']) || $_GET['tag'] != '*') { + + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM ".CDBT_ENTRIES." e ".$this->from." WHERE e.visible IS TRUE ".$this->where); + foreach ($this->params as $param) { + $stmt->bindValue($param[0],$param[1],$param[2]); + } + $stmt->execute(); + $entries_count = $stmt->fetchColumn(); + + if ($entries_count > $limit) { + echo '<div>Navigation:'; + $to = ceil($entries_count/(float)$limit); + for ($i=1; $i <= $to ; ++$i) { + if ($offset==($i-1)*$limit) { + echo '<strong>['.$i.']</strong>'; + } + else { + echo '<a href="?page=list'.(isset($_GET['letter']) ? '&letter='.$_GET['letter']:'').'&offset='.(($i-1)*$limit).'">'.$i.'</a>'; + } + } + echo '</div>'; + } - echo '<div>Letters:'; - for ($i=ord('a'); $i <= ord('z') ; ++$i) { - if (isset($letter) && chr($i)==$letter) { - echo '<strong>['.chr($i).']</strong>'; + + echo ' + <table class="rtable"> + <thead> + <tr> + <th>Application</th> + <th>Works?</th> + <th>Last modified</th> + </tr> + </thead> + <tbody>'; + + reset($this->params); + $stmt=CDBConnection::getInstance()->prepare("SELECT e.id, e.name, e.modified, (SELECT works FROM ".CDBT_REPORTS." WHERE entry_id=e.id ORDER BY created DESC LIMIT 1) AS works FROM ".CDBT_ENTRIES." e ".$this->from." WHERE e.visible IS TRUE ".$this->where." ORDER BY e.name ASC LIMIT :limit OFFSET :offset"); + foreach ($this->params as $param) { + $stmt->bindValue($param[0],$param[1],$param[2]); + } + $stmt->bindParam('limit', $limit, PDO::PARAM_INT); + $stmt->bindParam('offset', $offset, PDO::PARAM_INT); + $stmt->execute(); + $x=0; + while ($entry=$stmt->fetch(PDO::FETCH_ASSOC)) { + ++$x; + + $stmt_ver=CDBConnection::getInstance()->prepare("SELECT id, version FROM ".CDBT_VERSIONS." WHERE entry_id=:entry_id ORDER BY version DESC"); + $stmt_ver->bindParam('entry_id',$entry['id'],PDO::PARAM_STR); + $stmt_ver->execute(); + $versions = $stmt_ver->fetchAll(PDO::FETCH_ASSOC); + + // display entry only if it has also at least one version information + if (count($versions) > 0) { + echo ' + <tr class="row'.($x%2+1).'"> + <td>'; + + if (count($versions) == 1) { + echo ' + <a href="?page=item&ver='.$versions[0]['id'].'">'.htmlspecialchars($entry['name']).' '.$versions[0]['version'].'</a>'; + } + else { + echo ' + <a href="?page=item&item='.$entry['id'].'">'.htmlspecialchars($entry['name']).'</a> + <ul style="display:none;">'; + + + foreach ($versions as $version) { + echo ' + <li><a href="item&ver='.$entry['id'].'">'.htmlspecialchars($entry['name']).' '.$version['version'].'</a></li>'; + } + + echo ' + </ul>'; + } + + + echo ' + </td> + <td>'.$entry['works'].'</td> + <td>'.$entry['modified'].'</td> + </tr>'; } - else { - echo '<a href="?page=list&letter='.chr($i).'">'.strtoupper(chr($i)).'</a>'; - } - } - echo '</div>'; - - $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM ".CDBT_ENTRIES." e ".$this->from." WHERE e.visible IS TRUE ".$this->where); - foreach ($this->params as $param) { - $stmt->bindValue($param[0],$param[1],$param[2]); - } - $stmt->execute(); - $entries_count = $stmt->fetchColumn(); - - if ($entries_count > $limit) { - echo '<div>Navigation:'; - $to = ceil($entries_count/(float)$limit); - for ($i=1; $i <= $to ; ++$i) { - if ($offset==($i-1)*$limit) { - echo '<strong>['.$i.']</strong>'; - } - else { - echo '<a href="?page=list'.(isset($letter) ? '&letter='.$letter:'').'&offset='.(($i-1)*$limit).'">'.$i.'</a>'; - } - } - echo '</div>'; - } - - echo ' - <table class="rtable"> - <thead> - <tr> - <th>Application</th> - <th>Works?</th> - <th>Last modified</th> - </tr> - </thead> - <tbody>'; - - reset($this->params); - $stmt=CDBConnection::getInstance()->prepare("SELECT e.id, e.name, e.modified FROM ".CDBT_ENTRIES." e ".$this->from." WHERE e.visible IS TRUE ".$this->where." ORDER BY e.name ASC LIMIT :limit OFFSET :offset"); - foreach ($this->params as $param) { - $stmt->bindValue($param[0],$param[1],$param[2]); - } - $stmt->bindParam('limit', $limit, PDO::PARAM_INT); - $stmt->bindParam('offset', $offset, PDO::PARAM_INT); + } + + echo ' + </tbody> + </table>'; + } + } // end of member function body + + + + private function naviLetter( $letter ) + { + echo '<div>Letters:'; + for ($i=ord('a'); $i <= ord('z') ; ++$i) { + if (isset($letter) && chr($i)==$letter) { + echo '<strong>['.chr($i).']</strong>'; + } + else { + echo '<a href="?page=list&letter='.chr($i).'">'.strtoupper(chr($i)).'</a>'; + } + } + echo '</div>'; + } + + + + private function naviCategory( $category_id ) + { + echo ' + <div style="margin-bottom: 3em;">Categories + <table class="rtable"> + <thead> + <tr> + <th>Name</th> + <th>Subcategories</th> + <th>direct entries</th> + </tr> + </thead> + <tbody>'; + + $stmt=CDBConnection::getInstance()->prepare("SELECT id, name, (SELECT COUNT(*) FROM ".CDBT_CATEGORIES." WHERE parent=p.id) AS subcategories, (SELECT COUNT(*) FROM ".CDBT_ENTRIES." WHERE category_id=p.id) AS entries FROM ".CDBT_CATEGORIES." p WHERE parent=:category_id ORDER BY name ASC"); + $stmt->bindParam('category_id',$category_id,PDO::PARAM_STR); $stmt->execute(); $x=0; - while ($entry=$stmt->fetch(PDO::FETCH_ASSOC)) { + while ($category=$stmt->fetch(PDO::FETCH_ASSOC)) { ++$x; echo ' <tr class="row'.($x%2+1).'"> - <td><a href="?page=item&item='.$entry['id'].'">'.htmlspecialchars($entry['name']).'</a></td> - <td>???</td> - <td>'.$entry['modified'].'</td> + <td><a href="?page=list&cat='.$category['id'].'">'.$category['name'].'</a></td> + <td>'.$category['subcategories'].'</td> + <td>'.$category['entries'].'</td> </tr>'; } echo ' - </tbody> - </table>'; - } // end of member function body - - - - private function buildQuery ($filter) - { + </tbody> + </table> + </div>'; + } + + + + + private function naviTags( ) + { + $stmt=CDBConnection::getInstance()->prepare("SELECT MAX((SELECT COUNT(*) FROM ".CDBT_TAGGED." WHERE tag_id=t.id)) AS max FROM ".CDBT_TAGS." t"); + $stmt->execute(); + $max = $stmt->fetchColumn(); + echo $max; + + echo ' + <div style="margin-bottom: 3em;">'; + + $stmt=CDBConnection::getInstance()->prepare("SELECT id, name, (SELECT COUNT(*) FROM ".CDBT_TAGGED." WHERE tag_id=t.id) AS count FROM ".CDBT_TAGS." t ORDER BY name ASC"); + $stmt->execute(); + while ($tag=$stmt->fetch(PDO::FETCH_ASSOC)) { + echo '<span style="float: left; margin-right: 20px; font-size: '.((floor($tag['count']/(float)$max)*12.0)+8).'px;"><a href="?page=list&tag='.htmlspecialchars($tag['name']).'">'.htmlspecialchars($tag['name']).'</a></span>'; + } + echo ' + </div>'; + } + + + + + private function naviCustom( ) + { + echo '<div>Not yet implemented</div>'; + } + + + private function buildQuery($filter) + { + if ($filter == '') { + return false; + } + elseif (!strstr($filter, '_')) { + return false; + } + $filters = explode('|',$filter); foreach ($filters as $filter) { $part = explode('_',$filter); @@ -150,6 +274,14 @@ $this->params[] = array('ends_with','%'.$part[2],PDO::PARAM_STR); break; + // tagged with + case 't': + $this->where .= " t.name = :tagname "; + $this->from .= " JOIN ".CDBT_TAGGED." tr ON tr.entry_id=e.id "; + $this->from .= " JOIN ".CDBT_TAGS." t ON t.id=tr.tag_id "; + $this->params[] = array('tagname',$part[2],PDO::PARAM_STR); + break; + // category case 'c': if ($part[1] == 'is') { Modified: branches/compat/lib/view/HTML_Submit.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/HTML_Submit.cla… ============================================================================== --- branches/compat/lib/view/HTML_Submit.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/HTML_Submit.class.php [iso-8859-1] Mon May 4 17:25:30 2009 @@ -53,7 +53,7 @@ } // try to insert a new entry - if (isset($_POST['cat']) && isset($_POST['description'])) { + if (isset($_POST['title']) && $_POST['title'] != '' && isset($_POST['tags']) && isset($_POST['cat']) && isset($_POST['description']) && isset($_POST['version']) && $_POST['version'] != '') { $entry_id = Entry::add($_POST['title'], $_POST['version'], $_POST['cat'], $_POST['description'], $_POST['tags'], (isset($_POST['iCheck']) && $_POST['iCheck'] == 'yes')); } @@ -64,7 +64,8 @@ // insert new report/comment if ($entry_id !== false) { - Entry::addReport($entry_id, $revision, ($_POST['status']=='yes')); + if (isset($_POST['status']) && ($_POST['status'] == 'works' || $_POST['status'] == 'part' ||$_POST['status'] == 'not')) + Entry::addReport($entry_id, $revision, $_POST['status']); // insert new comment if (isset($_POST['comment']) && $_POST['comment'] != '') { @@ -115,9 +116,9 @@ <input type="text" name="description" id="description" /> </li> - <li style="display:none;"> - <label for="tags">Tags: (seperate them by <em>,</em>)</label><br /> - <input type="text" name="tags" id="tags" /> + <li> + <label for="tags">Tags: (e.g. vendor)</label><br /> + <input type="text" name="tags" id="tags" /> (seperate them by <em>,</em>) </li> </ul> </li> @@ -130,20 +131,23 @@ <ul style="list-style-type: none;"> <li> Status:<br /> - <input type="radio" name="status" id="noworks" value="no" /> + <input type="radio" name="status" id="noworks" value="not" /> <label for="noworks" style="color: red;">Doesn\'t Work</label> - <br /> - <input type="radio" name="status" id="doesn\'t work" value="yes" /> + + <input type="radio" name="status" id="partworks" value="part" /> + <label for="partworks" style="color: orange;">Works partly</label> + + <input type="radio" name="status" id="works" value="works" /> <label for="works" style="color: green;">Works</label> <br /> <br /> </li> <li> <label for="ver">Tested Version</label><br /> - <select name="ver" id="ver"> + <select name="ver" id="ver" onchange="'."javascript:document.getElementById('directRev').style.display=(this.value=='R' ? 'block' : 'none' );".'"> <option value="R"'.(($used_again && $_POST['ver'] == 'R') ? ' selected="selected"' : '').'>Use Revision</option>'; - $stmt=CDBConnection::getInstance()->prepare("SELECT revision, name FROM ".CDBT_VERSIONS." WHERE VISIBLE IS TRUE ORDER BY revision DESC"); + $stmt=CDBConnection::getInstance()->prepare("SELECT revision, name FROM ".CDBT_VERTAGS." WHERE VISIBLE IS TRUE ORDER BY revision DESC"); $stmt->execute(); $x = 0; while ($version = $stmt->fetch(PDO::FETCH_ASSOC) ) { @@ -155,11 +159,21 @@ </select> </li> - <li> + <li id="directRev"> <label for="rev">Tested Revision (only trunk revisions are allowed, please don\'t enter revisions of tags or branches)</label><br /> <input type="text" name="rev" id="rev"'.(($used_again && $_POST['ver'] == 'R') ? ' value="'.htmlspecialchars($_POST['revision']).'"' : '').' /> </li> - </ul> + </ul>'; + + if (!$used_again || $_POST['ver'] != 'R') { + echo ' + <script type="text/javascript"> + // + </script>'; + } + echo ' </fieldset> <fieldset> @@ -173,6 +187,9 @@ next action:<br /> <input type="radio" name="next" id="again" value="again" '.($used_again ? 'checked="checked"' : '').' /> <label for="again">Insert another entry/report</label> + <br /> + <input type="radio" name="next" id="more" value="more" /> + <label for="more">Add more information to that entry.</label> <br /> <input type="radio" name="next" id="entry" value="entry" '.(!$used_again ? 'checked="checked"' : '').' /> <label for="entry">Jump to inserted entry/report</label> Removed: branches/compat/lib/view/HTML_Version.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/HTML_Version.cl… ============================================================================== --- branches/compat/lib/view/HTML_Version.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/HTML_Version.class.php (removed) @@ -1,123 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2009 Danny Götte <dangerground(a)web.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -class Entry_Details extends HTML -{ - - const MODE_NORMAL = 1; - const MODE_DEV = 2; - - protected function body() - { - $mode = self::MODE_NORMAL; - - $stmt=CDBConnection::getInstance()->prepare("SELECT e.id, e.name, e.version, e.description, c.name AS category, e.category_id FROM ".CDBT_ENTRIES." e LEFT JOIN ".CDBT_CATEGORIES." c ON c.id=e.category_id WHERE e.id=:entry_id"); - $stmt->bindParam('entry_id',$_GET['item'],PDO::PARAM_INT); - $stmt->execute(); - $entry = $stmt->fetchOnce(PDO::FETCH_ASSOC); - - // tagged versions - if ($mode == self::MODE_NORMAL) { - $stmt=CDBConnection::getInstance()->prepare("SELECT r.revision, v.name FROM ".CDBT_REPORTS." r LEFT JOIN ".CDBT_VERSIONS." v ON r.revision=v.revision WHERE r.entry_id=:entry_id AND works IS TRUE ORDER BY v.revision DESC"); - $stmt->bindParam('entry_id',$entry['id'],PDO::PARAM_INT); - $stmt->execute(); - $report = $stmt->fetchOnce(PDO::FETCH_ASSOC); - } - - // untagged revisions - elseif ($mode == self::MODE_DEV) { - $stmt=CDBConnection::getInstance()->prepare("SELECT r.works, r.revision FROM ".CDBT_REPORTS." r LEFT JOIN ".CDBT_VERSIONS." v ON r.revision=v.revision WHERE r.entry_id=:entry_id AND v.revision IS NULL ORDER BY r.revision DESC"); - $stmt->bindParam('entry_id',$entry['id'],PDO::PARAM_INT); - $stmt->execute(); - $reports = $stmt->fetchAll(PDO::FETCH_ASSOC); - } - - echo ' - <h1>Compatability Database > Entry Details</h1> - - <div> - <h2>Details</h2> - <table style="width: 600px;"> - <tr> - <th style="width:100px;">Name</th> - <td style="width:200px;"><a href="">'.htmlspecialchars($entry['name']).'</a></td> - <th style="width:100px;">Version</th> - <td style="width:200px;">'.($entry['version'] != '0' ? htmlspecialchars($entry['version']) : '').'</td> - </tr> - <tr> - <th style="width:100px;">Category</th> - <td style="width:200px;" colspan="3"><a href="">'.htmlspecialchars($entry['category']).'</a></td> - </tr> - <tr> - <th style="width:100px;">Description</th> - <td style="width:200px;" colspan="3">'.htmlspecialchars($entry['description']).'</td> - </tr>'; - if ($mode == self::MODE_NORMAL) { - echo ' - <tr> - <th style="width:100px;">Works in</th> - <td style="width:200px;" colspan="3">'.(($report['name']) ? htmlspecialchars($report['name']) : (($report['revision'] > 0) ? 'r'.$report['revision'].' (trunk)' : 'no working version known')).'</td> - </tr>'; - } - echo ' - </table> - </div>'; - - if (isset($reports) && count($reports) > 0) { - echo ' - <div> - <h2>Tests</h2> - <ul>'; - foreach($reports as $report) { - echo '<li>'.($report['works'] ? 'works' : 'doesn\'t').' — r'.$report['revision'].'</li>'; - } - echo ' - </ul> - </div>'; - } - - - $stmt=CDBConnection::getInstance()->prepare("SELECT title, content, created, user_id FROM ".CDBT_COMMENTS." WHERE entry_id=:entry_id AND parent IS NULL ORDER BY created DESC"); - $stmt->bindParam('entry_id',$entry['id'],PDO::PARAM_STR); - $stmt->execute(); - $comments=$stmt->fetchAll(PDO::FETCH_ASSOC); - - if (count($comments) > 0) { - echo ' - <div> - <h2>Comments</h2>'; - - foreach ($comments as $comment) { - echo ' - <div> - <div> - <h3>'.htmlspecialchars($comment['title']).'</h3> - <span>by '.Subsystem::getUserName($comment['user_id']).' on '.$comment['created'].'</span> - </div> - '.nl2br(htmlspecialchars($comment['content'])).' - </div>'; - } - - echo '</div>'; - } - } // end of member function body -} -?> Removed: branches/compat/rsdb_config.php URL: http://svn.reactos.org/svn/reactos/branches/compat/rsdb_config.php?rev=400&… ============================================================================== --- branches/compat/rsdb_config.php [iso-8859-1] (original) +++ branches/compat/rsdb_config.php (removed) @@ -1,134 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - global $RSDB_SET_letter; - global $RSDB_SET_group; - global $RSDB_vote; - global $RSDB_vote2; - - global $RSDB_SET_threshold; - global $RSDB_SET_fstyle; - global $RSDB_SET_order; - global $RSDB_SET_save; - global $RSDB_SET_msg; - global $RSDB_SET_filter; - global $RSDB_SET_filter2; - global $rpm_lang; - - - - // Settings: - // ********* - - $RSDB_setting_stars_threshold = 6; - - // Links: - // ****** - - // RosCMS - $RSDB_intern_link_roscms = $RSDB_intern_path_server.$RSDB_intern_loginsystem_path."index.php"; - $RSDB_intern_link_roscms_page = $RSDB_intern_link_roscms."?page="; - - // Section - $RSDB_intern_link_db_sec = $RSDB_intern_index_php."?page="; - $RSDB_intern_link_db_sec_javascript = $RSDB_intern_index_php."?page="; - $RSDB_intern_link_db_sec_javascript2 = $RSDB_intern_index_php."?page=".htmlspecialchars(@$_GET['page']); - - // Category - $RSDB_intern_link_category_all = $RSDB_intern_link_db_sec.htmlspecialchars(@$_GET['page'])."&cat=".htmlspecialchars(@$_GET['cat']); - - $RSDB_intern_link_category_cat = $RSDB_intern_link_db_sec.htmlspecialchars(@$_GET['page'])."&cat="; - - - // Name - $RSDB_intern_link_name_letter = $RSDB_intern_link_db_sec.htmlspecialchars(@$_GET['page'])."&letter="; - $RSDB_intern_link_name_letter2 = $RSDB_intern_link_db_sec.htmlspecialchars(@$_GET['page'])."&letter=".$RSDB_SET_letter; - $RSDB_intern_link_name_curpos = $RSDB_intern_link_db_sec.htmlspecialchars(@$_GET['page'])."&letter=".$RSDB_SET_letter."&curpos="; - - // Group - $RSDB_intern_link_group = $RSDB_intern_link_db_sec."group&group="; - $RSDB_intern_link_group_group2 = $RSDB_intern_link_group.$RSDB_SET_group."&group2="; - $RSDB_intern_link_group_group2_both = $RSDB_intern_link_group_group2.htmlspecialchars(@$_GET['group2']); - $RSDB_intern_link_group_group2_both_javascript = $RSDB_intern_link_db_sec_javascript."group&group=".$RSDB_SET_group."&group2=".htmlspecialchars(@$_GET['group2']); - $RSDB_intern_link_group_sort = $RSDB_intern_link_group.$RSDB_SET_group."&group2=".htmlspecialchars(@$_GET['group2'])."&sort="; - $RSDB_intern_link_group_comp = $RSDB_intern_index_php."?page=group&group="; - $RSDB_intern_link_group_comp_javascript = $RSDB_intern_index_php."?page=group&group="; - - // Item - $RSDB_intern_link_item = $RSDB_intern_link_db_sec."item&item="; - $RSDB_intern_link_item_javascript = $RSDB_intern_index_php."?page=item&item="; - $RSDB_intern_link_item_item2 = $RSDB_intern_link_item.htmlspecialchars(@$_GET['item'])."&item2="; - $RSDB_intern_link_item_item2_both = $RSDB_intern_link_item_item2.htmlspecialchars(@$_GET['item2']); - $RSDB_intern_link_item_item2_both_javascript = $RSDB_intern_link_db_sec_javascript."item&item=".htmlspecialchars(@$_GET['item'])."&item2=".htmlspecialchars(@$_GET['item2']); - - $RSDB_intern_link_item_comp = $RSDB_intern_index_php."?page=item&item="; - - $RSDB_intern_link_item_item2_vote = $RSDB_intern_link_item_item2.htmlspecialchars(@$_GET['item2'])."&vote="; - $RSDB_intern_link_item_item2_forum_bar = $RSDB_intern_link_item_item2.htmlspecialchars(@$_GET['item2']); - $RSDB_intern_link_item_item2_forum_msg = $RSDB_intern_link_item_item2.htmlspecialchars(@$_GET['item2'])."&threshold=".$RSDB_SET_threshold."&fstyle=".$RSDB_SET_fstyle."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&msg="; - - // Vendor - $RSDB_intern_link_vendor = $RSDB_intern_link_db_sec."vendor_info&vendor="; - $RSDB_intern_link_vendor_both_javascript = $RSDB_intern_link_db_sec_javascript."vendor_info&vendor=".htmlspecialchars(@$_GET['vendor']); - $RSDB_intern_link_vendor2_group = $RSDB_intern_link_db_sec."group&group="; - $RSDB_intern_link_vendor_sec = $RSDB_intern_link_db_sec."vendor_info&vendor="; - $RSDB_intern_link_vendor_sec_comp = $RSDB_intern_index_php."?page=vendor_info&vendor="; - - // Rank - $RSDB_intern_link_rank = $RSDB_intern_link_db_sec."rank"; - $RSDB_intern_link_rank_rank2 = $RSDB_intern_link_rank."&rank2="; - $RSDB_intern_link_rank2_group = $RSDB_intern_link_db_sec."group&group="; - $RSDB_intern_link_rank2_item = $RSDB_intern_link_db_sec."item&item="; - $RSDB_intern_link_rank_sec = $RSDB_intern_link_db_sec."rank&rank="; - $RSDB_intern_link_rank_sec_comp = $RSDB_intern_index_php."?page=vendor_info&vendor="; - $RSDB_intern_link_rank_curpos = $RSDB_intern_link_rank_rank2.htmlspecialchars(@$_GET['rank2'])."&curpos="; - $RSDB_intern_link_rank_filter = $RSDB_intern_link_rank_curpos.htmlspecialchars(@$_GET['curpos'])."&filter="; - - // Submit - // Compatibility Test Report - $RSDB_intern_link_submit_comp_test = $RSDB_intern_link_item_item2.htmlspecialchars(@$_GET['item2'])."&addbox="; - // Compatibility Screenshot - $RSDB_intern_link_submit_comp_screenshot = $RSDB_intern_link_item_item2.htmlspecialchars(@$_GET['item2'])."&addbox="; - // Forum Post - $RSDB_intern_link_submit_forum_post = $RSDB_intern_link_item_item2.htmlspecialchars(@$_GET['item2'])."&addbox=reply&entry="; - // Application Version - $RSDB_intern_link_submit_appver = $RSDB_intern_link_item_item2.htmlspecialchars(@$_GET['item2'])."&group=".$RSDB_SET_group."&addbox=submit"; - $RSDB_intern_link_submit_appver_javascript = $RSDB_intern_link_item_javascript.htmlspecialchars(@$_GET['item'])."&item2=".htmlspecialchars(@$_GET['item2'])."&group=".$RSDB_SET_group."&addbox=submit"; - - - // Language - $RSDB_intern_link_language = $RSDB_intern_index_php."?page=".htmlspecialchars(@$_GET['page'])."&sec=".htmlspecialchars(@$_GET['page'])."&cat=".htmlspecialchars(@$_GET['cat'])."&letter=".$RSDB_SET_letter."&group=".$RSDB_SET_group."&item=".htmlspecialchars(@$_GET['item'])."&order=".$RSDB_SET_order."&filter=".$RSDB_SET_filter."&vendor=".htmlspecialchars(@$_GET['vendor'])."&lang="; - -?>

15 years, 8 months

[fireball] 40782: - Remove RemoveVectoredExceptionHandler() stub from stubs.c, since it is a forward to ntll.RtlRemoveVectoredExceptionHandler.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 4 16:19:48 2009 New Revision: 40782 URL: http://svn.reactos.org/svn/reactos?rev=40782&view=rev Log: - Remove RemoveVectoredExceptionHandler() stub from stubs.c, since it is a forward to ntll.RtlRemoveVectoredExceptionHandler. Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon May 4 16:19:48 2009 @@ -426,19 +426,6 @@ } return TRUE; -} - -/* - * @unimplemented - */ -ULONG -WINAPI -RemoveVectoredExceptionHandler( - PVOID VectoredHandlerHandle - ) -{ - STUB; - return 0; } /*

15 years, 8 months

[fireball] 40781: - Handle failure case correctly in *_submit_urb: remove URB from an endpoint's linked list, instead of corrupting this URB's memory. Thanks to Gregor Schneider for spotting the suspicious place. See issue #4279 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 4 13:32:02 2009 New Revision: 40781 URL: http://svn.reactos.org/svn/reactos?rev=40781&view=rev Log: - Handle failure case correctly in *_submit_urb: remove URB from an endpoint's linked list, instead of corrupting this URB's memory. Thanks to Gregor Schneider for spotting the suspicious place. See issue #4279 for more details. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Mon May 4 13:32:02 2009 @@ -798,7 +798,7 @@ LBL_OUT2: pdev->ref_count--; - RemoveEntryList((PLIST_ENTRY) purb); + RemoveEntryList(&purb->urb_link); LBL_OUT: unlock_dev(pdev, TRUE); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Mon May 4 13:32:02 2009 @@ -1436,7 +1436,7 @@ LBL_OUT2: pdev->ref_count--; - RemoveEntryList((PLIST_ENTRY) purb); + RemoveEntryList(&purb->urb_link); LBL_OUT: unlock_dev(pdev, TRUE);

15 years, 8 months

[fireball] 40780: - Silence pool debugging debugprints.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 4 12:33:58 2009 New Revision: 40780 URL: http://svn.reactos.org/svn/reactos?rev=40780&view=rev Log: - Silence pool debugging debugprints. Modified: trunk/reactos/ntoskrnl/mm/dbgpool.c Modified: trunk/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/dbgpool.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] Mon May 4 12:33:58 2009 @@ -96,7 +96,7 @@ /* Protect the guard page */ MmSetPageProtect(NULL, (PVOID)GuardArea, PAGE_NOACCESS); - DPRINT1("Allocating whole page block Tag %c%c%c%c, Buffer %p, Header %p, UserData %p, GuardArea %p, Size %d\n", + DPRINT("Allocating whole page block Tag %c%c%c%c, Buffer %p, Header %p, UserData %p, GuardArea %p, Size %d\n", Tag & 0xFF, (Tag >> 8) & 0xFF, (Tag >> 16) & 0xFF, (Tag >> 24) & 0xFF, Buffer, Header, UserData, GuardArea, Size); @@ -115,7 +115,7 @@ Header = (PEI_WHOLE_PAGE_HEADER) (((PCHAR)Block) - sizeof(EI_WHOLE_PAGE_HEADER)); - DPRINT1("Freeing whole page block at %08x (Tag %c%c%c%c, %x Header %x)\n", Block, + DPRINT("Freeing whole page block at %08x (Tag %c%c%c%c, %x Header %x)\n", Block, Header->Tag & 0xFF, (Header->Tag >> 8) & 0xFF, (Header->Tag >> 16) & 0xFF, (Header->Tag >> 24) & 0xFF, Header->Tag, Header);

15 years, 8 months

[dchapyshev] 40779: - Try to fix build

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun May 3 20:04:20 2009 New Revision: 40779 URL: http://svn.reactos.org/svn/reactos?rev=40779&view=rev Log: - Try to fix build Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=407… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Sun May 3 20:04:20 2009 @@ -272,6 +272,10 @@ return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); } + __CRT_INLINE int __cdecl __fpclassify (double x){ + return __fpclassifyl((long double)x); + } + #define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ : sizeof (x) == sizeof (double) ? __fpclassify (x) \ : __fpclassifyl (x))

15 years, 8 months

[dgoette] 400: * allow admins to translate every language (spotted by frik85) * don't switch toolbar while sort by columns (spotted by d0g) * allow to compare selected entries from overview again (spotted by Colin_Finck) * hide help for now (there is non written yet and I don't have the time to)

by dgoette＠svn.reactos.org

Author: dgoette Date: Sun May 3 20:00:39 2009 New Revision: 400 URL: http://svn.reactos.org/svn/reactos?rev=400&view=rev Log: * allow admins to translate every language (spotted by frik85) * don't switch toolbar while sort by columns (spotted by d0g) * allow to compare selected entries from overview again (spotted by Colin_Finck) * hide help for now (there is non written yet and I don't have the time to) Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms.js branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito… branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms.js [iso-8859-1] Sun May 3 20:00:39 2009 @@ -28,6 +28,7 @@ var filtstring1 = ''; var filtstring2 = ''; +var current_entry_table; @@ -441,7 +442,7 @@ if (setting != filtstring2) { filtstring2 = setting; htmlFilterChoices(setting); - loadEntryTable(); + loadEntryTable(current_entry_table); } } // end of function sortEntryTable Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Sun May 3 20:00:39 2009 @@ -514,6 +514,8 @@ */ function loadEntryTable( objevent ) { + current_entry_table = objevent; + if (document.getElementById('frametable').style.display !== 'block') { document.getElementById('frametable').style.display = 'block'; document.getElementById('frameedit').style.display = 'none'; @@ -635,7 +637,7 @@ /** * shows the edit frame which allows to edit an entry */ -function showEditor( ) +function showEditor( event ) { if (document.getElementById('frameedit').style.display !== 'block') { document.getElementById('frametable').style.display = 'none'; @@ -643,6 +645,13 @@ document.getElementById('newentryarea').style.display = 'none'; document.getElementById('frameedit').style.display = 'block'; } + + if (event == 'diff') { + document.getElementById('editzone').style.display = 'none'; + } + else { + document.getElementById('editzone').style.display = 'block'; + } // deactivate alert-timer window.clearTimeout(alertactiv); @@ -678,7 +687,7 @@ { switch (objevent) { case 'diffentry': - showEditor(); + showEditor('diff'); document.getElementById('frmedithead').innerHTML = '<span class="virtualLink" onclick="loadEntryTableWithOffset(roscms_current_tbl_position)"><strong>« Back</strong></span>   <strong>Compare two Entries</strong>'; break; @@ -2114,7 +2123,7 @@ var cmdhtml_space = ' '; var cmdhtml_diff = '<div class="button" onclick="compareEntries()"><img src="'+roscms_intern_webserver_roscms+'images/compare.png" alt="" /><span class="text">Compare</span></div>'; var cmdhtml_preview = '<div class="button" onclick="previewPage()"><img src="'+roscms_intern_webserver_roscms+'images/preview.png" alt="" /><span class="text">Preview</span></div>'; - var cmdhtml_ready = '<div class="button" onclick="changeSelectedTags(\'mn\')"><img src="'+roscms_intern_webserver_roscms+'images/submit" alt="" /><span class="text">to <em>Pending</em></span></div>'; + var cmdhtml_ready = '<div class="button" onclick="changeSelectedTags(\'mn\')"><img src="'+roscms_intern_webserver_roscms+'images/submit.png" alt="" /><span class="text">to <em>Pending</em></span></div>'; var cmdhtml_stable = ''; Modified: branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php [iso-8859-1] Sun May 3 20:00:39 2009 @@ -103,7 +103,7 @@ <th'.(($this->branch == 'welcome') ? ' class="active"' : '').'> <div class="corner_TL"> <div class="corner_TR"> - <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=welcome" onclick="'."loadBranch()".'">Welcome</a> + <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=welcome" onclick="'."loadBranch()".'">Welcome</a> </div> </div> </th> @@ -115,7 +115,7 @@ <th'.(($this->branch == 'website') ? ' class="active"' : '').'> <div class="corner_TL"> <div class="corner_TR"> - <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=website" onclick="'."loadBranch()".'">Content</a> + <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=website" onclick="'."loadBranch()".'">Content</a> </div> </div> </th> @@ -128,7 +128,7 @@ <th'.(($this->branch == 'maintain') ? ' class="active"' : '').'> <div class="corner_TL"> <div class="corner_TR"> - <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=maintain" onclick="'."loadBranch()".'">Maintain</a> + <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=maintain" onclick="'."loadBranch()".'">Maintain</a> </div> </div> </th> @@ -141,7 +141,7 @@ <th'.(($this->branch == 'stats') ? ' class="active"' : '').'> <div class="corner_TL"> <div class="corner_TR"> - <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=stats" onclick="'."loadBranch()".'">Statistics</a> + <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=stats" onclick="'."loadBranch()".'">Statistics</a> </div> </div> </th> @@ -149,10 +149,10 @@ } echo_strip(' - <th'.(($this->branch == 'help') ? ' class="active"' : '').'> + <th'.(($this->branch == 'help') ? ' class="active"' : '').' style="display:none"> <div class="corner_TL"> <div class="corner_TR"> - <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=help" onclick="'."loadBranch()".'">Help</a> + <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=help" onclick="'."loadBranch()".'">Help</a> </div> </div> </th> Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito… [iso-8859-1] Sun May 3 20:00:39 2009 @@ -971,13 +971,13 @@ private function showDifference( $rev_id1, $rev_id2 ) { // diff source 1 - $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, l.name AS language, r.datetime, u.name AS user_name, t.content FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_USERS." u ON r.user_id = u.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_TEXT." t ON t.rev_id=r.id WHERE r.id = :rev_id AND t.name='content' LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, l.name AS language, r.datetime, u.name AS user_name, t.content, r.status FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_USERS." u ON r.user_id = u.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_TEXT." t ON t.rev_id=r.id WHERE r.id = :rev_id AND t.name='content' LIMIT 1"); $stmt->bindParam('rev_id',$rev_id1,PDO::PARAM_INT); $stmt->execute(); $revision1 = $stmt->fetchOnce(); // diff source 2 - $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, l.name AS language, r.datetime, u.name AS user_name, t.content FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_USERS." u ON r.user_id = u.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_TEXT." t ON t.rev_id=r.id WHERE r.id = :rev_id AND t.name='content' LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, r.id, r.version, l.name AS language, r.datetime, u.name AS user_name, t.content, r.status FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_USERS." u ON r.user_id = u.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_TEXT." t ON t.rev_id=r.id WHERE r.id = :rev_id AND t.name='content' LIMIT 1"); $stmt->bindParam('rev_id',$rev_id2,PDO::PARAM_INT); $stmt->execute(); $revision2 = $stmt->fetchOnce(); @@ -1003,7 +1003,12 @@ <tr> <td style="text-align:center;"> <select name="cbmdiff1" id="cbmdiff1" onchange="'."getDiffEntries(this.value, document.getElementById('cbmdiff2').value)".'">'); - $this->selectRevision($rev_id1); + if ($revision1['status'] == 'stable') { + $this->selectRevision($rev_id1); + } + else { + echo '<option>Not a stable entry.</option>'; + } // history echo_strip(' </select> @@ -1013,7 +1018,12 @@ </td> <td style="text-align:center;"> <select name="cbmdiff2" id="cbmdiff2" onchange="'."getDiffEntries(document.getElementById('cbmdiff1').value, this.value)".'">'); - $this->selectRevision($rev_id2); + if ($revision2['status'] == 'stable') { + $this->selectRevision($rev_id2); + } + else { + echo '<option>Not a stable entry.</option>'; + } // history echo_strip(' </select> Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… [iso-8859-1] Sun May 3 20:00:39 2009 @@ -147,7 +147,7 @@ <div id="smenutab2" class="lmItemTop" onclick="loadMenu(this.id)"> <div id="smenutabc2" class="lmItemBottom">Pending</div> </div> - <div id="smenutab7" class="lmItemTop" onclick="loadMenu(this.id)"'.($thisuser->language() == Language::getStandardId() ? ' style="display:none;"' : '').'> + <div id="smenutab7" class="lmItemTop" onclick="loadMenu(this.id)"'.($thisuser->language() == Language::getStandardId() && !$thisuser->hasAccess('admin') ? ' style="display:none;"' : '').'> <div id="smenutabc7" class="lmItemBottom">Translate</div> </div> <div id="smenutab8" class="lmItemTopSelected" onclick="loadMenu(this.id)">

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009