Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 38080: Patch by encoded: update SHARED_CACHE_MAP
by tkreuzer＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: tkreuzer Date: Sun Dec 14 11:59:11 2008 New Revision: 38080 URL: http://svn.reactos.org/svn/reactos?rev=38080&view=rev Log: Patch by encoded: update SHARED_CACHE_MAP Modified: branches/ros-amd64-bringup/reactos/include/ndk/cctypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/cctypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/cctypes.h [iso-8859-1] Sun Dec 14 11:59:11 2008 @@ -98,7 +98,11 @@ LARGE_INTEGER ValidDataGoal; PVACB InitialVacbs[4]; PVACB *Vacbs; - PFILE_OBJECT FileObject; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + EX_FAST_REF FileObjectFastRef; +#else + PFILE_OBJECT FileObject; +#endif PVACB ActiveVacb; PVOID NeedToZero; ULONG ActivePage; @@ -127,9 +131,19 @@ ULONG BcbSpinLock; PVOID Reserved; KEVENT Event; - EX_PUSH_LOCK VacbPushLock; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) //guess + LARGE_INTEGER HighWaterMappingOffset; +#else + EX_PUSH_LOCK VacbPushLock; +#endif PRIVATE_CACHE_MAP PrivateCacheMap; -} SHARED_CACHE_MAP; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID WriteBehindWorkQueueEntry; + PVOLUME_CACHE_MAP VolumeCacheMap; + ULONG ProcImagePathHash; + ULONG MappedWritesInProgress; +#endif +} SHARED_CACHE_MAP, *PSHARED_CACHE_MAP; #endif /* _NTIFS_INCLUDED_ */ #endif /* NTOS_MODE_USER */

1 0

[dgorbachev] 38079: Fix winsta.dll rbuild file.
by dgorbachev＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: dgorbachev Date: Sun Dec 14 07:52:28 2008 New Revision: 38079 URL: http://svn.reactos.org/svn/reactos?rev=38079&view=rev Log: Fix winsta.dll rbuild file. Modified: trunk/reactos/dll/win32/winsta/winsta.rbuild Modified: trunk/reactos/dll/win32/winsta/winsta.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/winsta.rb… ============================================================================== --- trunk/reactos/dll/win32/winsta/winsta.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/winsta.rbuild [iso-8859-1] Sun Dec 14 07:52:28 2008 @@ -1,6 +1,6 @@ <module name="winsta" type="win32dll" baseaddress="${BASEADDRESS_WINSTA}" installbase="system32" installname="winsta.dll"> <importlibrary definition="winsta.def" /> - <include base="winsta">include</include> + <include base="winsta">.</include> <library>wine</library> <library>kernel32</library> <library>ntdll</library>

1 0

[ekohl] 38078: - SEH-protect LsaClose, LsaDelete and LsaOpenPolicy. - Move the code of LsaOpenPolicy into LsarOpenPolicy and make LsaOpenPolicy call LsarOpenPolicy.
by ekohl＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: ekohl Date: Sun Dec 14 07:16:16 2008 New Revision: 38078 URL: http://svn.reactos.org/svn/reactos?rev=38078&view=rev Log: - SEH-protect LsaClose, LsaDelete and LsaOpenPolicy. - Move the code of LsaOpenPolicy into LsarOpenPolicy and make LsaOpenPolicy call LsarOpenPolicy. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Dec 14 07:16:16 2008 @@ -78,13 +78,21 @@ NTSTATUS WINAPI LsaClose(LSA_HANDLE ObjectHandle) { + NTSTATUS Status; + TRACE("LsaClose(0x%p) called\n", ObjectHandle); - /* This is our fake handle, don't go too much long way */ - if (ObjectHandle == (LSA_HANDLE)0xcafe) - return STATUS_SUCCESS; - - return LsarClose((PLSAPR_HANDLE)&ObjectHandle); + _SEH2_TRY + { + Status = LsarClose((PLSAPR_HANDLE)&ObjectHandle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH2_END; + + return Status; } @@ -94,9 +102,21 @@ NTSTATUS WINAPI LsaDelete(LSA_HANDLE ObjectHandle) { + NTSTATUS Status; + TRACE("LsaDelete(0x%p) called\n", ObjectHandle); - return LsarDelete((LSAPR_HANDLE)ObjectHandle); + _SEH2_TRY + { + Status = LsarDelete((LSAPR_HANDLE)ObjectHandle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH2_END; + + return Status; } @@ -365,13 +385,32 @@ IN ACCESS_MASK DesiredAccess, IN OUT PLSA_HANDLE PolicyHandle) { - TRACE("(%s,%p,0x%08x,%p) stub\n", + NTSTATUS Status; + + TRACE("LsaOpenPolicy (%s,%p,0x%08x,%p)\n", SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle); - if(PolicyHandle) *PolicyHandle = (LSA_HANDLE)0xcafe; - return STATUS_SUCCESS; -} + _SEH2_TRY + { + *PolicyHandle = NULL; + + Status = LsarOpenPolicy(SystemName->Buffer, + (PLSAPR_OBJECT_ATTRIBUTES)ObjectAttributes, + DesiredAccess, + PolicyHandle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH2_END; + + TRACE("LsaOpenPolicy() done (Status: 0x%08lx)\n", Status); + + return Status; +} + /* * @unimplemented Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Dec 14 07:16:16 2008 @@ -162,8 +162,8 @@ /* Function 0 */ -NTSTATUS LsarClose( - LSAPR_HANDLE *ObjectHandle) +NTSTATUS +LsarClose(LSAPR_HANDLE *ObjectHandle) { #if 0 PLSAR_POLICY_HANDLE Policy = NULL; @@ -183,14 +183,24 @@ return Status; #endif - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + TRACE("LsarClose called!\n"); + + /* This is our fake handle, don't go too much long way */ + if (*ObjectHandle == (LSA_HANDLE)0xcafe) + Status = STATUS_SUCCESS; + + + TRACE("LsarClose done (Status: 0x%08lx)!\n", Status); + + return Status; } /* Function 1 */ -NTSTATUS LsarDelete( - LSAPR_HANDLE ObjectHandle) +NTSTATUS +LsarDelete(LSAPR_HANDLE ObjectHandle) { /* Deprecated */ return STATUS_NOT_SUPPORTED; @@ -252,16 +262,13 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *PolicyHandle) { - ERR("LsarOpenPolicy called!\n"); + TRACE("LsarOpenPolicy called!\n"); *PolicyHandle = (LSAPR_HANDLE)0xcafe; - ERR("LsarOpenPolicy done!\n"); + TRACE("LsarOpenPolicy done!\n"); return STATUS_SUCCESS; - -// UNIMPLEMENTED; -// return STATUS_NOT_IMPLEMENTED; }

1 0

[mjmartin] 38077: - Use volatile with PagesLocked and MdlAddress. Fixes bug #3674. - For safety may have to declare all variable used in except this way.
by mjmartin＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: mjmartin Date: Sun Dec 14 06:14:00 2008 New Revision: 38077 URL: http://svn.reactos.org/svn/reactos?rev=38077&view=rev Log: - Use volatile with PagesLocked and MdlAddress. Fixes bug #3674. - For safety may have to declare all variable used in except this way. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Sun Dec 14 06:14:00 2008 @@ -65,9 +65,9 @@ PMDL Mdl = (PMDL)MdlBuffer; SIZE_T TotalSize, CurrentSize, RemainingSize; volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; - BOOLEAN PagesLocked; + volatile BOOLEAN PagesLocked; PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; - PVOID MdlAddress; + volatile PVOID MdlAddress; KAPC_STATE ApcState; BOOLEAN HaveBadAddress; ULONG_PTR BadAddress;

1 0

[fireball] 38076: - Undo one "fix" from 38075. Coverity warned you about possible double check of the same pointer (though in || you probably can't go without it), but one check should definately stay! SpiGetLunExtension can return NULL!
by fireball＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: fireball Date: Sun Dec 14 05:59:21 2008 New Revision: 38076 URL: http://svn.reactos.org/svn/reactos?rev=38076&view=rev Log: - Undo one "fix" from 38075. Coverity warned you about possible double check of the same pointer (though in || you probably can't go without it), but one check should definately stay! SpiGetLunExtension can return NULL! Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Dec 14 05:59:21 2008 @@ -1956,6 +1956,9 @@ PathId, TargetId, Lun); + + /* If returned LunExtension is NULL, break out */ + if (!LunExtension) break; /* This request should not be processed if */ if ((LunExtension->ReadyLun) ||

1 0

[sginsberg] 38075: - Fix a broken loop - Remove unnecessary checks - Fixes CID 171, 172 and 655
by sginsberg＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: sginsberg Date: Sun Dec 14 04:15:49 2008 New Revision: 38075 URL: http://svn.reactos.org/svn/reactos?rev=38075&view=rev Log: - Fix a broken loop - Remove unnecessary checks - Fixes CID 171, 172 and 655 Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Dec 14 04:15:49 2008 @@ -1733,7 +1733,7 @@ LunInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]->LunInfo; - while (!LunInfo) + while (LunInfo) { /* Free current, but save pointer to the next one */ Ptr = LunInfo->Next; @@ -1958,8 +1958,8 @@ Lun); /* This request should not be processed if */ - if ((LunExtension && LunExtension->ReadyLun) || - (LunExtension && LunExtension->SrbInfo.Srb)) + if ((LunExtension->ReadyLun) || + (LunExtension->SrbInfo.Srb)) { /* Nothing to do here */ break; @@ -2900,7 +2900,7 @@ // Store the MDL virtual address in SrbInfo structure SrbInfo->DataOffset = MmGetMdlVirtualAddress(Irp->MdlAddress); - if (DeviceExtension->MapBuffers && Irp->MdlAddress) + if (DeviceExtension->MapBuffers) { /* Calculate offset within DataBuffer */ SrbInfo->DataOffset = MmGetSystemAddressForMdl(Irp->MdlAddress);

1 0

[sginsberg] 38074: - Get rid off STATIC, DECL_IMPORT and DECL_EXPORT - Fix FIELD_OFFSET
by sginsberg＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: sginsberg Date: Sun Dec 14 04:02:46 2008 New Revision: 38074 URL: http://svn.reactos.org/svn/reactos?rev=38074&view=rev Log: - Get rid off STATIC, DECL_IMPORT and DECL_EXPORT - Fix FIELD_OFFSET Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/ddk/winddi.h trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=38… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sun Dec 14 04:02:46 2008 @@ -58,14 +58,6 @@ // #ifndef CONST #define CONST const -#endif - - -// -// FIXME: Non standard, should be deprecated -// -#ifndef STATIC -#define STATIC static #endif // @@ -164,7 +156,7 @@ // #ifndef FIELD_OFFSET #define FIELD_OFFSET(Type, Field) \ - ((LONG_PTR) (&(((Type *) 0)->Field))) + ((LONG)(LONG_PTR) (&(((Type *) 0)->Field))) #endif // @@ -193,14 +185,8 @@ // // Import and Export Specifiers // -#ifndef DECL_IMPORT -#define DECL_IMPORT DECLSPEC_IMPORT //FIXME: DECL_IMPORT -> DECLSPEC_IMPORT -#endif -#ifndef DECL_EXPORT -#define DECL_EXPORT DECLSPEC_EXPORT //FIXME: DECL_EXPORT -> DECLSPEC_EXPORT -#endif - -// Done the same way as in windef.h (for now *cough*) + +// Done the same way as in windef.h for now #define DECLSPEC_IMPORT __declspec(dllimport) #define DECLSPEC_EXPORT __declspec(dllexport) #define DECLSPEC_NORETURN __declspec(noreturn) Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Sun Dec 14 04:02:46 2008 @@ -34,8 +34,8 @@ extern "C" { #endif -#ifndef DECL_IMPORT -#define DECL_IMPORT __attribute__((dllimport)) +#ifndef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT __attribute__((dllimport)) #endif #ifndef WIN32KAPI Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Dec 14 04:02:46 2008 @@ -3122,10 +3122,10 @@ } HAL_DISPATCH, *PHAL_DISPATCH; #if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTHAL_) -extern DECL_IMPORT PHAL_DISPATCH HalDispatchTable; +extern DECLSPEC_IMPORT PHAL_DISPATCH HalDispatchTable; #define HALDISPATCH ((PHAL_DISPATCH)&HalDispatchTable) #else -extern DECL_EXPORT HAL_DISPATCH HalDispatchTable; +extern DECLSPEC_EXPORT HAL_DISPATCH HalDispatchTable; #define HALDISPATCH (&HalDispatchTable) #endif

1 0

[sserapion] 38073: same here.
by sserapion＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: sserapion Date: Sun Dec 14 00:18:50 2008 New Revision: 38073 URL: http://svn.reactos.org/svn/reactos?rev=38073&view=rev Log: same here. Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sun Dec 14 00:18:50 2008 @@ -626,7 +626,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE;

1 0

[sserapion] 38072: revert CryptReleaseContext "fix", WINE headers made a fool out of me... need sleep. fix FARPROC, NEARPROC, PROC definitions, for real this time
by sserapion＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: sserapion Date: Sun Dec 14 00:17:16 2008 New Revision: 38072 URL: http://svn.reactos.org/svn/reactos?rev=38072&view=rev Log: revert CryptReleaseContext "fix", WINE headers made a fool out of me... need sleep. fix FARPROC, NEARPROC, PROC definitions, for real this time Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h branches/ros-amd64-bringup/reactos/include/psdk/windef.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Dec 14 00:17:16 2008 @@ -3788,7 +3788,7 @@ WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] Sun Dec 14 00:17:16 2008 @@ -358,9 +358,15 @@ typedef int HFILE; typedef HICON HCURSOR; typedef DWORD COLORREF; -typedef INT_PTR (WINAPI *FARPROC)(); -typedef INT_PTR (WINAPI *NEARPROC)(); +#ifdef _WIN64 +typedef INT_PTR (FAR WINAPI *FARPROC)(); +typedef INT_PTR (NEAR WINAPI *NEARPROC)(); typedef INT_PTR (WINAPI *PROC)(); +#else +typedef int (FAR WINAPI *FARPROC)(); +typedef int (NEAR WINAPI *NEARPROC)(); +typedef int (WINAPI *PROC)(); +#endif typedef struct tagRECT { LONG left; LONG top;

1 0

[sserapion] 38071: Fix CryptReleaseContext.
by sserapion＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: sserapion Date: Sat Dec 13 23:37:45 2008 New Revision: 38071 URL: http://svn.reactos.org/svn/reactos?rev=38071&view=rev Log: Fix CryptReleaseContext. Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sat Dec 13 23:37:45 2008 @@ -626,7 +626,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE;

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