Fixed definitions of TTTOOLINFOA/W_V1_SIZE and
REBARBANDINFOA/W_V3_SIZE.
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 8ba0593..e89e406 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2628,7 +2628,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 dfefe15..db1bd32 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -670,7 +670,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 bcecc9a..1172b23 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -1560,9 +1560,9 @@
#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 @@
#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
{
