Microsoft Direct3D Sample Problem

Ok, I think I have debugged Microsoft samples and the DirectX frame work. I could be wrong, but if I am correct I expect Bill Gates to send me a check for, to be fair I will only charge him for an hours work at his billable rate. I won''t hold my breath for the check:

Here is What I think the problem is (code from "D3DAPP.CPP"):

-------------------------------------------------------------
HRESULT CD3DApplication::AdjustWindowForChange()
{
if( m_bWindowed )
{
// Set windowed-mode style
SetWindowLong( m_hWnd, GWL_STYLE, m_dwWindowStyle );
if( m_hMenu != NULL ){
SetMenu( m_hWnd, m_hMenu ){

}
else
{
// Set fullscreen-mode style
SetWindowLong( m_hWnd, GWL_STYLE, WS_POPUP|WS_SYSMENU|WS_VISIBLE );
m_hMenu = (HMENU)SetMenu( m_hWnd, NULL );
}
return S_OK;
}
-------------------------------------------------------------


Notice that the second call to SetMenu asigns the return code (a BOOLEAN) to m_hMenu. I can''t find anywhere in the documents that say the SetMEnu returns a menu handle. However, if you make the following change it appears to fix the problem (at least in my app):

old code -----------------------------------
m_hMenu = (HMENU)SetMenu( m_hWnd, NULL );
old code -----------------------------------

new code -----------------------------------
m_hMenu = GetMenu(m_hWnd);
SetMenu( m_hWnd, NULL );
new code -----------------------------------

Can someone confirm that this fixes the problem? I am willing to share Bill check with you.

Thanks