Commit 658b9f46 authored by Roy T. Fielding's avatar Roy T. Fielding
Browse files

Apache Monitor's tray code does not notify Windows to remove it from the 

tray when the process is destroyed. Just needed to add a call to remove
the tray icon before PostQuitMessage(0).

Also show "MS Windows XP" instead of "Whistler".

Submitted by:	Jerry Baker <jerrybaker@weirdness.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90024 13f79535-47bb-0310-9956-ffa450edef68
parent d554ed31

support/win32/ApacheMonitor.c

+2 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ BOOL GetSystemOSVersion(LPSTR szVersion, LPDWORD dwVersion) 
            else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)

                strcpy(szVersion, "MS Windows 2000 ");

            else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)

                strcpy(szVersion, "Whistler ");

                strcpy(szVersion, "MS Windows XP ");

            /* Test for product type.*/            

#ifdef VER_VORKSTATION_NT

            if (bOsVersionInfoEx)
@@ -1440,6 +1440,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, 
                       SetFocus(ap_hwndAboutDlg);

                break;

                case IDM_EXIT:

                    ShowNotifyIcon(hWnd, NIM_DELETE);

                    PostQuitMessage(0);

                    return TRUE;

                break;