Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[weiden] 18388: fixed difference in signedness warning in MulDiv()

by weiden＠svn.reactos.com

fixed difference in signedness warning in MulDiv() Modified: trunk/reactos/lib/kernel32/misc/muldiv.c _____ Modified: trunk/reactos/lib/kernel32/misc/muldiv.c --- trunk/reactos/lib/kernel32/misc/muldiv.c 2005-10-09 22:15:06 UTC (rev 18387) +++ trunk/reactos/lib/kernel32/misc/muldiv.c 2005-10-09 22:30:27 UTC (rev 18388) @@ -39,7 +39,7 @@ /* Divide the product to get the quotient and remainder */ Result.LowPart = RtlEnlargedUnsignedDivide(*(PULARGE_INTEGER)&Result, (ULONG)nDenominator, - &Result.HighPart); + (PULONG)&Result.HighPart); /* Do the sign changes */ if ((LONG)Result.LowPart >= 0)

19 years, 2 months

[greatlrd] 18387: Fix DD_Cleanup that will make Contry Strike not crashing when it does not found right reslution, thx drfred that found the bug + source cleanup and small bugfix for ntddraw

by greatlrd＠svn.reactos.com

Fix DD_Cleanup that will make Contry Strike not crashing when it does not found right reslution, thx drfred that found the bug + source cleanup and small bugfix for ntddraw Modified: trunk/reactos/subsys/win32k/include/intddraw.h Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/include/intddraw.h --- trunk/reactos/subsys/win32k/include/intddraw.h 2005-10-09 22:12:56 UTC (rev 18386) +++ trunk/reactos/subsys/win32k/include/intddraw.h 2005-10-09 22:15:06 UTC (rev 18387) @@ -9,6 +9,7 @@ #define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00650000 + typedef struct { DD_SURFACE_LOCAL Local; @@ -25,8 +26,7 @@ DD_DIRECTDRAW_GLOBAL Global; // Drv callbacks PGD_GETDIRECTDRAWINFO DrvGetDirectDrawInfo; - PGD_DISABLEDIRECTDRAW DrvDisableDirectDraw; - PDD_GETDRIVERINFO DdGetDriverInfo; + PGD_DISABLEDIRECTDRAW DrvDisableDirectDraw; // DD callbacks DD_CALLBACKS DD; @@ -36,14 +36,29 @@ // Palette callbacks DD_PALETTECALLBACKS Pal; + + // HAL + DD_HALINFO Hal; + + // Color Control Callback + DD_COLORCONTROLCALLBACKS Color; + + // D3DHAL_CALLBACKS + //D3DHAL_CALLBACKS D3dHal; + //D3DHAL_CALLBACKS3 D3dHal3; + //D3DHAL_D3DEXTENDEDCAPS D3dHal3Ext; + + // Heap Callback + //DD_GETHEAPALIGNMENTDATA HeapData; - // Color Control Callback - PDD_COLORCB_COLORCONTROL DdControlColor; + // Kernel Callback + //DD_KERNELCALLBACKS Kernel; + //DDKERNELCAPS KernelCaps; + // Miscellaneous Callback - PDD_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; - // Kernel Callback - PDD_KERNELCB_SYNCSURFACE DdSyncSurfaceData; - PDD_KERNELCB_SYNCVIDEOPORT DdSyncVideoPortData; + DD_MISCELLANEOUSCALLBACKS Misc; + + // NT-based Callback PDD_FLIPTOGDISURFACE DdFlipToGDISurface; PDD_FREEDRIVERMEMORY DdFreeDriverMemory; @@ -77,17 +92,8 @@ PDD_VPORTCB_WAITFORSYNC DdVideoPortWaitForSync; // Notify Callback //LPDD_NOTIFYCALLBACK NotifyCallback + - - // D3D Device context callbacks - PD3DNTHAL_CONTEXTCREATECB D3dContextCreate; - PD3DNTHAL_CONTEXTDESTROYCB D3dContextDestroy; - // D3D Buffer callbacks - PDD_CANCREATESURFACE DdCanCreateD3DBuffer; - PDD_CREATESURFACE DdCreateD3DBuffer; - PDD_SURFCB_DESTROYSURFACE DdDestroyD3DBuffer; - PDD_SURFCB_LOCK DdLockD3DBuffer; - PDD_SURFCB_UNLOCK DdUnlockD3DBuffer; _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-09 22:12:56 UTC (rev 18386) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-09 22:15:06 UTC (rev 18387) @@ -20,8 +20,13 @@ BOOL INTERNAL_CALL DD_Cleanup(PVOID ObjectBody) { - PDD_DIRECTDRAW pDD = (PDD_DIRECTDRAW)ObjectBody; - pDD->DrvDisableDirectDraw(pDD->Global.dhpdev); + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(ObjectBody, GDI_OBJECT_TYPE_DIRECTDRAW); + if (!pDirectDraw) + return FALSE; + + pDirectDraw->DrvDisableDirectDraw(pDirectDraw->Global.dhpdev); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); return TRUE; } @@ -33,13 +38,14 @@ DD_SURFACECALLBACKS surface_callbacks; DD_PALETTECALLBACKS palette_callbacks; - RtlZeroMemory(&callbacks, sizeof(callbacks)); - callbacks.dwSize = sizeof(callbacks); - RtlZeroMemory(&surface_callbacks, sizeof(surface_callbacks)); - surface_callbacks.dwSize = sizeof(surface_callbacks); - RtlZeroMemory(&palette_callbacks, sizeof(palette_callbacks)); - palette_callbacks.dwSize = sizeof(palette_callbacks); + RtlZeroMemory(&callbacks, sizeof(DD_CALLBACKS)); + callbacks.dwSize = sizeof(DD_CALLBACKS); + RtlZeroMemory(&surface_callbacks, sizeof(DD_SURFACECALLBACKS)); + surface_callbacks.dwSize = sizeof(DD_SURFACECALLBACKS); + RtlZeroMemory(&palette_callbacks, sizeof(DD_PALETTECALLBACKS)); + palette_callbacks.dwSize = sizeof(DD_PALETTECALLBACKS); + DC *pDC = DC_LockDc(hdc); if (!pDC) return NULL; @@ -83,68 +89,16 @@ pDirectDraw->DrvGetDirectDrawInfo = pDC->DriverFunctions.GetDirectDrawInfo; pDirectDraw->DrvDisableDirectDraw = pDC->DriverFunctions.DisableDirectDraw; - - /* DD_CALLBACKS setup */ - pDirectDraw->DD.dwFlags = callbacks.dwFlags; - - /* DestroyDriver Unsuse in win2k or higher */ - if (callbacks.dwFlags & DDHAL_CB32_DESTROYDRIVER) - pDirectDraw->DD.DestroyDriver = callbacks.DestroyDriver; - if (callbacks.dwFlags & DDHAL_CB32_CREATESURFACE) - pDirectDraw->DD.CreateSurface = callbacks.CreateSurface; - if (callbacks.dwFlags & DDHAL_CB32_SETCOLORKEY) - pDirectDraw->DD.SetColorKey = callbacks.SetColorKey; - if (callbacks.dwFlags & DDHAL_CB32_SETMODE) - pDirectDraw->DD.SetMode = callbacks.SetMode; - if (callbacks.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) - pDirectDraw->DD.WaitForVerticalBlank = callbacks.WaitForVerticalBlank; - if (callbacks.dwFlags & DDHAL_CB32_CANCREATESURFACE) - pDirectDraw->DD.CanCreateSurface = callbacks.CanCreateSurface; - if (callbacks.dwFlags & DDHAL_CB32_CREATEPALETTE) - pDirectDraw->DD.CreatePalette = callbacks.CreatePalette; - if (callbacks.dwFlags & DDHAL_CB32_GETSCANLINE) - pDirectDraw->DD.GetScanLine = callbacks.GetScanLine; - if (callbacks.dwFlags & DDHAL_CB32_MAPMEMORY) - pDirectDraw->DD.MapMemory = callbacks.MapMemory; - /* Surface Callbacks */ - pDirectDraw->Surf.dwFlags = surface_callbacks.dwFlags; + /* DD_CALLBACKS setup */ + RtlMoveMemory(&pDirectDraw->DD, &callbacks, sizeof(DD_CALLBACKS)); - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) - pDirectDraw->Surf.DestroySurface = surface_callbacks.DestroySurface; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_FLIP) - pDirectDraw->Surf.Flip = surface_callbacks.Flip; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_SETCLIPLIST) - pDirectDraw->Surf.SetClipList = surface_callbacks.SetClipList; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_LOCK) - pDirectDraw->Surf.Lock = surface_callbacks.Lock; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_UNLOCK) - pDirectDraw->Surf.Unlock = surface_callbacks.Unlock; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_BLT) - pDirectDraw->Surf.Blt = surface_callbacks.Blt; - /* DD Callbacks SetColorKey is same as Surface callback SetColorKey */ - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_SETCOLORKEY) - pDirectDraw->Surf.SetColorKey = surface_callbacks.SetColorKey; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_ADDATTACHEDSURFACE) - pDirectDraw->Surf.AddAttachedSurface = surface_callbacks.AddAttachedSurface; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_GETBLTSTATUS) - pDirectDraw->Surf.GetBltStatus = surface_callbacks.GetBltStatus; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_GETFLIPSTATUS) - pDirectDraw->Surf.GetFlipStatus = surface_callbacks.GetFlipStatus; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) - pDirectDraw->Surf.UpdateOverlay = surface_callbacks.UpdateOverlay; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_SETOVERLAYPOSITION) - pDirectDraw->Surf.SetOverlayPosition = surface_callbacks.SetOverlayPosition; - if (surface_callbacks.dwFlags & DDHAL_SURFCB32_SETPALETTE) - pDirectDraw->Surf.SetPalette = surface_callbacks.SetPalette; - - /* Palette Callbacks */ - pDirectDraw->Pal.dwFlags = palette_callbacks.dwFlags; - if (palette_callbacks.dwFlags & DDHAL_PALCB32_DESTROYPALETTE) - pDirectDraw->Pal.DestroyPalette = palette_callbacks.DestroyPalette; - if (palette_callbacks.dwFlags & DDHAL_PALCB32_SETENTRIES) - pDirectDraw->Pal.SetEntries = palette_callbacks.SetEntries; + /* DD_SURFACECALLBACKS setup*/ + RtlMoveMemory(&pDirectDraw->Surf, &surface_callbacks, sizeof(DD_SURFACECALLBACKS)); + /* DD_PALETTECALLBACKS setup*/ + RtlMoveMemory(&pDirectDraw->Pal, &surface_callbacks, sizeof(DD_PALETTECALLBACKS)); + GDIOBJ_UnlockObjByPtr(pDirectDraw); DC_UnlockDc(pDC); @@ -190,35 +144,53 @@ return FALSE; } - if (pHalInfo->lpD3DHALCallbacks) + if (pHalInfo) { - RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, sizeof(D3DNTHAL_CALLBACKS)); - pDirectDraw->D3dContextCreate = puD3dCallbacks->ContextCreate; - pDirectDraw->D3dContextDestroy = puD3dCallbacks->ContextDestroy; - } + RtlMoveMemory(&pDirectDraw->Hal, pHalInfo, sizeof(DD_HALINFO)); - if (pHalInfo->lpD3DGlobalDriverData) - { - RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - } + if (pHalInfo->lpD3DHALCallbacks) + { + RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, sizeof(D3DNTHAL_CALLBACKS)); + } - if (pHalInfo->lpD3DBufCallbacks) - { - RtlMoveMemory(puD3dBufferCallbacks, pHalInfo->lpD3DBufCallbacks, sizeof(DD_D3DBUFCALLBACKS)); - pDirectDraw->DdCanCreateD3DBuffer = puD3dBufferCallbacks->CanCreateD3DBuffer; - pDirectDraw->DdCreateD3DBuffer = puD3dBufferCallbacks->CreateD3DBuffer; - pDirectDraw->DdDestroyD3DBuffer = puD3dBufferCallbacks->DestroyD3DBuffer; - pDirectDraw->DdLockD3DBuffer = puD3dBufferCallbacks->LockD3DBuffer; - pDirectDraw->DdUnlockD3DBuffer = puD3dBufferCallbacks->UnlockD3DBuffer; - } - - + if (pHalInfo->lpD3DGlobalDriverData) + { + RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + } + if (pHalInfo->lpD3DBufCallbacks) + { + RtlMoveMemory(puD3dBufferCallbacks, pHalInfo->lpD3DBufCallbacks, sizeof(DD_D3DBUFCALLBACKS)); + } + + } + GDIOBJ_UnlockObjByPtr(pDirectDraw); return TRUE; } +DWORD STDCALL NtGdiDdGetDriverInfo( + HANDLE hDirectDrawLocal, + PDD_GETDRIVERINFODATA puGetDriverInfoData) + +{ + DWORD ddRVal; + + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (!(pDirectDraw->Hal.dwFlags & DDHALINFO_GETDRIVERINFOSET)) + ddRVal = DDHAL_DRIVER_NOTHANDLED; + else + ddRVal = pDirectDraw->Hal.GetDriverInfo(puGetDriverInfoData); + + GDIOBJ_UnlockObjByPtr(pDirectDraw); + + return ddRVal; +} + /*********************************************************************** */ /* DD CALLBACKS */ /* FIXME NtGdiDdCreateSurface we do not call to ddCreateSurface */ @@ -653,45 +625,16 @@ } */ - - -DWORD STDCALL NtGdiDdGetDriverInfo( - HANDLE hDirectDrawLocal, - PDD_GETDRIVERINFODATA puGetDriverInfoData) - -{ - DWORD ddRVal; - - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - - ddRVal = pDirectDraw->DdGetDriverInfo(puGetDriverInfoData); - - GDIOBJ_UnlockObjByPtr(pDirectDraw); - - return ddRVal; -} - - - - - - - - - - - - DWORD STDCALL NtGdiDdGetAvailDriverMemory( HANDLE hDirectDrawLocal, PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - ddRVal = pDirectDraw->DdGetAvailDriverMemory(puGetAvailDriverMemoryData); + // ddRVal = pDirectDraw->DdGetAvailDriverMemory(puGetAvailDriverMemoryData); GDIOBJ_UnlockObjByPtr(pDirectDraw);

19 years, 2 months

[gdalsnes] 18386: Fix MulDiv. This fixes almost any progress-bar to stop showing negative values during installations or etc. Thanks to kichik for originally having found the bug.

by gdalsnes＠svn.reactos.com

Fix MulDiv. This fixes almost any progress-bar to stop showing negative values during installations or etc. Thanks to kichik for originally having found the bug. Patch by alex ionescu Modified: trunk/reactos/lib/kernel32/misc/muldiv.c _____ Modified: trunk/reactos/lib/kernel32/misc/muldiv.c --- trunk/reactos/lib/kernel32/misc/muldiv.c 2005-10-09 22:09:02 UTC (rev 18385) +++ trunk/reactos/lib/kernel32/misc/muldiv.c 2005-10-09 22:12:56 UTC (rev 18386) @@ -13,48 +13,42 @@ * * @implemented */ -INT STDCALL MulDiv( - INT nMultiplicand, - INT nMultiplier, - INT nDivisor) +INT +WINAPI +MulDiv(INT nNumber, + INT nNumerator, + INT nDenominator) { -#if SIZEOF_LONG_LONG >= 8 - long long ret; - - if (!nDivisor) return -1; - - /* We want to deal with a positive divisor to simplify the logic. */ - if (nDivisor < 0) + LARGE_INTEGER Result; + LONG Negative; + + /* Find out if this will be a negative result */ + Negative = nNumber ^ nNumerator ^ nDenominator; + + /* Turn all the parameters into absolute values */ + if (nNumber < 0) nNumber *= -1; + if (nNumerator < 0) nNumerator *= -1; + if (nDenominator < 0) nDenominator *= -1; + + /* Calculate the result */ + Result.QuadPart = Int32x32To64(nNumber, nNumerator) + (nDenominator / 2); + + /* Now check for overflow */ + if (nDenominator > Result.HighPart) { - nMultiplicand = - nMultiplicand; - nDivisor = -nDivisor; + /* Divide the product to get the quotient and remainder */ + Result.LowPart = RtlEnlargedUnsignedDivide(*(PULARGE_INTEGER)&Result, + (ULONG)nDenominator, + &Result.HighPart); + + /* Do the sign changes */ + if ((LONG)Result.LowPart >= 0) + { + return (Negative >= 0) ? Result.LowPart : -(LONG)Result.LowPart; + } } - - /* If the result is positive, we "add" to round. else, we subtract to round. */ - if ( ( (nMultiplicand < 0) && (nMultiplier < 0) ) || - ( (nMultiplicand >= 0) && (nMultiplier >= 0) ) ) - ret = (((long long)nMultiplicand * nMultiplier) + (nDivisor/2)) / nDivisor; - else - ret = (((long long)nMultiplicand * nMultiplier) - (nDivisor/2)) / nDivisor; - - if ((ret > 2147483647) || (ret < -2147483647)) return -1; - return ret; -#else - if (!nDivisor) return -1; - - /* We want to deal with a positive divisor to simplify the logic. */ - if (nDivisor < 0) - { - nMultiplicand = - nMultiplicand; - nDivisor = -nDivisor; - } - - /* If the result is positive, we "add" to round. else, we subtract to round. */ - if ( ( (nMultiplicand < 0) && (nMultiplier < 0) ) || - ( (nMultiplicand >= 0) && (nMultiplier >= 0) ) ) - return ((nMultiplicand * nMultiplier) + (nDivisor/2)) / nDivisor; - - return ((nMultiplicand * nMultiplier) - (nDivisor/2)) / nDivisor; - -#endif + + /* Return overflow */ + return - 1; } +

19 years, 2 months

[weiden] 18385: use the correct down-level scope filter flag for the computer selection dialog

by weiden＠svn.reactos.com

use the correct down-level scope filter flag for the computer selection dialog Modified: trunk/reactos/lib/aclui/misc.c _____ Modified: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-10-09 20:56:17 UTC (rev 18384) +++ trunk/reactos/lib/aclui/misc.c 2005-10-09 22:09:02 UTC (rev 18385) @@ -136,12 +136,10 @@ IN ACCESS_MASK DesiredAccess, OUT PLSA_HANDLE PolicyHandle) { - LSA_OBJECT_ATTRIBUTES LsaObjectAttributes; + LSA_OBJECT_ATTRIBUTES LsaObjectAttributes = {0}; LSA_UNICODE_STRING LsaSystemName, *psn; NTSTATUS Status; - ZeroMemory(&LsaObjectAttributes, sizeof(LSA_OBJECT_ATTRIBUTES)); - if (SystemName != NULL) { LsaSystemName.Buffer = SystemName; @@ -227,7 +225,7 @@ { DSOP_INIT_INFO InitInfo; UINT i; - DSOP_SCOPE_INIT_INFO Scopes[] = + static DSOP_SCOPE_INIT_INFO Scopes[] = { { sizeof(DSOP_SCOPE_INIT_INFO), @@ -253,7 +251,7 @@ InitInfo.pwzTargetComputer = ServerName; InitInfo.cDsScopeInfos = sizeof(Scopes) / sizeof(Scopes[0]); InitInfo.aDsScopeInfos = Scopes; - InitInfo.flOptions = DSOP_FLAG_MULTISELECT | DSOP_SCOPE_TYPE_TARGET_COMPUTER; + InitInfo.flOptions = DSOP_FLAG_MULTISELECT; InitInfo.cAttributesToFetch = sizeof(ObjectPickerAttributes) / sizeof(ObjectPickerAttributes[0]); InitInfo.apwzAttributeNames = ObjectPickerAttributes;

19 years, 2 months

[weiden] 18384: add a not yet complete tool to dump the recycle bin databases

by weiden＠svn.reactos.com

add a not yet complete tool to dump the recycle bin databases Added: trunk/reactos/apps/utils/dumprecbin/ Added: trunk/reactos/apps/utils/dumprecbin/dumprecbin.c Added: trunk/reactos/apps/utils/dumprecbin/dumprecbin.xml Property changes on: trunk/reactos/apps/utils/dumprecbin ___________________________________________________________________ Name: svn:ignore + *.o *.a *.d *.exe *.coff *.sym *.map GNUmakefile _____ Added: trunk/reactos/apps/utils/dumprecbin/dumprecbin.c --- trunk/reactos/apps/utils/dumprecbin/dumprecbin.c 2005-10-09 20:24:00 UTC (rev 18383) +++ trunk/reactos/apps/utils/dumprecbin/dumprecbin.c 2005-10-09 20:56:17 UTC (rev 18384) @@ -0,0 +1,733 @@ +/* + * + * dumprecbin - dumps a recycle bin database + * + * Copyright (c) 2005 by Thomas Weidenmueller <w3seek(a)reactos.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * TODO: - Support for Vista recycle bins (read the DeleteInfo NTFS streams, also NT 5.x) + * - Support for INFO databases (win95) + */ +#include <windows.h> +#include <winternl.h> +#include <sddl.h> +#include <ntsecapi.h> +#include <stdio.h> +#include <ctype.h> +#include <tchar.h> + +#ifndef NT_SUCCESS +#define NT_SUCCESS(status) ((LONG)(status) >= 0) +#endif + +typedef struct _RECYCLE_BIN +{ + struct _RECYCLE_BIN *Next; + PSID Sid; + WCHAR User[255]; + WCHAR Path[MAX_PATH + 1]; +} RECYCLE_BIN, *PRECYCLE_BIN; + +typedef enum +{ + ivUnknown = 0, + ivINFO2 +} INFO_VERSION, *PINFO_VERSION; + +typedef struct _INFO2_HEADER +{ + DWORD Version; + DWORD Zero1; + DWORD Zero2; + DWORD RecordSize; +} INFO2_HEADER, *PINFO2_HEADER; + +typedef struct _INFO2_RECORD +{ + DWORD Unknown; + CHAR AnsiFileName[MAX_PATH]; + DWORD RecordNumber; + DWORD DriveLetter; + FILETIME DeletionTime; + DWORD DeletedPhysicalSize; + WCHAR FileName[MAX_PATH - 2]; +} INFO2_RECORD, *PINFO2_RECORD; + +static HANDLE +OpenAndMapInfoDatabase(IN LPTSTR szFileName, + OUT PVOID *MappingBasePtr, + OUT PLARGE_INTEGER FileSize) +{ + HANDLE hFile, hMapping = INVALID_HANDLE_VALUE; + + hFile = CreateFile(szFileName, + FILE_READ_DATA, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM, + NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + if (GetFileSizeEx(hFile, + FileSize) && + FileSize->QuadPart >= 0xF) + { + hMapping = CreateFileMapping(hFile, + NULL, + PAGE_READONLY, + 0, + 0, + NULL); + if (hMapping == NULL || + !(*MappingBasePtr = MapViewOfFile(hMapping, + FILE_MAP_READ, + 0, + 0, + 0))) + { + if (hMapping != NULL) + { + CloseHandle(hMapping); + } + hMapping = INVALID_HANDLE_VALUE; + } + } + CloseHandle(hFile); + } + + return hMapping; +} + +static VOID +UnmapAndCloseDatabase(IN HANDLE hMapping, + IN PVOID MappingBasePtr) +{ + UnmapViewOfFile(MappingBasePtr); + CloseHandle(hMapping); +} + +static INFO_VERSION +DetectDatabaseVersion(PVOID Header) +{ + PINFO2_HEADER Info2 = (PINFO2_HEADER)Header; + INFO_VERSION Version = ivUnknown; + + if (Info2->Version == 5 && + Info2->Zero1 == 0 && + Info2->Zero2 == 0 && + Info2->RecordSize == 0x320) + { + Version = ivINFO2; + } + + return Version; +} + +static BOOL +IsValidRecycleBin(IN LPTSTR szPath) +{ + TCHAR szFile[MAX_PATH + 1]; + TCHAR szClsId[48]; + INFO_VERSION DbVersion = ivUnknown; + + _stprintf(szFile, + _T("%s\\desktop.ini"), + szPath); + + /* check if directory contains a valid desktop.ini for the recycle bin */ + if (GetPrivateProfileString(TEXT(".ShellClassInfo"), + TEXT("CLSID"), + NULL, + szClsId, + sizeof(szClsId) / sizeof(szClsId[0]), + szFile) && + !_tcsicmp(_T("{645FF040-5081-101B-9F08-00AA002F954E}"), + szClsId)) + { + HANDLE hDb; + LARGE_INTEGER FileSize; + PVOID pDbBase = NULL; + + /* open the database and check the signature */ + _stprintf(szFile, + _T("%s\\INFO2"), + szPath); + hDb = OpenAndMapInfoDatabase(szFile, + &pDbBase, + &FileSize); + if (hDb != INVALID_HANDLE_VALUE) + { + DbVersion = DetectDatabaseVersion(pDbBase); + UnmapAndCloseDatabase(hDb, + pDbBase); + } + } + + return DbVersion != ivUnknown; +} + +static BOOL +OpenLocalLSAPolicyHandle(IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE PolicyHandle) +{ + LSA_OBJECT_ATTRIBUTES LsaObjectAttributes = {0}; + NTSTATUS Status; + + Status = LsaOpenPolicy(NULL, + &LsaObjectAttributes, + DesiredAccess, + PolicyHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(LsaNtStatusToWinError(Status)); + return FALSE; + } + + return TRUE; +} + +static BOOL +ConvertSIDToAccountName(IN PSID Sid, + OUT LPWSTR User) +{ + DWORD AccountNameLen = 0; + DWORD DomainNameLen = 0; + SID_NAME_USE NameUse; + DWORD Error = ERROR_SUCCESS; + LPWSTR AccountName, DomainName; + BOOL Ret = FALSE; + + if (!LookupAccountSidW(NULL, + Sid, + NULL, + &AccountNameLen, + NULL, + &DomainNameLen, + &NameUse)) + { + Error = GetLastError(); + if (Error == ERROR_NONE_MAPPED || + Error != ERROR_INSUFFICIENT_BUFFER) + { + /* some unexpected error occured! */ + goto ConvertSID; + } + } + + AccountName = (LPWSTR)HeapAlloc(GetProcessHeap(), + 0, + (AccountNameLen + DomainNameLen) * sizeof(WCHAR)); + if (AccountName != NULL) + { + LSA_HANDLE PolicyHandle; + DomainName = AccountName + AccountNameLen; + + if (!LookupAccountSidW(NULL, + Sid, + AccountName, + &AccountNameLen, + DomainName, + &DomainNameLen, + &NameUse)) + { + goto BailFreeAccountName; + } + + wcscpy(User, + AccountName); + Ret = TRUE; + + if (OpenLocalLSAPolicyHandle(POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, + &PolicyHandle)) + { + PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain; + PLSA_TRANSLATED_NAME Names; + PLSA_TRUST_INFORMATION Domain; + PLSA_UNICODE_STRING DomainName; + PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL; + NTSTATUS Status; + + Status = LsaLookupSids(PolicyHandle, + 1, + &Sid, + &ReferencedDomain, + &Names); + if (NT_SUCCESS(Status)) + { + if (ReferencedDomain != NULL && + Names->DomainIndex >= 0) + { + Domain = &ReferencedDomain->Domains[Names->DomainIndex]; + DomainName = &Domain->Name; + } + else + { + Domain = NULL; + DomainName = NULL; + } + + switch (Names->Use) + { + case SidTypeAlias: + if (Domain != NULL) + { + /* query the domain name for BUILTIN accounts */ + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID*)&PolicyAccountDomainInfo); + if (NT_SUCCESS(Status)) + { + DomainName = &PolicyAccountDomainInfo->DomainName; + } + } + /* fall through */ + + case SidTypeUser: + { + if (Domain != NULL) + { + WCHAR *s; + + /* NOTE: LSA_UNICODE_STRINGs are not always NULL-terminated! */ + + wcscpy(User, + AccountName); + wcscat(User, + L" ("); + s = User + wcslen(User); + CopyMemory(s, + DomainName->Buffer, + DomainName->Length); + s += DomainName->Length / sizeof(WCHAR); + *(s++) = L'\\'; + CopyMemory(s, + Names->Name.Buffer, + Names->Name.Length); + s += Names->Name.Length / sizeof(WCHAR); + *(s++) = L')'; + *s = L'\0'; + } + break; + } + + case SidTypeWellKnownGroup: + { + break; + } + + default: + { + _ftprintf(stderr, + _T("Unhandled SID type: 0x%x\n"), + Names->Use); + break; + } + } + + if (PolicyAccountDomainInfo != NULL) + { + LsaFreeMemory(PolicyAccountDomainInfo); + } + + LsaFreeMemory(ReferencedDomain); + LsaFreeMemory(Names); + } + + LsaClose(PolicyHandle); + + if (!NT_SUCCESS(Status)) + { + Ret = FALSE; + goto BailFreeAccountName; + } + } + else + { +BailFreeAccountName: + HeapFree(GetProcessHeap(), + 0, + AccountName); + goto ConvertSID; + } + } + +ConvertSID: + if (!Ret) + { + LPWSTR StrSid; + Ret = ConvertSidToStringSidW(Sid, + &StrSid); + if (Ret) + { + wcscpy(User, + StrSid); + LocalFree((HLOCAL)StrSid); + } + } + + return Ret; +} + +static VOID +FreeRecycleBinsList(IN OUT PRECYCLE_BIN *RecycleBinsListHead) +{ + PRECYCLE_BIN CurrentBin, NextBin; + + CurrentBin = *RecycleBinsListHead; + while (CurrentBin != NULL) + { + NextBin = CurrentBin->Next; + LocalFree((HLOCAL)CurrentBin->Sid); + HeapFree(GetProcessHeap(), + 0, + CurrentBin); + CurrentBin = NextBin; + } + + *RecycleBinsListHead = NULL; +} + +static BOOL +LocateRecycleBins(IN LPWSTR szDrive, + OUT PRECYCLE_BIN *RecycleBinsListHead) +{ + TCHAR szRecBinPath[MAX_PATH + 1]; + HANDLE FindResult; + WIN32_FIND_DATA FindData; + PRECYCLE_BIN NewBin; + BOOL Ret = FALSE; + + FreeRecycleBinsList(RecycleBinsListHead); + + /* + * search for recycle bins on volumes that support file security (NTFS) + */ + _stprintf(szRecBinPath, + _T("%lS\\RECYCLER\\*"), + szDrive); + FindResult = FindFirstFile(szRecBinPath, + &FindData); + if (FindResult != INVALID_HANDLE_VALUE) + { + do + { + if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY && + _tcscmp(FindData.cFileName, + _T("..")) && + _tcscmp(FindData.cFileName, + _T("."))) + { + PSID Sid; + + if (ConvertStringSidToSid(FindData.cFileName, + &Sid)) + { + _stprintf(szRecBinPath, + _T("%s\\RECYCLER\\%s"), + szDrive, + FindData.cFileName); + if (IsValidRecycleBin(szRecBinPath)) + { + NewBin = (PRECYCLE_BIN)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(RECYCLE_BIN)); + if (NewBin != NULL) + { + _tcscpy(NewBin->Path, + szRecBinPath); + + /* convert the SID to an account name */ + ConvertSIDToAccountName(Sid, + NewBin->User); + + /* append the recycle bin */ + *RecycleBinsListHead = NewBin; + RecycleBinsListHead = &NewBin->Next; + + Ret = TRUE; + } + else + goto ContinueFreeSid; + } + else + { +ContinueFreeSid: + LocalFree((HLOCAL)Sid); + } + } + } + } while (FindNextFile(FindResult, + &FindData)); + + FindClose(FindResult); + } + + /* + * search for recycle bins on volumes that don't support file security (FAT) + */ + _stprintf(szRecBinPath, + _T("%s\\Recycled"), + szDrive); + FindResult = FindFirstFile(szRecBinPath, + &FindData); + if (FindResult != INVALID_HANDLE_VALUE) + { + if (IsValidRecycleBin(szRecBinPath)) + { + SID_IDENTIFIER_AUTHORITY WorldSia = {SECURITY_WORLD_SID_AUTHORITY}; + PSID EveryoneSid; + + /* create an Everyone SID */ + if (AllocateAndInitializeSid(&WorldSia, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid)) + { + NewBin = (PRECYCLE_BIN)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(RECYCLE_BIN)); + if (NewBin != NULL) + { + _tcscpy(NewBin->Path, + szRecBinPath); + + /* convert the SID to an account name */ + ConvertSIDToAccountName(EveryoneSid, + NewBin->User); + + /* append the recycle bin */ + *RecycleBinsListHead = NewBin; + RecycleBinsListHead = &NewBin->Next; + + Ret = TRUE; + } + else + FreeSid(EveryoneSid); + } + } + FindClose(FindResult); + } + + return Ret; +} + +static VOID +DiskFileNameFromRecord(OUT LPTSTR szShortFileName, + IN DWORD RecordNumber, + IN WCHAR cDriveLetter, + IN LPWSTR szFileName) +{ + LPWSTR FileExt; + + FileExt = wcsrchr(szFileName, + L'.'); + if (FileExt != NULL) + { + _stprintf(szShortFileName, + _T("D%lC%d%lS"), + cDriveLetter, + RecordNumber, + FileExt); + } + else + { + _stprintf(szShortFileName, + _T("D%lC%d"), + cDriveLetter, + RecordNumber); + } +} + +static BOOL +DumpRecycleBin(IN PRECYCLE_BIN RecycleBin) +{ + WCHAR szFile[MAX_PATH + 1]; + HANDLE hDb; + LARGE_INTEGER FileSize; + PVOID pDbBase = NULL; + INFO_VERSION Version = ivUnknown; + + _tprintf(_T("Dumping recycle bin of \"%lS\":\n"), + RecycleBin->User); + _tprintf(_T("Directory: %lS\n\n"), + RecycleBin->Path); + + _stprintf(szFile, + _T("%s\\INFO2"), + RecycleBin->Path); + hDb = OpenAndMapInfoDatabase(szFile, + &pDbBase, + &FileSize); + if (hDb != INVALID_HANDLE_VALUE) + { + Version = DetectDatabaseVersion(pDbBase); + + /* dump the INFO2 database */ + switch (Version) + { + case ivINFO2: + { + DWORD nRecords; + PINFO2_HEADER Info2Header = (PINFO2_HEADER)pDbBase; + PINFO2_RECORD Info2 = (PINFO2_RECORD)(Info2Header + 1); + int i = 0; + + nRecords = (FileSize.QuadPart - sizeof(INFO2_HEADER)) / Info2Header->RecordSize; + + while (nRecords != 0) + { + /* if the first character of the AnsiFileName is zero, the record + is considered deleted */ + if (Info2->AnsiFileName[0] != '\0') + { + _tprintf(_T(" [%d] Record: #%d \"%lS\"\n"), + ++i, + Info2->RecordNumber, + Info2->FileName); + + DiskFileNameFromRecord(szFile, + Info2->RecordNumber, + (WCHAR)Info2->DriveLetter + L'a', + Info2->FileName); + _tprintf(_T(" Name on disk: \"%s\"\n"), + szFile); + _tprintf(_T(" Deleted size on disk: %d KB\n"), + Info2->DeletedPhysicalSize / 1024); + } + nRecords--; + Info2++; + } + + break; + } + + default: + break; + } + + UnmapAndCloseDatabase(hDb, + pDbBase); + } + + return FALSE; +} + +static BOOL +SelectRecycleBin(IN LPWSTR szDrive) +{ + BOOL Ret; + PRECYCLE_BIN RecycleBinsList = NULL; + + Ret = LocateRecycleBins(szDrive, + &RecycleBinsList); + if (Ret) + { + if (RecycleBinsList->Next != NULL) + { + PRECYCLE_BIN CurrentBin = RecycleBinsList; + int n = 0, i = 0; + + /* if there are multiple recycle bins ask the user which one to dump */ + _tprintf(_T("There are several recycle bins on this drive. Select one:\n")); + + while (CurrentBin != NULL) + { + _tprintf(_T(" [%d] %lS\n"), + ++i, + CurrentBin->User); + CurrentBin = CurrentBin->Next; + n++; + } + + _tprintf(_T("Enter the number: ")); +DisplayPrompt: + _tscanf(_T("%d"), + &i); + if (i > n || i < 1) + { + _tprintf(_T("Please enter a number between 1 and %d: "), + n); + goto DisplayPrompt; + } + + /* walk to the selected recycle bin */ + CurrentBin = RecycleBinsList; + while (CurrentBin != NULL && i != 1) + { + CurrentBin = CurrentBin->Next; + i--; + } + + /* dump it */ + Ret = DumpRecycleBin(CurrentBin); + } + else + { + /* dump the first (and only) recycle bin */ + Ret = DumpRecycleBin(RecycleBinsList); + } + } + else + { + _ftprintf(stderr, + _T("No recycle bins on this volume!\n")); + } + + FreeRecycleBinsList(&RecycleBinsList); + + return Ret; +} + +static VOID +PrintHelp(VOID) +{ + _ftprintf(stderr, + _T("Usage: dumprecbin C:\n")); +} + +int +main(int argc, + char *argv[]) +{ + if (argc != 2 || + strlen(argv[1]) != 2 || argv[1][1] != ':' || + toupper(argv[1][0]) < 'A' || toupper(argv[1][0]) > 'Z') + { + PrintHelp(); + return 1; + } + else + { + WCHAR szDrive[3]; + _stprintf(szDrive, + _T("%lC:"), + argv[1][0]); + + if (!SelectRecycleBin(szDrive)) + return 1; + else + return 0; + } +} + Property changes on: trunk/reactos/apps/utils/dumprecbin/dumprecbin.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/apps/utils/dumprecbin/dumprecbin.xml --- trunk/reactos/apps/utils/dumprecbin/dumprecbin.xml 2005-10-09 20:24:00 UTC (rev 18383) +++ trunk/reactos/apps/utils/dumprecbin/dumprecbin.xml 2005-10-09 20:56:17 UTC (rev 18384) @@ -0,0 +1,13 @@ +<module name="dumprecbin" type="win32cui" installbase="bin" installname="dumprecbin.exe"> + <include base="dumprecbin">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>dumprecbin.c</file> +</module> \ No newline at end of file Property changes on: trunk/reactos/apps/utils/dumprecbin/dumprecbin.xml ___________________________________________________________________ Name: svn:eol-style + native

19 years, 2 months

[ekohl] 18383: First shot at CreateServiceW. It crashes due to a bug (aka missing feature) in widl. I'm going to fix it as soon as possible.

by ekohl＠svn.reactos.com

First shot at CreateServiceW. It crashes due to a bug (aka missing feature) in widl. I'm going to fix it as soon as possible. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.c Modified: trunk/reactos/subsys/system/services/services.h _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-10-09 19:08:18 UTC (rev 18382) +++ trunk/reactos/include/idl/svcctl.idl 2005-10-09 20:24:00 UTC (rev 18383) @@ -77,23 +77,23 @@ /* Function 12 */ -// DWORD ScmrCreateServiceW([in] handle_t BindingHandle, -// [in] SC_HANDLE hSCManager, -// [in, string, ref] LPCWSTR lpServiceName, -// [in, string, ref] LPCWSTR lpDisplayName, -// [in] DWORD dwDesiredAccess, -// [in] DWORD dwServiceType, -// [in] DWORD dwStartType, -// [in] DWORD dwErrorControl, -// [in, string, ref] LPCWSTR lpBinaryPathName, -// [in, string, unique] LPCWSTR lpLoadOrderGroup, -// [out] LPDWORD lpdwTagId, -// [in, size_is(dwDepwndenciesLength), unique] LPCWSTR lpDependencies, -// [in] DWORD dwDependenciesLength, -// [in, string, unique] LPCWSTR lpServiceStartName, -// [in, size_is(dwPasswordLength), unique] LPCWSTR lpPassword, -// [in] DWORD dwPasswordLength, -// [out] SC_HANDLE *hService); + DWORD ScmrCreateServiceW([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string, ref] LPCWSTR lpServiceName, + [in, string, unique] LPCWSTR lpDisplayName, + [in] DWORD dwDesiredAccess, + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, ref] LPCWSTR lpBinaryPathName, + [in, string, unique] LPCWSTR lpLoadOrderGroup, + [in, out, unique] LPDWORD lpdwTagId, + [in, size_is(dwDependenciesLength), unique] LPCWSTR lpDependencies, + [in] DWORD dwDependenciesLength, + [in, string, unique] LPCWSTR lpServiceStartName, + [in, size_is(dwPasswordLength), unique] LPCWSTR lpPassword, + [in] DWORD dwPasswordLength, + [out] SC_HANDLE *hService); /* Function 15 */ _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-10-09 19:08:18 UTC (rev 18382) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-10-09 20:24:00 UTC (rev 18383) @@ -245,25 +245,54 @@ * * @unimplemented */ -SC_HANDLE -STDCALL -CreateServiceW( - SC_HANDLE hSCManager, - LPCWSTR lpServiceName, - LPCWSTR lpDisplayName, - DWORD dwDesiredAccess, - DWORD dwServiceType, - DWORD dwStartType, - DWORD dwErrorControl, - LPCWSTR lpBinaryPathName, - LPCWSTR lpLoadOrderGroup, - LPDWORD lpdwTagId, - LPCWSTR lpDependencies, - LPCWSTR lpServiceStartName, - LPCWSTR lpPassword) +SC_HANDLE STDCALL +CreateServiceW(SC_HANDLE hSCManager, + LPCWSTR lpServiceName, + LPCWSTR lpDisplayName, + DWORD dwDesiredAccess, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, + LPCWSTR lpBinaryPathName, + LPCWSTR lpLoadOrderGroup, + LPDWORD lpdwTagId, + LPCWSTR lpDependencies, + LPCWSTR lpServiceStartName, + LPCWSTR lpPassword) { - DPRINT1("CreateServiceW is unimplemented, but returning INVALID_HANDLE_VALUE instead of NULL\n"); - return INVALID_HANDLE_VALUE; + SC_HANDLE hService = NULL; + DWORD dwError; + + DPRINT1("CreateServiceW() called\n"); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrCreateServiceW(BindingHandle, + (unsigned int)hSCManager, + (LPWSTR)lpServiceName, + (LPWSTR)lpDisplayName, + dwDesiredAccess, + dwServiceType, + dwStartType, + dwErrorControl, + (LPWSTR)lpBinaryPathName, + (LPWSTR)lpLoadOrderGroup, + lpdwTagId, + NULL, /* FIXME: lpDependencies */ + 0, /* FIXME: dwDependenciesLength */ + (LPWSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (unsigned int *)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrCreateServiceW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return INVALID_HANDLE_VALUE; + } + + return hService; } _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-10-09 19:08:18 UTC (rev 18382) +++ trunk/reactos/subsys/system/services/database.c 2005-10-09 20:24:00 UTC (rev 18383) @@ -25,9 +25,14 @@ /* INCLUDES *****************************************************************/ -#include "services.h" +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #include <services/services.h> +#include "services.h" + #define NDEBUG #include <debug.h> @@ -46,14 +51,14 @@ } SERVICE_GROUP, *PSERVICE_GROUP; - - /* GLOBALS *******************************************************************/ LIST_ENTRY GroupListHead; LIST_ENTRY ServiceListHead; +static RTL_RESOURCE DatabaseLock; + /* FUNCTIONS *****************************************************************/ PSERVICE @@ -66,19 +71,19 @@ ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead) - { - CurrentService = CONTAINING_RECORD(ServiceEntry, - SERVICE, - ServiceListEntry); - if (RtlEqualUnicodeString(&CurrentService->ServiceName, ServiceName, TRUE)) { - DPRINT("Found service: '%wZ'\n", &CurrentService->ServiceName); - return CurrentService; + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + if (RtlEqualUnicodeString(&CurrentService->ServiceName, ServiceName, TRUE)) + { + DPRINT("Found service: '%wZ'\n", &CurrentService->ServiceName); + return CurrentService; + } + + ServiceEntry = ServiceEntry->Flink; } - ServiceEntry = ServiceEntry->Flink; - } - DPRINT("Couldn't find a matching service\n"); return NULL; @@ -87,48 +92,50 @@ static NTSTATUS STDCALL CreateGroupOrderListRoutine(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) { - PSERVICE_GROUP Group; + PSERVICE_GROUP Group; - DPRINT("IopGetGroupOrderList(%S, %x, %x, %x, %x, %x)\n", - ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); + DPRINT("IopGetGroupOrderList(%S, %x, %x, %x, %x, %x)\n", + ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); - if (ValueType == REG_BINARY && - ValueData != NULL && - ValueLength >= sizeof(DWORD) && - ValueLength >= (*(PULONG)ValueData + 1) * sizeof(DWORD)) + if (ValueType == REG_BINARY && + ValueData != NULL && + ValueLength >= sizeof(DWORD) && + ValueLength >= (*(PULONG)ValueData + 1) * sizeof(DWORD)) { - Group = (PSERVICE_GROUP)Context; - Group->TagCount = ((PULONG)ValueData)[0]; - if (Group->TagCount > 0) + Group = (PSERVICE_GROUP)Context; + Group->TagCount = ((PULONG)ValueData)[0]; + if (Group->TagCount > 0) { - if (ValueLength >= (Group->TagCount + 1) * sizeof(DWORD)) + if (ValueLength >= (Group->TagCount + 1) * sizeof(DWORD)) { - Group->TagArray = (PULONG)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - Group->TagCount * sizeof(DWORD)); - if (Group->TagArray == NULL) - { - Group->TagCount = 0; - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlCopyMemory(Group->TagArray, - (PULONG)ValueData + 1, - Group->TagCount * sizeof(DWORD)); - } - else - { - Group->TagCount = 0; - return STATUS_UNSUCCESSFUL; - } - } + Group->TagArray = (PULONG)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + Group->TagCount * sizeof(DWORD)); + if (Group->TagArray == NULL) + { + Group->TagCount = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(Group->TagArray, + (PULONG)ValueData + 1, + Group->TagCount * sizeof(DWORD)); + } + else + { + Group->TagCount = 0; + return STATUS_UNSUCCESSFUL; + } + } } - return STATUS_SUCCESS; + + return STATUS_SUCCESS; } @@ -140,45 +147,44 @@ PVOID Context, PVOID EntryContext) { - PSERVICE_GROUP Group; - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; + PSERVICE_GROUP Group; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; - if (ValueType == REG_SZ) + if (ValueType == REG_SZ) { - DPRINT("Data: '%S'\n", (PWCHAR)ValueData); + DPRINT("Data: '%S'\n", (PWCHAR)ValueData); - Group = (PSERVICE_GROUP)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SERVICE_GROUP)); - if (Group == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } + Group = (PSERVICE_GROUP)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SERVICE_GROUP)); + if (Group == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } - if (!RtlCreateUnicodeString(&Group->GroupName, - (PWSTR)ValueData)) - { - return STATUS_INSUFFICIENT_RESOURCES; - } + if (!RtlCreateUnicodeString(&Group->GroupName, + (PWSTR)ValueData)) + { + return STATUS_INSUFFICIENT_RESOURCES; + } - RtlZeroMemory(&QueryTable, sizeof(QueryTable)); - QueryTable[0].Name = (PWSTR)ValueData; - QueryTable[0].QueryRoutine = CreateGroupOrderListRoutine; + RtlZeroMemory(&QueryTable, sizeof(QueryTable)); + QueryTable[0].Name = (PWSTR)ValueData; + QueryTable[0].QueryRoutine = CreateGroupOrderListRoutine; - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"GroupOrderList", - QueryTable, - (PVOID)Group, - NULL); - DPRINT("%x %d %S\n", Status, Group->TagCount, (PWSTR)ValueData); + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"GroupOrderList", + QueryTable, + (PVOID)Group, + NULL); + DPRINT("%x %d %S\n", Status, Group->TagCount, (PWSTR)ValueData); - - InsertTailList(&GroupListHead, - &Group->GroupListEntry); + InsertTailList(&GroupListHead, + &Group->GroupListEntry); } - return STATUS_SUCCESS; + return STATUS_SUCCESS; } @@ -296,7 +302,7 @@ { RTL_QUERY_REGISTRY_TABLE QueryTable[2]; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ServicesKeyName = + UNICODE_STRING ServicesKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se rvices"); UNICODE_STRING SubKeyName; HKEY ServicesKey; @@ -313,6 +319,9 @@ InitializeListHead(&GroupListHead); InitializeListHead(&ServiceListHead); + /* Initialize the database lock */ + RtlInitializeResource(&DatabaseLock); + /* Build group order list */ RtlZeroMemory(&QueryTable, sizeof(QueryTable)); @@ -328,6 +337,9 @@ if (!NT_SUCCESS(Status)) return Status; + RtlInitUnicodeString(&ServicesKeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); + InitializeObjectAttributes(&ObjectAttributes, &ServicesKeyName, OBJ_CASE_INSENSITIVE, @@ -926,4 +938,13 @@ } } + +DWORD +ScmMarkServiceForDelete(PSERVICE pService) +{ + DPRINT1("ScmMarkServiceForDelete() called\n"); + + return ERROR_SUCCESS; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-10-09 19:08:18 UTC (rev 18382) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-10-09 20:24:00 UTC (rev 18383) @@ -4,6 +4,10 @@ /* INCLUDES ****************************************************************/ +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #include "services.h" #include "svcctl_s.h" @@ -107,13 +111,13 @@ DPRINT("ScmStartRpcServer() called"); - Status = RpcServerUseProtseqEp(L"ncacn_np", - 10, - L"\\pipe\\ntsvcs", - NULL); + Status = RpcServerUseProtseqEpW(L"ncacn_np", + 10, + L"\\pipe\\ntsvcs", + NULL); if (Status != RPC_S_OK) { - DPRINT1("RpcServerUseProtseqEp() failed (Status %lx)\n", Status); + DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); return; } @@ -142,7 +146,7 @@ SC_HANDLE *Handle) { PMANAGER_HANDLE Ptr; - + if (lpDatabaseName == NULL) lpDatabaseName = SERVICES_ACTIVE_DATABASEW; @@ -325,6 +329,7 @@ { PSERVICE_HANDLE hSvc; PSERVICE lpService; + DWORD dwError; DPRINT1("ScmrDeleteService() called\n"); @@ -343,9 +348,16 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Mark service for delete */ + /* FIXME: Acquire service database lock exclusively */ - return ERROR_SUCCESS; + /* Mark service for delete */ + dwError = ScmMarkServiceForDelete(lpService); + + /* FIXME: Release service database lock */ + + DPRINT1("ScmrDeleteService() done\n"); + + return dwError; } @@ -471,9 +483,49 @@ } +#if 0 +static DWORD +CreateServiceKey(LPWSTR lpServiceName, PHKEY phKey) +{ + HKEY hServicesKey = NULL; + DWORD dwDisposition; + DWORD dwError; + *phKey = NULL; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_WRITE, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegCreateKeyExW(hServicesKey, + lpServiceName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + phKey, + &dwDisposition); + if ((dwError == ERROR_SUCCESS) && + (dwDisposition == REG_OPENED_EXISTING_KEY)) + { + RegCloseKey(*phKey); + *phKey = NULL; + dwError = ERROR_SERVICE_EXISTS; + } + + RegCloseKey(hServicesKey); + + return dwError; +} +#endif + + /* Function 12 */ -#if 0 unsigned long ScmrCreateServiceW(handle_t BindingHandle, unsigned int hSCManager, @@ -485,19 +537,170 @@ unsigned long dwErrorControl, wchar_t *lpBinaryPathName, wchar_t *lpLoadOrderGroup, - unsigned long *lpdwTagId, + unsigned long *lpdwTagId, /* in, out */ wchar_t *lpDependencies, + unsigned long dwDependenciesLength, wchar_t *lpServiceStartName, - wchar_t *lpPassword) + wchar_t *lpPassword, + unsigned long dwPasswordLength, + unsigned int *hService) /* out */ { - DPRINT1("ScmrCreateServiceW() called\n"); - if (lpdwTagId != NULL) - *lpdwTagId = 0; - return ERROR_SUCCESS; -} + PMANAGER_HANDLE hManager; + DWORD dwError = ERROR_SUCCESS; +#if 0 + HKEY hServiceKey = NULL; + LPWSTR lpImagePath = NULL; #endif + DPRINT1("ScmrCreateServiceW() called\n"); + DPRINT1("lpServiceName = %S\n", lpServiceName); + DPRINT1("lpDisplayName = %S\n", lpDisplayName); + DPRINT1("dwDesiredAccess = %lx\n", dwDesiredAccess); + DPRINT1("dwServiceType = %lu\n", dwServiceType); + DPRINT1("dwStartType = %lu\n", dwStartType); + DPRINT1("dwErrorControl = %lu\n", dwErrorControl); + DPRINT1("lpBinaryPathName = %S\n", lpBinaryPathName); + DPRINT1("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + hManager = (PMANAGER_HANDLE)hSCManager; + if (hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT1("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Check access rights */ + if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, + SC_MANAGER_CREATE_SERVICE)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", + hManager->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + /* FIXME: Fail if the service already exists! */ + +#if 0 + if (dwServiceType & SERVICE_DRIVER) + { + /* FIXME: Adjust the image path */ + lpImagePath = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + wcslen(lpBinaryPathName) + sizeof(WCHAR)); + if (lpImagePath == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + wcscpy(lpImagePath, lpBinaryPathName); + } + + /* FIXME: Allocate and fill a service entry */ + +// if (lpdwTagId != NULL) +// *lpdwTagId = 0; + +// *hService = 0; + + + /* Write service data to the registry */ + /* Create the service key */ + dwError = CreateServiceKey(lpServiceName, &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto done; + + if ((lpDisplayName != NULL) && (wcslen(lpDisplayName) > 0)) + { + RegSetValueExW(hServiceKey, + L"DisplayName", + 0, + REG_SZ, + (LPBYTE)lpDisplayName, + (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); + } + + /* Set the service type */ + dwError = RegSetValueExW(hServiceKey, + L"Type", + 0, + REG_DWORD, + (LPBYTE)&dwServiceType, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Set the start value */ + dwError = RegSetValueExW(hServiceKey, + L"Start", + 0, + REG_DWORD, + (LPBYTE)&dwStartType, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Set the error control value */ + dwError = RegSetValueExW(hServiceKey, + L"ErrorControl", + 0, + REG_DWORD, + (LPBYTE)&dwErrorControl, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Set the image path */ + if (dwServiceType & SERVICE_WIN32) + { + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_SZ, + (LPBYTE)lpBinaryPathName, + (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + else if (dwServiceType & SERVICE_DRIVER) + { + /* FIXME: Adjust the path name */ + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_SZ, + (LPBYTE)lpImagePath, + (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + + /* Set the group name */ + if (lpLoadOrderGroup != NULL && *lpLoadOrderGroup != 0) + { + dwError = RegSetValueExW(hServiceKey, + L"Group", + 0, + REG_SZ, + (LPBYTE)lpLoadOrderGroup, + (wcslen(lpLoadOrderGroup) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + +done:; + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + if (lpImagePath != NULL) + HeapFree(GetProcessHeap(), 0, lpImagePath); +#endif + + DPRINT1("ScmrCreateServiceW() done (Error %lu)\n", dwError); + + return dwError; +} + + /* Function 15 */ unsigned long ScmrOpenSCManagerW(handle_t BindingHandle, _____ Modified: trunk/reactos/subsys/system/services/services.c --- trunk/reactos/subsys/system/services/services.c 2005-10-09 19:08:18 UTC (rev 18382) +++ trunk/reactos/subsys/system/services/services.c 2005-10-09 20:24:00 UTC (rev 18383) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * service control manager * * ReactOS Operating System @@ -29,6 +28,10 @@ /* INCLUDES *****************************************************************/ +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #include "services.h" #define NDEBUG _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-10-09 19:08:18 UTC (rev 18382) +++ trunk/reactos/subsys/system/services/services.h 2005-10-09 20:24:00 UTC (rev 18383) @@ -1,3 +1,7 @@ +/* + * services.h + */ + #include <stdio.h> #include <windows.h> #define NTOS_MODE_USER @@ -3,8 +7,4 @@ #include <ndk/ntndk.h> -/* - * services.h - */ - typedef struct _SERVICE { @@ -45,8 +45,8 @@ VOID ScmGetBootAndSystemDriverState(VOID); VOID ScmAutoStartServices(VOID); -PSERVICE -ScmGetServiceEntryByName(PUNICODE_STRING ServiceName); +PSERVICE ScmGetServiceEntryByName(PUNICODE_STRING ServiceName); +DWORD ScmMarkServiceForDelete(PSERVICE pService); /* rpcserver.c */

19 years, 2 months

[turner] 18382: Make sure that FileList is not empty. fixes bug #884.

by turner＠svn.reactos.com

Make sure that FileList is not empty. fixes bug #884. Modified: trunk/reactos/subsys/system/cmd/filecomp.c _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2005-10-09 16:58:13 UTC (rev 18381) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2005-10-09 19:08:18 UTC (rev 18382) @@ -535,7 +535,7 @@ while (_istspace (*line)) line++; - if(!_tcsncmp (line, _T("rd "), 3) || !_tcsncmp (line, _T("cd "), 3)) + if(!_tcsnicmp (line, _T("rd "), 3) || !_tcsnicmp (line, _T("cd "), 3)) ShowAll = FALSE; /* Copy the string, str can be edited and orginal should not be */ @@ -645,7 +645,17 @@ }while(FindNextFile(hFile,&file)); - + /* Check the size of the list to see if we + found any matches */ + if(FileListSize == 0) + { + _tcscpy(strOut,szOrginal); + CloseHandle(hFile); + if(FileList != NULL) + free(FileList); + return; + + } /* Sort the files */ qsort(FileList,FileListSize,sizeof(FileName), compare);

19 years, 2 months

[weiden] 18381: added missing ansi/unicode definitions

by weiden＠svn.reactos.com

added missing ansi/unicode definitions Modified: trunk/reactos/w32api/include/sddl.h _____ Modified: trunk/reactos/w32api/include/sddl.h --- trunk/reactos/w32api/include/sddl.h 2005-10-09 15:23:16 UTC (rev 18380) +++ trunk/reactos/w32api/include/sddl.h 2005-10-09 16:58:13 UTC (rev 18381) @@ -69,8 +69,18 @@ #ifdef UNICODE #define ConvertSidToStringSid ConvertSidToStringSidW +#define ConvertStringSidToSid ConvertStringSidToSidW +#define ConvertStringSecurityDescriptorToSecurityDescriptor \ + ConvertStringSecurityDescriptorToSecurityDescriptorW +#define ConvertSecurityDescriptorToStringSecurityDescriptor \ + ConvertSecurityDescriptorToStringSecurityDescriptorW #else /* UNICODE */ #define ConvertSidToStringSid ConvertSidToStringSidA +#define ConvertStringSidToSid ConvertStringSidToSidA +#define ConvertStringSecurityDescriptorToSecurityDescriptor \ + ConvertStringSecurityDescriptorToSecurityDescriptorA +#define ConvertSecurityDescriptorToStringSecurityDescriptor \ + ConvertSecurityDescriptorToStringSecurityDescriptorA #endif /* UNICODE */ #ifdef __cplusplus

19 years, 2 months

[mf] 18380: remove binary attribute from japanese resource file

by mf＠svn.reactos.com

remove binary attribute from japanese resource file Modified: trunk/reactos/subsys/system/explorer/explorer-jp.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-jp.rc (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/explorer-jp.rc ___________________________________________________________________ Name: svn:mime-type - application/octet-stream Name: svn:eol-style + native

19 years, 2 months

[mf] 18379: Fix for Bugzilla Entry 330: Correctly handle WM_COMMAND messages in web windows without web control

by mf＠svn.reactos.com

Fix for Bugzilla Entry 330: Correctly handle WM_COMMAND messages in web windows without web control Modified: trunk/reactos/subsys/system/explorer/shell/webchild.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/webchild.cpp --- trunk/reactos/subsys/system/explorer/shell/webchild.cpp 2005-10-09 15:12:13 UTC (rev 18378) +++ trunk/reactos/subsys/system/explorer/shell/webchild.cpp 2005-10-09 15:16:41 UTC (rev 18379) @@ -247,46 +247,47 @@ return TRUE; case PM_DISPATCH_COMMAND: { - if (_control) { - HRESULT hr = E_FAIL; + if (!_control) + return FALSE; - switch(LOWORD(wparam)) { - case ID_GO_BACK: - hr = _control->GoBack(); - break; + HRESULT hr = E_FAIL; - case ID_GO_FORWARD: - hr = _control->GoForward(); - break; + switch(LOWORD(wparam)) { + case ID_GO_BACK: + hr = _control->GoBack(); + break; - case ID_GO_UP: - ///@todo - break; + case ID_GO_FORWARD: + hr = _control->GoForward(); + break; - case ID_GO_HOME: - hr = _control->GoHome(); - break; + case ID_GO_UP: + ///@todo + break; - case ID_GO_SEARCH: - hr = _control->GoSearch(); - break; + case ID_GO_HOME: + hr = _control->GoHome(); + break; - case ID_REFRESH: - hr = _control->Refresh(); - break; + case ID_GO_SEARCH: + hr = _control->GoSearch(); + break; - case ID_STOP: - hr = _control->Stop(); - break; + case ID_REFRESH: + hr = _control->Refresh(); + break; - default: - return super::WndProc(nmsg, wparam, lparam); - } + case ID_STOP: + hr = _control->Stop(); + break; - if (FAILED(hr) && hr!=E_FAIL) - THROW_EXCEPTION(hr); + default: + return super::WndProc(nmsg, wparam, lparam); } + if (FAILED(hr) && hr!=E_FAIL) + THROW_EXCEPTION(hr); + return TRUE;} default:

19 years, 2 months

← Newer
1
...
51
52
53
54
55
56
57
...
74
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 October 2005