From 2773106058b52c86acea18864fe0263383edab06 Mon Sep 17 00:00:00 2001
From: Filip Navara <xnavara@volny.cz>
Date: Tue, 16 Sep 2003 01:17:25 +0000
Subject: [PATCH] Fixed definitions of TTTOOLINFOA/W_V1_SIZE and
 REBARBANDINFOA/W_V3_SIZE.

---
 dlls/comctl32/rebar.c    | 12 ++++++------
 dlls/comctl32/tooltips.c | 40 ++++++++++++++++++++--------------------
 include/commctrl.h       | 12 ++++++------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 8ba05939871..e89e406f4bb 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2628,7 +2628,7 @@ REBAR_GetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
+    if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
 	return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
 	return FALSE;
@@ -2714,7 +2714,7 @@ REBAR_GetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
+    if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
 	return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
 	return FALSE;
@@ -2988,7 +2988,7 @@ REBAR_InsertBandA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 	return FALSE;
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
+    if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
 	return FALSE;
 
     /* trace the index as signed to see the -1 */
@@ -3069,7 +3069,7 @@ REBAR_InsertBandW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 	return FALSE;
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
+    if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
 	return FALSE;
 
     /* trace the index as signed to see the -1 */
@@ -3382,7 +3382,7 @@ REBAR_SetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
+    if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
 	return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
 	return FALSE;
@@ -3427,7 +3427,7 @@ REBAR_SetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 
     if (lprbbi == NULL)
 	return FALSE;
-    if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
+    if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
 	return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
 	return FALSE;
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index dfefe150e3f..db1bd32ea19 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -670,7 +670,7 @@ TOOLTIPS_AddToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return FALSE;
 
     TRACE("add tool (%p) %p %d%s!\n",
@@ -748,7 +748,7 @@ TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return FALSE;
 
     TRACE("add tool (%p) %p %d%s!\n",
@@ -826,7 +826,7 @@ TOOLTIPS_DelToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return 0;
     if (infoPtr->uNumTools == 0)
 	return 0;
@@ -901,7 +901,7 @@ TOOLTIPS_DelToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return 0;
     if (infoPtr->uNumTools == 0)
 	return 0;
@@ -976,7 +976,7 @@ TOOLTIPS_EnumToolsA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return FALSE;
     if (uIndex >= infoPtr->uNumTools)
 	return FALSE;
@@ -1011,7 +1011,7 @@ TOOLTIPS_EnumToolsW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return FALSE;
     if (uIndex >= infoPtr->uNumTools)
 	return FALSE;
@@ -1045,7 +1045,7 @@ TOOLTIPS_GetBubbleSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
@@ -1068,7 +1068,7 @@ TOOLTIPS_GetCurrentToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return FALSE;
 
     if (lpToolInfo) {
@@ -1106,7 +1106,7 @@ TOOLTIPS_GetCurrentToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return FALSE;
 
     if (lpToolInfo) {
@@ -1193,7 +1193,7 @@ TOOLTIPS_GetTextA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1219,7 +1219,7 @@ TOOLTIPS_GetTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
@@ -1265,7 +1265,7 @@ TOOLTIPS_GetToolInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return FALSE;
     if (infoPtr->uNumTools == 0)
 	return FALSE;
@@ -1302,7 +1302,7 @@ TOOLTIPS_GetToolInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return FALSE;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return FALSE;
     if (infoPtr->uNumTools == 0)
 	return FALSE;
@@ -1408,7 +1408,7 @@ TOOLTIPS_NewToolRectA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpti == NULL)
 	return 0;
-    if (lpti->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpti->cbSize < TTTOOLINFOA_V1_SIZE)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpti);
@@ -1429,7 +1429,7 @@ TOOLTIPS_NewToolRectW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpti == NULL)
 	return 0;
-    if (lpti->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpti->cbSize < TTTOOLINFOW_V1_SIZE)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpti);
@@ -1614,7 +1614,7 @@ TOOLTIPS_SetToolInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1671,7 +1671,7 @@ TOOLTIPS_SetToolInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return 0;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
@@ -1724,7 +1724,7 @@ TOOLTIPS_TrackActivate (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return FALSE;
 
     if ((BOOL)wParam) {
@@ -1791,7 +1791,7 @@ TOOLTIPS_UpdateTipTextA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
+    if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
@@ -1847,7 +1847,7 @@ TOOLTIPS_UpdateTipTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (lpToolInfo == NULL)
 	return 0;
-    if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
+    if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
 	return FALSE;
 
     nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
diff --git a/include/commctrl.h b/include/commctrl.h
index bcecc9a14b7..1172b233141 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -1560,9 +1560,9 @@ typedef struct tagTOOLINFOW {
 #define LPTTTOOLINFO WINELIB_NAME_AW(LPTTTOOLINFO)
 #define LPTOOLINFO WINELIB_NAME_AW(LPTOOLINFO)
 
-#define TTTOOLINFO_V1_SIZEA CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText)
-#define TTTOOLINFO_V1_SIZEW CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText)
-#define TTTOOLINFO_V1_SIZE WINELIB_NAME_AW(TTTOOLINFO_V1_SIZE)
+#define TTTOOLINFOA_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText)
+#define TTTOOLINFOW_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText)
+#define TTTOOLINFO_V1_SIZE  CCSIZEOF_STRUCT(WINELIB_NAME_AW(TTTOOLINFO), lpszText)
 
 typedef struct _TT_HITTESTINFOA
 {
@@ -1796,9 +1796,9 @@ typedef REBARBANDINFOW const *LPCREBARBANDINFOW;
 #define LPREBARBANDINFO  WINELIB_NAME_AW(LPREBARBANDINFO)
 #define LPCREBARBANDINFO WINELIB_NAME_AW(LPCREBARBANDINFO)
 
-#define REBARBANDINFO_V3_SIZEA CCSIZEOF_STRUCT(REBARBANDINFOA, wID)
-#define REBARBANDINFO_V3_SIZEW CCSIZEOF_STRUCT(REBARBANDINFOW, wID)
-#define REBARBANDINFO_V3_SIZE WINELIB_NAME_AW(REBARBANDINFO_V3_SIZE)
+#define REBARBANDINFOA_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA, wID)
+#define REBARBANDINFOW_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, wID)
+#define REBARBANDINFO_V3_SIZE  CCSIZEOF_STRUCT(WINELIB_NAME_AW(REBARBANDINFO), wID)
 
 typedef struct tagNMREBARCHILDSIZE
 {
-- 
GitLab