Skip to content

W
wine-winehq
Commit 27731060 authored by Filip Navara's avatar Filip Navara Committed by Alexandre Julliard
Browse files
Options

Fixed definitions of TTTOOLINFOA/W_V1_SIZE and

REBARBANDINFOA/W_V3_SIZE.
parent 6d4f4ac5
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
dlls/comctl32/rebar.c
View file @ 27731060
...@@ -2628,7 +2628,7 @@ REBAR_GetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2628,7 +2628,7 @@ REBAR_GetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
if (lprbbi == NULL) if (lprbbi == NULL)
return FALSE; return FALSE;
if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA) if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
return FALSE; return FALSE;
if ((UINT)wParam >= infoPtr->uNumBands) if ((UINT)wParam >= infoPtr->uNumBands)
return FALSE; return FALSE;
...@@ -2714,7 +2714,7 @@ REBAR_GetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2714,7 +2714,7 @@ REBAR_GetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
if (lprbbi == NULL) if (lprbbi == NULL)
return FALSE; return FALSE;
if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW) if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
return FALSE; return FALSE;
if ((UINT)wParam >= infoPtr->uNumBands) if ((UINT)wParam >= infoPtr->uNumBands)
return FALSE; return FALSE;
...@@ -2988,7 +2988,7 @@ REBAR_InsertBandA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -2988,7 +2988,7 @@ REBAR_InsertBandA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
return FALSE; return FALSE;
if (lprbbi == NULL) if (lprbbi == NULL)
return FALSE; return FALSE;
if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA) if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
return FALSE; return FALSE;
/* trace the index as signed to see the -1 */ /* trace the index as signed to see the -1 */
...@@ -3069,7 +3069,7 @@ REBAR_InsertBandW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -3069,7 +3069,7 @@ REBAR_InsertBandW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
return FALSE; return FALSE;
if (lprbbi == NULL) if (lprbbi == NULL)
return FALSE; return FALSE;
if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW) if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
return FALSE; return FALSE;
/* trace the index as signed to see the -1 */ /* trace the index as signed to see the -1 */
...@@ -3382,7 +3382,7 @@ REBAR_SetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -3382,7 +3382,7 @@ REBAR_SetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
if (lprbbi == NULL) if (lprbbi == NULL)
return FALSE; return FALSE;
if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA) if (lprbbi->cbSize < REBARBANDINFOA_V3_SIZE)
return FALSE; return FALSE;
if ((UINT)wParam >= infoPtr->uNumBands) if ((UINT)wParam >= infoPtr->uNumBands)
return FALSE; return FALSE;
...@@ -3427,7 +3427,7 @@ REBAR_SetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ...@@ -3427,7 +3427,7 @@ REBAR_SetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
if (lprbbi == NULL) if (lprbbi == NULL)
return FALSE; return FALSE;
if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW) if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE)
return FALSE; return FALSE;
if ((UINT)wParam >= infoPtr->uNumBands) if ((UINT)wParam >= infoPtr->uNumBands)
return FALSE; return FALSE;
......
dlls/comctl32/tooltips.c
View file @ 27731060
...@@ -670,7 +670,7 @@ TOOLTIPS_AddToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -670,7 +670,7 @@ TOOLTIPS_AddToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE; return FALSE;
TRACE("add tool (%p) %p %d%s!\n", TRACE("add tool (%p) %p %d%s!\n",
...@@ -748,7 +748,7 @@ TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -748,7 +748,7 @@ TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return FALSE; return FALSE;
TRACE("add tool (%p) %p %d%s!\n", TRACE("add tool (%p) %p %d%s!\n",
...@@ -826,7 +826,7 @@ TOOLTIPS_DelToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -826,7 +826,7 @@ TOOLTIPS_DelToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return 0; return 0;
if (infoPtr->uNumTools == 0) if (infoPtr->uNumTools == 0)
return 0; return 0;
...@@ -901,7 +901,7 @@ TOOLTIPS_DelToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -901,7 +901,7 @@ TOOLTIPS_DelToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return 0; return 0;
if (infoPtr->uNumTools == 0) if (infoPtr->uNumTools == 0)
return 0; return 0;
...@@ -976,7 +976,7 @@ TOOLTIPS_EnumToolsA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -976,7 +976,7 @@ TOOLTIPS_EnumToolsA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE; return FALSE;
if (uIndex >= infoPtr->uNumTools) if (uIndex >= infoPtr->uNumTools)
return FALSE; return FALSE;
...@@ -1011,7 +1011,7 @@ TOOLTIPS_EnumToolsW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1011,7 +1011,7 @@ TOOLTIPS_EnumToolsW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return FALSE; return FALSE;
if (uIndex >= infoPtr->uNumTools) if (uIndex >= infoPtr->uNumTools)
return FALSE; return FALSE;
...@@ -1045,7 +1045,7 @@ TOOLTIPS_GetBubbleSize (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1045,7 +1045,7 @@ TOOLTIPS_GetBubbleSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return FALSE; return FALSE;
nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo); nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
...@@ -1068,7 +1068,7 @@ TOOLTIPS_GetCurrentToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1068,7 +1068,7 @@ TOOLTIPS_GetCurrentToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE; return FALSE;
if (lpToolInfo) { if (lpToolInfo) {
...@@ -1106,7 +1106,7 @@ TOOLTIPS_GetCurrentToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1106,7 +1106,7 @@ TOOLTIPS_GetCurrentToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return FALSE; return FALSE;
if (lpToolInfo) { if (lpToolInfo) {
...@@ -1193,7 +1193,7 @@ TOOLTIPS_GetTextA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1193,7 +1193,7 @@ TOOLTIPS_GetTextA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return 0; return 0;
nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo); nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
...@@ -1219,7 +1219,7 @@ TOOLTIPS_GetTextW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1219,7 +1219,7 @@ TOOLTIPS_GetTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return 0; return 0;
nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo); nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
...@@ -1265,7 +1265,7 @@ TOOLTIPS_GetToolInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1265,7 +1265,7 @@ TOOLTIPS_GetToolInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE; return FALSE;
if (infoPtr->uNumTools == 0) if (infoPtr->uNumTools == 0)
return FALSE; return FALSE;
...@@ -1302,7 +1302,7 @@ TOOLTIPS_GetToolInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1302,7 +1302,7 @@ TOOLTIPS_GetToolInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return FALSE; return FALSE;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return FALSE; return FALSE;
if (infoPtr->uNumTools == 0) if (infoPtr->uNumTools == 0)
return FALSE; return FALSE;
...@@ -1408,7 +1408,7 @@ TOOLTIPS_NewToolRectA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1408,7 +1408,7 @@ TOOLTIPS_NewToolRectA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpti == NULL) if (lpti == NULL)
return 0; return 0;
if (lpti->cbSize < TTTOOLINFO_V1_SIZEA) if (lpti->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE; return FALSE;
nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpti); nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpti);
...@@ -1429,7 +1429,7 @@ TOOLTIPS_NewToolRectW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1429,7 +1429,7 @@ TOOLTIPS_NewToolRectW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpti == NULL) if (lpti == NULL)
return 0; return 0;
if (lpti->cbSize < TTTOOLINFO_V1_SIZEW) if (lpti->cbSize < TTTOOLINFOW_V1_SIZE)
return FALSE; return FALSE;
nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpti); nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpti);
...@@ -1614,7 +1614,7 @@ TOOLTIPS_SetToolInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1614,7 +1614,7 @@ TOOLTIPS_SetToolInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return 0; return 0;
nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo); nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
...@@ -1671,7 +1671,7 @@ TOOLTIPS_SetToolInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1671,7 +1671,7 @@ TOOLTIPS_SetToolInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return 0; return 0;
nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo); nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
...@@ -1724,7 +1724,7 @@ TOOLTIPS_TrackActivate (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1724,7 +1724,7 @@ TOOLTIPS_TrackActivate (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE; return FALSE;
if ((BOOL)wParam) { if ((BOOL)wParam) {
...@@ -1791,7 +1791,7 @@ TOOLTIPS_UpdateTipTextA (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1791,7 +1791,7 @@ TOOLTIPS_UpdateTipTextA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA) if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE; return FALSE;
nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo); nTool = TOOLTIPS_GetToolFromInfoA (infoPtr, lpToolInfo);
...@@ -1847,7 +1847,7 @@ TOOLTIPS_UpdateTipTextW (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1847,7 +1847,7 @@ TOOLTIPS_UpdateTipTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo == NULL) if (lpToolInfo == NULL)
return 0; return 0;
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW) if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return FALSE; return FALSE;
nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo); nTool = TOOLTIPS_GetToolFromInfoW (infoPtr, lpToolInfo);
......
include/commctrl.h
View file @ 27731060
...@@ -1560,9 +1560,9 @@ typedef struct tagTOOLINFOW { ...@@ -1560,9 +1560,9 @@ typedef struct tagTOOLINFOW {
#define LPTTTOOLINFO WINELIB_NAME_AW(LPTTTOOLINFO) #define LPTTTOOLINFO WINELIB_NAME_AW(LPTTTOOLINFO)
#define LPTOOLINFO WINELIB_NAME_AW(LPTOOLINFO) #define LPTOOLINFO WINELIB_NAME_AW(LPTOOLINFO)
#define TTTOOLINFO_V1_SIZEA CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText) #define TTTOOLINFOA_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText)
#define TTTOOLINFO_V1_SIZEW CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText) #define TTTOOLINFOW_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText)
#define TTTOOLINFO_V1_SIZE WINELIB_NAME_AW(TTTOOLINFO_V1_SIZE) #define TTTOOLINFO_V1_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(TTTOOLINFO), lpszText)
typedef struct _TT_HITTESTINFOA typedef struct _TT_HITTESTINFOA
{ {
...@@ -1796,9 +1796,9 @@ typedef REBARBANDINFOW const *LPCREBARBANDINFOW; ...@@ -1796,9 +1796,9 @@ typedef REBARBANDINFOW const *LPCREBARBANDINFOW;
#define LPREBARBANDINFO WINELIB_NAME_AW(LPREBARBANDINFO) #define LPREBARBANDINFO WINELIB_NAME_AW(LPREBARBANDINFO)
#define LPCREBARBANDINFO WINELIB_NAME_AW(LPCREBARBANDINFO) #define LPCREBARBANDINFO WINELIB_NAME_AW(LPCREBARBANDINFO)
#define REBARBANDINFO_V3_SIZEA CCSIZEOF_STRUCT(REBARBANDINFOA, wID) #define REBARBANDINFOA_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA, wID)
#define REBARBANDINFO_V3_SIZEW CCSIZEOF_STRUCT(REBARBANDINFOW, wID) #define REBARBANDINFOW_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, wID)
#define REBARBANDINFO_V3_SIZE WINELIB_NAME_AW(REBARBANDINFO_V3_SIZE) #define REBARBANDINFO_V3_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(REBARBANDINFO), wID)
typedef struct tagNMREBARCHILDSIZE typedef struct tagNMREBARCHILDSIZE
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment