Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[akhaldi] 62031: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 8 13:32:53 2014 New Revision: 62031 URL: http://svn.reactos.org/svn/reactos?rev=62031&view=rev Log: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861 Added: trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc (with props) trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/regedit/lang/tr-TR.rc trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/intl/lang/tr-TR.rc trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc trunk/reactos/dll/cpl/timedate/lang/tr-TR.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/mshtml/rsrc.rc trunk/reactos/dll/win32/msrle32/rsrc.rc trunk/reactos/dll/win32/msvfw32/rsrc.rc trunk/reactos/dll/win32/msvidc32/rsrc.rc trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2012 - Arda TanrÄ±kulu (ardatan) (ardatanrikulu(a)gmail.com), 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATORS: 2012 - Arda TanrÄ±kulu (ardatan) (ardatanrikulu(a)gmail.com); 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -191,7 +191,7 @@ IDS_DEVICE_MANUFACTURER "Ãretici KimliÄi" IDS_DEVICE_PRODUCT "ÃrÃ¼n KimliÄi" IDS_DEVICE_FORCEFEEDBACK "GÃ¼Ã§ DÃ¶nÃ¼tlÃ¼ SÃ¼rÃ¼cÃ¼sÃ¼" - IDS_NOT_APPLICABLE "n/a" + IDS_NOT_APPLICABLE "Uygulanamaz" IDS_OPTION_YES "Evet" IDS_DIRECTPLAY_COL_NAME1 "Ad" IDS_DIRECTPLAY_COL_NAME2 "DeÄer" @@ -216,7 +216,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Bu sÄ±nama, ReactDraw'Ä± tÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte Ã§izmek iÃ§in kullanacak. TÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte devinen bir ak dikdÃ¶rtgen gÃ¶receksiniz. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?" IDS_DDFULLSCREEN_RESULT "TÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte devinen bir ak dikdÃ¶rtgen gÃ¶rdÃ¼nÃ¼z mÃ¼?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u ikillik) (%uHz)" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bitlik) (%uHz)" IDS_OPTION_NO "HayÄ±r" IDS_D3DTEST_DESCRIPTION "React3D arayÃ¼z sÄ±namasÄ± baÅlatÄ±lacak. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?" IDS_D3DTEST_D3Dx "Bu sÄ±nama, donanÄ±m hÄ±zlandÄ±rmalÄ± React3D %u arayÃ¼zÃ¼nÃ¼ kullanacak." Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -11,11 +11,11 @@ MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", IDM_EXIT END - POPUP "&Device" + POPUP "&AygÄ±t" BEGIN - MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM "&HusÃ»siyetler", IDM_DEVPROPS MENUITEM SEPARATOR - MENUITEM "&Volume Control", IDM_VOLUMECTL + MENUITEM "&Ses DÃ¼zeyi Denetleyicisi", IDM_VOLUMECTL END POPUP "&YardÄ±m" BEGIN @@ -35,6 +35,6 @@ IDS_TOOLTIP_FORWARD "Bir Sonraki" IDS_APPTITLE "Ortam OynatÄ±cÄ±sÄ±" IDS_PLAY "Ãal" - IDS_DEFAULTMCIERRMSG "No description is available for this error" - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." + IDS_DEFAULTMCIERRMSG "Bu yanlÄ±ÅlÄ±ÄÄ±n tanÄ±mÄ± yoktur." + IDS_UNKNOWNFILEEXT "Verilen kÃ¼tÃ¼k tÃ¼rÃ¼nden aygÄ±t tÃ¼rÃ¼ belirlenemiyor." END Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -84,6 +84,9 @@ #ifdef LANGUAGE_TH_TH #include "lang/th-TH.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.rc" #endif Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -47,7 +47,7 @@ CAPTION "YÃ¼kleniyor" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "Olaylar yÃ¼kleniyor, lÃ¼tfen bekleyiniz.", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "Olaylar yÃ¼kleniyor, bekleyiniz.", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -87,8 +87,8 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Olay GÃ¶rÃ¼ntÃ¼leyicisi" - IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s)" + IDS_APP_TITLE_EX "%s - %s Oturum AÃ§ \\\\" + IDS_STATUS_MSG "%s'nin %lu olayÄ± vardÄ±r." IDS_EVENTSTRINGIDNOTFOUND "Kaynaktaki olay kimliÄi (%lu) iÃ§in aÃ§Ä±klama (%s) bulunamadÄ±. Yerli bilgisayarda, uzaktaki bilgisayardan ileti gÃ¶rÃ¼ntÃ¼lemesi iÃ§in gerekli, deÄer bilgileri veyÃ¢ kitaplÄ±klar olmayabilir." IDS_EVENTLOG_ERROR_TYPE "YanlÄ±ÅlÄ±k" IDS_EVENTLOG_WARNING_TYPE "UyarÄ±" Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -206,8 +206,8 @@ IDS_TOOLTIP14 "Ãokgen" IDS_TOOLTIP15 "SÃ¶bek" IDS_TOOLTIP16 "YuvarlatÄ±lmÄ±Å DikdÃ¶rtgen" - IDS_OPENFILTER "Ä°kil EÅlem GÃ¶rÃ¼ntÃ¼leri (*.bmp;*.dib)\1*.bmp;*.dib\1TÃ¼m KÃ¼tÃ¼kler (*.*)\1*.*\1" - IDS_SAVEFILTER "24 Ä°killik Ä°kil EÅlem GÃ¶rÃ¼ntÃ¼sÃ¼ (*.bmp;*.dib)\1*.bmp;*.dib\1" + IDS_OPENFILTER "Bit EÅlem GÃ¶rÃ¼ntÃ¼leri (*.bmp; *.dib)\1*.bmp;*.dib\1TÃ¼m KÃ¼tÃ¼kler (*.*)\1*.*\1" + IDS_SAVEFILTER "24 Bitlik Bit EÅlem GÃ¶rÃ¼ntÃ¼sÃ¼ (*.bmp; *.dib)\1*.bmp;*.dib\1" IDS_FILESIZE "%d Ã§oklu" IDS_PRINTRES "Her metrekarede %d x %d nokta" IDS_INTNUMBERS "Buraya yalnÄ±zca tamsayÄ± girilmelidir." Modified: trunk/reactos/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -284,7 +284,7 @@ ID_EDIT_NEW_KEY "Yeni bir dizin oluÅturur." ID_EDIT_NEW_STRINGVALUE "Yeni bir dizgi deÄeri oluÅturur." ID_EDIT_NEW_BINARYVALUE "Yeni bir ikili deÄer oluÅturur." - ID_EDIT_NEW_DWORDVALUE "Yeni bir 32 ikillik deÄer oluÅturur." + ID_EDIT_NEW_DWORDVALUE "Yeni bir 32 bitlik deÄer oluÅturur." ID_REGISTRY_IMPORTREGISTRYFILE "Uygun bir kÃ¼tÃ¼kten bilgiler alÄ±r." ID_REGISTRY_EXPORTREGISTRYFILE "DeÄer Defteri'nin tÃ¼mÃ¼nÃ¼ ya da bir bÃ¶lÃ¼mÃ¼nÃ¼ bir kÃ¼tÃ¼Äe kaydeder." ID_REGISTRY_LOADHIVE "DeÄer Defteri'ne bir yÄ±ÄÄ±n yÃ¼kler." @@ -347,7 +347,7 @@ IDS_EXPORT_REG_FILE "DeÄer KÃ¼tÃ¼ÄÃ¼ne Ver" IDS_LOAD_HIVE "YÄ±ÄÄ±n YÃ¼kle" IDS_UNLOAD_HIVE "YÄ±ÄÄ±nÄ± KaldÄ±r" - IDS_INVALID_DWORD "(Bu 32 ikillik deÄer geÃ§ersizdir.)" + IDS_INVALID_DWORD "(Bu 32 bitlik deÄer geÃ§ersizdir.)" END STRINGTABLE Modified: trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -27,35 +27,35 @@ MENUITEM "&AÃ§...", ID_FILE_OPEN MENUITEM "&Kaydet", ID_FILE_SAVE, GRAYED MENUITEM "Ay&rÄ± Kaydet...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED - MENUITEM "Properties", ID_FILE_PROPERTIES + MENUITEM "Y&eniden YÃ¼kle...", ID_FILE_RESTORE, GRAYED + MENUITEM "&HusÃ»siyetler", ID_FILE_PROPERTIES MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "&DÃ¼zen" BEGIN - MENUITEM "&Copy", ID_EDIT_COPY - MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED - MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM "&ÃoÄalt", ID_EDIT_COPY + MENUITEM "&Ekleyerek YapÄ±ÅtÄ±r", ID_EDIT_PASTE, GRAYED + MENUITEM "&KarÄ±ÅtÄ±rarak YapÄ±ÅtÄ±r", ID_EDIT_PASTEMIX, GRAYED MENUITEM SEPARATOR - MENUITEM "&Insert File...", ID_EDIT_INSERTFILE - MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM "K&Ã¼tÃ¼k Ekle...", ID_EDIT_INSERTFILE + MENUITEM "KÃ¼&tÃ¼kle KarÄ±ÅtÄ±r...", ID_EDIT_MIXFILE MENUITEM SEPARATOR - MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED - MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM "&Åimdiki Konumun Ãncesini Sil",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Å&imdiki Konumun SonrasÄ±nÄ± Sil",ID_EDIT_DELETEAFTER, GRAYED MENUITEM SEPARATOR - MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + MENUITEM "&Ses HusÃ»sÃ®yetleri", ID_EDIT_AUDIOPROPS END - POPUP "Effect&s" + POPUP "&Etkiler" BEGIN - MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL - MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM "&Sesi %25 ArttÄ±r", ID_EFFECTS_INCVOL + MENUITEM "S&esi DÃ¼ÅÃ¼r", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "&HÄ±zÄ± %100 ArttÄ±r", ID_EFFECTS_INCSPD + MENUITEM "H&Ä±zÄ± DÃ¼ÅÃ¼r", ID_EFFECTS_DECSPD MENUITEM SEPARATOR - MENUITEM "&Add Echo", ID_EFFECTS_ECHO - MENUITEM "&Reverse", ID_EFFECTS_REVERSE + MENUITEM "&YankÄ± Ekle", ID_EFFECTS_ECHO + MENUITEM "&Tersine Ãevir", ID_EFFECTS_REVERSE END POPUP "&YardÄ±m" BEGIN @@ -74,7 +74,7 @@ IDS_STRPOS "Konum: %.2f s" IDS_STRDUR "Uzunluk: %.2f s" IDS_STRBUF "Ara Bellek: %.2f KB" - IDS_STRFMT "%.1f kHz, %u ikillik" + IDS_STRFMT "%.1f kHz, %u bitlik" IDS_STRMONO "Tek Yollu" IDS_STRSTEREO "Ãift Yollu" IDS_STRCHAN "%s" Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -341,7 +341,7 @@ ID_HELP_TOPICS "GÃ¶rev YÃ¶neticisi ile ilgili yardÄ±m konularÄ±nÄ± gÃ¶rÃ¼ntÃ¼ler." ID_HELP_ABOUT "GÃ¶rev YÃ¶neticisi ile ilgili bilgi gÃ¶rÃ¼ntÃ¼ler." ID_FILE_EXIT "GÃ¶rev YÃ¶neticisi'nden Ã§Ä±kar." - ID_OPTIONS_SHOW16BITTASKS "FarazÃ® DOS makinesi (ntvdm.exe) altÄ±nda Ã§alÄ±Åan 16 ikillik uygulamalarÄ± da gÃ¶rÃ¼ntÃ¼ler." + ID_OPTIONS_SHOW16BITTASKS "FarazÃ® DOS makinesi (ntvdm.exe) altÄ±nda Ã§alÄ±Åan 16 bitlik uygulamalarÄ± da gÃ¶rÃ¼ntÃ¼ler." ID_VIEW_SELECTCOLUMNS """Ä°Ålemler"" sekmesinde hangi dikeÃ§lerin gÃ¶rÃ¼ntÃ¼lenip gÃ¶rÃ¼ntÃ¼lenmeyeceÄini belirler." ID_VIEW_SHOWKERNELTIMES "Ä°Ålemci Ã§izgelerinde Ã§ekirdek zamanlarÄ±nÄ± gÃ¶sterir." ID_VIEW_CPUHISTORY_ONEGRAPHALL "Toplam CPU kullanÄ±mÄ±nÄ± tek Ã§izgede gÃ¶sterir." Modified: trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -139,7 +139,7 @@ BEGIN IDS_CPLNAME "DonanÄ±m Ekle" IDS_CPLDESCRIPTION "Bilgisayara donanÄ±m ekler." - IDS_SEARCHTITLE "YardÄ±mcÄ±, donanÄ±mÄ± ararken lÃ¼tfen bekleyiniz..." + IDS_SEARCHTITLE "YardÄ±mcÄ±, donanÄ±mÄ± ararken bekleyiniz..." IDS_SEARCHTEXT "YardÄ±mcÄ±, az Ã¶nce bilgisayara baÄlanan ancak daha kurulmayan donanÄ±m iÃ§in arÄ±yor." IDS_ISCONNECTED "DonanÄ±m baÄlÄ± mÄ±?" IDS_PROBELISTTITLE "AÅaÄÄ±daki donanÄ±m, bilgisayarda Ã¶nceden kurulu." Modified: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -196,15 +196,15 @@ STRINGTABLE BEGIN - IDS_ERROR "Error" - IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)" - IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)" - IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)" - IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page" - IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page" - IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International" - IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International" - IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" - IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" - IDS_ERROR_INPUT_DLL "Unable to start input.dll" -END + IDS_ERROR "YanlÄ±ÅlÄ±k" + IDS_ERROR_SYMBOL_SEPARATE "Girilen kÄ±sa tÃ¢rih ayÄ±racÄ± yanlÄ±Å simge(ler) iÃ§eriyor." + IDS_ERROR_SYMBOL_FORMAT_SHORT "Girilen kÄ±sa tÃ¢rih biÃ§imi yanlÄ±Å simge(ler) iÃ§eriyor." + IDS_ERROR_SYMBOL_FORMAT_LONG "Girilen uzun tÃ¢rih biÃ§imi yanlÄ±Å simge(ler) iÃ§eriyor." + IDS_ERROR_OEM_CODE_PAGE "OEM dÃ¼zgÃ¼ sayfasÄ±nÄ±n okunmasÄ±nda sorun var." + IDS_ERROR_ANSI_CODE_PAGE "ANSI dÃ¼zgÃ¼ sayfasÄ±nÄ±n okunmasÄ±nda sorun var." + IDS_ERROR_INT_KEY_REG "HKCU\\Control Panel\\International dizininin aÃ§Ä±lmasÄ±nda sorun var." + IDS_ERROR_DEF_INT_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin aÃ§Ä±lmasÄ±nda sorun var." + IDS_ERROR_NLS_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin aÃ§Ä±lmasÄ±nda sorun var." + IDS_ERROR_NLS_CODE_REG "HKU\\.DEFAULT\\Control Panel\\International dizininin aÃ§Ä±lmasÄ±nda sorun var." + IDS_ERROR_INPUT_DLL "input.dll baÅlatÄ±lamÄ±yor." +END Modified: trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -251,7 +251,7 @@ 5837 "Yeni E-Posta Bildirimi" 5838 "Gezinmeyi BaÅlatma" 5839 "Ãizeylem AÃ§ma" - 5840 "YazdÄ±rma TamamlandÄ±" + 5840 "YazdÄ±rma Bitirildi" 5841 "AÅaÄÄ± Geri Getirme" 5842 "YukarÄ± Geri Getirme" 5843 "YÄ±ldÄ±z Ä°mi" Modified: trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/tr-T… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -121,7 +121,7 @@ IDS_PowerActionHibernate "AnÄ±kta Beklet" IDS_PowerActionShutdown "Kapat" IDS_PowerActionRestart "Yeniden BaÅlat" - IDS_PowerActionShutdownOff "Kapat ve Turn the Power Off" + IDS_PowerActionShutdownOff "Kapat ve GÃ¼cÃ¼ Kes" IDS_PowerActionWarmEject "Ne YapÄ±lacaÄÄ±nÄ± Sor" IDS_PowerActionNone2 "Yok" IDS_TIMEOUT1 "1 DakÃ®ka Sonra" Modified: trunk/reactos/dll/cpl/timedate/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/tr-T… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -54,6 +54,6 @@ IDS_TIMEZONEUNKNOWN "Bilinmeyen" IDS_INETTIMESUCSYNC "Zaman, %s.%s:%s ile baÅarÄ±yla eÅlendi." IDS_INETTIMENEXTSYNC "Bir Dahaki EÅleme: %s.%s" - IDS_INETTIMESYNCING "ReactOS, zamÃ¢nÄ± %s ile eÅlerken lÃ¼tfen bekleyiniz." + IDS_INETTIMESYNCING "ReactOS, zamÃ¢nÄ± %s ile eÅlerken bekleyiniz." IDS_INETTIMEERROR "ReactOS, zamÃ¢nÄ± %s ile eÅlerken bir yanlÄ±ÅlÄ±k oldu." END Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/co… ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -59,7 +59,7 @@ IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Sihirbaz" +CAPTION "YardÄ±mcÄ±" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Geri", IDC_BACK_BUTTON,56,138,55,14 Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -82,7 +82,7 @@ PD32_PRINTER_STATUS_PAPER_OUT "KÃ¢ÄÄ±t yok; " PD32_PRINTER_STATUS_MANUAL_FEED "Elle kÃ¢ÄÄ±t besleme; " PD32_PRINTER_STATUS_PAPER_PROBLEM "KÃ¢ÄÄ±t sorunu var; " - PD32_PRINTER_STATUS_OFFLINE "ÃevrimdÄ±ÅÄ±; " + PD32_PRINTER_STATUS_OFFLINE "Ãevrim DÄ±ÅÄ±; " PD32_PRINTER_STATUS_IO_ACTIVE "G/Ã Etkin; " PD32_PRINTER_STATUS_BUSY "KullanÄ±mda; " PD32_PRINTER_STATUS_PRINTING "YazdÄ±rÄ±lÄ±yor; " Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -73,6 +73,9 @@ #ifdef LANGUAGE_SV_SE #include "lang/crypt32_Sv.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/crypt32_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/crypt32_Uk.rc" #endif Added: trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc (added) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -0,0 +1,238 @@ +/* + * crypt32 dll resources + * + * Copyright (C) 2006 Juan Lang + * + * Translated to Turkish by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) in 2013 and 2014. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_AUTHORITY_KEY_ID "Yetki AnahtarÄ± TanÄ±mlayÄ±cÄ±sÄ±" + IDS_KEY_ATTRIBUTES "Anahtar HusÃ»siyetleri" + IDS_KEY_USAGE_RESTRICTION "Anahtar KullanÄ±mÄ± KÄ±sÄ±tlamasÄ±" + IDS_SUBJECT_ALT_NAME "Konu DiÄer AdÄ±" + IDS_ISSUER_ALT_NAME "DaÄÄ±tan DiÄer AdÄ±" + IDS_BASIC_CONSTRAINTS "Ana KÄ±sÄ±tlamalar" + IDS_KEY_USAGE "Anahtar KullanÄ±mÄ±" + IDS_CERT_POLICIES "Onay Belgesi Ä°lkeleri" + IDS_SUBJECT_KEY_IDENTIFIER "Konu AnahtarÄ± TanÄ±mlayÄ±cÄ±sÄ±" + IDS_CRL_REASON_CODE "CRL Neden DÃ¼zgÃ¼sÃ¼" + IDS_CRL_DIST_POINTS "CRL DaÄÄ±tÄ±m NoktalarÄ±" + IDS_ENHANCED_KEY_USAGE "GeliÅmiÅ Anahtar KullanÄ±mÄ±" + IDS_AUTHORITY_INFO_ACCESS "Yetkili Bilgi EriÅimi" + IDS_CERT_EXTENSIONS "Onay Belgesi Eklentileri" + IDS_NEXT_UPDATE_LOCATION "Bir Sonraki ÅimdikileÅtirme Konumu" + IDS_YES_OR_NO_TRUST "GÃ¼venmeye Evet ya da HayÄ±r" + IDS_EMAIL_ADDRESS "E-Posta Adresi" + IDS_UNSTRUCTURED_NAME "YapÄ±lÄ±k Olmayan Ad" + IDS_CONTENT_TYPE "Ä°Ã§erik TÃ¼rÃ¼" + IDS_MESSAGE_DIGEST "Ä°leti Ãzeti" + IDS_SIGNING_TIME "Ä°mzÃ¢lama ZamÃ¢nÄ±" + IDS_COUNTER_SIGN "Onay Ä°mzÃ¢sÄ±" + IDS_CHALLENGE_PASSWORD "Åifre Sorma" + IDS_UNSTRUCTURED_ADDRESS "YapÄ±lÄ±k Olmayan Adres" + IDS_SMIME_CAPABILITIES "S/MIME Yetenekleri" + IDS_PREFER_SIGNED_DATA "Ä°mzÃ¢lÄ± Veriyi YeÄleme" + IDS_CPS "CPS" + IDS_USER_NOTICE "KullanÄ±cÄ± Bildirisi" + IDS_OCSP "Ãevrim Ä°Ã§i Onay Belgesi Durum ProtokolÃ¼" + IDS_CA_ISSUER "Onaylama Yetkilisi DaÄÄ±tÄ±cÄ±sÄ±" + IDS_CERT_TEMPLATE_NAME "Onay Belgesi Ãrnek AdÄ±" + IDS_CERT_TYPE "Onay Belgesi TÃ¼rÃ¼" + IDS_CERT_MANIFOLD "Onay Belgesi SÃ»reti" + IDS_NETSCAPE_CERT_TYPE "Netscape Onay Belgesi TÃ¼rÃ¼" + IDS_NETSCAPE_BASE_URL "Netscape TabanlÄ± URL" + IDS_NETSCAPE_REVOCATION_URL "Netscape Ä°ptal URL'si" + IDS_NETSCAPE_CA_REVOCATION_URL "Netscape CA Ä°ptal URL'si" + IDS_NETSCAPE_CERT_RENEWAL_URL "Netscape Onay Belgesi Yenileme URL'si" + IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Ä°lke URL'si" + IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Sunucu AdÄ±" + IDS_NETSCAPE_COMMENT "Netscape Yorumu" + IDS_COUNTRY "Ãlke/BÃ¶lge" + IDS_ORGANIZATION "KuruluÅ" + IDS_ORGANIZATIONAL_UNIT "KuruluÅ Birimi" + IDS_COMMON_NAME "Bilinen AdÄ±" + IDS_LOCALITY "Konum" + IDS_STATE_OR_PROVINCE "Ä°l veyÃ¢ EyÃ¢let" + IDS_TITLE "BaÅlÄ±k" + IDS_GIVEN_NAME "Verilen Ad" + IDS_INITIALS "BaÅ HÃ¢rfleri" + IDS_SUR_NAME "SoyadÄ±" + IDS_DOMAIN_COMPONENT "Etki AlanÄ± BileÅeni" + IDS_STREET_ADDRESS "Sokak Adresi" + IDS_SERIAL_NUMBER "Dizi NumarasÄ±" + IDS_CA_VERSION "CA SÃ¼rÃ¼mÃ¼" + IDS_CROSS_CA_VERSION "Ãapraz CA SÃ¼rÃ¼mÃ¼" + IDS_SERIALIZED_SIG_SERIAL_NUMBER "DizilendirilmiÅ Ä°mzÃ¢ Dizi NumarasÄ±" + IDS_PRINCIPAL_NAME "AsÄ±l AdÄ±" + IDS_WINDOWS_PRODUCT_UPDATE "Pencereler ÃrÃ¼nÃ¼ ÅimdikileÅtirmesi" + IDS_ENROLLMENT_NAME_VALUE_PAIR "KaydedilmiÅ Ad DeÄeri Ãifti" + IDS_OS_VERSION "Ä°Åletim Dizgesi SÃ¼rÃ¼mÃ¼" + IDS_ENROLLMENT_CSP "KayÄ±t CSP'si" + IDS_CRL_NUMBER "CRL NumarasÄ±" + IDS_DELTA_CRL_INDICATOR "Delta CRL GÃ¶stergesi" + IDS_ISSUING_DIST_POINT "YayÄ±mlama DaÄÄ±tÄ±m NoktasÄ±" + IDS_FRESHEST_CRL "En Yeni CRL" + IDS_NAME_CONSTRAINTS "Ad KÄ±sÄ±tlamalarÄ±" + IDS_POLICY_MAPPINGS "Ä°lke PlalamalarÄ±" + IDS_POLICY_CONSTRAINTS "Ä°lke KÄ±sÄ±tlamalarÄ±" + IDS_CROSS_CERT_DIST_POINTS "Ãapraz Onaylama DaÄÄ±tÄ±m NoktalarÄ±" + IDS_APPLICATION_POLICIES "Uygulama Ä°lkeleri" + IDS_APPLICATION_POLICY_MAPPINGS "Uygulama Ä°lke PlanlamalarÄ±" + IDS_APPLICATION_POLICY_CONSTRAINTS "Uygulama Ä°lke KÄ±sÄ±tlamalarÄ±" + IDS_CMC_DATA "CMC Verisi" + IDS_CMC_RESPONSE "CMC YanÄ±tÄ±" + IDS_UNSIGNED_CMC_REQUEST "Ä°mzÃ¢lanmamÄ±Å CMC Ä°steÄi" + IDS_CMC_STATUS_INFO "CMC Durum Bilgisi" + IDS_CMC_EXTENSIONS "CMC Eklentileri" + IDS_CMC_ATTRIBUTES "CMC Ãznitelikleri" + IDS_PKCS_7_DATA "PKCS 7 Verisi" + IDS_PKCS_7_SIGNED "PKCS 7 Ä°mzÃ¢lÄ±" + IDS_PKCS_7_ENVELOPED "PKCS 7 ZarflÄ±" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Ä°mzÃ¢lÄ± ZarflÄ±" + IDS_PKCS_7_DIGESTED "PKCS 7 ÃzetlenmiÅ" + IDS_PKCS_7_ENCRYPTED "PKCS 7 Åifreli" + IDS_PREVIOUS_CA_CERT_HASH "Bir Ãnceki CA Onay Belgesi DÃ¼zgÃ¼sÃ¼" + IDS_CRL_VIRTUAL_BASE "FarazÃ® Taban CRL NumarasÄ±" + IDS_CRL_NEXT_PUBLISH "Bir Sonraki CRL YayÄ±mlamasÄ±" + IDS_CA_EXCHANGE "CA Åifreleme Onay Belgesi" + IDS_KEY_RECOVERY_AGENT "Anahtar Kurtarma YardÄ±mcÄ±sÄ±" + IDS_CERTIFICATE_TEMPLATE "Onay Belgesi Ãrnek Bilgisi" + IDS_ENTERPRISE_ROOT_OID "KuruluÅ KÃ¶k OID'si" + IDS_RDN_DUMMY_SIGNER "Kukla Ä°mzÃ¢layÄ±cÄ±sÄ±" + IDS_ARCHIVED_KEY_ATTR "ÅifrelenmiÅ HusÃ»sÃ® Anahtar" + IDS_CRL_SELF_CDP "YayÄ±mlanan CRL KonumlarÄ±" + IDS_REQUIRE_CERT_CHAIN_POLICY "Onay Belgesi Dizi Ä°lkesini Zorlama" + IDS_TRANSACTION_ID "Eylem KimliÄi" + IDS_SENDER_NONCE "Åimdiki GÃ¶nderici" + IDS_RECIPIENT_NONCE "Åimdiki AlÄ±cÄ±" + IDS_REG_INFO "KayÄ±t Bilgisi" + IDS_GET_CERTIFICATE "Onay Belgesi Al" + IDS_GET_CRL "CRL Al" + IDS_REVOKE_REQUEST "Ä°steÄi Ä°ptal Et" + IDS_QUERY_PENDING "Sorgu Beklemede" + IDS_SORTED_CTL "Onay Belgesi GÃ¼ven Dizelgesi" + IDS_ARCHIVED_KEY_CERT_HASH "BelgeliklenmiÅ Anahtar Onaylama DÃ¼zgÃ¼sÃ¼" + IDS_PRIVATE_KEY_USAGE_PERIOD "HusÃ»sÃ® Anahtar KullanÄ±m DÃ¶nemi" + IDS_CLIENT_INFORMATION "Ä°stemci Bilgisi" + IDS_SERVER_AUTHENTICATION "Sunucu Yetkilendirmesi" + IDS_CLIENT_AUTHENTICATION "Ä°stemci Yetkilendirmesi" + IDS_CODE_SIGNING "DÃ¼zgÃ¼ Ä°mzÃ¢lama" + IDS_SECURE_EMAIL "GÃ¼venli E-Posta" + IDS_TIME_STAMPING "Zaman Damgalama" + IDS_MICROSOFT_TRUST_LIST_SIGNING "MikroyazÄ±lÄ±m GÃ¼ven Dizelgesi Ä°mzÃ¢lamasÄ±" + IDS_MICROSOFT_TIME_STAMPING "MikroyazÄ±lÄ±m Zaman DamgalamasÄ±" + IDS_IPSEC_END_SYSTEM "IP GÃ¼venlik UÃ§ Dizgesi" + IDS_IPSEC_TUNNEL "IP GÃ¼venlik TÃ¼nel Sonu" + IDS_IPSEC_USER "IP GÃ¼venlik KullanÄ±cÄ±sÄ±" + IDS_EFS "Åifreleyici KÃ¼tÃ¼k Dizgesi" + IDS_WHQL_CRYPTO "Pencereler DonanÄ±m SÃ¼rÃ¼cÃ¼sÃ¼ DoÄrulamasÄ±" + IDS_NT5_CRYPTO "Pencereler Dizge BileÅeni DoÄrulamasÄ±" + IDS_OEM_WHQL_CRYPTO "OEM Pencereler Dizge BileÅeni DoÄrulamasÄ±" + IDS_EMBEDDED_NT_CRYPTO "GÃ¶mÃ¼lÃ¼ Pencereler Dizge BileÅeni DoÄrulamasÄ±" + IDS_KEY_PACK_LICENSES "Anahtar Paketi RusatlarÄ±" + IDS_LICENSE_SERVER "Ruhsat Sunucusu DoÄrulamasÄ±" + IDS_SMART_CARD_LOGON "AkÄ±llÄ± Kart ile Oturum AÃ§ma" + IDS_DIGITAL_RIGHTS "SayÄ±lÄ±k Haklar" + IDS_QUALIFIED_SUBORDINATION "Nitelikli BaÄlÄ±lÄ±k" + IDS_KEY_RECOVERY "Anahtar Kurtarma" + IDS_DOCUMENT_SIGNING "Belge Ä°mzÃ¢lama" + IDS_IPSEC_IKE_INTERMEDIATE "IP GÃ¼venlik IKE AracÄ±sÄ±" + IDS_FILE_RECOVERY "KÃ¼tÃ¼k Kurtarma" + IDS_ROOT_LIST_SIGNER "KÃ¶k Dizelgesi Ä°mzÃ¢layÄ±cÄ±sÄ±" + IDS_ANY_APPLICATION_POLICIES "TÃ¼m Uygulama Ä°lkeleri" + IDS_DS_EMAIL_REPLICATION "Dizin Hizmeti E-Posta SÃ»reti" + IDS_ENROLLMENT_AGENT "Onay Belgesi Ä°stek YardÄ±mcÄ±sÄ±" + IDS_LIFETIME_SIGNING "YaÅam Boyu Ä°mzÃ¢lama" + IDS_ANY_CERT_POLICY "TÃ¼m YayÄ±mlama Ä°lkeleri" +} + +STRINGTABLE +{ + IDS_LOCALIZEDNAME_ROOT "GÃ¼venilir KÃ¶k Onaylama Yetkilileri" + IDS_LOCALIZEDNAME_MY "ÅahsÃ®" + IDS_LOCALIZEDNAME_CA "Ara Onaylama Yetkilileri" + IDS_LOCALIZEDNAME_ADDRESSBOOK "DiÄer Ä°nsanlar" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "GÃ¼venilir YayÄ±mcÄ±lar" + IDS_LOCALIZEDNAME_DISALLOWED "GÃ¼venilmeyen Onay Belgeleri" +} + +STRINGTABLE +{ + IDS_KEY_ID "Anahtar KimliÄi=" + IDS_CERT_ISSUER "Onay Belgesi DaÄÄ±tÄ±cÄ±sÄ±" + IDS_CERT_SERIAL_NUMBER "Onay Belgesi Dizi NumarasÄ±=" + IDS_ALT_NAME_OTHER_NAME "DiÄer AdÄ±=" + IDS_ALT_NAME_RFC822_NAME "E-Posta Adresi=" + IDS_ALT_NAME_DNS_NAME "DNS AdÄ±=" + IDS_ALT_NAME_DIRECTORY_NAME "Dizin Adresi" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "IP Adresi=" + IDS_ALT_NAME_MASK "Maskesi=" + IDS_ALT_NAME_REGISTERED_ID "KayÄ±tlÄ± KimliÄi=" + IDS_USAGE_UNKNOWN "Bilinmeyen Anahtar KullanÄ±mÄ±" + IDS_SUBJECT_TYPE "Konu TÃ¼rÃ¼=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "Son VarlÄ±k" + IDS_PATH_LENGTH "Yol UzunluÄu KÄ±sÄ±tlamasÄ±=" + IDS_PATH_LENGTH_NONE "Yok" + IDS_INFO_NOT_AVAILABLE "Bilgi Yok" + IDS_AIA "Yetkili Bilgi EriÅimi" + IDS_ACCESS_METHOD "EriÅim YÃ¶ntemi=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "CA DaÄÄ±tÄ±cÄ±larÄ±" + IDS_ACCESS_METHOD_UNKNOWN "Bilinmeyen EriÅim YÃ¶ntemi" + IDS_ACCESS_LOCATION "DiÄer AdÄ±" + IDS_CRL_DIST_POINT "CRL DaÄÄ±tÄ±m NoktasÄ±" + IDS_CRL_DIST_POINT_NAME "DaÄÄ±tÄ±m NoktasÄ± AdÄ±" + IDS_CRL_DIST_POINT_FULL_NAME "Tam AdÄ±" + IDS_CRL_DIST_POINT_RDN_NAME "RDN AdÄ±" + IDS_CRL_DIST_POINT_REASON "CRL Nedeni=" + IDS_CRL_DIST_POINT_ISSUER "CRL DaÄÄ±tÄ±cÄ±sÄ±" + IDS_REASON_KEY_COMPROMISE "Anahtar UyuÅmasÄ±" + IDS_REASON_CA_COMPROMISE "CA UyuÅmasÄ±" + IDS_REASON_AFFILIATION_CHANGED "Ãyelik DeÄiÅti" + IDS_REASON_SUPERSEDED "Yerine GeÃ§ti" + IDS_REASON_CESSATION_OF_OPERATION "Ä°Ålem Sona Erdi" + IDS_REASON_CERTIFICATE_HOLD "Onay Belgesini Tutma" + IDS_FINANCIAL_CRITERIA "MÃ¢lÃ® Bilgi=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Var" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Yok" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "ÃlÃ§Ã¼tleri KarÅÄ±layan=" + IDS_YES "Evet" + IDS_NO "HayÄ±r" + IDS_DIGITAL_SIGNATURE "SayÄ±lÄ±k Ä°mzÃ¢" + IDS_NON_REPUDIATION "Ret Olmayan" + IDS_KEY_ENCIPHERMENT "Anahtar Åifreleme" + IDS_DATA_ENCIPHERMENT "Veri Åifreleme" + IDS_KEY_AGREEMENT "Anahtar KabÃ»lÃ¼" + IDS_CERT_SIGN "Onay Belgesi Ä°mzÃ¢lama" + IDS_OFFLINE_CRL_SIGN "Ãevrim DÄ±ÅÄ± CRL Ä°mzÃ¢lama" + IDS_CRL_SIGN "CRL Ä°mzÃ¢lama" + IDS_ENCIPHER_ONLY "YalnÄ±zca Åifrele" + IDS_DECIPHER_ONLY "YalnÄ±zca Åifreyi ÃÃ¶z" + IDS_NETSCAPE_SSL_CLIENT "SSL Ä°stemci Yetkilendirmesi" + IDS_NETSCAPE_SSL_SERVER "SSL Sunucu Yetkilendirmesi" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Ä°mzÃ¢" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "Ä°mzÃ¢ CA" +} Propchange: trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/lang/cr… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,7 +1,9 @@ /* - * cryptdlg Turkish resource + * cryptdlg dll resources * - * Copyright: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * Copyright 2008 Juan Lang + * + * Translated to Turkish by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) in 2013. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,12 +26,12 @@ STRINGTABLE { - IDS_CERT_POLICY "Onay Belgesi PoliÃ§esi" - IDS_POLICY_ID "PoliÃ§e TanÄ±mlayÄ±cÄ±sÄ±: " - IDS_POLICY_QUALIFIER_INFO "PoliÃ§e Niteleyici Bilgisi" - IDS_POLICY_QUALIFIER_ID "PoliÃ§e Niteleyici KimliÄi=" - IDS_CPS "CPS" /* Onay Belgesi Uygulama EsaslarÄ± */ - IDS_USER_NOTICE "KullanÄ±cÄ± Bildirimi" + IDS_CERT_POLICY "Onay Belgesi Ä°lkesi" + IDS_POLICY_ID "Ä°lke TanÄ±mlayÄ±cÄ±sÄ±: " + IDS_POLICY_QUALIFIER_INFO "Ä°lke Niteleyici Bilgisi" + IDS_POLICY_QUALIFIER_ID "Ä°lke Niteleyici KimliÄi=" + IDS_CPS "CPS" /* Certification Practice Statement (Onay Belgesi Uygulama EsaslarÄ±) */ + IDS_USER_NOTICE "KullanÄ±cÄ± Bildirisi" IDS_QUALIFIER "Niteleyici" IDS_NOTICE_REF "Bildirim KaynaÄÄ±" IDS_ORGANIZATION "Kurum=" Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -82,6 +82,9 @@ #ifdef LANGUAGE_RO_RO #include "lang/cryptui_Ro.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/cryptui_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/cryptui_Uk.rc" #endif Added: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc (added) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -0,0 +1,462 @@ +/* + * cryptui dll resources + * + * Copyright 2008 Juan Lang + * + * Translated to Turkish by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) in 2014. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptuires.h" + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CERTIFICATE "Onay Belgesi" + IDS_CERTIFICATEINFORMATION "Onay Belgesi Bilgisi" + IDS_CERT_INFO_BAD_SIG "Bu onay belgesinde geÃ§ersiz bir imzÃ¢ vardÄ±r. Bu onay belgesi deÄiÅtirilmiÅ veyÃ¢ bozulmuÅ olabilir." + IDS_CERT_INFO_UNTRUSTED_CA "Bu kÃ¶k onay belgesi gÃ¼venilir deÄil. Bunu gÃ¼venilir yapmak iÃ§in bunu dizgenizin gÃ¼venilir kÃ¶k onay belgesi deposuna ekleyiniz." + IDS_CERT_INFO_UNTRUSTED_ROOT "Bu onay belgesinin gÃ¼venilir kÃ¶k onay belgesi olduÄu doÄrulanamadÄ±." + IDS_CERT_INFO_PARTIAL_CHAIN "Bu onay belgesinin daÄÄ±tÄ±cÄ±sÄ± bulunamadÄ±." + IDS_CERT_INFO_BAD_PURPOSES "Bu onay belgesinin tÃ¼m kullanÄ±m amaÃ§larÄ± doÄrulanamadÄ±." + IDS_CERT_INFO_PURPOSES "Bu onay belgesi aÅaÄÄ±daki amaÃ§lar iÃ§in anÄ±klanmÄ±ÅtÄ±r:" + IDS_SUBJECT_HEADING "Åuraya DaÄÄ±tÄ±ldÄ±: " + IDS_ISSUER_HEADING "Åu DaÄÄ±ttÄ±: " + IDS_VALID_FROM "Åuradan geÃ§erlidir " + IDS_VALID_TO " Åuraya " + IDS_CERTIFICATE_BAD_SIGNATURE "Bu onay belgesinde geÃ§ersiz bir imzÃ¢ vardÄ±r." + IDS_CERTIFICATE_BAD_TIME "Bu onay belgesinin, sÃ¼resi dolmuÅtur ya da daha geÃ§ersizdir." + IDS_CERTIFICATE_BAD_TIMENEST "Bu onay belgesinin geÃ§erlilik dÃ¶nemi daÄÄ±tÄ±cÄ±sÄ±nÄ±nkisini aÅÄ±yor." + IDS_CERTIFICATE_REVOKED "Bu onay belgesi, daÄÄ±tÄ±cÄ±sÄ± eliyle iptal edildi." + IDS_CERTIFICATE_VALID "Bu onay belgesi doÄrulanmÄ±ÅtÄ±r." + IDS_FIELD "Alan" + IDS_VALUE "DeÄer" + IDS_FIELDS_ALL "<TÃ¼mÃ¼>" + IDS_FIELDS_V1 "YalnÄ±zca SÃ¼rÃ¼m 1 AlanlarÄ±" + IDS_FIELDS_EXTENSIONS "YalnÄ±zca Eklentiler" + IDS_FIELDS_CRITICAL_EXTENSIONS "YalnÄ±zca Ãnemli Eklentiler" + IDS_FIELDS_PROPERTIES "YalnÄ±zca HusÃ»siyetler" + IDS_FIELD_VERSION "SÃ¼rÃ¼m" + IDS_FIELD_SERIAL_NUMBER "Dizi numarasÄ±" + IDS_FIELD_ISSUER "DaÄÄ±tÄ±cÄ±" + IDS_FIELD_VALID_FROM "Åuradan geÃ§erlidir" + IDS_FIELD_VALID_TO "Åuraya geÃ§erlidir" + IDS_FIELD_SUBJECT "Konu" + IDS_FIELD_PUBLIC_KEY "AÃ§Ä±k anahtar" + IDS_FIELD_PUBLIC_KEY_FORMAT "%1 (%2!d! bit)" + IDS_PROP_HASH "SHA1 dÃ¼zgÃ¼sÃ¼" + IDS_PROP_ENHKEY_USAGE "GeliÅmiÅ anahtar kullanÄ±mÄ± (husÃ»siyet)" + IDS_PROP_FRIENDLY_NAME "Kolay adÄ±" + IDS_PROP_DESCRIPTION "TanÄ±mÄ±" + IDS_CERTIFICATE_PROPERTIES "Onay Belgesi HusÃ»siyetleri" + IDS_CERTIFICATE_PURPOSE_ERROR "1.2.3.4 biÃ§iminde bir OID giriniz." + IDS_CERTIFICATE_PURPOSE_EXISTS "GirdiÄiniz OID Ã¶nceden var." + IDS_SELECT_STORE_TITLE "Onay Belgesi Deposu SeÃ§me" + IDS_SELECT_STORE "Bir onay belgesi deposu seÃ§iniz." + IDS_IMPORT_WIZARD "Onay Belgesi Alma YardÄ±mcÄ±sÄ±" + IDS_IMPORT_TYPE_MISMATCH "Bu kÃ¼tÃ¼k, verilen Ã¶lÃ§Ã¼tlerle uyuÅmayan nesneler iÃ§eriyor. BaÅka bir kÃ¼tÃ¼k seÃ§iniz." + IDS_IMPORT_FILE_TITLE "AlÄ±nacak KÃ¼tÃ¼k" + IDS_IMPORT_FILE_SUBTITLE "Almak istediÄiniz kÃ¼tÃ¼ÄÃ¼ belirtiniz." + IDS_IMPORT_STORE_TITLE "Onay Belgesi Deposu" + IDS_IMPORT_STORE_SUBTITLE "Onay belgesi depolarÄ±; onay belgelerinden, onay belgesi iptal dizelgelerinden ve onay belgesi gÃ¼ven dizelgelerinden oluÅan derlemlerdir." + IDS_IMPORT_FILTER_CERT "X.509 Onay Belgesi (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "ÅahsÃ® Bilgi DeÄiÅtirmesi (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "Onay Belgesi Ä°ptal Dizelgesi (*.crl)" + IDS_IMPORT_FILTER_CTL "Onay Belgesi GÃ¼ven Dizelgesi (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "MikroyazÄ±lÄ±m DizilendirilmiÅ Onay Belgesi Deposu (*.sst)" + IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 Ä°letileri (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "TÃ¼m KÃ¼tÃ¼kler (*.*)" + IDS_IMPORT_EMPTY_FILE "Bir kÃ¼tÃ¼k seÃ§iniz." + IDS_IMPORT_BAD_FORMAT "Bu kÃ¼tÃ¼k biÃ§imi tanÄ±nmÄ±Å deÄil. BaÅka bir kÃ¼tÃ¼k seÃ§iniz." + IDS_IMPORT_OPEN_FAILED "AÃ§Ä±lmadÄ±." + IDS_IMPORT_DEST_DETERMINED "Ãizeylem eliyle karar verildi." + IDS_IMPORT_SELECT_STORE "Bir depo seÃ§iniz." + IDS_IMPORT_STORE_SELECTION "Onay belgesi deposu seÃ§ildi." + IDS_IMPORT_DEST_AUTOMATIC "Ãizeylem eliyle kendilÄinden karar verildi." + IDS_IMPORT_FILE "KÃ¼tÃ¼k" + IDS_IMPORT_CONTENT "Ä°Ã§erik" + IDS_IMPORT_CONTENT_CERT "Onay Belgesi" + IDS_IMPORT_CONTENT_CRL "Onay Belgesi Ä°ptal Dizelgesi" + IDS_IMPORT_CONTENT_CTL "Onay Belgesi GÃ¼ven Dizelgesi" + IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 Ä°letisi" + IDS_IMPORT_CONTENT_PFX "ÅahsÃ® Bilgi DeÄiÅtirmesi" + IDS_IMPORT_CONTENT_STORE "Onay Belgesi Deposu" + IDS_IMPORT_SUCCEEDED "Alma iÅlemi baÅarÄ±lÄ± oldu." + IDS_IMPORT_FAILED "Alma iÅlemi baÅarÄ±sÄ±z oldu." + IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "<TÃ¼mÃ¼>" + IDS_PURPOSE_ADVANCED "<GeliÅmiÅ AmaÃ§lar>" + IDS_SUBJECT_COLUMN "Åuraya DaÄÄ±tÄ±ldÄ±" + IDS_ISSUER_COLUMN "Eliyle DaÄÄ±tÄ±ldÄ±" + IDS_EXPIRATION_COLUMN "BitiÅ ZamÃ¢nÄ±" + IDS_FRIENDLY_NAME_COLUMN "Kolay AdÄ±" + IDS_ALLOWED_PURPOSE_ALL "<TÃ¼mÃ¼>" + IDS_ALLOWED_PURPOSE_NONE "<Yok>" + IDS_WARN_REMOVE_MY "ArtÄ±k bu onay belgesiyle, iletileri Ã§Ã¶zemeyeceksiniz veyÃ¢ iletileri imzÃ¢layamayacaksÄ±nÄ±z.\n\ +Bu onay belgesini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_PLURAL_MY "ArtÄ±k bu onay belgeleriyle, iletileri Ã§Ã¶zemeyeceksiniz veyÃ¢ iletileri imzÃ¢layamayacaksÄ±nÄ±z.\n\ +Bu onay belgelerini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_ADDRESSBOOK "ArtÄ±k bu onay belgesiyle, iletileri Åifreleyemeyeceksiniz veyÃ¢ imzÃ¢lanmÄ±Å iletileri doÄrulayamayacaksÄ±nÄ±z.\n\ +Bu onay belgesini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "ArtÄ±k bu onay belgeleriyle, iletileri Åifreleyemeyeceksiniz veyÃ¢ imzÃ¢lanmÄ±Å iletileri doÄrulayamayacaksÄ±nÄ±z.\n\ +Bu onay belgelerini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_CA "ArtÄ±k bu onaylama yetkilisiyle daÄÄ±tÄ±lan onay belgeleri gÃ¼venilir olmayacaktÄ±r.\n\ +Bu onay belgesini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_PLURAL_CA "ArtÄ±k bu onaylama yetkilileriyle daÄÄ±tÄ±lan onay belgeleri gÃ¼venilir olmayacaktÄ±r.\n\ +Bu onay belgelerini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_ROOT "ArtÄ±k, bu kÃ¶k onaylama yetkilisiyle daÄÄ±tÄ±lan onay belgeleri ve daÄÄ±tan bu onaylama yetkilisi gÃ¼venilir olmayacaktÄ±r.\n\ +Bu gÃ¼venilir kÃ¶k onay belgesini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_PLURAL_ROOT "ArtÄ±k, bu kÃ¶k onaylama yetkilileriyle daÄÄ±tÄ±lan onay belgeleri ve daÄÄ±tan bu onaylama yetkilileri gÃ¼venilir olmayacaktÄ±r.\n\ +Bu gÃ¼venilir kÃ¶k onay belgelerini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_TRUSTEDPUBLISHER "ArtÄ±k, bu yayÄ±mcÄ±nÄ±n imzÃ¢ladÄ±ÄÄ± yazÄ±lÄ±m gÃ¼venilir olmayacaktÄ±r.\n\ +Bu onay belgesini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "ArtÄ±k, bu yayÄ±mcÄ±larnÄ±n imzÃ¢ladÄ±ÄÄ± yazÄ±lÄ±m gÃ¼venilir olmayacaktÄ±r.\n\ +Bu onay belgelerini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_DEFAULT "Bu onay belgesini silmeyi onaylÄ±yor musunuz?" + IDS_WARN_REMOVE_PLURAL_DEFAULT "Bu onay belgelerini silmeyi onaylÄ±yor musunuz?" + IDS_CERT_MGR "Onay Belgeleri" + IDS_FRIENDLY_NAME_NONE "<Yok>" + IDS_PURPOSE_SERVER_AUTH "Uzaktaki bilgisayarÄ±n kimliÄini saÄlar." + IDS_PURPOSE_CLIENT_AUTH "Uzaktaki bilgisayara kimliÄinizi tanÄ±ttÄ±rÄ±r." + IDS_PURPOSE_CODE_SIGNING "YazÄ±lÄ±m yayÄ±mcÄ±sÄ±ndan gelen yazÄ±lÄ±mÄ± korur.\n\ +YazÄ±lÄ±mÄ± yayÄ±mlamadan sonraki deÄiÅikliklerden korur." + IDS_PURPOSE_EMAIL_PROTECTION "E-posta iletilerini korur." + IDS_PURPOSE_IPSEC "ÃrÃ¼tbaÄ Ã¼zerinden gÃ¼venli iletiÅim saÄlar." + IDS_PURPOSE_TIMESTAMP_SIGNING "Verilerin Åimdiki zamanla imzÃ¢lanmasÄ±nÄ± saÄlar." + IDS_PURPOSE_CTL_USAGE_SIGNING "Onay belgesi gÃ¼ven dizelgesini sayÄ±lÄ±k olarak imzÃ¢lamanÄ±zÄ± saÄlar." + IDS_PURPOSE_EFS "Diskteki verilerin Åifrelenmesini saÄlar." + IDS_PURPOSE_EFS_RECOVERY "KÃ¼tÃ¼k Kurtarma" + IDS_PURPOSE_WHQL "Pencereler DonanÄ±m SÃ¼rÃ¼cÃ¼sÃ¼ DoÄrulamasÄ±" + IDS_PURPOSE_NT5 "Pencereler Dizge BileÅeni DoÄrulamasÄ±" + IDS_PURPOSE_OEM_WHQL "OEM Pencereler Dizge BileÅeni DoÄrulamasÄ±" + IDS_PURPOSE_EMBEDDED_NT "GÃ¶mÃ¼lÃ¼ Pencereler Dizge BileÅeni DoÄrulamasÄ±" + IDS_PURPOSE_ROOT_LIST_SIGNER "KÃ¶k Dizelgesi Ä°mzÃ¢layÄ±cÄ±sÄ±" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Nitelikli BaÄlÄ±lÄ±k" + IDS_PURPOSE_KEY_RECOVERY "Anahtar Kurtarma" + IDS_PURPOSE_DOCUMENT_SIGNING "Belge Ä°mzÃ¢lama" + IDS_PURPOSE_LIFETIME_SIGNING "YaÅam Boyu Ä°mzÃ¢lama" + IDS_PURPOSE_DRM "SayÄ±lÄ±k Haklar" + IDS_PURPOSE_LICENSES "Anahtar Paketi RuhsatlarÄ±" + IDS_PURPOSE_LICENSE_SERVER "Ruhsat Sunucusu DoÄrulamasÄ±" + IDS_PURPOSE_ENROLLMENT_AGENT "Onay Belgesi Ä°stek YardÄ±mcÄ±sÄ±" + IDS_PURPOSE_SMARTCARD_LOGON "AkÄ±llÄ± Kart ile Oturum AÃ§ma" + IDS_PURPOSE_CA_EXCHANGE "HusÃ»sÃ® Anahtar BelgelikliÄi" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Anahtar Kurtarma YardÄ±mcÄ±sÄ±" + IDS_PURPOSE_DS_EMAIL_REPLICATION "Dizin Hizmeti E-Posta SÃ»reti" + IDS_EXPORT_WIZARD "Onay Belgesi Verme YardÄ±mcÄ±sÄ±" + IDS_EXPORT_FORMAT_TITLE "Verme BiÃ§imi" + IDS_EXPORT_FORMAT_SUBTITLE "Ä°Ã§eriÄin kaydedileceÄi biÃ§imi seÃ§iniz." + IDS_EXPORT_FILE_TITLE "Verme KÃ¼tÃ¼k AdÄ±" + IDS_EXPORT_FILE_SUBTITLE "Ä°Ã§eriÄin kaydedildeceÄi kÃ¼tÃ¼ÄÃ¼n adÄ±nÄ± belirtiniz." + IDS_EXPORT_FILE_EXISTS "Belirtilen kÃ¼tÃ¼k Ã¶nceden var. Onu deÄiÅtirmek ister misiniz?" + IDS_EXPORT_FILTER_CERT "DER ÅifrelenmiÅ Ä°kili X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64 ÅifrelenmiÅ X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "Onay Belgesi Ä°ptal Dizelgesi (*.crl)" + IDS_EXPORT_FILTER_CTL "Onay Belgesi GÃ¼ven Dizelgesi (*.stl)" + IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 Ä°letileri (*.p7b)" + IDS_EXPORT_FILTER_PFX "ÅahsÃ® Bilgi DeÄiÅtirmesi (*.pfx)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "DizilendirilmiÅ Onay Belgesi Deposu (*.sst)" + IDS_EXPORT_FORMAT "KÃ¼tÃ¼k BiÃ§imi" + IDS_EXPORT_INCLUDE_CHAIN "Onay belgesi yolundaki tÃ¼m onay belgeleri iÃ§inde olsun." + IDS_EXPORT_KEYS "Verilen Anahtarlar" + IDS_YES "Evet" + IDS_NO "HayÄ±r" + IDS_EXPORT_SUCCEEDED "Verme iÅlemi baÅarÄ±lÄ± oldu." + IDS_EXPORT_FAILED "Verme iÅlemi baÅarÄ±sÄ±z oldu." + IDS_EXPORT_PRIVATE_KEY_TITLE "HusÃ»sÃ® AnahtarÄ± Verme" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Bu onay belgesi, kendisiyle birlikte verilebilecek bir husÃ»sÃ® anahtar iÃ§erir." + IDS_EXPORT_PASSWORD_TITLE "Åifreyi Girme" + IDS_EXPORT_PASSWORD_SUBTITLE "Bir husÃ»sÃ® anahtarÄ± Åifreyle koruyabilirsiniz." + IDS_EXPORT_PASSWORD_MISMATCH "Åifreler birbiriyle uyuÅmuyor." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Ãnemli: Bu onay belgesinin husÃ»sÃ® anahtarÄ± aÃ§Ä±lamadÄ±." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Ãnemli: Bu onay belgesinin husÃ»sÃ® anahtarÄ± verilebilen deÄil." +} + +IDD_GENERAL DIALOG 0, 0, 255, 236 +CAPTION "UmÃ»mÃ®" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", ES_READONLY|WS_DISABLED,8,11,26,26 + CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", ES_READONLY|WS_DISABLED,34,11,212,26 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 + PUSHBUTTON "&Onay Belgesini Kur...", IDC_ADDTOSTORE,53,216,95,14 + PUSHBUTTON "&DaÄÄ±tÄ±cÄ± AÃ§Ä±klamasÄ±", IDC_ISSUERSTATEMENT,152,216,95,14 +END + +IDD_DETAIL DIALOG 0, 0, 255, 236 +CAPTION "AyrÄ±ntÄ±lar" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&GÃ¶ster:", -1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "&HusÃ»siyetleri DÃ¼zenle...", IDC_EDITPROPERTIES,53,216,95,14 + PUSHBUTTON "&KÃ¼tÃ¼Äe ÃoÄalt...", IDC_EXPORT,152,216,95,14 +END + +IDD_HIERARCHY DIALOG 0, 0, 255, 236 +CAPTION "Onay Belgesi Yolu" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Onay Belgesi Yolu", -1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "&Onay Belgesini GÃ¶ster", IDC_VIEWCERTIFICATE,155,156,90,14 + LTEXT "O&nay Belgesi Durumu:", IDC_CERTIFICATESTATUS,6,183,200,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + +IDD_USERNOTICE DIALOG 0, 0, 255, 256 +CAPTION "Geri Ãevirici" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "Kapat", IDOK,73,216,85,14 + PUSHBUTTON "&Daha Ãok Bilgi", IDC_CPS,162,216,85,14 +END + +IDD_CERT_PROPERTIES_GENERAL DIALOG 0, 0, 255, 236 +CAPTION "UmÃ»mÃ®" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Kolay AdÄ±:", -1, 6,14,60,14 + EDITTEXT IDC_FRIENDLY_NAME, 70,12,181,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&TanÄ±mÄ±:", -1, 6,32,60,14 + EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Onay Belgesi AmaÃ§larÄ±", -1,6,48,245,185, BS_GROUPBOX + AUTORADIOBUTTON "&Bu onay belgesinin tÃ¼m amaÃ§larÄ±nÄ± etkinleÅtir.", + IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "B&u onay belgesinin tÃ¼m amaÃ§larÄ±nÄ± edilginleÅtir.", + IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Bu &onay belgesinin yalnÄ±zca aÅaÄÄ±daki amaÃ§larÄ±nÄ± etkinleÅtir:", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 24,100,220,106 + PUSHBUTTON "&AmaÃ§ Ekle...", IDC_ADD_PURPOSE,174,212,70,14 +END + +IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68 +CAPTION "AmaÃ§ Ekleme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Eklemek istediÄiniz onay belgesi kullanÄ±m amacÄ±nÄ±n nesne tanÄ±mlayÄ±cÄ±sÄ±nÄ± (OID'sini) giriniz:", + -1, 6,6,190,28 + EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + PUSHBUTTON "Tamam", IDOK, 33,48,60,14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 100,48,60,14 +END + +IDD_SELECT_STORE DIALOG 0,0,200,136 +CAPTION "Onay Belgesi Deposunu SeÃ§me" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kullanmak istediÄiniz onay belgesi deposunu seÃ§iniz:", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, + 6,28,188,70 + CHECKBOX "&FizÃ®kÃ® DepolarÄ± GÃ¶ster", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "Tamam", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Ä°ptal", IDCANCEL, 144,118,50,14 +END + +IDD_IMPORT_WELCOME DIALOG 0,0,317,143 +CAPTION "Onay Belgesi Alma YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Onay Belgesi Alma YardÄ±mcÄ±sÄ±'na HoÅgeldiniz", IDC_IMPORT_TITLE, 115,7,195,30 + LTEXT "Bu yardÄ±mcÄ±; bir kÃ¼tÃ¼kten, onay belgelerinin, onay belgesi iptal dizelgelerinin ve onay belgesi gÃ¼ven dizelgelerinin bir onay belgesi deposuna verilmesini saÄlar.\n\ +\n\ +Bir onay belgesi, sizi veyÃ¢ sizle iletiÅim kuran bilgisayarÄ± tanÄ±mada kullanÄ±lmÄ±Å olabilir. Bu onay belgesi, yetkilendirmede ve iletileri imzÃ¢lamada da kullanÄ±lmÄ±Å olabilir. Onay belgesi depolarÄ±; onay belgelerinden, onay belgesi iptal dizelgelerinden ve onay belgesi gÃ¼ven dizelgelerinden oluÅan derlemlerdir.\n\ +\n\ +SÃ¼rdÃ¼rmek iÃ§in ""Ä°leri >"" dÃ¼Ämesine tÄ±klayÄ±nÄ±z.", + -1, 115,40,195,120 +END + +IDD_IMPORT_FILE DIALOG 0,0,317,178 +CAPTION "Onay Belgesi Alma YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&KÃ¼tÃ¼k AdÄ±:", -1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "&GÃ¶z At...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "Ãnemli: AÅaÄÄ±daki kÃ¼tÃ¼k biÃ§imleri, bir onay belgesinden, bir onay belgesi iptal dizelgesinden veyÃ¢ bir onay belgesi gÃ¼ven dizelgesinden daha Ã§oÄunu iÃ§erebilir:", + -1, 21,30,265,16 + LTEXT "Kriptografik Ä°leti SÃ¶z Dizimi ÃlÃ§Ã¼nÃ¼/PKCS #7 Ä°letileri (.p7b)", + -1, 31,53,265,10 + LTEXT "ÅahsÃ® Bilgi DeÄiÅtirmesi/PKCS #12 (.pfx, .p12)", + -1, 31,68,265,10 + LTEXT "MikroyazÄ±lÄ±m DizilendirilmiÅ Onay Belgesi Deposu (.sst)", + -1, 31,83,265,10 +END + +IDD_IMPORT_STORE DIALOG 0,0,317,143 +CAPTION "Onay Belgesi Alma YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS, kendiliÄinden bir onay belgesi deposu seÃ§ebilir ya da siz, onay belgeleri iÃ§in bir konum belirtebilirsiniz.", + -1, 21,1,220,25 + AUTORADIOBUTTON "&Onay belgesi deposunu kendiliÄinden seÃ§.", + IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&TÃ¼m onay belgelerini aÅaÄÄ±daki depoya yerleÅtir:", + IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY + PUSHBUTTON "&GÃ¶z At...", IDC_IMPORT_BROWSE_STORE, 236,61,60,14 +END + +IDD_IMPORT_FINISH DIALOG 0,0,317,178 +CAPTION "Onay Belgesi Alma YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Onay Belgesi Alma YardÄ±mcÄ±sÄ±'nÄ±n Bitirilmesi", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "Onay Belgesi Alma YardÄ±mcÄ±sÄ±'nÄ± baÅarÄ±lÄ± bir Åekilde bitirdiniz.", + -1, 115,33,195,24 + LTEXT "AÅaÄÄ±daki ayarlarÄ± belirlediniz:", + -1, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +IDD_CERT_MGR DIALOG 0,0,335,270 +CAPTION "Onay Belgeleri" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "K&ullanÄ±m AmacÄ±:", -1, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "&Al...", IDC_MGR_IMPORT, 7,172,65,14 + PUSHBUTTON "&Ver...", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED + PUSHBUTTON "&Sil", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED + PUSHBUTTON "G&eliÅmiÅ...", IDC_MGR_ADVANCED, 263,172,65,14 + GROUPBOX "Onay Belgesi KullanÄ±m AmaÃ§larÄ±", -1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,206,252,32 + PUSHBUTTON "&GÃ¶ster", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "&Kapat", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END + +IDD_CERT_MGR_ADVANCED DIALOG 0,0,248,176 +CAPTION "GeliÅmiÅ SeÃ§enekler" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Onay Belgesi AmaÃ§larÄ±", -1, 7,7,234,141, BS_GROUPBOX + LTEXT """GeliÅmiÅ AmaÃ§lar"" seÃ§ilmiÅ olduÄunda dizelgelenen bir ya da daha Ã§ok amacÄ± seÃ§iniz.", + -1, 14,18,220,16 + LTEXT "&Onay Belgesi AmaÃ§larÄ±:", -1, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "Tamam", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Ä°ptal", IDCANCEL, 190,155,51,14 +END + +IDD_EXPORT_WELCOME DIALOG 0,0,317,143 +CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Onay Belgesi Verme YardÄ±mcÄ±sÄ±'na HoÅgeldiniz", IDC_EXPORT_TITLE, 115,7,195,30 + LTEXT "Bu yardÄ±mcÄ±; bir onay belgesi deposundan, onay belgelerinin, onay belgesi iptal dizelgelerinin ve onay belgesi gÃ¼ven dizelgelerinin bir kÃ¼tÃ¼Äe verilmesini saÄlar.\n\ +\n\ +Bir onay belgesi, sizi veyÃ¢ sizle iletiÅim kuran bilgisayarÄ± tanÄ±mada kullanÄ±lmÄ±Å olabilir. Bu onay belgesi, yetkilendirmede ve iletileri imzÃ¢lamada da kullanÄ±lmÄ±Å olabilir. Onay belgesi depolarÄ±; onay belgelerinden, onay belgesi iptal dizelgelerinden ve onay belgesi gÃ¼ven dizelgelerinden oluÅan derlemlerdir.\n\ +\n\ +SÃ¼rdÃ¼rmek iÃ§in ""Ä°leri >"" dÃ¼Ämesine basÄ±nÄ±z.", + -1, 115,40,195,120 +END + +IDD_EXPORT_PRIVATE_KEY DIALOG 0,0,317,143 +CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Siz, husÃ»si anahtarÄ±n verilmesini seÃ§tiÄinizde sizden bir sonraki aÅamada husÃ»sÃ® anahtarÄ±n korunmasÄ± iÃ§in bir Åifre istenecektir.", -1, 21,1,195,25 + LTEXT "Bu husÃ»sÃ® anahtar verilsin mi?", -1, 21,27,195,10 + AUTORADIOBUTTON "&Evet, husÃ»sÃ® anahtarÄ± ver.", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&HayÄ±r, husÃ»sÃ® anahtarÄ± verme.", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 +END + +IDD_EXPORT_PASSWORD DIALOG 0,0,317,143 +CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Åifre:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "Å&ifreyi DoÄrula:", -1, 21,35,195,10 + EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + +IDD_EXPORT_FORMAT DIALOG 0,0,317,143 +CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "KullanÄ±lacak biÃ§imi seÃ§iniz:", -1, 21,1,195,10 + AUTORADIOBUTTON "&DER ÅifrelenmiÅ X.509 (.cer)", + IDC_EXPORT_FORMAT_DER, 31,18,280,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Base64 ÅifrelenmiÅ X.509 (.cer):", + IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Kriptografik Ä°leti SÃ¶z Dizimi ÃlÃ§Ã¼nÃ¼/PKCS #7 Ä°letileri (.p7b)", + IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON + CHECKBOX "&OlabildiÄince onaylama yoluna tÃ¼m onay belgelerini koy.", + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + AUTORADIOBUTTON "&ÅahsÃ® Bilgi DeÄiÅtirmesi/PKCS #12 (.pfx)", + IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED + CHECKBOX "O&labildiÄince onaylama yoluna tÃ¼m onay belgelerini koy.", + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&GÃ¼Ã§lÃ¼ Åifrelemeyi etkinleÅtir.", + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&Verme iÅlemi baÅarÄ±lÄ± olduÄunda husÃ»sÃ® anahtarÄ± sil.", + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED +END + +IDD_EXPORT_FILE DIALOG 0,0,317,143 +CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&KÃ¼tÃ¼k AdÄ±:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "&GÃ¶z At...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 +END + +IDD_EXPORT_FINISH DIALOG 0,0,317,178 +CAPTION "Onay Belgesi Verme YardÄ±mcÄ±sÄ±" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Onay Belgesi Verme YardÄ±mcÄ±sÄ±'nÄ±n Bitirilmesi", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "Onay Belgesi Verme YardÄ±mcÄ±sÄ±'nÄ± baÅarÄ±lÄ± bir Åekilde bitirdiniz.", + -1, 115,33,195,24 + LTEXT "AÅaÄÄ±daki ayarlarÄ± belirlediniz:", + -1, 115,57,195,12 + CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END Propchange: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,10 +1,10 @@ -/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2013, 2014 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "LÃ¼tfen Bekleyiniz..." +CAPTION "Bekleyiniz..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 @@ -42,8 +42,8 @@ BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Oturum AÃ§ma Bilgisi", IDC_STATIC, 7, 61, 261, 52 - LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18 - LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 + LTEXT "<Ä°leti>", IDC_LOGONMSG, 15, 73, 245, 18 + LTEXT "<Oturum AÃ§ma ZamÃ¢nÄ±>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "Ne yapmak istersiniz?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "BilgisayarÄ± Kilitle", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Oturumu Kapat", IDC_LOGOFF, 100, 135, 75, 14 @@ -61,7 +61,7 @@ CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_LOCKICON, -1, 7, 59, 20, 20 LTEXT "Bu bilgisayar kullanÄ±mda ve kilitli.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 37, 75, 231, 26 + LTEXT "Ä°leti", IDC_LOCKMSG, 37, 75, 231, 26 LTEXT "Bu bilgisayarÄ±n kilidini aÃ§mak iÃ§in Denetim, SeÃ§enek ve Silme dÃ¼Ämelerine birlikte basÄ±nÄ±z.", IDC_STATIC, 36, 106, 232, 8 END @@ -73,7 +73,7 @@ CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 ICON IDI_LOCKICON, -1, 7, 59, 20, 20 LTEXT "Bu bilgisayar kullanÄ±mda ve kilitli.", IDC_STATIC, 36, 61, 232, 8 - LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 + LTEXT "Ä°leti", IDC_LOCKMSG, 36, 75, 232, 26 LTEXT "KullanÄ±cÄ± AdÄ±:", IDC_STATIC, 36, 107, 40, 8 EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL LTEXT "Åifre:", IDC_STATIC, 36, 125, 42, 8 @@ -104,13 +104,13 @@ IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP -CAPTION "Log Off ReactOS" +CAPTION "Oturumu Kapatma" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN ICON IDI_LOCKICON, -1, 7, 7, 20, 20 - LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 - PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "No", IDNO, 95, 39, 50, 14 + LTEXT "Oturumu kapatmayÄ± onaylÄ±yor musunuz?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Evet", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "HayÄ±r", IDNO, 95, 39, 50, 14 END STRINGTABLE @@ -124,10 +124,10 @@ IDS_LOCKMSG "YalnÄ±zca %s ve bir yÃ¶netici bu bilgisayarÄ± kilitleyebilir." IDS_LOGONMSG "%s olarak oturum aÃ§tÄ±nÄ±z." IDS_LOGONDATE "Oturum AÃ§ma ZamÃ¢nÄ±: %s %s" - IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." - IDS_CHANGEPWDTITLE "Change Password" - IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." - IDS_PASSWORDCHANGED "Your password has been changed." + IDS_COMPUTERLOCKED "Bilgisayar kilitlendi." + IDS_LOCKEDWRONGPASSWORD "Åifre yanlÄ±ÅtÄ±r. Åifrenizi yine giriniz. Åifredeki hÃ¢rfler doÄru bÃ¼yÃ¼k-kÃ¼Ã§Ã¼k ayrÄ±mÄ±yla yazÄ±lmalÄ±dÄ±r." + IDS_LOCKEDWRONGUSER "Bu bilgisayar kilitli. Bu bilgisayarÄ±n kilidini yalnÄ±zca %s\\%s veyÃ¢ bir yÃ¶netici aÃ§abilir." + IDS_CHANGEPWDTITLE "Åifre DeÄÅtirme" + IDS_NONMATCHINGPASSWORDS "YazÄ±dÄ±ÄÄ±nÄ±z bu Åifreler birbiriyle uyuÅmuyor. Her iki metin kutusuna da aynÄ± Åifreyi yazÄ±nÄ±z." + IDS_PASSWORDCHANGED "Åifreniz deÄiÅtirildi." END Modified: trunk/reactos/dll/win32/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/mshtml/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/rsrc.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -56,9 +56,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DA_DK @@ -100,6 +97,9 @@ #ifdef LANGUAGE_SL_SI #include "lang/Si.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/Uk.rc" #endif Modified: trunk/reactos/dll/win32/msrle32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msrle32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/rsrc.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -1,7 +1,7 @@ /* * Top level resource file for MS-RLE * - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -67,9 +67,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/msrle_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/msrle_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -99,6 +96,9 @@ #ifdef LANGUAGE_SL_SI #include "lang/msrle_Si.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/msrle_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/msrle_Uk.rc" #endif Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -48,9 +48,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/msvfw32_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/msvfw32_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -80,6 +77,9 @@ #ifdef LANGUAGE_SL_SI #include "lang/msvfw32_Si.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/msvfw32_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/msvfw32_Uk.rc" #endif Modified: trunk/reactos/dll/win32/msvidc32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/msvidc32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvidc32/rsrc.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -46,9 +46,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/msvidc32_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/msvidc32_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -78,6 +75,9 @@ #ifdef LANGUAGE_SL_SI #include "lang/msvidc32_Si.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/msvidc32_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/msvidc32_Uk.rc" #endif Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] Sat Feb 8 13:32:53 2014 @@ -53,9 +53,6 @@ #ifdef LANGUAGE_SV_SE #include "lang/oledlg_Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "lang/oledlg_Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -94,10 +91,12 @@ #ifdef LANGUAGE_SL_SI #include "lang/oledlg_Si.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/oledlg_Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/oledlg_Uk.rc" #endif #ifdef LANGUAGE_ZH_CN #include "lang/oledlg_Zh.rc" #endif -

10 years, 7 months

[jgardou] 62030: [DESK] - Add Device Description Registry value in Display Class Installer.

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Feb 7 23:36:02 2014 New Revision: 62030 URL: http://svn.reactos.org/svn/reactos?rev=62030&view=rev Log: [DESK] - Add Device Description Registry value in Display Class Installer. Modified: trunk/reactos/dll/cpl/desk/classinst.c Modified: trunk/reactos/dll/cpl/desk/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/classinst.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/classinst.c [iso-8859-1] Fri Feb 7 23:36:02 2014 @@ -211,6 +211,15 @@ DPRINT("SetupInstallFromInfSection() failed with error 0x%lx\n", rc); goto cleanup; } + /* Add Device Description string */ + rc = RegSetValueEx(hDeviceSubKey, _T("Device Description"), 0, + REG_SZ, (const BYTE*)DriverInfoData.Description, + (_tcslen(DriverInfoData.Description) + 1) * sizeof(TCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueEx() failed with error 0x%lx\n", rc); + goto cleanup; + } /* FIXME: install OpenGLSoftwareSettings section */

10 years, 7 months

[jgardou] 62029: [WIN32K] - Slightly improve the way the Device Description is retrieved. - Slightly improve registry function.

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Feb 7 23:35:06 2014 New Revision: 62029 URL: http://svn.reactos.org/svn/reactos?rev=62029&view=rev Log: [WIN32K] - Slightly improve the way the Device Description is retrieved. - Slightly improve registry function. Modified: trunk/reactos/win32ss/gdi/eng/device.c trunk/reactos/win32ss/user/ntuser/misc/registry.c Modified: trunk/reactos/win32ss/gdi/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/device.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/device.c [iso-8859-1] Fri Feb 7 23:35:06 2014 @@ -113,7 +113,8 @@ pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); RtlCopyMemory(pGraphicsDevice->pwszDescription, pustrDescription->Buffer, - pustrDescription->Length + sizeof(WCHAR)); + pustrDescription->Length); + pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; /* Initialize the pdevmodeInfo list and default index */ pGraphicsDevice->pdevmodeInfo = NULL; Modified: trunk/reactos/win32ss/user/ntuser/misc/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/registry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/registry.c [iso-8859-1] Fri Feb 7 23:35:06 2014 @@ -58,7 +58,7 @@ ULONG cbInfoSize, cbDataSize; /* Check if the local buffer is sufficient */ - cbInfoSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + *pcbValue; + cbInfoSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[*pcbValue]); if (cbInfoSize <= sizeof(ajBuffer)) { pInfo = (PVOID)ajBuffer; @@ -82,7 +82,7 @@ cbInfoSize, &cbInfoSize); - cbDataSize = cbInfoSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + cbDataSize = pInfo->DataLength; /* Note: STATUS_BUFFER_OVERFLOW is not a success */ if (NT_SUCCESS(Status))

10 years, 7 months

[akhaldi] 62028: [UNICOWS] * Correct the destination of this dll.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Feb 7 21:56:49 2014 New Revision: 62028 URL: http://svn.reactos.org/svn/reactos?rev=62028&view=rev Log: [UNICOWS] * Correct the destination of this dll. Modified: trunk/reactos/dll/win32/unicows/CMakeLists.txt Modified: trunk/reactos/dll/win32/unicows/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/unicows/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/unicows/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/unicows/CMakeLists.txt [iso-8859-1] Fri Feb 7 21:56:49 2014 @@ -28,4 +28,4 @@ msvcrt kernel32 ntdll) -add_cd_file(TARGET unicows DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET unicows DESTINATION reactos FOR all)

10 years, 7 months

[akhaldi] 62027: [BZIP2] * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Feb 7 21:44:50 2014 New Revision: 62027 URL: http://svn.reactos.org/svn/reactos?rev=62027&view=rev Log: [BZIP2] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/lib/3rdparty/bzip2/bzlib.c Modified: trunk/reactos/lib/3rdparty/bzip2/bzlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/bzlib.c… ============================================================================== --- trunk/reactos/lib/3rdparty/bzip2/bzlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/bzip2/bzlib.c [iso-8859-1] Fri Feb 7 21:44:50 2014 @@ -32,7 +32,7 @@ #ifndef __NTDRIVER__ #define __NTDRIVER__ #endif -#include <ntddk.h> +#include <wdm.h> #include <debug.h> #endif #include "bzlib_private.h"

10 years, 7 months

[akhaldi] 62026: [WIN32DLLS] * Add header guards to the main headers. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Feb 7 18:02:02 2014 New Revision: 62026 URL: http://svn.reactos.org/svn/reactos?rev=62026&view=rev Log: [WIN32DLLS] * Add header guards to the main headers. CORE-7716 Modified: trunk/reactos/dll/ntdll/include/ntdll.h trunk/reactos/dll/opengl/opengl32/opengl32.h trunk/reactos/dll/shellext/fontext/fontext.h trunk/reactos/dll/win32/acledit/acledit.c trunk/reactos/dll/win32/acledit/stubs.c trunk/reactos/dll/win32/aclui/precomp.h trunk/reactos/dll/win32/advpack/advpack_private.h trunk/reactos/dll/win32/advpack/reg.c trunk/reactos/dll/win32/authz/authz.c trunk/reactos/dll/win32/authz/precomp.h trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h trunk/reactos/dll/win32/fmifs/precomp.h trunk/reactos/dll/win32/hid/precomp.h trunk/reactos/dll/win32/hlink/hlink_private.h trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h trunk/reactos/dll/win32/ieframe/ieframe.h trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/lpk/ros_lpk.h trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/mmdevapi/mmdevapi.h trunk/reactos/dll/win32/mmdrv/auxil.c trunk/reactos/dll/win32/mmdrv/midi.c trunk/reactos/dll/win32/mmdrv/mmdrv.h trunk/reactos/dll/win32/mmdrv/mmioctl.h trunk/reactos/dll/win32/mmdrv/wave.c trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msports/precomp.h trunk/reactos/dll/win32/mswsock/precomp.h trunk/reactos/dll/win32/objsel/objsel.c trunk/reactos/dll/win32/objsel/objsel_private.h trunk/reactos/dll/win32/ole32/enumx.h trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/propsys/propsys_private.h trunk/reactos/dll/win32/rasadhlp/precomp.h trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/samlib/precomp.h trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/schannel/precomp.h trunk/reactos/dll/win32/secur32/precomp.h trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/shlwapi/precomp.h trunk/reactos/dll/win32/smdll/precomp.h trunk/reactos/dll/win32/spoolss/spoolss.h trunk/reactos/dll/win32/sxs/sxs_private.h trunk/reactos/dll/win32/syssetup/precomp.h trunk/reactos/dll/win32/tapi32/precomp.h trunk/reactos/dll/win32/twain_32/twain_i.h trunk/reactos/dll/win32/userenv/precomp.h trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/dll/win32/uxtheme/uxthemep.h trunk/reactos/dll/win32/vbscript/vbscript.h trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h trunk/reactos/dll/win32/wbemprox/wbemprox_private.h trunk/reactos/dll/win32/winmm/winemm.h trunk/reactos/dll/win32/winsta/logon.c trunk/reactos/dll/win32/winsta/main.c trunk/reactos/dll/win32/winsta/misc.c trunk/reactos/dll/win32/winsta/security.c trunk/reactos/dll/win32/winsta/ws.c trunk/reactos/dll/win32/wldap32/winldap_private.h trunk/reactos/dll/win32/wldap32/wldap32.h trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/wuapi/wuapi_private.h Modified: trunk/reactos/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -5,6 +5,9 @@ * PURPOSE: Native Libary Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ + +#ifndef _NTDLL_H +#define _NTDLL_H /* INCLUDES ******************************************************************/ @@ -46,4 +49,4 @@ /* PSEH */ #include <pseh/pseh2.h> -/* EOF */ +#endif /* _NTDLL_H */ Modified: trunk/reactos/dll/opengl/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/opengl… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/opengl32.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -5,7 +5,8 @@ * PURPOSE: OpenGL32 lib, general header */ -#pragma once +#ifndef _OPENGL32_PCH_ +#define _OPENGL32_PCH_ #define WIN32_NO_STATUS #include <stdarg.h> @@ -168,3 +169,5 @@ BOOL sw_CopyContext(DHGLRC dhglrcSrc, DHGLRC dhglrcDst, UINT mask); BOOL sw_ShareLists(DHGLRC dhglrcSrc, DHGLRC dhglrcDst); BOOL sw_SwapBuffers(HDC hdc, struct wgl_dc_data* dc_data); + +#endif /* _OPENGL32_PCH_ */ Modified: trunk/reactos/dll/shellext/fontext/fontext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… ============================================================================== --- trunk/reactos/dll/shellext/fontext/fontext.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/fontext/fontext.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,6 +1,11 @@ +#ifndef _FONTEXT_PCH_ +#define _FONTEXT_PCH_ + #include <stdarg.h> #define WIN32_NO_STATUS #define COBJMACROS #include <windef.h> + +#endif /* _FONTEXT_PCH_ */ Modified: trunk/reactos/dll/win32/acledit/acledit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -33,7 +33,6 @@ HINSTANCE hDllInstance; - BOOL WINAPI DllMain( HINSTANCE hinstDLL, Modified: trunk/reactos/dll/win32/acledit/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/acledit/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/stubs.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -19,7 +19,6 @@ #define UNIMPLEMENTED \ DbgPrint("ACLEDIT: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) - DWORD WINAPI Modified: trunk/reactos/dll/win32/aclui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/aclui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _ACLUI_PCH_ +#define _ACLUI_PCH_ + #define _ACLUI_ #include <stdarg.h> @@ -199,4 +202,4 @@ DereferenceSidReqResult(IN HANDLE SidCacheMgr, IN PSIDREQRESULT ReqResult); -/* EOF */ +#endif /* _ACLUI_PCH_ */ Modified: trunk/reactos/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack_… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -34,9 +34,9 @@ #include <winternl.h> #include <advpub.h> +#include <wine/debug.h> #include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(advpack); HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/advpack/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/reg.c?re… ============================================================================== --- trunk/reactos/dll/win32/advpack/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/reg.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "advpack_private.h" Modified: trunk/reactos/dll/win32/authz/authz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.c?re… ============================================================================== --- trunk/reactos/dll/win32/authz/authz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/authz.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -33,7 +33,6 @@ HINSTANCE hDllInstance; - /* * @unimplemented */ Modified: trunk/reactos/dll/win32/authz/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/authz/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -3,11 +3,12 @@ #define _AUTHZ_ +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> #include <windef.h> #include <winbase.h> @@ -60,4 +61,3 @@ } AUTHZ_CLIENT_CONTEXT, *PAUTHZ_CLIENT_CONTEXT; #endif /* __AUTHZ_PRECOMP_H */ -/* EOF */ Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _BROWSEUI_PCH_ +#define _BROWSEUI_PCH_ + #include <stdarg.h> #define WIN32_NO_STATUS @@ -37,3 +40,5 @@ #include "regtreeoptions.h" WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +#endif /* _BROWSEUI_PCH_ */ Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -20,6 +20,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _DBGHELP_PRIVATE_H_ +#define _DBGHELP_PRIVATE_H_ #include <config.h> @@ -842,3 +845,5 @@ const char* name) DECLSPEC_HIDDEN; #include "image_private.h" + +#endif /* _DBGHELP_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/pr… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -5,6 +5,9 @@ * PURPOSE: Win32 DNS API Libary Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ + +#ifndef _DNSAPI_H +#define _DNSAPI_H /* INCLUDES ******************************************************************/ @@ -127,3 +130,5 @@ } return dst; } + +#endif /* _DNSAPI_H */ Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -7,6 +7,9 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Hervé Poussineau (hpoussin(a)reactos.org) */ + +#ifndef _FMIFS_PCH_ +#define _FMIFS_PCH_ /* INCLUDES ******************************************************************/ @@ -43,4 +46,4 @@ GetProvider( IN PWCHAR FileSytem); -/* EOF */ +#endif /* _FMIFS_PCH_ */ Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _HID_PCH_ +#define _HID_PCH_ + #include <stdarg.h> #define WIN32_NO_STATUS @@ -18,4 +21,4 @@ extern HINSTANCE hDllInstance; extern const GUID HidClassGuid; -/* EOF */ +#endif /* _HID_PCH_ */ Modified: trunk/reactos/dll/win32/hlink/hlink_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_priv… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _HLINK_PRIVATE_H +#define _HLINK_PRIVATE_H #include <stdarg.h> @@ -82,3 +85,5 @@ return ret; } + +#endif /* _HLINK_PRIVATE_H */ Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -16,7 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#ifndef _HNETCFG_PRIVATE_H_ +#define _HNETCFG_PRIVATE_H_ + +#include <wine/config.h> #include <stdarg.h> @@ -53,3 +56,5 @@ HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; + +#endif /* _HNETCFG_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _IEFRAME_H_ +#define _IEFRAME_H_ + #include <stdio.h> #define WIN32_NO_STATUS @@ -400,3 +403,5 @@ WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, 0, 0); return ret; } + +#endif /* _IEFRAME_H_ */ Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -172,4 +172,4 @@ GetComputerNameExA(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); #endif -#endif/*IPPRIVATE_H*/ +#endif /* IPPRIVATE_H */ Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _WINE_JSCRIPT_H +#define _WINE_JSCRIPT_H #include <wine/config.h> #include <wine/port.h> @@ -555,3 +558,5 @@ #include "engine.h" #include "regexp.h" + +#endif /* _WINE_JSCRIPT_H */ Modified: trunk/reactos/dll/win32/lpk/ros_lpk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/ros_lpk.h?re… ============================================================================== --- trunk/reactos/dll/win32/lpk/ros_lpk.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/ros_lpk.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -5,6 +5,9 @@ * PROGRAMMER: Magnus Olsen (greatlrd) * */ + +#ifndef _LPK_H +#define _LPK_H #include <stdarg.h> @@ -64,3 +67,5 @@ DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6); DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); + +#endif /* _LPK_H */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -6,6 +6,9 @@ * * PROGRAMMERS: Eric Kohl */ + +#ifndef _LSASRV_H +#define _LSASRV_H #include <stdarg.h> @@ -411,4 +414,4 @@ PSID SrcSid, ULONG Rid); -/* EOF */ +#endif /* _LSASRV_H */ Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _MMDEVAPI_H_ +#define _MMDEVAPI_H_ #include <wine/config.h> #include <wine/port.h> @@ -97,3 +100,5 @@ extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; + +#endif /* _MMDEVAPI_H_ */ Modified: trunk/reactos/dll/win32/mmdrv/auxil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/auxil.c?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/auxil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/auxil.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -9,12 +9,13 @@ * UPDATE HISTORY: * Mar 16, 2004: Created skeleton implementation */ + #include "mmdrv.h" -#include "wave.h" - #define NDEBUG #include <debug.h> + +#include "wave.h" APIENTRY DWORD auxMessage(UINT dwId, UINT uMessage, Modified: trunk/reactos/dll/win32/mmdrv/midi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/midi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/midi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/midi.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -10,10 +10,11 @@ */ #include "mmdrv.h" -#include "wave.h" #define NDEBUG #include <debug.h> + +#include "wave.h" // MIDI device instance information // Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -17,7 +17,6 @@ #include <stdarg.h> #define WIN32_NO_STATUS - #include <windef.h> #include <winbase.h> #include <winioctl.h> @@ -337,4 +336,4 @@ extern CRITICAL_SECTION critical_section; -#endif +#endif /* MMDRV_H */ Modified: trunk/reactos/dll/win32/mmdrv/mmioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmioctl.h?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmioctl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmioctl.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -137,4 +137,4 @@ #define IOCTL_SOUND_GET_CHANGED_VOLUME \ CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) -#endif +#endif /* MMDRV_IOCTLS */ Modified: trunk/reactos/dll/win32/mmdrv/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave.c?rev… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/wave.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -17,7 +17,6 @@ #define MAX_WAVE_BUFFER_SIZE 65536 - MMRESULT QueueWaveBuffer( SessionInfo* session_info, Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… ============================================================================== --- trunk/reactos/dll/win32/mshtml/mshtml_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/mshtml_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -16,7 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#ifndef _MSHTML_PRIVATE_H_ +#define _MSHTML_PRIVATE_H_ + +#include <wine/config.h> #include <assert.h> #include <stdarg.h> @@ -52,10 +55,10 @@ #include <wininet.h> #include <nsiface.h> +#include <wine/debug.h> #include <wine/list.h> #include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_ERROR_GENERATE_FAILURE(module,code) \ @@ -1204,3 +1207,5 @@ #include "htmlstyle.h" #include "pluginhost.h" #include "resource.h" + +#endif /* _MSHTML_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -22,10 +22,10 @@ #ifndef __WINE_MSI_PRIVATE__ #define __WINE_MSI_PRIVATE__ -#include <config.h> - +#include <wine/config.h> + +#include <assert.h> #include <stdarg.h> -#include <assert.h> #define _INC_WINDOWS #define COM_NO_WINDOWS_H @@ -48,8 +48,8 @@ #include <sddl.h> #include <msidefs.h> +#include <wine/debug.h> #include <wine/list.h> -#include <wine/debug.h> #include <wine/unicode.h> static const BOOL is_64bit = sizeof(void *) > sizeof(int); Modified: trunk/reactos/dll/win32/msports/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/precomp.… ============================================================================== --- trunk/reactos/dll/win32/msports/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _MSPORTS_PCH_ +#define _MSPORTS_PCH_ + #include <stdarg.h> #define WIN32_NO_STATUS @@ -17,3 +20,5 @@ #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(msports); + +#endif /* _MSPORTS_PCH_ */ Modified: trunk/reactos/dll/win32/mswsock/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/precomp.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _MSWSOCK_PCH_ +#define _MSWSOCK_PCH_ + #include <stdarg.h> #define WIN32_NO_STATUS @@ -6,3 +9,5 @@ #include <windef.h> #include <winbase.h> + +#endif /* _MSWSOCK_PCH_ */ Modified: trunk/reactos/dll/win32/objsel/objsel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/objsel/objsel.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -19,6 +19,7 @@ */ #include "objsel_private.h" + #include <rpcproxy.h> LONG dll_refs = 0; Modified: trunk/reactos/dll/win32/objsel/objsel_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_pr… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/objsel/objsel_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _OBJSEL_PRIVATE_H +#define _OBJSEL_PRIVATE_H #include <stdarg.h> @@ -58,3 +61,5 @@ HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) DECLSPEC_HIDDEN; extern ClassFactoryImpl OBJSEL_ClassFactory DECLSPEC_HIDDEN; + +#endif /* _OBJSEL_PRIVATE_H */ Modified: trunk/reactos/dll/win32/ole32/enumx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/enumx.h?re… ============================================================================== --- trunk/reactos/dll/win32/ole32/enumx.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/enumx.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -31,4 +31,4 @@ extern enumx_impl *enumx_allocate(REFIID, const void *, ULONG) DECLSPEC_HIDDEN; extern void *enumx_add_element(enumx_impl *, const void *) DECLSPEC_HIDDEN; -#endif +#endif /* __OLE_ENUM_H__ */ Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/storage32.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -27,6 +27,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __STORAGE32_H__ #define __STORAGE32_H__ Modified: trunk/reactos/dll/win32/propsys/propsys_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propsys_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _PROPSYS_PRIVATE_H_ +#define _PROPSYS_PRIVATE_H_ #include <config.h> @@ -40,3 +43,5 @@ WINE_DEFAULT_DEBUG_CHANNEL(propsys); HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN; + +#endif /* _PROPSYS_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/rasadhlp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasadhlp/precomp… ============================================================================== --- trunk/reactos/dll/win32/rasadhlp/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasadhlp/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _RASADHLP_H +#define _RASADHLP_H + #define _WIN32_WINNT 0x502 #define _CRT_SECURE_NO_DEPRECATE #define WIN32_NO_STATUS @@ -91,3 +94,4 @@ IN PAUTODIAL_ADDR ConnectionAddress ); +#endif /* _RASADHLP_H */ Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _RICHED20_EDITOR_H +#define _RICHED20_EDITOR_H #include <config.h> @@ -375,3 +378,5 @@ /* clipboard.c */ HRESULT ME_GetDataObject(ME_TextEditor *editor, const ME_Cursor *start, int nChars, LPDATAOBJECT *lplpdataobj) DECLSPEC_HIDDEN; + +#endif /* _RICHED20_EDITOR_H */ Modified: trunk/reactos/dll/win32/samlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _SAMLIB_PCH_ +#define _SAMLIB_PCH_ + #include <stdarg.h> #define WIN32_NO_STATUS @@ -6,3 +9,5 @@ #include <windef.h> #include <winbase.h> + +#endif /* _SAMLIB_PCH_ */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -6,6 +6,9 @@ * * PROGRAMMERS: Eric Kohl */ + +#ifndef _SAMSRV_PCH_ +#define _SAMSRV_PCH_ #include <stdio.h> #include <stdlib.h> @@ -430,3 +433,5 @@ WINAPI SystemFunction007(PUNICODE_STRING string, LPBYTE hash); + +#endif /* _SAMSRV_PCH_ */ Modified: trunk/reactos/dll/win32/schannel/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/precomp… ============================================================================== --- trunk/reactos/dll/win32/schannel/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -3,10 +3,11 @@ #include <stdarg.h> +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <ntstatus.h> #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H #include <windef.h> #include <winbase.h> #include <sspi.h> Modified: trunk/reactos/dll/win32/secur32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/secur32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -5,6 +5,9 @@ * PURPOSE: Security Library Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ + +#ifndef _SECUR32_PCH_ +#define _SECUR32_PCH_ #include <stdarg.h> @@ -19,3 +22,5 @@ #include <secext.h> #include <security.h> + +#endif /* _SECUR32_PCH_ */ Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -25,6 +25,7 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #define COBJMACROS #include <windef.h> Modified: trunk/reactos/dll/win32/shlwapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -24,11 +24,11 @@ #include <shlwapi.h> #include <shlobj.h> +#include <wine/debug.h> #include <wine/unicode.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(shell); #include "resource.h" +WINE_DEFAULT_DEBUG_CHANNEL(shell); + #endif /* _SHLWAPI_PCH_ */ Modified: trunk/reactos/dll/win32/smdll/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/smdll/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,5 +1,10 @@ +#ifndef _SMDLL_PCH_ +#define _SMDLL_PCH_ + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H #include <windef.h> + +#endif /* _SMDLL_PCH_ */ Modified: trunk/reactos/dll/win32/spoolss/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _SPOOLSS_H_ +#define _SPOOLSS_H_ #include <stdarg.h> @@ -46,3 +49,5 @@ { return HeapFree( GetProcessHeap(), 0, mem ); } + +#endif /* _SPOOLSS_H_ */ Modified: trunk/reactos/dll/win32/sxs/sxs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs_private.… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/sxs_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _SXS_PRIVATE_H_ +#define _SXS_PRIVATE_H_ #include <stdarg.h> @@ -54,3 +57,5 @@ if (dst) strcpyW( dst, src ); return dst; } + +#endif /* _SXS_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/syssetup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/precomp… ============================================================================== --- trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _SYSSETUP_PCH_ +#define _SYSSETUP_PCH_ + #include <stdio.h> #define WIN32_NO_STATUS @@ -17,3 +20,5 @@ #include "globals.h" #include "resource.h" + +#endif /* _SYSSETUP_PCH_ */ Modified: trunk/reactos/dll/win32/tapi32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/tapi32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,7 +1,7 @@ #ifndef _TAPI32_PCH_ #define _TAPI32_PCH_ -#include <config.h> +#include <wine/config.h> #include <stdarg.h> Modified: trunk/reactos/dll/win32/twain_32/twain_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain_i… ============================================================================== --- trunk/reactos/dll/win32/twain_32/twain_i.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/twain_i.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -20,7 +20,7 @@ #ifndef _TWAIN32_H #define _TWAIN32_H -#include <config.h> +#include <wine/config.h> #include <stdarg.h> @@ -67,4 +67,4 @@ extern TW_UINT16 TWAIN_GetDSMStatus (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; -#endif +#endif /* _TWAIN32_H */ Modified: trunk/reactos/dll/win32/userenv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/precomp.… ============================================================================== --- trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _USERENV_PCH_ +#define _USERENV_PCH_ + #include <stdio.h> #define WIN32_NO_STATUS @@ -14,3 +17,5 @@ #include <userenv.h> #include "internal.h" + +#endif /* _USERENV_PCH_ */ Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#ifndef _USP10_INTERNAL_H_ +#define _USP10_INTERNAL_H_ #include <config.h> @@ -268,3 +271,5 @@ HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN; HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) DECLSPEC_HIDDEN; HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN; + +#endif /* _USP10_INTERNAL_H_ */ Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -1,3 +1,6 @@ +#ifndef _UXTHEME_PCH_ +#define _UXTHEME_PCH_ + #include <stdarg.h> #define WIN32_NO_STATUS @@ -230,3 +233,5 @@ #define ALPHABLEND_BINARY 1 /* Full alpha blending */ #define ALPHABLEND_FULL 2 + +#endif /* _UXTHEME_PCH_ */ Modified: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _VBSCRIPT_H +#define _VBSCRIPT_H #include <assert.h> #include <stdarg.h> @@ -418,3 +421,5 @@ #include "parse.h" #include "regexp.h" #include "vbscript_defs.h" + +#endif /* _VBSCRIPT_H */ Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -16,7 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#ifndef _WBEMDISP_PRIVATE_H_ +#define _WBEMDISP_PRIVATE_H_ + +#include <wine/config.h> #include <stdarg.h> @@ -46,3 +49,5 @@ { return HeapFree( GetProcessHeap(), 0, mem ); } + +#endif /* _WBEMDISP_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/wbemprox/wbemprox_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbempro… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _WBEMPROX_PRIVATE_H_ +#define _WBEMPROX_PRIVATE_H_ #include <config.h> @@ -331,3 +334,5 @@ static const WCHAR param_userW[] = {'U','s','e','r',0}; static const WCHAR param_valueW[] = {'s','V','a','l','u','e',0}; static const WCHAR param_valuenameW[] = {'s','V','a','l','u','e','N','a','m','e',0}; + +#endif /* _WBEMPROX_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/winmm/winemm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winemm.h?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -18,6 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _WINEMM_H_ +#define _WINEMM_H_ #include <wine/config.h> @@ -199,3 +202,5 @@ "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers" INT LoadRegistryMMEDrivers(char* key); + +#endif /* _WINEMM_H_ */ Modified: trunk/reactos/dll/win32/winsta/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/logon.c?r… ============================================================================== --- trunk/reactos/dll/win32/winsta/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/logon.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -6,6 +6,7 @@ * NOTES: This file contains exported functions relevant to * userinit, winlogon, lsass and friends in vista. */ + #include "winsta.h" VOID Modified: trunk/reactos/dll/win32/winsta/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/winsta/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/main.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -23,6 +23,7 @@ * PROGRAMMER: Emanuele Aliberti <ea(a)reactos.com> * Samuel Serapi?n */ + #include "winsta.h" HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/winsta/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/misc.c?re… ============================================================================== --- trunk/reactos/dll/win32/winsta/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/misc.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -6,6 +6,7 @@ * NOTES: Misc functions. * */ + #include "winsta.h" VOID Modified: trunk/reactos/dll/win32/winsta/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/security.… ============================================================================== --- trunk/reactos/dll/win32/winsta/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/security.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -5,6 +5,7 @@ * PROGRAMMER: Samuel Serapi?n * NOTE: Not needed, just here for the show. */ + #include "winsta.h" VOID Modified: trunk/reactos/dll/win32/winsta/ws.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/ws.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winsta/ws.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/ws.c [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -5,6 +5,7 @@ * PROGRAMMER: Samuel Serapi?n * */ + #include "winsta.h" VOID Modified: trunk/reactos/dll/win32/wldap32/winldap_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/winldap_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -22,7 +22,10 @@ * native headers. */ -#include <config.h> +#ifndef _WINLDAP_PRIVATE_H_ +#define _WINLDAP_PRIVATE_H_ + +#include <wine/config.h> #include <stdarg.h> @@ -477,3 +480,5 @@ ULONG CDECL LdapMapErrorToWin32(ULONG); int CDECL LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int); int CDECL LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int); + +#endif /* _WINLDAP_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/wldap32/wldap32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; ULONG map_error( int ) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -4,6 +4,9 @@ * FILE: lib/ws2_32.h * PURPOSE: WinSock 2.2 Main Header */ + +#ifndef _WS2_32_NEW_PCH_ +#define _WS2_32_NEW_PCH_ #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -37,3 +40,5 @@ /* Internal headers */ #include "ws2_32p.h" + +#endif /* _WS2_32_NEW_PCH_ */ Modified: trunk/reactos/dll/win32/wuapi/wuapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi_priv… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/wuapi_private.h [iso-8859-1] Fri Feb 7 18:02:02 2014 @@ -16,7 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#ifndef _WUAPI_PRIVATE_H_ +#define _WUAPI_PRIVATE_H_ + +#include <wine/config.h> #include <stdarg.h> @@ -39,3 +42,5 @@ extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; + +#endif /* _WUAPI_PRIVATE_H_ */

10 years, 7 months

[bfreisen] 62025: [MSPAINT] - Simplify menu initialization - Add proof-of-concept text drawing functionality (for now with hard-coded text and font) - use RECT instead of int[4] and POINT instead o...

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Fri Feb 7 17:54:25 2014 New Revision: 62025 URL: http://svn.reactos.org/svn/reactos?rev=62025&view=rev Log: [MSPAINT] - Simplify menu initialization - Add proof-of-concept text drawing functionality (for now with hard-coded text and font) - use RECT instead of int[4] and POINT instead of int x,y - move some redundant code to new function ForceRefreshSelectionContents - rework transparent selection code using new function ColorKeyedMaskBlt Modified: trunk/reactos/base/applications/mspaint/definitions.h trunk/reactos/base/applications/mspaint/drawing.c trunk/reactos/base/applications/mspaint/drawing.h trunk/reactos/base/applications/mspaint/globalvar.h trunk/reactos/base/applications/mspaint/main.c trunk/reactos/base/applications/mspaint/mouse.c trunk/reactos/base/applications/mspaint/palette.c trunk/reactos/base/applications/mspaint/precomp.h trunk/reactos/base/applications/mspaint/selection.c trunk/reactos/base/applications/mspaint/selection.h trunk/reactos/base/applications/mspaint/toolsettings.c trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/definitions.h [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -13,6 +13,17 @@ #define SIZEOF(a) (sizeof(a) / sizeof((a)[0])) /* sizeof for string constants; equals max. number of characters */ + +#define RECT_WIDTH(a) ((a).right - (a).left) +/* width of the rectangle defined by a RECT structure */ + +#define RECT_HEIGHT(a) ((a).bottom - (a).top) +/* height of the rectangle defined by a RECT structure */ + +#define CHECKED_IF(a) ((a) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)) +/* simplifies checking and unchecking menu items */ +#define ENABLED_IF(a) ((a) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)) +/* simplifies enabling or graying menu items */ #define IDI_APPICON 500 Modified: trunk/reactos/base/applications/mspaint/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -258,3 +258,24 @@ DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); } + +void +Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style) +{ + HFONT oldFont; + RECT rect = {x1, y1, x2, y2}; + COLORREF oldColor; + COLORREF oldBkColor; + int oldBkMode; + oldFont = SelectObject(hdc, font); + oldColor = SetTextColor(hdc, fg); + oldBkColor = SetBkColor(hdc, bg); + oldBkMode = SetBkMode(hdc, TRANSPARENT); + if (style == 0) + Rect(hdc, x1, y1, x2, y2, bg, bg, 1, 2); + DrawText(hdc, lpchText, -1, &rect, DT_EDITCONTROL); + SelectObject(hdc, oldFont); + SetTextColor(hdc, oldColor); + SetBkColor(hdc, oldBkColor); + SetBkMode(hdc, oldBkMode); +} Modified: trunk/reactos/base/applications/mspaint/drawing.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/drawing.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/drawing.h [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -31,3 +31,5 @@ void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); void SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); + +void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style); Modified: trunk/reactos/base/applications/mspaint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/globalvar.h [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -48,12 +48,16 @@ extern int rubberRadius; extern int transpBg; extern int zoom; -extern int rectSel_src[4]; -extern int rectSel_dest[4]; +extern RECT rectSel_src; +extern RECT rectSel_dest; extern HWND hSelection; extern HWND hImageArea; extern HBITMAP hSelBm; extern HBITMAP hSelMask; +extern LOGFONT lfTextFont; +extern HFONT hfontTextFont; +extern LPTSTR textToolText; +extern int textToolTextMaxLen; extern int palColors[28]; extern int modernPalColors[28]; Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -46,12 +46,17 @@ int rubberRadius = 4; int transpBg = 0; int zoom = 1000; -int rectSel_src[4]; -int rectSel_dest[4]; +RECT rectSel_src; +RECT rectSel_dest; HWND hSelection; HWND hImageArea; HBITMAP hSelBm; HBITMAP hSelMask; +LOGFONT lfTextFont; +HFONT hfontTextFont; +/* TODO: add dialog to edit the currently hard-coded text */ +LPTSTR textToolText = _T("Abc\n1234567890"); +int textToolTextMaxLen = SIZEOF(textToolText); /* array holding palette colors; may be changed by the user during execution */ int palColors[28]; @@ -161,6 +166,23 @@ 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff }; + /* init font for text tool */ + lfTextFont.lfHeight = 0; + lfTextFont.lfWidth = 0; + lfTextFont.lfEscapement = 0; + lfTextFont.lfOrientation = 0; + lfTextFont.lfWeight = FW_NORMAL; + lfTextFont.lfItalic = FALSE; + lfTextFont.lfUnderline = FALSE; + lfTextFont.lfStrikeOut = FALSE; + lfTextFont.lfCharSet = DEFAULT_CHARSET; + lfTextFont.lfOutPrecision = OUT_DEFAULT_PRECIS; + lfTextFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lfTextFont.lfQuality = DEFAULT_QUALITY; + lfTextFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; + lstrcpy(lfTextFont.lfFaceName, _T("")); + hfontTextFont = CreateFontIndirect(&lfTextFont); + /* init palette */ selectedPalette = 1; CopyMemory(palColors, modernPalColors, sizeof(palColors)); Modified: trunk/reactos/base/applications/mspaint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/mouse.c [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -15,8 +15,8 @@ void placeSelWin() { - MoveWindow(hSelection, rectSel_dest[0] * zoom / 1000, rectSel_dest[1] * zoom / 1000, - rectSel_dest[2] * zoom / 1000 + 6, rectSel_dest[3] * zoom / 1000 + 6, TRUE); + MoveWindow(hSelection, rectSel_dest.left * zoom / 1000, rectSel_dest.top * zoom / 1000, + RECT_WIDTH(rectSel_dest) * zoom / 1000 + 6, RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 6, TRUE); BringWindowToTop(hSelection); InvalidateRect(hImageArea, NULL, FALSE); } @@ -72,7 +72,6 @@ ptStack[0].x = x; ptStack[0].y = y; break; - case TOOL_TEXT: case TOOL_LINE: case TOOL_RECT: case TOOL_ELLIPSE: @@ -80,9 +79,11 @@ newReversible(); break; case TOOL_RECTSEL: + case TOOL_TEXT: newReversible(); ShowWindow(hSelection, SW_HIDE); - rectSel_src[2] = rectSel_src[3] = 0; + rectSel_src.right = rectSel_src.left; + rectSel_src.bottom = rectSel_src.top; break; case TOOL_RUBBER: newReversible(); @@ -144,15 +145,16 @@ Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE); break; case TOOL_RECTSEL: + case TOOL_TEXT: { POINT temp; resetToU1(); temp.x = max(0, min(x, imgXRes)); temp.y = max(0, min(y, imgYRes)); - rectSel_dest[0] = rectSel_src[0] = min(start.x, temp.x); - rectSel_dest[1] = rectSel_src[1] = min(start.y, temp.y); - rectSel_dest[2] = rectSel_src[2] = max(start.x, temp.x) - min(start.x, temp.x); - rectSel_dest[3] = rectSel_src[3] = max(start.y, temp.y) - min(start.y, temp.y); + rectSel_dest.left = rectSel_src.left = min(start.x, temp.x); + rectSel_dest.top = rectSel_src.top = min(start.y, temp.y); + rectSel_dest.right = rectSel_src.right = max(start.x, temp.x); + rectSel_dest.bottom = rectSel_src.bottom = max(start.y, temp.y); RectSel(hdc, start.x, start.y, temp.x, temp.y); break; } @@ -235,46 +237,46 @@ { POINT *ptStackCopy; int i; - rectSel_src[0] = rectSel_src[1] = 0x7fffffff; - rectSel_src[2] = rectSel_src[3] = 0; + rectSel_src.left = rectSel_src.top = MAXLONG; + rectSel_src.right = rectSel_src.bottom = 0; for (i = 0; i <= ptSP; i++) { - if (ptStack[i].x < rectSel_src[0]) - rectSel_src[0] = ptStack[i].x; - if (ptStack[i].y < rectSel_src[1]) - rectSel_src[1] = ptStack[i].y; - if (ptStack[i].x > rectSel_src[2]) - rectSel_src[2] = ptStack[i].x; - if (ptStack[i].y > rectSel_src[3]) - rectSel_src[3] = ptStack[i].y; - } - rectSel_src[2] += 1 - rectSel_src[0]; - rectSel_src[3] += 1 - rectSel_src[1]; - rectSel_dest[0] = rectSel_src[0]; - rectSel_dest[1] = rectSel_src[1]; - rectSel_dest[2] = rectSel_src[2]; - rectSel_dest[3] = rectSel_src[3]; + if (ptStack[i].x < rectSel_src.left) + rectSel_src.left = ptStack[i].x; + if (ptStack[i].y < rectSel_src.top) + rectSel_src.top = ptStack[i].y; + if (ptStack[i].x > rectSel_src.right) + rectSel_src.right = ptStack[i].x; + if (ptStack[i].y > rectSel_src.bottom) + rectSel_src.bottom = ptStack[i].y; + } + rectSel_src.right += 1; + rectSel_src.bottom += 1; + rectSel_dest.left = rectSel_src.left; + rectSel_dest.top = rectSel_src.top; + rectSel_dest.right = rectSel_src.right; + rectSel_dest.bottom = rectSel_src.bottom; if (ptSP != 0) { DeleteObject(hSelMask); - hSelMask = CreateBitmap(rectSel_src[2], rectSel_src[3], 1, 1, NULL); + hSelMask = CreateBitmap(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 1, 1, NULL); DeleteObject(SelectObject(hSelDC, hSelMask)); ptStackCopy = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * (ptSP + 1)); for (i = 0; i <= ptSP; i++) { - ptStackCopy[i].x = ptStack[i].x - rectSel_src[0]; - ptStackCopy[i].y = ptStack[i].y - rectSel_src[1]; + ptStackCopy[i].x = ptStack[i].x - rectSel_src.left; + ptStackCopy[i].y = ptStack[i].y - rectSel_src.top; } Poly(hSelDC, ptStackCopy, ptSP + 1, 0x00ffffff, 0x00ffffff, 1, 2, TRUE); HeapFree(GetProcessHeap(), 0, ptStackCopy); - SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(rectSel_src[2], rectSel_src[3])); + SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src))); resetToU1(); - MaskBlt(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], hDrawingDC, rectSel_src[0], - rectSel_src[1], hSelMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS)); + MaskBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left, + rectSel_src.top, hSelMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS)); Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE); newReversible(); - MaskBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0, + MaskBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); placeSelWin(); @@ -290,29 +292,37 @@ } case TOOL_RECTSEL: resetToU1(); - if ((rectSel_src[2] != 0) && (rectSel_src[3] != 0)) + if ((RECT_WIDTH(rectSel_src) != 0) && (RECT_HEIGHT(rectSel_src) != 0)) { DeleteObject(hSelMask); - hSelMask = CreateBitmap(rectSel_src[2], rectSel_src[3], 1, 1, NULL); + hSelMask = CreateBitmap(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 1, 1, NULL); DeleteObject(SelectObject(hSelDC, hSelMask)); - Rect(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], 0x00ffffff, 0x00ffffff, 1, 2); - SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(rectSel_src[2], rectSel_src[3])); + Rect(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), 0x00ffffff, 0x00ffffff, 1, 2); + SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src))); resetToU1(); - BitBlt(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], hDrawingDC, rectSel_src[0], - rectSel_src[1], SRCCOPY); - Rect(hdc, rectSel_src[0], rectSel_src[1], rectSel_src[0] + rectSel_src[2], - rectSel_src[1] + rectSel_src[3], bgColor, bgColor, 0, TRUE); - newReversible(); - - BitBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0, + BitBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left, + rectSel_src.top, SRCCOPY); + Rect(hdc, rectSel_src.left, rectSel_src.top, rectSel_src.right, + rectSel_src.bottom, bgColor, bgColor, 0, TRUE); + newReversible(); + + BitBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0, 0, SRCCOPY); placeSelWin(); ShowWindow(hSelection, SW_SHOW); - /* force refresh of selection contents */ - SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0); - SendMessage(hSelection, WM_MOUSEMOVE, 0, 0); - SendMessage(hSelection, WM_LBUTTONUP, 0, 0); + ForceRefreshSelectionContents(); + } + break; + case TOOL_TEXT: + resetToU1(); + if ((RECT_WIDTH(rectSel_src) != 0) && (RECT_HEIGHT(rectSel_src) != 0)) + { + newReversible(); + + placeSelWin(); + ShowWindow(hSelection, SW_SHOW); + ForceRefreshSelectionContents(); } break; case TOOL_RUBBER: Modified: trunk/reactos/base/applications/mspaint/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/palette.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/palette.c [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -67,6 +67,8 @@ { fgColor = palColors[(GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14]; InvalidateRect(hwnd, NULL, FALSE); + if (activeTool == 10) + ForceRefreshSelectionContents(); } break; case WM_RBUTTONDOWN: @@ -74,6 +76,8 @@ { bgColor = palColors[(GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14]; InvalidateRect(hwnd, NULL, FALSE); + if (activeTool == 10) + ForceRefreshSelectionContents(); } break; case WM_LBUTTONDBLCLK: @@ -84,6 +88,8 @@ choosecolor.rgbResult; fgColor = choosecolor.rgbResult; InvalidateRect(hwnd, NULL, FALSE); + if (activeTool == 10) + ForceRefreshSelectionContents(); } break; case WM_RBUTTONDBLCLK: @@ -94,6 +100,8 @@ choosecolor.rgbResult; bgColor = choosecolor.rgbResult; InvalidateRect(hwnd, NULL, FALSE); + if (activeTool == 10) + ForceRefreshSelectionContents(); } break; Modified: trunk/reactos/base/applications/mspaint/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/precomp.h [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -20,5 +20,6 @@ #include "globalvar.h" #include "history.h" #include "mouse.h" +#include "selection.h" #endif /* _MSPAINT_H */ Modified: trunk/reactos/base/applications/mspaint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -18,10 +18,50 @@ BOOL moving = FALSE; int action = 0; -short xPos; -short yPos; -short xFrac; -short yFrac; +POINTS pos; +POINTS frac; + +BOOL +ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, DWORD dwRop, COLORREF keyColor) +{ + HDC hTempDC; + HDC hTempDC2; + HBITMAP hTempBm; + HBRUSH hTempBrush; + HBITMAP hTempMask; + + hTempDC = CreateCompatibleDC(hdcSrc); + hTempDC2 = CreateCompatibleDC(hdcSrc); + hTempBm = CreateCompatibleBitmap(hTempDC, nWidth, nHeight); + SelectObject(hTempDC, hTempBm); + hTempBrush = CreateSolidBrush(keyColor); + SelectObject(hTempDC, hTempBrush); + BitBlt(hTempDC, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY); + PatBlt(hTempDC, 0, 0, nWidth, nHeight, PATINVERT); + hTempMask = CreateBitmap(nWidth, nHeight, 1, 1, NULL); + SelectObject(hTempDC2, hTempMask); + BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, 0, 0, SRCCOPY); + SelectObject(hTempDC, hbmMask); + BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, xMask, yMask, SRCAND); + MaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, hTempMask, xMask, yMask, dwRop); + DeleteDC(hTempDC); + DeleteDC(hTempDC2); + DeleteObject(hTempBm); + DeleteObject(hTempBrush); + DeleteObject(hTempMask); + return TRUE; +} + +void +ForceRefreshSelectionContents() +{ + if (IsWindowVisible(hSelection)) + { + SendMessage(hSelection, WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); + SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); + SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); + } +} int identifyCorner(short x, short y, short w, short h) @@ -65,15 +105,15 @@ { HDC hDC = GetDC(hwnd); DefWindowProc(hwnd, message, wParam, lParam); - SelectionFrame(hDC, 1, 1, rectSel_dest[2] * zoom / 1000 + 5, - rectSel_dest[3] * zoom / 1000 + 5); + SelectionFrame(hDC, 1, 1, RECT_WIDTH(rectSel_dest) * zoom / 1000 + 5, + RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 5); ReleaseDC(hwnd, hDC); } break; } case WM_LBUTTONDOWN: - xPos = GET_X_LPARAM(lParam); - yPos = GET_Y_LPARAM(lParam); + pos.x = GET_X_LPARAM(lParam); + pos.y = GET_Y_LPARAM(lParam); SetCapture(hwnd); if (action != 0) SetCursor(LoadCursor(NULL, cursors[action])); @@ -83,107 +123,94 @@ if (moving) { TCHAR sizeStr[100]; - int xDelta; - int yDelta; + POINT delta; resetToU1(); - xFrac += GET_X_LPARAM(lParam) - xPos; - yFrac += GET_Y_LPARAM(lParam) - yPos; + frac.x += GET_X_LPARAM(lParam) - pos.x; + frac.y += GET_Y_LPARAM(lParam) - pos.y; if (zoom < 1000) { - xDelta = xFrac * 1000 / zoom; - xFrac = 0; - yDelta = yFrac * 1000 / zoom; - yFrac = 0; + delta.x = frac.x * 1000 / zoom; + frac.x = 0; + delta.y = frac.y * 1000 / zoom; + frac.y = 0; } else { - xDelta = xFrac * 1000 / zoom; - xFrac -= (xFrac * 1000 / zoom) * zoom / 1000; - yDelta = yFrac * 1000 / zoom; - yFrac -= (yFrac * 1000 / zoom) * zoom / 1000; + delta.x = frac.x * 1000 / zoom; + frac.x -= (frac.x * 1000 / zoom) * zoom / 1000; + delta.y = frac.y * 1000 / zoom; + frac.y -= (frac.y * 1000 / zoom) * zoom / 1000; } switch (action) { - case 0: - rectSel_dest[0] += xDelta; - rectSel_dest[1] += yDelta; - break; - case 1: - rectSel_dest[0] += xDelta; - rectSel_dest[1] += yDelta; - rectSel_dest[2] -= xDelta; - rectSel_dest[3] -= yDelta; - break; - case 2: - rectSel_dest[1] += yDelta; - rectSel_dest[3] -= yDelta; - break; - case 3: - rectSel_dest[1] += yDelta; - rectSel_dest[2] += xDelta; - rectSel_dest[3] -= yDelta; - break; - case 4: - rectSel_dest[0] += xDelta; - rectSel_dest[2] -= xDelta; - break; - case 5: - rectSel_dest[2] += xDelta; - break; - case 6: - rectSel_dest[0] += xDelta; - rectSel_dest[2] -= xDelta; - rectSel_dest[3] += yDelta; - break; - case 7: - rectSel_dest[3] += yDelta; - break; - case 8: - rectSel_dest[2] += xDelta; - rectSel_dest[3] += yDelta; - break; - } - - _stprintf(sizeStr, _T("%d x %d"), rectSel_dest[2], rectSel_dest[3]); + /* TODO: make sure that the selection is at least 1 pixel wide and high */ + case 0: /* move selection */ + OffsetRect(&rectSel_dest, delta.x, delta.y); + break; + case 1: /* resize at upper left corner */ + rectSel_dest.left += delta.x; + rectSel_dest.top += delta.y; + break; + case 2: /* resize at top edge */ + rectSel_dest.top += delta.y; + break; + case 3: /* resize at upper right corner */ + rectSel_dest.top += delta.y; + rectSel_dest.right += delta.x; + break; + case 4: /* resize at left edge */ + rectSel_dest.left += delta.x; + break; + case 5: /* resize at right edge */ + rectSel_dest.right += delta.x; + break; + case 6: /* resize at lower left corner */ + rectSel_dest.left += delta.x; + rectSel_dest.bottom += delta.y; + break; + case 7: /* resize at bottom edge */ + rectSel_dest.bottom += delta.y; + break; + case 8: /* resize at lower right corner */ + rectSel_dest.right += delta.x; + rectSel_dest.bottom += delta.y; + break; + } + + _stprintf(sizeStr, _T("%d x %d"), RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest)); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); - if (action != 0) - StretchBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); + if (activeTool == 10) /* text tool */ + { + Text(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, fgColor, bgColor, textToolText, hfontTextFont, transpBg); + } else - if (transpBg == 0) - MaskBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], - hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); - else - { - HBITMAP tempMask; - HBRUSH oldBrush; - HDC tempDC; - tempMask = CreateBitmap(rectSel_dest[2], rectSel_dest[3], 1, 1, NULL); - oldBrush = SelectObject(hSelDC, CreateSolidBrush(bgColor)); - tempDC = CreateCompatibleDC(hSelDC); - SelectObject(tempDC, tempMask); - MaskBlt(tempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, hSelMask, 0, 0, - MAKEROP4(NOTSRCCOPY, BLACKNESS)); - DeleteDC(tempDC); - DeleteObject(SelectObject(hSelDC, oldBrush)); - - MaskBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], - hSelDC, 0, 0, tempMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); - DeleteObject(tempMask); + { + if (action != 0) + StretchBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0, GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); + else + if (transpBg == 0) + MaskBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), + hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); + else + { + ColorKeyedMaskBlt(hDrawingDC, rectSel_dest.left, rectSel_dest.top, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), + hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND), bgColor); + } } InvalidateRect(hImageArea, NULL, FALSE); - xPos = GET_X_LPARAM(lParam); - yPos = GET_Y_LPARAM(lParam); + pos.x = GET_X_LPARAM(lParam); + pos.y = GET_Y_LPARAM(lParam); //SendMessage(hwnd, WM_PAINT, 0, 0); } else { - int w = rectSel_dest[2] * zoom / 1000 + 6; - int h = rectSel_dest[3] * zoom / 1000 + 6; - xPos = GET_X_LPARAM(lParam); - yPos = GET_Y_LPARAM(lParam); + int w = RECT_WIDTH(rectSel_dest) * zoom / 1000 + 6; + int h = RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 6; + pos.x = GET_X_LPARAM(lParam); + pos.y = GET_Y_LPARAM(lParam); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL); - action = identifyCorner(xPos, yPos, w, h); + action = identifyCorner(pos.x, pos.y, w, h); if (action != 0) SetCursor(LoadCursor(NULL, cursors[action])); } @@ -195,25 +222,32 @@ ReleaseCapture(); if (action != 0) { - HDC hTempDC; - HBITMAP hTempBm; - hTempDC = CreateCompatibleDC(hSelDC); - hTempBm = CreateDIBWithProperties(rectSel_dest[2], rectSel_dest[3]); - SelectObject(hTempDC, hTempBm); - SelectObject(hSelDC, hSelBm); - StretchBlt(hTempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, - GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); - DeleteObject(hSelBm); - hSelBm = hTempBm; - hTempBm = CreateBitmap(rectSel_dest[2], rectSel_dest[3], 1, 1, NULL); - SelectObject(hTempDC, hTempBm); - SelectObject(hSelDC, hSelMask); - StretchBlt(hTempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, - GetDIBWidth(hSelMask), GetDIBHeight(hSelMask), SRCCOPY); - DeleteObject(hSelMask); - hSelMask = hTempBm; - SelectObject(hSelDC, hSelBm); - DeleteDC(hTempDC); + if (activeTool == 10) /* text tool */ + { + + } + else + { + HDC hTempDC; + HBITMAP hTempBm; + hTempDC = CreateCompatibleDC(hSelDC); + hTempBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest)); + SelectObject(hTempDC, hTempBm); + SelectObject(hSelDC, hSelBm); + StretchBlt(hTempDC, 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0, + GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); + DeleteObject(hSelBm); + hSelBm = hTempBm; + hTempBm = CreateBitmap(RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), 1, 1, NULL); + SelectObject(hTempDC, hTempBm); + SelectObject(hSelDC, hSelMask); + StretchBlt(hTempDC, 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, 0, 0, + GetDIBWidth(hSelMask), GetDIBHeight(hSelMask), SRCCOPY); + DeleteObject(hSelMask); + hSelMask = hTempBm; + SelectObject(hSelDC, hSelBm); + DeleteDC(hTempDC); + } } placeSelWin(); ShowWindow(hSelection, SW_HIDE); Modified: trunk/reactos/base/applications/mspaint/selection.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.h [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -6,4 +6,6 @@ * PROGRAMMERS: Benedikt Freisen */ +void ForceRefreshSelectionContents(); + LRESULT CALLBACK SelectionWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/mspaint/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/toolsettings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/toolsettings.c [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -184,13 +184,7 @@ transpBg = (y - 2) / 31; InvalidateRect(hwnd, NULL, TRUE); - if (IsWindowVisible(hSelection)) - { - /* force refresh of selection contents */ - SendMessage(hSelection, WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); - } + ForceRefreshSelectionContents(); } break; case TOOL_RUBBER: Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Fri Feb 7 17:54:25 2014 @@ -44,15 +44,15 @@ int tbPos = 0; int tempZoom = newZoom; - long clientRectScrollbox[4]; - long clientRectImageArea[4]; + RECT clientRectScrollbox; + RECT clientRectImageArea; int x, y, w, h; - GetClientRect(hScrollbox, (LPRECT) &clientRectScrollbox); - GetClientRect(hImageArea, (LPRECT) &clientRectImageArea); - w = clientRectImageArea[2] * clientRectScrollbox[2] / (clientRectImageArea[2] * newZoom / zoom); - h = clientRectImageArea[3] * clientRectScrollbox[3] / (clientRectImageArea[3] * newZoom / zoom); - x = max(0, min(clientRectImageArea[2] - w, mouseX - w / 2)) * newZoom / zoom; - y = max(0, min(clientRectImageArea[3] - h, mouseY - h / 2)) * newZoom / zoom; + GetClientRect(hScrollbox, &clientRectScrollbox); + GetClientRect(hImageArea, &clientRectImageArea); + w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * newZoom / zoom); + h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * newZoom / zoom); + x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / zoom; + y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / zoom; zoom = newZoom; @@ -81,15 +81,15 @@ LOGBRUSH logbrush; int rop; - long clientRectScrollbox[4]; - long clientRectImageArea[4]; + RECT clientRectScrollbox; + RECT clientRectImageArea; int x, y, w, h; - GetClientRect(hScrollbox, (LPRECT) &clientRectScrollbox); - GetClientRect(hImageArea, (LPRECT) &clientRectImageArea); - w = clientRectImageArea[2] * clientRectScrollbox[2] / (clientRectImageArea[2] * 2); - h = clientRectImageArea[3] * clientRectScrollbox[3] / (clientRectImageArea[3] * 2); - x = max(0, min(clientRectImageArea[2] - w, mouseX - w / 2)); - y = max(0, min(clientRectImageArea[3] - h, mouseY - h / 2)); + GetClientRect(hScrollbox, &clientRectScrollbox); + GetClientRect(hImageArea, &clientRectImageArea); + w = clientRectImageArea.right * clientRectScrollbox.right / (clientRectImageArea.right * 2); + h = clientRectImageArea.bottom * clientRectScrollbox.bottom / (clientRectImageArea.bottom * 2); + x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)); + y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)); hdc = GetDC(hImageArea); oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 0, 0)); @@ -190,25 +190,22 @@ IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG))); newReversible(); - rectSel_src[0] = rectSel_src[1] = rectSel_src[2] = rectSel_src[3] = 0; - rectSel_dest[0] = rectSel_dest[1] = 0; - rectSel_dest[2] = GetDIBWidth(hSelBm); - rectSel_dest[3] = GetDIBHeight(hSelBm); + SetRectEmpty(&rectSel_src); + rectSel_dest.left = rectSel_dest.top = 0; + rectSel_dest.right = rectSel_dest.left + GetDIBWidth(hSelBm); + rectSel_dest.bottom = rectSel_dest.top + GetDIBHeight(hSelBm); hTempDC = CreateCompatibleDC(hSelDC); - hTempMask = CreateBitmap(rectSel_dest[2], rectSel_dest[3], 1, 1, NULL); + hTempMask = CreateBitmap(RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), 1, 1, NULL); SelectObject(hTempDC, hTempMask); - Rect(hTempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], 0x00ffffff, 0x00ffffff, 1, 1); + Rect(hTempDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, rectSel_dest.bottom, 0x00ffffff, 0x00ffffff, 1, 1); DeleteObject(hSelMask); hSelMask = hTempMask; DeleteDC(hTempDC); placeSelWin(); ShowWindow(hSelection, SW_SHOW); - /* force refresh of selection contents */ - SendMessage(hSelection, WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); + ForceRefreshSelectionContents(); } BOOL drawing; @@ -280,100 +277,52 @@ break; case WM_INITMENUPOPUP: + { + HMENU menu = GetMenu(hMainWnd); + BOOL trueSelection = (IsWindowVisible(hSelection) && ((activeTool == 1) || (activeTool == 2))); switch (lParam) { - case 0: - if (isAFile) - { - EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERPLANE, - MF_ENABLED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERCENTERED, - MF_ENABLED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERSTRETCHED, - MF_ENABLED | MF_BYCOMMAND); - } - else - { - EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERPLANE, - MF_GRAYED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERCENTERED, - MF_GRAYED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERSTRETCHED, - MF_GRAYED | MF_BYCOMMAND); - } - break; - case 1: - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITUNDO, - (undoSteps > 0) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITREDO, - (redoSteps > 0) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)); - if (IsWindowVisible(hSelection)) - { - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCUT, MF_ENABLED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCOPY, MF_ENABLED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITDELETESELECTION, MF_ENABLED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITINVERTSELECTION, MF_ENABLED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCOPYTO, MF_ENABLED | MF_BYCOMMAND); - } - else - { - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCUT, MF_GRAYED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCOPY, MF_GRAYED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITDELETESELECTION, MF_GRAYED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITINVERTSELECTION, MF_GRAYED | MF_BYCOMMAND); - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITCOPYTO, MF_GRAYED | MF_BYCOMMAND); - } + case 0: /* File menu */ + EnableMenuItem(menu, IDM_FILEASWALLPAPERPLANE, ENABLED_IF(isAFile)); + EnableMenuItem(menu, IDM_FILEASWALLPAPERCENTERED, ENABLED_IF(isAFile)); + EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile)); + break; + case 1: /* Edit menu */ + EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(undoSteps > 0)); + EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(redoSteps > 0)); + EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(trueSelection)); + EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(trueSelection)); + EnableMenuItem(menu, IDM_EDITDELETESELECTION, ENABLED_IF(trueSelection)); + EnableMenuItem(menu, IDM_EDITINVERTSELECTION, ENABLED_IF(trueSelection)); + EnableMenuItem(menu, IDM_EDITCOPYTO, ENABLED_IF(trueSelection)); OpenClipboard(hMainWnd); - if (GetClipboardData(CF_BITMAP) != NULL) - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITPASTE, MF_ENABLED | MF_BYCOMMAND); - else - EnableMenuItem(GetMenu(hMainWnd), IDM_EDITPASTE, MF_GRAYED | MF_BYCOMMAND); + EnableMenuItem(menu, IDM_EDITPASTE, ENABLED_IF(GetClipboardData(CF_BITMAP) != NULL)); CloseClipboard(); break; - case 3: - if (IsWindowVisible(hSelection)) - EnableMenuItem(GetMenu(hMainWnd), IDM_IMAGECROP, MF_ENABLED | MF_BYCOMMAND); - else - EnableMenuItem(GetMenu(hMainWnd), IDM_IMAGECROP, MF_GRAYED | MF_BYCOMMAND); - CheckMenuItem(GetMenu(hMainWnd), IDM_IMAGEDRAWOPAQUE, (transpBg == 0) ? - (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - break; - } - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWTOOLBOX, - IsWindowVisible(hToolBoxContainer) ? - (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWCOLORPALETTE, - IsWindowVisible(hPalWin) ? - (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSTATUSBAR, - IsWindowVisible(hStatusBar) ? - (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWGRID, - showGrid ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWMINIATURE, - showMiniature ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM125, - (zoom == 125) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM25, - (zoom == 250) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM50, - (zoom == 500) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM100, - (zoom == 1000) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM200, - (zoom == 2000) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM400, - (zoom == 4000) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM800, - (zoom == 8000) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - - CheckMenuItem(GetMenu(hMainWnd), IDM_COLORSMODERNPALETTE, - (selectedPalette == 1) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - CheckMenuItem(GetMenu(hMainWnd), IDM_COLORSOLDPALETTE, - (selectedPalette == 2) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)); - break; + case 3: /* Image menu */ + EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(IsWindowVisible(hSelection))); + CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(transpBg == 0)); + break; + } + CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(IsWindowVisible(hToolBoxContainer))); + CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(IsWindowVisible(hPalWin))); + CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(IsWindowVisible(hStatusBar))); + + CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); + CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); + + CheckMenuItem(menu, IDM_VIEWZOOM125, CHECKED_IF(zoom == 125)); + CheckMenuItem(menu, IDM_VIEWZOOM25, CHECKED_IF(zoom == 250)); + CheckMenuItem(menu, IDM_VIEWZOOM50, CHECKED_IF(zoom == 500)); + CheckMenuItem(menu, IDM_VIEWZOOM100, CHECKED_IF(zoom == 1000)); + CheckMenuItem(menu, IDM_VIEWZOOM200, CHECKED_IF(zoom == 2000)); + CheckMenuItem(menu, IDM_VIEWZOOM400, CHECKED_IF(zoom == 4000)); + CheckMenuItem(menu, IDM_VIEWZOOM800, CHECKED_IF(zoom == 8000)); + + CheckMenuItem(menu, IDM_COLORSMODERNPALETTE, CHECKED_IF(selectedPalette == 1)); + CheckMenuItem(menu, IDM_COLORSOLDPALETTE, CHECKED_IF(selectedPalette == 2)); + break; + } case WM_SIZE: if (hwnd == hMainWnd) @@ -413,25 +362,25 @@ } if ((hwnd == hImageArea) || (hwnd == hScrollbox)) { - long clientRectScrollbox[4]; - long clientRectImageArea[4]; + RECT clientRectScrollbox; + RECT clientRectImageArea; SCROLLINFO si; - GetClientRect(hScrollbox, (LPRECT) &clientRectScrollbox); - GetClientRect(hImageArea, (LPRECT) &clientRectImageArea); + GetClientRect(hScrollbox, &clientRectScrollbox); + GetClientRect(hImageArea, &clientRectImageArea); si.cbSize = sizeof(SCROLLINFO); si.fMask = SIF_PAGE | SIF_RANGE; - si.nMax = clientRectImageArea[2] + 6 - 1; + si.nMax = clientRectImageArea.right + 6 - 1; si.nMin = 0; - si.nPage = clientRectScrollbox[2]; + si.nPage = clientRectScrollbox.right; SetScrollInfo(hScrollbox, SB_HORZ, &si, TRUE); - GetClientRect(hScrollbox, (LPRECT) clientRectScrollbox); - si.nMax = clientRectImageArea[3] + 6 - 1; - si.nPage = clientRectScrollbox[3]; + GetClientRect(hScrollbox, &clientRectScrollbox); + si.nMax = clientRectImageArea.bottom + 6 - 1; + si.nPage = clientRectScrollbox.bottom; SetScrollInfo(hScrollbox, SB_VERT, &si, TRUE); MoveWindow(hScrlClient, -GetScrollPos(hScrollbox, SB_HORZ), -GetScrollPos(hScrollbox, SB_VERT), - max(clientRectImageArea[2] + 6, clientRectScrollbox[2]), - max(clientRectImageArea[3] + 6, clientRectScrollbox[3]), TRUE); + max(clientRectImageArea.right + 6, clientRectScrollbox.right), + max(clientRectImageArea.bottom + 6, clientRectScrollbox.bottom), TRUE); } break; @@ -908,8 +857,8 @@ if (activeTool == TOOL_RECTSEL) { newReversible(); - Rect(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2] + rectSel_dest[0], - rectSel_dest[3] + rectSel_dest[1], bgColor, bgColor, 0, TRUE); + Rect(hDrawingDC, rectSel_dest.left, rectSel_dest.top, rectSel_dest.right, + rectSel_dest.bottom, bgColor, bgColor, 0, TRUE); } if (activeTool == TOOL_FREESEL) { @@ -982,15 +931,12 @@ if (IsWindowVisible(hSelection)) { SelectObject(hSelDC, hSelMask); - StretchBlt(hSelDC, rectSel_dest[2] - 1, 0, -rectSel_dest[2], rectSel_dest[3], hSelDC, - 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + StretchBlt(hSelDC, RECT_WIDTH(rectSel_dest) - 1, 0, -RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, + 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY); SelectObject(hSelDC, hSelBm); - StretchBlt(hSelDC, rectSel_dest[2] - 1, 0, -rectSel_dest[2], rectSel_dest[3], hSelDC, - 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); - /* force refresh of selection contents */ - SendMessage(hSelection, WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); + StretchBlt(hSelDC, RECT_WIDTH(rectSel_dest) - 1, 0, -RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), hSelDC, + 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY); + ForceRefreshSelectionContents(); } else { @@ -1004,15 +950,12 @@ if (IsWindowVisible(hSelection)) { SelectObject(hSelDC, hSelMask); - StretchBlt(hSelDC, 0, rectSel_dest[3] - 1, rectSel_dest[2], -rectSel_dest[3], hSelDC, - 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + StretchBlt(hSelDC, 0, RECT_HEIGHT(rectSel_dest) - 1, RECT_WIDTH(rectSel_dest), -RECT_HEIGHT(rectSel_dest), hSelDC, + 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY); SelectObject(hSelDC, hSelBm); - StretchBlt(hSelDC, 0, rectSel_dest[3] - 1, rectSel_dest[2], -rectSel_dest[3], hSelDC, - 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); - /* force refresh of selection contents */ - SendMessage(hSelection, WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); + StretchBlt(hSelDC, 0, RECT_HEIGHT(rectSel_dest) - 1, RECT_WIDTH(rectSel_dest), -RECT_HEIGHT(rectSel_dest), hSelDC, + 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY); + ForceRefreshSelectionContents(); } else { @@ -1028,15 +971,12 @@ if (IsWindowVisible(hSelection)) { SelectObject(hSelDC, hSelMask); - StretchBlt(hSelDC, rectSel_dest[2] - 1, rectSel_dest[3] - 1, -rectSel_dest[2], -rectSel_dest[3], hSelDC, - 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + StretchBlt(hSelDC, RECT_WIDTH(rectSel_dest) - 1, RECT_HEIGHT(rectSel_dest) - 1, -RECT_WIDTH(rectSel_dest), -RECT_HEIGHT(rectSel_dest), hSelDC, + 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY); SelectObject(hSelDC, hSelBm); - StretchBlt(hSelDC, rectSel_dest[2] - 1, rectSel_dest[3] - 1, -rectSel_dest[2], -rectSel_dest[3], hSelDC, - 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); - /* force refresh of selection contents */ - SendMessage(hSelection, WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); + StretchBlt(hSelDC, RECT_WIDTH(rectSel_dest) - 1, RECT_HEIGHT(rectSel_dest) - 1, -RECT_WIDTH(rectSel_dest), -RECT_HEIGHT(rectSel_dest), hSelDC, + 0, 0, RECT_WIDTH(rectSel_dest), RECT_HEIGHT(rectSel_dest), SRCCOPY); + ForceRefreshSelectionContents(); } else {

10 years, 7 months

[akhaldi] 62024: [MSGINA] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Feb 7 17:38:56 2014 New Revision: 62024 URL: http://svn.reactos.org/svn/reactos?rev=62024&view=rev Log: [MSGINA] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Fri Feb 7 17:38:56 2014 @@ -6,6 +6,9 @@ */ #include "msgina.h" + +#include <wingdi.h> +#include <winnls.h> typedef struct _DISPLAYSTATUSMSG { Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Fri Feb 7 17:38:56 2014 @@ -25,6 +25,11 @@ */ #include "msgina.h" + +#include <winreg.h> +#include <winsvc.h> +#include <userenv.h> +#include <ndk/sefuncs.h> HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Fri Feb 7 17:38:56 2014 @@ -1,24 +1,17 @@ #ifndef _MSGINA_H #define _MSGINA_H +#include <stdarg.h> + #define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <stdlib.h> #include <windef.h> #include <winbase.h> -#include <wincon.h> -#include <winreg.h> -#include <wingdi.h> -#include <winnls.h> -#include <winsvc.h> #include <winuser.h> -#include <userenv.h> #include <winwlx.h> -#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> -#include <ndk/sefuncs.h> -#include <ntlsa.h> #include <ntsecapi.h> #include <wine/debug.h> @@ -116,5 +109,3 @@ IN PWSTR Password); #endif /* _MSGINA_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/tui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/tui.c [iso-8859-1] Fri Feb 7 17:38:56 2014 @@ -6,6 +6,8 @@ */ #include "msgina.h" + +#include <wincon.h> static BOOL TUIInitialize(

10 years, 7 months

[akhaldi] 62023: [WIN32SS] * Add header guards to the main headers. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Feb 7 17:32:20 2014 New Revision: 62023 URL: http://svn.reactos.org/svn/reactos?rev=62023&view=rev Log: [WIN32SS] * Add header guards to the main headers. CORE-7716 Modified: trunk/reactos/win32ss/drivers/displays/framebuf/dd.c trunk/reactos/win32ss/drivers/displays/framebuf/ddenable.c trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c trunk/reactos/win32ss/drivers/displays/vga/vgaddi.h trunk/reactos/win32ss/drivers/font/bmfd/bmfd.h trunk/reactos/win32ss/drivers/font/ftfd/ftfd.h trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.h trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h trunk/reactos/win32ss/gdi/gdi32/include/precomp.h trunk/reactos/win32ss/reactx/dxg/dxg_int.h trunk/reactos/win32ss/user/user32/include/user32.h Modified: trunk/reactos/win32ss/drivers/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf/dd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf/dd.c [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -21,7 +21,6 @@ /* Here we put in all 2d api for directdraw and redirect some of them to GDI api */ #include "framebuf.h" - DWORD CALLBACK DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA pccsd) @@ -113,4 +112,3 @@ pcsd->ddRVal = DD_OK; return DDHAL_DRIVER_HANDLED; } - Modified: trunk/reactos/win32ss/drivers/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf/ddenable.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf/ddenable.c [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -257,4 +257,3 @@ return TRUE; } - Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -6,6 +6,7 @@ * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group */ + #include "driver.h" #define SYSTM_LOGFONT {16,7,0,0,700,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,VARIABLE_PITCH | FF_DONTCARE,L"System"} Modified: trunk/reactos/win32ss/drivers/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/vgaddi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/vgaddi.h [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -1,3 +1,6 @@ +#ifndef _VGADDI_PCH_ +#define _VGADDI_PCH_ + #define _WINBASE_ #define _WINDOWS_H #include <stdarg.h> @@ -281,3 +284,5 @@ VOID FASTCALL vgaWriteScan(int x, int y, int w, void *b); + +#endif /* _VGADDI_PCH_ */ Modified: trunk/reactos/win32ss/drivers/font/bmfd/bmfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/bmfd.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/bmfd.h [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -4,6 +4,9 @@ * PURPOSE: GDI font driver for bitmap fonts * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ + +#ifndef _BMFD_PCH_ +#define _BMFD_PCH_ #include <stdarg.h> #include <windef.h> @@ -364,3 +367,4 @@ BmfdDestroyFont( IN FONTOBJ *pfo); +#endif /* _BMFD_PCH_ */ Modified: trunk/reactos/win32ss/drivers/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/ftfd.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/ftfd.h [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -4,6 +4,9 @@ * PURPOSE: GDI font driver for bitmap fonts * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ + +#ifndef _FTFD_PCH_ +#define _FTFD_PCH_ #include <stdarg.h> #include <windef.h> @@ -148,3 +151,4 @@ PVOID pv, ULONG cjSize); +#endif /* _FTFD_PCH_ */ Modified: trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vbe/vbemp.h [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -18,6 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _VBEMP_PCH_ +#define _VBEMP_PCH_ + /* INCLUDES *******************************************************************/ #include <ntdef.h> @@ -300,3 +303,5 @@ PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable, PSTATUS_BLOCK StatusBlock); + +#endif /* _VBEMP_PCH_ */ Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -6,6 +6,9 @@ * PROGRAMMERS: Copyright (c) 1992 Microsoft Corporation * ReactOS Portable Systems Group */ + +#ifndef _VGA_NEW_PCH_ +#define _VGA_NEW_PCH_ #include <ntdef.h> #include <dderror.h> @@ -446,3 +449,5 @@ #define VESA_MAGIC ('V' + ('E' << 8) + ('S' << 16) + ('A' << 24)) #include "vbe.h" + +#endif /* _VGA_NEW_PCH_ */ Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -5,6 +5,9 @@ * PURPOSE: User-Mode Win32 GDI Library Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ + +#ifndef _GDI32_PCH_ +#define _GDI32_PCH_ /* INCLUDES ******************************************************************/ @@ -43,4 +46,4 @@ /* Deprecated NTGDI calls which shouldn't exist */ #include <ntgdibad.h> -/* EOF */ +#endif /* _GDI32_PCH_ */ Modified: trunk/reactos/win32ss/reactx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/dxg_int… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -1,3 +1,6 @@ +#ifndef _DXG_PCH_ +#define _DXG_PCH_ + #include <ntifs.h> /* Win32 Headers */ @@ -102,3 +105,5 @@ #define drvDxEngUnlockDC gpEngFuncs[DXENG_INDEX_DxEngUnlockDC] #define drvDxEngUnlockHdev gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev] #define drvDxEngLockHdev gpEngFuncs[DXENG_INDEX_DxEngLockHdev] + +#endif /* _DXG_PCH_ */ Modified: trunk/reactos/win32ss/user/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32.h [iso-8859-1] Fri Feb 7 17:32:20 2014 @@ -5,6 +5,9 @@ * PURPOSE: Win32 User Library * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ + +#ifndef _USER32_PCH_ +#define _USER32_PCH_ /* INCLUDES ******************************************************************/ @@ -54,3 +57,5 @@ /* User macros */ #include "user_x.h" + +#endif /* _USER32_PCH_ */

10 years, 7 months

[akhaldi] 62022: [LIBS] * Add header guards to the main headers. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Feb 7 16:58:53 2014 New Revision: 62022 URL: http://svn.reactos.org/svn/reactos?rev=62022&view=rev Log: [LIBS] * Add header guards to the main headers. CORE-7716 Modified: trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/drivers/hidparser/parser.h trunk/reactos/lib/drivers/ip/precomp.h trunk/reactos/lib/drivers/sound/mmebuddy/precomp.h trunk/reactos/lib/drivers/sound/mment4/precomp.h trunk/reactos/lib/drivers/sound/mmixer/precomp.h trunk/reactos/lib/epsapi/enum/precomp.h trunk/reactos/lib/fslib/ext2lib/Mke2fs.h trunk/reactos/lib/fslib/vfatlib/vfatlib.h trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h trunk/reactos/lib/inflib/inflib.h trunk/reactos/lib/recyclebin/recyclebin_private.h trunk/reactos/lib/smlib/compses.c trunk/reactos/lib/smlib/execpgm.c trunk/reactos/lib/smlib/lookupss.c trunk/reactos/lib/smlib/precomp.h trunk/reactos/lib/smlib/smclient.c Modified: trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/strm… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef _STRMBASE_PCH_ +#define _STRMBASE_PCH_ #include <wine/config.h> @@ -73,3 +76,5 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv); void QualityControlRender_BeginRender(QualityControlImpl *This); void QualityControlRender_EndRender(QualityControlImpl *This); + +#endif /* _STRMBASE_PCH_ */ Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6202… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -4,6 +4,9 @@ * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl */ + +#ifndef _CMLIB_H_ +#define _CMLIB_H_ // // Debug support switch @@ -406,3 +409,5 @@ ULONG CMAPI HvpHiveHeaderChecksum( PHBASE_BLOCK HiveHeader); + +#endif /* _CMLIB_H_ */ Modified: trunk/reactos/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/pars… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/parser.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/parser.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -1,4 +1,5 @@ -#pragma once +#ifndef _HIDPARSER_H_ +#define _HIDPARSER_H_ #include <wdm.h> #include <pshpack1.h> @@ -393,3 +394,5 @@ HidParser_GetReportInCollection( IN PVOID Context, IN UCHAR ReportType); + +#endif /* _HIDPARSER_H_ */ Modified: trunk/reactos/lib/drivers/ip/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/precomp.h?r… ============================================================================== --- trunk/reactos/lib/drivers/ip/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/precomp.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -1,3 +1,6 @@ +#ifndef _IP_PCH_ +#define _IP_PCH_ + #include <tags.h> #include <tcpip.h> #include <loopback.h> @@ -17,3 +20,5 @@ #include <interface.h> #include <ports.h> #include <chew/chew.h> + +#endif /* _IP_PCH_ */ Modified: trunk/reactos/lib/drivers/sound/mmebuddy/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/precomp.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -1,5 +1,10 @@ +#ifndef _MMEBUDDY_PCH_ +#define _MMEBUDDY_PCH_ + #include <stdarg.h> #include <windef.h> #include <mmddk.h> #include <sndtypes.h> #include <mmebuddy.h> + +#endif /* _MMEBUDDY_PCH_ */ Modified: trunk/reactos/lib/drivers/sound/mment4/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/precomp.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -1,3 +1,6 @@ +#ifndef _MMENT4_PCH_ +#define _MMENT4_PCH_ + #include <stdarg.h> #include <windef.h> #include <winbase.h> @@ -7,3 +10,5 @@ #include <sndnames.h> #include <sndtypes.h> #include <mmebuddy.h> + +#endif /* _MMENT4_PCH_ */ Modified: trunk/reactos/lib/drivers/sound/mmixer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/precomp.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -1,3 +1,6 @@ +#ifndef _MMIXER_PCH_ +#define _MMIXER_PCH_ + #include <wdm.h> #include <windef.h> #define NOBITMAP @@ -518,3 +521,5 @@ VOID MMixerPrintTopology(); + +#endif /* _MMIXER_PCH_ */ Modified: trunk/reactos/lib/epsapi/enum/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/epsapi/enum/precomp.h?… ============================================================================== --- trunk/reactos/lib/epsapi/enum/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/epsapi/enum/precomp.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -1,4 +1,9 @@ +#ifndef _EPSAPI_PCH_ +#define _EPSAPI_PCH_ + #define NTOS_MODE_USER #include <ndk/exfuncs.h> #include <epsapi/epsapi.h> + +#endif /* _EPSAPI_PCH_ */ Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.h… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -4,6 +4,9 @@ * PROGRAMMER: Matt Wu <mattwu(a)163.com> * HOMEPAGE: http://ext2.yeah.net */ + +#ifndef _MKE2FS_H_ +#define _MKE2FS_H_ /* INCLUDES **************************************************************/ @@ -393,3 +396,5 @@ */ void uuid_generate(__u8 * uuid); + +#endif /* _MKE2FS_H_ */ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -3,6 +3,9 @@ * PROJECT: ReactOS VFAT filesystem library * FILE: vfatlib.h */ + +#ifndef _VFATLIB_H_ +#define _VFATLIB_H_ #include <stdio.h> @@ -145,4 +148,6 @@ VOID VfatPrint(PCHAR Format, ...); +#endif /* _VFATLIB_H_ */ + /* EOF */ Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/vfatxli… ============================================================================== --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -3,6 +3,9 @@ * PROJECT: ReactOS VFAT filesystem library * FILE: vfatxlib.h */ + +#ifndef _VFATXLIB_H_ +#define _VFATXLIB_H_ #define NTOS_MODE_USER #include <ndk/umtypes.h> @@ -45,4 +48,6 @@ VfatxUpdateProgress (PFORMAT_CONTEXT Context, ULONG Increment); +#endif /* _VFATXLIB_H_ */ + /* EOF */ Modified: trunk/reactos/lib/inflib/inflib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.h?rev=62… ============================================================================== --- trunk/reactos/lib/inflib/inflib.h [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -3,6 +3,9 @@ * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Ge van Geldorp <gvg(a)reactos.org> */ + +#ifndef _INFLIB_PCH_ +#define _INFLIB_PCH_ #include <ctype.h> #include <stddef.h> @@ -12,4 +15,4 @@ #include "infcommon.h" #include "infpriv.h" -/* EOF */ +#endif /* _INFLIB_PCH_ */ Modified: trunk/reactos/lib/recyclebin/recyclebin_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_private.h [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_private.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -1,3 +1,6 @@ +#ifndef _RECYCLEBIN_PRIVATE_H_ +#define _RECYCLEBIN_PRIVATE_H_ + #include <stdio.h> #define COBJMACROS @@ -44,3 +47,5 @@ /* recyclebin_v5.c */ HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown); + +#endif /* _RECYCLEBIN_PRIVATE_H_ */ Modified: trunk/reactos/lib/smlib/compses.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/compses.c?rev=62… ============================================================================== --- trunk/reactos/lib/smlib/compses.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/compses.c [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -4,6 +4,7 @@ * FILE: lib/smlib/compses.c * PURPOSE: Call SM API SM_API_COMPLETE_SESSION */ + #include "precomp.h" #define NDEBUG Modified: trunk/reactos/lib/smlib/execpgm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/execpgm.c?rev=62… ============================================================================== --- trunk/reactos/lib/smlib/execpgm.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/execpgm.c [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -4,6 +4,7 @@ * FILE: lib/smlib/execpgm.c * PURPOSE: Call SM API SM_API_EXECPGM */ + #include "precomp.h" #define NDEBUG Modified: trunk/reactos/lib/smlib/lookupss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/lookupss.c?rev=6… ============================================================================== --- trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -3,6 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/smlib/lookupss.c */ + #include "precomp.h" #define NDEBUG Modified: trunk/reactos/lib/smlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/precomp.h?rev=62… ============================================================================== --- trunk/reactos/lib/smlib/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/precomp.h [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -6,9 +6,9 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +#ifndef _SMLIB_PCH_ +#define _SMLIB_PCH_ -/* SDK/DDK/NDK Headers. */ #define WIN32_NO_STATUS #include <windef.h> #include <winreg.h> @@ -21,3 +21,4 @@ #include <sm/helper.h> +#endif /* _SMLIB_PCH_ */ Modified: trunk/reactos/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smclient.c?rev=6… ============================================================================== --- trunk/reactos/lib/smlib/smclient.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/smclient.c [iso-8859-1] Fri Feb 7 16:58:53 2014 @@ -9,9 +9,10 @@ /* INCLUDES *******************************************************************/ #include "precomp.h" -#include "sm/smmsg.h" // To go in precomp.h after +#include <sm/smmsg.h> // To go in precomp.h after + #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ******************************************************************/

10 years, 7 months

← Newer
1
...
31
32
33
34
35
36
37
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014