November 2006 - Wine-commits

Alexandre Julliard : ntdll: Maintain a file descriptor cache on the client side.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 28418cc91900ae8e5497e69fac2392779b8f4bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28418cc91900ae8e5497e69fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 20:48:19 2006 +0100 ntdll: Maintain a file descriptor cache on the client side. --- dlls/ntdll/file.c | 2 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/om.c | 7 ++- dlls/ntdll/server.c | 119 +++++++++++++++++++++++++++++++++------- include/wine/server_protocol.h | 8 +- server/fd.c | 12 +--- server/handle.c | 6 +- server/protocol.def | 6 +- server/trace.c | 7 +- 9 files changed, 122 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28418cc91900ae8e5497e…

1 0

Mikołaj Zalewski : comctl32: toolbar: Add buttons size tests.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 258008012cbd2aebf96da5d6f830069725c08b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258008012cbd2aebf96da5d6f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Nov 1 23:07:05 2006 +0100 comctl32: toolbar: Add buttons size tests. --- dlls/comctl32/tests/toolbar.c | 324 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 324 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=258008012cbd2aebf96da…

1 0

Mikołaj Zalewski : comctl32: toolbar: Use the width of the current button instead of nButtonWidth to position the icon .
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 0559afda80b79a0d948aa496a3b90d0bc5900628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0559afda80b79a0d948aa496a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Nov 1 23:38:30 2006 +0100 comctl32: toolbar: Use the width of the current button instead of nButtonWidth to position the icon. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 42ec39e..8875ca0 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -896,7 +896,7 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I rcBitmap.left += GetSystemMetrics(SM_CXEDGE) + infoPtr->iListGap / 2; } else - rcBitmap.left += (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2; + rcBitmap.left += ((rc.right - rc.left) - infoPtr->nBitmapWidth) / 2; rcBitmap.top += infoPtr->szPadding.cy / 2;

1 0

Mikołaj Zalewski : comctl32: toolbar: The SetButtonSize should not allow too small buttons.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 420f7cb076dde39941ccd46ef3a6e12a5e6efb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=420f7cb076dde39941ccd46ef… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Nov 1 23:04:05 2006 +0100 comctl32: toolbar: The SetButtonSize should not allow too small buttons. --- dlls/comctl32/toolbar.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index dd63e1c..42ec39e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4646,8 +4646,17 @@ TOOLBAR_SetButtonSize (HWND hwnd, WPARAM * either size, the system changes it to the default of 24 wide and * 22 high. Demonstarted in ControlSpy Toolbar. GLA 3/02 */ - infoPtr->nButtonWidth = (cx) ? cx : 24; - infoPtr->nButtonHeight = (cy) ? cy : 22; + if (cx == 0) cx = 24; + if (cy == 0) cx = 22; + + cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); + cy = max(cy, infoPtr->szPadding.cy + infoPtr->nVBitmapHeight); + + infoPtr->nButtonWidth = cx; + infoPtr->nButtonHeight = cy; + + infoPtr->iTopMargin = default_top_margin(infoPtr); + TOOLBAR_LayoutToolbar(hwnd); return TRUE; }

1 0

Mikołaj Zalewski : comctl32: toolbar: The top margin should be computed and saved in CalcToolbar.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 3bfcacc54c2c4705ec60813d4ed1f9d8f3e07aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfcacc54c2c4705ec60813d4… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Nov 1 23:02:45 2006 +0100 comctl32: toolbar: The top margin should be computed and saved in CalcToolbar. --- dlls/comctl32/toolbar.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 99c329e..dd63e1c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -141,6 +141,7 @@ typedef struct INT nOldHit; INT nHotItem; /* index of the "hot" item */ SIZE szPadding; /* padding values around button */ + INT iTopMargin; /* the top margin */ INT iListGap; /* default gap between text and image for toolbar with list style */ HFONT hDefaultFont; HFONT hFont; /* text font */ @@ -255,6 +256,10 @@ static void TOOLBAR_TooltipSetRect(TOOLB static LRESULT TOOLBAR_NotifyFormat(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam); +inline static int default_top_margin(TOOLBAR_INFO *infoPtr) +{ + return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); +} static LPWSTR TOOLBAR_GetText(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr) @@ -1628,6 +1633,7 @@ TOOLBAR_CalcToolbar (HWND hwnd) sizeButton = TOOLBAR_MeasureButton(infoPtr, sizeString, TRUE, validImageList); infoPtr->nButtonWidth = sizeButton.cx; infoPtr->nButtonHeight = sizeButton.cy; + infoPtr->iTopMargin = default_top_margin(infoPtr); if ( infoPtr->cxMin >= 0 && infoPtr->nButtonWidth < infoPtr->cxMin ) infoPtr->nButtonWidth = infoPtr->cxMin; @@ -1652,7 +1658,7 @@ TOOLBAR_LayoutToolbar(HWND hwnd) TOOLBAR_WrapToolbar(hwnd, infoPtr->dwStyle); x = infoPtr->nIndent; - y = (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); + y = infoPtr->iTopMargin; cx = infoPtr->nButtonWidth; cy = infoPtr->nButtonHeight; @@ -5393,6 +5399,7 @@ TOOLBAR_Create (HWND hwnd, WPARAM wParam infoPtr->szPadding.cx = DEFPAD_CX; infoPtr->szPadding.cy = DEFPAD_CY; infoPtr->iListGap = DEFLISTGAP; + infoPtr->iTopMargin = default_top_margin(infoPtr); infoPtr->dwStyle = dwStyle; infoPtr->tbim.iButton = -1; GetClientRect(hwnd, &infoPtr->client_rect);

1 0

Mikołaj Zalewski : comctl32: toolbar: The string should be included in the height of a button-less toolbar only if there is a string in the pool .
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 9ec280c25846357d2355ef107f958e3127bf2faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec280c25846357d2355ef107… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Nov 1 22:47:20 2006 +0100 comctl32: toolbar: The string should be included in the height of a button-less toolbar only if there is a string in the pool. --- dlls/comctl32/toolbar.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1a6f603..2024314 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1226,7 +1226,7 @@ TOOLBAR_CalcStrings (HWND hwnd, LPSIZE l hdc = GetDC (hwnd); hOldFont = SelectObject (hdc, infoPtr->hFont); - if (infoPtr->nNumButtons == 0) + if (infoPtr->nNumButtons == 0 && infoPtr->nNumStrings > 0) { TEXTMETRICW tm; @@ -3460,11 +3460,8 @@ TOOLBAR_GetButtonSize (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); - if (infoPtr->nNumButtons > 0) - return MAKELONG((WORD)infoPtr->nButtonWidth, - (WORD)infoPtr->nButtonHeight); - else - return MAKELONG(23,22); + return MAKELONG((WORD)infoPtr->nButtonWidth, + (WORD)infoPtr->nButtonHeight); }

1 0

Mikołaj Zalewski : comctl32: toolbar: Fix buttons heights.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: f7f1479a082dc1d1d363529649a8bdc5d33fe57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f1479a082dc1d1d36352964… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Nov 1 22:57:31 2006 +0100 comctl32: toolbar: Fix buttons heights. --- dlls/comctl32/toolbar.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2024314..22ba6c9 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -125,6 +125,7 @@ typedef struct INT nButtonHeight; INT nButtonWidth; INT nBitmapHeight; + INT nVBitmapHeight; /* see TOOLBAR_Create for an explanation */ INT nBitmapWidth; INT nIndent; INT nRows; /* number of button rows */ @@ -1553,7 +1554,7 @@ static inline SIZE TOOLBAR_MeasureButton if (infoPtr->dwStyle & TBSTYLE_LIST) { /* set button height from bitmap / text height... */ - sizeButton.cy = max((bHasBitmap ? infoPtr->nBitmapHeight : 0), + sizeButton.cy = max((bHasBitmap ? infoPtr->nVBitmapHeight : 0), sizeString.cy); /* ... add on the necessary padding */ @@ -1582,8 +1583,9 @@ static inline SIZE TOOLBAR_MeasureButton { if (bHasBitmap) { - sizeButton.cy = infoPtr->nBitmapHeight + 1 + - sizeString.cy + DEFPAD_CY; + sizeButton.cy = infoPtr->nVBitmapHeight + DEFPAD_CY; + if (sizeString.cy > 0) + sizeButton.cy += 1 + sizeString.cy; sizeButton.cx = infoPtr->szPadding.cx + max(sizeString.cx, infoPtr->nBitmapWidth); } @@ -4472,8 +4474,7 @@ TOOLBAR_SetBitmapSize (HWND hwnd, WPARAM LOWORD(lParam), HIWORD(lParam)); infoPtr->nBitmapWidth = (INT)LOWORD(lParam); - infoPtr->nBitmapHeight = (INT)HIWORD(lParam); - + infoPtr->nVBitmapHeight = infoPtr->nBitmapHeight = (INT)HIWORD(lParam); if ((himlDef == infoPtr->himlInt) && (ImageList_GetImageCount(infoPtr->himlInt) == 0)) @@ -4873,6 +4874,7 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM infoPtr->nBitmapWidth = 1; infoPtr->nBitmapHeight = 1; } + infoPtr->nVBitmapHeight = infoPtr->nBitmapHeight; TRACE("hwnd %p, new himl=%p, id = %d, count=%d, bitmap w=%d, h=%d\n", hwnd, infoPtr->himlDef, id, infoPtr->nNumBitmaps, @@ -5338,10 +5340,15 @@ TOOLBAR_Create (HWND hwnd, WPARAM wParam TRACE("hwnd = %p\n", hwnd); /* initialize info structure */ + infoPtr->nButtonWidth = 23; infoPtr->nButtonHeight = 22; - infoPtr->nButtonWidth = 24; infoPtr->nBitmapHeight = 15; infoPtr->nBitmapWidth = 16; + /* By default Windows creates an image list with 16x15 icons but computes the button size as + * if the icons were 16x16. That's why we keep infoPtr->nVBitmapHeight. After a call to + * TB_SETBITMAPSIZE or TB_SETIMAGELIST the nVBitmapHeight = nBitmapHeight. + */ + infoPtr->nVBitmapHeight = 16; infoPtr->nMaxTextRows = 1; infoPtr->cxMin = -1;

1 0

Mikołaj Zalewski : comctl32: toolbar: Add a LayoutToolbar that works like CalcToolbar but doesn' t overwrite the button sizes.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: a8a0a655153a9d835f2482ead564b72463ac1726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a0a655153a9d835f2482ead… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Nov 1 23:00:35 2006 +0100 comctl32: toolbar: Add a LayoutToolbar that works like CalcToolbar but doesn't overwrite the button sizes. --- dlls/comctl32/toolbar.c | 59 +++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 22ba6c9..99c329e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -247,6 +247,7 @@ static VOID TOOLBAR_DeleteImageList(PIML static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIST himl, INT id); static LRESULT TOOLBAR_LButtonDown(HWND hwnd, WPARAM wParam, LPARAM lParam); static void TOOLBAR_SetHotItemEx (TOOLBAR_INFO *infoPtr, INT nHit, DWORD dwReason); +static void TOOLBAR_LayoutToolbar(HWND hwnd); static LRESULT TOOLBAR_AutoSize(HWND hwnd); static void TOOLBAR_CheckImageListIconSize(TOOLBAR_INFO *infoPtr); static void TOOLBAR_TooltipSetRect(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *button); @@ -1615,14 +1616,8 @@ static void TOOLBAR_CalcToolbar (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd); - DWORD dwStyle = infoPtr->dwStyle; - TBUTTON_INFO *btnPtr; - INT i, nRows, nSepRows; - INT x, y, cx, cy; SIZE sizeString, sizeButton; - BOOL bWrap; BOOL validImageList = FALSE; - BOOL hasDropDownArrows = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle); TOOLBAR_CalcStrings (hwnd, &sizeString); @@ -1639,15 +1634,25 @@ TOOLBAR_CalcToolbar (HWND hwnd) if ( infoPtr->cxMax > 0 && infoPtr->nButtonWidth > infoPtr->cxMax ) infoPtr->nButtonWidth = infoPtr->cxMax; - TOOLBAR_WrapToolbar( hwnd, dwStyle ); + TOOLBAR_LayoutToolbar(hwnd); +} - x = infoPtr->nIndent; - if (infoPtr->dwStyle & TBSTYLE_FLAT) - y = 0; - else - y = TOP_BORDER; +static void +TOOLBAR_LayoutToolbar(HWND hwnd) +{ + TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd); + TBUTTON_INFO *btnPtr; + SIZE sizeButton; + INT i, nRows, nSepRows; + INT x, y, cx, cy; + BOOL bWrap; + BOOL validImageList = TOOLBAR_IsValidImageList(infoPtr, 0); + BOOL hasDropDownArrows = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle); + + TOOLBAR_WrapToolbar(hwnd, infoPtr->dwStyle); - /* from above, minimum is a button, and possible text */ + x = infoPtr->nIndent; + y = (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); cx = infoPtr->nButtonWidth; cy = infoPtr->nButtonHeight; @@ -2867,6 +2872,7 @@ TOOLBAR_AddButtonsT(HWND hwnd, WPARAM wP TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPTBBUTTON lpTbb = (LPTBBUTTON)lParam; INT nOldButtons, nNewButtons, nAddButtons, nCount; + BOOL fHasString = FALSE; TRACE("adding %d buttons (unicode=%d)!\n", wParam, fUnicode); @@ -2892,6 +2898,7 @@ TOOLBAR_AddButtonsT(HWND hwnd, WPARAM wP Str_SetPtrW ((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[nCount].iString ); else Str_SetPtrAtoW((LPWSTR*)&btnPtr->iString, (LPSTR)lpTbb[nCount].iString); + fHasString = TRUE; } else btnPtr->iString = lpTbb[nCount].iString; @@ -2899,7 +2906,10 @@ TOOLBAR_AddButtonsT(HWND hwnd, WPARAM wP TOOLBAR_TooltipAddTool(infoPtr, btnPtr); } - TOOLBAR_CalcToolbar (hwnd); + if (infoPtr->nNumStrings > 0 || fHasString) + TOOLBAR_CalcToolbar(hwnd); + else + TOOLBAR_LayoutToolbar(hwnd); TOOLBAR_AutoSize (hwnd); TOOLBAR_DumpToolbar (infoPtr, __LINE__); @@ -2915,6 +2925,7 @@ TOOLBAR_AddStringW (HWND hwnd, WPARAM wP { #define MAX_RESOURCE_STRING_LENGTH 512 TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); + BOOL fFirstString = (infoPtr->nNumStrings == 0); INT nIndex = infoPtr->nNumStrings; if ((wParam) && (HIWORD(lParam) == 0)) { @@ -2971,6 +2982,8 @@ #define MAX_RESOURCE_STRING_LENGTH 512 } } + if (fFirstString) + TOOLBAR_CalcToolbar(hwnd); return nIndex; } @@ -2979,6 +2992,7 @@ static LRESULT TOOLBAR_AddStringA (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); + BOOL fFirstString = (infoPtr->nNumStrings == 0); LPSTR p; INT nIndex; INT len; @@ -3003,6 +3017,8 @@ TOOLBAR_AddStringA (HWND hwnd, WPARAM wP p += (len+1); } + if (fFirstString) + TOOLBAR_CalcToolbar(hwnd); return nIndex; } @@ -3035,7 +3051,7 @@ TOOLBAR_AutoSize (HWND hwnd) if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1)) { - TOOLBAR_CalcToolbar(hwnd); + TOOLBAR_LayoutToolbar(hwnd); InvalidateRect( hwnd, NULL, TRUE ); } @@ -3261,7 +3277,7 @@ TOOLBAR_DeleteButton (HWND hwnd, WPARAM Free (oldButtons); } - TOOLBAR_CalcToolbar (hwnd); + TOOLBAR_LayoutToolbar(hwnd); InvalidateRect (hwnd, NULL, TRUE); @@ -3864,7 +3880,10 @@ TOOLBAR_InsertButtonT(HWND hwnd, WPARAM TOOLBAR_TooltipAddTool(infoPtr, &infoPtr->buttons[nIndex]); - TOOLBAR_CalcToolbar (hwnd); + if (infoPtr->nNumStrings > 0) + TOOLBAR_CalcToolbar(hwnd); + else + TOOLBAR_LayoutToolbar(hwnd); TOOLBAR_AutoSize (hwnd); InvalidateRect (hwnd, NULL, TRUE); @@ -4483,6 +4502,7 @@ TOOLBAR_SetBitmapSize (HWND hwnd, WPARAM infoPtr->nBitmapHeight); } + TOOLBAR_CalcToolbar(hwnd); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE; } @@ -5387,8 +5407,6 @@ TOOLBAR_Create (HWND hwnd, WPARAM wParam TOOLBAR_CheckStyle (hwnd, dwStyle); - TOOLBAR_CalcToolbar(hwnd); - return 0; } @@ -6589,6 +6607,9 @@ TOOLBAR_StyleChanged (HWND hwnd, INT nTy infoPtr->dwStyle = lpStyle->styleNew; + if ((dwOldStyle ^ lpStyle->styleNew) & (TBSTYLE_WRAPABLE | CCS_VERT)) + TOOLBAR_LayoutToolbar(hwnd); + /* only resize if one of the CCS_* styles was changed */ if ((dwOldStyle ^ lpStyle->styleNew) & COMMON_STYLES) {

1 0

Mike McCormack : msi: Fix a memory leak.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: f5dddd557f98c9b025fd232408fbd37159ae9214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dddd557f98c9b025fd23240… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 18:12:12 2006 +0900 msi: Fix a memory leak. --- dlls/msi/source.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index f10c32f..3b3e47f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -514,6 +514,7 @@ UINT WINAPI MsiSourceListAddSourceExW( L /* found the source */ if (dwIndex > 0 && current_index != dwIndex) FIXME("Need to reorder the sources!\n"); + msi_free( source_struct.path ); } else {

1 0

Mike McCormack : msi: Avoid a memory leak by freeing actions scripts in one place only.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: f86cfd4088fb0a6d535201e8da9372c1d8257b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86cfd4088fb0a6d535201e8d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 18:12:43 2006 +0900 msi: Avoid a memory leak by freeing actions scripts in one place only. --- dlls/msi/action.c | 6 +----- dlls/msi/helpers.c | 19 ++++++++++++------- dlls/msi/msipriv.h | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a6cb5c2..8e76413 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1491,14 +1491,10 @@ static UINT execute_script(MSIPACKAGE *p ui_actionstart(package, action); TRACE("Executing Action (%s)\n",debugstr_w(action)); rc = ACTION_PerformAction(package, action, TRUE); - msi_free(package->script->Actions[script][i]); if (rc != ERROR_SUCCESS) break; } - msi_free(package->script->Actions[script]); - - package->script->ActionCount[script] = 0; - package->script->Actions[script] = NULL; + msi_free_action_script(package, script); return rc; } diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 83a9f30..acb0f77 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -384,6 +384,17 @@ UINT schedule_action(MSIPACKAGE *package return ERROR_SUCCESS; } +void msi_free_action_script(MSIPACKAGE *package, UINT script) +{ + int i; + for (i = 0; i < package->script->ActionCount[script]; i++) + msi_free(package->script->Actions[script][i]); + + msi_free(package->script->Actions[script]); + package->script->Actions[script] = NULL; + package->script->ActionCount[script] = 0; +} + static void remove_tracked_tempfiles(MSIPACKAGE* package) { struct list *item, *cursor; @@ -571,13 +582,7 @@ void ACTION_free_package_structures( MSI if (package->script) { for (i = 0; i < TOTAL_SCRIPTS; i++) - { - int j; - for (j = 0; j < package->script->ActionCount[i]; j++) - msi_free(package->script->Actions[i][j]); - - msi_free(package->script->Actions[i]); - } + msi_free_action_script(package, i); for (i = 0; i < package->script->UniqueActionsCount; i++) msi_free(package->script->UniqueActions[i]); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fa0c225..2e4f5d2 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -752,6 +752,7 @@ extern MSIFILE *get_loaded_file( MSIPACK extern MSIFOLDER *get_loaded_folder( MSIPACKAGE *package, LPCWSTR dir ); extern int track_tempfile(MSIPACKAGE *package, LPCWSTR name, LPCWSTR path); extern UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action); +extern void msi_free_action_script(MSIPACKAGE *package, UINT script); extern LPWSTR build_icon_path(MSIPACKAGE *, LPCWSTR); extern LPWSTR build_directory_name(DWORD , ...); extern BOOL create_full_pathW(const WCHAR *path);

1 0