Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[amunger] 23527: Merge 23526 from trunk.

by amunger＠svn.reactos.org

Author: amunger Date: Wed Aug 9 00:14:51 2006 New Revision: 23527 URL: http://svn.reactos.org/svn/reactos?rev=23527&view=rev Log: Merge 23526 from trunk. Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff (original) +++ branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff Wed Aug 9 00:14:51 2006 @@ -398,7 +398,7 @@ modules\rosapps\notevil\notevil.exe 1 optional modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\dll\win32\package.dll 1 optional +modules\rosapps\packmgr\lib\package.dll 1 optional modules\rosapps\sysutils\ctm\ctm.exe 1 optional modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional modules\rosapps\sysutils\man\man.exe 1 optional

18 years, 2 months

[amunger] 23526: Correct the path to the package.dll for packmgr.

by amunger＠svn.reactos.org

Author: amunger Date: Wed Aug 9 00:13:27 2006 New Revision: 23526 URL: http://svn.reactos.org/svn/reactos?rev=23526&view=rev Log: Correct the path to the package.dll for packmgr. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Aug 9 00:13:27 2006 @@ -423,7 +423,7 @@ modules\rosapps\notevil\notevil.exe 1 optional modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\dll\win32\package.dll 1 optional +modules\rosapps\packmgr\lib\package.dll 1 optional modules\rosapps\sysutils\ctm\ctm.exe 1 optional modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional modules\rosapps\sysutils\man\man.exe 1 optional

18 years, 2 months

[jimtabor] 23525: - DrawCaption - Patch by Saveliy Tretiakov, new NtUserDrawCaption implementation. See URL for more details, http://www.reactos.org/archives/public/ros-dev/2006-July/008575.html

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 9 00:00:53 2006 New Revision: 23525 URL: http://svn.reactos.org/svn/reactos?rev=23525&view=rev Log: - DrawCaption - Patch by Saveliy Tretiakov, new NtUserDrawCaption implementation. See URL for more details, http://www.reactos.org/archives/public/ros-dev/2006-July/008575.html Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Wed Aug 9 00:00:53 2006 @@ -1097,230 +1097,8 @@ BOOL WINAPI DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags) { - NONCLIENTMETRICSW nclm; - BOOL result = FALSE; - RECT r = *lprc; - UINT VCenter = 0, Padding = 0, Height; - ULONG Style; - WCHAR buffer[256]; - HFONT hFont = NULL; - HFONT hOldFont = NULL; - HBRUSH OldBrush = NULL; - HDC MemDC = NULL; - int ButtonWidth; - COLORREF OldTextColor; - -#ifdef DOUBLE_BUFFER_CAPTION - HBITMAP MemBMP = NULL, OldBMP = NULL; - - MemDC = CreateCompatibleDC(hDC); - if (! MemDC) goto cleanup; - MemBMP = CreateCompatibleBitmap(hDC, lprc->right - lprc->left, lprc->bottom - lprc->top); - if (! MemBMP) goto cleanup; - OldBMP = SelectObject(MemDC, MemBMP); - if (! OldBMP) goto cleanup; -#else - MemDC = hDC; - - OffsetViewportOrgEx(MemDC, lprc->left, lprc->top, NULL); -#endif - - Style = GetWindowLongW(hWnd, GWL_STYLE); - - /* Windows behaves like this */ - Height = GetSystemMetrics(SM_CYCAPTION) - 1; - - VCenter = (lprc->bottom - lprc->top) / 2; - Padding = VCenter - (Height / 2); - - r.left = Padding; - r.right = r.left + (lprc->right - lprc->left); - r.top = Padding; - r.bottom = r.top + (Height / 2); - - // Draw the caption background - if (uFlags & DC_INBUTTON) - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_BTNFACE : COLOR_BTNSHADOW) ); - if (! OldBrush) goto cleanup; - if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup; - } - else - { - if (uFlags & DC_GRADIENT) - { - static GRADIENT_RECT gcap = {0, 1}; - TRIVERTEX vert[2]; - COLORREF Colors[2]; - LONG xx; - - r.right = (lprc->right - lprc->left); - if (uFlags & DC_SMALLCAP) - ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2; - else - ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - - //if (Style & WS_SYSMENU) - //{ - // r.right -= 3 + ButtonWidth; - // if (! (uFlags & DC_SMALLCAP)) - // { - // if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - // r.right -= 2 + 2 * ButtonWidth; - // else - // r.right -= 2; - // r.right -= 2; - // } - //} - - Colors[0] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); - Colors[1] = GetSysColor((uFlags & DC_ACTIVE) ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); - - vert[0].x = r.left; - vert[0].y = 0; - vert[0].Red = GetRValue(Colors[0]) << 8; - vert[0].Green = GetGValue(Colors[0]) << 8; - vert[0].Blue = GetBValue(Colors[0]) << 8; - vert[0].Alpha = 0; - - vert[1].x = r.right; - vert[1].y = lprc->bottom - lprc->top; - vert[1].Red = GetRValue(Colors[1]) << 8; - vert[1].Green = GetGValue(Colors[1]) << 8; - vert[1].Blue = GetBValue(Colors[1]) << 8; - vert[1].Alpha = 0; - - GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); - - if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) - { - r.top --; - SetBkMode( MemDC, TRANSPARENT ); - xx = GetSystemMetrics(SM_CXSIZE) + Padding; - if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) - r.left += xx; - r.top ++; - } - - if(OldBrush) - { - SelectObject(MemDC, OldBrush); - OldBrush = NULL; - } - //xx = lprc->right - lprc->left - r.right; - //if(xx > 0) - //{ - // OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION)); - // if (!OldBrush) goto cleanup; - // PatBlt(MemDC, r.right, 0, xx, lprc->bottom - lprc->top, PATCOPY); - //} - } - else - { - OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) ); - if (! OldBrush) goto cleanup; - if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup; - } - } - - if ((uFlags & DC_ICON) && !(uFlags & DC_GRADIENT) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP)) - { - /* For some reason the icon isn't centered correctly... */ - r.top --; - if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE)) - r.left += GetSystemMetrics(SM_CXSIZE) + Padding; - r.top ++; - } - r.top ++; - r.left += 2; - - r.bottom = r.top + Height; - - if ((uFlags & DC_TEXT) && (NtUserInternalGetWindowText( hWnd, buffer, sizeof(buffer)/sizeof(buffer[0]) ))) - { - if(!(uFlags & DC_GRADIENT)) - { - r.right = (lprc->right - lprc->left); - if (uFlags & DC_SMALLCAP) - ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2; - else - ButtonWidth = GetSystemMetrics(SM_CXSIZE) - 2; - - if (Style & WS_SYSMENU) - { - r.right -= 3 + ButtonWidth; - if (! (uFlags & DC_SMALLCAP)) - { - if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) - r.right -= 2 + 2 * ButtonWidth; - else - r.right -= 2; - r.right -= 2; - } - } - } - - nclm.cbSize = sizeof(nclm); - if (! SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &nclm, 0)) goto cleanup; - - SetBkMode( MemDC, TRANSPARENT ); - if (uFlags & DC_SMALLCAP) - hFont = CreateFontIndirectW(&nclm.lfSmCaptionFont); - else - hFont = CreateFontIndirectW(&nclm.lfCaptionFont); - - if (! hFont) goto cleanup; - - hOldFont = SelectObject(MemDC, hFont); - if (! hOldFont) goto cleanup; - - if (uFlags & DC_INBUTTON) - OldTextColor = SetTextColor(MemDC, GetSysColor(uFlags & DC_ACTIVE ? COLOR_BTNTEXT : COLOR_GRAYTEXT)); - else - OldTextColor = SetTextColor(MemDC, GetSysColor(uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); - - DrawTextW(MemDC, buffer, wcslen(buffer), &r, DT_VCENTER | DT_END_ELLIPSIS); - - SetTextColor(MemDC, OldTextColor); - } - -#if 0 - if (uFlags & DC_BUTTONS) - { - // Windows XP draws the caption buttons with DC_BUTTONS -// r.left += GetSystemMetrics(SM_CXSIZE) + 1; -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONCLOSE); -// r.right -= GetSystemMetrics(SM_CXSMSIZE) + 1; -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONMIN); -// UserDrawCaptionButton( hWnd, hDC, FALSE, DFCS_CAPTIONMAX); - } -#endif - -#ifdef DOUBLE_BUFFER_CAPTION - if (! BitBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, lprc->bottom - lprc->top, - MemDC, 0, 0, SRCCOPY)) goto cleanup; -#endif - - result = TRUE; - - cleanup : - if (MemDC) - { - if (OldBrush) SelectObject(MemDC, OldBrush); - if (hOldFont) SelectObject(MemDC, hOldFont); - if (hFont) DeleteObject(hFont); -#ifdef DOUBLE_BUFFER_CAPTION - if (OldBMP) SelectObject(MemDC, OldBMP); - if (MemBMP) DeleteObject(MemBMP); - DeleteDC(MemDC); -#else - OffsetViewportOrgEx(MemDC, -lprc->left, -lprc->top, NULL); -#endif - } - - return result; -} - + return NtUserDrawCaption(hWnd, hDC, lprc, uFlags); +} /* * @unimplemented Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Aug 9 00:00:53 2006 @@ -689,12 +689,11 @@ DWORD NTAPI NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 - ); + HWND hwnd1, + HWND hwnd2, + UINT u1, + DWORD dw1, + HCURSOR hc1); DWORD NTAPI @@ -704,24 +703,24 @@ DWORD Unknown2, DWORD Unknown3); -DWORD +BOOL NTAPI NtUserDrawCaption( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); - -DWORD -NTAPI + HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags); + +DWORD +STDCALL NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6); + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Wed Aug 9 00:00:53 2006 @@ -188,11 +188,17 @@ BOOL FASTCALL IntGetSysColorBrushes(HBRUSH *Brushes, UINT nBrushes); +HGDIOBJ FASTCALL +IntGetSysColorBrush(INT Object); + BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens); BOOL FASTCALL IntGetSysColors(COLORREF *Colors, UINT nColors); + +DWORD FASTCALL +IntGetSysColor(INT nIndex); /* Other Stuff */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Wed Aug 9 00:00:53 2006 @@ -72,7 +72,6 @@ } -static PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon) { PCURICON_OBJECT CurIcon; @@ -1346,6 +1345,191 @@ (Rop3), 0) #endif /* STRETCH_CAN_SRCCOPY_ONLY */ +BOOL +UserDrawIconEx( + HDC hDc, + INT xLeft, + INT yTop, + PCURICON_OBJECT pIcon, + INT cxWidth, + INT cyHeight, + UINT istepIfAniCur, + HBRUSH hbrFlickerFreeDraw, + UINT diFlags) +{ + BOOL Ret = FALSE; + HBITMAP hbmMask, hbmColor; + BITMAP bmpMask, bmpColor; + COLORREF oldFg, oldBg; + BOOL DoFlickerFree; + INT nStretchMode; + SIZE IconSize; + + HDC hdcOff; + HGDIOBJ hOldOffBrush = 0; + HGDIOBJ hOldOffBmp = 0; + HBITMAP hbmOff = 0; + HDC hdcMem = 0; + HGDIOBJ hOldMem; + + hbmMask = pIcon->IconInfo.hbmMask; + hbmColor = pIcon->IconInfo.hbmColor; + + if(istepIfAniCur) + DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); + + if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) + { + return FALSE; + } + + if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) + { + return FALSE; + } + + if(hbmColor) + { + IconSize.cx = bmpColor.bmWidth; + IconSize.cy = bmpColor.bmHeight; + } + else + { + IconSize.cx = bmpMask.bmWidth; + IconSize.cy = bmpMask.bmHeight / 2; + } + + if(!diFlags) + diFlags = DI_NORMAL; + + if(!cxWidth) + cxWidth = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CXICON) : IconSize.cx); + + if(!cyHeight) + cyHeight = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CYICON) : IconSize.cy); + + DoFlickerFree = (hbrFlickerFreeDraw && + (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); + + if(DoFlickerFree) + { + RECT r; + r.right = cxWidth; + r.bottom = cyHeight; + + hdcOff = NtGdiCreateCompatibleDC(hDc); + if(!hdcOff) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + return FALSE; + } + + hbmOff = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); + if(!hbmOff) + { + DPRINT1("NtGdiCreateCompatibleBitmap() failed!\n"); + goto cleanup; + } + + hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); + if(!hOldOffBrush) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + + hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); + if(!hOldOffBmp) + { + DPRINT1("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + + NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); + } + else hdcOff = hDc; + + hdcMem = NtGdiCreateCompatibleDC(hDc); + if(!hdcMem) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + goto cleanup; + } + + nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); + + oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); + oldBg = NtGdiSetBkColor(hdcOff, RGB(255, 255, 255)); + + if(diFlags & DI_MASK) + { + hOldMem = NtGdiSelectObject(hdcMem, hbmMask); + if(!hOldMem) + { + DPRINT("NtGdiSelectObject() failed!\n"); + goto cleanup; + } + + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, 0, IconSize.cx, IconSize.cy, + ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); + + if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) + && (diFlags & DI_IMAGE)) + { + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, IconSize.cy, IconSize.cx, IconSize.cy, SRCINVERT, + FALSE); + + diFlags &= ~DI_IMAGE; + } + + NtGdiSelectObject(hdcMem, hOldMem); + } + + if(diFlags & DI_IMAGE) + { + hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); + + DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), + (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, + 0, (hbmColor ? 0 : IconSize.cy), IconSize.cx, IconSize.cy, + ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), + NULL != hbmColor); + + NtGdiSelectObject(hdcMem, hOldMem); + } + + if(DoFlickerFree) + { + NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, + cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); + } + + NtGdiSetTextColor(hdcOff, oldFg); + NtGdiSetBkColor(hdcOff, oldBg); + NtGdiSetStretchBltMode(hdcOff, nStretchMode); + + Ret = TRUE; + +cleanup: + if(DoFlickerFree) + { + + if(hOldOffBmp) NtGdiSelectObject(hdcOff, hOldOffBmp); + if(hOldOffBrush) NtGdiSelectObject(hdcOff, hOldOffBrush); + if(hbmOff) NtGdiDeleteObject(hbmOff); + if(hdcOff) NtGdiDeleteObjectApp(hdcOff); + } + + if(hdcMem) NtGdiDeleteObjectApp(hdcMem); + return Ret; +} + /* * @implemented */ @@ -1364,167 +1548,29 @@ DWORD Unknown0, DWORD Unknown1) { - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; - HBITMAP hbmMask, hbmColor; - BITMAP bmpMask, bmpColor; - BOOL DoFlickerFree; - SIZE IconSize; - COLORREF oldFg, oldBg; - HDC hdcMem, hdcOff = (HDC)0; - HBITMAP hbmOff = (HBITMAP)0; - HGDIOBJ hOldOffBrush = 0, hOldOffBmp = 0, hOldMem; - BOOL Ret = FALSE; - INT nStretchMode; - - DECLARE_RETURN(BOOL); + PCURICON_OBJECT pIcon; + BOOL Ret; DPRINT("Enter NtUserDrawIconEx\n"); UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( FALSE); - } - - if (!(CurIcon = UserGetCurIconObject(hIcon))) - { - ObDereferenceObject(WinSta); - RETURN(FALSE); - } - - hbmMask = CurIcon->IconInfo.hbmMask; - hbmColor = CurIcon->IconInfo.hbmColor; - - if(istepIfAniCur) - DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - - if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) - goto done; - - if(hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) - goto done; - - if(hbmColor) - { - IconSize.cx = bmpColor.bmWidth; - IconSize.cy = bmpColor.bmHeight; - } - else - { - IconSize.cx = bmpMask.bmWidth; - IconSize.cy = bmpMask.bmHeight / 2; - } - - if(!diFlags) - diFlags = DI_NORMAL; - - if(!cxWidth) - cxWidth = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CXICON) : IconSize.cx); - if(!cyHeight) - cyHeight = ((diFlags & DI_DEFAULTSIZE) ? UserGetSystemMetrics(SM_CYICON) : IconSize.cy); - - DoFlickerFree = (hbrFlickerFreeDraw && (NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH)); - - if(DoFlickerFree) - { - RECT r; - r.right = cxWidth; - r.bottom = cyHeight; - - hdcOff = NtGdiCreateCompatibleDC(hdc); - if(!hdcOff) - goto done; - - hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight); - if(!hbmOff) - { - NtGdiDeleteObjectApp(hdcOff); - goto done; - } - hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); - hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); - NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); - NtGdiSelectObject(hdcOff, hbmOff); - } - - hdcMem = NtGdiCreateCompatibleDC(hdc); - if(!hdcMem) - goto cleanup; - - if(!DoFlickerFree) - hdcOff = hdc; - - nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); - - oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); - oldBg = NtGdiSetBkColor(hdcOff, RGB(255, 255, 255)); - - if(diFlags & DI_MASK) - { - hOldMem = NtGdiSelectObject(hdcMem, hbmMask); - - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, 0, IconSize.cx, IconSize.cy, - ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), FALSE); - - if(!hbmColor && (bmpMask.bmHeight == 2 * bmpMask.bmWidth) && (diFlags & DI_IMAGE)) - { - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, IconSize.cy, IconSize.cx, IconSize.cy, SRCINVERT, - FALSE); - - diFlags &= ~DI_IMAGE; - } - NtGdiSelectObject(hdcMem, hOldMem); - } - - if(diFlags & DI_IMAGE) - { - hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); - - DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), - (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, - 0, (hbmColor ? 0 : IconSize.cy), IconSize.cx, IconSize.cy, - ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), - NULL != hbmColor); - - NtGdiSelectObject(hdcMem, hOldMem); - } - - if(DoFlickerFree) - NtGdiBitBlt(hdc, xLeft, yTop, cxWidth, cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); - - NtGdiSetTextColor(hdcOff, oldFg); - NtGdiSetBkColor(hdcOff, oldBg); - - NtGdiSetStretchBltMode(hdcOff, nStretchMode); - - Ret = TRUE; - -cleanup: - if(DoFlickerFree) - { - - NtGdiSelectObject(hdcOff, hOldOffBmp); - NtGdiSelectObject(hdcOff, hOldOffBrush); - NtGdiDeleteObject(hbmOff); - NtGdiDeleteObjectApp(hdcOff); - } - if(hdcMem) - NtGdiDeleteObjectApp(hdcMem); - -done: - ObDereferenceObject(WinSta); - - RETURN( Ret); - -CLEANUP: - DPRINT("Leave NtUserDrawIconEx, ret=%i\n",_ret_); + + if(!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + UserLeave(); + return FALSE; + } + + Ret = UserDrawIconEx(hdc, + xLeft, + yTop, + pIcon, + cxWidth, + cyHeight, + istepIfAniCur, + hbrFlickerFreeDraw, + diFlags); + UserLeave(); - END_CLEANUP; -} - + return Ret; +} Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Wed Aug 9 00:00:53 2006 @@ -181,19 +181,6 @@ DWORD STDCALL NtUserDrawAnimatedRects( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserDrawCaption( DWORD Unknown0, DWORD Unknown1, DWORD Unknown2, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Wed Aug 9 00:00:53 2006 @@ -1372,4 +1372,392 @@ END_CLEANUP; } +/* Don't know where to put this */ +BOOL FASTCALL IntGdiGradientFill(DC *dc, PTRIVERTEX pVertex, ULONG uVertex, PVOID pMesh, ULONG uMesh, ULONG ulMode); +ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); +BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, + INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); +PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); + +BOOL +IntDrawSysMenuButton( + PWINDOW_OBJECT pWnd, + HDC hDc, + LPRECT lpRc, + BOOL Down) +{ + HICON hIcon; + PCURICON_OBJECT pIcon; + + ASSERT(pWnd && lpRc); + + /* Get the icon to draw. We don't care about WM_GETICON here. */ + + hIcon = pWnd->Class->hIconSm; + + if(!hIcon) + { + DPRINT("Wnd class has no small icon.\n"); + hIcon = pWnd->Class->hIcon; + } + + if(!hIcon) + { + DPRINT("Wnd class hasn't any icon.\n"); + //FIXME: Draw "winlogo" icon. + return FALSE; + } + + if(!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + return FALSE; + } + + return UserDrawIconEx(hDc, lpRc->left, lpRc->top, pIcon, + UserGetSystemMetrics(SM_CXSMICON), + UserGetSystemMetrics(SM_CYSMICON), + 0, NULL, DI_NORMAL); +} + +BOOL +IntDrawCaptionText(HDC hDc, + const PUNICODE_STRING Text, + const LPRECT lpRc, + UINT uFlags) +{ + HFONT hOldFont = NULL, hFont = NULL; + COLORREF OldTextColor; + NONCLIENTMETRICS nclm; + NTSTATUS Status; + INT i; + + #ifndef NDEBUG + DPRINT("%s:", __FUNCTION__); + for(i = 0; i < Text->Length/sizeof(WCHAR); i++) + DbgPrint("%C", Text->Buffer[i]); + DbgPrint(", %d\n", Text->Length/sizeof(WCHAR)); + #endif + + nclm.cbSize = sizeof(nclm); + if(!IntSystemParametersInfo(SPI_GETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICS), &nclm, 0)) + { + DPRINT1("%s: IntSystemParametersInfo() failed!\n", __FUNCTION__); + return FALSE; + } + + NtGdiSetBkMode(hDc, TRANSPARENT); + + if(uFlags & DC_SMALLCAP) + Status = TextIntCreateFontIndirect(&nclm.lfSmCaptionFont, &hFont); + else Status = TextIntCreateFontIndirect(&nclm.lfCaptionFont, &hFont); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("%s: TextIntCreateFontIndirect() failed! Status: 0x%x\n", + __FUNCTION__, Status); + return FALSE; + } + + hOldFont = NtGdiSelectObject(hDc, hFont); + if(!hOldFont) + { + DPRINT1("%s: SelectObject() failed!\n", __FUNCTION__); + NtGdiDeleteObject(hFont); + return FALSE; + } + + if(uFlags & DC_INBUTTON) + OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); + else OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE + ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); + + //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. + + NtGdiTextOut(hDc, lpRc->left, + lpRc->top, Text->Buffer, + Text->Length/sizeof(WCHAR)); + + NtGdiSetTextColor(hDc, OldTextColor); + NtGdiSelectObject(hDc, hOldFont); + NtGdiDeleteObject(hFont); + + return TRUE; +} + +BOOL UserDrawCaption( + PWINDOW_OBJECT pWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags) +{ + BOOL Ret = FALSE; + HBITMAP hMemBmp = NULL, hOldBmp = NULL; + HBRUSH hOldBrush = NULL; + HDC hMemDc = NULL; + ULONG Height; + UINT VCenter = 0, Padding = 0; + RECT r = *lpRc; + LONG ButtonWidth, IconWidth; + BOOL HasIcon; + + ASSERT(pWnd != NULL); + + hMemBmp = NtGdiCreateCompatibleBitmap(hDc, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top); + + if(!hMemBmp) + { + DPRINT1("%s: NtGdiCreateCompatibleBitmap() failed!\n", __FUNCTION__); + return FALSE; + } + + hMemDc = NtGdiCreateCompatibleDC(hDc); + if(!hMemDc) + { + DPRINT1("%s: NtGdiCreateCompatibleDC() failed!\n", __FUNCTION__); + goto cleanup; + } + + hOldBmp = NtGdiSelectObject(hMemDc, hMemBmp); + if(!hOldBmp) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + Height = UserGetSystemMetrics(SM_CYCAPTION) - 1; + VCenter = (lpRc->bottom - lpRc->top) / 2; + Padding = VCenter - (Height / 2); + HasIcon = (uFlags & DC_ICON) && (pWnd->Style & WS_SYSMENU) + && !(uFlags & DC_SMALLCAP); + IconWidth = UserGetSystemMetrics(SM_CXSIZE) + Padding; + + r.left = Padding; + r.right = r.left + (lpRc->right - lpRc->left); + r.top = Padding; + r.bottom = r.top + (Height / 2); + + // Draw the caption background + if(uFlags & DC_INBUTTON) + { + hOldBrush = NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_BTNFACE : COLOR_BTNSHADOW)); + + if(!hOldBrush) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(!NtGdiPatBlt(hMemDc, 0, 0, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top, + PATCOPY)) + { + DPRINT1("%s: NtGdiPatBlt() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(HasIcon) r.left+=IconWidth; + } + else + { + r.right = (lpRc->right - lpRc->left); + if(uFlags & DC_SMALLCAP) + ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; + else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; + + hOldBrush = NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION)); + + if(!hOldBrush) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + if(HasIcon && (uFlags & DC_GRADIENT)) + { + NtGdiPatBlt(hMemDc, 0, 0, + IconWidth+1, + lpRc->bottom - lpRc->top, + PATCOPY); + r.left+=IconWidth; + } + else + { + NtGdiPatBlt(hMemDc, 0, 0, + lpRc->right - lpRc->left, + lpRc->bottom - lpRc->top, + PATCOPY); + } + + if(uFlags & DC_GRADIENT) + { + static GRADIENT_RECT gcap = {0, 1}; + TRIVERTEX vert[2]; + COLORREF Colors[2]; + PDC pMemDc; + + if(pWnd->Style & WS_SYSMENU) + { + r.right -= 3 + ButtonWidth; + if(!(uFlags & DC_SMALLCAP)) + { + if(pWnd->Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + r.right -= 2 + 2 * ButtonWidth; + else r.right -= 2; + r.right -= 2; + } + + //Draw buttons background + if(!NtGdiSelectObject(hMemDc, + IntGetSysColorBrush(uFlags & DC_ACTIVE ? + COLOR_GRADIENTACTIVECAPTION:COLOR_GRADIENTINACTIVECAPTION))) + { + DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + goto cleanup; + } + + NtGdiPatBlt(hMemDc, + r.right, + 0, + lpRc->right - lpRc->left - r.right, + lpRc->bottom - lpRc->top, + PATCOPY); + } + + Colors[0] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); + + Colors[1] = IntGetSysColor((uFlags & DC_ACTIVE) ? + COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); + + vert[0].x = r.left; + vert[0].y = 0; + vert[0].Red = (WORD)Colors[0]<<8; + vert[0].Green = (WORD)Colors[0] & 0xFF00; + vert[0].Blue = (WORD)(Colors[0]>>8) & 0xFF00; + vert[0].Alpha = 0; + + vert[1].x = r.right; + vert[1].y = lpRc->bottom - lpRc->top; + vert[1].Red = (WORD)Colors[1]<<8; + vert[1].Green = (WORD)Colors[1] & 0xFF00; + vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00; + vert[1].Alpha = 0; + + pMemDc = DC_LockDc(hMemDc); + if(!pMemDc) + { + DPRINT1("%s: Can't lock dc!\n", __FUNCTION__); + goto cleanup; + } + + if(!IntGdiGradientFill(pMemDc, vert, 2, &gcap, + 1, GRADIENT_FILL_RECT_H)) + { + DPRINT1("%s: IntGdiGradientFill() failed!\n", __FUNCTION__); + } + + DC_UnlockDc(pMemDc); + } //if(uFlags & DC_GRADIENT) + } + + if(HasIcon) + { + r.top ++; + r.left -= --IconWidth; + IntDrawSysMenuButton(pWnd, hMemDc, &r, FALSE); + r.left += IconWidth; + r.top --; + } + + r.top ++; + r.left += 2; + + r.bottom = r.top + Height; + + if((uFlags & DC_TEXT) && pWnd->WindowName.Length) + { + if(!(uFlags & DC_GRADIENT)) + { + r.right = (lpRc->right - lpRc->left); + + if(uFlags & DC_SMALLCAP) + ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; + else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; + + if(pWnd->Style & WS_SYSMENU) + { + r.right -= 3 + ButtonWidth; + if(! (uFlags & DC_SMALLCAP)) + { + if(pWnd->Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) + r.right -= 2 + 2 * ButtonWidth; + else r.right -= 2; + r.right -= 2; + } + } + } + + IntDrawCaptionText(hMemDc, &pWnd->WindowName, &r, uFlags); + } + + if(!NtGdiBitBlt(hDc, lpRc->left, lpRc->top, + lpRc->right - lpRc->left, lpRc->bottom - lpRc->top, + hMemDc, 0, 0, SRCCOPY, 0, 0)) + { + DPRINT1("%s: NtGdiBitBlt() failed!\n", __FUNCTION__); + goto cleanup; + } + + Ret = TRUE; + +cleanup: + if (hOldBrush) NtGdiSelectObject(hMemDc, hOldBrush); + if (hOldBmp) NtGdiSelectObject(hMemDc, hOldBmp); + if (hMemBmp) NtGdiDeleteObject(hMemBmp); + if (hMemDc) NtGdiDeleteObjectApp(hMemDc); + + return Ret; +} + + +BOOL +STDCALL +NtUserDrawCaption(HWND hWnd, + HDC hDc, + LPCRECT lpRc, + UINT uFlags) +{ + PWINDOW_OBJECT pWnd; + RECT SafeRect; + BOOL Ret; + + if(!NT_SUCCESS(MmCopyFromCaller(&SafeRect, lpRc, sizeof(RECT)))) + { + DPRINT1("%s: MmCopyFromCaller failed!", __FUNCTION__); + return FALSE; + } + + UserEnterExclusive(); + + if(!(pWnd = UserGetWindowObject(hWnd))) + { + UserLeave(); + return FALSE; + } + + Ret = UserDrawCaption(pWnd, hDc, &SafeRect, uFlags); + + UserLeave(); + return Ret; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Wed Aug 9 00:00:53 2006 @@ -210,6 +210,12 @@ return nBrushes > 0; } +HGDIOBJ FASTCALL +IntGetSysColorBrush(INT Object) +{ + return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : SysColorBrushes[Object]; +} + BOOL FASTCALL IntGetSysColorPens(HPEN *Pens, UINT nPens) { @@ -252,6 +258,12 @@ } return nColors > 0; +} + +DWORD FASTCALL +IntGetSysColor(INT nIndex) +{ + return ((nIndex < 0) || (NUM_SYSCOLORS <= nIndex)) ? 0 : SysColors[nIndex]; } VOID FASTCALL

18 years, 2 months

[fireball] 23524: Force -fno-sibling-call-optimisation to every module's CFLAGs. This fixes *numerous* bugs (thanks to a bug in GCC itself), even in DBG=1 builds! Just an example, comctl32.dll doesn't crash anymore in LISTVIEW_Callback(). Thanks to Dmitriy Philippov (aka Shedon) for encountering the comctl32 bug and investigating it!

by fireball＠svn.reactos.org

Author: fireball Date: Tue Aug 8 16:41:56 2006 New Revision: 23524 URL: http://svn.reactos.org/svn/reactos?rev=23524&view=rev Log: Force -fno-sibling-call-optimisation to every module's CFLAGs. This fixes *numerous* bugs (thanks to a bug in GCC itself), even in DBG=1 builds! Just an example, comctl32.dll doesn't crash anymore in LISTVIEW_Callback(). Thanks to Dmitriy Philippov (aka Shedon) for encountering the comctl32 bug and investigating it! Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Aug 8 16:41:56 2006 @@ -1885,6 +1885,10 @@ globalCflags += " -pipe"; if ( !module.allowWarnings ) globalCflags += " -Werror"; + + // Always force disabling of sibling calls optimisation for GCC + // (TODO: Move to version-specific once this bug is fixed in GCC) + globalCflags += " -fno-optimize-sibling-calls"; fprintf ( fMakefile,

18 years, 2 months

[hpoussin] 23523: Give a valid name to the event

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Aug 8 15:10:59 2006 New Revision: 23523 URL: http://svn.reactos.org/svn/reactos?rev=23523&view=rev Log: Give a valid name to the event Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c Tue Aug 8 15:10:59 2006 @@ -20,7 +20,7 @@ hEvent = OpenEventW(EVENT_MODIFY_STATE, FALSE, - L"\\SECURITY_SERVICES_STARTED"); + L"Global\\SECURITY_SERVICES_STARTED"); if (hEvent != NULL) { SetEvent(hEvent);

18 years, 2 months

[hpoussin] 23522: Patch by Filip Navara: Remove the call to HvFree, as the hive was not initialized

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Aug 8 13:31:19 2006 New Revision: 23522 URL: http://svn.reactos.org/svn/reactos?rev=23522&view=rev Log: Patch by Filip Navara: Remove the call to HvFree, as the hive was not initialized Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Tue Aug 8 13:31:19 2006 @@ -697,7 +697,6 @@ if (!NT_SUCCESS (Status)) { DPRINT1 ("CmiInitNonVolatileRegistryHive() failed (Status %lx)\n", Status); - HvFree (Hive->Hive); ExFreePool (Hive); return Status; }

18 years, 2 months

[ekohl] 23521: - Implement ScmStartServiceA and revert the last modification of StartServiceA. - Fix EnumServicesStatusExW.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Aug 8 02:13:26 2006 New Revision: 23521 URL: http://svn.reactos.org/svn/reactos?rev=23521&view=rev Log: - Implement ScmStartServiceA and revert the last modification of StartServiceA. - Fix EnumServicesStatusExW. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Tue Aug 8 02:13:26 2006 @@ -2093,8 +2093,51 @@ unsigned char *lpServiceArgBuffer, unsigned long cbBufSize) { + DWORD dwError = ERROR_SUCCESS; + PSERVICE_HANDLE hSvc; + PSERVICE lpService = NULL; + NTSTATUS Status; + DPRINT1("ScmrStartServiceA() called\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + SERVICE_START)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + if (lpService->dwStartType == SERVICE_DISABLED) + return ERROR_SERVICE_DISABLED; + + if (lpService->bDeleted) + return ERROR_SERVICE_MARKED_FOR_DELETE; + + /* FIXME: Convert argument vector to Unicode */ + + /* Start the service */ + Status = ScmStartService(lpService); + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); + + return dwError; } Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Tue Aug 8 02:13:26 2006 @@ -1055,7 +1055,8 @@ lpStatusPtr++; } - if (dwError != ERROR_SUCCESS) + if (dwError != ERROR_SUCCESS && + dwError != ERROR_MORE_DATA) { DPRINT1("ScmrEnumServicesStatusExW() failed (Error %lu)\n", dwError); SetLastError(dwError); @@ -1970,16 +1971,72 @@ DWORD dwNumServiceArgs, LPCSTR *lpServiceArgVectors) { + LPSTR lpBuffer; + LPSTR lpStr; + DWORD dwError; + DWORD dwBufSize; + DWORD i; + + dwBufSize = 0; + for (i = 0; i < dwNumServiceArgs; i++) + { + dwBufSize += (strlen(lpServiceArgVectors[i]) + 1); + } + DPRINT1("dwBufSize: %lu\n", dwBufSize); + + lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); + if (lpBuffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + lpStr = lpBuffer; + for (i = 0; i < dwNumServiceArgs; i++) + { + strcpy(lpStr, lpServiceArgVectors[i]); + lpStr += (strlen(lpServiceArgVectors[i]) + 1); + } + + dwError = ScmrStartServiceA(BindingHandle, + (unsigned int)hService, + dwNumServiceArgs, + (unsigned char *)lpBuffer, + dwBufSize); + + HeapFree(GetProcessHeap(), 0, lpBuffer); + + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrStartServiceA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + + +/********************************************************************** + * StartServiceW + * + * @implemented + */ +BOOL STDCALL +StartServiceW(SC_HANDLE hService, + DWORD dwNumServiceArgs, + LPCWSTR *lpServiceArgVectors) +{ LPWSTR lpBuffer; LPWSTR lpStr; DWORD dwError; DWORD dwBufSize; - DWORD i, step; + DWORD i; dwBufSize = 0; for (i = 0; i < dwNumServiceArgs; i++) { - dwBufSize += MultiByteToWideChar(CP_ACP, 0, lpServiceArgVectors[i], -1, NULL, 0); + dwBufSize += ((wcslen(lpServiceArgVectors[i]) + 1) * sizeof(WCHAR)); } DPRINT1("dwBufSize: %lu\n", dwBufSize); @@ -1993,12 +2050,8 @@ lpStr = lpBuffer; for (i = 0; i < dwNumServiceArgs; i++) { - step = MultiByteToWideChar(CP_ACP, 0, - lpServiceArgVectors[i], -1, - lpStr, lpBuffer + dwBufSize - lpStr); - if (step == 0) - return FALSE; - lpStr += step + 1; + wcscpy(lpStr, lpServiceArgVectors[i]); + lpStr += (wcslen(lpServiceArgVectors[i]) + 1); } dwError = ScmrStartServiceW(BindingHandle, @@ -2021,62 +2074,6 @@ /********************************************************************** - * StartServiceW - * - * @implemented - */ -BOOL STDCALL -StartServiceW(SC_HANDLE hService, - DWORD dwNumServiceArgs, - LPCWSTR *lpServiceArgVectors) -{ - LPWSTR lpBuffer; - LPWSTR lpStr; - DWORD dwError; - DWORD dwBufSize; - DWORD i; - - dwBufSize = 0; - for (i = 0; i < dwNumServiceArgs; i++) - { - dwBufSize += ((wcslen(lpServiceArgVectors[i]) + 1) * sizeof(WCHAR)); - } - DPRINT1("dwBufSize: %lu\n", dwBufSize); - - lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); - if (lpBuffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - lpStr = lpBuffer; - for (i = 0; i < dwNumServiceArgs; i++) - { - wcscpy(lpStr, lpServiceArgVectors[i]); - lpStr += (wcslen(lpServiceArgVectors[i]) + 1); - } - - dwError = ScmrStartServiceW(BindingHandle, - (unsigned int)hService, - dwNumServiceArgs, - (unsigned char *)lpBuffer, - dwBufSize); - - HeapFree(GetProcessHeap(), 0, lpBuffer); - - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrStartServiceW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - return TRUE; -} - - -/********************************************************************** * UnlockServiceDatabase * * @implemented

18 years, 2 months

[hpoussin] 23520: - Start lsass.exe sooner, as Gina can call LsaRegisterLogonProcess in WlxInitialize - Check that loaded Gina has all needed functions - Set security attributes on windowstation and desktops

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 7 21:18:58 2006 New Revision: 23520 URL: http://svn.reactos.org/svn/reactos?rev=23520&view=rev Log: - Start lsass.exe sooner, as Gina can call LsaRegisterLogonProcess in WlxInitialize - Check that loaded Gina has all needed functions - Set security attributes on windowstation and desktops Modified: trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.rbuild trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Mon Aug 7 21:18:58 2006 @@ -137,7 +137,7 @@ if (!hService) goto cleanup; #if 0 - if (!StartService(hService, 0, NULL)) + if (!StartServiceW(hService, 0, NULL)) goto cleanup; #endif @@ -615,6 +615,12 @@ return 0; } + if (!StartLsass()) + { + DPRINT1("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); + return 1; + } + /* Load and initialize gina */ if (!GinaInit(WLSession)) { @@ -626,12 +632,6 @@ } DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); - - if (!StartLsass()) - { - DPRINT1("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); - return 1; - } #if 0 /* Connect to NetLogon service (lsass.exe) */ Modified: trunk/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rbuild (original) +++ trunk/reactos/base/system/winlogon/winlogon.rbuild Mon Aug 7 21:18:58 2006 @@ -3,6 +3,7 @@ <module name="winlogon" type="win32gui" installbase="system32" installname="winlogon.exe"> <include base="winlogon">.</include> <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0501</define> <library>ntdll</library> <library>kernel32</library> <library>user32</library> Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Mon Aug 7 21:18:58 2006 @@ -603,43 +603,41 @@ Functions->WlxActivateUserShell = (PFWLXACTIVATEUSERSHELL)GetProcAddress(hGina, "WlxActivateUserShell"); if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxDisplayLockedNotice = (PFWLXDISPLAYLOCKEDNOTICE)GetProcAddress(hGina, "WlxDisplayLockedNotice"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxDisplayLockedNotice) goto cleanup; Functions->WlxDisplaySASNotice = (PFWLXDISPLAYSASNOTICE)GetProcAddress(hGina, "WlxDisplaySASNotice"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxDisplaySASNotice) goto cleanup; Functions->WlxIsLockOk = (PFWLXISLOCKOK)GetProcAddress(hGina, "WlxIsLockOk"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxIsLockOk) goto cleanup; Functions->WlxIsLogoffOk = (PFWLXISLOGOFFOK)GetProcAddress(hGina, "WlxIsLogoffOk"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxIsLogoffOk) goto cleanup; Functions->WlxLoggedOnSAS = (PFWLXLOGGEDONSAS)GetProcAddress(hGina, "WlxLoggedOnSAS"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxLoggedOnSAS) goto cleanup; Functions->WlxLoggedOutSAS = (PFWLXLOGGEDOUTSAS)GetProcAddress(hGina, "WlxLoggedOutSAS"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxLoggedOutSAS) goto cleanup; Functions->WlxLogoff = (PFWLXLOGOFF)GetProcAddress(hGina, "WlxLogoff"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxLogoff) goto cleanup; Functions->WlxShutdown = (PFWLXSHUTDOWN)GetProcAddress(hGina, "WlxShutdown"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxShutdown) goto cleanup; Functions->WlxWkstaLockedSAS = (PFWLXWKSTALOCKEDSAS)GetProcAddress(hGina, "WlxWkstaLockedSAS"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxWkstaLockedSAS) goto cleanup; } if (*DllVersion >= WLX_VERSION_1_1) { Functions->WlxScreenSaverNotify = (PFWLXSCREENSAVERNOTIFY)GetProcAddress(hGina, "WlxScreenSaverNotify"); - if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxStartApplication = (PFWLXSTARTAPPLICATION)GetProcAddress(hGina, "WlxStartApplication"); - if (!Functions->WlxActivateUserShell) goto cleanup; } if (*DllVersion >= WLX_VERSION_1_3) { Functions->WlxDisplayStatusMessage = (PFWLXDISPLAYSTATUSMESSAGE)GetProcAddress(hGina, "WlxDisplayStatusMessage"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxDisplayStatusMessage) goto cleanup; Functions->WlxGetStatusMessage = (PFWLXGETSTATUSMESSAGE)GetProcAddress(hGina, "WlxGetStatusMessage"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxGetStatusMessage) goto cleanup; Functions->WlxNetworkProviderLoad = (PFWLXNETWORKPROVIDERLOAD)GetProcAddress(hGina, "WlxNetworkProviderLoad"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxNetworkProviderLoad) goto cleanup; Functions->WlxRemoveStatusMessage = (PFWLXREMOVESTATUSMESSAGE)GetProcAddress(hGina, "WlxRemoveStatusMessage"); - if (!Functions->WlxActivateUserShell) goto cleanup; + if (!Functions->WlxRemoveStatusMessage) goto cleanup; } ret = TRUE; @@ -670,6 +668,7 @@ Session->SuppressStatus = FALSE; PreviousWindowProc = NULL; + TRACE("Calling WlxInitialize(\"%S\")\n", Session->InteractiveWindowStationName); return Session->Gina.Functions.WlxInitialize( Session->InteractiveWindowStationName, (HANDLE)Session, @@ -682,6 +681,77 @@ CreateWindowStationAndDesktops( IN OUT PWLSESSION Session) { + BYTE LocalSystemBuffer[SECURITY_MAX_SID_SIZE]; + BYTE InteractiveBuffer[SECURITY_MAX_SID_SIZE]; + PSID pLocalSystemSid = (PSID)&LocalSystemBuffer; + PSID pInteractiveSid = (PSID)InteractiveBuffer; + DWORD SidSize, AclSize; + PACL pDefaultAcl = NULL; + PACL pUserDesktopAcl = NULL; + SECURITY_ATTRIBUTES DefaultSecurity; + SECURITY_ATTRIBUTES UserDesktopSecurity; + BOOL ret = FALSE; + + /* + * Prepare information for ACLs we will apply + */ + SidSize = SECURITY_MAX_SID_SIZE; + if (!CreateWellKnownSid(WinLocalSystemSid, NULL, pLocalSystemSid, &SidSize)) + { + ERR("WL: CreateWellKnownSid() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + SidSize = SECURITY_MAX_SID_SIZE; + if (!CreateWellKnownSid(WinInteractiveSid, NULL, pInteractiveSid, &SidSize)) + { + ERR("WL: CreateWellKnownSid() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + AclSize = sizeof(ACL) + + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(pLocalSystemSid) + + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(pInteractiveSid); + pDefaultAcl = HeapAlloc(GetProcessHeap(), 0, AclSize); + pUserDesktopAcl = HeapAlloc(GetProcessHeap(), 0, AclSize); + if (!pDefaultAcl || !pUserDesktopAcl) + { + ERR("WL: HeapAlloc() failed\n"); + goto cleanup; + } + + if (!InitializeAcl(pDefaultAcl, AclSize, ACL_REVISION) + || !InitializeAcl(pUserDesktopAcl, AclSize, ACL_REVISION)) + { + ERR("WL: InitializeAcl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* + * Create default ACL (window station, winlogon desktop, screen saver desktop) + */ + if (!AddAccessAllowedAce(pDefaultAcl, ACL_REVISION, GENERIC_ALL, pLocalSystemSid) + || !AddAccessAllowedAce(pDefaultAcl, ACL_REVISION, GENERIC_READ, pInteractiveSid)) + { + ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + DefaultSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); + DefaultSecurity.lpSecurityDescriptor = pDefaultAcl; + DefaultSecurity.bInheritHandle = TRUE; + + /* + * Create user desktop ACL + */ + if (!AddAccessAllowedAce(pUserDesktopAcl, ACL_REVISION, GENERIC_ALL, pLocalSystemSid) + || !AddAccessAllowedAce(pUserDesktopAcl, ACL_REVISION, GENERIC_ALL, pInteractiveSid)) + { + ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + UserDesktopSecurity.nLength = sizeof(SECURITY_ATTRIBUTES); + UserDesktopSecurity.lpSecurityDescriptor = pUserDesktopAcl; + UserDesktopSecurity.bInheritHandle = TRUE; + /* * Create the interactive window station */ @@ -690,13 +760,17 @@ Session->InteractiveWindowStationName, 0, WINSTA_CREATEDESKTOP, - NULL); + &DefaultSecurity); if (!Session->InteractiveWindowStation) { ERR("WL: Failed to create window station (%lu)\n", GetLastError()); - return FALSE; - } - SetProcessWindowStation(Session->InteractiveWindowStation); + goto cleanup; + } + if (!SetProcessWindowStation(Session->InteractiveWindowStation)) + { + ERR("WL: SetProcessWindowStation() failed (error %lu)\n", GetLastError()); + goto cleanup; + } /* * Create the application desktop @@ -705,13 +779,13 @@ L"Default", NULL, NULL, - 0, /* FIXME: Set some flags */ + 0, /* FIXME: Add DF_ALLOWOTHERACCOUNTHOOK flag? */ GENERIC_ALL, - NULL); + &UserDesktopSecurity); if (!Session->ApplicationDesktop) { ERR("WL: Failed to create Default desktop (%lu)\n", GetLastError()); - return FALSE; + goto cleanup; } /* @@ -721,13 +795,13 @@ L"Winlogon", NULL, NULL, - 0, /* FIXME: Set some flags */ + 0, GENERIC_ALL, - NULL); + &DefaultSecurity); if (!Session->WinlogonDesktop) { ERR("WL: Failed to create Winlogon desktop (%lu)\n", GetLastError()); - return FALSE; + goto cleanup; } /* @@ -737,13 +811,13 @@ L"Screen-Saver", NULL, NULL, - 0, /* FIXME: Set some flags */ + 0, GENERIC_ALL, - NULL); + &DefaultSecurity); if(!Session->ScreenSaverDesktop) { ERR("WL: Failed to create Screen-Saver desktop (%lu)\n", GetLastError()); - return FALSE; + goto cleanup; } /* FIXME: big HACK */ @@ -756,8 +830,24 @@ !SwitchDesktop(Session->WinlogonDesktop)) { ERR("WL: Cannot switch to Winlogon desktop (%lu)\n", GetLastError()); - return FALSE; - } - - return TRUE; -} + goto cleanup; + } + + ret = TRUE; + +cleanup: + if (!ret) + { + if (Session->ApplicationDesktop) + CloseDesktop(Session->ApplicationDesktop); + if (Session->WinlogonDesktop) + CloseDesktop(Session->WinlogonDesktop); + if (Session->ScreenSaverDesktop) + CloseDesktop(Session->ScreenSaverDesktop); + if (Session->InteractiveWindowStation) + CloseWindowStation(Session->InteractiveWindowStation); + } + HeapFree(GetProcessHeap(), 0, pDefaultAcl); + HeapFree(GetProcessHeap(), 0, pUserDesktopAcl); + return ret; +}

18 years, 2 months

[hpoussin] 23519: Call ScmrStartServiceW in StartServiceA to prevent code duplicating between ScmrStartServiceA/W in services.exe

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 7 21:04:48 2006 New Revision: 23519 URL: http://svn.reactos.org/svn/reactos?rev=23519&view=rev Log: Call ScmrStartServiceW in StartServiceA to prevent code duplicating between ScmrStartServiceA/W in services.exe Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Mon Aug 7 21:04:48 2006 @@ -2094,8 +2094,7 @@ unsigned long cbBufSize) { DPRINT1("ScmrStartServiceA() called\n"); - return ERROR_SUCCESS; -// return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Mon Aug 7 21:04:48 2006 @@ -1970,16 +1970,16 @@ DWORD dwNumServiceArgs, LPCSTR *lpServiceArgVectors) { - LPSTR lpBuffer; - LPSTR lpStr; + LPWSTR lpBuffer; + LPWSTR lpStr; DWORD dwError; DWORD dwBufSize; - DWORD i; + DWORD i, step; dwBufSize = 0; for (i = 0; i < dwNumServiceArgs; i++) { - dwBufSize += (strlen(lpServiceArgVectors[i]) + 1); + dwBufSize += MultiByteToWideChar(CP_ACP, 0, lpServiceArgVectors[i], -1, NULL, 0); } DPRINT1("dwBufSize: %lu\n", dwBufSize); @@ -1993,64 +1993,12 @@ lpStr = lpBuffer; for (i = 0; i < dwNumServiceArgs; i++) { - strcpy(lpStr, lpServiceArgVectors[i]); - lpStr += (strlen(lpServiceArgVectors[i]) + 1); - } - - dwError = ScmrStartServiceA(BindingHandle, - (unsigned int)hService, - dwNumServiceArgs, - (unsigned char *)lpBuffer, - dwBufSize); - - HeapFree(GetProcessHeap(), 0, lpBuffer); - - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrStartServiceA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - return TRUE; -} - - -/********************************************************************** - * StartServiceW - * - * @implemented - */ -BOOL STDCALL -StartServiceW(SC_HANDLE hService, - DWORD dwNumServiceArgs, - LPCWSTR *lpServiceArgVectors) -{ - LPWSTR lpBuffer; - LPWSTR lpStr; - DWORD dwError; - DWORD dwBufSize; - DWORD i; - - dwBufSize = 0; - for (i = 0; i < dwNumServiceArgs; i++) - { - dwBufSize += ((wcslen(lpServiceArgVectors[i]) + 1) * sizeof(WCHAR)); - } - DPRINT1("dwBufSize: %lu\n", dwBufSize); - - lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); - if (lpBuffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - lpStr = lpBuffer; - for (i = 0; i < dwNumServiceArgs; i++) - { - wcscpy(lpStr, lpServiceArgVectors[i]); - lpStr += (wcslen(lpServiceArgVectors[i]) + 1); + step = MultiByteToWideChar(CP_ACP, 0, + lpServiceArgVectors[i], -1, + lpStr, lpBuffer + dwBufSize - lpStr); + if (step == 0) + return FALSE; + lpStr += step + 1; } dwError = ScmrStartServiceW(BindingHandle, @@ -2073,6 +2021,62 @@ /********************************************************************** + * StartServiceW + * + * @implemented + */ +BOOL STDCALL +StartServiceW(SC_HANDLE hService, + DWORD dwNumServiceArgs, + LPCWSTR *lpServiceArgVectors) +{ + LPWSTR lpBuffer; + LPWSTR lpStr; + DWORD dwError; + DWORD dwBufSize; + DWORD i; + + dwBufSize = 0; + for (i = 0; i < dwNumServiceArgs; i++) + { + dwBufSize += ((wcslen(lpServiceArgVectors[i]) + 1) * sizeof(WCHAR)); + } + DPRINT1("dwBufSize: %lu\n", dwBufSize); + + lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); + if (lpBuffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + lpStr = lpBuffer; + for (i = 0; i < dwNumServiceArgs; i++) + { + wcscpy(lpStr, lpServiceArgVectors[i]); + lpStr += (wcslen(lpServiceArgVectors[i]) + 1); + } + + dwError = ScmrStartServiceW(BindingHandle, + (unsigned int)hService, + dwNumServiceArgs, + (unsigned char *)lpBuffer, + dwBufSize); + + HeapFree(GetProcessHeap(), 0, lpBuffer); + + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrStartServiceW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + + +/********************************************************************** * UnlockServiceDatabase * * @implemented

18 years, 2 months

[janderwald] 23518: * GUI settings for unattended setup

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 7 17:32:31 2006 New Revision: 23518 URL: http://svn.reactos.org/svn/reactos?rev=23518&view=rev Log: * GUI settings for unattended setup Modified: trunk/reactos/boot/bootdata/unattend.inf.sample Modified: trunk/reactos/boot/bootdata/unattend.inf.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf.sample (original) +++ trunk/reactos/boot/bootdata/unattend.inf.sample Mon Aug 7 17:32:31 2006 @@ -8,3 +8,11 @@ ;MBRInstallType=1 install MBR on floppy ;MBRInstallType=2 install MBR on hdd MBRInstallType=2 +FullName="MyName" +;OrgName="MyOrg" +ComputerName="MyComputerName"; +AdminPassword="MyPassword" +; TimeZone is set GMT as default +TimeZoneIndex=85 +; enable this setting to disable daylight saving changes +; DisableAutoDaylightTimeSet = 1

18 years, 2 months

← Newer
1
...
30
31
32
33
34
35
36
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2006