Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 21573: Implement surface unlock
by greatlrd＠svn.reactos.org 13 Apr '06

13 Apr '06

Author: greatlrd Date: Thu Apr 13 10:29:01 2006 New Revision: 21573 URL: http://svn.reactos.ru/svn/reactos?rev=21573&view=rev Log: Implement surface unlock Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Thu Apr 13 10:29:01 2006 @@ -93,7 +93,7 @@ { IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - + DDHAL_LOCKDATA Lock; if (prect!=NULL) @@ -115,16 +115,19 @@ if (!DdResetVisrgn(&This->Surf->mPrimaryLocal, NULL)) { - // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); + OutputDebugStringA("Here DdResetVisrgn lock"); + return DDERR_UNSUPPORTED; } if (Lock.Lock(&Lock)!= DDHAL_DRIVER_HANDLED) { - return DDERR_LOCKEDSURFACES; + OutputDebugStringA("Here DDHAL_DRIVER_HANDLED lock"); + return DDERR_UNSUPPORTED; } if (Lock.ddRVal!= DD_OK) { + OutputDebugStringA("Here ddRVal lock"); return Lock.ddRVal; } @@ -138,8 +141,33 @@ return DD_OK; } HRESULT Hal_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) -{ - DX_STUB; +{ + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + DDHAL_UNLOCKDATA unLock; + unLock.ddRVal = DDERR_NOTPALETTIZED; + unLock.lpDD = &This->owner->mDDrawGlobal; + unLock.lpDDSurface = &This->Surf->mPrimaryLocal; + unLock.Unlock = This->owner->mCallbacks.HALDDSurface.Unlock; + + + + if (!DdResetVisrgn( unLock.lpDDSurface, NULL)) + { + return DDERR_UNSUPPORTED; + } + + if (unLock.Unlock(&unLock)!= DDHAL_DRIVER_HANDLED) + { + return DDERR_UNSUPPORTED; + } + + if (unLock.ddRVal!= DD_OK) + { + return unLock.ddRVal; + } + + return DD_OK; } HRESULT Hal_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags)

1 0

[gvg] 21572: Keep track of last trunk rev merged to branch
by gvg＠svn.reactos.org 13 Apr '06

13 Apr '06

Author: gvg Date: Thu Apr 13 09:48:23 2006 New Revision: 21572 URL: http://svn.reactos.ru/svn/reactos?rev=21572&view=rev Log: Keep track of last trunk rev merged to branch Modified: branches/ntoskrnl-audit/reactos/ (props changed) Propchange: branches/ntoskrnl-audit/reactos/ ------------------------------------------------------------------------------ lastmerge = 21570

1 0

[gvg] 21571: Create kernel audit playground
by gvg＠svn.reactos.org 13 Apr '06

13 Apr '06

Author: gvg Date: Thu Apr 13 09:41:16 2006 New Revision: 21571 URL: http://svn.reactos.ru/svn/reactos?rev=21571&view=rev Log: Create kernel audit playground Added: branches/ntoskrnl-audit/ - copied from r21570, trunk/

1 0

[greatlrd] 21570: make ddraw not crashing in ros. close my debug marco for windows.
by greatlrd＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: greatlrd Date: Thu Apr 13 00:10:20 2006 New Revision: 21570 URL: http://svn.reactos.ru/svn/reactos?rev=21570&view=rev Log: make ddraw not crashing in ros. close my debug marco for windows. Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Thu Apr 13 00:10:20 2006 @@ -233,6 +233,9 @@ firstcall = FALSE; \ } +#define DX_WINDBG_trace() + +/* #define DX_WINDBG_trace() \ static BOOL firstcallx = TRUE; \ if (firstcallx) \ @@ -242,6 +245,7 @@ OutputDebugStringA(buffer); \ firstcallx = TRUE; \ } +*/ #define DX_WINDBG_trace_res(width,height,bpp) \ static BOOL firstcallxx = TRUE; \

1 0

[greatlrd] 21569: Implement DX HAL Lock it works now. we getting back user mode pointer of kernel mode memode pointer. it is mapen now. it did make next test apps working with our ddraw.dll in windows. lest 4 dx draw apps I got is working.
by greatlrd＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: greatlrd Date: Thu Apr 13 00:09:09 2006 New Revision: 21569 URL: http://svn.reactos.ru/svn/reactos?rev=21569&view=rev Log: Implement DX HAL Lock it works now. we getting back user mode pointer of kernel mode memode pointer. it is mapen now. it did make next test apps working with our ddraw.dll in windows. lest 4 dx draw apps I got is working. Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Thu Apr 13 00:09:09 2006 @@ -65,25 +65,20 @@ mDdBlt.lpDDSrcSurface = That->Surf->mpPrimaryLocals[0]; } - //mDdBlt.lpDDSrcSurface = NULL; //src-> - mDdBlt.lpDD = &This->owner->mDDrawGlobal; mDdBlt.Blt = This->owner->mCallbacks.HALDDSurface.Blt; mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; mDdBlt.dwFlags = dwFlags; - - // This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + // FIXME dectect if it clipped or not - DX_STUB_str( "Can not create offscreenplain surface"); mDdBlt.IsClipped = FALSE; if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) { return DDHAL_DRIVER_HANDLED; } - if (mDdBlt.ddRVal!=DD_OK) { @@ -97,10 +92,9 @@ pDDSD, DWORD flags, HANDLE event) { - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - - - DDHAL_LOCKDATA Lock; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + DDHAL_LOCKDATA Lock; if (prect!=NULL) { @@ -115,26 +109,32 @@ Lock.ddRVal = DDERR_NOTPALETTIZED; Lock.Lock = This->owner->mCallbacks.HALDDSurface.Lock; Lock.dwFlags = flags; - Lock.lpDDSurface = This->Surf->mpPrimaryLocals[0]; + Lock.lpDDSurface = &This->Surf->mPrimaryLocal; Lock.lpDD = &This->owner->mDDrawGlobal; Lock.lpSurfData = NULL; - - // FIXME some how lock goes wrong; - return DD_FALSE; - if (This->owner->mCallbacks.HALDDSurface.Lock(&Lock)!= DDHAL_DRIVER_HANDLED) + + if (!DdResetVisrgn(&This->Surf->mPrimaryLocal, NULL)) { + // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); + } + + if (Lock.Lock(&Lock)!= DDHAL_DRIVER_HANDLED) + { + return DDERR_LOCKEDSURFACES; + } + + if (Lock.ddRVal!= DD_OK) + { return Lock.ddRVal; } + // FIXME ??? is this right ?? RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); pDDSD->dwSize = sizeof(DDSURFACEDESC2); - - pDDSD->lpSurface = Lock.lpSurfData; - - - // FIXME some things is wrong it does not show the data on screen ?? - + + pDDSD->lpSurface = (LPVOID) Lock.lpSurfData; + return DD_OK; } HRESULT Hal_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect)

1 0

[tretiakov] 21568: Oops, forget to add these.
by tretiakov＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: tretiakov Date: Wed Apr 12 23:18:22 2006 New Revision: 21568 URL: http://svn.reactos.ru/svn/reactos?rev=21568&view=rev Log: Oops, forget to add these. Added: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h Added: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_contex… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c (added) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c Wed Apr 12 23:18:22 2006 @@ -1,0 +1,206 @@ +/* + * Context Handle Functions + * + * Copyright 2006 Saveliy Tretiakov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "rpc.h" +#include "rpcndr.h" +#include "wine/debug.h" + +#include "rpc_binding.h" +#include "ndr_contexth.h" + + +/*********************************************************************** + * NDRCContextBinding + */ +RPC_BINDING_HANDLE WINAPI NDRCContextBinding(NDR_CCONTEXT CContext) +{ + if(!CContext) + RpcRaiseException(ERROR_INVALID_HANDLE); + + return (RPC_BINDING_HANDLE)((CContextHandle*)CContext)->Binding; +} + +/*********************************************************************** + * NDRCContextMarshall + */ +void WINAPI NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff ) +{ + CContextHandle *ctx = (CContextHandle*)CContext; + memcpy(pBuff, &ctx->Ndr, sizeof(ContextHandleNdr)); +} + +/*********************************************************************** + * NdrClientContextMarshall + */ +void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, + NDR_CCONTEXT ContextHandle, + int fCheck) +{ + + if(!ContextHandle) + RpcRaiseException(ERROR_INVALID_HANDLE); + + NDRCContextMarshall(ContextHandle, pStubMsg->Buffer); + + pStubMsg->Buffer += sizeof(ContextHandleNdr); + +} + +/*********************************************************************** + * NDRCContextUnmarshall + */ +void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, + RPC_BINDING_HANDLE hBinding, + void *pBuff, + unsigned long DataRepresentation ) +{ + CContextHandle *ctx = (CContextHandle*)*pCContext; + ContextHandleNdr *ndr = (ContextHandleNdr*)pBuff; + RPC_STATUS status; + + if(UuidIsNil(&ndr->uuid, &status)) + { + if(ctx) + { + RPCRT4_DestroyBinding(ctx->Binding); + HeapFree(GetProcessHeap(), 0, ctx); + } + *pCContext = NULL; + } + else + { + ctx = HeapAlloc(GetProcessHeap(), 0, sizeof(CContextHandle)); + if(!ctx) RpcRaiseException(ERROR_OUTOFMEMORY); + + status = RpcBindingCopy(hBinding, (RPC_BINDING_HANDLE*) &ctx->Binding); + if(status != RPC_S_OK) RpcRaiseException(status); + + memcpy(&ctx->Ndr, ndr, sizeof(ContextHandleNdr)); + *pCContext = (NDR_CCONTEXT)ctx; + } +} + +/*********************************************************************** + * NdrClientContextUnmarshall + */ +void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + NDR_CCONTEXT * pContextHandle, + RPC_BINDING_HANDLE BindHandle) +{ + if(!pContextHandle) + RpcRaiseException(ERROR_INVALID_HANDLE); + + NDRCContextUnmarshall(pContextHandle, + ((CContextHandle*)pContextHandle)->Binding, + pStubMsg->Buffer, + pStubMsg->RpcMsg->DataRepresentation); + + pStubMsg->Buffer += sizeof(ContextHandleNdr); +} + +/*********************************************************************** + * RpcSmDestroyClientContext + */ +RPC_STATUS WINAPI RpcSmDestroyClientContext(void** ContextHandle) +{ + CContextHandle *ctx = (CContextHandle*)ContextHandle; + + if(!ctx) + return RPC_X_SS_CONTEXT_MISMATCH; + + RPCRT4_DestroyBinding(ctx->Binding); + HeapFree(GetProcessHeap(), 0, ctx); + *ContextHandle = NULL; + + return RPC_S_OK; +} + +/*********************************************************************** + * RpcSsDestroyClientContext + */ +void WINAPI RpcSsDestroyClientContext(void** ContextHandle) +{ + RPC_STATUS status; + + status = RpcSmDestroyClientContext(ContextHandle); + + if(status != RPC_S_OK) + RpcRaiseException(status); +} + +/*********************************************************************** + * NdrServerContextMarshall + */ +void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, + NDR_SCONTEXT ContextHandle, + NDR_RUNDOWN RundownRoutine ) +{ + FIXME("(%p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine); +} + +/*********************************************************************** + * NdrServerContextUnmarshall + */ +NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); + return NULL; +} + +/*********************************************************************** + * NdrContextHandleSize + */ +void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char* pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("(%p, %p, %p): stub\n", pStubMsg, pMemory, pFormat); +} + +/*********************************************************************** + * NdrContextHandleInitialize + */ +NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("(%p, %p): stub\n", pStubMsg, pFormat); + return NULL; +} + +/*********************************************************************** + * NdrServerContextNewMarshall + */ +void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, + NDR_SCONTEXT ContextHandle, + NDR_RUNDOWN RundownRoutine, + PFORMAT_STRING pFormat) +{ + FIXME("(%p, %p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); +} + +/*********************************************************************** + * NdrServerContextNewUnmarshall + */ +NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("(%p, %p): stub\n", pStubMsg, pFormat); + return NULL; +} Added: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_contex… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h (added) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h Wed Apr 12 23:18:22 2006 @@ -1,0 +1,39 @@ +/* + * Context Handle Functions + * + * Copyright 2006 Saveliy Tretiakov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef __WINE_NDR_CONTEXTH_H +#define __WINE_NDR_CONTEXTH_H + +#include "wine/rpcss_shared.h" + +typedef struct _ContextHandleNdr +{ + UINT attributes; + UUID uuid; +} ContextHandleNdr; + +typedef struct _CContextHandle +{ + RpcBinding *Binding; + ContextHandleNdr Ndr; +} CContextHandle; + +#endif //__WINE_NDR_CONTEXTH_H

1 0

[tretiakov] 21567: Move all context handle stuff to ndr_contexth.c
by tretiakov＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: tretiakov Date: Wed Apr 12 23:17:30 2006 New Revision: 21567 URL: http://svn.reactos.ru/svn/reactos?rev=21567&view=rev Log: Move all context handle stuff to ndr_contexth.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsha… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Wed Apr 12 23:17:30 2006 @@ -3229,167 +3229,3 @@ /* nothing to do */ } - -/*********************************************************************** - * NDRCContextMarshall - */ -void WINAPI NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff ) -{ - CContextHandle *ctx = (CContextHandle*)CContext; - memcpy(pBuff, &ctx->Ndr, sizeof(ContextHandleNdr)); -} - -/*********************************************************************** - * NdrClientContextMarshall - */ -void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, - NDR_CCONTEXT ContextHandle, - int fCheck) -{ - - if(!ContextHandle) - RpcRaiseException(ERROR_INVALID_HANDLE); - - NDRCContextMarshall(ContextHandle, pStubMsg->Buffer); - - pStubMsg->Buffer += sizeof(ContextHandleNdr); - -} - - -/*********************************************************************** - * NDRCContextUnmarshall - */ -void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, - RPC_BINDING_HANDLE hBinding, - void *pBuff, - unsigned long DataRepresentation ) -{ - CContextHandle *ctx = (CContextHandle*)*pCContext; - ContextHandleNdr *ndr = (ContextHandleNdr*)pBuff; - RPC_STATUS status; - - if(UuidIsNil(&ndr->uuid, &status)) - { - if(ctx) - { - RPCRT4_DestroyBinding(ctx->Binding); - HeapFree(GetProcessHeap(), 0, ctx); - } - *pCContext = NULL; - } - else - { - ctx = HeapAlloc(GetProcessHeap(), 0, sizeof(CContextHandle)); - if(!ctx) RpcRaiseException(ERROR_OUTOFMEMORY); - - status = RpcBindingCopy(hBinding, (RPC_BINDING_HANDLE*) &ctx->Binding); - if(status != RPC_S_OK) RpcRaiseException(status); - - memcpy(&ctx->Ndr, ndr, sizeof(ContextHandleNdr)); - *pCContext = (NDR_CCONTEXT)ctx; - } -} - -/*********************************************************************** - * NdrClientContextUnmarshall - */ -void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, - NDR_CCONTEXT * pContextHandle, - RPC_BINDING_HANDLE BindHandle) -{ - if(!pContextHandle) - RpcRaiseException(ERROR_INVALID_HANDLE); - - NDRCContextUnmarshall(pContextHandle, - ((CContextHandle*)pContextHandle)->Binding, - pStubMsg->Buffer, - pStubMsg->RpcMsg->DataRepresentation); - - pStubMsg->Buffer += sizeof(ContextHandleNdr); -} - -void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, - NDR_SCONTEXT ContextHandle, - NDR_RUNDOWN RundownRoutine ) -{ - FIXME("(%p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine); -} - -NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) -{ - FIXME("(%p): stub\n", pStubMsg); - return NULL; -} - -void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, - unsigned char* pMemory, - PFORMAT_STRING pFormat) -{ - FIXME("(%p, %p, %p): stub\n", pStubMsg, pMemory, pFormat); -} - -NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) -{ - FIXME("(%p, %p): stub\n", pStubMsg, pFormat); - return NULL; -} - -void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, - NDR_SCONTEXT ContextHandle, - NDR_RUNDOWN RundownRoutine, - PFORMAT_STRING pFormat) -{ - FIXME("(%p, %p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); -} - -NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) -{ - FIXME("(%p, %p): stub\n", pStubMsg, pFormat); - return NULL; -} - -/*********************************************************************** - * NDRCContextBinding - */ -RPC_BINDING_HANDLE WINAPI NDRCContextBinding(NDR_CCONTEXT CContext) -{ - if(!CContext) - RpcRaiseException(ERROR_INVALID_HANDLE); - - return (RPC_BINDING_HANDLE)((CContextHandle*)CContext)->Binding; -} - -/*********************************************************************** - * RpcSmDestroyClientContext - */ -RPC_STATUS WINAPI RpcSmDestroyClientContext(void** ContextHandle) -{ - CContextHandle *ctx = (CContextHandle*)ContextHandle; - - if(!ctx) - return RPC_X_SS_CONTEXT_MISMATCH; - - RPCRT4_DestroyBinding(ctx->Binding); - HeapFree(GetProcessHeap(), 0, ctx); - *ContextHandle = NULL; - - return RPC_S_OK; -} - -/*********************************************************************** - * RpcSsDestroyClientContext - */ -void WINAPI RpcSsDestroyClientContext(void** ContextHandle) -{ - RPC_STATUS status; - - status = RpcSmDestroyClientContext(ContextHandle); - - if(status != RPC_S_OK) - RpcRaiseException(status); -} - - Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindin… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.h (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.h Wed Apr 12 23:17:30 2006 @@ -53,18 +53,6 @@ RpcConnection* FromConn; } RpcBinding; -typedef struct _ContextHandleNdr -{ - UINT attributes; - UUID uuid; -} ContextHandleNdr; - -typedef struct _CContextHandle -{ - RpcBinding *Binding; - ContextHandleNdr Ndr; -} CContextHandle; - LPSTR RPCRT4_strndupA(LPCSTR src, INT len); LPWSTR RPCRT4_strndupW(LPWSTR src, INT len); LPSTR RPCRT4_strdupWtoA(LPWSTR src); Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbu… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Wed Apr 12 23:17:30 2006 @@ -29,6 +29,7 @@ <file>rpc_epmap.c</file> <file>rpc_message.c</file> <file>rpc_server.c</file> + <file>ndr_contexth.c</file> <file>rpcrt4_main.c</file> <file>rpcss_np_client.c</file> <file>rpcrt4.rc</file>

1 0

[tretiakov] 21566: Add rpcrt4 api call chains. Autogenerated by OpenRCE.org script. Fireball said we can use this.
by tretiakov＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: tretiakov Date: Wed Apr 12 23:13:28 2006 New Revision: 21566 URL: http://svn.reactos.ru/svn/reactos?rev=21566&view=rev Log: Add rpcrt4 api call chains. Autogenerated by OpenRCE.org script. Fireball said we can use this. Added: trunk/documentation/reverse.engineering/rpcrt4/ trunk/documentation/reverse.engineering/rpcrt4/rpcrt4_callchains.txt Added: trunk/documentation/reverse.engineering/rpcrt4/rpcrt4_callchains.txt URL: http://svn.reactos.ru/svn/reactos/trunk/documentation/reverse.engineering/r… ============================================================================== --- trunk/documentation/reverse.engineering/rpcrt4/rpcrt4_callchains.txt (added) +++ trunk/documentation/reverse.engineering/rpcrt4/rpcrt4_callchains.txt Wed Apr 12 23:13:28 2006 @@ -1,0 +1,903 @@ +******************************************************************** +* rpcrt4.dll api call chains. Autogenerated by OpenRCE.org scrtipt * +******************************************************************** + +RpcServerUseProtseqEpA + -> I_RpcServerUseProtseqEp2A + +RpcServerRegisterAuthInfoA + -> RpcServerRegisterAuthInfoW + -> RtlFreeUnicodeString + +RpcEpRegisterW + -> RpcEpRegisterA + +RpcServerUseProtseqW + -> RpcServerUseProtseqExW + +RpcServerUseProtseqExW + -> I_RpcServerUseProtseq2W + +I_RpcServerUseProtseqEp2A + -> lstrlenA + -> _alloca_probe + -> RtlMultiByteToUnicodeN + -> I_RpcServerUseProtseqEp2W + -> RtlFreeUnicodeString + +RpcServerUseAllProtseqsIf + -> RpcServerUseAllProtseqsIfEx + +RpcServerUseAllProtseqsIfEx + -> RpcServerUseProtseqEpExA + +RpcServerUseProtseqEpExA + -> I_RpcServerUseProtseqEp2A + +RpcBindingVectorFree + -> RpcBindingFree + +RpcBindingToStringBindingA + -> RpcBindingToStringBindingW + +I_RpcServerAllocateIpPort + -> RpcBindingFromStringBindingW + -> RpcBindingFree + -> RtlEnterCriticalSection + -> RtlLeaveCriticalSection + +RpcStringBindingParseA + -> RpcStringBindingParseW + -> RtlFreeUnicodeString + +RpcServerUseProtseqA + -> I_RpcServerUseProtseq2A + +I_RpcServerUseProtseq2A + -> lstrlenA + -> _alloca_probe + -> RtlMultiByteToUnicodeN + -> I_RpcServerUseProtseq2W + +NdrFullPointerXlatInit + -> I_RpcAllocate + +NdrFullPointerXlatFree + -> I_RpcFree + +NdrFullPointerQueryPointer + -> I_RpcAllocate + +TowerConstruct + -> lstrcmpiA + -> I_RpcAllocate + -> I_RpcFree + +NdrFullPointerInsertRefId + -> I_RpcAllocate + +RpcBindingSetAuthInfoW + -> RpcBindingSetAuthInfoExW + +UuidFromStringA + -> RtlFreeUnicodeString + +NdrServerMarshall + -> NdrStubGetBuffer + -> NdrSimpleTypeMarshall + +NdrServerUnmarshall + -> NdrStubInitialize + +RpcStringFreeA + -> RpcStringFreeW + +RpcBindingFromStringBindingA + -> RpcBindingFromStringBindingW + -> RtlFreeUnicodeString + +RpcStringBindingComposeA + -> lstrlenA + -> _alloca_probe + -> RtlMultiByteToUnicodeN + -> RpcStringBindingComposeW + +RpcRaiseException + -> RaiseException + +RpcBindingInqAuthInfoExW + -> RtlEnterCriticalSection + -> RtlLeaveCriticalSection + -> GetTokenInformation + -> CloseHandle + +NdrRangeUnmarshall + -> RpcRaiseException + -> NdrAllocate + +MesEncodeFixedBufferHandleCreate + -> MesBufferHandleReset + +NdrMesTypeAlignSize2 + -> _alloca_probe + -> NdrCorrelationInitialize + -> NdrMesTypeAlignSize + +RpcBindingInqAuthClientW + -> RpcBindingInqAuthClientExW + +MesDecodeBufferHandleCreate + -> MesBufferHandleReset + +NdrMesTypeEncode2 + -> _alloca_probe + -> NdrCorrelationInitialize + -> NdrMesTypeEncode + -> NdrCorrelationPass + +NdrMesTypeDecode2 + -> _alloca_probe + -> NdrCorrelationInitialize + -> NdrMesTypeDecode + -> NdrCorrelationPass + +NdrMesTypeEncode + -> NdrMesTypeAlignSize + +RpcSmDestroyClientContext + -> RpcSsDestroyClientContext + +RpcSsDestroyClientContext + -> NDRCContextBinding + -> RpcBindingFree + -> I_RpcFree + +RpcServerUseProtseqEpExW + -> I_RpcServerUseProtseqEp2W + +RpcServerUseProtseqEpW + -> RpcServerUseProtseqEpExW + +NdrConformantStructUnmarshall + -> NdrAllocate + +NDRCContextUnmarshall + -> I_RpcAllocate + -> I_RpcBindingCopy + +NdrServerContextNewMarshall + -> NDRSContextMarshall2 + +NDRSContextMarshall2 + -> UuidCreate + +NdrContextHandleInitialize + -> NDRSContextUnmarshall2 + +RpcStringBindingParseW + -> wcslen + -> _alloca_probe + -> wcscpy + +RpcBindingFromStringBindingW + -> wcslen + -> _alloca_probe + -> wcscpy + +I_RpcParseSecurity + -> _wcsnicmp + +RpcRevertToSelf + -> RpcRevertToSelfEx + +NdrSimpleTypeUnmarshall + -> RpcRaiseException + +NdrComplexStructMarshall + -> NdrComplexStructBufferSize + +NdrComplexStructUnmarshall + -> NdrComplexStructMemorySize + +NdrComplexStructFree + -> NdrAllocate + +I_RpcGetBuffer + -> I_RpcGetBufferWithObject + +NdrClientInitializeNew + -> NdrClientInitialize + +NdrGetBuffer + -> I_RpcGetBuffer + +NdrFreeBuffer + -> I_RpcFreeBuffer + +NdrServerInitializeNew + -> NdrServerInitialize + +NdrSendReceive + -> I_RpcSendReceive + +I_RpcRequestMutex + -> RtlEnterCriticalSection + +I_RpcClearMutex + -> RtlLeaveCriticalSection + +NDRSContextUnmarshall2 + -> I_RpcGetAssociationContext + -> I_RpcRequestMutex + -> I_RpcClearMutex + -> I_RpcGetServerContextList + -> I_RpcSetServerContextList + +NdrServerContextNewUnmarshall + -> NDRSContextUnmarshall2 + +NdrComplexArrayMarshall + -> NdrComplexArrayBufferSize + +NdrComplexArrayUnmarshall + -> NdrComplexArrayMemorySize + +NdrComplexArrayMemorySize + -> NdrAllocate + -> LoadLibraryA + -> GetProcAddress + -> RtlInitializeCriticalSection + -> GetProcessHeap + -> HeapAlloc + -> InitializeCriticalSection + -> InterlockedExchange + -> RtlDeleteCriticalSection + -> DeleteCriticalSection + -> HeapFree + -> PerformRpcInitialization + -> GetLastError + -> CloseHandle + -> RtlLeaveCriticalSection + -> InterlockedDecrement + -> InterlockedIncrement + -> RtlEnterCriticalSection + -> _wcsicmp + -> RpcBindingVectorFree + -> Sleep + -> _wcsnicmp + -> memmove + -> I_RpcAsyncSetHandle + -> InterlockedCompareExchange + -> I_RpcBCacheFree + -> SetEvent + -> lstrlenA + -> _alloca_probe + -> RtlMultiByteToUnicodeN + -> RegCloseKey + -> RegOpenKeyExA + -> RegQueryValueExW + -> RtlFreeAnsiString + -> TowerExplode + -> I_RpcFree + -> NdrRpcSsDefaultFree + -> RpcSsDestroyClientContext + -> RpcSmDestroyClientContext + -> RtlFreeUnicodeString + -> GetCurrentThread + -> RpcCancelThread + -> RpcBindingSetObject + -> RtlUlongByteSwap + -> GetComputerNameW + -> CompareStringW + -> NtRequestPort + -> NtReplyWaitReplyPort + -> PostQueuedCompletionStatus + -> VirtualAlloc + -> VirtualFree + -> SetLastError + -> GetCurrentProcessId + -> swprintf + -> RpcServerUseProtseqEpW + -> NtReplyPort + -> I_RpcClearMutex + -> RpcRaiseException + -> NdrOleFree + -> I_RpcAllocate + -> MesHandleFree + -> I_RpcIsForcedPickleCleanup + -> NdrpSetRpcSsDefaults + -> I_RpcReceive + -> NdrInterfacePointerBufferSize + -> MIDL_wchar_strlen + -> NdrSimpleTypeMarshall + -> NdrFullPointerInsertRefId + -> NdrSimpleTypeUnmarshall + -> NdrFullPointerQueryRefId + +GlobalMutexRequestExternal + -> RtlEnterCriticalSection + +GlobalMutexClearExternal + -> RtlLeaveCriticalSection + +RpcNetworkIsProtseqValidW + -> PerformRpcInitialization + +RpcMgmtInqComTimeout + -> PerformRpcInitialization + +DceErrorInqTextA + -> FormatMessageA + +DceErrorInqTextW + -> FormatMessageW + +I_RpcConnectionInqSockBuffSize + -> RtlEnterCriticalSection + -> RtlLeaveCriticalSection + +I_RpcConnectionSetSockBuffSize + -> RtlEnterCriticalSection + -> RtlLeaveCriticalSection + +RpcCancelThread + -> QueueUserAPC + +RpcCancelThreadEx + -> QueueUserAPC + +RpcTestCancel + -> RpcServerTestCancel + +RpcNetworkInqProtseqsW + -> PerformRpcInitialization + +RpcObjectInqType + -> PerformRpcInitialization + +RpcObjectSetInqFn + -> PerformRpcInitialization + +RpcObjectSetType + -> PerformRpcInitialization + +RpcProtseqVectorFreeW + -> PerformRpcInitialization + +RpcServerInqIf + -> PerformRpcInitialization + +RpcServerUseAllProtseqsEx + -> PerformRpcInitialization + -> _wcsnicmp + -> RpcProtseqVectorFreeW + +RpcServerUseAllProtseqs + -> RpcServerUseAllProtseqsEx + +RpcServerUseProtseqIfExW + -> PerformRpcInitialization + -> _wcsicmp + -> RtlFreeUnicodeString + -> RpcServerUseProtseqEpExA + +RpcServerUseProtseqIfW + -> RpcServerUseProtseqIfExW + +RpcMgmtInqStats + -> PerformRpcInitialization + +RpcMgmtWaitServerListen + -> PerformRpcInitialization + +RpcMgmtInqIfIds + -> PerformRpcInitialization + +RpcIfIdVectorFree + -> PerformRpcInitialization + +RpcServerInqDefaultPrincNameA + -> RpcServerInqDefaultPrincNameW + +I_RpcNsInterfaceExported + -> PerformRpcInitialization + +I_RpcNsInterfaceUnexported + -> PerformRpcInitialization + +RpcEpResolveBinding + -> PerformRpcInitialization + +RpcNsBindingInqEntryNameW + -> PerformRpcInitialization + +I_RpcNsBindingSetEntryNameW + -> PerformRpcInitialization + +RpcBindingInqAuthInfoW + -> PerformRpcInitialization + -> RpcBindingInqAuthInfoExW + +I_RpcBindingInqSecurityContext + -> PerformRpcInitialization + +I_RpcBindingToStaticStringBindingW + -> PerformRpcInitialization + +RpcMgmtInqDefaultProtectLevel + -> PerformRpcInitialization + +RpcBindingInqOption + -> PerformRpcInitialization + +I_RpcBindingInqWireIdForSnego + -> PerformRpcInitialization + +I_RpcGetCurrentCallHandle + -> PerformRpcInitialization + +RpcNetworkIsProtseqValidA + -> lstrlenA + -> _alloca_probe + -> RtlMultiByteToUnicodeN + -> RpcNetworkIsProtseqValidW + +RpcNetworkInqProtseqsA + -> RpcNetworkInqProtseqsW + -> RpcProtseqVectorFreeA + +RpcProtseqVectorFreeA + -> RpcProtseqVectorFreeW + +RpcServerUseProtseqExA + -> I_RpcServerUseProtseq2A + +RpcServerUseProtseqIfExA + -> lstrlenA + -> _alloca_probe + -> RtlMultiByteToUnicodeN + -> RpcServerUseProtseqIfExW + +RpcServerUseProtseqIfA + -> RpcServerUseProtseqIfExA + +RpcNsBindingInqEntryNameA + -> RpcNsBindingInqEntryNameW + +RpcBindingInqAuthClientA + -> RpcBindingInqAuthClientExA + +RpcBindingInqAuthClientExA + -> RpcBindingInqAuthClientExW + +RpcBindingInqAuthInfoA + -> RpcBindingInqAuthInfoExA + +RpcBindingInqAuthInfoExA + -> RpcBindingInqAuthInfoExW + +RpcBindingSetAuthInfoA + -> RpcBindingSetAuthInfoExA + +RpcBindingSetAuthInfoExA + -> RpcBindingSetAuthInfoExW + -> RtlFreeUnicodeString + +RpcMgmtInqServerPrincNameA + -> RpcMgmtInqServerPrincNameW + +RpcCertGeneratePrincipalNameA + -> RpcCertGeneratePrincipalNameW + +I_UuidCreate + -> UuidCreateSequential + +UuidCreateSequential + -> PerformRpcInitialization + -> GetTickCount + -> InterlockedDecrement + +UuidCompare + -> UuidIsNil + +RpcCertGeneratePrincipalNameW + -> PerformRpcInitialization + -> dword_77162CD0 + -> dword_77162CC8 + -> dword_77162CCC + -> wcscpy + -> dword_77162CE0 + -> GetLastError + -> _alloca_probe + -> dword_77162CDC + +RpcEpRegisterNoReplaceW + -> RpcEpRegisterNoReplaceA + -> RtlFreeAnsiString + +RpcEpUnregister + -> I_RpcAllocate + -> RpcBindingFree + -> I_RpcFree + +RpcMgmtEpEltInqBegin + -> RpcBindingInqObject + -> UuidIsNil + -> RpcBindingToStringBindingW + -> RpcStringBindingParseW + -> RpcStringFreeW + -> RpcMgmtInqComTimeout + -> I_RpcAllocate + +RpcMgmtEpEltInqDone + -> RpcBindingFree + -> RpcSsDestroyClientContext + -> I_RpcFree + +RpcMgmtEpEltInqNextW + -> RpcMgmtEpEltInqNextA + -> I_RpcFree + +RpcMgmtEpEltInqNextA + -> TowerExplode + -> NdrRpcSsDefaultFree + -> RpcStringBindingComposeA + -> RpcBindingFromStringBindingA + -> RpcStringFreeA + -> I_RpcAllocate + +RpcMgmtEpUnregister + -> RpcBindingInqObject + -> UuidIsNil + -> RpcBindingToStringBindingW + -> RpcStringBindingParseW + -> RpcStringFreeW + -> RpcMgmtInqComTimeout + -> RpcBindingToStringBindingA + -> RpcStringBindingParseA + -> TowerConstruct + -> RpcStringFreeA + -> RpcBindingFree + +NDRSContextUnmarshall + -> I_RpcGetCurrentCallHandle + -> NDRSContextUnmarshall2 + +NDRSContextUnmarshallEx + -> NDRSContextUnmarshall2 + +NDRSContextMarshallEx + -> NDRSContextMarshall2 + +NDRSContextMarshall + -> I_RpcGetCurrentCallHandle + -> NDRSContextMarshall2 + +data_from_ndr + -> float_from_ndr + -> double_from_ndr + -> char_from_ndr + -> long_from_ndr + -> short_array_from_ndr + -> short_from_ndr + -> NDRcopy + -> char_array_from_ndr + +data_size_ndr + -> MIDL_wchar_strlen + +tree_size_ndr + -> MIDL_wchar_strlen + +tree_peek_ndr + -> long_from_ndr + +float_from_ndr + -> RpcRaiseException + +float_array_from_ndr + -> RpcRaiseException + +double_from_ndr + -> RpcRaiseException + +double_array_from_ndr + -> RpcRaiseException + +DllGetClassObject + -> PerformRpcInitialization + +NdrDllRegisterProxy + -> GetModuleFileNameA + -> GetLastError + -> RegCreateKeyExA + -> RegCloseKey + +NdrDllUnregisterProxy + -> GetModuleFileNameA + -> GetLastError + -> RegOpenKeyExA + -> RegCloseKey + +DllRegisterServer + -> GetModuleFileNameA + -> GetLastError + +MesEncodeIncrementalHandleCreate + -> MesIncrementalHandleReset + -> MesHandleFree + +MesDecodeIncrementalHandleCreate + -> MesIncrementalHandleReset + -> MesHandleFree + +MesEncodeDynBufferHandleCreate + -> MesBufferHandleReset + -> MesHandleFree + +NdrMesProcEncodeDecode + -> RpcRaiseException + -> NdrFullPointerXlatInit + -> NdrSimpleTypeMarshall + -> NdrSimpleTypeUnmarshall + -> NdrFullPointerXlatFree + +NdrMesProcEncodeDecode2 + -> RpcRaiseException + -> NdrFullPointerXlatInit + -> _alloca_probe + -> NdrCorrelationInitialize + -> NdrCorrelationPass + +NdrMesTypeFree2 + -> _alloca_probe + -> NdrCorrelationInitialize + +NdrMesSimpleTypeAlignSize + -> RpcRaiseException + +NdrMesSimpleTypeEncode + -> NdrMesSimpleTypeAlignSize + +NdrServerInitializePartial + -> NdrServerInitialize + -> NdrpSetRpcSsDefaults + -> RpcRaiseException + +NdrNsGetBuffer + -> dword_77162F64 + -> RpcRaiseException + +NdrNsSendReceive + -> RpcRaiseException + -> dword_77162F68 + +NdrServerInitializeUnmarshall + -> NdrServerInitialize + +NdrEncapsulatedUnionBufferSize + -> RpcRaiseException + +NdrEncapsulatedUnionFree + -> RpcRaiseException + +NdrEncapsulatedUnionMarshall + -> RpcRaiseException + +NdrXmitOrRepAsMarshall + -> NdrSimpleTypeMarshall + +NdrClientContextMarshall + -> RpcRaiseException + -> NDRCContextMarshall + +NdrServerContextMarshall + -> NDRSContextMarshall2 + +NdrConformantVaryingStructUnmarshall + -> RpcRaiseException + -> NdrAllocate + -> NdrFullPointerInsertRefId + +NdrEncapsulatedUnionUnmarshall + -> NdrAllocate + -> NdrFullPointerInsertRefId + -> NdrSimpleTypeUnmarshall + +NdrXmitOrRepAsUnmarshall + -> NdrAllocate + -> NdrSimpleTypeUnmarshall + +NdrClientContextUnmarshall + -> RpcRaiseException + -> NDRCContextUnmarshall + +NdrServerContextUnmarshall + -> RpcRaiseException + -> NDRSContextUnmarshall2 + +NdrConformantVaryingStructMemorySize + -> RpcRaiseException + +NdrUserMarshalSimpleTypeConvert + -> RpcRaiseException + +NdrGetPipeBuffer + -> NdrGetBuffer + +NdrGetPartialBuffer + -> I_RpcReallocPipeBuffer + +NdrPipesInitialize + -> I_RpcAllocate + -> RpcRaiseException + +NdrPipesDone + -> I_RpcFree + +NdrMarkNextActivePipe + -> NdrGetPipeBuffer + +NdrIsAppDoneWithPipes + -> RpcRaiseException + +NdrPipePull + -> NdrMarkNextActivePipe + +NdrPipePush + -> NdrGetPartialBuffer + -> NdrMarkNextActivePipe + +RpcSsAllocate + -> RpcRaiseException + -> EnterCriticalSection + -> LeaveCriticalSection + +RpcSsGetThreadHandle + -> EnterCriticalSection + -> LeaveCriticalSection + +RpcSsSetClientAllocFree + -> EnterCriticalSection + -> LeaveCriticalSection + +RpcSsSetThreadHandle + -> EnterCriticalSection + -> LeaveCriticalSection + -> DeleteCriticalSection + -> I_RpcFree + +RpcSsSwapClientAllocFree + -> EnterCriticalSection + -> LeaveCriticalSection + +RpcSmAllocate + -> RpcSsAllocate + +RpcSmClientFree + -> NdrRpcSmClientFree + +RpcSmDisableAllocate + -> RpcSsDisableAllocate + +RpcSmEnableAllocate + -> RpcSsEnableAllocate + +RpcSmFree + -> RpcSsFree + +RpcSmGetThreadHandle + -> RpcSsGetThreadHandle + +RpcSmSetClientAllocFree + -> RpcSsSetClientAllocFree + +RpcSmSetThreadHandle + -> RpcSsSetThreadHandle + +RpcSmSwapClientAllocFree + -> RpcSsSwapClientAllocFree + +NdrRpcSsDefaultAllocate + -> I_RpcAllocate + +NdrRpcSsDefaultFree + -> I_RpcFree + +NdrRpcSmClientAllocate + -> EnterCriticalSection + -> LeaveCriticalSection + +NdrRpcSmClientFree + -> EnterCriticalSection + -> LeaveCriticalSection + +I_RpcTransGetAddressList + -> dword_77162064 + -> I_RpcAllocate + -> I_RpcFree + -> dword_77162020 + +NdrStubCall + -> NdrServerUnmarshall + -> NdrServerMarshall + +NdrCStdStubBuffer2_Release + -> InterlockedDecrement + -> NdrOleFree + +NdrProxyInitialize + -> NdrClientInitializeNew + +NdrAsyncServerCall + -> NdrServerInitializeNew + -> NdrCorrelationInitialize + -> NdrCorrelationPass + -> CheckVerificationTrailer + -> InterlockedDecrement + +NdrClientCall + -> NdrClientInitializeNew + -> NdrGetBuffer + -> NdrSimpleTypeMarshall + -> NdrSendReceive + -> NdrSimpleTypeUnmarshall + +NdrDllGetClassObject + -> PerformRpcInitialization + +CStdStubBuffer_AddRef + -> InterlockedIncrement + +NdrCStdStubBuffer_Release + -> InterlockedDecrement + -> NdrOleFree + +CStdStubBuffer_Disconnect + -> InterlockedExchange + +RpcAsyncInitializeHandle + -> IsBadWritePtr + +CStdStubBuffer_Invoke + -> NdrStubCall2 + +NdrStubInitialize + -> NdrServerInitialize + +NdrAsyncClientCall + -> NdrClientInitializeNew + -> NdrGetBuffer + +NdrClientCall2 + -> NdrClientInitializeNew + +NdrStubCall2 + -> _alloca_probe + -> NdrServerInitializeNew + +NdrServerCall2 + -> NdrStubCall2 + +CStdStubBuffer_Connect + -> InterlockedExchange + +NdrStubForwardingFunction + -> RpcRaiseException + +RpcAsyncAbortCall + -> InterlockedDecrement + +NdrDcomAsyncStubCall + -> NdrStubInitialize + -> NdrFullPointerXlatInit + -> NdrCorrelationInitialize + -> NdrConvert2 + -> NdrCorrelationPass + -> CheckVerificationTrailer + -> RpcRaiseException + -> NdrProxyErrorHandler + +NdrServerCall + -> NdrStubCall +

1 0

[hpoussin] 21565: SetupDiInstallClassExW; - Use the provided FileQueue (if any) - Start to implement device interface installation SetupDiInstallDevice: - Set FAILEDINSTALL flag in registry if asked to
by hpoussin＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: hpoussin Date: Wed Apr 12 19:16:07 2006 New Revision: 21565 URL: http://svn.reactos.ru/svn/reactos?rev=21565&view=rev Log: SetupDiInstallClassExW; - Use the provided FileQueue (if any) - Start to implement device interface installation SetupDiInstallDevice: - Set FAILEDINSTALL flag in registry if asked to Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Apr 12 19:16:07 2006 @@ -3133,8 +3133,11 @@ TRACE("%p %s 0x%lx %p %s %p %p\n", hwndParent, debugstr_w(InfFileName), Flags, FileQueue, debugstr_guid(InterfaceClassGuid), Reserved1, Reserved2); - if (!InfFileName && !InterfaceClassGuid) - SetLastError(ERROR_INVALID_PARAMETER); + if (!InfFileName) + { + FIXME("Case not implemented: InfFileName NULL\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + } else if (Flags & ~(DI_NOVCP | DI_NOBROWSE | DI_FORCECOPY | DI_QUIETINSTALL)) { TRACE("Unknown flags: 0x%08lx\n", Flags & ~(DI_NOVCP | DI_NOBROWSE | DI_FORCECOPY | DI_QUIETINSTALL)); @@ -3148,41 +3151,67 @@ SetLastError(ERROR_INVALID_PARAMETER); else { + HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE; + SP_DEVINSTALL_PARAMS_W InstallParams; WCHAR SectionName[MAX_PATH]; HINF hInf = INVALID_HANDLE_VALUE; - HKEY hClassKey = INVALID_HANDLE_VALUE; + HKEY hRootKey = INVALID_HANDLE_VALUE; PVOID callback_context = NULL; + hDeviceInfo = SetupDiCreateDeviceInfoList(NULL, NULL); + + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (!SetupDiGetDeviceInstallParamsW(hDeviceInfo, NULL, &InstallParams)) + goto cleanup; + InstallParams.Flags &= ~(DI_NOVCP | DI_NOBROWSE | DI_QUIETINSTALL); + InstallParams.Flags |= Flags & (DI_NOVCP | DI_NOBROWSE | DI_QUIETINSTALL); + if (Flags & DI_NOVCP) + InstallParams.FileQueue = FileQueue; + if (!SetupDiSetDeviceInstallParamsW(hDeviceInfo, NULL, &InstallParams)) + goto cleanup; + + /* Open the .inf file */ + hInf = SetupOpenInfFileW( + InfFileName, + NULL, + INF_STYLE_WIN4, + NULL); + if (hInf == INVALID_HANDLE_VALUE) + goto cleanup; + + /* Try to append a layout file */ + ret = SetupOpenAppendInfFileW(NULL, hInf, NULL); + if (!ret) + goto cleanup; + if (InterfaceClassGuid) { + /* Retrieve the actual section name */ + ret = SetupDiGetActualSectionToInstallW( + hInf, + InterfaceInstall32, + SectionName, + MAX_PATH, + NULL, + NULL); + if (!ret) + goto cleanup; + + /* Open registry key related to this interface */ + /* FIXME: What happens if the key doesn't exist? */ + hRootKey = SetupDiOpenClassRegKeyExW(InterfaceClassGuid, KEY_ENUMERATE_SUB_KEYS, DIOCR_INTERFACE, NULL, NULL); + if (hRootKey == INVALID_HANDLE_VALUE) + goto cleanup; + /* SetupDiCreateDeviceInterface??? */ FIXME("Installing an interface is not implemented\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } else { - if (Flags & DI_NOVCP) - FIXME("FileQueue argument ignored\n"); - if (Flags & (DI_NOBROWSE | DI_FORCECOPY | DI_QUIETINSTALL)) - FIXME("Flags 0x%lx ignored\n", Flags & (DI_NOBROWSE | DI_FORCECOPY | DI_QUIETINSTALL)); - - /* Open the .inf file */ - hInf = SetupOpenInfFileW( - InfFileName, - NULL, - INF_STYLE_WIN4, - NULL); - if (hInf == INVALID_HANDLE_VALUE) - goto cleanup; - /* Create or open the class registry key 'HKLM\CurrentControlSet\Class\{GUID}' */ - hClassKey = CreateClassKey(hInf); - if (hClassKey == INVALID_HANDLE_VALUE) - goto cleanup; - - /* Try to append a layout file */ - ret = SetupOpenAppendInfFileW(NULL, hInf, NULL); - if (!ret) + hRootKey = CreateClassKey(hInf); + if (hRootKey == INVALID_HANDLE_VALUE) goto cleanup; /* Retrieve the actual section name */ @@ -3205,30 +3234,39 @@ hInf, SectionName, SPINST_REGISTRY | SPINST_FILES | SPINST_BITREG | SPINST_INIFILES | SPINST_INI2REG, - hClassKey, + hRootKey, NULL, /* SourceRootPath */ - 0, /* CopyFlags */ + !(Flags & DI_NOVCP) && (Flags & DI_FORCECOPY) ? SP_COPY_FORCE_IN_USE : 0, /* CopyFlags */ SetupDefaultQueueCallbackW, callback_context, + hDeviceInfo, + NULL); + if (!ret) + goto cleanup; + + /* Install .Services section */ + lstrcatW(SectionName, DotServices); + ret = SetupInstallServicesFromInfSectionExW( + hInf, + SectionName, + 0, + hDeviceInfo, + NULL, NULL, NULL); if (!ret) goto cleanup; - /* Install .Services section */ - lstrcatW(SectionName, DotServices); - ret = SetupInstallServicesFromInfSectionW(hInf, SectionName, 0); - if (!ret) - goto cleanup; - ret = TRUE; } cleanup: + if (hDeviceInfo != INVALID_HANDLE_VALUE) + SetupDiDestroyDeviceInfoList(hDeviceInfo); if (hInf != INVALID_HANDLE_VALUE) SetupCloseInfFile(hInf); - if (hClassKey != INVALID_HANDLE_VALUE) - RegCloseKey(hClassKey); + if (hRootKey != INVALID_HANDLE_VALUE) + RegCloseKey(hRootKey); SetupTermDefaultQueueCallback(callback_context); } @@ -4076,7 +4114,7 @@ */ BOOL WINAPI SetupDiGetDeviceInstallParamsA( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, OUT PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) { SP_DEVINSTALL_PARAMS_W deviceInstallParamsW; @@ -4118,7 +4156,7 @@ */ BOOL WINAPI SetupDiGetDeviceInstallParamsW( IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, OUT PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) { struct DeviceInfoSet *list; @@ -4167,6 +4205,7 @@ DI_ENUMSINGLEINF | /* 0x00010000 */ DI_CLASSINSTALLPARAMS | /* 0x00100000 */ DI_NODI_DEFAULTACTION | /* 0x00200000 */ + DI_QUIETINSTALL | /* 0x00800000 */ DI_NOFILECOPY | /* 0x01000000 */ DI_DRIVERPAGE_ADDED; /* 0x04000000 */ DWORD SupportedFlagsEx = @@ -7480,7 +7519,35 @@ if (InstallParams.FlagsEx & DI_FLAGSEX_SETFAILEDINSTALL) { - /* FIXME: set FAILEDINSTALL in ConfigFlags registry value */ + /* Set FAILEDINSTALL in ConfigFlags registry value */ + DWORD ConfigFlags, regType; + Result = SetupDiGetDeviceRegistryPropertyW( + DeviceInfoSet, + DeviceInfoData, + SPDRP_CONFIGFLAGS, + &regType, + (PBYTE)&ConfigFlags, + sizeof(ConfigFlags), + NULL); + if (!Result || regType != REG_DWORD) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + ConfigFlags |= DNF_DISABLED; + Result = SetupDiSetDeviceRegistryPropertyW( + DeviceInfoSet, + DeviceInfoData, + SPDRP_CONFIGFLAGS, + (PBYTE)&ConfigFlags, + sizeof(ConfigFlags)); + if (!Result) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + ret = TRUE; goto cleanup; }

1 0

[hpoussin] 21564: Add missing OPTIONAL information in prototypes Check for NULL parameters
by hpoussin＠svn.reactos.org 12 Apr '06

12 Apr '06

Author: hpoussin Date: Wed Apr 12 17:41:11 2006 New Revision: 21564 URL: http://svn.reactos.ru/svn/reactos?rev=21564&view=rev Log: Add missing OPTIONAL information in prototypes Check for NULL parameters Modified: trunk/reactos/lib/recyclebin/ (props changed) trunk/reactos/lib/recyclebin/openclose.c trunk/reactos/lib/recyclebin/readme.txt trunk/reactos/lib/recyclebin/recyclebin.c trunk/reactos/lib/recyclebin/recyclebin.h trunk/reactos/lib/recyclebin/recyclebin_private.h trunk/reactos/lib/recyclebin/recyclebin_v5.c trunk/reactos/lib/recyclebin/recyclebin_v5.h Propchange: trunk/reactos/lib/recyclebin/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Apr 12 17:41:11 2006 @@ -1,0 +1,4 @@ +*.bak +*.gch +GNUMakefile +Makefile Modified: trunk/reactos/lib/recyclebin/openclose.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/openclose.c?… ============================================================================== --- trunk/reactos/lib/recyclebin/openclose.c (original) +++ trunk/reactos/lib/recyclebin/openclose.c Wed Apr 12 17:41:11 2006 @@ -77,7 +77,7 @@ if (OwnerSid) { //DWORD rc; - + /* Add ACL to allow only user/SYSTEM to open it */ /* FIXME: rc = SetNamedSecurityInfo( BufferName, @@ -114,7 +114,7 @@ } CloseHandle(hFile); hFile = INVALID_HANDLE_VALUE; - + /* Create empty INFO2 file */ wcscpy(FileName, RECYCLE_BIN_FILE_NAME); hFile = CreateFileW(BufferName, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_HIDDEN, NULL); @@ -140,7 +140,7 @@ if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); } - return ret; + return ret; } PRECYCLE_BIN Modified: trunk/reactos/lib/recyclebin/readme.txt URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/readme.txt?r… ============================================================================== --- trunk/reactos/lib/recyclebin/readme.txt (original) +++ trunk/reactos/lib/recyclebin/readme.txt Wed Apr 12 17:41:11 2006 @@ -6,6 +6,7 @@ - Empty a recycle bin containing directories (v5) - Set security on recycle bin folder - Delete files > 4Gb +- Make the library thread-safe 3 levels - 1: recyclebin.c: Public interface Modified: trunk/reactos/lib/recyclebin/recyclebin.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.c… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin.c Wed Apr 12 17:41:11 2006 @@ -20,7 +20,7 @@ IN HANDLE hDeletedFile) { BOOL ret = FALSE; - + if (!IntCheckDeletedFileHandle(hDeletedFile)) SetLastError(ERROR_INVALID_HANDLE); else @@ -28,7 +28,7 @@ PDELETED_FILE_HANDLE file = (PDELETED_FILE_HANDLE)hDeletedFile; ret = DereferenceHandle(&file->refCount); } - + return ret; } @@ -39,7 +39,14 @@ int len; LPWSTR FileNameW = NULL; BOOL ret = FALSE; - + + /* Check parameters */ + if (FileName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + len = MultiByteToWideChar(CP_ACP, 0, FileName, -1, NULL, 0); if (len == 0) goto cleanup; @@ -69,6 +76,13 @@ DWORD len; PRECYCLE_BIN bin = NULL; BOOL ret = FALSE; + + /* Check parameters */ + if (FileName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } /* Get full file name */ while (TRUE) @@ -145,7 +159,7 @@ EnumerateRecycleBinA( IN CHAR driveLetter, IN PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, - IN PVOID Context) + IN PVOID Context OPTIONAL) { return EnumerateRecycleBinW((WCHAR)driveLetter, pFnCallback, Context); } @@ -202,10 +216,17 @@ EnumerateRecycleBinW( IN WCHAR driveLetter, IN PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, - IN PVOID Context) + IN PVOID Context OPTIONAL) { PRECYCLE_BIN bin = NULL; BOOL ret = FALSE; + + /* Check parameters */ + if (pFnCallback == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } /* Open recycle bin */ bin = IntReferenceRecycleBin(driveLetter); @@ -235,7 +256,7 @@ GetDeletedFileDetailsA( IN HANDLE hDeletedFile, IN DWORD BufferSize, - IN OUT PDELETED_FILE_DETAILS_A FileDetails, + IN OUT PDELETED_FILE_DETAILS_A FileDetails OPTIONAL, OUT LPDWORD RequiredSize OPTIONAL) { PDELETED_FILE_DETAILS_W FileDetailsW = NULL; @@ -279,7 +300,7 @@ GetDeletedFileDetailsW( IN HANDLE hDeletedFile, IN DWORD BufferSize, - IN OUT PDELETED_FILE_DETAILS_W FileDetails, + IN OUT PDELETED_FILE_DETAILS_W FileDetails OPTIONAL, OUT LPDWORD RequiredSize OPTIONAL) { BOOL ret = FALSE; Modified: trunk/reactos/lib/recyclebin/recyclebin.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.h… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.h (original) +++ trunk/reactos/lib/recyclebin/recyclebin.h Wed Apr 12 17:41:11 2006 @@ -68,12 +68,12 @@ EnumerateRecycleBinA( IN CHAR driveLetter, IN PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, - IN PVOID Context); + IN PVOID Context OPTIONAL); BOOL WINAPI EnumerateRecycleBinW( IN WCHAR driveLetter, IN PENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, - IN PVOID Context); + IN PVOID Context OPTIONAL); #ifdef UNICODE #define EnumerateRecycleBin EnumerateRecycleBinW #else @@ -84,13 +84,13 @@ GetDeletedFileDetailsA( IN HANDLE hDeletedFile, IN DWORD BufferSize, - IN OUT PDELETED_FILE_DETAILS_A FileDetails, + IN OUT PDELETED_FILE_DETAILS_A FileDetails OPTIONAL, OUT LPDWORD RequiredSize OPTIONAL); BOOL WINAPI GetDeletedFileDetailsW( IN HANDLE hDeletedFile, IN DWORD BufferSize, - IN OUT PDELETED_FILE_DETAILS_W FileDetails, + IN OUT PDELETED_FILE_DETAILS_W FileDetails OPTIONAL, OUT LPDWORD RequiredSize OPTIONAL); #ifdef UNICODE #define GetDeletedFileDetails GetDeletedFileDetailsW Modified: trunk/reactos/lib/recyclebin/recyclebin_private.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_p… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_private.h (original) +++ trunk/reactos/lib/recyclebin/recyclebin_private.h Wed Apr 12 17:41:11 2006 @@ -22,14 +22,14 @@ struct _REFCOUNT_DATA; typedef struct _REFCOUNT_DATA *PREFCOUNT_DATA; -typedef BOOL (*PINT_ENUMERATE_RECYCLEBIN_CALLBACK)(IN PVOID Context, IN HANDLE hDeletedFile); +typedef BOOL (*PINT_ENUMERATE_RECYCLEBIN_CALLBACK)(IN PVOID Context OPTIONAL, IN HANDLE hDeletedFile); typedef BOOL (*PDESTROY_DATA) (IN PREFCOUNT_DATA pData); typedef BOOL (*PCLOSE_HANDLE) (IN HANDLE hHandle); typedef BOOL (*PDELETE_FILE) (IN PRECYCLE_BIN bin, IN LPCWSTR FullPath, IN LPCWSTR FileName); typedef BOOL (*PEMPTY_RECYCLEBIN)(IN PRECYCLE_BIN* bin); -typedef BOOL (*PENUMERATE_FILES) (IN PRECYCLE_BIN bin, IN PINT_ENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, IN PVOID Context); -typedef BOOL (*PGET_DETAILS) (IN PRECYCLE_BIN bin, IN HANDLE hDeletedFile, IN DWORD BufferSize, IN OUT PDELETED_FILE_DETAILS_W FileDetails, OUT LPDWORD RequiredSize OPTIONAL); +typedef BOOL (*PENUMERATE_FILES) (IN PRECYCLE_BIN bin, IN PINT_ENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, IN PVOID Context OPTIONAL); +typedef BOOL (*PGET_DETAILS) (IN PRECYCLE_BIN bin, IN HANDLE hDeletedFile, IN DWORD BufferSize, IN OUT PDELETED_FILE_DETAILS_W FileDetails OPTIONAL, OUT LPDWORD RequiredSize OPTIONAL); typedef BOOL (*PRESTORE_FILE) (IN PRECYCLE_BIN bin, IN HANDLE hDeletedFile); typedef struct _RECYCLEBIN_CALLBACKS Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_v… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c Wed Apr 12 17:41:11 2006 @@ -189,13 +189,13 @@ EnumerateFiles5( IN PRECYCLE_BIN bin, IN PINT_ENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, - IN PVOID Context) + IN PVOID Context OPTIONAL) { INFO2_HEADER Header; DELETED_FILE_RECORD DeletedFile; DWORD bytesRead, dwEntries; BOOL ret = FALSE; - + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) goto cleanup; if (!ReadFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesRead, NULL)) @@ -227,7 +227,7 @@ if (SetFilePointer(bin->hInfo, sizeof(INFO2_HEADER) + Header.dwRecordSize * dwEntries, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) goto cleanup; } - + ret = TRUE; cleanup: @@ -239,7 +239,7 @@ IN PRECYCLE_BIN bin, IN HANDLE hDeletedFile, IN DWORD BufferSize, - IN OUT PDELETED_FILE_DETAILS_W FileDetails, + IN OUT PDELETED_FILE_DETAILS_W FileDetails OPTIONAL, OUT LPDWORD RequiredSize OPTIONAL) { DELETED_FILE_RECORD DeletedFile; @@ -248,9 +248,16 @@ HANDLE hFile = INVALID_HANDLE_VALUE; BOOL ret = FALSE; + /* Check parameters */ + if (BufferSize > 0 && FileDetails == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + if (!IntSearchRecord(bin, hDeletedFile, &DeletedFile, NULL)) goto cleanup; - Needed = (DWORD)FIELD_OFFSET(DELETED_FILE_DETAILS_W, FileName) + (wcslen(DeletedFile.FileNameW) + 1) * sizeof(WCHAR); + Needed = FIELD_OFFSET(DELETED_FILE_DETAILS_W, FileName) + (wcslen(DeletedFile.FileNameW) + 1) * sizeof(WCHAR); if (RequiredSize) *RequiredSize = (DWORD)Needed; if (Needed > BufferSize) @@ -304,7 +311,7 @@ DELETED_FILE_RECORD DeletedFile, LastFile; LPWSTR FullName = NULL; BOOL ret = FALSE; - + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) goto cleanup; if (!ReadFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesRead, NULL)) @@ -330,7 +337,7 @@ /* Restore file */ if (!MoveFileW(FullName, DeletedFile.FileNameW)) goto cleanup; - + /* Update INFO2 */ /* 1) If not last entry, copy last entry to the current one */ if (SetFilePointer(bin->hInfo, -sizeof(DELETED_FILE_RECORD), NULL, FILE_END) == INVALID_SET_FILE_POINTER) @@ -434,7 +441,7 @@ if (!IntGetFullName(bin, &DeletedFile, &FullName)) goto cleanup; - + if (!IntDeleteRecursive(FullName)) goto cleanup; ret = TRUE; @@ -489,7 +496,7 @@ DELETED_FILE_RECORD DeletedFile; DWORD bytesRead, dwEntries; BOOL ret = FALSE; - + if (SetFilePointer(bin->hInfo, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) goto cleanup; if (!ReadFile(bin->hInfo, &Header, sizeof(INFO2_HEADER), &bytesRead, NULL)) Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_v… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.h (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.h Wed Apr 12 17:41:11 2006 @@ -26,7 +26,7 @@ static BOOL DeleteFile5( - IN PRECYCLE_BIN Context, + IN PRECYCLE_BIN bin, IN LPCWSTR FullPath, IN LPCWSTR FileName); @@ -38,19 +38,19 @@ EnumerateFiles5( IN PRECYCLE_BIN bin, IN PINT_ENUMERATE_RECYCLEBIN_CALLBACK pFnCallback, - IN PVOID Context); + IN PVOID Context OPTIONAL); static BOOL GetDetails5( IN PRECYCLE_BIN bin, IN HANDLE hDeletedFile, IN DWORD BufferSize, - IN OUT PDELETED_FILE_DETAILS_W FileDetails, + IN OUT PDELETED_FILE_DETAILS_W FileDetails OPTIONAL, OUT LPDWORD RequiredSize OPTIONAL); static BOOL RestoreFile5( - IN PRECYCLE_BIN Context, + IN PRECYCLE_BIN bin, IN HANDLE hDeletedFile); static BOOL

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