Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 49299: [CMAKE] - remove unnecessary linkage
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 23:38:28 2010 New Revision: 49299 URL: http://svn.reactos.org/svn/reactos?rev=49299&view=rev Log: [CMAKE] - remove unnecessary linkage Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Tue Oct 26 23:38:28 2010 @@ -60,7 +60,6 @@ -lsupc++ -lstdc++ -lgcc - -lmingw32 -lmingwex wine mingw_wmain @@ -79,6 +78,8 @@ -lmsvcrt -lkernel32 -lntdll) + +set_image_base(explorer 0x00400000) add_dependencies(explorer psdk buildno_header) add_livecd_target(explorer reactos)

1 0

[jgardou] 49298: [RPCRT4] - Fix build
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 22:07:36 2010 New Revision: 49298 URL: http://svn.reactos.org/svn/reactos?rev=49298&view=rev Log: [RPCRT4] - Fix build Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Tue Oct 26 22:07:36 2010 @@ -96,7 +96,7 @@ args[0] = *(const WORD*)(fs + 8); TRACE("(%p)->(%d)([%d bytes]) ret=%08x\n", iface, index, args[0], args[1]); - return NdrClientCall2(stubless->pStubDesc, fs, args + 2); + return NdrClientCall2(stubless->pStubDesc, fs, args + 2).Simple; } #define BLOCK_SIZE 1024 Modified: branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Tue Oct 26 22:07:36 2010 @@ -548,10 +548,7 @@ } } -/* the return type should be CLIENT_CALL_RETURN, but this is incompatible - * with the way gcc returns structures. "void *" should be the largest type - * that MIDL should allow you to return anyway */ -LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) +CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; @@ -574,7 +571,7 @@ /* -Oif or -Oicf generated format */ BOOL bV2Format = FALSE; /* the value to return to the client from the remote procedure */ - LONG_PTR RetVal = 0; + CLIENT_CALL_RETURN RetVal = {0}; /* the pointer to the object when in OLE mode */ void * This = NULL; PFORMAT_STRING pHandleFormat; @@ -630,7 +627,7 @@ if (!(pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)) { pFormat = client_get_handle(&stubMsg, pProcHeader, pHandleFormat, &hBinding); - if (!pFormat) return 0; + if (!pFormat) return RetVal; } bV2Format = (pStubDesc->Version >= 0x20000); @@ -729,7 +726,7 @@ } __EXCEPT_ALL { - RetVal = NdrProxyErrorHandler(GetExceptionCode()); + RetVal.Simple = NdrProxyErrorHandler(GetExceptionCode()); } __ENDTRY }

1 0

[jgardou] 49297: [PSDK] - remove GCC special flag, as it has no reason to exist. Thanks go to Timo for having tested this.
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 21:57:12 2010 New Revision: 49297 URL: http://svn.reactos.org/svn/reactos?rev=49297&view=rev Log: [PSDK] - remove GCC special flag, as it has no reason to exist. Thanks go to Timo for having tested this. Modified: branches/cmake-bringup/include/psdk/rpcndr.h Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcn… ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Oct 26 21:57:12 2010 @@ -204,7 +204,7 @@ ULONG_PTR MaxCount; ULONG Offset; ULONG ActualCount; - void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); unsigned char *StackTop; unsigned char *pPresentedType; @@ -486,7 +486,7 @@ { void *Buffer; ULONG BufferSize; - void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); struct IRpcChannelBuffer *pRpcChannelBuffer; ULONG_PTR Reserved[5]; @@ -652,24 +652,14 @@ RPCRTAPI unsigned char* RPC_ENTRY NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); -#ifdef __GCC__ -/* Note: this should return a CLIENT_CALL_RETURN, but calling convention for - * returning structures/unions is different between Windows and gcc on i386. */ -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -#else -CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( - PMIDL_STUB_DESC pStubDescriptor, - PFORMAT_STRING pFormat, - ... -); -#endif RPCRTAPI void RPC_ENTRY NdrServerCall2( PRPC_MESSAGE pRpcMsg );

1 0

[fireball] 49296: [NTOS/MM] - Don't lie about page protection in MiQueryAddressState. Fixes PDFCreator-alike bugs. See issue #5627 for more details.
by fireball＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: fireball Date: Tue Oct 26 21:34:52 2010 New Revision: 49296 URL: http://svn.reactos.org/svn/reactos?rev=49296&view=rev Log: [NTOS/MM] - Don't lie about page protection in MiQueryAddressState. Fixes PDFCreator-alike bugs. See issue #5627 for more details. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Oct 26 21:34:52 2010 @@ -1050,6 +1050,48 @@ ULONG NTAPI +MiGetPageProtection(IN PMMPTE PointerPte) +{ + MMPTE TempPte; + PMMPFN Pfn; + PAGED_CODE(); + + /* Copy this PTE's contents */ + TempPte = *PointerPte; + + /* Assure it's not totally zero */ + ASSERT(TempPte.u.Long); + + /* Check for a special prototype format */ + if (TempPte.u.Soft.Valid == 0 && + TempPte.u.Soft.Prototype == 1) + { + /* Unsupported now */ + UNIMPLEMENTED; + ASSERT(FALSE); + } + + /* In the easy case of transition or demand zero PTE just return its protection */ + if (!TempPte.u.Hard.Valid) return MmProtectToValue[TempPte.u.Soft.Protection]; + + /* If we get here, the PTE is valid, so look up the page in PFN database */ + Pfn = &MmPfnDatabase[TempPte.u.Hard.PageFrameNumber]; + + if (!Pfn->u3.e1.PrototypePte) + { + /* Return protection of the original pte */ + return MmProtectToValue[Pfn->OriginalPte.u.Soft.Protection]; + } + + /* This is hardware PTE */ + UNIMPLEMENTED; + ASSERT(FALSE); + + return PAGE_NOACCESS; +} + +ULONG +NTAPI MiQueryAddressState(IN PVOID Va, IN PMMVAD Vad, IN PEPROCESS TargetProcess, @@ -1119,9 +1161,9 @@ { /* This means it's committed */ State = MEM_COMMIT; - - /* For now, we lie about the protection */ - Protect = PAGE_EXECUTE_READWRITE; + + /* Get protection state of this page */ + Protect = MiGetPageProtection(PointerPte); } else {

1 0

[jgardou] 49295: [WIN32 DLLS] - fix MIDL_user_allocate once and for all
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:58:46 2010 New Revision: 49295 URL: http://svn.reactos.org/svn/reactos?rev=49295&view=rev Log: [WIN32 DLLS] - fix MIDL_user_allocate once and for all Modified: branches/cmake-bringup/dll/win32/advapi32/service/rpc.c branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c branches/cmake-bringup/dll/win32/ole32/moniker.c branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c branches/cmake-bringup/dll/win32/setupapi/rpc.c branches/cmake-bringup/dll/win32/wlanapi/main.c Modified: branches/cmake-bringup/dll/win32/advapi32/service/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/service/rpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/service/rpc.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -12,7 +12,7 @@ void __RPC_FAR * __RPC_USER -midl_user_allocate(SIZE_T len) +midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -72,7 +72,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/m… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/moniker.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/moniker.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -1657,7 +1657,7 @@ return S_OK; } -void * __RPC_USER MIDL_user_allocate(SIZE_T size) +void * __RPC_USER MIDL_user_allocate(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } Modified: branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -596,7 +596,7 @@ return RPC_S_OK; } -void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } Modified: branches/cmake-bringup/dll/win32/setupapi/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/rpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/rpc.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -111,7 +111,7 @@ void __RPC_FAR * __RPC_USER -midl_user_allocate(SIZE_T len) +midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/main.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -198,7 +198,7 @@ } void __RPC_FAR * __RPC_USER -midl_user_allocate(SIZE_T len) +midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

[jgardou] 49294: [PSDK] - fix definition of MIDL_STUB_DESC
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:43:25 2010 New Revision: 49294 URL: http://svn.reactos.org/svn/reactos?rev=49294&view=rev Log: [PSDK] - fix definition of MIDL_STUB_DESC Modified: branches/cmake-bringup/include/psdk/rpcndr.h Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcn… ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Oct 26 18:43:25 2010 @@ -343,7 +343,7 @@ typedef struct _MIDL_STUB_DESC { void *RpcInterfaceInformation; - void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); union { handle_t *pAutoHandle;

1 0

[jgardou] 49293: [SERVICES] - fix definition of midl_user_allocate, RQueryServiceConfigW and RQueryServiceConfigA
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:39:27 2010 New Revision: 49293 URL: http://svn.reactos.org/svn/reactos?rev=49293&view=rev Log: [SERVICES] - fix definition of midl_user_allocate, RQueryServiceConfigW and RQueryServiceConfigA Modified: branches/cmake-bringup/base/system/services/rpcserver.c Modified: branches/cmake-bringup/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] Tue Oct 26 18:39:27 2010 @@ -2564,11 +2564,10 @@ /* Function 17 */ DWORD RQueryServiceConfigW( SC_RPC_HANDLE hService, - LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGW lpServiceConfig, + LPQUERY_SERVICE_CONFIGW lpServiceConfig, DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { - LPQUERY_SERVICE_CONFIGW lpServiceConfig = (LPQUERY_SERVICE_CONFIGW)lpBuf; DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; @@ -3742,11 +3741,10 @@ /* Function 29 */ DWORD RQueryServiceConfigA( SC_RPC_HANDLE hService, - LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGA lpServiceConfig, + LPQUERY_SERVICE_CONFIGA lpServiceConfig, DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { - LPQUERY_SERVICE_CONFIGA lpServiceConfig = (LPQUERY_SERVICE_CONFIGA)lpBuf; DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; @@ -5355,7 +5353,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

[jgardou] 49292: [UMPNPMGR] - Fix definition of midl_user_allocate
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:38:03 2010 New Revision: 49292 URL: http://svn.reactos.org/svn/reactos?rev=49292&view=rev Log: [UMPNPMGR] - Fix definition of midl_user_allocate Modified: branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c Modified: branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Tue Oct 26 18:38:03 2010 @@ -137,7 +137,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

[jgardou] 49291: [CMAKE] - rpcss depends on winesdk [RPCSS] - fix declaration of MIDL_user_allocate
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:30:13 2010 New Revision: 49291 URL: http://svn.reactos.org/svn/reactos?rev=49291&view=rev Log: [CMAKE] - rpcss depends on winesdk [RPCSS] - fix declaration of MIDL_user_allocate Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/base/services/rpcss/irotp.c Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Tue Oct 26 18:30:13 2010 @@ -19,4 +19,5 @@ set_module_type(rpcss win32cui) add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_livecd_target(rpcss reactos/system32) +add_livecd_target(rpcss reactos/system32) +add_dependencies(rpcss winesdk) Modified: branches/cmake-bringup/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/irotp.c [iso-8859-1] Tue Oct 26 18:30:13 2010 @@ -368,7 +368,7 @@ rot_entry_release(rot_entry); } -void * __RPC_USER MIDL_user_allocate(SIZE_T size) +void * __RPC_USER MIDL_user_allocate(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); }

1 0

[jgardou] 49290: [CMAKE] - fix typo
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:01:37 2010 New Revision: 49290 URL: http://svn.reactos.org/svn/reactos?rev=49290&view=rev Log: [CMAKE] - fix typo Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=492… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue Oct 26 18:01:37 2010 @@ -152,6 +152,4 @@ set(IDL_SERVER_ARG -s -S) #.c for server library set(IDL_CLIENT_ARG -c -C) #.c for stub client library -endmacro() - endif()

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