Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 23203: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: winesync Date: Fri Jul 21 15:30:20 2006 New Revision: 23203 URL: http://svn.reactos.org/svn/reactos?rev=23203&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (with props) Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/comctl_Cn.rc trunk/reactos/dll/win32/comctl32/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/comctl_De.rc trunk/reactos/dll/win32/comctl32/comctl_En.rc trunk/reactos/dll/win32/comctl32/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/comctl_Es.rc trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comctl32/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc trunk/reactos/dll/win32/comctl32/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/trackbar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Fri Jul 21 15:30:20 2006 @@ -4,18 +4,19 @@ <include base="comctl32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>winmm</library> + <library>uxtheme</library> <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>uxtheme</library> - <library>winmm</library> <file>animate.c</file> <file>comboex.c</file> <file>comctl32undoc.c</file> @@ -37,8 +38,8 @@ <file>propsheet.c</file> <file>rebar.c</file> <file>smoothscroll.c</file> + <file>status.c</file> <file>string.c</file> - <file>status.c</file> <file>syslink.c</file> <file>tab.c</file> <file>theme_combo.c</file> Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (added) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Fri Jul 21 15:30:20 2006 @@ -1,0 +1,26 @@ +Index: comctl32.rbuild +=================================================================== +--- comctl32.rbuild (revision 23123) ++++ comctl32.rbuild (working copy) +@@ -1,4 +1,5 @@ + <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> ++ <autoregister infsection="OleControlDlls" type="DllInstall" /> + <importlibrary definition="comctl32.spec.def" /> + <include base="comctl32">.</include> + <include base="ReactOS">include/reactos/wine</include> +Index: listview.c +=================================================================== +--- listview.c (revision 23123) ++++ listview.c (working copy) +@@ -3770,9 +3770,8 @@ + if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) + { + TRACE("iImage=%d\n", lvItem.iImage); ++ ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, ++ (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); +- ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, +- rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT, +- (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + } + + /* Don't bother painting item being edited */ Propchange: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Bg.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Bg.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà íà " +CAPTION "Ñâîéñòâà íà %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cn.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "ÊôÐÔ " +CAPTION "ÊôÐÔ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Cs.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Cs.rc Fri Jul 21 15:30:20 2006 @@ -26,7 +26,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Vlastnosti " +CAPTION "Vlastnosti %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_De.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_De.rc Fri Jul 21 15:30:20 2006 @@ -41,7 +41,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschaften für " +CAPTION "Eigenschaften für %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_En.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_En.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "Properties for %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Eo.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ecoj laý " +CAPTION "Ecoj laý %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Es.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Es.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propiedades de " +CAPTION "Propiedades de %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Fr.rc Fri Jul 21 15:30:20 2006 @@ -24,7 +24,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriétés pour " +CAPTION "Propriétés pour %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Hu.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Hu.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Tulajdonságok: " +CAPTION "Tulajdonságok: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_It.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_It.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Proprietà per " +CAPTION "Proprietà per %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ja.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ja.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "Properties for %s" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ko.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ko.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¼Ó¼º" +CAPTION "%s ¼Ó¼º" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -54,11 +54,11 @@ FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "´Ù½Ã(&E)", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "À§·Î ÀÌµ¿(&U)", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "¾Æ·¡·Î ÀÌµ¿(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10 + LTEXT "°¡´ÉÇÑ ¹öÆ°(&V)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "´õÇÏ±â(&A) ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- Á¦°ÅÇÏ±â(&R)", IDC_REMOVE_BTN,131,62,44,14 @@ -81,3 +81,8 @@ { IDS_SEPARATOR "ºÐ¸®ÀÚ" } + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "¾øÀ½" +} Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Nl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Nl.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Eigenschappen van " +CAPTION "Eigenschappen van %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_No.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_No.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Egenskaper for " +CAPTION "Egenskaper for %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Pl.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pl.rc Fri Jul 21 15:30:20 2006 @@ -21,7 +21,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "W³aciwoci " +CAPTION "W³aciwoci %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Pt.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para " +CAPTION "Propriedades para %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Ru.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ñâîéñòâà äëÿ " +CAPTION "Ñâîéñòâà äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Si.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Si.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Lastnosti" +CAPTION "Lastnosti %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Sv.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Sv.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Egenskaper för " +CAPTION "Egenskaper för %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Th.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Th.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ " +CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Tr.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Tr.rc Fri Jul 21 15:30:20 2006 @@ -20,7 +20,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Özellikler: " +CAPTION "Özellikler: %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Tamam", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_Uk.rc Fri Jul 21 15:30:20 2006 @@ -22,7 +22,7 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Âëàñòèâîñò³ äëÿ " +CAPTION "Âëàñòèâîñò³ äëÿ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Fri Jul 21 15:30:20 2006 @@ -3770,8 +3770,8 @@ if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) { TRACE("iImage=%d\n", lvItem.iImage); - ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, + (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); } /* Don't bother painting item being edited */ @@ -5617,9 +5617,11 @@ { POINT Position; LVITEMW lvItem; - INT nColumn = lprc->top; + INT nColumn; if (!lprc) return FALSE; + + nColumn = lprc->top; TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top); /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ @@ -6274,7 +6276,13 @@ memcpy(&item, lpLVItem, offsetof( LVITEMW, iIndent )); } item.iItem = nItem; - if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) item.state &= ~LVIS_STATEIMAGEMASK; + if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + { + item.mask |= LVIF_STATE; + item.stateMask |= LVIS_STATEIMAGEMASK; + item.state &= ~LVIS_STATEIMAGEMASK; + item.state |= INDEXTOSTATEIMAGEMASK(1); + } if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* if we're sorted, sort the list, and update the index */ @@ -6592,6 +6600,7 @@ /* make space for the new column */ LISTVIEW_ScrollColumns(infoPtr, nNewColumn + 1, lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left); + LISTVIEW_UpdateItemSize(infoPtr); return nNewColumn; @@ -6871,7 +6880,15 @@ { HIMAGELIST himl = 0; if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + { + LVITEMW item; + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK; + item.state = INDEXTOSTATEIMAGEMASK(1); + LISTVIEW_SetItemState(infoPtr, -1, &item); + himl = LISTVIEW_CreateCheckBoxIL(infoPtr); + } LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); } Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Fri Jul 21 15:30:20 2006 @@ -2151,8 +2151,7 @@ int lenprop = strlenW(psInfo->strPropertiesFor); dest = Alloc( (lentitle + lenprop + 1)*sizeof (WCHAR)); - strcpyW(dest, psInfo->strPropertiesFor); - strcatW(dest, lpszText); + wsprintfW(dest, psInfo->strPropertiesFor, lpszText); SetWindowTextW(hwndDlg, dest); Free(dest); Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Fri Jul 21 15:30:20 2006 @@ -237,7 +237,7 @@ return 0; } -static void inline +inline static void TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMax) return; @@ -249,7 +249,7 @@ } -static void inline +inline static void TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMin) return; @@ -260,7 +260,7 @@ notify_with_scroll (infoPtr, TB_PAGEUP); } -static void inline TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) +inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMin) return; infoPtr->lPos -= infoPtr->lLineSize; @@ -269,7 +269,7 @@ notify_with_scroll (infoPtr, TB_LINEUP); } -static void inline TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) +inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr) { if (infoPtr->lPos == infoPtr->lRangeMax) return; infoPtr->lPos += infoPtr->lLineSize; @@ -404,7 +404,7 @@ TRACKBAR_InvalidateThumb (infoPtr, newPos); } -static BOOL inline +inline static BOOL TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr) { return infoPtr->lSelMin != infoPtr->lSelMax; @@ -757,7 +757,7 @@ } -static void inline +inline static void TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow) { TTTOOLINFOW ti; @@ -1022,7 +1022,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc) { if (lprc == NULL) return 0; @@ -1036,7 +1036,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) @@ -1058,7 +1058,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic) { if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics) @@ -1069,7 +1069,7 @@ } -static LONG inline +inline static LONG TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic) { LONG range, width, pos, tic; @@ -1111,7 +1111,7 @@ } -static LONG inline +inline static LONG TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) { LONG lTemp = infoPtr->lLineSize; @@ -1122,7 +1122,7 @@ } -static LONG inline +inline static LONG TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; @@ -1133,7 +1133,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) { LONG oldPos = infoPtr->lPos; @@ -1152,7 +1152,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange) { infoPtr->lRangeMin = (SHORT)LOWORD(lRange); @@ -1177,7 +1177,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax) { infoPtr->lRangeMax = lMax; @@ -1195,7 +1195,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) { infoPtr->lRangeMin = lMin; @@ -1213,7 +1213,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1234,7 +1234,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1252,7 +1252,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart) { if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) @@ -1270,7 +1270,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) { @@ -1283,7 +1283,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) @@ -1310,7 +1310,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) { if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) { @@ -1323,7 +1323,7 @@ } -static INT inline +inline static INT TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation) { INT fTemp = infoPtr->fLocation; @@ -1334,7 +1334,7 @@ } -static LRESULT inline +inline static LRESULT TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT) { infoPtr->hwndToolTip = hwndTT; @@ -1343,7 +1343,7 @@ } -static BOOL inline +inline static BOOL TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode) { BOOL bTemp = infoPtr->bUnicode; @@ -1702,7 +1702,7 @@ } -static BOOL inline +inline static BOOL TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) { switch (nVirtKey) {

1 0

[winesync] 23202: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: winesync Date: Fri Jul 21 15:20:23 2006 New Revision: 23202 URL: http://svn.reactos.org/svn/reactos?rev=23202&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/lz32/lzexpand16.c Modified: trunk/reactos/dll/win32/lz32/lzexpand16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lzexpand16.… ============================================================================== --- trunk/reactos/dll/win32/lz32/lzexpand16.c (original) +++ trunk/reactos/dll/win32/lz32/lzexpand16.c Fri Jul 21 15:20:23 2006 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h>

1 0

[winesync] 23201: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: winesync Date: Fri Jul 21 15:13:18 2006 New Revision: 23201 URL: http://svn.reactos.org/svn/reactos?rev=23201&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/dll/win32/crypt32/serialize.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/crypt32/str.c Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c (original) +++ trunk/reactos/dll/win32/crypt32/cert.c Fri Jul 21 15:13:18 2006 @@ -244,12 +244,7 @@ return ret; } -/* info is assumed to be a CRYPT_KEY_PROV_INFO, followed by its container name, - * provider name, and any provider parameters, in a contiguous buffer, but - * where info's pointers are assumed to be invalid. Upon return, info's - * pointers point to the appropriate memory locations. - */ -static void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) { DWORD i, containerLen, provNameLen; LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); @@ -1826,6 +1821,7 @@ } /* Copies data from the parameters into info, where: + * pSerialNumber: The serial number. Must not be NULL. * pSubjectIssuerBlob: Specifies both the subject and issuer for info. * Must not be NULL * pSignatureAlgorithm: Optional. @@ -1836,23 +1832,22 @@ * pubKey: The public key of the certificate. Must not be NULL. * pExtensions: Extensions to be included with the certificate. Optional. */ -static void CRYPT_MakeCertInfo(PCERT_INFO info, +static void CRYPT_MakeCertInfo(PCERT_INFO info, PCRYPT_DATA_BLOB pSerialNumber, PCERT_NAME_BLOB pSubjectIssuerBlob, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, PSYSTEMTIME pStartTime, PSYSTEMTIME pEndTime, PCERT_PUBLIC_KEY_INFO pubKey, PCERT_EXTENSIONS pExtensions) { - /* FIXME: what serial number to use? */ - static const BYTE serialNum[] = { 1 }; static CHAR oid[] = szOID_RSA_SHA1RSA; assert(info); + assert(pSerialNumber); assert(pSubjectIssuerBlob); assert(pubKey); info->dwVersion = CERT_V3; - info->SerialNumber.cbData = sizeof(serialNum); - info->SerialNumber.pbData = (LPBYTE)serialNum; + info->SerialNumber.cbData = pSerialNumber->cbData; + info->SerialNumber.pbData = pSerialNumber->pbData; if (pSignatureAlgorithm) memcpy(&info->SignatureAlgorithm, pSignatureAlgorithm, sizeof(info->SignatureAlgorithm)); @@ -1910,9 +1905,9 @@ UuidCreateFunc uuidCreate = (UuidCreateFunc)GetProcAddress(rpcrt, "UuidCreate"); UuidToStringFunc uuidToString = (UuidToStringFunc)GetProcAddress(rpcrt, - "UuidToString"); + "UuidToStringA"); RpcStringFreeFunc rpcStringFree = (RpcStringFreeFunc)GetProcAddress( - rpcrt, "RpcStringFree"); + rpcrt, "RpcStringFreeA"); if (uuidCreate && uuidToString && rpcStringFree) { @@ -1978,10 +1973,12 @@ { CERT_INFO info = { 0 }; CRYPT_DER_BLOB blob = { 0, NULL }; - BOOL ret; - - CRYPT_MakeCertInfo(&info, pSubjectIssuerBlob, pSignatureAlgorithm, - pStartTime, pEndTime, pubKey, pExtensions); + BYTE serial[16]; + CRYPT_DATA_BLOB serialBlob = { sizeof(serial), serial }; + + CryptGenRandom(hProv, sizeof(serial), serial); + CRYPT_MakeCertInfo(&info, &serialBlob, pSubjectIssuerBlob, + pSignatureAlgorithm, pStartTime, pEndTime, pubKey, pExtensions); ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&blob.pbData, &blob.cbData); Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.spec (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.spec Fri Jul 21 15:13:18 2006 @@ -89,7 +89,7 @@ @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr) @ stub CertVerifyValidityNesting -@ stub CreateFileU +@ stdcall CreateFileU(wstr long long ptr long long ptr) kernel32.CreateFileW @ stdcall CryptBinaryToStringA(ptr long long ptr ptr) @ stub CryptBinaryToStringW # (ptr long long ptr ptr) @ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h Fri Jul 21 15:13:18 2006 @@ -23,13 +23,20 @@ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) #define ASN_ENUMERATED (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x0a) +#define ASN_UTF8STRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x0c) #define ASN_SETOF (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x11) #define ASN_NUMERICSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x12) #define ASN_PRINTABLESTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x13) #define ASN_T61STRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x14) +#define ASN_VIDEOTEXSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x15) #define ASN_IA5STRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x16) #define ASN_UTCTIME (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x17) #define ASN_GENERALTIME (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x18) +#define ASN_GRAPHICSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x19) +#define ASN_VISIBLESTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1a) +#define ASN_GENERALSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1b) +#define ASN_UNIVERSALSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1c) +#define ASN_BMPSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1e) /* The following aren't defined in wincrypt.h, as they're "reserved" */ #define CERT_CERT_PROP_ID 32 @@ -97,6 +104,14 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType); +/* Fixes up the the pointers in info, where info is assumed to be a + * CRYPT_KEY_PROV_INFO, followed by its container name, provider name, and any + * provider parameters, in a contiguous buffer, but where info's pointers are + * assumed to be invalid. Upon return, info's pointers point to the + * appropriate memory locations. + */ +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info); + DWORD CertStore_GetAccessState(HCERTSTORE hCertStore); /** Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/decode.c (original) +++ trunk/reactos/dll/win32/crypt32/decode.c Fri Jul 21 15:13:18 2006 @@ -42,6 +42,7 @@ #include "winbase.h" #include "excpt.h" #include "wincrypt.h" +#include "winnls.h" #include "winreg.h" #include "snmp.h" #include "wine/debug.h" @@ -1271,33 +1272,75 @@ if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesNeeded = sizeof(CERT_NAME_VALUE), valueType; switch (pbEncoded[0]) { + case ASN_OCTETSTRING: + valueType = CERT_RDN_OCTET_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; case ASN_NUMERICSTRING: + valueType = CERT_RDN_NUMERIC_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; case ASN_PRINTABLESTRING: + valueType = CERT_RDN_PRINTABLE_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; case ASN_IA5STRING: + valueType = CERT_RDN_IA5_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; case ASN_T61STRING: + valueType = CERT_RDN_T61_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_VIDEOTEXSTRING: + valueType = CERT_RDN_VIDEOTEX_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_GRAPHICSTRING: + valueType = CERT_RDN_GRAPHIC_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_VISIBLESTRING: + valueType = CERT_RDN_VISIBLE_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_GENERALSTRING: + valueType = CERT_RDN_GENERAL_STRING; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + bytesNeeded += dataLen; + break; + case ASN_UNIVERSALSTRING: + FIXME("ASN_UNIVERSALSTRING: unimplemented\n"); + SetLastError(CRYPT_E_ASN1_BADTAG); + ret = FALSE; + break; + case ASN_BMPSTRING: + valueType = CERT_RDN_BMP_STRING; + bytesNeeded += dataLen; + break; + case ASN_UTF8STRING: + valueType = CERT_RDN_UTF8_STRING; + bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; break; default: - FIXME("Unimplemented string type %02x\n", pbEncoded[0]); - SetLastError(OSS_UNIMPLEMENTED); + SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; } if (ret) { - DWORD bytesNeeded = sizeof(CERT_NAME_VALUE); - - switch (pbEncoded[0]) - { - case ASN_NUMERICSTRING: - case ASN_PRINTABLESTRING: - case ASN_IA5STRING: - case ASN_T61STRING: - if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) - bytesNeeded += dataLen; - break; - } if (!value) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded) @@ -1309,39 +1352,225 @@ else { *pcbStructInfo = bytesNeeded; - switch (pbEncoded[0]) - { - case ASN_NUMERICSTRING: - value->dwValueType = CERT_RDN_NUMERIC_STRING; - break; - case ASN_PRINTABLESTRING: - value->dwValueType = CERT_RDN_PRINTABLE_STRING; - break; - case ASN_IA5STRING: - value->dwValueType = CERT_RDN_IA5_STRING; - break; - case ASN_T61STRING: - value->dwValueType = CERT_RDN_T61_STRING; - break; - } + value->dwValueType = valueType; if (dataLen) { + DWORD i; + + assert(value->Value.pbData); + switch (pbEncoded[0]) + { + case ASN_OCTETSTRING: + case ASN_NUMERICSTRING: + case ASN_PRINTABLESTRING: + case ASN_IA5STRING: + case ASN_T61STRING: + case ASN_VIDEOTEXSTRING: + case ASN_GRAPHICSTRING: + case ASN_VISIBLESTRING: + case ASN_GENERALSTRING: + value->Value.cbData = dataLen; + if (dataLen) + { + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + memcpy(value->Value.pbData, + pbEncoded + 1 + lenBytes, dataLen); + else + value->Value.pbData = (LPBYTE)pbEncoded + 1 + + lenBytes; + } + break; + case ASN_BMPSTRING: + { + LPWSTR str = (LPWSTR)value->Value.pbData; + + value->Value.cbData = dataLen; + for (i = 0; i < dataLen / 2; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | + pbEncoded[1 + lenBytes + 2 * i + 1]; + break; + } + case ASN_UTF8STRING: + { + LPWSTR str = (LPWSTR)value->Value.pbData; + + value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, + str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; + break; + } + } + } + else + { + value->Value.cbData = 0; + value->Value.pbData = NULL; + } + } + } + } + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeNameValue(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = TRUE; + + __TRY + { + ret = CRYPT_AsnDecodeNameValueInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, pcbStructInfo); + if (ret && pvStructInfo) + { + ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, *pcbStructInfo); + if (ret) + { + CERT_NAME_VALUE *value; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + value = (CERT_NAME_VALUE *)pvStructInfo; + value->Value.pbData = ((BYTE *)value + sizeof(CERT_NAME_VALUE)); + ret = CRYPT_AsnDecodeNameValueInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, + pcbStructInfo); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeUnicodeNameValueInternal( + DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = TRUE; + DWORD dataLen; + CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo; + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesNeeded = sizeof(CERT_NAME_VALUE), valueType; + + switch (pbEncoded[0]) + { + case ASN_NUMERICSTRING: + valueType = CERT_RDN_NUMERIC_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_PRINTABLESTRING: + valueType = CERT_RDN_PRINTABLE_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_IA5STRING: + valueType = CERT_RDN_IA5_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_T61STRING: + valueType = CERT_RDN_T61_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_VIDEOTEXSTRING: + valueType = CERT_RDN_VIDEOTEX_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_GRAPHICSTRING: + valueType = CERT_RDN_GRAPHIC_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_VISIBLESTRING: + valueType = CERT_RDN_VISIBLE_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_GENERALSTRING: + valueType = CERT_RDN_GENERAL_STRING; + bytesNeeded += (dataLen + 1) * 2; + break; + case ASN_UNIVERSALSTRING: + valueType = CERT_RDN_UNIVERSAL_STRING; + bytesNeeded += dataLen / 2 + 2; + break; + case ASN_BMPSTRING: + valueType = CERT_RDN_BMP_STRING; + bytesNeeded += dataLen + 2; + break; + case ASN_UTF8STRING: + valueType = CERT_RDN_UTF8_STRING; + bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2 + 2; + break; + default: + SetLastError(CRYPT_E_ASN1_BADTAG); + ret = FALSE; + } + if (ret) + { + if (!value) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbStructInfo = bytesNeeded; + value->dwValueType = valueType; + if (dataLen) + { + DWORD i; + LPWSTR str = (LPWSTR)value->Value.pbData; + + assert(value->Value.pbData); switch (pbEncoded[0]) { case ASN_NUMERICSTRING: case ASN_PRINTABLESTRING: case ASN_IA5STRING: case ASN_T61STRING: - value->Value.cbData = dataLen; - if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) - value->Value.pbData = (BYTE *)pbEncoded + 1 + - lenBytes; - else - { - assert(value->Value.pbData); - memcpy(value->Value.pbData, - pbEncoded + 1 + lenBytes, dataLen); - } + case ASN_VIDEOTEXSTRING: + case ASN_GRAPHICSTRING: + case ASN_VISIBLESTRING: + case ASN_GENERALSTRING: + value->Value.cbData = dataLen * 2 + 2; + for (i = 0; i < dataLen; i++) + str[i] = pbEncoded[1 + lenBytes + i]; + str[i] = 0; + break; + case ASN_UNIVERSALSTRING: + value->Value.cbData = dataLen / 2 + 2; + for (i = 0; i < dataLen / 4; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i + 2] << 8) + | pbEncoded[1 + lenBytes + 2 * i + 3]; + str[i] = 0; + break; + case ASN_BMPSTRING: + value->Value.cbData = dataLen + 2; + for (i = 0; i < dataLen / 2; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | + pbEncoded[1 + lenBytes + 2 * i + 1]; + str[i] = 0; + break; + case ASN_UTF8STRING: + value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, + str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; + str[value->Value.cbData / 2] = 0; + value->Value.cbData += 2; break; } } @@ -1356,7 +1585,7 @@ return ret; } -static BOOL WINAPI CRYPT_AsnDecodeNameValue(DWORD dwCertEncodingType, +static BOOL WINAPI CRYPT_AsnDecodeUnicodeNameValue(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { @@ -1364,7 +1593,7 @@ __TRY { - ret = CRYPT_AsnDecodeNameValueInternal(dwCertEncodingType, + ret = CRYPT_AsnDecodeUnicodeNameValueInternal(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, pcbStructInfo); if (ret && pvStructInfo) @@ -1379,8 +1608,8 @@ pvStructInfo = *(BYTE **)pvStructInfo; value = (CERT_NAME_VALUE *)pvStructInfo; value->Value.pbData = ((BYTE *)value + sizeof(CERT_NAME_VALUE)); - ret = CRYPT_AsnDecodeNameValueInternal(dwCertEncodingType, - lpszStructType, pbEncoded, cbEncoded, + ret = CRYPT_AsnDecodeUnicodeNameValueInternal( + dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, pcbStructInfo); } @@ -3190,6 +3419,9 @@ case (WORD)RSA_CSP_PUBLICKEYBLOB: decodeFunc = CRYPT_AsnDecodeRsaPubKey; break; + case (WORD)X509_UNICODE_NAME_VALUE: + decodeFunc = CRYPT_AsnDecodeUnicodeNameValue; + break; case (WORD)X509_OCTET_STRING: decodeFunc = CRYPT_AsnDecodeOctets; break; Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/encode.c (original) +++ trunk/reactos/dll/win32/crypt32/encode.c Fri Jul 21 15:13:18 2006 @@ -46,6 +46,7 @@ #include "snmp.h" #include "wine/debug.h" #include "wine/exception.h" +#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -163,6 +164,8 @@ SetLastError(ERROR_MORE_DATA); ret = FALSE; } + else + *pcbEncoded = bytesNeeded; return ret; } @@ -381,18 +384,18 @@ *pcbEncoded = blob->cbData; ret = TRUE; } - else if (*pcbEncoded < blob->cbData) - { - *pcbEncoded = blob->cbData; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } else { - if (blob->cbData) - memcpy(pbEncoded, blob->pbData, blob->cbData); - *pcbEncoded = blob->cbData; - ret = TRUE; + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, + pcbEncoded, blob->cbData))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + if (blob->cbData) + memcpy(pbEncoded, blob->pbData, blob->cbData); + *pcbEncoded = blob->cbData; + ret = TRUE; + } } return ret; } @@ -910,6 +913,104 @@ return ret; } +static BOOL CRYPT_AsnEncodeStringCoerce(const CERT_NAME_VALUE *value, + BYTE tag, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCSTR str = (LPCSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData : lstrlenA(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = tag; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + memcpy(pbEncoded, str, encodedLen); + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeBMPString(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, strLen; + + strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(strLen * 2, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + strLen * 2; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_BMPSTRING; + CRYPT_EncodeLen(strLen * 2, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < strLen; i++) + { + *pbEncoded++ = (str[i] & 0xff00) >> 8; + *pbEncoded++ = str[i] & 0x00ff; + } + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeUTF8String(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen, strLen; + + strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + encodedLen = WideCharToMultiByte(CP_UTF8, 0, str, strLen, NULL, 0, NULL, + NULL); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_UTF8STRING; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + WideCharToMultiByte(CP_UTF8, 0, str, strLen, (LPSTR)pbEncoded, + bytesNeeded - lenBytes - 1, NULL, NULL); + } + } + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodeNameValue(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -918,65 +1019,355 @@ __TRY { - BYTE tag; - DWORD bytesNeeded, lenBytes, encodedLen; const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo; switch (value->dwValueType) { - case CERT_RDN_NUMERIC_STRING: - tag = ASN_NUMERICSTRING; - encodedLen = value->Value.cbData; - break; - case CERT_RDN_PRINTABLE_STRING: - tag = ASN_PRINTABLESTRING; - encodedLen = value->Value.cbData; - break; - case CERT_RDN_T61_STRING: - tag = ASN_T61STRING; - encodedLen = value->Value.cbData; - break; - case CERT_RDN_IA5_STRING: - tag = ASN_IA5STRING; - encodedLen = value->Value.cbData; - break; case CERT_RDN_ANY_TYPE: /* explicitly disallowed */ SetLastError(E_INVALIDARG); - return FALSE; + ret = FALSE; + break; + case CERT_RDN_ENCODED_BLOB: + ret = CRYPT_CopyEncodedBlob(dwCertEncodingType, NULL, + &value->Value, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_OCTET_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_OCTETSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_NUMERIC_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_NUMERICSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_PRINTABLE_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_PRINTABLESTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_TELETEX_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_T61STRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_VIDEOTEX_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, + ASN_VIDEOTEXSTRING, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_IA5_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_IA5STRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_GRAPHIC_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_GRAPHICSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_VISIBLE_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_VISIBLESTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_GENERAL_STRING: + ret = CRYPT_AsnEncodeStringCoerce(value, ASN_GENERALSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_UNIVERSAL_STRING: + FIXME("CERT_RDN_UNIVERSAL_STRING: unimplemented\n"); + SetLastError(CRYPT_E_ASN1_CHOICE); + ret = FALSE; + break; + case CERT_RDN_BMP_STRING: + ret = CRYPT_AsnEncodeBMPString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_UTF8_STRING: + ret = CRYPT_AsnEncodeUTF8String(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; default: - FIXME("String type %ld unimplemented\n", value->dwValueType); - return FALSE; - } - CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + encodedLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else - { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) - { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = tag; - CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - switch (value->dwValueType) - { - case CERT_RDN_NUMERIC_STRING: - case CERT_RDN_PRINTABLE_STRING: - case CERT_RDN_T61_STRING: - case CERT_RDN_IA5_STRING: - memcpy(pbEncoded, value->Value.pbData, value->Value.cbData); - } - } + SetLastError(CRYPT_E_ASN1_CHOICE); + ret = FALSE; } } __EXCEPT_PAGE_FAULT { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; + } + __ENDTRY + return ret; +} + +static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value, + BYTE tag, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = tag; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < encodedLen; i++) + *pbEncoded++ = (BYTE)str[i]; + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_NUMERICSTRING; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < encodedLen; i++) + { + if (isdigitW(str[i])) + *pbEncoded++ = (BYTE)str[i]; + else + { + *pcbEncoded = i; + SetLastError(CRYPT_E_INVALID_NUMERIC_STRING); + ret = FALSE; + } + } + } + } + return ret; +} + +static inline int isprintableW(WCHAR wc) +{ + return isalnumW(wc) || isspaceW(wc) || wc == '\'' || wc == '(' || + wc == ')' || wc == '+' || wc == ',' || wc == '-' || wc == '.' || + wc == '/' || wc == ':' || wc == '=' || wc == '?'; +} + +static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_PRINTABLESTRING; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < encodedLen; i++) + { + if (isprintableW(str[i])) + *pbEncoded++ = (BYTE)str[i]; + else + { + *pcbEncoded = i; + SetLastError(CRYPT_E_INVALID_PRINTABLE_STRING); + ret = FALSE; + } + } + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, encodedLen; + + encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_IA5STRING; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < encodedLen; i++) + { + if (str[i] <= 0x7f) + *pbEncoded++ = (BYTE)str[i]; + else + { + *pcbEncoded = i; + SetLastError(CRYPT_E_INVALID_IA5_STRING); + ret = FALSE; + } + } + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeUniversalString(const CERT_NAME_VALUE *value, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)value->Value.pbData; + DWORD bytesNeeded, lenBytes, strLen; + + /* FIXME: doesn't handle composite characters */ + strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : + lstrlenW(str); + CRYPT_EncodeLen(strLen * 4, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + strLen * 4; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + DWORD i; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_UNIVERSALSTRING; + CRYPT_EncodeLen(strLen * 4, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < strLen; i++) + { + *pbEncoded++ = 0; + *pbEncoded++ = 0; + *pbEncoded++ = (BYTE)((str[i] & 0xff00) >> 8); + *pbEncoded++ = (BYTE)(str[i] & 0x00ff); + } + } + } + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeUnicodeNameValue(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo; + + switch (value->dwValueType) + { + case CERT_RDN_ANY_TYPE: + case CERT_RDN_ENCODED_BLOB: + case CERT_RDN_OCTET_STRING: + SetLastError(CRYPT_E_NOT_CHAR_STRING); + break; + case CERT_RDN_NUMERIC_STRING: + ret = CRYPT_AsnEncodeNumericString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_PRINTABLE_STRING: + ret = CRYPT_AsnEncodePrintableString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_TELETEX_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, ASN_T61STRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_VIDEOTEX_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, + ASN_VIDEOTEXSTRING, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_IA5_STRING: + ret = CRYPT_AsnEncodeIA5String(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_GRAPHIC_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, ASN_GRAPHICSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_VISIBLE_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, ASN_VISIBLESTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_GENERAL_STRING: + ret = CRYPT_AsnEncodeUnicodeStringCoerce(value, ASN_GENERALSTRING, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + break; + case CERT_RDN_UNIVERSAL_STRING: + ret = CRYPT_AsnEncodeUniversalString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_BMP_STRING: + ret = CRYPT_AsnEncodeBMPString(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + case CERT_RDN_UTF8_STRING: + ret = CRYPT_AsnEncodeUTF8String(value, dwFlags, pEncodePara, + pbEncoded, pcbEncoded); + break; + default: + SetLastError(CRYPT_E_ASN1_CHOICE); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); } __ENDTRY return ret; @@ -2395,6 +2786,9 @@ break; case (WORD)RSA_CSP_PUBLICKEYBLOB: encodeFunc = CRYPT_AsnEncodeRsaPubKey; + break; + case (WORD)X509_UNICODE_NAME_VALUE: + encodeFunc = CRYPT_AsnEncodeUnicodeNameValue; break; case (WORD)X509_OCTET_STRING: encodeFunc = CRYPT_AsnEncodeOctets; Modified: trunk/reactos/dll/win32/crypt32/serialize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/serializ… ============================================================================== --- trunk/reactos/dll/win32/crypt32/serialize.c (original) +++ trunk/reactos/dll/win32/crypt32/serialize.c Fri Jul 21 15:13:18 2006 @@ -363,6 +363,16 @@ ret = contextInterface->setProp(context, hdr->propID, 0, pbElement); break; + case CERT_KEY_PROV_INFO_PROP_ID: + { + PCRYPT_KEY_PROV_INFO info = + (PCRYPT_KEY_PROV_INFO)pbElement; + + CRYPT_FixKeyProvInfoPointers(info); + ret = contextInterface->setProp(context, + hdr->propID, 0, pbElement); + break; + } default: FIXME("prop ID %ld: stub\n", hdr->propID); } Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/store.c (original) +++ trunk/reactos/dll/win32/crypt32/store.c Fri Jul 21 15:13:18 2006 @@ -1723,6 +1723,54 @@ return ret; } +static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + FIXME("(%ld, %08lx, %s): stub\n", hCryptProv, dwFlags, + debugstr_w((LPCWSTR)pvPara)); + return NULL; +} + +static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + int len; + PWINECRYPT_CERTSTORE ret = NULL; + + TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags, + debugstr_a((LPCSTR)pvPara)); + + if (!pvPara) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return NULL; + } + len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, NULL, 0); + if (len) + { + LPWSTR storeName = CryptMemAlloc(len * sizeof(WCHAR)); + + if (storeName) + { + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, storeName, len); + ret = CRYPT_FileNameOpenStoreW(hCryptProv, dwFlags, storeName); + CryptMemFree(storeName); + } + } + return ret; +} + +static PWINECRYPT_CERTSTORE CRYPT_PhysOpenStoreW(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG) + FIXME("(%ld, %08lx, %p): stub\n", hCryptProv, dwFlags, pvPara); + else + FIXME("(%ld, %08lx, %s): stub\n", hCryptProv, dwFlags, + debugstr_w((LPCWSTR)pvPara)); + return NULL; +} + HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, DWORD dwMsgAndCertEncodingType, HCRYPTPROV hCryptProv, DWORD dwFlags, const void* pvPara) @@ -1742,6 +1790,12 @@ break; case (int)CERT_STORE_PROV_REG: openFunc = CRYPT_RegOpenStore; + break; + case (int)CERT_STORE_PROV_FILENAME_A: + openFunc = CRYPT_FileNameOpenStoreA; + break; + case (int)CERT_STORE_PROV_FILENAME_W: + openFunc = CRYPT_FileNameOpenStoreW; break; case (int)CERT_STORE_PROV_COLLECTION: openFunc = CRYPT_CollectionOpenStore; @@ -1757,6 +1811,9 @@ break; case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_W: openFunc = CRYPT_SysRegOpenStoreW; + break; + case (int)CERT_STORE_PROV_PHYSICAL_W: + openFunc = CRYPT_PhysOpenStoreW; break; default: if (LOWORD(lpszStoreProvider)) Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/str.c (original) +++ trunk/reactos/dll/win32/crypt32/str.c Fri Jul 21 15:13:18 2006 @@ -62,6 +62,7 @@ } else ret++; + TRACE("returning %ld (%s)\n", ret, debugstr_a(psz)); return ret; } @@ -106,7 +107,33 @@ } else ret++; + TRACE("returning %ld (%s)\n", ret, debugstr_w(psz)); return ret; +} + +/* Adds the prefix prefix to the string pointed to by psz, followed by the + * character '='. Copies no more than csz characters. Returns the number of + * characters copied. If psz is NULL, returns the number of characters that + * would be copied. + */ +static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz) +{ + DWORD chars; + + TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz); + + if (psz) + { + chars = min(lstrlenA(prefix), csz); + memcpy(psz, prefix, chars); + csz -= chars; + *(psz + chars) = '='; + chars++; + csz--; + } + else + chars = lstrlenA(prefix) + 1; + return chars; } DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, @@ -147,36 +174,45 @@ else rdnSep = plusSep; rdnSepLen = strlen(rdnSep); - for (i = 0; ret < csz && i < info->cRDN; i++) - { - for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++) + for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) + { + for (j = 0; (!psz || ret < csz) && j < info->rgRDN[i].cRDNAttr; j++) { DWORD chars; + char prefixBuf[10]; /* big enough for GivenName */ + LPCSTR prefix = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR) + prefix = info->rgRDN[i].rgRDNAttr[j].pszObjId; + else if ((dwStrType & 0x000000ff) == CERT_X500_NAME_STR) + { + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo( + CRYPT_OID_INFO_OID_KEY, + info->rgRDN[i].rgRDNAttr[j].pszObjId, + CRYPT_RDN_ATTR_OID_GROUP_ID); + + if (oidInfo) + { + WideCharToMultiByte(CP_ACP, 0, oidInfo->pwszName, -1, + prefixBuf, sizeof(prefixBuf), NULL, NULL); + prefix = prefixBuf; + } + else + prefix = info->rgRDN[i].rgRDNAttr[j].pszObjId; + } + if (prefix) { /* - 1 is needed to account for the NULL terminator. */ - chars = min( - lstrlenA(info->rgRDN[i].rgRDNAttr[j].pszObjId), - csz - ret - 1); - if (psz && chars) - memcpy(psz + ret, info->rgRDN[i].rgRDNAttr[j].pszObjId, - chars); + chars = CRYPT_AddPrefixA(prefix, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; csz -= chars; - if (csz > 1) - { - if (psz) - *(psz + ret) = '='; - ret++; - csz--; - } } /* FIXME: handle quoting */ chars = CertRDNValueToStrA( info->rgRDN[i].rgRDNAttr[j].dwValueType, &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL, - csz - ret - 1); + psz ? csz - ret : 0); if (chars) ret += chars - 1; if (j < info->rgRDN[i].cRDNAttr - 1) @@ -203,7 +239,62 @@ } else ret++; + TRACE("Returning %s\n", debugstr_a(psz)); return ret; +} + +/* Adds the prefix prefix to the wide-character string pointed to by psz, + * followed by the character '='. Copies no more than csz characters. Returns + * the number of characters copied. If psz is NULL, returns the number of + * characters that would be copied. + * Assumes the characters in prefix are ASCII (not multibyte characters.) + */ +static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz) +{ + DWORD chars; + + TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz); + + if (psz) + { + DWORD i; + + chars = min(lstrlenA(prefix), csz); + for (i = 0; i < chars; i++) + *(psz + i) = prefix[i]; + csz -= chars; + *(psz + chars) = '='; + chars++; + csz--; + } + else + chars = lstrlenA(prefix) + 1; + return chars; +} + +/* Adds the prefix prefix to the string pointed to by psz, followed by the + * character '='. Copies no more than csz characters. Returns the number of + * characters copied. If psz is NULL, returns the number of characters that + * would be copied. + */ +static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) +{ + DWORD chars; + + TRACE("(%s, %p, %ld)\n", debugstr_w(prefix), psz, csz); + + if (psz) + { + chars = min(lstrlenW(prefix), csz); + memcpy(psz, prefix, chars * sizeof(WCHAR)); + csz -= chars; + *(psz + chars) = '='; + chars++; + csz--; + } + else + chars = lstrlenW(prefix) + 1; + return chars; } DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, @@ -244,41 +335,49 @@ else rdnSep = plusSep; rdnSepLen = lstrlenW(rdnSep); - for (i = 0; ret < csz && i < info->cRDN; i++) - { - for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++) + for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) + { + for (j = 0; (!psz || ret < csz) && j < info->rgRDN[i].cRDNAttr; j++) { DWORD chars; + LPCSTR prefixA = NULL; + LPCWSTR prefixW = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR) + prefixA = info->rgRDN[i].rgRDNAttr[j].pszObjId; + else if ((dwStrType & 0x000000ff) == CERT_X500_NAME_STR) + { + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo( + CRYPT_OID_INFO_OID_KEY, + info->rgRDN[i].rgRDNAttr[j].pszObjId, + CRYPT_RDN_ATTR_OID_GROUP_ID); + + if (oidInfo) + prefixW = oidInfo->pwszName; + else + prefixA = info->rgRDN[i].rgRDNAttr[j].pszObjId; + } + if (prefixW) { /* - 1 is needed to account for the NULL terminator. */ - chars = min( - lstrlenA(info->rgRDN[i].rgRDNAttr[j].pszObjId), - csz - ret - 1); - if (psz && chars) - { - DWORD k; - - for (k = 0; k < chars; k++) - *(psz + ret + k) = - info->rgRDN[i].rgRDNAttr[j].pszObjId[k]; - } + chars = CRYPT_AddPrefixW(prefixW, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; csz -= chars; - if (csz > 1) - { - if (psz) - *(psz + ret) = '='; - ret++; - csz--; - } + } + else if (prefixA) + { + /* - 1 is needed to account for the NULL terminator. */ + chars = CRYPT_AddPrefixAToW(prefixA, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); + ret += chars; + csz -= chars; } /* FIXME: handle quoting */ chars = CertRDNValueToStrW( info->rgRDN[i].rgRDNAttr[j].dwValueType, &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL, - csz - ret - 1); + psz ? csz - ret : 0); if (chars) ret += chars - 1; if (j < info->rgRDN[i].cRDNAttr - 1) @@ -305,6 +404,7 @@ } else ret++; + TRACE("Returning %s\n", debugstr_w(psz)); return ret; }

1 0

[greatlrd] 23200: patch from LMH1 : Bug#: 1675 : Norwegian translation
by greatlrd＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: greatlrd Date: Fri Jul 21 14:23:55 2006 New Revision: 23200 URL: http://svn.reactos.org/svn/reactos?rev=23200&view=rev Log: patch from LMH1 : Bug#: 1675 : Norwegian translation Added: trunk/reactos/base/shell/cmd/No.rc (with props) Modified: trunk/reactos/base/shell/cmd/cmd.rc Added: trunk/reactos/base/shell/cmd/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/No.rc?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/No.rc (added) +++ trunk/reactos/base/shell/cmd/No.rc Fri Jul 21 14:23:55 2006 @@ -1,0 +1,650 @@ +#include "windows.h" +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +STRING_ATTRIB_HELP, "Skjermvisning eller endre fil attributter.\n\n\ +ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ + [/S [/D]]\n\n\ + + sette en attributter\n\ + - slette en attributter\n\ + R Les-bare fil attributter\n\ + A arkiver fil attributter\n\ + S System fil attributter\n\ + H Skjule fil attributter\n\ + /S prosesser tilpassings filer i retning mappe\n\ + og alt under-mapper\n\ + /D Prosesser Kataloger slik som kilde\n\n\ +Skriv ATTRIB uten en parameter for å vise attributter av alle filer.\n" + +STRING_ALIAS_HELP, "Setter, fjerner eller viser kortnavner.\n\n\ +ALIAS [alias=[Kommando]]\n\n\ + alias Navn for et kortnavn.\n\ + Kommando Tekst til å bli substitutt for en kortnavn.\n\n\ +for å liste alle korte navn:\n\ + ALIAS\n\n\ +For å sette en ny eller endre en eksisterende kortnavn:\n\ + ALIAS da=dir a:\n\n\ +For å fjerne et kortnavn fra kortnavnet liste:\n\ + kortnavn da=" + +STRING_BEEP_HELP, "lydsignal til høytalleren.\n\nPIPP \n" + +STRING_CALL_HELP, "kapital en bunke program fra andre.\n\n\ +CALL [stasjon:][mappe]filenavn [bunke-parameter]\n\n\ + batch-parameter Spesifisere noen kommando-linje informasjon trengs av \n\ + batch program." + +STRING_CD_HELP, "Endre nåværende mappe eller vise dens navn\n\n\ +CHDIR [/D][stasjon:][mappe]\n\ +CHDIR[..|.]\n\ +CD [/D][stasjon:][mappe]\n\ +CD[..|.]\n\n\ + .. forelder mappe\n\ + . nåværende mappe\n\ + /D Vil endre nåværende stasjon og nåværende mappe.\n\n\ +Skriv CD stasjon: for å vise nåværende mappe på spesifiserte stasjon.\n\ +Skriv CD uten en parameter for å vise nåværende stasjon og mappe.\n" + +STRING_CHCP_HELP, "Vis eller velg aktive kode side nummer.\n\n\ +CHCP [nnn]\n\n\ + nnn Spesifisere aktive kode side nummer.\n\n\ +Skriv CHCP uten en parameter for å vise aktive kode side nummer.\n" + +STRING_CHOICE_HELP, "Vent for bruker å endre en av valgene av alternativer.\n\n\ +CHOICE [/C[:]valg][/N][/S][/T[:]c,nn][text]\n\n\ + /C[:]Valg Spesifisere tillattet nøkkeler. Standard er JN.\n\ + /N Ikke vis valgene og ? ved enden av hurtig streng.\n\ + /S Behandle valgte nøkkel som under følsom.\n\ + /T[:]c,nn Standard valg til c etter nn sekunder.\n\ + tekst Påminne streng for å viser.\n\n\ +ERRORLEVEL er valgt for å forskyvning av nøkkeler bruker presser inn valget.\n" + +STRING_CLS_HELP, "Rens skjermen.\n\nCLS\n" + +STRING_CMD_HELP1, "\nInnenlandsk kommando tilgjengelig:\n" + +STRING_CMD_HELP2, "\nFunksjoner tilgjengelig:" + +STRING_CMD_HELP3," [kortnavn]" + +STRING_CMD_HELP4," [historie]" + +STRING_CMD_HELP5," [unix filnavn ferdig gjør]" + +STRING_CMD_HELP6," [mappe stabil]" + +STRING_CMD_HELP7," [omadressering og tuting]" + +STRING_CMD_HELP8, "Start et nytt eksempel av ReactOS kommando linje fortolker.\n\n\ +CMD [/[C|K] kommando][/P][/Q][/T:bf]\n\n\ + /C kommando Kjører spesifiserte kommando og avsluttes.\n\ + /K kommando Kjører spesifiserte kommando og består.\n\ + /P CMD kommer permanent og kjører autoexec.bat\n\ + (kan ikke bli avsluttet).\n\ + /T:bf Velg bakgrunn/forgrunn farge (se FARGE kommando).\n" + +STRING_COLOR_HELP1, "Velg standard forgrunn og bakgrunn farger.\n\n\ +FARGE [attr [/-F]] \n\n\ + attr Spesifisere farge attributter av konsoll utbytte\n\ + /-F klarer ikke fylle konsoll blank plass med farge attributter\n\n\ +Det er tre veier å spesifisere fargene:\n\ +1) [lys] navn på [lys] navn (bare de tre første bokstaver er krevet)\n\ +2) desimal på desimal\n\ +3) to hex siffer\n\n\ +Fargene er:\n\ +dec hex navn dec hex navn\n\ +0 0 Svart 8 8 Grå(lys svart)\n\ +1 1 Blå 9 9 lys Blå\n\ +2 2 Grønn 10 A lys Grønn\n\ +3 3 Cyan 11 B lys Cyan\n\ +4 4 Rød 12 C lys Rød\n\ +5 5 magentarød 13 D lys Magenta\n\ +6 6 Gult 14 E lys Gult\n\ +7 7 Hvit 15 F lys Hvit\n" + +STRING_COPY_HELP1, "Overskrive %s (Ja/Nei/Alt)? " + +STRING_COPY_HELP2, "Kopierer en eller mere filer til annen lokalisering.\n\n\ +COPY [/V][/Y|/-Y][/A|/B] kilde [/A|/B]\n\ + [+ source [/A|/B] [+ ...]] [bestemmelsessted [/A|/B]]\n\n\ + source Spesifisere filene eller filer til å bli kopiert.\n\ + /A Indiserende en ASCII tekst fil.\n\ + /B Indiserende en binær fil.\n\ + destination Spesifisere katalogen og/eller filnavn for den nye fil(ene).\n\ + /V Bekreftet dem nye filer som er skrevet nøyaktig.\n\ + /Y Undertrykke påvirkning til å godkjenne du ønsker å overskrive en\n\ + eksisterende destasjons fil.\n\ + /-Y Årsaker påvirker til å bekrefte du ønsker å overskrive en\n\ + eksisterende destasjons fil.\n\n\ +Bryteren /Y kan kanskje bli forestille i COPYCMD miljø variabel.\n\ +...\n" + +STRING_DATE_HELP1, "\nSkriv inn ny dato (mm%cdd%cyyyy): " + +STRING_DATE_HELP2, "\nSkriv inn ny dato (dd%cmm%cyyyy): " + +STRING_DATE_HELP3, "\nSkriv inn ny dato (yyyy%cmm%cdd): " + +STRING_DATE_HELP4, "Vis eller endre datoen.\n\n\ +DATO [/T][dato]\n\n\ + /T Vis bare\n\n\ +Skriv DATO uten parametere for å vise nåværende dato innstillinger og\n\ +en påminnelse for en ny. Trykk ENTER for å beholde samme dato.\n" + +STRING_DEL_HELP1, "Slett en eller mere filer.\n\n\ +DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributter]] fil ...\n\ +SLETT [/N /P /T /Q /S /W /Y /Z /A[[:]attributter]] fil ...\n\ +ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributer]] fil ...\n\n\ + fil spesifisere file(r) for sletting.\n\n\ + /N Ingenting.\n\ + /P Påminnelse. Spør før sletting av hver fil.\n\ + /T Total. Vis total nummer av slettet filer og ledig disk plass.\n\ + /Q hemmelig.\n\ + /W Slett. Overskrive fil med tilfeldig nummer før sletting av det.\n\ + /Y Ja. ødelegge alt *.* uten å spørre.\n\ + /F Tvinge slette skjulte, les-bare og system filer.\n\ + /S Slett filer fra alle undermapper\n\ + /A Velg filer til å bli slettet basert på attributter.\n\ + attributter\n\ + R Les bare filer\n\ + S System filer\n\ + A Arkiv filer\n\ + H Skjulte Filer\n\ + - Ikke prefiks betydningsfull\n" + +STRING_DEL_HELP2, "Alle filer i mappen vil bli slettet!\ner du sikker (J/N)?" +STRING_DEL_HELP3, " %lu filer slettet\n" +STRING_DEL_HELP4, " %lu filer slettet\n" + +STRING_DELAY_HELP, "pause for n sekunder eller mikrosekunder\n\ +DELAY [/m]n\n\n\ + /m spesifisere dem n er mikrosekunder\n\ + på annen måte n er sekunder\n" + +STRING_DIR_HELP1, "DIR [stasjon:][mappe][filnavn] [/A[[:]attributter]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefelt]] [/W] [/X] [/4]\n\n\ + [stasjon:][mappe][filnavn]\n\ + Spesifisere stasjon, katalog, og/eller filer til listen.\n\n\ + /A Vis filer med spesifisere attributter.\n\ + attributter D Kataloger R Les-bare filer\n\ + H Skjulte filer A Filer klar for arkivering\n\ + S System filer - Ikke prefiks mening\n\ + /B Bruker bare format (ingen overskrift informasjon eller oppsummering).\n\ + /C Vis tusen separator i en fil størrelse. Denne er\n\ + standard. Bruk /-C for å koble ut skjerm av separator.\n\ + /D Samme som stor men filer er listet sortert etter kolonne.\n\ + /L Bruk små bokstaver.\n\ + /N Ny lang liste format hvor filenavnene er på fjern rett.\n\ + /O Liste til side filer i sortert orden.\n\ + sortorder N Etter navn (alfabetisk) S Etter størrelse (minste først)\n\ + E Etter utvidelse (alfabetisk) D Etter dato/tid (eldste først)\n\ + G Gruppere kataloger først - Prefiks til reversere orden\n\ + /P Pause etter hver skjerm full av informasjon.\n\ + /Q Vis eier av fil.\n\ + /S Vis filer i spesifiserte kataloger og alle underkatalog.\n\ + /T Kontroller hvilken tid felt viset eller brukt for sortering\n\ + timefelt C Fremkalling \n\ + A Sist tilgang\n\ + W Sist skrevet\n\ + /W Bruk bred liste format.\n\ + /X Denne viser kort navn generert for non-8dot3 fil\n\ + navn. Formatet er fordi av /N med kort navn innsatt\n\ + før lang navn. Hvis det ikke er kort navn er gjeldende, blank er\n\ + vist i dens plass.\n\ + /4 Vis fire-siffer år\n\n\ +Brytere kan kanskje bli forhåndssatt i DIRCMD miljø variabel. Tilsidesette\n\ +forhåndsinnstilt brytere etter retningsnummer noen bryter med - (hyphen)--for eksempel, /-W.\n" + +STRING_DIR_HELP2, " Volumet i stasjon %c er %s\n" +STRING_DIR_HELP3, " Volumet i stasjon %c har ingen merke.\n" +STRING_DIR_HELP4, " Volumet Serie nummer er %04X-%04X\n" +STRING_DIR_HELP5, "\n Totalt filer listet:\n%16i File(r)% 14s bytes\n" +STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" +STRING_DIR_HELP7, "\n Katalog av %s\n\n" +STRING_DIR_HELP8, "%16i File(r)% 14s bytes\n" + +STRING_DIRSTACK_HELP1, "lagringsenheter aktuelle katalog for bruk av POPD kommando, inntil da\n\ +den endres til spesifiserte katalog.\n\n\ +PUSHD [mappe | ..]\n\n\ + mappe spesifisere katalogen for å lage retning katalog\n" + +STRING_DIRSTACK_HELP2, "Endre til katalog lagerenhet etter PUSHD kommando.\n\nPOPD" + +STRING_DIRSTACK_HELP3, "Trykk innholdet av katalog stakk.\n\nDIRS" + +STRING_DIRSTACK_HELP4, "Katalog stakk tomt" + +STRING_ECHO_HELP1, "Vis en melding uten bakerste holdning retur og linje tilfører.\n\n\ + ECHOS message" + +STRING_ECHO_HELP2, "Vis en melding til standard feil utbytte.\n\n\ + ECHOERR message\n\ + ECHOERR. trykk en tomt linje" + +STRING_ECHO_HELP3, "Trykk en melding til standard feil utbytte uten bakerste holdning retur og linje tilfører.\n\n\ + ECHOSERR message" + +STRING_ECHO_HELP4, "Vis en melding eller endre kommando echo på eller av.\n\n\ + ECHO [PÅ | AV]\n\ + ECHO [melding]\n\ + ECHO. trykk en tom linje\n\n\ +Skriv ECHO uten en parameter for å vise nåværende ECHO innstillinger." + +STRING_ECHO_HELP5, "ECHO er %s\n" + +STRING_EXIT_HELP, "Avslutt kommando linje interpreter.\n\nAVSLUTT\n" + +STRING_FOR_HELP1, "Kjør en spesifiserte kommando for hver fil i en sett av filer\n\n\ +FOR %variabel I (sett) gjøre kommando [parameter]\n\n\ + %variable Spesifisere en erstattelig parameter.\n\ + (sett) Spesifisere et sett av en eller mere filer. Jokertegn kan bli brukt.\n\ + kommando Spesifisere kommandoen til gå med ut for hver fil.\n\ + parametere Spesifisere parameter ellerr endre for spesifiserte kommando.\n\n\ +For å bruke FOR kommando i en batch program, spesifisere %%variabel isteden for\n\ +%variabel.\n" + +STRING_FREE_HELP1, "\nVolume i drive %s er %-11s\n\ + Serie nummer er %s\n\ + %16s byte totalt harddisk plass\n\ + %16s byte brukt\n\ + %16s byte ledig\n" + +STRING_FREE_HELP2, "Vis driver informasjon.\n\nFRI [stasjon: ...]\n" + +STRING_IF_HELP1, "Parfyme betingelses behandling i batch programmer.\n\n\ + IF [IKKE] ERRORLEVEL nummer kommando\n\ + IF [IKKE] string1==string2 kommando\n\ + IF [IKKE] EKSISERER filnavn kommando\n\ + IF [IKKE] DEFINERT variabel kommando\n\n\ +NOT Spesifisere fordi CMD skulle fortsette ut kommando bare hvis\n\ + betingelse er falskt\n\ +ERRORLEVEL nummer Spesifiser en sann vilkår hvis forrige program kjører retursjekk\n\ + en avsluttene kode lik eller flottere enn nummer spesifisert.\n\ +kommando Specifies the command to carry out if the condition is met.\n\ +string1==string2 Spesifiser en sann vilkår hvis spesifisert tekst streng\n\ + stemmer.\n\ +EXIST filnavn Spesifisere en sann vilkår hvis spesifisert filnavn eksisterer.\n\ +DEFINED variabel Spesifisere en sann vilkår hvis spesifisert variabel er\n\ + definert.\n" + +STRING_GOTO_HELP1, "Direkte CMD til et merke linje i en batch skript.\n\n\ +GÅTIL merke\n\n\ + etikett spesifisere en tekst streng brukt i en batch skript som et merke.\n\n\ +Din skriv et merke på en linje etter i seg selv, begynner med en kolon." + +STRING_LABEL_HELP1, "Vis eller endre stasjon merke.\n\nMERKE [stasjon:][merke]\n" + +STRING_LABEL_HELP2, "Volumet i stasjon %c: er %s\n" +STRING_LABEL_HELP3, "Volumet i stasjon %c: har ingen merke\n" +STRING_LABEL_HELP4, "Volumet Serie Nummer er %04X-%04X\n" +STRING_LABEL_HELP5, "Stasjon merke (11 tegn, innføre hvis ingen)? " + +STRING_LOCALE_HELP1, "Nåværende tid er" + +STRING_MKDIR_HELP, "Opprett en katalog.\n\n\ +MKDIR [stasjon:]mappe\nMD [stasjon:]mappe" + +STRING_MEMMORY_HELP1, "Vis mengde av system minne.\n\nMINNE" + +STRING_MEMMORY_HELP2, "\n %12s%% laster minne.\n\n\ + %13s byte totalt fysisk RAM.\n\ + %13s byte tilgjengelig fysisk RAM.\n\n\ + %13s byte totalt side fil.\n\ + %13s byte tilgjengelig side fil.\n\n\ + %13s byte totalt virtuell minne.\n\ + %13s byte tilgjengelig virtuell minne.\n" + +STRING_MISC_HELP1, "Trykk en tast for å fortsette...\n" + +STRING_MOVE_HELP1, "Overskrive %s (Ja/Nei/Alt)? " + +STRING_MOVE_HELP2, "Flytt filer og endre navn på filer og kataloger.\n\n\ +For å flytte en eller flere filer:\n\ +FLYTT [/N][stasjon:][mappe]filnavn1[,...] destinasjon\n\n\ +For å endre navn på en katalog:\n\ +FLYTT [/N][stasjon:][mappe]dirnavn1 dirnavn2\n\n\ + [stasjon:][mappe]filnavn1 Spesifisere lokalisering og navn av fil\n\ + eller filer du ønsker å flytte.\n\ + /N Ingenting. Gjør alt men flytt filer eller kataloger.\n\n\ +Nåværende begrensninger:\n\ + - Du kan ikke filer en fil eller kataloger fra en stasjon til en annen.\n" + +STRING_MSGBOX_HELP, "vis en melding boks og retur bruker reager\n\n\ +MSGBOX skriv ['tittel'] påminnelse\n\n\ +skriv knapp viset\n\ + mulige verdier er: OK, OKAVBRYT,\n\ + JANEI, JANEIAVBRYT\n\ +title tittel av melding boks\n\ +prompt tekst viset etter melding boks\n\n\n\ +ERRORLEVEL et sett ettersom knappen er presset:\n\n\ +JA : 10 | NEI : 11\n\ +OK : 10 | AVBRYT : 12\n" + +STRING_PATH_HELP1, "Vis eller velg en søk mappe for kjørbare filer.\n\n\ +MAPPE [[stasjon:]mappe[;...]]\nMAPPE ;\n\n\ +Skriv MAPPE ; for å rense alle søk-mapper innstillinger og direkte kommando skall\n\ +for å søke bare i nåværende katalog.\n\ +Skriv MAPPE uten parameter for å vise nåværende mappen.\n" + +STRING_PROMPT_HELP1, "Endre kommando påminnelse.\n\n\ +PROMPT [tekst]\n\n\ + tekst Spesifisere et nytt kommando påminnelse.\n\n\ +Påminnelsen kan bli laget opp av normale tegn og følgende spesiele koder:\n\n\ + $A & (et-tegnet)\n\ + $B | (pipe)\n\ + $C ( (venstre parentes)\n\ + $D Nåværende dato\n\ + $E flykte kode (ASCII kode 27)\n\ + $F ) (Høyre parentes)\n\ + $G > (større-enn symbol)\n\ + $H Backspace (sletter forrige tegn)\n\ + $L < (mindre-enn symbol)\n\ + $N Nåværende stasjon\n\ + $P Nåværende stasjon og mappe\n\ + $Q = (lik symbol)\n\ + $T Nåværende tid\n\ + $V OS versjon nummer\n\ + $_ Forsendelse retur og sidelinje\n\ + $$ $ (dollar tegn)\n" + +STRING_PAUSE_HELP1, "Stopp eksekusjon av en batch fil og oppvisning følgende melding:\n\ +'Trykk en tast for å fortsette...' eller en bruker definert melding.\n\n\ +PAUSE [melding]" + +STRING_PROMPT_HELP2, " $+ Vis nåværende dybde av katalog stabel" + +STRING_PROMPT_HELP3, "\nSkriv PÅMINNELSE uten parameter for å restarte påminnelsen til standard innstilling." + +STRING_REM_HELP, "Start en kommentar linje i en batch fil.\n\nREM [Kommentar]" + +STRING_RMDIR_HELP, "Flytter en katalog.\n\n\ +RMDIR [stasjon:]mappe\nRD [stasjon:]mappe\n\ +/S Sletter alle filer og mapper innenfor målet\n\ +/Q Gir ikke påminnelse for bruker\n" +STRING_RMDIR_HELP2, "Katalogen er ikke tom!\n" + +STRING_REN_HELP1, "Endre navn på fil/katalog eller filer/kataloger.\n\n\ +ENDRE NAVN [/E /N /P /Q /S /T] gammelt_navn ... ny_navn\n\ +REN [/E /N /P /Q /S /T] gammelt_navn ... ny_navn\n\n\ + /E Ingen feil meldinger.\n\ + /N Ingenting.\n\ + /P påminnelse for godkjenning før endre navn på hver fil.\n\ + (Ikke implementert enda!)\n\ + /Q Stillhet.\n\ + /S Endre navn på underkatalog.\n\ + /T Vis totalt nummer av endret navn filer.\n\n\ +Notat at du kan ikke spesifisere en ny stasjon eller mappe for din destinasjon. Bruk\n\ +FLYTT kommando for det formålet.\n" + +STRING_REN_HELP2, " %lu fil endret navn\n" + +STRING_REN_HELP3, " %lu filer endret navn\n" + +STRING_SHIFT_HELP, "Endre posisjon av erstattelig parameter i et batch fil.\n\n\ +SHIFT [NED]" + +STRING_SCREEN_HELP, "flytt markør og med eller uten trykk tekst\n\n\ +SCREEN row col [tekst]\n\n\ + row rad til stad flytt markør\n\ + col kolonne til stad flytt markør" + +STRING_SET_HELP, "Vis, sett, eller flytt miljø variabel.\n\n\ +SET [variabel[=][streng]]\n\n\ + variabel Spesifisere miljø-variabel navn.\n\ + string Spesifisere en serie av tegn til bestemme variabel.\n\n\ +Skriv SETT uten parameter for å vise nåværende miljø variabelene.\n" + +STRING_START_HELP1, "Start en kommando.\n\n\ +START kommando\n\n\ + kommando Spesifisere kommando for å kjøre.\n\n\ +ved the øyeblikket alle kommandoer er startet asynchronously.\n" + +STRING_TITLE_HELP, "Velg vindu tittel for kommando påminnelse vindu.\n\n\ +TITLE [streng]\n\n\ +string Spesifisere tittel for kommando påminnelse vindu.\n" + +STRING_TIME_HELP1, "Vis eller velg system tid.\n\n\ +TIME [/T][tid]\n\n\ + /T vis bare\n\n\ +Skriv TID med ingen parametere for å vise nåværende tid innstillinger og en påminnelse\n\ +for en ny en. Trykk ENTER for å beholde samme tid.\n" + +STRING_TIME_HELP2, "Velg ny tid: " + +STRING_TIMER_HELP1, "Forløpt %d msecs\n" + +STRING_TIMER_HELP2, "Forløpt %02d%c%02d%c%02d%c%02d\n" + +STRING_TIMER_HELP3, "Godta bruker av ti stoppeklokke.\n\n\ +TIMER [PÅ|AV] [/S] [/n] [/Fn]\n\n\ + ON sett stoppeklokke PÅ\n\ + OFF sett stoppeklokke AV\n\ + /S Splitt tiden. Retur stoppeklokke splitt\n\ + tid uten å endre dens verdi\n\ + /n Spesifisere stoppeklokke nummer.\n\ + Stoppeklokke er tilgjengelig 0 til 9\n\ + Hvis ikke det er spesifisert standard er 1\n\ + /Fn Format for utgående\n\ + n kan bli:\n\ + 0 mikrosekunder\n\ + 1 hh%cmm%css%cdd\n\n\ +hvis ingen er PÅ, AV eller /S er spesifisert kommando\n\ +vil toggle Stoppeklokke status\n\n" + +STRING_TYPE_HELP1, "Vis innholdet av tekst filer.\n\nSkriv [stasjon:][mappe]filnavn \n\ + /P Vis en skjerm av utgående ved en tid.\n" + +STRING_VERIFY_HELP1, "Denne kommandoen er bare en etterlikning!!\n\ +Sett enten til bekrefte de dine filer er skrevet korrekt til en\n\ +disk.\n\n\ +BEKREFTE [PÅ | AV]\n\n\ +Skriv BEKREFTE uten en parameter for å vise nåværende BEKREFT innstillinger.\n" + +STRING_VERIFY_HELP2, "BEKREFTE er %s.\n" + +STRING_VERIFY_HELP3, "Må spesifisere PÅ eller AV." + +STRING_VERSION_HELP1, "Vis shell versjon informasjon\n\n\ +VER [/C][/R][/W]\n\n\ + /C Vis kreditt.\n\ + /R Vis omfordeling informasjon.\n\ + /W Vis garanti informasjon." + +STRING_VERSION_HELP2, " kommer med ABSOLUTT INGEN GARANTI; for detaljer\n\ +Skriv: `ver /w'. Dette er gratis programvare, og du er velkommen til omfordele\n\ +det under sikker betingelser; Skriv `ver /r' for detaljer. Skriv `ver /c' for en\n\ +liste av kreditt." + +STRING_VERSION_HELP3, "\n Dette programet er fordelt i håpet som det vil bli brukbar,\n\ + men UTEN NOEN GARANTI; uten akkurat forutsatt garanti av\n\ + SALGBARHET eller DUGELIGHET FOR EN KRESEN FORMÅL. Se \n\ + GNU Generielt Publikum Lisens for mere detaljer." + +STRING_VERSION_HELP4, "\n Dette programmet er gratis programvare; du kan omfordele det og/eller modifisere\n\ + det under betingelser av Generielt Publikum Lisens som utgivelses av\n\ + Gratis Programvare Stiftelse; enten versjon 2 av Lisens, eller\n\ + (ved din mulighet) andre nyere versjon.\n" + +STRING_VERSION_HELP5, "\nSend bug rapporter til <ros-dev(a)reactos.org>.\n\ +oppdateringer er tilgjengelig her: http://www.reactos.org" + +STRING_VERSION_HELP6, "\nFreeDOS versjon skrivet av:\n" + +STRING_VERSION_HELP7, "\nReactOS versjon skrivet av:\n" + +STRING_VOL_HELP1, " Volumet i stasjon %c: er %s" +STRING_VOL_HELP2, " Volumet i stasjon %c: har ingen merke" +STRING_VOL_HELP3, " Volumet Serie nummer er %04X-%04X\n" +STRING_VOL_HELP4, "Vis disk volumet merke og serie nummer, hvis det eksisterer.\n\nVOL [stasjon:]" + +STRING_WINDOW_HELP1, "endre konsoll vindu aspekt\n\n\ +WINDOW [/POS[=]venstre,topp,bredde,høyde]\n\ + [MINI|MAKS|GJENOPPRETT] ['tittel']\n\n\ +/POS spesifisere vindu plass og størrelse\n\ +MINI minimer vinduet\n\ +MAKS maksimer vinduet\n\ +GJENOPPRETT gjenopprett vinduet" + +STRING_WINDOW_HELP2, "endre konsoll vindu aspekt\n\n\ +ACTIVATE 'window' [/POS[=]venstre,topp,bredde,høyde]\n\ + [MINI|MAKS|GJENOPPRETT] ['tittel']\n\n\ +vindu tittel av vindu på stad fullføre handlinger\n\ +/POS spesifisere vindu plass og størrelse\n\ +MINI minimer vinduet\n\ +MAKS maksimer vinduet\n\ +GJENOPPRETT gjenopprett vinduet\n\ +tittel ny tittel\n" + + +STRING_HELP1, "Liste av alle tilgjengelige kommando (+ beskrivelse)\n\n\ + command /? For mere informasjon på en spesifikt kommando\n\n\ +? Liste alle tilgjengelig kommando uten beskrivelse).\n\ +ALIAS Sett, fjern eller vis kortnavn.\n\ +ATTRIB\n Vis eller endre fil attributter.\n\ +BEEP Pipp høytalleren.\n\ +CALL Ringe opp en batch program fra andre.\n\ +CD Vis navnet av eller endre nåværende katalog.\n\ +CHCP Vis eller sett aktive kode side nummer.\n\ +CHOICE Vent til bruken velger en av et sett av valg.\n\ +CLS Rens skjermen.\n\ +CMD Start en ny eksempel av ReactOS kommando interpreter.\n\ +COLOR Sett standard konsoll forgrunn og bakgrunn farger.\n\ +COPY Kopier en eller mere filer til et annet plass.\n\ +DATE Vis eller sett datoen.\n\ +DELETE Slett en eller mere filer.\n\ +DIR Vis en liste av filer og underkatalog i en katalog.\n\ +ECHO Vis meldinger, eller skru kommando echo på eller av.\n\ +ERASE Sletter en eller mere filer.\n\ +EXIT Avslutt CMD.EXE program (kommando interpreter).\n\ +FOR Kjør en spesifisert kommando for hver fil i en sett av filer.\n\ +FREE (fri) disk plass.\n\ +GOTO Direkte ReactOS kommando interpreter til en merket linje i\n\ + et batch program.\n\ +HELP Forutsetning Hjelp informasjon for ReactOS kommando.\n\ +HISTORY Liste alle kommando som har blitt brukt\n\ +IF Parfymere betingelses prosess i batch programmer.\n\ +LABEL Opprett, endre, eller slett volumet merke av en disk.\n\ +MD Oppretter en katalog.\n\ +MKDIR Oppretter en mappe.\n\ +MOVE Flytter en eller flere filer fra en katalog til annet\n\ + katalog.\n\ +PATH Vis eller sett en søk mappe for kjørbare filer.\n\ +PAUSE Spenning prosesser av en batch fil og vis en melding.\n\ +POPD Få tilbake forrige verdi av nåværende katalog lagret av\n\ + PUSHD.\n\ +PROMPT Endre kommando påminnelse.\n\ +PUSHD Lagre nåværende katalog også endre det.\n\ +RD Flytt en katalog.\n\ +REM Register kommentarer (kommentere) i batch filer.\n\ +REN Endre navn på en fil eller filer.\n\ +RENAME Endre navn på en fil eller filer.\n\ +RMDIR Flytter en katalog.\n\ +SCREEN Flytt markør og valgfri trykk tekst.\n\ +SET Vis, sett, eller fjern ReactOS miljø variabel.\n\ +SHIFT Shift plass av erstattelig parameter i batch filer.\n" +STRING_HELP2, "START Start en separat vindu til å kjøre es spesifisert program eller kommando.\n\ + Utfører kommando.\n\ +TIME Vis eller sett system tid.\n\ +TIMER Godta bruker av ti stoppeklokke.\n\ +TITLE Sett vindu tittel for en CMD.EXE sesjon.\n\ +SKRIV Vis innholdet av en tekst fil.\n\ +VER Viser ReactOS versjon.\n\ +VERIFY Forteller ReactOS om å bekrefte de dine filer er skrevet\n\ + riktig til en disk.\n\ +VOL Vis en disk volum merke og serie nummer.\n" + + +STRING_CHOICE_OPTION, "YN" +STRING_COPY_OPTION, "YNA" + + +STRING_ALIAS_ERROR, "Kommando linje for lang etter kortnavn utvikling!\n" +STRING_BATCH_ERROR, "Feil åpner batch fil\n" +STRING_CHCP_ERROR1, "Aktive kode side: %u\n" +STRING_CHCP_ERROR4, "Ugyldig kode side\n" +STRING_CHOICE_ERROR, "Ugyldig valg. Forventet format: /C[:]valg" +STRING_CHOICE_ERROR_TXT, "Ugyldig valg. Forventet format: /T[:]c,nn" +STRING_CHOICE_ERROR_OPTION, "Ulovlig operasjon: %s" +STRING_MD_ERROR, "En underkatalog eller fil finnes allerede.\n" +STRING_MD_ERROR2, "Mappen til nye katalogen eksisterer ikke.\n" +STRING_CMD_ERROR1, "Kan ikke forandre inndata fra fil %s\n" +STRING_CMD_ERROR2, "Feil opprettet temporær fil for pipe data\n" +STRING_CMD_ERROR3, "Kan ikke forandre til fil %s\n" +STRING_CMD_ERROR4, "Kjører %s...\n" +STRING_CMD_ERROR5, "Kjører cmdexit.bat...\n" +STRING_COLOR_ERROR1, "Samme farge feil! (Bakgrunn og forgrunn kan ikke bli samme farge)" +STRING_COLOR_ERROR2, "feil i farge spesifikasjon" +STRING_COLOR_ERROR3, "Farge %x\n" +STRING_COLOR_ERROR4, "samme farge feil!" +STRING_CONSOLE_ERROR, "Ukjent feil: %d\n" +STRING_COPY_ERROR1, "Feil: kan ikke åpne kildekoden - %s!\n" +STRING_COPY_ERROR2, "Feil: kan ikke kopiere til seg selv!\n" +STRING_COPY_ERROR3, "Feil skriving destinasjon!\n" +STRING_COPY_ERROR4, "Feil: Ikke implementert enda!\n" +STRING_DATE_ERROR, "Ugyldig dato." +STRING_DEL_ERROR5, "Filen %s vil bli slettet! " +STRING_DEL_ERROR6, "Er du sikker (J/N)?" +STRING_DEL_ERROR7, "Sletter: %s\n" +STRING_ERROR_ERROR1, "Ukjent feil! Feil kode: 0x%lx\n" +STRING_ERROR_ERROR2, "Syntaks feil" +STRING_FOR_ERROR1, "'i' tapt i for forklaring." +STRING_FOR_ERROR2, "ingen brakett funnet." +STRING_FOR_ERROR3, "'gjøre' tapt." +STRING_FOR_ERROR4, "ingen kommando etter 'gjøre'." +STRING_FREE_ERROR1, "Ugyldig driver" +STRING_FREE_ERROR2, "utmerket" +STRING_GOTO_ERROR1, "Ingen merke spesifisert for GÅTIL" +STRING_GOTO_ERROR2, "merke '%s' ikke funnet\n" + +STRING_MOVE_ERROR1, "[OK]\n" +STRING_MOVE_ERROR2, "[Feil]\n" + +STRING_REN_ERROR1, "MoveFile() mislykkes. Feil: %lu\n" + +STRING_START_ERROR1, "Ingen bunke støtte for øyeblikket!" + +STRING_TIME_ERROR1, "Ugyldig tid." + +STRING_TYPE_ERROR1, "Ugyldig mulighet '/%s'\n" + +STRING_WINDOW_ERROR1, "Vinduet ble ikke funnet" + + +STRING_ERROR_PARAMETERF_ERROR, "Parameter format ikke riktig - %c\n" +STRING_ERROR_INVALID_SWITCH, "Ugyldig bryter - /%c\n" +STRING_ERROR_TOO_MANY_PARAMETERS, "For mange parametere - %s\n" +STRING_ERROR_PATH_NOT_FOUND, "Mappen ble ikke funnet\n" +STRING_ERROR_FILE_NOT_FOUND, "Filen ble ikke funnet\n" +STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" +STRING_ERROR_INVALID_DRIVE, "Ugyldig driver spesifikasjon\n" +STRING_ERROR_INVALID_PARAM_FORMAT, "Ugyldig parameter format - %s\n" +STRING_ERROR_BADCOMMAND, "Feil kommando eller filenavn\n" +STRING_ERROR_OUT_OF_MEMORY, "Ute av minne feil.\n" +STRING_ERROR_CANNOTPIPE, "Feil! Kan ikke pipe! kan ikke åpne temporære filer!\n" +STRING_ERROR_D_PAUSEMSG, "Trykk en tast for å fortsette . . ." +STRING_ERROR_DRIVER_NOT_READY, "Stasjonen er ikke klar" + +STRING_PATH_ERROR, "CMD: Ikke i miljøet '%s'\n" + +STRING_CMD_SHELLINFO, "\nReactOS Kommando linje Interpreter" +STRING_VERSION_RUNVER, " kjører på %s" +STRING_COPY_FILE , " %d file(r) kopiert\n" +STRING_DELETE_WIPE, "Slettet" +STRING_FOR_ERROR, "Dårlig variabel spesifikasjon." +STRING_SCREEN_COL, "Ugyldig verdi for farge" +STRING_SCREEN_ROW, "Ugyldig verdi for rad" +STRING_TIMER_TIME "Tiden %d er %s: " + +STRING_INVALID_OPERAND, "Ugyldig operasjon." +STRING_EXPECTED_CLOSE_PAREN, "Forventet ')'." +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Forventet nummer eller variabel navn." +STRING_SYNTAX_COMMAND_INCORRECT, "syntaks av kommandoen er uriktig." + +} Propchange: trunk/reactos/base/shell/cmd/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rc (original) +++ trunk/reactos/base/shell/cmd/cmd.rc Fri Jul 21 14:23:55 2006 @@ -15,7 +15,7 @@ #include "Ru.rc" #include "Ja.rc" #include "Hu.rc" - +#include "No.rc" STRINGTABLE DISCARDABLE {

1 0

[ion] 23199: - Use safe referencing. - Fix a bug in PsGetNextProcess(Thread) since we now use safe referencing and the lookup loop can continue.
by ion＠svn.reactos.org 20 Jul '06

20 Jul '06

Author: ion Date: Thu Jul 20 22:47:35 2006 New Revision: 23199 URL: http://svn.reactos.org/svn/reactos?rev=23199&view=rev Log: - Use safe referencing. - Fix a bug in PsGetNextProcess(Thread) since we now use safe referencing and the lookup loop can continue. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 20 22:47:35 2006 @@ -27,7 +27,6 @@ // Ps: // - Use Process/Thread Rundown. // - Use Process Pushlock Locks. -// - Use Safe Referencing where needed. // - Use Security Locks in security.c // - Figure out why processes don't die. // - Generate process cookie for user-more thread. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Jul 20 22:47:35 2006 @@ -199,6 +199,12 @@ IN ULONG Count ); +BOOLEAN +FASTCALL +ObReferenceObjectSafe( + IN PVOID Object +); + VOID NTAPI ObpReapObject( Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Jul 20 22:47:35 2006 @@ -77,9 +77,12 @@ /* Get the Thread */ FoundThread = CONTAINING_RECORD(Entry, ETHREAD, ThreadListEntry); - /* Reference the thread. FIXME: Race, use ObSafeReferenceObject */ - ObReferenceObject(FoundThread); - break; + /* Safe reference the thread */ + if (ObReferenceObjectSafe(FoundThread)) break; + + /* Nothing found, keep looping */ + FoundThread = NULL; + Entry = Entry->Flink; } /* Unlock the process */ @@ -123,9 +126,12 @@ /* Get the Thread */ FoundProcess = CONTAINING_RECORD(Entry, EPROCESS, ActiveProcessLinks); - /* Reference the thread. FIXME: Race, use ObSafeReferenceObject */ - ObReferenceObject(FoundProcess); - break; + /* Reference the process */ + if (ObReferenceObjectSafe(FoundProcess)) break; + + /* Nothing found, keep trying */ + FoundProcess = NULL; + Entry = Entry->Flink; } /* Release the lock */ @@ -543,10 +549,12 @@ /* Make sure it's really a process */ if (FoundProcess->Pcb.Header.Type == ProcessObject) { - /* FIXME: Safe Reference and return it */ - ObReferenceObject(FoundProcess); - *Process = FoundProcess; - Status = STATUS_SUCCESS; + /* Safe Reference and return it */ + if (ObReferenceObjectSafe(FoundProcess)) + { + *Process = FoundProcess; + Status = STATUS_SUCCESS; + } } /* Unlock the Entry */ @@ -584,17 +592,19 @@ if ((FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) && (FoundThread->Cid.UniqueProcess == Cid->UniqueProcess)) { - /* FIXME: Safe Reference and return it */ - ObReferenceObject(FoundThread); - *Thread = FoundThread; - Status = STATUS_SUCCESS; - - /* Check if we should return the Process too */ - if (Process) + /* Safe Reference and return it */ + if (ObReferenceObjectSafe(FoundThread)) { - /* Return it and reference it */ - *Process = FoundThread->ThreadsProcess; - ObReferenceObject(*Process); + *Thread = FoundThread; + Status = STATUS_SUCCESS; + + /* Check if we should return the Process too */ + if (Process) + { + /* Return it and reference it */ + *Process = FoundThread->ThreadsProcess; + ObReferenceObject(*Process); + } } } Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Jul 20 22:47:35 2006 @@ -436,10 +436,12 @@ /* Make sure it's really a process */ if (FoundThread->Tcb.DispatcherHeader.Type == ThreadObject) { - /* FIXME: Safe Reference and return it */ - ObReferenceObject(FoundThread); - *Thread = FoundThread; - Status = STATUS_SUCCESS; + /* Safe Reference and return it */ + if (ObReferenceObjectSafe(FoundThread)) + { + *Thread = FoundThread; + Status = STATUS_SUCCESS; + } } /* Unlock the Entry */

1 0

[ion] 23198: - Refactor NtSuspend/ResumeThread into PsSuspend/ResumeThread. - Implement NtSuspend/ResumeProcess with PsSuspend/ResumeProcess. - Improve the previous code to use rundown protection and be thread-safe.
by ion＠svn.reactos.org 20 Jul '06

20 Jul '06

Author: ion Date: Thu Jul 20 22:29:54 2006 New Revision: 23198 URL: http://svn.reactos.org/svn/reactos?rev=23198&view=rev Log: - Refactor NtSuspend/ResumeThread into PsSuspend/ResumeThread. - Implement NtSuspend/ResumeProcess with PsSuspend/ResumeProcess. - Improve the previous code to use rundown protection and be thread-safe. Modified: trunk/reactos/ntoskrnl/ps/state.c Modified: trunk/reactos/ntoskrnl/ps/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/state.c (original) +++ trunk/reactos/ntoskrnl/ps/state.c Thu Jul 20 22:29:54 2006 @@ -13,7 +13,153 @@ #define NDEBUG #include <internal/debug.h> -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +PsResumeThread(IN PETHREAD Thread, + OUT PULONG PreviousCount OPTIONAL) +{ + ULONG OldCount; + PAGED_CODE(); + + /* Resume the thread */ + OldCount = KeResumeThread(&Thread->Tcb); + + /* Return the count if asked */ + if (PreviousCount) *PreviousCount = OldCount; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PsSuspendThread(IN PETHREAD Thread, + OUT PULONG PreviousCount OPTIONAL) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG OldCount = 0; + PAGED_CODE(); + + /* Guard with SEH because KeSuspendThread can raise an exception */ + _SEH_TRY + { + /* Check if we're suspending ourselves */ + if (Thread == PsGetCurrentThread()) + { + /* Do the suspend */ + OldCount = KeSuspendThread(&Thread->Tcb); + } + else + { + /* Acquire rundown */ + if (ExAcquireRundownProtection(&Thread->RundownProtect)) + { + /* Make sure the thread isn't terminating */ + if (Thread->Terminated) + { + /* Fail */ + Status = STATUS_THREAD_IS_TERMINATING; + } + else + { + /* Otherwise, do the suspend */ + OldCount = KeSuspendThread(&Thread->Tcb); + + /* Check if it terminated during the suspend */ + if (Thread->Terminated) + { + /* Wake it back up and fail */ + KeForceResumeThread(&Thread->Tcb); + Status = STATUS_THREAD_IS_TERMINATING; + OldCount = 0; + } + } + + /* Release rundown protection */ + ExReleaseRundownProtection(&Thread->RundownProtect); + } + else + { + /* Thread is terminating */ + Status = STATUS_THREAD_IS_TERMINATING; + } + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + + /* Don't fail if we merely couldn't write the handle back */ + if (Status != STATUS_SUSPEND_COUNT_EXCEEDED) Status = STATUS_SUCCESS; + } + _SEH_END; + + /* Write back the previous count */ + if (PreviousCount) *PreviousCount = OldCount; + return Status; +} + +NTSTATUS +NTAPI +PsResumeProcess(IN PEPROCESS Process) +{ + PETHREAD Thread; + PAGED_CODE(); + + /* Lock the Process */ + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Process is terminating */ + return STATUS_PROCESS_IS_TERMINATING; + } + + /* Get the first thread */ + Thread = PsGetNextProcessThread(Process, NULL); + while (Thread) + { + /* Resume it */ + KeResumeThread(&Thread->Tcb); + + /* Move to the next thread */ + Thread = PsGetNextProcessThread(Process, Thread); + } + + /* Unlock the process */ + ExReleaseRundownProtection(&Process->RundownProtect); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PsSuspendProcess(IN PEPROCESS Process) +{ + PETHREAD Thread; + PAGED_CODE(); + + /* Lock the Process */ + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Process is terminating */ + return STATUS_PROCESS_IS_TERMINATING; + } + + /* Get the first thread */ + Thread = PsGetNextProcessThread(Process, NULL); + while (Thread) + { + /* Resume it */ + PsSuspendThread(Thread, NULL); + + /* Move to the next thread */ + Thread = PsGetNextProcessThread(Process, Thread); + } + + /* Unlock the process */ + ExReleaseRundownProtection(&Process->RundownProtect); + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented @@ -76,8 +222,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Fail on exception */ if (!NT_SUCCESS(Status)) return Status; } @@ -144,8 +288,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Fail on exception */ if(!NT_SUCCESS(Status)) return Status; } @@ -158,8 +300,8 @@ NULL); if (!NT_SUCCESS(Status)) return Status; - /* Call the Kernel Function */ - Prev = KeResumeThread(&Thread->Tcb); + /* Call the internal function */ + Status = PsResumeThread(Thread, &Prev); /* Check if the caller wanted the count back */ if (SuspendCount) @@ -209,8 +351,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Fail on exception */ if(!NT_SUCCESS(Status)) return Status; } @@ -223,33 +363,25 @@ NULL); if (!NT_SUCCESS(Status)) return Status; - /* Guard with SEH because KeSuspendThread can raise an exception */ + /* Call the internal function */ + Status = PsSuspendThread(Thread, &Prev); + ObDereferenceObject(Thread); + if (!NT_SUCCESS(Status)) return Status; + + /* Protect write with SEH */ _SEH_TRY { - /* Make sure the thread isn't terminating */ - if ((Thread != PsGetCurrentThread()) && (Thread->Terminated)) - { - ObDereferenceObject(Thread); - return STATUS_THREAD_IS_TERMINATING; - } - - /* Call the Kernel function */ - Prev = KeSuspendThread(&Thread->Tcb); - /* Return the Previous Count */ if (PreviousSuspendCount) *PreviousSuspendCount = Prev; } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - - /* Don't fail if we merely couldn't write the handle back */ - if (Status != STATUS_SUSPEND_COUNT_EXCEEDED) Status = STATUS_SUCCESS; } _SEH_END; /* Return */ - ObDereferenceObject(Thread); return Status; } @@ -271,9 +403,8 @@ NULL); if (NT_SUCCESS(Status)) { - /* FIXME */ - Status = STATUS_NOT_IMPLEMENTED; - DPRINT1("NtSuspendProcess not yet implemented!\n"); + /* Call the internal function */ + Status = PsSuspendProcess(Process); ObDereferenceObject(Process); } @@ -299,9 +430,8 @@ NULL); if (NT_SUCCESS(Status)) { - /* FIXME */ - Status = STATUS_NOT_IMPLEMENTED; - DPRINT1("NtResumeProcess not yet implemented!\n"); + /* Call the internal function */ + Status = PsResumeProcess(Process); ObDereferenceObject(Process); }

1 0

[ion] 23197: - Add Pushlock support for GCC (Thanks Thomas!) - Remove a bunch of deprecated crap from ps.h - Get rid of PsLockProcess, PsUnlockProcess. Use the process pushlock instead. - When assigning the job, only acquiring rundown protection is enough. - Use interlocked intrinsics for setting the ExceptionPort instead of locking the entire process object. - Disable locking in ProcessSessionInformation for NtSetInformationProcess. The whole API seems wrong anyway, on my XP machine calling it
by ion＠svn.reactos.org 20 Jul '06

20 Jul '06

Author: ion Date: Thu Jul 20 21:44:30 2006 New Revision: 23197 URL: http://svn.reactos.org/svn/reactos?rev=23197&view=rev Log: - Add Pushlock support for GCC (Thanks Thomas!) - Remove a bunch of deprecated crap from ps.h - Get rid of PsLockProcess, PsUnlockProcess. Use the process pushlock instead. - When assigning the job, only acquiring rundown protection is enough. - Use interlocked intrinsics for setting the ExceptionPort instead of locking the entire process object. - Disable locking in ProcessSessionInformation for NtSetInformationProcess. The whole API seems wrong anyway, on my XP machine calling it does not change the session or change any token data. To verify later... Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Thu Jul 20 21:44:30 2006 @@ -31,6 +31,17 @@ #include <ketypes.h> #include <potypes.h> #include <lpctypes.h> + +// +// GCC compatibility +// +#if defined(__GNUC__) +#define __ALIGNED(n) __attribute__((aligned (n))) +#elif defined(_MSC_VER) +#define __ALIGNED(n) __declspec(align(n)) +#else +#error __ALIGNED not defined for your compiler! +#endif // // Atom and Language IDs @@ -411,9 +422,7 @@ // // Executive Pushlock Wait Block // -#ifndef __GNUC__ // WARNING! PUSHLOCKS WILL NOT WORK IN GCC FOR NOW!!! -__declspec(align(16)) -#endif +__ALIGNED(16) typedef struct _EX_PUSH_LOCK_WAIT_BLOCK { union Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Thu Jul 20 21:44:30 2006 @@ -466,6 +466,7 @@ if (InterlockedBitTestAndSet((PLONG)PushLock, EX_PUSH_LOCK_LOCK_V)) { /* Someone changed it, use the slow path */ + DbgPrint("%s - Contention!\n", __FUNCTION__); ExfAcquirePushLockExclusive(PushLock); } @@ -500,9 +501,10 @@ /* Try acquiring the lock */ NewValue.Value = EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_SHARE_INC; - if (!InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, 0)) + if (InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, 0)) { /* Someone changed it, use the slow path */ + DbgPrint("%s - Contention!\n", __FUNCTION__); ExfAcquirePushLockShared(PushLock); } @@ -575,6 +577,7 @@ OldValue.Ptr) { /* There are still other people waiting on it */ + DbgPrint("%s - Contention!\n", __FUNCTION__); ExfReleasePushLockShared(PushLock); } } @@ -621,6 +624,7 @@ if ((OldValue.Waiting) && !(OldValue.Waking)) { /* Wake it up */ + DbgPrint("%s - Contention!\n", __FUNCTION__); ExfTryToWakePushLock(PushLock); } } @@ -672,6 +676,7 @@ OldValue.Ptr)) { /* We have waiters, use the long path */ + DbgPrint("%s - Contention!\n", __FUNCTION__); ExfReleasePushLock(PushLock); } } Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Thu Jul 20 21:44:30 2006 @@ -21,97 +21,24 @@ VOID NTAPI +PspShutdownProcessManager(VOID); + +VOID +NTAPI +PsInitThreadManagment(VOID); + +VOID +INIT_FUNCTION +NTAPI PiInitProcessManager(VOID); VOID NTAPI -PspShutdownProcessManager(VOID); - -VOID -NTAPI -PsInitThreadManagment(VOID); - -VOID -NTAPI PsInitProcessManagment(VOID); VOID NTAPI PsInitIdleThread(VOID); - -VOID -NTAPI -PiTerminateProcessThreads( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PsTerminateCurrentThread(NTSTATUS ExitStatus); - -VOID -NTAPI -PsTerminateOtherThread( - PETHREAD Thread, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PsReleaseThread(PETHREAD Thread); - -VOID -NTAPI -PsBeginThread( - PKSTART_ROUTINE StartRoutine, - PVOID StartContext -); - -VOID -NTAPI -PsBeginThreadWithContextInternal(VOID); - -VOID -NTAPI -PiKillMostProcesses(VOID); - -NTSTATUS -STDCALL -PiTerminateProcess( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -VOID -NTAPI -PiInitApcManagement(VOID); - -VOID -STDCALL -PiDeleteThread(PVOID ObjectBody); - -VOID -NTAPI -PsReapThreads(VOID); - -VOID -NTAPI -PsInitializeThreadReaper(VOID); - -VOID -NTAPI -PsQueueThreadReap(PETHREAD Thread); - -NTSTATUS -NTAPI -PsInitializeThread( - PEPROCESS Process, - PETHREAD* ThreadPtr, - POBJECT_ATTRIBUTES ObjectAttributes, - KPROCESSOR_MODE AccessMode, - BOOLEAN First -); PACCESS_TOKEN STDCALL @@ -127,27 +54,6 @@ PsOpenTokenOfProcess( HANDLE ProcessHandle, PACCESS_TOKEN* Token -); - -VOID -STDCALL -PspTerminateProcessThreads( - PEPROCESS Process, - NTSTATUS ExitStatus -); - -NTSTATUS -NTAPI -PsSuspendThread( - PETHREAD Thread, - PULONG PreviousCount -); - -NTSTATUS -NTAPI -PsResumeThread( - PETHREAD Thread, - PULONG PreviousCount ); NTSTATUS @@ -200,10 +106,6 @@ VOID STDCALL -PiDeleteProcess(PVOID ObjectBody); - -VOID -STDCALL PspReapRoutine(PVOID Context); VOID @@ -218,67 +120,13 @@ BOOLEAN bSelf ); -NTSTATUS -NTAPI -PsUnfreezeOtherThread(PETHREAD Thread); - -VOID -NTAPI -PsFreezeOtherThread(PETHREAD Thread); - -VOID -NTAPI -PsFreezeProcessThreads(PEPROCESS Process); - -VOID -NTAPI -PsUnfreezeProcessThreads(PEPROCESS Process); - -ULONG -NTAPI -PsEnumThreadsByProcess(PEPROCESS Process); - PEPROCESS STDCALL PsGetNextProcess(PEPROCESS OldProcess); VOID -NTAPI -PsApplicationProcessorInit(VOID); - -VOID -NTAPI -PsPrepareForApplicationProcessorInit(ULONG Id); - -VOID STDCALL PsIdleThreadMain(PVOID Context); - -VOID -STDCALL -PiSuspendThreadRundownRoutine(PKAPC Apc); - -VOID -STDCALL -PiSuspendThreadKernelRoutine( - PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArguemnt2 -); - -VOID -STDCALL -PiSuspendThreadNormalRoutine( - PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2 -); - -VOID -NTAPI -PsInitialiseSuspendImplementation(VOID); VOID STDCALL @@ -293,23 +141,6 @@ STDCALL PspDeleteThread(PVOID ObjectBody); - -NTSTATUS -NTAPI -PsInitWin32Thread(PETHREAD Thread); - -VOID -NTAPI -PsTerminateWin32Process(PEPROCESS Process); - -VOID -NTAPI -PsTerminateWin32Thread(PETHREAD Thread); - -VOID -NTAPI -PsInitialiseW32Call(VOID); - VOID NTAPI INIT_FUNCTION @@ -340,17 +171,6 @@ NTSTATUS STDCALL PspGetSystemDllEntryPoints(VOID); - -NTSTATUS -NTAPI -PsLockProcess( - PEPROCESS Process, - BOOLEAN Timeout -); - -VOID -NTAPI -PsUnlockProcess(PEPROCESS Process); VOID NTAPI @@ -391,7 +211,7 @@ extern PEPROCESS PsIdleProcess; extern LIST_ENTRY PsActiveProcessHead; extern KGUARDED_MUTEX PspActiveProcessMutex; -extern LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; +extern LARGE_INTEGER ShortPsLockDelay; extern EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; extern PHANDLE_TABLE PspCidTable; extern PCREATE_THREAD_NOTIFY_ROUTINE Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=2319… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c (original) +++ trunk/reactos/ntoskrnl/ps/job.c Thu Jul 20 21:44:30 2006 @@ -169,7 +169,7 @@ /* lock the process so we can safely assign the process. Note that in the meanwhile another thread could have assigned this process to a job! */ - Status = PsLockProcess(Process, FALSE); + ExAcquireRundownProtection(&Process->RundownProtect); if(NT_SUCCESS(Status)) { if(Process->Job == NULL && Process->Session == Job->SessionId) @@ -185,7 +185,7 @@ /* process is already assigned to a job or session id differs! */ Status = STATUS_ACCESS_DENIED; } - PsUnlockProcess(Process); + ExReleaseRundownProtection(&Process->RundownProtect); if(NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Thu Jul 20 21:44:30 2006 @@ -296,13 +296,15 @@ if (Thread->ThreadListEntry.Flink) { /* Lock the thread's process */ - PsLockProcess(Process, FALSE); + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&Process->ProcessLock); /* Remove us from the list */ RemoveEntryList(&Thread->ThreadListEntry); /* Release the lock */ - PsUnlockProcess(Process); + ExReleasePushLockExclusive(&Process->ProcessLock); + KeLeaveCriticalRegion(); } /* Dereference the Process */ @@ -385,10 +387,11 @@ PspRunCreateThreadNotifyRoutines(Thread, FALSE); /* Lock the Process before we modify its thread entries */ - PsLockProcess(CurrentProcess, FALSE); - - /* Wake up the thread so we don't deadlock on PsLockProcess */ - KeForceResumeThread(&Thread->Tcb); + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&CurrentProcess->ProcessLock); + + /* Wake up the thread so we don't deadlock on lock */ + //KeForceResumeThread(&Thread->Tcb); /* Decrease the active thread count, and check if it's 0 */ if (!(--CurrentProcess->ActiveThreads)) @@ -425,7 +428,8 @@ } /* Unlock the Process */ - PsUnlockProcess(CurrentProcess); + ExReleasePushLockExclusive(&CurrentProcess->ProcessLock); + KeLeaveCriticalRegion(); /* Check if the process has a debug port and if this is a user thread */ if ((CurrentProcess->DebugPort) && !(Thread->SystemThread)) Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Jul 20 21:44:30 2006 @@ -25,87 +25,7 @@ LIST_ENTRY PsActiveProcessHead; KGUARDED_MUTEX PspActiveProcessMutex; -#if 1 -LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; -#define LockEvent Spare0[0] -#define LockCount Spare0[1] -#define LockOwner Spare0[2] -NTSTATUS -NTAPI -PsLockProcess(PEPROCESS Process, BOOLEAN Timeout) -{ - ULONG Attempts = 0; - PKTHREAD PrevLockOwner; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - PLARGE_INTEGER Delay = (Timeout ? &PsLockTimeout : NULL); - PKTHREAD CallingThread = KeGetCurrentThread(); - - PAGED_CODE(); - - KeEnterCriticalRegion(); - - for(;;) - { - PrevLockOwner = (PKTHREAD)InterlockedCompareExchangePointer( - &Process->LockOwner, CallingThread, NULL); - if(PrevLockOwner == NULL || PrevLockOwner == CallingThread) - { - /* we got the lock or already locked it */ - if(InterlockedIncrementUL(&Process->LockCount) == 1) - { - KeClearEvent(Process->LockEvent); - } - - return STATUS_SUCCESS; - } - else - { - if(++Attempts > 2) - { - Status = KeWaitForSingleObject(Process->LockEvent, - Executive, - KernelMode, - FALSE, - Delay); - if(!NT_SUCCESS(Status) || Status == STATUS_TIMEOUT) - { -#ifndef NDEBUG - if(Status == STATUS_TIMEOUT) - { - DPRINT1("PsLockProcess(0x%x) timed out!\n", Process); - } -#endif - KeLeaveCriticalRegion(); - break; - } - } - else - { - KeDelayExecutionThread(KernelMode, FALSE, &ShortPsLockDelay); - } - } - } - - return Status; -} - -VOID -NTAPI -PsUnlockProcess(PEPROCESS Process) -{ - PAGED_CODE(); - - ASSERT(Process->LockOwner == KeGetCurrentThread()); - - if(InterlockedDecrementUL(&Process->LockCount) == 0) - { - (void)InterlockedExchangePointer(&Process->LockOwner, NULL); - KeSetEvent(Process->LockEvent, IO_NO_INCREMENT, FALSE); - } - - KeLeaveCriticalRegion(); -} -#endif +LARGE_INTEGER ShortPsLockDelay; /* PRIVATE FUNCTIONS *********************************************************/ @@ -135,7 +55,8 @@ PAGED_CODE(); /* Lock the process */ - PsLockProcess(Process, FALSE); + KeEnterCriticalRegion(); + ExAcquirePushLockShared(&Process->ProcessLock); /* Check if we're already starting somewhere */ if (Thread) @@ -162,7 +83,8 @@ } /* Unlock the process */ - PsUnlockProcess(Process); + ExReleasePushLockShared(&Process->ProcessLock); + KeLeaveCriticalRegion(); /* Check if we had a starting thread, and dereference it */ if (Thread) ObDereferenceObject(Thread); @@ -422,14 +344,6 @@ /* Save the pointer to the section object */ Process->SectionObject = SectionObject; - /* Setup the Lock Event */ -#if 1 - Process->LockEvent = ExAllocatePoolWithTag(PagedPool, - sizeof(KEVENT), - TAG('P', 's', 'L', 'k')); - KeInitializeEvent(Process->LockEvent, SynchronizationEvent, FALSE); -#endif - /* Set default exit code */ Process->ExitStatus = STATUS_TIMEOUT; Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Thu Jul 20 21:44:30 2006 @@ -138,7 +138,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; ShortPsLockDelay.QuadPart = -100LL; - PsLockTimeout.QuadPart = -10000000LL; /* one second */ + /* * Register the process object type */ Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Jul 20 21:44:30 2006 @@ -551,30 +551,14 @@ NULL); if (!NT_SUCCESS(Status)) break; - /* Lock the process to be thread-safe! */ - Status = PsLockProcess(Process, FALSE); - if(NT_SUCCESS(Status)) - { - /* Make sure we don't already have a port */ - if (!Process->ExceptionPort) - { - /* Save the exception port */ - Process->ExceptionPort = ExceptionPort; - } - else - { - /* We already have one, fail */ - ObDereferenceObject(ExceptionPort); - Status = STATUS_PORT_ALREADY_SET; - } - - /* Unlock the process */ - PsUnlockProcess(Process); - } - else - { - /* Locking failed, dereference the port */ + /* Change the pointer */ + if (InterlockedCompareExchangePointer(&Process->ExceptionPort, + ExceptionPort, + NULL)) + { + /* We already had one, fail */ ObDereferenceObject(ExceptionPort); + Status = STATUS_PORT_ALREADY_SET; } break; @@ -644,7 +628,7 @@ } /* FIXME - update the session id for the process token */ - Status = PsLockProcess(Process, FALSE); + //Status = PsLockProcess(Process, FALSE); if (!NT_SUCCESS(Status)) break; /* Write the session ID in the EPROCESS */ @@ -677,7 +661,7 @@ } /* Unlock the process */ - PsUnlockProcess(Process); + //PsUnlockProcess(Process); break; /* Priority class: HACK! */

1 0

[mc] 23196: Too many changes to list here! just see screenshot: http://img352.imageshack.us/my.php?image=socloseta2.png (not pictured: artifacts due to sometimes-broken handling of window region refreshing) The graphics, mouse and keyboard are virtually done. Mouse wheel works. Still some bugs in the handling of binary raster operation codes, but less than before. Fixed polyline. Fixed all cursor issues. Fully supports text output. Fixed a resource leak where all clipping region were slowly leak
by mc＠svn.reactos.org 20 Jul '06

20 Jul '06

Author: mc Date: Thu Jul 20 21:11:00 2006 New Revision: 23196 URL: http://svn.reactos.org/svn/reactos?rev=23196&view=rev Log: Too many changes to list here! just see screenshot: http://img352.imageshack.us/my.php?image=socloseta2.png (not pictured: artifacts due to sometimes-broken handling of window region refreshing) The graphics, mouse and keyboard are virtually done. Mouse wheel works. Still some bugs in the handling of binary raster operation codes, but less than before. Fixed polyline. Fixed all cursor issues. Fully supports text output. Fixed a resource leak where all clipping region were slowly leaked. Now closes cleanly on server disconnect Moving on to more fun things! Many thanks to filip & WaxDragon for the code of the previous Win32 port, it was misleading at times but very useful overall! Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h trunk/reactos/base/applications/tsclient/rdesktop/bitmap.c trunk/reactos/base/applications/tsclient/rdesktop/orders.c trunk/reactos/base/applications/tsclient/rdesktop/proto.h trunk/reactos/base/applications/tsclient/rdesktop/rdesktop-core.vcproj trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h trunk/reactos/base/applications/tsclient/rdesktop/rdp.c trunk/reactos/base/applications/tsclient/rdesktop/secure.c trunk/reactos/base/applications/tsclient/rdesktop/types.h Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp (original) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.cpp Thu Jul 20 21:11:00 2006 @@ -1,7 +1,29 @@ #include "stdafx.h" + +#include <zmouse.h> #include "rdesktop/rdesktop.h" #include "rdesktop/proto.h" + +template<class T, class U> T aligndown(const T& X, const U& align) +{ + return X & ~(T(align) - 1); +} + +template<class T, class U> T alignup(const T& X, const U& align) +{ + return aligndown(X + (align - 1), align); +} + +#ifdef _WIN64 +#else + +#undef InterlockedExchangePointer + +#define InterlockedExchangePointer(Target, Value) \ + LongToPtr(InterlockedExchange((LONG volatile *)(Target), PtrToLong(Value))) + +#endif extern "C" { @@ -83,7 +105,7 @@ /* malloc; exit if out of memory */ void * - xmalloc(int size) + xmalloc(size_t size) { void *mem = malloc(size); if (mem == NULL) @@ -98,7 +120,7 @@ char * xstrdup(const char *s) { - char *mem = strdup(s); + char *mem = _strdup(s); if (mem == NULL) { perror("strdup"); @@ -109,7 +131,7 @@ /* realloc; exit if out of memory */ void * - xrealloc(void *oldmem, int size) + xrealloc(void *oldmem, size_t size) { void *mem; @@ -299,7 +321,9 @@ // Globals are totally teh evil, but cut me some slack here HWND hwnd; HBITMAP hbmBuffer; + PVOID pBuffer; HDC hdcBuffer; + UINT wmZMouseWheel; #if 0 // NOTE: we don't really need these with rdesktop.c out of the picture @@ -343,33 +367,120 @@ void ui_move_pointer(RDPCLIENT * This, int x, int y) { - // TODO + POINT point; + point.x = x; + point.y = y; + + ClientToScreen(hwnd, &point); + SetCursorPos(point.x, point.y); + } + + HCURSOR hcursor; + + struct Bitmap + { + int width; + int height; + uint8 data[1]; + }; + + static + HBITMAP + win32_create_dib(LONG width, LONG height, WORD bitcount, const BYTE * data) + { + struct b_ + { + BITMAPINFO bmi; + RGBQUAD colormap[256 - ARRAYSIZE(RTL_FIELD_TYPE(BITMAPINFO, bmiColors))]; + } + b; + + b.bmi.bmiHeader.biSize = sizeof(b.bmi.bmiHeader); + b.bmi.bmiHeader.biWidth = width; + b.bmi.bmiHeader.biHeight = height; + b.bmi.bmiHeader.biPlanes = 1; + b.bmi.bmiHeader.biBitCount = bitcount; + b.bmi.bmiHeader.biCompression = BI_RGB; + b.bmi.bmiHeader.biSizeImage = 0; + b.bmi.bmiHeader.biXPelsPerMeter = 0; + b.bmi.bmiHeader.biYPelsPerMeter = 0; + + if(bitcount > 8) + { + b.bmi.bmiHeader.biClrUsed = 0; + b.bmi.bmiHeader.biClrImportant = 0; + } + else + { + b.bmi.bmiHeader.biClrUsed = 2 << bitcount; + b.bmi.bmiHeader.biClrImportant = 2 << bitcount; + + // TODO: palette + } + + HBITMAP hbm = CreateDIBitmap(hdcBuffer, &b.bmi.bmiHeader, CBM_INIT, data, &b.bmi, DIB_RGB_COLORS); + + if(hbm == NULL) + error("CreateDIBitmap %dx%dx%d failed\n", width, height, bitcount); + + return hbm; + } + + static + uint8 * + win32_convert_scanlines(int width, int height, int bitcount, int fromalign, int toalign, const uint8 * data, uint8 ** buffer) + { + assert(width > 0); + assert(height); + assert(bitcount && bitcount <= 32); + assert(fromalign <= toalign); + assert(data); + assert(buffer); + + bool flipped = height < 0; + + if(flipped) + height = - height; + + int bytesperrow = alignup(width * bitcount, 8) / 8; + int fromstride = alignup(bytesperrow, fromalign); + int tostride = alignup(bytesperrow, toalign); + assert(fromstride <= tostride); + + int datasize = tostride * height; + + uint8 * dibits = new(xmalloc(datasize)) uint8; + + const uint8 * src = data; + uint8 * dest = dibits; + + const int pad = tostride - fromstride; + + assert(pad < 4); + __assume(pad < 4); + + if(flipped) + { + dest += (height - 1) * tostride; + tostride = - tostride; + } + + for(int i = 0; i < height; ++ i) + { + memcpy(dest, src, fromstride); + memset(dest + fromstride, 0, pad); + src += fromstride; + dest += tostride; + } + + *buffer = dibits; + return dibits; } HBITMAP ui_create_bitmap(RDPCLIENT * This, int width, int height, uint8 * data) { - void * pBits; - - BITMAPINFOHEADER bmih; - BITMAPINFO bmi; - - bmih.biSize = sizeof(bmih); - bmih.biWidth = width; - bmih.biHeight = - height; - bmih.biPlanes = 1; - bmih.biBitCount = This->server_depth; - bmih.biCompression = BI_RGB; - bmih.biSizeImage = 0; - bmih.biXPelsPerMeter = 0; - bmih.biYPelsPerMeter = 0; - bmih.biClrUsed = 0; - bmih.biClrImportant = 0; - - bmi.bmiHeader = bmih; - memset(bmi.bmiColors, 0, sizeof(bmi.bmiColors)); - - return CreateDIBitmap(hdcBuffer, &bmih, CBM_INIT, data, &bmi, DIB_RGB_COLORS); + return win32_create_dib(width, height, This->server_depth, data); } void @@ -381,44 +492,105 @@ HGLYPH ui_create_glyph(RDPCLIENT * This, int width, int height, const uint8 * data) { - // TODO: create 2bpp mask - return 0; + uint8 * databuf = NULL; + uint8 * databits = win32_convert_scanlines(width, height, 1, 1, 2, data, &databuf); + + HBITMAP hbm = CreateBitmap(width, height, 1, 1, databits); + + if(databuf) + xfree(databuf); + + const uint8 * p = data; + int stride = alignup(alignup(width, 8) / 8, 1); + + printf("glyph %p\n", hbm); + + for(int i = 0; i < height; ++ i, p += stride) + { + for(int j = 0; j < width; ++ j) + { + int B = p[j / 8]; + int b = 8 - j % 8 - 1; + + if(B & (1 << b)) + fputs("##", stdout); + else + fputs("..", stdout); + } + + fputc('\n', stdout); + } + + fputc('\n', stdout); + + return hbm; } void ui_destroy_glyph(RDPCLIENT * This, HGLYPH glyph) { - // TODO + DeleteObject(glyph); } HCURSOR ui_create_cursor(RDPCLIENT * This, unsigned int x, unsigned int y, int width, int height, uint8 * andmask, uint8 * xormask) { - return CreateCursor(NULL, x, y, width, height, andmask, xormask); + uint8 * andbuf = NULL; + uint8 * xorbuf = NULL; + + uint8 * andbits = win32_convert_scanlines(width, - height, 1, 2, 4, andmask, &andbuf); + uint8 * xorbits = win32_convert_scanlines(width, height, 24, 2, 4, xormask, &xorbuf); + + HBITMAP hbmMask = CreateBitmap(width, height, 1, 1, andbits); + HBITMAP hbmColor = win32_create_dib(width, height, 24, xorbits); + + ICONINFO iconinfo; + iconinfo.fIcon = FALSE; + iconinfo.xHotspot = x; + iconinfo.yHotspot = y; + iconinfo.hbmMask = hbmMask; + iconinfo.hbmColor = hbmColor; + + HICON icon = CreateIconIndirect(&iconinfo); + + if(icon == NULL) + error("CreateIconIndirect %dx%d failed\n", width, height); + + if(andbuf) + xfree(andbuf); + + if(xorbuf) + xfree(xorbuf); + + DeleteObject(hbmMask); + DeleteObject(hbmColor); + + return icon; } void ui_set_cursor(RDPCLIENT * This, HCURSOR cursor) { - // TODO + hcursor = cursor; } void ui_destroy_cursor(RDPCLIENT * This, HCURSOR cursor) { - DestroyCursor(cursor); + DestroyIcon(cursor); } void ui_set_null_cursor(RDPCLIENT * This) { - // TODO + hcursor = NULL; } HCOLOURMAP ui_create_colourmap(RDPCLIENT * This, COLOURMAP * colours) { + // TODO // TODO: kill HCOLOURMAP/COLOURMAP, use HPALETTE/LOGPALETTE return 0; } @@ -442,9 +614,12 @@ { rcClip.left = x; rcClip.top = y; - rcClip.right = x + cx - 1; - rcClip.bottom = y + cy - 1; - SelectObject(hdcBuffer, CreateRectRgnIndirect(&rcClip)); + rcClip.right = x + cx + 1; + rcClip.bottom = y + cy + 1; + + HRGN hrgn = CreateRectRgnIndirect(&rcClip); + SelectClipRgn(hdcBuffer, hrgn); + DeleteObject(hrgn); } void @@ -452,9 +627,9 @@ { rcClip.left = 0; rcClip.top = 0; - rcClip.right = This->width; - rcClip.bottom = This->height; - SelectObject(hdcBuffer, CreateRectRgnIndirect(&rcClip)); + rcClip.right = This->width + 1; + rcClip.bottom = This->height + 1; + SelectClipRgn(hdcBuffer, NULL); } void @@ -469,8 +644,17 @@ { RECT rcDamage; IntersectRect(&rcDamage, lprc, &rcClip); + +#if 0 + HDC hdc = GetDC(hwnd); + SelectObject(hdc, GetStockObject(NULL_PEN)); + SelectObject(hdc, CreateSolidBrush(RGB(255, 0, 0))); + Rectangle(hdc, rcDamage.left, rcDamage.top, rcDamage.right + 1, rcDamage.bottom + 1); + ReleaseDC(hwnd, hdc); + Sleep(200); +#endif + InvalidateRect(hwnd, &rcDamage, FALSE); - //Sleep(100); } static @@ -522,24 +706,25 @@ InvalidateRgn(hwnd, NULL, FALSE); } - /* - TODO: all of the following could probably be implemented this way: - - perform operation on off-screen buffer - - invalidate affected region of the window - */ void ui_paint_bitmap(RDPCLIENT * This, int x, int y, int cx, int cy, int width, int height, uint8 * data) { - BITMAPINFO bmi; - ZeroMemory(&bmi, sizeof(bmi)); - - bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); - bmi.bmiHeader.biWidth = width; - bmi.bmiHeader.biHeight = - height; - bmi.bmiHeader.biPlanes = 1; - bmi.bmiHeader.biBitCount = This->server_depth; - - StretchDIBits(hdcBuffer, x, y, cx, cy, 0, 0, width, height, data, &bmi, DIB_RGB_COLORS, SRCCOPY); + GdiFlush(); + + int Bpp = This->server_depth / 8; + int fromstride = alignup(width * Bpp, 4); + int tostride = alignup(This->width * Bpp, 4); + int sizex = cx * Bpp; + + const uint8 * src = data; + uint8 * dst = (uint8 *)pBuffer + (This->height - y - cy) * tostride + x * Bpp; + + for(int i = 0; i < cy; ++ i) + { + memcpy(dst, src, sizex); + src += fromstride; + dst += tostride; + } win32_repaint_area(This, x, y, cx, cy); } @@ -548,19 +733,57 @@ ui_destblt(RDPCLIENT * This, uint8 opcode, /* dest */ int x, int y, int cx, int cy) { - RECT rc; - rc.left = x; - rc.top = y; - rc.right = x + cx; - rc.bottom = y + cy; - - int prev = SetROP2(hdcBuffer, MAKELONG(0, opcode | opcode << 4)); - - FillRect(hdcBuffer, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); // use Rectangle instead? - - SetROP2(hdcBuffer, prev); + HGDIOBJ holdbrush = SelectObject(hdcBuffer, GetStockObject(BLACK_BRUSH)); + PatBlt(hdcBuffer, x, y, cx, cy, MAKELONG(0, opcode)); + SelectObject(hdcBuffer, holdbrush); win32_repaint_area(This, x, y, cx, cy); + } + + static + HBRUSH + win32_create_brush(RDPCLIENT * This, BRUSH * brush, COLORREF fgcolour) + { + switch(brush->style) + { + case BS_SOLID: + case BS_NULL: + case BS_HATCHED: + case BS_PATTERN: + case BS_PATTERN8X8: + break; + + default: + return NULL; + } + + switch(brush->style) + { + case BS_SOLID: + return CreateSolidBrush(fgcolour); + + case BS_HATCHED: + return CreateHatchBrush(brush->pattern[0], fgcolour); + + case BS_NULL: + return (HBRUSH)GetStockObject(NULL_BRUSH); + + case BS_PATTERN: + case BS_PATTERN8X8: + { + uint16 pattern[8]; + + for(size_t i = 0; i < 8; ++ i) + pattern[7 - i] = brush->pattern[i]; + + HBITMAP hpattern = CreateBitmap(8, 8, 1, 1, pattern); + HBRUSH hbr = CreatePatternBrush(hpattern); + DeleteObject(hpattern); + return hbr; + } + + DEFAULT_UNREACHABLE; + } } void @@ -568,7 +791,22 @@ /* dest */ int x, int y, int cx, int cy, /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { - // TODO + HBRUSH hbr = win32_create_brush(This, brush, fgcolour); + + int oldbkcolor = SetBkColor(hdcBuffer, bgcolour); + int oldtextcolor = SetTextColor(hdcBuffer, fgcolour); + POINT oldbrushorg; SetBrushOrgEx(hdcBuffer, brush->xorigin, brush->yorigin, &oldbrushorg); + HGDIOBJ holdbrush = SelectObject(hdcBuffer, hbr); + + PatBlt(hdcBuffer, x, y, cx, cy, MAKELONG(0, opcode)); + + SelectObject(hdcBuffer, holdbrush); + SetBrushOrgEx(hdcBuffer, oldbrushorg.x, oldbrushorg.y, NULL); + SetTextColor(hdcBuffer, oldtextcolor); + SetBkColor(hdcBuffer, oldbkcolor); + + DeleteObject(hbr); + win32_repaint_area(This, x, y, cx, cy); } @@ -577,7 +815,7 @@ /* dest */ int x, int y, int cx, int cy, /* src */ int srcx, int srcy) { - BitBlt(hdcBuffer, x, y, cx, cy, hdcBuffer, srcx, srcy, MAKELONG(0, opcode | opcode << 4)); + BitBlt(hdcBuffer, x, y, cx, cy, hdcBuffer, srcx, srcy, MAKELONG(0, opcode)); win32_repaint_area(This, x, y, cx, cy); } @@ -589,9 +827,9 @@ HDC hdcSrc = CreateCompatibleDC(hdcBuffer); HGDIOBJ hOld = SelectObject(hdcSrc, src); - BitBlt(hdcBuffer, x, y, cx, cy, hdcSrc, srcx, srcy, MAKELONG(0, opcode | opcode << 4)); - - DeleteObject(hOld); + BitBlt(hdcBuffer, x, y, cx, cy, hdcSrc, srcx, srcy, MAKELONG(0, opcode)); + + SelectObject(hdcSrc, hOld); DeleteDC(hdcSrc); win32_repaint_area(This, x, y, cx, cy); @@ -603,7 +841,18 @@ /* src */ HBITMAP src, int srcx, int srcy, /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { - // TODO + HDC hdcSrc = CreateCompatibleDC(hdcBuffer); + HGDIOBJ hOld = SelectObject(hdcSrc, src); + + //SELECT_BRUSH(brush, bgcolour, fgcolour); + + BitBlt(hdcBuffer, x, y, cx, cy, hdcSrc, srcx, srcy, MAKELONG(0, opcode)); + + //RESET_BRUSH(); + + SelectObject(hdcSrc, hOld); + DeleteDC(hdcSrc); + win32_repaint_area(This, x, y, cx, cy); } @@ -613,20 +862,18 @@ /* pen */ PEN * pen) { HPEN hpen = CreatePen(pen->style, pen->width, pen->colour); - HGDIOBJ hOld = SelectObject(hdcBuffer, hpen); - - int prevROP = SetROP2(hdcBuffer, opcode); - - POINT prevPos; - MoveToEx(hdcBuffer, startx, starty, &prevPos); + + int oldROP2 = SetROP2(hdcBuffer, opcode); + HGDIOBJ holdpen = SelectObject(hdcBuffer, hpen); + POINT oldpos; MoveToEx(hdcBuffer, startx, starty, &oldpos); LineTo(hdcBuffer, endx, endy); - MoveToEx(hdcBuffer, prevPos.x, prevPos.y, NULL); - - SetROP2(hdcBuffer, prevROP); - - SelectObject(hdcBuffer, hOld); + MoveToEx(hdcBuffer, oldpos.x, oldpos.y, NULL); + SelectObject(hdcBuffer, holdpen); + SetROP2(hdcBuffer, oldROP2); + + DeleteObject(hpen); RECT rcDamage; @@ -661,17 +908,19 @@ /* dest */ int x, int y, int cx, int cy, /* brush */ int colour) { - RECT rc; - rc.left = x; - rc.top = y; - rc.right = x + cx; - rc.bottom = y + cy; - HBRUSH hbr = CreateSolidBrush(colour); - FillRect(hdcBuffer, &rc, hbr); // use Rectangle instead? + + HGDIOBJ holdbrush = SelectObject(hdcBuffer, hbr); + HGDIOBJ holdpen = SelectObject(hdcBuffer, GetStockObject(NULL_PEN)); + + Rectangle(hdcBuffer, x, y, x + cx + 1, y + cy + 1); + + SelectObject(hdcBuffer, holdpen); + SelectObject(hdcBuffer, holdbrush); + DeleteObject(hbr); - win32_repaint_rect(This, &rc); + win32_repaint_area(This, x, y, cx, cy); } void @@ -680,13 +929,19 @@ /* dest */ POINT * point, int npoints, /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { - // TODO: create brush, set fg&bg - - int oldRop = SetROP2(hdcBuffer, opcode); + HBRUSH hbr = win32_create_brush(This, brush, fgcolour); + + int oldbkcolor = SetBkColor(hdcBuffer, bgcolour); + int oldtextcolor = SetTextColor(hdcBuffer, fgcolour); int oldFillMode = SetPolyFillMode(hdcBuffer, fillmode); + HGDIOBJ holdbrush = SelectObject(hdcBuffer, hbr); + Polygon(hdcBuffer, point, npoints); + + SelectObject(hdcBuffer, holdbrush); SetPolyFillMode(hdcBuffer, oldFillMode); - SetROP2(hdcBuffer, oldRop); + SetTextColor(hdcBuffer, oldtextcolor); + SetBkColor(hdcBuffer, oldbkcolor); win32_repaint_poly(This, point, npoints, 0); } @@ -696,12 +951,26 @@ /* dest */ POINT * points, int npoints, /* pen */ PEN * pen) { + POINT last = points[0]; + + for(int i = 1; i < npoints; ++ i) + { + points[i].x += last.x; + points[i].y += last.y; + last = points[i]; + } + HPEN hpen = CreatePen(pen->style, pen->width, pen->colour); - HGDIOBJ hOld = SelectObject(hdcBuffer, hpen); - int oldRop = SetROP2(hdcBuffer, opcode); + + int oldROP2 = SetROP2(hdcBuffer, opcode); + HGDIOBJ holdpen = SelectObject(hdcBuffer, hpen); + Polyline(hdcBuffer, points, npoints); - SetROP2(hdcBuffer, oldRop); - SelectObject(hdcBuffer, hOld); + + SelectObject(hdcBuffer, holdpen); + SetROP2(hdcBuffer, oldROP2); + + DeleteObject(hpen); win32_repaint_poly(This, points, npoints, pen->width); } @@ -712,13 +981,30 @@ /* dest */ int x, int y, int cx, int cy, /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { -#if 0 switch(fillmode) { - case 0: // outline // HOW? HOW? WITH WHAT PEN? - case 1: // filled // TODO - } -#endif + case 0: // outline + { + HPEN hpen = CreatePen(PS_SOLID, 1, fgcolour); + + int oldROP2 = SetROP2(hdcBuffer, opcode); + HGDIOBJ holdPen = SelectObject(hdcBuffer, hpen); + + Ellipse(hdcBuffer, x, y, x + cx, y + cy); + + SelectObject(hdcBuffer, holdPen); + SetROP2(hdcBuffer, oldROP2); + + DeleteObject(hpen); + } + + break; + + case 1: + // TODO + break; + } + win32_repaint_area(This, x, y, cx, cy); } @@ -728,8 +1014,81 @@ /* src */ HGLYPH glyph, int srcx, int srcy, int bgcolour, int fgcolour) { - // TODO!!! - } + HBITMAP hbmGlyph = (HBITMAP)glyph; + HDC hdcGlyph = CreateCompatibleDC(hdcBuffer); + HGDIOBJ hOld = SelectObject(hdcGlyph, hbmGlyph); + + switch(mixmode) + { + case MIX_TRANSPARENT: + { + /* + ROP is DSPDxax: + - where the glyph (S) is white, D is set to the foreground color (P) + - where the glyph (S) is black, D is left untouched + + This paints a transparent glyph in the specified color + */ + HBRUSH hbr = CreateSolidBrush(fgcolour); + HGDIOBJ holdbrush = SelectObject(hdcBuffer, hbr); + BitBlt(hdcBuffer, x, y, cx, cy, hdcGlyph, srcx, srcy, MAKELONG(0, 0xe2)); + SelectObject(hdcBuffer, holdbrush); + DeleteObject(hbr); + } + + break; + + case MIX_OPAQUE: + { + /* Curiously, glyphs are inverted (white-on-black) */ + int oldbkcolor = SetBkColor(hdcBuffer, fgcolour); + int oldtextcolor = SetTextColor(hdcBuffer, bgcolour); + BitBlt(hdcBuffer, x, y, cx, cy, hdcGlyph, srcx, srcy, SRCCOPY); + SetTextColor(hdcBuffer, oldtextcolor); + SetBkColor(hdcBuffer, oldbkcolor); + } + + break; + } + + SelectObject(hdcGlyph, hOld); + DeleteDC(hdcGlyph); + + win32_repaint_area(This, x, y, cx, cy); + } + +#define DO_GLYPH(ttext,idx) \ +{\ + glyph = cache_get_font (This, font, ttext[idx]);\ + if (!(flags & TEXT2_IMPLICIT_X))\ + {\ + xyoffset = ttext[++idx];\ + if ((xyoffset & 0x80))\ + {\ + if (flags & TEXT2_VERTICAL)\ + y += ttext[idx+1] | (ttext[idx+2] << 8);\ + else\ + x += ttext[idx+1] | (ttext[idx+2] << 8);\ + idx += 2;\ + }\ + else\ + {\ + if (flags & TEXT2_VERTICAL)\ + y += xyoffset;\ + else\ + x += xyoffset;\ + }\ + }\ + if (glyph != NULL)\ + {\ + ui_draw_glyph (This, mixmode, x + (short) glyph->offset,\ + y + (short) glyph->baseline,\ + glyph->width, glyph->height,\ + glyph->pixmap, 0, 0, bgcolour, fgcolour);\ + if (flags & TEXT2_IMPLICIT_X)\ + x += glyph->width;\ + }\ +} void ui_draw_text(RDPCLIENT * This, uint8 font, uint8 flags, uint8 opcode, int mixmode, int x, int y, @@ -737,19 +1096,106 @@ int boxx, int boxy, int boxcx, int boxcy, BRUSH * brush, int bgcolour, int fgcolour, uint8 * text, uint8 length) { - // TODO!!! + FONTGLYPH * glyph; + int i, j, xyoffset; + DATABLOB *entry; + + HBRUSH hbr = CreateSolidBrush(bgcolour); + HGDIOBJ holdbrush = SelectObject(hdcBuffer, hbr); + HGDIOBJ holdpen = SelectObject(hdcBuffer, GetStockObject(NULL_PEN)); + + if (boxcx > 1) + Rectangle(hdcBuffer, boxx, boxy, boxx + boxcx + 1, boxy + boxcy + 1); + else if (mixmode == MIX_OPAQUE) + Rectangle(hdcBuffer, clipx, clipy, clipx + clipcx + 1, clipy + clipcy + 1); + + SelectObject(hdcBuffer, holdpen); + SelectObject(hdcBuffer, holdbrush); + + DeleteObject(hbr); + + if(boxcx > 1) + win32_repaint_area(This, boxx, boxy, boxcx, boxcy); + else + win32_repaint_area(This, clipx, clipy, clipcx, clipcy); + + /* Paint text, character by character */ + for (i = 0; i < length;) + { + switch (text[i]) + { + case 0xff: + /* At least two bytes needs to follow */ + if (i + 3 > length) + { + warning("Skipping short 0xff command:"); + for (j = 0; j < length; j++) + fprintf(stderr, "%02x ", text[j]); + fprintf(stderr, "\n"); + i = length = 0; + break; + } + cache_put_text(This, text[i + 1], text, text[i + 2]); + i += 3; + length -= i; + /* this will move pointer from start to first character after FF command */ + text = &(text[i]); + i = 0; + break; + + case 0xfe: + /* At least one byte needs to follow */ + if (i + 2 > length) + { + warning("Skipping short 0xfe command:"); + for (j = 0; j < length; j++) + fprintf(stderr, "%02x ", text[j]); + fprintf(stderr, "\n"); + i = length = 0; + break; + } + entry = cache_get_text(This, text[i + 1]); + if (entry->data != NULL) + { + if ((((uint8 *) (entry->data))[1] == 0) + && (!(flags & TEXT2_IMPLICIT_X)) && (i + 2 < length)) + { + if (flags & TEXT2_VERTICAL) + y += text[i + 2]; + else + x += text[i + 2]; + } + for (j = 0; j < entry->size; j++) + DO_GLYPH(((uint8 *) (entry->data)), j); + } + if (i + 2 < length) + i += 3; + else + i += 2; + length -= i; + /* this will move pointer from start to first character after FE command */ + text = &(text[i]); + i = 0; + break; + + default: + DO_GLYPH(text, i); + i++; + break; + } + } } void ui_desktop_save(RDPCLIENT * This, uint32 offset, int x, int y, int cx, int cy) { - // TODO (use GetDIBits) + // TODO } void ui_desktop_restore(RDPCLIENT * This, uint32 offset, int x, int y, int cx, int cy) { - // TODO (use SetDIBitsToDevice) + // TODO win32_repaint_whole(This); } @@ -765,6 +1211,24 @@ // TODO? use a mutex to arbitrate access to the off-screen buffer? } }; + +static +void +mstsc_mousewheel(RDPCLIENT * This, int value, LPARAM lparam) +{ + uint16 button; + + if(value < 0) + button = MOUSE_FLAG_BUTTON5; + else + button = MOUSE_FLAG_BUTTON4; + + if(value < 0) + value = - value; + + for(int click = 0; click < value; click += WHEEL_DELTA) + rdp_send_input(This, GetTickCount(), RDP_INPUT_MOUSE, button | MOUSE_FLAG_DOWN, LOWORD(lparam), HIWORD(lparam)); +} static LRESULT @@ -783,64 +1247,132 @@ switch(uMsg) { + case WM_CLOSE: + DestroyWindow(hwnd); + break; + + // FIXME: temporary + case WM_DESTROY: + PostQuitMessage(0); + break; + + /* Initialization */ case WM_CREATE: This = static_cast<RDPCLIENT *>(reinterpret_cast<LPCREATESTRUCT>(lparam)->lpCreateParams); SetWindowLongPtr(hwnd, GWLP_USERDATA, PtrToLong(This)); break; + /* Painting */ + case WM_PRINTCLIENT: + if(wparam == 0) + break; + case WM_PAINT: - // Obscenely simple code for now... - { - PAINTSTRUCT ps; - HDC hdc = BeginPaint(hwnd, &ps); - - BitBlt - ( - hdc, - ps.rcPaint.left, - ps.rcPaint.top, - ps.rcPaint.right - ps.rcPaint.left, - ps.rcPaint.bottom - ps.rcPaint.top, - hdcBuffer, - ps.rcPaint.left, - ps.rcPaint.top, - SRCCOPY - ); - - EndPaint(hwnd, &ps); + { + HDC hdc = (HDC)wparam; + + // A DC was provided: print the whole client area into it + if(hdc) + { + RECT rc; + GetClientRect(hwnd, &rc); + BitBlt(hdc, 0, 0, rc.right, rc.bottom, hdcBuffer, 0, 0, SRCCOPY); + } + // Otherwise, we're refreshing to screen + else + { + PAINTSTRUCT ps; + hdc = BeginPaint(hwnd, &ps); + + BitBlt + ( + hdc, + ps.rcPaint.left, + ps.rcPaint.top, + ps.rcPaint.right - ps.rcPaint.left, + ps.rcPaint.bottom - ps.rcPaint.top, + hdcBuffer, + ps.rcPaint.left, + ps.rcPaint.top, + SRCCOPY + ); + + EndPaint(hwnd, &ps); + } } break; + /* Keyboard stuff */ case WM_SYSKEYDOWN: case WM_KEYDOWN: - rdp_send_input - ( - This, - GetMessageTime(), - RDP_INPUT_SCANCODE, - RDP_KEYPRESS | (lparam & 0x1000000 ? KBD_FLAG_EXT : 0), - LOBYTE(HIWORD(lparam)), - 0 - ); - + rdp_send_input(This, GetMessageTime(), RDP_INPUT_SCANCODE, RDP_KEYPRESS | (lparam & 0x1000000 ? KBD_FLAG_EXT : 0), LOBYTE(HIWORD(lparam)), 0); break; case WM_SYSKEYUP: case WM_KEYUP: - rdp_send_input - ( - This, - GetMessageTime(), - RDP_INPUT_SCANCODE, - RDP_KEYRELEASE | (lparam & 0x1000000 ? KBD_FLAG_EXT : 0), - LOBYTE(HIWORD(lparam)), - 0 - ); - + rdp_send_input(This, GetMessageTime(), RDP_INPUT_SCANCODE, RDP_KEYRELEASE | (lparam & 0x1000000 ? KBD_FLAG_EXT : 0), LOBYTE(HIWORD(lparam)), 0); break; + /* Mouse stuff */ + // Cursor shape + case WM_SETCURSOR: + if(LOWORD(lparam) == HTCLIENT) + { + SetCursor(hcursor); + return TRUE; + } + + break; + + // Movement + case WM_MOUSEMOVE: + if(This->sendmotion || wparam & (MK_LBUTTON | MK_RBUTTON | MK_MBUTTON | MK_XBUTTON1 | MK_XBUTTON2)) + rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, LOWORD(lparam), HIWORD(lparam)); + + break; + + // Buttons + // TODO: X buttons + case WM_LBUTTONDOWN: + rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON1 | MOUSE_FLAG_DOWN, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_RBUTTONDOWN: + rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON2 | MOUSE_FLAG_DOWN, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_MBUTTONDOWN: + rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON3 | MOUSE_FLAG_DOWN, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_LBUTTONUP: + rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON1, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_RBUTTONUP: + rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON2, LOWORD(lparam), HIWORD(lparam)); + break; + + case WM_MBUTTONUP: + rdp_send_input(This, GetMessageTime(), RDP_INPUT_MOUSE, MOUSE_FLAG_BUTTON3, LOWORD(lparam), HIWORD(lparam)); + break; + + // Wheel + case WM_MOUSEWHEEL: + mstsc_mousewheel(This, (SHORT)HIWORD(wparam), lparam); + break; + default: + /* Registered messages */ + // Z-Mouse wheel support - you know, just in case + if(uMsg == wmZMouseWheel) + { + mstsc_mousewheel(This, (int)wparam, lparam); + break; + } + + /* Unhandled messages */ return DefWindowProc(hwnd, uMsg, wparam, lparam); } @@ -857,14 +1389,15 @@ { RDPCLIENT * This = static_cast<RDPCLIENT *>(lpArgument); - strcpy(This->username, "Hyperion"); + strcpy(This->username, "Administrator"); DWORD dw = sizeof(This->hostname); GetComputerNameA(This->hostname, &dw); uint32 flags = RDP_LOGON_NORMAL | RDP_LOGON_COMPRESSION | RDP_LOGON_COMPRESSION2; - rdp_connect(This, "10.0.0.3", flags, "", "", "", ""); + //rdp_connect(This, "10.0.0.3", flags, "", "", "", ""); + rdp_connect(This, "192.168.7.232", flags, "", "", "", ""); hdcBuffer = CreateCompatibleDC(NULL); @@ -881,9 +1414,7 @@ bmi.bmiHeader.biClrUsed = 0; // TODO! palette displays bmi.bmiHeader.biClrImportant = 0; // TODO! palette displays - void * p; - - hbmBuffer = CreateDIBSection(hdcBuffer, &bmi, DIB_RGB_COLORS, &p, NULL, 0); + hbmBuffer = CreateDIBSection(hdcBuffer, &bmi, DIB_RGB_COLORS, &pBuffer, NULL, 0); SelectObject(hdcBuffer, hbmBuffer); @@ -896,6 +1427,8 @@ uint32 ext_disc_reason; rdp_main_loop(This, &deactivated, &ext_disc_reason); + + SendMessage(hwnd, WM_CLOSE, 0, 0); return 0; } @@ -936,8 +1469,8 @@ This->bitmap_cache_precache = True; This->encryption = True; This->packet_encryption = True; - This->desktop_save = True; - This->polygon_ellipse_orders = True; + This->desktop_save = False; // True; + This->polygon_ellipse_orders = False; // = True; This->fullscreen = False; This->grab_keyboard = True; This->hide_decorations = False; @@ -957,12 +1490,16 @@ This->cache.bmpcache_mru[1] = NOT_SET; This->cache.bmpcache_mru[2] = NOT_SET; + hcursor = NULL; + WNDCLASS wc; ZeroMemory(&wc, sizeof(wc)); wc.lpfnWndProc = mstsc_WndProc; wc.hbrBackground = static_cast<HBRUSH>(GetStockObject(HOLLOW_BRUSH)); wc.lpszClassName = TEXT("MissTosca_Desktop"); + + wmZMouseWheel = RegisterWindowMessage(MSH_MOUSEWHEEL); ATOM a = RegisterClass(&wc); Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj (original) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj Thu Jul 20 21:11:00 2006 @@ -61,7 +61,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib $(NoInherit)" + AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib msimg32.lib $(NoInherit)" LinkIncremental="2" AdditionalLibraryDirectories=""C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\out32"" GenerateDebugInformation="true" @@ -137,7 +137,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib $(NoInherit)" + AdditionalDependencies="kernel32.lib user32.lib gdi32.lib ws2_32.lib libeay32.lib advapi32.lib msimg32.lib $(NoInherit)" LinkIncremental="1" AdditionalLibraryDirectories=""C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\out32"" GenerateDebugInformation="true" Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h (original) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h Thu Jul 20 21:11:00 2006 @@ -1,4 +1,9 @@ #pragma once + +#define _CRT_SECURE_NO_DEPRECATE +#define _SCL_SECURE 0 + +#include <new> #include <assert.h> #include <stdio.h> Modified: trunk/reactos/base/applications/tsclient/rdesktop/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/bitmap.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/bitmap.c Thu Jul 20 21:11:00 2006 @@ -23,7 +23,7 @@ /* comment out #define BITMAP_SPEED_OVER_SIZE below for one slower function */ /* j(a)american-data.com */ -#define BITMAP_SPEED_OVER_SIZE +//#define BITMAP_SPEED_OVER_SIZE /* indent is confused by this file */ /* *INDENT-OFF* */ @@ -73,14 +73,22 @@ bitmap_decompress1(uint8 * output, int width, int height, uint8 * input, int size) { uint8 *end = input + size; - uint8 *prevline = NULL, *line = NULL; - int opcode, count, offset, isfillormix, x = width; + uint8 *prevline = NULL; + int opcode, count, offset, isfillormix; int lastopcode = -1, insertmix = False, bicolour = False; uint8 code; uint8 colour1 = 0, colour2 = 0; uint8 mixmask, mask = 0; uint8 mix = 0xff; int fom_mask = 0; +#if 0 + uint8 *line = NULL; + int x = width; +#else + uint8 *line = output; + int x = 0; + int y = 0; +#endif while (input < end) { @@ -167,12 +175,27 @@ { if (x >= width) { +#if 0 if (height <= 0) +#else + if (y >= height) +#endif return False; x = 0; + +#if 0 height--; +#else + y ++; +#endif + prevline = line; + +#if 0 line = output + height * width; +#else + line = output + y * width; +#endif } switch (opcode) { @@ -271,14 +294,22 @@ bitmap_decompress2(uint8 * output, int width, int height, uint8 * input, int size) { uint8 *end = input + size; - uint16 *prevline = NULL, *line = NULL; - int opcode, count, offset, isfillormix, x = width; + uint16 *prevline = NULL; + int opcode, count, offset, isfillormix; int lastopcode = -1, insertmix = False, bicolour = False; uint8 code; uint16 colour1 = 0, colour2 = 0; uint8 mixmask, mask = 0; uint16 mix = 0xffff; int fom_mask = 0; +#if 0 + uint8 *line = NULL; + int x = width; +#else + uint8 *line = output; + int x = 0; + int y = 0; +#endif while (input < end) { @@ -365,12 +396,27 @@ { if (x >= width) { +#if 0 if (height <= 0) +#else + if (y >= height) +#endif return False; x = 0; + +#if 0 height--; +#else + y ++; +#endif + prevline = line; + +#if 0 line = ((uint16 *) output) + height * width; +#else + line = ((uint16 *) output) + y * width; +#endif } switch (opcode) { @@ -470,14 +516,22 @@ bitmap_decompress3(uint8 * output, int width, int height, uint8 * input, int size) { uint8 *end = input + size; - uint8 *prevline = NULL, *line = NULL; - int opcode, count, offset, isfillormix, x = width; + uint8 *prevline = NULL; + int opcode, count, offset, isfillormix; int lastopcode = -1, insertmix = False, bicolour = False; uint8 code; uint8 colour1[3] = {0, 0, 0}, colour2[3] = {0, 0, 0}; uint8 mixmask, mask = 0; uint8 mix[3] = {0xff, 0xff, 0xff}; int fom_mask = 0; +#if 0 + uint8 *line = NULL; + int x = width; +#else + uint8 *line = output; + int x = 0; + int y = 0; +#endif while (input < end) { @@ -571,12 +625,27 @@ { if (x >= width) { +#if 0 if (height <= 0) +#else + if (y >= height) +#endif return False; x = 0; + +#if 0 height--; +#else + y ++; +#endif + prevline = line; + +#if 0 line = output + height * (width * 3); +#else + line = output + y * (width * 3); +#endif } switch (opcode) { @@ -782,14 +851,22 @@ bitmap_decompressx(uint8 *output, int width, int height, uint8 *input, int size, int Bpp) { uint8 *end = input + size; - uint8 *prevline = NULL, *line = NULL; - int opcode, count, offset, isfillormix, x = width; + uint8 *prevline = NULL; + int opcode, count, offset, isfillormix; int lastopcode = -1, insertmix = False, bicolour = False; uint8 code; uint32 colour1 = 0, colour2 = 0; uint8 mixmask, mask = 0; uint32 mix = 0xffffffff; int fom_mask = 0; +#if 0 + uint8 *line = NULL; + int x = width; +#else + uint8 *line = output; + int x = 0; + int y = 0; +#endif while (input < end) { @@ -885,14 +962,28 @@ { if (x >= width) { +#if 0 if (height <= 0) +#else + if (y >= height) +#endif return False; x = 0; + +#if 0 height--; +#else + y ++; +#endif prevline = line; + +#if 0 line = output + height * width * Bpp; +#else + line = output + y * width * Bpp; +#endif } switch (opcode) Modified: trunk/reactos/base/applications/tsclient/rdesktop/orders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/orders.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/orders.c Thu Jul 20 21:11:00 2006 @@ -188,7 +188,11 @@ DEBUG(("DESTBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d)\n", os->opcode, os->x, os->y, os->cx, os->cy)); +#if 0 ui_destblt(This, ROP2_S(os->opcode), os->x, os->y, os->cx, os->cy); +#else + ui_destblt(This, os->opcode, os->x, os->y, os->cx, os->cy); +#endif } /* Process a pattern blt order */ @@ -221,8 +225,13 @@ DEBUG(("PATBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d,bs=%d,bg=0x%x,fg=0x%x)\n", os->opcode, os->x, os->y, os->cx, os->cy, os->brush.style, os->bgcolour, os->fgcolour)); +#if 0 ui_patblt(This, ROP2_P(os->opcode), os->x, os->y, os->cx, os->cy, &os->brush, os->bgcolour, os->fgcolour); +#else + ui_patblt(This, os->opcode, os->x, os->y, os->cx, os->cy, + &os->brush, os->bgcolour, os->fgcolour); +#endif } /* Process a screen blt order */ @@ -253,7 +262,11 @@ DEBUG(("SCREENBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d,srcx=%d,srcy=%d)\n", os->opcode, os->x, os->y, os->cx, os->cy, os->srcx, os->srcy)); +#if 0 ui_screenblt(This, ROP2_S(os->opcode), os->x, os->y, os->cx, os->cy, os->srcx, os->srcy); +#else + ui_screenblt(This, os->opcode, os->x, os->y, os->cx, os->cy, os->srcx, os->srcy); +#endif } /* Process a line order */ @@ -292,7 +305,11 @@ return; } +#if 0 ui_line(This, os->opcode - 1, os->startx, os->starty, os->endx, os->endy, &os->pen); +#else + ui_line(This, os->opcode, os->startx, os->starty, os->endx, os->endy, &os->pen); +#endif } /* Process an opaque rectangle order */ @@ -414,7 +431,11 @@ if (bitmap == NULL) return; +#if 0 ui_memblt(This, ROP2_S(os->opcode), os->x, os->y, os->cx, os->cy, bitmap, os->srcx, os->srcy); +#else + ui_memblt(This, os->opcode, os->x, os->y, os->cx, os->cy, bitmap, os->srcx, os->srcy); +#endif } /* Process a 3-way blt order */ @@ -547,8 +568,13 @@ } if (next - 1 == os->npoints) +#if 0 ui_polygon(This, os->opcode - 1, os->fillmode, points, os->npoints + 1, NULL, 0, os->fgcolour); +#else + ui_polygon(This, os->opcode, os->fillmode, points, os->npoints + 1, NULL, 0, + os->fgcolour); +#endif else error("polygon parse error\n"); @@ -632,8 +658,13 @@ } if (next - 1 == os->npoints) +#if 0 ui_polygon(This, os->opcode - 1, os->fillmode, points, os->npoints + 1, &os->brush, os->bgcolour, os->fgcolour); +#else + ui_polygon(This, os->opcode, os->fillmode, points, os->npoints + 1, + &os->brush, os->bgcolour, os->fgcolour); +#endif else error("polygon2 parse error\n"); @@ -711,7 +742,11 @@ } if (next - 1 == os->lines) +#if 0 ui_polyline(This, os->opcode - 1, points, os->lines + 1, &pen); +#else + ui_polyline(This, os->opcode, points, os->lines + 1, &pen); +#endif else error("polyline parse error\n"); @@ -746,8 +781,13 @@ DEBUG(("ELLIPSE(l=%d,t=%d,r=%d,b=%d,op=0x%x,fm=%d,fg=0x%x)\n", os->left, os->top, os->right, os->bottom, os->opcode, os->fillmode, os->fgcolour)); +#if 0 ui_ellipse(This, os->opcode - 1, os->fillmode, os->left, os->top, os->right - os->left, os->bottom - os->top, NULL, 0, os->fgcolour); +#else + ui_ellipse(This, os->opcode, os->fillmode, os->left, os->top, os->right - os->left, + os->bottom - os->top, NULL, 0, os->fgcolour); +#endif } /* Process an ellipse2 order */ @@ -784,8 +824,13 @@ os->left, os->top, os->right, os->bottom, os->opcode, os->fillmode, os->brush.style, os->bgcolour, os->fgcolour)); +#if 0 ui_ellipse(This, os->opcode - 1, os->fillmode, os->left, os->top, os->right - os->left, os->bottom - os->top, &os->brush, os->bgcolour, os->fgcolour); +#else + ui_ellipse(This, os->opcode, os->fillmode, os->left, os->top, os->right - os->left, + os->bottom - os->top, &os->brush, os->bgcolour, os->fgcolour); +#endif } /* Process a text order */ @@ -859,11 +904,19 @@ DEBUG(("\n")); +#if 0 ui_draw_text(This, os->font, os->flags, os->opcode - 1, os->mixmode, os->x, os->y, os->clipleft, os->cliptop, os->clipright - os->clipleft, os->clipbottom - os->cliptop, os->boxleft, os->boxtop, os->boxright - os->boxleft, os->boxbottom - os->boxtop, &os->brush, os->bgcolour, os->fgcolour, os->text, os->length); +#else + ui_draw_text(This, os->font, os->flags, os->opcode, os->mixmode, os->x, os->y, + os->clipleft, os->cliptop, os->clipright - os->clipleft, + os->clipbottom - os->cliptop, os->boxleft, os->boxtop, + os->boxright - os->boxleft, os->boxbottom - os->boxtop, + &os->brush, os->bgcolour, os->fgcolour, os->text, os->length); +#endif } /* Process a raw bitmap cache order */ @@ -887,15 +940,22 @@ in_uint8p(s, data, bufsize); DEBUG(("RAW_BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d)\n", width, height, cache_id, cache_idx)); +#if 0 inverted = (uint8 *) xmalloc(width * height * Bpp); for (y = 0; y < height; y++) { memcpy(&inverted[(height - y - 1) * (width * Bpp)], &data[y * (width * Bpp)], width * Bpp); } - +#endif + +#if 0 bitmap = ui_create_bitmap(This, width, height, inverted); xfree(inverted); +#else + bitmap = ui_create_bitmap(This, width, height, data); +#endif + cache_put_bitmap(This, cache_id, cache_idx, bitmap); } @@ -1000,10 +1060,10 @@ DEBUG(("BMPCACHE2(compr=%d,flags=%x,cx=%d,cy=%d,id=%d,idx=%d,Bpp=%d,bs=%d)\n", compressed, flags, width, height, cache_id, cache_idx, Bpp, bufsize)); - bmpdata = (uint8 *) xmalloc(width * height * Bpp); - if (compressed) { + bmpdata = (uint8 *) xmalloc(width * height * Bpp); + if (!bitmap_decompress(bmpdata, width, height, data, bufsize, Bpp)) { DEBUG(("Failed to decompress bitmap data\n")); @@ -1013,9 +1073,13 @@ } else { +#if 0 for (y = 0; y < height; y++) memcpy(&bmpdata[(height - y - 1) * (width * Bpp)], &data[y * (width * Bpp)], width * Bpp); +#else + bmpdata = data; +#endif } bitmap = ui_create_bitmap(This, width, height, bmpdata); @@ -1032,7 +1096,8 @@ DEBUG(("process_bmpcache2: ui_create_bitmap failed\n")); } - xfree(bmpdata); + if (compressed) + xfree(bmpdata); } /* Process a colourmap cache order */ Modified: trunk/reactos/base/applications/tsclient/rdesktop/proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/proto.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/proto.h Thu Jul 20 21:11:00 2006 @@ -110,9 +110,9 @@ /* rdesktop.c */ int main(int argc, char *argv[]); void generate_random(uint8 * random); -void *xmalloc(int size); +void *xmalloc(size_t size); char *xstrdup(const char *s); -void *xrealloc(void *oldmem, int size); +void *xrealloc(void *oldmem, size_t size); void xfree(void *mem); void error(char *format, ...); void warning(char *format, ...); Modified: trunk/reactos/base/applications/tsclient/rdesktop/rdesktop-core.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdesktop-core.vcproj (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdesktop-core.vcproj Thu Jul 20 21:11:00 2006 @@ -39,7 +39,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\inc32"" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WITH_DEBUG;" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -100,7 +100,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""C:\Documents and Settings\All Users\Documenti\openssl-0.9.8b\inc32"" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Modified: trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdesktop.h Thu Jul 20 21:11:00 2006 @@ -311,6 +311,7 @@ /* rdp.c */ struct rdp_ { + int ignore_; #if WITH_DEBUG uint32 packetno; #endif Modified: trunk/reactos/base/applications/tsclient/rdesktop/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/rdp.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/rdp.c Thu Jul 20 21:11:00 2006 @@ -968,7 +968,7 @@ in_uint8p(s, mask, masklen); cursor = ui_create_cursor(This, x, y, width, height, mask, data); ui_set_cursor(This, cursor); - // cache_put_cursor(This, cache_idx, cursor); // TODO + cache_put_cursor(This, cache_idx, cursor); } /* Process a cached pointer PDU */ @@ -978,7 +978,7 @@ uint16 cache_idx; in_uint16_le(s, cache_idx); - ui_set_cursor(This, /*cache_get_cursor(This, cache_idx)*/ NULL); // TODO + ui_set_cursor(This, cache_get_cursor(This, cache_idx)); } /* Process a system pointer PDU */ @@ -1068,6 +1068,7 @@ if (!compress) { +#if 0 int y; bmpdata = (uint8 *) xmalloc(width * height * Bpp); for (y = 0; y < height; y++) @@ -1077,6 +1078,10 @@ } ui_paint_bitmap(This, left, top, cx, cy, width, height, bmpdata); xfree(bmpdata); +#else + in_uint8p(s, bmpdata, width * height * Bpp); + ui_paint_bitmap(This, left, top, cx, cy, width, height, bmpdata); +#endif continue; } Modified: trunk/reactos/base/applications/tsclient/rdesktop/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/secure.c (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/secure.c Thu Jul 20 21:11:00 2006 @@ -333,8 +333,8 @@ datalen = s->end - s->p - 8; #if WITH_DEBUG - DEBUG(("Sending encrypted packet:\n")); - hexdump(s->p + 8, datalen); + //DEBUG(("Sending encrypted packet:\n")); + //hexdump(s->p + 8, datalen); #endif sec_sign(s->p, 8, This->secure.sign_key, This->secure.rc4_key_len, s->p + 8, datalen); Modified: trunk/reactos/base/applications/tsclient/rdesktop/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/rdesktop/types.h (original) +++ trunk/reactos/base/applications/tsclient/rdesktop/types.h Thu Jul 20 21:11:00 2006 @@ -92,7 +92,6 @@ } PEN; -// TODO: nuke, use LOGBRUSH + pattern[8] typedef struct _BRUSH { uint8 xorigin;

1 0

[ion] 23195: - Add some final missing annotations to kill.c [AUDIT] - Most of the functions are documented at length in Windows Internals II and at a more high-level fashion in Windows Internals 4 and were based on that information. Undocumented routines were based of the operations done in the documented ones (for example, freeing buffers that we know were allocated, etc).
by ion＠svn.reactos.org 20 Jul '06

20 Jul '06

Author: ion Date: Thu Jul 20 20:30:07 2006 New Revision: 23195 URL: http://svn.reactos.org/svn/reactos?rev=23195&view=rev Log: - Add some final missing annotations to kill.c [AUDIT] - Most of the functions are documented at length in Windows Internals II and at a more high-level fashion in Windows Internals 4 and were based on that information. Undocumented routines were based of the operations done in the documented ones (for example, freeing buffers that we know were allocated, etc). Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ps/kill.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 20 20:30:07 2006 @@ -28,7 +28,6 @@ // - Use Process/Thread Rundown. // - Use Process Pushlock Locks. // - Use Safe Referencing where needed. -// - Use Guarded Mutex instead of Fast Mutex for Active Process Locks. // - Use Security Locks in security.c // - Figure out why processes don't die. // - Generate process cookie for user-more thread. Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Thu Jul 20 20:30:07 2006 @@ -90,7 +90,7 @@ VOID NTAPI -PspReapRoutine(PVOID Context) +PspReapRoutine(IN PVOID Context) { PLIST_ENTRY *ListAddr; PLIST_ENTRY NextEntry; @@ -130,7 +130,7 @@ VOID NTAPI -PspDeleteProcess(PVOID ObjectBody) +PspDeleteProcess(IN PVOID ObjectBody) { PEPROCESS Process = (PEPROCESS)ObjectBody; KAPC_STATE ApcState; @@ -260,7 +260,7 @@ VOID NTAPI -PspDeleteThread(PVOID ObjectBody) +PspDeleteThread(IN PVOID ObjectBody) { PETHREAD Thread = (PETHREAD)ObjectBody; PEPROCESS Process = Thread->ThreadsProcess; @@ -315,7 +315,7 @@ */ VOID NTAPI -PspExitThread(NTSTATUS ExitStatus) +PspExitThread(IN NTSTATUS ExitStatus) { CLIENT_DIED_MSG TerminationMsg; NTSTATUS Status; @@ -726,11 +726,11 @@ VOID NTAPI -PsExitSpecialApc(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArguemnt2) +PsExitSpecialApc(IN PKAPC Apc, + IN OUT PKNORMAL_ROUTINE* NormalRoutine, + IN OUT PVOID* NormalContext, + IN OUT PVOID* SystemArgument1, + IN OUT PVOID* SystemArguemnt2) { NTSTATUS Status; PAGED_CODE(); @@ -749,9 +749,9 @@ VOID NTAPI -PspExitNormalApc(PVOID NormalContext, - PVOID SystemArgument1, - PVOID SystemArgument2) +PspExitNormalApc(IN PVOID NormalContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) { PKAPC Apc = (PKAPC)SystemArgument1; PETHREAD Thread = PsGetCurrentThread(); @@ -789,9 +789,9 @@ */ NTSTATUS NTAPI -PspTerminateThreadByPointer(PETHREAD Thread, - NTSTATUS ExitStatus, - BOOLEAN bSelf) +PspTerminateThreadByPointer(IN PETHREAD Thread, + IN NTSTATUS ExitStatus, + IN BOOLEAN bSelf) { PKAPC Apc; NTSTATUS Status = STATUS_SUCCESS; @@ -932,7 +932,7 @@ */ NTSTATUS NTAPI -PsTerminateSystemThread(NTSTATUS ExitStatus) +PsTerminateSystemThread(IN NTSTATUS ExitStatus) { PETHREAD Thread = PsGetCurrentThread(); Propchange: trunk/reactos/ntoskrnl/ps/kill.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 23194: - Move a bunch of externs to ps.h and delete many dupped/tripped ones. - Change FAST_MUTEX PsActiveProcessMutex to KGUARDED_MUTEX. - Define PS Flags and use them, isntead of magic numbers. (For magic mushrooms, you'll have to wait a while, these aren't implemented yet).
by ion＠svn.reactos.org 20 Jul '06

20 Jul '06

Author: ion Date: Thu Jul 20 20:26:10 2006 New Revision: 23194 URL: http://svn.reactos.org/svn/reactos?rev=23194&view=rev Log: - Move a bunch of externs to ps.h and delete many dupped/tripped ones. - Change FAST_MUTEX PsActiveProcessMutex to KGUARDED_MUTEX. - Define PS Flags and use them, isntead of magic numbers. (For magic mushrooms, you'll have to wait a while, these aren't implemented yet). Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/idle.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Thu Jul 20 20:26:10 2006 @@ -179,6 +179,37 @@ #define STA_LPC_EXIT_THREAD_CALLED_BIT 0x2 #define STA_ADDRESS_SPACE_OWNER_BIT 0x4 #endif + +// +// Process Flags +// +#define PSF_CREATE_REPORTED_BIT 0x1 +#define PSF_NO_DEBUG_INHERIT_BIT 0x2 +#define PSF_PROCESS_EXITING_BIT 0x4 +#define PSF_PROCESS_DELETE_BIT 0x8 +#define PSF_WOW64_SPLIT_PAGES_BIT 0x10 +#define PSF_VM_DELETED_BIT 0x20 +#define PSF_OUTSWAP_ENABLED_BIT 0x40 +#define PSF_OUTSWAPPED_BIT 0x80 +#define PSF_FORK_FAILED_BIT 0x100 +#define PSF_WOW64_VA_SPACE_4GB_BIT 0x200 +#define PSF_ADDRESS_SPACE_INITIALIZED_BIT 0x400 +#define PSF_SET_TIMER_RESOLUTION_BIT 0x1000 +#define PSF_BREAK_ON_TERMINATION_BIT 0x2000 +#define PSF_SESSION_CREATION_UNDERWAY_BIT 0x4000 +#define PSF_WRITE_WATCH_BIT 0x8000 +#define PSF_PROCESS_IN_SESSION_BIT 0x10000 +#define PSF_OVERRIDE_ADDRESS_SPACE_BIT 0x20000 +#define PSF_HAS_ADDRESS_SPACE_BIT 0x40000 +#define PSF_LAUNCH_PREFETCHED_BIT 0x80000 +#define PSF_INJECT_INPAGE_ERRORS_BIT 0x100000 +#define PSF_VM_TOP_DOWN_BIT 0x200000 +#define PSF_IMAGE_NOTIFY_DONE_BIT 0x400000 +#define PSF_PDE_UPDATE_NEEDED_BIT 0x800000 +#define PSF_VDM_ALLOWED_BIT 0x1000000 +#define PSF_SWAP_ALLOWED_BIT 0x2000000 +#define PSF_CREATE_FAILED_BIT 0x4000000 +#define PSF_DEFAULT_IO_PRIORITY_BIT 0x8000000 #ifdef NTOS_MODE_USER // Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h Thu Jul 20 20:26:10 2006 @@ -20,6 +20,7 @@ IN PEPROCESS Parent ); +extern POBJECT_TYPE DbgkDebugObjectType; #endif /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Thu Jul 20 20:26:10 2006 @@ -390,9 +390,10 @@ extern PEPROCESS PsInitialSystemProcess; extern PEPROCESS PsIdleProcess; extern LIST_ENTRY PsActiveProcessHead; -extern FAST_MUTEX PspActiveProcessMutex; +extern KGUARDED_MUTEX PspActiveProcessMutex; extern LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; extern EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; +extern PHANDLE_TABLE PspCidTable; extern PCREATE_THREAD_NOTIFY_ROUTINE PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; extern PCREATE_PROCESS_NOTIFY_ROUTINE @@ -401,6 +402,10 @@ PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; extern PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; extern ULONG PspThreadNotifyRoutineCount; +extern PKWIN32_PROCESS_CALLOUT PspW32ProcessCallout; +extern PKWIN32_THREAD_CALLOUT PspW32ThreadCallout; +extern PVOID PspSystemDllEntryPoint; +extern PVOID PspSystemDllBase; #include "ps_x.h" Modified: trunk/reactos/ntoskrnl/ps/idle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/idle.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/ps/idle.c (original) +++ trunk/reactos/ntoskrnl/ps/idle.c Thu Jul 20 20:26:10 2006 @@ -17,10 +17,6 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, PsInitIdleThread) #endif - -/* GLOBALS *******************************************************************/ - -extern PEPROCESS PsIdleProcess; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=231… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Thu Jul 20 20:26:10 2006 @@ -18,13 +18,6 @@ LIST_ENTRY PspReaperListHead = {0}; WORK_QUEUE_ITEM PspReaperWorkItem; -extern LIST_ENTRY PsActiveProcessHead; -extern FAST_MUTEX PspActiveProcessMutex; -extern PHANDLE_TABLE PspCidTable; -extern PKWIN32_PROCESS_CALLOUT PspW32ProcessCallout; -extern PKWIN32_THREAD_CALLOUT PspW32ThreadCallout; -extern PEPROCESS PsInitialSystemProcess; -extern PEPROCESS PsIdleProcess; /* PRIVATE FUNCTIONS *********************************************************/ @@ -45,7 +38,7 @@ } /* Set the delete flag */ - InterlockedOr((PLONG)&Process->Flags, 8); + InterlockedOr((PLONG)&Process->Flags, PSF_PROCESS_DELETE_BIT); /* Get the first thread */ Thread = PsGetNextProcessThread(Process, Thread); @@ -147,9 +140,9 @@ if (Process->ActiveProcessLinks.Flink) { /* Remove it from the Active List */ - ExAcquireFastMutex(&PspActiveProcessMutex); + KeAcquireGuardedMutex(&PspActiveProcessMutex); RemoveEntryList(&Process->ActiveProcessLinks); - ExReleaseFastMutex(&PspActiveProcessMutex); + KeReleaseGuardedMutex(&PspActiveProcessMutex); } /* Check for Auditing information */ @@ -401,7 +394,7 @@ if (!(--CurrentProcess->ActiveThreads)) { /* Set the delete flag */ - InterlockedOr((PLONG)&CurrentProcess->Flags, 8); + InterlockedOr((PLONG)&CurrentProcess->Flags, PSF_PROCESS_DELETE_BIT); /* Remember we are last */ Last = TRUE; @@ -820,7 +813,7 @@ ASSERT_IRQL(PASSIVE_LEVEL); /* Mark it as terminated */ - InterlockedOr((PLONG)&Thread->CrossThreadFlags, 1); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_TERMINATED_BIT); /* Directly terminate the thread */ PspExitThread(ExitStatus); @@ -878,8 +871,8 @@ ULONG Actual; PAGED_CODE(); - /* Set Process Delete flag */ - InterlockedOr((PLONG)&Process->Flags, 4); + /* Set Process Exit flag */ + InterlockedOr((PLONG)&Process->Flags, PSF_PROCESS_EXITING_BIT); /* Check if we are the last thread */ if (LastThread) @@ -992,8 +985,9 @@ /* Lock the Process */ ExAcquireRundownProtection(&Process->RundownProtect); - /* Set the exit flag */ - if (!KillByHandle) InterlockedOr((PLONG)&Process->Flags, 8); + /* Set the delete flag */ + if (!KillByHandle) InterlockedOr((PLONG)&Process->Flags, + PSF_PROCESS_DELETE_BIT); /* Get the first thread */ Status = STATUS_NOTHING_TO_TERMINATE; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Jul 20 20:26:10 2006 @@ -18,14 +18,12 @@ PEPROCESS PsInitialSystemProcess = NULL; PEPROCESS PsIdleProcess = NULL; POBJECT_TYPE PsProcessType = NULL; -extern PHANDLE_TABLE PspCidTable; -extern POBJECT_TYPE DbgkDebugObjectType; EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; ULONG PsMinimumWorkingSet, PsMaximumWorkingSet; LIST_ENTRY PsActiveProcessHead; -FAST_MUTEX PspActiveProcessMutex; +KGUARDED_MUTEX PspActiveProcessMutex; #if 1 LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; @@ -182,7 +180,7 @@ PAGED_CODE(); /* Acquire the Active Process Lock */ - ExAcquireFastMutex(&PspActiveProcessMutex); + KeAcquireGuardedMutex(&PspActiveProcessMutex); /* Check if we're already starting somewhere */ if (OldProcess) @@ -209,7 +207,7 @@ } /* Release the lock */ - ExReleaseFastMutex(&PspActiveProcessMutex); + KeReleaseGuardedMutex(&PspActiveProcessMutex); /* Reference the Process we had referenced earlier */ if (OldProcess) ObDereferenceObject(OldProcess); @@ -396,7 +394,7 @@ if (Flags & PS_NO_DEBUG_INHERIT) { /* Set the process flag */ - InterlockedOr((PLONG)&Process->Flags, 2); + InterlockedOr((PLONG)&Process->Flags, PSF_NO_DEBUG_INHERIT_BIT); } } else @@ -444,7 +442,7 @@ &DirectoryTableBase); /* We now have an address space */ - InterlockedOr((PLONG)&Process->Flags, 0x40000); + InterlockedOr((PLONG)&Process->Flags, PSF_HAS_ADDRESS_SPACE_BIT); /* Set the maximum WS */ Process->Vm.MaximumWorkingSetSize = MaxWs; @@ -524,9 +522,9 @@ } /* The process can now be activated */ - ExAcquireFastMutex(&PspActiveProcessMutex); + KeAcquireGuardedMutex(&PspActiveProcessMutex); InsertTailList(&PsActiveProcessHead, &Process->ActiveProcessLinks); - ExReleaseFastMutex(&PspActiveProcessMutex); + KeReleaseGuardedMutex(&PspActiveProcessMutex); /* FIXME: SeCreateAccessStateEx */ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Thu Jul 20 20:26:10 2006 @@ -157,7 +157,7 @@ ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsProcessType); InitializeListHead(&PsActiveProcessHead); - ExInitializeFastMutex(&PspActiveProcessMutex); + KeInitializeGuardedMutex(&PspActiveProcessMutex); /* * Initialize the default quota block. Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Jul 20 20:26:10 2006 @@ -15,9 +15,6 @@ /* GLOBALS ******************************************************************/ -extern PVOID PspSystemDllEntryPoint; -extern PVOID PspSystemDllBase; -extern PHANDLE_TABLE PspCidTable; extern BOOLEAN CcPfEnablePrefetcher; extern ULONG MmReadClusterSize; POBJECT_TYPE PsThreadType = NULL;

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