Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 59976: [VGAFONTS] * Correct AD and B2 characters of codepage 437. By Erdem Ersoy. CORE-7432 #resolve #comment Committed in r59976. Thanks.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 3 12:56:00 2013 New Revision: 59976 URL: http://svn.reactos.org/svn/reactos?rev=59976&view=rev Log: [VGAFONTS] * Correct AD and B2 characters of codepage 437. By Erdem Ersoy. CORE-7432 #resolve #comment Committed in r59976. Thanks. Modified: trunk/reactos/media/vgafonts/437-8x8.bin Modified: trunk/reactos/media/vgafonts/437-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/437-8x8.bin… ============================================================================== Binary files - no diff available.

11 years

[akhaldi] 59975: [KERNEL32] * "Fix" the VS build when the default code page is a MBCS (Chinese version). For some reasons, the MSVC resource compiler ignores the #pragma code_page inside the includ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 3 12:44:48 2013 New Revision: 59975 URL: http://svn.reactos.org/svn/reactos?rev=59975&view=rev Log: [KERNEL32] * "Fix" the VS build when the default code page is a MBCS (Chinese version). For some reasons, the MSVC resource compiler ignores the #pragma code_page inside the included nls files. Brought to you by Yuntian Zhang. CORE-7420 #resolve #comment Committed in r59975. Cheers. Modified: trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc Modified: trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc [iso-8859-1] Tue Sep 3 12:44:48 2013 @@ -27,211 +27,349 @@ /* add languages in numerical order of main language (last two digits) * it is much easier to find the missing holes that way */ +#pragma code_page(1256) #include "nls/ara.nls" /* 0x0401 LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA */ +#pragma code_page(1256) #include "nls/ari.nls" /* 0x0801 LANG_ARABIC, SUBLANG_ARABIC_IRAQ */ +#pragma code_page(1256) #include "nls/are.nls" /* 0x0c01 LANG_ARABIC, SUBLANG_ARABIC_EGYPT */ +#pragma code_page(1256) #include "nls/arl.nls" /* 0x1001 LANG_ARABIC, SUBLANG_ARABIC_LIBYA */ +#pragma code_page(1256) #include "nls/arg.nls" /* 0x1401 LANG_ARABIC, SUBLANG_ARABIC_ALGERIA */ +#pragma code_page(1256) #include "nls/arm.nls" /* 0x1801 LANG_ARABIC, SUBLANG_ARABIC_MOROCCO */ +#pragma code_page(1256) #include "nls/art.nls" /* 0x1c01 LANG_ARABIC, SUBLANG_ARABIC_TUNISIA */ +#pragma code_page(1256) #include "nls/aro.nls" /* 0x2001 LANG_ARABIC, SUBLANG_ARABIC_OMAN */ +#pragma code_page(1256) #include "nls/ary.nls" /* 0x2401 LANG_ARABIC, SUBLANG_ARABIC_YEMEN */ +#pragma code_page(1256) #include "nls/ars.nls" /* 0x2801 LANG_ARABIC, SUBLANG_ARABIC_SYRIA */ +#pragma code_page(1256) #include "nls/arj.nls" /* 0x2c01 LANG_ARABIC, SUBLANG_ARABIC_JORDAN */ +#pragma code_page(1256) #include "nls/arb.nls" /* 0x3001 LANG_ARABIC, SUBLANG_ARABIC_LEBANON */ +#pragma code_page(1256) #include "nls/ark.nls" /* 0x3401 LANG_ARABIC, SUBLANG_ARABIC_KUWAIT */ +#pragma code_page(1256) #include "nls/aru.nls" /* 0x3801 LANG_ARABIC, SUBLANG_ARABIC_UAE */ +#pragma code_page(1256) #include "nls/arh.nls" /* 0x3c01 LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN */ +#pragma code_page(1256) #include "nls/arq.nls" /* 0x4001 LANG_ARABIC, SUBLANG_ARABIC_QATAR */ +#pragma code_page(1251) #include "nls/bgr.nls" /* 0x0402 LANG_BULGARIAN, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_DEFAULT */ +#pragma code_page(950) #include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ +#pragma code_page(936) #include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */ +#pragma code_page(950) #include "nls/zhh.nls" /* 0x0c04 LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */ +#pragma code_page(936) #include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */ +#pragma code_page(950) #include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ +#pragma code_page(1250) #include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/dan.nls" /* 0x0406 LANG_DANISH, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/deu.nls" /* 0x0407 LANG_GERMAN, SUBLANG_GERMAN */ +#pragma code_page(1252) #include "nls/des.nls" /* 0x0807 LANG_GERMAN, SUBLANG_GERMAN_SWISS */ +#pragma code_page(1252) #include "nls/dea.nls" /* 0x0c07 LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN */ +#pragma code_page(1252) #include "nls/del.nls" /* 0x1007 LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG */ +#pragma code_page(1252) #include "nls/dec.nls" /* 0x1407 LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN */ +#pragma code_page(1253) #include "nls/ell.nls" /* 0x0408 LANG_GREEK, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/enu.nls" /* 0x0409 LANG_ENGLISH, SUBLANG_ENGLISH_US */ +#pragma code_page(1252) #include "nls/eng.nls" /* 0x0809 LANG_ENGLISH, SUBLANG_ENGLISH_UK */ +#pragma code_page(1252) #include "nls/ena.nls" /* 0x0c09 LANG_ENGLISH, SUBLANG_ENGLISH_AUS */ +#pragma code_page(1252) #include "nls/enc.nls" /* 0x1009 LANG_ENGLISH, SUBLANG_ENGLISH_CAN */ +#pragma code_page(1252) #include "nls/enz.nls" /* 0x1409 LANG_ENGLISH, SUBLANG_ENGLISH_NZ */ +#pragma code_page(1252) #include "nls/eni.nls" /* 0x1809 LANG_ENGLISH, SUBLANG_ENGLISH_EIRE */ +#pragma code_page(1252) #include "nls/ens.nls" /* 0x1c09 LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA */ +#pragma code_page(1252) #include "nls/enj.nls" /* 0x2009 LANG_ENGLISH, SUBLANG_ENGLISH_JAMAICA */ +#pragma code_page(1252) #include "nls/enb.nls" /* 0x2409 LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN */ +#pragma code_page(1252) #include "nls/enl.nls" /* 0x2809 LANG_ENGLISH, SUBLANG_ENGLISH_BELIZE */ +#pragma code_page(1252) #include "nls/ent.nls" /* 0x2c09 LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD */ +#pragma code_page(1252) #include "nls/enw.nls" /* 0x3009 LANG_ENGLISH, SUBLANG_ENGLISH_ZIMBABWE */ +#pragma code_page(1252) #include "nls/enp.nls" /* 0x3409 LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES */ +#pragma code_page(1252) #include "nls/esp.nls" /* 0x040a LANG_SPANISH, SUBLANG_SPANISH */ +#pragma code_page(1252) #include "nls/esm.nls" /* 0x080a LANG_SPANISH, SUBLANG_SPANISH_MEXICAN */ +#pragma code_page(1252) #include "nls/esn.nls" /* 0x0c0a LANG_SPANISH, SUBLANG_SPANISH_MODERN */ +#pragma code_page(1252) #include "nls/esg.nls" /* 0x100a LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA */ +#pragma code_page(1252) #include "nls/esc.nls" /* 0x140a LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA */ +#pragma code_page(1252) #include "nls/esa.nls" /* 0x180a LANG_SPANISH, SUBLANG_SPANISH_PANAMA */ +#pragma code_page(1252) #include "nls/esd.nls" /* 0x1c0a LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC */ +#pragma code_page(1252) #include "nls/esv.nls" /* 0x200a LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA */ +#pragma code_page(1252) #include "nls/eso.nls" /* 0x240a LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA */ +#pragma code_page(1252) #include "nls/esr.nls" /* 0x280a LANG_SPANISH, SUBLANG_SPANISH_PERU */ +#pragma code_page(1252) #include "nls/ess.nls" /* 0x2c0a LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA */ +#pragma code_page(1252) #include "nls/esf.nls" /* 0x300a LANG_SPANISH, SUBLANG_SPANISH_ECUADOR */ +#pragma code_page(1252) #include "nls/esl.nls" /* 0x340a LANG_SPANISH, SUBLANG_SPANISH_CHILE */ +#pragma code_page(1252) #include "nls/esy.nls" /* 0x380a LANG_SPANISH, SUBLANG_SPANISH_URUGUAY */ +#pragma code_page(1252) #include "nls/esz.nls" /* 0x3c0a LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY */ +#pragma code_page(1252) #include "nls/esb.nls" /* 0x400a LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA */ +#pragma code_page(1252) #include "nls/ese.nls" /* 0x440a LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR */ +#pragma code_page(1252) #include "nls/esh.nls" /* 0x480a LANG_SPANISH, SUBLANG_SPANISH_HONDURAS */ +#pragma code_page(1252) #include "nls/esi.nls" /* 0x4c0a LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA */ +#pragma code_page(1252) #include "nls/esu.nls" /* 0x500a LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO */ +#pragma code_page(1252) #include "nls/fin.nls" /* 0x040b LANG_FINNISH, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/fra.nls" /* 0x040c LANG_FRENCH, SUBLANG_FRENCH */ +#pragma code_page(1252) #include "nls/frb.nls" /* 0x080c LANG_FRENCH, SUBLANG_FRENCH_BELGIAN */ +#pragma code_page(1252) #include "nls/frc.nls" /* 0x0c0c LANG_FRENCH, SUBLANG_FRENCH_CANADIAN */ +#pragma code_page(1252) #include "nls/frs.nls" /* 0x100c LANG_FRENCH, SUBLANG_FRENCH_SWISS */ +#pragma code_page(1252) #include "nls/frl.nls" /* 0x140c LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG */ +#pragma code_page(1252) #include "nls/frm.nls" /* 0x180c LANG_FRENCH, SUBLANG_FRENCH_MONACO */ +#pragma code_page(1255) #include "nls/heb.nls" /* 0x040d LANG_HEBREW, SUBLANG_DEFAULT */ +#pragma code_page(1250) #include "nls/hun.nls" /* 0x040e LANG_HUNGARIAN, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/isl.nls" /* 0x040f LANG_ICELANDIC, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ +#pragma code_page(1252) #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ +#pragma code_page(932) #include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ +#pragma code_page(949) #include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ +#pragma code_page(1252) #include "nls/nld.nls" /* 0x0413 LANG_DUTCH, SUBLANG_DUTCH */ +#pragma code_page(1252) #include "nls/nlb.nls" /* 0x0813 LANG_DUTCH, SUBLANG_DUTCH_BELGIAN */ +#pragma code_page(1252) #include "nls/nor.nls" /* 0x0414 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL */ +#pragma code_page(1252) #include "nls/non.nls" /* 0x0814 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK */ +#pragma code_page(1250) #include "nls/plk.nls" /* 0x0415 LANG_POLISH, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/ptb.nls" /* 0x0416 LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN */ +#pragma code_page(1252) #include "nls/ptg.nls" /* 0x0816 LANG_PORTUGUESE, SUBLANG_PORTUGUESE */ +//#pragma code_page(1252) //#include "nls/rmc.nls" /* 0x0417 LANG_ROMANSH, SUBLANG_ROMANSH_SWITZERLAND */ +#pragma code_page(65001) #include "nls/rom.nls" /* 0x0418 LANG_ROMANIAN, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/rus.nls" /* 0x0419 LANG_RUSSIAN, SUBLANG_DEFAULT */ +#pragma code_page(1250) #include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ +#pragma code_page(1250) #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ +#pragma code_page(1251) #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ +#pragma code_page(1250) #include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ +#pragma code_page(1250) #include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_SWEDISH */ +#pragma code_page(1252) #include "nls/svf.nls" /* 0x081d LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND */ +#pragma code_page(874) #include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_DEFAULT */ +#pragma code_page(1254) #include "nls/trk.nls" /* 0x041f LANG_TURKISH, SUBLANG_DEFAULT */ +#pragma code_page(1256) #include "nls/urd.nls" /* 0x0420 LANG_URDU, SUBLANG_URDU_PAKISTAN */ +#pragma code_page(1252) #include "nls/ind.nls" /* 0x0421 LANG_INDONESIAN, SUBLANG_DEFAULT */ +#pragma code_page(1251) #include "nls/ukr.nls" /* 0x0422 LANG_UKRAINIAN, SUBLANG_DEFAULT */ +#pragma code_page(1251) #include "nls/bel.nls" /* 0x0423 LANG_BELARUSIAN, SUBLANG_DEFAULT */ +#pragma code_page(1250) #include "nls/slv.nls" /* 0x0424 LANG_SLOVENIAN, SUBLANG_DEFAULT */ +#pragma code_page(1257) #include "nls/eti.nls" /* 0x0425 LANG_ESTONIAN, SUBLANG_DEFAULT */ +#pragma code_page(1257) #include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ +#pragma code_page(1256) #include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_DEFAULT */ +#pragma code_page(1258) #include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_DEFAULT */ +#pragma code_page(1254) #include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ +#pragma code_page(1251) #include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ +#pragma code_page(1252) #include "nls/euq.nls" /* 0x042d LANG_BASQUE, SUBLANG_DEFAULT */ +#pragma code_page(1251) #include "nls/mki.nls" /* 0x042f LANG_MACEDONIAN, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/afk.nls" /* 0x0436 LANG_AFRIKAANS, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/kat.nls" /* 0x0437 LANG_GEORGIAN, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/fos.nls" /* 0x0438 LANG_FAEROESE, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/hin.nls" /* 0x0439 LANG_HINDI, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/msl.nls" /* 0x043e LANG_MALAY, SUBLANG_MALAY_MALAYSIA */ +#pragma code_page(1252) #include "nls/msb.nls" /* 0x083e LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM */ +#pragma code_page(1251) #include "nls/kkz.nls" /* 0x043f LANG_KAZAK, SUBLANG_DEFAULT */ +#pragma code_page(1251) #include "nls/kyr.nls" /* 0x0440 LANG_KYRGYZ, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/swk.nls" /* 0x0441 LANG_SWAHILI, SUBLANG_DEFAULT */ +#pragma code_page(1254) #include "nls/uzl.nls" /* 0x0443 LANG_UZBEK, SUBLANG_UZBEK_LATIN */ +#pragma code_page(1251) #include "nls/uzb.nls" /* 0x0843 LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC */ +#pragma code_page(1251) #include "nls/ttt.nls" /* 0x0444 LANG_TATAR, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/pan.nls" /* 0x0446 LANG_PUNJABI, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/guj.nls" /* 0x0447 LANG_GUJARATI, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/tam.nls" /* 0x0449 LANG_TAMIL, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/tel.nls" /* 0x044a LANG_TELUGU, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/kan.nls" /* 0x044b LANG_KANNADA, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/mar.nls" /* 0x044e LANG_MARATHI, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/san.nls" /* 0x044f LANG_SANSKRIT, SUBLANG_DEFAULT */ +#pragma code_page(1251) #include "nls/mon.nls" /* 0x0450 LANG_MONGOLIAN, SUBLANG_DEFAULT */ +//#pragma code_page(28604) //#include "nls/cym.nls" /* 0x0452 LANG_WELSH, SUBLANG_DEFAULT */ +#pragma code_page(1252) #include "nls/glc.nls" /* 0x0456 LANG_GALICIAN, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/knk.nls" /* 0x0457 LANG_KONKANI, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ +#pragma code_page(65001) #include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ +//#pragma code_page(1252) //#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_DEFAULT */

11 years

[akhaldi] 59974: [SHELL32] * Improve the German translation, fix the position of some new strings that are larger than English originals and fix some formatting. By Robert Naumann. CORE-7440 #resol...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 3 12:32:48 2013 New Revision: 59974 URL: http://svn.reactos.org/svn/reactos?rev=59974&view=rev Log: [SHELL32] * Improve the German translation, fix the position of some new strings that are larger than English originals and fix some formatting. By Robert Naumann. CORE-7440 #resolve #comment Committed in r59974. Thanks. Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Tue Sep 3 12:32:48 2013 @@ -224,7 +224,7 @@ EDITTEXT 14009, 68, 56, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "GrÃ¶Ãe:", 14010, 8, 72, 55, 10 EDITTEXT 14011, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Size on disk:", 140101, 8, 88, 55, 10 + LTEXT "GrÃ¶Ãe auf DatentrÃ¤ger:", 140101, 8, 83, 55, 20 EDITTEXT 14012, 68, 88, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Inhalt:", 14026, 8, 104, 55, 10 EDITTEXT 14027, 68, 104, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -236,7 +236,7 @@ AUTOCHECKBOX "&SchreibgeschÃ¼tzt", 14021, 56, 152, 70, 10 AUTOCHECKBOX "&Versteckt", 14022, 56, 166, 70, 10 AUTOCHECKBOX "&Archiv", 14023, 56, 180, 70, 10 - PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Er&weitert...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -252,14 +252,14 @@ CONTROL "Datei", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10 LTEXT "Ãffnen mit:", 14006, 8, 53, 50, 10 ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE - PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ãndern...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Pfad:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 68, 75, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "GrÃ¶Ãe:", 14010, 8, 91, 45, 10 EDITTEXT 14011, 68, 91, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Size on disk:", 140112, 8, 107, 55, 10 + LTEXT "GrÃ¶Ãe auf DatentrÃ¤ger:", 140112, 8, 102, 55, 20 EDITTEXT 14012, 68, 107, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Erstellt:", 14014, 8, 131, 45, 10 @@ -273,7 +273,7 @@ AUTOCHECKBOX "&SchreibgeschÃ¼tzt", 14021, 45, 189, 67, 10 AUTOCHECKBOX "&Versteckt", 14022, 126, 189, 50, 10 AUTOCHECKBOX "&Archiv", 14023, 181, 189, 49, 10 - PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP + PUSHBUTTON "Er&weitert...", 14028, 180, 185, 50, 15, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -407,10 +407,10 @@ IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 +CAPTION "Kopiere..." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + PUSHBUTTON "Abbrechen", 14002, 195, 14, 60, 16 CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 LTEXT "File", 14001, 8, 6, 169, 10 END @@ -659,7 +659,7 @@ IDS_SHV_COLUMN_STATUS "Status" IDS_SHV_COLUMN_COMMENTS "Kommentare" IDS_SHV_COLUMN_LOCATION "Ort" - IDS_SHV_COLUMN_MODEL "Model" + IDS_SHV_COLUMN_MODEL "Modell" /* special folders */ @@ -710,10 +710,10 @@ IDS_LOGOFF_PROMPT "MÃ¶chten Sie sich ausloggen?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Anzeigen der Datei AusfÃ¼hren Dialogbox nicht mÃ¶glich (interner Fehler)" + IDS_RUNDLG_BROWSE_ERROR "Anzeigen der Durchsuchen Dialogbox nicht mÃ¶glich (interner Fehler)" + IDS_RUNDLG_BROWSE_CAPTION "Durchsuchen" + IDS_RUNDLG_BROWSE_FILTER "AusfÃ¼hrbare Dateien (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "StartmenÃ¼\\Programme" @@ -752,23 +752,23 @@ IDS_DRIVE_NETWORK "Netzlaufwerk" /* Open With */ - IDS_OPEN_WITH "Ãffnen &mit..." + IDS_OPEN_WITH "Ãffnen mit..." IDS_OPEN_WITH_CHOOSE "Programm wÃ¤hlen..." - IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:" - IDS_OPEN_WITH_OTHER "Other Programs:" + IDS_OPEN_WITH_RECOMMENDED "Empfohlene Programme:" + IDS_OPEN_WITH_OTHER "Andere Programme:" IDS_SHELL_ABOUT_AUTHORS "&Autoren" IDS_SHELL_ABOUT_BACK "< &ZurÃ¼ck" - FCIDM_SHVIEW_NEW "Neu" - FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" + FCIDM_SHVIEW_NEW "Neu" + FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" IDS_RECYCLEBIN_DISKSPACE "freier Speicher" IDS_EMPTY_BITBUCKET "Papierkorb leeren" IDS_PICK_ICON_TITLE "Symbol auswÃ¤hlen" - IDS_PICK_ICON_FILTER "Symboldateien (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "Programme (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_PICK_ICON_FILTER "Symboldateien (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Alle Dateien (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Programme (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0" IDS_DIRECTORY "Dateiordner" IDS_VIRTUAL_DRIVER "Virtueller GerÃ¤tetreiber" IDS_BAT_FILE "ReactOS-Stapelverarbeitungsdatei"

11 years

[akhaldi] 59973: [DDK] * Annotate scsiwmi.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 3 12:04:47 2013 New Revision: 59973 URL: http://svn.reactos.org/svn/reactos?rev=59973&view=rev Log: [DDK] * Annotate scsiwmi.h. Modified: trunk/reactos/include/ddk/scsiwmi.h Modified: trunk/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/scsiwmi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/scsiwmi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/scsiwmi.h [iso-8859-1] Tue Sep 3 12:04:47 2013 @@ -20,8 +20,10 @@ * */ -#ifndef __SCSIWMI_H -#define __SCSIWMI_H +#pragma once + +#ifndef _SCSIWMI_ +#define _SCSIWMI_ #include "srb.h" @@ -32,12 +34,12 @@ #pragma pack(push,4) typedef struct _SCSIWMI_REQUEST_CONTEXT { - PVOID UserContext; - ULONG BufferSize; - PUCHAR Buffer; - UCHAR MinorFunction; - UCHAR ReturnStatus; - ULONG ReturnSize; + PVOID UserContext; + ULONG BufferSize; + PUCHAR Buffer; + UCHAR MinorFunction; + UCHAR ReturnStatus; + ULONG ReturnSize; } SCSIWMI_REQUEST_CONTEXT, *PSCSIWMI_REQUEST_CONTEXT; #ifdef _GUID_DEFINED @@ -47,129 +49,142 @@ #if ! (defined _GUID_DEFINED || defined GUID_DEFINED) #define GUID_DEFINED typedef struct _GUID { - unsigned long Data1; - unsigned short Data2; - unsigned short Data3; - unsigned char Data4[ 8 ]; + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[8]; } GUID; #endif typedef struct _SCSIWMIGUIDREGINFO { - LPCGUID Guid; - ULONG InstanceCount; - ULONG Flags; + LPCGUID Guid; + ULONG InstanceCount; + ULONG Flags; } SCSIWMIGUIDREGINFO, *PSCSIWMIGUIDREGINFO; -typedef UCHAR +typedef +_Must_inspect_result_ +UCHAR (NTAPI *PSCSIWMI_QUERY_REGINFO)( - IN PVOID DeviceContext, - IN PSCSIWMI_REQUEST_CONTEXT RequestContext, - OUT PWCHAR *MofResourceName); - -typedef BOOLEAN + _In_ PVOID DeviceContext, + _In_ PSCSIWMI_REQUEST_CONTEXT RequestContext, + _Out_ PWCHAR *MofResourceName); + +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PSCSIWMI_QUERY_DATABLOCK)( - IN PVOID Context, - IN PSCSIWMI_REQUEST_CONTEXT DispatchContext, - IN ULONG GuidIndex, - IN ULONG InstanceIndex, - IN ULONG InstanceCount, - IN OUT PULONG InstanceLengthArray, - IN ULONG BufferAvail, - OUT PUCHAR Buffer); - -typedef BOOLEAN + _In_ PVOID Context, + _In_ PSCSIWMI_REQUEST_CONTEXT DispatchContext, + _In_ ULONG GuidIndex, + _In_ ULONG InstanceIndex, + _In_ ULONG InstanceCount, + _Inout_ PULONG InstanceLengthArray, + _In_ ULONG BufferAvail, + _Out_writes_bytes_(BufferAvail) PUCHAR Buffer); + +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PSCSIWMI_SET_DATABLOCK)( - IN PVOID DeviceContext, - IN PSCSIWMI_REQUEST_CONTEXT RequestContext, - IN ULONG GuidIndex, - IN ULONG InstanceIndex, - IN ULONG BufferSize, - IN PUCHAR Buffer); - -typedef BOOLEAN + _In_ PVOID DeviceContext, + _In_ PSCSIWMI_REQUEST_CONTEXT RequestContext, + _In_ ULONG GuidIndex, + _In_ ULONG InstanceIndex, + _In_ ULONG BufferSize, + _In_reads_bytes_(BufferSize) PUCHAR Buffer); + +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PSCSIWMI_SET_DATAITEM)( - IN PVOID DeviceContext, - IN PSCSIWMI_REQUEST_CONTEXT RequestContext, - IN ULONG GuidIndex, - IN ULONG InstanceIndex, - IN ULONG DataItemId, - IN ULONG BufferSize, - IN PUCHAR Buffer); - -typedef BOOLEAN + _In_ PVOID DeviceContext, + _In_ PSCSIWMI_REQUEST_CONTEXT RequestContext, + _In_ ULONG GuidIndex, + _In_ ULONG InstanceIndex, + _In_ ULONG DataItemId, + _In_ ULONG BufferSize, + _In_reads_bytes_(BufferSize) PUCHAR Buffer); + +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PSCSIWMI_EXECUTE_METHOD)( - IN PVOID DeviceContext, - IN PSCSIWMI_REQUEST_CONTEXT RequestContext, - IN ULONG GuidIndex, - IN ULONG InstanceIndex, - IN ULONG MethodId, - IN ULONG InBufferSize, - IN ULONG OutBufferSize, - IN OUT PUCHAR Buffer); + _In_ PVOID DeviceContext, + _In_ PSCSIWMI_REQUEST_CONTEXT RequestContext, + _In_ ULONG GuidIndex, + _In_ ULONG InstanceIndex, + _In_ ULONG MethodId, + _In_ ULONG InBufferSize, + _In_ ULONG OutBufferSize, + _Inout_updates_bytes_to_(InBufferSize, OutBufferSize) PUCHAR Buffer); typedef enum _SCSIWMI_ENABLE_DISABLE_CONTROL { - ScsiWmiEventControl, - ScsiWmiDataBlockControl + ScsiWmiEventControl, + ScsiWmiDataBlockControl } SCSIWMI_ENABLE_DISABLE_CONTROL; -typedef BOOLEAN +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PSCSIWMI_FUNCTION_CONTROL)( - IN PVOID DeviceContext, - IN PSCSIWMI_REQUEST_CONTEXT RequestContext, - IN ULONG GuidIndex, - IN SCSIWMI_ENABLE_DISABLE_CONTROL Function, - IN BOOLEAN Enable); + _In_ PVOID DeviceContext, + _In_ PSCSIWMI_REQUEST_CONTEXT RequestContext, + _In_ ULONG GuidIndex, + _In_ SCSIWMI_ENABLE_DISABLE_CONTROL Function, + _In_ BOOLEAN Enable); typedef struct _SCSIWMILIB_CONTEXT { - ULONG GuidCount; - PSCSIWMIGUIDREGINFO GuidList; - PSCSIWMI_QUERY_REGINFO QueryWmiRegInfo; - PSCSIWMI_QUERY_DATABLOCK QueryWmiDataBlock; - PSCSIWMI_SET_DATABLOCK SetWmiDataBlock; - PSCSIWMI_SET_DATAITEM SetWmiDataItem; - PSCSIWMI_EXECUTE_METHOD ExecuteWmiMethod; - PSCSIWMI_FUNCTION_CONTROL WmiFunctionControl; + ULONG GuidCount; + PSCSIWMIGUIDREGINFO GuidList; + PSCSIWMI_QUERY_REGINFO QueryWmiRegInfo; + PSCSIWMI_QUERY_DATABLOCK QueryWmiDataBlock; + PSCSIWMI_SET_DATABLOCK SetWmiDataBlock; + PSCSIWMI_SET_DATAITEM SetWmiDataItem; + PSCSIWMI_EXECUTE_METHOD ExecuteWmiMethod; + PSCSIWMI_FUNCTION_CONTROL WmiFunctionControl; } SCSI_WMILIB_CONTEXT, *PSCSI_WMILIB_CONTEXT; +_Must_inspect_result_ SCSIPORTAPI BOOLEAN NTAPI ScsiPortWmiDispatchFunction( - IN PSCSI_WMILIB_CONTEXT WmiLibInfo, - IN UCHAR MinorFunction, - IN PVOID DeviceContext, - IN PSCSIWMI_REQUEST_CONTEXT RequestContext, - IN PVOID DataPath, - IN ULONG BufferSize, - IN PVOID Buffer); - -#define ScsiPortWmiFireAdapterEvent( \ - HwDeviceExtension, \ - Guid, \ - InstanceIndex, \ - EventDataSize, \ - EventData) \ - ScsiPortWmiFireLogicalUnitEvent( \ - HwDeviceExtension, \ - 0xff, \ - 0, \ - 0, \ - Guid, \ - InstanceIndex, \ - EventDataSize, \ - EventData) + _In_ PSCSI_WMILIB_CONTEXT WmiLibInfo, + _In_ UCHAR MinorFunction, + _In_ PVOID DeviceContext, + _In_ PSCSIWMI_REQUEST_CONTEXT RequestContext, + _In_ PVOID DataPath, + _In_ ULONG BufferSize, + _In_ PVOID Buffer); + +#define ScsiPortWmiFireAdapterEvent( \ + HwDeviceExtension, \ + Guid, \ + InstanceIndex, \ + EventDataSize, \ + EventData) \ + ScsiPortWmiFireLogicalUnitEvent( \ + HwDeviceExtension, \ + 0xff, \ + 0, \ + 0, \ + Guid, \ + InstanceIndex, \ + EventDataSize, \ + EventData) /* * ULONG * ScsiPortWmiGetReturnSize( - * PSCSIWMI_REQUEST_CONTEXT RequestContext); + * PSCSIWMI_REQUEST_CONTEXT RequestContext); */ #define ScsiPortWmiGetReturnSize(RequestContext) \ ((RequestContext)->ReturnSize) /* UCHAR * ScsiPortWmiGetReturnStatus( - * PSCSIWMI_REQUEST_CONTEXT RequestContext); + * PSCSIWMI_REQUEST_CONTEXT RequestContext); */ #define ScsiPortWmiGetReturnStatus(RequestContext) \ ((RequestContext)->ReturnStatus) @@ -178,22 +193,22 @@ VOID NTAPI ScsiPortWmiPostProcess( - IN PSCSIWMI_REQUEST_CONTEXT RequestContext, - IN UCHAR SrbStatus, - IN ULONG BufferUsed); + _Inout_ PSCSIWMI_REQUEST_CONTEXT RequestContext, + _In_ UCHAR SrbStatus, + _In_ ULONG BufferUsed); SCSIPORTAPI VOID NTAPI ScsiPortWmiFireLogicalUnitEvent( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN LPGUID Guid, - IN ULONG InstanceIndex, - IN ULONG EventDataSize, - IN PVOID EventData); + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ LPGUID Guid, + _In_ ULONG InstanceIndex, + _In_ ULONG EventDataSize, + _In_ PVOID EventData); #pragma pack(pop) @@ -201,4 +216,4 @@ } #endif -#endif /* __SCSIWMI_H */ +#endif /* _SCSIWMI_ */

11 years

[akhaldi] 59972: [SMSS] * Fix some print specifiers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 3 12:02:52 2013 New Revision: 59972 URL: http://svn.reactos.org/svn/reactos?rev=59972&view=rev Log: [SMSS] * Fix some print specifiers. Modified: trunk/reactos/base/system/smss/pagefile.c trunk/reactos/base/system/smss/sminit.c trunk/reactos/base/system/smss/smsessn.c trunk/reactos/base/system/smss/smss.c trunk/reactos/base/system/smss/smsubsys.c Modified: trunk/reactos/base/system/smss/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/pagefile.… ============================================================================== --- trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] Tue Sep 3 12:02:52 2013 @@ -94,7 +94,7 @@ /* Make sure we don't have too many */ if (SmpNumberOfPagingFiles >= 16) { - DPRINT1("SMSS:PFILE: Too many paging files specified - %d\n", + DPRINT1("SMSS:PFILE: Too many paging files specified - %lu\n", SmpNumberOfPagingFiles); return STATUS_TOO_MANY_PAGING_FILES; } Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… ============================================================================== --- trunk/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/sminit.c [iso-8859-1] Tue Sep 3 12:02:52 2013 @@ -236,7 +236,7 @@ /* Recreate the security descriptors to take into account security mode */ SmpCreateSecurityDescriptors(FALSE); - DPRINT("SmpProtectionMode: %d\n", SmpProtectionMode); + DPRINT("SmpProtectionMode: %lu\n", SmpProtectionMode); return STATUS_SUCCESS; } @@ -261,7 +261,7 @@ SmpAllowProtectedRenames = 0; } - DPRINT("SmpAllowProtectedRenames: %d\n", SmpAllowProtectedRenames); + DPRINT("SmpAllowProtectedRenames: %lu\n", SmpAllowProtectedRenames); return STATUS_SUCCESS; } @@ -1819,13 +1819,13 @@ { /* To combine it into a single string */ swprintf((PWCHAR)PartialInfo->Data + wcslen((PWCHAR)PartialInfo->Data), - L", %ws", + L", %S", PartialInfo2->Data); } /* So that we can set this as the PROCESSOR_IDENTIFIER variable */ RtlInitUnicodeString(&ValueName, L"PROCESSOR_IDENTIFIER"); - DPRINT("Setting %wZ to %S\n", &ValueName, PartialInfo->Data); + DPRINT("Setting %wZ to %s\n", &ValueName, PartialInfo->Data); Status = NtSetValueKey(KeyHandle, &ValueName, 0, @@ -1884,7 +1884,7 @@ /* And finally, write the number of CPUs */ RtlInitUnicodeString(&ValueName, L"NUMBER_OF_PROCESSORS"); - swprintf(ValueBuffer, L"%u", BasicInfo.NumberOfProcessors); + swprintf(ValueBuffer, L"%d", BasicInfo.NumberOfProcessors); DPRINT("Setting %wZ to %S\n", &ValueName, ValueBuffer); Status = NtSetValueKey(KeyHandle, &ValueName, Modified: trunk/reactos/base/system/smss/smsessn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smsessn.c… ============================================================================== --- trunk/reactos/base/system/smss/smsessn.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smsessn.c [iso-8859-1] Tue Sep 3 12:02:52 2013 @@ -184,7 +184,7 @@ else { /* Failure -- assume session zero */ - DPRINT1("SMSS: GetProcessMuSessionId, Process=%x, Status=%x\n", + DPRINT1("SMSS: GetProcessMuSessionId, Process=%p, Status=%x\n", ProcessHandle, Status); *SessionId = 0; } @@ -207,7 +207,7 @@ sizeof(SessionId)); if (!NT_SUCCESS(Status)) { - DPRINT1("SMSS: SetProcessMuSessionId, Process=%x, Status=%x\n", + DPRINT1("SMSS: SetProcessMuSessionId, Process=%p, Status=%x\n", ProcessHandle, Status); } Modified: trunk/reactos/base/system/smss/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.c?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.c [iso-8859-1] Tue Sep 3 12:02:52 2013 @@ -420,7 +420,7 @@ UNICODE_STRING DestinationString; /* Print and breakpoint into the debugger */ - DbgPrint("SMSS: Unhandled exception - Status == %x IP == %x\n", + DbgPrint("SMSS: Unhandled exception - Status == %x IP == %p\n", ExceptionInfo->ExceptionRecord->ExceptionCode, ExceptionInfo->ExceptionRecord->ExceptionAddress); DbgPrint(" Memory Address: %x Read/Write: %x\n", Modified: trunk/reactos/base/system/smss/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smsubsys.… ============================================================================== --- trunk/reactos/base/system/smss/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smsubsys.c [iso-8859-1] Tue Sep 3 12:02:52 2013 @@ -330,7 +330,7 @@ { /* Odd failure -- but handle it anyway */ Status = STATUS_NO_SUCH_PACKAGE; - DPRINT1("SMSS: SmpLoadSubSystem - SmpLocateKnownSubSysByType Failed with Status %lx for sessionid %ld\n", + DPRINT1("SMSS: SmpLoadSubSystem - SmpLocateKnownSubSysByType Failed with Status %lx for sessionid %lu\n", Status, MuSessionId); goto Quickie; @@ -347,7 +347,7 @@ if (!NT_SUCCESS(Status)) { /* Fail since this is critical */ - DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with Status %lx for sessionid %ld\n", + DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with Status %lx for sessionid %lu\n", Status, MuSessionId); goto Quickie; @@ -364,7 +364,7 @@ if (!NT_SUCCESS(Status)) { /* Fail since this is critical */ - DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with Status %lx for sessionid %ld\n", + DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with Status %lx for sessionid %lu\n", Status, MuSessionId); goto Quickie; @@ -387,7 +387,7 @@ { /* Delete the session and handle failure if the LPC call failed */ SmpDeleteSession(CreateSession->SessionId); - DPRINT1("SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with Status %lx for sessionid %ld\n", + DPRINT1("SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with Status %lx for sessionid %lu\n", Status, CreateSession->SessionId); goto Quickie; @@ -422,7 +422,7 @@ if (Status != STATUS_WAIT_0) { /* Something is wrong with the subsystem, so back out of everything */ - DPRINT1("SMSS: SmpLoadSubSystem - Timeout waiting for subsystem connect with Status %lx for sessionid %ld\n", + DPRINT1("SMSS: SmpLoadSubSystem - Timeout waiting for subsystem connect with Status %lx for sessionid %lu\n", Status, MuSessionId); goto Quickie; @@ -618,7 +618,7 @@ } if (!NT_SUCCESS(Status)) { - DbgPrint("SMSS: Subsystem execute failed (%WZ)\n", &RegEntry->Value); + DbgPrint("SMSS: Subsystem execute failed (%wZ)\n", &RegEntry->Value); return Status; }

11 years

[akhaldi] 59971: [PSDK] * Fix a typo.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 3 11:59:51 2013 New Revision: 59971 URL: http://svn.reactos.org/svn/reactos?rev=59971&view=rev Log: [PSDK] * Fix a typo. Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=5997… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Tue Sep 3 11:59:51 2013 @@ -4257,7 +4257,7 @@ _In_ POOL_TYPE PoolType, _In_ ULONG_PTR ResourceName, _In_ ULONG ResourceType, - _Outptr_result_bytebuffer_(ResourceSize) PVOID *Resource, + _Outptr_result_bytebuffer_(*ResourceSize) PVOID *Resource, _Out_opt_ PULONG ResourceSize); _IRQL_requires_max_(PASSIVE_LEVEL)

11 years

[pschweitzer] 59970: [FRAMEDYN] Reduce Len variable scope * 2

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 3 06:20:51 2013 New Revision: 59970 URL: http://svn.reactos.org/svn/reactos?rev=59970&view=rev Log: [FRAMEDYN] Reduce Len variable scope * 2 Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin… ============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Tue Sep 3 06:20:51 2013 @@ -133,7 +133,6 @@ */ CHString::CHString(LPCWSTR lpsz) throw (CHeap_Exception) { - int Len; // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -141,7 +140,7 @@ if (lpsz != 0) { // Get its length - Len = SafeStrlen(lpsz); + int Len = SafeStrlen(lpsz); // Then, allocate a big enough buffer and copy string // Note that here, we don't null terminate the string... if (Len) @@ -174,7 +173,6 @@ */ CHString::CHString(LPCSTR lpsz) throw (CHeap_Exception) { - int Len; // Allow null initialize, in case something goes wrong m_pchData = afxPchNil; @@ -182,7 +180,7 @@ if (lpsz != 0) { // Get its length - Len = strlen(lpsz); + int Len = strlen(lpsz); if (Len) { // Allocate and convert the string

11 years

[akhaldi] 59969: [PSDK] * Annotate usp10.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 2 22:49:45 2013 New Revision: 59969 URL: http://svn.reactos.org/svn/reactos?rev=59969&view=rev Log: [PSDK] * Annotate usp10.h. Modified: trunk/reactos/include/psdk/usp10.h Modified: trunk/reactos/include/psdk/usp10.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usp10.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/usp10.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usp10.h [iso-8859-1] Mon Sep 2 22:49:45 2013 @@ -230,65 +230,310 @@ /* Function Declarations */ -HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE* psds, - SCRIPT_CONTROL* psc, SCRIPT_STATE* pss); -HRESULT WINAPI ScriptApplyLogicalWidth(const int *piDx, int cChars, int cGlyphs, const WORD *pwLogClust, - const SCRIPT_VISATTR *psva, const int *piAdvance, - const SCRIPT_ANALYSIS *psa, ABC *pABC, int *piJustify); -HRESULT WINAPI ScriptRecordDigitSubstitution(LCID Locale, SCRIPT_DIGITSUBSTITUTE *psds); -HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItems, - const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, - SCRIPT_ITEM *pItems, int *pcItems); -HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, int cChars, - DWORD dwFlags, WORD *pwOutGlyphs); -HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp); -HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD wGlyph, ABC *pABC); -HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *psa, int cChars, int cGlyphs, - const int *piGlyphWidth, const WORD *pwLogClust, - const SCRIPT_VISATTR *psva, int *piDx); -HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts); -HRESULT WINAPI ScriptStringAnalyse(HDC hdc, - const void *pString, - int cString, - int cGlyphs, - int iCharset, - DWORD dwFlags, - int iReqWidth, - SCRIPT_CONTROL *psControl, - SCRIPT_STATE *psState, - const int *piDx, - SCRIPT_TABDEF *pTabdef, - const BYTE *pbInClass, - SCRIPT_STRING_ANALYSIS *pssa); -HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa); -HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa); -HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc); -HRESULT WINAPI ScriptIsComplex(const WCHAR* pwcInChars, int cInChars, DWORD dwFlags); -HRESULT WINAPI ScriptJustify(const SCRIPT_VISATTR *psva, const int *piAdvance, int cGlyphs, - int iDx, int iMinKashida, int *piJustify); -HRESULT WINAPI ScriptLayout(int cRuns, const BYTE *pbLevel, int *piVisualToLogical, int *piLogicalToVisual); -HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, int cChars, int cMaxGlyphs, - SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, SCRIPT_VISATTR *psva, int *pcGlyphs); -HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, - SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ); -HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, SCRIPT_LOGATTR *psla); -HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *tmHeight); -HRESULT WINAPI ScriptCPtoX(int iCP, BOOL fTrailing, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, - const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piX); -HRESULT WINAPI ScriptXtoCP(int iX, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, - const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piCP, int *piTrailing); -HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int *pX); -HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int *piCh , int *piTrailing); -HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piDx); -HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *puOrder); -HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, UINT uOptions, const RECT *prc, - int iMinSel, int iMaxSel, BOOL fDisabled); -HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UINT fuOptions, const RECT *lprc, - const SCRIPT_ANALYSIS *psa, const WCHAR *pwcReserved, int iReserved, const WORD *pwGlyphs, - int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset); -const int* WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa); -const SCRIPT_LOGATTR* WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa); -const SIZE* WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa); +_Check_return_ +HRESULT +WINAPI +ScriptApplyDigitSubstitution( + _In_reads_(1) const SCRIPT_DIGITSUBSTITUTE* psds, + _Out_writes_(1) SCRIPT_CONTROL* psc, + _Out_writes_(1) SCRIPT_STATE* pss); + +_Check_return_ +HRESULT +WINAPI +ScriptApplyLogicalWidth( + _In_reads_(cChars) const int *piDx, + _In_ int cChars, + _In_ int cGlyphs, + _In_reads_(cChars) const WORD *pwLogClust, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cGlyphs) const int *piAdvance, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Inout_updates_opt_(1) ABC *pABC, + _Out_writes_all_(cGlyphs) int *piJustify); + +_Check_return_ +HRESULT +WINAPI +ScriptRecordDigitSubstitution( + _In_ LCID Locale, + _Out_writes_(1) SCRIPT_DIGITSUBSTITUTE *psds); + +_Check_return_ +HRESULT +WINAPI +ScriptItemize( + _In_reads_(cInChars) const WCHAR *pwcInChars, + _In_ int cInChars, + _In_ int cMaxItems, + _In_reads_opt_(1) const SCRIPT_CONTROL *psControl, + _In_reads_opt_(1) const SCRIPT_STATE *psState, + _Out_writes_to_(cMaxItems, *pcItems) SCRIPT_ITEM *pItems, + _Out_writes_(1) int *pcItems); + +_Check_return_ +HRESULT +WINAPI +ScriptGetCMap( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_reads_(cChars) const WCHAR *pwcInChars, + _In_ int cChars, + _In_ DWORD dwFlags, + _Out_writes_(cChars) WORD *pwOutGlyphs); + +_Check_return_ +HRESULT +WINAPI +ScriptGetFontProperties( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _Out_writes_(1) SCRIPT_FONTPROPERTIES *sfp); + +_Check_return_ +HRESULT +WINAPI +ScriptGetGlyphABCWidth( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_ WORD wGlyph, + _Out_writes_(1) ABC *pABC); + +_Check_return_ +HRESULT +WINAPI +ScriptGetLogicalWidths( + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _In_ int cChars, + _In_ int cGlyphs, + _In_reads_(cGlyphs) const int *piGlyphWidth, + _In_reads_(cChars) const WORD *pwLogClust, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cChars) int *piDx); + +_Check_return_ +HRESULT +WINAPI +ScriptGetProperties( + _Outptr_result_buffer_(*piNumScripts) const SCRIPT_PROPERTIES ***ppSp, + _Out_ int *piNumScripts); + +_Check_return_ +HRESULT +WINAPI +ScriptStringAnalyse( + _In_ HDC hdc, + _In_ const void *pString, + _In_ int cString, + _In_ int cGlyphs, + _In_ int iCharset, + _In_ DWORD dwFlags, + _In_ int iReqWidth, + _In_reads_opt_(1) SCRIPT_CONTROL *psControl, + _In_reads_opt_(1) SCRIPT_STATE *psState, + _In_reads_opt_(cString) const int *piDx, + _In_reads_opt_(1) SCRIPT_TABDEF *pTabdef, + _In_ const BYTE *pbInClass, + _Outptr_result_buffer_(1) SCRIPT_STRING_ANALYSIS *pssa); + +_Check_return_ +HRESULT +WINAPI +ScriptStringValidate( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa); + +_Check_return_ +HRESULT +WINAPI +ScriptStringFree( + _Inout_updates_(1) SCRIPT_STRING_ANALYSIS *pssa); + +_Check_return_ +HRESULT +WINAPI +ScriptFreeCache( + _Inout_updates_(1) _At_(*psc, _Post_null_) SCRIPT_CACHE *psc); + +_Check_return_ +HRESULT +WINAPI +ScriptIsComplex( + _In_reads_(cInChars) const WCHAR *pwcInChars, + _In_ int cInChars, + _In_ DWORD dwFlags); + +_Check_return_ +HRESULT +WINAPI +ScriptJustify( + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cGlyphs) const int *piAdvance, + _In_ int cGlyphs, + _In_ int iDx, + _In_ int iMinKashida, + _Out_writes_all_(cGlyphs) int *piJustify); + +_Check_return_ +HRESULT +WINAPI +ScriptLayout( + int cRuns, + _In_reads_(cRuns) const BYTE *pbLevel, + _Out_writes_all_opt_(cRuns) int *piVisualToLogical, + _Out_writes_all_opt_(cRuns) int *piLogicalToVisual); + +_Check_return_ +HRESULT +WINAPI +ScriptShape( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_reads_(cChars) const WCHAR *pwcChars, + _In_ int cChars, + _In_ int cMaxGlyphs, + _Inout_updates_(1) SCRIPT_ANALYSIS *psa, + _Out_writes_to_(cMaxGlyphs, *pcGlyphs) WORD *pwOutGlyphs, + _Out_writes_all_(cChars) WORD *pwLogClust, + _Out_writes_to_(cMaxGlyphs, *pcGlyphs) SCRIPT_VISATTR *psva, + _Out_writes_(1) int *pcGlyphs); + +_Check_return_ +HRESULT +WINAPI +ScriptPlace( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_reads_(cGlyphs) const WORD *pwGlyphs, + _In_ int cGlyphs, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _Inout_updates_(1) SCRIPT_ANALYSIS *psa, + _Out_writes_all_(cGlyphs) int *piAdvance, + _Out_writes_all_opt_(cGlyphs) GOFFSET *pGoffset, + _Out_writes_(1) ABC *pABC); + +_Check_return_ +HRESULT +WINAPI +ScriptBreak( + _In_reads_(cChars) const WCHAR *pwcChars, + _In_ int cChars, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Out_writes_all_(cChars) SCRIPT_LOGATTR *psla); + +_Check_return_ +HRESULT +WINAPI +ScriptCacheGetHeight( + _In_ HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _Out_writes_(1) LONG *tmHeight); + +_Check_return_ +HRESULT +WINAPI +ScriptCPtoX( + _In_ int iCP, + _In_ BOOL fTrailing, + _In_ int cChars, + _In_ int cGlyphs, + _In_reads_(cChars) const WORD *pwLogClust, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cGlyphs) const int *piAdvance, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Out_ int *piX); + +_Check_return_ +HRESULT +WINAPI +ScriptXtoCP( + _In_ int iX, + _In_ int cChars, + _In_ int cGlyphs, + _In_reads_(cChars) const WORD *pwLogClust, + _In_reads_(cGlyphs) const SCRIPT_VISATTR *psva, + _In_reads_(cGlyphs) const int *piAdvance, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Out_writes_(1) int *piCP, + _Out_writes_(1) int *piTrailing); + +_Check_return_ +HRESULT +WINAPI +ScriptStringCPtoX( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _In_ int icp, + _In_ BOOL fTrailing, + _Out_writes_(1) int *pX); + +_Check_return_ +HRESULT +WINAPI +ScriptStringXtoCP( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _In_ int iX, + _Out_writes_(1) int *piCh, + _Out_writes_(1) int *piTrailing); + +_Check_return_ +HRESULT +WINAPI +ScriptStringGetLogicalWidths( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _Out_ int *piDx); + +_Check_return_ +HRESULT +WINAPI +ScriptStringGetOrder( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _Out_ UINT *puOrder); + +_Check_return_ +HRESULT +WINAPI +ScriptStringOut( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa, + _In_ int iX, + _In_ int iY, + _In_ UINT uOptions, + _In_reads_opt_(1) const RECT *prc, + _In_ int iMinSel, + _In_ int iMaxSel, + _In_ BOOL fDisabled); + +_Check_return_ +HRESULT +WINAPI +ScriptTextOut( + _In_ const HDC hdc, + _Inout_updates_(1) SCRIPT_CACHE *psc, + _In_ int x, + _In_ int y, + _In_ UINT fuOptions, + _In_reads_opt_(1) const RECT *lprc, + _In_reads_(1) const SCRIPT_ANALYSIS *psa, + _Reserved_ const WCHAR *pwcReserved, + _Reserved_ int iReserved, + _In_reads_(cGlyphs) const WORD *pwGlyphs, + _In_ int cGlyphs, + _In_reads_(cGlyphs) const int *piAdvance, + _In_reads_opt_(cGlyphs) const int *piJustify, + _In_reads_(cGlyphs) const GOFFSET *pGoffset); + +const int* +WINAPI +ScriptString_pcOutChars( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa); + +const SCRIPT_LOGATTR* +WINAPI +ScriptString_pLogAttr( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa); + +const SIZE* +WINAPI +ScriptString_pSize( + _In_reads_(1) SCRIPT_STRING_ANALYSIS ssa); #ifdef __cplusplus } /* extern "C" */

11 years

[akhaldi] 59968: [SMLIB] * Fix some print specifiers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 2 22:43:37 2013 New Revision: 59968 URL: http://svn.reactos.org/svn/reactos?rev=59968&view=rev Log: [SMLIB] * Fix some print specifiers. Modified: trunk/reactos/lib/smlib/execpgm.c trunk/reactos/lib/smlib/lookupss.c Modified: trunk/reactos/lib/smlib/execpgm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/execpgm.c?rev=59… ============================================================================== --- trunk/reactos/lib/smlib/execpgm.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/execpgm.c [iso-8859-1] Mon Sep 2 22:43:37 2013 @@ -36,7 +36,7 @@ SM_PORT_MESSAGE SmReqMsg; - DPRINT("SMLIB: %s(%08lx,'%S') called\n", + DPRINT("SMLIB: %s(%p,'%S') called\n", __FUNCTION__, hSmApiPort, Pgm->Buffer); /* Check Pgm's length */ @@ -63,7 +63,7 @@ " u2.s2.Type = %d\n" " u1.s1.DataLength = %d\n" " u1.s1.TotalLength = %d\n" - " sizeof(PORT_MESSAGE)==%d\n", + " sizeof(PORT_MESSAGE)==%u\n", __FUNCTION__, SmReqMsg.Header.u2.s2.Type, SmReqMsg.Header.u1.s1.DataLength, Modified: trunk/reactos/lib/smlib/lookupss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/lookupss.c?rev=5… ============================================================================== --- trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] Mon Sep 2 22:43:37 2013 @@ -84,9 +84,9 @@ & ResultLength); if(NT_SUCCESS(Status)) { - DPRINT("nkvpi.TitleIndex = %ld\n", kvpi->TitleIndex); - DPRINT("kvpi.Type = %ld\n", kvpi->Type); - DPRINT("kvpi.DataLength = %ld\n", kvpi->DataLength); + DPRINT("nkvpi.TitleIndex = %lu\n", kvpi->TitleIndex); + DPRINT("kvpi.Type = %lu\n", kvpi->Type); + DPRINT("kvpi.DataLength = %lu\n", kvpi->DataLength); if((NULL != Data) && (NULL != DataLength) && (NULL != DataType)) {

11 years

[hbelusca] 59967: [NTOS:LPC]: Rename a flag I've introduced sooner, and remove an unneeded variable + code formatting.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Sep 2 22:19:41 2013 New Revision: 59967 URL: http://svn.reactos.org/svn/reactos?rev=59967&view=rev Log: [NTOS:LPC]: Rename a flag I've introduced sooner, and remove an unneeded variable + code formatting. Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/lpc/close.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] Mon Sep 2 22:19:41 2013 @@ -60,7 +60,7 @@ // // LPC Locking Flags // -#define LPCP_LOCK_OWNED 1 +#define LPCP_LOCK_HELD 1 #define LPCP_LOCK_RELEASE 2 // Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/close.c [iso-8859-1] Mon Sep 2 22:19:41 2013 @@ -55,7 +55,7 @@ PLPCP_CONNECTION_MESSAGE ConnectMessage; PLPCP_PORT_OBJECT ClientPort = NULL; PETHREAD Thread = NULL; - BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_OWNED); + BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_HELD); BOOLEAN ReleaseLock = (LockFlags & LPCP_LOCK_RELEASE); PAGED_CODE(); @@ -186,7 +186,7 @@ Thread->LpcReplyMessage = NULL; /* And remove the message from the port zone */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); NextEntry = Port->LpcReplyChainHead.Flink; } @@ -213,7 +213,7 @@ InitializeListHead(&Message->Entry); /* Remove it from the port zone */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); } /* Release the lock */ @@ -407,7 +407,7 @@ /* Free queued messages */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); /* Restart at the head */ NextEntry = ListHead->Flink; @@ -420,7 +420,7 @@ /* Remove it */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); /* Restart at the head */ NextEntry = ListHead->Flink; Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Mon Sep 2 22:19:41 2013 @@ -48,7 +48,7 @@ /* Unlink and free it */ RemoveEntryList(&Message->Entry); InitializeListHead(&Message->Entry); - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD); break; } @@ -63,7 +63,7 @@ IN PLPCP_MESSAGE Message, IN ULONG LockFlags) { - BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_OWNED); + BOOLEAN LockHeld = (LockFlags & LPCP_LOCK_HELD); PAGED_CODE(); @@ -238,7 +238,7 @@ Request) != LPC_REQUEST))) { /* It isn't, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); @@ -257,7 +257,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); _SEH2_YIELD(return _SEH2_GetExceptionCode()); @@ -482,7 +482,7 @@ Request) != LPC_REQUEST))) { /* It isn't, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); @@ -639,7 +639,7 @@ if (Message->Request.u2.s2.DataInfoOffset) { /* It does, save it, and don't free the message below */ - LpcpSaveDataInfoMessage(Port, Message, LPCP_LOCK_OWNED); + LpcpSaveDataInfoMessage(Port, Message, LPCP_LOCK_HELD); Message = NULL; } } @@ -661,7 +661,7 @@ if (Message) { /* Free it and release the lock */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); } else { Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=59… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Mon Sep 2 22:19:41 2013 @@ -104,7 +104,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -115,7 +115,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -134,7 +134,7 @@ if (QueuePort) { /* Generate the Message ID and set it */ - Message->Request.MessageId = LpcpNextMessageId++; + Message->Request.MessageId = LpcpNextMessageId++; if (!LpcpNextMessageId) LpcpNextMessageId = 1; Message->Request.CallbackId = 0; @@ -144,7 +144,7 @@ /* Insert the message in our chain */ InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); - /* Release the lock and release the semaphore */ + /* Release the lock and the semaphore */ KeEnterCriticalRegion(); KeReleaseGuardedMutex(&LpcpLock); LpcpCompleteWait(QueuePort->MsgQueue.Semaphore); @@ -156,15 +156,16 @@ KeSetEvent(&QueuePort->WaitEvent, IO_NO_INCREMENT, FALSE); } + KeLeaveCriticalRegion(); + /* We're done */ - KeLeaveCriticalRegion(); if (ConnectionPort) ObDereferenceObject(ConnectionPort); LPCTRACE(LPC_SEND_DEBUG, "Port: %p. Message: %p\n", QueuePort, Message); return STATUS_SUCCESS; } /* If we got here, then free the message and fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); if (ConnectionPort) ObDereferenceObject(ConnectionPort); return STATUS_PORT_DISCONNECTED; } @@ -284,7 +285,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } @@ -300,7 +301,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -312,7 +313,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); return STATUS_PORT_DISCONNECTED; } } @@ -331,7 +332,7 @@ Message->SenderPort = Port; /* Generate the Message ID and set it */ - Message->Request.MessageId = LpcpNextMessageId++; + Message->Request.MessageId = LpcpNextMessageId++; if (!LpcpNextMessageId) LpcpNextMessageId = 1; Message->Request.CallbackId = 0; @@ -413,7 +414,7 @@ } /* Free the message */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); } else { @@ -452,7 +453,6 @@ PLPCP_MESSAGE Message; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PETHREAD Thread = PsGetCurrentThread(); - PKSEMAPHORE Semaphore; PAGED_CODE(); @@ -536,7 +536,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -550,7 +550,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -563,7 +563,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -585,7 +585,7 @@ Message->SenderPort = Port; /* Generate the Message ID and set it */ - Message->Request.MessageId = LpcpNextMessageId++; + Message->Request.MessageId = LpcpNextMessageId++; if (!LpcpNextMessageId) LpcpNextMessageId = 1; Message->Request.CallbackId = 0; @@ -595,13 +595,10 @@ /* Insert the message in our chain */ InsertTailList(&QueuePort->MsgQueue.ReceiveHead, &Message->Entry); - /* Release the lock and get the semaphore we'll use later */ + /* Release the lock and the semaphore */ KeEnterCriticalRegion(); KeReleaseGuardedMutex(&LpcpLock); - - /* Now release the semaphore */ - Semaphore = QueuePort->MsgQueue.Semaphore; - LpcpCompleteWait(Semaphore); + LpcpCompleteWait(QueuePort->MsgQueue.Semaphore); /* If this is a waitable port, wake it up */ if (QueuePort->Flags & LPCP_WAITABLE_PORT) @@ -629,7 +626,7 @@ Status); /* The wait failed, free the message */ - if (Message) LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + if (Message) LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); if (ConnectionPort) ObDereferenceObject(ConnectionPort); @@ -762,7 +759,7 @@ if (!QueuePort) { /* We have no connected port, fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -779,7 +776,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -792,7 +789,7 @@ if (!ConnectionPort) { /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_OWNED | LPCP_LOCK_RELEASE); + LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; } @@ -812,7 +809,7 @@ Message->SenderPort = Port; /* Generate the Message ID and set it */ - Message->Request.MessageId = LpcpNextMessageId++; + Message->Request.MessageId = LpcpNextMessageId++; if (!LpcpNextMessageId) LpcpNextMessageId = 1; Message->Request.CallbackId = 0;

11 years

← Newer
1
...
49
50
51
52
53
54
55
56
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 September 2013