Index: /trunk/include/VBox/VMMDev.h =================================================================== --- /trunk/include/VBox/VMMDev.h (revision 30851) +++ /trunk/include/VBox/VMMDev.h (revision 30852) @@ -860,7 +860,7 @@ -/** The length of a string field in the credentials request. +/** The size of a string field in the credentials request (including '\\0'). * @see VMMDevCredentials */ -#define VMMDEV_CREDENTIALS_STRLEN 128 +#define VMMDEV_CREDENTIALS_SZ_SIZE 128 /** @@ -877,9 +877,9 @@ uint32_t u32Flags; /** OUT: User name (UTF-8). */ - char szUserName[VMMDEV_CREDENTIALS_STRLEN]; + char szUserName[VMMDEV_CREDENTIALS_SZ_SIZE]; /** OUT: Password (UTF-8). */ - char szPassword[VMMDEV_CREDENTIALS_STRLEN]; + char szPassword[VMMDEV_CREDENTIALS_SZ_SIZE]; /** OUT: Domain name (UTF-8). */ - char szDomain[VMMDEV_CREDENTIALS_STRLEN]; + char szDomain[VMMDEV_CREDENTIALS_SZ_SIZE]; } VMMDevCredentials; AssertCompileSize(VMMDevCredentials, 24+4+3*128); Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp (revision 30851) +++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp (revision 30852) @@ -1,7 +1,10 @@ +/* $Id$ */ /** @file + * VBoxGINA - Windows Logon DLL for VirtualBox, Dialog Code. + */ + +/* * - * VBoxGINA -- Windows Logon DLL for VirtualBox Dialog Code - * - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -43,7 +46,7 @@ #define IDC_WLXWKSTALOCKEDSAS_DOMAIN 1856 -static DLGPROC pfWlxLoggedOutSASDlgProc = NULL; - -static PWLX_DIALOG_BOX_PARAM pfWlxDialogBoxParam = NULL; +static DLGPROC g_pfnWlxLoggedOutSASDlgProc = NULL; + +static PWLX_DIALOG_BOX_PARAM g_pfnWlxDialogBoxParam = NULL; int WINAPI MyWlxDialogBoxParam (HANDLE, HANDLE, LPWSTR, HWND, DLGPROC, LPARAM); @@ -58,5 +61,5 @@ case WLX_VERSION_1_0: { - pfWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_0)pWinlogonFunctions)->WlxDialogBoxParam; + g_pfnWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_0)pWinlogonFunctions)->WlxDialogBoxParam; ((PWLX_DISPATCH_VERSION_1_0)pWinlogonFunctions)->WlxDialogBoxParam = MyWlxDialogBoxParam; break; @@ -65,5 +68,5 @@ case WLX_VERSION_1_1: { - pfWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_1)pWinlogonFunctions)->WlxDialogBoxParam; + g_pfnWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_1)pWinlogonFunctions)->WlxDialogBoxParam; ((PWLX_DISPATCH_VERSION_1_1)pWinlogonFunctions)->WlxDialogBoxParam = MyWlxDialogBoxParam; break; @@ -72,5 +75,5 @@ case WLX_VERSION_1_2: { - pfWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_2)pWinlogonFunctions)->WlxDialogBoxParam; + g_pfnWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_2)pWinlogonFunctions)->WlxDialogBoxParam; ((PWLX_DISPATCH_VERSION_1_2)pWinlogonFunctions)->WlxDialogBoxParam = MyWlxDialogBoxParam; break; @@ -79,5 +82,5 @@ case WLX_VERSION_1_3: { - pfWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_3)pWinlogonFunctions)->WlxDialogBoxParam; + g_pfnWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_3)pWinlogonFunctions)->WlxDialogBoxParam; ((PWLX_DISPATCH_VERSION_1_3)pWinlogonFunctions)->WlxDialogBoxParam = MyWlxDialogBoxParam; break; @@ -86,5 +89,5 @@ case WLX_VERSION_1_4: { - pfWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_4)pWinlogonFunctions)->WlxDialogBoxParam; + g_pfnWlxDialogBoxParam = ((PWLX_DISPATCH_VERSION_1_4)pWinlogonFunctions)->WlxDialogBoxParam; ((PWLX_DISPATCH_VERSION_1_4)pWinlogonFunctions)->WlxDialogBoxParam = MyWlxDialogBoxParam; break; @@ -188,5 +191,5 @@ // Pass on to MSGINA first. // - bResult = pfWlxLoggedOutSASDlgProc(hwndDlg, uMsg, wParam, lParam); + bResult = g_pfnWlxLoggedOutSASDlgProc(hwndDlg, uMsg, wParam, lParam); // @@ -303,7 +306,7 @@ { Log(("VBoxGINA::MyWlxDialogBoxParam: returning hooked logged out dialog\n")); - pfWlxLoggedOutSASDlgProc = dlgprc; - return pfWlxDialogBoxParam(hWlx, hInst, lpszTemplate, hwndOwner, - MyWlxLoggedOutSASDlgProc, dwInitParam); + g_pfnWlxLoggedOutSASDlgProc = dlgprc; + return g_pfnWlxDialogBoxParam(hWlx, hInst, lpszTemplate, hwndOwner, + MyWlxLoggedOutSASDlgProc, dwInitParam); } } @@ -313,5 +316,6 @@ // The rest will not be redirected. // - return pfWlxDialogBoxParam(hWlx, hInst, lpszTemplate, - hwndOwner, dlgprc, dwInitParam); + return g_pfnWlxDialogBoxParam(hWlx, hInst, lpszTemplate, + hwndOwner, dlgprc, dwInitParam); } + Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.h (revision 30851) +++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.h (revision 30852) @@ -1,7 +1,8 @@ /** @file - * - * VBoxGINA -- Windows Logon DLL for VirtualBox Dialog code - * - * Copyright (C) 2006-2007 Oracle Corporation + * VBoxGINA - Windows Logon DLL for VirtualBox, Dialog Header. + */ + +/* + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -14,8 +15,9 @@ */ -#ifndef __H_GINADIALOG -#define __H_GINADIALOG +#ifndef ___H_GINADIALOG +#define ___H_GINADIALOG void hookDialogBoxes(PVOID pWinlogonFunctions, DWORD dwWlxVersion); -#endif /* __H_GINADIALOG */ +#endif /* !___H_GINADIALOG */ + Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp (revision 30851) +++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp (revision 30852) @@ -24,7 +24,7 @@ /* the credentials */ -wchar_t g_Username[VMMDEV_CREDENTIALS_STRLEN]; -wchar_t g_Password[VMMDEV_CREDENTIALS_STRLEN]; -wchar_t g_Domain[VMMDEV_CREDENTIALS_STRLEN]; +wchar_t g_Username[VMMDEV_CREDENTIALS_SZ_SIZE]; +wchar_t g_Password[VMMDEV_CREDENTIALS_SZ_SIZE]; +wchar_t g_Domain[VMMDEV_CREDENTIALS_SZ_SIZE]; Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.h (revision 30851) +++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.h (revision 30852) @@ -1,7 +1,8 @@ /** @file - * - * VBoxGINA -- Windows Logon DLL for VirtualBox Helper Functions - * - * Copyright (C) 2006-2007 Oracle Corporation + * VBoxGINA - Windows Logon DLL for VirtualBox, Helper Functions. + */ + +/* + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -14,6 +15,6 @@ */ -#ifndef __H_GINAHELPER -#define __H_GINAHELPER +#ifndef ___H_GINAHELPER +#define ___H_GINAHELPER #include @@ -31,3 +32,4 @@ bool credentialsPollerTerminate(void); -#endif /* __H_GINAHELPER */ +#endif /* !___H_GINAHELPER */ + Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.h (revision 30851) +++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.h (revision 30852) @@ -1,7 +1,8 @@ /** @file - * - * VBoxGINA -- Windows Logon DLL for VirtualBox - * - * Copyright (C) 2006-2007 Oracle Corporation + * VBoxGINA - Windows Logon DLL for VirtualBox. + */ + +/* + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -14,11 +15,9 @@ */ -#ifndef __H_VBOXGINA -#define __H_VBOXGINA +#ifndef ___H_VBOXGINA +#define ___H_VBOXGINA #include -#include - -#include +#include /** Handle to Winlogon service */ @@ -28,6 +27,6 @@ -/** - * GINA entry point calls +/** @name GINA entry point calls + * @{ */ typedef BOOL (WINAPI *PGWLXNEGOTIATE)(DWORD, DWORD*); @@ -56,6 +55,6 @@ typedef VOID (WINAPI *PGWLXRECONNECTNOTIFY)(PVOID); typedef VOID (WINAPI *PGWLXDISCONNECTNOTIFY)(PVOID); +/** @} */ +#endif /* !___H_VBOXGINA */ - -#endif /* __H_VBOXGINA */ Index: /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp =================================================================== --- /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (revision 30851) +++ /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (revision 30852) @@ -1631,7 +1631,7 @@ /* let's start by nulling out the data */ - memset(credentials->szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(credentials->szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(credentials->szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN); + memset(credentials->szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(credentials->szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(credentials->szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); /* should we return whether we got credentials for a logon? */ @@ -1670,7 +1670,7 @@ if (credentials->u32Flags & VMMDEV_CREDENTIALS_CLEAR) { - memset(pThis->pCredentials->Logon.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(pThis->pCredentials->Logon.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(pThis->pCredentials->Logon.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN); + memset(pThis->pCredentials->Logon.szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(pThis->pCredentials->Logon.szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(pThis->pCredentials->Logon.szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); } } @@ -1690,7 +1690,7 @@ if (credentials->u32Flags & VMMDEV_CREDENTIALS_CLEARJUDGE) { - memset(pThis->pCredentials->Judge.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(pThis->pCredentials->Judge.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(pThis->pCredentials->Judge.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN); + memset(pThis->pCredentials->Judge.szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(pThis->pCredentials->Judge.szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(pThis->pCredentials->Judge.szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); } @@ -2682,11 +2682,11 @@ if (!pThis->fKeepCredentials) { - memset(pThis->pCredentials->Logon.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(pThis->pCredentials->Logon.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(pThis->pCredentials->Logon.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN); - } - memset(pThis->pCredentials->Judge.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(pThis->pCredentials->Judge.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN); - memset(pThis->pCredentials->Judge.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN); + memset(pThis->pCredentials->Logon.szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(pThis->pCredentials->Logon.szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(pThis->pCredentials->Logon.szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + } + memset(pThis->pCredentials->Judge.szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(pThis->pCredentials->Judge.szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); + memset(pThis->pCredentials->Judge.szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE); /* Reset means that additions will report again. */ Index: /trunk/src/VBox/Devices/VMMDev/VMMDevState.h =================================================================== --- /trunk/src/VBox/Devices/VMMDev/VMMDevState.h (revision 30851) +++ /trunk/src/VBox/Devices/VMMDev/VMMDevState.h (revision 30852) @@ -65,7 +65,7 @@ struct { - char szUserName[VMMDEV_CREDENTIALS_STRLEN]; - char szPassword[VMMDEV_CREDENTIALS_STRLEN]; - char szDomain[VMMDEV_CREDENTIALS_STRLEN]; + char szUserName[VMMDEV_CREDENTIALS_SZ_SIZE]; + char szPassword[VMMDEV_CREDENTIALS_SZ_SIZE]; + char szDomain[VMMDEV_CREDENTIALS_SZ_SIZE]; bool fAllowInteractiveLogon; } Logon; @@ -74,7 +74,7 @@ struct { - char szUserName[VMMDEV_CREDENTIALS_STRLEN]; - char szPassword[VMMDEV_CREDENTIALS_STRLEN]; - char szDomain[VMMDEV_CREDENTIALS_STRLEN]; + char szUserName[VMMDEV_CREDENTIALS_SZ_SIZE]; + char szPassword[VMMDEV_CREDENTIALS_SZ_SIZE]; + char szDomain[VMMDEV_CREDENTIALS_SZ_SIZE]; } Judge; } VMMDEVCREDS;