Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 17316: Revert last Wine sync to pidl.c, since it breaks SHGetPathFromIDListW. Fixes
by gvg＠svn.reactos.com 11 Aug '05

11 Aug '05

Revert last Wine sync to pidl.c, since it breaks SHGetPathFromIDListW. Fixes bug 697 Modified: trunk/reactos/lib/shell32/pidl.c _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-08-11 20:48:55 UTC (rev 17315) +++ trunk/reactos/lib/shell32/pidl.c 2005-08-11 21:09:56 UTC (rev 17316) @@ -1210,6 +1210,87 @@ } /*********************************************************************** ** + * SHELL_GetPathFromIDListA + */ +HRESULT SHELL_GetPathFromIDListA(LPCITEMIDLIST pidl, LPSTR pszPath, UINT uOutSize) +{ + HRESULT hr = S_OK; + + pszPath[0]=0; + + /* One case is a PIDL rooted at desktop level */ + if (_ILIsDesktop(pidl) || _ILIsValue(pidl) || _ILIsFolder(pidl)) + { + hr = SHGetSpecialFolderPathA(0, pszPath, CSIDL_DESKTOP, FALSE); + + if (SUCCEEDED(hr)) + PathAddBackslashA(pszPath); + } + /* The only other valid case is an item ID list beginning at "My Computer" */ + else if (_ILIsMyComputer(pidl)) + pidl = ILGetNext(pidl); + + if (SUCCEEDED(hr)) + { + LPSTR txt; + + while(pidl && pidl->mkid.cb) + { + if (_ILIsSpecialFolder(pidl)) + { + hr = E_INVALIDARG; + break; + } + + txt = _ILGetTextPointer(pidl); + if (!txt) + { + hr = E_INVALIDARG; + break; + } + + if (lstrlenA(txt) > pidl->mkid.cb) + ERR("pidl %p is borked\n",pidl); + + /* make sure there's enough space for the next segment */ + if ((lstrlenA(txt) + lstrlenA(pszPath)) > uOutSize) + { + hr = E_INVALIDARG; + break; + } + lstrcatA( pszPath, txt ); + + pidl = ILGetNext(pidl); + if (!pidl) + { + hr = E_INVALIDARG; + break; + } + + /* Are we at the end and successfully converted the complete PIDL? */ + if (!pidl->mkid.cb) + break; + + if ((lstrlenA(pszPath) + 1) > uOutSize) + { + hr = E_INVALIDARG; + break; + } + if (!PathAddBackslashA(pszPath)) + { + hr = E_INVALIDARG; + break; + } + } + } + else + hr = E_INVALIDARG; + + TRACE_(shell)("-- %s, 0x%08lx\n", pszPath, hr); + return hr; +} + +/********************************************************************** *** * SHGetPathFromIDListA [SHELL32.@][NT 4.0: SHELL32.220] * * PARAMETERS @@ -1226,26 +1307,108 @@ */ BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST pidl, LPSTR pszPath) { - WCHAR wszPath[MAX_PATH]; - BOOL bSuccess; + HRESULT hr; - bSuccess = SHGetPathFromIDListW(pidl, wszPath); - if (bSuccess) - WideCharToMultiByte(CP_ACP, 0, wszPath, -1, pszPath, MAX_PATH, NULL, NULL); + TRACE_(shell)("(pidl=%p,%p)\n",pidl,pszPath); + pdump(pidl); - return bSuccess; + if (!pidl) + return FALSE; + + hr = SHELL_GetPathFromIDListA(pidl, pszPath, MAX_PATH); + + return SUCCEEDED(hr); } /*********************************************************************** ** + * SHELL_GetPathFromIDListW + */ +HRESULT SHELL_GetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSize) +{ + HRESULT hr = S_OK; + UINT len; + + pszPath[0]=0; + + /* One case is a PIDL rooted at desktop level */ + if (_ILIsDesktop(pidl) ||_ILIsValue(pidl) || _ILIsFolder(pidl)) + { + hr = SHGetSpecialFolderPathW(0, pszPath, CSIDL_DESKTOP, FALSE); + + if (SUCCEEDED(hr)) + PathAddBackslashW(pszPath); + } + /* The only other valid case is an item ID list beginning at "My Computer" */ + else if (_ILIsMyComputer(pidl)) + pidl = ILGetNext(pidl); + + if (SUCCEEDED(hr)) + { + LPSTR txt; + + while(pidl && pidl->mkid.cb) + { + if (_ILIsSpecialFolder(pidl)) + { + hr = E_INVALIDARG; + break; + } + + txt = _ILGetTextPointer(pidl); + if (!txt) + { + hr = E_INVALIDARG; + break; + } + + if (lstrlenA(txt) > pidl->mkid.cb) + ERR("pidl %p is borked\n",pidl); + len = MultiByteToWideChar(CP_ACP, 0, txt, -1, NULL, 0); + if ( (lstrlenW(pszPath) + len) > uOutSize ) + { + hr = E_INVALIDARG; + break; + } + + MultiByteToWideChar(CP_ACP, 0, txt, -1, + &pszPath[lstrlenW(pszPath)], len); + + pidl = ILGetNext(pidl); + if (!pidl) + { + hr = E_INVALIDARG; + break; + } + + /* Are we at the end and successfully converted the complete PIDL? */ + if (!pidl->mkid.cb) + break; + + if ((lstrlenW(pszPath) + 1) > uOutSize ) + { + hr = E_INVALIDARG; + break; + } + if (!PathAddBackslashW(pszPath)) + { + hr = E_INVALIDARG; + break; + } + } + } + else + hr = E_INVALIDARG; + + TRACE_(shell)("-- %s, 0x%08lx\n", debugstr_w(pszPath), hr); + return hr; +} + +/********************************************************************** *** * SHGetPathFromIDListW [SHELL32.@] */ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath) { HRESULT hr; - LPCITEMIDLIST pidlLast; - LPSHELLFOLDER psfFolder; - DWORD dwAttributes; - STRRET strret; TRACE_(shell)("(pidl=%p,%p)\n", pidl, debugstr_w(pszPath)); pdump(pidl); @@ -1253,19 +1416,8 @@ if (!pidl) return FALSE; - hr = SHBindToParent(pidl, &IID_IShellFolder, (VOID**)&psfFolder, &pidlLast); - if (FAILED(hr)) return FALSE; + hr = SHELL_GetPathFromIDListW(pidl, pszPath, MAX_PATH); - dwAttributes = SFGAO_FILESYSTEM; - hr = IShellFolder_GetAttributesOf(psfFolder, 1, &pidlLast, &dwAttributes); - if (FAILED(hr) || !(dwAttributes & SFGAO_FILESYSTEM)) return FALSE; - - hr = IShellFolder_GetDisplayNameOf(psfFolder, pidlLast, SHGDN_FORPARSING, &strret); - if (FAILED(hr)) return FALSE; - - hr = StrRetToBufW(&strret, pidlLast, pszPath, MAX_PATH); - IShellFolder_Release(psfFolder); - TRACE_(shell)("-- %s, 0x%08lx\n",debugstr_w(pszPath), hr); return SUCCEEDED(hr); }

1 0

[hbirr] 17314: Replaced _WINBASE_ by _WINBASE_H because some headers depends on _WINBASE_H.
by hbirr＠svn.reactos.com 11 Aug '05

11 Aug '05

Replaced _WINBASE_ by _WINBASE_H because some headers depends on _WINBASE_H. Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-08-11 20:45:41 UTC (rev 17313) +++ trunk/reactos/include/ndk/rtltypes.h 2005-08-11 20:48:55 UTC (rev 17314) @@ -399,7 +399,7 @@ } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; /* Let Kernel Drivers use this */ -#ifndef _WINBASE_ +#ifndef _WINBASE_H typedef struct _SYSTEMTIME { WORD wYear; _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-08-11 20:45:41 UTC (rev 17313) +++ trunk/reactos/w32api/include/winbase.h 2005-08-11 20:48:55 UTC (rev 17314) @@ -1,5 +1,5 @@ -#ifndef _WINBASE_ -#define _WINBASE_ +#ifndef _WINBASE_H +#define _WINBASE_H #if __GNUC__ >= 3 #pragma GCC system_header #endif

1 0

[navaraf] 17315: Implement NdisAllocatePacketPool by calling NdisAllocatePacketPoolEx.
by navaraf＠svn.reactos.com 11 Aug '05

11 Aug '05

Implement NdisAllocatePacketPool by calling NdisAllocatePacketPoolEx. Modified: trunk/reactos/drivers/net/ndis/ndis/buffer.c _____ Modified: trunk/reactos/drivers/net/ndis/ndis/buffer.c --- trunk/reactos/drivers/net/ndis/ndis/buffer.c 2005-08-11 20:48:55 UTC (rev 17314) +++ trunk/reactos/drivers/net/ndis/ndis/buffer.c 2005-08-11 20:48:55 UTC (rev 17315) @@ -514,40 +514,12 @@ * ProtocolReservedLength = Size of protocol reserved area in bytes */ { - PNDIS_PACKET_POOL Pool; - UINT Size, Length, i; - PNDIS_PACKET Packet, NextPacket; - - NDIS_DbgPrint(MAX_TRACE, ("Status (0x%X) PoolHandle (0x%X) " - "NumberOfDescriptors (%d) ProtocolReservedLength (%d).\n", - Status, PoolHandle, NumberOfDescriptors, ProtocolReservedLength)); - - Length = sizeof(NDIS_PACKET) + ProtocolReservedLength; - Size = sizeof(NDIS_PACKET_POOL) + Length * NumberOfDescriptors; - - Pool = ExAllocatePool(NonPagedPool, Size); - if (Pool) { - KeInitializeSpinLock(&Pool->SpinLock.SpinLock); - Pool->PacketLength = Length; - - if (NumberOfDescriptors > 0) { - Packet = (PNDIS_PACKET)&Pool->Buffer; - Pool->FreeList = Packet; - - NextPacket = (PNDIS_PACKET)((ULONG_PTR)Packet + Length); - for (i = 1; i < NumberOfDescriptors; i++) { - Packet->Private.Head = (PNDIS_BUFFER)NextPacket; - Packet = NextPacket; - NextPacket = (PNDIS_PACKET)((ULONG_PTR)Packet + Length); - } - Packet->Private.Head = NULL; - } else - Pool->FreeList = NULL; - - *Status = NDIS_STATUS_SUCCESS; - *PoolHandle = (PNDIS_HANDLE)Pool; - } else - *Status = NDIS_STATUS_RESOURCES; + NdisAllocatePacketPoolEx( + Status, + PoolHandle, + NumberOfDescriptors, + 0, + ProtocolReservedLength); }

1 0

[ekohl] 17313: The RpcFinally block must always be executed. Otherwise, RPC code will leak allocated buffer memory.
by ekohl＠svn.reactos.com 11 Aug '05

11 Aug '05

The RpcFinally block must always be executed. Otherwise, RPC code will leak allocated buffer memory. Modified: trunk/reactos/w32api/include/rpc.h _____ Modified: trunk/reactos/w32api/include/rpc.h --- trunk/reactos/w32api/include/rpc.h 2005-08-11 20:44:04 UTC (rev 17312) +++ trunk/reactos/w32api/include/rpc.h 2005-08-11 20:45:41 UTC (rev 17313) @@ -59,7 +59,7 @@ #define RpcExcept(x) } else { #define RpcEndExcept } #define RpcTryFinally if (1) { -#define RpcFinally } else { +#define RpcFinally } if (1) { #define RpcEndFinally } #define RpcExceptionCode() 0 #define RpcAbnormalTermination() AbnormalTermination()

1 0

[hbirr] 17312: Moved the pragma to the correct position.
by hbirr＠svn.reactos.com 11 Aug '05

11 Aug '05

Moved the pragma to the correct position. Modified: trunk/reactos/w32api/include/ddk/win2k.h _____ Modified: trunk/reactos/w32api/include/ddk/win2k.h --- trunk/reactos/w32api/include/ddk/win2k.h 2005-08-11 20:43:24 UTC (rev 17311) +++ trunk/reactos/w32api/include/ddk/win2k.h 2005-08-11 20:44:04 UTC (rev 17312) @@ -50,6 +50,8 @@ MaximumBusDataType } BUS_DATA_TYPE, *PBUS_DATA_TYPE; +#pragma pack(pop) + NTOSAPI VOID DDKAPI @@ -95,8 +97,6 @@ ((Mdl)->MappedSystemVa) : \ (MmMapLockedPages((Mdl), KernelMode))) -#pragma pack(pop) - #ifdef __cplusplus } #endif

1 0

[ea] 17311: A more likely demo VMS server (it should not block, because it is chain-called from the listenig thread in csrsrv.dll.
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

A more likely demo VMS server (it should not block, because it is chain-called from the listenig thread in csrsrv.dll. Modified: trunk/vms/server/server.c _____ Modified: trunk/vms/server/server.c --- trunk/vms/server/server.c 2005-08-11 20:41:20 UTC (rev 17310) +++ trunk/vms/server/server.c 2005-08-11 20:43:24 UTC (rev 17311) @@ -37,30 +37,21 @@ VOID STDCALL VmsStaticServerThread (PVOID x) { NTSTATUS Status = STATUS_SUCCESS; - LPC_MAX_MESSAGE Request; + PPORT_MESSAGE Request = (PPORT_MESSAGE) x; PPORT_MESSAGE Reply = NULL; ULONG MessageType = 0; - while (TRUE) + DPRINT("VMSSRV: %s called\n", __FUNCTION__); + + MessageType = Request->u2.s2.Type; + DPRINT("VMSSRV: %s received a message (Type=%d)\n", + __FUNCTION__, MessageType); + switch (MessageType) { - Status = NtReplyWaitReceivePort (VmsApiPort, - 0, - Reply, - (PPORT_MESSAGE) & Request); - if(NT_SUCCESS(Status)) - { - MessageType = Request.Header.u2.s2.Type; - DPRINT("VMS: %s received a message (Type=%d)\n", - __FUNCTION__, MessageType); - switch(MessageType) - { - default: - continue; - } - }else{ - DPRINT("VMS: %s: NtReplyWaitReceivePort failed (Status=%08lx)\n", - __FUNCTION__, Status); - } + default: + Reply = Request; + Status = NtReplyPort (VmsApiPort, Reply); + break; } } @@ -71,7 +62,23 @@ NTSTATUS STDCALL ServerDllInitialization (ULONG ArgumentCount, LPWSTR *Argument) { - return CsrAddStaticServerThread (VmsStaticServerThread); + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("VMSSRV: %s called\n", __FUNCTION__); + + // Get the listening port from csrsrv.dll + VmsApiPort = CsrQueryApiPort (); + if (NULL == VmsApiPort) + { + return STATUS_UNSUCCESSFUL; + } + // Register our message dispatcher + Status = CsrAddStaticServerThread (VmsStaticServerThread); + if (NT_SUCCESS(Status)) + { + //TODO: perform the real VMS server internal initialization here + } + return Status; } /* EOF */

1 0

[hbirr] 17310: Use GetLocalTime instead of GetSystemTime.
by hbirr＠svn.reactos.com 11 Aug '05

11 Aug '05

Use GetLocalTime instead of GetSystemTime. Modified: trunk/reactos/subsys/system/cmd/locale.c _____ Modified: trunk/reactos/subsys/system/cmd/locale.c --- trunk/reactos/subsys/system/cmd/locale.c 2005-08-11 20:39:28 UTC (rev 17309) +++ trunk/reactos/subsys/system/cmd/locale.c 2005-08-11 20:41:20 UTC (rev 17310) @@ -71,8 +71,8 @@ VOID PrintTime (VOID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - SYSTEMTIME t; - GetSystemTime(&t); + SYSTEMTIME t; + GetLocalTime(&t); LoadString(CMD_ModuleHandle, STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(_T("%s: %02d%c%02d%c%02d%c%02d\n"), szMsg, t.wHour, cTimeSeparator,

1 0

[hbirr] 17309: Don't query on batch files.
by hbirr＠svn.reactos.com 11 Aug '05

11 Aug '05

Don't query on batch files. Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-08-11 20:37:09 UTC (rev 17308) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-08-11 20:39:28 UTC (rev 17309) @@ -537,6 +537,13 @@ } } + /* keep quiet within batch files */ + if (bc != NULL) + { + dwFlags |= COPY_NO_PROMPT; + dwFlags &= ~COPY_PROMPT; + } + if(nFiles < 1) { /* There is not enough files, there has to be at least 1 */

1 0

[hbirr] 17308: Clear the memory after we know that the buffer was allocated.
by hbirr＠svn.reactos.com 11 Aug '05

11 Aug '05

Clear the memory after we know that the buffer was allocated. Modified: trunk/reactos/ntoskrnl/se/semgr.c _____ Modified: trunk/reactos/ntoskrnl/se/semgr.c --- trunk/reactos/ntoskrnl/se/semgr.c 2005-08-11 20:35:00 UTC (rev 17307) +++ trunk/reactos/ntoskrnl/se/semgr.c 2005-08-11 20:37:09 UTC (rev 17308) @@ -719,8 +719,6 @@ Descriptor = ExAllocatePool(PagedPool, Length); - RtlZeroMemory( Descriptor, Length ); - if (Descriptor == NULL) { DPRINT1("ExAlloctePool() failed\n"); @@ -728,6 +726,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } + RtlZeroMemory( Descriptor, Length ); RtlCreateSecurityDescriptor(Descriptor, SECURITY_DESCRIPTOR_REVISION);

1 0

[hbirr] 17307: - Implemented MEMORY_AREA_PEB_OR_TEB and MEMORY_AREA_PAGED_POOL for MiQueryVirtualMemory.
by hbirr＠svn.reactos.com 11 Aug '05

11 Aug '05

- Implemented MEMORY_AREA_PEB_OR_TEB and MEMORY_AREA_PAGED_POOL for MiQueryVirtualMemory. - Fixed the range check in ProbeForRead and ProbeForWrite. Modified: trunk/reactos/ntoskrnl/mm/virtual.c _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-08-11 20:29:08 UTC (rev 17306) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-08-11 20:35:00 UTC (rev 17307) @@ -175,6 +175,7 @@ switch(MemoryArea->Type) { case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: Status = MmQueryAnonMem(MemoryArea, Address, Info, ResultLength); break; @@ -230,6 +231,18 @@ Status = STATUS_SUCCESS; *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); break; + case MEMORY_AREA_PAGED_POOL: + Info->Type = 0; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Attributes; + Info->AllocationProtect = MemoryArea->Attributes; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; default: DPRINT1("unhandled memory area type: 0x%x\n", MemoryArea->Type); Status = STATUS_UNSUCCESSFUL; @@ -1001,7 +1014,7 @@ ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); } else if ((ULONG_PTR)Address + Length - 1 < (ULONG_PTR)Address || - (ULONG_PTR)Address + Length - 1 > (ULONG_PTR)MmUserProbeAddress) + (ULONG_PTR)Address + Length - 1 >= (ULONG_PTR)MmUserProbeAddress) { ExRaiseStatus (STATUS_ACCESS_VIOLATION); } @@ -1031,7 +1044,7 @@ Last = (PCHAR)((ULONG_PTR)Address + Length - 1); if ((ULONG_PTR)Last < (ULONG_PTR)Address || - (ULONG_PTR)Last > (ULONG_PTR)MmUserProbeAddress) + (ULONG_PTR)Last >= (ULONG_PTR)MmUserProbeAddress) { ExRaiseStatus (STATUS_ACCESS_VIOLATION); }

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