Alexandre Julliard : comctl32: Remove invalid NULL check.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Nov 21 08:14:57 CST 2006
Module: wine
Branch: master
Commit: 10c3a4db67898773fa93cc491b2c133186d05e66
URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c3a4db67898773fa93cc491b2c133186d05e66
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Nov 21 12:40:39 2006 +0100
comctl32: Remove invalid NULL check.
---
dlls/comctl32/tooltips.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index a05d8a5..ea487b7 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -1383,12 +1383,10 @@ TOOLTIPS_GetCurrentToolA (HWND hwnd, WPA
LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam;
TTTOOL_INFO *toolPtr;
- if (lpToolInfo == NULL)
- return FALSE;
- if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
- return FALSE;
-
if (lpToolInfo) {
+ if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
+ return FALSE;
+
if (infoPtr->nCurrentTool > -1) {
toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
@@ -1419,12 +1417,10 @@ TOOLTIPS_GetCurrentToolW (HWND hwnd, WPA
LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam;
TTTOOL_INFO *toolPtr;
- if (lpToolInfo == NULL)
- return FALSE;
- if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
- return FALSE;
-
if (lpToolInfo) {
+ if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
+ return FALSE;
+
if (infoPtr->nCurrentTool > -1) {
toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
More information about the wine-cvs
mailing list