Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 35770: QueryServiceConfig2A/W: Add more parameter checks. Fixes 3 winetest failures.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 17:31:54 2008 New Revision: 35770 URL: http://svn.reactos.org/svn/reactos?rev=35770&view=rev Log: QueryServiceConfig2A/W: Add more parameter checks. Fixes 3 winetest failures. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Aug 29 17:31:54 2008 @@ -1831,7 +1831,15 @@ TRACE("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - if (lpBuffer == NULL && cbBufSize != 0) + if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION && + dwInfoLevel != SERVICE_CONFIG_FAILURE_ACTIONS) + { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if ((lpBuffer == NULL && cbBufSize != 0) || + pcbBytesNeeded == NULL) { SetLastError(ERROR_INVALID_ADDRESS); return FALSE; @@ -1921,7 +1929,15 @@ TRACE("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - if (lpBuffer == NULL && cbBufSize != 0) + if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION && + dwInfoLevel != SERVICE_CONFIG_FAILURE_ACTIONS) + { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if ((lpBuffer == NULL && cbBufSize != 0) || + pcbBytesNeeded == NULL) { SetLastError(ERROR_INVALID_ADDRESS); return FALSE;

1 0

[hpoussin] 35769: win32k: Add tags when allocating memory ntoskrnl: Relax checks when freeing a string
by hpoussin＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: hpoussin Date: Fri Aug 29 16:19:41 2008 New Revision: 35769 URL: http://svn.reactos.org/svn/reactos?rev=35769&view=rev Log: win32k: Add tags when allocating memory ntoskrnl: Relax checks when freeing a string Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -74,13 +74,18 @@ } +#define TAG_USTR TAG('U', 'S', 'T', 'R') +#define TAG_ASTR TAG('A', 'S', 'T', 'R') +#define TAG_OSTR TAG('O', 'S', 'T', 'R') VOID STDCALL RtlpFreeMemory(PVOID Mem, ULONG Tag) { - ExFreePoolWithTag(Mem, - Tag); + if (Tag == TAG_ASTR || Tag == TAG_OSTR || Tag == TAG_USTR) + ExFreePool(Mem); + else + ExFreePoolWithTag(Mem, Tag); } /* Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -325,7 +325,7 @@ SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_8BPP)); SurfObj->cjBits = SurfObj->lDelta * Size.cy; UncompressedFormat = BMF_8BPP; - UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0); + UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, TAG_DIB); Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj->lDelta); } else @@ -356,7 +356,7 @@ { SurfObj->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, - SurfObj->cjBits, 0); + SurfObj->cjBits, TAG_DIB); } if (SurfObj->pvBits == NULL) { Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -243,7 +243,7 @@ { XlateObj->cEntries = SourcePalGDI->NumColors; XlateObj->pulXlate = - EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); + EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, TAG_XLATEOBJ); XlateObj->flXlate |= XO_TRIVIAL; for (i = 0; i < XlateObj->cEntries; i++) @@ -264,7 +264,7 @@ { XlateObj->cEntries = SourcePalGDI->NumColors; XlateObj->pulXlate = - EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); + EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, TAG_XLATEOBJ); for (i = 0; i < XlateObj->cEntries; i++) XlateObj->pulXlate[i] = ShiftAndMask(XlateGDI, *((ULONG *)&SourcePalGDI->IndexedColors[i])); @@ -379,7 +379,7 @@ XlateObj = GDIToObj(XlateGDI, XLATE); XlateObj->cEntries = 2; - XlateObj->pulXlate = EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); + XlateObj->pulXlate = EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, TAG_XLATEOBJ); if (XlateObj->pulXlate == NULL) { PALETTE_UnlockPalette(DestPalGDI); 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -317,7 +317,7 @@ NULL, 0, sizeof(CURICON_PROCESS), - 0, + TAG_DIB, 128); InitializeListHead(&gCurIconList); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Aug 29 16:19:41 2008 @@ -155,14 +155,14 @@ NULL, 0, sizeof(USER_MESSAGE), - 0, + TAG_USRMSG, 256); ExInitializePagedLookasideList(&TimerLookasideList, NULL, NULL, 0, sizeof(TIMER_ENTRY), - 0, + TAG_TIMER, 64); return(STATUS_SUCCESS);

1 0

[ekohl] 35768: Forgot to commit this file too! Patch based on bug report #3669 by Michael Martin (aka bugboy) <martinmnet@hotmail.com> just like the patches r35748, r35750, r35752 and r35753.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 15:44:40 2008 New Revision: 35768 URL: http://svn.reactos.org/svn/reactos?rev=35768&view=rev Log: Forgot to commit this file too! Patch based on bug report #3669 by Michael Martin (aka bugboy) <martinmnet(a)hotmail.com> just like the patches r35748, r35750, r35752 and r35753. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Fri Aug 29 15:44:40 2008 @@ -172,10 +172,11 @@ /* Set the resume count */ lpService->dwResumeCount = dwResumeCount++; - /* Append service entry */ + /* Append service record */ InsertTailList(&ServiceListHead, &lpService->ServiceListEntry); + /* Initialize the service status */ lpService->Status.dwCurrentState = SERVICE_STOPPED; lpService->Status.dwControlsAccepted = 0; lpService->Status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; @@ -184,6 +185,42 @@ lpService->Status.dwWaitHint = 2000; /* 2 seconds */ return ERROR_SUCCESS; +} + + +VOID +ScmDeleteServiceRecord(PSERVICE lpService) +{ + DPRINT1("Deleting Service %S\n", lpService->lpServiceName); + + /* Delete the display name */ + if (lpService->lpDisplayName != NULL && + lpService->lpDisplayName != lpService->lpServiceName) + HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); + + /* Decrement the image reference counter */ + if (lpService->lpImage) + lpService->lpImage->dwServiceRefCount--; + + /* Decrement the group reference counter */ + if (lpService->lpGroup) + lpService->lpGroup->dwRefCount--; + + /* FIXME: SecurityDescriptor */ + + /* Close the control pipe */ + if (lpService->ControlPipeHandle != INVALID_HANDLE_VALUE) + CloseHandle(lpService->ControlPipeHandle); + + /* Remove the Service from the List */ + RemoveEntryList(&lpService->ServiceListEntry); + + DPRINT1("Deleted Service %S\n", lpService->lpServiceName); + + /* Delete the service record */ + HeapFree(GetProcessHeap(), 0, lpService); + + DPRINT1("Done\n"); }

1 0

[ekohl] 35767: - Add a reference counter to the service record. - Implement a common service record delete function. - RCloseServiceHandle: Remove a service if it has been marked for deletion and the reference counter reaches 0. - RControlService: Stop a service only if there are no dependent services running. Patch based on bug report #3669 by Michael Martin (aka bugboy) <martinmnet@hotmail.com> just like the patches r35748, r35750, r35752 and r35753.
by ekohl＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: ekohl Date: Fri Aug 29 15:43:12 2008 New Revision: 35767 URL: http://svn.reactos.org/svn/reactos?rev=35767&view=rev Log: - Add a reference counter to the service record. - Implement a common service record delete function. - RCloseServiceHandle: Remove a service if it has been marked for deletion and the reference counter reaches 0. - RControlService: Stop a service only if there are no dependent services running. Patch based on bug report #3669 by Michael Martin (aka bugboy) <martinmnet(a)hotmail.com> just like the patches r35748, r35750, r35752 and r35753. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h 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 [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Aug 29 15:43:12 2008 @@ -404,6 +404,12 @@ LPSC_RPC_HANDLE hSCObject) { PMANAGER_HANDLE hManager; + PSERVICE_HANDLE hService; + PSERVICE lpService; + HKEY hServicesKey; + DWORD dwError; + DWORD pcbBytesNeeded = 0; + DWORD dwServicesReturned = 0; DPRINT("RCloseServiceHandle() called\n"); @@ -413,6 +419,7 @@ return ERROR_INVALID_HANDLE; hManager = (PMANAGER_HANDLE)*hSCObject; + hService = (PSERVICE_HANDLE)*hSCObject; if (hManager->Handle.Tag == MANAGER_TAG) { DPRINT("Found manager handle\n"); @@ -420,24 +427,92 @@ hManager->Handle.RefCount--; if (hManager->Handle.RefCount == 0) { - /* FIXME: add cleanup code */ + /* FIXME: add handle cleanup code */ HeapFree(GetProcessHeap(), 0, hManager); + hManager = NULL; } DPRINT("RCloseServiceHandle() done\n"); return ERROR_SUCCESS; } - else if (hManager->Handle.Tag == SERVICE_TAG) + else if (hService->Handle.Tag == SERVICE_TAG) { DPRINT("Found service handle\n"); - hManager->Handle.RefCount--; - if (hManager->Handle.RefCount == 0) - { - /* FIXME: add cleanup code */ - - HeapFree(GetProcessHeap(), 0, hManager); + /* Get the pointer to the service record */ + lpService = hService->ServiceEntry; + + ASSERT(hService->Handle.RefCount > 0); + + hService->Handle.RefCount--; + if (hService->Handle.RefCount == 0) + { + /* FIXME: add handle cleanup code */ + + /* Free the handle */ + HeapFree(GetProcessHeap(), 0, hService); + hService = NULL; + } + + ASSERT(lpService->dwRefCount > 0); + + lpService->dwRefCount--; + DPRINT1("CloseServiceHandle - lpService->dwRefCount %u\n", + lpService->dwRefCount); + + if (lpService->dwRefCount == 0) + { + /* If this service has been marked for deletion */ + if (lpService->bDeleted) + { + /* Open the Services Reg key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_SET_VALUE | KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to open services key\n"); + return dwError; + } + + /* Call the internal function with NULL, just to get bytes we need */ + Int_EnumDependentServicesW(hServicesKey, + lpService, + SERVICE_ACTIVE, + NULL, + &pcbBytesNeeded, + &dwServicesReturned); + + /* if pcbBytesNeeded returned a value then there are services running that are dependent on this service*/ + if (pcbBytesNeeded) + { + DPRINT1("Deletion failed due to running dependencies.\n", + lpService->lpServiceName); + RegCloseKey(hServicesKey); + return ERROR_SUCCESS; + } + + /* There are no references and no runnning dependencies, + it is now safe to delete the service */ + + /* Delete the Service Key */ + dwError = RegDeleteKey(hServicesKey, + lpService->lpServiceName); + + RegCloseKey(hServicesKey); + + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to Delete the Service Registry key\n"); + return dwError; + } + + /* Delete the Service */ + ScmDeleteServiceRecord(lpService); + } } DPRINT("RCloseServiceHandle() done\n"); @@ -461,6 +536,9 @@ PSERVICE lpService; ACCESS_MASK DesiredAccess; DWORD dwError = ERROR_SUCCESS; + DWORD pcbBytesNeeded = 0; + DWORD dwServicesReturned = 0; + HKEY hServicesKey = NULL; DPRINT("RControlService() called\n"); @@ -472,6 +550,14 @@ if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + /* Check the service entry point */ + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -507,12 +593,40 @@ DesiredAccess)) return ERROR_ACCESS_DENIED; - /* Check the service entry point */ - lpService = hSvc->ServiceEntry; - if (lpService == NULL) - { - DPRINT1("lpService == NULL!\n"); - return ERROR_INVALID_HANDLE; + if (dwControl == SERVICE_CONTROL_STOP) + { + /* Check if the service has dependencies running as windows + doesn't stop a service that does */ + + /* Open the Services Reg key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to open services key\n"); + return dwError; + } + + /* Call the internal function with NULL, just to get bytes we need */ + Int_EnumDependentServicesW(hServicesKey, + lpService, + SERVICE_ACTIVE, + NULL, + &pcbBytesNeeded, + &dwServicesReturned); + + RegCloseKey(hServicesKey); + + /* If pcbBytesNeeded is not zero then there are services running that + are dependent on this service */ + if (pcbBytesNeeded != 0) + { + DPRINT("Service has running dependencies. Failed to stop service.\n"); + return ERROR_DEPENDENT_SERVICES_RUNNING; + } } if (lpService->Status.dwServiceType & SERVICE_DRIVER) @@ -529,6 +643,9 @@ dwControl, lpServiceStatus); } + + if ((dwError == ERROR_SUCCESS) && (pcbBytesNeeded)) + dwError = ERROR_DEPENDENT_SERVICES_RUNNING; /* Return service status information */ RtlCopyMemory(lpServiceStatus, @@ -1120,7 +1237,7 @@ (wcslen(lpLoadOrderGroup) + 1) * sizeof(WCHAR)); if (dwError != ERROR_SUCCESS) goto done; - /* FIXME: update lpService->lpServiceGroup */ + /* FIXME: Update lpService->lpServiceGroup */ } if (lpdwTagId != NULL) @@ -1836,6 +1953,9 @@ if (dwError != ERROR_SUCCESS) goto done; + lpService->dwRefCount = 1; + DPRINT1("CreateService - lpService->dwRefCount %u\n", lpService->dwRefCount); + done:; if (hServiceKey != NULL) RegCloseKey(hServiceKey); @@ -2308,6 +2428,9 @@ HeapFree(GetProcessHeap(), 0, hHandle); return dwError; } + + lpService->dwRefCount++; + DPRINT1("OpenService - lpService->dwRefCount %u\n",lpService->dwRefCount); *lpServiceHandle = (unsigned long)hHandle; /* FIXME: 64 bit portability */ DPRINT("*hService = %p\n", *lpServiceHandle); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Fri Aug 29 15:43:12 2008 @@ -40,6 +40,7 @@ PSERVICE_IMAGE lpImage; BOOL bDeleted; DWORD dwResumeCount; + DWORD dwRefCount; CLIENT_HANDLE hClient; SERVICE_STATUS Status; @@ -109,6 +110,7 @@ PSERVICE ScmGetServiceEntryByClientHandle(ULONG ThreadId); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); +VOID ScmDeleteServiceRecord(PSERVICE lpService); DWORD ScmMarkServiceForDelete(PSERVICE pService); DWORD ScmControlService(PSERVICE Service,

1 0

[dreimer] 35766: OK, now it works with three parameters. Not nice, but hey... its Batch :-P
by dreimer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: dreimer Date: Fri Aug 29 15:23:16 2008 New Revision: 35766 URL: http://svn.reactos.org/svn/reactos?rev=35766&view=rev Log: OK, now it works with three parameters. Not nice, but hey... its Batch :-P Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Fri Aug 29 15:23:16 2008 @@ -34,30 +34,78 @@ set _ROSBE_CMDS=yes set _ROSBE_GCC=yes set _ROSBE_TOOLS=yes -set _ROSBE_PARAM=no :: :: Update the Vars if the params say so. :: +if "%1" == "" ( + goto :next +) + if "%1" == "nocmds" ( set _ROSBE_CMDS=no - set _ROSBE_PARAM=yes + goto :p1 ) if "%1" == "nogcc" ( set _ROSBE_GCC=no - set _ROSBE_PARAM=yes + goto :p1 ) if "%1" == "notools" ( set _ROSBE_TOOLS=no - set _ROSBE_PARAM=yes -) -if not "%1" == "" ( - if %_ROSBE_PARAM% == no ( - cls - echo Unknown parameter specified. Exiting. - goto :EOU - ) -) + goto :p1 +) + +cls +echo Unknown first parameter specified. Exiting. +goto :EOU + +:p1 + +if "%2" == "" ( + goto :next +) + +if "%2" == "nocmds" ( + set _ROSBE_CMDS=no + goto :p2 +) +if "%2" == "nogcc" ( + set _ROSBE_GCC=no + goto :p2 +) +if "%2" == "notools" ( + set _ROSBE_TOOLS=no + goto :p2 +) + +cls +echo Unknown second parameter specified. Exiting. +goto :EOU + +:p2 + +if "%3" == "" ( + goto :next +) + +if "%3" == "nocmds" ( + set _ROSBE_CMDS=no + goto :next +) +if "%3" == "nogcc" ( + set _ROSBE_GCC=no + goto :next +) +if "%3" == "notools" ( + set _ROSBE_TOOLS=no + goto :next +) + +cls +echo Unknown third parameter specified. Exiting. +goto :EOU + +:next cd /d "%_ROSBE_BASEDIR%" @@ -220,7 +268,6 @@ set _ROSBE_CMDS= set _ROSBE_GCC= set _ROSBE_TOOLS= -set _ROSBE_PARAM= set _ROSBE_OPATH= set _ROSBE_UPDDATE= set _ROSBE_UPDDATE2=

1 0

[dreimer] 35765: Tidy up the output a bit.
by dreimer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: dreimer Date: Fri Aug 29 14:36:49 2008 New Revision: 35765 URL: http://svn.reactos.org/svn/reactos?rev=35765&view=rev Log: Tidy up the output a bit. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Fri Aug 29 14:36:49 2008 @@ -66,7 +66,7 @@ :: First check for a new Updater :: for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/update.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( @@ -78,80 +78,80 @@ :: PS1 Files. :: if exist "Build.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Build.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.ps1 ) if exist "Clean.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Clean.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.ps1 ) if exist "Help.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Help.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Help.ps1 ) if exist "MinGW.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/MinGW.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.ps1 ) if exist "RosBE.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/RosBE.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.ps1 ) if exist "rosbe-gcc-env.ps1" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/rosbe-gcc-env.ps1 + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.ps1 ) :: :: Options Files. :: if exist "options.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/options.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.cmd ) :: :: SVN Files. :: if exist "sSVN.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/sSVN.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.cmd ) :: :: SCut Files. :: if exist "scut.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/scut.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.cmd ) :: :: RelAddr2Line Files. :: if exist "reladdr2line.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/reladdr2line.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.cmd ) :: :: Other Tools Files. :: if exist "Config.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Config.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.cmd ) if exist "chdefdir.cmd" ( - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/chdefdir.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.cmd ) :: :: Default Files. :: - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Build.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/ChangeLog.txt - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/chdefgcc.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Clean.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Help.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/LICENSE.TXT - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/MinGW.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/mingw.ico - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/MinGW.mac - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/README.pdf - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/RosBE.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/rosbe.ico - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/RosBE.mac - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/rosbe-gcc-env.cmd - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/TimeDate.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/ChangeLog.txt + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Help.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/LICENSE.TXT + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/mingw.ico + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.mac + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/README.pdf + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe.ico + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.mac + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.cmd + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/TimeDate.cmd ) if %_ROSBE_GCC% == yes ( @@ -164,7 +164,7 @@ set _ROSBE_GCCDATE=0 ) - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/GCC.7z + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/GCC.7z :: :: Add the maybe Updated Dates to another Var. @@ -188,7 +188,7 @@ set _ROSBE_TOOOLSDATE=0 ) - "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/Tools.7z + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Tools.7z :: :: Add the maybe Updated Dates to another Var.

1 0

[fireball] 35764: Gregor Schneider <grschneider@gmail.com> - Only pad with zeroes if padding requested. - Show signs for floating point numbers without checking for SIGN type (since there is no unsigned float/double). See issue #3587 for more details.
by fireball＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: fireball Date: Fri Aug 29 13:57:31 2008 New Revision: 35764 URL: http://svn.reactos.org/svn/reactos?rev=35764&view=rev Log: Gregor Schneider <grschneider(a)gmail.com> - Only pad with zeroes if padding requested. - Show signs for floating point numbers without checking for SIGN type (since there is no unsigned float/double). See issue #3587 for more details. Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Fri Aug 29 13:57:31 2008 @@ -167,18 +167,16 @@ return 0; c = (type & ZEROPAD) ? '0' : ' '; sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } + if (num < 0) { + sign = '-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; } if (type & SPECIAL) { if (base == 16) @@ -231,10 +229,12 @@ ++buf; } } - while (i < precision--) { - if (buf <= end) - *buf = '0'; - ++buf; + if (type & ZEROPAD) { + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } } while (i-- > 0) { if (buf <= end)

1 0

[dreimer] 35763: Progress. It WORKS!!!!!!!!11111111234. setlocal ftw. Thx to hackbunny for helping me. Now it does what its meant to be for.
by dreimer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: dreimer Date: Fri Aug 29 13:47:02 2008 New Revision: 35763 URL: http://svn.reactos.org/svn/reactos?rev=35763&view=rev Log: Progress. It WORKS!!!!!!!!11111111234. setlocal ftw. Thx to hackbunny for helping me. Now it does what its meant to be for. Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Fri Aug 29 13:47:02 2008 @@ -7,6 +7,11 @@ :: :: @echo off + +setlocal +setlocal enableextensions +setlocal enabledelayedexpansion + if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on @@ -47,7 +52,7 @@ set _ROSBE_PARAM=yes ) if not "%1" == "" ( - if _ROSBE_PARAM == no ( + if %_ROSBE_PARAM% == no ( cls echo Unknown parameter specified. Exiting. goto :EOU @@ -56,15 +61,15 @@ cd /d "%_ROSBE_BASEDIR%" -if _ROSBE_CMDS == yes ( +if %_ROSBE_CMDS% == yes ( :: :: First check for a new Updater :: - for /f "usebackq" %%i in (`"forfiles /M update.cmd /C "cmd /c echo @fdate""`) do set _ROSBE_UPDDATE=%%i + for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/update.cmd - for /f "usebackq" %%i in (`"forfiles /M update.cmd /C "cmd /c echo @fdate""`) do set _ROSBE_UPDDATE2=%%i - - if %_ROSBE_UPDDATE% NEQ %_ROSBE_UPDDATE2% ( + for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF + + if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( cls echo Updater got updated and needs to be restarted. goto :EOU @@ -149,12 +154,12 @@ "Tools\wget.exe" -N --ignore-length %_ROSBE_URL%/TimeDate.cmd ) -if _ROSBE_GCC == yes ( +if %_ROSBE_GCC% == yes ( :: :: Add Dates into Vars and load GCC packages if needed. :: if exist GCC.7z ( - for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE=%%i + for %%F in (GCC.7z) do set _ROSBE_GCCDATE=%%~tF ) else ( set _ROSBE_GCCDATE=0 ) @@ -164,21 +169,21 @@ :: :: Add the maybe Updated Dates to another Var. :: - for /f "usebackq" %%i in (`"forfiles /M GCC.7z /C "cmd /c echo @fdate""`) do set _ROSBE_GCCDATE2=%%i + for %%F in (GCC.7z) do set _ROSBE_GCCDATE2=%%~tF :: :: Extract GCC. :: - if %_ROSBE_GCCDATE% NEQ %_ROSBE_GCCDATE2% ( + if !_ROSBE_GCCDATE! NEQ !_ROSBE_GCCDATE2! ( "Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\4.1.3" ) ) -if _ROSBE_TOOLS == yes ( +if %_ROSBE_TOOLS% == yes ( :: :: Add Dates into Vars and load Tool SRC packages if needed. :: if exist Tools.7z ( - for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE=%%i + for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE=%%~tF ) else ( set _ROSBE_TOOOLSDATE=0 ) @@ -188,9 +193,9 @@ :: :: Add the maybe Updated Dates to another Var. :: - for /f "usebackq" %%i in (`"forfiles /M Tools.7z /C "cmd /c echo @fdate""`) do set _ROSBE_TOOLSDATE2=%%i - - if %_ROSBE_TOOLSDATE% NEQ %_ROSBE_TOOLSDATE2% ( + for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE2=%%~tF + + if !_ROSBE_TOOLSDATE! NEQ !_ROSBE_TOOLSDATE2! ( "Tools\7z.exe" x Tools.7z "%TEMP%" :: :: Build the tools

1 0

[sserapion] 35762: Convert fmifs and lsasrv to spec files.
by sserapion＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: sserapion Date: Fri Aug 29 11:39:06 2008 New Revision: 35762 URL: http://svn.reactos.org/svn/reactos?rev=35762&view=rev Log: Convert fmifs and lsasrv to spec files. Added: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.spec (contents, props changed) - copied, changed from r35723, branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.spec (contents, props changed) - copied, changed from r35723, branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def Removed: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def (removed) @@ -1,31 +1,0 @@ -; $Id$ -; -; fmifs.def -; -; Project : ReactOS -; Description : fmifs.dll exported symbols -; Contributors: -; Created by Emanuele Aliberti -; -; -; NOTE: Functions with trailing @0 are unknown. -; -LIBRARY fmifs.dll -EXPORTS -Chkdsk@36 -;ChkdskEx -;ComputeFmMediaType -DiskCopy@0 -EnableVolumeCompression@8 -Extend@0 -Format@0 -FormatEx@28 -;FormatEx2 -InitializeFmIfs@12 -QueryAvailableFileSystemFormat@20 -;QueryDeviceInformation -;QueryDeviceInformationByHandle -;QueryFileSystemName -;QueryLatestFileSystemVersion -QuerySupportedMedia@16 -SetLabel(a)8=KERNEL32.SetVolumeLabelW Modified: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild [iso-8859-1] Fri Aug 29 11:39:06 2008 @@ -1,5 +1,5 @@ <module name="fmifs" type="win32dll" entrypoint="InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}" installbase="system32" installname="fmifs.dll"> - <importlibrary definition="fmifs.def" /> + <importlibrary definition="fmifs.spec.def" /> <include base="fmifs">.</include> <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_WINNT">0x0600</define> @@ -14,5 +14,6 @@ <file>media.c</file> <file>query.c</file> <file>fmifs.rc</file> + <file>fmifs.spec</file> <pch>precomp.h</pch> </module> Copied: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.spec (from r35723, branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.spec [iso-8859-1] Fri Aug 29 11:39:06 2008 @@ -1,31 +1,18 @@ -; $Id$ -; -; fmifs.def -; -; Project : ReactOS -; Description : fmifs.dll exported symbols -; Contributors: -; Created by Emanuele Aliberti -; -; -; NOTE: Functions with trailing @0 are unknown. -; -LIBRARY fmifs.dll -EXPORTS -Chkdsk@36 -;ChkdskEx -;ComputeFmMediaType -DiskCopy@0 -EnableVolumeCompression@8 -Extend@0 -Format@0 -FormatEx@28 -;FormatEx2 -InitializeFmIfs@12 -QueryAvailableFileSystemFormat@20 -;QueryDeviceInformation -;QueryDeviceInformationByHandle -;QueryFileSystemName -;QueryLatestFileSystemVersion -QuerySupportedMedia@16 -SetLabel(a)8=KERNEL32.SetVolumeLabelW + + @ stdcall Chkdsk(wstr wstr long long long long ptr ptr ptr) + @ stub ChkdskEx + @ stub ComputeFmMediaType + @ stdcall DiskCopy() + @ stdcall EnableVolumeCompression(wstr long) + @ stdcall Extend() + @ stdcall Format() + @ stdcall FormatEx(wstr long wstr wstr long long ptr) + @ stub FormatEx2 + @ stdcall InitializeFmIfs(ptr long ptr) + @ stdcall QueryAvailableFileSystemFormat(long ptr str str long) + @ stub QueryDeviceInformation + @ stub QueryDeviceInformationByHandle + @ stub QueryFileSystemName + @ stub QueryLatestFileSystemVersion + @ stdcall QuerySupportedMedia(str ptr long ptr) + @ stdcall SetLabel(wstr wstr) kernel32.SetVolumeLabelW Propchange: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def (removed) @@ -1,68 +1,0 @@ -; $Id: lsasrv.def 12852 2005-01-06 13:58:04Z mf $ -LIBRARY lsasrv -EXPORTS -;LsaIAuditNotifyPackageLoad -;LsaIAuditSamEvent -;LsaIEnumerateSecrets -;LsaIFree_LSAI_PRIVATE_DATA -;LsaIFree_LSAI_SECRET_ENUM_BUFFER -;LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER -;LsaIFree_LSAPR_CR_CIPHER_VALUE -;LsaIFree_LSAPR_POLICY_INFORMATION -;LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER -;LsaIFree_LSAPR_PRIVILEGE_SET -;LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST -;LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR -;LsaIFree_LSAPR_TRANSLATED_NAMES -;LsaIFree_LSAPR_TRANSLATED_SIDS -;LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO -;LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER -;LsaIFree_LSAPR_TRUST_INFORMATION -;LsaIFree_LSAPR_UNICODE_STRING -;LsaIGetPrivateData -;LsaIGetSerialNumberPolicy -;LsaIGetSerialNumberPolicy2 -;LsaIHealthCheck -;LsaIInitializeWellKnownSids -;LsaIOpenPolicyTrusted -;LsaIQueryInformationPolicyTrusted -;LsaISetPrivateData -;LsaISetSerialNumberPolicy -;LsaISetTimesSecret -;LsaISetupWasRun -;LsapAuOpenSam -LsapInitLsa@0 -;LsarAddPrivilegesToAccount -;LsarClose -;LsarCreateAccount -;LsarCreateSecret -;LsarCreateTrustedDomain -;LsarDelete -;LsarEnumerateAccounts -;LsarEnumeratePrivileges -;LsarEnumeratePrivilegesAccount -;LsarEnumerateTrustedDomains -;LsarGetQuotasForAccount -;LsarGetSystemAccessAccount -;LsarLookupNames -;LsarLookupPrivilegeDisplayName -;LsarLookupPrivilegeName -;LsarLookupPrivilegeValue -;LsarLookupSids -;LsarOpenAccount -;LsarOpenPolicy -;LsarOpenSecret -;LsarOpenTrustedDomain -;LsarQueryInfoTrustedDomain -;LsarQueryInformationPolicy -;LsarQuerySecret -;LsarQuerySecurityObject -;LsarRemovePrivilegesFromAccount -;LsarSetInformationPolicy -;LsarSetInformationTrustedDomain -;LsarSetQuotasForAccount -;LsarSetSecret -;LsarSetSecurityObject -;LsarSetSystemAccessAccount -;ServiceInit -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Fri Aug 29 11:39:06 2008 @@ -1,5 +1,5 @@ <module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes"> - <importlibrary definition="lsasrv.def" /> + <importlibrary definition="lsasrv.spec.def" /> <include base="lsasrv">.</include> <include base="lsa_server">.</include> <define name="WINVER">0x600</define> @@ -13,4 +13,5 @@ <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> -</module> + <file>lsasrv.spec</file> +</module> Copied: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.spec (from r35723, branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Fri Aug 29 11:39:06 2008 @@ -1,68 +1,65 @@ -; $Id: lsasrv.def 12852 2005-01-06 13:58:04Z mf $ -LIBRARY lsasrv -EXPORTS -;LsaIAuditNotifyPackageLoad -;LsaIAuditSamEvent -;LsaIEnumerateSecrets -;LsaIFree_LSAI_PRIVATE_DATA -;LsaIFree_LSAI_SECRET_ENUM_BUFFER -;LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER -;LsaIFree_LSAPR_CR_CIPHER_VALUE -;LsaIFree_LSAPR_POLICY_INFORMATION -;LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER -;LsaIFree_LSAPR_PRIVILEGE_SET -;LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST -;LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR -;LsaIFree_LSAPR_TRANSLATED_NAMES -;LsaIFree_LSAPR_TRANSLATED_SIDS -;LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO -;LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER -;LsaIFree_LSAPR_TRUST_INFORMATION -;LsaIFree_LSAPR_UNICODE_STRING -;LsaIGetPrivateData -;LsaIGetSerialNumberPolicy -;LsaIGetSerialNumberPolicy2 -;LsaIHealthCheck -;LsaIInitializeWellKnownSids -;LsaIOpenPolicyTrusted -;LsaIQueryInformationPolicyTrusted -;LsaISetPrivateData -;LsaISetSerialNumberPolicy -;LsaISetTimesSecret -;LsaISetupWasRun -;LsapAuOpenSam -LsapInitLsa@0 -;LsarAddPrivilegesToAccount -;LsarClose -;LsarCreateAccount -;LsarCreateSecret -;LsarCreateTrustedDomain -;LsarDelete -;LsarEnumerateAccounts -;LsarEnumeratePrivileges -;LsarEnumeratePrivilegesAccount -;LsarEnumerateTrustedDomains -;LsarGetQuotasForAccount -;LsarGetSystemAccessAccount -;LsarLookupNames -;LsarLookupPrivilegeDisplayName -;LsarLookupPrivilegeName -;LsarLookupPrivilegeValue -;LsarLookupSids -;LsarOpenAccount -;LsarOpenPolicy -;LsarOpenSecret -;LsarOpenTrustedDomain -;LsarQueryInfoTrustedDomain -;LsarQueryInformationPolicy -;LsarQuerySecret -;LsarQuerySecurityObject -;LsarRemovePrivilegesFromAccount -;LsarSetInformationPolicy -;LsarSetInformationTrustedDomain -;LsarSetQuotasForAccount -;LsarSetSecret -;LsarSetSecurityObject -;LsarSetSystemAccessAccount -;ServiceInit -; EOF + + @ stub LsaIAuditNotifyPackageLoad + @ stub LsaIAuditSamEvent + @ stub LsaIEnumerateSecrets + @ stub LsaIFree_LSAI_PRIVATE_DATA #DATA + @ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER + @ stub LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER + @ stub LsaIFree_LSAPR_CR_CIPHER_VALUE + @ stub LsaIFree_LSAPR_POLICY_INFORMATION + @ stub LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER + @ stub LsaIFree_LSAPR_PRIVILEGE_SET + @ stub LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST + @ stub LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR + @ stub LsaIFree_LSAPR_TRANSLATED_NAMES + @ stub LsaIFree_LSAPR_TRANSLATED_SIDS + @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO + @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER + @ stub LsaIFree_LSAPR_TRUST_INFORMATION + @ stub LsaIFree_LSAPR_UNICODE_STRING + @ stub LsaIGetPrivateData + @ stub LsaIGetSerialNumberPolicy + @ stub LsaIGetSerialNumberPolicy2 + @ stub LsaIHealthCheck + @ stub LsaIInitializeWellKnownSids + @ stub LsaIOpenPolicyTrusted + @ stub LsaIQueryInformationPolicyTrusted + @ stub LsaISetPrivateData + @ stub LsaISetSerialNumberPolicy + @ stub LsaISetTimesSecret + @ stub LsaISetupWasRun + @ stub LsapAuOpenSam + @ stdcall LsapInitLsa() + @ stub LsarAddPrivilegesToAccount + @ stub LsarClose + @ stub LsarCreateAccount + @ stub LsarCreateSecret + @ stub LsarCreateTrustedDomain + @ stub LsarDelete + @ stub LsarEnumerateAccounts + @ stub LsarEnumeratePrivileges + @ stub LsarEnumeratePrivilegesAccount + @ stub LsarEnumerateTrustedDomains + @ stub LsarGetQuotasForAccount + @ stub LsarGetSystemAccessAccount + @ stub LsarLookupNames + @ stub LsarLookupPrivilegeDisplayName + @ stub LsarLookupPrivilegeName + @ stub LsarLookupPrivilegeValue + @ stub LsarLookupSids + @ stub LsarOpenAccount + @ stub LsarOpenPolicy + @ stub LsarOpenSecret + @ stub LsarOpenTrustedDomain + @ stub LsarQueryInfoTrustedDomain + @ stub LsarQueryInformationPolicy + @ stub LsarQuerySecret + @ stub LsarQuerySecurityObject + @ stub LsarRemovePrivilegesFromAccount + @ stub LsarSetInformationPolicy + @ stub LsarSetInformationTrustedDomain + @ stub LsarSetQuotasForAccount + @ stub LsarSetSecret + @ stub LsarSetSecurityObject + @ stub LsarSetSystemAccessAccount + @ stub ServiceInit Propchange: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 35761: - Returning STATUS_BUFFER_OVERFLOW is ok also since we're only trying to get DriverKeyLength
by cgutman＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: cgutman Date: Fri Aug 29 09:33:42 2008 New Revision: 35761 URL: http://svn.reactos.org/svn/reactos?rev=35761&view=rev Log: - Returning STATUS_BUFFER_OVERFLOW is ok also since we're only trying to get DriverKeyLength Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Aug 29 09:33:42 2008 @@ -1625,7 +1625,7 @@ Status = IoGetDeviceProperty(PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &DriverKeyLength); - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) { NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n")); return Status;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs