Rein Klazes : comctl32: Do not free LPSTR_TEXTCALLBACK tooltip texts.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Mar 23 13:50:10 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 8b55e4a6621bef1fbd75909e2cfafd2270282aa5
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b55e4a6621bef1fbd75909e2cfafd2270282aa5
Author: Rein Klazes <wijn at wanadoo.nl>
Date: Thu Mar 23 11:29:44 2006 +0100
comctl32: Do not free LPSTR_TEXTCALLBACK tooltip texts.
---
dlls/comctl32/tooltips.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index c16fd7e..d730595 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -2025,7 +2025,8 @@ TOOLTIPS_SetToolInfoA (HWND hwnd, WPARAM
else {
if ( (toolPtr->lpszText) &&
!IS_INTRESOURCE(toolPtr->lpszText) ) {
- Free (toolPtr->lpszText);
+ if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+ Free (toolPtr->lpszText);
toolPtr->lpszText = NULL;
}
if (lpToolInfo->lpszText) {
@@ -2082,7 +2083,8 @@ TOOLTIPS_SetToolInfoW (HWND hwnd, WPARAM
else {
if ( (toolPtr->lpszText) &&
!IS_INTRESOURCE(toolPtr->lpszText) ) {
- Free (toolPtr->lpszText);
+ if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+ Free (toolPtr->lpszText);
toolPtr->lpszText = NULL;
}
if (lpToolInfo->lpszText) {
@@ -2208,7 +2210,8 @@ TOOLTIPS_UpdateTipTextA (HWND hwnd, WPAR
else {
if ( (toolPtr->lpszText) &&
!IS_INTRESOURCE(toolPtr->lpszText) ) {
- Free (toolPtr->lpszText);
+ if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+ Free (toolPtr->lpszText);
toolPtr->lpszText = NULL;
}
if (lpToolInfo->lpszText) {
@@ -2265,7 +2268,8 @@ TOOLTIPS_UpdateTipTextW (HWND hwnd, WPAR
else {
if ( (toolPtr->lpszText) &&
!IS_INTRESOURCE(toolPtr->lpszText) ) {
- Free (toolPtr->lpszText);
+ if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+ Free (toolPtr->lpszText);
toolPtr->lpszText = NULL;
}
if (lpToolInfo->lpszText) {
More information about the wine-cvs
mailing list