Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSGIINA] Make sure we do not leak bitmaps

Browse source
This commit is contained in:
Eric Kohl 2018-05-23 00:24:01 +02:00
parent b4363068d1
commit 8828567086
3 changed files with 92 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
dll/win32/msgina/gui.c
View file

@ -27,6 +27,11 @@ typedef struct _LEGALNOTICEDATA
LPWSTR pszText; LPWSTR pszText;
} LEGALNOTICEDATA, *PLEGALNOTICEDATA; } LEGALNOTICEDATA, *PLEGALNOTICEDATA;
typedef struct _DLG_DATA
{
PGINA_CONTEXT pgContext;
HBITMAP hBitmap;
} DLG_DATA, *PDLG_DATA;
static BOOL static BOOL
GUIInitialize( GUIInitialize(
@ -193,41 +198,48 @@ GUIRemoveStatusMessage(
} }
static INT_PTR CALLBACK static INT_PTR CALLBACK
EmptyWindowProc( NoticeWindowProc(
IN HWND hwndDlg, IN HWND hwndDlg,
IN UINT uMsg, IN UINT uMsg,
IN WPARAM wParam, IN WPARAM wParam,
IN LPARAM lParam) IN LPARAM lParam)
{ {
PGINA_CONTEXT pgContext; PDLG_DATA pDlgData;
pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
switch (uMsg) switch (uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
pgContext = (PGINA_CONTEXT)lParam; pDlgData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DLG_DATA));
SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); if (pDlgData == NULL)
return FALSE;
/* Draw the logo bitmap */ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pDlgData);
pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
pDlgData->pgContext = (PGINA_CONTEXT)lParam;
/* Load the logo bitmap */
pDlgData->hBitmap = LoadImageW(pDlgData->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
return TRUE; return TRUE;
} }
case WM_PAINT: case WM_PAINT:
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
if (pgContext->hBitmap) if (pDlgData->hBitmap)
{ {
BeginPaint(hwndDlg, &ps); BeginPaint(hwndDlg, &ps);
DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pDlgData->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP);
EndPaint(hwndDlg, &ps); EndPaint(hwndDlg, &ps);
} }
return TRUE; return TRUE;
} }
case WM_DESTROY: case WM_DESTROY:
{ {
DeleteObject(pgContext->hBitmap); DeleteObject(pDlgData->hBitmap);
HeapFree(GetProcessHeap(), 0, pDlgData);
return TRUE; return TRUE;
} }
} }
@ -245,7 +257,7 @@ GUIDisplaySASNotice(
pgContext->hDllInstance, pgContext->hDllInstance,
MAKEINTRESOURCEW(IDD_NOTICE_DLG), MAKEINTRESOURCEW(IDD_NOTICE_DLG),
GetDesktopWindow(), GetDesktopWindow(),
EmptyWindowProc, NoticeWindowProc,
(LPARAM)pgContext); (LPARAM)pgContext);
} }
@ -943,39 +955,44 @@ LoggedOutWindowProc(
IN WPARAM wParam, IN WPARAM wParam,
IN LPARAM lParam) IN LPARAM lParam)
{ {
PGINA_CONTEXT pgContext; PDLG_DATA pDlgData;
pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
switch (uMsg) switch (uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
pDlgData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DLG_DATA));
if (pDlgData == NULL)
return FALSE;
SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pDlgData);
/* FIXME: take care of NoDomainUI */ /* FIXME: take care of NoDomainUI */
pgContext = (PGINA_CONTEXT)lParam; pDlgData->pgContext = (PGINA_CONTEXT)lParam;
SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext);
if (pgContext->bAutoAdminLogon || if (pDlgData->pgContext->bAutoAdminLogon ||
!pgContext->bDontDisplayLastUserName) !pDlgData->pgContext->bDontDisplayLastUserName)
SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName); SetDlgItemTextW(hwndDlg, IDC_USERNAME, pDlgData->pgContext->UserName);
if (pgContext->bAutoAdminLogon) if (pDlgData->pgContext->bAutoAdminLogon)
SetDlgItemTextW(hwndDlg, IDC_PASSWORD, pgContext->Password); SetDlgItemTextW(hwndDlg, IDC_PASSWORD, pDlgData->pgContext->Password);
SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_TO), pgContext); SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_TO), pDlgData->pgContext);
if (pgContext->bDisableCAD) if (pDlgData->pgContext->bDisableCAD)
EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
if (!pgContext->bShutdownWithoutLogon) if (!pDlgData->pgContext->bShutdownWithoutLogon)
EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE);
SetFocus(GetDlgItem(hwndDlg, pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD)); SetFocus(GetDlgItem(hwndDlg, pDlgData->pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD));
/* Draw the logo bitmap */ /* Draw the logo bitmap */
pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); pDlgData->hBitmap = LoadImageW(pDlgData->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
if (pgContext->bAutoAdminLogon) if (pDlgData->pgContext->bAutoAdminLogon)
PostMessage(GetDlgItem(hwndDlg, IDOK), BM_CLICK, 0, 0); PostMessage(GetDlgItem(hwndDlg, IDOK), BM_CLICK, 0, 0);
return TRUE; return TRUE;
@ -984,24 +1001,25 @@ LoggedOutWindowProc(
case WM_PAINT: case WM_PAINT:
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
if (pgContext->hBitmap) if (pDlgData->hBitmap)
{ {
BeginPaint(hwndDlg, &ps); BeginPaint(hwndDlg, &ps);
DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pDlgData->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP);
EndPaint(hwndDlg, &ps); EndPaint(hwndDlg, &ps);
} }
return TRUE; return TRUE;
} }
case WM_DESTROY: case WM_DESTROY:
DeleteObject(pgContext->hBitmap); DeleteObject(pDlgData->hBitmap);
HeapFree(GetProcessHeap(), 0, pDlgData);
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {
case IDOK: case IDOK:
if (DoLogon(hwndDlg, pgContext)) if (DoLogon(hwndDlg, pDlgData->pgContext))
EndDialog(hwndDlg, WLX_SAS_ACTION_LOGON); EndDialog(hwndDlg, WLX_SAS_ACTION_LOGON);
return TRUE; return TRUE;
@ -1010,8 +1028,8 @@ LoggedOutWindowProc(
return TRUE; return TRUE;
case IDC_SHUTDOWN: case IDC_SHUTDOWN:
if (OnShutDown(hwndDlg, pgContext) == IDOK) if (OnShutDown(hwndDlg, pDlgData->pgContext) == IDOK)
EndDialog(hwndDlg, pgContext->nShutdownAction); EndDialog(hwndDlg, pDlgData->pgContext->nShutdownAction);
return TRUE; return TRUE;
} }
break; break;
@ -1214,51 +1232,57 @@ UnlockWindowProc(
IN WPARAM wParam, IN WPARAM wParam,
IN LPARAM lParam) IN LPARAM lParam)
{ {
PGINA_CONTEXT pgContext; PDLG_DATA pDlgData;
INT result = WLX_SAS_ACTION_NONE; INT result = WLX_SAS_ACTION_NONE;
pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
switch (uMsg) switch (uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
pgContext = (PGINA_CONTEXT)lParam; pDlgData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DLG_DATA));
SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); if (pDlgData == NULL)
return FALSE;
SetLockMessage(hwndDlg, IDC_LOCKMSG, pgContext); SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pDlgData);
SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName); pDlgData->pgContext = (PGINA_CONTEXT)lParam;
SetLockMessage(hwndDlg, IDC_LOCKMSG, pDlgData->pgContext);
SetDlgItemTextW(hwndDlg, IDC_USERNAME, pDlgData->pgContext->UserName);
SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD)); SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD));
if (pgContext->bDisableCAD) if (pDlgData->pgContext->bDisableCAD)
EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
/* Draw the logo bitmap */ /* Load the logo bitmap */
pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); pDlgData->hBitmap = LoadImageW(pDlgData->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
return TRUE; return TRUE;
} }
case WM_PAINT: case WM_PAINT:
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
if (pgContext->hBitmap) if (pDlgData->hBitmap)
{ {
BeginPaint(hwndDlg, &ps); BeginPaint(hwndDlg, &ps);
DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pDlgData->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP);
EndPaint(hwndDlg, &ps); EndPaint(hwndDlg, &ps);
} }
return TRUE; return TRUE;
} }
case WM_DESTROY: case WM_DESTROY:
DeleteObject(pgContext->hBitmap); DeleteObject(pDlgData->hBitmap);
HeapFree(GetProcessHeap(), 0, pDlgData);
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {
case IDOK: case IDOK:
if (DoUnlock(hwndDlg, pgContext, &result)) if (DoUnlock(hwndDlg, pDlgData->pgContext, &result))
EndDialog(hwndDlg, result); EndDialog(hwndDlg, result);
return TRUE; return TRUE;
@ -1307,36 +1331,43 @@ LockedWindowProc(
IN WPARAM wParam, IN WPARAM wParam,
IN LPARAM lParam) IN LPARAM lParam)
{ {
PGINA_CONTEXT pgContext; PDLG_DATA pDlgData;
pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
switch (uMsg) switch (uMsg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
pgContext = (PGINA_CONTEXT)lParam; pDlgData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DLG_DATA));
SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); if (pDlgData == NULL)
return FALSE;
/* Draw the logo bitmap */ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pDlgData);
pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
SetLockMessage(hwndDlg, IDC_LOCKMSG, pgContext); pDlgData->pgContext = (PGINA_CONTEXT)lParam;
/* Load the logo bitmap */
pDlgData->hBitmap = LoadImageW(pDlgData->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
SetLockMessage(hwndDlg, IDC_LOCKMSG, pDlgData->pgContext);
return TRUE; return TRUE;
} }
case WM_PAINT: case WM_PAINT:
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
if (pgContext->hBitmap) if (pDlgData->hBitmap)
{ {
BeginPaint(hwndDlg, &ps); BeginPaint(hwndDlg, &ps);
DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pDlgData->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP);
EndPaint(hwndDlg, &ps); EndPaint(hwndDlg, &ps);
} }
return TRUE; return TRUE;
} }
case WM_DESTROY: case WM_DESTROY:
{ {
DeleteObject(pgContext->hBitmap); DeleteObject(pDlgData->hBitmap);
HeapFree(GetProcessHeap(), 0, pDlgData);
return TRUE; return TRUE;
} }
} }

3
dll/win32/msgina/msgina.h
View file

@ -56,9 +56,6 @@ typedef struct
PDWORD pdwOptions; PDWORD pdwOptions;
PWLX_MPR_NOTIFY_INFO pMprNotifyInfo; PWLX_MPR_NOTIFY_INFO pMprNotifyInfo;
PVOID *pProfile; PVOID *pProfile;
/* Current logo to display */
HBITMAP hBitmap;
} GINA_CONTEXT, *PGINA_CONTEXT; } GINA_CONTEXT, *PGINA_CONTEXT;
extern HINSTANCE hDllInstance; extern HINSTANCE hDllInstance;

9
dll/win32/msgina/shutdown.c
View file

@ -24,6 +24,7 @@
typedef struct _SHUTDOWN_DLG_CONTEXT typedef struct _SHUTDOWN_DLG_CONTEXT
{ {
PGINA_CONTEXT pgContext; PGINA_CONTEXT pgContext;
HBITMAP hBitmap;
DWORD ShutdownOptions; DWORD ShutdownOptions;
BOOL bCloseDlg; BOOL bCloseDlg;
BOOL bReasonUI; BOOL bReasonUI;
@ -419,13 +420,13 @@ ShutdownDialogProc(
ShutdownOnInit(hDlg, pContext); ShutdownOnInit(hDlg, pContext);
/* Draw the logo bitmap */ /* Draw the logo bitmap */
pContext->pgContext->hBitmap = pContext->hBitmap =
LoadImageW(pContext->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); LoadImageW(pContext->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
return TRUE; return TRUE;
} }
case WM_DESTROY: case WM_DESTROY:
DeleteObject(pContext->pgContext->hBitmap); DeleteObject(pContext->hBitmap);
return TRUE; return TRUE;
case WM_ACTIVATE: case WM_ACTIVATE:
@ -449,10 +450,10 @@ ShutdownDialogProc(
case WM_PAINT: case WM_PAINT:
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
if (pContext->pgContext->hBitmap) if (pContext->hBitmap)
{ {
BeginPaint(hDlg, &ps); BeginPaint(hDlg, &ps);
DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pContext->pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP);
EndPaint(hDlg, &ps); EndPaint(hDlg, &ps);
} }
return TRUE; return TRUE;