Give some functions real names.

This commit is contained in:
Juergen Schmied 2003-01-15 00:53:39 +00:00 committed by Alexandre Julliard
parent c5eb897d98
commit d5281fd393
2 changed files with 28 additions and 26 deletions

View File

@ -219,9 +219,9 @@
219 stdcall @(long long long long) SHLWAPI_219 219 stdcall @(long long long long) SHLWAPI_219
220 stub @ 220 stub @
221 stub @ 221 stub @
222 stdcall @(long) SHLWAPI_222 222 stdcall -noname _SHGlobalCounterCreate(long) _SHGlobalCounterCreate
223 stdcall @(long) SHLWAPI_223 223 stdcall -noname _SHGlobalCounterGetValue(long) _SHGlobalCounterGetValue
224 stdcall @(long) SHLWAPI_224 224 stdcall -noname _SHGlobalCounterIncrement(long) _SHGlobalCounterIncrement
225 stub @ 225 stub @
226 stub @ 226 stub @
227 stub @ 227 stub @
@ -353,7 +353,7 @@
353 stub @ 353 stub @
354 stub @ 354 stub @
355 stub @ 355 stub @
356 stdcall @(ptr ptr) SHLWAPI_356 356 stdcall -noname _CreateAllAccessSecurityAttributes(ptr ptr) _CreateAllAccessSecurityAttributes
357 stdcall @(wstr wstr wstr long long) SHLWAPI_357 357 stdcall @(wstr wstr wstr long long) SHLWAPI_357
358 stdcall @(wstr long long ptr ptr long) SHLWAPI_358 358 stdcall @(wstr long long ptr ptr long) SHLWAPI_358
359 forward @ kernel32.OpenEventW 359 forward @ kernel32.OpenEventW
@ -419,9 +419,9 @@
419 stub @ 419 stub @
420 stub @ 420 stub @
421 stub @ 421 stub @
422 stdcall @(str long) SHLWAPI_422 422 stdcall -noname _SHGlobalCounterCreateNamedA(str long) _SHGlobalCounterCreateNamedA
423 stdcall @(wstr long) SHLWAPI_423 423 stdcall -noname _SHGlobalCounterCreateNamedW(wstr long) _SHGlobalCounterCreateNamedW
424 stdcall @(long) SHLWAPI_424 424 stdcall -noname _SHGlobalCounterDecrement(long) _SHGlobalCounterDecrement
425 stub @ 425 stub @
426 stub @ 426 stub @
427 stub @ 427 stub @

View File

@ -52,7 +52,7 @@ extern DWORD SHLWAPI_ThreadRef_index; /* Initialised in shlwapi_main.c */
DWORD WINAPI SHLWAPI_23(REFGUID,LPSTR,INT); DWORD WINAPI SHLWAPI_23(REFGUID,LPSTR,INT);
/************************************************************************** /**************************************************************************
* @ [SHLWAPI.356] * _CreateAllAccessSecurityAttributes [SHLWAPI.356]
* *
* Initialise security attributes from a security descriptor. * Initialise security attributes from a security descriptor.
* *
@ -70,7 +70,9 @@ DWORD WINAPI SHLWAPI_23(REFGUID,LPSTR,INT);
* before Windows NT). * before Windows NT).
*/ */
LPSECURITY_ATTRIBUTES LPSECURITY_ATTRIBUTES
WINAPI SHLWAPI_356(LPSECURITY_ATTRIBUTES lpAttr, PSECURITY_DESCRIPTOR lpSec) WINAPI _CreateAllAccessSecurityAttributes(
LPSECURITY_ATTRIBUTES lpAttr,
PSECURITY_DESCRIPTOR lpSec)
{ {
/* This function is used within SHLWAPI only to create security attributes /* This function is used within SHLWAPI only to create security attributes
* for shell semaphores. */ * for shell semaphores. */
@ -338,7 +340,7 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE pfnThreadProc, VOID *pData,
} }
/************************************************************************* /*************************************************************************
* @ [SHLWAPI.223] * _SHGlobalCounterGetValue [SHLWAPI.223]
* *
* Get the current count of a semaphore. * Get the current count of a semaphore.
* *
@ -348,7 +350,7 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE pfnThreadProc, VOID *pData,
* RETURNS * RETURNS
* The current count of the semaphore. * The current count of the semaphore.
*/ */
DWORD WINAPI SHLWAPI_223(HANDLE hSem) DWORD WINAPI _SHGlobalCounterGetValue(HANDLE hSem)
{ {
DWORD dwOldCount = 0; DWORD dwOldCount = 0;
@ -359,7 +361,7 @@ DWORD WINAPI SHLWAPI_223(HANDLE hSem)
} }
/************************************************************************* /*************************************************************************
* @ [SHLWAPI.224] * _SHGlobalCounterIncrement [SHLWAPI.224]
* *
* Claim a semaphore. * Claim a semaphore.
* *
@ -369,7 +371,7 @@ DWORD WINAPI SHLWAPI_223(HANDLE hSem)
* RETURNS * RETURNS
* The new count of the semaphore. * The new count of the semaphore.
*/ */
DWORD WINAPI SHLWAPI_224(HANDLE hSem) DWORD WINAPI _SHGlobalCounterIncrement(HANDLE hSem)
{ {
DWORD dwOldCount = 0; DWORD dwOldCount = 0;
@ -379,7 +381,7 @@ DWORD WINAPI SHLWAPI_224(HANDLE hSem)
} }
/************************************************************************* /*************************************************************************
* @ [SHLWAPI.424] * _SHGlobalCounterDecrement [SHLWAPI.424]
* *
* Release a semaphore. * Release a semaphore.
* *
@ -389,23 +391,23 @@ DWORD WINAPI SHLWAPI_224(HANDLE hSem)
* RETURNS * RETURNS
* The new count of the semaphore. * The new count of the semaphore.
*/ */
DWORD WINAPI SHLWAPI_424(HANDLE hSem) DWORD WINAPI _SHGlobalCounterDecrement(HANDLE hSem)
{ {
DWORD dwOldCount = 0; DWORD dwOldCount = 0;
TRACE("(%p)\n", hSem); TRACE("(%p)\n", hSem);
dwOldCount = SHLWAPI_223(hSem); dwOldCount = _SHGlobalCounterGetValue(hSem);
WaitForSingleObject(hSem, 0); WaitForSingleObject(hSem, 0);
return dwOldCount - 1; return dwOldCount - 1;
} }
/************************************************************************* /*************************************************************************
* @ [SHLWAPI.423] * _SHGlobalCounterCreateNamedW [SHLWAPI.423]
* *
* Unicode version of SHLWAPI_422. * Unicode version of _SHGlobalCounterCreateNamedA.
*/ */
HANDLE WINAPI SHLWAPI_423(LPCWSTR lpszName, DWORD iInitial) HANDLE WINAPI _SHGlobalCounterCreateNamedW(LPCWSTR lpszName, DWORD iInitial)
{ {
static const WCHAR szPrefix[] = { 's', 'h', 'e', 'l', 'l', '.', '\0' }; static const WCHAR szPrefix[] = { 's', 'h', 'e', 'l', 'l', '.', '\0' };
const int iPrefixLen = 6; const int iPrefixLen = 6;
@ -423,7 +425,7 @@ HANDLE WINAPI SHLWAPI_423(LPCWSTR lpszName, DWORD iInitial)
StrCpyNW(szBuff + iPrefixLen, lpszName, iBuffLen - iPrefixLen); StrCpyNW(szBuff + iPrefixLen, lpszName, iBuffLen - iPrefixLen);
/* Initialise security attributes */ /* Initialise security attributes */
pSecAttr = SHLWAPI_356(&sAttr, &sd); pSecAttr = _CreateAllAccessSecurityAttributes(&sAttr, &sd);
if (!(hRet = CreateSemaphoreW(pSecAttr , iInitial, MAXLONG, szBuff))) if (!(hRet = CreateSemaphoreW(pSecAttr , iInitial, MAXLONG, szBuff)))
hRet = OpenSemaphoreW(SYNCHRONIZE|SEMAPHORE_MODIFY_STATE, 0, szBuff); hRet = OpenSemaphoreW(SYNCHRONIZE|SEMAPHORE_MODIFY_STATE, 0, szBuff);
@ -431,7 +433,7 @@ HANDLE WINAPI SHLWAPI_423(LPCWSTR lpszName, DWORD iInitial)
} }
/************************************************************************* /*************************************************************************
* @ [SHLWAPI.422] * _SHGlobalCounterCreateNamedA [SHLWAPI.422]
* *
* Create a semaphore. * Create a semaphore.
* *
@ -442,7 +444,7 @@ HANDLE WINAPI SHLWAPI_423(LPCWSTR lpszName, DWORD iInitial)
* RETURNS * RETURNS
* A new semaphore handle. * A new semaphore handle.
*/ */
HANDLE WINAPI SHLWAPI_422(LPCSTR lpszName, DWORD iInitial) HANDLE WINAPI _SHGlobalCounterCreateNamedA(LPCSTR lpszName, DWORD iInitial)
{ {
WCHAR szBuff[MAX_PATH]; WCHAR szBuff[MAX_PATH];
@ -450,11 +452,11 @@ HANDLE WINAPI SHLWAPI_422(LPCSTR lpszName, DWORD iInitial)
if (lpszName) if (lpszName)
MultiByteToWideChar(0, 0, lpszName, -1, szBuff, MAX_PATH); MultiByteToWideChar(0, 0, lpszName, -1, szBuff, MAX_PATH);
return SHLWAPI_423(lpszName ? szBuff : NULL, iInitial); return _SHGlobalCounterCreateNamedW(lpszName ? szBuff : NULL, iInitial);
} }
/************************************************************************* /*************************************************************************
* @ [SHLWAPI.222] * _SHGlobalCounterCreate [SHLWAPI.222]
* *
* Create a semaphore using the name of a GUID. * Create a semaphore using the name of a GUID.
* *
@ -467,7 +469,7 @@ HANDLE WINAPI SHLWAPI_422(LPCSTR lpszName, DWORD iInitial)
* NOTES * NOTES
* The initial count of the semaphore is set to 0. * The initial count of the semaphore is set to 0.
*/ */
HANDLE WINAPI SHLWAPI_222(REFGUID guid) HANDLE WINAPI _SHGlobalCounterCreate (REFGUID guid)
{ {
char szName[40]; char szName[40];
@ -475,5 +477,5 @@ HANDLE WINAPI SHLWAPI_222(REFGUID guid)
/* Create a named semaphore using the GUID string */ /* Create a named semaphore using the GUID string */
SHLWAPI_23(guid, szName, sizeof(szName) - 1); SHLWAPI_23(guid, szName, sizeof(szName) - 1);
return SHLWAPI_422(szName, 0); return _SHGlobalCounterCreateNamedA(szName, 0);
} }