February 2007 - Wine-commits

Andrew Talbot : wtsapi32: Declare a variable static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 7e13c16cbcc2b0b96da8f9216bb7c809ee7358d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e13c16cbcc2b0b96da8f9216… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Feb 3 14:25:13 2007 +0000 wtsapi32: Declare a variable static. --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 91b1aa4..cec23ee 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -HMODULE WTSAPI32_hModule = 0; +static HMODULE WTSAPI32_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

Andrew Talbot : winex11.drv: Declare variable signed to accept possible negative return value (Coverity ).
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: e463110e22422c330e2126d3dfe36b1f7554ede3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e463110e22422c330e2126d3d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Feb 3 22:39:18 2007 +0000 winex11.drv: Declare variable signed to accept possible negative return value (Coverity). --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index aaeb0a3..ac0c8ba 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1923,7 +1923,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCrea GLXFBConfig* cfgs = NULL; int nCfgs = 0; int attribs[256]; - unsigned nAttribs = 0; + int nAttribs = 0; int fmt_index = 0; TRACE("(%p, %d, %d, %d, %p)\n", hdc, iPixelFormat, iWidth, iHeight, piAttribList);

1 0

Andrew Talbot : quartz: Fix a typo.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 6ef74bc9c885b0ef053b7c060bf79b4f539a3b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef74bc9c885b0ef053b7c060… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Feb 2 17:47:54 2007 +0000 quartz: Fix a typo. Should fix Coverity CID-348 (dereference before NULL check). --- dlls/quartz/pin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 9336022..5bc84bf 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -338,7 +338,7 @@ HRESULT WINAPI IPinImpl_QueryId(IPin * i TRACE("(%p/%p)->(%p)\n", This, iface, Id); *Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); - if (!Id) + if (!*Id) return E_OUTOFMEMORY; strcpyW(*Id, This->pinInfo.achName);

1 0

Andrew Talbot : winemp3.acm: Declare some items static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 6d7e1e73271a05c940dd1f4cc757caed0604d634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7e1e73271a05c940dd1f4cc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Feb 2 17:25:09 2007 +0000 winemp3.acm: Declare some items static. --- dlls/winemp3.acm/layer1.c | 6 +++--- dlls/winemp3.acm/layer2.c | 5 +++-- dlls/winemp3.acm/layer3.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winemp3.acm/layer1.c b/dlls/winemp3.acm/layer1.c index 001811b..45caf30 100644 --- a/dlls/winemp3.acm/layer1.c +++ b/dlls/winemp3.acm/layer1.c @@ -24,7 +24,7 @@ #include "mpg123.h" -void I_step_one(unsigned int balloc[], unsigned int scale_index[2][SBLIMIT],struct frame *fr) +static void I_step_one(unsigned int balloc[], unsigned int scale_index[2][SBLIMIT],struct frame *fr) { unsigned int *ba=balloc; unsigned int *sca = (unsigned int *) scale_index; @@ -64,8 +64,8 @@ void I_step_one(unsigned int balloc[], u } } -void I_step_two(real fraction[2][SBLIMIT],unsigned int balloc[2*SBLIMIT], - unsigned int scale_index[2][SBLIMIT],struct frame *fr) +static void I_step_two(real fraction[2][SBLIMIT],unsigned int balloc[2*SBLIMIT], + unsigned int scale_index[2][SBLIMIT],struct frame *fr) { int i,n; int smpb[2*SBLIMIT]; /* values: 0-65535 */ diff --git a/dlls/winemp3.acm/layer2.c b/dlls/winemp3.acm/layer2.c index be765f0..5e3fbdf 100644 --- a/dlls/winemp3.acm/layer2.c +++ b/dlls/winemp3.acm/layer2.c @@ -71,7 +71,7 @@ void init_layer2(void) } -void II_step_one(unsigned int *bit_alloc,int *scale,struct frame *fr) +static void II_step_one(unsigned int *bit_alloc,int *scale,struct frame *fr) { int stereo = fr->stereo-1; int sblimit = fr->II_sblimit; @@ -144,7 +144,8 @@ void II_step_one(unsigned int *bit_alloc } -void II_step_two(unsigned int *bit_alloc,real fraction[2][4][SBLIMIT],int *scale,struct frame *fr,int x1) +static void II_step_two(unsigned int *bit_alloc, real fraction[2][4][SBLIMIT], + int *scale, struct frame *fr, int x1) { int i,j,k,ba; int stereo = fr->stereo; diff --git a/dlls/winemp3.acm/layer3.c b/dlls/winemp3.acm/layer3.c index 35ad213..398a0a0 100644 --- a/dlls/winemp3.acm/layer3.c +++ b/dlls/winemp3.acm/layer3.c @@ -48,8 +48,8 @@ struct bandInfoStruct { short shortDiff[13]; }; -int longLimit[9][23]; -int shortLimit[9][14]; +static int longLimit[9][23]; +static int shortLimit[9][14]; static const struct bandInfoStruct bandInfo[9] = {

1 0

Andrew Talbot : shdocvw: Declare some functions static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: f06c01e230df3451757bc07523bdfb8f8f97c85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06c01e230df3451757bc0752… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 29 18:12:56 2007 +0000 shdocvw: Declare some functions static. --- dlls/shdocvw/navigate.c | 4 ++-- dlls/shdocvw/shdocvw_main.c | 2 +- dlls/shdocvw/shlinstobj.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index dcbbb24..3d3ff61 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -548,8 +548,8 @@ HRESULT navigate_url(DocHost *This, BSTR return hres; } -HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, - IBindStatusCallback *callback) +static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, + IBindStatusCallback *callback) { IHttpNegotiate *http_negotiate; LPWSTR url = NULL; diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 89956ac..551fb3e 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -126,7 +126,7 @@ HRESULT WINAPI DllInstall(BOOL bInstall, * * makes sure the handle to shell32 is valid */ - BOOL SHDOCVW_LoadShell32(void) +static BOOL SHDOCVW_LoadShell32(void) { if (SHDOCVW_hshell32) return TRUE; diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 6a39fe9..a697918 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -169,7 +169,7 @@ static const IPropertyBagVtbl RegistryPr RegistryPropertyBag_IPropertyBag_Write }; -HRESULT RegistryPropertyBag_Constructor(HKEY hInitPropertyBagKey, REFIID riid, LPVOID *ppvObject) { +static HRESULT RegistryPropertyBag_Constructor(HKEY hInitPropertyBagKey, REFIID riid, LPVOID *ppvObject) { HRESULT hr = E_FAIL; RegistryPropertyBag *pRegistryPropertyBag; @@ -313,8 +313,8 @@ static const IClassFactoryVtbl InstanceO InstanceObjectFactory_IClassFactory_LockServer }; -HRESULT InstanceObjectFactory_Constructor(REFCLSID rclsid, IPropertyBag *pPropertyBag, REFIID riid, - LPVOID *ppvObject) +static HRESULT InstanceObjectFactory_Constructor(REFCLSID rclsid, IPropertyBag *pPropertyBag, + REFIID riid, LPVOID *ppvObject) { InstanceObjectFactory *pInstanceObjectFactory; HRESULT hr = E_FAIL;

1 0

Andrew Talbot : user32: Declare some functions static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 29c66df45b9c20703469e8a1ac517823ffd94ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c66df45b9c20703469e8a1a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 31 20:22:01 2007 +0000 user32: Declare some functions static. --- dlls/user32/comm16.c | 2 +- dlls/user32/menu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index ebeb97c..4f6a076 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -361,7 +361,7 @@ static void comm_waitwrite(struct DosDev /***************************************************************************** * COMM16_DCBtoDCB16 (Internal) */ -INT16 COMM16_DCBtoDCB16(LPDCB lpdcb, LPDCB16 lpdcb16) +static INT16 COMM16_DCBtoDCB16(LPDCB lpdcb, LPDCB16 lpdcb16) { if(lpdcb->BaudRate<0x10000) lpdcb16->BaudRate = lpdcb->BaudRate; diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 0e87fde..4ac2e93 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -440,7 +440,7 @@ static HMENU MENU_CopySysPopup(void) * However, the real system menu handle is sometimes seen in the * WM_MENUSELECT parameters (and Word 6 likes it this way). */ -HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) +static HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) { HMENU hMenu;

1 0

Andrew Talbot : uxtheme: Declare some items static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 2bb44198b6958e6d981dd96c794ebdd46aa76513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb44198b6958e6d981dd96c7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Feb 1 21:52:58 2007 +0000 uxtheme: Declare some items static. --- dlls/uxtheme/draw.c | 4 ++-- dlls/uxtheme/msstyles.c | 14 +++++++------- dlls/uxtheme/msstyles.h | 1 - dlls/uxtheme/system.c | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index a2fee03..bad4471 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1719,8 +1719,8 @@ HRESULT WINAPI GetThemeBackgroundRegion( } /* compute part size for "borderfill" backgrounds */ -HRESULT get_border_background_size (HTHEME hTheme, int iPartId, - int iStateId, THEMESIZE eSize, POINT* psz) +static HRESULT get_border_background_size (HTHEME hTheme, int iPartId, + int iStateId, THEMESIZE eSize, POINT* psz) { HRESULT hr = S_OK; int bordersize = 1; diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 919a871..e555eb2 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); -HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); +static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); extern HINSTANCE hDllInst; extern int alphaBlendMode; @@ -58,7 +58,7 @@ static const WCHAR szThemesIniResource[] 't','h','e','m','e','s','_','i','n','i','\0' }; -PTHEME_FILE tfActiveTheme = NULL; +static PTHEME_FILE tfActiveTheme; /***********************************************************************/ @@ -403,7 +403,7 @@ static BOOL MSSTYLES_ParseIniSectionName * RETURNS * The class found, or NULL */ -PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) +static PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) { PTHEME_CLASS cur = tf->classes; while(cur) { @@ -675,7 +675,7 @@ struct PARSECOLORSTATE int captionColors; }; -inline void parse_init_color (struct PARSECOLORSTATE* state) +static inline void parse_init_color (struct PARSECOLORSTATE* state) { memset (state, 0, sizeof (*state)); } @@ -729,7 +729,7 @@ struct PARSENONCLIENTSTATE LOGFONTW iconTitleFont; }; -inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state) +static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state) { memset (state, 0, sizeof (*state)); state->metrics.cbSize = sizeof (NONCLIENTMETRICSW); @@ -1226,8 +1226,8 @@ HRESULT MSSTYLES_GetPropertyColor(PTHEME * * Retrieve a color value for a property */ -HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd, - LPCWSTR *lpValEnd, LOGFONTW* pFont) +static HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd, + LPCWSTR *lpValEnd, LOGFONTW* pFont) { static const WCHAR szBold[] = {'b','o','l','d','\0'}; static const WCHAR szItalic[] = {'i','t','a','l','i','c','\0'}; diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index c333a2a..0eef06c 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -94,7 +94,6 @@ BOOL MSSTYLES_LookupEnum(LPCWSTR pszValu BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); -PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName); PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index b0545b1..9e69cb8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -471,7 +471,7 @@ static void UXTHEME_SaveSystemMetrics(vo * * Change the current active theme */ -HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) +static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { HKEY hKey; WCHAR tmp[2]; @@ -605,7 +605,7 @@ HRESULT WINAPI EnableTheming(BOOL fEnabl * I'm using atoms as there may be large numbers of duplicated strings * and they do the work of keeping memory down as a cause of that quite nicely */ -HRESULT UXTHEME_SetWindowProperty(HWND hwnd, ATOM aProp, LPCWSTR pszValue) +static HRESULT UXTHEME_SetWindowProperty(HWND hwnd, ATOM aProp, LPCWSTR pszValue) { ATOM oldValue = (ATOM)(size_t)RemovePropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp)); if(oldValue) @@ -622,7 +622,7 @@ HRESULT UXTHEME_SetWindowProperty(HWND h return S_OK; } -LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, int dwLen) +static LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, int dwLen) { ATOM atValue = (ATOM)(size_t)GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp)); if(atValue) {

1 0

Dmitry Timoshkov : winedump: Add a sanity check before dumping long format library export.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 6d62ef657de15216c7ee23d722fa3b1f02ec7dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d62ef657de15216c7ee23d72… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 5 14:19:44 2007 +0800 winedump: Add a sanity check before dumping long format library export. --- tools/winedump/lib.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index a7f8367..155a6fa 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -183,6 +183,9 @@ void lib_dump(void) cur_file_pos += sizeof(IMAGE_ARCHIVE_MEMBER_HEADER); + size = strtoul((const char *)iamh->Size, NULL, 10); + size = (size + 1) & ~1; /* align to an even address */ + /* FIXME: only import library contents with the short format are * recognized. */ @@ -193,6 +196,7 @@ void lib_dump(void) } else if (strncmp((const char *)iamh->Name, IMAGE_ARCHIVE_LINKER_MEMBER, sizeof(iamh->Name))) { + long expected_size; const IMAGE_FILE_HEADER *fh = (const IMAGE_FILE_HEADER *)ioh; if (globals.do_dumpheader) @@ -204,12 +208,12 @@ void lib_dump(void) dump_optional_header(oh, fh->SizeOfOptionalHeader); } } - dump_long_import(fh, (const IMAGE_SECTION_HEADER *)((const char *)fh + sizeof(*fh) + fh->SizeOfOptionalHeader), fh->NumberOfSections); + /* Sanity check */ + expected_size = sizeof(*fh) + fh->SizeOfOptionalHeader + fh->NumberOfSections * sizeof(IMAGE_SECTION_HEADER); + if (size > expected_size) + dump_long_import(fh, (const IMAGE_SECTION_HEADER *)((const char *)fh + sizeof(*fh) + fh->SizeOfOptionalHeader), fh->NumberOfSections); } - size = strtoul((const char *)iamh->Size, NULL, 10); - size = (size + 1) & ~1; /* align to an even address */ - cur_file_pos += size; } }

1 0

Dmitry Timoshkov : dbghelp: Turn a FIXME to a WARN in order to avoid mangling the output.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 736743dd57c0445b5cc7802bf9f16924295e157d URL: http://source.winehq.org/git/wine.git/?a=commit;h=736743dd57c0445b5cc7802bf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 5 14:20:23 2007 +0800 dbghelp: Turn a FIXME to a WARN in order to avoid mangling the output. --- dlls/dbghelp/dwarf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e8f9d3e..6ff33f2 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1319,7 +1319,7 @@ static void dwarf2_parse_variable(dwarf2 else if (dwarf2_find_attribute(subpgm->ctx, di, DW_AT_const_value, &value)) { VARIANT v; - if (subpgm->func) FIXME("Unsupported constant %s in function\n", name.u.string); + if (subpgm->func) WARN("Unsupported constant %s in function\n", name.u.string); if (is_pmt) FIXME("Unsupported constant (parameter) %s in function\n", name.u.string); switch (value.form) {

1 0

Mikołaj Zalewski : comctl32: rebar: Fix lpBand-> lpText memory leak in DeleteBand and simplify the code.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 1ee6c9e3c536b95907d074e3e36eb148636b3cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee6c9e3c536b95907d074e3e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 5 00:02:27 2007 +0100 comctl32: rebar: Fix lpBand->lpText memory leak in DeleteBand and simplify the code. --- dlls/comctl32/rebar.c | 40 ++++++++-------------------------------- 1 files changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 0fc0937..9550eb5 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2649,7 +2649,6 @@ static LRESULT REBAR_DeleteBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { UINT uBand = (UINT)wParam; - HWND childhwnd = 0; REBAR_BAND *lpBand; if (uBand >= infoPtr->uNumBands) @@ -2658,39 +2657,16 @@ REBAR_DeleteBand (REBAR_INFO *infoPtr, W TRACE("deleting band %u!\n", uBand); lpBand = &infoPtr->bands[uBand]; REBAR_Notify_NMREBAR (infoPtr, uBand, RBN_DELETINGBAND); + /* TODO: a return of 1 should probably cancel the deletion */ - if (infoPtr->uNumBands == 1) { - TRACE(" simple delete!\n"); - if ((lpBand->fMask & RBBIM_CHILD) && lpBand->hwndChild) - childhwnd = lpBand->hwndChild; - Free (infoPtr->bands); - infoPtr->bands = NULL; - infoPtr->uNumBands = 0; - } - else { - REBAR_BAND *oldBands = infoPtr->bands; - TRACE("complex delete! [uBand=%u]\n", uBand); - - if ((lpBand->fMask & RBBIM_CHILD) && lpBand->hwndChild) - childhwnd = lpBand->hwndChild; - - infoPtr->uNumBands--; - infoPtr->bands = Alloc (sizeof (REBAR_BAND) * infoPtr->uNumBands); - if (uBand > 0) { - memcpy (&infoPtr->bands[0], &oldBands[0], - uBand * sizeof(REBAR_BAND)); - } - - if (uBand < infoPtr->uNumBands) { - memcpy (&infoPtr->bands[uBand], &oldBands[uBand+1], - (infoPtr->uNumBands - uBand) * sizeof(REBAR_BAND)); - } - - Free (oldBands); - } + if (lpBand->hwndChild) + ShowWindow(lpBand->hwndChild, SW_HIDE); + Free(lpBand->lpText); - if (childhwnd) - ShowWindow (childhwnd, SW_HIDE); + infoPtr->uNumBands--; + memmove(&infoPtr->bands[uBand], &infoPtr->bands[uBand+1], + (infoPtr->uNumBands - uBand) * sizeof(REBAR_BAND)); + infoPtr->bands = ReAlloc(infoPtr->bands, infoPtr->uNumBands * sizeof(REBAR_BAND)); REBAR_Notify_NMREBAR (infoPtr, -1, RBN_DELETEDBAND);

1 0