Module: wine Branch: master Commit: 403ff3734ac9e9d0dcdcfc8cc63c1e6a308811a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403ff3734ac9e9d0dcdcfc8cc6...
Author: Sebastian Lackner sebastian@fds-team.de Date: Thu Oct 2 14:46:39 2014 +0200
shlwapi: Remove unnecessary internal function SHLWAPI_DupSharedHandle.
---
dlls/shlwapi/ordinal.c | 61 ++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 39 deletions(-)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 756ed34..21a75e9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -74,13 +74,24 @@ BOOL WINAPI SHAboutInfoW(LPWSTR,DWORD); */
/************************************************************************* - * SHLWAPI_DupSharedHandle + * @ [SHLWAPI.11] + * + * Copy a sharable memory handle from one process to another. + * + * PARAMS + * hShared [I] Shared memory handle to duplicate + * dwSrcProcId [I] ID of the process owning hShared + * dwDstProcId [I] ID of the process wanting the duplicated handle + * dwAccess [I] Desired DuplicateHandle() access + * dwOptions [I] Desired DuplicateHandle() options + * + * RETURNS + * Success: A handle suitable for use by the dwDstProcId process. + * Failure: A NULL handle. * - * Internal implementation of SHLWAPI_11. */ -static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, - DWORD dwSrcProcId, DWORD dwAccess, - DWORD dwOptions) +HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, + DWORD dwAccess, DWORD dwOptions) { HANDLE hDst, hSrc; DWORD dwMyProcId = GetCurrentProcessId(); @@ -170,9 +181,8 @@ HANDLE WINAPI SHAllocShared(LPCVOID lpvData, DWORD dwSize, DWORD dwProcId)
/* Release view. All further views mapped will be opaque */ UnmapViewOfFile(pMapped); - hRet = SHLWAPI_DupSharedHandle(hMap, dwProcId, - GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, - DUPLICATE_SAME_ACCESS); + hRet = SHMapHandle(hMap, GetCurrentProcessId(), dwProcId, + FILE_MAP_ALL_ACCESS, DUPLICATE_SAME_ACCESS); }
CloseHandle(hMap); @@ -201,8 +211,8 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId);
/* Get handle to shared memory for current process */ - hDup = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, - FILE_MAP_ALL_ACCESS, 0); + hDup = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, 0); + /* Get View */ pMapped = MapViewOfFile(hDup, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); CloseHandle(hDup); @@ -252,40 +262,13 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId);
/* Get a copy of the handle for our process, closing the source handle */ - hClose = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, - FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); + hClose = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), + FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); /* Close local copy */ return CloseHandle(hClose); }
/************************************************************************* - * @ [SHLWAPI.11] - * - * Copy a sharable memory handle from one process to another. - * - * PARAMS - * hShared [I] Shared memory handle to duplicate - * dwSrcProcId [I] ID of the process owning hShared - * dwDstProcId [I] ID of the process wanting the duplicated handle - * dwAccess [I] Desired DuplicateHandle() access - * dwOptions [I] Desired DuplicateHandle() options - * - * RETURNS - * Success: A handle suitable for use by the dwDstProcId process. - * Failure: A NULL handle. - * - */ -HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, - DWORD dwAccess, DWORD dwOptions) -{ - HANDLE hRet; - - hRet = SHLWAPI_DupSharedHandle(hShared, dwDstProcId, dwSrcProcId, - dwAccess, dwOptions); - return hRet; -} - -/************************************************************************* * @ [SHLWAPI.13] * * Create and register a clipboard enumerator for a web browser.