reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-22 11:54:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cryptnet: Don't use HIWORD() on a string pointer.

Browse Source
This commit is contained in:
Michael Stefaniuc 2010-01-29 01:38:54 +01:00 committed by Alexandre Julliard
parent 4b5dcc9e6b
commit 1dcbbfe1ee
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/cryptnet/cryptnet_main.c
View File

@ -40,6 +40,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); WINE_DEFAULT_DEBUG_CHANNEL(cryptnet);
#define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0)
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
@ -92,9 +94,7 @@ HRESULT WINAPI DllUnregisterServer(void)
static const char *url_oid_to_str(LPCSTR oid) static const char *url_oid_to_str(LPCSTR oid)
{ {
if (HIWORD(oid)) if (IS_INTOID(oid))
return oid;
else
{ {
static char buf[10]; static char buf[10];
@ -115,6 +115,8 @@ static const char *url_oid_to_str(LPCSTR oid)
return buf; return buf;
} }
} }
else
return oid;
} }
typedef BOOL (WINAPI *UrlDllGetObjectUrlFunc)(LPCSTR, LPVOID, DWORD, typedef BOOL (WINAPI *UrlDllGetObjectUrlFunc)(LPCSTR, LPVOID, DWORD,
@ -379,7 +381,7 @@ BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags,
TRACE("(%s, %p, %08x, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid), TRACE("(%s, %p, %08x, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid),
pvPara, dwFlags, pUrlArray, pcbUrlArray, pUrlInfo, pcbUrlInfo, pvReserved); pvPara, dwFlags, pUrlArray, pcbUrlArray, pUrlInfo, pcbUrlInfo, pvReserved);
if (!HIWORD(pszUrlOid)) if (IS_INTOID(pszUrlOid))
{ {
switch (LOWORD(pszUrlOid)) switch (LOWORD(pszUrlOid))
{ {
@ -1398,7 +1400,7 @@ static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid,
*pFunc = NULL; *pFunc = NULL;
*phFunc = 0; *phFunc = 0;
if (!HIWORD(pszObjectOid)) if (IS_INTOID(pszObjectOid))
{ {
switch (LOWORD(pszObjectOid)) switch (LOWORD(pszObjectOid))
{ {
@ -1468,7 +1470,7 @@ static BOOL CRYPT_GetExpirationFunction(LPCSTR pszObjectOid,
{ {
BOOL ret; BOOL ret;
if (!HIWORD(pszObjectOid)) if (IS_INTOID(pszObjectOid))
{ {
switch (LOWORD(pszObjectOid)) switch (LOWORD(pszObjectOid))
{ {