[Avi-3k]

following Wiz memleak thread & my suggestment,
here's the fix for the title menu multiple loading of the
msimg32.dll library that might cause this issue
(or this will at least reduce memory usage and function call)

note that i haven't compiled the code yet but it should work
(since it's based on my improved MiniMule code & the api used in Title Menu)

Quote

...
  typedef UINT (WINAPI* LPFNGRADIENTFILL)(HDC, CONST PTRIVERTEX, DWORD, CONST PVOID, DWORD, DWORD); // Avi3k: fix & improve code
...
protected:
...
  // Avi3k: fix & improve code
  //typedef UINT (WINAPI* LPFNGRADIENTFILL)(HDC, CONST PTRIVERTEX, DWORD, CONST PVOID, DWORD, DWORD);
  static LPFNGRADIENTFILL m_pfnGradientFill;
  //HINSTANCE m_hLibMsimg32;
  // end Avi3k: fix & improve code
...

Quote

...
bool    CTitleMenu::m_bInitializedAPI = false;
LPFNGRADIENTFILL CTitleMenu::m_pfnGradientFill = NULL; // Avi3k: fix & improve code
...
CTitleMenu::CTitleMenu() {
...
  m_clText = ::GetSysColor(COLOR_CAPTIONTEXT);

  // Avi3k: fix & improve code
  if (!g_bLowColorDesktop && !m_pfnGradientFill)
  {
      m_pfnGradientFill = (LPFNGRADIENTFILL)GetProcAddress(GetModuleHandle(_T("msimg32")), "GradientFill");
  }
  // end Avi3k: fix & improve code

  m_bDrawEdge = false;
...
}
...
CTitleMenu::~CTitleMenu()
{
  // Avi3k: fix + improve code
  //if (m_hLibMsimg32)
  //  FreeLibrary(m_hLibMsimg32);
  // end Avi3k: fix + improve code
}
...

blue = add, red = comment out or remove, green = modify

if anyone can test and verify, please do so... thanx...

Avi3k

[SlugFiller]

Hmm... The library is never freed. Maybe a ref-count, or a static member that does the load/unload at constructor/destructor?

[Avi-3k]

@Slug
look at the api functions in Title Menu at the bottom,
they call the user32.dll with GetModuleHandle() without
freeing it (just calling without reference to the handle again)
and it works ok, and afaik there aren't any errors...

it should work, though if u'r not sure, u can always
move the calls from the c'tor to CTitleMenu::DrawItem()
(i did the same in MiniMule and it works like a charm )

Avi3k

[SlugFiller]

Hmm... From MSDN:

Quote

The GetModuleHandle function retrieves a module handle for the specified module if the file has been mapped into the address space of the calling process.

Quote

The GetModuleHandle function returns a handle to a mapped module without incrementing its reference count.

Works for me.

[Avi-3k]

@Slug
if it works for u, then everything is ok
when i read the info on msdn earlier i wasn't really sure,
but the code in eMule itself in other parts reassured me.

Avi3k

[Avi-3k]

i've compiled the code and it works great
(didn't get any errors, though i ran it without debugging)

Avi3k

[CiccioBastardo]

Had to add this:

Quote

//m_hLibMsimg32 = NULL;

in CTitleMenu::CTitleMenu

Now goig to test it.

Thanks

[Avi-3k]

yeah, i marked the code in green to note it needs
to be changed (that includes the entire condition)

thanx for testing, u'r welcome

Avi3k

[SlugFiller]

Important thought: According to MSDN, this only works if msimg32.dll is otherwise loaded, and only up to the point where it is freed.

It seems it's loaded by CDialogMinTrayBtn for non 9x, but is subsequently freed, so I'd doubt this is the saver. A testrun on a 9x would confirm.

There is no msimg32.lib used. Dependency Walker confirms msimg32.dll isn't auto-loaded, directly or otherwise.

I wonder where the library is actually loaded and unloaded.

[Avi-3k]

i'll check it and if necessary, find a different solution...
maybe my suggestment (linked in the first post) will
take care of the problem but it requires the dlls to be loaded
prior to any eMule code and unloaded after everything.

btw, i haven't checked the msdn, but could it be that the
call to GetModuleHandle() loads the dll if not loaded?
gonna check the msdn again about this function.

Avi3k

[tHeWiZaRdOfDoS]

I wrote my own menu class and I use a static "init" and "uninit" call to load/release the library (like with my antileechclass/the prefs/the stats) - this works pretty good, maybe take that into concern

[Avi-3k]

thanx Wiz, that's what i had in mind
(at least one of the solutions, another is what Slug
gave which is to use a counter within the class...)

Avi3k

This post has been edited by Avi-3k: 16 October 2005 - 09:46 AM