Fixed some issues found by winapi_check.
This commit is contained in:
parent
4d4a52c803
commit
9ff202e65c
|
@ -1057,7 +1057,7 @@ BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, DW
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* CryptGetKeyParam (ADVAPI32.@)
|
* CryptSetKeyParam (ADVAPI32.@)
|
||||||
*/
|
*/
|
||||||
BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags)
|
BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags)
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,21 +18,15 @@ DEFAULT_DEBUG_CHANNEL(shell);
|
||||||
|
|
||||||
/************************* STRRET functions ****************************/
|
/************************* STRRET functions ****************************/
|
||||||
|
|
||||||
/*************************************************************************
|
/*
|
||||||
* StrRetToStrN [SHELL32.96]
|
|
||||||
*
|
|
||||||
* converts a STRRET to a normal string
|
|
||||||
*
|
|
||||||
* NOTES
|
|
||||||
* the pidl is for STRRET OFFSET
|
|
||||||
*
|
|
||||||
* ***** NOTE *****
|
* ***** NOTE *****
|
||||||
* This routine is identical to StrRetToBufA in dlls/shlwapi/string.c.
|
* These routines are identical to StrRetToBuf[AW] in dlls/shlwapi/string.c.
|
||||||
* It was duplicated here because not every version of Shlwapi.dll exports
|
* They were duplicated here because not every version of Shlwapi.dll exports
|
||||||
* StrRetToBufA. If you change one routine, change them both. YOU HAVE BEEN
|
* StrRetToBuf[AW]. If you change one routine, change them both. YOU HAVE BEEN
|
||||||
* WARNED.
|
* WARNED.
|
||||||
* ***** NOTE *****
|
* ***** NOTE *****
|
||||||
*/
|
*/
|
||||||
|
|
||||||
HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
|
HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
|
||||||
{
|
{
|
||||||
TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
|
TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
|
||||||
|
@ -63,21 +57,7 @@ HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, const ITEMID
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*************************************************************************
|
/************************************************************************/
|
||||||
* StrRetToStrNW [SHELL32.96]
|
|
||||||
*
|
|
||||||
* converts a STRRET to a normal string
|
|
||||||
*
|
|
||||||
* NOTES
|
|
||||||
* the pidl is for STRRET OFFSET
|
|
||||||
*
|
|
||||||
* ***** NOTE *****
|
|
||||||
* This routine is identical to StrRetToBufW in dlls/shlwapi/string.c.
|
|
||||||
* It was duplicated here because not every version of Shlwapi.dll exports
|
|
||||||
* StrRetToBufW. If you change one routine, change them both. YOU HAVE BEEN
|
|
||||||
* WARNED.
|
|
||||||
* ***** NOTE *****
|
|
||||||
*/
|
|
||||||
|
|
||||||
HRESULT WINAPI StrRetToStrNW (LPVOID dest1, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
|
HRESULT WINAPI StrRetToStrNW (LPVOID dest1, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
|
||||||
{
|
{
|
||||||
|
@ -115,8 +95,15 @@ HRESULT WINAPI StrRetToStrNW (LPVOID dest1, DWORD len, LPSTRRET src, const ITEMI
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*************************************************************************/
|
|
||||||
|
|
||||||
|
/*************************************************************************
|
||||||
|
* StrRetToStrN [SHELL32.96]
|
||||||
|
*
|
||||||
|
* converts a STRRET to a normal string
|
||||||
|
*
|
||||||
|
* NOTES
|
||||||
|
* the pidl is for STRRET OFFSET
|
||||||
|
*/
|
||||||
HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
|
HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
|
||||||
{
|
{
|
||||||
if(SHELL_OsIsUnicode())
|
if(SHELL_OsIsUnicode())
|
||||||
|
|
|
@ -1078,8 +1078,8 @@ DWORD WINAPI SHLWAPI_172 (
|
||||||
*/
|
*/
|
||||||
DWORD WINAPI SHLWAPI_174(
|
DWORD WINAPI SHLWAPI_174(
|
||||||
IUnknown *p1, /* [in] OLE object */
|
IUnknown *p1, /* [in] OLE object */
|
||||||
LPVOID *p2) /* [out] ptr to result of either GetClassID */
|
LPVOID *p2) /* [out] ptr to result of either GetClassID
|
||||||
/* or SetSite call. */
|
or SetSite call. */
|
||||||
{
|
{
|
||||||
DWORD ret, aa;
|
DWORD ret, aa;
|
||||||
|
|
||||||
|
|
|
@ -3472,6 +3472,9 @@ INT WINAPI WSCDeinstallProvider(LPGUID lpProviderId, LPINT lpErrno)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* WSAAccept (WS2_32.26)
|
||||||
|
*/
|
||||||
SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
|
SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
|
||||||
LPCONDITIONPROC lpfnCondition, DWORD dwCallbackData)
|
LPCONDITIONPROC lpfnCondition, DWORD dwCallbackData)
|
||||||
{
|
{
|
||||||
|
|
|
@ -521,9 +521,12 @@ static BOOL WINAPI CONSOLE_DefaultHandler(DWORD dwCtrlType)
|
||||||
* Does not yet do any error checking, or set LastError if failed.
|
* Does not yet do any error checking, or set LastError if failed.
|
||||||
* This doesn't yet matter, since these handlers are not yet called...!
|
* This doesn't yet matter, since these handlers are not yet called...!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static unsigned int console_ignore_ctrl_c = 0; /* FIXME: this should be inherited somehow */
|
static unsigned int console_ignore_ctrl_c = 0; /* FIXME: this should be inherited somehow */
|
||||||
static PHANDLER_ROUTINE handlers[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,CONSOLE_DefaultHandler};
|
static PHANDLER_ROUTINE handlers[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,CONSOLE_DefaultHandler};
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
BOOL WINAPI SetConsoleCtrlHandler(PHANDLER_ROUTINE func, BOOL add)
|
BOOL WINAPI SetConsoleCtrlHandler(PHANDLER_ROUTINE func, BOOL add)
|
||||||
{
|
{
|
||||||
int alloc_loop = sizeof(handlers)/sizeof(handlers[0]) - 1;
|
int alloc_loop = sizeof(handlers)/sizeof(handlers[0]) - 1;
|
||||||
|
|
Loading…
Reference in New Issue