Michael Stefaniuc : cryptnet: Don't use HIWORD() on a string pointer.
Alexandre Julliard
julliard at winehq.org
Fri Jan 29 10:56:34 CST 2010
Module: wine
Branch: master
Commit: 1dcbbfe1ee083aa9599f6819512d6db226c6d124
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcbbfe1ee083aa9599f6819512d6db226c6d124
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Jan 29 01:38:54 2010 +0100
cryptnet: Don't use HIWORD() on a string pointer.
---
dlls/cryptnet/cryptnet_main.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c
index 2306941..0b4e31d 100644
--- a/dlls/cryptnet/cryptnet_main.c
+++ b/dlls/cryptnet/cryptnet_main.c
@@ -40,6 +40,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(cryptnet);
+#define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0)
+
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID 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)
{
- if (HIWORD(oid))
- return oid;
- else
+ if (IS_INTOID(oid))
{
static char buf[10];
@@ -115,6 +115,8 @@ static const char *url_oid_to_str(LPCSTR oid)
return buf;
}
}
+ else
+ return oid;
}
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),
pvPara, dwFlags, pUrlArray, pcbUrlArray, pUrlInfo, pcbUrlInfo, pvReserved);
- if (!HIWORD(pszUrlOid))
+ if (IS_INTOID(pszUrlOid))
{
switch (LOWORD(pszUrlOid))
{
@@ -1398,7 +1400,7 @@ static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid,
*pFunc = NULL;
*phFunc = 0;
- if (!HIWORD(pszObjectOid))
+ if (IS_INTOID(pszObjectOid))
{
switch (LOWORD(pszObjectOid))
{
@@ -1468,7 +1470,7 @@ static BOOL CRYPT_GetExpirationFunction(LPCSTR pszObjectOid,
{
BOOL ret;
- if (!HIWORD(pszObjectOid))
+ if (IS_INTOID(pszObjectOid))
{
switch (LOWORD(pszObjectOid))
{
More information about the wine-cvs
mailing list