Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 20977: DJ_Smith (dj_smith_reactos(at)online(dot)de): Updated and added german translations.
by mbosma＠svn.reactos.org 22 Jan '06

22 Jan '06

DJ_Smith (dj_smith_reactos(at)online(dot)de): Updated and added german translations. Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc Modified: trunk/reactos/lib/devmgr/De.rc Modified: trunk/reactos/lib/msacm/msacm.rc Added: trunk/reactos/lib/msacm/msacm_De.rc Modified: trunk/reactos/lib/setupapi/De.rc _____ Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc --- trunk/reactos/lib/comdlg32/cdlg_De.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/comdlg32/cdlg_De.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -29,19 +29,19 @@ FONT 8, "MS Shell Dlg" { LTEXT "Datei&name:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Verzeichnisse:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Liste der Datei&typen:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "&Laufwerke:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Íffnen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Íffnen", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Schreibgesch³tzt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Schreibgesch³tzt", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -51,19 +51,19 @@ FONT 8, "MS Shell Dlg" { LTEXT "Datei&name:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Verzeichnisse:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Liste der Datei&typen:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "&Laufwerke:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Speichern als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Speichern als", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Schreibgesch³tzt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Schreibgesch³tzt", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -74,19 +74,19 @@ { LTEXT "Drucker:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Druckbereicht", 1072, 6, 30, 160, 65, BS_GROUPBOX + GROUPBOX "Druckbereicht", grp1, 6, 30, 160, 65, BS_GROUPBOX RADIOBUTTON "&Alles", rad1, 16, 45, 60, 12 RADIOBUTTON "A&uswahl", rad2, 16, 60, 60, 12 RADIOBUTTON "&Seiten", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "Drucken", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Drucken", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Einrichten", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&Von:", 1090, 60, 80, 30, 9 LTEXT "&Bis:", 1091, 120, 80, 30, 9 LTEXT "Druck&qualitõt:", 1092, 6, 100, 76, 9 - COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "In &Datei drucken", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Verdichtet", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "In &Datei drucken", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Verdichtet", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -95,80 +95,50 @@ CAPTION "Druckereinrichtung" FONT 8, "MS Shell Dlg" { - GROUPBOX "Drucker", 1072, 6, 10, 180, 65, BS_GROUPBOX + GROUPBOX "Drucker", grp1, 6, 10, 180, 65, BS_GROUPBOX RADIOBUTTON "&Standarddrucker", rad1, 16, 20, 80, 12 LTEXT "[keiner]", 1088, 35, 35, 120, 9 RADIOBUTTON "Bestimmter &Drucker", rad2, 16, 50, 80, 12 - COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Einrichten", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Orientierung", 1073, 6, 85, 100, 50, BS_GROUPBOX + GROUPBOX "Orientierung", grp2, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "&Hochformat", rad3, 50, 100, 40, 12 RADIOBUTTON "&Querformat", rad4, 50, 115, 40, 12 - ICON "LANDSCAP", 1097, 10, 95, 32, 32 - ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX + ICON "LANDSCAP", stc10, 10, 95, 32, 32 + ICON "PORTRAIT", stc11, 10, 95, 32, 32 + GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX LTEXT "&Gr÷?e", 1089, 130, 95, 30, 9 LTEXT "P&apierquelle", 1090, 130, 110, 30, 9 - COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } -PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Seite einrichten" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "&Gr÷?e:", stc2, 16, 112, 36, 8 - COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&Zufuhr:", stc3, 16, 132, 36, 8 - COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Format", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Hochformat", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Querformat", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Rõnder", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "&Links:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "&Rechts:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "&Oben:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "&Unten:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Abbrechen", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "&Drucker...", psh3, 184, 220, 48, 14 -END - CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Schriftart" FONT 8, "MS Shell Dlg" { - LTEXT "Schrift&art:",1088 ,6,3,40,9 - COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Schrift&art:",stc1 ,6,3,40,9 + COMBOBOX cmb1 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Schrift&stil:",1089 ,108,3,44,9 - COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Schrift&stil:",stc2 ,108,3,44,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Schrift&gr÷?e:",1090,179,3,30,9 - COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Schrift&gr÷?e:",stc3,179,3,30,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,218,23,40,14,WS_GROUP - PUSHBUTTON "&Zuweisen", psh3,218,40,40,14,WS_GROUP - PUSHBUTTON "&Hilfe" , pshHelp,218,57,40,14,WS_GROUP - GROUPBOX "Darstellung",1072,6,72,84,34,WS_GROUP - CHECKBOX "&Durchgestrichen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Unterstrichen", 1041, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "&Farbe:", 1091 ,6,110,30,9 - COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Zuweisen", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "Darstellung",grp1,6,72,84,34,WS_GROUP + CHECKBOX "&Durchgestrichen", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Unterstrichen", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "&Farbe:", stc4 ,6,110,30,9 + COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Muster",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE @@ -186,29 +156,29 @@ LTEXT "Gr&undfarben:", 1088, 4, 4, 140, 10 LTEXT "Selbs&tdefinierte Farben:", 1089, 4, 106, 140, 10 LTEXT "Farbe | B&asis", 1090, 150, 151, 48, 10 - LTEXT "&Rot:", 726 ,249,126,24,10 - EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Rot:", 726 /*1094*/,249,126,24,10 + EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Gr³n:",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Blau:",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Farbe:" ,723 /*1091*/,202,126,22,10 - EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Sõtt:" ,724 /*1092*/,202,140,22,10 - EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "H&ell:" ,725 /*1093*/,202,154,22,10 - EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "Ok", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Ok", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp,100,166, 44, 14 PUSHBUTTON "Farbe hin&zuf³gen", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Farben &definieren >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&a",713,300,200,4,14 /* just a dummy: 'a' is like &a in "B&asis" */ + PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -218,13 +188,14 @@ FONT 8, "MS Shell Dlg" { LTEXT "S&uchen nach:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Gro?/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Richtung", 1072, 107, 26, 68, 28 + EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nur ganze &Worte", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Beachte Gro?/Kleinschreibung", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Richtung", grp1, 107, 26, 68, 28 CONTROL "H&och", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "&Runter", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Nõchsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP + + DEFPUSHBUTTON "&Nõchsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -236,42 +207,20 @@ FONT 8, "MS Shell Dlg" { LTEXT "S&uchen nach:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "Ersetzen &durch:", -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Gro?/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&Nõchsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ersetzen", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Alle ersetzen", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nur ganze &Worte", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Beachte Gro?/Kleinschreibung", chx1, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "&Nõchsten finden", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&Ersetzen", psh1 , 174,21, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Alle ersetzen", psh2 , 174,38, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL , 174,55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe", pshHelp , 174,75, 50, 14, WS_GROUP | WS_TABSTOP } -NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "Íffnen" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Suche in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY - COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - - LTEXT "Datei&name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY - EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - - LTEXT "Datei&typen",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - CONTROL "&Schreibgesch³tzt",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 - - DEFPUSHBUTTON "Í&ffnen", IDOK,222,110,50,14 - PUSHBUTTON "Abbrechen", IDCANCEL,222,128,50,14 - PUSHBUTTON "&Hilfe", pshHelp,222,145,50,14 -} - PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK @@ -308,8 +257,8 @@ CONTROL "Aus&wahl", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&von:", stc2, 52,124, 20,8 - RTEXT "&bis:", stc3, 100,124, 16,8 + RTEXT "&von:", stc2, 52,124, 20,8 + RTEXT "&bis:", stc3, 100,124, 16,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 @@ -347,6 +296,60 @@ CONTROL "&Querformat", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Seite einrichten" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Gr÷?e:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&Zufuhr:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Format", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Hochformat", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Querformat", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Rõnder", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Links:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Rechts:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Oben:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Unten:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Abbrechen", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "&Drucker...", psh3, 184, 220, 48, 14 +END + +NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "Íffnen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Suche in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "Datei&name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY + EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL + + LTEXT "Datei&typen",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "&Schreibgesch³tzt",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + + DEFPUSHBUTTON "Í&ffnen", IDOK,222,110,50,14 + PUSHBUTTON "Abbrechen", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Hilfe", pshHelp,222,145,50,14 +} + STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "?&ber den Folderpicker" _____ Modified: trunk/reactos/lib/devmgr/De.rc --- trunk/reactos/lib/devmgr/De.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/devmgr/De.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -1,4 +1,4 @@ -// German language resource file (David Hinz (fRy2oo5), 2005-12-04) +// German language resource file (David Hinz (fRy2oo5), 2005-12-04) ( and Friedrich Stange (dj_smith_reactos(a)online.de), 2006-1-20 ) // This is incomplete, IDS_DEV_UNKNOWN_RESOURCE still needs to be translated LANGUAGE LANG_GERMAN, SUBLANG_GERMAN @@ -25,6 +25,9 @@ IDS_PROPERTIES "&Eigenschaften" IDS_UPDATEDRV "Treiber &aktualisieren..." IDS_REBOOT "Computer neusta&rten..." + IDS_NOTAVAILABLE "Nicht verf³gbar" + IDS_NOTDIGITALLYSIGNED "Nicht digital signierte" + IDS_NODRIVERS "Es werden keine Treiber f³r dieses Gerõt ben÷tigt oder es wurden keine Treiber geladen." END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -111,7 +114,7 @@ IDD_DEVICEGENERAL DIALOG DISCARDABLE 0, 0, 252, 218 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -142,5 +145,33 @@ EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Treiberversion:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Signaturgeber:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Treiberdetails...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "Einzelheiten ³ber die Treiberdateien anzeigen.", -1, 91, 110, 154, 17, SS_NOPREFIX END +IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Treiberdateidetails" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Treiberdateien:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Anbieter:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "Dateiversion:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Copyright:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Signaturgeber:", -1, 14, 182, 50, 8 + LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + + + _____ Modified: trunk/reactos/lib/msacm/msacm.rc --- trunk/reactos/lib/msacm/msacm.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/msacm/msacm.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -24,6 +24,7 @@ #include "wineacm.h" #include "msacm_En.rc" +#include "msacm_De.rc" #include "msacm_Es.rc" #include "msacm_Fr.rc" #include "msacm_It.rc" _____ Added: trunk/reactos/lib/msacm/msacm_De.rc --- trunk/reactos/lib/msacm/msacm_De.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/msacm/msacm_De.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -0,0 +1,56 @@ +/* + * German resource file for MS ACM + * + * by Friedrich Stange (dj_smith_reactos(a)online.de) + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sound auswahl" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Name:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Speichern als...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&L÷schen", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Eigenschaften:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Hilfe", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END _____ Modified: trunk/reactos/lib/setupapi/De.rc --- trunk/reactos/lib/setupapi/De.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/setupapi/De.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -1,7 +1,7 @@ /* * German resources for SETUPAPI * - * Copyright 2004 Henning Gerhardt + * Copyright 2004 Henning Gerhardt ( added some stuff in 2006-1-20 by Friedrich Stange (dj_smith_reactos(a)online.de) ) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,3 +32,9 @@ LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUERY_REBOOT_TEXT "Ihr Computer muss zum Beenden der Installation neugestartet werden. Wollen Sie fortfahren?" + IDS_QUERY_REBOOT_CAPTION "Neustarten" +END

1 0

[weiden] 20976: - fixed a possible endless loop in GetSecurityInfo()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

- fixed a possible endless loop in GetSecurityInfo() - implemented the SE_REGISTRY_KEY, SE_FILE_OBJECT, SE_KERNEL_OBJECT, SE_SERVICE and SE_WINDOW_OBJECT object types for SetSecurityInfo() Modified: trunk/reactos/lib/ntmarta/ntmarta.c _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 13:41:39 UTC (rev 20975) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 14:03:12 UTC (rev 20976) @@ -52,13 +52,15 @@ ULONG SDSize = 0; NTSTATUS Status; DWORD LastErr; - DWORD Ret = ERROR_SUCCESS; + DWORD Ret; /* save the last error code */ LastErr = GetLastError(); do { + Ret = ERROR_SUCCESS; + /* allocate a buffer large enough to hold the security descriptor we need to return */ SDSize += 0x100; @@ -89,14 +91,15 @@ { case SE_REGISTRY_KEY: { - Ret = RegGetKeySecurity((HKEY)handle, - SecurityInfo, - pSD, - &SDSize); + Ret = (DWORD)RegGetKeySecurity((HKEY)handle, + SecurityInfo, + pSD, + &SDSize); break; } case SE_FILE_OBJECT: + /* FIXME - handle console handles? */ case SE_KERNEL_OBJECT: { Status = NtQuerySecurityObject(handle, @@ -104,27 +107,36 @@ pSD, SDSize, &SDSize); - Ret = RtlNtStatusToDosError(Status); + if (!NT_SUCCESS(Status)) + { + Ret = RtlNtStatusToDosError(Status); + } break; } case SE_SERVICE: { - Ret = QueryServiceObjectSecurity((SC_HANDLE)handle, - SecurityInfo, - pSD, - SDSize, - &SDSize); + if (!QueryServiceObjectSecurity((SC_HANDLE)handle, + SecurityInfo, + pSD, + SDSize, + &SDSize)) + { + Ret = GetLastError(); + } break; } case SE_WINDOW_OBJECT: { - Ret = GetUserObjectSecurity(handle, - &SecurityInfo, - pSD, - SDSize, - &SDSize); + if (!GetUserObjectSecurity(handle, + &SecurityInfo, + pSD, + SDSize, + &SDSize)) + { + Ret = GetLastError(); + } break; } @@ -221,8 +233,73 @@ SECURITY_INFORMATION SecurityInfo, PSECURITY_DESCRIPTOR pSecurityDescriptor) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + NTSTATUS Status; + DWORD LastErr; + DWORD Ret = ERROR_SUCCESS; + + /* save the last error code */ + LastErr = GetLastError(); + + /* set the security according to the object type */ + switch (ObjectType) + { + case SE_REGISTRY_KEY: + { + Ret = (DWORD)RegSetKeySecurity((HKEY)handle, + SecurityInfo, + pSecurityDescriptor); + break; + } + + case SE_FILE_OBJECT: + /* FIXME - handle console handles? */ + case SE_KERNEL_OBJECT: + { + Status = NtSetSecurityObject(handle, + SecurityInfo, + pSecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + Ret = RtlNtStatusToDosError(Status); + } + break; + } + + case SE_SERVICE: + { + if (!SetServiceObjectSecurity((SC_HANDLE)handle, + SecurityInfo, + pSecurityDescriptor)) + { + Ret = GetLastError(); + } + break; + } + + case SE_WINDOW_OBJECT: + { + if (!SetUserObjectSecurity(handle, + &SecurityInfo, + pSecurityDescriptor)) + { + Ret = GetLastError(); + } + break; + } + + default: + { + UNIMPLEMENTED; + Ret = ERROR_CALL_NOT_IMPLEMENTED; + break; + } + } + + + /* restore the last error code */ + SetLastError(LastErr); + + return Ret; } @@ -362,9 +439,9 @@ { case DLL_PROCESS_ATTACH: hDllInstance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); break; - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: break; }

1 0

[weiden] 20975: don't free the string allocated by RtlDosPathNameToNtPathName_U using RtlFreeUnicodeString because the string isn't allocated with the USTR tag
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

don't free the string allocated by RtlDosPathNameToNtPathName_U using RtlFreeUnicodeString because the string isn't allocated with the USTR tag Modified: trunk/reactos/lib/kernel32/file/cnotify.c Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/lib/kernel32/file/delete.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/file/find.c Modified: trunk/reactos/lib/kernel32/file/hardlink.c Modified: trunk/reactos/lib/kernel32/file/mailslot.c Modified: trunk/reactos/lib/kernel32/file/move.c Modified: trunk/reactos/lib/kernel32/file/npipe.c Modified: trunk/reactos/lib/kernel32/file/volume.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/subsys/smss/initpage.c Modified: trunk/reactos/subsys/smss/initwkdll.c _____ Modified: trunk/reactos/lib/kernel32/file/cnotify.c --- trunk/reactos/lib/kernel32/file/cnotify.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/cnotify.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -99,18 +99,12 @@ -Gunnar */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); - /* FIXME: We free the string alloced by RtlDosPathNameToNtPathName_U, but what - * about the special case where the user can pass a \\?\ path? We must not free - * the users buffer!. But should we even call RtlDosPathNameToNtPathName_U in that - * case??? -Gunnar - */ - RtlFreeUnicodeString( &NtPathU); - - - if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/create.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -104,19 +104,6 @@ return (INVALID_HANDLE_VALUE); } - /* validate & translate the filename */ - if (!RtlDosPathNameToNtPathName_U (lpFileName, - &NtPathU, - NULL, - NULL)) - { - DPRINT("Invalid path\n"); - SetLastError(ERROR_PATH_NOT_FOUND); - return INVALID_HANDLE_VALUE; - } - - DPRINT("NtPathU \'%S\'\n", NtPathU.Buffer); - /* validate & translate the flags */ /* translate the flags that need no validation */ @@ -209,6 +196,19 @@ } } + /* validate & translate the filename */ + if (!RtlDosPathNameToNtPathName_U (lpFileName, + &NtPathU, + NULL, + NULL)) + { + DPRINT("Invalid path\n"); + SetLastError(ERROR_PATH_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + DPRINT("NtPathU \'%wZ\'\n", &NtPathU); + if (hTemplateFile != NULL) { FILE_EA_INFORMATION EaInformation; @@ -230,6 +230,10 @@ EaInformation.EaSize); if (EaBuffer == NULL) { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); + /* the template file handle is valid and has extended attributes, however we seem to lack some memory here. We should fail here! */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -309,7 +313,9 @@ EaBuffer, EaLength); - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); /* free the extended attributes buffer if allocated */ if (EaBuffer != NULL) @@ -370,7 +376,7 @@ HANDLE hSymlink = NULL; UNICODE_STRING SymlinkFileName = { 0, 0, NULL }; UNICODE_STRING TargetFileName = { 0, 0, NULL }; - BOOLEAN bRelativePath = FALSE; + BOOLEAN bAllocatedTarget = FALSE, bRelativePath = FALSE; LPWSTR lpTargetFullFileName = NULL; SIZE_T cbPrintName; SIZE_T cbReparseData; @@ -439,6 +445,7 @@ default: if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) { + bAllocatedTarget = TRUE; dwErr = ERROR_INVALID_PARAMETER; goto Cleanup; } @@ -535,7 +542,12 @@ NtClose(hSymlink); RtlFreeUnicodeString(&SymlinkFileName); - RtlFreeUnicodeString(&TargetFileName); + if (bAllocatedTarget) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + TargetFileName.Buffer); + } if(lpTargetFullFileName) RtlFreeHeap(RtlGetProcessHeap(), 0, lpTargetFullFileName); _____ Modified: trunk/reactos/lib/kernel32/file/delete.c --- trunk/reactos/lib/kernel32/file/delete.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/delete.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -84,7 +84,9 @@ NULL, 0); - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/file.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -309,7 +309,9 @@ if ((uStyle & OF_PARSE) == OF_PARSE) { - RtlFreeUnicodeString(&FileNameString); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileNameString.Buffer); return (HFILE)NULL; } @@ -327,7 +329,9 @@ FILE_SHARE_READ, FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT); - RtlFreeUnicodeString(&FileNameString); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileNameString.Buffer); lpReOpenBuff->nErrCode = RtlNtStatusToDosError(errCode); _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/find.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -877,7 +877,9 @@ NtClose(FileHandle); } - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/kernel32/file/hardlink.c --- trunk/reactos/lib/kernel32/file/hardlink.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/hardlink.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -181,7 +181,7 @@ { SetLastError(ERROR_INVALID_NAME); } - RtlFreeUnicodeString(&LinkTarget); + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); } else { _____ Modified: trunk/reactos/lib/kernel32/file/mailslot.c --- trunk/reactos/lib/kernel32/file/mailslot.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/mailslot.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -99,7 +99,9 @@ nMaxMessageSize, &DefaultTimeOut); - RtlFreeUnicodeString(&MailslotName); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + MailslotName.Buffer); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/move.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -81,7 +81,7 @@ UNICODE_STRING nameW, source_name, dest_name; KEY_VALUE_PARTIAL_INFORMATION *info; BOOL rc = FALSE; - HANDLE Reboot = 0; + HANDLE Reboot = NULL; DWORD len1, len2; DWORD DataSize = 0; BYTE *Buffer = NULL; @@ -98,7 +98,7 @@ dest_name.Buffer = NULL; if (dest && !RtlDosPathNameToNtPathName_U( dest, &dest_name, NULL, NULL )) { - RtlFreeUnicodeString( &source_name ); + RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); SetLastError( ERROR_PATH_NOT_FOUND ); return FALSE; } @@ -120,8 +120,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status 0x%lx)\n", Status); - RtlFreeUnicodeString( &source_name ); - RtlFreeUnicodeString( &dest_name ); + RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); + RtlFreeHeap( RtlGetProcessHeap(), 0, dest_name.Buffer ); return FALSE; } @@ -176,11 +176,11 @@ *p = 0; DataSize += sizeof(WCHAR); - rc = !NtSetValueKey(Reboot, &nameW, 0, REG_MULTI_SZ, Buffer + info_size, DataSize - info_size); + rc = NT_SUCCESS(NtSetValueKey(Reboot, &nameW, 0, REG_MULTI_SZ, Buffer + info_size, DataSize - info_size)); Quit: - RtlFreeUnicodeString( &source_name ); - RtlFreeUnicodeString( &dest_name ); + RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); + RtlFreeHeap( RtlGetProcessHeap(), 0, dest_name.Buffer ); if (Reboot) NtClose(Reboot); HeapFree( GetProcessHeap(), 0, Buffer ); return(rc); _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/npipe.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -215,7 +215,9 @@ } /* Free the name */ - RtlFreeUnicodeString(&NamedPipeName); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NamedPipeName.Buffer); /* Check status */ if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/volume.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -66,7 +66,9 @@ NULL, 0); - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); if (!NT_SUCCESS(errCode)) { _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -640,10 +640,14 @@ { DPRINT1("Dll open of %wZ failed: Status = 0x%08lx\n", &FullNtFileName, Status); - RtlFreeUnicodeString (&FullNtFileName); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + FullNtFileName.Buffer); return Status; } - RtlFreeUnicodeString (&FullNtFileName); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + FullNtFileName.Buffer); Status = NtReadFile(FileHandle, NULL, _____ Modified: trunk/reactos/subsys/smss/initpage.c --- trunk/reactos/subsys/smss/initpage.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/subsys/smss/initpage.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -162,7 +162,9 @@ NULL, 0); - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); if (!NT_SUCCESS(Status)) { @@ -230,7 +232,9 @@ } Cleanup: - RtlFreeUnicodeString(&FileName); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileName.Buffer); return STATUS_SUCCESS; } _____ Modified: trunk/reactos/subsys/smss/initwkdll.c --- trunk/reactos/subsys/smss/initwkdll.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/subsys/smss/initwkdll.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -203,9 +203,14 @@ &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + DllNtPath.Buffer); + if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile(%wZ) failed (Status %lx)\n", &DllNtPath, Status); + DPRINT1("NtOpenFile failed (Status %lx)\n", Status); return Status; }

1 0

[weiden] 20974: don't free the string allocated by RtlDosPathNameToNtPathName_U using RtlFreeUnicodeString because the string isn't allocated with the USTR tag
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

1 0

[weiden] 20973: translate the \\?\ prefix to \??\ in RtlDosPathNameToNtPathName_U
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

translate the \\?\ prefix to \??\ in RtlDosPathNameToNtPathName_U Modified: trunk/reactos/lib/rtl/path.c _____ Modified: trunk/reactos/lib/rtl/path.c --- trunk/reactos/lib/rtl/path.c 2006-01-22 11:08:35 UTC (rev 20972) +++ trunk/reactos/lib/rtl/path.c 2006-01-22 12:29:40 UTC (rev 20973) @@ -690,9 +690,6 @@ WCHAR fullname[MAX_PATH + 1]; PWSTR Buffer = NULL; - - RtlAcquirePebLock (); - RtlInitUnicodeString (&us, DosPathName); if (us.Length > 8) { @@ -700,15 +697,56 @@ /* check for "\\?\" - allows to use very long filenames ( up to 32k ) */ if (Buffer[0] == L'\\' && Buffer[1] == L'\\' && Buffer[2] == L'?' && Buffer[3] == L'\\') - { -// if( f_77F68606( &us, ntname, shortname, nah ) ) -// { -// RtlReleasePebLock (); -// return TRUE; -// } - Buffer = NULL; - RtlReleasePebLock (); - return FALSE; + { + /* allocate the new string and simply copy it */ + NtPathName->Length = us.Length; + NtPathName->MaximumLength = us.Length + sizeof(WCHAR); + NtPathName->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + NtPathName->MaximumLength); + if (NtPathName->Buffer == NULL) + { + return FALSE; + } + + /* copy the string */ + RtlCopyMemory(NtPathName->Buffer, + us.Buffer, + NtPathName->Length); + NtPathName->Buffer[us.Length / sizeof(WCHAR)] = L'\0'; + + /* change the \\?\ prefix to \??\ */ + NtPathName->Buffer[1] = L'?'; + + if (NtFileNamePart != NULL) + { + PWSTR FilePart = NULL; + PWSTR s; + + /* try to find the last separator */ + s = NtPathName->Buffer + (NtPathName->Length / sizeof(WCHAR)); + while (s != NtPathName->Buffer) + { + if (*s == L'\\') + { + FilePart = s + 1; + break; + } + s--; + } + + *NtFileNamePart = FilePart; + } + + if (DirectoryInfo != NULL) + { + DirectoryInfo->DosPath.Length = 0; + DirectoryInfo->DosPath.MaximumLength = 0; + DirectoryInfo->DosPath.Buffer = NULL; + DirectoryInfo->Handle = NULL; + } + + return TRUE; } } @@ -717,10 +755,11 @@ sizeof( fullname ) + MAX_PFX_SIZE); if (Buffer == NULL) { - RtlReleasePebLock (); return FALSE; } + RtlAcquirePebLock (); + Size = RtlGetFullPathName_U (DosPathName, sizeof(fullname), fullname,

1 0

[weiden] 20972: fixed compiling
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

fixed compiling Modified: trunk/reactos/lib/gdi32/objects/font.c _____ Modified: trunk/reactos/lib/gdi32/objects/font.c --- trunk/reactos/lib/gdi32/objects/font.c 2006-01-22 04:20:30 UTC (rev 20971) +++ trunk/reactos/lib/gdi32/objects/font.c 2006-01-22 11:08:35 UTC (rev 20972) @@ -15,73 +15,6 @@ #define INITIAL_FAMILY_COUNT 64 -/********************************************************************** * - * FONT_mbtowc - * - * Returns a Unicode translation of str using the charset of the - * currently selected font in hdc. If count is -1 then str is assumed - * to be '\0' terminated, otherwise it contains the number of bytes to - * convert. If plenW is non-NULL, on return it will point to the - * number of WCHARs that have been written. If pCP is non-NULL, on - * return it will point to the codepage used in the conversion. The - * caller should free the returned LPWSTR from the process heap - * itself. - */ -static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) -{ - UINT cp = CP_ACP; - INT lenW; - LPWSTR strW; - CHARSETINFO csi; - int charset = GetTextCharset(hdc); - - /* Hmm, nicely designed api this one! */ - if(NtGdiTranslateCharsetInfo((PDWORD)charset, &csi, TCI_SRCCHARSET)) - cp = csi.ciACP; - else { - switch(charset) { - case OEM_CHARSET: - cp = GetOEMCP(); - break; - case DEFAULT_CHARSET: - cp = GetACP(); - break; - -/* case VISCII_CHARSET: - case TCVN_CHARSET: - case KOI8_CHARSET: - case ISO3_CHARSET: - case ISO4_CHARSET: - case ISO10_CHARSET: - case CELTIC_CHARSET:*/ - /* FIXME: These have no place here, but because x11drv - enumerates fonts with these (made up) charsets some apps - might use them and then the FIXME below would become - annoying. Now we could pick the intended codepage for - each of these, but since it's broken anyway we'll just - use CP_ACP and hope it'll go away... - */ - /* cp = CP_ACP; - break;*/ - - default: - DPRINT1("Can't find codepage for charset %d\n", charset); - break; - } - } - - DPRINT("charset %d => cp %d\n", charset, cp); - - if(count == -1) count = strlen(str); - lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0); - strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR)); - MultiByteToWideChar(cp, 0, str, count, strW, lenW); - if(plenW) *plenW = lenW; - if(pCP) *pCP = cp; - return strW; -} - - static BOOL FASTCALL MetricsCharConvert(WCHAR w, UCHAR *b) { @@ -415,7 +348,7 @@ ) { /* FIXME should be NtGdiGetCharWidthW */ - return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer)) + return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer); }

1 0

[weiden] 20971: try to get the user from the token and fall back to reading the owner from the process when needed
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

try to get the user from the token and fall back to reading the owner from the process when needed Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2006-01-22 03:53:02 UTC (rev 20970) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2006-01-22 04:20:30 UTC (rev 20971) @@ -92,14 +92,16 @@ PPERFDATA pPDOld; ULONG Idx, Idx2; HANDLE hProcess; + HANDLE hProcessToken; SYSTEM_PERFORMANCE_INFORMATION SysPerfInfo; SYSTEM_TIMEOFDAY_INFORMATION SysTimeInfo; SYSTEM_CACHE_INFORMATION SysCacheInfo; LPBYTE SysHandleInfoData; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SysProcessorTimeInfo; double CurrentKernelTime; - PSECURITY_DESCRIPTOR ProcessSD = NULL; + PSECURITY_DESCRIPTOR ProcessSD; PSID ProcessUser; + ULONG Buffer[64]; /* must be 4 bytes aligned! */ /* Get new system time */ status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); @@ -281,15 +283,41 @@ pPerfData[Idx].ThreadCount = pSPI->NumberOfThreads; pPerfData[Idx].SessionId = pSPI->SessionId; pPerfData[Idx].UserName[0] = _T('\0'); + pPerfData[Idx].USERObjectCount = 0; + pPerfData[Idx].GDIObjectCount = 0; ProcessUser = SystemUserSid; + ProcessSD = NULL; if (pSPI->UniqueProcessId != NULL) { hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | READ_CONTROL, FALSE, PtrToUlong(pSPI->UniqueProcessId)); if (hProcess) { - GetSecurityInfo(hProcess, SE_KERNEL_OBJECT, OWNER_SECURITY_INFORMATION, &ProcessUser, NULL, NULL, NULL, &ProcessSD); + /* don't query the information of the system process. It's possible but + returns Administrators as the owner of the process instead of SYSTEM */ + if (pSPI->UniqueProcessId != (HANDLE)0x4) + { + if (OpenProcessToken(hProcess, TOKEN_QUERY, &hProcessToken)) + { + DWORD RetLen = 0; + BOOL Ret; - pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); - pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); + Ret = GetTokenInformation(hProcessToken, TokenUser, (LPVOID)Buffer, sizeof(Buffer), &RetLen); + CloseHandle(hProcessToken); + + if (Ret) + ProcessUser = ((PTOKEN_USER)Buffer)->User.Sid; + else + goto ReadProcOwner; + } + else + { +ReadProcOwner: + GetSecurityInfo(hProcess, SE_KERNEL_OBJECT, OWNER_SECURITY_INFORMATION, &ProcessUser, NULL, NULL, NULL, &ProcessSD); + } + + pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); + pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); + } + GetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); CloseHandle(hProcess); } else { @@ -298,8 +326,6 @@ } else { ClearInfo: /* clear information we were unable to fetch */ - pPerfData[Idx].USERObjectCount = 0; - pPerfData[Idx].GDIObjectCount = 0; ZeroMemory(&pPerfData[Idx].IOCounters, sizeof(IO_COUNTERS)); }

1 0

[weiden] 20970: fixed allocating the memory for the security descriptor
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

fixed allocating the memory for the security descriptor Modified: trunk/reactos/lib/ntmarta/ntmarta.c _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:50:36 UTC (rev 20969) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:53:02 UTC (rev 20970) @@ -62,7 +62,7 @@ /* allocate a buffer large enough to hold the security descriptor we need to return */ SDSize += 0x100; - if (pSD != NULL) + if (pSD == NULL) { pSD = LocalAlloc(LMEM_FIXED, (SIZE_T)SDSize);

1 0

[ros-diffs] [weiden] 20969: return the pointers of the owner, group, dacl and sacl in the security descriptor returned by GetSecurityInfo()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

return the pointers of the owner, group, dacl and sacl in the security descriptor returned by GetSecurityInfo() Modified: trunk/reactos/lib/ntmarta/ntmarta.c _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:27:21 UTC (rev 20968) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:50:36 UTC (rev 20969) @@ -1,6 +1,6 @@ /* * ReactOS MARTA provider - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2005 - 2006 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -69,9 +69,13 @@ } else { - pSD = LocalReAlloc((HLOCAL)pSD, - (SIZE_T)SDSize, - LMEM_MOVEABLE); + PSECURITY_DESCRIPTOR newSD; + + newSD = LocalReAlloc((HLOCAL)pSD, + (SIZE_T)SDSize, + LMEM_MOVEABLE); + if (newSD != NULL) + pSD = newSD; } if (pSD == NULL) @@ -136,11 +140,67 @@ if (Ret == ERROR_SUCCESS) { + BOOL Present, Defaulted; + + if (SecurityInfo & OWNER_SECURITY_INFORMATION && ppsidOwner != NULL) + { + *ppsidOwner = NULL; + if (!GetSecurityDescriptorOwner(pSD, + ppsidOwner, + &Defaulted)) + { + Ret = GetLastError(); + goto Cleanup; + } + } + + if (SecurityInfo & GROUP_SECURITY_INFORMATION && ppsidGroup != NULL) + { + *ppsidOwner = NULL; + if (!GetSecurityDescriptorGroup(pSD, + ppsidGroup, + &Defaulted)) + { + Ret = GetLastError(); + goto Cleanup; + } + } + + if (SecurityInfo & DACL_SECURITY_INFORMATION && ppDacl != NULL) + { + *ppDacl = NULL; + if (!GetSecurityDescriptorDacl(pSD, + &Present, + ppDacl, + &Defaulted)) + { + Ret = GetLastError(); + goto Cleanup; + } + } + + if (SecurityInfo & SACL_SECURITY_INFORMATION && ppSacl != NULL) + { + *ppSacl = NULL; + if (!GetSecurityDescriptorSacl(pSD, + &Present, + ppSacl, + &Defaulted)) + { + Ret = GetLastError(); + goto Cleanup; + } + } + *ppSecurityDescriptor = pSD; } - else if (pSD != NULL) + else { - LocalFree((HLOCAL)pSD); +Cleanup: + if (pSD != NULL) + { + LocalFree((HLOCAL)pSD); + } } /* restore the last error code */

1 0

[weiden] 20968: implement the object types SE_REGISTRY_KEY, SE_FILE_OBJECT, SE_SERVICE and SE_WINDOW_OBJECT for GetSecurityInfo()
by weiden＠svn.reactos.org 22 Jan '06

22 Jan '06

implement the object types SE_REGISTRY_KEY, SE_FILE_OBJECT, SE_SERVICE and SE_WINDOW_OBJECT for GetSecurityInfo() Modified: trunk/reactos/lib/ntmarta/ntmarta.c Modified: trunk/reactos/lib/ntmarta/ntmarta.h _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:07:21 UTC (rev 20967) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 03:27:21 UTC (rev 20968) @@ -49,7 +49,7 @@ PSECURITY_DESCRIPTOR* ppSecurityDescriptor) { PSECURITY_DESCRIPTOR pSD = NULL; - ULONG RequiredSize, SDSize = 0; + ULONG SDSize = 0; NTSTATUS Status; DWORD LastErr; DWORD Ret = ERROR_SUCCESS; @@ -57,59 +57,83 @@ /* save the last error code */ LastErr = GetLastError(); -AllocBuffer: - /* allocate a buffer large enough to hold the - security descriptor we need to return */ - SDSize += 0x100; - if (pSD != NULL) + do { - pSD = LocalAlloc(LMEM_FIXED, - (SIZE_T)SDSize); - } - else - { - pSD = LocalReAlloc((HLOCAL)pSD, - (SIZE_T)SDSize, - LMEM_MOVEABLE); - } + /* allocate a buffer large enough to hold the + security descriptor we need to return */ + SDSize += 0x100; + if (pSD != NULL) + { + pSD = LocalAlloc(LMEM_FIXED, + (SIZE_T)SDSize); + } + else + { + pSD = LocalReAlloc((HLOCAL)pSD, + (SIZE_T)SDSize, + LMEM_MOVEABLE); + } - if (pSD == NULL) - { - Ret = GetLastError(); - goto Cleanup; - } + if (pSD == NULL) + { + Ret = GetLastError(); + break; + } - /* perform the actual query depending on the object type */ - switch (ObjectType) - { - case SE_KERNEL_OBJECT: + /* perform the actual query depending on the object type */ + switch (ObjectType) { - Status = NtQuerySecurityObject(handle, - SecurityInfo, - pSD, - SDSize, - &RequiredSize); - if (Status == STATUS_BUFFER_TOO_SMALL) + case SE_REGISTRY_KEY: { - /* not enough memory, increase the size of - the buffer and try again */ - ASSERT(RequiredSize > SDSize); - SDSize = RequiredSize; - goto AllocBuffer; + Ret = RegGetKeySecurity((HKEY)handle, + SecurityInfo, + pSD, + &SDSize); + break; } - Ret = RtlNtStatusToDosError(Status); - break; - } - default: - { - UNIMPLEMENTED; - Ret = ERROR_CALL_NOT_IMPLEMENTED; - break; + case SE_FILE_OBJECT: + case SE_KERNEL_OBJECT: + { + Status = NtQuerySecurityObject(handle, + SecurityInfo, + pSD, + SDSize, + &SDSize); + Ret = RtlNtStatusToDosError(Status); + break; + } + + case SE_SERVICE: + { + Ret = QueryServiceObjectSecurity((SC_HANDLE)handle, + SecurityInfo, + pSD, + SDSize, + &SDSize); + break; + } + + case SE_WINDOW_OBJECT: + { + Ret = GetUserObjectSecurity(handle, + &SecurityInfo, + pSD, + SDSize, + &SDSize); + break; + } + + default: + { + UNIMPLEMENTED; + Ret = ERROR_CALL_NOT_IMPLEMENTED; + break; + } } - } -Cleanup: + } while (Ret == ERROR_INSUFFICIENT_BUFFER); + if (Ret == ERROR_SUCCESS) { *ppSecurityDescriptor = pSD; _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.h --- trunk/reactos/lib/ntmarta/ntmarta.h 2006-01-22 03:07:21 UTC (rev 20967) +++ trunk/reactos/lib/ntmarta/ntmarta.h 2006-01-22 03:27:21 UTC (rev 20968) @@ -3,6 +3,7 @@ #include <windows.h> #include <ndk/ntndk.h> #include <accctrl.h> +#include <winsvc.h> #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs